Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

yvan.ni
2 parents 6ebe430d c4a20bea
Showing 3 changed files with 53 additions and 7 deletions
app.js
packageE/pages/qy/contactMe/contactMe.js
packageE/pages/user/labels/labels.js
@@ -1460,6 +1460,15 @@ App({
    //-- 获取判断注册成功后，是跳转等级卡，还是新人有礼 --
    async go_to_page(func){
  
+      //如果是从企业专属导购跳过来的话，就要返回专属导购处理页面
+      let qyzsdg = wx.getStorageSync('qyzsdg')  //如果是专属导购
+      if (qyzsdg) {
+        wx.reLaunch({
+          url: `/packageE/pages/qy/contactMe/contactMe?scene=${qyzsdg}`,
+        })
+        return
+      }
+
        //新判断新人有礼
        var res= await getApp().request.promiseGet("/api/weshop/marketing/newpeople/act/judge", {
            data: {
@@ -92,7 +92,21 @@ Page({
         this.setData({
           id: f_arr[2]
         })
-        this.getopenuserid(f_arr[2])
+        //判断是否有注册，如果没有注册必须先注册
+        let userinfo = wx.getStorageSync('userinfo');
+        if (!userinfo) {
+          wx.setStorageSync('qyzsdg', tt.scene)
+          wx.navigateTo({
+            url: '/packageE/pages/togoin/togoin',
+          })
+        }else{
+          wx.removeStorageSync('qyzsdg')
+          this.setData({
+            phone:userinfo.mobile
+          })     
+          this.getopenuserid(f_arr[2])
+        }
+
         // getApp().globalData.groupchat_id = f_arr[2];
       }
  
@@ -145,7 +159,17 @@ Page({
     //   }
     // })
   },
-
+  onShow:function(){
+    let userinfo = wx.getStorageSync('userinfo');
+    if (userinfo) {
+      this.setData({
+        phone:userinfo.mobile
+      })
+    }
+    if (this.data.id) {
+      this.getopenuserid(this.data.id)
+    }
+  },
   getopenuserid(id) {
     let url = `/api/weshop/qyWeChat/qywxStaffcode/get/${id}`
     getApp().request.promiseGet(url, { data: {} }).then(res => {
@@ -158,6 +182,10 @@ Page({
           openuserid,
           skip_verify
         })
+        if (this.data.phone) {
+          
+          this.befgetqy()
+        }
         // if (this.data.phone) {
         //   this.getqy()
         // }
@@ -111,9 +111,14 @@ Page({
     var pages = getCurrentPages();
     var prevPage = pages[pages.length - 2]; //上一个页面
     //直接调用上一个页面的setData()方法，把数据存到上一个页面中去
-    prevPage.setData({
-      is_zy: 1
-    })
+    try {
+      prevPage.setData({
+        is_zy: 1
+      })
+    } catch (error) {
+      
+    }
+
     th.query_nolabels();
     th.get_config();
   },
@@ -291,9 +296,13 @@ Page({
                     }
                   })
                 }else{
-                  wx.reLaunch({
-                    url: '/pages/user/index/index',
+                  getApp().go_to_page(function (){
+                    // wx.navigateBack({ delta: 1 })
+                    wx.reLaunch({
+                      url: '/pages/user/index/index',
+                    })
                   })
+
                 }
  
             },