From f60ea4c0783bf6cf6cf04ae2714c8d12e5ce9fdb Mon Sep 17 00:00:00 2001
From: 15820893422 <1978476055@qq.com>
Date: Sun, 7 Apr 2024 20:06:43 +0800
Subject: [PATCH] add

---
 src/views/product/addProduct/index.vue        | 146 +++++++++++-------
 src/views/product/productList/proDetails.vue  |   8 +-
 .../systemForm/setSystem/modifyStoreInfo.vue  | 137 +++++++++-------
 3 files changed, 169 insertions(+), 122 deletions(-)

diff --git a/src/views/product/addProduct/index.vue b/src/views/product/addProduct/index.vue
index b5956a9..47b0e5f 100644
--- a/src/views/product/addProduct/index.vue
+++ b/src/views/product/addProduct/index.vue
@@ -52,6 +52,7 @@
                 placeholder="请输入商品名称"
                 size="small"
                 class="pageWidth"
+                :disabled='virStatus'
               />
             </el-form-item>
           </el-col>
@@ -85,11 +86,12 @@
                 :props="props"
                 filterable
                 clearable
+                :disabled='virStatus'
                 @visible-change="getSpecsLst"
               />
             </el-form-item>
           </el-col>
-          <el-col :span="24">
+          <!-- <el-col :span="24">
             <el-form-item label="商户商品分类：">
               <el-cascader
                 v-model="formValidate.mer_cate_id"
@@ -101,8 +103,8 @@
                 clearable
               />
             </el-form-item>
-          </el-col>
-          <el-col v-if="labelList.length" :span="24">
+          </el-col> -->
+          <!-- <el-col v-if="labelList.length" :span="24">
             <el-form-item label="商品标签：">
               <el-select
                 v-model="formValidate.mer_labels"
@@ -119,8 +121,8 @@
                 />
               </el-select>
             </el-form-item>
-          </el-col>
-          <el-col v-bind="grid2">
+          </el-col> -->
+          <!-- <el-col v-bind="grid2">
             <el-form-item label="品牌选择：">
               <el-select
                 v-model="formValidate.brand_id"
@@ -137,7 +139,7 @@
                 />
               </el-select>
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="24">
             <el-form-item label="商品封面图：" prop="image">
               <div
@@ -267,7 +269,7 @@
               />
             </el-form-item>
           </el-col>
-
+<!-- 
           <el-col :span="24">
             <el-form-item label="优惠券（赠送券）：" class="proCoupon">
               <div class="acea-row">
@@ -287,7 +289,7 @@
                 >选择优惠券</el-button>
               </div>
             </el-form-item>
-          </el-col>
+          </el-col> -->
         </el-row>
         <!-- 资质详情 -->
         <el-row v-if="currentTab == '2'" :gutter="24">
@@ -355,18 +357,18 @@
                       <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
                         <i class="el-icon-zoom-in" />
                       </span>
-                      <span class="el-upload-list__item-delete" @click="onRemoveHandler(file,'businessList')">
+                      <span v-if="!virStatus" class="el-upload-list__item-delete" @click="onRemoveHandler(file,'businessList')">
                         <i class="el-icon-delete" />
                       </span>
                     </span>
                   </div>
-                  <el-button size="small" type="primary">点击上传</el-button>
+                  <el-button :disabled='virStatus' size="small" type="primary">点击上传</el-button>
                   <!-- <div slot="tip" class="el-upload__tip">只能上传图片和PDF文件</div> -->
                 </el-upload>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="许可证：" prop="qualification.licenceList">
+              <el-form-item label="生产许可证：" prop="qualification.licenceList">
                 <el-upload
                   class="upload-demo"
                   ref="licenceList"
@@ -394,12 +396,12 @@
                       <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
                         <i class="el-icon-zoom-in" />
                       </span>
-                      <span class="el-upload-list__item-delete" @click="onRemoveHandler(file,'licenceList')">
+                      <span v-if="!virStatus" class="el-upload-list__item-delete" @click="onRemoveHandler(file,'licenceList')">
                         <i class="el-icon-delete" />
                       </span>
                     </span>
                   </div>
