Feat：抽奖2.0（细节调整，查漏补缺）

pages/order/MyOrder/index.vue

@@ -375,6 +375,7 @@
               <view
                   v-if="order.isDrawOrder > 0"
                   class="bnt service"
+                  @click.stop="callMerPhone(order)"
                 >联系客服
               </view>
               <view>
@@ -1055,6 +1056,19 @@ export default {
     force2Decimal(v) {
       return this.$force2Decimal(v)
     },
+    callMerPhone(order) {
+      const phone = String((order && order.merPhone) || '').trim()
+      if (!phone) {
+        uni.showToast({
+          title: '暂无电话',
+          icon: 'none'
+        })
+        return
+      }
+      uni.makePhoneCall({
+        phoneNumber: phone
+      })
+    },
     goRoom(order) {
       console.log(order);
       if (order.experienceOrderInfo) {

pages/order/OrderDetails/index.vue

@@ -489,7 +489,7 @@
       <template v-if="status.type == 1" >
         <view class="v12-justify-between " style="width: 100%">
           <view class="v12-justify-between ">
-            <view v-if="orderInfo.isDrawOrder > 0" class="bnt v12-dark-text v12-dark-border cancel">联系客服</view>
+            <view v-if="orderInfo.isDrawOrder > 0" class="bnt v12-dark-text v12-dark-border cancel" @click.stop="callMerPhone">联系客服</view>
             <view v-if="orderInfo.isGiftCardReceiveBlind === 0 && orderInfo.isDrawOrder === 0" class="bnt v12-dark-text v12-dark-border cancel" @click="goRoom(orderInfo)">联系商家</view>
             <view v-if="orderInfo.isDrawOrder === 0" class="bnt v12-dark-text v12-dark-border cancel" @click="delayOrder">催发货</view>
             <view v-if="canShowModifyAddress(orderInfo) && orderInfo.isDrawOrder === 0" class="bnt v12-dark-text v12-dark-border cancel" @click="goAddress">修改地址</view>
@@ -559,7 +559,7 @@
       </template>
       <template v-if="status.type == 4">
         <view class="v12-justify-between " style="width: 100%">
-          <view v-if="orderInfo.isDrawOrder > 0" class="bnt v12-dark-text v12-dark-border cancel" >联系客服</view>
+          <view v-if="orderInfo.isDrawOrder > 0" class="bnt v12-dark-text v12-dark-border cancel" @click.stop="callMerPhone">联系客服</view>
           <view class="bnt v12-dark-text v12-dark-border cancel" @click="delOrder">删除订单</view>
         </view>
         <!-- <view
@@ -588,7 +588,7 @@
         <view class="draw-ticket-close" @click="closeDrawTicketPopup">×</view>
         <view class="draw-ticket-icon">
           <view class="ticket-icon-box">
-            <view class="ticket-icon-check"></view>
+            <image class="ticket-icon-check" :src="webUrl + '/home/gongxi.png'" mode="widthFix"></image>
           </view>
         </view>
         <view class="draw-ticket-title">支付成功</view>
@@ -970,6 +970,17 @@ export default {
         url: `/pkg_common/views/room?id=${order.merId}&name=${order.merName}&params=${JSON.stringify(params)}`
       })
     },
+    callMerPhone() {
+      const phone = String((this.orderInfo && this.orderInfo.merPhone) || '').trim()
+      if (!phone) {
+        uni.showToast({
+          title: '暂无商家电话',
+          icon: 'none'
+        })
+        return
+      }
+      this.call(phone)
+    },
     force2Decimal(v) {
       return this.$force2Decimal(v);
     },
@@ -1572,37 +1583,16 @@ export default {
 }
 
 .ticket-icon-box {
-  width: 90rpx;
+  width: 100rpx;
   height: 70rpx;
-  border: 6rpx solid #111;
   border-radius: 10rpx;
   position: relative;
   box-sizing: border-box;
 }
 
-.ticket-icon-box::before {
-  content: '';
-  position: absolute;
-  top: -16rpx;
-  left: 14rpx;
-  width: 50rpx;
-  height: 12rpx;
-  border-top: 6rpx solid #111;
-  border-left: 6rpx solid #111;
-  border-right: 6rpx solid #111;
-  border-radius: 6rpx 6rpx 0 0;
-  background: #fff;
-}
-
 .ticket-icon-check {
-  width: 36rpx;
-  height: 18rpx;
-  border-left: 6rpx solid #c23326;
-  border-bottom: 6rpx solid #c23326;
-  transform: rotate(-45deg);
-  position: absolute;
-  left: 20rpx;
-  top: 14rpx;
+  width: 100%;
+  height: 100%;
 }
 
 .draw-ticket-title {

pages/shop/GoodsCon/index.vue

@@ -2105,6 +2105,7 @@ export default {
 .product-con .footer{
   height: 140rpx !important;
   padding-bottom: 20rpx;
+  z-index: 1002 !important;
 }
 .product-con .product-intro .conter view {
   width: 100% !important;