|
|
@@ -19,20 +19,17 @@
|
|
|
<view class="shuaxin" v-if="orderData.data.sheetState == 1 &&sx" @click="shuaxinFn">
|
|
|
如果支付状态未及时更新，请点击 <span style="color: #3F90F7;">刷新</span>
|
|
|
</view>
|
|
|
- <view class="top" :style="{background:'#'+themeColor}">
|
|
|
- <view class="orderState">
|
|
|
- <image src="../../../static/img/icon_order_def.png" mode="" style="width: 44rpx;height: 44rpx;"></image>
|
|
|
-
|
|
|
-
|
|
|
- <view class="SheetState" v-if="orderData.data.sheetState == 1">待付款</view>
|
|
|
- <view class="SheetState" v-if="orderData.data.sheetState == 2">待服务</view>
|
|
|
- <view class="SheetState" v-if="orderData.data.sheetState == 3">已完成</view>
|
|
|
- <view class="SheetState" v-if="orderData.data.sheetState == 4">已取消</view>
|
|
|
-
|
|
|
+ <view class="topBox">
|
|
|
+ <view class="top" >
|
|
|
+ <view class="orderState">
|
|
|
+ <view class="SheetState" v-if="orderData.data.sheetState == 1">待付款</view>
|
|
|
+ <view class="SheetState" v-if="orderData.data.sheetState == 2">待服务</view>
|
|
|
+ <view class="SheetState" v-if="orderData.data.sheetState == 3">已完成</view>
|
|
|
+ <view class="SheetState" v-if="orderData.data.sheetState == 4">已取消</view>
|
|
|
+ </view>
|
|
|
</view>
|
|
|
-
|
|
|
-
|
|
|
</view>
|
|
|
+
|
|
|
|
|
|
<!-- 店铺信息 -->
|
|
|
<view class="shopBox">
|
|
|
@@ -75,7 +72,7 @@
|
|
|
</view>
|
|
|
<view v-if="orderData.data.sheetState != 1 && orderData.data.sheetState != 4" class="line"></view>
|
|
|
<view v-if="orderData.data.sheetState != 1 && orderData.data.sheetState != 4">
|
|
|
- <view class="goodsName">
|
|
|
+ <!-- <view class="goodsName">
|
|
|
券码信息（{{quanMaList.length?quanMaList.length:0}}张可用）
|
|
|
</view>
|
|
|
<view class="detailedLineBox" v-for="(v,index) in orderData.OpenSheetQRCode">
|
|
|
@@ -107,6 +104,27 @@
|
|
|
</view>
|
|
|
|
|
|
|
|
|
+ </view> -->
|
|
|
+ <view class="newCodeBox">
|
|
|
+ <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;">
|
|
|
+ <view class="swiper-item">
|
|
|
+
|
|
|
+ <tki-qrcode cid="qrcode1" ref="qrcode" :val="item" :size="300" :unit="unit"
|
|
|
+ :pdground="pdground" :icon="icon" :iconSize="iconsize" :lv="lv" :onval="onval"
|
|
|
+ :loadMake="loadMake" :usingComponents="true" @result="qrR" />
|
|
|
+
|
|
|
+ </view>
|
|
|
+ </swiper-item>
|
|
|
+
|
|
|
+
|
|
|
+ </swiper>
|
|
|
+ </view>
|
|
|
+ <view class="newQrcodeTs" @click="qmshowFn">
|
|
|
+ 待使用<span>{{quanMaList.length?quanMaList.length:0}}</span>份券码
|
|
|
+ <image src="../../../static/img2/jt1.png" mode="" class="jtImg1"></image>
|
|
|
+ </view>
|
|
|
</view>
|
|
|
</view>
|
|
|
|
|
|
@@ -152,20 +170,40 @@
|
|
|
</view>
|
|
|
|
|
|
</view>
|
|
|
+ <view style="padding-left: 24rpx;padding-right: 24rpx;" >
|
|
|
+ <view class="ysyBox">
|
|
|
+ <view class="ysyLeft" style="font-weight: 500;color: #222222;">已使用({{orderData.writeoff}})·退款({{orderData.refund}})</view>
|
|
|
+ <view class="ysyRgiht" @click="sheetQRCode">
|
|
|
+ <span style="color: #9A9A9A;padding-right: 16rpx;">查看详情</span>
|
|
|
+ <image src="../../../static/img2/jt1.png" mode="" class="jtImg1"></image>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+
|
|
|
|
|
|
<!-- 实付款 -->
|
|
|
<view class="money">
|
|
|
- <view class="informationNum">实付款：</view>
|
|
|
- <view class="informationNum" style="color: #EC0F0A;font-weight: bold;">￥{{orderData.data.realMoney}}</view>
|
|
|
+ <view style="display: flex;justify-content: space-between;border-bottom: 1px solid #EEEEEE;padding-bottom: 20rpx;">
|
|
|
+ <view class="informationNum">商品费</view>
|
|
|
+ <view class="informationNum" >￥{{orderData.data.totalMoney}}</view>
|
|
|
+ </view>
|
|
|
+ <view style="font-weight: bold;text-align: right;padding-top: 20rpx;">
|
|
|
+ 实付款
|
|
|
+ <span style="color: #CE0000;">￥{{orderData.data.realMoney}}</span>
|
|
|
+ </view>
|
|
|
+
|
|
|
</view>
|
|
|
|
|
|
<!-- 订单信息 -->
|
|
|
<view class="information">
|
|
|
- <view class="detailedTitle">订单信息</view>
|
|
|
+ <!-- <view class="detailedTitle">订单信息</view> -->
|
|
|
<view class="informationLine">
|
|
|
<view class="informationTxt">订单单号：</view>
|
|
|
- <view class="informationNum">{{orderData.data.code}}<span class="codeCopy"
|
|
|
- @click="copy(orderData.data.code)">复制</span></view>
|
|
|
+ <view class="informationNum">
|
|
|
+ <image src="../../../static/img2/copy.png" mode="" class="copyIcon"></image>
|
|
|
+ {{orderData.data.code}}
|
|
|
+ <!-- <span class="codeCopy" @click="copy(orderData.data.code)">复制</span> -->
|
|
|
+ </view>
|
|
|
</view>
|
|
|
<view class="informationLine">
|
|
|
<view class="informationTxt">下单人：</view>
|
|
|
@@ -185,7 +223,7 @@
|
|
|
|
|
|
<!-- 支付信息 -->
|
|
|
<view class="information">
|
|
|
- <view class="detailedTitle">支付信息</view>
|
|
|
+ <!-- <view class="detailedTitle">支付信息</view> -->
|
|
|
<view class="informationLine">
|
|
|
<view class="informationTxt">支付状态：</view>
|
|
|
<view class="informationNum" v-if="orderData.data.payState==1">未支付</view>
|
|
|
@@ -231,7 +269,7 @@
|
|
|
<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" >退款</view>
|
|
|
+ <view class="cancel" @click="cancelOrder" >申请退款</view>
|
|
|
</view>
|
|
|
|
|
|
|
|
|
@@ -332,6 +370,73 @@
|
|
|
|
|
|
|
|
|
|
|
|
+<view class="tkBox" v-if="qmShow">
|
|
|
+ <view class="tkContBox">
|
|
|
+ <view class="tkTop">
|
|
|
+ <view style="width: 22rpx;"></view>
|
|
|
+ <view class="tkTitle">券码信息（{{quanMaList.length?quanMaList.length:0}}）</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="tkLineLeft">
|
|
|
+ <span style="color: #9A9A9A;">券码</span>
|
|
|
+ <span style="color: #222222;padding-left: 66rpx;">{{item}}</span>
|
|
|
+ </view>
|
|
|
+ <view class="tkLineRight" style="color: #576B95;">复制</view>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+</view>
|
|
|
+
|
|
|
+<view class="tkBox" v-if="syShow">
|
|
|
+ <view class="tkContBox2">
|
|
|
+ <view class="tkTop">
|
|
|
+ <view style="width: 22rpx;"></view>
|
|
|
+ <view class="tkTitle">详情</view>
|
|
|
+ <image @click="syHide" src="../../../static/img2/chahao.png" mode="" class="chahaoIMg"></image>
|
|
|
+ </view>
|
|
|
+ <view class="tklineBox2">
|
|
|
+ <view class="tkline2" v-for="(item,index) in sheetQRCodeList">
|
|
|
+ <view class="tklineTop2">
|
|
|
+ <view class="tkZt">
|
|
|
+ <span v-if="item.writeoffState==3">已使用</span>
|
|
|
+ <span v-if="item.writeoffState==1">未使用</span>
|
|
|
+ <span v-if="item.refundState==0"></span>
|
|
|
+ <span v-if="item.refundState==1">·退款中</span>
|
|
|
+ <span v-if="item.refundState==2">·退款成功</span>
|
|
|
+ <span v-if="item.refundState==3">·退款拒绝</span>
|
|
|
+ <span v-if="item.refundState==4">·退款失败</span>
|
|
|
+
|
|
|
+ </view>
|
|
|
+ <view class="tkSeeD">
|
|
|
+ <span>退款详情</span>
|
|
|
+ <image src="../../../static/img2/jt1.png" mode="" class="jtImg1"></image>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ <view class="tkRow">
|
|
|
+ <view class="tlRowLeft" v-if="item.writeoffState==3">使用份数</view>
|
|
|
+ <view class="tlRowLeft" v-else>退款份数</view>
|
|
|
+ <view style="color: #222222;">1份</view>
|
|
|
+ </view>
|
|
|
+ <view class="tkRow">
|
|
|
+ <view class="tlRowLeft">消费门店</view>
|
|
|
+ <view style="color: #222222;">{{item.writeoffShopName}}</view>
|
|
|
+ </view>
|
|
|
+ <view class="tkRow">
|
|
|
+ <view class="tlRowLeft">消费时间</view>
|
|
|
+ <view style="color: #222222;">{{item.writeoffTime}}</view>
|
|
|
+ </view>
|
|
|
+ <view class="tkRow">
|
|
|
+ <view class="tlRowLeft">券 号</view>
|
|
|
+ <view style="color: #222222;">{{item.qrCode}}</view>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+
|
|
|
+ </view>
|
|
|
+</view>
|
|
|
+
|
|
|
</view>
|
|
|
</template>
|
|
|
|
|
|
@@ -378,6 +483,9 @@
|
|
|
tuikuanContent: '',
|
|
|
swiperIndex:0,
|
|
|
sx:'',
|
|
|
+ qmShow:false,
|
|
|
+ syShow:false,
|
|
|
+ sheetQRCodeList:'',
|
|
|
}
|
|
|
},
|
|
|
onLoad(opt) {
|
|
|
@@ -408,12 +516,42 @@
|
|
|
})
|
|
|
}
|
|
|
this.sx=opt.sx
|
|
|
-
|
|
|
+ // this.getsheetQRCode()
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
methods: {
|
|
|
+ getsheetQRCode(){
|
|
|
+ this.$http('openOrderManagement/sheetQRCodeList', {
|
|
|
+ type:1,
|
|
|
+ sheetID: this.id,
|
|
|
+ }, 'GET').then(res => {
|
|
|
+
|
|
|
+ })
|
|
|
+ },
|
|
|
+ sheetQRCode(){
|
|
|
+ uni.showLoading({
|
|
|
+ title: '加载中'
|
|
|
+ })
|
|
|
+ this.$http('openOrderManagement/sheetQRCodeList', {
|
|
|
+ type:2,
|
|
|
+ sheetID: this.id,
|
|
|
+ }, 'GET').then(res => {
|
|
|
+ uni.hideLoading();
|
|
|
+ this.syShow=true;
|
|
|
+ this.sheetQRCodeList=res.data
|
|
|
+ })
|
|
|
+ },
|
|
|
+ qmshowFn(){
|
|
|
+ this.qmShow=true
|
|
|
+ },
|
|
|
+ qmHide(){
|
|
|
+ this.qmShow=false
|
|
|
+ },
|
|
|
+ syHide(){
|
|
|
+ this.syShow=false;
|
|
|
+ },
|
|
|
shuaxinFn(){
|
|
|
this.sxNum=1
|
|
|
this.getData();
|
|
|
@@ -422,7 +560,7 @@
|
|
|
cancelOrder(){
|
|
|
//this.isShowTui=true;
|
|
|
uni.navigateTo({
|
|
|
- url:'../../subPack/refund'
|
|
|
+ url:'../../subPack/refund?type=1&id='+this.id
|
|
|
})
|
|
|
},
|
|
|
goTui(){
|
|
|
@@ -718,8 +856,15 @@
|
|
|
duration: 3000
|
|
|
});
|
|
|
}
|
|
|
- console.log('可用券码--',this.quanMaList);
|
|
|
-
|
|
|
+ //console.log('可用券码--',this.quanMaList);
|
|
|
+ uni.setStorage({
|
|
|
+ key: 'orderData',
|
|
|
+ data: this.orderData,
|
|
|
+ success: function () {
|
|
|
+
|
|
|
+
|
|
|
+ }
|
|
|
+ });
|
|
|
})
|
|
|
},
|
|
|
|
|
|
@@ -792,11 +937,19 @@
|
|
|
line-height: 44px;
|
|
|
}
|
|
|
|
|
|
-
|
|
|
+.topBox{
|
|
|
+ padding: 24rpx;
|
|
|
+}
|
|
|
.top {
|
|
|
- height: 190rpx;
|
|
|
- background: #EC0F0A;
|
|
|
-
|
|
|
+ height: 100rpx;
|
|
|
+ background: #FFFFFF;
|
|
|
+ border-radius: 11rpx;
|
|
|
+ text-align: center;
|
|
|
+ line-height: 100rpx;
|
|
|
+ font-weight: 500;
|
|
|
+ font-size: 30rpx;
|
|
|
+ color: #EC0F0A;
|
|
|
+ line-height: 42rpx;
|
|
|
}
|
|
|
|
|
|
.orderState {
|
|
|
@@ -806,7 +959,7 @@
|
|
|
padding-top: 40rpx;
|
|
|
}
|
|
|
|
|
|
- .SheetState {
|
|
|
+ /* .SheetState {
|
|
|
display: flex;
|
|
|
justify-content: center;
|
|
|
font-size: 36rpx;
|
|
|
@@ -814,7 +967,7 @@
|
|
|
color: #FFFFFF;
|
|
|
margin-left: 15rpx;
|
|
|
|
|
|
- }
|
|
|
+ } */
|
|
|
|
|
|
|
|
|
|
|
|
@@ -849,7 +1002,7 @@
|
|
|
display: flex;
|
|
|
padding: 30rpx 20rpx;
|
|
|
margin: 0rpx 24rpx;
|
|
|
- margin-top: -60rpx;
|
|
|
+
|
|
|
background-color: #FFFFFF;
|
|
|
border-radius: 10rpx;
|
|
|
|
|
|
@@ -977,11 +1130,15 @@
|
|
|
margin: 20rpx 24rpx;
|
|
|
padding-bottom: 15rpx;
|
|
|
}
|
|
|
-
|
|
|
+ .information{
|
|
|
+ padding: 0 20rpx;
|
|
|
+ }
|
|
|
.informationLine {
|
|
|
display: flex;
|
|
|
-
|
|
|
- padding: 15rpx 20rpx;
|
|
|
+ justify-content: space-between;
|
|
|
+ padding:20rpx 0rpx;
|
|
|
+ border-bottom: 1px solid #EEEEEE;
|
|
|
+ color: #222222;
|
|
|
}
|
|
|
|
|
|
.informationLine2 {
|
|
|
@@ -1005,8 +1162,8 @@
|
|
|
|
|
|
margin: 20rpx 24rpx;
|
|
|
|
|
|
- display: flex;
|
|
|
- justify-content: space-between;
|
|
|
+ /* display: flex;
|
|
|
+ justify-content: space-between; */
|
|
|
font-size: 26rpx;
|
|
|
padding: 30rpx 20rpx;
|
|
|
}
|
|
|
@@ -1014,7 +1171,7 @@
|
|
|
.informationTxt {
|
|
|
width: 190rpx;
|
|
|
font-size: 26rpx;
|
|
|
- color: #999999;
|
|
|
+ /* color: #999999; */
|
|
|
}
|
|
|
|
|
|
.line {
|
|
|
@@ -1031,7 +1188,7 @@
|
|
|
}
|
|
|
|
|
|
.informationNum {
|
|
|
- color: #333333;
|
|
|
+ /* color: #333333; */
|
|
|
font-size: 26rpx;
|
|
|
}
|
|
|
|
|
|
@@ -1414,4 +1571,121 @@
|
|
|
padding-left: 24rpx;
|
|
|
font-size: 26rpx;
|
|
|
}
|
|
|
+.newQrcode{
|
|
|
+ text-align: center;padding-top: 30rpx;
|
|
|
+}
|
|
|
+.newQrcodeTs{
|
|
|
+ font-size: 24rpx;
|
|
|
+ color: #222222;
|
|
|
+}
|
|
|
+.jtImg1{
|
|
|
+ width: 10rpx;height: 20rpx;
|
|
|
+}
|
|
|
+.newQrcodeTs {
|
|
|
+ text-align: center;
|
|
|
+ padding-top: 10rpx;
|
|
|
+ padding-bottom: 30rpx;
|
|
|
+}
|
|
|
+.ysyBox{
|
|
|
+ background: #ffffff;
|
|
|
+ border-radius: 16rpx;
|
|
|
+ display: flex;
|
|
|
+ justify-content: space-between;
|
|
|
+ font-size: 26rpx;
|
|
|
+ padding: 30rpx 24rpx;
|
|
|
+}
|
|
|
+.copyIcon{
|
|
|
+ width: 30rpx;height: 30rpx;
|
|
|
+ margin-top: 4rpx;margin-right: 6rpx;
|
|
|
+}
|
|
|
+.newQrcode .swiper-item{
|
|
|
+ text-align: center;
|
|
|
+}
|
|
|
+.chahaoIMg{
|
|
|
+ width: 22rpx;height: 22rpx;
|
|
|
+ margin-top: 4rpx;
|
|
|
+}
|
|
|
+.tkBox{
|
|
|
+ position: fixed;
|
|
|
+ background: rgba(0, 0, 0, 0.4);
|
|
|
+ width: 100%;height: 100%;
|
|
|
+ top: 0;
|
|
|
+ left: 0;
|
|
|
+}
|
|
|
+.tkContBox{
|
|
|
+ width: 750rpx;
|
|
|
+ height: 483rpx;
|
|
|
+ background: #F8F8F8;
|
|
|
+ border-radius: 28rpx 28rpx 0rpx 0rpx;
|
|
|
+ position: absolute;
|
|
|
+ left: 0;
|
|
|
+ bottom: 0;
|
|
|
+ padding-bottom: constant(safe-area-inset-bottom);
|
|
|
+ padding-bottom: env(safe-area-inset-bottom);
|
|
|
+}
|
|
|
+.tkContBox2{
|
|
|
+ width: 750rpx;
|
|
|
+ height: 60vh;
|
|
|
+ background: #F8F8F8;
|
|
|
+ border-radius: 28rpx 28rpx 0rpx 0rpx;
|
|
|
+ position: absolute;
|
|
|
+ left: 0;
|
|
|
+ bottom: 0;
|
|
|
+ padding-bottom: constant(safe-area-inset-bottom);
|
|
|
+ padding-bottom: env(safe-area-inset-bottom);
|
|
|
+}
|
|
|
+.tkTop{
|
|
|
+ display: flex;justify-content: space-between;
|
|
|
+ padding: 25rpx 40rpx 40rpx 40rpx;
|
|
|
+ font-weight: 500;
|
|
|
+ font-size: 28rpx;
|
|
|
+ color: #222222;
|
|
|
+}
|
|
|
+.tkLineBox{
|
|
|
+ background: #FFFFFF;
|
|
|
+ border-radius: 16rpx;
|
|
|
+ margin: 0 33rpx;
|
|
|
+}
|
|
|
+.tkLine{
|
|
|
+ display: flex;justify-content: space-between;
|
|
|
+ font-size: 26rpx;
|
|
|
+ padding: 24rpx 30rpx;
|
|
|
+ border-bottom: 1px solid #EEEEEE;
|
|
|
+}
|
|
|
+.tklineBox2{
|
|
|
+ padding:0 24rpx;
|
|
|
+}
|
|
|
+.tkline2{
|
|
|
+ background: #FFFFFF;
|
|
|
+ border-radius: 16rpx;
|
|
|
+ padding: 32rpx 24rpx;
|
|
|
+}
|
|
|
+.tklineTop2{
|
|
|
+ display: flex;justify-content: space-between;
|
|
|
+}
|
|
|
+.tkZt{
|
|
|
+ font-weight: 500;
|
|
|
+ font-size: 28rpx;
|
|
|
+ color: #222222;
|
|
|
+ line-height: 40rpx;
|
|
|
+}
|
|
|
+.tkSeeD{
|
|
|
+ font-weight: 400;
|
|
|
+ font-size: 26rpx;
|
|
|
+ color: #9A9A9A;
|
|
|
+ line-height: 40rpx;
|
|
|
+}
|
|
|
+.tkSeeD .jtImg1{
|
|
|
+ margin-left: 4rpx;
|
|
|
+}
|
|
|
+.tkRow{
|
|
|
+ display: flex;
|
|
|
+ font-size: 26rpx;
|
|
|
+ padding-top: 18rpx;
|
|
|
+
|
|
|
+}
|
|
|
+.tlRowLeft{
|
|
|
+ color: #9A9A9A;width: 140rpx;
|
|
|
+
|
|
|
+}
|
|
|
</style>
|