-                  <el-button size="small" type="primary">点击上传</el-button>
+                  <el-button :disabled='virStatus' size="small" type="primary">点击上传</el-button>
                   <!-- <div slot="tip" class="el-upload__tip">只能上传图片和PDF文件</div> -->
                 </el-upload>
               </el-form-item>
@@ -433,18 +435,18 @@
                       <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
                         <i class="el-icon-zoom-in" />
                       </span>
-                      <span class="el-upload-list__item-delete" @click="onRemoveHandler(file,'trademarkList')">
+                      <span v-if="!virStatus" class="el-upload-list__item-delete" @click="onRemoveHandler(file,'trademarkList')">
                         <i class="el-icon-delete" />
                       </span>
                     </span>
                   </div>
-                  <el-button size="small" type="primary">点击上传</el-button>
+                  <el-button :disabled='virStatus' size="small" type="primary">点击上传</el-button>
                   <!-- <div slot="tip" class="el-upload__tip">只能上传图片和PDF文件</div> -->
                 </el-upload>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="销售授权及其他：" prop="qualification.authorizedList">
+              <el-form-item label="销售授权及品牌方营业执照：" prop="qualification.authorizedList">
                 <el-upload
                   class="upload-demo"
                   :action="filePdf"
@@ -471,19 +473,19 @@
                       <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
                         <i class="el-icon-zoom-in" />
                       </span>
-                      <span class="el-upload-list__item-delete" @click="onRemoveHandler(file,'authorizedList')">
+                      <span v-if="!virStatus" class="el-upload-list__item-delete" @click="onRemoveHandler(file,'authorizedList')">
                         <i class="el-icon-delete" />
                       </span>
                     </span>
                   </div>
-                  <el-button size="small" type="primary">点击上传</el-button>
+                  <el-button :disabled='virStatus' size="small" type="primary">点击上传</el-button>
                   <!-- <div slot="tip" class="el-upload__tip">只能上传图片和PDF文件</div> -->
                 </el-upload>
               </el-form-item>
             </el-col>
             <div>产品资质</div>
             <el-col :span="24">
-              <el-form-item label="商品检测报告：" prop="qualification.commodityList">
+              <el-form-item label="商品检测报告及备案：" prop="qualification.commodityList">
                 <el-upload
                   class="upload-demo"
                   :action="filePdf"
@@ -510,18 +512,18 @@
                       <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
                         <i class="el-icon-zoom-in" />
                       </span>
-                      <span class="el-upload-list__item-delete" @click="onRemoveHandler(file,'commodityList')">
+                      <span v-if="!virStatus" class="el-upload-list__item-delete" @click="onRemoveHandler(file,'commodityList')">
                         <i class="el-icon-delete" />
                       </span>
                     </span>
                   </div>
-                  <el-button size="small" type="primary">点击上传</el-button>
+                  <el-button :disabled='virStatus' size="small" type="primary">点击上传</el-button>
                   <!-- <div slot="tip" class="el-upload__tip">只能上传图片和PDF文件</div> -->
                 </el-upload>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="其他资质：" prop="qualification.otherList">
+              <el-form-item label="助农文件及其他资质：" prop="qualification.otherList">
                 <el-upload
                   class="upload-demo"
                   :action="filePdf"
@@ -548,12 +550,12 @@
                       <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
                         <i class="el-icon-zoom-in" />
                       </span>
-                      <span class="el-upload-list__item-delete" @click="onRemoveHandler(file,'commodityList')">
+                      <span v-if="!virStatus" class="el-upload-list__item-delete" @click="onRemoveHandler(file,'commodityList')">
                         <i class="el-icon-delete" />
                       </span>
                     </span>
                   </div>
