Compare commits

..

No commits in common. "0d76b301b96297175310c1038b1014f79ac457a6" and "4878c435711ec7d7bbcba2c056acab9e5ed74ccd" have entirely different histories.

4 changed files with 9 additions and 32 deletions

View File

@ -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

View File

@ -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>

View File

@ -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

View File

@ -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',