Merge branch 'master' of http://120.77.182.185/yanl/mini-shimao

pages/pay/order-detail/order-detail.wxml

 <view class="order-status col con-c {{ticketInfo.status === 1 ? 'bgPink' : ''}}" wx:if="{{ticketInfo.status !== 0}}">
   <view class="status-text">{{statusText}}</view>
-  <view class="status-tips" wx:if="{{ticketInfo.status === 2}}">有效期2019.09.30 - 2020.12.30</view>
-  <view class="status-tips" wx:elif="{{ticketInfo.status === 3}}">下单后15分钟内未付款，自动取消订单</view>
-  <view class="status-tips" wx:elif="{{ticketInfo.status === 5}}">请在14:59内付款，否则讲自动取消订单</view>
+  <view class="status-tips" wx:if="{{statusTips}}">{{statusTips}}</view>
 </view>
 
 <view class="ticket-wrapper">
@@ -66,10 +64,13 @@
             <view class="code-img">
               <image mode="widthFix" src="{{item.img}}"></image>
             </view>
-            <view class="code-num-wrapper row align-c con-b">
-              <view class="code-num-title">券码{{index+1}}:</view>
-              <view class="code-num">{{item.num}}</view>
-              <view class="num-copy">复制</view>
+            <view class="code-num-wrapper row align-c con-a">
+              <view class="code-num-title {{codeUsed ? 'code-used' : ''}}">券码{{index+1}}:</view>
+              <view class="code-num {{codeUsed ? 'code-used' : ''}}">{{item.num}}</view>
+              <view class="num-copy" wx:if="{{!codeUsed}}" bindtap="setClipboard" data-index="{{index}}">复制</view>
+            </view>
+            <view class="code-used-seal" wx:if="{{codeUsed}}">
+                <image mode="widthFix" src="./image/used.png"></image>
             </view>
           </view>
         </swiper-item>
@@ -118,7 +119,7 @@
       <view class="goods-item-img">
         <image mode="widthFix" src="{{item.img}}"></image>
       </view>
-      <view class="goods-item-info">
+      <view class="goods-item-info col con-a">
         <view class="goods-item-info-text">{{item.infoText}}</view>
         <view class="goods-item-info-price">
           <text class="price-symbol">￥</text>
@@ -126,7 +127,6 @@
         </view>
       </view>
       <view class="goods-item-btn {{item.used === '已使用'?'disabled':''}}" bindtap="handleQRcode">{{item.used}}</view>
-      <!-- <view class="goods-item-btn"></view> -->
     </view>
   </view>
 </view>

pages/pay/order-detail/order-detail.wxss

@@ -122,6 +122,7 @@
   height: 666rpx;
 }
 .code-item {
+  position: relative;
   width: 526rpx;
   height: 666rpx;
   background-color: #fff;
@@ -146,19 +147,32 @@
   padding: 0 24rpx;
   background-color: #F2F3F5;
   border-radius: 4rpx;
+  line-height: 96rpx;
 }
 .code-num-title {
   color: #959DA9;
+  text-decoration: none !important;
   font-size: 26rpx;
 }
 .code-num {
   color: #15191F;
   font-size: 30rpx;
 }
+.code-used {
+  color: #C2C7CF;
+  text-decoration: line-through;
+}
 .num-copy {
   color: #5DB5DD;
   font-size: 26rpx;
 }
+.code-used-seal {
+  position: absolute;
+  right: -68rpx;
+  transform: translateY(56rpx);
+  width: 254rpx;
+  height: 254rpx;
+}
 .img-num {
   margin-top: 54rpx;
 }
@@ -219,6 +233,7 @@
 .goods-title {
   color: #15191F;
   font-size: 34rpx;
+  font-weight: 600;
 }
 .goods-list {
   margin-top: 40rpx;
@@ -256,7 +271,7 @@
 }
 .goods-item-info {
   flex: 1;
-  padding: 0 32rpx 0 24rpx;
+  padding-left: 24rpx;
 }
 .goods-item-info-text {
   color: #15191F;
@@ -268,7 +283,6 @@
   -webkit-line-clamp: 2;
 }
 .goods-item-info-price {
-  margin-top: 18rpx;
   color: #15191F;
   font-weight: 600;
 }
@@ -279,9 +293,10 @@
   font-size: 26rpx;
 }
 .goods-item-btn {
-  margin-top: 40rpx;
   width: 120rpx;
   height: 56rpx;
+  margin-top: 40rpx;
+  margin-left: 32rpx;
   color: #fff;
   font-size: 22rpx;
   text-align: center;

project.config.json

@@ -119,8 +119,8 @@
 				},
 				{
 					"id": 7,
-					"name": "pages/pay/order-input/order-input",
-					"pathName": "pages/pay/order-input/order-input",
+					"name": "pages/pay/order-detail/order-detail",
+					"pathName": "pages/pay/order-detail/order-detail",
 					"query": "",
 					"scene": null
 				}