diff --git a/admin-web-master/dist.zip b/admin-web-master/dist (2).zip index 1668c23..95ccb3f 100644 --- a/admin-web-master/dist.zip +++ b/admin-web-master/dist (2).zip diff --git a/admin-web-master/src/api/business.js b/admin-web-master/src/api/business.js index 7a95d7e..42ea2c5 100644 --- a/admin-web-master/src/api/business.js +++ b/admin-web-master/src/api/business.js @@ -36,7 +36,22 @@ export function businessListUpdate(data) { data }) } - +// 修改个体商家 +export function updateIndividual(data) { + return request({ + url: '/shop/updateIndividual', + method: 'post', + data + }) +} +// 修改企业商家 +export function updateEnterprise(data) { + return request({ + url: '/shop/updateEnterprise', + method: 'post', + data + }) +} // 启停用商家 export function businessListStart(data) { return request({ diff --git a/admin-web-master/src/components/add/addyixiang.vue b/admin-web-master/src/components/add/addyixiang.vue new file mode 100644 index 0000000..c378eff --- /dev/null +++ b/admin-web-master/src/components/add/addyixiang.vue @@ -0,0 +1,571 @@ + + + + diff --git a/admin-web-master/src/utils/request.js b/admin-web-master/src/utils/request.js index 3c6e59d..cfa4e91 100644 --- a/admin-web-master/src/utils/request.js +++ b/admin-web-master/src/utils/request.js @@ -18,12 +18,7 @@ if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1; // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server'; - baseURL = 'http://128.10.250.186:9003'; - - // baseURL = 'http://128.10.249.206:9003'; - - - // baseURL = 'http://128.10.250.204:9003'; + baseURL = 'http://128.10.250.134:9003'; // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1; // baseURL = 'http://192.168.2.225:9003'; diff --git a/admin-web-master/src/views/customer/icReview/index - 副本.vue b/admin-web-master/src/views/customer/icReview/index - 副本.vue new file mode 100644 index 0000000..1b05e19 --- /dev/null +++ b/admin-web-master/src/views/customer/icReview/index - 副本.vue @@ -0,0 +1,1407 @@ + + + + + + diff --git a/admin-web-master/src/views/customer/icReview/index.vue b/admin-web-master/src/views/customer/icReview/index.vue index 1b05e19..b1164f6 100644 --- a/admin-web-master/src/views/customer/icReview/index.vue +++ b/admin-web-master/src/views/customer/icReview/index.vue @@ -1,56 +1,30 @@ - - + - - diff --git a/admin-web-master/src/views/customer/rUser/index.vue b/admin-web-master/src/views/customer/rUser/index.vue index 0f7a431..860894b 100644 --- a/admin-web-master/src/views/customer/rUser/index.vue +++ b/admin-web-master/src/views/customer/rUser/index.vue @@ -47,11 +47,11 @@ - + @@ -59,14 +59,14 @@
查看
- +
评级
-
+
加入黑名单
-
+
取消黑名单
@@ -266,7 +266,7 @@ import merchantInformation from '../../../components/merchantInformation/index.v // 查询 async onSubmit() { const res = await cerePlatformMerchant(this.pageindex) - this.total = res.data.content.length + this.total = res.data.totalElements this.tableData = res.data.content }, @@ -292,8 +292,8 @@ import merchantInformation from '../../../components/merchantInformation/index.v addCheck() { this.$refs.rulePing.validate((valid) => { if (valid) { - this.ruleForm.shopId = this.secondData.shopId - rUserAdd(this.ruleForm) + this.ruleForm.id = this.secondData.id + cerePlatformMerchantedit(this.ruleForm) this.ggXin = false this.getAll() }else{ @@ -328,7 +328,7 @@ import merchantInformation from '../../../components/merchantInformation/index.v }, async sethei(ids, num) { // console.log(ids, num) - await rUserEdit({id:ids,isBlacklist:num}) + await cerePlatformMerchantedit({id:ids,isBlackList:num}) this.getAll() } } diff --git a/admin-web-master/src/views/customer/rsaManagement/index.vue b/admin-web-master/src/views/customer/rsaManagement/index.vue index 3d92df5..1230e54 100644 --- a/admin-web-master/src/views/customer/rsaManagement/index.vue +++ b/admin-web-master/src/views/customer/rsaManagement/index.vue @@ -51,9 +51,13 @@ - - - + + + + +