faiz
/
hy-shop-admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

edit

This commit is contained in:
faiz 2024-05-06 13:59:51 +08:00
parent e410d78236
commit 8231575ab5
6 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.env.development
View File

@ -3,11 +3,11 @@ ENV = 'development'
# http://192.168.1.43:8324/admin
# http://mer.crmeb.net/admin
# base api
VUE_APP_BASE_API = 'http://192.168.1.131:8080'
VUE_APP_BASE_API = 'http://192.168.1.107:8080'
# VUE_APP_BASE_API = 'https://plus.hwms.shop'
# socket 连接地址
VUE_APP_WS_URL = 'ws://192.168.1.131:8080'
VUE_APP_WS_URL = 'ws://192.168.1.107:8080'
# VUE_APP_WS_URL = 'ws://plus.hwms.shop'
# vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,

1
src/views/merchant/deposit/index.vue
View File

@ -377,7 +377,6 @@
>退回信息</el-button
>
<el-button
v-if="type != 30 && type != 40"
type="text"
size="small"
@click="handleRecord(scope.row.mer_id)"

4
src/views/product/productExamine/editAttr.vue
View File

@ -373,7 +373,7 @@ export default {
val.cost=val.cost.replace(/^([0-9-]\d*\.?\d{0,2})?.*$/,'$1')
// val.growth = parseInt(val.price*(0.9-(val.cost/val.price)))
val.proportion = (val.cost/val.price).toFixed(2)
val.growth = parseInt(val.price*val.proportion)
val.growth = parseInt(val.price*0.5)
break;
case 'ot_price':
val.ot_price=val.ot_price.replace(/^([0-9-]\d*\.?\d{0,2})?.*$/,'$1')
@ -384,7 +384,7 @@ export default {
case 'price':
val.price=val.price.replace(/^([0-9-]\d*\.?\d{0,2})?.*$/,'$1')
val.proportion = (val.cost/val.price).toFixed(2)
val.growth = parseInt(val.price*val.proportion)
val.growth = parseInt(val.price*0.5)
break;
case 'growth':
val.growth=val.growth.replace(/[^\d]/g,'')

4
src/views/product/productExamine/index.vue
View File

@ -31,13 +31,13 @@
<el-option v-for="item in labelList" :key="item.id" :label="item.name" :value="item.id" />
</el-select>
</el-form-item>
<el-form-item label="会员价：" prop="svip_price_type">
<!-- <el-form-item label="会员价：" prop="svip_price_type">
<el-select v-model="tableFrom.svip_price_type" placeholder="请选择" class="selWidth" clearable @change="getList(1)">
<el-option label="未设置" value="0" />
<el-option label="默认设置" value="1" />
<el-option label="自定义设置" value="2" />
</el-select>
</el-form-item>
</el-form-item> -->
<el-form-item label="商品推荐：" prop="hot_type">
<el-select v-model="tableFrom.hot_type" placeholder="请选择" class="filter-item selWidth" clearable filterable @change="getList(1)">
<el-option v-for="item in recommendList" :key="item.value" :label="item.name" :value="item.value" />

15
src/views/product/productExamine/info.vue
View File

@ -13,13 +13,13 @@
<span class="sp">店铺名称：{{ projectData.merchant&&projectData.merchant.mer_name }}</span>
<span class="sp">入住企业名称：{{ projectData.merchant&&projectData.merchant.mer_name }}</span>
<span class="sp">店铺联系人: {{ projectData.merchant&&projectData.merchant.real_name }}</span>
<span class="sp">
<span class="sp" v-if="projectData.merchant">
营业执照：
<div class="demo-image__preview">
<el-image
style="width: 60px; height: 60px"
:src="projectData.image"
:preview-src-list="[projectData.image]"
:src="projectData.merchant.mer_cert"
:preview-src-list="[projectData.merchant.mer_cert]"
/>
</div>
</span>
@ -403,6 +403,8 @@
<el-radio :label="1">通过</el-radio>
<el-radio v-if="projectData.status == 0" :label="-1">拒绝</el-radio>
<el-radio v-if="projectData.status == 10 || projectData.status == 11" :label="15">锁定</el-radio>
<el-radio v-if="projectData.status == 10" :label="-2">返回上一级</el-radio>
<el-radio v-if="projectData.status == 11" :label="-2">返回上一级</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="佐证图片" prop="status_img" label-width="80px">
@ -678,11 +680,12 @@ export default {
},
10: {
'api': productStatusSecondApi,
'status':11
'status':11,
'backStatus':0,
},
11: {
'api': productStatusApi,
'status':1
'backStatus':10
},
'15': {
'api': productStatusUnlockApi,
@ -694,7 +697,7 @@ export default {
this.isShow ? this.ruleForm.id = this.proId : this.ruleForm.id = this.ids
let params = {
...this.ruleForm,
status: this.ruleForm.status==-1?-1:this.ruleForm.status ==15?15:mode[this.projectData.status].status,
status: this.ruleForm.status==-1?-1:this.ruleForm.status ==15?15:this.ruleForm.status==-2?mode[this.projectData.status].backStatus:mode[this.projectData.status].status
}
mode[this.projectData.status].api(params).then(res => {
this.$message.success(res.message)

4
src/views/user/list/index.vue
View File

@ -250,8 +250,8 @@
<span>{{ row.user_type === 'routine' ? '小程序' : row.user_type === 'wechat' ? '公众号' : row.user_type === 'app' || row.user_type === 'App' ? 'App' : row.user_type === 'pc' ? 'PC' : 'H5' }}</span>
</template>
</el-table-column>
<el-table-column prop="now_money" label="余额" sortable min-width="100" :sort-method="(a,b)=>{return a.now_money - b.now_money}"/>
<el-table-column prop="integral" label="当前可用积分" min-width="100" />
<el-table-column prop="now_money" label="消费卷" sortable min-width="100" :sort-method="(a,b)=>{return a.now_money - b.now_money}"/>
<el-table-column prop="integral" label="铸源星" min-width="100" />
<el-table-column label="操作" min-width="150" fixed="right">
<template slot-scope="scope">
<el-button v-if="!scope.row.cancel_time" type="text" size="small" @click="onDetails(scope.row.uid)">详情</el-button>