商户信息补充

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

@@ -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>
-          56789
+          <span class="basic-label"> 商户可提现总金额：</span>
+          {{ merData.assets.available_money }}
         </div>
         <div class="basic-information">
-          <span class="basic-label"> 商户可提现总金额：</span>
-          56789
+          <span class="basic-label"> 商户退款支出：</span>
+          {{ merData.assets.refund_money }}
         </div>
         <div class="basic-information">
-          <span class="basic-label"> 商户可提现消费积分部分：</span>
-          56789
+          <span class="basic-label"> 商户福利积分：</span>
+          {{ merData.assets.welfare }}
         </div>
         <div class="basic-information">
-          <span class="basic-label"> 商户退款支出：</span>
-          56789
+          <span class="basic-label"> 商户冻结积分：</span>
+          {{ merData.assets.welfare_frozen }}
         </div>
       </div>
       <div v-if="infoType != 4" class="submit-button">