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

店铺保证金审核处理

This commit is contained in:
faiz 2024-07-23 10:02:33 +08:00
parent f71276bf68
commit a77e330d82
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.env.development
View File

@ -3,12 +3,12 @@ ENV = 'development'
# http://192.168.1.43:8324/admin # http://192.168.1.43:8324/admin
# http://mer.crmeb.net/admin # http://mer.crmeb.net/admin
# base api # base api
# VUE_APP_BASE_API = 'http://192.168.1.12:8080' VUE_APP_BASE_API = 'http://shop.many.lo'
VUE_APP_BASE_API = 'https://api.tropjoin.com' # VUE_APP_BASE_API = 'https://api.tropjoin.com'
# socket 连接地址 # socket 连接地址
# VUE_APP_WS_URL = 'ws://http://192.168.1.12:8080' VUE_APP_WS_URL = 'ws://http://shop.many.lo'
VUE_APP_WS_URL = 'ws://https://api.tropjoin.com' # VUE_APP_WS_URL = 'ws://https://api.tropjoin.com'
# vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable, # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,
# to control whether the babel-plugin-dynamic-import-node plugin is enabled. # to control whether the babel-plugin-dynamic-import-node plugin is enabled.

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

@ -422,7 +422,7 @@
>操作记录</el-button >操作记录</el-button
> >
<el-button <el-button
v-if="(type == 2 || type == 3 || type == 4) && scope.row.status != 1" v-if="(type == 2 || type == 3 || type == 4) && scope.row.status == 0"
type="text" type="text"
size="small" size="small"
@click="offline(scope.row.order_id)" @click="offline(scope.row.order_id)"

2
src/views/setting/devise/index.vue
View File

@ -637,6 +637,7 @@ export default {
this.mConfig.push(tempItem); this.mConfig.push(tempItem);
this.activeIndex = this.mConfig.length - 1; this.activeIndex = this.mConfig.length - 1;
this.rConfig.push(tempItem); this.rConfig.push(tempItem);
console.log(this.rConfig)
}else { }else {
this.mConfig.splice(index+1, 0, tempItem); this.mConfig.splice(index+1, 0, tempItem);
this.activeIndex = index; this.activeIndex = index;
@ -811,6 +812,7 @@ export default {
} }
this.loading = true; this.loading = true;
let val = this.$store.state.mobildConfig.defaultArray; let val = this.$store.state.mobildConfig.defaultArray;
console.log(val);
if (!this.footActive) { if (!this.footActive) {
let timestamp = new Date().getTime() * 1000; let timestamp = new Date().getTime() * 1000;
val[timestamp] = this.$store.state.mobildConfig.pageFooter; val[timestamp] = this.$store.state.mobildConfig.pageFooter;