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 76 additions and 66 deletions
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",
......
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
// import {baseURL,apiURL,cffpURL} from "../environments/environment"; // import {baseURL,apiURL,cffpURL} from "../environments/environment";
// 白名单，不需要携带token就允许被访问的接口 // 白名单，不需要携带token就允许被访问的接口
const whiteApiList = [`/api/authorize/obtainToken`, `/api/authorize/checkToken`]; const whiteApiList = [`/api/authorize/obtainToken`, `/api/authorize/checkToken`];
export const interceptor = () => { export const interceptor = () => {
uni.addInterceptor('request', { uni.addInterceptor('request', {
// 请求拦截器 // 请求拦截器
invoke(args) { invoke(args) {
// console.log('请求拦截器',args); // console.log('请求拦截器',args);
// 加载loading // 加载loading
// uni.showLoading({ // uni.showLoading({
// title: '加载中...' // title: '加载中...'
// }); // });
// 当本地没有token，并且接口地址没在白名单内，需要重新获取token // 当本地没有token，并且接口地址没在白名单内，需要重新获取token
if (!uni.getStorageSync('uni-token') && !whiteApiList.includes(args.url)) { if (!uni.getStorageSync('uni-token') && !whiteApiList.includes(args.url)) {
uni.request({ const params = {
url: '/api/authorize/obtainToken', ticket:'uni-app',
method: 'POST', loginId:null
data: { ticket: 'uni-app' }, }
success: (res) => { let h5userId = uni.getStorageSync('cffp_userId');
if (res.statusCode === 200) { if (h5userId) {
uni.setStorageSync('uni-token', res.data['data']['token']); params.loginId = h5userId;
window.location.href = window.location.href + '?' + 't_reload=' + new Date().getTime(); }
} uni.request({
// console.log(res) url: '/api/authorize/obtainToken',
} method: 'POST',
}) data: params,
// uni.hideLoading(); success: (res) => {
} if (res.statusCode === 200) {
// request 触发前拼接 url uni.setStorageSync('uni-token', res.data['data']['token']);
window.location.href = window.location.href + '?' + 't_reload=' + new Date().getTime();
//设置请求头及token }
args.header = { }
'content-type': args.method === 'POST' ? 'application/json' : 'application/x-www-form-urlencoded', })
'X-Authorization': uni.getStorageSync('uni-token') ? uni.getStorageSync('uni-token') : '', }
// 'Access-Control-Allow-Headers': 'appId', // request 触发前拼接 url
// 'Access-Control-Allow-Methods': 'POST, GET, OPTIONS',
// 'Access-Control-Max-Age': 86400, //设置请求头及token
} args.header = {
// console.log(args.header) 'content-type': args.method === 'POST' ? 'application/json' : 'application/x-www-form-urlencoded',
}, 'X-Authorization': uni.getStorageSync('uni-token') ? uni.getStorageSync('uni-token') : '',
// 'Access-Control-Allow-Headers': 'appId',
// 响应拦截器，可以对数据进行预处理 // 'Access-Control-Allow-Methods': 'POST, GET, OPTIONS',
success() { // 'Access-Control-Max-Age': 86400,
// uni.hideLoading() }
// console.log(args); // console.log(args.header)
}, },
fail() {
// console.log('interceptor-fail', err) // 响应拦截器，可以对数据进行预处理
// console.log('请求失败') success() {
// uni.hideLoading() // uni.hideLoading()
}, // console.log(args);
complete() { },
// uni.hideLoading() fail() {
} // console.log('interceptor-fail', err)
}) // console.log('请求失败')
} // uni.hideLoading()
},
complete() {
// uni.hideLoading()
}
})
}
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