Skip to content

7
7_Eleven_Alipay
Commit c2a239d9 by 高淑倩
Options

开卡

parent 5f3b6ae0
Showing with 60 additions and 55 deletions
.tea/configuration/mini-program.json
{"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"}],"alipay:alipay-mini:uploadTime":"","alipay:alipay-mini:packageSize":0,"alipay:alipay-mini:MockStore":{"reLoginErr":""},"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}
\ No newline at end of file
{"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"}],"alipay:alipay-mini:uploadTime":"","alipay:alipay-mini:packageSize":0,"alipay:alipay-mini:MockStore":{"reLoginErr":"","_loginCode":"5e1d3dc7cd084c3d8fe4658ef9bdVX68","_accreditUserInfo":{"code":"10000","msg":"Success","avatar":"https://tfs.alipayobjects.com/images/partner/TB1G5LYXaFzDuNkUuyQXXbFwXXa","city":"上海市","countryCode":"CN","gender":"f","nickName":"大倩。","province":"上海"},"_baseUserInfo":{"token":"b7735fb8b9aabb7d00808d8bafa5c193","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%26callback%3Dhttps%3A%2F%2Falipay.com%2Fcard%2Fdemo.htm","member":{"id":"626059159485419520","createTime":"2019-09-24 14:15:35","updateTime":"2019-09-24 14:15:35","code":"770211095005161885","brandId":"1001","alipayUserId":"20880040397323055201586190418468","level":0}},"token":"b7735fb8b9aabb7d00808d8bafa5c193","_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}
\ No newline at end of file
.tea/editor.json
This source diff could not be displayed because it is too large. You can view the blob instead.
.tea/editorTabs.json
{"tabs":["file:///f%3A/code/7_Eleven_Alipay/utils/util.js","file:///f%3A/code/7_Eleven_Alipay/utils/currentLinkRouter.js","file:///f%3A/code/7_Eleven_Alipay/app.json","file:///f%3A/code/7_Eleven_Alipay/project.config.json"],"current":"file:///f%3A/code/7_Eleven_Alipay/project.config.json"}
\ No newline at end of file
{"tabs":["file:///f%3A/code/7_Eleven_Alipay/utils/util.js","file:///f%3A/code/7_Eleven_Alipay/utils/wxService.js","file:///f%3A/code/7_Eleven_Alipay/component/authorization-modal/authorization-modal.js"],"current":"file:///f%3A/code/7_Eleven_Alipay/utils/wxService.js"}
\ No newline at end of file
.tea/entryFiles-development/index$.worker.js
if(!self.__appxInited) {
self.__appxInited = 1;
require('@alipay/appx-compiler/lib/sjsEnvInit');
require('./config$');
......@@ -15,7 +15,7 @@ self.abridge = self.my;
self.Component = AFAppX.WorkerComponent || function(){};
self.$global = AFAppX.$global;
if(AFAppX.compilerConfig){ AFAppX.compilerConfig.component2 = true; }
function success() {
require('../../app');
require('../../component/authorization-modal/authorization-modal');
......
.tea/entryFiles-production/index$.worker.js
if(!self.__appxInited) {
self.__appxInited = 1;
require('@alipay/appx-compiler/lib/sjsEnvInit');
require('./config$');
require('./importScripts$');
......@@ -15,7 +15,7 @@ self.abridge = self.my;
self.Component = AFAppX.WorkerComponent || function(){};
self.$global = AFAppX.$global;
if(AFAppX.compilerConfig){ AFAppX.compilerConfig.component2 = true; }
function success() {
require('../../app');
require('../../component/authorization-modal/authorization-modal');
......
.tea/recentlyTouched.json
{"files":["f:\\code\\7_Eleven_Alipay\\project.config.json","f:\\code\\7_Eleven_Alipay\\app.json","f:\\code\\7_Eleven_Alipay\\utils\\currentLinkRouter.js","f:\\code\\7_Eleven_Alipay\\utils\\util.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\\utils\\common.js","f:\\code\\7_Eleven_Alipay\\subPackage\\page\\pages\\subPage\\subPage.js","f:\\code\\7_Eleven_Alipay\\subPackage\\page\\pages\\subPage\\subPage.json","f:\\code\\7_Eleven_Alipay\\subPackage\\page\\pages\\subPage\\subPage.acss","f:\\code\\7_Eleven_Alipay\\subPackage\\page\\pages\\subPage\\subPage.axml","f:\\code\\7_Eleven_Alipay\\subPackage\\page\\pages\\h5\\h5page.js","f:\\code\\7_Eleven_Alipay\\component\\authorization-modal\\authorization-modal.axml","f:\\code\\7_Eleven_Alipay\\component\\picNav\\picNav.js","f:\\code\\7_Eleven_Alipay\\component\\picNav\\picNav.axml","f:\\code\\7_Eleven_Alipay\\component\\picNav\\picNav.json","f:\\code\\7_Eleven_Alipay\\images\\3x-29.png","f:\\code\\7_Eleven_Alipay\\images\\3x-28.png","f:\\code\\7_Eleven_Alipay\\wxs\\utils.sjs","f:\\code\\7_Eleven_Alipay\\subPackage\\page\\pages\\pointGoodsList\\pointGoodsList.json","f:\\code\\7_Eleven_Alipay\\subPackage\\page\\pages\\pointGoodsList\\pointGoodsList.axml","f:\\code\\7_Eleven_Alipay\\subPackage\\page\\pages\\pointGoodsList\\pointGoodsList.js","f:\\code\\7_Eleven_Alipay\\subPackage\\page\\pages\\pointGoodsList\\pointGoodsList.acss","f:\\code\\7_Eleven_Alipay\\pages\\mySpend\\mySpend.json","f:\\code\\7_Eleven_Alipay\\subPackage\\page\\pages\\goToHome\\goToHome.axml","f:\\code\\7_Eleven_Alipay\\subPackage\\page\\pages\\goToHome\\goToHome.js","f:\\code\\7_Eleven_Alipay\\subPackage\\page\\pages\\goToHome\\goToHome.acss","f:\\code\\7_Eleven_Alipay\\subPackage\\page\\pages\\goToHome\\goToHome.json","f:\\code\\7_Eleven_Alipay\\pages\\pointDetail\\tools.wxs","f:\\code\\7_Eleven_Alipay\\pages\\pointList\\tools.wxs","f:\\code\\7_Eleven_Alipay\\pages\\pointDetail\\pointDetail.axml","f:\\code\\7_Eleven_Alipay\\pages\\pointDetail\\pointDetail.js","f:\\code\\7_Eleven_Alipay\\pages\\pointDetail\\pointDetail.acss","f:\\code\\7_Eleven_Alipay\\pages\\pointDetail\\pointDetail.json","f:\\code\\7_Eleven_Alipay\\component\\statusPoint\\statusPoint.axml","f:\\code\\7_Eleven_Alipay\\component\\statusPoint\\statusPoint.json","f:\\code\\7_Eleven_Alipay\\component\\statusPoint\\statusPoint.js","f:\\code\\7_Eleven_Alipay\\component\\statusPoint\\statusPoint.acss","f:\\code\\7_Eleven_Alipay\\utils\\helper.js","f:\\code\\7_Eleven_Alipay\\pages\\pointList\\pointList.js","f:\\code\\7_Eleven_Alipay\\pages\\pointList\\pointList.axml","f:\\code\\7_Eleven_Alipay\\pages\\pointList\\pointList.acss","f:\\code\\7_Eleven_Alipay\\pages\\pointList\\pointList.json","f:\\code\\7_Eleven_Alipay\\utils\\Http.js","f:\\code\\7_Eleven_Alipay\\component\\authorization-modal\\authorization-modal.json","f:\\code\\7_Eleven_Alipay\\component\\authorization-modal\\authorization-modal.acss","f:\\code\\7_Eleven_Alipay\\wx2my.js","f:\\code\\7_Eleven_Alipay\\package-lock.json","f:\\code\\7_Eleven_Alipay\\Behavior.js","f:\\code\\7_Eleven_Alipay\\app.js"]}
\ No newline at end of file
{"files":["f:\\code\\7_Eleven_Alipay\\utils\\currentLinkRouter.js","f:\\code\\7_Eleven_Alipay\\utils\\wxService.js","f:\\code\\7_Eleven_Alipay\\component\\picNav\\picNav.js","f:\\code\\7_Eleven_Alipay\\component\\authorization-modal\\authorization-modal.js","f:\\code\\7_Eleven_Alipay\\pages\\activateCard\\activateCardCallback.js","f:\\code\\7_Eleven_Alipay\\utils\\util.js","f:\\code\\7_Eleven_Alipay\\utils\\Http.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","f:\\code\\7_Eleven_Alipay\\pages\\pointDetail\\pointDetail.js","f:\\code\\7_Eleven_Alipay\\pages\\pointList\\pointList.acss","f:\\code\\7_Eleven_Alipay\\pages\\pointList\\pointList.axml","f:\\code\\7_Eleven_Alipay\\pages\\pointList\\pointList.js","f:\\code\\7_Eleven_Alipay\\pages\\pointList\\pointList.json","f:\\code\\7_Eleven_Alipay\\utils\\currentAccessiblePath.js","f:\\code\\7_Eleven_Alipay\\utils\\integerDigitalConvertion.js","f:\\code\\7_Eleven_Alipay\\utils\\helper.js","f:\\code\\7_Eleven_Alipay\\app.json","f:\\code\\7_Eleven_Alipay\\utils\\common.js","f:\\code\\7_Eleven_Alipay\\subPackage\\page\\pages\\subPage\\subPage.js","f:\\code\\7_Eleven_Alipay\\subPackage\\page\\pages\\subPage\\subPage.json","f:\\code\\7_Eleven_Alipay\\subPackage\\page\\pages\\subPage\\subPage.acss","f:\\code\\7_Eleven_Alipay\\subPackage\\page\\pages\\subPage\\subPage.axml","f:\\code\\7_Eleven_Alipay\\subPackage\\page\\pages\\h5\\h5page.js","f:\\code\\7_Eleven_Alipay\\component\\authorization-modal\\authorization-modal.axml","f:\\code\\7_Eleven_Alipay\\component\\picNav\\picNav.axml","f:\\code\\7_Eleven_Alipay\\component\\picNav\\picNav.json","f:\\code\\7_Eleven_Alipay\\images\\3x-29.png","f:\\code\\7_Eleven_Alipay\\images\\3x-28.png","f:\\code\\7_Eleven_Alipay\\wxs\\utils.sjs","f:\\code\\7_Eleven_Alipay\\subPackage\\page\\pages\\pointGoodsList\\pointGoodsList.json","f:\\code\\7_Eleven_Alipay\\subPackage\\page\\pages\\pointGoodsList\\pointGoodsList.axml","f:\\code\\7_Eleven_Alipay\\subPackage\\page\\pages\\pointGoodsList\\pointGoodsList.js","f:\\code\\7_Eleven_Alipay\\subPackage\\page\\pages\\pointGoodsList\\pointGoodsList.acss","f:\\code\\7_Eleven_Alipay\\pages\\mySpend\\mySpend.json","f:\\code\\7_Eleven_Alipay\\subPackage\\page\\pages\\goToHome\\goToHome.axml","f:\\code\\7_Eleven_Alipay\\subPackage\\page\\pages\\goToHome\\goToHome.js","f:\\code\\7_Eleven_Alipay\\subPackage\\page\\pages\\goToHome\\goToHome.json","f:\\code\\7_Eleven_Alipay\\pages\\pointDetail\\tools.wxs","f:\\code\\7_Eleven_Alipay\\pages\\pointList\\tools.wxs","f:\\code\\7_Eleven_Alipay\\pages\\pointDetail\\pointDetail.axml","f:\\code\\7_Eleven_Alipay\\pages\\pointDetail\\pointDetail.acss","f:\\code\\7_Eleven_Alipay\\pages\\pointDetail\\pointDetail.json","f:\\code\\7_Eleven_Alipay\\component\\statusPoint\\statusPoint.axml","f:\\code\\7_Eleven_Alipay\\component\\statusPoint\\statusPoint.json","f:\\code\\7_Eleven_Alipay\\component\\statusPoint\\statusPoint.js","f:\\code\\7_Eleven_Alipay\\component\\statusPoint\\statusPoint.acss","f:\\code\\7_Eleven_Alipay\\component\\authorization-modal\\authorization-modal.json"]}
\ No newline at end of file
component/authorization-modal/authorization-modal.js
......@@ -114,7 +114,7 @@ Component({
wx2my.setStorageSync('_baseUserInfo', data); // 存储用户开卡状态
// this.setUserInfo();
this.setUserInfo();
}).catch(err => {
if (err) {
wx2my.showToast({
......@@ -178,15 +178,16 @@ Component({
// 判断有无开卡
// const {memberActivateStatus} = wx.getStorageSync('_baseUserInfo')
const userInfo = wx2my.getStorageSync('_baseUserInfo'); // 新用户去激活领卡
if (userInfo && userInfo.member && !userInfo.member.mobile) {
console.log('ssssssssss',userInfo)
if (userInfo && userInfo.data && userInfo.data.member && !userInfo.data.member.mobile) {
wxService.openCard();
return false;
}
const urls = getCurrentPages();
setTimeout(() => {
const item = urls[0].options;
if (item.route) {
const item = urls[0];
console.log('urls', urls)
if (item && item.route) {
try {
const options = JSON.parse(item.options);
wxService.router(`/${item.route}`).search(options).replace();
......
pages/activateCard/activateCardCallback.js
......@@ -87,9 +87,9 @@ wxService.page({
wx2my.setStorageSync('_loginCode', res.code);
if (res.code) {
wxService.post(`/member/minaLogin`, {
wxService.post(`/member/alipay/minaLogin`, {
code: res.code,
wechatInfo: null,
// wechatInfo: null,
brandId: app.globalData.brandId
}).then(response => {
let dataResp = response.data.data;
......
project.config.json
......@@ -13,7 +13,7 @@
},
"compileType": "miniprogram",
"libVersion": "2.6.6",
"appid": "wxc3b64b09b1d3dfc2",
"appid": "2019091967575819",
"projectname": "7-Eleven",
"debugOptions": {
"hidedInDevtools": []
......
utils/currentLinkRouter.js
......@@ -11,7 +11,7 @@ function currentLinkRouter(event, _this) {
let currentClickType = app.globalData.commonFunc.getLink(curItemType.link.type, curItemType)
console.log('wwwwwwww', curItemType.link.type)
console.log('1111111userInfo11111',userInfo)
wxService.openCard()
// wxService.openCard()
// 触发父组件更新页面 外部小程序
// if (curItemType.link.type == 1) {
// // 触发父组件更新页面 外部小程序
......
utils/util.js
......@@ -321,11 +321,12 @@ function getUserInfoByBtn(userInfo) {
icon: 'none',
mask: true
});
return wxService.post(`/member/minaLogin`, {
code: res[1].authCode,
wechatInfo: userInfoObj,
brandId: app.globalData.brandId
});
// {
// code: res[1].authCode,
// // wechatInfo: userInfoObj,
// brandId: app.globalData.brandId
// }
return wxService.post(`/member/alipay/minaLogin?code=${res[1].authCode}&brandId=${app.globalData.brandId}`);
}, err => {
return Promise.reject(err);
}).then(response => {
......
utils/wxService.js
......@@ -120,9 +120,9 @@ class WXService extends Http {
return _this.login().then(result => {
if (result.code) {
_this.post(`/member/minaLogin`, {
_this.post(`/member/alipay/minaLogin`, {
code: result.code,
wechatInfo: null,
// wechatInfo: null,
brandId: app.globalData.brandId
}).then(response => {
let dataResp = response.data.data;
......@@ -589,15 +589,13 @@ class WXService extends Http {
openCard() {
const baseUserInfo = wx2my.getStorageSync('_baseUserInfo');
console.log('open', baseUserInfo)
return new Promise((resolve, reject) => {
if (baseUserInfo && baseUserInfo.memberActivateStatus) {
console.log('已开卡');
wxService.openCardList();
resolve(baseUserInfo);
} else if (!baseUserInfo || !baseUserInfo.memberActivateStatus) {
console.log('去开卡');
if (baseUserInfo && baseUserInfo.data) {
let url = decodeURIComponent(baseUserInfo.data.applyCardUrl)
console.log('去开卡', url);
return my.addCardAuth({
url: 'https%3A%2F%2Fmemberprod.alipay.com%2Faccount%2Fopenform%2Factivecard.htm%3Fapp_id%3D2017092708960568%26template_id%3D20190923000000002110649000300848%26__webview_options__%3DcanPullDown%253dNO%2526transparentTitle%253dauto%26out_string%3Dalipay%26isv_app_id%3D2019080966120777%26callback%3Dhttps%3A%2F%2Falipay.com%2Fcard%2Fdemo.htm',
url: `${url}`,
success: (res) => {
my.alert({ content: '授权成功' });
},
......@@ -605,35 +603,40 @@ class WXService extends Http {
my.alert({ content: '授权失败' });
},
});
// return this.navigateToMiniProgram({
// biz: baseUserInfo.biz,
// encrypt_card_id: baseUserInfo.encryptCardId,
// outer_str: baseUserInfo.outerStr
// });
// resolve(baseUserInfo);
} else {
reject({
state: 0
});
}
}); // 注释原因 所有跳转前 判断新老会员
// return new Promise((resolve, reject) => {
// if (baseUserInfo && baseUserInfo.member && baseUserInfo.member.mobile) {
// console.log('已开卡')
// wxService.openCardList()
// resolve(baseUserInfo)
// } else if (!baseUserInfo || !baseUserInfo.member || !baseUserInfo.member.mobile) {
// console.log('去开卡')
// return this.navigateToMiniProgram({
// biz: baseUserInfo.biz,
// encrypt_card_id: baseUserInfo.encryptCardId,
// outer_str: baseUserInfo.outerStr
// })
// if (baseUserInfo && baseUserInfo.memberActivateStatus) {
// console.log('已开卡');
// wxService.openCardList();
// resolve(baseUserInfo);
// } else if (!baseUserInfo || !baseUserInfo.memberActivateStatus) {
// console.log('去开卡');
// return my.addCardAuth({
// url: `${baseUserInfo.applyCardUrl}`,
// success: (res) => {
// my.alert({ content: '授权成功' });
// },
// fail: (res) => {
// my.alert({ content: '授权失败' });
// },
// });
// // return this.navigateToMiniProgram({
// // biz: baseUserInfo.biz,
// // encrypt_card_id: baseUserInfo.encryptCardId,
// // outer_str: baseUserInfo.outerStr
// // });
// } else {
// reject({ state: 0 })
// reject({
// state: 0
// });
// }
// })
});
}
/**
* 查看微信卡包中的卡券
......
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