-                  <el-button size="small" type="primary">点击上传</el-button>
+                  <el-button :disabled='virStatus' size="small" type="primary">点击上传</el-button>
                   <!-- <div slot="tip" class="el-upload__tip">只能上传图片和PDF文件</div> -->
                 </el-upload>
               </el-form-item>
@@ -599,19 +601,19 @@
                       <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
                         <i class="el-icon-zoom-in" />
                       </span>
-                      <span class="el-upload-list__item-delete" @click="onRemoveHandler(file,'importBusinessList')">
+                      <span v-if="!virStatus" class="el-upload-list__item-delete" @click="onRemoveHandler(file,'importBusinessList')">
                         <i class="el-icon-delete" />
                       </span>
                     </span>
                   </div>
-                  <el-button size="small" type="primary">点击上传</el-button>
+                  <el-button :disabled='virStatus' size="small" type="primary">点击上传</el-button>
                   <!-- <div slot="tip" class="el-upload__tip">只能上传图片和PDF文件</div> -->
                 </el-upload>
               </el-form-item>
             </el-col>
             <div>品牌方资质</div>
             <el-col :span="24">
-              <el-form-item label="销售授权及其他：" prop="qualification.importAuthorizedList">
+              <el-form-item label="销售授权及品牌方营业执照：" prop="qualification.importAuthorizedList">
                 <el-upload
                   class="upload-demo"
                   :action="filePdf"
@@ -638,12 +640,12 @@
                       <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
                         <i class="el-icon-zoom-in" />
                       </span>
-                      <span class="el-upload-list__item-delete" @click="onRemoveHandler(file,'importAuthorizedList')">
+                      <span v-if="!virStatus" class="el-upload-list__item-delete" @click="onRemoveHandler(file,'importAuthorizedList')">
                         <i class="el-icon-delete" />
                       </span>
                     </span>
                   </div>
-                  <el-button size="small" type="primary">点击上传</el-button>
+                  <el-button :disabled='virStatus' size="small" type="primary">点击上传</el-button>
                   <!-- <div slot="tip" class="el-upload__tip">只能上传图片和PDF文件</div> -->
                 </el-upload>
               </el-form-item>
@@ -677,18 +679,18 @@
                       <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
                         <i class="el-icon-zoom-in" />
                       </span>
-                      <span class="el-upload-list__item-delete" @click="onRemoveHandler(file,'customsList')">
+                      <span v-if="!virStatus" class="el-upload-list__item-delete" @click="onRemoveHandler(file,'customsList')">
                         <i class="el-icon-delete" />
                       </span>
                     </span>
                   </div>
-                  <el-button size="small" type="primary">点击上传</el-button>
+                  <el-button :disabled='virStatus' size="small" type="primary">点击上传</el-button>
                   <!-- <div slot="tip" class="el-upload__tip">只能上传图片和PDF文件</div> -->
                 </el-upload>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="产品外包装实物图：" prop="qualification.packingList">
+              <el-form-item label="产品外包装实拍图含中文标签：" prop="qualification.packingList">
                 <el-upload
                   class="upload-demo"
                   :action="filePdf"
@@ -715,12 +717,12 @@
                       <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
                         <i class="el-icon-zoom-in" />
                       </span>
-                      <span class="el-upload-list__item-delete" @click="onRemoveHandler(file,'packingList')">
+                      <span v-if="!virStatus" class="el-upload-list__item-delete" @click="onRemoveHandler(file,'packingList')">
                         <i class="el-icon-delete" />
                       </span>
                     </span>
                   </div>
-                  <el-button size="small" type="primary">点击上传</el-button>
+                  <el-button :disabled='virStatus' size="small" type="primary">点击上传</el-button>
                   <!-- <div slot="tip" class="el-upload__tip">只能上传图片和PDF文件</div> -->
                 </el-upload>
               </el-form-item>
@@ -753,12 +755,12 @@
                       <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
                         <i class="el-icon-zoom-in" />
                       </span>
-                      <span class="el-upload-list__item-delete" @click="onRemoveHandler(file,'importOtherList')">
+                      <span v-if="!virStatus" class="el-upload-list__item-delete" @click="onRemoveHandler(file,'importOtherList')">
                         <i class="el-icon-delete" />
                       </span>
                     </span>
                   </div>
