|
|
@@ -19,7 +19,7 @@
|
|
|
<view class="orders box">
|
|
|
<view class="o_title">
|
|
|
<text>我的订单</text>
|
|
|
- <view class="ot_all" @tap="toTurn('/pagesHouse/Mine/ordersList/index?type=',true)">
|
|
|
+ <view class="ot_all" @tap="toTurn('/pagesHouse/Mine/ordersList/index?type=&index=-1',true)">
|
|
|
<!-- <view class="ot_all" @tap="toToast"> -->
|
|
|
<text>全部订单</text>
|
|
|
<!-- <image src="../../static/index/steamerTicket/icon_yjt.png"></image> -->
|
|
|
@@ -27,7 +27,7 @@
|
|
|
</view>
|
|
|
<view class="o_menus">
|
|
|
<view v-for="(item,index) in orderMenus" :key="index"
|
|
|
- @tap="toTurn('/pagesHouse/Mine/ordersList/index?type='+item.type,true)">
|
|
|
+ @tap="toTurn('/pagesHouse/Mine/ordersList/index?type='+item.type+'&index='+index,true)">
|
|
|
<!-- <view v-for="(item,index) in orderMenus" :key="index" @tap="toToast"> -->
|
|
|
<image :src="item.img"></image>
|
|
|
<text>{{item.text}}</text>
|
|
|
@@ -96,13 +96,13 @@
|
|
|
h: uni.getSystemInfoSync().windowHeight,
|
|
|
w: uni.getSystemInfoSync().windowWidth,
|
|
|
mt: uni.getSystemInfoSync().statusBarHeight + 44,
|
|
|
- avatar: 'https://i.ringzle.com/file/20240129/5b4a757190334fa7ae8616620c770bc4.png',
|
|
|
+ avatar: 'https://i.ringzle.com/file/20240129/5b4a757190334fa7ae8616620c770bc4.png',
|
|
|
name: '游客',
|
|
|
orderMenus: [ //type:1 待付款、2 待使用、3 待评价、4 退款/售后
|
|
|
{
|
|
|
type: 0,
|
|
|
img: 'https://i.ringzle.com/file/20240129/818fa751cf8d4772ac1cf818522a7f54.png',
|
|
|
- text: '待付款'
|
|
|
+ text: '待支付'
|
|
|
},
|
|
|
{
|
|
|
type: 4,
|
|
|
@@ -132,7 +132,6 @@
|
|
|
methods: {
|
|
|
toTurn(url, login) { //login 是否需要验证登录跳转
|
|
|
if (!url) return this.$showToast('正在开发中...')
|
|
|
- console.log(url);
|
|
|
uni.navigateTo({
|
|
|
url
|
|
|
});
|
|
|
@@ -140,7 +139,6 @@
|
|
|
},
|
|
|
getInfo() {
|
|
|
this.$api.get('/api/merchant/food/merchant/' + uni.getStorageSync('merchantId')).then(res => {
|
|
|
- console.log(res)
|
|
|
if (res.data.code == 0) {
|
|
|
this.dto = res.data.data;
|
|
|
if (!res.data.data.shopSign) {
|
|
|
@@ -148,7 +146,6 @@
|
|
|
'https://i.ringzle.com/file/20240225/26feb8cc8f744123a980211ebdfb8d40.png';
|
|
|
}
|
|
|
//this.shopImgs = res.data.data.split(',');
|
|
|
- console.log(this.shopImgs)
|
|
|
}
|
|
|
})
|
|
|
},
|
