添加：商户转账信息添加手续费及实际到账金额显示

优化：隐藏平台&商户积分相关内容

.env.development

@@ -6,11 +6,13 @@ ENV = 'development'
 # VUE_APP_BASE_API = 'http://192.168.31.106:8324'
 #VUE_APP_BASE_API = 'https://mer1.crmeb.net'
 VUE_APP_BASE_API = 'https://zc.test.cdlfjy.com'
+#VUE_APP_BASE_API = 'https://zcgx.cdlfjy.com'
 
 # socket 连接地址
 #VUE_APP_WS_URL = 'ws://0.0.0.0:8324'
 #VUE_APP_WS_URL = 'ws://mer1.crmeb.net'
 VUE_APP_WS_URL = 'ws://zc.test.cdlfjy.com'
+#VUE_APP_WS_URL = 'ws://zcgx.cdlfjy.com'
 
 # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,
 # to control whether the babel-plugin-dynamic-import-node plugin is enabled.

src/views/accounts/transferRecord/index.vue

@@ -181,22 +181,63 @@
     <el-dialog :title="transferData.status == 0 ? '审核' :  '转账信息'" :visible.sync="dialogVisible" width="700px" v-if="dialogVisible">
       <div class="box-container">
         <div class="acea-row">
-                <div class="list sp100"><label class="name">商户名称：</label>{{ transferData.merchant && transferData.merchant.mer_name }}</div>
+          <div class="list sp100">
-                <div class="list sp100"><label class="name">商户ID：</label>{{  transferData.merchant && transferData.merchant.mer_id }}</div>
+            <label class="name">商户名称：</label>{{ transferData.merchant && transferData.merchant.mer_name }}
-                <div class="list sp100"><label class="name">商户余额：</label>{{ transferData.mer_money }}</div>
+          </div>
-                <div class="list sp100"><label class="name">商户收款方式：</label>{{ transferData.financial_type == 1 ? '银行卡' : transferData.financial_type == 2 ? '微信' : '支付宝' }}</div>
+          <div class="list sp100">
-                <div class="list sp100" v-if="transferData.financial_type == 1"><label class="name">开户银行：</label>{{ transferData.financial_account.bank }}</div>
+            <label class="name">商户ID：</label>{{ transferData.merchant && transferData.merchant.mer_id }}
-                <div class="list sp100" v-if="transferData.financial_type == 1"><label class="name">银行账号：</label>{{ transferData.financial_account.bank_code }}</div>
+          </div>
-                <div class="list sp100" v-if="transferData.financial_type == 1"><label class="name">开户户名：</label>{{ transferData.financial_account.name }}</div>
+          <div class="list sp100">
-                <div class="list sp100" v-if="transferData.financial_type != 1"><label class="name">真实姓名：</label>{{ transferData.financial_account.name }}</div>
+            <label class="name">商户余额：</label>{{ transferData.mer_money }}</div>
-                <div class="list sp100" v-if="transferData.financial_type == 2"><label class="name">微信号：</label>{{ transferData.financial_account.wechat }}</div>
+          <div class="list sp100">
-                <div class="list sp100 image" v-if="transferData.financial_type == 2"><label class="name">微信收款二维码：</label><img style="max-width: 150px; height: 80px;" @click="getPicture(transferData.financial_account.wechat_code);return false;" :src="transferData.financial_account.wechat_code"/></div>
+            <label class="name">商户收款方式：</label>{{transferData.financial_type == 1 ? '银行卡' : transferData.financial_type == 2 ? '微信' : '支付宝'}}
-                <div class="list sp100" v-if="transferData.financial_type == 3"><label class="name">支付宝账号：</label>{{ transferData.financial_account.alipay }}</div>
+          </div>
-                <div class="list sp100 image" v-if="transferData.financial_type == 3"><label class="name">支付宝收款二维码：</label><img style="max-width: 150px; height: 80px;" @click="getPicture(transferData.financial_account.alipay_code);return false;" :src="transferData.financial_account.alipay_code"/></div>
+          <div class="list sp100" v-if="transferData.financial_type == 1">
-                <div class="list sp100"><label class="name">本次申请转账金额：</label><span class="font-red">{{ transferData.extract_money }}</span></div>
+            <label class="name">开户银行：</label>{{ transferData.financial_account.bank }}
-                <div class="list sp100" v-if="transferData.status != 0"><label class="name">审核状态：</label>{{ transferData.status == 0 ? '待审核' : transferData.status == 1 ? '已审核' : '审核失败' }}</div>
+          </div>
-                <div class="list sp100" v-if="transferData.status == 1"><label class="name">审核时间：</label>{{ transferData.status_time }}</div>
+          <div class="list sp100" v-if="transferData.financial_type == 1">
-                <div class="list sp100" v-if="transferData.status == -1"><label class="name">审核未通过原因：</label>{{ transferData.refusal }}</div>
+            <label class="name">银行账号：</label>{{ transferData.financial_account.bank_code }}
+          </div>
+          <div class="list sp100" v-if="transferData.financial_type == 1">
+            <label class="name">开户户名：</label>{{ transferData.financial_account.name }}
+          </div>
+          <div class="list sp100" v-if="transferData.financial_type != 1">
+            <label class="name">真实姓名：</label>{{ transferData.financial_account.name }}
+          </div>
+          <div class="list sp100" v-if="transferData.financial_type == 2">
+            <label class="name">微信号：</label>{{ transferData.financial_account.wechat }}
+          </div>
+          <div class="list sp100 image" v-if="transferData.financial_type == 2">
+            <label class="name">微信收款二维码：</label><img style="max-width: 150px; height: 80px;" @click="getPicture(transferData.financial_account.wechat_code);return false;" :src="transferData.financial_account.wechat_code" />
+          </div>
+          <div class="list sp100" v-if="transferData.financial_type == 3">
+            <label class="name">支付宝账号：</label>{{ transferData.financial_account.alipay }}
+          </div>
+          <div class="list sp100 image" v-if="transferData.financial_type == 3">
+            <label class="name">支付宝收款二维码：</label>
+            <img style="max-width: 150px; height: 80px;" @click="getPicture(transferData.financial_account.alipay_code);return false;" :src="transferData.financial_account.alipay_code" />
+          </div>
+          <div class="list sp100">
+            <label class="name">本次申请转账金额：</label><span class="font-red">{{ transferData.extract_money }}元</span>
+          </div>
+          <div class="list sp100">
+            <label class="name">提现手续费比例：</label><span class="font-red">{{ transferData.withdrawal_fees }}%</span>
+          </div>
+          <div class="list sp100">
+            <label class="name">提现手续费金额：</label><span class="font-red">{{ transferData.withdrawal_fees }}元</span>
+          </div>
+          <div class="list sp100">
+            <label class="name">实际打款金额：</label><span class="font-red">{{ transferData.reality_money }}元</span>
+          </div>
+          <div class="list sp100" v-if="transferData.status != 0">
+            <label class="name">审核状态：</label>{{transferData.status == 0 ? '待审核' : transferData.status == 1 ? '已审核' : '审核失败'}}
+          </div>
+          <div class="list sp100" v-if="transferData.status == 1">
+            <label class="name">审核时间：</label>{{ transferData.status_time }}
+          </div>
+          <div class="list sp100" v-if="transferData.status == -1">
+            <label class="name">审核未通过原因：</label>{{ transferData.refusal }}
+          </div>
           <el-form ref="ruleForm" class="demo-ruleForm" label-width="90px">
             <el-form-item label="审核状态：" required v-if="transferData.status == 0">
               <el-radio-group v-model="formValidate.status">
