授权解决

page_mycenter/bindaccounts/douyinbind.vue

@@ -6,20 +6,32 @@
 		<view class="home">
 			<view class="card" v-if="!loading">
 				<view class="head">
-					<image src="https://horastar.obs.cn-east-3.myhuaweicloud.com/talent/pingtai2.png" mode="aspectFill">
+					<image
+						src="https://horastar.obs.cn-east-3.myhuaweicloud.com/talent/lQLPDhrXwll1_NcjI7AD0T3viYtxQwGOvh1SwG0A_35_35.png"
+						mode="aspectFill">
 					</image>
-					<span>抖音账号绑定</span>
+					<span>快手账号绑定</span>
 				</view>
 
 				<view class="body">
 
 					<view>
-
-						<!-- 放用户信息 -->
+						<!-- 绑定成功展示信息  v-if -->
 						<view>
-							<p>用户抖音平台头像昵称等信息展示</p>
-							<p>用户抖音平台头像昵称等信息展示</p>
-							<p>用户抖音平台头像昵称等信息展示</p>
+							<!-- 左侧图片和文字 -->
+							<view class="task-info-left" style="display: flex;">
+								<!-- 图片 -->
+								<image class="head-img" :src="head_uri"></image>
+								<view class="task-info-txt">
+									<p style="margin-bottom: 15rpx;">{{nick_name}}</p>
+									<p style="color: #81838f;">剩余100天</p>
+
+								</view>
+							</view>
+							<view class="sale_txt">
+								<p>粉丝数:<span>{{fansCount}}</span></p>
+								<p>近30日橱窗销量:<span style="padding-left: 30rpx;">{{saleNum_30}}</span></p>
+							</view>
 						</view>
 
 
@@ -28,11 +40,9 @@
 
 						<!-- 点击弹窗 toggle(触发)-->
 						<button class="btn1" @click="getqrcode('center')">
-							添加抖音账号</button>
+							{{ isBindKuaishou ? '刷新授权' : '添加快手账号' }}
+						</button>
 					</view>
-
-
-
 				</view>
 			</view>
 		</view>
@@ -41,46 +51,39 @@
 			<view class="popup-content" :class="{ 'popup-height': type === 'left' || type === 'right' }">
 				<view class="sharepage">
 					<view class="projecttext1">
-						<span>抖音账号登录</span>
+						<span>快手账号登录</span>
 					</view>
 					<view class="sharetxt">
 						<text style="color:#9a9a9a ;">
-							截屏或下载二维码，使用抖音APP\n
+							截屏或下载二维码，使用快手APP\n
 							打开[首页-搜索-扫一扫]后扫码进行
 						</text>
 					</view>
+					<!-- 授权码展示 -->
 					<view class="sharemap">
+						<!-- 根据 countdownTime 的值为 image 元素应用不同的类名 -->
+						<image :class="{'expired-image': countdownTime <= 0, 'active-image': countdownTime > 0}"
+							:src="qrcodeURL" mode=""></image>
 
-						<image :src="qrcodeURL" style="width: 300rpx;height: 300rpx;" mode=""></image>
-
-						<!-- <image :src="qrcodeURL" style="width: 300rpx;height: 300rpx;" mode=""></image> -->
-
-
-						<!-- <image src="https://horastar.obs.cn-east-3.myhuaweicloud.com/talent/kefu.jpeg"
-							style="width: 400rpx;height: 400rpx;" mode=""></image> -->
-
+						<!-- 条件渲染：当 countdownTime 小于等于 0 时显示蒙版 -->
+						<image v-if="countdownTime <= 0"
+							src="https://horastar.obs.cn-east-3.myhuaweicloud.com/talent/qrOOD.png"
+							style="width: 150rpx;height: 150rpx;position: absolute;top: 240rpx;left: 200rpx;"></image>
 
 					</view>
+
 					<view style="margin: 30rpx 0;">
 						<button class="butmin1" size="mini" @tap="freshqrcode" :disabled="countdownTime > 0">
 							{{ countdownTime > 0 ? `刷新二维码(${countdownTime}秒后到期)` : '刷新二维码 (已过期)' }}
 						</button>
 					</view>
-					<!-- 
-					·同步账号基础信息及查看账号运营数据\n
-					·获得免费领样权限\n
-					·获得承接抖音悬赏任务权限\n
-					·为达人橱窗快速选品\n
-					·为直播带货快速选品\n
-					·样叽专属高佣商品，同一商品，更高佣金\n
-					·变现种草任务参与资质\n -->
 					<view class="importentInfo1">
 						<view class="sharetxt1" style="font-size: 22rpx;">
 							<text style="white-space: pre-line; text-align: left;line-height: 1;">
 								登录成功后： \n
 								·同步账号基础信息及查看账号运营数据\n
 								·获得免费领样权限\n
-								·获得承接抖音悬赏任务权限\n
+								·获得承接快手悬赏任务权限\n
 								·为达人橱窗快速选品\n
 								·为直播带货快速选品\n
 								·样叽专属高佣商品，同一商品，更高佣金\n
