wxd / MShopWeApp

Commit 958405e82711a0afead8335879fb9d4763253f2a

Authored by yvan.ni
1 parent a170b1a3

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

Inline Side-by-side
Showing 12 changed files with 37 additions and 142 deletions
pages/getphone/getphone.js
  View file @958405e
... ... @@ -26,8 +26,7 @@ Page({
26 26 if (openid == "" || openid == null || r==null ){
27 27 getApp().globalData.user_id=null;
28 28 getApp().globalData.userInfo=null;
29   - console.log("openid");
30   - wx.navigateTo({ url: '/pages/togoin/togoin', })
  29 + getApp().goto('/pages/togoin/togoin')
31 30 return false;
32 31 }
33 32 var user_info=getApp().globalData.userInfo;
... ...
pages/giftpack/birthdaygift/birthdaygift.js
  View file @958405e
... ... @@ -115,31 +115,22 @@ Page({
115 115 },
116 116  
117 117 onLoad: function onLoad(options) {
118   - //--先判断会员状态--
119   - var user_info = getApp().globalData.userInfo;
120   - if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
121   - wx.navigateTo({
122   - url: '/pages/getphone/getphone',
123   - })
124   - return false;
125   - }
126 118  
127 119 var th = this;
128 120 th.setData({
129 121 getActId: options.actId,
130 122 giftID: options.giftBagId
131 123 })
132   - th.GetList();
  124 +
133 125 },
134 126 onShow: function onShow() {
135 127 //--先判断会员状态--
136 128 var user_info = getApp().globalData.userInfo;
137 129 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
138   - wx.navigateTo({
139   - url: '/pages/getphone/getphone',
140   - })
  130 + getApp().goto('/pages/getphone/getphone');
141 131 return false;
142 132 }
  133 + this.GetList();
143 134  
144 135 },
145 136 GetReceive: function() {
... ...
pages/giftpack/buygiftpack/giftpackbuy.js
  View file @958405e
... ... @@ -28,15 +28,6 @@ Page({
28 28 },
29 29 onLoad: function(options) {
30 30  
31   - //--先判断会员状态--
32   - var user_info = getApp().globalData.userInfo;
33   - if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
34   - wx.navigateTo({
35   - url: '/pages/getphone/getphone',
36   - })
37   - return false;
38   - }
39   -
40 31 var th = this;
41 32 var my_confirm = th.selectComponent("#my_confirm"); //组件的id
42 33 my_confirm.open_cancel(0);
... ... @@ -44,17 +35,16 @@ Page({
44 35 getStorageID: a.stoid,
45 36 getUserID: d.user_id
46 37 })
47   - th.getList();
  38 +
48 39 },
49 40 onShow: function() {
50 41 //--先判断会员状态--
51 42 var user_info = getApp().globalData.userInfo;
52 43 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
53   - wx.navigateTo({
54   - url: '/pages/getphone/getphone',
55   - })
  44 + getApp().goto('/pages/getphone/getphone');
56 45 return false;
57 46 }
  47 + this.getList();
58 48  
59 49 },
60 50  
... ...
pages/giftpack/evaluategift/evaluategift.js
  View file @958405e
... ... @@ -121,15 +121,6 @@ Page({
121 121 },
122 122 onLoad: function(options) {
123 123  
124   - //--先判断会员状态--
125   - var user_info = getApp().globalData.userInfo;
126   - if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
127   - wx.navigateTo({
128   - url: '/pages/getphone/getphone',
129   - })
130   - return false;
131   - }
132   -
133 124 var th = this;
134 125 th.setData({
135 126 getActId: options.actId,
... ... @@ -143,17 +134,17 @@ Page({
143 134 th.setData({ orderType: orderType})
144 135 }
145 136  
146   - th.GetList();
  137 +
147 138 },
148 139 onShow: function() {
149 140 //--先判断会员状态--
150 141 var user_info = getApp().globalData.userInfo;
151 142 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
152   - wx.navigateTo({
153   - url: '/pages/getphone/getphone',
154   - })
  143 + getApp().goto('/pages/getphone/getphone');
155 144 return false;
156 145 }
  146 +
  147 + this.GetList();
157 148  
158 149 },
159 150 GetReceive: function() {
... ...
pages/giftpack/festival/festival.js
  View file @958405e
... ... @@ -118,22 +118,13 @@ Page({
118 118 },
119 119  
120 120 onLoad: function(options) {
121   - //--先判断会员状态--
122   - var user_info = getApp().globalData.userInfo;
123   - if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
124   - wx.navigateTo({
125   - url: '/pages/getphone/getphone',
126   - })
127   - return false;
128   - }
129 121  
130 122 var th = this;
131 123 th.setData({
132 124 getActId: options.actId,
133 125 giftID: options.giftBagId
134 126 })
135   - th.is_festival();
136   - th.GetList();
  127 +
137 128 wx.setNavigationBarTitle({
138 129 title: "节日有礼",
139 130 });
... ... @@ -142,11 +133,11 @@ Page({
142 133 //--先判断会员状态--
143 134 var user_info = getApp().globalData.userInfo;
144 135 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
145   - wx.navigateTo({
146   - url: '/pages/getphone/getphone',
147   - })
  136 + getApp().goto('/pages/getphone/getphone');
148 137 return false;
149 138 }
  139 + this.is_festival();
  140 + this.GetList();
150 141  
151 142 },
152 143 GetReceive: function() {
... ...
pages/giftpack/giftpacklist/giftpacklist.js
  View file @958405e
... ... @@ -30,14 +30,7 @@ Page({
30 30 is_lb: 0, //是否有礼包
31 31 },
32 32 onLoad: function(options) {
33   - //--先判断会员状态--
34   - var user_info = getApp().globalData.userInfo;
35   - if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
36   - wx.navigateTo({
37   - url: '/pages/getphone/getphone',
38   - })
39   - return false;
40   - }
  33 +
41 34  
42 35 var th = this;
43 36 th.setData({
... ... @@ -45,23 +38,23 @@ Page({
45 38 getGiftID: options.lbId,
46 39 orderSn: options.orderSn
47 40 })
48   - if (options.isBuy == 0) {
49   - th.GetMyGiftList();
50   - } else {
51   - th.GetBuyGiftList();
52   - }
  41 +
53 42 th.close();
54 43 },
55 44 onShow: function() {
56 45 //--先判断会员状态--
57 46 var user_info = getApp().globalData.userInfo;
58 47 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
59   - wx.navigateTo({
60   - url: '/pages/getphone/getphone',
61   - })
  48 + getApp().goto('/pages/getphone/getphone');
62 49 return false;
63 50 }
64 51  
  52 + if (this.data.isBuy == 0) {
  53 + this.GetMyGiftList();
  54 + } else {
  55 + this.GetBuyGiftList();
  56 + }
  57 +
65 58 },
66 59 GetBuyPrice: function(e) {
67 60 var that = this.data;
... ...
pages/giftpack/mygiftpack/mygiftpack.js
  View file @958405e
... ... @@ -28,14 +28,6 @@ Page({
28 28 },
29 29  
30 30 onLoad: function(options) {
31   - //--先判断会员状态--
32   - var user_info = getApp().globalData.userInfo;
33   - if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
34   - wx.navigateTo({
35   - url: '/pages/getphone/getphone',
36   - })
37   - return false;
38   - }
39 31  
40 32 var th = this;
41 33 th.setData({
... ... @@ -44,17 +36,16 @@ Page({
44 36 loadingType: 0,
45 37 getDate: i.formatTime(new Date().getTime())
46 38 })
47   - th.getList();
  39 +
48 40 },
49 41 onShow: function() {
50 42 //--先判断会员状态--
51 43 var user_info = getApp().globalData.userInfo;
52 44 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
53   - wx.navigateTo({
54   - url: '/pages/getphone/getphone',
55   - })
  45 + getApp().goto('/pages/getphone/getphone');
56 46 return false;
57 47 }
  48 + this.getList();
58 49  
59 50 },
60 51 getList: function() {
... ...
pages/giftpack/newvipgift/newvipgift.js
  View file @958405e
... ... @@ -114,30 +114,22 @@ Page({
114 114 },
115 115  
116 116 onLoad: function(options) {
117   - //--先判断会员状态--
118   - var user_info = getApp().globalData.userInfo;
119   - if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
120   - wx.navigateTo({
121   - url: '/pages/getphone/getphone',
122   - })
123   - return false;
124   - }
  117 +
125 118 var th = this;
126 119 th.setData({
127 120 getActId: options.actId,
128 121 giftID: options.giftBagId
129 122 })
130   - th.GetList();
  123 +
131 124 },
132 125 onShow: function() {
133 126 //--先判断会员状态--
134 127 var user_info = getApp().globalData.userInfo;
135 128 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
136   - wx.navigateTo({
137   - url: '/pages/getphone/getphone',
138   - })
  129 + getApp().goto('/pages/getphone/getphone');
139 130 return false;
140 131 }
  132 + this.GetList();
141 133  
142 134 },
143 135 GetReceive: function() {
... ...
pages/user/assistance/assistance.js
  View file @958405e
... ... @@ -35,15 +35,6 @@ Page({
35 35 */
36 36 onLoad: function(options) {
37 37  
38   - //--先判断会员状态--
39   - var user_info = getApp().globalData.userInfo;
40   - if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
41   - wx.navigateTo({
42   - url: '/pages/getphone/getphone',
43   - })
44   - return false;
45   - }
46   -
47 38 var th = this;
48 39 var nav_b = th.selectComponent("#nav_b"); //组件的id
49 40 nav_b.set_name("助力", "/pages/user/assistance/assistance");
... ... @@ -58,15 +49,13 @@ Page({
58 49 //--先判断会员状态--
59 50 var user_info = getApp().globalData.userInfo;
60 51 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
61   - wx.navigateTo({
62   - url: '/pages/getphone/getphone',
63   - })
  52 + getApp().goto('/pages/getphone/getphone');
64 53 return false;
65 54 }
66 55  
67 56 var th = this;
68 57 // 助力活动
69   - th.assistance();
  58 + this.assistance();
70 59 },
71 60 // 助力活动
72 61 assistance() {
... ...
pages/user/assistance/friend_assistance.js
  View file @958405e
... ... @@ -29,15 +29,6 @@ Page({
29 29 */
30 30 onLoad: function(options) {
31 31  
32   - //--先判断会员状态--
33   - var user_info = getApp().globalData.userInfo;
34   - if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
35   - wx.navigateTo({
36   - url: '/pages/getphone/getphone',
37   - })
38   - return false;
39   - }
40   -
41 32 var th = this;
42 33  
43 34 var nav_b = th.selectComponent("#nav_b"); //组件的id
... ... @@ -49,7 +40,6 @@ Page({
49 40 if (this.data.tasking == 0 || this.data.tasking == undefined) {
50 41 this.data.tasking = decodeURIComponent(options.scene);
51 42 }
52   - getApp().getUserFir(function() {});
53 43  
54 44 },
55 45  
... ... @@ -67,9 +57,7 @@ Page({
67 57 //--先判断会员状态--
68 58 var user_info = getApp().globalData.userInfo;
69 59 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
70   - wx.navigateTo({
71   - url: '/pages/getphone/getphone',
72   - })
  60 + getApp().goto('/pages/getphone/getphone');
73 61 return false;
74 62 }
75 63  
... ...
pages/user/assistance/giftpacklist.js
  View file @958405e
... ... @@ -39,15 +39,6 @@ Page({
39 39 },
40 40 onLoad: function(options) {
41 41  
42   - //--先判断会员状态--
43   - var user_info = getApp().globalData.userInfo;
44   - if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
45   - wx.navigateTo({
46   - url: '/pages/getphone/getphone',
47   - })
48   - return false;
49   - }
50   -
51 42 var th = this;
52 43 if (options.is_libao == 0) {
53 44 th.setData({
... ... @@ -80,9 +71,7 @@ Page({
80 71 //--先判断会员状态--
81 72 var user_info = getApp().globalData.userInfo;
82 73 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
83   - wx.navigateTo({
84   - url: '/pages/getphone/getphone',
85   - })
  74 + getApp().goto('/pages/getphone/getphone');
86 75 return false;
87 76 }
88 77  
... ...
pages/user/assistance/task_assistance.js
  View file @958405e
... ... @@ -69,14 +69,7 @@ Page({
69 69 * 生命周期函数--监听页面加载
70 70 */
71 71 onLoad: function (options) {
72   - //--先判断会员状态--
73   - var user_info = getApp().globalData.userInfo;
74   - if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
75   - wx.navigateTo({
76   - url: '/pages/getphone/getphone',
77   - })
78   - return false;
79   - }
  72 +
80 73 var th = this;
81 74 var help_id = options.help_id;
82 75 var nav_b = th.selectComponent("#nav_b"); //组件的id
... ... @@ -147,9 +140,7 @@ Page({
147 140 //--先判断会员状态--
148 141 var user_info = getApp().globalData.userInfo;
149 142 if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
150   - wx.navigateTo({
151   - url: '/pages/getphone/getphone',
152   - })
  143 + getApp().goto('/pages/getphone/getphone');
153 144 return false;
154 145 }
155 146  
... ...