Compare commits
No commits in common. "0d76b301b96297175310c1038b1014f79ac457a6" and "4878c435711ec7d7bbcba2c056acab9e5ed74ccd" have entirely different histories.
0d76b301b9
...
4878c43571
2
App.vue
2
App.vue
@ -12,7 +12,7 @@
|
|||||||
//异步加载分类列表
|
//异步加载分类列表
|
||||||
this.$store.dispatch('fetchMenuList')
|
this.$store.dispatch('fetchMenuList')
|
||||||
// 创建一个数组存放两个需要等待的异步操作的 Promise
|
// 创建一个数组存放两个需要等待的异步操作的 Promise
|
||||||
const promises = []
|
const promises = [];
|
||||||
//异步获取spu列表
|
//异步获取spu列表
|
||||||
promises.push(this.$store.dispatch('fetchSpuList'))
|
promises.push(this.$store.dispatch('fetchSpuList'))
|
||||||
//异步获取sku列表
|
//异步获取sku列表
|
||||||
|
@ -31,7 +31,7 @@
|
|||||||
<view v-if="showPickupNumber" class="numberBut bg-m fci rad8 fz28 fb flex mac mc m-l-24">
|
<view v-if="showPickupNumber" class="numberBut bg-m fci rad8 fz28 fb flex mac mc m-l-24">
|
||||||
{{ foodSn }}
|
{{ foodSn }}
|
||||||
</view>
|
</view>
|
||||||
<navigator v-if="showAfterSaleButton" class="m-l-24" :url="`/pages/order/refund?order_sn=${order.order_sn}`" hover-class="navigator-hover">
|
<navigator v-if="showAfterSaleButton" class="m-l-24" :url="`/pages/shop/refund?order_sn=${order.order_sn}`" hover-class="navigator-hover">
|
||||||
<view class="nullBut border fcb rad8 fz28 flex mac mc">
|
<view class="nullBut border fcb rad8 fz28 flex mac mc">
|
||||||
申请售后
|
申请售后
|
||||||
</view>
|
</view>
|
||||||
|
@ -1,16 +1,10 @@
|
|||||||
<template>
|
<template>
|
||||||
<view>
|
<view>
|
||||||
<!-- topbar -->
|
<!-- topbar -->
|
||||||
<u-navbar
|
<u-navbar title="订单" bgColor="#d43030" :titleStyle="{ color: '#FFF'}" :autoBack="true" placeholder>
|
||||||
title="订单"
|
<view class="u-nav-slot" slot="left">
|
||||||
bgColor="#d43030"
|
<u-icon name="arrow-left" color="#fff" size="19"></u-icon>
|
||||||
:titleStyle="{ color: '#FFF' }"
|
</view>
|
||||||
:autoBack="false"
|
|
||||||
placeholder
|
|
||||||
>
|
|
||||||
<view class="u-nav-slot" slot="left" @click="onBackClick">
|
|
||||||
<u-icon name="arrow-left" color="#fff" size="19"></u-icon>
|
|
||||||
</view>
|
|
||||||
</u-navbar>
|
</u-navbar>
|
||||||
<!-- tab -->
|
<!-- tab -->
|
||||||
<view class="tabListBox m-l-24 m-r-24 m-t-24 flex msb pr">
|
<view class="tabListBox m-l-24 m-r-24 m-t-24 flex msb pr">
|
||||||
@ -69,8 +63,6 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
onLoad() {
|
onLoad() {
|
||||||
//更新订订单列表
|
|
||||||
this.$store.dispatch('fetchOrderList')
|
|
||||||
//初始化 tapline的位置
|
//初始化 tapline的位置
|
||||||
this.lineOffset(this.current)
|
this.lineOffset(this.current)
|
||||||
},
|
},
|
||||||
@ -95,21 +87,6 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
// 自定义返回按钮点击事件
|
|
||||||
onBackClick() {
|
|
||||||
const pages = getCurrentPages() // 获取当前页面栈
|
|
||||||
if (pages.length === 1) {
|
|
||||||
// 如果当前页面是栈中的唯一页面,跳转到首页
|
|
||||||
uni.reLaunch({
|
|
||||||
url: '/pages/index/index', // 跳转到首页
|
|
||||||
})
|
|
||||||
} else {
|
|
||||||
// 否则返回上一页
|
|
||||||
uni.navigateBack({
|
|
||||||
delta: 1, // 返回上一页
|
|
||||||
})
|
|
||||||
}
|
|
||||||
},
|
|
||||||
//点击tab标签时 设置current
|
//点击tab标签时 设置current
|
||||||
handlerTab(index) {
|
handlerTab(index) {
|
||||||
this.current = index
|
this.current = index
|
||||||
|
@ -217,9 +217,9 @@
|
|||||||
//成功申请退款
|
//成功申请退款
|
||||||
if (res.data.status === 1) {
|
if (res.data.status === 1) {
|
||||||
//跳转到订单 退款tab页面
|
//跳转到订单 退款tab页面
|
||||||
uni.navigateTo({
|
// uni.navigateTo({
|
||||||
url: `/pages/order/index`
|
// url: `/pages/shop/pay?order_sn=${res.data.order_sn}&fullPrice=${fullPrice}`
|
||||||
})
|
// })
|
||||||
} else if (res.data.status === -1) {
|
} else if (res.data.status === -1) {
|
||||||
uni.removeStorage({ //清除用户信息 跳转首页
|
uni.removeStorage({ //清除用户信息 跳转首页
|
||||||
key: 'userInfo',
|
key: 'userInfo',
|
||||||
|
Loading…
Reference in New Issue
Block a user