优化

config/xhyx_uat.env.js

@@ -16,7 +16,7 @@ module.exports = merge(prodEnv, {//zjgyl
   // BASE_URL:"'https://shop.mayi888.com'", 
   // BASE_URL:"'http://192.168.1.146:3005'",
   // BASE_URL:"'http://172.16.1.18:3000'",
-  BASE_URL:"'https://uat-m.xinhuabest.com'",
+  BASE_URL:"'http://192.168.18.176:3000'",
   ADMIN_URL:"'http://uat.admin.xinhuabest.com'",
   GUIDE_URL:"'http://uat.guide.xinhuabest.com'",
   // BASE_URL:"'http://192.168.137.1:3004'",

src/App.vue

@@ -15,8 +15,8 @@ export default {
     console.log(extConfig, "-----------extConfig");
     if (JSON.stringify(extConfig) == "{}") {
       let shopItem = {
-        // development: { mixid: "ssa", "shopid": 2342}, //五粮液uat
-        development: { mixid: "antgood", "shopid": 67},
+        development: { mixid: "ssa", "shopid": 2342}, //五粮液uat
+        // development: { mixid: "antgood", "shopid": 67},
         // production: { "mixid":"qiyeCT", "shopid": 1045 }, // 道可
         // production: { "mixid":"metasense_doctors", "shopid": 1238 }, // 册为医护端
         production: { "mixid":"3QqsFT", "shopid": 1337 },

src/components/paySuccess/paySuccessInfo.vue

@@ -191,6 +191,9 @@ export default {
     },
     orderSn() {
       return this.render?this.routeQuery.orderSn:'----------'
+    },
+    orderSns() {
+      return this.render?this.routeQuery.orderSns:'----------'
     }
   },
   onLoad() {
@@ -217,7 +220,8 @@ export default {
     toOrderDetail() {
       if (!this.render) return;
       console.log("查看详情");
-      let url = `/pages/index/main?from=home&backpath=${encodeURIComponent(`/order/orderDetail?orderSn=${this.orderSn}&isReplace=true`)}}`
+      let h5Url = this.routeQuery.multiMerchantsFlag == 1 ? encodeURIComponent(`/order/orderList`) : encodeURIComponent(`/order/orderDetail?orderSn=${this.orderSn}&isReplace=true`);
+      let url = `/pages/index/main?from=home&backpath=${h5Url}}`
       wx.redirectTo({
         url,
       });

src/components/restaurantList/index.vue

@@ -85,10 +85,10 @@ export default {
     computed: {
       merchantAddress() {
         const {
-          provinceName,
-          cityName,
-          areaName,
-          address
+          provinceName="",
+          cityName="",
+          areaName="",
+          address=""
         } = this.sourceData
         return provinceName + cityName + areaName + address
       }
@@ -141,7 +141,7 @@ export default {
         })
       },
       orderNow(){
-      let url = 'https://uat-zanmall-m.cipmp.com/#/pages/restaurantInfo/index?restaurantId=' + this.sourceData.id
+      let url = 'https://uat-zanmall-m.cipmp.com/#/pages/restaurantInfo/index?restaurantId=' + this.sourceData.id + `${wx.getStorageSync("sessionid")?`&sessionid=${wx.getStorageSync("sessionid")}`:''}`
       console.log(url,"立即预订的接口地址");
       let link = "/pages/wxArticle/main?link=" + encodeURIComponent(url);
         app.$themeToLink({

src/pages/paySuccess/index.vue

@@ -182,7 +182,9 @@ export default {
     console.log(options, "--paySuccess-onLoad");
     this.query.orderSn = options.orderSn;
     this.routeQuery = options;
-    this.orderMsg();
+    if (this.routeQuery.multiMerchantsFlag != 1) {
+      this.orderMsg();
+    }
     this.setGiftsKey(); //设置码表
     this.getIsReceiveGift()
     // 获取页面数据