@@ -221,8 +262,12 @@
               </div>
             </el-form-item>
             <el-form-item>
-                        <el-button v-if="transferData.status == 0" type="primary" @click="transferReview(transferData.financial_id)">提交</el-button>
+              <el-button v-if="transferData.status == 0" type="primary" @click="transferReview(transferData.financial_id)">
-                        <el-button v-if="transferData.status == 1" type="primary" @click="onSubmit(transferData.financial_id)">提交</el-button>
+                提交
+              </el-button>
+              <el-button v-if="transferData.status == 1" type="primary" @click="onSubmit(transferData.financial_id)">
+                提交
+              </el-button>
             </el-form-item>
           </el-form>
         </div>

src/views/merchant/list/handle/merEditForm.vue

@@ -311,7 +311,7 @@
         </div>
       </el-tab-pane>
       <el-tab-pane label="其他设置" name="integral">
-        <div class="section">
+        <!--<div class="section">
           <div class="title">平台&商户积分设置</div>
           <el-row :gutter="24" class="mt20">
             <el-col :span="24">
@@ -327,7 +327,7 @@
               </el-form-item>
             </el-col>
           </el-row>
-        </div>
+        </div>-->
         <div class="section">
           <div class="title">平台抽成设置</div>
           <el-row :gutter="24" class="mt20">

src/views/merchant/list/handle/merInfo.vue

@@ -180,7 +180,7 @@
       </el-tab-pane>
       <el-tab-pane label="其他设置" name="integral">
         <div class="section">
-          <div class="title">平台&商户积分设置</div>
+          <!--<div class="title">平台&商户积分设置</div>
           <ul class="list">
             <li class="item">
               <div>商户积分兑换平台积分比例：</div>
@@ -192,7 +192,7 @@
               <div>平台积分转换商户积分比例：</div>
               <div class="value">{{merData.mer_integral_merchant_rate}} : 1</div>
             </li>
-          </ul>
+          </ul>-->
           <div class="title">平台抽成设置</div>
           <ul class="list">
             <li class="item">