-                  <el-button size="small" type="primary">点击上传</el-button>
+                  <el-button :disabled='virStatus' size="small" type="primary">点击上传</el-button>
                   <!-- <div slot="tip" class="el-upload__tip">只能上传图片和PDF文件</div> -->
                 </el-upload>
               </el-form-item>
@@ -1150,7 +1152,7 @@
                         controls-position="right"
                       />
                       <el-input
-                        v-if="formThead[iii].title === '商品编号'"
+                        v-if="formThead[iii].title === '商品编号' || formThead[iii].title === '依据链接'"
                         v-model="scope.row[iii]"
                         type="text"
                         class="priceBox"
@@ -1159,6 +1161,7 @@
                         v-if="
                           formThead[iii].title !== '付费会员价' &&
                             formThead[iii].title !== '商品编号' &&
+                            formThead[iii].title !== '依据链接' &&
                             formThead[iii].title !== '库存'
                         "
                         v-model="scope.row[iii]"
@@ -1187,10 +1190,12 @@
 
                     <div v-else>
                       <el-input
-                        v-if="formThead[iii].title === '商品编号'"
+                        v-if="formThead[iii].title === '商品编号' || formThead[iii].title === '依据链接' || formThead[iii].title === '售价'"
                         v-model="scope.row[iii]"
                         type="text"
                         size="small"
+                        :disabled="virStatus&&formThead[iii].title === '依据链接'"
+                        @input="handleCost(scope.row,iii,$event)"
                         class="priceBox"
                       />
                       <el-input-number
@@ -1198,14 +1203,14 @@
                         v-model="scope.row[iii]"
                         :min="0"
                         size="small"
-                        :disabled="formThead[iii].title === '库存' && formValidate.type == 2"
+                        :disabled="formThead[iii].title === '成本价'"
                         class="priceBox"
                         controls-position="right"
                       />
                     </div>
                   </template>
                 </el-table-column>
-                <template v-if="formValidate.type == 2">
+                <!-- <template v-if="formValidate.type == 2">
                   <el-table-column
                     align="center"
                     label="卡密设置"
@@ -1220,7 +1225,7 @@
                       <span v-else class="seeCatMy" @click="seeVirtual(OneattrValue[0], 'OneattrValue', 0)">已设置</span>
                     </template>
                   </el-table-column>
-                </template>
+                </template> -->
                 <template v-if="formValidate.extension_type === 1">
                   <el-table-column
                     align="center"
@@ -1317,7 +1322,7 @@
                         controls-position="right"
                       />
                       <el-input
-                        v-if="formThead[iii].title === '商品编号'"
+                        v-if="formThead[iii].title === '商品编号' || formThead[iii].title === '依据链接'"
                         v-model="scope.row[iii]"
                         type="text"
                         size="small"
@@ -1326,6 +1331,7 @@
                       <el-input-number
                         v-if="formThead[iii].title !== '付费会员价' &&
                           formThead[iii].title !== '商品编号' &&
+                          formThead[iii].title !== '依据链接' &&
                           formThead[iii].title !== '库存'"
                         v-model="scope.row[iii]"
                         :min="0"
@@ -1352,7 +1358,7 @@
                     </div>
                     <div v-else>
                       <el-input
-                        v-if="formThead[iii].title === '商品编号'"
+                        v-if="formThead[iii].title === '商品编号' || formThead[iii].title === '依据链接'"
                         v-model="scope.row[iii]"
                         type="text"
                         size="small"
@@ -1377,7 +1383,7 @@
                     </div>
                   </template>
                 </el-table-column>
-                <template v-if="formValidate.type == 2">
+                <!-- <template v-if="formValidate.type == 2">
                   <el-table-column
                     align="center"
                     label="卡密设置"
