diff --git a/src/views/merchant/list/handle/merEditForm.vue b/src/views/merchant/list/handle/merEditForm.vue
index 37662df..6db9cba 100644
--- a/src/views/merchant/list/handle/merEditForm.vue
+++ b/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">
diff --git a/src/views/merchant/list/handle/merInfo.vue b/src/views/merchant/list/handle/merInfo.vue
index 9fbd30e..6ea405f 100644
--- a/src/views/merchant/list/handle/merInfo.vue
+++ b/src/views/merchant/list/handle/merInfo.vue
@@ -58,7 +58,7 @@
               <div class="value">
                 {{merData.commission_switch ? "开启" : "关闭"}}
               </div>
-            </li>  
+            </li>
             <li v-if="merData.commission_switch" class="item item100">
               <div>手续费：</div>
               <div class="value">
@@ -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,8 +80,8 @@
             </li>
             <li v-if="merData.is_margin != 0" class="item">
               <div>保证金余额：</div>
-              <div class="value">{{merData.margin}}</div>
-            </li> 
+              <div class="value">{{merData.ot_margin}}</div>
+            </li>
           </ul>
         </div>
         <div class="section">
@@ -116,9 +116,9 @@
               <div>商户资质：</div>
               <div class="value">
                 <el-image
-                  v-for="(item, index) in merData.mer_certificate" 
-                  :key="index" 
-                  :src="item" 
+                  v-for="(item, index) in merData.mer_certificate"
+                  :key="index"
+                  :src="item"
                   @click="lookImg(item)"
                   style="width: 36px;height: 36px;margin-right: 5px;"
                   />
@@ -140,7 +140,7 @@
             <li class="item">
               <div>登录密码：</div>
               <div class="value">{{merData.mer_password}}</div>
-              
+
             </li>
             <li class="item">
               <div>联系人：</div>
@@ -149,7 +149,7 @@
             <li class="item">
               <div>联系电话：</div>
               <div class="value">{{merData.mer_phone}}</div>
-            </li> 
+            </li>
             <!-- <li class="item">
               <div>绑定手机号：</div>
               <div class="value">{{merData.real_name}}</div>
@@ -157,7 +157,7 @@
             <li class="item">
               <div>绑定微信用户昵称/ID：</div>
               <div class="value">{{merData.real_name}}</div>
-            </li>  --> 
+            </li>  -->
           </ul>
         </div>
         <div v-if="merData.sub_mchid" class="section">
@@ -252,8 +252,8 @@
     </el-tabs>
      <div class="images" v-show="false" v-viewer="{ movable: false }">
       <img v-for="(src,index) in merData.mer_certificate" :src="src" :key="index" />
-    </div> 
-  </div>   
+    </div>
+  </div>
 </template>
 <script>
 // +----------------------------------------------------------------------
diff --git a/vue.config.js b/vue.config.js
index 6138b33..5dd1186 100644
--- a/vue.config.js
+++ b/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: {