【类 型】:fix
【原 因】:checkUserInfo的函数之前修改过 不用接受参数 再函数内部直接调用的全局变量 ,前端调用时并没有删掉传参 【过 程】:去掉多余的wxLogin函数引用 checkUserInfo这个函数不用传参 【影 响】: # 类型 包含: # feat:新功能(feature) # fix:修补bug # docs:文档(documentation) # style: 格式(不影响代码运行的变动) # refactor:重构(即不是新增功能,也不是修改bug的代码变动) # test:增加测试 # chore:构建过程或辅助工具的变动
This commit is contained in:
parent
c280d65a7a
commit
c8018ceb97
4
App.vue
4
App.vue
@ -59,6 +59,10 @@
|
|||||||
position: relative;
|
position: relative;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.pa{
|
||||||
|
position: absolute;
|
||||||
|
}
|
||||||
|
|
||||||
.fc {
|
.fc {
|
||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
|
@ -20,12 +20,18 @@
|
|||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="m-t-24 flex mr">
|
<view class="m-t-24 flex mr">
|
||||||
<view class="numberBut bg-m fci rad8 fz28 fb flex mac mc" :key="foodSn">
|
<view class="nullBut bg-m fci rad8 fz28 flex mac mc m-l-24" :key="foodSn">
|
||||||
|
立即支付
|
||||||
|
</view>
|
||||||
|
<view class="numberBut bg-m fci rad8 fz28 fb flex mac mc m-l-24" :key="foodSn">
|
||||||
{{ foodSn }}
|
{{ foodSn }}
|
||||||
</view>
|
</view>
|
||||||
<view class="nullBut border fcb rad8 fz28 flex mac mc m-l-24" style="">
|
<view class="nullBut border fcb rad8 fz28 flex mac mc m-l-24">
|
||||||
申请售后
|
申请售后
|
||||||
</view>
|
</view>
|
||||||
|
<view class="nullBut border fcb rad8 fz28 flex mac mc m-l-24">
|
||||||
|
退款详情
|
||||||
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</template>
|
</template>
|
||||||
|
@ -47,8 +47,7 @@
|
|||||||
|
|
||||||
<script>
|
<script>
|
||||||
import {
|
import {
|
||||||
checkUserInfo,
|
checkUserInfo
|
||||||
wxLogin
|
|
||||||
} from '@/utils/index.js'
|
} from '@/utils/index.js'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
@ -69,7 +68,7 @@
|
|||||||
return this.$store.state.orderList.filter(item => item.main_status === '已付款')
|
return this.$store.state.orderList.filter(item => item.main_status === '已付款')
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
onShow() {
|
created() {
|
||||||
//检查token 没有则进行无感登录
|
//检查token 没有则进行无感登录
|
||||||
this.checkUserInfo()
|
this.checkUserInfo()
|
||||||
// 当页面显示时,设置tabber的激活项
|
// 当页面显示时,设置tabber的激活项
|
||||||
@ -77,9 +76,7 @@
|
|||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
// 检查用户信息
|
// 检查用户信息
|
||||||
checkUserInfo() {
|
checkUserInfo,
|
||||||
return checkUserInfo(this.$store)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
@ -71,12 +71,13 @@
|
|||||||
orderList_unpaid() {
|
orderList_unpaid() {
|
||||||
return this.$store.state.orderList.filter(item => item.main_status === '未付款')
|
return this.$store.state.orderList.filter(item => item.main_status === '未付款')
|
||||||
},
|
},
|
||||||
//已付款 并且没有申请退款的订单
|
//已付款 已完成 并且没有申请退款的订单
|
||||||
orderList_paid() {
|
orderList_paid() {
|
||||||
return this.$store.state.orderList.filter(item => item.main_status === '已付款' && item.refund_status ===
|
return this.$store.state.orderList.filter(item => {
|
||||||
'未申请')
|
(item.main_status === '已付款' || item.main_status === '已完成') && item.refund_status === '未申请'
|
||||||
|
})
|
||||||
},
|
},
|
||||||
//申请中 已同意 主动退 等退款的订单
|
//申请中 已同意 主动退 拒绝退 等退款相关的订单
|
||||||
orderList_refund() {
|
orderList_refund() {
|
||||||
return this.$store.state.orderList.filter(item => item.refund_status !== '未申请')
|
return this.$store.state.orderList.filter(item => item.refund_status !== '未申请')
|
||||||
},
|
},
|
||||||
|
Loading…
Reference in New Issue
Block a user