wangyifang
/
xietaitai-shop-wx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

icon

Browse Source
main
lion 1 year ago
parent 67c55c78ee
commit 0d429e23a9
5 changed files with 85 additions and 55 deletions
Show Stats Download Patch File Download Diff File

58
common/http.interceptor.js
Unescape View File

@ -23,8 +23,8 @@ const install = (Vue, vm) => {
// 请求拦截部分，如配置，每次请求前都会执行
Vue.prototype.$u.http.interceptor.request = (config) => {
console.log('config-http', config)
let xtt_lifeData2 = uni.getStorageSync('xtt_lifeData2')
let vuex_token = xtt_lifeData2.vuex_token;
let xtt_lifeData3 = uni.getStorageSync('xtt_lifeData3')
let vuex_token = xtt_lifeData3.vuex_token;
if (vuex_token || vm.vuex_token) {
config.header['Authorization'] = `Bearer ${vuex_token || vm.vuex_token}`;
}
@ -43,12 +43,11 @@ const install = (Vue, vm) => {
confirmText: '重新获取',
success: function(res) {
if (res.confirm) {
uni.removeStorageSync('xtt_lifeData2')
uni.removeStorageSync('xtt_lifeData3')
uni.login({
provider: 'weixin',
success: (res) => {
let url = baseUrl +
'​/api​/mobile​/user​/login'
let url = baseUrl + '​/api/mobile/user/login'
uni.request({
url: url,
data:{
@ -57,31 +56,34 @@ const install = (Vue, vm) => {
method: 'GET',
success: result => {
console.log("result",result)
uni.setStorageSync("xtt_lifeData2",{'vuex_token':result.data.token})
const currentPage =
getCurrentPages()[
getCurrentPages()
.length - 1];
const currentPagePath =
"/" + currentPage.route;
const currentPageOptions =
currentPage.options;
const queryString = Object
.keys(
currentPageOptions)
.map(key =>
`${key}=${currentPageOptions[key]}`
)
.join('&');
// 使用uni.reLaunch方法刷新当前页面
uni.setStorageSync("xtt_lifeData3",{'vuex_token':result.data.token})
uni.reLaunch({
url: `${currentPagePath}?${queryString}`
url: '/pages/home/home'
});
console.log("reLaunch",
`${currentPagePath}?${queryString}`
)
// const currentPage =
// getCurrentPages()[
// getCurrentPages()
// .length - 1];
// const currentPagePath =
// "/" + currentPage.route;
// const currentPageOptions =
// currentPage.options;
// const queryString = Object
// .keys(
// currentPageOptions)
// .map(key =>
// `${key}=${currentPageOptions[key]}`
// )
// .join('&');
// // 使用uni.reLaunch方法刷新当前页面
// uni.reLaunch({
// url: `${currentPagePath}?${queryString}`
// });
// console.log("reLaunch",
// `${currentPagePath}?${queryString}`
// )
}
});

4
packages/change/change.vue
Unescape View File

@ -75,6 +75,10 @@
return
}
this.$u.api.getCard(this.form).then(res => {
if(res.available_dates.length===0){
toast(this.dateFalse,4000)
return
}
let open_date = res.card.sku.open?res.card.sku.open:false
let end_date = res.card.sku.end?res.card.sku.end:false
let today = this.$moment().format('YYYY-MM-DD')

36
pages/home/home.vue
Unescape View File

@ -99,7 +99,11 @@
import PrivacyPopup from '@/components/privacy-popup/privacy-popup.vue';
import tabbar from '@/components/tabbar/tabbar.vue';
import {
isNull
ROOTPATH as baseUrl
} from "@/common/config.js"
import {
isNull,
toast
} from '@/common/util.js'
export default {
components: {
@ -122,7 +126,7 @@
},
onLoad(option) {
this.getBanner()
let token = uni.getStorageSync('xtt_lifeData2')?uni.getStorageSync('xtt_lifeData2').vuex_token:''
let token = uni.getStorageSync('xtt_lifeData3')?uni.getStorageSync('xtt_lifeData3').vuex_token:''
if (isNull(token)) {
this.getToken()
}
@ -190,19 +194,39 @@
await uni.login({
provider: 'weixin',
success: (res) => {
this.$u.api.login({
code: res.code
}).then(res => {
this.$u.vuex('vuex_token', res.token)
this.$u.api.user().then(res => {
this.$u.vuex('vuex_user', res)
}).then(res1 => {
uni.removeStorageSync("xtt_lifeData3")
uni.setStorageSync("xtt_lifeData3", {
'vuex_token': res1.token
})
// uni.request({
// url: baseUrl + '/api/mobile/user/show',
// header: {
// Authorization: `Bearer ${res1.token}`
// },
// method: "GET",
// success(res2) {
// uni.setStorageSync("xtt_lifeData3", {
// 'vuex_token': res1.token,
// "vuex_user": res2.user
// })
// },
// fail(err) {
// console.log("err", err)
// }
// })
}).catch(err => {
toast(JSON.stringify(err))
console.log('login-error:', JSON.stringify(err))
})
},
fail: (res) => {
console.log("errtoken", JSON.stringify(res))
toast(JSON.stringify(err))
}
});
},

2
pages/me/me.vue
Unescape View File

@ -163,7 +163,7 @@
onLoad() {
const MenuButton = uni.getMenuButtonBoundingClientRect()
this.navBarTop = MenuButton.top //左侧文字与右侧胶囊对齐
this.myToken = uni.getStorageSync('xtt_lifeData2').vuex_token
this.myToken = uni.getStorageSync('xtt_lifeData3').vuex_token
},
onShow() {
this.getInitUser()

28
store/index.js
Unescape View File

@ -2,11 +2,11 @@ import Vue from 'vue'
import Vuex from 'vuex'
Vue.use(Vuex)
let xtt_lifeData2 = {};
let xtt_lifeData3 = {};
try{
// 尝试获取本地是否存在xtt_lifeData2变量，第一次启动APP时是不存在的
xtt_lifeData2 = uni.getStorageSync('xtt_lifeData2');
// 尝试获取本地是否存在xtt_lifeData3变量，第一次启动APP时是不存在的
xtt_lifeData3 = uni.getStorageSync('xtt_lifeData3');
}catch(e){
}
@ -15,26 +15,26 @@ try{
let saveStateKeys = ['vuex_user', 'vuex_token','vuex_share'];
// 保存变量到本地存储中
const savextt_LifeData2 = function(key, value){
const savextt_LifeData3 = function(key, value){
// 判断变量名是否在需要存储的数组中
if(saveStateKeys.indexOf(key) != -1) {
// 获取本地存储的xtt_lifeData2对象，将变量添加到对象中
let tmp = uni.getStorageSync('xtt_lifeData2');
// 第一次打开APP，不存在xtt_lifeData2变量，故放一个{}空对象
// 获取本地存储的xtt_lifeData3对象，将变量添加到对象中
let tmp = uni.getStorageSync('xtt_lifeData3');
// 第一次打开APP，不存在xtt_lifeData3变量，故放一个{}空对象
tmp = tmp ? tmp : {};
tmp[key] = value;
// 执行这一步后，所有需要存储的变量，都挂载在本地的xtt_lifeData2对象中
uni.setStorageSync('xtt_lifeData2', tmp);
// 执行这一步后，所有需要存储的变量，都挂载在本地的xtt_lifeData3对象中
uni.setStorageSync('xtt_lifeData3', tmp);
}
}
const store = new Vuex.Store({
// 下面这些值仅为示例，使用过程中请删除
state: {
// 如果上面从本地获取的xtt_lifeData2对象下有对应的属性，就赋值给state中对应的变量
// 如果上面从本地获取的xtt_lifeData3对象下有对应的属性，就赋值给state中对应的变量
// 加上vuex_前缀，是防止变量名冲突，也让人一目了然
vuex_user: xtt_lifeData2.vuex_user ? xtt_lifeData2.vuex_user : {},
vuex_token: xtt_lifeData2.vuex_token ? xtt_lifeData2.vuex_token : '',
// 如果vuex_version无需保存到本地永久存储，无需xtt_lifeData2.vuex_version方式
vuex_user: xtt_lifeData3.vuex_user ? xtt_lifeData3.vuex_user : {},
vuex_token: xtt_lifeData3.vuex_token ? xtt_lifeData3.vuex_token : '',
// 如果vuex_version无需保存到本地永久存储，无需xtt_lifeData3.vuex_version方式
vuex_version: '1.0.0',
vuex_sign_base64: '',
@ -59,7 +59,7 @@ const store = new Vuex.Store({
saveKey = payload.name;
}
// 保存变量到本地，见顶部函数定义
savextt_LifeData2(saveKey, state[saveKey])
savextt_LifeData3(saveKey, state[saveKey])
}
}
})

Write Preview
Loading…
Cancel
Save