|
|
@@ -4,7 +4,6 @@
|
|
|
|
|
|
<view class="top"></view>
|
|
|
<view class="head">
|
|
|
- <!-- <span class="cuIcon-back" @click="back"></span> -->
|
|
|
<view class="case">
|
|
|
<view class="select_type">
|
|
|
<div class="tab-item" :class="tabIndex == 0?'active':''"
|
|
|
@@ -40,7 +39,7 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
<mescroll-uni class="list" :fixed="false" ref="mescrollRef" @up="getList" @init="mescrollInit" :use="false"
|
|
|
- v-show="tabIndex ==0">
|
|
|
+ v-if="tabIndex ==0">
|
|
|
<view class="order_item" v-for="(item,index) in orderList" :key="item.id" @click="geDetail(item)">
|
|
|
<view class="order_id">
|
|
|
<view class="id_left">
|
|
|
@@ -68,6 +67,9 @@
|
|
|
{{item.productName}}
|
|
|
<span>￥{{item.orderPrice}}</span>
|
|
|
</view>
|
|
|
+ <view class="ticket" v-if="item.isUseRights">
|
|
|
+ <image src="/static/product/ticket.png" mode=""></image>
|
|
|
+ </view>
|
|
|
</view>
|
|
|
<view class="time">
|
|
|
<view class="time_left">
|
|
|
@@ -81,7 +83,7 @@
|
|
|
</mescroll-uni>
|
|
|
<!-- 服务订单 -->
|
|
|
<mescroll-uni class="list" :fixed="false" ref="mescrollRef" @up="getserviceList" @init="mescrollInit" :use="false"
|
|
|
- v-show="tabIndex == 1">
|
|
|
+ v-if="tabIndex == 1">
|
|
|
<view class="service_order" v-for="item in serviceList" :key="item.orderNo" @click="goDetail(item)">
|
|
|
<view class="item_title">
|
|
|
<span>订单编号：{{item.orderNo}}</span>
|
|
|
@@ -128,8 +130,8 @@
|
|
|
去评价
|
|
|
</view>
|
|
|
</view>
|
|
|
- <!-- 送车到站按钮区域结束-->
|
|
|
- <!-- 上门取车按钮区域开始item.checkType==0 -->
|
|
|
+ <!-- 送车到站按钮区域结束
|
|
|
+ 上门取车按钮区域开始item.checkType==0 -->
|
|
|
<view class="" v-if="item.checkType == 0" style="flex:1;display: flex;justify-content: space-around;">
|
|
|
<view class="btn join" @click.stop="goGetCar(item)" v-if="item.statusCode ==5 && item.flowStatus == 4">
|
|
|
去取车
|
|
|
@@ -152,7 +154,7 @@
|
|
|
去评价
|
|
|
</view>
|
|
|
</view>
|
|
|
- <!-- 上门取车按钮区域结束-->
|
|
|
+ <!-- 上门取车按钮区域结束 -->
|
|
|
</view>
|
|
|
<view class="add_service" @click.stop="addService(item)" v-if="item.statusCode==4 ||item.statusCode==3 ">
|
|
|
<span>添加收费服务</span>
|
|
|
@@ -270,7 +272,7 @@
|
|
|
tip: '暂无相关数据'
|
|
|
}
|
|
|
},
|
|
|
- tabIndex: 1,
|
|
|
+ tabIndex: 0,
|
|
|
serviceList: [],
|
|
|
isReceive: false, //接单成功弹窗
|
|
|
isServiceDeatil: false, //服务明细弹窗
|
|
|
@@ -315,18 +317,23 @@
|
|
|
this.currentIndex = index
|
|
|
this.state = item.type
|
|
|
this.orderList = []
|
|
|
- this.mescroll.resetUpScroll();
|
|
|
- // let page = {
|
|
|
- // num: 1,
|
|
|
- // size: 10
|
|
|
- // }
|
|
|
- // this.getList(page)
|
|
|
+ // this.mescroll.resetUpScroll();
|
|
|
+ let page = {
|
|
|
+ num: 1,
|
|
|
+ size: 10
|
|
|
+ }
|
|
|
+ this.getList(page)
|
|
|
},
|
|
|
//服务订单
|
|
|
selectSeiviceType(item, index) {
|
|
|
this.currentIndex = index
|
|
|
this.statusCode = item.type
|
|
|
this.serviceList = []
|
|
|
+ // let page = {
|
|
|
+ // num: 1,
|
|
|
+ // size: 10
|
|
|
+ // }
|
|
|
+
|
|
|
this.mescroll.resetUpScroll();
|
|
|
},
|
|
|
searchList() {
|
|
|
@@ -366,15 +373,9 @@
|
|
|
buyEndTime: this.buyEndTime
|
|
|
}
|
|
|
this.$http.post("/app/order/locaOrder/list", data).then(res => {
|
|
|
- console.log(res)
|
|
|
- if (res.data.code == 200) {
|
|
|
this.orderList = this.orderList.concat(res.data.result.records)
|
|
|
this.mescroll.endSuccess(res.data.result.records.length, res.data.result.total);
|
|
|
uni.showTabBar()
|
|
|
- } else {
|
|
|
- this.mescroll.endErr()
|
|
|
- this.orderList = []
|
|
|
- }
|
|
|
}).catch(() => {
|
|
|
this.mescroll.endErr()
|
|
|
})
|
|
|
@@ -384,6 +385,7 @@
|
|
|
url: '/pages/order/details?orderId=' + item.orderId
|
|
|
})
|
|
|
},
|
|
|
+ //获取服务订单列表
|
|
|
getserviceList(page) {
|
|
|
let data = {
|
|
|
merchantId: this.merchantId,
|
|
|
@@ -393,7 +395,7 @@
|
|
|
}
|
|
|
this.$http.post("/ts/merchant/serviceOrder", data).then(res => {
|
|
|
if (res.data.code == 200) {
|
|
|
- this.serviceList = res.data.result.records
|
|
|
+ this.serviceList =this.serviceList.cancat(res.data.result.records)
|
|
|
this.mescroll.endSuccess(res.data.result.records.length, res.data.result.total);
|
|
|
}
|
|
|
})
|
|
|
@@ -839,6 +841,12 @@
|
|
|
color: #F0761D;
|
|
|
}
|
|
|
}
|
|
|
+ .ticket{
|
|
|
+ image{
|
|
|
+ width: 50rpx;
|
|
|
+ height: 50rpx;
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
.schedule {
|
|
|
width: 15%;
|
