From 673a5de0bdcee06209a0b08911e98cf003577a89 Mon Sep 17 00:00:00 2001
From: "DESKTOP-GMUNQ1B\\k" <1154079537@qq.com>
Date: Fri, 8 Mar 2024 15:50:20 +0800
Subject: [PATCH] 1

---
 src/views/accounts/capitalFlow/index.vue |  5 +-
 src/views/accounts/statement/index.vue   |  1 -
 src/views/merchant/application/index.vue | 17 +++--
 src/views/system/appvison/index.vue      | 81 +++++++++++++++---------
 4 files changed, 66 insertions(+), 38 deletions(-)

diff --git a/src/views/accounts/capitalFlow/index.vue b/src/views/accounts/capitalFlow/index.vue
index 39751e5..a1a9849 100644
--- a/src/views/accounts/capitalFlow/index.vue
+++ b/src/views/accounts/capitalFlow/index.vue
@@ -8,7 +8,7 @@
               <el-radio-group v-model="tableFrom.date" type="button" class="mr20" size="small"
                 @change="selectChange(tableFrom.date)">
                 <el-radio-button v-for="(item, i) in fromList.fromTxt" :key="i" :label="item.val">{{ item.text
-                }}</el-radio-button>
+                  }}</el-radio-button>
               </el-radio-group>
               <el-date-picker v-model="timeVal" value-format="yyyy/MM/dd" format="yyyy/MM/dd" size="small"
                 type="daterange" placement="bottom-end" placeholder="自定义时间" style="width: 250px;"
@@ -17,7 +17,8 @@
             <el-form-item label="关键字：" class="width100">
               <el-input v-model="tableFrom.keyword" @keyup.enter.native="getList(1)" placeholder="请输入订单号/用户昵称"
                 class="selWidth" size="small">
-                <el-button slot="append" icon="el-icon-search" size="small" class="el-button-solt" @click="getList(1)" />
+                <el-button slot="append" icon="el-icon-search" size="small" class="el-button-solt"
+                  @click="getList(1)" />
               </el-input>
               <el-button size="small" type="primary" icon="el-icon-top" @click="exports">列表导出</el-button>
               <!-- <el-button size="small" type="primary" @click="getExportFileList">导出记录</el-button> -->
diff --git a/src/views/accounts/statement/index.vue b/src/views/accounts/statement/index.vue
index b151eee..6093f45 100644
--- a/src/views/accounts/statement/index.vue
+++ b/src/views/accounts/statement/index.vue
@@ -261,7 +261,6 @@ export default {
     },
     // 具体日期
     onchangeTime(e) {
-      console.log(e)
       this.timeVal = e
       this.tableForm.date = this.timeVal ? this.timeVal.join('-') : ''
       this.getList('')
diff --git a/src/views/merchant/application/index.vue b/src/views/merchant/application/index.vue
index 9b64517..50cb16b 100644
--- a/src/views/merchant/application/index.vue
+++ b/src/views/merchant/application/index.vue
@@ -7,7 +7,7 @@
             <el-form-item label="选择时间：" style="width: 100%">
               <el-radio-group v-model="tableFrom.date" size="small" @change="selectChange(tableFrom.date)">
                 <el-radio-button v-for="(itemn, indexn) in fromList.fromTxt" :key="indexn" :label="itemn.val">{{
-                  itemn.text }}</el-radio-button>
+            itemn.text }}</el-radio-button>
               </el-radio-group>
               <el-date-picker v-model="timeVal" type="daterange" placeholder="选择日期" format="yyyy/MM/dd"
                 value-format="yyyy/MM/dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
@@ -16,7 +16,7 @@
             <el-form-item label="状态：">
               <el-radio-group v-model="tableFrom.status" size="small" @change="statusChange(tableFrom.status)">
                 <el-radio-button v-for="(itemn, indexn) in statusList.fromTxt" :key="indexn" :label="itemn.val">{{
-                  itemn.text }}</el-radio-button>
+            itemn.text }}</el-radio-button>
               </el-radio-group>
             </el-form-item>
             <el-form-item label="商户分类：">
@@ -57,6 +57,7 @@
           </template>
         </el-table-column>
         <el-table-column label="状态" min-width="150">
+
           <template slot-scope="scope">
             <el-tag v-if="scope.row.status == 1" type="success">通过</el-tag>
             <el-tag v-if="scope.row.status == 0" type="info">未处理</el-tag>
