Merge branch 'dev' into 'test'

账户余额显示

See merge request quanshu/mp-ui-pc!363

src/views/business/channel/components/Detail.vue

@@ -94,6 +94,9 @@
          <el-form-item label="佣金" style="width: 50%;margin-bottom:5px;" >
            <span :class="loading?'el-icon-loading':''"></span>￥{{detail.operData && detail.operData.commAmt/100}}
          </el-form-item>
+         <el-form-item label="账户余额" style="width: 50%;margin-bottom:5px;" >
+             <span :class="loading?'el-icon-loading':''"></span>￥{{detail.money / 100}}
+          </el-form-item>
      </flexbox>
    </el-form>
    <div slot="footer" class="dialog-footer">

src/views/business/salesite/components/Detail.vue

@@ -121,6 +121,14 @@
             <span :class="loading?'el-icon-loading':''"></span>￥{{detail.operData && detail.operData.commAmt/100}}
           </el-form-item>
      </flexbox>
+     <flexbox
+         class="ygp-form-items"
+         align="flex-start"
+         justify="flex-start">
+          <el-form-item label="账户余额" style="width: 50%;margin-bottom:5px;" >
+             <span :class="loading?'el-icon-loading':''"></span>￥{{detail.money / 100}}
+          </el-form-item>
+     </flexbox>
    </el-form>
    <div slot="footer" class="dialog-footer">
      <el-button @click="close">关 闭</el-button>