From a484e2b16e46ca15e50a9725ce570448f5bbd0fc Mon Sep 17 00:00:00 2001
From: 396316021 <396316021@qq.com>
Date: Thu, 28 Dec 2023 17:16:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=BD=E5=A5=96=E5=88=86=E4=BA=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/coupons.js          |  2 +-
 api/draw.js             |  4 +-
 config/host.js          |  6 +--
 pages/Coupons/index.vue | 88 +++++++++++++++++++++++++++++++++++++++--
 pages/Draw/index.vue    |  4 +-
 utils/request.js        | 11 ++++--
 6 files changed, 101 insertions(+), 14 deletions(-)

diff --git a/api/coupons.js b/api/coupons.js
index 00045c2..a9dff7e 100644
--- a/api/coupons.js
+++ b/api/coupons.js
@@ -8,7 +8,7 @@ export function couponsList(data) {
 		url: `${host}/coupons/coupons-list`,
 		method: "get",
 		data
-	});
+	},false);
 }
 export function obtainCoupons(data) {
 
diff --git a/api/draw.js b/api/draw.js
index 015af5f..427caa5 100644
--- a/api/draw.js
+++ b/api/draw.js
@@ -2,10 +2,10 @@ import request from "@/utils/request";
 import requestOther from "@/utils/requestOther";
 
 export function drawList(){
-    return requestOther({
+    return request({
         url:'draw/drawgoods-list',
         method:'post',
-    })
+    },false)
 }
 export function getDraw(data){
     return request({
diff --git a/config/host.js b/config/host.js
index 32618ef..cd923c9 100644
--- a/config/host.js
+++ b/config/host.js
@@ -1,6 +1,6 @@
-// const host='http://192.168.2.92:9505/api'
-// const host='https://weiyang.test.scyp.ink/api'
-const host='https://wechat.wwxtx.com/api'
+// const host='http://192.168.2.92:9509/api'
+const host='https://weiyang.test.scyp.ink/api'
+// const host='https://wechat.wwxtx.com/api'
 // const host='https://bml.test.scyp.ink/api'
 // const host='http://192.168.2.92:9503/api'
 // const imghost='https://weiyang.test.scyp.ink/static/image'
diff --git a/pages/Coupons/index.vue b/pages/Coupons/index.vue
index 42c890c..5963a25 100644
--- a/pages/Coupons/index.vue
+++ b/pages/Coupons/index.vue
@@ -87,7 +87,56 @@
       <u-parse :content="couponsContent"></u-parse>
     </view>
   </uv-popup>
-	<!-- <RightNav></RightNav> -->
+  <uv-popup z-index="10000" ref="notOpenPop" mode="center" round="20rpx" closeable 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>
+      </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 class="row">
+<!--        <view class="col-6">-->
+<!--          <MzButton title="取消" @click="() => {}"></MzButton>-->
+<!--        </view>-->
+        <view class="col-12">
+          <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;">
+    <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>
+      </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 class="row">
+        <view class="col-6" style="padding:0 15rpx;">
+          <MzButton title="取消" @click="navTo('/pages/Index/index')"></MzButton>
+        </view>
+        <view class="col-6" style="padding:0 15rpx;">
+          <MzButton title="确认" @click="() => {
+            this.navTo('/pages/Login/index');
+            this.$refs.notLoginPop.close();
+          }" button-color="#4DC3B8" font-color="#fff"></MzButton>
+        </view>
+      </view>
+    </view>
+  </uv-popup>
+  <!-- <RightNav></RightNav> -->
 </template>
 
 <script>
@@ -116,6 +165,7 @@
 		},
 		data() {
 			return {
+        showModal:false,
 				title: 'Hello',
 				loading: true,
 				staticImage: {
@@ -150,24 +200,50 @@
 				status:'loadmore',
         navToUrl:'',
         couponsContent:'',
+        is_open_draw:false,
 			}
 		},
 		onLoad(option) {
       this.type = option.type||'lists'
-      console.log(this.type)
       this.navToUrl = option.url || ''
+      this.couponType = parseInt(option.coupon_type) || 2
 		},
+    onShareAppMessage() {
+      // if(!this.is_open_draw){
+      //   return false;
+      // }
+      return {
+        title:'优惠在这',
+        path:'/pages/Coupons/index?coupon_type=1&type=draw',
+      }
+    },
+    onShareTimeline() {
+      // if(!this.is_open_draw){
+      //   return false;
+      // }
+      return {
+        title:'优惠在这',
+        path:'/pages/Index/index?coupon_type=1&type=draw',
+      }
+    },
 		methods: {
       getDrawList(){
         drawList().then(data => {
           if(data.code === 200){
             if(data.data.goodslists.length > 0){
+
               this.types = [
                 {title:'省点银子', value: 2},
                 {title:'宝藏挖掘机', value: 1},
               ];
+            }else {
+              if(this.type === 'draw'){
+                this.$refs.notOpenPop.open();
+              }
             }
           }
+        }).catch(err => {
+          this.$refs.notLoginPop.open();
         });
       },
       showCoupons(item){
@@ -238,7 +314,9 @@
 						return;
 					}
           this.couponsList.push(...couponsList);
-        })
+        }).catch(err => {
+          this.$refs.notLoginPop.open();
+        });
       },
 			couponTypeToggle(item){
 				this.couponType = item.value;
@@ -246,9 +324,11 @@
 				this.status = 'loadmore';
         if(item.value === 1){
           this.type = 'draw';
+          this.is_open_draw = true;
           return;
         }else{
           this.type = 'lists';
+          this.is_open_draw = false;
         }
 				this.getCouponsList();
 			}
@@ -267,7 +347,7 @@
 			// this.pagePadding = (api.navHeight().navPaddingTop +
 			// api.navHeight().navHeight + (api.navHeight().headerPadding * 2))
 		},
-    mounted() {
+    onShow() {
       this.getCouponsList();
       this.getDrawList();
     }
diff --git a/pages/Draw/index.vue b/pages/Draw/index.vue
index 5e8a79c..0276f11 100644
--- a/pages/Draw/index.vue
+++ b/pages/Draw/index.vue
@@ -13,7 +13,9 @@
                 <view class="" style="width:95rpx;height:95rpx;display: inline-block;">
                   <u-image width="83" height="83" class="img" mode="aspectFill" :src="item.logo"></u-image>
                 </view>
-                <view class="draw-title ">{{ item.title }}</view>
+                <view class="draw-title ">
+                  <u-text align="center" :lines="1" :text="item.title" :color="(checked === index)?'#fff':'#539188'" size="26rpx"></u-text>
+                </view>
               </view>
             </view>
           </view>
diff --git a/utils/request.js b/utils/request.js
index 18859c7..8c76d9e 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -1,6 +1,6 @@
 import functions from '@/utils/functions.js'
 import {host} from "@/config/host";
-const service = (params) => {
+const service = (params,showToast = true) => {
 	return new Promise((relove, reject) => {
 		let token=uni.getStorageSync('token')
 		let user=uni.getStorageSync('user')
@@ -32,14 +32,19 @@ const service = (params) => {
 						reject(data);
 						break;
 					case 202:
-						functions.error(data.msg);
+						if(showToast){
+							functions.error(data.msg);
+						}
 						reject(data);
 						break;
 					default:
 						relove(data);
 				}
 			} else {
-				functions.error('连接服务器失败')
+				if(showToast){
+					functions.error('连接服务器失败')
+				}
+				reject();
 			}
 		})