@@ -66,6 +67,7 @@
         </el-table-column>
         <el-table-column prop="mark" label="备注" min-width="150" />
         <el-table-column label="操作" min-width="280" fixed="right" align="center">
+
           <template slot-scope="scope">
             <el-button v-if="scope.row.status == 0" type="text" size="small"
               @click="onchangeIsShow(scope.row)">审核</el-button>
@@ -194,11 +196,11 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="24">
+          <el-col :span="24" v-if="item.image && item.image.length > 0">
             <el-form-item label="开户凭证：">
               <div class="demo-image__preview">
                 <el-image style="width: 80px;height: 60px;margin-right: 10px;"
-                  v-for="(item, index) in statusAuditForm.images" :key="index" :src="item" class="preview"
+                  v-for="(item, index) in statusAuditForm.image" :key="index" :src="item" class="preview"
                   :preview-src-list="[item]" />
               </div>
             </el-form-item>
@@ -350,6 +352,13 @@ export default {
     onchangeIsShow(item) {
       this.statusAuditVisible = true;
       this.statusAuditForm = item;
+      if (item.financial_bank) {
+        let bi = JSON.parse(item.financial_bank);
+        item.bank_username = bi.bank;
+        item.bank_code = bi.bank_code;
+        item.bank_opening = bi.bank_branch;
+        this.$set(item, 'image', [bi.bank_front])
+      }
       this.$set(this.statusAuditForm, 'state', 1);
       this.$set(this.statusAuditForm, 'create_mer', 1);
     },
diff --git a/src/views/system/appvison/index.vue b/src/views/system/appvison/index.vue
index 0006bfe..6a0254f 100644
--- a/src/views/system/appvison/index.vue
+++ b/src/views/system/appvison/index.vue
@@ -10,7 +10,7 @@
         <el-table-column label="ID" prop="id" min-width="100" />
         <el-table-column label="标题" min-width="100">
           <template slot-scope="scope">
-            <span>{{scope.row.title.length>10?scope.row.title.slice(0,9) :scope.row.title }}</span>
+            <span>{{ scope.row.title.length > 10 ? scope.row.title.slice(0, 9) : scope.row.title }}</span>
           </template>
         </el-table-column>
 
@@ -20,7 +20,7 @@
 
         <el-table-column label="分类" min-width="100">
           <template slot-scope="scope">
-            <span>{{scope.row.type==1?'Android':"IOS"  }}</span>
+            <span>{{ scope.row.type == 1 ? 'Android' : "IOS" }}</span>
           </template>
         </el-table-column>
 
@@ -36,31 +36,22 @@
         </el-table-column>
       </el-table>
       <div class="block">
-        <el-pagination :page-sizes="[20, 40, 60, 80]" :page-size="tableFrom.limit" :current-page="tableFrom.page" layout="total, sizes, prev, pager, next, jumper" :total="tableData.total" @size-change="handleSizeChange" @current-change="pageChange" />
+        <el-pagination :page-sizes="[20, 40, 60, 80]" :page-size="tableFrom.limit" :current-page="tableFrom.page"
+          layout="total, sizes, prev, pager, next, jumper" :total="tableData.total" @size-change="handleSizeChange"
+          @current-change="pageChange" />
       </div>
     </el-card>
     <!--审核-->
-    <el-dialog v-if="dialogVisible" :before-close="handleClose" :title="isExamine ? '新增' : '编辑'" :visible.sync="dialogVisible" width="700px">
+    <el-dialog v-if="dialogVisible" :before-close="handleClose" :title="isExamine ? '新增' : '编辑'"
+      :visible.sync="dialogVisible" width="700px">
       <div v-loading="loading">
         <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="120px" class="demo-ruleForm">
-
           <el-form-item label="版本标题：" prop="title">
-
             <el-input v-model="ruleForm.title" placeholder="请输入标题" />
           </el-form-item>
           <el-form-item label="版本内容：" prop="content">
-            <el-input v-model="ruleForm.content" placeholder="请输入内容" />
+            <el-input type="textarea" v-model="ruleForm.content" :rows="3" placeholder="请输入内容" />
           </el-form-item>
-          <!-- <el-form-item label="上传版本：">
-            <el-upload ref="upload" :action="fileUrl" :on-success="handleSuccess" :headers="myHeaders" :show-file-list="false" multiple>
-              <i class="el-icon-upload"></i>
-              <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
-              <div class="el-upload__tip" slot="tip">
-                只能上传apk文件.
-              </div>
-            </el-upload>
-          </el-form-item> -->
-
           <el-form-item label="系统类型：" prop="type">
             <el-radio-group v-model="ruleForm.type">
               <el-radio :label="2">IOS</el-radio>
@@ -76,6 +67,18 @@
           <el-form-item label="版本号" prop="version">
             <el-input v-model="ruleForm.version" placeholder="版本号" />
           </el-form-item>
+          <!-- <el-form-item label="上传版本：">
+            <div class="upload-wrap">
+              <el-upload ref="upload" :action="fileUrl" :on-success="handleSuccess" :headers="myHeaders"
+                :show-file-list="false" multiple>
+                <i class="el-icon-upload"></i>
+                <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+                <div class="el-upload__tip" slot="tip">
+                  只能上传apk文件.
+                </div>
+              </el-upload>
+            </div>
+          </el-form-item> -->
           <el-form-item label="下载地址" prop="dow_url">
             <el-input v-model="ruleForm.dow_url" placeholder="下载地址" />
           </el-form-item>
@@ -97,15 +100,16 @@
         </el-form>
       </div>
     </el-dialog>
-    <el-dialog v-if="dialogVisible1" :before-close="handleClose1" title="详情" :visible.sync="dialogVisible1" width="700px">
+    <el-dialog v-if="dialogVisible1" :before-close="handleClose1" title="详情" :visible.sync="dialogVisible1"
+      width="700px">
 
       <el-form ref="ruleForm1" :model="ruleForm1" label-width="120px" class="demo-ruleForm">
         <el-form-item label="标题：">
-          {{ruleForm1.title}}
+          {{ ruleForm1.title }}
 
         </el-form-item>
         <el-form-item label="上传内容：">
-          {{ruleForm1.content}}
+          {{ ruleForm1.content }}
         </el-form-item>
 
         <el-form-item label="类型：">
@@ -116,13 +120,13 @@
           </el-radio-group>
         </el-form-item>
         <el-form-item label="手机平台">
-          {{ruleForm1.phone_brand}}
+          {{ ruleForm1.phone_brand }}
         </el-form-item>
         <el-form-item label="下载地址">
-          {{ruleForm1.dow_url}}
+          {{ ruleForm1.dow_url }}
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="dialogVisible1=false">确定</el-button>
+          <el-button type="primary" @click="dialogVisible1 = false">确定</el-button>
         </el-form-item>
       </el-form>
 
@@ -130,7 +134,7 @@
   </div>
 </template>
 
-    <script>
+<script>
 // +----------------------------------------------------------------------
 // | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 // +----------------------------------------------------------------------
@@ -219,7 +223,7 @@ export default {
       ruleForm1: {
 
       },
-      id:0
+      id: 0
     }
   },
   computed: {
@@ -278,7 +282,7 @@ export default {
       this.isExamine = false
       this.dialogVisible = true
       this.ruleForm = row
-      this.id=row.id
+      this.id = row.id
     },
 
     onSubmit(item) {
@@ -353,43 +357,58 @@ export default {
         this.$message.error(message)
       })
     },
-
-
-
   }
 }
-    </script>
+</script>
+
+<style scoped lang="scss">
+.upload-wrap>div {
+  border: 1px dashed #D9D9D9;
+  border-radius: 6px;
+  width: 240px;
+  padding: 20px;
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: center;
+}
 
-    <style scoped lang="scss">
 .box-container {
   overflow: hidden;
 }
+
 .box-container .list {
   float: left;
   line-height: 40px;
 }
+
 .box-container .sp {
   width: 50%;
 }
+
 .box-container .sp3 {
   width: 33.3333%;
 }
+
 .box-container .sp100 {
   width: 100%;
 }
+
 .box-container .list .name {
   display: inline-block;
   width: 150px;
   text-align: right;
   color: #606266;
 }
+
 .box-container .list.image {
   margin-bottom: 40px;
 }
+
 .box-container .list.image img {
   position: relative;
   top: 40px;
 }
+
 /deep/.el-form-item__content .el-rate {
   position: relative;
   top: 8px;