Commit 55c86dc9 by 高淑倩

容错

parent 748e4893
{"undefined::component2":false,"undefined::_enableAutoPush":false,"undefined::_appIdList":[],"undefined::uploadTime":"","undefined::packageSize":0,"tinyType":"alipay","tinyCnName":"支付宝","tinyProjectType":"alipay-mini","alipay:alipay-mini:tinyIcon":"https://gw.alipayobjects.com/zos/rmsportal/rcwFIauzePpMqlTzzanK.svg","alipay:alipay-mini:auditLink":null,"alipay:alipay-mini:whiteListLink":null,"alipay:alipay-mini:createLink":null,"alipay:alipay-mini:component2":true,"alipay:alipay-mini:_enableAutoPush":true,"alipay:alipay-mini:_appIdList":[{"appid":"2019091967575819","name":"大禹dev","logoUrl":"https://appstoreisvpic.alipayobjects.com/prod/eebdb2f7-2747-499e-9a22-2b89664d7739.png"}],"alipay:alipay-mini:uploadTime":"2019-09-26 14:47:23","alipay:alipay-mini:packageSize":null,"alipay:alipay-mini:MockStore":{"reLoginErr":"","_loginCode":"b0c491dfd99b4a7fb8f00cb66a9fYX68","_accreditUserInfo":{"code":"10000","msg":"Success","avatar":"https://tfs.alipayobjects.com/images/partner/TB1G5LYXaFzDuNkUuyQXXbFwXXa","city":"上海市","countryCode":"CN","gender":"f","nickName":"大倩。","province":"上海"},"_baseUserInfo":{"token":"f46a67309ff4046b9888b061921e80f6","applyCardUrl":"https%3A%2F%2Fmemberprod.alipay.com%2Faccount%2Fopenform%2Factivecard.htm%3Fapp_id%3D2019091967575819%26template_id%3D20190923000000002110649000300848%26__webview_options__%3DcanPullDown%253dNO%2526transparentTitle%253dauto%26out_string%3Dalipay%26isv_app_id%3D2019080966120777","authToken":"composeBdee8ada4753049749d76df9b562d9X68","member":{"id":"626718288768012288","createTime":"2019-09-26 09:54:43","updateTime":"2019-09-26 09:54:56","code":"770213714001465086","brandId":"1001","mobile":"17521232119","cardNoAlipay":"prex0000000568","alipayUserId":"2088702576494684","alipayAccessToken":"composeB8ccdbe74d55946f5ad4fb11f358a9X68","lock":false,"activateAlipayCardTime":"2019-09-26 09:54:56","level":0},"memberActivateStatus":true},"token":"f46a67309ff4046b9888b061921e80f6","_userInfo":{"code":"10000","msg":"Success","avatar":"https://tfs.alipayobjects.com/images/partner/TB1G5LYXaFzDuNkUuyQXXbFwXXa","city":"上海市","countryCode":"CN","gender":"f","nickName":"大倩。","province":"上海"}},"alipay:alipay-mini:_appId":"2019091967575819","alipay:alipay-mini:_appName":"大禹dev","alipay:alipay-mini:remoteVersion":"0.0.0","alipay:alipay-mini:currentVersion":"0.0.1","alipay:alipay-mini:whiteList":[],"alipay:alipay-mini:h5WhiteList":[],"alipay:alipay-mini:appLogo":"https://appstoreisvpic.alipayobjects.com/prod/eebdb2f7-2747-499e-9a22-2b89664d7739.png","alipay:alipay-mini:userAuthorization":[],"isSimulatorOpen":false,"isNotFirstToggleSimulator":true,"compilerList":[{"title":"普通编译","query":"","page":""},{"title":"积分商城","page":"pages/IntegralMall/IntegralMall"},{"title":"我的消费","page":"pages/mySpend/mySpend"},{"title":"动态子页面_pageId","page":"subPackage/page/pages/subPage/subPage"}],"compilerIndex":0,"alipay:alipay-mini:preAuditLimit":5,"alipay:alipay-mini:preAuditUsed":0,"storageVersion":"0.70.7"}
{"undefined::component2":false,"undefined::_enableAutoPush":false,"undefined::_appIdList":[],"undefined::uploadTime":"","undefined::packageSize":0,"tinyType":"alipay","tinyCnName":"支付宝","tinyProjectType":"alipay-mini","alipay:alipay-mini:tinyIcon":"https://gw.alipayobjects.com/zos/rmsportal/rcwFIauzePpMqlTzzanK.svg","alipay:alipay-mini:auditLink":null,"alipay:alipay-mini:whiteListLink":null,"alipay:alipay-mini:createLink":null,"alipay:alipay-mini:component2":true,"alipay:alipay-mini:_enableAutoPush":true,"alipay:alipay-mini:_appIdList":[{"appid":"2019092667869080","name":"大禹prd"},{"appid":"2019092667878018","name":"大禹qa"},{"appid":"2019091967575819","name":"大禹dev"}],"alipay:alipay-mini:uploadTime":"2019-09-26 19:34:01","alipay:alipay-mini:packageSize":0,"alipay:alipay-mini:MockStore":{"reLoginErr":false},"alipay:alipay-mini:_appId":"2019092667878018","alipay:alipay-mini:_appName":"大禹qa","alipay:alipay-mini:remoteVersion":"0.0.2","alipay:alipay-mini:currentVersion":"0.0.3","alipay:alipay-mini:whiteList":["crm-b.bigaka.net"],"alipay:alipay-mini:h5WhiteList":[],"alipay:alipay-mini:appLogo":"https://appstoreisvpic.alipayobjects.com/prod/427d828a-9326-47b3-8c0a-fb35c4c1c521.png","alipay:alipay-mini:userAuthorization":["userInfo"],"isSimulatorOpen":true,"isNotFirstToggleSimulator":true,"compilerList":[{"title":"普通编译","query":"","page":""},{"title":"积分商城","page":"pages/IntegralMall/IntegralMall"},{"title":"我的消费","page":"pages/mySpend/mySpend"},{"title":"动态子页面_pageId","page":"subPackage/page/pages/subPage/subPage"}],"compilerIndex":0,"alipay:alipay-mini:preAuditLimit":5,"alipay:alipay-mini:preAuditUsed":0,"storageVersion":"0.70.7"}
This source diff could not be displayed because it is too large. You can view the blob instead.
{"tabs":["file:///f%3A/code/7_Eleven_Alipay/pages/couponCodeDetail/couponCodeDetail.js","file:///f%3A/code/7_Eleven_Alipay/pages/integralMallDetail/integralMallDetail.js"],"current":"file:///f%3A/code/7_Eleven_Alipay/pages/couponCodeDetail/couponCodeDetail.js","storageVersion":"0.70.7"}
{"tabs":["file:///f%3A/code/7_Eleven_Alipay/utils/wxService.js","file:///f%3A/code/7_Eleven_Alipay/pages/userCenter/userCenter.js","file:///f%3A/code/7_Eleven_Alipay/component/authorization-modal/authorization-modal.js","file:///f%3A/code/7_Eleven_Alipay/component/personCenter/personCenter.js"],"current":"file:///f%3A/code/7_Eleven_Alipay/component/personCenter/personCenter.js","storageVersion":"0.70.7"}
{"files":["f:\\code\\7_Eleven_Alipay\\pages\\integralMallDetail\\integralMallDetail.js","f:\\code\\7_Eleven_Alipay\\pages\\couponCodeDetail\\couponCodeDetail.json","f:\\code\\7_Eleven_Alipay\\pages\\coupons\\coupons.js","f:\\code\\7_Eleven_Alipay\\pages\\couponCodeDetail\\couponCodeDetail.js","f:\\code\\7_Eleven_Alipay\\pages\\coupons\\coupons.axml","f:\\code\\7_Eleven_Alipay\\pages\\couponDetail\\couponDetail.js","f:\\code\\7_Eleven_Alipay\\component\\exchange-coupon-modal\\exchange-coupon-modal.js","f:\\code\\7_Eleven_Alipay\\pages\\integralMallDetail\\integralMallDetail.axml","f:\\code\\7_Eleven_Alipay\\component\\personCenter\\personCenter.js","f:\\code\\7_Eleven_Alipay\\component\\personCenter\\personCenter.acss","f:\\code\\7_Eleven_Alipay\\pages\\integralMallDetail\\integralMallDetail.json","f:\\code\\7_Eleven_Alipay\\pages\\IntegralMall\\IntegralMall.js","f:\\code\\7_Eleven_Alipay\\pages\\IntegralMall\\IntegralMall.axml","f:\\code\\7_Eleven_Alipay\\pages\\memberOfOwn\\memberOfOwn.acss","f:\\code\\7_Eleven_Alipay\\component\\personCenter\\personCenter.axml","f:\\code\\7_Eleven_Alipay\\pages\\memberOfOwn\\memberOfOwn.axml","f:\\code\\7_Eleven_Alipay\\pages\\memberOfOwn\\memberOfOwn.js","f:\\code\\7_Eleven_Alipay\\pages\\couponDetail\\couponDetail.axml","f:\\code\\7_Eleven_Alipay\\pages\\coupons\\coupons.json","f:\\code\\7_Eleven_Alipay\\pages\\coupons\\coupons.acss","f:\\code\\7_Eleven_Alipay\\pages\\integralWater\\integralWater.acss","f:\\code\\7_Eleven_Alipay\\pages\\integralWater\\integralWater.axml","f:\\code\\7_Eleven_Alipay\\pages\\integralWater\\integralWater.js","f:\\code\\7_Eleven_Alipay\\pages\\userCenter\\userCenter.axml","f:\\code\\7_Eleven_Alipay\\pages\\userCenter\\userCenter.js","f:\\code\\7_Eleven_Alipay\\component\\authorization-modal\\authorization-modal.js","f:\\code\\7_Eleven_Alipay\\utils\\wxService.js","f:\\code\\7_Eleven_Alipay\\component\\authorization-modal\\authorization-modal.axml","f:\\code\\7_Eleven_Alipay\\utils\\util.js","f:\\code\\7_Eleven_Alipay\\utils\\Http.js","f:\\code\\7_Eleven_Alipay\\pages\\userCenter\\userCenter.acss","f:\\code\\7_Eleven_Alipay\\utils\\currentLinkRouter.js","f:\\code\\7_Eleven_Alipay\\utils\\renderPage.js","f:\\code\\7_Eleven_Alipay\\utils\\router.js","f:\\code\\7_Eleven_Alipay\\utils\\common.js","f:\\code\\7_Eleven_Alipay\\subPackage\\page\\pages\\subPage\\subPage.js","f:\\code\\7_Eleven_Alipay\\component\\bottom\\bottom.js","f:\\code\\7_Eleven_Alipay\\subPackage\\page\\pages\\h5\\h5page.js","f:\\code\\7_Eleven_Alipay\\subPackage\\page\\pages\\h5\\h5page.acss","f:\\code\\7_Eleven_Alipay\\app.js","f:\\code\\7_Eleven_Alipay\\component\\picNav\\picNav.js","f:\\code\\7_Eleven_Alipay\\component\\imageSwiper\\imageSwiper.js","f:\\code\\7_Eleven_Alipay\\component\\picNav\\picNav.axml","f:\\code\\7_Eleven_Alipay\\pages\\userCenter\\userCenter.json","f:\\code\\7_Eleven_Alipay\\component\\authorization-modal\\authorization-modal.acss","f:\\code\\7_Eleven_Alipay\\pages\\activateCard\\activateCardCallback.js","f:\\code\\7_Eleven_Alipay\\project.config.json","f:\\code\\7_Eleven_Alipay\\subPackage\\page\\pages\\goToHome\\goToHome.acss","f:\\code\\7_Eleven_Alipay\\package-lock.json","f:\\code\\7_Eleven_Alipay\\config\\index.js"]}
{"files":["f:\\code\\7_Eleven_Alipay\\component\\personCenter\\personCenter.js","f:\\code\\7_Eleven_Alipay\\component\\authorization-modal\\authorization-modal.js","f:\\code\\7_Eleven_Alipay\\pages\\userCenter\\userCenter.js","f:\\code\\7_Eleven_Alipay\\utils\\wxService.js","f:\\code\\7_Eleven_Alipay\\component\\personCenter\\personCenter.axml","f:\\code\\7_Eleven_Alipay\\component\\personCenter\\personCenter.json","f:\\code\\7_Eleven_Alipay\\component\\authorization-modal\\authorization-modal.axml","f:\\code\\7_Eleven_Alipay\\pages\\userCenter\\userCenter.axml","f:\\code\\7_Eleven_Alipay\\app.js","f:\\code\\7_Eleven_Alipay\\app.json","f:\\code\\7_Eleven_Alipay\\config\\index.js","f:\\code\\7_Eleven_Alipay\\component\\personCenter\\personCenter.acss","f:\\code\\7_Eleven_Alipay\\pages\\integralMallDetail\\integralMallDetail.js","f:\\code\\7_Eleven_Alipay\\pages\\couponCodeDetail\\couponCodeDetail.json","f:\\code\\7_Eleven_Alipay\\pages\\coupons\\coupons.js","f:\\code\\7_Eleven_Alipay\\pages\\couponCodeDetail\\couponCodeDetail.js","f:\\code\\7_Eleven_Alipay\\pages\\coupons\\coupons.axml","f:\\code\\7_Eleven_Alipay\\pages\\couponDetail\\couponDetail.js","f:\\code\\7_Eleven_Alipay\\component\\exchange-coupon-modal\\exchange-coupon-modal.js","f:\\code\\7_Eleven_Alipay\\pages\\integralMallDetail\\integralMallDetail.axml","f:\\code\\7_Eleven_Alipay\\pages\\integralMallDetail\\integralMallDetail.json","f:\\code\\7_Eleven_Alipay\\pages\\IntegralMall\\IntegralMall.js","f:\\code\\7_Eleven_Alipay\\pages\\IntegralMall\\IntegralMall.axml","f:\\code\\7_Eleven_Alipay\\pages\\memberOfOwn\\memberOfOwn.acss","f:\\code\\7_Eleven_Alipay\\pages\\memberOfOwn\\memberOfOwn.axml","f:\\code\\7_Eleven_Alipay\\pages\\memberOfOwn\\memberOfOwn.js","f:\\code\\7_Eleven_Alipay\\pages\\couponDetail\\couponDetail.axml","f:\\code\\7_Eleven_Alipay\\pages\\coupons\\coupons.json","f:\\code\\7_Eleven_Alipay\\pages\\coupons\\coupons.acss","f:\\code\\7_Eleven_Alipay\\pages\\integralWater\\integralWater.acss","f:\\code\\7_Eleven_Alipay\\pages\\integralWater\\integralWater.axml","f:\\code\\7_Eleven_Alipay\\pages\\integralWater\\integralWater.js","f:\\code\\7_Eleven_Alipay\\utils\\util.js","f:\\code\\7_Eleven_Alipay\\utils\\Http.js","f:\\code\\7_Eleven_Alipay\\pages\\userCenter\\userCenter.acss","f:\\code\\7_Eleven_Alipay\\utils\\currentLinkRouter.js","f:\\code\\7_Eleven_Alipay\\utils\\renderPage.js","f:\\code\\7_Eleven_Alipay\\utils\\router.js","f:\\code\\7_Eleven_Alipay\\utils\\common.js","f:\\code\\7_Eleven_Alipay\\subPackage\\page\\pages\\subPage\\subPage.js","f:\\code\\7_Eleven_Alipay\\component\\bottom\\bottom.js","f:\\code\\7_Eleven_Alipay\\subPackage\\page\\pages\\h5\\h5page.js","f:\\code\\7_Eleven_Alipay\\subPackage\\page\\pages\\h5\\h5page.acss","f:\\code\\7_Eleven_Alipay\\component\\picNav\\picNav.js","f:\\code\\7_Eleven_Alipay\\component\\imageSwiper\\imageSwiper.js","f:\\code\\7_Eleven_Alipay\\component\\picNav\\picNav.axml","f:\\code\\7_Eleven_Alipay\\pages\\userCenter\\userCenter.json","f:\\code\\7_Eleven_Alipay\\component\\authorization-modal\\authorization-modal.acss","f:\\code\\7_Eleven_Alipay\\pages\\activateCard\\activateCardCallback.js","f:\\code\\7_Eleven_Alipay\\project.config.json"]}
......@@ -106,7 +106,8 @@ App({
commonFunc: commonFunc,
// brandId: 2711,
// brandId: 2005,
brandId: 1001 // brandId: 1002,
// brandId: 1001,
brandId: 1002,
}
});
\ No newline at end of file
......@@ -132,29 +132,29 @@ Component({
}
});
},
handleGetAuthCode() {
this.setData({
isAuthorization: false
});
my.getAuthCode({
scopes: ['auth_user','auth_ecard'],
success: (res) => {
console.log('res', res, res.authCode)
my.getAuthUserInfo({
success: (userInfo) => {
console.log('userInfo', userInfo)
if (userInfo) {
utils.getUserInfoByBtn(userInfo, res.authCode).then((data = {}) => {
console.log('data', data)
})
}
}
});
},
});
},
// handleGetAuthCode() {
// this.setData({
// isAuthorization: false
// });
// my.getAuthCode({
// scopes: ['auth_user','auth_ecard'],
// success: (res) => {
// console.log('res', res, res.authCode)
// my.getAuthUserInfo({
// success: (userInfo) => {
// console.log('userInfo', userInfo)
// if (userInfo) {
// utils.getUserInfoByBtn(userInfo, res.authCode).then((data = {}) => {
// console.log('data', data)
// })
// }
// }
// });
// },
// });
// },
handleActiveAgree() {
// 子组件触发父组件 去开卡
......
<!--component/personCenter/personCenter.axml-->
==={{currentMobile}}
<view
a:if="{{!currentMobile}}"
class="member-unActive {{personCenter.noactiveBackgroundImageUrl ?'':'member-unActive-bgc'}}"
......
......@@ -38,18 +38,17 @@ Component({
}
},
onInit() {
const accreditUserInfo = wx2my.getStorageSync('_accreditUserInfo').data
const {code, mobile} = this.props && this.props.baseUserInfo && this.props.baseUserInfo.member
const {avatar, nickName} = accreditUserInfo
const {integralNum, couponNum} = this.data
const accreditUserInfo = wx2my.getStorageSync('_accreditUserInfo') && wx2my.getStorageSync('_accreditUserInfo').data
const userMember = this.props && this.props.baseUserInfo && this.props.baseUserInfo.member
const {integralNum=0, couponNum=0} = this.data
console.log('init--person', userMember, accreditUserInfo)
this.setData({
integralNum,
couponNum,
avatar,
nickName,
memberCardNo: code || '',
currentMobile: mobile ||'',
avatar: accreditUserInfo && accreditUserInfo.avatar || '',
nickName: accreditUserInfo && accreditUserInfo.nickName|| '',
memberCardNo: userMember && userMember.code || '',
currentMobile: userMember && userMember.mobile ||'',
personCenter: this.props && this.props.personData,
baseImgUrl: app.globalData.imageUrl
})
......@@ -60,7 +59,7 @@ Component({
const {code, mobile} = prevProps && prevProps.baseUserInfo && prevProps.baseUserInfo.member
const {avatar, nickName} = accreditUserInfo
const {integralNum, couponNum} = prevData
console.log('didUpdate', mobile)
this.setData({
integralNum,
couponNum,
......
const wx2my = require('../wx2my');
const Behavior = require('../Behavior');
const PROJECT_ENV = 'dev'; // 生产 prod, 开发 dev, 测试 test, 预生产 pre
const PROJECT_ENV = 'test'; // 生产 prod, 开发 dev, 测试 test, 预生产 pre
const needMock = ''; //
// appid_dev_wx wxc3b64b09b1d3dfc2
......
......@@ -83,7 +83,7 @@ wxService.page({
const baseUserInfo = wx2my.getStorageSync('_baseUserInfo') && wx2my.getStorageSync('_baseUserInfo').data;
const cardMember = wx2my.getStorageSync('_cardMember') && wx2my.getStorageSync('_cardMember').data; // 登录接口返回err
const reLoginErrFlag = wx2my.getStorageSync('reLoginErr') && wx2my.getStorageSync('reLoginErr').data;
console.log('首页onShow', baseUserInfo)
if (baseUserInfo && !reLoginErrFlag) {
this.setData({
token: wx2my.getStorageSync('token'),
......
......@@ -630,6 +630,10 @@ class WXService extends Http {
baseUserInfo.member = res.data.data
baseUserInfo.memberActivateStatus = true
wx2my.setStorageSync('_baseUserInfo', baseUserInfo);
setTimeout(()=>{
this.router('/pages/userCenter/userCenter');
})
}).catch(err => {
console.log('err', err)
});
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment