修改店铺保证金展示

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

@@ -127,8 +127,8 @@
           <div class="title">费用信息</div>
           <el-row :gutter="24" class="mt20">
             <el-col v-if="!isAdd" :span="24">
-              <el-form-item label="店铺保证金：" prop="ot_margin">
-                <span>{{ merData.is_margin == 0 ? '无' : merData.ot_margin + '元' }}</span>
+              <el-form-item label="店铺保证金：" prop="margin">
+                <span>{{ merData.is_margin == 0 ? '无' : merData.margin + '元' }}</span>
               </el-form-item>
             </el-col>
             <el-col v-if="!isAdd && merData.is_margin != 0" :span="24">
@@ -138,7 +138,7 @@
             </el-col>
             <el-col v-if="!isAdd && merData.is_margin != 0" :span="24">
               <el-form-item label="保证金余额：">
-                <span>{{ merData.margin }}</span>
+                <span>{{ merData.ot_margin }}</span>
               </el-form-item>
             </el-col>
             <el-col :span="24">

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

@@ -69,7 +69,7 @@
             <li class="item">
               <div>店铺保证金：</div>
               <div class="value">
-                {{merData.is_margin == 0 ? '无' : merData.ot_margin}}
+                {{merData.is_margin == 0 ? '无' : merData.margin}}
               </div>
             </li>
             <li v-if="merData.is_margin != 0" class="item">
@@ -80,7 +80,7 @@
             </li>
             <li v-if="merData.is_margin != 0" class="item">
               <div>保证金余额：</div>
-              <div class="value">{{merData.margin}}</div>
+              <div class="value">{{merData.ot_margin}}</div>
             </li>
           </ul>
         </div>

vue.config.js

@@ -24,10 +24,10 @@ module.exports = {
    * In most cases please use '/' !!!
    * Detail: https://cli.vuejs.org/config/#publicpath
    */
-  publicPath: '/',
+  publicPath: '/admin',
   outputDir: 'dist',
-  assetsDir: 'system',
-  indexPath: process.env.NODE_ENV === 'development' ? 'index.html' : 'system.html',
+  assetsDir: 'static',
+  indexPath: 'index.html',
   lintOnSave: process.env.NODE_ENV === 'development',
   productionSourceMap: false,
   devServer: {