@@ -111,10 +114,12 @@
 		},
 		data() {
 			return {
-				countdownTime: 300, // 初始倒计时时间（秒）
+				countdownTime: 100, // 初始倒计时时间（秒）
 				intervalId: null, // 计时器 ID
-				qrcodeURL: 'https://horastar.obs.cn-east-3.myhuaweicloud.com/talent/pingtai2.png', // 用来保存二维码URL的变量
+				qrcodeURL: 'https://horastar.obs.cn-east-3.myhuaweicloud.com/talent/lQLPDhrXwll1_NcjI7AD0T3viYtxQwGOvh1SwG0A_35_35.png', // 用来保存二维码URL的变量
 				// qrcodeURL: '',
+				head_uri: 'https://horastar.obs.cn-east-3.myhuaweicloud.com/talent/lQLPDhrXwll1_NcjI7AD0T3viYtxQwGOvh1SwG0A_35_35.png',
+				nick_name: "",
 				navH: getApp().globalData.navHeight,
 				hasClicked: false,
 				loading: true,
@@ -125,6 +130,7 @@
 					platform_icon: '',
 				},
 				isBind: true,
+				isBindKuaishou: true,
 				imageData: [],
 				formData: {
 					platform_nickname: '',
@@ -137,6 +143,7 @@
 				index: 0,
 				fansLabel: "选择单位",
 				fansCount: null,
+				saleNum_30: 0,
 				fansCountInfo: 1,
 				fansRange: [{
 						value: 1,
@@ -204,6 +211,7 @@
 		onReady() {},
 		async onShow() {},
 		async onLoad(options) {
+			await this.checkaccount()
 			this.platform.platform_id = parseInt(options.platform_id)
 			if (options.account_id) {
 				this.accountId = parseInt(options.account_id)
@@ -221,6 +229,34 @@
 			uni.hideLoading();
 		},
 		methods: {
+			checkaccount() {
+				this.$https.get('/youngee/c/t/g/check-account').then(res => {
+					// todo:得到用户数据并赋值 ，头像、粉丝，
+					console.log("Backend response res:", res);
+
+					// 如果后端响应了您想要的结果，则关闭 uni-popup，并停止向后端发送请求
+					//如果/kuangshouauth执行完毕（存在含tid的数据）
+					if (res.data.code != -1) {
+						this.nick_name = res.data.data.nick_name
+						this.head_uri = res.data.data.head_uri
+						this.fansCount = res.data.data.fan
+						//继续往数据中填充30天销量字段
+						this.$https.get('/youngee/c/t/g/query-sales-for30-days').then(res => {
+							console.log("30days+++++++", res)
+							this.saleNum_30 = res.data.data
+						})
+						this.isBindKuaishou = true
+						//从数据库中取到accesstoken和
+
+
+					} else {
+						//没查到数据，没有绑定
+						this.isBindKuaishou = false
+					}
+				}).catch(err => {
+					console.error("Error:", err);
+				});
+			},
 			// 获得二维码
 			async getqrcode(type) {
 				this.type4 = type;
@@ -229,62 +265,88 @@
 				uni.showLoading({
 					title: '加载中',
 				})
-				this.startCountdown();
+
 				// 从后端中请求二维码图片展示出来
 				//达人id在后端通过session获取
 				await this.$https.get('/youngee/c/t/g/display-qrcode').then(res => {
-					console.log("resisjjjj",res)
 					this.qrcodeURL = res.data.data;
-					console.log("url:", this.qrcodeURL);
 				})
+				this.startCountdown();
 				this.loading = false;
 				uni.hideLoading();
 
 			},
 			// 倒计时结束才能点击
-			freshqrcode() {
+			async freshqrcode() {
+				this.qrcodeURL =
+					'https://horastar.obs.cn-east-3.myhuaweicloud.com/talent/lQLPDhrXwll1_NcjI7AD0T3viYtxQwGOvh1SwG0A_35_35.png'
 				if (this.intervalId != null) {
 					clearInterval(this.intervalId);
-					this.countdownTime = 300;
+					this.countdownTime = 100;
 				}
 				//重新设置倒计时时间
-				this.countdownTime = 300; // 重置为 300 秒
+				this.countdownTime = 100; // 重置为 10 秒
+				this.loading = true;
+				uni.showLoading({
+					title: '加载中',
+				})
+				await this.$https.get('/youngee/c/t/g/display-qrcode').then(res => {
+					this.qrcodeURL = res.data.data;
+					console.log("refresh--url:", this.qrcodeURL);
+				})
 				// 启动倒计时计时器
 				this.startCountdown();
-				this.qrcodeURL = 'https://horastar.obs.cn-east-3.myhuaweicloud.com/talent/pingtai2.png'
-				// 启动倒计时计时器
-				this.$https.get('/displayqrcode').then(res => {
-					this.qrcodeURL = res.data;
-					console.log("url:", this.qrcodeURL);
-				})
+				this.loading = false;
+				uni.hideLoading();
 			},
 			startCountdown() {
 				// 每秒减少剩余时间
 				this.intervalId = setInterval(() => {
 					if (this.countdownTime > 0) {
 						this.countdownTime--;
+						this.$https.get('/youngee/c/t/g/check-account').then(res => {
+							// todo:得到用户数据并赋值
+							console.log("Backend response res:", res);
+							// 如果后端响应了您想要的结果，则关闭 uni-popup，并停止向后端发送请求
+							if (res.data.code != -1 && this.intervalId != null) {
+								clearInterval(this.intervalId);
+								this.countdownTime = 100;
+								this.closepop() // 关闭 uni-popup
+							}
+						}).catch(err => {
+							console.error("Error:", err);
+						});
 					}
 				}, 1000); // 每秒执行一次
 			},
+			// startCountdown() {
+			// 	// 每秒减少剩余时间
+			// 	this.intervalId = setInterval(() => {
+			// 		if (this.countdownTime > 0) {
+			// 			this.countdownTime--;
+			// 		}
+			// 	}, 1000); // 每秒执行一次
+			// },
 
 			//unipop出现/消失自动触发
-			change(e) {
-				if(this.loading){
+			async change(e) {
+				if (this.loading) {
 					this.loading = false;
 					uni.hideLoading();
 				}
 				if (this.intervalId != null) {
 					clearInterval(this.intervalId);
-					this.countdownTime = 300;
+					this.countdownTime = 100;
 				}
-				this.qrcodeURL = 'https://horastar.obs.cn-east-3.myhuaweicloud.com/talent/pingtai2.png'
-				console.log("ddcpdd")
+				await this.checkaccount()
+				this.qrcodeURL =
+					'https://horastar.obs.cn-east-3.myhuaweicloud.com/talent/lQLPDhrXwll1_NcjI7AD0T3viYtxQwGOvh1SwG0A_35_35.png'
 			},
 			// 保存图片
 			async saveImage() {
 				// showToast('保存成功')
 				wx.downloadFile({
-					url: 'https://horastar.obs.cn-east-3.myhuaweicloud.com/talent/pingtai2u',
+					url: 'https://horastar.obs.cn-east-3.myhuaweicloud.com/talent/lQLPDhrXwll1_NcjI7AD0T3viYtxQwGOvh1SwG0A_35_35u',
 					success: function(res) {
 						wx.saveImageToPhotosAlbum({
 							filePath: res.tempFilePath,
@@ -539,6 +601,31 @@
 		padding-right: 14rpx;
 	}
 
+	.task-info-txt {
+		margin-top: 10rpx;
+		margin-left: 20rpx;
+	}
+
+	.head-img {
+		width: 120rpx;
+		height: 120rpx;
+		border-radius: 100rpx;
+	}
+
+	.sale_txt {
+		margin-top: 30rpx;
+	}
+
+	.sale_txt p {
+		margin-bottom: 17rpx;
+		color: #81838f;
+	}
+
+	.sale_txt span {
+		padding-left: 160rpx;
+	}
+
+
 	.home-link {
 		/deep/.uni-easyinput__content-input {
 			background-color: #EBEBEB;
@@ -620,9 +707,25 @@
 		// margin-bottom: 15%;
 	}
 
+	.expired-image {
+		width: 300rpx;
+		height: 300rpx;
+		background-color: #000;
+		opacity: 0.2;
+		/* 例如，设置透明度为 0.5 */
+	}
+
+	/* 定义活跃图片的样式 */
+	.active-image {
+		width: 300rpx;
+		height: 300rpx;
+		/* 如果有特定样式，可以在这里定义 */
+	}
+
+
 	.sharemap image {
-		width: 400rpx;
-		height: 400rpx;
+		width: 300rpx;
+		height: 300rpx;
 
 	}
 

page_mycenter/myinformation/myaccount.vue

@@ -8,7 +8,9 @@
 			<view class="card" style="margin-top: 2%;" v-for="item in account" @click="accountdetail(item)">
 				<view class="Tasktext">
 					<image :src="item.platform_icon" mode=""></image>
-					<span>{{item.platform_nickname}}</span>
+					<span>{{item.nick_name}}</span>
+					<image :src="suc_flag===0 ? auth_exp_img : auth_suc_img" mode=""
+						style="height: 25rpx;padding-left: 25rpx;"></image>
 				</view>
 				<view class="dou">
 					<p style="padding-right: 20rpx;color:#A8A8A8;">粉丝数</p>
@@ -20,8 +22,8 @@
 			</view>
 		</view>
 		<view v-if="!loading">
-			<!-- 未绑定的 -->
-			<view class="card" style="margin-top: 2%;" v-for="item in list1">
+			<!-- 未绑定的  list_all含未绑定平台的id和name-->
+			<view class="card" style="margin-top: 2%;" v-for="item in list_all">
 				<view class="Tasktext" @click="bindaccount(item)">
 					<image :src="item.platform_icon" mode=""></image>
 					<span>绑定{{item.platform_name}}账号</span>
@@ -54,8 +56,11 @@
 				navH: getApp().globalData.navHeight,
 				loading: false,
 				togoimg: 'https://horastar.obs.cn-east-3.myhuaweicloud.com/talent/task16.png',
-				list1: [],
+				list_all: [],
 				account: [],
+				suc_flag: 0, //0表示已过期，1表示未过期
+				auth_suc_img: 'https://horastar.obs.cn-east-3.myhuaweicloud.com/talent/auth_suc.png',
+				auth_exp_img: 'https://horastar.obs.cn-east-3.myhuaweicloud.com/talent/auth-exp.png',
 				mysNavConfig: {
 					/* 开启单页显示首页图标 */
 					isHome: true,
@@ -87,8 +92,10 @@
 			uni.showLoading({
 				title: '加载中'
 			});
-			await this.getlist1()
-			await this.getlist()
+			await this.getlist_all()
+			await this.getlist_bind()
+			//检查token是否有效,发送获取销量接口，得到code值
+			await this.checkToken()
 			uni.hideLoading();
 			this.loading = false;
 		},
@@ -110,32 +117,68 @@
 				});
 			},
 			// 信息表
-			getlist() {
-				return this.$https.get('/youngee/c/t/g/get-talent-account')
+			// 此前已获取所有平台的信息
+			getlist_bind() {
+				//查询快手平台绑定表
+				return this.$https.get('/youngee/c/t/g/get-talent-account-kuaishou')
 					.then(res => {
-						console.log("get list----", res)
-						//-3表示没有绑定任何平台
+						console.log("get list_bind----", res)
+						//  !== -3表示绑定了平台
 						if (res.data.code !== -3) {
 							this.account = res.data.data
 							for (var i = 0; i < this.account.length; i++) {
-								this.account[i].show_fans_count = fansview(this.account[i].fans_count)
-
-								for (var j = 0; j < this.list1.length; j++) {
-									if (this.list1[j].id == this.account[i].platform_id) {
-										this.account[i].platform_icon = this.list1[j].platform_icon
-										this.list1.splice(j, 1)
+								this.account[i].show_fans_count = this.account[i].fan
+								for (var j = 0; j < this.list_all.length; j++) {
+									if (this.list_all[j].id == this.account[i].platform_id) {
+										this.account[i].platform_icon = this.list_all[j].platform_icon
+										//表示从索引 j 开始删除1个元素。list_all中，剩下的都是未绑定的平台
+										this.list_all.splice(j, 1)
 									}
 								}
 							}
 						}
 					})
 			},
-			// 默认信息表
-			getlist1() {
+			// getlist() {
+			// 	//查询快手平台绑定表
+			// 	return this.$https.get('/youngee/c/t/g/get-talent-account')
+			// 		.then(res => {
+			// 			console.log("get list----", res)
+			// 			//  !== -3表示绑定了平台
+			// 			if (res.data.code !== -3) {
+			// 				this.account = res.data.data
+			// 				for (var i = 0; i < this.account.length; i++) {
+			// 					this.account[i].show_fans_count = fansview(this.account[i].fans_count)
+
+			// 					for (var j = 0; j < this.list_all.length; j++) {
+			// 						if (this.list_all[j].id == this.account[i].platform_id) {
+			// 							this.account[i].platform_icon = this.list_all[j].platform_icon
+			// 							//表示从索引 j 开始删除1个元素。list_all中，剩下的都是未绑定的平台
+			// 							this.list_all.splice(j, 1)
+			// 						}
+			// 					}
+			// 				}
+			// 			}
+			// 		})
+			// },
+			// 获取所有平台的id、icon和name
+			getlist_all() {
 				return this.$https.get('/youngee/c/g/get-info-tables')
 					.then(res => {
-						console.log("get list1----", res)
-						this.list1 = res.data.data.ThirdPlatform
+						this.list_all = res.data.data.ThirdPlatform
+						console.log("this.list_all", this.list_all)
+					})
+			},
+			checkToken() {
+				//进入页面就发送一个请求，看是否过期
+				return this.$https.get('/youngee/c/t/g/check-token-exp')
+					.then(res => {
+						console.log("checkToken___", res)
+						if (res.data.code == -2) {
+							this.suc_flag = 0
+						} else {
+							this.suc_flag = 1
+						}
 					})
 			},
 			// 前往绑定账号
@@ -148,27 +191,27 @@
 			//前往绑定抖音页面
 			// 前往绑定账号
 			bindaccount(item) {
-				console.log("11", item);
 				//绑定抖音平台
-				if(item.id==2){
+				if (item.id == 4) {
 					uni.navigateTo({
-						url: '/page_mycenter/bindaccounts/douyinbind'
+						url: '/page_mycenter/bindaccounts/kuaishoubind'
 					});
-				}else{
+				} else {
 					uni.navigateTo({
 						url: '/page_mycenter/myinformation/bindaccount?platform_id=' + item.id
 					});
 				}
-				
+
 			},
 			// 前往账号详情
 			accountdetail(item) {
+				
 				uni.navigateTo({
-					url: '/page_mycenter/myinformation/bindaccount?platform_id=' + item.platform_id +
+					url: '/page_mycenter/bindaccounts/kuaishoubind?platform_id=' + item.platform_id +
 						'&account_id=' + item
 						.account_id
 				});
-			}
+			},
 		}
 	}
 </script>

page_mycenter/myselection/myselection.vue

@@ -22,15 +22,6 @@
 		<view class="home" v-if="showList[0] && !loading">
 			<view class="task" v-for="item in secTaskLists[0]" @click="handleToSecTaskDetail(item)">
 				<view class="task-card">
-					<!-- <view class="task-head">
-						<view class="task-head-account">
-							<image class="platform-img" :src="item.platform_icon_url"></image>
-							<p>{{item.platform_nick_name}}</p>
-						</view>
-						<view class="task-head-status">
-							<p>{{item.task_stage_txt}}</p>
-						</view>
-					</view> -->
 					<view class="task-info">
 						<!-- 左侧图片和文字 -->
 						<view class="task-info-left">
@@ -38,17 +29,25 @@
 							<image class="project-img" :src="item.product_img_url"></image>
 							<!-- 描述 -->
 							<view class="task-info-txt">
-								<view class="" style="display: flex;">
+								<!-- <view class="" style="display: flex;">
 									<image class="platform-img" :src="item.platform_icon_url"></image>
 									<p style="font-size: 28rpx; line-height: 28rpx;color: black;">
 										{{item.selection_name}}
 									</p>
+								</view> -->
+								<view class="Tasktext">
+									<image class="platform-img" :src="item.platform_icon_url"></image>
+									<span>
+										{{item.selection_name}}
+									</span>
 								</view>
 								<p style="color: #ffcb41 ;">任务截至时间:{{item.ddl}}</p>
-								<p>售价：{{item.price}} 佣金率：{{item.exclusive_commission}}</p>
-								<p>全部销售量/有效销售量：</p>
-								<p>悬赏金额/悬赏有效销售量：</p>
-								<p>免费领样状态：</p>
+								<p>售价：￥{{item.price}} 佣金率：{{item.exclusive_commission}}%</p>
+								<!-- sectask表有已经有 -->
+								<p>全部销售量/有效销售量：{{item.SecTaskTable.sale_num_all}}单/{{item.sale_actual}}单</p>
+								<p v-if="item.task_mode==1">悬赏金额/悬赏有效销售量：
+									￥{{item.RewardStrategy[0].per_reward}}/{{item.RewardStrategy[0].sale_actual}}单</p>
+								<p v-if="item.sample_mode==1">免费领样状态：{{ getFreeStageText(item.SecTaskTable.free_stage) }}</p>
 							</view>
 						</view>
 						<!-- 右侧图标 -->
@@ -58,9 +57,14 @@
 								style="height: 30rpx;width: 30rpx;"></image>
 						</view>
 					</view>
-					<view style="text-align: right;" v-if="item.task_stage > 5">
+					<!-- <view style="text-align: right;" v-if="item.task_stage > 5">
 						<p style="font-size: 25rpx;">实际收益：￥{{item.show_real_reward}}</p>
+					</view> -->
+					<view class="container" v-if="item.task_stage > 5">
+						<p class="left-text">待领悬赏</p>
+						<p class="right-text">实际收益：￥{{ item.show_real_reward }}</p>
 					</view>
+
 				</view>
 			</view>
 		</view>
@@ -216,7 +220,6 @@
 				],
 				curTab: 0,
 				productInfo: {},
-				lastCallTime:null,
 			}
 		},
 		async onLoad(options) {
@@ -258,6 +261,22 @@
 			this.handleClickTab(this.curTab)
 		},
 		methods: {
+			getFreeStageText(freeStage) {
+				switch (freeStage) {
+					case 1:
+						return '已申请';
+					case 2:
+						return '已拒绝';
+					case 3:
+						return '待发货';
+					case 4:
+						return '已发货';
+					case 5:
+						return '已收货';
+					default:
+						return '未知状态';
+				}
+			},
 			async handleClickTab(value) {
 				this.loading = true;
 				uni.showLoading({
@@ -315,7 +334,6 @@
 					.then(res => {
 						console.log("getproductsuccess---", res)
 						this.productInfo = res.data.data
-						this.lastCallTime = Date.now();
 
 					})
 			},
@@ -329,17 +347,11 @@
 							console.log("secTaskList--->", secTaskList)
 							let num = res.data.data.count
 							for (let i = 0; i < num; ++i) {
-								// 计算距离上次调用的时间间隔
-								//不定时，报错，操作频繁
-								const elapsedTime = Date.now() - this.lastCallTime;
 
-								// 如果时间间隔小于一秒，等待剩余时间
-								if (elapsedTime < 1000) {
-									await new Promise(resolve => setTimeout(resolve, 1000 - elapsedTime));
-								}
 								//通过prouctid获取product表和product_photo表的信息
 								await this.getProductInfoApi(secTaskList[i].product_id);
-								console.log("***********", this.productInfo)
+
+								console.log("****secTaskList[i]*******", secTaskList[i])
 								secTaskList[i].price = this.productInfo.product_price
 								secTaskList[i].exclusive_commission = this.productInfo.exclusive_commission
 
@@ -490,6 +502,48 @@
 		font-size: 32rpx;
 	}
 
+	.container {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+	}
+
+	.left-text {
+		text-align: left;
+		flex: 1;
+		font-size: 25rpx;
+	}
+
+	.right-text {
+
+		text-align: right;
+		flex: 1;
+		font-size: 25rpx;
+	}
+
+	.Tasktext {
+		// padding-top: 5% ;
+		padding: 0 0 0 1%;
+		// height: 80rpx;
+		// margin-top: 2%;
+	}
+
+	.Tasktext span {
+		color: #333333;
+		font-size: 23rpx;
+		font-weight: 550;
+		text-indent: 2em;
+
+	}
+
+	.Tasktext image {
+		vertical-align: middle;
+		width: 50rpx;
+		height: 50rpx;
+		display: inline-block;
+		padding-right: 14rpx;
+	}
+
 	.home {
 		padding-top: 70rpx;
 	}
@@ -523,14 +577,15 @@
 
 	.task-card {
 		margin: 10rpx 0;
-		height: 240rpx;
+		height: 300rpx;
 		background-color: #f2f2f2;
 
 		// border-bottom: 1rpx #d7d7d7 solid;
 		.platform-img {
-			width: 30rpx;
-			height: 30rpx;
+			width: 40rpx;
+			height: 40rpx;
 			margin-right: 10rpx;
+			flex-shrink: 0;
 		}
 
 		.task-head {
@@ -547,6 +602,7 @@
 				width: 40rpx;
 				height: 40rpx;
 				margin-right: 10rpx;
+				flex-shrink: 0;
 			}
 
 			.task-head-status p {
@@ -564,8 +620,9 @@
 				// align-items: center;
 
 				.project-img {
-					height: 180rpx;
-					width: 180rpx;
+					height: 200rpx;
+					width: 200rpx;
+					flex-shrink: 0;
 					// background-color: #b3c96b;
 				}
 

page_selectionsquare/selectiondetail/information.vue

@@ -54,12 +54,12 @@
 
 		<view class="account" @click="editAccount()">
 			<view class="account_txt">
-				<image :src="selection.PlatformInfo.platform_icon" mode=""></image>
-				<span>{{account.platform_nickname}}</span>
+				<image src="https://horastar.obs.cn-east-3.myhuaweicloud.com/talent/lQLPDhrXwll1_NcjI7AD0T3viYtxQwGOvh1SwG0A_35_35.png" mode=""></image>
+				<span>{{account.nick_name}}</span>
 			</view>
 			<view class="account_fans">
 				<p style="padding-right: 20rpx;color:#A8A8A8;">粉丝数</p>
-				<p>{{account.show_fans_count}}</p>
+				<p>{{account.fan}}</p>
 			</view>
 			<view class="account_btn">
 				<image :src="picture.togoimg" mode="" style="width: 16rpx;height: 30rpx;"></image>
@@ -142,6 +142,7 @@
 				],
 
 				selection: {},
+				product: {},
 				youngTeamId: "",
 				youngLeadTeamId: "",
 				mainImg: "https://horastar.obs.cn-east-3.myhuaweicloud.com/backstage_upload/bb531ede-28b5-49a0-8431-a1608fd35890.png",
@@ -152,24 +153,27 @@
 				account: null,
 				strategy: null,
 				thirdPlatform: [],
+				saleNum_30: 0,
 			}
 		},
 		onShow() {
 			// 根据address_id查询address
 			this.getDefaultAddress();
 			// 查询account	
-			this.getAccount();
+			this.getTalentAccountInfo();
 		},
 		onLoad(options) {
 			this.textObj = options.textObj.replace(/""/g, "");
 			this.textObj = JSON.parse(decodeURIComponent(this.textObj))
+			console.log("详情页传来的数据",this.textObj)
+			this.saleNum_30=this.textObj.saleNum_30
 			this.selection = this.textObj.selection
 			console.log("this.selection------>", this.selection)
+			this.product = this.selection.YounggeeProduct[0]
 			this.youngTeamId = this.textObj.youngTeamId
 			this.youngLeadTeamId = this.textObj.youngLeadTeamId
 
 			for (let i = 0; i < this.selection.YounggeeProductPhoto.length; ++i) {
-				console.log("intoforloop---->", this.selection.YounggeeProductPhoto[i])
 				if (this.selection.YounggeeProductPhoto[i].symbol === 1) {
 					this.mainImg = this.selection.YounggeeProductPhoto[i].photo_url
 				}
@@ -203,22 +207,13 @@
 						this.youngLeadTeamId = res.data.data;
 					})
 			},
-			getAccount() {
-				this.$https.get('/youngee/c/t/g/get-talent-account')
+			//账号信息
+			getTalentAccountInfo() {
+				return this.$https.get('/youngee/c/t/g/get-talent-account-kuaishou')
 					.then(res => {
-						console.log(res)
-						console.log(res.data.data)
-						if (res.data.code !== -3) {
-							let account = res.data.data
-							while (this.selection == null) {} // 这句很危险
-							for (var i = 0; i < account.length; i++) {
-								if (this.selection.platform == account[i].platform_id) {
-									this.account = account[i]
-								}
-							}
-							this.account.show_fans_count = fansview(this.account.fans_count)
-						}
+						this.account=res.data.data[0]
 					})
+				// console.log("account数组——————：  ",res)
 			},
 			getDefaultAddress() {
 				this.$https.get('/youngee/c/t/g/get-talent-default-address').then(res => {
@@ -255,9 +250,7 @@
 			},
 			editAccount() {
 				uni.navigateTo({
-					url: '/page_mycenter/myinformation/bindaccount?platform_id=' + this.account.platform_id +
-						'&account_id=' +
-						this.account.account_id
+					url: '/page_mycenter/bindaccounts/kuaishoubind' 
 				});
 			},
 			debugSubmit() {
@@ -265,36 +258,82 @@
 					url: '/page_tasksquare/wholetask/success'
 				});
 			},
-			
-			// 提交确认报名
-			async submit() {
-				console.log("提交报名")
-				// 直接报名
-				console.log("********", this.selection.product_id)
-				this.$https.post('/youngee/c/t/p/sign-up-sec-task', {
-					address_id: this.address.address_id,
-					selection_id: this.selection.selection_id,
-					lead_team_id: this.youngLeadTeamId,
-					team_id: this.youngTeamId,
-					product_id: this.selection.product_id
-				}).then(res => {
-					if (res.data.code == 0) {
-						var data = {
-							task_id: res.data.data.task_id
-						};
-						data = JSON.stringify(data)
-						uni.navigateTo({
-							url: '/page_selectionsquare/selectiondetail/success?textObj=' +
-								encodeURIComponent(
-									data)
+			async submit(){
+				
+				//肯定有地址，样品肯定够，肯定有效期内，否则立即领样按钮无法点击
+				console.log("api----", this.product.kuaishou_product_id)
+				//调用加入橱窗api
+				this.$https.get('/youngee/c/t/g/add-window' +
+					"?" +
+					"product_id" +
+					"=" +
+					this.product.kuaishou_product_id
+				).then(res => {
+					console.log("add window res****", res)
+					//未开通
+					let api_result = res.data.data.data[0]
+					if (api_result.result == 1800533) {
+						uni.showModal({
+							content: '添加橱窗失败，免费领样申请失败', // 这里设置弹窗的内容
+							showCancel: false, // 不显示取消按钮
+							confirmText: '知道了', // 设置确认按钮的文本
+							success: function(res) {
+								if (res.confirm) {
+									console.log('用户点击知道了');
+								}
+							}
 						});
-					} else {
+					} else if (api_result.result == 1800550) {
 						uni.showModal({
-							content: '网络繁忙，请小主稍后再试~',
+							content: '添加橱窗失败，免费领样申请失败', // 这里设置弹窗的内容
+							showCancel: false, // 不显示取消按钮
+							confirmText: '知道了', // 设置确认按钮的文本
+							success: function(res) {
+								if (res.confirm) {
+									console.log('用户点击知道了');
+								}
+							}
 						});
+					} else {
+						//添加到seltask带货任务中
+						console.log("提交报名")
+						// 直接报名
+						console.log("********", this.selection.product_id)
+						console.log("this.account.fan********111", this.account.fan)
+						console.log("this.saleNum_30********111", this.saleNum_30)
+						this.$https.post('/youngee/c/t/p/sign-up-sec-task', {
+							address_id: this.address.address_id,
+							selection_id: this.selection.selection_id,
+							lead_team_id: this.youngLeadTeamId,
+							team_id: this.youngTeamId,
+							product_id: this.selection.product_id,
+							//新增
+							saleNum: this.saleNum_30,
+							fans: this.account.fan,
+						}).then(res => {
+							console.log("sign-up-sec-task 的res",res)
+							if (res.data.code == 0) {
+								var data = {
+									task_id: res.data.data.task_id
+								};
+								data = JSON.stringify(data)
+								uni.navigateTo({
+									url: '/page_selectionsquare/selectiondetail/success?textObj=' +
+										encodeURIComponent(
+											data)
+								});
+							} else {
+								uni.showModal({
+									content: '网络繁忙，请小主稍后再试~',
+								});
+								
+							}
+							
+						})
+						
 					}
 				})
-			}
+			},
 		},
 	}
 </script>

page_selectionsquare/selectiondetail/selectiondetail.vue

@@ -54,7 +54,7 @@
 
 							<view class="rright1">
 								<!-- <p>距离任务有效期还有<span style="color: #f70606;">1107</span>天</p> -->
-								<p style="color:#c4c4c4 ;">总销量:{{product.sales_count}}</p>
+								<p style="color:#c4c4c4 ;">近30日销量:{{product.sales_count}}</p>
 							</view>
 						</view>
 
@@ -177,9 +177,8 @@
 
 					<!-- 悬赏进度条 -->
 					<view style="display: flex; justify-content: space-between;">
-						<!-- 假数据 -->
 						<view style="font-size:22rpx;line-height:44rpx;margin-left: 27rpx;margin-right: 3rpx;">
-							<p>悬赏奖金池：剩余<span style="color: red;">{{selection.remain_reward_poll}}</span>￥</p>
+							<p>悬赏奖金池：剩余<span style="color: red;">{{selection.remain_poll}}</span>￥</p>
 						</view>
 
 						<view style="width: 55%;margin: auto;">
@@ -587,9 +586,13 @@
 				],
 
 				// 数据
+				suc_flag: 0, //0表示access_token失效
+				condition_flag: 0, //0表示未达到领样条件
+				kuaishouFansNum: 0, //判断是否满足领样条件时调用得到的粉丝数
+				saleNum_30: 0,
 				qrcode: '',
 				selectionId: '',
-				productId: '',
+				kuaishou_productId: '',
 				talent: {},
 				account: [],
 				selection: {},
@@ -745,6 +748,11 @@
 				await this.getTalentAccountInfo();
 				if (this.account.length != 0) {
 					await this.isSignUp();
+					await this.checkToken()
+					//token没有过期	
+					if (this.suc_flag == 1) {
+						await this.checkSampleCondition()
+					}
 				}
 				await this.handleButtonText();
 				this.loading = false;
@@ -773,8 +781,23 @@
 			this.init();
 		},
 		methods: {
+			//走到这一步的token必然有效
+			getFansNum() {
+				return this.$https.get('/youngee/c/t/g/get-kuaishou-fans-num')
+					.then(res => {
+						console.log("get-kuaishou-fans-num------", res); // 这行会输出响应对象到控制台
+						this.kuaishouFansNum = res.data.data.fan
+					})
+			},
+			get30daysSaleNum() {
+				return this.$https.get('/youngee/c/t/g/query-sales-for30-days')
+					.then(res => {
+						console.log("query-sales-for30-days------", res); // 这行会输出响应对象到控制台
+						this.saleNum_30 = res.data.data
+					})
+			},
 			handleButtonText() {
-				console.log('into handleButtonText,,this.isSign--->', this.isSign)
+				console.log('into handleButtonText,this.isSign--->', this.isSign)
 				// 领样条件判断
 				if (this.selection.sample_mode === 3) {
 					// 未开放免费领样
@@ -791,22 +814,24 @@
 						this.buttonText = '免费领样';
 						this.isDisabled = true;
 					} else if (this.isSign === 1) {
-						//  4. 若开放免费领样，但已经申请过，则按钮文字为“已申请”且置灰不可点击
+						//4. 若开放免费领样，但已经申请过，则按钮文字为“已申请”且置灰不可点击
+						//特殊情况：如果查到了数据，并且sectask的sample_mode也为1，说明是真申请过了
 						console.log("come in")
 						this.buttonText = '已申请';
 						this.isDisabled = true;
 					} else {
 						//不满足领取条件
 						//授权过期
-						console.log("其他情况")
-
+						console.log("按钮可点击")
 					}
 				} else {
 					console.log("sample_mode不可为2")
 				}
 			},
 			getFansLabel(fansNum) {
+				//// 在 options 数组中查找 value 属性等于 fansNum.toString() 的对象  fansNum在表中为int类型
 				const option = this.options.find(o => o.value === fansNum.toString());
+				// 如果找到这样的对象，则返回其 label 属性值，否则返回 fansNum
 				return option ? option.label : fansNum;
 			},
 			handleCopy(content) {
@@ -891,7 +916,7 @@
 				).then(res => {
 					if (res.data.code === 0) {
 						this.selection = res.data.data
-						console.log("this.selection---->",this.selection)
+						console.log("this.selection---->", this.selection)
 						this.product = this.selection.YounggeeProduct[0]
 						this.younggeeProductPhoto = this.selection.YounggeeProductPhoto
 						this.freeStrategy = this.selection.FreeStrategy
@@ -952,7 +977,8 @@
 						this.selection.sample_percent = (this.selection.remain_num / this.selection.sample_num) *
 							100
 						//悬赏进度
-						this.selection.reward_percent = (this.selection.remain_reward_poll / this.rewardStrategy
+						this.selection.remain_poll=this.rewardStrategy.reward-this.selection.settlement_amount
+						this.selection.reward_percent = (this.selection.remain_poll / this.rewardStrategy
 								.reward) *
 							100
 						// this.selection.task_reward=this.selection.task_reward
@@ -985,20 +1011,17 @@
 
 			},
 			//账号信息
-			// res 包含了从 /youngee/c/t/g/get-talent-account 路径获取的响应数据
 			getTalentAccountInfo() {
-				console.log("into getTalentAccountInfo")
-				return this.$https.get('/youngee/c/t/g/get-talent-account')
+				return this.$https.get('/youngee/c/t/g/get-talent-account-kuaishou')
 					.then(res => {
 						var accounts = res.data.data
 						this.account = []
 						// -3表示未绑定任何平台
 						if (res.data.code != -3) {
 							for (var i = 0; i < accounts.length; i++) {
-								console.log("account数组——————：  ", accounts[i])
+								console.log("kuaishouaccount数组——————：  ", accounts[i])
 								// 此带货商品的平台与用户绑定的三方平台一致,才会加入到this.account中
 								if (this.selection.platform === accounts[i].platform_id) {
-									accounts[i].show_fans_count = fansview(accounts[i].fans_count)
 									this.account.push(accounts[i])
 								}
 							}
@@ -1006,6 +1029,7 @@
 					})
 				// console.log("account数组——————：  ",res)
 			},
+
 			isSignUp() {
 				console.log("into isSignUp")
 				return this.$https.get('/youngee/c/t/g/is-sign-up-sec-task' +
@@ -1026,6 +1050,18 @@
 						}
 					})
 			},
+			checkToken() {
+				//进入页面就发送一个请求，看是否过期
+				return this.$https.get('/youngee/c/t/g/check-token-exp')
+					.then(res => {
+						console.log("checkToken___", res)
+						if (res.data.code == -2) {
+							this.suc_flag = 0
+						} else {
+							this.suc_flag = 1
+						}
+					})
+			},
 			onPageScroll(res) {
 				uni.$emit('onPageScroll', res.scrollTop);
 				this.scrollTop = res.scrollTop;
@@ -1092,25 +1128,133 @@
 			// 添加橱窗
 			addwindow() {
 				console.log('ino addwindow')
+				let that = this
+				//1.账号绑定情况
+				if (that.account.length === 0) {
+					uni.showModal({
+						content: '您尚未绑定快手账号，请绑定快手账号后重试',
+						confirmText: '去绑定',
+						success: function(res) {
+							if (res.confirm) {
+								//绑定快手平台
+								if (that.selection.platform == 4) {
+									uni.navigateTo({
+										url: '/page_mycenter/bindaccounts/kuaishoubind'
+									});
+								} else {
+									uni.navigateTo({
+										url: '/page_mycenter/myinformation/bindaccount?platform_id=' +
+											that.selection.platform
+									});
+								};
+							} else if (res.cancel) {
+								console.log('用户点击取消');
+							}
+						}
+					});
+				} else if (that.suc_flag == 0) {
+					//2.token无效情况
+					uni.showModal({
+						content: '您快手账号授权已过期，请刷新快手账号授权后重试',
+						confirmText: '去刷新',
+						success: function(res) {
+							if (res.confirm) {
+								//刷新快手平台
+								if (that.selection.platform == 4) {
+									uni.navigateTo({
+										url: '/page_mycenter/bindaccounts/kuaishoubind'
+									});
+								} else {
+									uni.navigateTo({
+										url: '/page_mycenter/myinformation/bindaccount?platform_id=' +
+											that.selection.platform
+									});
+								};
+							} else if (res.cancel) {
+								console.log('用户点击取消');
+							}
+						}
+					})
+					//token有效
+				} else {
+					console.log("api----", this.product.kuaishou_product_id)
+					//调用加入橱窗api
+					this.$https.get('/youngee/c/t/g/add-window' +
+						"?" +
+						"product_id" +
+						"=" +
+						this.product.kuaishou_product_id
+					).then(res => {
+						console.log("add window res****", res)
+						//未开通
+						let api_result = res.data.data.data[0]
+						if (api_result.result == 1800533) {
+							uni.showModal({
+								content: '选品不存在或已下线', // 这里设置弹窗的内容
+								showCancel: false, // 不显示取消按钮
+								confirmText: '知道了', // 设置确认按钮的文本
+								success: function(res) {
+									if (res.confirm) {
+										console.log('用户点击知道了');
+									}
+								}
+							});
+						} else if (api_result.result == 1800550) {
+							uni.showModal({
+								content: '您未开通快手橱窗，请开通后重试', // 这里设置弹窗的内容
+								showCancel: false, // 不显示取消按钮
+								confirmText: '知道了', // 设置确认按钮的文本
+								success: function(res) {
+									if (res.confirm) {
+										console.log('用户点击知道了');
+									}
+								}
+							});
+						} else {
+							uni.showModal({
+								content: '添加橱窗成功,已创建带货任务！', // 这里设置弹窗的内容
+								showCancel: false, // 不显示取消按钮
+								confirmText: '知道了', // 设置确认按钮的文本
+								success: function(res) {
+									if (res.confirm) {
+										console.log('用户点击知道了');
+									}
+								}
+							});
+							//添加到seltask带货任务中
+							console.log("提交报名")
+							// 直接报名
+							console.log("********", this.selection.product_id)
+							console.log("this.kuaishouFansNum********111", this.kuaishouFansNum)
+							console.log("this.saleNum_30********111", this.saleNum_30)
+							this.$https.post('/youngee/c/t/p/sign-up-sec-task-from-window', {
+								selection_id: this.selection.selection_id,
+								product_id: this.selection.product_id,
+								//新增
+								saleNum: this.saleNum_30,
+								fans: this.kuaishouFansNum,
+							}).then(res => {
+								console.log("addwindow succuss",res)
+							})
+						
+						}
+					})
+				}
 			},
-
 			// 免费领样
 			submit(type) {
 				// this在页面刚展示时,已经被赋值了必要的信息
-				let that = this
-				//是否绑定收获地址
+				let that = this;
+				//绑定收获地址，这样详情页就不用考虑没有地址的情况了
 				if (that.talent.is_bind_location === 0) {
-					// 前往个人信息绑定三合一界面。。
+					// 前往个人信息绑定三合一界面
 					uni.showModal({
 						content: '请先绑定个人信息',
 						success: function(res) {
 							if (res.confirm) {
 								if (that.account.length === 0) {
-
-
 									uni.navigateTo({
-										url: '/page_tasksquare/bindinfo?platform_id=' +
-											that
+										url: '/page_tasksquare/bindinfo?platform_id=' + that
 											.selection.platform
 									})
 								} else {
@@ -1128,42 +1272,113 @@
 					});
 				} else if (that.account.length === 0) {
 					uni.showModal({
-						content: '您尚未绑定抖音账号，请绑定抖音账号后重试',
-
+						content: '您尚未绑定快手账号，请绑定快手账号后重试',
 						confirmText: '去绑定',
 						success: function(res) {
 							if (res.confirm) {
-								//绑定抖音平台
-								if (that.selection.platform == 2) {
+								// 绑定快手平台
+								if (that.selection.platform == 4) {
 									uni.navigateTo({
-										url: '/page_mycenter/bindaccounts/douyinbind'
+										url: '/page_mycenter/bindaccounts/kuaishoubind'
 									});
 								} else {
 									uni.navigateTo({
 										url: '/page_mycenter/myinformation/bindaccount?platform_id=' +
 											that.selection.platform
 									});
-								};
+								}
 							} else if (res.cancel) {
 								console.log('用户点击取消');
 							}
 						}
 					});
+				} else if (this.suc_flag == 0) {
+					// token无效情况
+					uni.showModal({
+						content: '您快手账号授权已过期，请刷新快手账号授权后重试',
+						confirmText: '去刷新',
+						success: function(res) {
+							if (res.confirm) {
+								// 刷新快手平台
+								if (that.selection.platform == 4) {
+									uni.navigateTo({
+										url: '/page_mycenter/bindaccounts/kuaishoubind'
+									});
+								} else {
+									uni.navigateTo({
+										url: '/page_mycenter/myinformation/bindaccount?platform_id=' +
+											that.selection.platform
+									});
+								}
+							} else if (res.cancel) {
+								console.log('用户点击取消');
+							}
+						}
+					});
+					//token有效
+				} else if (this.condition_flag == 0) {
+					// 未到达领样条件
+					uni.showModal({
+						content: '您的账号暂未达到领样要求，若在快手平台已达标，请刷新快手账号授权后重试', // 这里设置弹窗的内容
+						showCancel: false, // 不显示取消按钮
+						confirmText: '知道了', // 设置确认按钮的文本
+						success: function(res) {
+							if (res.confirm) {
+								console.log('用户点击知道了');
+							}
+						}
+					});
 				} else {
+					// 达到领样条件 ，进入信息确认页
 					var data = {
 						selectionId: this.selectionId,
 						selection: this.selection,
 						youngTeamId: this.youngTeamId,
 						youngLeadTeamId: this.youngLeadTeamId,
-					}
-					data = JSON.stringify(data)
-					console.log("data: ", data)
+						saleNum_30: this.saleNum_30,
+						fansNum: this.kuaishouFansNum,
+					};
+					data = JSON.stringify(data);
+					// console.log("此页面传递给信息确认页的信息: ", data);
 					uni.navigateTo({
 						url: '/page_selectionsquare/selectiondetail/information?textObj=' +
-							encodeURIComponent(
-								data)
-					})
+							encodeURIComponent(data)
+					});
 				}
+
+			},
+			async checkSampleCondition() {
+				//获取粉丝数，  获取30天销量
+				await this.getFansNum()
+				await this.get30daysSaleNum()
+				console.log("get30daysSaleNum()", this.saleNum_30)
+				console.log("after this.getFansNum()", this.kuaishouFansNum)
+				// 将区间映射到最小粉丝数
+				//声明对象，声明键和值
+				const fansCountRanges = {
+					1: 0,
+					2: 0,
+					3: 10000,
+					4: 100000,
+					5: 1000000,
+					6: 5000000,
+					7: 10000000 // 对于 1000w以上, 设置一个大的默认值，比如无穷大
+				};
+
+				for (let strategy of this.freeStrategy) {
+					console.log("strategy", strategy)
+					let requiredFans = fansCountRanges[strategy.fans_num];
+					console.log("this.kuaishouFansNum", this.kuaishouFansNum)
+					console.log("requiredFans", requiredFans)
+					console.log("this.saleNum_30", this.saleNum_30)
+					console.log("strategy.sale_num", strategy.sale_num)
+					if (this.kuaishouFansNum >= requiredFans && this.saleNum_30 >= strategy.sale_num) {
+						console.log("条件满足")
+						this.condition_flag = 1;
+						return;
+					}
+				}
+				this.condition_flag = 0;
 			},
 			// 下载视频
 			downloadVideo(url) {
@@ -1250,61 +1465,6 @@
 					}
 				});
 			},
-			//进入信息确认页面
-			determine() {
-				console.log(this.strategy_id)
-				if (this.strategy_id === 0 || this.strategy === null) {
-					this.showWarning = true;
-					setTimeout(() => {
-						this.showWarning = false;
-					}, 2000)
-					return
-				}
-				let index = 0;
-				for (let i = 0; i < this.coop_choice.length; ++i) {
-					if (this.strategy_id === this.coop_choice[i].strategy_id) {
-						index = i
-					}
-				}
-				if (this.account[0].fans_count < this.strategy.followers_low) {
-					this.coop_choice[index].warningText = "粉丝量不符合报名条件"
-					this.coop_choice[index].showWarning = true;
-					this.hackReset = false;
-					this.hackReset = true;
-					setTimeout(() => {
-						this.coop_choice[index].showWarning = false;
-						this.hackReset = false;
-						this.hackReset = true;
-					}, 2000)
-				} else if (this.strategy.fee_form === 3 && (this.strategy.offer === 0 || this.strategy
-						.offer === null)) {
-					this.coop_choice[index].warningText = "请填写自报价金额"
-					this.coop_choice[index].showWarning = true;
-					this.hackReset = false;
-					this.hackReset = true;
-					setTimeout(() => {
-						this.coop_choice[index].showWarning = false;
-						this.hackReset = false;
-						this.hackReset = true;
-					}, 2000)
-				} else {
-					this.$refs.popup.close()
-					this.strategy.offer = parseInt(this.strategy.offer)
-					this.strategy.showOffer = money(this.strategy.offer)
-					var data = {
-							projectid: this.projectid,
-							information: this.information,
-							account: this.account[0].account_id,
-							strategy: this.strategy,
-						},
-						data = JSON.stringify(data)
-					console.log("data")
-					console.log(data)
-					uni.navigateTo({
-						url: '/pages/tasksquare/information?textObj=' + encodeURIComponent(data)
-					});
-				}
-			},
 			beginCanvas() {
 				this.$refs.mosoweCanvasComponents.createCanvas();
 			},

page_selectionsquare/selectiondetail/success.vue

@@ -19,7 +19,7 @@
 				<view class="" style="width: 90%;margin-top: 20rpx;margin-bottom: 20rpx;">
 
 					<p class='ipon1' style='margin-top: 5rpx;'>1.任务确认结果可随时在<span
-							style="color: deepskyblue;">种草任务</span>中查看 </p>
+							style="color: deepskyblue;">带货任务</span>中查看 </p>
 					<p class='ipon1'> 2.品牌同意合作后我们会再次与您确认合作意向和收货地址，请及时操作，否则资格可能会被取消~ </p>
 					<p class='ipon1'>3.请<span style="color: deepskyblue;">订阅</span>我们的通知消息~以防止超时操作的情况~</p>
 					<p class='ipon1'> 4.点击右上角添加小程序，能更快找到我们哦~</p>
@@ -125,7 +125,7 @@
 			// 进入任务列表页面
 			toDetail() {
 				uni.navigateTo({
-					url: '/page_workspace/selection/sectaskdetail?taskId=' + this.taskId,
+					url: '/page_workspace/selection/sectaskdetail1?taskId=' + this.taskId,
 				});
 			},
 			dingyue() {

page_workspace/selection/assignment/upload1.vue

@@ -113,7 +113,9 @@
 						link_url: this.link_url,
 						photo_url: this.imageData[0],
 					})
-					.then(res => {})
+					.then(res => {
+						console.log("截图提交成功")
+					})
 			},
 
 			ceshiChooseSuccess(tempFilePaths, e) { //选择图片返回

page_workspace/selection/sectaskdetail1.vue

@@ -44,7 +44,7 @@
 							</view>
 							<view style="margin-left: 25rpx;line-height: 40rpx">
 								<p style="color: red;font-size: 25rpx;">
-									每单赚：{{project.high_estimated_income}}￥
+									每单赚：{{product.commission_price}}￥
 									(佣金比例：{{product.exclusive_commission}}%)</p>
 							</view>
 						</view>
@@ -97,11 +97,11 @@
 			<view class="card" style="margin-top: 2%;" @click="accountdetail()">
 				<view class="Tasktext">
 					<image :src="project.PlatformInfo.platform_icon" mode=""></image>
-					<span>{{account.platform_nickname}}</span>
+					<span>{{account.nick_name}}</span>
 				</view>
 				<view class="dou">
 					<p style="padding-right: 20rpx;color:#A8A8A8;">粉丝数</p>
-					<p>{{account.fans_count}}</p>
+					<p>{{account.fan}}</p>
 				</view>
 				<view class="clickkk">
 					<image :src="togoimg" mode="" style="width: 16rpx;height: 30rpx;"></image>
@@ -125,9 +125,9 @@
 			<!-- 带货信息 -->
 			<view style="padding: 10rpx 20rpx;font-size: 25rpx;" class="saleInfo">
 				<span style="font-weight: bold; ">带货信息</span>
-				<p>全部销售额/有效销售额：todo</p>
-				<p>全部销售量/有效销售量：todo</p>
-				<p>全部佣金/有效佣金：todo</p>
+				<p>全部销售额/有效销售额：￥todo/￥{{sale_actual*product.product_price}}</p>
+				<p>全部销售量/有效销售量：todo/{{sale_actual}}单</p>
+				<p>全部佣金/有效佣金：todo/￥{{sale_actual*product.product_price}}</p>
 				<p>退款销售额/退款单数：todo</p>
 				<p>退款佣金/退款率：todo</p>
 			</view>
@@ -136,17 +136,23 @@
 			<!-- 悬赏奖金 -->
 			<view style="padding: 10rpx 20rpx;font-size: 25rpx;" class="rewardInfo">
 				<span style="font-weight: bold; ">悬赏奖金</span>
-				<p>悬赏奖金池总额/悬赏奖金池余额:todo</p>
-				<p>悬赏销售量/有效销售量：todo</p>
+				<view style="display: flex;">
+					<p>悬赏奖金池总额/悬赏奖金池余额: {{all_poll}}/{{remain_poll}}</p>
+					<image :src="remain_poll_flag===0 ? commission_fail : commission_suc" mode=""
+						style="height: 45rpx; width: 45rpx;padding-left: 20rpx;"></image>
+				</view>
+				<view style="display: flex;">
+					<p>悬赏销售量/有效销售量：{{project.RewardStrategy[0].sale_actual}}单/{{sale_actual}}单</p>
+					<image :src="sale_actual_flag===0 ? commission_fail : commission_suc" mode=""
+						style="height: 45rpx; width: 45rpx;padding-left: 20rpx;"></image>
+				</view>	
 			</view>
 
 			<!-- 上传截图 -->
-			<view style="height: 150rpx;">
+			<view style="height: 150rpx;" v-if="conditionFit == 1 ">
 				<button class="btn1" :disabled="uploaded"   @click="toUpload()">
 					{{ uploaded ? '销量截图已上传' : '上传销量截图领悬赏' }}</button>
 			</view>
-
-
 		</view>
 	</view>
 </template>
@@ -235,6 +241,15 @@
 				taskLogs: [],
 				infoTables: [],
 				withdrawStatus: 1,
+				all_poll: 0, //总金额
+				remain_poll: 0, //悬赏池剩余金额
+				sale_actual: 0, //达人的有效销量
+				conditionFit: 0, //条件满足（1）则展示按钮
+				sale_actual_flag: 0, //实际销量是否达成
+				remain_poll_flag: 0, //奖金池是否足够
+				commission_suc: "https://horastar.obs.cn-east-3.myhuaweicloud.com/talent/commission_suc.png",
+				commission_fail: "https://horastar.obs.cn-east-3.myhuaweicloud.com/talent/commission_fail.png",
+
 			}
 		},
 		async onShow() {
@@ -243,15 +258,17 @@
 				title: '加载中'
 			});
 			await this.getTaskInfo();
-			await this.getTaskLogs();
+			// await this.getTaskLogs();
 			await this.getInfoTables();
-			await this.getAccountList();
+			await this.getTalentAccountInfo();
+			await this.checkConditionFit();
 			this.loading = false;
 			uni.hideLoading();
 		},
 		onLoad(options) {
+			console.log("options上一页传来", options)
 			this.taskId = options.taskId
-			this.isuploaded=options
+			// this.isuploaded = options
 		},
 		methods: {
 			handleCopy(text) {
@@ -262,6 +279,21 @@
 					}
 				});
 			},
+			
+			checkConditionFit() {
+				if(this.remain_poll > this.project.RewardStrategy[0].per_reward){
+					this.remain_poll_flag=1
+				}
+				if(this.sale_actual >= this.project.RewardStrategy[0].sale_actual){
+					this.sale_actual_flag=1
+				}
+				if (this.remain_poll > this.project.RewardStrategy[0].per_reward && this.sale_actual >= this.project
+					.RewardStrategy[0].sale_actual) {
+					this.conditionFit = 1
+				} else {
+					this.conditionFit = 0
+				}
+			},
 
 			// 默认信息表
 			getInfoTables() {
@@ -272,39 +304,21 @@
 					})
 			},
 
-			// 绑定账号信息表
-			getAccountList() {
-				return this.$https.get('/youngee/c/t/g/get-talent-account')
+			//账号信息
+			getTalentAccountInfo() {
+				return this.$https.get('/youngee/c/t/g/get-talent-account-kuaishou')
 					.then(res => {
-						console.log("get accountlist（get-talent-account）----", res)
-						//-3表示没有绑定任何平台
-						if (res.data.code !== -3) {
-							//可能绑定了多个账号,让res中包含平台icon
-							this.accountlist = res.data.data
-							for (var i = 0; i < this.accountlist.length; i++) {
-								//仅考虑抖音账号
-								if (this.accountlist[i].platform_id == 2) {
-									this.account = this.accountlist[i]
-									for (var j = 0; j < this.infoTables.length; j++) {
-										if (this.infoTables[j].id == this.account.platform_id) {
-											this.account.platform_icon = this.infoTables[j].platform_icon
-										}
-									}
-								}
-
-							}
-
-							console.log("this.account", this.account)
-						}
+						console.log("sssss", res)
+						this.account = res.data.data[0]
+						console.log("sssss", this.account)
 					})
+				// console.log("account数组——————：  ",res)
 			},
 
 			// 前往账号详情
 			accountdetail() {
 				uni.navigateTo({
-					url: '/page_mycenter/myinformation/bindaccount?platform_id=' + this.account.platform_id +
-						'&account_id=' + this.account
-						.account_id
+					url: '/page_mycenter/bindaccounts/kuaishoubind'
 				});
 			},
 			getTaskInfo() {
@@ -321,37 +335,51 @@
 					const data = res.data.data
 					this.task = data.sec_task_info
 					this.withdrawStatus = data.withdraw_status
+					// 选品项目信息
+					this.project = data.selection_detail
+					//悬赏数据
+					if (this.project.task_mode == 1) {
+						//总额
+						this.all_poll = this.project.RewardStrategy[0].reward
+						//已经结算
+						this.settlement_poll = this.project.settlement_amount
+						//悬赏余额
+						this.remain_poll = this.all_poll - this.settlement_poll
+						//实际销量
+						this.sale_actual = data.sec_task_info.sale_actual
 
-					// 地址解析
-					this.address = JSON.parse(this.task.talent_post_addr_snap);
-					let a = this.address.region_code.toString().slice(0, 2)
-					let b = this.address.region_code.toString().slice(0, 4)
-					let c = 0
-					for (var i = 0; i < region.length; i++) {
-						if (region[i].code == a) {
-							a = region[i].name
-							for (var j = 0; j < region[i].children.length; j++) {
-								if (region[i].children[j].code == b) {
-									b = region[i].children[j].name
-									for (var o = 0; o < region[i].children[j].children.length; o++) {
-										if (region[i].children[j].children[o].code == this.address
-											.region_code) {
-											c = region[i].children[j].children[o].name
-										}
-									}
-								}
-
-							}
-						}
 					}
-					this.address.full_detail_addr = a + b + c + this.address.detail_addr
+
+					// 地址解析
+					// this.address = JSON.parse(this.task.talent_post_addr_snap);
+					// let a = this.address.region_code.toString().slice(0, 2)
+					// let b = this.address.region_code.toString().slice(0, 4)
+					// let c = 0
+					// for (var i = 0; i < region.length; i++) {
+					// 	if (region[i].code == a) {
+					// 		a = region[i].name
+					// 		for (var j = 0; j < region[i].children.length; j++) {
+					// 			if (region[i].children[j].code == b) {
+					// 				b = region[i].children[j].name
+					// 				for (var o = 0; o < region[i].children[j].children.length; o++) {
+					// 					if (region[i].children[j].children[o].code == this.address
+					// 						.region_code) {
+					// 						c = region[i].children[j].children[o].name
+					// 					}
+					// 				}
+					// 			}
+
+					// 		}
+					// 	}
+					// }
+					// this.address.full_detail_addr = a + b + c + this.address.detail_addr
 
 					// 账号信息
 					this.account = JSON.parse(this.task.talent_platform_info_snap);
 					this.account.show_fans_count = fansview(this.account.fans_count)
 
-					// 选品项目信息
-					this.project = data.selection_detail
+
+
 					console.log("icon_url", this.project.PlatformInfo.platform_icon)
 					this.project.ProductPhoto = this.project.YounggeeProductPhoto
 					this.product = this.project.YounggeeProduct[0]
@@ -395,34 +423,41 @@
 					} else {
 						this.isShowUpload = false
 					}
+					//判断提交截图按钮是否可用
+					if(this.task.assignment_status==2){
+						this.uploaded=true //截图已上传
+					}else{
+						this.uploaded=false  //截图未上传
+					}
 
 					// 不同任务阶段提示消息
 					this.msg1 = this.infoMsg1[this.task.task_stage - 1]
 					this.msg2 = this.isSpecial ? this.infoMsg3[this.task.task_stage - 1] : this.infoMsg2[this.task
 						.task_stage - 1]
+						
 				})
 			},
-			getTaskLogs() {
-				return this.$https.get('/youngee/c/t/g/get-task-log' +
-					"?" +
-					"task_id" +
-					"=" +
-					this.taskId
-				).then(res => {
-					this.taskLogs = res.data.data
-					console.log("task-log--》",this.taskLogs)
-					if(this.taskLogs==null){
-						console.log("这个task无历史数据")
-					}else if(this.taskLogs.length!==0){
-						this.uploaded=true
-					}
-					
-				})
-			},
+			// getTaskLogs() {
+			// 	return this.$https.get('/youngee/c/t/g/get-task-log' +
+			// 		"?" +
+			// 		"task_id" +
+			// 		"=" +
+			// 		this.taskId
+			// 	).then(res => {
+			// 		this.taskLogs = res.data.data
+			// 		console.log("task-log--》",this.taskLogs)
+			// 		if(this.taskLogs==null){
+			// 			console.log("这个task无历史数据")
+			// 		}else if(this.taskLogs.length!==0){
+			// 			this.uploaded=true
+			// 		}
+
+			// 	})
+			// },
 			toUpload() {
 				var data = {
 					taskId: this.taskId,
-					assignmentStatus: this.task.assignment_status
+					assignmentStatus: this.task.assignment_status  //作业上传状态
 				};
 				data = JSON.stringify(data)
 				uni.navigateTo({

pages.json

@@ -185,6 +185,14 @@
 						"navigationStyle": "custom",
 						"navigationBarTextStyle": "black"
 					}
+				},
+				{
+					"path": "bindaccounts/kuaishoubind",
+					"style": {
+						"navigationBarTitleText": "YoungGee",
+						"navigationStyle": "custom",
+						"navigationBarTextStyle": "black"
+					}
 				}
 			]
 		},

pages/selectionsquare/selectionsquare.vue

@@ -661,7 +661,6 @@
 			getInfoListApi() {
 				return this.$http.get('/youngee/c/g/get-info-tables')
 					.then(res => {
-						console.log("llllllool", res); // 这行会输出响应对象到控制台
 						this.hobby = []
 						this.platformList = res.data.data.ThirdPlatform
 						let l = this.platformList != null ? this.platformList.length : 0;
@@ -697,6 +696,7 @@
 							return
 						}
 						for (var i = 0; i < selectionList.length; i++) {
+							console.log("**** selectionList[i]****", selectionList[i])
 							this.product = selectionList[i].YounggeeProduct[0]
 							this.younggeeProductPhoto = selectionList[i].YounggeeProductPhoto
 
@@ -721,8 +721,7 @@
 							//高佣
 							selectionList[i].exclusive_commission = this.product.exclusive_commission
 							//预估赚
-							selectionList[i].show_earn = selectionList[i].price * selectionList[i]
-								.exclusive_commission * 0.01
+							selectionList[i].show_earn = this.product.commission_price
 							//额外悬赏
 							if (selectionList[i].task_mode == 1) {
 								selectionList[i].show_task_reward = selectionList[i].RewardStrategy[0].per_reward

pages/workspace/workspace.vue

@@ -18,7 +18,7 @@
 					<!-- <span class="point" v-if="showPoint1" key="0"></span> -->
 				</view>
 			</view>
-
+			<!-- 种草子选项 -->
 			<view class="menu" v-if="showTask">
 
 				<view class="menu-item" @click="toShow(index)" v-for="(item,index) in taskTabList">
@@ -28,27 +28,17 @@
 					<span class="point" v-if="showPoint[index]" :key="index"></span>
 				</view>
 			</view>
-
+			<!-- 带货子选项 -->
 			<view class="menu" v-if="showSec">
 				<view class="menu-item" @click="toShow(4)">
 					<view class="menu-item-p">
-						<p v-bind:class="showList[4]?'lor':'unlor'">待交作业</p>
+						<p v-bind:class="showList[4]?'lor':'unlor'">已报名</p>
 					</view>
 					<span class="point" v-if="showPoint[4]" key="0"></span>
 				</view>
-				<view class="menu-item">
-					<view class="menu-item-p">
-						<p style="color: #fff;">待传初稿</p>
-					</view>
-				</view>
-				<view class="menu-item">
+				<view class="menu-item" @click="toShow(5)">
 					<view class="menu-item-p">
-						<p style="color: #fff;">待传链接</p>
-					</view>
-				</view>
-				<view class="menu-item">
-					<view class="menu-item-p">
-						<p style="color: #fff;">待传数据</p>
+						<p v-bind:class="showList[5]?'lor':'unlor'">待领悬赏</p>
 					</view>
 				</view>
 			</view>
@@ -193,9 +183,46 @@
 				</view>
 			</view>
 		</view>
-
+		<!-- 已报名 -->
 		<view class="home" v-if="showList[4] && !loading">
 			<view class="task" v-for="item in taskLists[4]">
+				<view class="task-card">
+					<view class="task-info">
+						<!-- 左侧图片和文字 -->
+						<view class="task-info-left">
+							<!-- 图片 -->
+							<image class="project-img" :src="item.product_img_url"></image>
+							<!-- 描述 -->
+							<view class="task-info-txt">
+								<view class="" style="display: flex;">
+									<image class="platform-img" :src="item.platform_icon_url"></image>
+									<p style="font-size: 28rpx; line-height: 28rpx;color: black;">
+										{{item.selection_name}}
+									</p>
+								</view>
+								<p style="color: #ffcb41 ;">任务截至时间:{{item.ddl}}</p>
+								<p>售价：{{item.price}} 佣金率：{{item.exclusive_commission}}</p>
+								<p>全部销售量/有效销售量：</p>
+								<p>悬赏金额/悬赏有效销售量：</p>
+								<p>免费领样状态：</p>
+							</view>
+						</view>
+						<!-- 右侧图标 -->
+						<view class="task-info-right">
+							<image
+								src="https://horastar.obs.cn-east-3.myhuaweicloud.com/talent_upload/icon-arrow-right.png"
+								style="height: 30rpx;width: 30rpx;"></image>
+						</view>
+					</view>
+					<view style="text-align: right;" v-if="item.task_stage > 5">
+						<p style="font-size: 25rpx;">实际收益：￥{{item.show_real_reward}}</p>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 待领悬赏 -->
+		<view class="home" v-if="showList[5] && !loading">
+			<view class="task" v-for="item in taskLists[5]">
 				<view class="task-card">
 					<view class="task-head" @click="toSecTaskDetail(item)">
 						<view class="task-head-account">
@@ -220,8 +247,9 @@
 							<p style="font-size: 32rpx;color: #ffcb41;font-weight: 600">改</p>
 						</view>
 					</view>
-					<view style="display: flex;justify-content: flex-end;margin-right: 10rpx;" >
-						<button type="default" class="but2" @click="toLogisticDetail(item.task_id)" v-if="item.task_stage > 7">
+					<view style="display: flex;justify-content: flex-end;margin-right: 10rpx;">
+						<button type="default" class="but2" @click="toLogisticDetail(item.task_id)"
+							v-if="item.task_stage > 7">
 							查看物流
 						</button>
 						<button type="default" class="but2" @click="handleCopy(item.product_url)">
@@ -251,11 +279,11 @@
 			return {
 				navH: getApp().globalData.navHeight,
 				loading: true,
-				showPoint: [false, false, false, false, false],
+				showPoint: [false, false, false, false, false, false],
 				showTask: false,
 				showSec: true,
 				showList: [
-					false, false, false, false, true
+					false, false, false, false, true, false
 				],
 				taskLists: [
 					[],
@@ -273,6 +301,11 @@
 				secTaskTabList: [
 					"待传作业"
 				],
+				secTaskTabList1: [
+					"已报名",
+					"待领悬赏"
+				],
+				lastCallTime: null,
 				taskStageList: [],
 				secTaskStageList: [],
 				mysNavConfig: {
@@ -374,18 +407,22 @@
 						}
 					})
 			},
+			// 默认选择0
 			toShowTask() {
 				this.showTask = true;
 				this.showSec = false;
 				this.toShow(0)
 			},
+			// 默认选择4
 			toShowSec() {
 				this.showTask = false;
 				this.showSec = true;
 				this.toShow(4)
 			},
 			toShow(value) {
+				console.log("toshow的参数-->", value)
 				let that = this
+				// item表示当前遍历到的元素，index表示该元素在列表中的索引位置
 				this.showList.forEach(function(item, index) {
 					if (index == value) {
 						that.showList[index] = true
@@ -393,11 +430,13 @@
 						that.showList[index] = false
 					}
 				})
+
 				if (value < 4) {
 					this.getTaskList(value);
 				} else {
 					this.getSecTaskList(value);
 				}
+				console.log("showList--->", that.showList)
 			},
 			toTaskDetail(item) {
 				uni.navigateTo({
@@ -408,7 +447,7 @@
 			},
 			toSecTaskDetail(item) {
 				uni.navigateTo({
-					url: '/page_workspace/selection/sectaskdetail?taskId=' + item.task_id,
+					url: '/page_workspace/selection/sectaskdetail1?taskId=' + item.task_id,
 					success(res) {},
 					fail(err) {}
 				});
@@ -459,7 +498,7 @@
 									taskList[i].product_img_url = productPhoto[j].PhotoUrl
 								}
 							}
-							
+
 							// 带货链接
 							taskList[i].product_url = product.product_url
 
@@ -501,6 +540,20 @@
 				this.loading = false
 			},
 
+			getProductInfoApi(item) {
+				console.log("into product")
+				return this.$https.get('/youngee/c/t/g/get-product-detail' +
+						"?productid=" +
+						item
+					)
+					.then(res => {
+						console.log("getproductsuccess---", res)
+						this.productInfo = res.data.data
+						this.lastCallTime = Date.now();
+
+					})
+			},
+
 			async getSecTaskList(value) {
 				this.loading = true
 				uni.showLoading({
@@ -597,7 +650,6 @@
 		justify-content: space-around;
 		height: 60rpx;
 		width: 100%;
-		padding-bottom: 40rpx;
 		display: flex;
 		z-index: 10;
 	}
@@ -623,13 +675,21 @@
 	}
 
 	.home {
-		margin-top: 180rpx;
+		margin-top: 150rpx;
 	}
 
 
 	.task-card {
 		margin: 10rpx 0;
 		// border-bottom: 1rpx #d7d7d7 solid;
+		height: 240rpx;
+		background-color: #f2f2f2;
+
+		.platform-img {
+			width: 30rpx;
+			height: 30rpx;
+			margin-right: 10rpx;
+		}
 
 		.task-head {
 			display: flex;
@@ -645,7 +705,6 @@
 				width: 40rpx;
 				height: 40rpx;
 				margin-right: 10rpx;
-				background-color: #F0D232;
 			}
 
 			.task-head-status p {
@@ -663,8 +722,8 @@
 				// align-items: center;
 
 				.project-img {
-					height: 120rpx;
-					width: 120rpx;
+					height: 180rpx;
+					width: 180rpx;
 					// background-color: #b3c96b;
 				}
 
@@ -675,15 +734,15 @@
 				.task-info-txt p {
 					font-size: 24rpx;
 					color: #85859d;
-					margin-bottom: 10rpx;
+					letter-spacing: 2rpx;
 				}
 			}
 
 			.task-info-right {
-				width: 100rpx;
-				height: 100rpx;
+				// width: 100rpx;
+				// height: 100rpx;
 				border-radius: 50%;
-				border: #ffcb41 2rpx solid;
+				// border: #ffcb41 2rpx solid;
 				display: flex;
 				align-items: center;
 				justify-content: center;
@@ -753,7 +812,7 @@
 		background: red;
 		border-radius: 50%;
 	}
-	
+
 	.but2 {
 		background-color: #FFFFFF;
 		border: 1rpx solid #f2d22d;