From b002300ef933c26bfdf666632d09af2c5d3b82e8 Mon Sep 17 00:00:00 2001
From: "DESKTOP-GMUNQ1B\\k" <1154079537@qq.com>
Date: Wed, 27 Mar 2024 16:47:15 +0800
Subject: [PATCH 1/8] 1

---
 src/views/merchant/list/index.vue             | 191 +++------
 .../product/productExamine/proDetails.vue     | 368 +++++++++---------
 2 files changed, 236 insertions(+), 323 deletions(-)

diff --git a/src/views/merchant/list/index.vue b/src/views/merchant/list/index.vue
index 9484d0b..9285503 100644
--- a/src/views/merchant/list/index.vue
+++ b/src/views/merchant/list/index.vue
@@ -3,82 +3,35 @@
     <div class="selCard">
       <el-form :model="tableFrom" ref="searchForm" size="small" label-width="85px" :inline="true">
         <el-form-item label="选择时间：">
-          <el-date-picker
-            v-model="timeVal"
-            type="daterange"
-            placeholder="选择日期"
-            format="yyyy/MM/dd"
-            value-format="yyyy/MM/dd"
-            range-separator="-"
-            style="width:280px;"
-            :picker-options="pickerOptions"
-            @change="onchangeTime"
-          />
+          <el-date-picker v-model="timeVal" type="daterange" placeholder="选择日期" format="yyyy/MM/dd"
+            value-format="yyyy/MM/dd" range-separator="-" style="width:280px;" :picker-options="pickerOptions"
+            @change="onchangeTime" />
         </el-form-item>
         <el-form-item label="商户类别：" prop="is_trader">
-          <el-select
-            v-model="tableFrom.is_trader"
-            clearable
-            placeholder="请选择"
-            class="selWidth"
-            @change="getList(1)"
-          >
+          <el-select v-model="tableFrom.is_trader" clearable placeholder="请选择" class="selWidth" @change="getList(1)">
             <el-option label="自营" value="1" />
             <el-option label="非自营" value="0" />
           </el-select>
         </el-form-item>
-          <el-form-item label="商户分类：" prop="category_id">
-            <el-select
-            v-model="tableFrom.category_id"
-            clearable
-            placeholder="请选择"
-            class="selWidth"
-            @change="getList(1)"
-          >
-            <el-option
-              v-for="item in merCateList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
+        <el-form-item label="商户分类：" prop="category_id">
+          <el-select v-model="tableFrom.category_id" clearable placeholder="请选择" class="selWidth" @change="getList(1)">
+            <el-option v-for="item in merCateList" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
         </el-form-item>
         <el-form-item label="店铺类型：" prop="type_id">
-          <el-select
-            v-model="tableFrom.type_id"
-            clearable
-            placeholder="请选择"
-            class="selWidth"
-            @change="getList(1)"
-          >
-            <el-option
-              v-for="item in storeType"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
+          <el-select v-model="tableFrom.type_id" clearable placeholder="请选择" class="selWidth" @change="getList(1)">
+            <el-option v-for="item in storeType" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
         </el-form-item>
         <el-form-item label="是否推荐：" prop="is_best">
-          <el-select
-            v-model="tableFrom.is_best"
-            clearable
-            placeholder="请选择"
-            class="selWidth"
-            @change="getList(1)"
-          >
-            <el-option key="1" label="是" value="1"/>
-            <el-option key="0" label="否" value="0"/>
+          <el-select v-model="tableFrom.is_best" clearable placeholder="请选择" class="selWidth" @change="getList(1)">
+            <el-option key="1" label="是" value="1" />
+            <el-option key="0" label="否" value="0" />
           </el-select>
         </el-form-item>
         <el-form-item label="关键字：" prop="keyword">
-          <el-input
-            v-model="tableFrom.keyword"
-            @keyup.enter.native="getList(1)"
-            placeholder="请输入店铺关键字/店铺名/联系电话"
-            class="selWidth"
-            clearable
-          />
+          <el-input v-model="tableFrom.keyword" @keyup.enter.native="getList(1)" placeholder="请输入店铺关键字/店铺名/联系电话"
+            class="selWidth" clearable />
         </el-form-item>
         <el-form-item>
           <el-button type="primary" size="small" @click="getList(1)">搜索</el-button>
@@ -88,49 +41,27 @@
     </div>
     <el-card class="mt14">
       <div class="mb20">
-        <el-tabs v-if="headeNum.length > 0" v-model="tableFrom.status" @tab-click="getList(1),getHeadNum()">
-          <el-tab-pane
-            v-for="(item,index) in headeNum"
-            :key="index"
-            :name="item.type.toString()"
-            :label="item.title +'('+item.count +')' "
-          />
+        <el-tabs v-if="headeNum.length > 0" v-model="tableFrom.status" @tab-click="getList(1), getHeadNum()">
+          <el-tab-pane v-for="(item, index) in headeNum" :key="index" :name="item.type.toString()"
+            :label="item.title + '(' + item.count + ')'" />
         </el-tabs>
         <el-button size="small" type="primary" class="mt5" @click="onAdd">添加商户</el-button>
       </div>
-      <el-table
-        v-loading="listLoading"
-        :data="tableData.data"
-        size="small"
-        highlight-current-row
-      >
+      <el-table v-loading="listLoading" :data="tableData.data" size="small" highlight-current-row>
         <el-table-column prop="mer_id" label="ID" min-width="60" />
         <el-table-column prop="mer_name" label="商户名称" min-width="150" />
         <el-table-column prop="real_name" label="商户姓名" min-width="150" />
+        <el-table-column prop="spread" label="推广人" min-width="150" />
         <el-table-column prop="status" label="推荐" min-width="100">
           <template slot-scope="scope">
-            <el-switch
-              v-model="scope.row.is_best"
-              :active-value="1"
-              :inactive-value="0"
-              active-text="是"
-              inactive-text="否"
-              :width="40"
-              @click.native="onchangeIsShow(scope.row)"
-            />
+            <el-switch v-model="scope.row.is_best" :active-value="1" :inactive-value="0" active-text="是"
+              inactive-text="否" :width="40" @click.native="onchangeIsShow(scope.row)" />
           </template>
         </el-table-column>
-         <el-table-column prop="status" label="开启/关闭" min-width="100">
+        <el-table-column prop="status" label="开启/关闭" min-width="100">
           <template slot-scope="scope">
-            <el-switch
-              v-model="scope.row.status"
-              :active-value="1"
-              :inactive-value="0"
-              active-text="开启"
-              inactive-text="关闭"
-              :width="55"
-              @click.native="onchangeIsClose(scope.row)"
-            />
+            <el-switch v-model="scope.row.status" :active-value="1" :inactive-value="0" active-text="开启"
+              inactive-text="关闭" :width="55" @click.native="onchangeIsClose(scope.row)" />
           </template>
         </el-table-column>
         <el-table-column prop="purchase_amount" label="采购金额" min-width="120" />
@@ -138,7 +69,7 @@
         <el-table-column prop="create_time" label="创建时间" min-width="150" />
         <el-table-column prop="margin" label="保证金" min-width="150">
           <template slot-scope="scope">
-            <span>{{scope.row.is_margin == 1 ? '未支付' : scope.row.is_margin == 0 ? '无' : '已支付'}}</span>
+            <span>{{ scope.row.is_margin == 1 ? '未支付' : scope.row.is_margin == 0 ? '无' : '已支付' }}</span>
 
           </template>
         </el-table-column>
@@ -147,48 +78,25 @@
 
         <el-table-column label="操作" min-width="150" fixed="right">
           <template slot-scope="scope">
-            <el-button
-              v-if="tableFrom.status === '1'"
-              type="text"
-              size="small"
-              @click="onLogo(scope.row.mer_id)"
-            >登录</el-button>
+            <el-button v-if="tableFrom.status === '1'" type="text" size="small"
+              @click="onLogo(scope.row.mer_id)">登录</el-button>
             <el-button type="text" size="small" @click="onEdit(scope.row.mer_id)">编辑</el-button>
             <el-button type="text" size="small" @click="onDetails(scope.row.mer_id)">详情</el-button>
-            <el-button
-              v-if="tableFrom.status === '0'"
-              type="text"
-              size="small"
-              @click="handleDelete(scope.row.mer_id, scope.$index)"
-            >删除</el-button>
+            <el-button v-if="tableFrom.status === '0'" type="text" size="small"
+              @click="handleDelete(scope.row.mer_id, scope.$index)">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
       <div class="block">
-        <el-pagination
-          background
-          :page-size="tableFrom.limit"
-          :current-page="tableFrom.page"
-          layout="total, prev, pager, next, jumper"
-          :total="tableData.total"
-          @size-change="handleSizeChange"
-          @current-change="pageChange"
-        />
+        <el-pagination background :page-size="tableFrom.limit" :current-page="tableFrom.page"
+          layout="total, prev, pager, next, jumper" :total="tableData.total" @size-change="handleSizeChange"
+          @current-change="pageChange" />
       </div>
     </el-card>
     <!--商户详情-->
-    <mer-detail
-      ref="merDetail"
-      :merId="merId"
-      :merCateList="merCateList"
-      :storeType="storeType"
-      @closeDrawer="closeDrawer"
-      @changeDrawer="changeDrawer"
-      @onPassword="onPassword"
-      @handleTimes="handleTimes"
-      @getList="getList"
-      :drawer="drawer"
-    ></mer-detail>
+    <mer-detail ref="merDetail" :merId="merId" :merCateList="merCateList" :storeType="storeType"
+      @closeDrawer="closeDrawer" @changeDrawer="changeDrawer" @onPassword="onPassword" @handleTimes="handleTimes"
+      @getList="getList" :drawer="drawer"></mer-detail>
   </div>
 </template>
 <script>
