修改问题

pages/Coupons/index.vue

@@ -5,7 +5,9 @@
 		}">
 
     <view class="capsule-container row">
-			<view class="capsule" :class="{active:item.value === couponType,'col-6':(types.length >1),'col-12':(types.length === 1)}" @click="couponTypeToggle(item)" v-for="item in types">
+      <view class="capsule"
+            :class="{active:item.value === couponType,'col-6':(types.length >1),'col-12':(types.length === 1)}"
+            @click="couponTypeToggle(item)" v-for="item in types">
         {{ item.title }}
       </view>
     </view>
@@ -17,7 +19,8 @@
           <view class="coupons-left ">
             <view class="coupons-big-title-group row">
               <view class="coupons-big-title">
-                <u-text :text="item.price" :size="item.price>99?60:90" color="#ffffff" align="center" line-height="90" bold></u-text>
+                <u-text :text="item.price" :size="item.price>99?60:90" color="#ffffff" align="center" line-height="90"
+                        bold></u-text>
                 <!--                {{item.price}}-->
               </view>
               <view class="coupons-big-desc">元</view>
@@ -44,7 +47,9 @@
               <image class="img" :src="staticImage.couponsUse" mode="aspectFill"/>
             </view>
             <view class="coupons-bottom col-12 row">
-							<view class="coupons-rule row col" @click="showCoupons(item)">查看使用规则 <u-icon class="arrow-right" size="24rpx" color="#999999" name="arrow-right"></u-icon></view>
+              <view class="coupons-rule row col" @click="showCoupons(item)">查看使用规则
+                <u-icon class="arrow-right" size="24rpx" color="#999999" name="arrow-right"></u-icon>
+              </view>
               <view class="coupons-button">
                 <MzButton
                     title="立即领取"
@@ -72,14 +77,17 @@
                 marginBottom="30" marginTop="30" @loadmore="getCouponsList(++this.page)"/>
     <Draw v-if="type === 'draw'"></Draw>
   </view>
-  <uv-popup ref="agreement" mode="bottom" round="20rpx" closeable safeAreaInsetTop safeAreaInsetBottom custom-style="position:relative;">
+  <uv-popup ref="agreement" mode="bottom" round="20rpx" closeable safeAreaInsetTop safeAreaInsetBottom
+            custom-style="position:relative;">
     <view class="title row" style="position:absolute;justify-content: center;width:100%;top:20rpx;left:0;">
       <view class="value col" style="position: relative;text-align: center;">
 
         <!--        <u-text text="协议内容" size="38" color="#191919"></u-text>-->
         <view class="" style="position: relative;display:inline-block;">
-          <view style="color:#191919;font-size:38rpx;display:inline-block;position: relative;z-index: 2;">使用说明</view>
+          <view style="color:#191919;font-size:38rpx;display:inline-block;position: relative;z-index: 2;">使用说明
-          <view class="background" style="width:100%;height:50%;position: absolute;bottom:0;left:0;background-color:rgba(227, 191, 119, 0.6);display:inline-block;z-index:1;"></view>
+          </view>
+          <view class="background"
+                style="width:100%;height:50%;position: absolute;bottom:0;left:0;background-color:rgba(227, 191, 119, 0.6);display:inline-block;z-index:1;"></view>
         </view>
       </view>
     </view>
@@ -87,14 +95,16 @@
       <u-parse :content="couponsContent"></u-parse>
     </view>
   </uv-popup>
-  <uv-popup z-index="10000" ref="notOpenPop" mode="center" round="20rpx" closeable safeAreaInsetTop safeAreaInsetBottom custom-style="width:80%;position:relative;">
+  <uv-popup :close-on-click-overlay="false" z-index="10000" ref="notOpenPop" mode="center" round="20rpx"
+            safeAreaInsetTop safeAreaInsetBottom custom-style="width:80%;position:relative;">
     <view class="title row" style="position:absolute;justify-content: flex-start;width:100%;top:20rpx;left:0;">
       <view class="value col" style="position: relative;text-align: center;">
 
         <!--        <u-text text="协议内容" size="38" color="#191919"></u-text>-->
         <view class="" style="position: relative;display:inline-block;">
           <view style="color:#191919;font-size:38rpx;display:inline-block;position: relative;z-index: 2;">提示</view>
