mkm/new_shop_admin_vue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改店铺保证金展示

Browse Source
This commit is contained in:
luofei 2024-05-15 17:33:21 +08:00
parent f8743d7d90
commit bada6ede69
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/views/merchant/list/handle/merEditForm.vue
View File

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

4
src/views/merchant/list/handle/merInfo.vue
View File

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

6
vue.config.js
View File

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