@@ -272,7 +180,7 @@ export default {
   },
   methods: {
     /**重置 */
-    searchReset(){
+    searchReset() {
       this.timeVal = []
       this.tableFrom.date = ""
       this.$refs.searchForm.resetFields()
@@ -302,22 +210,22 @@ export default {
           this.headeNum[0]["count"] = res.data.valid;
           this.headeNum[1]["count"] = res.data.invalid;
         })
-        .catch(res => {});
+        .catch(res => { });
     },
     // 商户分类；
     getMerCategory() {
-        getMerCateApi().then(res => {
-            this.merCateList = res.data
-        }).catch(res => {
-            this.$message.error(res.message)
-        })
+      getMerCateApi().then(res => {
+        this.merCateList = res.data
+      }).catch(res => {
+        this.$message.error(res.message)
+      })
     },
-    getStoreType(){
-        getstoreTypeApi().then(res => {
-            this.storeType = res.data
-        }).catch(res => {
-            this.$message.error(res.message)
-        })
+    getStoreType() {
+      getstoreTypeApi().then(res => {
+        this.storeType = res.data
+      }).catch(res => {
+        this.$message.error(res.message)
+      })
     },
     // 列表
     getList(num) {
@@ -417,5 +325,4 @@ export default {
 };
 </script>
 
-<style scoped lang="scss">
-</style>
+<style scoped lang="scss"></style>
diff --git a/src/views/product/productExamine/proDetails.vue b/src/views/product/productExamine/proDetails.vue
index 7a7d5fa..079b7ea 100644
--- a/src/views/product/productExamine/proDetails.vue
+++ b/src/views/product/productExamine/proDetails.vue
@@ -1,12 +1,7 @@
 <template>
   <div>
-    <el-drawer
-      :with-header="false"
-      :visible.sync="drawer"
-      size="1100px"
-      :direction="direction"
-      :before-close="handleClose"
-    >
+    <el-drawer :with-header="false" :visible.sync="drawer" size="1100px" :direction="direction"
+      :before-close="handleClose">
       <div v-loading="loading">
         <div class="head">
           <div class="full">
@@ -21,7 +16,7 @@
           <ul class="list">
             <li class="item">
               <div class="title">商品类型</div>
-              <div>{{productData.type == 0 ? '普通商品' : productData.type == 1 ? '虚拟商品' : '卡密商品' }}</div>
+              <div>{{ productData.type == 0 ? '普通商品' : productData.type == 1 ? '虚拟商品' : '卡密商品' }}</div>
             </li>
             <li class="item">
               <div class="title">商品状态</div>
@@ -48,57 +43,64 @@
               <ul class="list">
                 <li class="item item100">
                   <div class="item-title">封面图：</div>
-                  <img :src="productData.image" style="width:40px;height:40px;margin-right:12px;"/>
+                  <img :src="productData.image" style="width:40px;height:40px;margin-right:12px;" />
                 </li>
                 <li class="item item100">
                   <div class="item-title">轮播图：</div>
-                  <img v-for="(pic,idx) in productData.slider_image" :key="idx" :src="pic" style="width:40px;height:40px;margin-right:12px;"/>
-                </li>  
+                  <img v-for="(pic, idx) in productData.slider_image" :key="idx" :src="pic"
+                    style="width:40px;height:40px;margin-right:12px;" />
+                </li>
               </ul>
               <li class="item item100">
                 <div class="item-title">商品简介：</div>
-                  <div class="value">{{productData.store_info}}</div>
-                </li>
+                <div class="value">{{ productData.store_info }}</div>
+              </li>
               <ul class="list">
                 <li class="item">
                   <div class="item-title">平台分类：</div>
-                  <div class="value">{{productData.storeCategory&&productData.storeCategory.cate_name || '-'}}</div>
+                  <div class="value">{{ productData.storeCategory && productData.storeCategory.cate_name || '-' }}</div>
                 </li>
-                <li v-if="productData.merCateId&&productData.merCateId.length>0" class="item">
+                <li v-if="productData.merCateId && productData.merCateId.length > 0" class="item">
                   <div class="item-title">商户分类：</div>
                   <div class="value">
-                    <span v-for="(item,index) in productData.merCateId" :key="index">{{item.category&&item.category.cate_name}}&nbsp;&nbsp;&nbsp;&nbsp;</span>
+                    <span v-for="(item, index) in productData.merCateId" :key="index">{{ item.category &&
+      item.category.cate_name }}&nbsp;&nbsp;&nbsp;&nbsp;</span>
                   </div>
                 </li>
                 <li class="item">
                   <div class="item-title">商品标签：</div>
-                  <div v-if="(productData.mer_labels&&productData.mer_labels_data.length) || (productData.sys_labels_data&&productData.sys_labels_data.length)" class="value">
-                    <template v-if="productData.mer_labels_data&&productData.mer_labels_data.length">
-                      <span v-for="(item,index) in productData.mer_labels_data" :key="index" class="value-item"> {{item}} </span> 
+                  <div
+                    v-if="(productData.mer_labels && productData.mer_labels_data.length) || (productData.sys_labels_data && productData.sys_labels_data.length)"
+                    class="value">
+                    <template v-if="productData.mer_labels_data && productData.mer_labels_data.length">
+                      <span v-for="(item, index) in productData.mer_labels_data" :key="index" class="value-item">
+                        {{ item }} </span>
                     </template>
-                    <template v-if="productData.sys_labels_data&&productData.sys_labels_data.length">
-                      <span v-for="(item,index) in productData.sys_labels_data" :key="index" class="value-item"> {{item}} </span>
+                    <template v-if="productData.sys_labels_data && productData.sys_labels_data.length">
+                      <span v-for="(item, index) in productData.sys_labels_data" :key="index" class="value-item">
+                        {{ item }} </span>
                     </template>
                   </div>
                   <div v-else class="value"><span>-</span></div>
                 </li>
                 <li class="item">
                   <div class="item-title">品牌选择：</div>
-                  <div class="value">{{productData.brand&&productData.brand.brand_name || '其它'}}</div>
+                  <div class="value">{{ productData.brand && productData.brand.brand_name || '其它' }}</div>
                 </li>
                 <li class="item">
                   <div class="item-title">单位：</div>
-                  <div class="value">{{productData.unit_name}}</div>
+                  <div class="value">{{ productData.unit_name }}</div>
                 </li>
                 <li class="item">
                   <div class="item-title">关键字：</div>
-                  <div class="value">{{productData.keyword || '-'}}</div>
+                  <div class="value">{{ productData.keyword || '-' }}</div>
                 </li>
                 <li class="item">
                   <div class="item-title">配送方式：</div>
-                  <template v-if="productData.type==0">
-                    <div v-if="productData.delivery_way.length==2" class="value">快递/到店自提</div>
-                    <div v-else-if="productData.delivery_way.length==1">{{productData.delivery_way[0]==1 ? "到店自提" : "快递"}}</div>
+                  <template v-if="productData.type == 0">
+                    <div v-if="productData.delivery_way.length == 2" class="value">快递/到店自提</div>
+                    <div v-else-if="productData.delivery_way.length == 1">{{ productData.delivery_way[0] == 1 ? "到店自提" :
+      "快递" }}</div>
                   </template>
                   <template v-else>
                     <div v-if="productData.type == 1" class="value">虚拟发货</div>
@@ -109,7 +111,8 @@
               <ul v-if="productData.video_link" class="list">
                 <li class="item item100">
                   <div class="item-title">主图视频：</div>
-                  <video style="width:300px;height: 150px;border-radius: 10px;" :src="productData.video_link" controls="controls">
+                  <video style="width:300px;height: 150px;border-radius: 10px;" :src="productData.video_link"
+                    controls="controls">
                     您的浏览器不支持 video 标签。
                   </video>
                 </li>
@@ -121,15 +124,17 @@
               <ul class="list">
                 <li class="item">
                   <div class="item-title">佣金设置：</div>
-                  <div class="value">{{productData.extension_type==1?"单独设置":"默认设置"}}</div>
+                  <div class="value">{{ productData.extension_type == 1 ? "单独设置" : "默认设置" }}</div>
                 </li>
-                 <li v-if="mer_svip_status" class="item">
+                <li v-if="mer_svip_status" class="item">
                   <div>付费会员价设置：</div>
-                  <div class="value">{{productData.svip_price_type==0 ? '不设置会员价' : productData.svip_price_type==1 ? '默认设置会员价' : '自定义设置会员价'}}</div>
+                  <div class="value">{{ productData.svip_price_type == 0 ? '不设置会员价' : productData.svip_price_type == 1 ?
+      '默认设置会员价' :
+      '自定义设置会员价' }}</div>
                 </li>
-                 <li class="item">
+                <li class="item">
                   <div class="item-title">规格：</div>
-                  <div class="value">{{productData.spec_type == 1 ? "多规格" : "单规格"}}</div>
+                  <div class="value">{{ productData.spec_type == 1 ? "多规格" : "单规格" }}</div>
                 </li>
               </ul>
             </div>
@@ -141,14 +146,12 @@
                     <el-table-column align="center" label="图片" min-width="80">
                       <template slot-scope="scope">
                         <div class="demo-image__preview">
-                          <el-image
-                            style="width: 60px; height: 60px"
-                            :src="scope.row.image"
-                          />
+                          <el-image style="width: 60px; height: 60px" :src="scope.row.image" />
                         </div>
                       </template>
                     </el-table-column>
-                    <el-table-column v-for="(item,iii) in attrValue" :key="iii" :label="formThead[iii].title" align="center" min-width="120">
+                    <el-table-column v-for="(item, iii) in attrValue" :key="iii" :label="formThead[iii].title"
+                      align="center" min-width="120">
                       <template slot-scope="scope">
                         <span class="priceBox" v-text="scope.row[iii]" />
                       </template>
@@ -169,13 +172,14 @@
                 </template>
                 <template v-if="productData.spec_type === 1">
                   <el-table :data="ManyAttrValue" border class="tabNumWidth" size="mini">
-                      <template v-if="manyTabDate">
-                        <el-table-column v-for="(item,iii) in manyTabDate" :key="iii" align="center" :label="manyTabTit[iii].title" min-width="100">
-                          <template slot-scope="scope">
-                            <span class="priceBox" v-text="scope.row[iii]" />
-                          </template>
-                        </el-table-column>
-                      </template>
+                    <template v-if="manyTabDate">
+                      <el-table-column v-for="(item, iii) in manyTabDate" :key="iii" align="center"
+                        :label="manyTabTit[iii].title" min-width="100">
+                        <template slot-scope="scope">
+                          <span class="priceBox" v-text="scope.row[iii]" />
+                        </template>
+                      </el-table-column>
+                    </template>
                     <el-table-column align="center" label="图片" min-width="80">
                       <template slot-scope="scope">
                         <div class="upLoadPicBox">
@@ -183,7 +187,8 @@
                         </div>
                       </template>
                     </el-table-column>
-                    <el-table-column v-for="(item,iii) in attrValue" :key="iii" :label="formThead[iii].title" align="center" min-width="100">
+                    <el-table-column v-for="(item, iii) in attrValue" :key="iii" :label="formThead[iii].title"
+                      align="center" min-width="100">
                       <template slot-scope="scope">
                         <span class="priceBox">{{ scope.row[iii] }}</span>
                       </template>
@@ -207,7 +212,12 @@
           </el-tab-pane>
           <el-tab-pane label="商品详情" name="detail">
             <div class="section">
-              <div class="contentPic" v-html="productData.content"/>
+              <el-form v-if="productData.content && productData.content.image && productData.content.image.length > 0">
+                <el-form-item label="商品图片">
+                  <el-image style="width:100px;margin-right:10px;" v-for="(item, indx) in productData.content.image"
+                    :key="indx" :src="item" :preview-src-list="productData.content.image" />
+                </el-form-item>
+              </el-form>
             </div>
           </el-tab-pane>
           <el-tab-pane label="营销信息" name="marketing">
@@ -215,11 +225,12 @@
               <ul class="list">
                 <li class="item">
                   <div class="item-title">店铺推荐：</div>
-                  <div class="value">{{productData.is_good ? '是' : '否'}}</div>
+                  <div class="value">{{ productData.is_good ? '是' : '否' }}</div>
                 </li>
                 <li class="item">
                   <div class="item-title">平台推荐：</div>
-                  <div v-if="productData.is_benefit||productData.is_new||productData.is_best||productData.is_hot" class="value">
+                  <div v-if="productData.is_benefit || productData.is_new || productData.is_best || productData.is_hot"
+                    class="value">
                     <span class="value-item" v-if="productData.is_benefit">促销单品</span>
                     <span class="value-item" v-if="productData.is_new">首发新品</span>
                     <span class="value-item" v-if="productData.is_best">精品推荐</span>
@@ -229,7 +240,7 @@
                 </li>
                 <li class="item">
                   <div class="item-title">分销礼包：</div>
-                  <div class="value">{{productData.is_gift_bag ? '是' : '否'}}</div>
+                  <div class="value">{{ productData.is_gift_bag ? '是' : '否' }}</div>
                 </li>
                 <li v-if="productData.star" class="item">
                   <div class="item-title">平台推荐星级：</div>
@@ -237,37 +248,40 @@
                     <el-rate disabled v-model="productData.star" :colors="colors"></el-rate>
                   </div>
                 </li>
-                <li v-if="productData.merchant&&productData.integral_rate!=0" class="item">
+                <li v-if="productData.merchant && productData.integral_rate != 0" class="item">
                   <div class="item-title">积分抵扣比例：</div>
-                  <div v-if="productData.integral_rate == -1&&productData.merchant" class="value">默认设置{{'('+productData.merchant.mer_integral_rate+'%)'}}</div>
-                  <div v-else-if="productData.integral_rate > 0" class="value">单独设置{{'('+productData.integral_rate+'%)'}}</div>
+                  <div v-if="productData.integral_rate == -1 && productData.merchant" class="value">
+                    默认设置{{ '(' + productData.merchant.mer_integral_rate + '%)' }}</div>
+                  <div v-else-if="productData.integral_rate > 0" class="value">
+                    单独设置{{ '(' + productData.integral_rate + '%)' }}</div>
                 </li>
-                <li v-if="productData.integral_rate!=0" class="item">
+                <li v-if="productData.integral_rate != 0" class="item">
                   <div class="item-title">积分抵扣金额：</div>
-                  <div class="value">{{productData.integral_price_total}}元</div>
+                  <div class="value">{{ productData.integral_price_total }}元</div>
                 </li>
-                <li v-if="productData.coupon&&productData.coupon.length>0" class="item">
+                <li v-if="productData.coupon && productData.coupon.length > 0" class="item">
                   <div class="item-title">优惠券(赠送券)：</div>
                   <div class="value">
-                    <span v-for="(itm,idx) in productData.coupon" :key="idx" class="value-item"> {{itm.title}} </span>
+                    <span v-for="(itm, idx) in productData.coupon" :key="idx" class="value-item"> {{ itm.title }}
+                    </span>
                   </div>
                 </li>
                 <li class="item">
                   <div class="item-title">收藏人数：</div>
                   <div class="value">
-                    <span> {{productData.care_count}}人</span>
+                    <span> {{ productData.care_count }}人</span>
                   </div>
                 </li>
                 <li class="item">
                   <div class="item-title">已售数量：</div>
                   <div class="value">
-                    <span> {{productData.ficti}} (指手动添加数量)</span>
+                    <span> {{ productData.ficti }} (指手动添加数量)</span>
                   </div>
                 </li>
                 <li class="item">
                   <div class="item-title">实际销量 ：</div>
                   <div class="value">
-                    <span> {{productData.sales-productData.ficti}} (指实际售出数量)</span>
+                    <span> {{ productData.sales - productData.ficti }} (指实际售出数量)</span>
                   </div>
                 </li>
               </ul>
@@ -278,28 +292,35 @@
               <ul class="list">
                 <li class="item">
                   <div class="item-title">支持退款：</div>
-                  <div class="value">{{productData.refund_switch ? '是' : '否'}}</div>
+                  <div class="value">{{ productData.refund_switch ? '是' : '否' }}</div>
                 </li>
                 <li class="item">
                   <div class="item-title">最少购买件数：</div>
-                  <div class="value">{{productData.once_min_count == 0 ? '不限购' : productData.once_min_count}}</div>
+                  <div class="value">{{ productData.once_min_count == 0 ? '不限购' : productData.once_min_count }}</div>
                 </li>
-                <li v-if="productData.pay_limit!=0" class="item">
+                <li v-if="productData.pay_limit != 0" class="item">
                   <div class="item-title">限购类型：</div>
-                  <div class="value">{{productData.pay_limit==1?'单次限购':'长期限购'}}{{productData.once_min_count+'('+productData.unit_name+')'}}</div>
+                  <div class="value">
+                    {{ productData.pay_limit == 1 ? '单次限购' : '长期限购' }}{{ productData.once_min_count + '(' +
+      productData.unit_name
+      + ')' }}
+                  </div>
                 </li>
-               <li v-if="productData.guarantee" class="item item100">
+                <li v-if="productData.guarantee" class="item item100">
                   <div class="item-title">保障服务：</div>
                   <div class="value" style="width: 250px;">
-                    <span>{{productData.guarantee.template_name}}</span>
-                    <div v-if="productData.guarantee.templateValue && productData.guarantee.templateValue.length>0" style="display: inline;">
-                      【<span v-for="(item,i) in productData.guarantee.templateValue" :key="i" class="value-temp">{{item.value&&item.value.guarantee_name}}</span>】
+                    <span>{{ productData.guarantee.template_name }}</span>
+                    <div v-if="productData.guarantee.templateValue && productData.guarantee.templateValue.length > 0"
+                      style="display: inline;">
+                      【<span v-for="(item, i) in productData.guarantee.templateValue" :key="i" class="value-temp">{{
+      item.value &&
+      item.value.guarantee_name }}</span>】
                     </div>
                   </div>
                 </li>
                 <li v-if="productData.refusal" class="item">
                   <div class="item-title">审核拒绝原因：</div>
-                  <div class="value">{{productData.refusal}}</div>
+                  <div class="value">{{ productData.refusal }}</div>
                 </li>
               </ul>
             </div>
@@ -308,26 +329,16 @@
                 <li class="item item100">
                   <div class="item-title">商户商品参数：</div>
                   <div class="value" style="width: 721px;">
-                    <el-table
-                      border
-                      ref="tableParameter"
-                      :data="merParams"
-                      row-key="parameter_value_id"
-                      size="small"
-                      class="ones"
-                    >
-                      <el-table-column
-                        align="center"
-                        label="参数名称"
-                        width="360"
-                      >
+                    <el-table border ref="tableParameter" :data="merParams" row-key="parameter_value_id" size="small"
+                      class="ones">
+                      <el-table-column align="center" label="参数名称" width="360">
                         <template slot-scope="scope">
-                          <span>{{scope.row.name}}</span>
+                          <span>{{ scope.row.name }}</span>
                         </template>
                       </el-table-column>
                       <el-table-column align="center" label="参数值" width="360">
                         <template slot-scope="scope">
-                          <span>{{scope.row.value}}</span>
+                          <span>{{ scope.row.value }}</span>
                         </template>
                       </el-table-column>
                     </el-table>
@@ -336,26 +347,16 @@
                 <li class="item item100">
                   <div class="item-title">平台商品参数：</div>
                   <div class="value" style="width: 721px;">
-                    <el-table
-                      border
-                      ref="tableParameter"
-                      :data="sysParams"
-                      row-key="parameter_value_id"
-                      size="small"
-                      class="ones"
-                    >
-                      <el-table-column
-                        align="center"
-                        label="参数名称"
-                        width="360"
-                      >
+                    <el-table border ref="tableParameter" :data="sysParams" row-key="parameter_value_id" size="small"
+                      class="ones">
+                      <el-table-column align="center" label="参数名称" width="360">
                         <template slot-scope="scope">
-                          <span>{{scope.row.name}}</span>
+                          <span>{{ scope.row.name }}</span>
                         </template>
                       </el-table-column>
                       <el-table-column align="center" label="参数值" width="360">
                         <template slot-scope="scope">
-                          <span>{{scope.row.value}}</span>
+                          <span>{{ scope.row.value }}</span>
                         </template>
                       </el-table-column>
                     </el-table>
@@ -364,9 +365,11 @@
                 <li class="item item100">
                   <div class="item-title">关联系统表单：</div>
                   <div v-if="!productData.mer_form_id" class="value">关闭</div>
-                  <div v-else-if="productData.mer_form_id && formData.length==0" class="value">表单已被删除</div>
-                  <div v-else-if="formData.length>0 && productData.mer_form_id && activeName=='others'" class="value" style="width: 350px;">
-                    <iframe class="iframe-box" :src="formUrl" frameborder="0" ref="iframe" style="min-height: 300px;"></iframe>
+                  <div v-else-if="productData.mer_form_id && formData.length == 0" class="value">表单已被删除</div>
+                  <div v-else-if="formData.length > 0 && productData.mer_form_id && activeName == 'others'"
+                    class="value" style="width: 350px;">
+                    <iframe class="iframe-box" :src="formUrl" frameborder="0" ref="iframe"
+                      style="min-height: 300px;"></iframe>
                     <!-- <el-table
                     border
                     class="specsList"
@@ -395,95 +398,68 @@
               <ul class="list">
                 <li class="item">
                   <div class="item-title">商户名称：</div>
-                  <div class="value">{{productData.merchant.mer_name}}</div>
+                  <div class="value">{{ productData.merchant.mer_name }}</div>
                 </li>
                 <li class="item">
                   <div class="item-title">商户类别：</div>
-                  <div class="value">{{productData.merchant.is_trader == 1 ? '自营' : '非自营'}}</div>
+                  <div class="value">{{ productData.merchant.is_trader == 1 ? '自营' : '非自营' }}</div>
                 </li>
                 <li class="item">
                   <div class="item-title">店铺类型：</div>
-                  <div class="value">{{productData.merchant.type_name}}</div>
+                  <div class="value">{{ productData.merchant.type_name }}</div>
                 </li>
               </ul>
-            </div> 
+            </div>
           </el-tab-pane>
           <el-tab-pane label="商品操作记录" name="records">
             <div class="section">
               <el-form size="small" label-width="90px">
                 <div class="acea-row">
                   <el-form-item label="操作端：">
-                    <el-select
-                      v-model="recordForm.type"
-                      placeholder="请选择"
-                      class="selWidth mr10"
-                      clearable
-                      filterable
-                      @change="getRecordData(productId)"
-                    >
+                    <el-select v-model="recordForm.type" placeholder="请选择" class="selWidth mr10" clearable filterable
+                      @change="getRecordData(productId)">
                       <el-option label="平台端" value="1" />
                       <el-option label="商户端" value="2" />
                     </el-select>
                   </el-form-item>
                   <el-form-item label="操作时间：">
-                    <el-date-picker
-                      class="selWidth"
-                      v-model="timeVal"
-                      type="datetimerange"
-                      placeholder="选择日期"
-                      value-format="yyyy/MM/dd HH:mm:ss"
-                      clearable
-                      @change="onchangeTime"
-                    >
+                    <el-date-picker class="selWidth" v-model="timeVal" type="datetimerange" placeholder="选择日期"
+                      value-format="yyyy/MM/dd HH:mm:ss" clearable @change="onchangeTime">
                     </el-date-picker>
                   </el-form-item>
                 </div>
               </el-form>
-              <el-table
-                border
-                ref="productRecords"
-                :data="recordData.data"
-                row-key="operate_log_id"
-                size="small"
-                class="ones"
-              >
-                <el-table-column
-                  align="center"
-                  label="序号"
-                  min-width="60"
-                  prop="operate_log_id"
-                />
+              <el-table border ref="productRecords" :data="recordData.data" row-key="operate_log_id" size="small"
+                class="ones">
+                <el-table-column align="center" label="序号" min-width="60" prop="operate_log_id" />
                 <el-table-column align="center" label="操作记录" min-width="120">
                   <template slot-scope="scope">
-                    <span>{{scope.row.category_name}}</span>
+                    <span>{{ scope.row.category_name }}</span>
                   </template>
                 </el-table-column>
                 <el-table-column align="center" label="操作端" min-width="100">
                   <template slot-scope="scope">
-                    <span>{{scope.row.type}}</span>
+                    <span>{{ scope.row.type }}</span>
                   </template>
                 </el-table-column>
                 <el-table-column align="center" label="操作角色" min-width="100">
                   <template slot-scope="scope">
-                    <span>{{scope.row.operator_role_nickname}}</span>
+                    <span>{{ scope.row.operator_role_nickname }}</span>
                   </template>
                 </el-table-column>
                 <el-table-column align="center" label="操作人" min-width="100">
                   <template slot-scope="scope">
-                    <span>{{scope.row.operator_nickname}}</span>
+                    <span>{{ scope.row.operator_nickname }}</span>
                   </template>
                 </el-table-column>
-                <el-table-column
-                  align="center"
-                  label="操作时间"
-                  min-width="100"
-                  prop="create_time"
-                />
+                <el-table-column align="center" label="操作时间" min-width="100" prop="create_time" />
               </el-table>
               <div class="block">
-                <el-pagination :page-size="recordForm.limit" :current-page="recordForm.page" layout="prev, pager, next, jumper" :total="recordData.total" @size-change="handleSizeChange" @current-change="pageChange" />
+                <el-pagination :page-size="recordForm.limit" :current-page="recordForm.page"
+                  layout="prev, pager, next, jumper" :total="recordData.total" @size-change="handleSizeChange"
+                  @current-change="pageChange" />
               </div>
-            </div> 
+            </div>
           </el-tab-pane>
         </el-tabs>
       </div>
@@ -609,7 +585,7 @@ export default {
   computed: {
     attrValue() {
       const obj = Object.assign({}, defaultObj.attrValue[0])
-      if(this.svip_type == 0 || this.mer_svip_status == 0)delete obj.svip_price
+      if (this.svip_type == 0 || this.mer_svip_status == 0) delete obj.svip_price
       delete obj.image
       return obj
     },
@@ -646,16 +622,16 @@ export default {
         this.formThead = Object.assign({}, this.formThead, tmp)
         this.sysParams = []
         this.merParams = []
-        if(res.data.params&&res.data.params.length>0){
-          for(var i=0;i<res.data.params.length;i++){
-            if(res.data.params[i]['mer_id'] == 0){
+        if (res.data.params && res.data.params.length > 0) {
+          for (var i = 0; i < res.data.params.length; i++) {
+            if (res.data.params[i]['mer_id'] == 0) {
               this.sysParams.push(res.data.params[i])
-            }else{
+            } else {
               this.merParams.push(res.data.params[i])
             }
           }
         }
-        if(res.data.mer_form_id)this.getFormInfo(res.data.mer_form_id,res.data.mer_id)
+        if (res.data.mer_form_id) this.getFormInfo(res.data.mer_form_id, res.data.mer_id)
         this.getRecordData(id)
         this.loading = false
       }).catch(res => {
@@ -664,16 +640,16 @@ export default {
       })
     },
     // 关联的表单信息
-    getFormInfo(id,merId){
-      associatedFormInfo(id,{mer_id:merId}).then((res) => {
+    getFormInfo(id, merId) {
+      associatedFormInfo(id, { mer_id: merId }).then((res) => {
         this.formData = res.data
         let time = new Date().getTime() * 1000
         let formUrl = `${this.baseURL}/pages/admin/system_form/index?inner_frame=1&form_id=${id}&time=${time}`;
         this.formUrl = formUrl;
       })
-      .catch((res) => {
-        this.$message.error(res.message)
-      })
+        .catch((res) => {
+          this.$message.error(res.message)
+        })
     },
     // 具体日期
     onchangeTime(e) {
@@ -682,8 +658,8 @@ export default {
       this.getRecordData(this.productData.product_id)
     },
     // 商品操作记录
-    getRecordData(id){
-      operateRecordList(id,this.recordForm)
+    getRecordData(id) {
+      operateRecordList(id, this.recordForm)
         .then(res => {
           this.recordData.data = res.data.list
           this.recordData.total = res.data.count
@@ -701,7 +677,7 @@ export default {
       this.getList('')
     },
     tabClick(tab) {
-   
+
     },
   },
 };
@@ -709,19 +685,24 @@ export default {
 <style lang="scss" scoped>
 .head {
   padding: 20px 35px;
+
   .full {
     display: flex;
     align-items: center;
+
     .order_icon {
       width: 60px;
       height: 60px;
     }
+
     .iconfont {
       color: var(--prev-color-primary);
+
       &.sale-after {
         color: #90add5;
       }
     }
+
     .text {
       align-self: center;
       flex: 1;
@@ -729,6 +710,7 @@ export default {
       padding-left: 12px;
       font-size: 13px;
       color: #606266;
+
       .title {
         margin-bottom: 10px;
         font-weight: 500;
@@ -737,24 +719,28 @@ export default {
         font-weight: bold;
         color: #282828;
       }
+
       .order-num {
         padding-top: 10px;
         white-space: nowrap;
       }
     }
   }
+
   .list {
     display: flex;
     margin-top: 20px;
     overflow: hidden;
     list-style: none;
     padding: 0;
+
     .item {
       flex: none;
       width: 20%;
       font-size: 14px;
       line-height: 14px;
-      color: rgba(0, 0, 0, 0.85);      
+      color: rgba(0, 0, 0, 0.85);
+
       .title {
         margin-bottom: 12px;
         font-size: 13px;
@@ -764,17 +750,21 @@ export default {
     }
   }
 }
-.tabNumWidth{
+
+.tabNumWidth {
   max-height: 350px;
   overflow-y: auto;
-  &:before{
+
+  &:before {
     display: none;
   }
 }
+
 .el-tabs--border-card {
   box-shadow: none;
   border-bottom: none;
 }
+
 .section {
   .title {
     margin-bottom: 20px;
@@ -782,6 +772,7 @@ export default {
     line-height: 15px;
     color: #303133;
   }
+
   .list {
     display: flex;
     flex-wrap: wrap;
@@ -789,6 +780,7 @@ export default {
     padding: 0;
     margin: 0;
   }
+
   .item {
     flex: 0 0 calc(100% / 3);
     display: flex;
@@ -796,56 +788,66 @@ export default {
     font-size: 13px;
     color: #606266;
     align-items: center;
+
     &:nth-child(3n + 1) {
       padding-right: 20px;
     }
+
     &:nth-child(3n + 2) {
       padding-right: 10px;
       padding-left: 10px;
     }
+
     &:nth-child(3n + 3) {
       padding-left: 20px;
     }
-    .item-title{
+
+    .item-title {
       width: 100px;
       text-align: right;
     }
   }
-  .item100{
+
+  .item100 {
     padding-left: 0;
     flex: 0 0 calc(100% / 1);
-    padding-left: 0!important;
+    padding-left: 0 !important;
   }
-  .contentPic{
+
+  .contentPic {
     width: 500px;
     margin: 0 auto;
     max-height: 600px;
     overflow-y: auto;
   }
- 
+
   .value {
     .value-item {
-      &::after{
+      &::after {
         content: "/";
         display: inline-block;
       }
-      &:last-child{
-        &::after{
+
+      &:last-child {
+        &::after {
           display: none;
         }
       }
     }
-    .value-temp{
-       &::after{
+
+    .value-temp {
+      &::after {
         content: "、";
         display: inline-block;
       }
-      &:last-child{
-        &::after{
+
+      &:last-child {
+        &::after {
           display: none;
         }
       }
     }
+
     image {
       display: inline-block;
       width: 40px;
@@ -855,23 +857,27 @@ export default {
     }
   }
 }
-.contentPic ::v-deep img{
+
+.contentPic ::v-deep img {
   max-width: 100%;
 }
+
 .tab {
   display: flex;
   align-items: center;
+
   .el-image {
     width: 36px;
     height: 36px;
     margin-right: 10px;
   }
 }
+
 ::v-deep .el-drawer__body {
   overflow: auto;
 }
-::v-deep .ones th{
+
+::v-deep .ones th {
   background: #F0F5FF;
 }
-
 </style>

From 43f7fd690ed0904717dc21801e274fb849371d79 Mon Sep 17 00:00:00 2001
From: "DESKTOP-GMUNQ1B\\k" <1154079537@qq.com>
Date: Fri, 29 Mar 2024 17:10:22 +0800
Subject: [PATCH 2/8] =?UTF-8?q?=E9=93=B6=E8=A1=8C=E5=8D=A1=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                         |   2 +-
 src/api/accounts.js                      |  16 +
 src/router/modules/accounts.js           |   9 +
 src/views/accounts/auditRecord/index.vue | 426 +++++++++++++++++++++++
 src/views/order/list/index.vue           |  16 +-
 5 files changed, 466 insertions(+), 3 deletions(-)
 create mode 100644 src/views/accounts/auditRecord/index.vue

diff --git a/.env.development b/.env.development
index 558b6c7..74b216c 100644
--- a/.env.development
+++ b/.env.development
@@ -4,7 +4,7 @@ ENV = 'development'
 # http://mer.crmeb.net/admin
 # base api
 # VUE_APP_BASE_API = 'http://192.168.31.106:8324'
-VUE_APP_BASE_API = 'https://crmeb-test.shop.lihaink.cn/'
+VUE_APP_BASE_API = 'https://crmeb-test.shop.lihaink.cn'
 
 # socket 连接地址
 # VUE_APP_WS_URL = 'ws://0.0.0.0:8324'
diff --git a/src/api/accounts.js b/src/api/accounts.js
index c65da2d..b345151 100644
--- a/src/api/accounts.js
+++ b/src/api/accounts.js
@@ -10,6 +10,22 @@
 import request from './request'
 
 
+/**
+ * @description 银行卡审核 -- 列表
+ */
+export function bankListApi(data) {
+  return request.get('merchant/intention/bank_list', data)
+}
+
+
+/**
+ * @description 银行卡审核 -- 审核
+ */
+export function bandAuditApi(data) {
+  return request.post('merchant/intention/deal/' + data.id, data)
+}
+
+
 /**
  * @description 资金管理 -- 列表
  */
diff --git a/src/router/modules/accounts.js b/src/router/modules/accounts.js
index c6054dd..33a49fb 100644
--- a/src/router/modules/accounts.js
+++ b/src/router/modules/accounts.js
@@ -131,6 +131,15 @@ const accountsRouter =
       },
       component: () => import('@/views/accounts/transferRecord/index')
     },
+    {
+      path: 'auditRecord',
+      name: 'bankAuditRecord',
+      meta: {
+        title: '银行卡审核',
+        noCache: true
+      },
+      component: () => import('@/views/accounts/auditRecord/index')
+    },
     {
       path: 'setting',
       name: 'AccountsTransferSetting',
diff --git a/src/views/accounts/auditRecord/index.vue b/src/views/accounts/auditRecord/index.vue
new file mode 100644
index 0000000..de0e973
--- /dev/null
+++ b/src/views/accounts/auditRecord/index.vue
@@ -0,0 +1,426 @@
+<template>
+  <div class="divBox">
+    <div class="selCard mb14">
+      <el-form :model="tableFrom" ref="searchForm" size="small" inline label-width="85px">
+        <el-form-item label="审核状态：" prop="is_check">
+          <el-select v-model="tableFrom.is_check" clearable placeholder="请选择" class="selWidth" @change="getList(1)">
+            <el-option label="全部" value="" />
+            <el-option label="待审核" value="0" />
+            <el-option label="审核通过" value="1" />
+            <el-option label="审核未通过" value="2" />
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="商户名称：" prop="mer_id">
+          <el-select v-model="tableFrom.mer_id" clearable filterable placeholder="请选择" class="selWidth"
+            @change="getList(1)">
+            <el-option v-for="item in merSelect" :key="item.mer_id" :label="item.mer_name" :value="item.mer_id" />
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="提现类型：" prop="is_own">
+          <el-select v-model="tableFrom.is_own" clearable placeholder="请选择" class="selWidth" @change="getList(1)">
+            <el-option label="对公账户" value="1" />
+            <el-option label="法人账户" value="0" />
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" size="small" @click="getList(1)">搜索</el-button>
+          <el-button size="small" @click="searchReset()">重置</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+
+    <el-card>
+      <div class="mb20">
+        <el-button size="small" type="primary" @click="exports">导出列表</el-button>
+      </div>
+      <el-table v-loading="listLoading" tooltip-effect="dark" :data="tableData.data" size="small" class="table">
+        <el-table-column label="序号" min-width="60">
+          <template scope="scope">
+            <span>{{ scope.$index + (tableFrom.page - 1) * tableFrom.limit + 1 }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="商户名称" min-width="150" prop="merchantInfo.mer_name" />
+        <el-table-column label="提现类型" min-width="150">
+          <template slot-scope="scope">
+            <span class="spBlock" v-if="scope.row.is_own === 0">法人账户</span>
+            <span class="spBlock" v-else-if="scope.row.is_own == 1">对公账户</span>
+            <span class="spBlock" v-else>-</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="账户名称" min-width="150" prop="financial_account.name" />
+        <el-table-column label="开户银行" min-width="150" prop="financial_account.bank" />
+        <el-table-column label="支行名称" min-width="150" prop="financial_account.bank_branch" />
+        <el-table-column label="银行账号" min-width="150" prop="financial_account.bank_code" />
+        <el-table-column label="手机号码" min-width="150" prop="merchantInfo.mer_phone" />
+        <el-table-column label="身份证号码" min-width="160" prop="financial_account.id_card" />
+        <el-table-column label="凭证">
+          <template slot-scope="scope">
+            <div v-if="scope.row.financial_account.financial_img" class="demo-image__preview">
+              <el-image :src="srcParse(scope.row)[0]" :preview-src-list="srcParse(scope.row)" />
+            </div>
+            <span v-else>-</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="状态" min-width="80">
+          <template slot-scope="scope">
+            <span class="spBlock">{{ scope.row.is_check === 0 ? '待审核' : scope.row.is_check == 1 ? '审核通过' : '审核未通过'
+              }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="create_time" label="申请时间" min-width="150" />
+        <el-table-column label="操作" min-width="180" fixed="right">
+          <template slot-scope="scope">
+            <el-button v-if="scope.row.is_check === 0" type="text" size="small"
+              @click="transferMark(scope.row, 1)">审核</el-button>
+            <el-button type="text" size="small" @click="transferMark(scope.row, 2)">查看</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="block">
+        <el-pagination background :page-size="tableFrom.limit" :current-page="tableFrom.page"
+          layout="total, prev, pager, next, jumper" :total="tableData.total" @size-change="handleSizeChange"
+          @current-change="pageChange" />
+      </div>
+    </el-card>
+
+    <!--审核 查看-->
+    <el-dialog :title="type == 1 ? '审核' : '查看'" :visible.sync="dialogVisible" width="700px" v-if="dialogVisible">
+      <div class="box-container">
+        <el-form ref="ruleForm" size="small" :model="auditForm">
+          <div class="section" style="padding-top:10px;">
+            <div class="title">商户信息</div>
+            <div class="list">
+              <div class="item"><label class="name">商户名称：</label>{{ transferData.merchantInfo.mer_name }}</div>
+              <div class="item"><label class="name">商户ID：</label>{{ transferData.merchantInfo.mer_id }} </div>
+              <div class="item"><label class="name">开户银行：</label>{{ transferData.financial_account.bank }}</div>
+              <div class="item"><label class="name">银行账号：</label>{{ transferData.financial_account.bank_code }}</div>
+              <div class="item"><label class="name">开户户名：</label>{{ transferData.financial_account.name }}</div>
+              <div class="item"><label class="name">开户网点：</label>{{ transferData.financial_account.bank_branch }}</div>
+              <div class="item"><label class="name">真实姓名：</label>{{ transferData.merchantInfo.real_name }}</div>
+              <div class="item"><label class="name">备注：</label>{{ transferData.fail_msg ? transferData.fail_msg : '-' }}
+              </div>
+              <div class="item" v-if="srcParse(transferData).length > 0"><label class="name">凭证：</label>
+                <el-image style="width:100px;height:100px;" :src="srcParse(transferData)[0]"
+                  :preview-src-list="srcParse(transferData)" />
+              </div>
+            </div>
+          </div>
+          <div class="section" v-if="type == 1">
+            <div class="title">审核信息</div>
+            <div class="list">
+              <el-form-item label="审核状态：" class="item" prop="status" :rules="{ required: true, message:'审核状态不能为空',trigger:'change'}">
+                <el-radio-group v-model=" auditForm.status ">
+                  <el-radio :label=" 1 " class="radio">通过</el-radio>
+                  <el-radio :label=" 2 ">拒绝</el-radio>
+                </el-radio-group>
+              </el-form-item>
+              <el-form-item label="原因：" prop="fail_msg" class="item"
+                :rules=" { required: auditForm.status == 2 ? true : false, message: '拒绝原因不能为空', trigger: 'change' } ">
+                <el-input type="textarea" v-model=" auditForm.fail_msg "></el-input>
+              </el-form-item>
+            </div>
+          </div>
+        </el-form>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="small" @click="dialogVisible = false">取消</el-button>
+        <el-button v-if=" type == 1 " type="primary" size="small" @click=" transferReview ">提交</el-button>
+      </span>
+    </el-dialog>
+
+    <!--导出订单列表-->
+    <file-list ref="exportList" />
+  </div>
+</template>
+<script>
+// +----------------------------------------------------------------------
+// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2016~2024 https://www.crmeb.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+// +----------------------------------------------------------------------
+// | Author: CRMEB Team <admin@crmeb.com>
+// +----------------------------------------------------------------------
+import { merSelectApi } from '@/api/product'
+import { bankListApi, bandAuditApi } from "@/api/accounts";
+import { transferRecordApi, transferDetailApi, transferReviewApi, transferEditApi, transferMarkApi, transferHeaderDataApi, transferRecordsExportApi } from '@/api/accounts'
+import createWorkBook from '@/utils/newToExcel.js';
+import timeOptions from '@/utils/timeOptions';
+export default {
+  data() {
+    return {
+      type: '',
+      pickerOptions: timeOptions,
+      tableData: {
+        data: [],
+        total: 0
+      },
+
+      listLoading: true,
+      voucher_image: [],
+      tableFrom: {
+        date: '',
+        page: 1,
+        limit: 20,
+        mer_id: '',
+        is_check: '',
+        is_own: '',
+      },
+      timeVal: [],
+      merSelect: [],
+      loading: false,
+      dialogVisible: false,
+      pictureUrl: '',
+      transferData: undefined,
+      auditForm: {
+        id: '',
+        status: '',
+        fail_msg: ''
+      },
+      type: '',//类型 是审核还是查看
+    }
+  },
+  mounted() {
+    this.getList(1);
+    this.getMerSelect();
+  },
+  methods: {
+
+    // 图片格式
+    srcParse(item) {
+      if (item.financial_account.financial_img && item.financial_account.financial_img.indexOf(',') > -1) {
+        return item.financial_account.financial_img.split(",");
+      } else {
+        return item.financial_account.financial_img ? [item.financial_account.financial_img] : []
+      }
+    },
+
+    /**重置 */
+    searchReset() {
+      this.timeVal = []
+      this.tableFrom.date = ""
+      this.$refs.searchForm.resetFields()
+      this.getList(1)
+    },
+
+    // 商户列表
+    getMerSelect() {
+      merSelectApi()
+        .then((res) => {
+          this.merSelect = res.data;
+        })
+        .catch((res) => {
+          this.$message.error(res.message);
+        });
+    },
+
+    // 审核
+    transferReview(id) {
+      this.$refs.ruleForm.validate(valid => {
+        if (valid) {
+          this.auditForm.id = this.transferData.id
+          bandAuditApi(this.auditForm).then(res => {
+            this.$message.success(res.message);
+            this.dialogVisible = false;
+            this.getList(1);
+          }).catch(res => {
+            this.listLoading = false;
+            this.$message.error(res.message)
+          })
+        }
+      })
+    },
+
+    // 审核 查看
+    transferMark(item, type) {
+      this.transferData = item;
+      this.dialogVisible = true;
+      this.type = type;
+    },
+
+    // 具体日期
+    onchangeTime(e) {
+      this.timeVal = e
+      this.tableFrom.date = e ? this.timeVal.join('-') : ''
+      this.getList(1)
+    },
+
+    async exports() {
+      let excelData = JSON.parse(JSON.stringify(this.tableFrom)), data = []
+      excelData.page = 1
+      let pageCount = 1
+      let lebData = {};
+      for (let i = 0; i < pageCount; i++) {
+        lebData = await this.downData(excelData)
+        pageCount = Math.ceil(lebData.count / excelData.limit)
+        if (lebData.export.length) {
+          data = data.concat(lebData.export)
+          excelData.page++
+        }
+      }
+      createWorkBook(lebData.header, lebData.title, data, lebData.foot, lebData.filename);
+      return
+    },
+    /**订单列表 */
+    downData(excelData) {
+      return new Promise((resolve, reject) => {
+        transferRecordsExportApi(excelData).then((res) => {
+          return resolve(res.data)
+        })
+      })
+    },
+
+    // 导出
+    exportRecord() {
+      transferRecordsExportApi(this.tableFrom)
+        .then((res) => {
+          /*this.$message.success(res.message)
+          this.$refs.exportList.exportFileList()*/
+          const h = this.$createElement;
+          this.$msgbox({
+            title: '提示',
+            message: h('p', null, [
+              h('span', null, '文件正在生成中，请稍后点击"'),
+              h('span', { style: 'color: teal' }, '导出记录'),
+              h('span', null, '"查看~ '),
+            ]),
+            confirmButtonText: '我知道了',
+          }).then(action => {
+
+          });
+        })
+        .catch((res) => {
+          this.$message.error(res.message)
+        })
+    },
+
+    // 导出列表
+    getExportFileList() {
+      this.$refs.exportList.exportFileList()
+    },
+
+    // 列表
+    getList(num) {
+      this.listLoading = true
+      this.tableFrom.page = num ? num : this.tableFrom.page;
+      bankListApi(this.tableFrom)
+        .then(res => {
+          this.tableData.data = res.data.list
+          this.tableData.total = res.data.count
+          this.listLoading = false
+        })
+        .catch(res => {
+          this.$message.error(res.message)
+          this.listLoading = false
+        })
+    },
+    pageChange(page) {
+      this.tableFrom.page = page
+      this.getList()
+    },
+    handleSizeChange(val) {
+      this.tableFrom.limit = val
+      this.getList()
+    },
+
+    handleClose() {
+      this.dialogLogistics = false
+    },
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.pictrue {
+  width: 60px;
+  height: 60px;
+  border: 1px dotted rgba(0, 0, 0, 0.1);
+  margin-right: 10px;
+  position: relative;
+  cursor: pointer;
+
+  img {
+    width: 100%;
+    height: 100%;
+  }
+}
+
+.btndel {
+  position: absolute;
+  z-index: 1;
+  width: 20px !important;
+  height: 20px !important;
+  left: 46px;
+  top: -4px;
+}
+
+.box-container {
+  overflow: hidden;
+  padding: 0 10px;
+}
+
+
+.section {
+  padding: 10px 0 30px;
+  border-bottom: 1px dashed #eeeeee;
+
+  &:last-child {
+    padding: 30px 0 0;
+    border-bottom: none;
+  }
+
+  .title {
+    padding-left: 10px;
+    border-left: 3px solid var(--prev-color-primary);
+    font-size: 14px;
+    line-height: 15px;
+    color: #303133;
+    font-weight: bold;
+  }
+}
+
+.box-container .list {
+  display: flex;
+  flex-wrap: wrap;
+}
+
+.box-container .item {
+  margin-top: 16px;
+  font-size: 13px;
+  display: flex;
+  flex: 0 0 calc(100% / 2);
+  color: #606266;
+}
+
+.box-container .list .info {
+  display: block;
+
+  .el-textarea {
+    margin-top: 10px;
+  }
+}
+
+.box-container .list.image {
+  margin: 20px 0;
+  position: relative;
+}
+
+.box-container .list.image img {
+  position: absolute;
+  top: -20px;
+}
+
+.box-container .list .name {
+  align-items: center;
+  display: inline-block;
+  color: #909399;
+}
+
+.pictures {
+  width: 100%;
+  max-width: 100%;
+}
+</style>
diff --git a/src/views/order/list/index.vue b/src/views/order/list/index.vue
index db60d75..701f733 100644
--- a/src/views/order/list/index.vue
+++ b/src/views/order/list/index.vue
@@ -122,10 +122,22 @@
         <el-table-column label="用户信息" min-width="130">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.native="onUserDetails(scope.row.uid)">{{ scope.row.user &&
-        scope.row.user.nickname + '/' +
-        scope.row.uid }}</el-button>
+        scope.row.user.nickname + '/' + scope.row.uid }}</el-button>
           </template>
         </el-table-column>
+
+        <el-table-column label="关联商户" min-width="80">
+          <template slot-scope="scope">
+            <span>{{ scope.row.user.merchant.mer_name ? scope.row.user.merchant.mer_name : '-' }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="订单来源" min-width="80">
+          <template slot-scope="scope">
+            <span>{{ scope.row.order_type == 2 ? '扫码付款':'平台下单' }}</span>
+          </template>
+        </el-table-column>
+
         <el-table-column label="订单类型" min-width="80">
           <template slot-scope="scope">
             <span>{{ scope.row.is_virtual == 1 ? "虚拟订单" : scope.row.order_type == 0 ? "普通订单" : "核销订单" }}</span>

From c4a05029b86e959af5028a1bfef6d76fcf6d2e3f Mon Sep 17 00:00:00 2001
From: "DESKTOP-GMUNQ1B\\k" <1154079537@qq.com>
Date: Fri, 29 Mar 2024 17:36:03 +0800
Subject: [PATCH 3/8] 111

---
 src/views/accounts/auditRecord/index.vue | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/views/accounts/auditRecord/index.vue b/src/views/accounts/auditRecord/index.vue
index de0e973..afa2b87 100644
--- a/src/views/accounts/auditRecord/index.vue
+++ b/src/views/accounts/auditRecord/index.vue
@@ -110,15 +110,16 @@
           <div class="section" v-if="type == 1">
             <div class="title">审核信息</div>
             <div class="list">
-              <el-form-item label="审核状态：" class="item" prop="status" :rules="{ required: true, message:'审核状态不能为空',trigger:'change'}">
-                <el-radio-group v-model=" auditForm.status ">
-                  <el-radio :label=" 1 " class="radio">通过</el-radio>
-                  <el-radio :label=" 2 ">拒绝</el-radio>
+              <el-form-item label="审核状态：" class="item" prop="status"
+                :rules="{ required: true, message: '审核状态不能为空', trigger: 'change' }">
+                <el-radio-group v-model="auditForm.status">
+                  <el-radio :label="1" class="radio">通过</el-radio>
+                  <el-radio :label="2">拒绝</el-radio>
                 </el-radio-group>
               </el-form-item>
               <el-form-item label="原因：" prop="fail_msg" class="item"
-                :rules=" { required: auditForm.status == 2 ? true : false, message: '拒绝原因不能为空', trigger: 'change' } ">
-                <el-input type="textarea" v-model=" auditForm.fail_msg "></el-input>
+                :rules="{ required: auditForm.status == 2 ? true : false, message: '拒绝原因不能为空', trigger: 'change' }">
+                <el-input type="textarea" v-model="auditForm.fail_msg"></el-input>
               </el-form-item>
             </div>
           </div>
@@ -126,12 +127,12 @@
       </div>
       <span slot="footer" class="dialog-footer">
         <el-button size="small" @click="dialogVisible = false">取消</el-button>
-        <el-button v-if=" type == 1 " type="primary" size="small" @click=" transferReview ">提交</el-button>
+        <el-button v-if="type == 1" type="primary" size="small" @click="transferReview">提交</el-button>
       </span>
     </el-dialog>
 
     <!--导出订单列表-->
-    <file-list ref="exportList" />
+    <!-- <file-list ref="exportList" /> -->
   </div>
 </template>
 <script>

From d7e0cc5d3825a2038b8554110aa190006d39dc18 Mon Sep 17 00:00:00 2001
From: "DESKTOP-GMUNQ1B\\k" <1154079537@qq.com>
Date: Sat, 30 Mar 2024 11:05:50 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E5=9B=BE=E7=89=87bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/accounts/auditRecord/index.vue | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/views/accounts/auditRecord/index.vue b/src/views/accounts/auditRecord/index.vue
index afa2b87..912b452 100644
--- a/src/views/accounts/auditRecord/index.vue
+++ b/src/views/accounts/auditRecord/index.vue
@@ -57,8 +57,9 @@
         <el-table-column label="身份证号码" min-width="160" prop="financial_account.id_card" />
         <el-table-column label="凭证">
           <template slot-scope="scope">
-            <div v-if="scope.row.financial_account.financial_img" class="demo-image__preview">
-              <el-image :src="srcParse(scope.row)[0]" :preview-src-list="srcParse(scope.row)" />
+            <div v-if="scope.row.financial_account.financial_img" style="display:flex;" class="demo-image__preview">
+              <el-image v-for="(item, indx) in srcParse(scope.row)" :key="indx" :src="item"
+                :preview-src-list="srcParse(scope.row)" style="margin-right:10px;" />
             </div>
             <span v-else>-</span>
           </template>
@@ -102,8 +103,8 @@
               <div class="item"><label class="name">备注：</label>{{ transferData.fail_msg ? transferData.fail_msg : '-' }}
               </div>
               <div class="item" v-if="srcParse(transferData).length > 0"><label class="name">凭证：</label>
-                <el-image style="width:100px;height:100px;" :src="srcParse(transferData)[0]"
-                  :preview-src-list="srcParse(transferData)" />
+                <el-image v-for="(item, indx) in srcParse(transferData)" :key="indx" :src="item"
+                  :preview-src-list="srcParse(transferData)" style="width:100px;height:100px;margin-right:10px;" />
               </div>
             </div>
           </div>
@@ -112,7 +113,7 @@
             <div class="list">
               <el-form-item label="审核状态：" class="item" prop="status"
                 :rules="{ required: true, message: '审核状态不能为空', trigger: 'change' }">
-                <el-radio-group v-model="auditForm.status">
+                <el-radio-group v-model="auditForm.status" @change="radioChange">
                   <el-radio :label="1" class="radio">通过</el-radio>
                   <el-radio :label="2">拒绝</el-radio>
                 </el-radio-group>
@@ -192,10 +193,11 @@ export default {
 
     // 图片格式
     srcParse(item) {
-      if (item.financial_account.financial_img && item.financial_account.financial_img.indexOf(',') > -1) {
+      if (!item) return [];
+      if (item && item.financial_account.financial_img && item.financial_account.financial_img.indexOf(',') > -1) {
         return item.financial_account.financial_img.split(",");
-      } else {
-        return item.financial_account.financial_img ? [item.financial_account.financial_img] : []
+      } else if (item && item.financial_account.financial_img) {
+        return [item.financial_account.financial_img]
       }
     },
 
@@ -218,6 +220,10 @@ export default {
         });
     },
 
+    radioChange() {
+      if (this.auditForm.status == 1) this.auditForm.fail_msg = '';
+    },
+
     // 审核
     transferReview(id) {
       this.$refs.ruleForm.validate(valid => {
@@ -237,6 +243,8 @@ export default {
 
     // 审核 查看
     transferMark(item, type) {
+      this.auditForm.status = '';
+      this.auditForm.fail_msg = '';
       this.transferData = item;
       this.dialogVisible = true;
       this.type = type;

From d4a60b893856adc5cf99ccb72312ea737b5d0dd1 Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Tue, 2 Apr 2024 15:54:35 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AF=8C=E6=96=87?=
 =?UTF-8?q?=E6=9C=AC=E8=A7=86=E9=A2=91=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/videoCloud.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/utils/videoCloud.js b/src/utils/videoCloud.js
index fdf09a5..5c425a8 100644
--- a/src/utils/videoCloud.js
+++ b/src/utils/videoCloud.js
@@ -209,7 +209,7 @@ export default {
     }
     const filename = new Date().getTime() + suffix
     const formData = new FormData()
-    const data = res.data
+    const data = res
     // 注意formData里append添加的键的大小写
     formData.append('key', filename) // 存储在oss的文件路径
     formData.append('OSSAccessKeyId', data.accessid) // accessKeyId
@@ -219,14 +219,14 @@ export default {
     formData.append('file', fileObject)
     formData.append('success_action_status', 200) // 成功后返回的操作码
     const url = data.host
-    const fileUrl = url + '/' + filename
+    const fileUrl = url + '/def/' + filename
     videoIng(true, 100)
     return new Promise((resolve, reject) => {
       axios.defaults.withCredentials = false
       axios.post(url, formData).then(() => {
         // that.progress = 0;
         videoIng(false, 0)
-        resolve({ url: data.cdn ? data.cdn + '/' + filename : fileUrl })
+        resolve({ url: data.cdn ? data.cdn + '/def/' + filename : fileUrl })
       }).catch(res => {
         reject({ msg: res })
       })

From 9582f1eecf9540491b4983f19bad987330f1aa75 Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Wed, 3 Apr 2024 09:30:33 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BA=97=E9=93=BA?=
 =?UTF-8?q?=E7=BB=8F=E8=90=A5=E7=B1=BB=E5=9E=8B=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/merchant/list/index.vue | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/src/views/merchant/list/index.vue b/src/views/merchant/list/index.vue
index 9285503..ca9fcee 100644
--- a/src/views/merchant/list/index.vue
+++ b/src/views/merchant/list/index.vue
@@ -23,6 +23,11 @@
             <el-option v-for="item in storeType" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
         </el-form-item>
+        <el-form-item label="经营类型：" prop="business_type">
+          <el-select v-model="tableFrom.business_type" clearable placeholder="请选择" class="selWidth" @change="getList(1)">
+            <el-option v-for="item in businessType" :key="item.value" :label="item.label" :value="item.value" />
+          </el-select>
+        </el-form-item>
         <el-form-item label="是否推荐：" prop="is_best">
           <el-select v-model="tableFrom.is_best" clearable placeholder="请选择" class="selWidth" @change="getList(1)">
             <el-option key="1" label="是" value="1" />
@@ -139,6 +144,20 @@ export default {
       listLoading: true,
       merCateList: [],
       storeType: [],
+      businessType: [
+        {
+          "label": "零售商户",
+          "value": 0
+        },
+        {
+          "label": "批发商户",
+          "value": 1
+        },
+        {
+          "label": "批发零售商户",
+          "value": 2
+        },
+      ],
       headeNum: [
         {
           count: '',
@@ -164,6 +183,7 @@ export default {
         is_trader: "",
         is_best: "",
         category_id: '',
+        business_type: '',
         type_id: ""
       },
       autoUpdate: true,

From db58cbaea5fedbcf0ee7fa81b4f44420166380a3 Mon Sep 17 00:00:00 2001
From: "DESKTOP-GMUNQ1B\\k" <1154079537@qq.com>
Date: Wed, 3 Apr 2024 09:33:51 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E5=8F=96=E6=B6=88=E9=93=B6=E8=A1=8C?=
 =?UTF-8?q?=E5=8D=A1=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/accounts/auditRecord/index.vue | 38 +++++++++----
 src/views/merchant/application/index.vue | 70 +-----------------------
 2 files changed, 28 insertions(+), 80 deletions(-)

diff --git a/src/views/accounts/auditRecord/index.vue b/src/views/accounts/auditRecord/index.vue
index 912b452..8b73842 100644
--- a/src/views/accounts/auditRecord/index.vue
+++ b/src/views/accounts/auditRecord/index.vue
@@ -54,7 +54,12 @@
         <el-table-column label="支行名称" min-width="150" prop="financial_account.bank_branch" />
         <el-table-column label="银行账号" min-width="150" prop="financial_account.bank_code" />
         <el-table-column label="手机号码" min-width="150" prop="merchantInfo.mer_phone" />
-        <el-table-column label="身份证号码" min-width="160" prop="financial_account.id_card" />
+        <el-table-column label="身份证号码" min-width="160" prop="financial_account.id_card">
+          <template slot-scope="scope">
+            <span class="spBlock">{{ scope.row.financial_account.id_card ? scope.row.financial_account.id_card : '-'
+              }}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="凭证">
           <template slot-scope="scope">
             <div v-if="scope.row.financial_account.financial_img" style="display:flex;" class="demo-image__preview">
@@ -93,16 +98,24 @@
           <div class="section" style="padding-top:10px;">
             <div class="title">商户信息</div>
             <div class="list">
-              <div class="item"><label class="name">商户名称：</label>{{ transferData.merchantInfo.mer_name }}</div>
+              <div class="item"><label class="name">商户名称：</label><input placeholder="请输入商户名称"
+                  :disabled="type == 1 ? false : true" v-model="transferData.merchantInfo.mer_name"></div>
               <div class="item"><label class="name">商户ID：</label>{{ transferData.merchantInfo.mer_id }} </div>
-              <div class="item"><label class="name">开户银行：</label>{{ transferData.financial_account.bank }}</div>
-              <div class="item"><label class="name">银行账号：</label>{{ transferData.financial_account.bank_code }}</div>
-              <div class="item"><label class="name">开户户名：</label>{{ transferData.financial_account.name }}</div>
-              <div class="item"><label class="name">开户网点：</label>{{ transferData.financial_account.bank_branch }}</div>
-              <div class="item"><label class="name">真实姓名：</label>{{ transferData.merchantInfo.real_name }}</div>
+              <div class="item"><label class="name">开户银行：</label><input placeholder="请输入开户银行"
+                  :disabled="type == 1 ? false : true" v-model="transferData.financial_account.bank"></div>
+              <div class="item"><label class="name">银行账号：</label><input placeholder="请输入银行账号"
+                  :disabled="type == 1 ? false : true" v-model="transferData.financial_account.bank_code" /> </div>
+              <div class="item"><label class="name">开户户名：</label><input placeholder="请输入开户户名"
+                  v-model="transferData.financial_account.name" :disabled="type == 1 ? false : true" />
+              </div>
+              <div class="item"><label class="name">开户网点：</label><input placeholder="请输入开户网点"
+                  v-model="transferData.financial_account.bank_branch" :disabled="type == 1 ? false : true" /> </div>
+              <div class="item"><label class="name">真实姓名：</label><input placeholder="请输入真实姓名"
+                  v-model="transferData.merchantInfo.real_name" :disabled="type == 1 ? false : true" />
+              </div>
               <div class="item"><label class="name">备注：</label>{{ transferData.fail_msg ? transferData.fail_msg : '-' }}
               </div>
-              <div class="item" v-if="srcParse(transferData).length > 0"><label class="name">凭证：</label>
+              <div class="item" v-if="transferData.financial_account.financial_img"><label class="name">凭证：</label>
                 <el-image v-for="(item, indx) in srcParse(transferData)" :key="indx" :src="item"
                   :preview-src-list="srcParse(transferData)" style="width:100px;height:100px;margin-right:10px;" />
               </div>
@@ -194,9 +207,10 @@ export default {
     // 图片格式
     srcParse(item) {
       if (!item) return [];
-      if (item && item.financial_account.financial_img && item.financial_account.financial_img.indexOf(',') > -1) {
+      if (!item.financial_account.financial_img) return [];
+      if (item.financial_account.financial_img.indexOf(',') > -1) {
         return item.financial_account.financial_img.split(",");
-      } else if (item && item.financial_account.financial_img) {
+      } else {
         return [item.financial_account.financial_img]
       }
     },
@@ -229,6 +243,7 @@ export default {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
           this.auditForm.id = this.transferData.id
+          this.auditForm.financial_account = this.transferData.financial_account;
           bandAuditApi(this.auditForm).then(res => {
             this.$message.success(res.message);
             this.dialogVisible = false;
@@ -243,9 +258,10 @@ export default {
 
     // 审核 查看
     transferMark(item, type) {
+      console.log(item)
+      this.transferData = JSON.parse(JSON.stringify(item));
       this.auditForm.status = '';
       this.auditForm.fail_msg = '';
-      this.transferData = item;
       this.dialogVisible = true;
       this.type = type;
     },
diff --git a/src/views/merchant/application/index.vue b/src/views/merchant/application/index.vue
index 857ef92..a5f3837 100644
--- a/src/views/merchant/application/index.vue
+++ b/src/views/merchant/application/index.vue
@@ -172,23 +172,7 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="12">
-            <el-form-item :label="statusAuditForm.is_company == 1 ? '对公账号：' : '银行卡号：'">
-              <el-input readony :value="statusAuditForm.bank_code" />
-            </el-form-item>
-          </el-col>
 
-          <el-col :span="12">
-            <el-form-item label="开户银行：">
-              <el-input readony :value="statusAuditForm.bank_username" />
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="开户网点：">
-              <el-input readony :value="statusAuditForm.bank_opening" />
-            </el-form-item>
-          </el-col>
 
           <el-col :span="24">
             <el-form-item label="资质：">
@@ -200,16 +184,6 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="24" v-if="statusAuditForm.is_company == 0">
-            <el-form-item label="银行卡照片：">
-              <div class="demo-image__preview">
-                <el-image style="width: 80px;height: 60px;margin-right: 10px;"
-                  v-for="(ii, index) in statusAuditForm.bank_img" :key="index" :src="ii" class="preview"
-                  :preview-src-list="[ii]" />
-              </div>
-            </el-form-item>
-          </el-col>
-
           <el-col :span="24">
             <el-form-item label="备注：">
               <el-input readony :value="statusAuditForm.mark" />
@@ -292,23 +266,7 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="12">
-            <el-form-item :label="statusAuditForm.is_company == 1 ? '对公账号：' : '银行卡号：'">
-              <el-input readony :value="statusAuditForm.bank_code" />
-            </el-form-item>
-          </el-col>
 
-          <el-col :span="12">
-            <el-form-item label="开户银行：">
-              <el-input readony :value="statusAuditForm.bank_username" />
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="开户网点：">
-              <el-input readony :value="statusAuditForm.bank_opening" />
-            </el-form-item>
-          </el-col>
 
           <el-col :span="24">
             <el-form-item label="资质：">
@@ -320,15 +278,7 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="24" v-if="statusAuditForm.is_company == 0">
-            <el-form-item label="银行卡照片：">
-              <div class="demo-image__preview">
-                <el-image style="width: 80px;height: 60px;margin-right: 10px;"
-                  v-for="(ii, index) in statusAuditForm.bank_img" :key="index" :src="ii" class="preview"
-                  :preview-src-list="[ii]" />
-              </div>
-            </el-form-item>
-          </el-col>
+
 
           <el-col :span="24">
             <el-form-item label="备注：">
@@ -495,15 +445,6 @@ export default {
     // 修改状态
     onchangeIsShow(item) {
       this.statusAuditVisible = true;
-      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;
-        if (bi.bank_front[0]) {
-          this.$set(item, 'bank_img', bi.bank_front);
-        }
-      }
       this.statusAuditForm = item;
       this.$set(this.statusAuditForm, 'state', 1);
       this.$set(this.statusAuditForm, 'create_mer', 1);
@@ -539,15 +480,6 @@ export default {
     handleView(item) {
       console.log(item)
       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;
-        if (bi.bank_front[0]) {
-          this.$set(item, 'bank_img', bi.bank_front);
-        }
-      }
       this.formShow = true;
     },
 

From f06b44b41e8d1a423602bb19c8091282226fdeae Mon Sep 17 00:00:00 2001
From: "DESKTOP-GMUNQ1B\\k" <1154079537@qq.com>
Date: Wed, 3 Apr 2024 17:53:11 +0800
Subject: [PATCH 8/8] 1

---
 src/api/accounts.js                           |   8 ++
 src/views/accounts/auditRecord/index.vue      | 132 ++++++++++--------
 .../merchant/list/handle/merEditForm.vue      |   9 ++
 3 files changed, 92 insertions(+), 57 deletions(-)

diff --git a/src/api/accounts.js b/src/api/accounts.js
index b345151..8021034 100644
--- a/src/api/accounts.js
+++ b/src/api/accounts.js
@@ -10,6 +10,14 @@
 import request from './request'
 
 
+/**
+ * @description 银行卡审核 -- 修改 /sys/merchant/intention/edit/155
+ */
+export function editApi(data) {
+  return request.post('merchant/intention/edit/' + data.id, data)
+}
+
+
 /**
  * @description 银行卡审核 -- 列表
  */
diff --git a/src/views/accounts/auditRecord/index.vue b/src/views/accounts/auditRecord/index.vue
index 8b73842..bf848ab 100644
--- a/src/views/accounts/auditRecord/index.vue
+++ b/src/views/accounts/auditRecord/index.vue
@@ -80,7 +80,8 @@
           <template slot-scope="scope">
             <el-button v-if="scope.row.is_check === 0" type="text" size="small"
               @click="transferMark(scope.row, 1)">审核</el-button>
-            <el-button type="text" size="small" @click="transferMark(scope.row, 2)">查看</el-button>
+            <el-button type="text" size="small" @click="transferMark(scope.row, 2)">修改</el-button>
+            <el-button type="text" size="small" @click="transferMark(scope.row, 3)">查看</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -92,56 +93,60 @@
     </el-card>
 
     <!--审核 查看-->
-    <el-dialog :title="type == 1 ? '审核' : '查看'" :visible.sync="dialogVisible" width="700px" v-if="dialogVisible">
-      <div class="box-container">
-        <el-form ref="ruleForm" size="small" :model="auditForm">
-          <div class="section" style="padding-top:10px;">
-            <div class="title">商户信息</div>
-            <div class="list">
-              <div class="item"><label class="name">商户名称：</label><input placeholder="请输入商户名称"
-                  :disabled="type == 1 ? false : true" v-model="transferData.merchantInfo.mer_name"></div>
-              <div class="item"><label class="name">商户ID：</label>{{ transferData.merchantInfo.mer_id }} </div>
-              <div class="item"><label class="name">开户银行：</label><input placeholder="请输入开户银行"
-                  :disabled="type == 1 ? false : true" v-model="transferData.financial_account.bank"></div>
-              <div class="item"><label class="name">银行账号：</label><input placeholder="请输入银行账号"
-                  :disabled="type == 1 ? false : true" v-model="transferData.financial_account.bank_code" /> </div>
-              <div class="item"><label class="name">开户户名：</label><input placeholder="请输入开户户名"
-                  v-model="transferData.financial_account.name" :disabled="type == 1 ? false : true" />
-              </div>
-              <div class="item"><label class="name">开户网点：</label><input placeholder="请输入开户网点"
-                  v-model="transferData.financial_account.bank_branch" :disabled="type == 1 ? false : true" /> </div>
-              <div class="item"><label class="name">真实姓名：</label><input placeholder="请输入真实姓名"
-                  v-model="transferData.merchantInfo.real_name" :disabled="type == 1 ? false : true" />
-              </div>
-              <div class="item"><label class="name">备注：</label>{{ transferData.fail_msg ? transferData.fail_msg : '-' }}
-              </div>
-              <div class="item" v-if="transferData.financial_account.financial_img"><label class="name">凭证：</label>
-                <el-image v-for="(item, indx) in srcParse(transferData)" :key="indx" :src="item"
-                  :preview-src-list="srcParse(transferData)" style="width:100px;height:100px;margin-right:10px;" />
-              </div>
-            </div>
-          </div>
-          <div class="section" v-if="type == 1">
-            <div class="title">审核信息</div>
-            <div class="list">
-              <el-form-item label="审核状态：" class="item" prop="status"
-                :rules="{ required: true, message: '审核状态不能为空', trigger: 'change' }">
-                <el-radio-group v-model="auditForm.status" @change="radioChange">
-                  <el-radio :label="1" class="radio">通过</el-radio>
-                  <el-radio :label="2">拒绝</el-radio>
-                </el-radio-group>
-              </el-form-item>
-              <el-form-item label="原因：" prop="fail_msg" class="item"
-                :rules="{ required: auditForm.status == 2 ? true : false, message: '拒绝原因不能为空', trigger: 'change' }">
-                <el-input type="textarea" v-model="auditForm.fail_msg"></el-input>
-              </el-form-item>
-            </div>
-          </div>
-        </el-form>
-      </div>
+    <el-dialog :title="title" :visible.sync="dialogVisible" width="860px" v-if="dialogVisible">
+      <el-form ref="ruleForm" :model="auditForm" label-width="90px" class="box-container">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="审核状态：" prop="status"
+              :rules="{ required:  (auditForm.status == 2 && title == '审核') , message: '审核状态不能为空', trigger: 'change' }">
+              <el-radio-group v-model="auditForm.status" @change="radioChange" :disabled="(title == '查看' || title == '修改')">
+                <el-radio :label="1" class="radio">通过</el-radio>
+                <el-radio :label="2">拒绝</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="24">
+            <el-form-item label="原因：" prop="fail_msg"
+              :rules="{ required: (auditForm.status == 2 && title == '审核') ? true : false, message: '拒绝原因不能为空', trigger: 'change' }">
+              <el-input type="textarea" v-model="auditForm.fail_msg" :rows="3" :disabled="title == '查看' || title == '修改'"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="商户名称：">
+              <el-input v-model="transferData.merchantInfo.mer_name" placeholder="请输入商户名称" :disabled="title == '查看'"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="开户银行：">
+              <el-input v-model="transferData.financial_account.bank" placeholder="请输入开户银行" :disabled="title == '查看'"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="银行账号：">
+              <el-input v-model="transferData.financial_account.bank_code" placeholder="请输入银行账号" :disabled="title == '查看'"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="开户户名：">
+              <el-input v-model="transferData.financial_account.name" placeholder="请输入开户户名" :disabled="title == '查看'"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="开户网点：">
+              <el-input v-model="transferData.financial_account.bank_branch" placeholder="请输入开户网点" :disabled="title == '查看'"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button size="small" @click="dialogVisible = false">取消</el-button>
-        <el-button v-if="type == 1" type="primary" size="small" @click="transferReview">提交</el-button>
+        <el-button v-if="title != '查看'" type="primary" size="small" @click="transferReview">提交</el-button>
       </span>
     </el-dialog>
 
@@ -160,7 +165,7 @@
 // | Author: CRMEB Team <admin@crmeb.com>
 // +----------------------------------------------------------------------
 import { merSelectApi } from '@/api/product'
-import { bankListApi, bandAuditApi } from "@/api/accounts";
+import { bankListApi, bandAuditApi ,editApi} from "@/api/accounts";
 import { transferRecordApi, transferDetailApi, transferReviewApi, transferEditApi, transferMarkApi, transferHeaderDataApi, transferRecordsExportApi } from '@/api/accounts'
 import createWorkBook from '@/utils/newToExcel.js';
 import timeOptions from '@/utils/timeOptions';
@@ -195,7 +200,7 @@ export default {
         status: '',
         fail_msg: ''
       },
-      type: '',//类型 是审核还是查看
+      title: '',//类型 是审核还是查看
     }
   },
   mounted() {
@@ -242,8 +247,18 @@ export default {
     transferReview(id) {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
-          this.auditForm.id = this.transferData.id
+          this.auditForm.id = this.transferData.id;
           this.auditForm.financial_account = this.transferData.financial_account;
+          if(this.title == '修改') {
+            editApi(this.auditForm).then(res=>{
+              this.$message.success(res.message);
+            this.dialogVisible = false;
+            this.getList(1);
+            }).catch(res => {
+            this.listLoading = false;
+            this.$message.error(res.message)
+          })
+          } else {
           bandAuditApi(this.auditForm).then(res => {
             this.$message.success(res.message);
             this.dialogVisible = false;
@@ -252,18 +267,22 @@ export default {
             this.listLoading = false;
             this.$message.error(res.message)
           })
+          }
         }
       })
     },
 
     // 审核 查看
     transferMark(item, type) {
-      console.log(item)
       this.transferData = JSON.parse(JSON.stringify(item));
-      this.auditForm.status = '';
-      this.auditForm.fail_msg = '';
+      this.auditForm.status = item.is_check;
+      this.auditForm.fail_msg = item.fail_msg;
       this.dialogVisible = true;
-      this.type = type;
+
+      if (type == 1) this.title = '审核';
+      if (type == 2) this.title = '修改';
+      if (type == 3) this.title = '查看';
+
     },
 
     // 具体日期
@@ -387,7 +406,6 @@ export default {
   padding: 0 10px;
 }
 
-
 .section {
   padding: 10px 0 30px;
   border-bottom: 1px dashed #eeeeee;
diff --git a/src/views/merchant/list/handle/merEditForm.vue b/src/views/merchant/list/handle/merEditForm.vue
index 4a3fe60..e0fd990 100644
--- a/src/views/merchant/list/handle/merEditForm.vue
+++ b/src/views/merchant/list/handle/merEditForm.vue
@@ -94,6 +94,15 @@
           </el-row>
 
           <el-row>
+            <el-col :span="12">
+              <el-form-item label="批发类型：" prop="wholesale">
+                <el-select v-model="merData.wholesale" placeholder="请选择批发类型" class="selWidth">
+                  <el-option label="仅零售" :value="0"></el-option>
+                  <el-option label="仅批发" :value="1"></el-option>
+                  <el-option label="零售+批发" :value="2"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
             <el-col :span="12">
               <el-form-item label="备注：" prop="mark">
                 <el-input type="textarea" size="small" v-model="merData.mark" placeholder="请填写备注" class="selWidth" />