diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json index 6531799..38b0b25 100644 --- a/.hbuilderx/launch.json +++ b/.hbuilderx/launch.json @@ -7,8 +7,8 @@ "type" : "uni-app:app-ios" }, { - "customPlaygroundType" : "device", - "playground" : "standard", + "customPlaygroundType" : "local", + "playground" : "custom", "type" : "uni-app:app-android" } ] diff --git a/manifest.json b/manifest.json index 28786b9..52bd228 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "美融融商家", "appid" : "__UNI__BBE6285", "description" : "同城便捷到家美业“技术外卖”服务、同城预约到店服务平台美融融为同城爱美人群提供更优质的更全面的服务。", - "versionName" : "1.0.21", - "versionCode" : 1021, + "versionName" : "1.0.22", + "versionCode" : 1022, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/pages/home/home.vue b/pages/home/home.vue index 9faed40..81d957a 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -185,7 +185,7 @@ - + @@ -270,11 +270,7 @@ export default { displayScore: 0, animationTimer: null, - noticeList: [{ - id: 0, - title: '', - url: '' - }], + noticeList: [], quickActions: [{ name: '扫码验券', diff --git a/pages/shop/add-service.vue b/pages/shop/add-service.vue index d3538aa..26d8a49 100644 --- a/pages/shop/add-service.vue +++ b/pages/shop/add-service.vue @@ -372,7 +372,7 @@ export default { this.formData.id = options.id; this.getInit(); } else { - request.post("/sj/firstclass", {}).then((res) => { + request.post("/sj/firstclass", { id: uni.getStorageSync("sjId") }).then((res) => { this.serviceTypes = this.serviceTypes.concat(res.data); }); } @@ -539,7 +539,7 @@ export default { this.formData.video = null; }, async getInit() { - const firstclass = await request.post("/sj/firstclass"); + const firstclass = await request.post("/sj/firstclass", { id: uni.getStorageSync("sjId") }); this.serviceTypes = this.serviceTypes.concat(firstclass.data); await request diff --git a/pages/shop/qualification_sj_change.vue b/pages/shop/qualification_sj_change.vue index f8720a8..b028216 100644 --- a/pages/shop/qualification_sj_change.vue +++ b/pages/shop/qualification_sj_change.vue @@ -225,7 +225,7 @@ - 行业资质 + 行业资质 diff --git a/utils/request.js b/utils/request.js index a177c79..d09f5bc 100644 --- a/utils/request.js +++ b/utils/request.js @@ -120,14 +120,14 @@ const request = async (options, isUpdate) => { if (process.env.NODE_ENV === "development") { baseURL = url; // 发布到生产环境时,此处代码会被摇树移除掉。 - baseURL = "http://test.mrrwlkj.top"; // 发布到生产环境时,此处代码会被摇树移除掉。 + // baseURL = "http://test.mrrwlkj.top"; // 发布到生产环境时,此处代码会被摇树移除掉。 // baseURL = 'http://dev.mrrwlkj.top'; // 发布到生产环境时,此处代码会被摇树移除掉。 - // baseURL = "https://app.mrrweb.com.cn"; + baseURL = "https://app.mrrweb.com.cn"; } else { baseURL = url; // 发布到生产环境时,此处代码会被摇树移除掉。 - baseURL = "http://test.mrrwlkj.top"; // 发布到生产环境时,此处代码会被摇树移除掉。 + // baseURL = "http://test.mrrwlkj.top"; // 发布到生产环境时,此处代码会被摇树移除掉。 // baseURL = 'http://dev.mrrwlkj.top'; // 发布到生产环境时,此处代码会被摇树移除掉。 - // baseURL = "https://app.mrrweb.com.cn"; + baseURL = "https://app.mrrweb.com.cn"; console.log("生产环境"); }