礼包，助力要跳转注册的优化

yvan.ni
1 parent a170b1a3
Showing 12 changed files with 37 additions and 142 deletions
pages/getphone/getphone.js
pages/giftpack/birthdaygift/birthdaygift.js
pages/giftpack/buygiftpack/giftpackbuy.js
pages/giftpack/evaluategift/evaluategift.js
pages/giftpack/festival/festival.js
pages/giftpack/giftpacklist/giftpacklist.js
pages/giftpack/mygiftpack/mygiftpack.js
pages/giftpack/newvipgift/newvipgift.js
pages/user/assistance/assistance.js
pages/user/assistance/friend_assistance.js
pages/user/assistance/giftpacklist.js
pages/user/assistance/task_assistance.js
@@ -26,8 +26,7 @@ Page({
 		if (openid == "" || openid == null || r==null ){
 		      getApp().globalData.user_id=null;
           getApp().globalData.userInfo=null;
-          console.log("openid");
-          wx.navigateTo({ url: '/pages/togoin/togoin', })
+          getApp().goto('/pages/togoin/togoin')
           return false;
     }
     var user_info=getApp().globalData.userInfo;
@@ -115,31 +115,22 @@ Page({
   },
   onLoad: function onLoad(options) {
-    //--先判断会员状态--
-    var user_info = getApp().globalData.userInfo;
-    if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
-      wx.navigateTo({
-        url: '/pages/getphone/getphone',
-      })
-      return false;
-    }
     var th = this;
     th.setData({
       getActId: options.actId,
       giftID: options.giftBagId
     })
-    th.GetList();
+
   },
   onShow: function onShow() {
     //--先判断会员状态--
     var user_info = getApp().globalData.userInfo;
     if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
-      wx.navigateTo({
-        url: '/pages/getphone/getphone',
-      })
+      getApp().goto('/pages/getphone/getphone');
       return false;
     }
+    this.GetList();
   },
   GetReceive: function() {
@@ -28,15 +28,6 @@ Page({
   },
   onLoad: function(options) {
-    //--先判断会员状态--
-    var user_info = getApp().globalData.userInfo;
-    if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
-      wx.navigateTo({
-        url: '/pages/getphone/getphone',
-      })
-      return false;
-    }
-
     var th = this;
     var my_confirm = th.selectComponent("#my_confirm"); //组件的id
     my_confirm.open_cancel(0);
@@ -44,17 +35,16 @@ Page({
       getStorageID: a.stoid,
       getUserID: d.user_id
     })
-    th.getList();
+
   },
   onShow: function() {
     //--先判断会员状态--
     var user_info = getApp().globalData.userInfo;
     if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
-      wx.navigateTo({
-        url: '/pages/getphone/getphone',
-      })
+      getApp().goto('/pages/getphone/getphone');
       return false;
     }
+    this.getList();
   },
@@ -121,15 +121,6 @@ Page({
   },
   onLoad: function(options) {
-    //--先判断会员状态--
-    var user_info = getApp().globalData.userInfo;
-    if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
-      wx.navigateTo({
-        url: '/pages/getphone/getphone',
-      })
-      return false;
-    }
-
     var th = this;
     th.setData({
       getActId: options.actId,
@@ -143,17 +134,17 @@ Page({
       th.setData({ orderType: orderType})
     }
-    th.GetList();
+
   },
   onShow: function() {
     //--先判断会员状态--
     var user_info = getApp().globalData.userInfo;
     if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
-      wx.navigateTo({
-        url: '/pages/getphone/getphone',
-      })
+      getApp().goto('/pages/getphone/getphone');
       return false;
     }
+
+    this.GetList();
   },
   GetReceive: function() {
@@ -118,22 +118,13 @@ Page({
   },
   onLoad: function(options) {
-    //--先判断会员状态--
-    var user_info = getApp().globalData.userInfo;
-    if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
-      wx.navigateTo({
-        url: '/pages/getphone/getphone',
-      })
-      return false;
-    }
     var th = this;
     th.setData({
       getActId: options.actId,
       giftID: options.giftBagId
     })
-    th.is_festival();
-    th.GetList();
+
     wx.setNavigationBarTitle({
       title: "节日有礼",
     });
@@ -142,11 +133,11 @@ Page({
     //--先判断会员状态--
     var user_info = getApp().globalData.userInfo;
     if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
-      wx.navigateTo({
-        url: '/pages/getphone/getphone',
-      })
+      getApp().goto('/pages/getphone/getphone');
       return false;
     }
+    this.is_festival();
+    this.GetList();
   },
   GetReceive: function() {
@@ -30,14 +30,7 @@ Page({
     is_lb: 0, //是否有礼包
   },
   onLoad: function(options) {
-    //--先判断会员状态--
-    var user_info = getApp().globalData.userInfo;
-    if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
-      wx.navigateTo({
-        url: '/pages/getphone/getphone',
-      })
-      return false;
-    }
+
     var th = this;
     th.setData({
@@ -45,23 +38,23 @@ Page({
       getGiftID: options.lbId,
       orderSn: options.orderSn
     })
-    if (options.isBuy == 0) {
-      th.GetMyGiftList();
-    } else {
-      th.GetBuyGiftList();
-    }
+
     th.close();
   },
   onShow: function() {
     //--先判断会员状态--
     var user_info = getApp().globalData.userInfo;
     if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
-      wx.navigateTo({
-        url: '/pages/getphone/getphone',
-      })
+      getApp().goto('/pages/getphone/getphone');
       return false;
     }
+    if (this.data.isBuy == 0) {
+      this.GetMyGiftList();
+    } else {
+      this.GetBuyGiftList();
+    }
+
   },
   GetBuyPrice: function(e) {
     var that = this.data;
@@ -28,14 +28,6 @@ Page({
   },
   onLoad: function(options) {
-    //--先判断会员状态--
-    var user_info = getApp().globalData.userInfo;
-    if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
-      wx.navigateTo({
-        url: '/pages/getphone/getphone',
-      })
-      return false;
-    }
     var th = this;
     th.setData({
@@ -44,17 +36,16 @@ Page({
       loadingType: 0,
       getDate: i.formatTime(new Date().getTime())
     })
-    th.getList();
+
   },
   onShow: function() {
     //--先判断会员状态--
     var user_info = getApp().globalData.userInfo;
     if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
-      wx.navigateTo({
-        url: '/pages/getphone/getphone',
-      })
+      getApp().goto('/pages/getphone/getphone');
       return false;
     }
+    this.getList();
   },
   getList: function() {
@@ -114,30 +114,22 @@ Page({
   },
   onLoad: function(options) {
-    //--先判断会员状态--
-    var user_info = getApp().globalData.userInfo;
-    if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
-      wx.navigateTo({
-        url: '/pages/getphone/getphone',
-      })
-      return false;
-    }
+
     var th = this;
     th.setData({
       getActId: options.actId,
       giftID: options.giftBagId
     })
-    th.GetList();
+
   },
   onShow: function() {
     //--先判断会员状态--
     var user_info = getApp().globalData.userInfo;
     if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
-      wx.navigateTo({
-        url: '/pages/getphone/getphone',
-      })
+      getApp().goto('/pages/getphone/getphone');
       return false;
     }
+    this.GetList();
   },
   GetReceive: function() {
@@ -35,15 +35,6 @@ Page({
    */
   onLoad: function(options) {
-    //--先判断会员状态--
-    var user_info = getApp().globalData.userInfo;
-    if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
-      wx.navigateTo({
-        url: '/pages/getphone/getphone',
-      })
-      return false;
-    }
-
     var th = this;
     var nav_b = th.selectComponent("#nav_b"); //组件的id
     nav_b.set_name("助力", "/pages/user/assistance/assistance");
@@ -58,15 +49,13 @@ Page({
     //--先判断会员状态--
     var user_info = getApp().globalData.userInfo;
     if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
-      wx.navigateTo({
-        url: '/pages/getphone/getphone',
-      })
+      getApp().goto('/pages/getphone/getphone');
       return false;
     }
     var th = this;
     // 助力活动
-    th.assistance();
+    this.assistance();
   },
   // 助力活动
   assistance() {
@@ -29,15 +29,6 @@ Page({
 	 */
 	onLoad: function(options) {
-		//--先判断会员状态--
-		var user_info = getApp().globalData.userInfo;
-		if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
-			wx.navigateTo({
-				url: '/pages/getphone/getphone',
-			})
-			return false;
-		}
-
 		var th = this;
 		var nav_b = th.selectComponent("#nav_b"); //组件的id
@@ -49,7 +40,6 @@ Page({
 		if (this.data.tasking == 0 || this.data.tasking == undefined) {
             this.data.tasking = decodeURIComponent(options.scene);
 		}
-		getApp().getUserFir(function() {});
 	},
@@ -67,9 +57,7 @@ Page({
 		//--先判断会员状态--
 		var user_info = getApp().globalData.userInfo;
 		if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
-			wx.navigateTo({
-				url: '/pages/getphone/getphone',
-			})
+			getApp().goto('/pages/getphone/getphone');
 			return false;
 		}
@@ -39,15 +39,6 @@ Page({
   },
   onLoad: function(options) {
-    //--先判断会员状态--
-    var user_info = getApp().globalData.userInfo;
-    if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
-      wx.navigateTo({
-        url: '/pages/getphone/getphone',
-      })
-      return false;
-    }
-
     var th = this;
     if (options.is_libao == 0) {
       th.setData({
@@ -80,9 +71,7 @@ Page({
     //--先判断会员状态--
     var user_info = getApp().globalData.userInfo;
     if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
-      wx.navigateTo({
-        url: '/pages/getphone/getphone',
-      })
+      getApp().goto('/pages/getphone/getphone');
       return false;
     }
@@ -69,14 +69,7 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-    //--先判断会员状态--
-    var user_info = getApp().globalData.userInfo;
-    if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
-      wx.navigateTo({
-        url: '/pages/getphone/getphone',
-      })
-      return false;
-    }
+
     var th = this;
     var help_id = options.help_id;
     var nav_b = th.selectComponent("#nav_b"); //组件的id
@@ -147,9 +140,7 @@ Page({
     //--先判断会员状态--
     var user_info = getApp().globalData.userInfo;
     if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
-      wx.navigateTo({
-        url: '/pages/getphone/getphone',
-      })
+      getApp().goto('/pages/getphone/getphone');
       return false;
     }