五粮液

build/webpack.dev.conf.js

@@ -82,6 +82,15 @@ module.exports = merge(baseWebpackConfig, {
     //   inject: true
     // }),
     new FriendlyErrorsPlugin(),
-    // new UglifyJsPlugin({ sourceMap: true })
+    // new UglifyJsPlugin({
+    //   sourceMap: true,
+    //   uglifyOptions: {
+    //     compress: {
+    //       warnings: false,
+    //       drop_console: true,
+    //       pure_funcs: ['console.log']
+    //     }
+    //   }
+    // })
   ]
 })

config/dev.env.js

@@ -26,7 +26,8 @@ module.exports = merge(prodEnv, {//zjgyl
   IMG_DOMAIN: '"http://test-bucket-ant.oss-cn-shanghai.aliyuncs.com"',
   POSTHOG_KEY: '"phc_nTr1oY7NkSuDMZsqCskE6iUIGKgWPmFHlRAKFVuZD2B"',
   POSTHOG_HOST: '"https://posthog.mayi118.com"',
-  AREA_JSON: '"https://mayi-newshop.oss-cn-shanghai.aliyuncs.com/static/js/app.area.json"'
+  AREA_JSON: '"https://mayi-newshop.oss-cn-shanghai.aliyuncs.com/static/js/app.area.json"',
+  WLY_PROD_MARKETING: '"https://uat-zanmall-m.cipmp.com"'
   // IMG_DOMAIN: '"http://cdn.mayi888.com"',
 
 })

config/index.js

@@ -38,6 +38,7 @@ module.exports = {
         production: require('./prod.env'),
         xhyx_uat: require('./xhyx_uat.env'),
         xhyx_prod: require('./xhyx_prod.env'),
+        wly_prod: require('./wly_prod.env'),
       }
       return configFile[process.env.NODE_ENV];
     })(),

config/wly_prod.env.js

+/*
+ * @Author: your name
+ * @Date: 2020-10-21 09:46:59
+ * @LastEditTime: 2020-10-22 14:09:41
+ * @LastEditors: Please set LastEditors
+ * @Description: In User Settings Edit
+ * @FilePath: \mayi-mp-shop\config\dev.env.js
+ */
+var merge = require('webpack-merge')
+var prodEnv = require('./prod.env')
+
+
+module.exports = merge(prodEnv, {//zjgyl
+  SHOP_MIXID:"'WLYSWT'",
+  NODE_ENV: '"wly_prod"',
+  // 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://swt.wuliangye.com.cn:1443'",
+  ADMIN_URL:"'https://swt.wuliangye.com.cn:1443'",
+  GUIDE_URL:"'https://swt.wuliangye.com.cn:1443'",
+  // BASE_URL:"'http://192.168.137.1:3004'",
+
+  OLSHOP_URL:'"https://swt.wuliangye.com.cn:1443/innerApi/shopApiService"',
+  // OLSHOP_URL:'"https://shop.mayi888.com/innerApi/shopApiService"',
+  IMG_DOMAIN: '"https://swt.wuliangye.com.cn:1443"',
+  POSTHOG_KEY: '"phc_nTr1oY7NkSuDMZsqCskE6iUIGKgWPmFHlRAKFVuZD2B"',
+  POSTHOG_HOST: '"https://posthog.mayi118.com"',
+  AREA_JSON: '"https://new-xhyx-uat.oss-cn-zhangjiakou.aliyuncs.com/public/json/f7746156-6329-4130-b724-eda06215ddea.json"',
+  WLY_PROD_MARKETING: '"https://swt.wuliangye.com.cn:1443/marketing"'
+  // IMG_DOMAIN: '"http://cdn.mayi888.com"',
+
+})

package.json

@@ -13,6 +13,7 @@
     "build:xhyx_prod": "cross-env NODE_ENV=xhyx_prod node build/build.js wx",
     "test:wx": "cross-env NODE_ENV=development node build/build.js wx",
     "test:xhyx_uat": "cross-env NODE_ENV=xhyx_uat node build/build.js wx",