-          <view class="background" style="width:100%;height:50%;position: absolute;bottom:0;left:0;background-color:rgba(227, 191, 119, 0.6);display:inline-block;z-index:1;"></view>
+          <view class="background"
+                style="width:100%;height:50%;position: absolute;bottom:0;left:0;background-color:rgba(227, 191, 119, 0.6);display:inline-block;z-index:1;"></view>
         </view>
       </view>
     </view>
@@ -105,24 +115,28 @@
         <!--          <MzButton title="取消" @click="() => {}"></MzButton>-->
         <!--        </view>-->
         <view class="col-12">
-          <MzButton title="确认" @click="navTo('/pages/Index/index')" button-color="#4DC3B8" font-color="#fff"></MzButton>
+          <MzButton title="确认" @click="navTo('/pages/Index/index')" button-color="#4DC3B8"
+                    font-color="#fff"></MzButton>
         </view>
       </view>
     </view>
   </uv-popup>
-  <uv-popup z-index="10000" ref="notLoginPop" mode="center" round="20rpx" closeable safeAreaInsetTop safeAreaInsetBottom custom-style="width:80%;position:relative;">
+  <uv-popup :close-on-click-overlay="false" z-index="10000" ref="notLoginPop" mode="center" round="20rpx"
+            safeAreaInsetTop safeAreaInsetBottom custom-style="width:80%;position:relative;">
     <view class="title row" style="position:absolute;justify-content: flex-start;width:100%;top:20rpx;left:0;">
       <view class="value col" style="position: relative;text-align: center;">
 
         <!--        <u-text text="协议内容" size="38" color="#191919"></u-text>-->
         <view class="" style="position: relative;display:inline-block;">
           <view style="color:#191919;font-size:38rpx;display:inline-block;position: relative;z-index: 2;">提示</view>
-          <view class="background" style="width:100%;height:50%;position: absolute;bottom:0;left:0;background-color:rgba(227, 191, 119, 0.6);display:inline-block;z-index:1;"></view>
+          <view class="background"
+                style="width:100%;height:50%;position: absolute;bottom:0;left:0;background-color:rgba(227, 191, 119, 0.6);display:inline-block;z-index:1;"></view>
         </view>
       </view>
     </view>
     <view style="padding:30rpx 30rpx 0;max-height:700rpx;overflow: auto;">
-      <view style="height:100rpx;display: flex;align-items: center;justify-content: center;">当前未登录，是否前往登录 </view>
+      <view style="height:100rpx;display: flex;align-items: center;justify-content: center;">当前未登录，是否前往登录
+      </view>
       <view class="row">
         <view class="col-6" style="padding:0 15rpx;">
           <MzButton title="取消" @click="navTo('/pages/Index/index')"></MzButton>
@@ -155,6 +169,7 @@
 import {error} from "@/uni_modules/uv-ui-tools/libs/function";
 import api from "@/utils/functions";
 import {UserCache} from "@/config/config";
+
 export default {
   components: {
     HeaderNav,
@@ -227,6 +242,8 @@
     }
   },
   methods: {
+    //分享进来 没有开启
+    //正常点击进来切换 开启 没有开启
     getDrawList() {
       drawList().then(data => {
         if (data.code === 200) {
@@ -243,7 +260,13 @@
           }
         }
       }).catch(err => {
+        if (this.type === 'draw') {
+          if (err.msg === '暂未开放，敬请期待！') {
+            this.$refs.notOpenPop.open();
+          } else {
             this.$refs.notLoginPop.open();
+          }
+        }
       });
     },
     showCoupons(item) {
@@ -349,6 +372,7 @@
   },
   onShow() {
     this.getCouponsList();
+
     this.getDrawList();
   }
 }

pages/OrderDetail/index.vue

@@ -328,6 +328,7 @@
   import functions from "@/utils/functions.js";
   import {orderDetail, orderServiceInfo} from "@/api/order";
   import FomItem from "./components/fomItem.vue";
+  import orderDetailShare from "@/static/image/order-detail-share.jpg"
 	export default {
 		components: {
       FomItem,
@@ -360,7 +361,8 @@
           petVideoTitle:imghost +'/pet-detail-video-title.png',
           petPhotoTitle:imghost +'/pet-detail-photo-title.png',
           orderDetailBackground:imghost+'/order-detail-background.png',
-          orderDetailShare:imghost+'/order-detail-share.png',
+          // orderDetailShare:imghost+'/order-detail-share.png',
+          orderDetailShare:orderDetailShare,
 				},
 				indexBanner: [{
 					image: imghost + '/banner.png',