From 4ddad18f72b3905088abf9ec0cf095784d16c11d Mon Sep 17 00:00:00 2001 From: chenlong Date: Thu, 14 Sep 2023 16:27:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A21?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/UserCache.js | 44 +++++++++++++++++++++++ config/config.js | 6 ++-- pages/Index/components/UserPage/index.vue | 9 +++-- pages/Index/index.vue | 9 ++--- pages/Login/index.vue | 10 +++--- pages/UserCoupons/index.vue | 14 ++++---- pages/UserDetail/index.vue | 12 +++++-- pages/UserOrderPage/index.vue | 2 ++ store.js | 1 + 9 files changed, 79 insertions(+), 28 deletions(-) create mode 100644 config/UserCache.js diff --git a/config/UserCache.js b/config/UserCache.js new file mode 100644 index 0000000..1ac14ff --- /dev/null +++ b/config/UserCache.js @@ -0,0 +1,44 @@ +/** + * 用户缓存操作 + */ +export default (function () { + let userCacheKey = "user"; + let extCacheKey = "userExtends"; + + function set(key, info, obj){ + uni.setStorageSync(key, info); + return obj; + } + + function get(cacheKey, key, defaultValue){ + let info = uni.getStorageSync(cacheKey); + return key !== null + ? (info[key] ? info[key] : defaultValue) + : info; + } + + function remove(cacheKey){ + uni.removeStorageSync(cacheKey); + } + + return { + set:(info) => set(userCacheKey, info), + setAndReturn(info){ + this.set(info); + return this.get(); + }, + get:(key = null, defaultValue = null) => get(userCacheKey, key, defaultValue), + extSet:(info) => set(extCacheKey, info), + extSetAndReturn(info){ + this.extSet(info); + return this.extGet(); + }, + extGet:(key = null, defaultValue = null) => get(extCacheKey, key, defaultValue), + clearUser:()=> remove(userCacheKey), + clearUserExt:() => remove(extCacheKey), + clearAll(){ + this.clearUser(); + this.clearUserExt(); + } + } +})(); \ No newline at end of file diff --git a/config/config.js b/config/config.js index 7ea3a3d..7742e30 100644 --- a/config/config.js +++ b/config/config.js @@ -1,3 +1,5 @@ +import UserCache from "@/config/UserCache"; + /** * 当前环境 * @type {string} @@ -10,6 +12,4 @@ const ENV = 'dev'; */ const OPEN_LOG = true; - - -export {OPEN_LOG, ENV} +export {OPEN_LOG, ENV, UserCache} diff --git a/pages/Index/components/UserPage/index.vue b/pages/Index/components/UserPage/index.vue index 8f28111..3e688e5 100644 --- a/pages/Index/components/UserPage/index.vue +++ b/pages/Index/components/UserPage/index.vue @@ -153,6 +153,7 @@ import api from '@/utils/functions.js'; import {userDetail, userExtends} from "@/api/user"; import log from "@/utils/log"; + import {UserCache} from "@/config/config"; export default { components: { HeaderNav, @@ -221,15 +222,14 @@ }, orderPage(type, is_buy){ uni.navigateTo({ - url:`/pages/UserOrderPage/index?type=${type}&is_bay=${is_buy}` + url:`/pages/UserOrderPage/index?type=${type}&is_buy=${is_buy}` }) }, showNumber(){ userExtends().then(data => { log(data); this.userExtends = data.data; - uni.setStorageSync('userExtends',data.data); - this.$store.commit('userExtends',data.data); + this.$store.commit('userExtends',UserCache.extSetAndReturn(data.data)); }); }, userCouponsPage(){ @@ -247,8 +247,7 @@ }, showUserInfo(){ userDetail().then(res => { - uni.setStorageSync('user',res.data); - this.$store.commit('userInfo',res.data); + this.$store.commit('userInfo', UserCache.setAndReturn(res.data)); }) } }, diff --git a/pages/Index/index.vue b/pages/Index/index.vue index 56e8887..ae6ecd5 100644 --- a/pages/Index/index.vue +++ b/pages/Index/index.vue @@ -27,7 +27,8 @@ import ChatPage from '@/pages/Index/components/ChatPage/Index.vue'; import UserPage from '@/pages/Index/components/UserPage/Index.vue'; import {imghost} from "@/config/host"; - import log from "@/utils/log"; + import {UserCache} from "@/config/config.js"; + import log from "@/utils/log"; export default { components: { FooterNav, @@ -55,7 +56,7 @@ image: imghost + "/static/image/foot-nav-button-two", name: 'order', title:'订单', - is_show: uni.getStorageSync('user')?.store_id > 0 + is_show: UserCache.get('store_id', 0) > 0 }, { image: imghost + "/static/image/foot-nav-button-three", @@ -119,9 +120,9 @@ if (!token) { this.show = true; }else{ - let user = uni.getStorageSync('user'); + let user = UserCache.get(); this.$store.commit('userInfo', user); - let userExtends = uni.getStorageSync('userExtends'); + let userExtends = UserCache.extGet(); this.$store.commit('userExtends', userExtends); } }, diff --git a/pages/Login/index.vue b/pages/Login/index.vue index bf2c874..6026072 100644 --- a/pages/Login/index.vue +++ b/pages/Login/index.vue @@ -109,6 +109,7 @@ import { } from '@/config/host.js' import api from '@/utils/functions.js'; import {appletLogin, testLogin, userDetail, userExtends} from "@/api/user"; +import {UserCache} from "@/config/config"; export default { data() { @@ -141,12 +142,10 @@ export default { }).then((res) => { uni.setStorageSync('token',res.data.token); userDetail().then((res) => { - uni.setStorageSync('user',res.data); - this.$store.commit('userInfo',res.data); + this.$store.commit('userInfo', UserCache.setAndReturn(res.data)); }); userExtends().then((res) => { - uni.setStorageSync('userExtends',res.data); - this.$store.commit('userExtends',res.data); + this.$store.commit('userExtends', UserCache.extSetAndReturn(res.data)); }); }); }, @@ -156,8 +155,7 @@ export default { appletLogin(res.code).then(res => { if(res.code === 200){ uni.setStorageSync('token',res.data.token); - uni.setStorageSync('user',res.data.user); - this.$store.commit('userInfo', res.data.user); + this.$store.commit('userInfo', UserCache.setAndReturn(res.data.user)); uni.navigateBack({ delta:1, }) diff --git a/pages/UserCoupons/index.vue b/pages/UserCoupons/index.vue index f1a6d2b..dc849ac 100644 --- a/pages/UserCoupons/index.vue +++ b/pages/UserCoupons/index.vue @@ -11,7 +11,7 @@ @@ -28,10 +28,10 @@ {{item.title}} {{item.time}} - + - + @@ -41,13 +41,13 @@ title="立即使用" @click="clickCoupons(item)" button-width="145rpx" - :button-color="item.is_timeout?'#CACACA':'#4DC3B8'" + :button-color="item.status > 0 ?'#CACACA':'#4DC3B8'" font-color="#fff" font-size="26rpx" :is-background="false" padding-tb="2rpx" :btn-style="{ - boxShadow:(item.is_timeout?'2rpx -5rpx 0rpx 0rpx rgba(199,199,199,0.35)':'2rpx -5rpx 0rpx 0rpx rgba(77,195,184,0.35)') + boxShadow:(item.status > 0?'2rpx -5rpx 0rpx 0rpx rgba(199,199,199,0.35)':'2rpx -5rpx 0rpx 0rpx rgba(77,195,184,0.35)') }"> @@ -124,7 +124,7 @@ }, methods: { clickCoupons(item){ - if(!item.is_timeout){ + if(item.status === 0){ uni.setStorageSync('userCoupons',item); uni.navigateBack(); } @@ -152,7 +152,7 @@ title:row.title, time: '有效期至 '+row.end_time, cause:'满'+parseFloat(row.min_price)+'使用', - is_timeout: (row.status === 2), + status: row.status, } }); this.status = couponsList.length < 10 ? 'nomore' : 'loadmore'; diff --git a/pages/UserDetail/index.vue b/pages/UserDetail/index.vue index 84b96af..2ae50be 100644 --- a/pages/UserDetail/index.vue +++ b/pages/UserDetail/index.vue @@ -58,7 +58,7 @@ - + 退出登录 @@ -79,6 +79,7 @@ import log from "@/utils/log"; import {updateUserDetail, userDetail} from "@/api/user"; import functions from "@/utils/functions.js"; + import {UserCache} from "@/config/config"; export default { components:{ HeaderNav @@ -147,7 +148,7 @@ this.user.birthday = uni.$u.timeFormat(this.user.birthday, 'yyyy-mm-dd') } updateUserDetail(this.user).then((data) => { - uni.setStorageSync('user', data.data); + UserCache.set(data.data); }); }, setSexTitle(v) { @@ -169,7 +170,12 @@ backgroundDel(index, file, name){ this.background = []; this.user.background = ''; - } + }, + loginout(){ + uni.clearStorageSync(); + this.$store.commit('logout'); + uni.reLaunch({url:'/pages/Index/index'}); + } }, onPageScroll(res) { diff --git a/pages/UserOrderPage/index.vue b/pages/UserOrderPage/index.vue index 6fe12be..59243d1 100644 --- a/pages/UserOrderPage/index.vue +++ b/pages/UserOrderPage/index.vue @@ -169,6 +169,7 @@ onLoad(options) { this.screenCheck = options.type; this.is_buy = options.is_buy; + log(options) }, methods: { selectScreen(item){ @@ -200,6 +201,7 @@ return; } this.status = 'loading'; + log(filter); getOrderList(filter).then(data => { if (filter.page === 1){ this.orderList = data.data; diff --git a/store.js b/store.js index 562283d..e542d01 100644 --- a/store.js +++ b/store.js @@ -1,5 +1,6 @@ import {title} from "@/config/host"; import { createStore } from 'vuex' +import log from "@/utils/log"; const store = createStore({ state () {