Commit 335483078212da4b4723832d9858e105c40909ee
chen合并冲突
Showing
2 changed files
with
343 additions
and
195 deletions
packageE/pages/qy/contactMe/contactMe.js
| @@ -12,90 +12,90 @@ Page({ | @@ -12,90 +12,90 @@ Page({ | ||
| 12 | first_leader: '', //-- 邀请人 -- | 12 | first_leader: '', //-- 邀请人 -- |
| 13 | config2: null, | 13 | config2: null, |
| 14 | sub: 0, | 14 | sub: 0, |
| 15 | - phone:'', | ||
| 16 | - id:"", | ||
| 17 | - openuserid:'', | ||
| 18 | - skip_verify:1, | ||
| 19 | - error_arr:{ | ||
| 20 | - '81012':'缺失可见范围', | ||
| 21 | - '81013':'UserID、部门ID、标签ID全部非法或无权限', | ||
| 22 | - '40031':'不合法的UserID列表', | ||
| 23 | - '0032': '不合法的UserID列表长度', | ||
| 24 | - '40058':'不合法的参数', | ||
| 25 | - '40063':'参数为空', | ||
| 26 | - '40094':'不合法的URL', | ||
| 27 | - '40096':'不合法的外部联系人userid', | ||
| 28 | - '40099':'外部联系人的数量已达上限', | ||
| 29 | - '40100':'此用户的外部联系人已经在转移流程中', | ||
| 30 | - '40125':'无效的openuserid参数', | ||
| 31 | - '41001':'缺少access_token参数', | ||
| 32 | - '41009':'缺少userid参数', | ||
| 33 | - '41010':'缺少url参数', | ||
| 34 | - '41035':'缺少外部联系人userid参数', | ||
| 35 | - "41037":'缺少「联系我」type参数', | ||
| 36 | - "41038":'缺少「联系我」scene参数', | ||
| 37 | - "41039":'无效的「联系我」type参数', | ||
| 38 | - "41040":'无效的「联系我」scene参数', | ||
| 39 | - "41041":'「联系我」使用人数超过限制', | ||
| 40 | - "41042":'无效的「联系我」style参数', | ||
| 41 | - "41043":'缺少「联系我」config_id参数', | ||
| 42 | - "41044":'无效的「联系我」config_id参数', | ||
| 43 | - "41045":'API添加「联系我」达到数量上限', | ||
| 44 | - "42001":'access_token已过期', | ||
| 45 | - '43009': '企业未验证主体', | ||
| 46 | - '45009': '接口调用超过限制', | ||
| 47 | - '45022': '应用name参数长度不符合系统限制', | ||
| 48 | - '45024': '帐号数量超过上限', | ||
| 49 | - '45034': 'url必须有协议头', | ||
| 50 | - '46004': '指定的用户不存在', | ||
| 51 | - '48001': 'API功能未授权', | ||
| 52 | - '48002': 'API接口无权限调用', | ||
| 53 | - '48003': '不合法的suite_id', | ||
| 54 | - '48004': '授权关系无效', | ||
| 55 | - '48005': 'API接口已废弃', | ||
| 56 | - '48006': '接口权限被收回', | ||
| 57 | - '60102': 'UserID已存在', | ||
| 58 | - '670010': '负责人数量超出限制', | ||
| 59 | - '81014': '标签添加成员，单次添加user或party过多', | ||
| 60 | - '82001':' 指定的成员/部门/标签全部为空', | ||
| 61 | - '84072': '应用未配置客服', | ||
| 62 | - '84073': '客服userid不在应用配置的客服列表中', | ||
| 63 | - '84074': '没有外部联系人权限', | ||
| 64 | - '84075': '不合法或过期的authcode', | ||
| 65 | - '84076': '缺失authcode', | ||
| 66 | - '84083': '非服务人员', | ||
| 67 | - '84084': '非跟进用户', | ||
| 68 | - '84085': '应用已下架', | ||
| 69 | - '84144': '确认者的gid不在当前服务商的通讯录中', | ||
| 70 | - '84145': '确认者gid所在的企业数不能超过5个', | ||
| 71 | - '84146': '确认者gid最多只能在3个企业下确认合同', | ||
| 72 | - '86001': '参数 chatid 不合法', | ||
| 73 | - '86003': '参数 chatid 不存在', | ||
| 74 | - '86004': '参数 群名不合法', | ||
| 75 | - '86005': '参数 群主不合法', | ||
| 76 | - '86006': '群成员数过多或过少', | ||
| 77 | - '86007': '不合法的群成员', | 15 | + phone: '', |
| 16 | + id: "", | ||
| 17 | + openuserid: '', | ||
| 18 | + skip_verify: 1, | ||
| 19 | + error_arr: { | ||
| 20 | + '81012': '缺失可见范围', | ||
| 21 | + '81013': 'UserID、部门ID、标签ID全部非法或无权限', | ||
| 22 | + '40031': '不合法的UserID列表', | ||
| 23 | + '0032': '不合法的UserID列表长度', | ||
| 24 | + '40058': '不合法的参数', | ||
| 25 | + '40063': '参数为空', | ||
| 26 | + '40094': '不合法的URL', | ||
| 27 | + '40096': '不合法的外部联系人userid', | ||
| 28 | + '40099': '外部联系人的数量已达上限', | ||
| 29 | + '40100': '此用户的外部联系人已经在转移流程中', | ||
| 30 | + '40125': '无效的openuserid参数', | ||
| 31 | + '41001': '缺少access_token参数', | ||
| 32 | + '41009': '缺少userid参数', | ||
| 33 | + '41010': '缺少url参数', | ||
| 34 | + '41035': '缺少外部联系人userid参数', | ||
| 35 | + "41037": '缺少「联系我」type参数', | ||
| 36 | + "41038": '缺少「联系我」scene参数', | ||
| 37 | + "41039": '无效的「联系我」type参数', | ||
| 38 | + "41040": '无效的「联系我」scene参数', | ||
| 39 | + "41041": '「联系我」使用人数超过限制', | ||
| 40 | + "41042": '无效的「联系我」style参数', | ||
| 41 | + "41043": '缺少「联系我」config_id参数', | ||
| 42 | + "41044": '无效的「联系我」config_id参数', | ||
| 43 | + "41045": 'API添加「联系我」达到数量上限', | ||
| 44 | + "42001": 'access_token已过期', | ||
| 45 | + '43009': '企业未验证主体', | ||
| 46 | + '45009': '接口调用超过限制', | ||
| 47 | + '45022': '应用name参数长度不符合系统限制', | ||
| 48 | + '45024': '帐号数量超过上限', | ||
| 49 | + '45034': 'url必须有协议头', | ||
| 50 | + '46004': '指定的用户不存在', | ||
| 51 | + '48001': 'API功能未授权', | ||
| 52 | + '48002': 'API接口无权限调用', | ||
| 53 | + '48003': '不合法的suite_id', | ||
| 54 | + '48004': '授权关系无效', | ||
| 55 | + '48005': 'API接口已废弃', | ||
| 56 | + '48006': '接口权限被收回', | ||
| 57 | + '60102': 'UserID已存在', | ||
| 58 | + '670010': '负责人数量超出限制', | ||
| 59 | + '81014': '标签添加成员，单次添加user或party过多', | ||
| 60 | + '82001': ' 指定的成员/部门/标签全部为空', | ||
| 61 | + '84072': '应用未配置客服', | ||
| 62 | + '84073': '客服userid不在应用配置的客服列表中', | ||
| 63 | + '84074': '没有外部联系人权限', | ||
| 64 | + '84075': '不合法或过期的authcode', | ||
| 65 | + '84076': '缺失authcode', | ||
| 66 | + '84083': '非服务人员', | ||
| 67 | + '84084': '非跟进用户', | ||
| 68 | + '84085': '应用已下架', | ||
| 69 | + '84144': '确认者的gid不在当前服务商的通讯录中', | ||
| 70 | + '84145': '确认者gid所在的企业数不能超过5个', | ||
| 71 | + '84146': '确认者gid最多只能在3个企业下确认合同', | ||
| 72 | + '86001': '参数 chatid 不合法', | ||
| 73 | + '86003': '参数 chatid 不存在', | ||
| 74 | + '86004': '参数 群名不合法', | ||
| 75 | + '86005': '参数 群主不合法', | ||
| 76 | + '86006': '群成员数过多或过少', | ||
| 77 | + '86007': '不合法的群成员', | ||
| 78 | }, | 78 | }, |
| 79 | }, | 79 | }, |
| 80 | onLoad: function (tt) { | 80 | onLoad: function (tt) { |
| 81 | // tt.scene="0_0_16" | 81 | // tt.scene="0_0_16" |
| 82 | if (tt && tt.scene) { | 82 | if (tt && tt.scene) { |
| 83 | - var first_leader_str = decodeURIComponent(tt.scene); | ||
| 84 | - var f_arr = first_leader_str.split("_"); | ||
| 85 | - // first_leader = f_arr[0] && parseFloat(f_arr[0]) > 0 ? f_arr[0] : null; | ||
| 86 | - //注册门店 | ||
| 87 | - // if (f_arr[1] && parseFloat(f_arr[1]) > 0) { | ||
| 88 | - // getApp().globalData.store_number = f_arr[1]; | 83 | + var first_leader_str = decodeURIComponent(tt.scene); |
| 84 | + var f_arr = first_leader_str.split("_"); | ||
| 85 | + // first_leader = f_arr[0] && parseFloat(f_arr[0]) > 0 ? f_arr[0] : null; | ||
| 86 | + //注册门店 | ||
| 87 | + // if (f_arr[1] && parseFloat(f_arr[1]) > 0) { | ||
| 88 | + // getApp().globalData.store_number = f_arr[1]; | ||
| 89 | // } | 89 | // } |
| 90 | //企业微信群id | 90 | //企业微信群id |
| 91 | - if (f_arr && f_arr[2] && parseFloat(f_arr[2]) > 0) { | 91 | + if (f_arr && f_arr[2] && parseFloat(f_arr[2]) > 0) { |
| 92 | this.setData({ | 92 | this.setData({ |
| 93 | - id:f_arr[2] | 93 | + id: f_arr[2] |
| 94 | }) | 94 | }) |
| 95 | this.getopenuserid(f_arr[2]) | 95 | this.getopenuserid(f_arr[2]) |
| 96 | - // getApp().globalData.groupchat_id = f_arr[2]; | 96 | + // getApp().globalData.groupchat_id = f_arr[2]; |
| 97 | } | 97 | } |
| 98 | - | 98 | + |
| 99 | } | 99 | } |
| 100 | // if (wx.getUserProfile) { | 100 | // if (wx.getUserProfile) { |
| 101 | // this.setData({ | 101 | // this.setData({ |
| @@ -146,12 +146,13 @@ Page({ | @@ -146,12 +146,13 @@ Page({ | ||
| 146 | // }) | 146 | // }) |
| 147 | }, | 147 | }, |
| 148 | 148 | ||
| 149 | - getopenuserid(id){ | ||
| 150 | - let url=`/api/weshop/qyWeChat/qywxStaffcode/get/${id}` | ||
| 151 | - getApp().request.promiseGet(url,{data:{}}).then(res => { | 149 | + getopenuserid(id) { |
| 150 | + let url = `/api/weshop/qyWeChat/qywxStaffcode/get/${id}` | ||
| 151 | + getApp().request.promiseGet(url, { data: {} }).then(res => { | ||
| 152 | console.log(res); | 152 | console.log(res); |
| 153 | if (res.data.code == 0) { | 153 | if (res.data.code == 0) { |
| 154 | // let resdata=JSON.parse(res.data.data); | 154 | // let resdata=JSON.parse(res.data.data); |
| 155 | +<<<<<<< HEAD | ||
| 155 | let openuserid=res.data.data.openuserid; | 156 | let openuserid=res.data.data.openuserid; |
| 156 | let skip_verify=res.data.data.skip_verify; | 157 | let skip_verify=res.data.data.skip_verify; |
| 157 | this.setData({ | 158 | this.setData({ |
| @@ -168,16 +169,37 @@ Page({ | @@ -168,16 +169,37 @@ Page({ | ||
| 168 | }) | 169 | }) |
| 169 | let openuserid=this.data.openuserid | 170 | let openuserid=this.data.openuserid |
| 170 | let skip_verify=this.data.skip_verify ? true : false | 171 | let skip_verify=this.data.skip_verify ? true : false |
| 172 | +======= | ||
| 173 | + let openuserid = res.data.data.openuserid; | ||
| 174 | + let skip_verify = res.data.data.skip_verify; | ||
| 175 | + this.setData({ | ||
| 176 | + openuserid, | ||
| 177 | + skip_verify | ||
| 178 | + }) | ||
| 179 | + // if (this.data.phone) { | ||
| 180 | + // this.getqy() | ||
| 181 | + // } | ||
| 182 | + } | ||
| 183 | + }) | ||
| 184 | + }, | ||
| 185 | + async getqy() { | ||
| 186 | + // wx.showLoading({ | ||
| 187 | + // title: '加载中', | ||
| 188 | + // mask:true | ||
| 189 | + // }) | ||
| 190 | + let openuserid = this.data.openuserid | ||
| 191 | + let skip_verify = this.data.skip_verify ? true : false | ||
| 192 | +>>>>>>> dev_oa_chen9 | ||
| 171 | let res = await getApp().request.promisePost(`/apib/weshop/admin/qyWeChat/qyWeChatCorpInfo/postAdminQyApi?accdb=${this.data.store.erpid}&url=externalcontact/add_contact_way`, { | 193 | let res = await getApp().request.promisePost(`/apib/weshop/admin/qyWeChat/qyWeChatCorpInfo/postAdminQyApi?accdb=${this.data.store.erpid}&url=externalcontact/add_contact_way`, { |
| 172 | data: { | 194 | data: { |
| 173 | // accdb: getApp().globalData.config.erpid, | 195 | // accdb: getApp().globalData.config.erpid, |
| 174 | // ApiName: 'api.pos.shop.advancesum.seek', | 196 | // ApiName: 'api.pos.shop.advancesum.seek', |
| 175 | // url:'externalcontact/add_contact_way', | 197 | // url:'externalcontact/add_contact_way', |
| 176 | - user:openuserid, | ||
| 177 | - type:1, | ||
| 178 | - scene:2, | ||
| 179 | - style:1, | ||
| 180 | - state:'手店_'+this.data.phone, | 198 | + user: openuserid, |
| 199 | + type: 1, | ||
| 200 | + scene: 2, | ||
| 201 | + style: 1, | ||
| 202 | + state: '手店_' + this.data.phone, | ||
| 181 | skip_verify | 203 | skip_verify |
| 182 | // is_temp:true, | 204 | // is_temp:true, |
| 183 | // store_id: getApp().globalData.setting.stoid, | 205 | // store_id: getApp().globalData.setting.stoid, |
| @@ -191,21 +213,22 @@ Page({ | @@ -191,21 +213,22 @@ Page({ | ||
| 191 | is_json: 1 | 213 | is_json: 1 |
| 192 | }) | 214 | }) |
| 193 | wx.hideLoading() | 215 | wx.hideLoading() |
| 194 | - if(res.data && res.data.errcode==0){ | 216 | + if (res.data && res.data.errcode == 0) { |
| 195 | this.setData({ | 217 | this.setData({ |
| 196 | - qr_code:res.data.qr_code | 218 | + qr_code: res.data.qr_code |
| 197 | }) | 219 | }) |
| 198 | - }else{ | ||
| 199 | - let errcode=res.data.errcode | ||
| 200 | - let msg=errcode | 220 | + this.saveqy(res.data.config_id, res.data.qr_code) |
| 221 | + } else { | ||
| 222 | + let errcode = res.data.errcode | ||
| 223 | + let msg = errcode | ||
| 201 | if (this.data.error_arr[errcode]) { | 224 | if (this.data.error_arr[errcode]) { |
| 202 | - msg+=this.data.error_arr[errcode] | 225 | + msg += this.data.error_arr[errcode] |
| 203 | } | 226 | } |
| 204 | wx.showModal({ | 227 | wx.showModal({ |
| 205 | title: '提示', | 228 | title: '提示', |
| 206 | - content: '获取失败,错误码:'+msg, | ||
| 207 | - showCancel:false, | ||
| 208 | - success (res) { | 229 | + content: '获取失败,错误码:' + msg, |
| 230 | + showCancel: false, | ||
| 231 | + success(res) { | ||
| 209 | if (res.confirm) { | 232 | if (res.confirm) { |
| 210 | console.log('用户点击确定') | 233 | console.log('用户点击确定') |
| 211 | } else if (res.cancel) { | 234 | } else if (res.cancel) { |
| @@ -222,41 +245,111 @@ Page({ | @@ -222,41 +245,111 @@ Page({ | ||
| 222 | getphone: function (e) { | 245 | getphone: function (e) { |
| 223 | //接下来写业务代码登录 | 246 | //接下来写业务代码登录 |
| 224 | console.log(e); | 247 | console.log(e); |
| 225 | - // return | ||
| 226 | e = e.detail; | 248 | e = e.detail; |
| 227 | if (e.code == undefined) { | 249 | if (e.code == undefined) { |
| 228 | this.setData({ show_bind: 0 }) | 250 | this.setData({ show_bind: 0 }) |
| 229 | return app.my_warnning("登录需要授权手机号码！", 0, this); | 251 | return app.my_warnning("登录需要授权手机号码！", 0, this); |
| 230 | return false; | 252 | return false; |
| 231 | } | 253 | } |
| 232 | - // var sessionKey = getApp().globalData.sessionKey; | ||
| 233 | - var req_data = { | ||
| 234 | - js_code: e.code, | ||
| 235 | - store_id: getApp().globalData.setting.stoid, | ||
| 236 | - } | ||
| 237 | - //-- 获取一下手机 --/api/weshop/users/getCodeMobile?store_id=1&js_code=b8451556dd98b2eebec5aa6775625bce192a68fc1a4b15b0c6bf3ed046f90da4 | ||
| 238 | - getApp().request.promiseGet("/api/weshop/users/getCodeMobile", { data: req_data }).then(res => { | ||
| 239 | - // console.log('手机号码'); | ||
| 240 | - // console.log(res); | ||
| 241 | - if (res.data.code == 0) { | ||
| 242 | - let resdata=JSON.parse(res.data.data); | ||
| 243 | - this.setData({ | ||
| 244 | - phone:resdata.phoneNumber | ||
| 245 | - }) | ||
| 246 | - this.getqy() | ||
| 247 | - // getApp().globalData.zc_dd = dd; | ||
| 248 | - // wx.redirectTo({ | ||
| 249 | - // url: "/packageA/pages/profile/profile?is_back=1" | ||
| 250 | - // }) | 254 | + |
| 255 | + var that =this; | ||
| 256 | + app.request.get("/api/weshop/manager/managerConfig/get", { | ||
| 257 | + data: { | ||
| 258 | + storeId: getApp().globalData.setting.stoid | ||
| 259 | + }, | ||
| 260 | + success: function (res2) { | ||
| 261 | + if (res2.data.code == 0) { | ||
| 262 | + var sessionKey = getApp().globalData.sessionKey; | ||
| 263 | + if (res2.data.data.is_newphone == 1) { | ||
| 264 | + | ||
| 265 | + var req_data = { | ||
| 266 | + sessionKey: sessionKey, | ||
| 267 | + code: e.code, | ||
| 268 | + isNewPhone: 1, | ||
| 269 | + store_id: getApp().globalData.setting.stoid, | ||
| 270 | + } | ||
| 271 | + }else{ | ||
| 272 | + var req_data = { | ||
| 273 | + sessionKey: sessionKey, | ||
| 274 | + encryptedData: e.encryptedData, | ||
| 275 | + iv: e.iv, | ||
| 276 | + store_id: getApp().globalData.setting.stoid, | ||
| 277 | + } | ||
| 278 | + } | ||
| 279 | + | ||
| 280 | + | ||
| 281 | + //-- 获取一下手机 --/api/weshop/users/getCodeMobile?store_id=1&js_code=b8451556dd98b2eebec5aa6775625bce192a68fc1a4b15b0c6bf3ed046f90da4 | ||
| 282 | + getApp().request.promiseGet("/api/weshop/users/getmobile", { data: req_data }).then(res => { | ||
| 283 | + // console.log('手机号码'); | ||
| 284 | + // console.log(res); | ||
| 285 | + if (res.data.code == 0) { | ||
| 286 | + let resdata = JSON.parse(res.data.data); | ||
| 287 | + that.setData({ | ||
| 288 | + phone: resdata.phoneNumber | ||
| 289 | + }) | ||
| 290 | + that.befgetqy() | ||
| 291 | + // getApp().globalData.zc_dd = dd; | ||
| 292 | + // wx.redirectTo({ | ||
| 293 | + // url: "/packageA/pages/profile/profile?is_back=1" | ||
| 294 | + // }) | ||
| 295 | + } | ||
| 296 | + }) | ||
| 297 | + // var sessionKey = getApp().globalData.sessionKey; | ||
| 298 | + // var openid = getApp().globalData.openid; | ||
| 299 | + // var r = getApp().globalData.getu; | ||
| 300 | + // this.save_the_data(r, e, sessionKey, openid) | ||
| 301 | + | ||
| 302 | + | ||
| 303 | + } else { | ||
| 304 | + return app.my_warnning("授权登入失败,请稍后再试!", 0, that); | ||
| 305 | + } | ||
| 306 | + }, | ||
| 307 | + failStatus: function (t) { | ||
| 308 | + return app.my_warnning("授权登入失败,请稍后再试!", 0, that); | ||
| 309 | + }, | ||
| 310 | + fail: function (t) { | ||
| 311 | + return i.clearAuth(), i.alertLoginErrorAndGoHome(), !1; | ||
| 251 | } | 312 | } |
| 252 | - }) | 313 | + }); |
| 253 | 314 | ||
| 254 | - // var sessionKey = getApp().globalData.sessionKey; | ||
| 255 | - // var openid = getApp().globalData.openid; | ||
| 256 | - // var r = getApp().globalData.getu; | ||
| 257 | - // this.save_the_data(r, e, sessionKey, openid) | ||
| 258 | }, | 315 | }, |
| 316 | + async befgetqy() { | ||
| 317 | + wx.showLoading({ | ||
| 318 | + title: '加载中', | ||
| 319 | + mask: true | ||
| 320 | + }) | ||
| 321 | + let openuserid = this.data.openuserid | ||
| 322 | + let res = await getApp().request.promiseGet(`/api/weshop/qyWeChat/qywxConfigList/getMobileInfo/${getApp().globalData.setting.stoid}/${openuserid}/${this.data.phone}`, { data: {} }) | ||
| 323 | + console.log('获取数据库表'); | ||
| 324 | + console.log(res); | ||
| 325 | + if (res.data && res.data.code == 0) { | ||
| 326 | + this.setData({ | ||
| 327 | + qr_code: res.data.data.qrcode | ||
| 328 | + }) | ||
| 329 | + wx.hideLoading() | ||
| 330 | + } else { | ||
| 331 | + this.getqy() | ||
| 332 | + } | ||
| 259 | 333 | ||
| 334 | + }, | ||
| 335 | + async saveqy(config_id, qrcode) { | ||
| 336 | + let openuserid = this.data.openuserid | ||
| 337 | + let mobile = this.data.phone | ||
| 338 | + let addtime = ((Date.now()) / 1000).toFixed(0) | ||
| 339 | + let req_data = { | ||
| 340 | + store_id: getApp().globalData.setting.stoid, | ||
| 341 | + openuserid, | ||
| 342 | + config_id, | ||
| 343 | + qrcode, | ||
| 344 | + mobile, | ||
| 345 | + addtime | ||
| 346 | + } | ||
| 347 | + let res = await getApp().request.promisePost(`/api/weshop/qyWeChat/qywxConfigList/save`, { | ||
| 348 | + data: req_data, | ||
| 349 | + // is_json: 1 | ||
| 350 | + }) | ||
| 351 | + // wx.hideLoading() | ||
| 352 | + }, | ||
| 260 | 353 | ||
| 261 | //-- 会员授权 -- | 354 | //-- 会员授权 -- |
| 262 | bindGetUserInfo: function (ee) { | 355 | bindGetUserInfo: function (ee) { |
packageE/pages/togoin/togoin.js
| @@ -134,7 +134,7 @@ Page({ | @@ -134,7 +134,7 @@ Page({ | ||
| 134 | app.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + e.data.data.user_id, {}).then(res => { | 134 | app.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + e.data.data.user_id, {}).then(res => { |
| 135 | if (res.data.code == 0) { | 135 | if (res.data.code == 0) { |
| 136 | getApp().globalData.guide_id = res.data.data.id; | 136 | getApp().globalData.guide_id = res.data.data.id; |
| 137 | - getApp().globalData.guide_pick_id= res.data.data.pickup_id | 137 | + getApp().globalData.guide_pick_id = res.data.data.pickup_id |
| 138 | } | 138 | } |
| 139 | }) | 139 | }) |
| 140 | 140 | ||
| @@ -191,93 +191,148 @@ Page({ | @@ -191,93 +191,148 @@ Page({ | ||
| 191 | 191 | ||
| 192 | save_the_data: async function (r, e, sessionKey, openid) { | 192 | save_the_data: async function (r, e, sessionKey, openid) { |
| 193 | var app = getApp(), a = app, th = this; | 193 | var app = getApp(), a = app, th = this; |
| 194 | - var dd = { | ||
| 195 | - oauth: "miniapp", | ||
| 196 | - nickname: a.clear_word(r.nickName), | ||
| 197 | - head_pic: r.avatarUrl, | ||
| 198 | - sex: r.gender, | ||
| 199 | - terminal: "miniapp", | ||
| 200 | - sessionKey: sessionKey, | ||
| 201 | - openid: openid, | ||
| 202 | - encryptedData: e.encryptedData, | ||
| 203 | - iv: e.iv, | ||
| 204 | - store_id: getApp().globalData.setting.stoid, | ||
| 205 | - }; | ||
| 206 | - //--如果有邀请人的时候-- | ||
| 207 | - if (th.data.first_leader) { | ||
| 208 | - dd.first_leader = th.data.first_leader; | ||
| 209 | - } | ||
| 210 | - //-- 导购会员ID -- | ||
| 211 | - if (getApp().globalData.guide_id) { | ||
| 212 | - dd.guide_id = getApp().globalData.guide_id; | ||
| 213 | - } | ||
| 214 | 194 | ||
| 215 | - //门店的扫描识别码 | ||
| 216 | - if (getApp().globalData.store_number) { | ||
| 217 | - dd.SunCode = encodeURIComponent(getApp().globalData.store_number.trim()); | ||
| 218 | - } | 195 | + app.request.get("/api/weshop/manager/managerConfig/get", { |
| 196 | + data: { | ||
| 197 | + storeId: getApp().globalData.setting.stoid | ||
| 198 | + }, | ||
| 199 | + success: function (res2) { | ||
| 200 | + if (res2.data.code == 0) { | ||
| 201 | + if (res2.data.data.is_newphone == 1) { | ||
| 202 | + var dd = { | ||
| 203 | + oauth: "miniapp", | ||
| 204 | + nickname: a.clear_word(r.nickName), | ||
| 205 | + head_pic: r.avatarUrl, | ||
| 206 | + sex: r.gender, | ||
| 207 | + terminal: "miniapp", | ||
| 208 | + sessionKey: sessionKey, | ||
| 209 | + openid: openid, | ||
| 210 | + code: e.code, | ||
| 211 | + isNewPhone: 1, | ||
| 212 | + store_id: getApp().globalData.setting.stoid, | ||
| 213 | + }; | ||
| 214 | + } else { | ||
| 215 | + var dd = { | ||
| 216 | + oauth: "miniapp", | ||
| 217 | + nickname: a.clear_word(r.nickName), | ||
| 218 | + head_pic: r.avatarUrl, | ||
| 219 | + sex: r.gender, | ||
| 220 | + terminal: "miniapp", | ||
| 221 | + sessionKey: sessionKey, | ||
| 222 | + openid: openid, | ||
| 223 | + encryptedData: e.encryptedData, | ||
| 224 | + iv: e.iv, | ||
| 225 | + store_id: getApp().globalData.setting.stoid, | ||
| 226 | + }; | ||
| 227 | + } | ||
| 219 | 228 | ||
| 220 | - console.log("-----会员注册的信息-------"); | ||
| 221 | - console.log(dd); | ||
| 222 | 229 | ||
| 230 | + //--如果有邀请人的时候-- | ||
| 231 | + if (th.data.first_leader) { | ||
| 232 | + dd.first_leader = th.data.first_leader; | ||
| 233 | + } | ||
| 234 | + //-- 导购会员ID -- | ||
| 235 | + if (getApp().globalData.guide_id) { | ||
| 236 | + dd.guide_id = getApp().globalData.guide_id; | ||
| 237 | + } | ||
| 223 | 238 | ||
| 224 | - var need_go = 0; | ||
| 225 | - //如果有需要完善的信息没有完善，就需要跳转 | ||
| 226 | - if (th.data.name_need_go) { need_go = 1; } | ||
| 227 | - if (th.data.birth_need_go) { need_go = 1; } | ||
| 228 | - if (th.data.idcard_need_go) { need_go = 1; } | ||
| 229 | - if (th.data.address_need_go) { need_go = 1; } | ||
| 230 | - if (th.data.pick_need_go) { need_go = 1; } | ||
| 231 | - if (th.data.sex_need_go) { need_go = 1; } | ||
| 232 | - if (th.data.introducer_need_go) { need_go = 1; } | 239 | + //门店的扫描识别码 |
| 240 | + if (getApp().globalData.store_number) { | ||
| 241 | + dd.SunCode = encodeURIComponent(getApp().globalData.store_number.trim()); | ||
| 242 | + } | ||
| 233 | 243 | ||
| 234 | - if (need_go) { | 244 | + console.log("-----会员注册的信息-------"); |
| 245 | + console.log(dd); | ||
| 235 | 246 | ||
| 236 | - var req_data = { | ||
| 237 | - sessionKey: sessionKey, | ||
| 238 | - encryptedData: e.encryptedData, | ||
| 239 | - iv: e.iv, | ||
| 240 | - store_id: getApp().globalData.setting.stoid, | ||
| 241 | - } | ||
| 242 | - //-- 获取一下手机 -- | ||
| 243 | - getApp().request.promiseGet("/api/weshop/users/getmobile", { data: req_data }).then(res => { | ||
| 244 | - if (res.data.code == 0) { | ||
| 245 | - dd.mobile = res.data.data; | ||
| 246 | - getApp().globalData.zc_dd = dd; | ||
| 247 | - wx.redirectTo({ | ||
| 248 | - url: "/packageA/pages/profile/profile?is_back=1" | ||
| 249 | - }) | ||
| 250 | - } | ||
| 251 | - }) | ||
| 252 | 247 | ||
| 253 | - } else { | ||
| 254 | - if (th.data.is_lable_set) { | ||
| 255 | - var req_data = { | ||
| 256 | - sessionKey: sessionKey, | ||
| 257 | - encryptedData: e.encryptedData, | ||
| 258 | - iv: e.iv, | ||
| 259 | - store_id: getApp().globalData.setting.stoid, | ||
| 260 | - } | ||
| 261 | - //-- 获取一下手机 -- | ||
| 262 | - getApp().request.promiseGet("/api/weshop/users/getmobile", { data: req_data }).then(res => { | ||
| 263 | - if (res.data.code == 0) { | ||
| 264 | - dd.mobile = res.data.data; | ||
| 265 | - getApp().globalData.zc_dd = dd; | ||
| 266 | - wx.redirectTo({ | ||
| 267 | - url: "/packageE/pages/user/labels/labels?pageType=1" | 248 | + var need_go = 0; |
| 249 | + //如果有需要完善的信息没有完善，就需要跳转 | ||
| 250 | + if (th.data.name_need_go) { need_go = 1; } | ||
| 251 | + if (th.data.birth_need_go) { need_go = 1; } | ||
| 252 | + if (th.data.idcard_need_go) { need_go = 1; } | ||
| 253 | + if (th.data.address_need_go) { need_go = 1; } | ||
| 254 | + if (th.data.pick_need_go) { need_go = 1; } | ||
| 255 | + if (th.data.sex_need_go) { need_go = 1; } | ||
| 256 | + if (th.data.introducer_need_go) { need_go = 1; } | ||
| 257 | + | ||
| 258 | + if (need_go) { | ||
| 259 | + | ||
| 260 | + if (res2.data.data.is_newphone == 1) { | ||
| 261 | + var req_data = { | ||
| 262 | + sessionKey: sessionKey, | ||
| 263 | + code: e.code, | ||
| 264 | + isNewPhone: 1, | ||
| 265 | + store_id: getApp().globalData.setting.stoid, | ||
| 266 | + } | ||
| 267 | + }else{ | ||
| 268 | + var req_data = { | ||
| 269 | + sessionKey: sessionKey, | ||
| 270 | + encryptedData: e.encryptedData, | ||
| 271 | + iv: e.iv, | ||
| 272 | + store_id: getApp().globalData.setting.stoid, | ||
| 273 | + } | ||
| 274 | + } | ||
| 275 | + //-- 获取一下手机 -- | ||
| 276 | + getApp().request.promiseGet("/api/weshop/users/getmobile", { data: req_data }).then(res => { | ||
| 277 | + if (res.data.code == 0) { | ||
| 278 | + dd.mobile = res.data.data; | ||
| 279 | + getApp().globalData.zc_dd = dd; | ||
| 280 | + wx.redirectTo({ | ||
| 281 | + url: "/packageA/pages/profile/profile?is_back=1" | ||
| 282 | + }) | ||
| 283 | + } | ||
| 268 | }) | 284 | }) |
| 285 | + | ||
| 286 | + } else { | ||
| 287 | + if (th.data.is_lable_set) { | ||
| 288 | + if (res2.data.data.is_newphone == 1) { | ||
| 289 | + var req_data = { | ||
| 290 | + sessionKey: sessionKey, | ||
| 291 | + code: e.code, | ||
| 292 | + isNewPhone: 1, | ||
| 293 | + store_id: getApp().globalData.setting.stoid, | ||
| 294 | + } | ||
| 295 | + }else{ | ||
| 296 | + var req_data = { | ||
| 297 | + sessionKey: sessionKey, | ||
| 298 | + encryptedData: e.encryptedData, | ||
| 299 | + iv: e.iv, | ||
| 300 | + store_id: getApp().globalData.setting.stoid, | ||
| 301 | + } | ||
| 302 | + } | ||
| 303 | + | ||
| 304 | + //-- 获取一下手机 -- | ||
| 305 | + getApp().request.promiseGet("/api/weshop/users/getmobile", { data: req_data }).then(res => { | ||
| 306 | + if (res.data.code == 0) { | ||
| 307 | + dd.mobile = res.data.data; | ||
| 308 | + getApp().globalData.zc_dd = dd; | ||
| 309 | + wx.redirectTo({ | ||
| 310 | + url: "/packageE/pages/user/labels/labels?pageType=1" | ||
| 311 | + }) | ||
| 312 | + } | ||
| 313 | + }) | ||
| 314 | + } else { | ||
| 315 | + this.setData({ sub: 1 }); | ||
| 316 | + wx.showLoading({ | ||
| 317 | + title: '处理中.', | ||
| 318 | + mask: true | ||
| 319 | + }) | ||
| 320 | + this.zu_ce(dd); //调用注册的函数 | ||
| 321 | + } | ||
| 269 | } | 322 | } |
| 270 | - }) | ||
| 271 | - } else { | ||
| 272 | - this.setData({ sub: 1 }); | ||
| 273 | - wx.showLoading({ | ||
| 274 | - title: '处理中.', | ||
| 275 | - mask: true | ||
| 276 | - }) | ||
| 277 | - this.zu_ce(dd); //调用注册的函数 | ||
| 278 | - } | ||
| 279 | - } | ||
| 280 | 323 | ||
| 324 | + | ||
| 325 | + } else { | ||
| 326 | + return app.my_warnning("授权登入失败,请稍后再试!", 0, that); | ||
| 327 | + } | ||
| 328 | + }, | ||
| 329 | + failStatus: function (t) { | ||
| 330 | + return app.my_warnning("授权登入失败,请稍后再试!", 0, that); | ||
| 331 | + }, | ||
| 332 | + fail: function (t) { | ||
| 333 | + return i.clearAuth(), i.alertLoginErrorAndGoHome(), !1; | ||
| 334 | + } | ||
| 335 | + }); | ||
| 281 | }, | 336 | }, |
| 282 | 337 | ||
| 283 | zu_ce: function (dd) { | 338 | zu_ce: function (dd) { |
| @@ -298,7 +353,7 @@ Page({ | @@ -298,7 +353,7 @@ Page({ | ||
| 298 | app.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + e.data.data.user_id, {}).then(res => { | 353 | app.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + e.data.data.user_id, {}).then(res => { |
| 299 | if (res.data.code == 0) { | 354 | if (res.data.code == 0) { |
| 300 | getApp().globalData.guide_id = res.data.data.id; | 355 | getApp().globalData.guide_id = res.data.data.id; |
| 301 | - getApp().globalData.guide_pick_id= res.data.data.pickup_id | 356 | + getApp().globalData.guide_pick_id = res.data.data.pickup_id |
| 302 | } | 357 | } |
| 303 | }) | 358 | }) |
| 304 | 359 | ||
| @@ -369,7 +424,7 @@ Page({ | @@ -369,7 +424,7 @@ Page({ | ||
| 369 | app.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + e.data.data.user_id, {}).then(res => { | 424 | app.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + e.data.data.user_id, {}).then(res => { |
| 370 | if (res.data.code == 0) { | 425 | if (res.data.code == 0) { |
| 371 | getApp().globalData.guide_id = res.data.data.id; | 426 | getApp().globalData.guide_id = res.data.data.id; |
| 372 | - getApp().globalData.guide_pick_id= res.data.data.pickup_id | 427 | + getApp().globalData.guide_pick_id = res.data.data.pickup_id |
| 373 | } | 428 | } |
| 374 | }) | 429 | }) |
| 375 | 430 |