wk450097098
/
mrr.sj.front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'mrr_sj_develop_丁杰_20260413_pricer' of https://gitee.com/qtvbidt/mrr.sj.front into mrr_sj_develop_丁杰_20260413_pricer

This commit is contained in:
BAKEYi 2026-05-20 16:45:10 +08:00
parent d5690bc51b 4e21e22bdf
commit 624888f58c
4 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifest.json
View File

@ -2,8 +2,8 @@
"name" : "美融融商家", "name" : "美融融商家",
"appid" : "__UNI__BBE6285", "appid" : "__UNI__BBE6285",
"description" : "同城便捷到家美业“技术外卖”服务、同城预约到店服务平台美融融为同城爱美人群提供更优质的更全面的服务。", "description" : "同城便捷到家美业“技术外卖”服务、同城预约到店服务平台美融融为同城爱美人群提供更优质的更全面的服务。",
"versionName" : "1.0.15", "versionName" : "1.0.16",
"versionCode" : 1015, "versionCode" : 1016,
"transformPx" : false, "transformPx" : false,
/* 5+App特有相关 */ /* 5+App特有相关 */
"app-plus" : { "app-plus" : {

3
pages/shop/add-img-text.vue
View File

@ -121,7 +121,8 @@
onLoad(options) { onLoad(options) {
console.log(options) console.log(options)
if(options.list){ if(options.list){
this.list = JSON.parse(options.list) const parsed = JSON.parse(options.list)
this.list = Array.isArray(parsed) ? parsed : []
console.log(this.list) console.log(this.list)
} }
}, },

6
pages/shop/add-service.vue
View File

@ -576,7 +576,7 @@
this.categoryAll = result.data; this.categoryAll = result.data;
this.categoryAll.filter((e, i) => { this.categoryAll.filter((e, i) => {
if (e.id == this.formData.second_class_id) { if (e.id == this.formData.second_class_id) {
this.selectedCategoryIndex = i; this.selectedCategoryIndex = [i];
this.category = e.title; this.category = e.title;
} }
}); });
@ -913,6 +913,8 @@
this.formData.first_class_id = selectedType.id; this.formData.first_class_id = selectedType.id;
this.serviceType = selectedType.title; this.serviceType = selectedType.title;
this.ratio = selectedType.ratio; this.ratio = selectedType.ratio;
this.formData.second_class_id = "";
this.category = "";
let id = selectedType.id; let id = selectedType.id;
request request
.post("/user/secondclass", { .post("/user/secondclass", {
@ -926,6 +928,8 @@
this.categoryAll = res.data; this.categoryAll = res.data;
this.showCategory = true; this.showCategory = true;
this.selectedCategoryIndex = [0]; this.selectedCategoryIndex = [0];
// this.formData.second_class_id = res.data[0].id;
// this.category = res.data[0].title;
} }
}); });
}, },

8
utils/request.js
View File

@ -134,13 +134,13 @@ const request = async (options, isUpdate) => {
if (process.env.NODE_ENV === 'development') { if (process.env.NODE_ENV === 'development') {
//baseURL = url; // 发布到生产环境时，此处代码会被摇树移除掉。 baseURL = url; // 发布到生产环境时，此处代码会被摇树移除掉。
baseURL = 'http://60.247.146.5:93'; // 发布到生产环境时，此处代码会被摇树移除掉。 //baseURL = 'http://60.247.146.5:93'; // 发布到生产环境时，此处代码会被摇树移除掉。
//baseURL = 'http://60.247.146.5:96'; // 发布到生产环境时，此处代码会被摇树移除掉。 //baseURL = 'http://60.247.146.5:96'; // 发布到生产环境时，此处代码会被摇树移除掉。
//baseURL = 'https://app.mrrweb.com.cn'; //baseURL = 'https://app.mrrweb.com.cn';
} else { } else {
//baseURL = url; // 发布到生产环境时，此处代码会被摇树移除掉。 baseURL = url; // 发布到生产环境时，此处代码会被摇树移除掉。
baseURL = 'http://60.247.146.5:93'; // 发布到生产环境时，此处代码会被摇树移除掉。 //baseURL = 'http://60.247.146.5:93'; // 发布到生产环境时，此处代码会被摇树移除掉。
//baseURL = 'http://60.247.146.5:96'; // 发布到生产环境时，此处代码会被摇树移除掉。 //baseURL = 'http://60.247.146.5:96'; // 发布到生产环境时，此处代码会被摇树移除掉。
//baseURL = 'https://app.mrrweb.com.cn'; //baseURL = 'https://app.mrrweb.com.cn';