@@ -1392,7 +1398,7 @@
                       <span v-else class="seeCatMy" @click="seeVirtual(ManyAttrValue[scope.$index], 'ManyAttrValue', scope.$index)">已设置</span>
                     </template>
                   </el-table-column>
-                </template>
+                </template> -->
                 <template v-if="formValidate.extension_type === 1">
                   <el-table-column
                     key="1"
@@ -1557,6 +1563,7 @@
               <el-switch
                 v-model="formValidate.refund_switch"
                 :active-value="1"
+                disabled
                 :inactive-value="0"
                 :width="55"
                 active-text="开启"
@@ -2061,7 +2068,8 @@ const defaultObj = {
       cdkey: {},
       bar_code: '',
       weight: null,
-      volume: null
+      volume: null,
+      gist_url:''
     }
   ],
   attr: [],
@@ -2120,6 +2128,9 @@ const objTitle = {
   },
   volume: {
     title: '体积(m³)'
+  },
+  gist_url: {
+    title: '依据链接'
   }
 }
 const proOptions = [{ name: '店铺推荐', value: 'is_good' }]
@@ -2258,11 +2269,11 @@ export default {
             required: true, message: '请上传营业执照图片或者PDF', trigger: 'blur'
           }
         ],
-        'qualification.licenceList': [
-          {
-            required: true, message: '请上传许可证图片或者PDF', trigger: 'blur'
-          }
-        ],
+        // 'qualification.licenceList': [
+        //   {
+        //     required: true, message: '请上传生产许可证图片或者PDF', trigger: 'blur'
+        //   }
+        // ],
         'qualification.trademarkList': [
           {
             required: true, message: '请上传商标注册证图片或者PDF', trigger: 'blur'
@@ -2351,9 +2362,9 @@ export default {
       previewKey: '',
       deliveryType: [],
       virtual: [
-        { tit: '食品', id: 0, tit2: '物流发货' },
-        { tit: '日化', id: 1, tit2: '物流发货' },
-        { tit: '其他', id: 2, tit2: '物流发货' }
+        { tit: '食品及保健品', id: 0, tit2: '物流发货' },
+        { tit: '化妆品及日化品', id: 1, tit2: '物流发货' },
+        { tit: '其他品类', id: 2, tit2: '物流发货' }
       ],
       customBtn: 0, // 自定义留言开关
       // 自定义留言下拉选择
@@ -2411,7 +2422,8 @@ export default {
         stock: null,
         bar_code: '',
         weight: null,
-        volume: null
+        volume: null,
+        gist_url:''
       },
       open_svip: false,
       svip_rate: 0,
@@ -2458,7 +2470,8 @@ export default {
       product_id: '',
       goodList: [],
       unitList: [],
-      recommendVisible: false
+      recommendVisible: false,
+      virStatus:false
     }
   },
   computed: {
@@ -2550,6 +2563,11 @@ export default {
     window.removeEventListener('popstate', this.goBack, false)
   },
   methods: {
+    handleCost(val,i,e){
+      if(i=='price'){
+        val.cost = (e * 0.6).toFixed(2)
+      }
+    },
     handlCommodity(name) {
       console.log(this.importBusinessList);
       this.$refs[name].clearValidate()
@@ -3317,7 +3335,8 @@ export default {
           stock: null,
           bar_code: '',
           weight: null,
-          volume: null
+          volume: null,
+          gist_url:''
         }
         // if(this.formValidate.type == 2)this.attrVal.cdkey = {}
         this.OneattrValue[0]['svip_price'] = this.OneattrValue[0]['price']
@@ -3337,7 +3356,8 @@ export default {
           stock: null,
           bar_code: '',
           weight: null,
-          volume: null
+          volume: null,
+          gist_url:''
         }
       }
     },
@@ -3518,6 +3538,7 @@ export default {
         });
     },
     infoData(info) {
+      this.virStatus = true
       this.deduction_set = info.integral_rate == -1 ? -1 : 1;
       this.goodList = info.goodList || [];
       this.attrs = info.attr || [];
@@ -3585,7 +3606,8 @@ export default {
           // cdkey: {},
           bar_code: "",
           weight: null,
-          volume: null
+          volume: null,
+          gist_url:''
         };
       if (this.formValidate.extend.length != 0) {
         this.customBtn = 1;
@@ -3612,10 +3634,12 @@ export default {
       this.infoData(data);
     },
     handleRemove(i) {
+      if(this.virStatus) return
       this.formValidate.slider_image.splice(i, 1);
     },
     // 点击商品图
     modalPicTap(tit, num, i) {
+      if(this.virStatus) return
       const _this = this;
       const attr = [];
       this.$modalUpload(function(img) {
@@ -3776,15 +3800,19 @@ export default {
     },
     // 移动
     handleDragStart(e, item) {
+      if(this.virStatus) return
       this.dragging = item;
     },
     handleDragEnd(e, item) {
+      if(this.virStatus) return
       this.dragging = null;
     },
     handleDragOver(e) {
+      if(this.virStatus) return
       e.dataTransfer.dropEffect = "move";
     },
     handleDragEnter(e, item) {
+      if(this.virStatus) return
       e.dataTransfer.effectAllowed = "move";
       if (item === this.dragging) {
         return;
diff --git a/src/views/product/productList/proDetails.vue b/src/views/product/productList/proDetails.vue
index 097865f..1a93f58 100644
--- a/src/views/product/productList/proDetails.vue
+++ b/src/views/product/productList/proDetails.vue
@@ -294,13 +294,13 @@
           <el-tab-pane label="审核回复栏" name="audit">
             <div class="section">
               <ul class="list">
-                <li class="item">
+                <li class="item" v-if="productData.refusal">
                   <div class="item-title">审核拒绝原因：</div>
-                  <div class="value">{{productData.refusal || '-'}}</div>
+                  <div class="value">{{productData.refusal || ''}}</div>
                 </li>
                 <li class="item item100">
-                  <div class="item-title">审核图：</div>
-                  <el-image :src="productData.status_img" style="width:40px;height:40px;margin-right:12px;" :preview-src-list="[productData.status_img]" />
+                  <div class="item-title">佐证图片：</div>
+                  <el-image v-for="(item,index) in productData.status_img" :key="index" :src="item" style="width:40px;height:40px;margin-right:12px;" :preview-src-list="productData.status_img" />
                 </li>  
               </ul>
             </div>
diff --git a/src/views/systemForm/setSystem/modifyStoreInfo.vue b/src/views/systemForm/setSystem/modifyStoreInfo.vue
index a0fe4b7..34d9ed6 100644
--- a/src/views/systemForm/setSystem/modifyStoreInfo.vue
+++ b/src/views/systemForm/setSystem/modifyStoreInfo.vue
@@ -60,7 +60,7 @@
               <div class="margin_count" @mouseenter="getCode('all')">
                 <el-button type="text" size="small" class="mr10 pay_btn">去支付保证金</el-button>
                 <!--支付二维码-->
-                <div class="erweima">
+                <!-- <div class="erweima">
                   <div class="pay_title">支付保证金</div>
                   <div>
                     <vue-qr class="bicode" :text="goodsQrcode" :size="310" />
@@ -68,6 +68,17 @@
                     <div class="pay_price">￥{{ marginPrice }}元</div>
                     <div class="pay_time">支付码过期时间： {{ qrEndTime }}</div>
                   </div>
+                </div> -->
+                <div class="erweima">
+                  <div class="pay_title">对公账户</div>
+                  <div>
+                    <!-- <vue-qr class="bicode" :text="goodsQrcode" :size="310" /> -->
+                    <!-- <div class="pay_type">请使用微信扫码支付</div> -->
+                    <div class="pay_price">￥{{ merData.margin }}元</div>
+                    <div class="pay_time">支付账户名称： {{ merData.bank_info.bank_account_name }}</div>
+                    <div class="pay_time">开户银行： {{ merData.bank_info.bank_name }}</div>
+                    <div class="pay_time">银行卡号： {{ merData.bank_info.bank_account_code }}</div>
+                  </div>
                 </div>
               </div>
             </div>
@@ -78,13 +89,15 @@
               <div class="margin_count" @mouseenter="getCode('service')">
                 <el-button type="text" size="small" class="mr10 pay_btn">去支付产品服务费</el-button>
                 <!--支付二维码-->
-                <div class="erweima">
-                  <div class="pay_title">支付保证金</div>
+                  <div class="erweima">
+                  <div class="pay_title">对公账户</div>
                   <div>
-                    <vue-qr class="bicode" :text="serviceQrCode" :size="310" />
-                    <div class="pay_type">请使用微信扫码支付</div>
-                    <div class="pay_price">￥{{ servicePrice }}元</div>
-                    <div class="pay_time">支付码过期时间： {{ serviceQrEndTime }}</div>
+                    <!-- <vue-qr class="bicode" :text="goodsQrcode" :size="310" /> -->
+                    <!-- <div class="pay_type">请使用微信扫码支付</div> -->
+                    <div class="pay_price">￥{{ merData.margin }}元</div>
+                    <div class="pay_time">支付账户名称： {{ merData.bank_info.bank_account_name }}</div>
+                    <div class="pay_time">开户银行： {{ merData.bank_info.bank_name }}</div>
+                    <div class="pay_time">银行卡号： {{ merData.bank_info.bank_account_code }}</div>
                   </div>
                 </div>
               </div>
@@ -95,14 +108,15 @@
               <span class="font_red">{{ merData.goods_cost }}元</span>
               <div class="margin_count" @mouseenter="getCode('goods')">
                 <el-button type="text" size="small" class="mr10 pay_btn">去支付上架费</el-button>
-                <!--支付二维码-->
-                <div class="erweima">
-                  <div class="pay_title">支付保证金</div>
+                  <div class="erweima">
+                  <div class="pay_title">对公账户</div>
                   <div>
-                    <vue-qr class="bicode" :text="qrCode" :size="310" />
-                    <div class="pay_type">请使用微信扫码支付</div>
-                    <div class="pay_price">￥{{ goodsPrice }}元</div>
-                    <div class="pay_time">支付码过期时间： {{ goodsQrEndTime }}</div>
+                    <!-- <vue-qr class="bicode" :text="goodsQrcode" :size="310" /> -->
+                    <!-- <div class="pay_type">请使用微信扫码支付</div> -->
+                    <div class="pay_price">￥{{ merData.margin }}元</div>
+                    <div class="pay_time">支付账户名称： {{ merData.bank_info.bank_account_name }}</div>
+                    <div class="pay_time">开户银行： {{ merData.bank_info.bank_name }}</div>
+                    <div class="pay_time">银行卡号： {{ merData.bank_info.bank_account_code }}</div>
                   </div>
                 </div>
               </div>
@@ -128,16 +142,18 @@
                 <div class="margin_count" @mouseenter="getCode('all')">
                   <el-button type="text" size="small" class="mr10 pay_btn">去补缴保证金</el-button>
                   <!--支付二维码-->
-                  <div class="erweima">
-                    <div class="pay_title">支付保证金</div>
-                    <div>
-                      <vue-qr class="bicode" :text="qrCode" :size="310" />
-                      <div class="pay_type">请使用微信扫码支付</div>
-                      <div class="pay_price">￥{{ marginPrice }}元</div>
-                      <div class="pay_time">支付码过期时间： {{ qrEndTime }}</div>
-                    </div>
+                <div class="erweima">
+                  <div class="pay_title">对公账户</div>
+                  <div>
+                    <!-- <vue-qr class="bicode" :text="goodsQrcode" :size="310" /> -->
+                    <!-- <div class="pay_type">请使用微信扫码支付</div> -->
+                    <div class="pay_price">￥{{ merData.margin }}元</div>
+                    <div class="pay_time">支付账户名称： {{ merData.bank_info.bank_account_name }}</div>
+                    <div class="pay_time">开户银行： {{ merData.bank_info.bank_name }}</div>
+                    <div class="pay_time">银行卡号： {{ merData.bank_info.bank_account_code }}</div>
                   </div>
                 </div>
+                </div>
               </div>
             </div>
             <div v-if="merData.is_margin == -10 || merData.is_margin == -1" class="margin_main">
@@ -717,6 +733,7 @@ export default {
       const that = this
       that.merModel = false
       getBaseInfo().then((res) => {
+        console.log(res);
         that.merData = res.data
         that.$set(that.merData, 'uploadedqualifications', '') // 资质图片列表
         that.$set(that.merData, 'delivery_way', res.data.delivery_way && res.data.delivery_way.length ? res.data.delivery_way.map(String) : [])
@@ -827,46 +844,46 @@ export default {
       const that = this
       // 产品服务费
       if(type == 'service' && this.merData.is_service){
-        return serviceCodeApi().then((res) => {
-          console.log(res);
-          that.serviceQrCode = res.data.config
-          that.serviceQrEndTime = res.data.endtime
-          that.servicePrice = res.data.price
-        }).catch(function(res) {
-            that.$message.error(res.message)
-          })
+        // return serviceCodeApi().then((res) => {
+        //   console.log(res);
+        //   that.serviceQrCode = res.data.config
+        //   that.serviceQrEndTime = res.data.endtime
+        //   that.servicePrice = res.data.price
+        // }).catch(function(res) {
+        //     that.$message.error(res.message)
+        //   })
       }
       // 上架费
       if(type == 'goods' && this.merData.is_goods){
-        return goodsCodeApi().then((res) => {
-          console.log(res);
-          that.goodsQrCode = res.data.config
-          that.goodsQrEndTime = res.data.endtime
-          that.goodsPrice = res.data.price
-        }).catch(function(res) {
-            that.$message.error(res.message)
-          })
+        // return goodsCodeApi().then((res) => {
+        //   console.log(res);
+        //   that.goodsQrCode = res.data.config
+        //   that.goodsQrEndTime = res.data.endtime
+        //   that.goodsPrice = res.data.price
+        // }).catch(function(res) {
+        //     that.$message.error(res.message)
+        //   })
       }
       if (type =='all' && this.merData.marginStatus) {
-        return marginMakeCode()
-          .then((res) => {
-            that.qrCode = res.data.config
-            that.qrEndTime = res.data.endtime
-            that.marginPrice = res.data.price
-          })
-          .catch(function(res) {
-            that.$message.error(res.message)
-          })
+        // return marginMakeCode()
+        //   .then((res) => {
+        //     that.qrCode = res.data.config
+        //     that.qrEndTime = res.data.endtime
+        //     that.marginPrice = res.data.price
+        //   })
+        //   .catch(function(res) {
+        //     that.$message.error(res.message)
+        //   })
       } else {
-        return marginCode()
-          .then((res) => {
-            that.qrCode = res.data.config
-            that.qrEndTime = res.data.endtime
-            that.marginPrice = res.data.price
-          })
-          .catch(function(res) {
-            that.$message.error(res.message)
-          })
+        // return marginCode()
+        //   .then((res) => {
+        //     that.qrCode = res.data.config
+        //     that.qrEndTime = res.data.endtime
+        //     that.marginPrice = res.data.price
+        //   })
+        //   .catch(function(res) {
+        //     that.$message.error(res.message)
+        //   })
       }
     },
     // 查看保证金记录
@@ -1189,7 +1206,7 @@ export default {
     z-index: 9;
     display: none;
     width: 250px;
-    height: 320px;
+    height: 220px;
     text-align: center;
     background: #fff;
     border-radius: 8px;
@@ -1218,9 +1235,11 @@ export default {
       margin-top: 20px;
     }
     .pay_time{
-      font-size: 12px;
+      font-size: 16px;
       color: #6D7278;
-
+      & + .pay_time{
+        margin-top: 10px;
+      }
     }
   }