From c11af6126603544dace0b19de519fd66509f775e Mon Sep 17 00:00:00 2001
From: 15820893422 <1978476055@qq.com>
Date: Fri, 26 Apr 2024 10:01:07 +0800
Subject: [PATCH] edit

---
 .../systemForm/setSystem/modifyStoreInfo.vue  | 56 ++++++++-----------
 1 file changed, 24 insertions(+), 32 deletions(-)

diff --git a/src/views/systemForm/setSystem/modifyStoreInfo.vue b/src/views/systemForm/setSystem/modifyStoreInfo.vue
index dac154d..287762a 100644
--- a/src/views/systemForm/setSystem/modifyStoreInfo.vue
+++ b/src/views/systemForm/setSystem/modifyStoreInfo.vue
@@ -126,17 +126,7 @@
               <span class="basic-label">店铺保证金：</span>
               <span class="margin_price">{{ marginNumber }}元</span>
               <div class="margin_count">
-                <span class="mr10 spanBtn" @click="viewRecords">查看转账记录</span>
-                <!--保证金弹窗-->
-                <div class="margin_modal" @mouseleave="supplyPay=false">
-                  <div>
-                    <img src="@/assets/images/margin03.png">
-                    <div class="alic">
-                      <span class="text_g">剩余保证金￥{{ marginNumber }}元</span>
-                      <el-button v-if="merData.margin>0" type="primary" size="small" @click="applyReturn">申请退回保证金</el-button>
-                    </div>
-                  </div>
-                </div>
+                <span class="mr10 spanBtn" @click="viewRecords('mer_margin')">查看转账记录</span>
               </div>
               <div v-if="merData.marginStatus" style="display: inline-block;">
                 <div class="margin_count" @mouseenter="getCode('all')">
@@ -162,16 +152,7 @@
               <span class="basic-label">技术服务费：</span>
               <span class="margin_price">{{ serviceNumber }}元</span>
               <div class="margin_count">
-                <span class="mr10 spanBtn" @click="viewRecords">查看转账记录</span>
-                <!--保证金弹窗-->
-                <div class="margin_modal" @mouseleave="supplyPay=false">
-                  <div>
-                    <img src="@/assets/images/margin03.png">
-                    <div class="alic">
-                      <span class="text_g">剩余技术服务费￥{{ serviceNumber }}元</span>
-                    </div>
-                  </div>
-                </div>
+                <span class="mr10 spanBtn" @click="viewRecords('mer_service')">查看转账记录</span>
               </div>
               <div v-if="merData.serviceStatus" style="display: inline-block;">
                 <div class="margin_count" @mouseenter="getCode('all')">
@@ -197,16 +178,16 @@
               <span class="basic-label">上架费：</span>
               <span class="margin_price">{{ goodsNumber }}元</span>
               <div class="margin_count">
-                <span class="mr10 spanBtn" @click="viewRecords">查看转账记录</span>
+                <span class="mr10 spanBtn" @click="viewRecords('mer_goods')">查看转账记录</span>
                 <!--保证金弹窗-->
-                <div class="margin_modal" @mouseleave="supplyPay=false">
+                <!-- <div class="margin_modal" @mouseleave="supplyPay=false">
                   <div>
                     <img src="@/assets/images/margin03.png">
                     <div class="alic">
                       <span class="text_g">剩余上架费￥{{ goodsNumber }}元</span>
                     </div>
                   </div>
-                </div>
+                </div> -->
               </div>
               <div v-if="merData.goodsStatus" style="display: inline-block;">
                 <div class="margin_count" @mouseenter="getCode('all')">
@@ -231,7 +212,7 @@
               <span class="basic-label">店铺保证金：</span>
               <span class="margin_price">{{ merData.margin }}元</span>
               <div class="margin_count">
-                <span class="mr10 spanBtn" @click="viewRecords">查看转账记录</span>
+                <span class="mr10 spanBtn" @click="viewRecords('mer_margin')">查看转账记录</span>
                 <!--保证金弹窗-->
                 <div class="margin_modal" @mouseleave="goPay=false">
                   <div>
@@ -539,7 +520,16 @@
           </template>
         </el-table-column>
         <el-table-column prop="balance" label="保证金结余" min-width="100" />
-        <el-table-column label="备注" min-width="150" prop="mark" />
+        <el-table-column label="缴费截图" min-width="90" prop="image">
+          <template scope="scope">
+            <el-image 
+              v-if="scope.row.image"
+              style="width: 30px; height: 30px"
+              :src="scope.row.image" 
+              :preview-src-list="[scope.row.image]">
+            </el-image>
+          </template>
+        </el-table-column>
         <el-table-column prop="create_time" label="操作时间" min-width="120" />
       </el-table>
       <div class="acea-row row-right page">
@@ -581,7 +571,7 @@
         <el-table-column prop="pay_price" label="支付金额" min-width="60"></el-table-column>
         <el-table-column prop="type" label="缴费类型" min-width="60">
           <template scope="scope">
-            <span>{{scope.row.type == 10?'保证金':scope.row.type == 30?'上架费':'技术服务费'}}</span>
+            <span>{{scope.row.type == 10?'保证金':scope.row.type == 30?'技术服务费':'上架费'}}</span>
           </template>
         </el-table-column>
         <el-table-column prop="status" label="缴费状态" min-width="80">
@@ -715,7 +705,8 @@ export default {
       goPay: false,
       tableFrom: {
         page: 1,
-        limit: 20
+        limit: 20,
+        category:''
       },
       tableData: {
         total: 0,
@@ -1055,8 +1046,9 @@ export default {
       })
     },
     // 查看保证金记录
-    viewRecords() {
-      this.tableFrom.page = 1
+    viewRecords(category) {
+      this.tableFrom.page = 1,
+      this.tableFrom.category = category
       this.modalRecord = true
       this.getRecordList()
     },
@@ -1089,11 +1081,11 @@ export default {
     },
     pageOffChange(page) {
       this.tableFrom.page = page
-      this.getRecordList()
+      this.getOffRecordList()
     },
     handleOffSizeChange(val) {
       this.tableFrom.limit = val
-      this.getRecordList()
+      this.getOffRecordList()
     },
     // 申请退回保证金
     applyReturn() {