Merge branch 'dev' into 'master'

Dev

See merge request !67

src/views/operation/exceptionMessage.vue

@@ -148,7 +148,7 @@ export default {
           key: 'statusStr'
         },
         {
-          label: '异常信息2',
+          label: '异常信息',
           key: 'errorMsg',
           minWidth: 200,
           render: (row) => (

src/views/user/rechargeRecord.vue

@@ -407,6 +407,13 @@
                 min-width="120"
                 :show-overflow-tooltip="true" />
               <el-table-column
+                label="收款备注"
+                prop="financeRemark"
+                header-align="center"
+                align="left"
+                min-width="120"
+                :show-overflow-tooltip="true" />
+              <el-table-column
                 label="水单"
                 prop="billUrl"
                 header-align="center"
@@ -426,6 +433,25 @@
                 </template>
               </el-table-column>
               <el-table-column
+                label="收款水单"
+                prop="financeBillUrl"
+                header-align="center"
+                align="center"
+                width="120">
+                <template slot-scope="{ row }">
+                  <span
+                    v-if="row.financeBillUrl"
+                    class="bill-img-wrap"
+                    @click.stop="openBillImageViewer(row.financeBillUrl)">
+                    <el-image
+                      class="bill-img"
+                      :src="setimgUrl(row.financeBillUrl, { w: 80 })"
+                      fit="cover" />
+                  </span>
+                  <span v-else>-</span>
+                </template>
+              </el-table-column>
+              <el-table-column
                 label="创建时间"
                 prop="createdTime"
                 header-align="center"