Merge branch 'master' of http://code.mayi888.com/chengmo/mayi-mp-shop

config/dev.env.js

@@ -7,7 +7,7 @@ module.exports = merge(prodEnv, {//zjgyl
   NODE_ENV: '"development"',
   // BASE_URL:"'https://shop.mayi888.com'", 
   // BASE_URL:"'http://192.168.1.146:3005'",
-  // BASE_URL:"'http://192.168.1.106:3000'",
+  // BASE_URL:"'http://192.168.1.127:3000'",
   BASE_URL:"'https://test-m-shop.mayi888.cn'",
 
   OLSHOP_URL:'"https://test-m-shop.mayi888.cn/innerApi/shopApiService"',

src/pages/contact/index.vue

@@ -4,7 +4,7 @@
             <img src="../../../static/images/contact_img.png" alt="">
         </div>
         <div class="btn-wrap">
-            <button open-type="contact" show-message-card>
+            <button open-type="contact">
                 <div class="btn-main">
                     <div class="main-img">
                         <img src="../../../static/images/wx.png" alt="">

src/pages/index/index.vue

@@ -36,6 +36,7 @@ export default {
       shareLogoUrl: "",
       shareOrderSn: "",
       shareTid: "",
+      shareImgUrl : '',
       sharePageList: [
         "goods/",
         "receivingGift",
@@ -57,6 +58,9 @@ export default {
     this.checkLogin();
 
     this.options = options;
+    console.log('-------')
+    console.log(this.options)
+    console.log('-------')
     if (options.share) {
       //来自分享
       this.link = decodeURIComponent(options.share);
@@ -110,9 +114,12 @@ export default {
       var scene = decodeURIComponent(options.scene); //参数二维码传递过来的参数
       let querys = scene.split("_");
       if (querys) {
-        if (querys[0] == "pid") {
+        if (querys[0] == "goods") {
           //商品详情 pid_123
           this.page = `/goods/${querys[1]}`;
+          this.params += `&spokesmanGroupId=${querys[2]}&spokesmanShopId=${
+            querys[3]
+          }&spokesmanRelId=${querys[4]}&usedId=${querys[5]}`;
         } else if (querys[0] == "activty") {
           //活动页面activty_turntable_123
           this.params += `&pageInfo=${scene}`;
@@ -122,9 +129,16 @@ export default {
           this.params += `&spokesmanGroupId=${querys[1]}&spokesmanShopId=${
             querys[2]
           }&spokesmanRelId=${querys[3]}&usedId=${querys[4]}`;
+        }else if(querys[0] == "home"){
+          this.page = `/`;
+          this.params += `&spokesmanGroupId=${querys[1]}&spokesmanShopId=${
+            querys[2]
+          }&spokesmanRelId=${querys[3]}&usedId=${querys[4]}`;
         }
       }
       console.log(querys, "scene");
+      console.log(this.page)
+      console.log(this.params)
       // var query = options.query.dentistId; // 参数二维码传递过来的场景参数
     }
     console.log("url", this.link + this.page + this.params);
@@ -225,15 +239,17 @@ export default {
       }
     },
     getMessage(res) {
+      console.log(res)
       let len = res.target.data.length - 1;
       console.log(res, "h5消息", res.target.data[len]);
       this.shareShopName = res.target.data[len].shareShopName || "";
       this.shareLogoUrl = DFSImg(res.target.data[len].shareLogoUrl, 500, 400);
+      
       //分享内容中有订单信息为送礼活动
       this.shareOrderSn = res.target.data[len].orderSn;
       this.shareTid = res.target.data[len].shareTid;
-
-      console.log("分享信息：", this.shareLogoUrl, this.shareShopName);
+      this.shareImgUrl = res.target.data[len].shareImgUrl;
+      console.log("分享信息：", this.shareLogoUrl, this.shareShopName,this.shareImgUrl);
     },
     checkPageUrl(val) {
       for (let i = 0; i < this.sharePageList.length; i++) {
@@ -248,6 +264,7 @@ export default {
     console.log("卸载----------------", this.options);
   },
   onShareAppMessage(res) {
+    console.log(res)
     console.log(
       this.shareShopName,
       "share",
@@ -255,7 +272,13 @@ export default {
       "0000",
       this.shareLogoUrl
     );
-    let url = res.webViewUrl;
+    let url = ''
+    if(this.shareImgUrl){
+      url = this.shareImgUrl;
+    }else{
+      url = res.webViewUrl;
+    }
+     
     //分享页面去掉登录态
     if (url.indexOf("sessionid") > -1) {
       url = url.split("?")[0] + "?mixid=" + this.shopId;
@@ -278,7 +301,12 @@ export default {
       }`;
     }
     //增加分销员信息
-    this.shareUrl = url + this.newHref;
+    if(this.hasInvitationStatus == 1){
+      this.shareUrl = url
+    }else{
+      this.shareUrl = url + this.newHref;
+    }
+    
 
     console.log(this.shareUrl, "index12");
     return {

src/pages/wxPay/index.vue

@@ -66,6 +66,10 @@ export default {
                     if (this.options_orderType == 5 && (key == 'gift_be_expire' || key == 'gift_draw')) {
                       tmplIds.push(subscribeMessageObj[key]);
                     }
+                    // 订单发货
+                    if (key == 'order_shipment') {
+                      tmplIds.push(subscribeMessageObj[key]);
+                    }
                   }
 
                   if (tmplIds.length > 0) {