Skip to content

C
CFFP-HB
Commit 9d159137 by sunchao
Options

Merge branch 'dev' of http://139.224.139.2:9091/chaosun/CFFP into dev

parents 300b5e3a 75360b47
Showing with 42 additions and 13 deletions
api/api.ts
...@@ -13,7 +13,12 @@ export default { ...@@ -13,7 +13,12 @@ export default {
// 获取token // 获取token
obtainToken(){ obtainToken(){
const params = { const params = {
ticket:'uni-app' ticket:'uni-app',
loginId:null
}
let h5userId = uni.getStorageSync('cffp_userId');
if (h5userId) {
params.loginId = h5userId;
} }
return request(`${baseURL}/api/authorize/obtainToken`, "POST", params) return request(`${baseURL}/api/authorize/obtainToken`, "POST", params)
}, },
......
manifest.json
...@@ -47,10 +47,12 @@ ...@@ -47,10 +47,12 @@
"<uses-permission android:name=\"android.permission.INTERNET\"/>", "<uses-permission android:name=\"android.permission.INTERNET\"/>",
"<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>", "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>", "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
"<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
"<uses-permission android:name=\"android.permission.READ_LOGS\"/>", "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>", "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
"<uses-permission android:name=\"android.permission.VIBRATE\"/>", "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>", "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
"<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
"<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>", "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>" "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
], ],
...@@ -93,7 +95,9 @@ ...@@ -93,7 +95,9 @@
"appid" : "wx3ec6ac74a8c074be", "appid" : "wx3ec6ac74a8c074be",
"UniversalLinks" : "https://mapp.cffp.org.cn/app/" "UniversalLinks" : "https://mapp.cffp.org.cn/app/"
} }
} },
"maps" : {},
"geolocation" : {}
}, },
"splashscreen" : { "splashscreen" : {
"androidStyle" : "common", "androidStyle" : "common",
......
pages/orderConfirm/orderConfirm.vue
...@@ -452,7 +452,22 @@ ...@@ -452,7 +452,22 @@
this.fileId = option.fileId; this.fileId = option.fileId;
this.orderId = option.orderId; this.orderId = option.orderId;
if (option.userId) { if (option.userId) {
this.userId = option.userId this.userId = option.userId;
}
this.isRedirect = option.isRedirect;
if (this.isRedirect == 1 && uni.getStorageSync('cffp_userId')) {
uni.request({
url: '/api/authorize/obtainToken',
method: 'POST',
data: {ticket:'uni-app', loginId:uni.getStorageSync('cffp_userId')},
success: (res) => {
if (res.statusCode === 200) {
uni.setStorageSync('uni-token', res.data['data']['token']);
uni.setStorageSync('isLogin','1');
uni.setStorageSync('isH5', 1);
}
}
});
} }
this.courseDetail(); this.courseDetail();
this.queryByUserIdFortuneStatistic() this.queryByUserIdFortuneStatistic()
...@@ -460,7 +475,6 @@ ...@@ -460,7 +475,6 @@
if (this.deviceType == 3) { if (this.deviceType == 3) {
this.paymentMethod = 1; this.paymentMethod = 1;
} }
this.isRedirect = option.isRedirect;
if (this.isRedirect == 1) { if (this.isRedirect == 1) {
this.deductionCore = option.deductionCore; this.deductionCore = option.deductionCore;
this.amount = Number(option.amount); this.amount = Number(option.amount);
......
sfp/housePurchase/housePurchase.vue
...@@ -363,7 +363,7 @@ ...@@ -363,7 +363,7 @@
chart.setOption(this.option); chart.setOption(this.option);
}); });
}, },
checkToken(){ /* checkToken(){
api.checkToken().then(res=>{ api.checkToken().then(res=>{
if(res['success']){}else{ if(res['success']){}else{
api.obtainToken().then(res=>{ api.obtainToken().then(res=>{
...@@ -373,7 +373,7 @@ ...@@ -373,7 +373,7 @@
}) })
} }
}) })
}, }, */
radioChange: function(evt) { radioChange: function(evt) {
for (let i = 0; i < this.chartsLegends.length; i++) { for (let i = 0; i < this.chartsLegends.length; i++) {
if (this.chartsLegends[i].value === evt.detail.value) { if (this.chartsLegends[i].value === evt.detail.value) {
...@@ -738,7 +738,7 @@ ...@@ -738,7 +738,7 @@
// this.$refs.chart.init(echarts, chart => { // this.$refs.chart.init(echarts, chart => {
// chart.setOption(this.option); // chart.setOption(this.option);
// }); // });
this.checkToken(); //this.checkToken();
} }
} }
</script> </script>
......
sfp/index/index.vue
...@@ -261,7 +261,7 @@ ...@@ -261,7 +261,7 @@
url:'/pages/product/finance-calculator' url:'/pages/product/finance-calculator'
}) })
}, },
checkToken(){ /* checkToken(){
api.checkToken().then(res=>{ api.checkToken().then(res=>{
if(res['success']){}else{ if(res['success']){}else{
api.obtainToken().then(res=>{ api.obtainToken().then(res=>{
...@@ -271,7 +271,7 @@ ...@@ -271,7 +271,7 @@
}) })
} }
}) })
}, }, */
getFollowData(e){ getFollowData(e){
this.isNeedOfficialAccountQrcode= ref(e); this.isNeedOfficialAccountQrcode= ref(e);
console.log('父组件拿到值了',e); console.log('父组件拿到值了',e);
...@@ -634,7 +634,7 @@ ...@@ -634,7 +634,7 @@
} }
}, },
mounted() { mounted() {
this.checkToken(); //this.checkToken();
} }
} }
......
util/interceptor.ts
...@@ -15,19 +15,25 @@ export const interceptor = () => { ...@@ -15,19 +15,25 @@ export const interceptor = () => {
// 当本地没有token，并且接口地址没在白名单内，需要重新获取token // 当本地没有token，并且接口地址没在白名单内，需要重新获取token
if (!uni.getStorageSync('uni-token') && !whiteApiList.includes(args.url)) { if (!uni.getStorageSync('uni-token') && !whiteApiList.includes(args.url)) {
const params = {
ticket:'uni-app',
loginId:null
}
let h5userId = uni.getStorageSync('cffp_userId');
if (h5userId) {
params.loginId = h5userId;
}
uni.request({ uni.request({
url: '/api/authorize/obtainToken', url: '/api/authorize/obtainToken',
method: 'POST', method: 'POST',
data: { ticket: 'uni-app' }, data: params,
success: (res) => { success: (res) => {
if (res.statusCode === 200) { if (res.statusCode === 200) {
uni.setStorageSync('uni-token', res.data['data']['token']); uni.setStorageSync('uni-token', res.data['data']['token']);
window.location.href = window.location.href + '?' + 't_reload=' + new Date().getTime(); window.location.href = window.location.href + '?' + 't_reload=' + new Date().getTime();
} }
// console.log(res)
} }
}) })
// uni.hideLoading();
} }
// request 触发前拼接 url // request 触发前拼接 url
......
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