From 3caf534ec3bd880e24b79406707b9de6289f1a32 Mon Sep 17 00:00:00 2001
From: guoxing <1369478551@qq.com>
Date: Mon, 1 Apr 2024 16:23:07 +0800
Subject: [PATCH] 1111111

---
 common/config.js          |  4 +--
 pages/home/cloudCard2.vue | 52 ++++++++++++++++++++++-----------------
 2 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/common/config.js b/common/config.js
index 0f01b3f..35be549 100644
--- a/common/config.js
+++ b/common/config.js
@@ -6,10 +6,10 @@
  * loginTimeoutPage = "/pages/login/index", // 登录超时或失效的情况下，跳转到的登录页面
  */
 module.exports = {
-	baseUrl: 'http://192.168.2.117:7211', // 本地
+	// baseUrl: 'http://192.168.2.117:7211', // 本地
 	// baseUrl: 'https://lpk.yyundong.com/lpkapi',  // 测试服务器
 	// baseUrl: 'https://lpk.yyundong.com/mallapi',  // 测试服务器
-	// baseUrl: 'https://supervise.yxtsoft.com/lpkapi', // 正式服务器
+	baseUrl: 'https://supervise.yxtsoft.com/lpkapi', // 正式服务器
 	// tokenName: "Authorization", // 请求头中token的名字，与服务器端对应
 	loginTimeoutCode: "5001", // 登录超时或失效的情况下，服务器端返回的错误码
 	loginTimeoutPage: "/pages/login/index", // 登录超时或失效的情况下，跳转到的登录页面
diff --git a/pages/home/cloudCard2.vue b/pages/home/cloudCard2.vue
index dcd7fbb..cbe594f 100644
--- a/pages/home/cloudCard2.vue
+++ b/pages/home/cloudCard2.vue
@@ -33,8 +33,7 @@
 
 					<view class="center" style="">
 
-						<view
-							style="width: 24%;  display: flex;flex-direction: column;
+						<view style="width: 24%;  display: flex;flex-direction: column;
 						position: relative;">
 
 							<view style="width: 100%;display: flex;flex-direction: column;
@@ -45,8 +44,8 @@
 								</view>
 
 							</view>
-							
-							<view v-if="isPurchase == '1'" @click="newUserGift()" style="display: flex;flex-direction: column;justify-content: center;align-items: center;width: 100%;
+
+							<view v-if="isPurchase == '1'&&newPerGiftList.length>0" @click="newUserGift()" style="display: flex;flex-direction: column;justify-content: center;align-items: center;width: 100%;
 						position: absolute; bottom: 0; margin-bottom: 10px;">
 								<image src="../../static/newUserGift.png" style="width: 40px;height: 40px;"></image>
 								<text style="font-size: 12px;margin-top: 5px;color: #666;">新人专享</text>
@@ -82,7 +81,7 @@
 
 									<view style="display: flex;flex-direction: row;align-items: center;width: 100%;  ">
 
-										<image :src="item.iconUrl" 	@click="itemClick(item.goodsSid)"
+										<image :src="item.iconUrl" @click="itemClick(item.goodsSid)"
 											style="width: 90px;height: 90px; border-radius: 10px; " mode="aspectFill">
 										</image>
 
@@ -114,14 +113,13 @@
 												<text
 													style="font-size: 14px;color: #FF5006;">￥{{item.mefenPrice}}元</text>
 
-												<view 
-													style="display: flex;flex-direction: row;align-items: center;">
+												<view style="display: flex;flex-direction: row;align-items: center;">
 
 													<image src="../../static/jian_icon.png" mode="aspectFill"
 														style="width: 20px;height: 20px;" @click.stop="jian(item)">
 													</image>
 
-													<text 
+													<text
 														style="font-size: 14px;padding:5px; margin-left: 8px;margin-right: 8px;"
 														@click.stop="numberClick(item)">{{item.goodsNumber}}</text>
 
@@ -157,7 +155,8 @@
 										style="width: 80px;height: 80px; "></image>
 									<view style="display: flex;flex-direction: column;align-items: center; justify-content: center;margin: 20px 30px;
 										">
-										<text style="text-indent: 2em; font-size: 16px; color: #999;">您好，【企业菜窖】需要通过认证才能进行购买</text>
+										<text
+											style="text-indent: 2em; font-size: 16px; color: #999;">您好，【企业菜窖】需要通过认证才能进行购买</text>
 
 										<text style="font-size: 14px;color: #fff;padding: 10px 40px; border-radius: 20px;
 										background: #FF9901;margin-top: 20px;" @click="authentication()">立即认证</text>
@@ -554,7 +553,7 @@
 				initWeight: "0",
 				shareSid: "",
 				baseDataSuccess: false,
-				isPurchase:"0",// 0 不显示 1显示
+				isPurchase: getApp().globalData.isPurchase, // 0 不显示 1显示
 
 			}
 		},
@@ -572,11 +571,11 @@
 
 			console.log("isPurchase", getApp().globalData.isPurchase);
 
-			if (getApp().globalData.isPurchase == '1'){
-				this.showModal = true
-				this.isPurchase = '1'
-			}
-				
+			// if (getApp().globalData.isPurchase == '1'){
+			// 	this.showModal = true
+			// 	this.isPurchase = '1'
+			// }
+
 
 			if (getApp().globalData.mobile == '')
 				this.showModal4 = true
@@ -595,28 +594,37 @@
 
 			this.request()
 
-			this.shareGift()
+			this.getGiftList()
 			this.getBannerList()
 
 		},
 		methods: {
-			newUserGift(){
+			newUserGift() {
 				this.showModal = true
-				this.isPurchase = '1'
+				// this.isPurchase = '1'
 			},
-			showGift() {
+			getGiftList() {
 				let _this = this
 
 				_this.$api.newUserQuota().then((resp) => {
 					// console.log("--------", resp);
 					_this.newPerGiftList = resp
 
-					_this.showModal = false
-					_this.showModal2 = true
+					if (_this.newPerGiftList.length > 0 && _this.isPurchase=="1") {
+						_this.showModal = true
+						// _this.isPurchase = getApp().globalData.isPurchase
+					}
+
+					// _this.showModal = false
+					// _this.showModal2 = true
 
 				}).catch(e => {
 
 				})
+			},
+			showGift() {
+				this.showModal = false
+				this.showModal2 = true
 
 			},
 			radioChange(event) {
@@ -799,7 +807,7 @@
 
 					} else if (e.code == '202' || e.code == '203') {
 						// 认证审核中  或 认证不通过
-							this.notAuthentication = false
+						this.notAuthentication = false
 						this.showModal6 = true
 						this.authenticationRemarks = e.data.remarks