|
@@ -34,7 +34,7 @@
|
|
<view class="two_1">
|
|
<view class="two_1">
|
|
<view class="title">我的订单</view>
|
|
<view class="title">我的订单</view>
|
|
<view class="title">
|
|
<view class="title">
|
|
- <text @click="toAllOrder()">全部订单</text>
|
|
|
|
|
|
+ <text @click="toCommon('pagesMy/order/all')">全部订单</text>
|
|
<text class="iconfont icon-jiantouyou"></text>
|
|
<text class="iconfont icon-jiantouyou"></text>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
@@ -52,8 +52,7 @@
|
|
<view class="title">{{item.title}}</view>
|
|
<view class="title">{{item.title}}</view>
|
|
<view class="title">
|
|
<view class="title">
|
|
<text v-if="user.id&&item.title=='我的尊荣'">{{integral||0}}分</text>
|
|
<text v-if="user.id&&item.title=='我的尊荣'">{{integral||0}}分</text>
|
|
- <text v-if="item.title=='客服电话'"
|
|
|
|
- @tap="makePhone(serviceContactInfo.phone)">{{serviceContactInfo.phone||''}}</text>
|
|
|
|
|
|
+ <text v-if="item.title=='客服电话'" @tap="makePhone(serviceContactInfo.phone)">{{serviceContactInfo.phone||''}}</text>
|
|
<text class="iconfont icon-jiantouyou"></text>
|
|
<text class="iconfont icon-jiantouyou"></text>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
@@ -87,7 +86,7 @@
|
|
notice_total: 0,
|
|
notice_total: 0,
|
|
};
|
|
};
|
|
},
|
|
},
|
|
- onShow:async function() {
|
|
|
|
|
|
+ onShow: async function() {
|
|
const that = this;
|
|
const that = this;
|
|
// 查询其他信息
|
|
// 查询其他信息
|
|
await that.searchOther();
|
|
await that.searchOther();
|
|
@@ -177,12 +176,6 @@
|
|
that.$set(that, `serviceContactInfo`, res.data[0])
|
|
that.$set(that, `serviceContactInfo`, res.data[0])
|
|
}
|
|
}
|
|
},
|
|
},
|
|
- // 全部订单
|
|
|
|
- toAllOrder(){
|
|
|
|
- uni.navigateTo({
|
|
|
|
- url: `/pagesMy/order/all`
|
|
|
|
- })
|
|
|
|
- },
|
|
|
|
// 公共跳转
|
|
// 公共跳转
|
|
toCommon(e) {
|
|
toCommon(e) {
|
|
uni.getStorage({
|
|
uni.getStorage({
|
|
@@ -267,9 +260,11 @@
|
|
|
|
|
|
.one_1 {
|
|
.one_1 {
|
|
margin: 0 0 5vw 0;
|
|
margin: 0 0 5vw 0;
|
|
- .one_1_1{
|
|
|
|
|
|
+
|
|
|
|
+ .one_1_1 {
|
|
position: absolute;
|
|
position: absolute;
|
|
left: 55vw;
|
|
left: 55vw;
|
|
|
|
+
|
|
.iconfont {
|
|
.iconfont {
|
|
font-size: 20px;
|
|
font-size: 20px;
|
|
}
|
|
}
|