Просмотр исходного кода

options.otherParam = util.copyObj(options.otherParam.replace(/'/g, '"'))

姜永辉 1 год назад
Родитель
Сommit
45e631bced
2 измененных файлов с 20 добавлено и 17 удалено
  1. 17 16
      pages/home-page/home-page.js
  2. 3 1
      pages/welcome/welcome.js

+ 17 - 16
pages/home-page/home-page.js

@@ -456,6 +456,7 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+    console.log("homepage", options, options.otherParam);
     const gradeCode = app.globalData.company.gradeCode;
     this.setData({
       freeVersionFlag: gradeCode === 'STD'
@@ -632,8 +633,8 @@ Page({
     })
     // 本周本月数据
     this.tauchSwiper('swiperList');
-     // 查询广告数据
-     this.getAdvertisement();
+    // 查询广告数据
+    this.getAdvertisement();
 
     // options 中的 scene  todo.. 先不要删除日志
     if (options.scene) {
@@ -661,39 +662,39 @@ Page({
         }
       })
     }
- 
+
     //小程序推送消息传过来的值 pages/login/login?loginType=1&otherParam=值
     // loginType 
-    // 1 客户任务通知  2 邀约进店 3 约尺 4 5 接待或跟进   
-    // 6 量尺   
+    // 1 客户任务通知  2 邀约进店 3 约尺 4 5 接待或跟进   6 量尺   
     else if (options.loginType == 1) {
-      // options.otherParam = util.copyObj(options.otherParam.replace(/'/g, '"'))    
+      // options.otherParam = options.otherParam.replace(/'/g, '"')    
       // wx.navigateTo({
       //   url: '/package3/pages/customer-follow-up/detail/detail?item=' + encodeURIComponent(options.otherParam),
       // })
     }
     else if (options.loginType == 2) {
-      options.otherParam = util.copyObj(options.otherParam.replace(/'/g, '"'))
-      // 邀约进店 
-      wx.navigateTo({        
+      options.otherParam =  options.otherParam.replace(/'/g, '"')
+      // 邀约进店  // 后台闯过来 是字符串
+      wx.navigateTo({
         url: '/package-basic-data/pages/customer-follow-up/customer-follow-up?loginType=2&item=' + encodeURIComponent(options.otherParam),
       })
-    } 
+    }
     else if (options.loginType == 3) {
-      // 3 约尺
-      options.otherParam = util.copyObj(options.otherParam.replace(/'/g, '"')) 
+      // 3 约尺 // 后台闯过来 是字符串 
+      options.otherParam =  options.otherParam.replace(/'/g, '"')
       wx.navigateTo({
         url: '/package-basic-data/pages/customer-reception/measure-to/measure-to?loginType= 3' + '&item=' + encodeURIComponent(options.otherParam),
       })
-    }     
+    }
     else if (options.loginType == 4) {
-      options.otherParam = util.copyObj(options.otherParam.replace(/'/g, '"'))
+      // 后台闯过来 是字符串
+      options.otherParam = options.otherParam.replace(/'/g, '"')
       // 4 5 接待或跟进       
-      wx.navigateTo({        
+      wx.navigateTo({
         url: '/package-basic-data/pages/customer-follow-up/customer-follow-up?item=' + encodeURIComponent(options.otherParam),
       })
     }
-
+    // options.otherParam = util.copyObj(options.otherParam.replace(/'/g, '"')) 
   },
 
   /** 

+ 3 - 1
pages/welcome/welcome.js

@@ -429,7 +429,9 @@ Page({
                             })
                         } else {
                             wx.reLaunch({
-                                url: '../../pages/home-page/home-page?loginType=' + this.data.loginType,
+                                url: '../../pages/home-page/home-page?loginType=' 
+                                + this.data.loginType
+                                + '&otherParam=' + this.data.otherParam,
                             })
                         }
                     }