+    "build:wly_prod": "cross-env NODE_ENV=wly_prod node build/build.js wx",
     "dev:swan": "node build/dev-server.js swan",
     "start:swan": "npm run dev:swan",
     "build:swan": "node build/build.js swan",

src/App.vue

@@ -27,6 +27,7 @@ export default {
         // production: { "mixid":"5BkDRR", "shopid": 1316 }, // lost in echo订货
         xhyx_uat: { "mixid":"xhyxshop", "shopid": 1 },
         xhyx_prod: { "mixid":"antgood", "shopid": 67 },
+        wly_prod: { "mixid":"WLYSWT", "shopid": 2 }
       }
       extConfig = shopItem[process.env.NODE_ENV];
       wx.setStorageSync("extConfig", JSON.stringify(extConfig));

src/components/restaurantList/index.vue

@@ -8,7 +8,7 @@
           <i class="iconfont icon-tubiao_jiyao-xiangyou"></i>
         </div>
       </div>
-      <div v-if="isLoading && showList">
+      <div v-if="!isLoading && showList">
         <image class="picture" :src="sourceData.restaurantLogo" mode="aspectFill" alt="" />
         <div class="title_box">
           <div class="title_text">{{ sourceData.restaurantName }}</div>
@@ -33,7 +33,7 @@
           <div class="right_btn" @click="orderNow">立即预订</div>
         </div>
       </div>
-      <div class="noList" v-else>
+      <div class="noList" v-else-if="!isLoading">
         <image src="http://cdn.mayi888.com/public/jpg/0aac085c-aa79-4ef2-94c8-7bce73f94943.jpg" mode="widthFix" />
         <p class="info">当前城市暂无入驻商家，敬请期待</p>
       </div>
@@ -92,10 +92,11 @@ export default {
         }
         console.log('定位数据', res)
         goods.getWlyList(query).then((res) => {
+          console.log(res,'---res')
           _this.isLoading = false;
-          if (res.code == 200 && res.data) {
+          if (res.data.code == 200 && res.data.data) {
             _this.showList = true;
-            _this.sourceData = data;
+            _this.sourceData = res.data.data;
             console.log(_this.sourceData, "商家数据");
           } else {
             _this.showList = false;
@@ -108,6 +109,7 @@ export default {
       },
       fail: function (err) {
         _this.isLoading = false;
+        _this.showList = true;
         console.log('定位失败', err)
         wx.showModal({
           title: '提示',
@@ -125,7 +127,7 @@ export default {
   },
   methods: {
     viewMore() {
-      let url = "/pages/wxArticle/main?link=" + encodeURIComponent("https://uat-zanmall-m.cipmp.com/#/pages/restaurantList/index");
+      let url = "/pages/wxArticle/main?link=" + encodeURIComponent(process.env.WLY_PROD_MARKETING+"/#/pages/restaurantList/index");
       app.$themeToLink({
         type: 1.2,
         link: url
@@ -137,7 +139,7 @@ export default {
       })
     },
     orderNow() {
-      let url = 'https://uat-zanmall-m.cipmp.com/#/pages/restaurantInfo/index?restaurantId=' + this.sourceData.id + `${wx.getStorageSync("sessionid") ? `&sessionid=${wx.getStorageSync("sessionid")}` : ''}`
+      let url = process.env.WLY_PROD_MARKETING + '/#/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({

static/vant/tabs/index.wxml

@@ -30,6 +30,7 @@
             bind:tap="onTap"
           >
             <view class="{{ ellipsis ? 'van-ellipsis' : '' }}" style="{{ item.titleStyle }}">
+              <view>主标签</view>
               {{ item.title }}
               <van-info
                 wx:if="{{ item.info !== null || item.dot }}"