Commit 1ea391d1132f4810313c78b2ec4b2d006d7f4642
1 parent
eb16625e
日志~~~
Showing
2 changed files
with
22 additions
and
4 deletions
app.js
| 1 | 1 | var t = require("setting.js"), o = require("./utils/auth.js"), a = require("./utils/request.js"), e = require("./utils/common.js"), ut = require("./utils/util.js"); |
| 2 | 2 | var os = t; |
| 3 | 3 | var regeneratorRuntime = require('./utils/runtime.js'); |
| 4 | -var api = require("./api/api.js") | |
| 4 | +var api = require("./api/api.js"); | |
| 5 | + | |
| 6 | +var wxlog = require("./utils/wxlog.js"); | |
| 7 | + | |
| 5 | 8 | |
| 6 | 9 | //公共方法和变量 |
| 7 | 10 | App({ |
| ... | ... | @@ -146,7 +149,7 @@ App({ |
| 146 | 149 | // }) |
| 147 | 150 | // } |
| 148 | 151 | // if(app.globalData.user_id){ //-- 启用默认的user_id -- |
| 149 | - // | |
| 152 | + | |
| 150 | 153 | // app.promiseGet("/api/weshop/users/get/" + app.globalData.setting.stoid + "/" + app.globalData.user_id,{}).then(res=>{ |
| 151 | 154 | // app.globalData.is_get_login=1; |
| 152 | 155 | // if(res.data.code==0){ |
| ... | ... | @@ -154,6 +157,13 @@ App({ |
| 154 | 157 | // wx.setStorageSync("userinfo",app.globalData.userInfo); |
| 155 | 158 | // //刷一下导购 |
| 156 | 159 | // app.promiseGet("/api/weshop/users/getAndUpdateUser/" +app.globalData.setting.stoid + "/" + app.globalData.user_id, {}) |
| 160 | + // //调用接口判断是不是会员 | |
| 161 | + // app.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + res.data.data.user_id, {}).then(rs => { | |
| 162 | + // if (rs.data.code == 0) { | |
| 163 | + // app.globalData.guide_id = rs.data.data.id; | |
| 164 | + // app.globalData.guide_pick_id = rs.data.data.pickup_id | |
| 165 | + // } | |
| 166 | + // }) | |
| 157 | 167 | // } |
| 158 | 168 | // }) |
| 159 | 169 | // } |
| ... | ... | @@ -191,8 +201,13 @@ App({ |
| 191 | 201 | //调用接口判断是不是会员 |
| 192 | 202 | app.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + e.data.data.user_id, {}).then(res => { |
| 193 | 203 | if (res.data.code == 0) { |
| 204 | + | |
| 205 | + wxlog.info('获取到导购:'+res.data.data.id); | |
| 206 | + | |
| 194 | 207 | app.globalData.guide_id = res.data.data.id; |
| 195 | - app.globalData.guide_pick_id = res.data.data.pickup_id | |
| 208 | + app.globalData.guide_pick_id = res.data.data.pickup_id; | |
| 209 | + | |
| 210 | + wxlog.info('globalData中导购id:'+app.globalData.guide_id ); | |
| 196 | 211 | } |
| 197 | 212 | }) |
| 198 | 213 | |
| ... | ... | @@ -204,9 +219,9 @@ App({ |
| 204 | 219 | } |
| 205 | 220 | }) |
| 206 | 221 | //} |
| 207 | - | |
| 208 | 222 | |
| 209 | 223 | } |
| 224 | + | |
| 210 | 225 | wx.getSystemInfo({ |
| 211 | 226 | success: (res) => { |
| 212 | 227 | // console.log(res) | ... | ... |
pages/goods/goodsInfo/goodsInfo.js