商户信息补充

view/mer/src/views/systemForm/setSystem/modifyStoreInfo.vue

@@ -132,8 +132,8 @@
                 <div v-else class="upLoad">
                   <i class="el-icon-camera cameraIconfont" />
                 </div>
-                <div class="trip">建议尺寸：710*134px或710*460px(请根据平台要求选择尺寸，此图如未上传默认展示店铺背景图)</div>    
+                <div class="trip">建议尺寸：710*134px或710*460px(请根据平台要求选择尺寸，此图如未上传默认展示店铺背景图)</div>
-              </div> 
+              </div>
             </el-form-item>
             <el-form-item class="form-item" label="店铺资质：" :prop="merData.sys_bases_status == 1 ? 'uploadedqualifications' : ''">
               <div class="upLoadPicBox_qualification">
@@ -304,32 +304,32 @@
       <div v-if="infoType == '4'" class="user-msg">
         <div class="basic-information">
           <span class="basic-label"> 商户收入：</span>
-          56789
+          {{ merData.assets.total }}
           <!-- {{ Number(merData.commission_rate) > 0 ? (parseFloat(merData.commission_rate)).toFixed(2) : (parseFloat(merData.merchantCategory.commission_rate * 100)).toFixed(2)}}% -->
         </div>
         <div class="basic-information">
           <span class="basic-label"> 商户余额：</span>
-          56789
+          {{ merData.assets.mer_money }}
         </div>
         <div class="basic-information">
           <span class="basic-label"> 商户冻结金额：</span>
-          56789
+          {{ merData.assets.frozen_money }}
         </div>
         <div class="basic-information">
-          <span class="basic-label"> 商户冻结积分：</span>
+          <span class="basic-label"> 商户可提现总金额：</span>
-          56789
+          {{ merData.assets.available_money }}
         </div>
         <div class="basic-information">
-          <span class="basic-label"> 商户可提现总金额：</span>
+          <span class="basic-label"> 商户退款支出：</span>
-          56789
+          {{ merData.assets.refund_money }}
         </div>
         <div class="basic-information">
-          <span class="basic-label"> 商户可提现消费积分部分：</span>
+          <span class="basic-label"> 商户福利积分：</span>
-          56789
+          {{ merData.assets.welfare }}
         </div>
         <div class="basic-information">
-          <span class="basic-label"> 商户退款支出：</span>
+          <span class="basic-label"> 商户冻结积分：</span>
-          56789
+          {{ merData.assets.welfare_frozen }}
         </div>
       </div>
       <div v-if="infoType != 4" class="submit-button">
@@ -446,7 +446,7 @@ export default {
   //       }
   //     },100)
   //   }
-  
+
 // var checkPhone = (rule, value, callback) => {
 //       if (value === '') {
 //         callback(new Error('请输入电话号码'))
@@ -570,7 +570,7 @@ export default {
   },
   created() {
     this.getMapInfo()
-    
+
 
   },
   mounted: function() {
@@ -647,7 +647,7 @@ export default {
           })
         } else {
           that.uploadedQualifications = []
-        }   
+        }
         if(that.merData.is_margin == 1)(this.getCode())
       })
     },
@@ -702,7 +702,7 @@ export default {
                 this.$message.error(rej.data.message)
         })
       }
-      
+
     },
     // 获取支付二维码
     getCode() {
@@ -724,7 +724,7 @@ export default {
     getRecordList(){
       let that = this
       that.loading = true;
-      marginRecordLst(that.tableFrom).then(async (res) => { 
+      marginRecordLst(that.tableFrom).then(async (res) => {
         that.tableData.data = res.data.list;
         that.tableData.total = res.data.count;
         that.loading = false;
@@ -1010,7 +1010,7 @@ export default {
     border-radius: 8px;
     padding: 10px;
     box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, .3);
-    
+
     img{
       width: 160px;
       height: 160px;
@@ -1020,7 +1020,7 @@ export default {
       font-size: 16px;
       color: #303133;
       font-weight: normal;
-     
+
     }
     .pay_price{
       font-size: 18px;
@@ -1035,7 +1035,7 @@ export default {
     .pay_time{
       font-size: 12px;
       color: #6D7278;
-      
+
     }
   }