diff --git a/pages/index/index.vue b/pages/index/index.vue
index 238594a..c0d26b5 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -13,10 +13,12 @@
-
-
- 订单
-
+
+
+
+ 订单
+
+
diff --git a/pages/main/order.vue b/pages/main/order.vue
index b086607..5ad2fc3 100644
--- a/pages/main/order.vue
+++ b/pages/main/order.vue
@@ -6,6 +6,25 @@
+
+
+
+
+
+
+ 订单号: {{item.order_sn}}
+
+
+
+
+ 订单号: {{item.order_sn}}
+
+
+
+
+ 订单号: {{item.order_sn}}
+
+
@@ -13,11 +32,25 @@
export default {
data() {
return {
-
+ list: ['未付款', '已付款', '申请售后'],
+ curNow: 0
+ }
+ },
+ computed: {
+ orderList() {
+ return this.$store.state.orderList
}
},
methods: {
-
+ sectionChange(index) {
+ this.curNow = index;
+ }
+ },
+ onLoad() {
+ this.$store.dispatch('fetchOrderList')
+ setTimeout(()=> {
+ console.log(this.orderList)
+ }, 2000);
}
}
diff --git a/store/index.js b/store/index.js
index e13d27e..809f0d0 100644
--- a/store/index.js
+++ b/store/index.js
@@ -30,6 +30,7 @@ const store = new Vuex.Store({
topic_prefix: null
}, //用户信息
+ orderList: [], //订单列表
siteList: [], //站点列表
menuList: [], //分类列表
spuList: [], //spu列表
@@ -44,16 +45,16 @@ const store = new Vuex.Store({
//修改状态
mutations: {
//设置 列表页 购物车折叠显隐
- setCartShow(state,val){
- Vue.set(state,'cartShow', val)
+ setCartShow(state, val) {
+ Vue.set(state, 'cartShow', val)
},
//设置 标记用户登录状态
- setMqttState(state,val){
- Vue.set(state,'mqttState', val)
+ setMqttState(state, val) {
+ Vue.set(state, 'mqttState', val)
},
//设置tabbar当前激活像
- setTabbarCurrent(state,val){
- Vue.set(state,'tabbarCurrent', val)
+ setTabbarCurrent(state, val) {
+ Vue.set(state, 'tabbarCurrent', val)
},
//把用户信息 从本地缓存 提取到内存当中
setUserInfo(state, obj) {
@@ -73,6 +74,10 @@ const store = new Vuex.Store({
Vue.set(state.userInfo, 'token', null)
Vue.set(state.userInfo, 'topic_prefix', null)
},
+ //设置订单列表
+ setOrderList(state, list) {
+ state.orderList = list
+ },
//设置站点列表
setSiteList(state, list) {
state.siteList = list
@@ -94,8 +99,8 @@ const store = new Vuex.Store({
state.shopCon = obj
},
//清空购物车
- clearCartList(state){
- Vue.set(state,'cartList', [])
+ clearCartList(state) {
+ Vue.set(state, 'cartList', [])
},
// 设置购物车列表
setCartList(state, obj) {
@@ -150,6 +155,24 @@ const store = new Vuex.Store({
},
//异步修改
actions: {
+ //获取订单列表
+ fetchOrderList({
+ state,
+ commit
+ }) {
+ uni.$u.http.get('/Api/Check/getOrderList', {
+ header:{
+ 'Token': state.userInfo.token,
+ }
+ }).then(res => {
+ if (res.data.status === 1) {
+ //更新数据
+ commit('setOrderList', res.data.orderList)
+ } else {
+ commit('setSiteList', [])
+ }
+ })
+ },
//获取站点列表
fetchSiteList({
state,
diff --git a/utils/index.js b/utils/index.js
index 8427993..e6b9d3a 100644
--- a/utils/index.js
+++ b/utils/index.js
@@ -135,7 +135,7 @@ export function totalPrice(cartList) {
* 检查用户信息登录 信息
*/
export function checkUserInfo() {
- //检查是否已经标记登录了
+ //刚打开app token未赋值到内存时
if (store.state.userInfo.token === null) {
//先从storage里调取token
uni.getStorage({
@@ -165,7 +165,7 @@ export function checkUserInfo() {
wxLogin()
}
})
- } else {
+ } else { //内存中已经赋值了token时
//验证token
isTokenValid().then((isValid) => {
if (isValid.data.status === -1) { //token验证失败或过期