From f953640af1d0131928eb13db414557031e74f199 Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Mon, 20 May 2024 12:27:02 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/dealer/withdraw/apply.vue | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/pages/dealer/withdraw/apply.vue b/pages/dealer/withdraw/apply.vue
index 3e0e68c..8679a37 100644
--- a/pages/dealer/withdraw/apply.vue
+++ b/pages/dealer/withdraw/apply.vue
@@ -20,8 +20,8 @@
 					<view class="capital__item dis-flex flex-y-center">
 						<view class="item__left">{{ words.money.value }}：</view>
 						<view class="item__right flex-box">
-							<input class="input" v-model="inputValue" type="digit" name="money"
-								@blur="wordsAmount" :placeholder="words.money_placeholder.value" />
+							<input class="input" v-model="inputValue" type="digit" name="money" @blur="wordsAmount"
+								:placeholder="words.money_placeholder.value" />
 						</view>
 					</view>
 				</view>
@@ -150,7 +150,6 @@
 
 		methods: {
 			wordsAmount(e) {
-				let that=this
 				let amount = e.detail.value
 				let num = null
 				num = amount.replace(new RegExp('^(\\d+\\.\\d{2}).+'), '$1')
@@ -169,19 +168,26 @@
 						.replace(/\./g, "")
 						.replace("$#$", ".")
 				}
-				if (num > Number(that.settlement.min_money)) {
+				if (Number(this.dealer.money) == 0) {
 					uni.showToast({
-						title: that.settlement.min_money > 0 ? `最多可用${Number(that.settlement.min_money)}元, 请重新输入` :
-							'暂无可提现金额',
+						title: `暂无可提现金额`,
 						icon: 'none',
 						duration: 2000
 					})
-					that.inputValue = ''
-					that.$forceUpdate();
+					this.inputValue = ''
+					this.$forceUpdate();
+				} else if (Number(this.settlement.min_money) > num) { // 判断value值是否小于等于100, 如果大于100限制输入100
+					uni.showToast({
+						title: `最低可提现金额为${Number(this.settlement.min_money)}元, 请重新输入`,
+						icon: 'none',
+						duration: 2000
+					})
+					this.inputValue = ''
+					this.$forceUpdate();
 				} else {
 					if (!num) { // 判断value值是否等于空,为空amount默认0,
-						that.inputValue = ''
-						that.$forceUpdate();
+						this.inputValue = ''
+						this.$forceUpdate();
 					}
 				}
 			},

From 7b7709e46d4effd0320af224d67d16accfe556c6 Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Mon, 20 May 2024 17:34:07 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/news/user/rechargeList.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pages/news/user/rechargeList.vue b/pages/news/user/rechargeList.vue
index f0d8e3f..2bb0f5a 100644
--- a/pages/news/user/rechargeList.vue
+++ b/pages/news/user/rechargeList.vue
@@ -58,6 +58,9 @@
 </script>
 
 <style lang="scss" scoped>
+	::v-deep .u-empty {
+		padding: 100rpx 0;
+	}
 	.recharge {
 		padding: 25rpx;
 		overflow: hidden;

From caf265f5ccd485431e8ce96ad70cf0db7d808932 Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Wed, 22 May 2024 09:58:30 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pages/index/index.vue b/pages/index/index.vue
index 2796523..cf364be 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1264,6 +1264,7 @@
 		}
 
 		.tabs {
+			margin-top: 10rpx;
 			width: 100%;
 			height: 80rpx;
 			align-items: center;

From 1c8748e04be1e059de07cc1d857a1c78c4b40ed0 Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Sun, 26 May 2024 20:36:24 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods/components/setPrice.vue | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/pages/goods/components/setPrice.vue b/pages/goods/components/setPrice.vue
index e9221b5..7d7bae4 100644
--- a/pages/goods/components/setPrice.vue
+++ b/pages/goods/components/setPrice.vue
@@ -16,7 +16,7 @@
 							{{startTime?startTime:'起始时间'}}
 						</view>
 					</view>
-					<view class="priceCon" v-if="secondQuota">
+					<view class="priceCon">
 						<text>秒杀时长：</text>
 						<input type="number" style="width: 130rpx;margin-right: 15rpx;" class="input" v-model="sec_hour"
 							placeholder="请输入"> /小时
@@ -44,8 +44,9 @@
 			</view>
 		</u-popup>
 	</view>
-	<u-calendar v-model="timeShow" mode="date" minDate='0' @change="getTime" :pickerOptions="pickerOptions"
-		range-color='#FF6257' range-bg-color='#FFBDBA' active-bg-color='#FF6257'></u-calendar>
+	<u-picker v-model="timeShow" mode="time" @confirm="getTime" :params="params"></u-picker>
+	<!-- 	<u-calendar v-model="timeShow" mode="date"  minDate='0' @change="getTime" :pickerOptions="pickerOptions"
+		range-color='#FF6257' range-bg-color='#FFBDBA' active-bg-color='#FF6257'></u-calendar> -->
 </template>
 
 <script>
@@ -57,9 +58,17 @@
 				startTime: '',
 				sec_hour: '',
 				secondPrice: '',
-				secondQuota: 1,
+				secondQuota: false,
 				quotaNum: '',
 				fontColor: '#262626',
+				params: {
+					year: true,
+					month: true,
+					day: true,
+					hour: true,
+					minute: true,
+					second: true
+				},
 			}
 		},
 		methods: {
@@ -70,7 +79,7 @@
 				this.quotaNum = null
 			},
 			getTime(e) {
-				this.startTime = e.result;
+				this.startTime = e.year + '-' + e.month + '-' + e.day + ' ' + e.hour + ':' + e.minute + ':' + e.second;
 			},
 			submit() {
 				if (!this.secondPrice) {
@@ -79,7 +88,7 @@
 				if (!this.startTime) {
 					return this.$toast('请选择开始时间')
 				}
-				if (!this.sec_hour) {
+				if (!this.sec_hour && this.secondQuota) {
 					return this.$toast('请输入秒杀时长')
 				}
 				if (!this.quotaNum && this.secondQuota) {
@@ -168,11 +177,11 @@
 				}
 
 				.selectTime {
-					width: 300rpx;
+					width: 358rpx;
 					height: 70rpx;
 					background: #F3F3F3;
 					border-radius: 44rpx;
-					text-align: center;
+					text-align: left;
 					line-height: 70rpx;
 					font-family: PingFang SC, PingFang SC;
 					font-weight: 500;
@@ -180,6 +189,7 @@
 					color: #A1A1A1;
 					font-style: normal;
 					text-transform: none;
+					padding-left: 30rpx;
 				}
 
 				text {

From 74b37a0a3f57e0f6c07f2fad201ab8939101dd75 Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Mon, 27 May 2024 11:44:50 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E9=9E=8B=E6=9C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.vue | 16 ++++++++--------
 pages/user/index.vue  |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pages/index/index.vue b/pages/index/index.vue
index cf364be..1cb40ce 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -76,7 +76,7 @@
 					<image :src="$picUrl+'/static/index/new.png?t='+timestamp" class="firstBg"></image>
 					<view class="firstInfo">
 						<view class="fTitle">
-							<image :src="$picUrl+'/static/index/xinren.png'" class="firstTitle"></image>
+							<image :src="$picUrl+'/static/index/xinren.png?t='+timestamp" class="firstTitle"></image>
 							<!-- <text></text> -->
 						</view>
 						<view class="couponInfo">
@@ -108,9 +108,9 @@
 						<!-- <image src="/static/index/dapaibg.png" mode="widthFix" class="dapaibg"></image> -->
 						<view class="dapaiBox">
 							<view class="dapaiTitle">
-								<image :src="$picUrl+'/static/index/dapai.png'" mode="widthFix"></image>
+								<image :src="$picUrl+'/static/index/dapai.png?t='+timestamp" mode="widthFix"></image>
 								<view class="goods">
-									<image :src="$picUrl+'/static/index/diannei.png'" mode="widthFix"></image>
+									<image :src="$picUrl+'/static/index/diannei.png?t='+timestamp" mode="widthFix"></image>
 									<view>店内现货</view>
 								</view>
 							</view>
@@ -168,7 +168,7 @@
 							</view>
 							<view class="price">
 								<view class="tip">
-									<image :src="$picUrl+'/static/index/tip.png'"></image>
+									<image :src="$picUrl+'/static/index/tip.png?t='+timestamp"></image>
 									<view class="tipPrice">
 										<text style="font-size: 20rpx;">￥</text>
 										<text>{{item.seckill_price_min}}</text>
@@ -191,7 +191,7 @@
 						<!-- <view class="rightContent"> -->
 						<view class="rightItem1" v-if="wxAppSetting.new_product">
 							<view style="">
-								<image :src="$picUrl+'/static/index/xinpin.png'" mode="widthFix" @click="goNewGoods"
+								<image :src="$picUrl+'/static/index/xinpin.png?t='+timestamp" mode="widthFix" @click="goNewGoods"
 									class="title"></image>
 								<view class="more" @click="goNewGoods">查看更多<u-icon name="arrow-right"></u-icon>
 								</view>
@@ -202,7 +202,7 @@
 												@click="goJump('/pages/goods/detail?goodsId=' + item.goods_id)">
 												<image :src="item.goods_image"></image>
 												<view class="priceBox">
-													<image :src="$picUrl+'/static/index/price.png'" mode="heightFix">
+													<image :src="$picUrl+'/static/index/price.png?t='+timestamp" mode="heightFix">
 													</image>
 													<view><text>￥</text>{{item.goods_price_min}}</view>
 												</view>
@@ -214,7 +214,7 @@
 						</view>
 						<view class="rightItem2" v-if="wxAppSetting.ranking_list">
 							<view style="margin-bottom: 10rpx;">
-								<image :src="$picUrl+'/static/index/paihangbang.png'" mode="widthFix" @click="rankIng"
+								<image :src="$picUrl+'/static/index/paihangbang.png?t='+timestamp" mode="widthFix" @click="rankIng"
 									class="title"></image>
 								<view class="more" @click="rankIng">查看更多<u-icon name="arrow-right"></u-icon>
 								</view>
@@ -224,7 +224,7 @@
 											@click="goJump('/pages/goods/detail?goodsId=' + item.goods_id)">
 											<image :src="item.goods_image"></image>
 											<view class="priceBox">
-												<image :src="$picUrl+'/static/index/price.png'" mode="heightFix">
+												<image :src="$picUrl+'/static/index/price.png?t='+timestamp" mode="heightFix">
 												</image>
 												<view><text>￥</text>{{item.goods_price_min}}</view>
 											</view>
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 36dfe78..aaeff67 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -1306,10 +1306,10 @@
 			}
 
 			.goodsInfo {
-				margin-bottom: 12rpx;
-				height: 60rpx;
+				overflow: hidden;
 
 				.title {
+					height: 60rpx;
 					display: flex;
 					align-items: center;
 					margin-top: 10rpx;

From dedf184df6d60833749fae4e46be0816588b1e78 Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Mon, 27 May 2024 15:55:36 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/news1/jinqun.vue | 277 ++++++++++++++++++++++-------------------
 pages/user/index.vue   |   2 +-
 2 files changed, 153 insertions(+), 126 deletions(-)

diff --git a/pages/news1/jinqun.vue b/pages/news1/jinqun.vue
index a157bdc..ff8ccba 100644
--- a/pages/news1/jinqun.vue
+++ b/pages/news1/jinqun.vue
@@ -1,7 +1,10 @@
 <template>
-<view class="jinqun"  :style="{background:`url(${$picUrl}/static/jinqun-bg1.png)`}" style="background-size: 100% 100%;text-align: center;">
-		<image :src="cityInfo.group_share_img" style="padding-top: 70%; width: 370rpx;height: 370rpx;" show-menu-by-longpress='1' bindtap="clickImg"></image>
-</view>
+	<view class="jinqun" :style="{background:`url(${$picUrl}/static/jinqun-bg1.png)`}"
+		style="background-size: 100% 100%;text-align: center;">
+		<view class="image-box">
+			<image :src="cityInfo.group_share_img" class="image" bindtap="clickImg"></image>
+		</view>
+	</view>
 </template>
 
 <script>
@@ -26,7 +29,7 @@
 					this.cityInfo = data
 				}
 			},
-			clickImg(){
+			clickImg() {
 				this.onShareAppMessage()
 			}
 		},
@@ -34,153 +37,177 @@
 		 * 分享当前页面
 		 */
 		onShareAppMessage() {
-		  return {
-		    title: "进社群领取更多福利",
-			imageUrl: this.cityInfo.group_share_img
-		  }
+			return {
+				title: "进社群领取更多福利",
+				imageUrl: this.cityInfo.group_share_img
+			}
 		},
-		
+
 		/**
 		 * 分享到朋友圈
 		 * 本接口为 Beta 版本，暂只在 Android 平台支持，详见分享到朋友圈 (Beta)
 		 * https://developers.weixin.qq.com/miniprogram/dev/framework/open-ability/share-timeline.html
 		 */
 		onShareTimeline() {
-		  return {
-		    title:  "进社群领取更多福利",
-			imageUrl: this.cityInfo.group_share_img
-		  }
+			return {
+				title: "进社群领取更多福利",
+				imageUrl: this.cityInfo.group_share_img
+			}
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
+	.jinqun {
+		.image-box {
+			width: 330rpx;
+			height: 330rpx;
+			margin: 420rpx auto;
 
-.jinqun{
-	height:100%;
-	position: relative;
-	
-	background-repeat: no-repeat;
-	background-size: cover;
-	min-height: 100vh;
-	.flag{
-		position: absolute;
-		top:0;
-		left:0;
-		.flagContent{
-			position: relative;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			image{
-				width: 96px;
-				height:auto;
-			}
-			text{
-				position: absolute;
-				font-size: 32upx;
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 500;
-				color: #E92214;
+			.image {
+				width: 100%;
+				height: 100%;
 			}
 		}
-	}
-	.topicText{
-		font-size: 80upx;
-		font-family: YouSheBiaoTiHei, YouSheBiaoTiHei;
-		font-weight: 400;
-		text-align: center;
-		background: linear-gradient(180deg, #FFFFFF 0%, #FAE0BC 100%);
-		-webkit-background-clip: text;
-		-webkit-text-fill-color: transparent;
-		padding-top:150upx;
-	}
-	.subTopicText{
-	
-		font-size: 50upx;
-		font-family: YouSheBiaoTiHei, YouSheBiaoTiHei;
-		font-weight: 400;
-		color: #FFFFFF;
-		text-align: center;
-		-webkit-background-clip: text;
-		// -webkit-text-fill-color: transparent;
-		margin-top:20upx;
-	}
-	.qcode{
-		width: 400upx;
-		height:300upx;
-		margin:160upx auto;
-		border:1px solid red; 
-		image{
-			width: 100%;
-			height: 140%;
-		}
-	}
-	.submitBtn{
-		width: 340upx;
-		height: 90upx;
-		background: linear-gradient(180deg, #FEE6A8 0%, #FCC96E 100%);
-		border-radius: 39px 39px 39px 39px;
-		opacity: 1;
-		font-size: 40upx;
-		font-family: PingFang SC, PingFang SC;
-		font-weight: 500;
-		color: #E92214;
-		line-height: 90upx;
-		text-align: center;
-		margin:0 auto;
+       overflow: hidden;
+		height:100%;
 		position: relative;
-		button{
-			width: 100%;
-			height: 100%;
+		background-repeat: no-repeat;
+		background-size: cover;
+		min-height: 100vh;
+
+		.flag {
 			position: absolute;
-			left: 0;
 			top: 0;
-			z-index: 2;
-			opacity: 0;
-		}
-	}
-	.fuli{
-		margin: 60upx;
-		background-color: #fff;
-		border-radius: 14upx;
-		.fuliTitle{
-			width: 137px;
-			height: 35px;
-			background: #3A393E;
-			opacity: 1;
-			margin: 0 auto;
-			border-radius: 0 0 20px 20px;
-			color: #FFFFFF;
-			text-align: center;
-			line-height: 35px;
-			font-size: 32upx;
-		}
-		.fuliContent{
-			display: flex;
-			justify-content: space-around;
-			align-items: center;
-			padding:50upx 0;
-			
-			.fuliItem{
+			left: 0;
+
+			.flagContent {
+				position: relative;
 				display: flex;
-				flex-direction: column;
 				align-items: center;
 				justify-content: center;
-				image{
-					height:100upx;
-					width: auto;
+
+				image {
+					width: 96px;
+					height: auto;
 				}
-				text{
-					font-size: 28upx;
+
+				text {
+					position: absolute;
+					font-size: 32upx;
 					font-family: PingFang SC, PingFang SC;
 					font-weight: 500;
 					color: #E92214;
-					margin-top:12upx;
 				}
 			}
 		}
-		
+
+		.topicText {
+			font-size: 80upx;
+			font-family: YouSheBiaoTiHei, YouSheBiaoTiHei;
+			font-weight: 400;
+			text-align: center;
+			background: linear-gradient(180deg, #FFFFFF 0%, #FAE0BC 100%);
+			-webkit-background-clip: text;
+			-webkit-text-fill-color: transparent;
+			padding-top: 150upx;
+		}
+
+		.subTopicText {
+
+			font-size: 50upx;
+			font-family: YouSheBiaoTiHei, YouSheBiaoTiHei;
+			font-weight: 400;
+			color: #FFFFFF;
+			text-align: center;
+			-webkit-background-clip: text;
+			// -webkit-text-fill-color: transparent;
+			margin-top: 20upx;
+		}
+
+		.qcode {
+			width: 400upx;
+			height: 300upx;
+			margin: 160upx auto;
+			border: 1px solid red;
+
+			image {
+				width: 100%;
+				height: 140%;
+			}
+		}
+
+		.submitBtn {
+			width: 340upx;
+			height: 90upx;
+			background: linear-gradient(180deg, #FEE6A8 0%, #FCC96E 100%);
+			border-radius: 39px 39px 39px 39px;
+			opacity: 1;
+			font-size: 40upx;
+			font-family: PingFang SC, PingFang SC;
+			font-weight: 500;
+			color: #E92214;
+			line-height: 90upx;
+			text-align: center;
+			margin: 0 auto;
+			position: relative;
+
+			button {
+				width: 100%;
+				height: 100%;
+				position: absolute;
+				left: 0;
+				top: 0;
+				z-index: 2;
+				opacity: 0;
+			}
+		}
+
+		.fuli {
+			margin: 60upx;
+			background-color: #fff;
+			border-radius: 14upx;
+
+			.fuliTitle {
+				width: 137px;
+				height: 35px;
+				background: #3A393E;
+				opacity: 1;
+				margin: 0 auto;
+				border-radius: 0 0 20px 20px;
+				color: #FFFFFF;
+				text-align: center;
+				line-height: 35px;
+				font-size: 32upx;
+			}
+
+			.fuliContent {
+				display: flex;
+				justify-content: space-around;
+				align-items: center;
+				padding: 50upx 0;
+
+				.fuliItem {
+					display: flex;
+					flex-direction: column;
+					align-items: center;
+					justify-content: center;
+
+					image {
+						height: 100upx;
+						width: auto;
+					}
+
+					text {
+						font-size: 28upx;
+						font-family: PingFang SC, PingFang SC;
+						font-weight: 500;
+						color: #E92214;
+						margin-top: 12upx;
+					}
+				}
+			}
+
+		}
 	}
-}
-</style>
\ No newline at end of file
+</style>
diff --git a/pages/user/index.vue b/pages/user/index.vue
index aaeff67..afe7021 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -503,7 +503,7 @@
 							会员管理
 						</view>
 					</view>
-					<view class="serveIcon" v-if="userInfo.user_type == 40" @click="goJump('/pages/news1/jinqun')">
+					<view class="serveIcon" v-if="userInfo.user_type == 40 || userInfo.user_type == 30 || userInfo.user_type == 20"  @click="goJump('/pages/news1/jinqun')">
 						<image :src="$picUrl+'/static/user/jq.png'" class="icons"></image>
 						<view class="serveInfo">
 							进群有礼