|
@@ -55,7 +55,7 @@
|
|
|
</view>
|
|
|
|
|
|
<!-- 店铺信息 -->
|
|
|
- <view class="shopBox" :class="{shopBoxpt:orderData.data.sheetState == 5}">
|
|
|
+ <view class="shopBox" v-if="orderData" :class="{shopBoxpt:orderData.data.sheetState == 5}">
|
|
|
<image src="../../../static/img/icon_store.png" mode="" class="shopBoximg"></image>
|
|
|
<view class="shopCont">
|
|
|
<view class="shopName">{{orderData.shopInfo.shopName}}</view>
|
|
@@ -171,7 +171,7 @@
|
|
|
|
|
|
</view>
|
|
|
<view style="padding-left: 24rpx;padding-right: 24rpx;" v-if="orderData.writeoff!=0||orderData.refund!=0">
|
|
|
- <view class="ysyBox">
|
|
|
+ <view class="ysyBox" v-if="orderData">
|
|
|
<view class="ysyLeft" style="font-weight: 500;color: #222222;">
|
|
|
<span v-if="orderData.writeoff!=0">已使用({{orderData.writeoff}})</span>
|
|
|
<span v-if="orderData.writeoff!=0&&orderData.refund!=0">·</span>
|
|
@@ -186,7 +186,7 @@
|
|
|
|
|
|
|
|
|
<!-- 实付款 -->
|
|
|
- <view class="money">
|
|
|
+ <view class="money" v-if="orderData">
|
|
|
<view class="informationNum">实付款:</view>
|
|
|
<view class="informationNum" style="color: #EC0F0A;font-weight: bold;">¥{{orderData.data.payType==1?orderData.data.realMoney:0}}</view>
|
|
|
</view>
|
|
@@ -403,14 +403,14 @@
|
|
|
</view>
|
|
|
|
|
|
|
|
|
-<view class="tkBox" v-if="qmShow">
|
|
|
- <view class="tkContBox">
|
|
|
+<view class="tkBox" v-if="qmShow" @click="qmHide">
|
|
|
+ <view class="tkContBox" @click.stop="">
|
|
|
<view class="tkTop">
|
|
|
<view style="width: 22rpx;"></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="tkLineBox3">
|
|
|
<view class="tkLine" v-for="(item,index) in sheetQRCodeList1">
|
|
|
<view class="tkLineLeft">
|
|
|
<span style="color: #9A9A9A;">券码</span>
|
|
@@ -422,8 +422,8 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
|
|
|
-<view class="tkBox" v-if="syShow">
|
|
|
- <view class="tkContBox2">
|
|
|
+<view class="tkBox" v-if="syShow" @click="syHide">
|
|
|
+ <view class="tkContBox2" @click.stop="">
|
|
|
<view class="tkTop">
|
|
|
<view style="width: 22rpx;"></view>
|
|
|
<view class="tkTitle">详情</view>
|
|
@@ -471,7 +471,7 @@
|
|
|
</view>
|
|
|
<view class="tkRow" v-if="item.orderType==3">
|
|
|
<view class="tlRowLeft">券 号</view>
|
|
|
- <view style="color: #222222;" class="xiahuaxian">{{item.couponCode}}</view>
|
|
|
+ <view style="color: #222222;width: 480rpx; white-space: normal; word-break: break-all;" class="xiahuaxian">{{item.couponCode}}</view>
|
|
|
</view>
|
|
|
|
|
|
<view class="tkRow" v-if="item.orderType==2">
|
|
@@ -488,7 +488,7 @@
|
|
|
</view>
|
|
|
<view class="tkRow" v-if="item.orderType==2">
|
|
|
<view class="tlRowLeft">券 号</view>
|
|
|
- <view style="color: #222222;" class="xiahuaxian">{{item.couponCode}}</view>
|
|
|
+ <view style="color: #222222;width: 480rpx; white-space: normal; word-break: break-all;" class="">{{item.couponCode}}</view>
|
|
|
</view>
|
|
|
|
|
|
|
|
@@ -500,8 +500,8 @@
|
|
|
</view>
|
|
|
|
|
|
|
|
|
-<view class="tkBox" v-if="xsShow">
|
|
|
- <view class="tkContBox">
|
|
|
+<view class="tkBox" v-if="xsShow" @click="xsHide">
|
|
|
+ <view class="tkContBox" @click.stop="">
|
|
|
<view class="tkTop">
|
|
|
<view style="width: 22rpx;"></view>
|
|
|
<view class="tkTitle">申请售后</view>
|
|
@@ -1978,7 +1978,7 @@ color: #764D49;font-size: 26rpx;padding-top:20rpx;
|
|
|
text-align: center;padding-top: 30rpx;
|
|
|
}
|
|
|
.newQrcodeTs{
|
|
|
- font-size: 24rpx;
|
|
|
+ font-size: 28rpx;
|
|
|
color: #222222;
|
|
|
}
|
|
|
.jtImg1{
|
|
@@ -2051,6 +2051,12 @@ color: #764D49;font-size: 26rpx;padding-top:20rpx;
|
|
|
height: 380rpx;
|
|
|
overflow: scroll;
|
|
|
}
|
|
|
+ .tkLineBox3{
|
|
|
+ border-radius: 16rpx;
|
|
|
+ margin: 0 33rpx;
|
|
|
+ height: 380rpx;
|
|
|
+ overflow: scroll;
|
|
|
+ }
|
|
|
.tkLine{
|
|
|
display: flex;justify-content: space-between;
|
|
|
font-size: 26rpx;
|
|
@@ -2058,6 +2064,10 @@ color: #764D49;font-size: 26rpx;padding-top:20rpx;
|
|
|
border-bottom: 1px solid #EEEEEE;
|
|
|
|
|
|
}
|
|
|
+ .tkLineBox3 .tkLine{
|
|
|
+ background: #FFFFFF;
|
|
|
+ font-size: 28rpx;
|
|
|
+ }
|
|
|
.tkLine:last-child {
|
|
|
border:none;
|
|
|
}
|
|
@@ -2134,20 +2144,24 @@ color: #764D49;font-size: 26rpx;padding-top:20rpx;
|
|
|
margin-top: 32rpx;
|
|
|
margin-right: 32rpx;
|
|
|
}
|
|
|
- .zkRefund{
|
|
|
- display: flex;justify-content: center;
|
|
|
- font-size: 24rpx;
|
|
|
- color: #9A9A9A;
|
|
|
- padding-top: 30rpx;
|
|
|
- }
|
|
|
- .zkRefund .jtImg1{
|
|
|
- margin-left: 6rpx;margin-top: 6rpx;
|
|
|
- }
|
|
|
+.zkRefund{
|
|
|
+ display: flex;justify-content: center;
|
|
|
+ font-size: 28rpx;
|
|
|
+ color: #333333;
|
|
|
+ padding-top: 30rpx;
|
|
|
+}
|
|
|
+.zkRefund .jtImg1{
|
|
|
+ margin-left: 6rpx;margin-top: 12rpx;
|
|
|
+}
|
|
|
.dsyjt{
|
|
|
- margin-left: 10rpx;margin-top: 2rpx;
|
|
|
+ margin-left: 10rpx;margin-top: 10rpx;
|
|
|
+ }
|
|
|
+ .newQrcodeTs{
|
|
|
+ display: flex;
|
|
|
+ justify-content: center;
|
|
|
}
|
|
|
.NoBorder{
|
|
|
- border: none;
|
|
|
+ border: none !important;
|
|
|
}
|
|
|
.xiahuaxian{
|
|
|
text-decoration: line-through;
|