|
|
@@ -145,13 +145,13 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
</view> -->
|
|
|
- <view class="newCodeBox" v-if="quanMaList.length>0">
|
|
|
+ <view class="newCodeBox" v-if="sheetQRCodeList1.length>0">
|
|
|
<view class="newQrcode">
|
|
|
<swiper class="swiper" style="height: 400rpx;" circular :current='swiperIndex' :autoplay="false" :indicator-dots="true" indicator-color="#CCCCCC" indicator-active-color="#EC0F0A">
|
|
|
- <swiper-item v-for="(item,index) in quanMaList" style="height: 400rpx;">
|
|
|
+ <swiper-item v-for="(item,index) in sheetQRCodeList1" style="height: 400rpx;">
|
|
|
<view class="swiper-item">
|
|
|
|
|
|
- <tki-qrcode cid="qrcode1" ref="qrcode" :val="item" :size="300" :unit="unit"
|
|
|
+ <tki-qrcode cid="qrcode1" ref="qrcode" :val="item.qrCode" :size="300" :unit="unit"
|
|
|
:pdground="pdground" :icon="icon" :iconSize="iconsize" :lv="lv" :onval="onval"
|
|
|
:loadMake="loadMake" :usingComponents="true" @result="qrR" />
|
|
|
|
|
|
@@ -162,22 +162,15 @@
|
|
|
</swiper>
|
|
|
</view>
|
|
|
<view class="newQrcodeTs" @click="qmshowFn">
|
|
|
- 待使用<span>{{quanMaList.length?quanMaList.length:0}}</span>份券码
|
|
|
- <image src="../../../static/img2/jt1.png" mode="" class="jtImg1"></image>
|
|
|
+ 待使用<span>{{orderData.unWriteoff}}</span>份券码
|
|
|
+ <image src="../../../static/img2/jt1.png" mode="" class="jtImg1 dsyjt"></image>
|
|
|
</view>
|
|
|
</view>
|
|
|
|
|
|
</view>
|
|
|
|
|
|
</view>
|
|
|
-
|
|
|
-
|
|
|
- <!-- 实付款 -->
|
|
|
- <view class="money">
|
|
|
- <view class="informationNum">实付款：</view>
|
|
|
- <view class="informationNum" style="color: #EC0F0A;font-weight: bold;">￥{{orderData.data.payType==1?orderData.data.realMoney:0}}</view>
|
|
|
- </view>
|
|
|
- <view style="padding-left: 24rpx;padding-right: 24rpx;" >
|
|
|
+ <view style="padding-left: 24rpx;padding-right: 24rpx;" v-if="orderData.writeoff!=0||orderData.refund!=0">
|
|
|
<view class="ysyBox">
|
|
|
<view class="ysyLeft" style="font-weight: 500;color: #222222;">已使用({{orderData.writeoff}})·退款({{orderData.refund}})</view>
|
|
|
<view class="ysyRgiht" @click="sheetQRCode">
|
|
|
@@ -187,6 +180,14 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
|
|
|
+
|
|
|
+ <!-- 实付款 -->
|
|
|
+ <view class="money">
|
|
|
+ <view class="informationNum">实付款：</view>
|
|
|
+ <view class="informationNum" style="color: #EC0F0A;font-weight: bold;">￥{{orderData.data.payType==1?orderData.data.realMoney:0}}</view>
|
|
|
+ </view>
|
|
|
+
|
|
|
+
|
|
|
<!-- 订单信息 -->
|
|
|
<view class="information">
|
|
|
<!-- <view class="detailedTitle">订单信息</view> -->
|
|
|
@@ -212,7 +213,7 @@
|
|
|
<view class="informationNum">{{orderData.data.createTime}}</view>
|
|
|
</view>
|
|
|
|
|
|
- <view class="informationLine">
|
|
|
+ <view class="informationLine NoBorder">
|
|
|
<view class="informationTxt">订单单号：</view>
|
|
|
<view class="informationNum">{{orderData.data.code}}<span class="codeCopy"
|
|
|
@click="copy(orderData.data.code)">复制</span></view>
|
|
|
@@ -234,7 +235,7 @@
|
|
|
<view class="informationNum" v-if="orderData.data.payType==1">在线支付</view>
|
|
|
<view class="informationNum" v-if="orderData.data.payType==2">-</view>
|
|
|
</view>
|
|
|
- <view class="informationLine">
|
|
|
+ <view class="informationLine NoBorder">
|
|
|
<view class="informationTxt">支付时间：</view>
|
|
|
<view class="informationNum">{{orderData.data.payTime?orderData.data.payTime:'-'}}</view>
|
|
|
</view>
|
|
|
@@ -255,7 +256,7 @@
|
|
|
<view class="informationTxt">核销时间：</view>
|
|
|
<view class="informationNum">{{orderData.data.writeoffTime?orderData.data.writeoffTime:'-'}} {{orderData.data.writeoffName}}</view>
|
|
|
</view>
|
|
|
- <view class="informationLine">
|
|
|
+ <view class="informationLine NoBorder">
|
|
|
<view class="informationTxt">核销门店：</view>
|
|
|
<view class="informationNum">{{orderData.data.writeoffShopName?orderData.data.writeoffShopName:'-'}}</view>
|
|
|
</view>
|
|
|
@@ -270,7 +271,11 @@
|
|
|
<view class="defer" @click="pay">立即支付</view>
|
|
|
</view>
|
|
|
<view class="bottom" v-if="orderData.data.sheetState == 2||orderData.data.sheetState == 5">
|
|
|
- <view class="cancel" @click="cancelOrder" v-if="orderData.data.payState==2">退款</view>
|
|
|
+ <view v-if="orderData.data.payState==2">
|
|
|
+
|
|
|
+ <view class="cancel" v-if="orderData.unWriteoff>0" @click="cancelOrder" >退款</view>
|
|
|
+ </view>
|
|
|
+
|
|
|
<view class="cancel" @click="cancelBespeak" v-else>取消订单</view>
|
|
|
</view>
|
|
|
|
|
|
@@ -398,16 +403,16 @@
|
|
|
<view class="tkContBox">
|
|
|
<view class="tkTop">
|
|
|
<view style="width: 22rpx;"></view>
|
|
|
- <view class="tkTitle">券码信息（{{quanMaList.length?quanMaList.length:0}}）</view>
|
|
|
+ <view class="tkTitle">券码信息（{{orderData.unWriteoff}}）</view>
|
|
|
<image @click="qmHide" src="../../../static/img2/chahao.png" mode="" class="chahaoIMg"></image>
|
|
|
</view>
|
|
|
<view class="tkLineBox">
|
|
|
- <view class="tkLine" v-for="(item,index) in quanMaList">
|
|
|
+ <view class="tkLine" v-for="(item,index) in sheetQRCodeList1">
|
|
|
<view class="tkLineLeft">
|
|
|
<span style="color: #9A9A9A;">券码</span>
|
|
|
- <span style="color: #222222;padding-left: 66rpx;">{{item}}</span>
|
|
|
+ <span style="color: #222222;padding-left: 66rpx;">{{item.qrCode}}</span>
|
|
|
</view>
|
|
|
- <view class="tkLineRight" style="color: #576B95;" @click="copy(item)">复制</view>
|
|
|
+ <view class="tkLineRight" style="color: #576B95;" @click="copy(item.qrCode)">复制</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -437,9 +442,15 @@
|
|
|
<span>退款详情</span>
|
|
|
<image src="../../../static/img2/jt1.png" mode="" class="jtImg1"></image>
|
|
|
</view>
|
|
|
- <view class="tkSeeD" @click="goSh(item)" v-if="item.writeoffState==3">
|
|
|
- <span>申请售后</span>
|
|
|
- <image src="../../../static/img2/jt1.png" mode="" class="jtImg1"></image>
|
|
|
+ <view v-if="item.writeoffState==3">
|
|
|
+ <view class="tkSeeD" @click="refundDetail(item)" v-if="item.refundState==4||item.refundState==2||item.refundState==1||item.refundState==3">
|
|
|
+ <span>退款详情</span>
|
|
|
+ <image src="../../../static/img2/jt1.png" mode="" class="jtImg1"></image>
|
|
|
+ </view>
|
|
|
+ <view class="tkSeeD" @click="goSh(item)" v-if="item.refundState==0">
|
|
|
+ <span>申请售后</span>
|
|
|
+ <image src="../../../static/img2/jt1.png" mode="" class="jtImg1"></image>
|
|
|
+ </view>
|
|
|
</view>
|
|
|
</view>
|
|
|
<view class="tkRow">
|
|
|
@@ -456,8 +467,8 @@
|
|
|
<view style="color: #222222;">{{item.writeoffTime?item.writeoffTime:''}}</view>
|
|
|
</view>
|
|
|
<view class="tkRow">
|
|
|
- <view class="tlRowLeft">券 号</view>
|
|
|
- <view style="color: #222222;">{{item.qrCode}}</view>
|
|
|
+ <view class="tlRowLeft">券 号</view>
|
|
|
+ <view style="color: #222222;" class="{'xiahuaxian':item.writeoffState==3}">{{item.qrCode}}</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
<nodata v-if="sheetQRCodeList.length==0"></nodata>
|
|
|
@@ -548,6 +559,8 @@
|
|
|
syShow:false,
|
|
|
sheetQRCodeList:'',
|
|
|
xsShow:false,
|
|
|
+ sheetQRCodeList1:'',
|
|
|
+ shItem:'',
|
|
|
}
|
|
|
},
|
|
|
//0拼团取消1拼团失败 2拼团中3拼团成功4自动成团 groupState
|
|
|
@@ -605,7 +618,17 @@
|
|
|
})
|
|
|
},
|
|
|
qmshowFn(){
|
|
|
- this.qmShow=true
|
|
|
+ uni.showLoading({
|
|
|
+ title: '加载中'
|
|
|
+ })
|
|
|
+ this.$http('openOrderManagement/sheetQRCodeList', {
|
|
|
+ type:1,
|
|
|
+ sheetID: this.id,
|
|
|
+ }, 'GET').then(res => {
|
|
|
+ uni.hideLoading();
|
|
|
+ this.qmShow=true;
|
|
|
+ this.sheetQRCodeList1=res.data
|
|
|
+ })
|
|
|
},
|
|
|
qmHide(){
|
|
|
this.qmShow=false
|
|
|
@@ -619,12 +642,18 @@
|
|
|
//this.getTuiKuanData()
|
|
|
},
|
|
|
cancelOrder(){
|
|
|
- //this.isShowTui=true;
|
|
|
- uni.navigateTo({
|
|
|
- url:'../../subPack/refund?type=1&id='+this.id
|
|
|
- })
|
|
|
+ if(this.orderData.data.sheetState == 5){
|
|
|
+ this.isShowTui=true;
|
|
|
+ }else{
|
|
|
+ uni.navigateTo({
|
|
|
+ url:'../../subPack/refund?type=1&id='+this.id
|
|
|
+ })
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
},
|
|
|
goSh(item){
|
|
|
+ this.shItem=item
|
|
|
var that=this
|
|
|
uni.setStorage({
|
|
|
key: 'shData',
|
|
|
@@ -922,7 +951,7 @@
|
|
|
|
|
|
call() {
|
|
|
uni.makePhoneCall({
|
|
|
- phoneNumber: this.orderData.shopInfo.mobilePhone
|
|
|
+ phoneNumber:this.shItem.mobilePhone// this.orderData.shopInfo.mobilePhone
|
|
|
});
|
|
|
},
|
|
|
|
|
|
@@ -968,6 +997,13 @@
|
|
|
console.log('可用券码--',this.quanMaList);
|
|
|
|
|
|
})
|
|
|
+ this.$http('openOrderManagement/sheetQRCodeList', {
|
|
|
+ type:1,
|
|
|
+ sheetID: this.id,
|
|
|
+ }, 'GET').then(res => {
|
|
|
+
|
|
|
+ this.sheetQRCodeList1=res.data
|
|
|
+ })
|
|
|
},
|
|
|
getData2() {
|
|
|
uni.showLoading({
|
|
|
@@ -1248,14 +1284,14 @@ color: #764D49;font-size: 26rpx;padding-top:20rpx;
|
|
|
font-weight: 500;
|
|
|
font-size: 30rpx;
|
|
|
color: #EC0F0A;
|
|
|
- line-height: 42rpx;
|
|
|
+ line-height: 100rpx;
|
|
|
}
|
|
|
|
|
|
.orderState {
|
|
|
display: flex;
|
|
|
justify-content: center;
|
|
|
align-items: center;
|
|
|
- padding-top: 40rpx;
|
|
|
+
|
|
|
}
|
|
|
|
|
|
/* .SheetState {
|
|
|
@@ -1990,6 +2026,8 @@ color: #764D49;font-size: 26rpx;padding-top:20rpx;
|
|
|
background: #FFFFFF;
|
|
|
border-radius: 16rpx;
|
|
|
margin: 0 33rpx;
|
|
|
+ height: 380rpx;
|
|
|
+ overflow: scroll;
|
|
|
}
|
|
|
.tkLine{
|
|
|
display: flex;justify-content: space-between;
|
|
|
@@ -1998,6 +2036,9 @@ color: #764D49;font-size: 26rpx;padding-top:20rpx;
|
|
|
border-bottom: 1px solid #EEEEEE;
|
|
|
|
|
|
}
|
|
|
+ .tkLine:last-child {
|
|
|
+ border:none;
|
|
|
+ }
|
|
|
.tklineBox2{
|
|
|
padding:0 24rpx;
|
|
|
height: 55vh;
|
|
|
@@ -2080,4 +2121,13 @@ color: #764D49;font-size: 26rpx;padding-top:20rpx;
|
|
|
.zkRefund .jtImg1{
|
|
|
margin-left: 6rpx;margin-top: 6rpx;
|
|
|
}
|
|
|
+ .dsyjt{
|
|
|
+ margin-left: 10rpx;margin-top: 2rpx;
|
|
|
+ }
|
|
|
+ .NoBorder{
|
|
|
+ border: none;
|
|
|
+ }
|
|
|
+ .xiahuaxian{
|
|
|
+ text-decoration: line-through;
|
|
|
+ }
|
|
|
</style>
|
