0308

App.vue

@@ -32,7 +32,7 @@
 		font-family: uniicons;
 		src: url("/static/uni.ttf");
 	}
-
+	
 	/* #endif */
 	.home {
 		width: 97%;
@@ -40,6 +40,23 @@
 		/* padding-top: 23%; */
 	}
 
+	/deep/ textarea{
+		width: auto;
+	}
+	
+	/deep/ .uni-forms-item__content {
+		display: flex !important;
+		align-items: center !important;
+		/* justify-content: space-between; */
+	}
+	p {
+		word-break: break-all;
+	}
+
+	text {
+		word-break: break-all;
+	}
+
 	/deep/.uni-forms-item__inner {
 		padding-bottom: 0rpx !important;
 		margin-bottom: 30rpx !important;

ceshi.txt

@@ -1 +0,0 @@
-1231231212

components/htz-image-upload/htz-image-upload.vue

@@ -179,6 +179,7 @@
 							// this.$emit("imgDelete", this.uploadLists);
 							let delUrl = this.uploadLists[index]
 							this.uploadLists.splice(index, 1)
+							console.log("删除后：",this.uploadLists)
 							this.$emit("input", this.uploadLists);
 							this.$emit("imgDelete", {
 								del: delUrl,
@@ -218,7 +219,7 @@
 								}
 							},
 							fail: (res) => {
-								console.log(res.errMsg);
+								console.log("err: ", res.errMsg);
 							}
 						});
 						break;
@@ -277,7 +278,7 @@
 							}
 						},
 						fail: (res) => {
-							console.log(res.errMsg);
+							console.log("err: ", res.errMsg);
 						}
 					});
 				}
@@ -452,7 +453,8 @@
 							}
 						});
 					}))
-				})
+				})				
+				console.log("上传后：",this.uploadLists)
 				Promise.all(uploadImgs) //执行所有需请求的接口
 					.then((results) => {
 						uni.hideLoading();
@@ -573,8 +575,10 @@
 	}
 
 	.htz-image-upload-Item {
-		width: 160rpx;
-		height: 160rpx;
+		/* width: 160rpx;
+		height: 160rpx; */
+		width: 205rpx;
+		height: 205rpx;
 		margin: 13rpx;
 		border-radius: 10rpx;
 		position: relative;

components/mosowe-canvas-image/mosowe-canvas-image.vue

@@ -334,7 +334,10 @@
 			// 文本绘制
 			drawText(item) {
 				this.canvas.setFillStyle(item.hasOwnProperty('color') ? item.color : '#000000');
-				this.canvas.setFontSize(item.hasOwnProperty('size') ? item.size : 20);
+				// this.canvas.setFontSize(item.hasOwnProperty('size') ? item.size : 20);
+				this.canvas.setFontSize(10);
+				let font = (item.hasOwnProperty('weight') ? item.weight : 'normal') + (item.hasOwnProperty('style') ? ' ' + item.style : ' normal') + (item.hasOwnProperty('size') ? ' ' + item.size : ' 10px') + (item.hasOwnProperty('family') ? ' ' + item.family : ' sans-serif')
+				this.canvas.font = font
 				this.canvas.setTextAlign(item.hasOwnProperty('align') ? item.align : 'left');
 				this.canvas.globalAlpha = item.hasOwnProperty('globalAlpha') ? item.globalAlpha : 1;
 
@@ -366,9 +369,11 @@
 
 			// 二维码绘制
 			async drawQR(item) {
-				console.log("content:", item.content)
 				await this.removeSave();
-				item.content = await this.base64ToSave(item.content);
+				console.log("content:", item.content)
+				let projectid = item.hasOwnProperty('projectid') ? item.projectid : "tmp_base64src";
+				item.content = await this.base64ToSave(item.content, projectid);
+				// item.content = "wxfile://usr/tmp_base64src.png"
 				console.log("content:", item.content)
 				if (item.content) {
 					this.canvas.globalAlpha = item.hasOwnProperty('globalAlpha') ? item.globalAlpha : 1;
@@ -450,7 +455,7 @@
 					// 把文件删除后再写进，防止超过最大范围而无法写入
 					const fsm = uni.getFileSystemManager(); //文件管理器
 					const FILE_BASE_NAME = 'tmp_base64src';
-					const format = 'gif';
+					const format = 'png';
 					const filePath = `${wx.env.USER_DATA_PATH}/${FILE_BASE_NAME}.${format}`;
 					fsm.unlink({
 						filePath: filePath,
@@ -481,9 +486,11 @@
 						//data: base64data.split(";base64,")[1],
 						encoding: 'base64',
 						success() {
+							console.log("保存成功")
 							resolve(filePath);
 						},
 						fail() {
+							console.log("保存失败")
 							reject(new Error('ERROR_BASE64SRC_WRITE'));
 						},
 					});

components/mys_navBar/mysNavBar.vue

@@ -356,7 +356,7 @@
 		position: absolute;
 		width: 750upx;
 		height: 88upx;
-		z-index: 10;
+		z-index: 1010;
 		top: 0;
 		background-color: transparent;
 		/* #ifdef MP */
@@ -381,7 +381,7 @@
 		flex-direction: row;
 		background-color: transparent;
 		position: absolute;
-		z-index: 10;
+		z-index: 1010;
 		top: 0;
 	}
 

components/request.js

@@ -2,9 +2,9 @@
 
 export default {
 	config: {
-		// baseUrl: "http://localhost:8200",	//本地开发
+		baseUrl: "http://localhost:8200",	//本地开发
 		// baseUrl: "http://172.27.185.236:8200",	//本地开发	
-		baseUrl: "https://talent.younggee.com:8201",  //默认的公共域名
+		// baseUrl: "https://talent.younggee.com:8201",  //默认的公共域名
 		},
 	// 获取用户 token
 	// let userToken = uni.getStorageSync('userInfo')
@@ -21,8 +21,7 @@ export default {
 	// 			 console.log(options.header)
 	// };
 		
-	request(options){	
-		
+	request(options){			
 		return new Promise((resolve,reject)=>{//把调取的的接口给了一个Promise实例
 			uni.request({//uni-app调接口
 			...options,//所有的数据通过options传过来

components/requesttoken111.js

@@ -2,9 +2,9 @@
 //通用uni-app网络请求
 export default {
 	config: {
-		// baseUrl: "http://localhost:8200", //本地开发
+		baseUrl: "http://localhost:8200", //本地开发
 		// baseUrl: "http://172.27.185.236:8200",	//本地开发		
-		baseUrl: "https://talent.younggee.com:8201",  //默认的公共域名
+		// baseUrl: "https://talent.younggee.com:8201",  //默认的公共域名
 
 		header: {
 			'Content-Type': 'application/json;charset=UTF-8', //默认get方式

components/utils.js

@@ -36,9 +36,10 @@ function money(value) {
 		value = String(value)
 	}
 	if (!value) return '0.0'
-	const intPart = Number(value).toFixed(0) // 获取整数部分
+	// const intPart = Number(value).toFixed(0) // 获取整数部分
+	const intPart = value.split('.')[0]
 	const intPartFormat = intPart
-		.toString()
+		// .toString()
 		.replace(/(\d)(?=(?:\d{3})+$)/g, '$1,') // 将整数部分逢三一断
 	let floatPart = '.0' // 预定义小数部分
 	const value2Array = value.split('.')

pages.json

@@ -290,6 +290,15 @@
 				"navigationBarTextStyle": "black"
 			}            
         }
+        ,{
+            "path" : "pages/tasksquare/guanwang",
+			"style": {
+				"navigationBarTitleText": "YoungGee",
+				"navigationStyle": "custom",
+				"navigationBarTextStyle": "black"
+			}            
+            
+        }
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",

pages/login/login.vue

@@ -529,6 +529,7 @@
 	export default {
 		data() {
 			return {
+				token: "",
 				licenseStatus: 0,
 				value: 0,
 				range: [{
@@ -550,8 +551,27 @@
 				gender: '0',
 			};
 		},
-		onLoad() {},
+		async onLoad() {
+			await this.isLogin()
+			if (this.token !== '') {
+				uni.navigateTo({
+					url: '/pages/tasksquare/tasksquare'
+				});
+			}
+		},
 		methods: {
+			// 判断登陆是否过期
+			isLogin() {
+				return this.$https.get('/youngee/c/t/g/is-login')
+					.then(res => {
+						if (res.data.code === 403) {
+							// 登陆已失效
+							this.token = ""
+						} else {
+							this.token = uni.getStorageSync('token')
+						}
+					})
+			},
 			showXieyi() {
 				this.$refs.popup3.open()
 			},
@@ -707,7 +727,7 @@
 															.onLoad(); // 执行上一页的onLoad方法
 													}
 												})
-												uni.navigateBack()
+												// uni.navigateBack()
 											})
 										}
 									}

pages/mycenter/mycenter.vue

@@ -197,7 +197,6 @@
 		<!-- <view class="" style="text-align: center;margin: 5% 0;">
 			<button size="mini" @tap="toSpecialTask()">专项测试</button>
 		</view> -->
-		<!-- </view> -->
 	</view>
 </template>
 
@@ -313,7 +312,7 @@
 		methods: {
 			toSpecialTask() {
 				uni.navigateTo({
-					url: '/pages/tasksquare/specialTask/specialTaskDetail?id=' + "2302662349"
+					url: '/pages/tasksquare/specialTask/specialTaskDetail?id=' + "2302497478"
 				});
 			},
 			init() {
@@ -845,8 +844,8 @@
 		position: absolute;
 		// top: 0;
 		right: 5px;
-		width: 6px;
-		height: 6px;
+		width: 20rpx;
+		height: 20rpx;
 		background: red;
 		border-radius: 50%;
 	}

pages/mycenter/myincome.vue

@@ -32,11 +32,10 @@
 							<view>
 								<p>任务ID：{{item.task_id}}</p>
 								<p>{{item.project_name}}</p>
-								<p>商品价值：{{item.product_price}}元</p>
+								<p>商品价值：{{item.show_product_price}}元</p>
 								<p>粉丝量：{{item.RecruitStrategy.show_followers_low}}-{{item.RecruitStrategy.show_followers_up}}
 								</p>
 								<p>稿费：{{item.RecruitStrategy.show_fee_form}} {{item.show_task_reward}}</p>
-								<p>提交时间：{{item.complete_date}}</p>
 							</view>
 						</view>
 
@@ -48,16 +47,15 @@
 			</view>
 
 			<view class="income-list" v-if="showList2">
-				<view class="income-list-cell" style="margin-left: 70rpx;" v-for="item in list2" :key="item.value">
+				<view class="income-list-cell" style="margin-left: 50rpx;" v-for="item in list2" :key="item.value">
 					<view class="income-list-cell-left">
 						<view>
 							<p>任务ID：{{item.task_id}}</p>
 							<p>{{item.project_name}}</p>
-							<p>商品价值：{{item.product_price}}元</p>
+							<p>商品价值：{{item.show_product_price}}元</p>
 							<p>粉丝量：{{item.RecruitStrategy.show_followers_low}}-{{item.RecruitStrategy.show_followers_up}}
 							</p>
 							<p>稿费：{{item.RecruitStrategy.show_fee_form}} {{item.show_task_reward}}</p>
-							<p>提交时间：{{item.withdraw_date}}</p>
 						</view>
 					</view>
 
@@ -68,16 +66,15 @@
 			</view>
 
 			<view class="income-list" v-if="showList3">
-				<view class="income-list-cell" style="margin-left: 70rpx;" v-for="item in list3" :key="item.value">
+				<view class="income-list-cell" style="margin-left: 50rpx;" v-for="item in list3" :key="item.value">
 					<view class="income-list-cell-left">
 						<view>
 							<p>任务ID：{{item.task_id}}</p>
 							<p>{{item.project_name}}</p>
-							<p>商品价值：{{item.product_price}}元</p>
+							<p>商品价值：{{item.show_product_price}}元</p>
 							<p>粉丝量：{{item.RecruitStrategy.show_followers_low}}-{{item.RecruitStrategy.show_followers_up}}
 							</p>
-							<p>稿费：{{item.RecruitStrategy.show_fee_form}} {{item.show_task_reward}}</p>
-							<p>提交时间：{{item.withdraw_date}}</p>
+							<p>稿费：{{item.RecruitStrategy.show_fee_form}} {{item.show_task_reward}}元</p>
 						</view>
 					</view>
 
@@ -114,7 +111,6 @@
 <script>
 	import mvBar from "@/components/mys_navBar/mysNavBar";
 	import {
-		getRouter,
 		money,
 		fansview
 	} from '@/components/utils.js';
@@ -262,7 +258,6 @@
 			}
 		},
 		onLoad(options) {
-			getRouter();
 			console.log(options)
 			this.showTab = options.showTab
 			// 传过来的id
@@ -327,6 +322,7 @@
 						if (res.data.data.can_withdraw_task_info_list != null) {
 							this.list1 = res.data.data.can_withdraw_task_info_list
 							for (let i = 0; i < this.list1.length; i++) {
+								this.list1[i].show_product_price = money(this.list1[i].product_price)
 								this.list1[i].show_task_reward = money(this.list1[i].task_reward)
 								this.list1[i].show_settle_amount = money(this.list1[i].settle_amount)
 								this.list1[i].RecruitStrategy.show_followers_low = fansview(this.list1[i]
@@ -349,6 +345,7 @@
 						if (res.data.data.withdrawed_task_info_list != null) {
 							this.list2 = res.data.data.withdrawed_task_info_list
 							for (let i = 0; i < this.list2.length; i++) {
+								this.list2[i].show_product_price = money(this.list2[i].product_price)
 								this.list2[i].show_task_reward = money(this.list2[i].task_reward)
 								this.list2[i].show_settle_amount = money(this.list2[i].settle_amount)
 								this.list2[i].RecruitStrategy.show_followers_low = fansview(this.list2[i]
@@ -371,6 +368,7 @@
 						if (res.data.data.withdrawing_task_info_list != null) {
 							this.list3 = res.data.data.withdrawing_task_info_list
 							for (let i = 0; i < this.list3.length; i++) {
+								this.list3[i].show_product_price = money(this.list3[i].product_price)
 								this.list3[i].show_task_reward = money(this.list3[i].task_reward)
 								this.list3[i].show_settle_amount = money(this.list3[i].settle_amount)
 								this.list3[i].RecruitStrategy.show_followers_low = fansview(this.list3[i]
@@ -392,10 +390,6 @@
 						}
 					})
 			},
-			// 进入收益页面
-			toincome(tab) {
-				console.log(tab)
-			},
 			toShow1() {
 				this.showList2 = false;
 				this.showList3 = false;
@@ -412,12 +406,6 @@
 				this.showList3 = true;
 			},
 			withdraw() {
-				if (this.list1.length == 0) {
-					uni.showModal({
-						content: '请先选择提现任务',
-					});
-					return
-				}
 				let taskIdList = []
 				let totalAmount = 0
 				for (let i = 0; i < this.list1.length; ++i) {
@@ -426,6 +414,13 @@
 						totalAmount += this.list1[i].settle_amount
 					}
 				}
+				if (taskIdList.length == 0) {
+					uni.showToast({
+						content: '请先选择提现任务',
+						icon: 'none'
+					});
+					return
+				}
 				var data = {
 					taskIdList: taskIdList,
 					totalAmount: totalAmount
@@ -452,7 +447,7 @@
 	.menu {
 		display: flex;
 		align-items: center;
-		justify-content: space-around;
+		justify-content: space-between;
 	}
 
 	.menu-item p {
@@ -513,12 +508,11 @@
 	}
 
 	.show-income3 {
-		margin: 0 3%;
+		margin: 0 50rpx;
 	}
 
 	.show-income3 p {
 		margin-top: 50rpx;
-		margin-left: 20rpx;
 	}
 
 	.income-list {
@@ -529,8 +523,6 @@
 		display: flex;
 		align-items: center;
 		justify-content: space-between;
-
-		margin-right: 20rpx;
 	}
 
 	.income-list-cell-left {
@@ -542,6 +534,7 @@
 	.income-list-cell-right p {
 		color: #F0D232;
 		font-size: 35rpx;
+		margin-right: 50rpx;
 	}
 
 	// .income-list-cell2 {
@@ -549,12 +542,13 @@
 	// }
 
 	.income-list-checkbox {
+		width: 50rpx;
 		transform: scale(0.7)
 	}
 
 	.interval2 {
 		width: 100%;
-		height: 100rpx;
+		height: 120rpx;
 		margin-top: 5%;
 	}
 
@@ -563,10 +557,10 @@
 		justify-content: space-between;
 		align-items: center;
 
-		padding: 2% 5%;
+		padding: 2% 50rpx;
 		position: fixed;
 		width: 90%;
-		bottom: 0rpx;
+		bottom: 20rpx;
 		height: 90rpx;
 		// padding-top: 2%;
 		background-color: #FFFFFF;
@@ -575,15 +569,16 @@
 
 	.all-check-box {
 		display: flex;
+		margin-left: -20rpx;
 	}
 
 	.right-btn {
-		width: 200rpx;
+		width: 150rpx;
 		text-align: center;
 		color: #000;
 		background-color: #F0D232;
 		border-radius: 15rpx;
 		font-size: 32rpx;
-		line-height: 200%;
+		line-height: 180%;
 	}
 </style>

pages/mycenter/myincome/applywithdraw.vue

@@ -13,7 +13,8 @@
 						<p>{{formData.bank_card_number}}</p>
 					</view>
 					<view style="display: flex;align-items: center;justify-content: center;" @click="toModifyBank()">
-						<p>前往修改/绑定</p>
+						<p v-if="!binded">前往绑定</p>
+						<p v-else>前往修改</p>
 						<image class="show-body1-icon" :src="picture.icon_right"></image>
 					</view>
 				</view>
@@ -63,6 +64,7 @@
 		},
 		data() {
 			return {
+				binded: false,
 				navH: getApp().globalData.navHeight,
 				picture: {
 					icon_person: 'https://horastar.obs.cn-east-3.myhuaweicloud.com/youngee/talent_upload/icon-person.png',
@@ -142,16 +144,26 @@
 					.then(res => {
 						console.log(res)
 						if (res.data.data != null) {
+							this.binded = true
 							this.formData = res.data.data
+						}else{
+							this.binded = false
 						}
 					})
 			},
-			withdraw() {
+			withdraw() {					
+				if(!this.binded){					
+					uni.showToast({
+						title: "请先绑定银行卡信息",
+						icon: 'none'
+					})
+					return
+				}
 				this.$https.post('/youngee/c/t/p/withdraw', {
 						task_id_list: this.taskIdList,
 						total_amount: this.totalAmount,
 						real_amount: this.realAmount,
-						bank_type: this.bankType,
+						bank_type: 2,
 					})
 					.then(res => {
 						console.log(res)
@@ -208,7 +220,7 @@
 
 
 	.tips {
-		margin: 30rpx;
+		margin: 30rpx 0;
 		padding: 30rpx 20rpx;
 		background-color: #eaeaea;
 		border-radius: 15rpx;

pages/mycenter/myinformation/addlocation.vue

@@ -74,7 +74,7 @@
 					navFixed: true,
 					/* 标题 （屏幕中心居中 两边图标中心居中使用slot center1） */
 					navTitle: {
-						text: "收货地址管理",
+						text: "收货地址管理1",
 						color: "",
 						fontSize: "32rpx", // px upx rpx
 						fontWeight: "normal", // 100 - 700
@@ -379,8 +379,8 @@
 		display: block;
 		cursor: pointer;
 		padding-left: 20rpx !important;
-		padding-top: 14rpx !important;
-		color: grey !important;
+		/* padding-top: 14rpx !important;
+		color: grey !important; */
 	}
 
 	/deep/.uni-forms-item__inner {
@@ -675,8 +675,8 @@
 		display: block;
 		cursor: pointer;
 		padding-left: 20rpx !important;
-		padding-top: 14rpx !important;
-		color: grey !important;
+		// padding-top: 14rpx !important;
+		// color: grey !important;
 	}
 
 	/deep/.uni-date-x--border {

pages/mycenter/myinformation/bindaccount.vue

@@ -12,18 +12,34 @@
 
 				<view class="body">
 					<view>
-						<uni-forms :modelValue="formData" ref="form" validate-trigger="bind" err-show-type="undertext">
+						<uni-forms :modelValue="formData" ref="form" :rules="bindRules" validate-trigger="bind"
+							err-show-type="undertext">
 							<uni-forms-item name="name" required label="昵称">
-								<uni-easyinput type="text" v-model="formData.platform_nickname" placeholder="请填写账号昵称">
+								<uni-easyinput type="text" v-model="formData.platform_nickname" style="width:300rpx"
+									placeholder="请填写账号昵称">
 								</uni-easyinput>
 							</uni-forms-item>
 							<uni-forms-item name="numberfans" required label="粉丝数">
-								<uni-easyinput type="number" v-model="formData.fans_count" placeholder="请填写粉丝数量">
-								</uni-easyinput>
+								<view class="number-inupt">
+									<uni-easyinput type="number" v-model="fansCount" placeholder="可保留小数点后一位"
+										v-if="fansCountInfo === 1" style="width:300rpx" @input="onInput1">
+									</uni-easyinput>
+									<uni-easyinput type="digit" v-model="fansCount" placeholder="可保留小数点后一位" v-else
+										style="width:300rpx" @input="onInput">
+									</uni-easyinput>
+									<picker @change="bindPickerChange" :value="index" :range="fansRange"
+										style="z-index: 999;background-color: #fcdf41;padding: 0 10rpx;border-radius: 5rpx;"
+										range-key="label">
+										<view>{{ fansLabel }}</view>
+									</picker>
+								</view>
+								<!-- <view style="font-size: 24rpx;padding-left: 10px;" @click="hasClicked = true" v-else>
+									<p>点选数字单位</p>
+								</view> -->
 							</uni-forms-item>
 							<uni-forms-item name="home_link" required label=" " label-width='10'>
 								<uni-easyinput class="home-link" type="text" v-model="formData.home_page_url"
-									placeholder="请填写个人主页链接">
+									style="width:650rpx" placeholder="请填写个人主页链接">
 								</uni-easyinput>
 							</uni-forms-item>
 							<view style="margin-top: 40rpx;">
@@ -32,7 +48,6 @@
 										v-model="imageData" @chooseSuccess="ceshiChooseSuccess">
 									</htz-image-upload>
 								</uni-forms-item>
-
 							</view>
 						</uni-forms>
 						<view class="heng-line"></view>
@@ -58,6 +73,7 @@
 		data() {
 			return {
 				navH: getApp().globalData.navHeight,
+				hasClicked: false,
 				loading: true,
 				accountId: '',
 				platform: {
@@ -71,7 +87,27 @@
 					platform_nickname: '',
 					fans_count: '',
 					home_page_url: '',
+					home_page_capture_url: ''
 				},
+
+				index: 0,
+				fansLabel: "选择单位",
+				fansCount: null,
+				fansCountInfo: 1,
+				fansRange: [{
+						value: 1,
+						label: '个'
+					},
+					{
+						value: 10000,
+						label: '万'
+					},
+					{
+						value: 100000000,
+						label: '亿'
+					}
+				],
+
 				mysNavConfig: {
 					/* 开启单页显示首页图标 */
 					isHome: true,
@@ -95,12 +131,32 @@
 						// 圆角
 						radius: "40rpx",
 					},
-				},
+				}, // 密码登录校验规则
+				bindRules: {
+					name: {
+						rules: [{
+							required: true,
+							errorMessage: '请输入昵称'
+						}]
+					},
+					home_img: {
+						rules: [{
+							required: true,
+							errorMessage: '请上传主页截图',
+						}]
+					}
+				}
 
 			}
 		},
 		onReady() {},
-		async onShow() {
+		async onShow() {},
+		async onLoad(options) {
+			this.platform.platform_id = parseInt(options.platform_id)
+			if (options.account_id) {
+				this.accountId = parseInt(options.account_id)
+				this.isBind = false
+			}
 			this.loading = true;
 			uni.showLoading({
 				title: '加载中'
@@ -112,14 +168,6 @@
 			this.loading = false;
 			uni.hideLoading();
 		},
-		onLoad() {},
-		onLoad(options) {
-			this.platform.platform_id = parseInt(options.platform_id)
-			if (options.account_id) {
-				this.accountId = parseInt(options.account_id)
-				this.isBind = false
-			}
-		},
 		methods: {
 			// 默认信息表，获取平台logo
 			getinfo() {
@@ -143,10 +191,28 @@
 							this.imageData = []
 							for (var i = 0; i < this.account.length; i++) {
 								if (this.platform.platform_id == this.account[i].platform_id) {
+									this.hasClicked = true
 									this.formData.platform_nickname = this.account[i].platform_nickname
 									this.formData.fans_count = this.account[i].fans_count
 									this.formData.home_page_url = this.account[i].home_page_url
 									this.imageData.push(this.account[i].home_page_capture_url);
+
+									if (this.formData.fans_count >= 100000000) {
+										this.index = 2
+										this.fansCountInfo = this.fansRange[this.index].value;
+										this.fansLabel = this.fansRange[this.index].label;
+										this.fansCount = (this.formData.fans_count / 100000000).toFixed(1)
+									} else if (this.formData.fans_count >= 10000) {
+										this.index = 1
+										this.fansCountInfo = this.fansRange[this.index].value;
+										this.fansLabel = this.fansRange[this.index].label;
+										this.fansCount = (this.formData.fans_count / 10000).toFixed(1)
+									} else {
+										this.index = 0
+										this.fansCountInfo = this.fansRange[this.index].value;
+										this.fansLabel = this.fansRange[this.index].label;
+										this.fansCount = this.formData.fans_count
+									}
 								}
 							}
 						}
@@ -166,16 +232,33 @@
 					})
 					return
 				}
+				if (this.fansCount == null || this.fansCount * this.fansCountInfo <= 0 || this.fansLabel == "选择单位") {
+					uni.showToast({
+						title: '请填写粉丝量数量',
+						icon: 'none'
+					})
+					return
+				}
+				this.formData.fans_count = this.fansCount * this.fansCountInfo
+				if (this.imageData.length === 0) {
+					uni.showToast({
+						title: '请上传主页截图',
+						icon: 'none'
+					})
+					return
+				}
 				let that = this
-				uni.showModal({
-					title: '提示',
-					content: '请保证账号信息的准确性和真实性',
-					success: function(res) {
-						if (res.confirm) {
-							that.$refs[form]
-								.submit()
-								.then(res => {
-									console.log('表单的值：', res)
+				that.$refs.form.validate()
+					// that.$refs[form]
+					// 	.submit()
+					.then(res => {
+						console.log('表单的值：', res)
+
+						uni.showModal({
+							title: '提示',
+							content: '请保证账号信息的准确性和真实性',
+							success: function(res) {
+								if (res.confirm) {
 									that.formData.home_page_capture_url = that.imageData[0]
 									if (that.isBind) {
 										that.$https.post('/youngee/c/t/p/add-talent-account', {
@@ -222,30 +305,38 @@
 													});
 												}
 											})
-
 									}
-								})
-								.catch(errors => {
-									console.error('验证失败：', errors)
-									uni.showToast({
-										title: '请填写所有信息',
-										icon: 'none'
-									})
-								})
-						} else if (res.cancel) {
-							console.log('用户点击取消');
-						}
-					}
-				});
+								} else if (res.cancel) {
+									console.log('用户点击取消');
+								}
+							},
+						});
+					})
+					.catch(errors => {
+						console.error('验证失败：', errors)
+						uni.showToast({
+							title: '请填写账号昵称',
+							icon: 'none'
+						})
+					})
 			},
 			exit() {
 				uni.navigateBack()
 			},
+			// 粉丝量量级选择
+			bindPickerChange: function(e) {
+				if (this.index !== e.detail.value) {
+					this.fansCount = null
+				}
+				this.index = e.detail.value;
+				this.fansLabel = this.fansRange[this.index].label
+				this.fansCountInfo = this.fansRange[this.index].value
+			},
 			ceshiChooseSuccess(tempFilePaths, e) { //选择图片返回
 				console.log('ceshiChooseSuccess', tempFilePaths, e);
 				if (e == 0) {
 					this.store = 'talent_upload/' + this.guid() + '.png'
-					// this.store = 'talent_upload/guide.png'
+					// this.store = 'talent_upload/guanwang.png'
 				} else if (e == 1) {
 					this.store = 'talent_upload/' + this.guid() + '.mp4'
 				}
@@ -254,11 +345,9 @@
 				***************/
 				this.imgUpload(tempFilePaths);
 				/*******************************/
-				console.log("imgdata" + this.imageData)
 			},
 			imgUpload(tempFilePaths) {
 				let that = this
-				console.log('imgUpload', tempFilePaths)
 				let config = {
 					AccessKeyId: 'IVW21DTGIIUBBAGXKK0Y', //AK
 					SecretKey: 'Y01nEQNcLOATMw7uJwrk3yOdQZ2fqLhSnXcOKVDE', //SK
@@ -293,12 +382,12 @@
 					},
 
 					success: function(res) {
-						console.log(res.statusCode); //打印响应状态码
-						if (res.statusCode == '204') {
-							that.imageData.push(config.EndPoint + '/' + fileName);
-							let obs_url = config.EndPoint + '/' + fileName; //用你自己的 bucket 名替换星号
-							console.log(obs_url)
-							that.formData.home_img = obs_url
+						console.log("res", res); //打印响应状态码
+						if (res.statusCode == 204) {
+							// that.imageData.push(config.EndPoint + '/' + fileName);
+							let obs_url = config.EndPoint + '/' + fileName; //用你自己的 bucket 名替换星号							
+							that.imageData.push(obs_url)
+							that.formData.home_page_capture_url = obs_url
 							uni.showToast({
 								title: '上传成功',
 								icon: '成功'
@@ -327,6 +416,37 @@
 					return v.toString(16);
 				});
 			},
+			onInput(e) {
+				console.log(e)
+				e = (e.match(/^\d*(\.?\d{0,1})/g)[0]) || null
+				// //重新赋值给input
+				if (e < 0 || e > 9999.9) {
+					uni.showToast({
+						title: '请输入[1,9999.9]区间内的数',
+						icon: 'none'
+					})
+					console.log('请输入[1,9999.9]区间内的数')
+				}
+				this.$nextTick(() => {
+					this.fansCount = (e > 0 && e <= 9999.9) ? e : null
+				})
+			},
+			onInput1(e) {
+				// 验证是否是纯数字
+				const isNumber = /^\d*$/.test(e)
+				// 过滤非数字
+				e = e.replace(/\D/g, '')
+				if (!isNumber || e < 0 || e > 9999) {
+					uni.showToast({
+						title: '请输入[0,9999]区间的整数',
+						icon: 'none'
+					})
+					console.log('请输入[0,9999]区间的整数')
+				}
+				this.$nextTick(() => {
+					this.fansCount = (e >= 0 && e <= 9999 && e.match(/^\d*/g)[0]) ? e : null
+				})
+			}
 		},
 	}
 </script>
@@ -352,8 +472,19 @@
 		padding: 5px 0;
 		/* height: 36px; */
 	}
+
+	/deep/ .uni-forms-item__content {
+		display: flex !important;
+		align-items: center !important;
+		/* justify-content: space-between; */
+	}
 </style>
 <style lang="scss" scoped>
+	.number-inupt {
+		display: flex !important;
+		align-items: center !important;
+	}
+
 	.card {
 		padding: 24rpx;
 		margin-top: 30rpx;

pages/mycenter/myinformation/myaccount.vue

@@ -207,6 +207,7 @@
 		color: #333333;
 		font-weight: 550;
 		text-indent: 2em;
+		font-size: 30rpx;
 	}
 
 	.Tasktext image {
@@ -224,7 +225,7 @@
 
 	.dou p {
 		display: inline-block;
-		font-size: 26rpx;
+		font-size: 30rpx;
 		color: #333333;
 		font-weight: 550;
 	}

pages/mycenter/myinformation/mybank.vue

@@ -6,7 +6,7 @@
 		<view>
 			<!-- 银行卡信息绑定 -->
 			<view style="margin: 0 20rpx;">
-				<font style="margin: 30rpx 20rpx 20rpx;color: #878994;">银行卡信息绑定</font>
+				<!-- <font style="margin: 30rpx 20rpx 20rpx;color: #878994;">银行卡信息绑定</font> -->
 				<uni-forms :modelValue="formData" err-show-type="undertext">
 					<uni-forms-item name="name" required label="户主姓名">
 						<uni-easyinput type="text" :inputBorder="false" v-model="formData.name" placeholder="姓名">
@@ -372,8 +372,8 @@
 		display: block;
 		cursor: pointer;
 		padding-left: 20rpx !important;
-		padding-top: 14rpx !important;
-		color: grey !important;
+		/* padding-top: 14rpx !important; */
+		/* color: grey !important; */
 	}
 
 	/deep/.uni-forms-item__inner {
@@ -560,8 +560,8 @@
 		display: block;
 		cursor: pointer;
 		padding-left: 20rpx !important;
-		padding-top: 14rpx !important;
-		color: grey !important;
+		// padding-top: 14rpx !important;
+		// color: grey !important;
 	}
 
 	/deep/.uni-date-x--border {

pages/mycenter/myinformation/myinformation.vue

@@ -7,10 +7,10 @@
 			<view class="func-head">
 				<p>任务报名必填项</p>
 			</view>
-			<view class="func-card">
+<!-- 			<view class="func-card">
 				<p @click="handlePersoninfo()">个人资料管理</p>
 				<image class="show-body1-icon" :src="picture.icon_right" @click="handlePersoninfo()"></image>
-			</view>
+			</view> -->
 			<view class="func-card">
 				<p @click="handleLocation()">收货地址管理</p>
 				<image class="show-body1-icon" :src="picture.icon_right" @click="handleLocation()"></image>

pages/mycenter/myinformation/personinfo.vue

@@ -145,10 +145,34 @@
 			this.$refs.form.setRules(this.rules)
 		},
 		async onShow() {
+			this.initRegion()
 			await this.getlist()
 			this.getlist1()
 		},
 		methods: {
+			initRegion() {
+				// 声明城市数组
+				let cityArr = [];
+				let countyArr = [];
+				// 设置下标
+				this.regionIndex = [0, 0, 0];
+				// 改变城市列表
+				this.region[1] = this.oldRegion[0].children.map(item => {
+					cityArr.push({
+						name: item.name,
+						code: item.code
+					});
+				})
+				this.$set(this.region, 1, cityArr);
+				// 改变县区列表
+				this.oldRegion[0].children[0].children.map(item => {
+					countyArr.push({
+						name: item.name,
+						code: item.code
+					});
+				})
+				this.$set(this.region, 2, countyArr);
+			},
 			// 信息表
 			getlist() {
 				return this.$https.get('/youngee/c/g/get-info-tables')
@@ -236,18 +260,20 @@
 							})
 							return
 						}
+						let nickName = uni.getStorageSync('nickName');
+						let avatarUrl = uni.getStorageSync('avatarUrl');
 						this.$https.post('/youngee/c/t/p/talent-info', {
 								talent_age_bracket: this.formData.age,
 								talent_nationality: this.formData.nationality,
 								visit_store_region: this.formData.visitStoreRegion,
 								talent_phone_number: this.formData.phone,
+								talent_wx_nickname: nickName,
+								avatar: avatarUrl,
 							})
 							.then(res => {
 								if (res.data.code == 0) {
 									console.log(res)
-									uni.navigateTo({
-										url: './mylocation'
-									});
+									uni.navigateBack()
 								} else {
 									uni.showToast({
 										title: res.data.msg,
@@ -382,8 +408,8 @@
 		display: block;
 		cursor: pointer;
 		padding-left: 20rpx !important;
-		padding-top: 20rpx !important;
-		color: grey !important;
+		/* padding-top: 20rpx !important; */
+		/* color: grey !important; */
 	}
 
 	/deep/.uni-forms-item__inner {
@@ -594,8 +620,8 @@
 		display: block;
 		cursor: pointer;
 		padding-left: 20rpx !important;
-		padding-top: 14rpx !important;
-		color: grey !important;
+		// padding-top: 14rpx !important;
+		// color: grey !important;
 	}
 
 	/deep/.uni-date-x--border {

pages/mycenter/mytask/mytask.vue

@@ -119,7 +119,6 @@
 
 <script>
 	import mvBar from "@/components/mys_navBar/mysNavBar";
-	import getRouter from '@/components/utils.js';
 	export default {
 		components: {
 			mvBar,

pages/tasksquare/bindinfo.vue

@@ -5,11 +5,12 @@
 		<view :style="{marginTop:navH}"></view>
 		<view class="home">
 			<view style="margin: 0 20rpx;">
-				<uni-forms :value="formData" ref="form" validate-trigger="bind" err-show-type="undertext">
-					<view class="title">
+				<uni-forms :value="formData" ref="form" :rules="rules" validate-trigger="bind"
+					err-show-type="undertext">
+<!-- 					<view class="title">
 						<p>个人资料</p>
-					</view>
-					<uni-forms-item name="age" label="年龄区间">
+					</view> -->
+					<!-- <uni-forms-item name="age" label="年龄区间">
 						<picker @change="bindPickerChange" :value="index" :range="array"
 							range-key="age_bracket_discribe">
 							<view>{{ Xage }}</view>
@@ -33,15 +34,43 @@
 						<uni-easyinput type="number" maxlength="11" :inputBorder="true" v-model="formData.phone"
 							placeholder="请输入联系电话">
 						</uni-easyinput>
-					</uni-forms-item>
+					</uni-forms-item> -->
 
 					<view class="line"></view>
 
-					<view class="title">
-						<p>收货地址</p>
+
+					<view class="but2">
+						<view class="title" >
+							<p>收货地址:</p>
+						</view>
+<!-- 					<button type="default" class="btn3" @click="chooseAddr()">
+						<image class="weixinlogo" :src="weixinimage">
+						</image>
+						<p class="auto-text">
+							自动获取</p>
+					</button> -->
+						<button class="but3" @click="chooseAddr()">
+							<image class="weixinlogo" :src="weixinimage">
+							自动获取
+						</button>
+							<view style="display: flex;margin-top: 3%;">
+								<p class='ipon' style="padding-right: 200rpx;color:#707070">{{formData.name}}</p>
+								<p class='ipon' style="padding-right: 200rpx;color:#707070">{{formData.number}}</p>
+								
+					<!-- 			<text>{{formData.detailregion}}</text> -->
+							</view>
+							<view>
+								<p class='ipon' style="color:#707070">{{formData.detailregion}}</p>
+							</view>
 					</view>
+					
+<!-- 					<view class="setdeault">
+						<view class="setdeault-text">设为默认收货地址</view>
+						<switch style='zoom:.8;' @change="setDefault" />
+					</view>					
+					 -->
 
-					<uni-forms-item name="name" required label="收件人">
+<!-- 					<uni-forms-item name="name" required label="收件人">
 						<uni-easyinput type="text" :inputBorder="true" v-model="formData.name" placeholder="请输入收件人">
 						</uni-easyinput>
 					</uni-forms-item>
@@ -63,11 +92,8 @@
 						<uni-easyinput type="text" :inputBorder="true" v-model="formData.detailregion"
 							placeholder="请输入详细地址(省/市/县/镇/)">
 						</uni-easyinput>
-					</uni-forms-item>
-					<view class="setdeault">
-						<view class="setdeault-text">设为默认收货地址</view>
-						<switch style='zoom:.8;' @change="setDefault" />
-					</view>
+					</uni-forms-item> -->
+
 
 					<view class="line"></view>
 
@@ -76,16 +102,30 @@
 					</view>
 
 					<uni-forms-item name="nickname" required label="昵称">
-						<uni-easyinput type="text" v-model="formData.platform_nickname" placeholder="请填写账号昵称">
+						<uni-easyinput type="text" v-model="formData.platform_nickname" style="width:300rpx"
+							placeholder="请填写账号昵称">
 						</uni-easyinput>
 					</uni-forms-item>
 					<uni-forms-item name="numberfans" required label="粉丝数">
-						<uni-easyinput type="number" v-model="formData.fans_count" placeholder="请填写粉丝数量">
-						</uni-easyinput>
+						<view class="number-inupt">
+							<uni-easyinput type="number" v-model="fansCount" placeholder="请填写粉丝数量"
+								v-if="fansCountInfo === 1" style="width:300rpx" @input="onInput1">
+							</uni-easyinput>
+							<uni-easyinput type="digit" v-model="fansCount" style="width:300rpx" placeholder="请填写粉丝数量"
+								v-else @input="onInput">
+							</uni-easyinput>
+							<picker @change="bindPickerChange2" :value="index3" :range="fansRange" range-key="label"
+								style="z-index: 999;background-color: #fcdf41;padding: 0 10rpx;border-radius: 5rpx;">
+								<view>{{ fansLabel }}</view>
+							</picker>
+						</view>
+						<!-- <view style="font-size: 24rpx;padding-left: 10px;" @click="hasClicked = true" v-else>
+							<p>点选数字单位</p>
+						</view> -->
 					</uni-forms-item>
 					<uni-forms-item name="home_link" required label=" " label-width='10'>
 						<uni-easyinput class="home-link" type="text" v-model="formData.home_page_url"
-							placeholder="请填写个人主页链接">
+							style="width:650rpx" placeholder="请填写个人主页链接">
 						</uni-easyinput>
 					</uni-forms-item>
 					<view style="margin-top: 40rpx;">
@@ -116,7 +156,9 @@
 		},
 		data() {
 			return {
+				weixinimage: "../../static/img/icon-weixin.png",
 				navH: getApp().globalData.navHeight,
+				hasClicked: false,
 				address: [],
 				accountId: '',
 				platform: {
@@ -155,6 +197,25 @@
 					fans_count: '',
 					home_page_url: '',
 				},
+
+				index3: 0,
+				fansLabel: "选择单位",
+				fansCount: null,
+				fansCountInfo: 1,
+				fansRange: [{
+						value: 1,
+						label: '个'
+					},
+					{
+						value: 10000,
+						label: '万'
+					},
+					{
+						value: 100000000,
+						label: '亿'
+					}
+				],
+
 				index: 0,
 				index1: 0,
 				Xage: '请选择',
@@ -215,22 +276,131 @@
 						radius: "40rpx",
 					},
 				},
+				rules: {
+					home_img: {
+						rules: [{
+							required: true,
+							errorMessage: '请上传主页截图'
+						}, ]
+					},
+					home_link: {
+						rules: [{
+							required: true,
+							errorMessage: '请输入主页链接'
+						}, ]
+					},
+					numberfans: {
+						rules: [{
+							required: true,
+							errorMessage: '请输入粉丝量'
+						}, ]
+					},
+					nickname: {
+						rules: [{
+							required: true,
+							errorMessage: '请输入账号昵称'
+						}, ]
+					},
+					detailregion: {
+						rules: [{
+							required: true,
+							errorMessage: '请输入详细地址'
+						}, ]
+					},
+					fregion: {
+						rules: [{
+							required: true,
+							errorMessage: '请输入收货地址'
+						}, ]
+					},
+					tel: {
+						rules: [{
+							required: true,
+							errorMessage: '请输入联系方式'
+						}, ]
+					},
+					name: {
+						rules: [{
+							required: true,
+							errorMessage: '请输入姓名'
+						}, ]
+					},
+					phone: {
+						rules: [{
+							required: true,
+							errorMessage: '请输入联系方式'
+						}, ]
+					},
+					vregion: {
+						rules: [{
+							required: false,
+							errorMessage: '请输入探店地区'
+						}, ]
+					},
+					skintype: {
+						rules: [{
+							required: false,
+							errorMessage: '请输入国籍'
+						}, ]
+					},
+					age: {
+						rules: [{
+							required: false,
+							errorMessage: '请输入年龄'
+						}, ]
+					},
+
+				},
 			}
 		},
 		onReady() {},
-		onShow() {
-			this.initRegion()
-			this.getDefaultAddress()
-			this.getlist()
-		},
+		onShow() {},
 		onLoad(options) {
 			this.platform.platform_id = parseInt(options.platform_id)
 			if (options.account_id) {
 				this.accountId = parseInt(options.account_id)
 				this.isBind = false
 			}
+			this.initRegion()
+			this.getDefaultAddress()
+			this.getlist()
 		},
 		methods: {
+			chooseAddr() {
+				const that = this
+				uni.chooseAddress({
+					success(res) {
+						that.formData.name = res.userName
+						that.formData.number=res.telNumber
+						that.formData.detailregion=res.provinceName + res.cityName + res.countyName + res.detailInfo
+						console.log(res)
+						console.log(res.userName)
+						console.log(res.postalCode)
+						console.log(res.provinceName)
+						console.log(res.cityName)
+						console.log(res.countyName)
+						console.log(res.detailInfo)
+						console.log(res.nationalCode)
+						console.log(res.telNumber)
+			
+						that.$https.post('/youngee/c/t/p/add-talent-address', {
+								region_code: res.nationalCode,
+								detail_addr: res.provinceName + res.cityName + res.countyName + res.detailInfo,
+								phone_number: res.telNumber,
+								receiver_name: res.userName,
+								mail_code: res.postalCode,
+								default_tag: 1
+							})
+							.then(res => {
+								console.log(res)
+								that.getlist()
+							})
+					},
+					fail: (res) => {
+						console.log(res)
+					}
+				})
+			},
 			initRegion() {
 				// 声明城市数组
 				let cityArr = [];
@@ -258,7 +428,6 @@
 			getlist() {
 				this.$https.get('/youngee/c/g/get-info-tables')
 					.then(res => {
-						console.log(res)
 						this.array = res.data.data.AgeBracket
 
 						let list = res.data.data.ThirdPlatform
@@ -276,7 +445,6 @@
 			getlist1() {
 				this.$https.get('/youngee/c/t/g/get-talent-info')
 					.then(res => {
-						console.log(res)
 						if (res.data.data.talent_wx_number !== null) {
 							if (res.data.data.talent_age_bracket !== 0) {
 								for (var i = 0; i < this.array.length; i++) {
@@ -322,19 +490,35 @@
 					})
 			},
 			getaccount() {
-				console.log(this.isBind)
 				if (!this.isBind) {
 					this.$https.get('/youngee/c/t/g/get-talent-account')
 						.then(res => {
-							console.log(res)
 							if (res.data.code !== -3) {
 								this.account = res.data.data
 								for (var i = 0; i < this.account.length; i++) {
 									if (this.platform.platform_id == this.account[i].platform_id) {
+										this.hasClicked = true
 										this.formData.platform_nickname = this.account[i].platform_nickname
 										this.formData.fans_count = this.account[i].fans_count
 										this.formData.home_page_url = this.account[i].home_page_url
 										this.imageData.push(this.account[i].home_page_capture_url);
+
+										if (this.formData.fans_count >= 100000000) {
+											this.index3 = 2
+											this.fansCountInfo = this.fansRange[this.index3].value;
+											this.fansLabel = this.fansRange[this.index3].label;
+											this.fansCount = (this.formData.fans_count / 100000000).toFixed(1)
+										} else if (this.formData.fans_count >= 10000) {
+											this.index3 = 1
+											this.fansCountInfo = this.fansRange[this.index3].value;
+											this.fansLabel = this.fansRange[this.index3].label;
+											this.fansCount = (this.formData.fans_count / 10000).toFixed(1)
+										} else {
+											this.index3 = 0
+											this.fansCountInfo = this.fansRange[this.index3].value;
+											this.fansLabel = this.fansRange[this.index3].label;
+											this.fansCount = this.formData.fans_count
+										}
 									}
 								}
 							}
@@ -342,7 +526,6 @@
 				}
 			},
 			setDefault(e) {
-				console.log(e.detail.value)
 				if (e.detail.value)
 					this.formData.setdefault = 1
 				else
@@ -355,8 +538,6 @@
 					this.formData.tel = res.data.data.phone_number
 					this.formData.detailregion = res.data.data.detail_addr
 					this.formData.fregion = res.data.data.region_code
-					console.log("111")
-					console.log(this.formData)
 					let a = res.data.data.region_code.toString().slice(0, 2)
 					let b = res.data.data.region_code.toString().slice(0, 4)
 					let c = 0
@@ -385,16 +566,21 @@
 			 * @param {Object} form
 			 */
 			submitForm(form) {
-				// console.log(this.formData);
 				this.$refs.form.validate().then(res => {
-
 					const iphoneReg1 = /^1[0-9]{10}$/
 					const urlReg =
 						/(ht|f)tp(s?)\:\/\/[0-9a-zA-Z]([-.\w]*[0-9a-zA-Z])*(:(0-9)*)*(\/?)([a-zA-Z0-9\-\.\?\,\'\/\\\+&amp;%$#_]*)?/
 
 					if (!iphoneReg1.test(this.formData.phone)) {
 						uni.showToast({
-							title: '电话号码格式不正确',
+							title: '请填写正确的联系方式',
+							icon: 'none'
+						})
+						return
+					}
+					if (!iphoneReg1.test(this.formData.tel)) {
+						uni.showToast({
+							title: '请填写正确的电话号码',
 							icon: 'none'
 						})
 						return
@@ -406,30 +592,45 @@
 						})
 						return
 					}
-					uni.showToast({
-						title: '提交成功'
-					})
+					if (this.fansCount == null || this.fansCount * this.fansCountInfo <= 0 || this.fansLabel == "选择单位") {
+						uni.showToast({
+							title: '请填写粉丝量数量',
+							icon: 'none'
+						})
+						return
+					}
+					this.formData.fans_count = this.fansCount * this.fansCountInfo
+					if (this.imageData.length === 0) {
+						uni.showToast({
+							title: '请上传主页截图',
+							icon: 'none'
+						})
+						return
+					}
+					// uni.showToast({
+					// 	title: '提交成功'
+					// })
 
+					let nickName = uni.getStorageSync('nickName');
+					let avatarUrl = uni.getStorageSync('avatarUrl');
 					this.$https.post('/youngee/c/t/p/talent-info', {
 							talent_age_bracket: this.formData.age,
 							talent_nationality: this.formData.nationality,
 							visit_store_region: this.formData.visitStoreRegion,
 							talent_phone_number: this.formData.phone,
+							talent_wx_nickname: nickName,
+							avatar: avatarUrl,
 						})
-						.then(res => {
-							console.log(res)
-						})
+						.then(res => {})
 
 					this.$https.post('/youngee/c/t/p/add-talent-address', {
 							region_code: this.formData.fregion,
 							detail_addr: this.formData.detailregion,
-							phone_number: this.formData.phone,
+							phone_number: this.formData.tel,
 							receiver_name: this.formData.name,
 							default_tag: this.formData.setdefault
 						})
-						.then(res => {
-							console.log(res)
-						})
+						.then(res => {})
 
 					this.formData.home_page_capture_url = this.imageData[0]
 					if (this.isBind) {
@@ -441,9 +642,7 @@
 								home_page_capture_url: this.formData
 									.home_page_capture_url,
 							})
-							.then(res => {
-								console.log(res)
-							})
+							.then(res => {})
 					} else {
 						this.$https.post('/youngee/c/t/p/update-talent-account', {
 								account_id: this.accountId,
@@ -454,9 +653,7 @@
 								home_page_capture_url: this.formData
 									.home_page_capture_url,
 							})
-							.then(res => {
-								console.log(res)
-							})
+							.then(res => {})
 					}
 
 					uni.showToast({
@@ -464,7 +661,6 @@
 					})
 					uni.navigateBack()
 				}).catch(err => {
-					console.error('验证失败：', err)
 					uni.showToast({
 						title: '请填写所有信息',
 						icon: 'none'
@@ -472,7 +668,6 @@
 				})
 			},
 			ceshiChooseSuccess(tempFilePaths, e) { //选择图片返回
-				console.log('ceshiChooseSuccess', tempFilePaths, e);
 				if (e == 0) {
 					this.store = 'talent_upload/' + this.guid() + '.png'
 				} else if (e == 1) {
@@ -483,11 +678,9 @@
 				***************/
 				this.imgUpload(tempFilePaths);
 				/*******************************/
-				console.log("imgdata" + this.imageData)
 			},
 			imgUpload(tempFilePaths) {
 				let that = this
-				console.log('imgUpload', tempFilePaths)
 				let config = {
 					AccessKeyId: 'IVW21DTGIIUBBAGXKK0Y', //AK
 					SecretKey: 'Y01nEQNcLOATMw7uJwrk3yOdQZ2fqLhSnXcOKVDE', //SK
@@ -523,28 +716,22 @@
 					},
 
 					success: function(res) {
-						console.log(res.statusCode); //打印响应状态码
 						if (res.statusCode == '204') {
 							that.imageData.push(config.EndPoint + '/' + fileName);
-							console.log('上传图片成功', res)
 							let obs_url = config.EndPoint + '/' + fileName; //用你自己的 bucket 名替换星号
-							console.log(obs_url)
 							that.formData.home_img = obs_url
 							uni.showToast({
 								title: '上传成功',
 								icon: '成功'
 							});
 						} else {
-							console.log('上传图片失败', res)
 							uni.showToast({
 								title: '上传失败',
 								icon: '失败'
 							});
 						}
 					},
-					fail: function(e) {
-						console.log(e);
-					}
+					fail: function(e) {}
 				})
 			},
 			guid() {
@@ -560,18 +747,14 @@
 				this.index = e.detail.value;
 				this.formData.age = this.array[this.index].age_aid
 				this.Xage = this.array[this.index].age_bracket_discribe
-				console.log(this.formData.age)
 			},
 			//国籍选择
 			bindPickerChange1: function(e) {
-				console.log(e)
 				this.index1 = e.detail.value;
 				this.formData.nationality = this.array1[this.index1].id
-				console.log(this.formData.nationality)
 			},
 			//城市选择
 			pickerChange(e) {
-				// console.log(e, '1');
 				this.regionIndex = e.detail.value;
 				this.regionStr = this.region[0][this.regionIndex[0]].name + ' ' + this.region[1][this.regionIndex[
 						1]]
@@ -588,12 +771,6 @@
 
 			},
 			pickerColumnchange(e) {
-				// console.log(e);
-				// 第几列滑动
-				// console.log(e.detail.column);
-				// 第几列滑动的下标
-				// console.log(e.detail.value)
-
 				if (e.detail.column === 0) {
 					// 声明城市数组
 					let cityArr = [];
@@ -635,7 +812,6 @@
 			},
 			//城市选择
 			pickerChange(e) {
-				// console.log(e, '1');
 				this.regionIndex = e.detail.value;
 				this.regionStr = this.region[0][this.regionIndex[0]].name + ' ' + this.region[1][this.regionIndex[
 						1]]
@@ -652,12 +828,6 @@
 
 			},
 			pickerColumnchange(e) {
-				// console.log(e);
-				// 第几列滑动
-				// console.log(e.detail.column);
-				// 第几列滑动的下标
-				// console.log(e.detail.value)
-
 				if (e.detail.column === 0) {
 					// 声明城市数组
 					let cityArr = [];
@@ -699,7 +869,6 @@
 			},
 			//城市选择
 			pickerChange1(e) {
-				// console.log(e, '1');
 				this.regionIndex1 = e.detail.value;
 				this.regionStr1 = this.region[0][this.regionIndex1[0]].name + ' ' + this.region[1][this.regionIndex1[
 						1]]
@@ -713,7 +882,6 @@
 						2][this.regionIndex1[2]].code
 				]);
 				this.formData.fregion = this.region[2][this.regionIndex1[2]].code;
-				console.log(this.formData.fregion)
 
 			},
 			pickerColumnchange1(e) {
@@ -756,6 +924,43 @@
 					this.regionIndex1[2] = e.detail.value;
 				}
 			},
+			// 粉丝量量级选择
+			bindPickerChange2: function(e) {
+				if (this.index3 !== e.detail.value) {
+					this.fansCount = null
+				}
+				this.index3 = e.detail.value;
+				this.fansLabel = this.fansRange[this.index3].label
+				this.fansCountInfo = this.fansRange[this.index3].value
+			},
+			onInput(e) {
+				e = (e.match(/^\d*(\.?\d{0,1})/g)[0]) || null
+				// //重新赋值给input
+				if (e < 0 || e > 9999.9) {
+					uni.showToast({
+						title: '请输入[1,9999.9]区间内的数',
+						icon: 'none'
+					})
+				}
+				this.$nextTick(() => {
+					this.fansCount = (e > 0 && e <= 9999.9) ? e : null
+				})
+			},
+			onInput1(e) {
+				// 验证是否是纯数字
+				const isNumber = /^\d*$/.test(e)
+				// 过滤非数字
+				e = e.replace(/\D/g, '')
+				if (!isNumber || e < 0 || e > 9999) {
+					uni.showToast({
+						title: '请输入[0,9999]区间的整数',
+						icon: 'none'
+					})
+				}
+				this.$nextTick(() => {
+					this.fansCount = (e >= 0 && e <= 9999 && e.match(/^\d*/g)[0]) ? e : null
+				})
+			}
 		},
 		created() {
 			let provinceArr = [];
@@ -766,7 +971,6 @@
 					code: item.code
 				});
 			})
-			// console.log(provinceArr);
 			provinceArr.map((item, index) => {
 				this.region[1].push({
 					name: item.name,
@@ -780,6 +984,38 @@
 				});
 			})
 			this.regionStr = '请选择省市区';
+		},
+		chooseAddr() {
+			const that = this
+			uni.chooseAddress({
+				success(res) {
+					console.log(res)
+					console.log(res.userName)
+					console.log(res.postalCode)
+					console.log(res.provinceName)
+					console.log(res.cityName)
+					console.log(res.countyName)
+					console.log(res.detailInfo)
+					console.log(res.nationalCode)
+					console.log(res.telNumber)
+		
+					that.$https.post('/youngee/c/t/p/add-talent-address', {
+							region_code: res.nationalCode,
+							detail_addr: res.provinceName + res.cityName + res.countyName + res.detailInfo,
+							phone_number: res.telNumber,
+							receiver_name: res.userName,
+							mail_code: res.postalCode,
+							default_tag: 1
+						})
+						.then(res => {
+							console.log(res)
+							that.getlist()
+						})
+				},
+				fail: (res) => {
+					console.log(res)
+				}
+			})
 		}
 	};
 </script>
@@ -789,14 +1025,20 @@
 		display: block;
 		cursor: pointer;
 		padding-left: 20rpx !important;
-		padding-top: 20rpx !important;
-		color: grey !important;
+		/* padding-top: 20rpx !important; */
+		/* color: grey !important; */
 	}
 
 	/deep/.uni-forms-item__inner {
 		border-bottom: none !important;
 		margin-bottom: 0 !important;
 	}
+
+	/deep/ .uni-forms-item__content {
+		display: flex !important;
+		align-items: center !important;
+		/* justify-content: space-between; */
+	}
 </style>
 <style lang="scss" scoped>
 	@charset "UTF-8";
@@ -861,7 +1103,34 @@
 			padding-bottom: 15rpx;
 		}
 	}
-
+	.but2{
+		width: 100%;
+		height:260rpx;
+		
+	}
+	.but3{
+		// width: 27%;
+		// height:50rpx;
+		// display: flex;
+		// align-items: center;
+		margin-left: 0;
+		// background-color: #F0D232;
+		// font-size: 30rpx;
+		// color: #ffffff;
+		background-color: #f2d22d;
+		color: #ffffff;
+		border-color: #ffffff;
+		border-radius: 10rpx;
+		font-size: 22rpx;
+		line-height: 200%;
+		letter-spacing: 10rpx;
+		font-weight: 500;
+		height: 50rpx;
+		width: 225rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
 	.setdeault {
 		display: flex;
 		justify-content: space-between;
@@ -979,7 +1248,16 @@
 		text-align: center;
 		margin-top: 2%;
 	}
-
+	.auto-text {
+		display: inline-block;
+		// font-size:32rpx;
+	}
+	.weixinlogo {
+		display: inline-block;
+		padding-right: 5rpx;
+		width: 35rpx;
+		height: 35rpx;
+	}
 	.but1 {
 		width: 120%;
 		text-align: center;
@@ -1290,4 +1568,9 @@
 		padding: 15px;
 		background-color: #ffffff;
 	}
+
+	.number-inupt {
+		display: flex !important;
+		align-items: center !important;
+	}
 </style>

pages/tasksquare/guanwang.vue

@@ -0,0 +1,115 @@
+<template>
+	<view>
+		<!-- 胶囊 -->
+		<!-- 		<mvBar :mysNavConfig="mysNavConfig"></mvBar>
+		<view :style="{marginTop:navH}"></view> -->
+		<!-- <view class="home"> -->
+			<!-- 我是新人指南页面 -->
+			<!-- <web-view src="https://www.baidu.com/"></web-view> -->
+			<web-view src="https://younggee.com/index"></web-view>
+		<!-- </view> -->
+
+
+	</view>
+</template>
+
+<script>
+	import mvBar from "@/components/mys_navBar/mysNavBar";
+	export default {
+		components: {
+			mvBar,
+		},
+		data() {
+			return {
+				navH: getApp().globalData.navHeight,
+				picture: {
+					guide: 'https://horastar.obs.cn-east-3.myhuaweicloud.com/talent_upload/home/guide.png',
+					coop: 'https://horastar.obs.cn-east-3.myhuaweicloud.com/talent_upload/home/coop.png'
+				},
+
+				mysNavConfig: {
+					/* 占位开启  */
+					// navPadding: true,
+					/* 背景 */
+					// bgColor: "#f8f8f8",
+					/* 开启单页显示首页图标 */
+					isHome: true,
+					/* 固定导航  */
+					navFixed: true,
+					/* 标题 （屏幕中心居中 两边图标中心居中使用slot center1） */
+					navTitle: {
+						text: "官网",
+						color: "",
+						fontSize: "32rpx", // px upx rpx
+						fontWeight: "", // 100 - 700
+					},
+					btnType: "type2",
+					onLeftClick: '',
+					/* type2 按钮 */
+					type2Config: {
+						// 左图标
+						leftPath: "/static/img/png2.png",
+						// 右图标
+						rightPath: "/static/img/png4.png",
+						// 圆角
+						radius: "40rpx",
+					},
+					/* 定义右侧图标 */
+					// rightIconPath: "/static/s.png",
+				},
+			};
+		},
+		methods: {
+
+		}
+	};
+</script>
+<style>
+
+</style>
+<style lang="scss" scoped>
+	.butto {
+		text-align: center;
+	}
+
+	.option {
+		padding: 20rpx;
+	}
+
+	.uni-margin-wrap {
+		width: 690rpx;
+		width: 100%;
+		;
+	}
+
+	.swiper {
+		height: 300rpx;
+	}
+
+	.swiper-item {
+		display: block;
+		height: 300rpx;
+		line-height: 300rpx;
+		text-align: center;
+	}
+
+	.swiper-list {
+		margin-top: 40rpx;
+		margin-bottom: 0;
+	}
+
+	.uni-common-mt {
+		margin-top: 60rpx;
+		position: relative;
+	}
+
+	.info {
+		position: absolute;
+		right: 20rpx;
+	}
+
+	.uni-padding-wrap {
+		width: 550rpx;
+		padding: 0 100rpx;
+	}
+</style>

pages/tasksquare/information.vue

@@ -31,18 +31,21 @@
 		</view>
 
 		<view class="keyInfo">
-			<p style="margin-bottom: 30rpx;font-size: 36rpx;">关键任务信息</p>
-			<p style="margin-top: 10rpx;">合作方式</p>
-			<view style="display: flex;padding-top: 10rpx;">
-				<p>粉丝量{{strategy.show_followers_low}}-{{strategy.show_followers_up}}
-					&nbsp;&nbsp;
-					稿费-{{strategy.fee_form_t}}
+			<!-- <p style="margin-bottom: 30rpx;font-size: 36rpx;">关键任务信息</p> -->
+			<p style="margin-top: 10rpx;">合作佣金</p>
+			<view style="padding-top: 10rpx;">
+				<p>粉丝量：{{strategy.show_followers_low}}-{{strategy.show_followers_up}}
+				</p>
+			</view>
+			<view style="display: flex;">
+				<p>
+					稿费：{{strategy.fee_form_t}}
 				</p>
 				<view v-if="strategy.fee_form==3">
-					<p>{{strategy.offer}}</p>
+					<p>{{strategy.showOffer}}元</p>
 				</view>
 			</view>
-			<view style="border-bottom: #dfdfdf 1px solid;margin: 10rpx 0 0;"></view>
+			<!-- <view style="border-bottom: #dfdfdf 1px solid;margin: 10rpx 0 0;"></view>
 			<p style="margin-top: 10rpx;">社媒平台</p>
 			<view style="display: flex;padding-top: 10rpx;">
 				<p>{{project.PlatformInfo.platform_name}}</p>
@@ -62,7 +65,7 @@
 				<text class="keyInfo_task_txt">{{project.Product.ProductDetail}}</text>
 				<p style="margin: 35rpx 0 0rpx;">任务详情：</p>
 				<text class="keyInfo_task_txt">{{project.project_detail}}</text>
-			</view>
+			</view> -->
 		</view>
 
 		<view class="account" @click="editAccount()">
@@ -71,7 +74,7 @@
 				<span>{{account.platform_nickname}}</span>
 			</view>
 			<view class="account_fans">
-				<p style="padding-right: 20rpx;color:#000;">粉丝数</p>
+				<p style="padding-right: 20rpx;color:#A8A8A8;">粉丝数</p>
 				<p>{{account.show_fans_count}}</p>
 			</view>
 			<view class="account_btn">
@@ -208,12 +211,14 @@
 			},
 			editAddress() {
 				uni.navigateTo({
-					url: '/pages/mycenter/myinformation/addlocation?address_id=' + this.address.address_id + '&ismodify=1'
+					url: '/pages/mycenter/myinformation/addlocation?address_id=' + this.address.address_id +
+						'&ismodify=1'
 				});
 			},
 			editAccount() {
 				uni.navigateTo({
-					url: '/pages/mycenter/myinformation/bindaccount?platform_id=' + this.account.platform_id + '&account_id=' +
+					url: '/pages/mycenter/myinformation/bindaccount?platform_id=' + this.account.platform_id +
+						'&account_id=' +
 						this.account.account_id
 				});
 			},
@@ -251,12 +256,12 @@
 				})
 				// 2. 判断粉丝量是否符合条件
 				if (this.account.fans_count < this.strategy.followers_low) {
-						// 招募截止
-						uni.showToast({
-							title: "粉丝量不达标",
-							duration: 1000,
-						});
-				}else{
+					// 招募截止
+					uni.showToast({
+						title: "粉丝量不达标",
+						duration: 1000,
+					});
+				} else {
 					// 3. 插入一条任务
 					this.$https.post('/youngee/c/t/p/sign-up-task', {
 						address_id: this.address.address_id,
@@ -272,6 +277,10 @@
 							uni.navigateTo({
 								url: '/pages/tasksquare/success?textObj=' + encodeURIComponent(data)
 							});
+						} else {
+							uni.showModal({
+								content: '网络繁忙，请小主稍后再试~',
+							});
 						}
 					})
 				}
@@ -346,21 +355,18 @@
 	}
 
 	.keyInfo {
-		margin: 30rpx 40rpx 0;
+		margin: 30rpx 40rpx;
 
 		.keyInfo_task {
 			color: #000;
 
 			.keyInfo_task_txt {
-				// border: 1rpx solid #CCCCCC;
 				border-radius: 10rpx;
-				// padding: 10rpx;
 			}
 		}
 	}
 
-	.keyInfo h3 {
-	}
+	.keyInfo h3 {}
 
 	.keyInfo p {
 		font-size: 30rpx;
@@ -369,11 +375,9 @@
 	.account {
 		display: flex;
 		align-items: center;
-		// justify-content: space-between;
-		width: 90%;
-		padding: 16rpx;
-		margin-top: 50rpx;
-		font-size: 35rpx;
+		width: 690rpx;
+		padding: 24rpx 0;
+		margin: 0 auto;
 
 		.account_txt {
 			display: inline-block;
@@ -381,6 +385,14 @@
 			width: 400rpx;
 		}
 
+		.account_txt span {
+			color: #333333;
+			font-weight: 550;
+			text-indent: 2em;
+			font-size: 30rpx;
+		}
+
+
 		.account_txt image {
 			vertical-align: middle;
 			width: 50rpx;
@@ -396,7 +408,9 @@
 
 		.account_fans p {
 			display: inline-block;
+			font-size: 30rpx;
 			color: #333333;
+			font-weight: 550;
 		}
 
 		.account_btn {}

pages/tasksquare/search.vue

@@ -283,6 +283,8 @@
 
 						// 任务数量&稿费形式
 						res.data.data.ProjectInfos[i].taskNum = 0
+						res.data.data.ProjectInfos[i].isfixedfee = 0
+						res.data.data.ProjectInfos[i].isself = 0
 						let lengthOfRecruitStrategys = res.data.data.ProjectInfos[i]
 							.RecruitStrategys != null ? res.data.data.ProjectInfos[i]
 							.RecruitStrategys
@@ -294,12 +296,10 @@
 								.RecruitStrategys[j]
 								.recruit_number)
 
-							res.data.data.ProjectInfos[i].isfixedfee = 0
 							if (res.data.data.ProjectInfos[i].RecruitStrategys[j].fee_form === 2) {
 								res.data.data.ProjectInfos[i].isfixedfee = 1
 							}
 
-							res.data.data.ProjectInfos[i].isself = 0
 							if (res.data.data.ProjectInfos[i].RecruitStrategys[j].fee_form === 3) {
 								res.data.data.ProjectInfos[i].isself = 1
 							}
@@ -371,6 +371,8 @@
 
 							// 任务数量&稿费形式
 							res.data.data.ProjectInfos[i].taskNum = 0
+							res.data.data.ProjectInfos[i].isfixedfee = 0
+							res.data.data.ProjectInfos[i].isself = 0
 							let lengthOfRecruitStrategys = res.data.data.ProjectInfos[i]
 								.RecruitStrategys != null ? res.data.data.ProjectInfos[i]
 								.RecruitStrategys
@@ -382,12 +384,10 @@
 									.RecruitStrategys[j]
 									.recruit_number)
 
-								res.data.data.ProjectInfos[i].isfixedfee = 0
 								if (res.data.data.ProjectInfos[i].RecruitStrategys[j].fee_form === 2) {
 									res.data.data.ProjectInfos[i].isfixedfee = 1
 								}
 
-								res.data.data.ProjectInfos[i].isself = 0
 								if (res.data.data.ProjectInfos[i].RecruitStrategys[j].fee_form === 3) {
 									res.data.data.ProjectInfos[i].isself = 1
 								}
@@ -1035,17 +1035,20 @@
 
 	.TitleText {
 		// height: 30rpx;
+		width: 25%;
 		background-color: #FDD442;
 		border-radius: 10rpx;
 		display: inline-block;
-		padding: 0rpx 20rpx 0rpx 20rpx;
+		text-align: center;
+		// padding: 0rpx 10rpx 0rpx 10rpx;
+		margin-right: 6%;
 		line-height: 30rpx;
 		margin-top: 0%;
 	}
 
 	.TitleText p {
 		color: black;
-		font-size: 18rpx;
+		font-size: 16rpx;
 	}
 
 	.introduction {

pages/tasksquare/specialTask/information.vue

@@ -12,7 +12,7 @@
 			</view>
 		</view>
 
-		<view class="address">
+		<!-- <view class="address">
 			<view>
 				<image class="address_icon" :src="picture.icon_loc" mode="">
 				</image>
@@ -28,9 +28,9 @@
 				<image :src="picture.icon_edit" mode="">
 				</image>
 			</view>
-		</view>
+		</view> -->
 
-		<view class="keyInfo">
+		<!-- <view class="keyInfo">
 			<h3>关键任务信息</h3>
 			<view style="display: flex;margin-top: 10rpx;">
 				<p style="">社媒平台：</p>
@@ -48,7 +48,7 @@
 				<p style="margin: 5rpx 0;">任务详情：</p>
 				<p class="keyInfo_task_txt"> {{project.project_detail}} </p>
 			</view>
-		</view>
+		</view> -->
 
 		<view class="account">
 			<view class="account_txt" @click="editAccount(item)">
@@ -237,21 +237,18 @@
 	}
 
 	.keyInfo {
-		margin: 50rpx 40rpx 0;
+		margin: 30rpx 40rpx;
 
 		.keyInfo_task {
-			color: #999999;
+			color: #000;
 
 			.keyInfo_task_txt {
-				border: 1rpx solid #CCCCCC;
 				border-radius: 10rpx;
-				padding: 10rpx;
 			}
 		}
 	}
 
-	.keyInfo h3 {
-	}
+	.keyInfo h3 {}
 
 	.keyInfo p {
 		font-size: 30rpx;
@@ -260,11 +257,9 @@
 	.account {
 		display: flex;
 		align-items: center;
-		// justify-content: space-between;
-		width: 90%;
-		padding: 16rpx;
-		margin-top: 50rpx;
-		font-size: 35rpx;
+		width: 690rpx;
+		padding: 24rpx 0;
+		margin: 0 auto;
 
 		.account_txt {
 			display: inline-block;
@@ -288,6 +283,8 @@
 		.account_fans p {
 			display: inline-block;
 			color: #333333;
+			font-size: 30rpx;
+			font-weight: 550;
 		}
 
 		.account_btn {}

pages/tasksquare/specialTask/specialTaskDetail.vue

@@ -47,7 +47,12 @@
 						</view>
 						<view style="display: flex;;margin: 10rpx 0;">
 							<p class="label">商品链接：</p>
-							<span style="display: flex;align-items: center;">
+							<span style="display: flex;align-items: center;"
+								v-if="information.Product.ProductUrl === ''">
+								<p class="wvp" style="padding: 0;">无</p>
+							</span>
+							<span style="display: flex;align-items: center;"
+								v-if="information.Product.ProductUrl !== ''">
 								<p class="wvp" style="padding: 0;">{{information.Product.ProductUrl|ellipsis}}</p>
 								<image :src="icon_copy" mode="" style="width: 40rpx;height: 40rpx;"
 									@click="handleCopy(information.Product.ProductUrl)" />
@@ -94,7 +99,7 @@
 							</view>
 						</view>
 					</view>
-					<view class="">
+					<!-- <view class="">
 						<view class="circularmark">
 							<p>商品详情图</p>
 						</view>
@@ -103,7 +108,7 @@
 								<image :src="item" mode="widthFix"></image>
 							</view>
 						</view>
-					</view>
+					</view> -->
 				</view>
 				<view class="interval2"></view>
 			</view>
@@ -152,9 +157,9 @@
 			</view>
 			<uni-popup ref="popup2" class="share1" background-color="#fff" @change="change">
 				<view class="popup-content">
-					<image :src="canvasUrl" mode="widthFix" style="width: 300px;height: 400px;margin-top: 30rpx;">
+					<image :src="canvasUrl" mode="widthFix" style="width: 300px;height: 420px;margin-top: 30rpx;">
 					</image>
-					<mosoweCanvas ref="mosoweCanvasComponents" @canvasImage="_canvasImage" :lists="lists" height="400"
+					<mosoweCanvas ref="mosoweCanvasComponents" @canvasImage="_canvasImage" :lists="lists" height="420"
 						width="300" imgType="png" />
 
 					<view class="" style="text-align: center;margin: 5% 0;">
@@ -171,8 +176,8 @@
 	import mvBar from "@/components/mys_navBar/mysNavBar";
 	import zSwiper from '@/components/z-swiper/index.vue'
 	import {
-		getRouter,
-		getQueryString
+		getQueryString,
+		money
 	} from '@/components/utils.js';
 	import {
 		saveImageToPhotosAlbum,
@@ -434,7 +439,7 @@
 							type: 'image',
 							content: this.img,
 							width: 300,
-							height: 300,
+							height: 320,
 							x: 0,
 							y: 0,
 						},
@@ -443,40 +448,63 @@
 							type: 'text',
 							content: this.title,
 							color: '#333333',
-							size: 12,
+							weight: 'bold',
+							size: '12px',
 							width: 200,
-							height: 10,
-							x: 10,
-							y: 320,
+							height: 20,
+							x: 20,
+							y: 340,
 						},
 						// 文案2
 						{
 							type: 'text',
 							content: "扫码立即报名",
 							color: '#333333',
-							size: 10,
+							size: '10px',
 							width: 60,
-							height: 10,
-							x: 10,
-							y: 340,
+							height: 20,
+							x: 20,
+							y: 370,
 						},
 						// logo
+						// {
+						// 	type: 'image',
+						// 	content: this.younggee_logo,
+						// 	width: 120,
+						// 	height: 50,
+						// 	x: 10,
+						// 	y: 370,
+						// },
+						// 文案3
 						{
-							type: 'image',
-							content: this.younggee_logo,
-							width: 120,
-							height: 50,
-							x: 10,
-							y: 350,
+							type: 'text',
+							content: "发布任务请登录",
+							color: '#333333',
+							size: '10px',
+							width: 70,
+							height: 20,
+							x: 20,
+							y: 400,
+						},
+						{
+							type: 'text',
+							content: "www.younggee.com",
+							color: '#333333',
+							size: '10px',
+							// style: 'italic',
+							width: 60,
+							height: 20,
+							x: 90,
+							y: 400,
 						},
 						// 二维码
 						{
 							type: 'qr',
 							content: this.head,
-							width: 75,
-							height: 75,
-							x: 210,
-							y: 305,
+							width: 80,
+							height: 80,
+							x: 215,
+							y: 325,
 						},
 					]
 					return tmplist
@@ -506,6 +534,7 @@
 				uni.showLoading({
 					title: '加载中'
 				});
+				await this.postlist()
 				await this.getTalentInfo();
 				await this.getProjectDetail();
 				await this.getTalentAccountInfo();
@@ -517,7 +546,6 @@
 			}
 		},
 		onLoad(options) {
-			getRouter();
 			// if (options.q) {
 			// 	let queryAll = decodeURIComponent(options.q);
 			// 	this.projectid = getQueryString(queryAll, 'id')
@@ -530,8 +558,8 @@
 			if (scene != "undefined") {
 				this.projectid = scene;
 			}
-			this.share.path = 'https://younggee.com/wxapp/specialtaskdetail?action=taskdetail&id=' + this.projectid
-			this.postlist()
+			this.share.path = 'https://younggee.com/wxapp/specialtaskdetail?action=taskdetail&id=' + this
+				.projectid
 		},
 		onReady() { // 注意：想要拿到元素实例，需要在实例已经挂载到页面上才可以
 		},
@@ -545,7 +573,7 @@
 				});
 			},
 			postlist() {
-				this.$https.post('/youngee/c/p/get-qrcode', {
+				return this.$https.post('/youngee/c/p/get-qrcode', {
 						scene: this.projectid,
 						page: 'pages/tasksquare/specialTask/specialTaskDetail',
 						// scene: this.taskid,
@@ -599,7 +627,10 @@
 					this.information = res.data.data
 					this.hasNoProjectPhoto = this.information.ProjectPhoto === null ? true : false;
 					this.information.Product = JSON.parse(res.data.data.product_snap);
-					this.information.Product.ProductPhoto = JSON.parse(res.data.data.product_photo_snap);
+					this.information.Product.ProductPhoto = JSON.parse(res.data.data
+						.product_photo_snap);
+					this.information.Product.ProductPrice = money(this.information.Product
+						.ProductPrice)
 					console.log("Product: ", this.information.Product)
 					// 分享图里的
 					for (let i = 0; i < this.information.Product.ProductPhoto.length; i++) {
@@ -612,7 +643,8 @@
 					this.share.title = this.information.project_name
 
 
-					this.information.Product.ProductType = this.product_types[parseInt(this.information.Product
+					this.information.Product.ProductType = this.product_types[parseInt(this.information
+						.Product
 						.ProductType) - 1].label
 					// 轮播图、详情图
 					this.carousel_images = []
@@ -665,10 +697,7 @@
 						"?" +
 						"project_id" +
 						"=" +
-						this.projectid +
-						"&account_id" +
-						"=" +
-						this.account[0].account_id)
+						this.projectid)
 					.then(res => {
 						if (res.data.code === 0) {
 							this.isSign = res.data.data.is_sign;
@@ -742,8 +771,7 @@
 			},
 			toggle(type) {
 				let that = this
-				if (that.talent.is_bind_info === 0 || that.talent.is_bind_location === 0 ||
-					that.account.length === 0) {
+				if (that.talent.is_bind_location === 0) {
 					// 前往个人信息绑定三合一界面
 					uni.showModal({
 						content: '请先绑定个人信息',
@@ -768,6 +796,20 @@
 							}
 						}
 					});
+				} else if (that.account.length === 0) {
+					uni.showModal({
+						content: '请先绑定社媒账号',
+						success: function(res) {
+							if (res.confirm) {
+								uni.navigateTo({
+									url: '/pages/mycenter/myinformation/bindaccount?platform_id=' +
+										that.information.project_platform
+								});
+							} else if (res.cancel) {
+								console.log('用户点击取消');
+							}
+						}
+					});
 				} else {
 					var data = {
 							projectid: that.projectid,
@@ -926,7 +968,7 @@
 	}
 
 	.wvp {
-		color: #b2b0b0;
+		color: #000;
 		margin: 0 5rpx;
 	}
 

pages/tasksquare/taskdetail.vue

@@ -23,7 +23,7 @@
 							<span>{{information.project_name}}</span>
 						</view>
 						<view class="introduction">
-							<view style="color: #b2b0b0" class="rleft">
+							<view class="rleft">
 								<p>商品价值:{{information.Product.ProductPrice}}元</p>
 							</view>
 							<view class="rright">
@@ -73,7 +73,9 @@
 						</view>
 						<view style="display: flex;margin: 10rpx 0;">
 							<p class="label">合作佣金：</p>
-							<p style="color: #f2d22d;">点击报名后显示</p>
+							<view>
+								<p style="color: red;">{{coopStrategy}}</p>
+							</view>
 						</view>
 					</view>
 				</view>
@@ -167,7 +169,7 @@
 							<view
 								style="display: flex;align-items: center;justify-content: space-between;margin-bottom: 50rpx;">
 								<view style="font-size: 30rpx;">
-									<p>商品价值：{{information.Product.ProductPrice}}RMB</p>
+									<p>商品价值：{{information.Product.ProductPrice}}元</p>
 								</view>
 								<view style="margin-right: 20rpx;font-size: 30rpx;">
 									<p>任务形式：{{information.project_form}}</p>
@@ -195,12 +197,15 @@
 										<view class="coop_box_btn"
 											:class="strategy_id===item.strategy_id?'borderColor':''"
 											@click="handleCoopClick(item)">
-											<p>粉丝量{{item.show_followers_low}}-{{item.show_followers_up}}</p>
+											<p>粉丝量：{{item.show_followers_low}}-{{item.show_followers_up}}</p>
 											<view style="display: flex;align-items: center;justify-content: center;">
-												<p>稿费-{{item.fee_form_t}}</p>
+												<p>稿费：{{item.fee_form_t}}</p>
+												<view v-if="item.fee_form===3">
+													<input class="offer_input" type="number" placeholder="请输入" 
+														v-model="item.offer"/>
+												</view>
 												<view v-if="item.fee_form===3">
-													<input class="offer_input" type="digit" placeholder="0.0"
-														v-model="item.offer" />
+													<p>元</p>
 												</view>
 											</view>
 										</view>
@@ -261,9 +266,9 @@
 
 			<uni-popup ref="popup2" class="share1" background-color="#fff" @change="change">
 				<view class="popup-content">
-					<image :src="canvasUrl" mode="widthFix" style="width: 300px;height: 400px;margin-top: 30rpx;">
+					<image :src="canvasUrl" mode="widthFix" style="width: 300px;height: 420px;margin-top: 30rpx;">
 					</image>
-					<mosoweCanvas ref="mosoweCanvasComponents" @canvasImage="_canvasImage" :lists="lists" height="400"
+					<mosoweCanvas ref="mosoweCanvasComponents" @canvasImage="_canvasImage" :lists="lists" height="420"
 						width="300" imgType="png" />
 
 					<view class="" style="text-align: center;margin: 5% 0;">
@@ -280,9 +285,9 @@
 	import mvBar from "@/components/mys_navBar/mysNavBar";
 	import zSwiper from '@/components/z-swiper/index.vue'; // npm安装
 	import {
-		getRouter,
 		getQueryString,
-		fansview
+		fansview,
+		money
 	} from '@/components/utils.js';
 	import {
 		saveImageToPhotosAlbum,
@@ -306,6 +311,7 @@
 		},
 		data() {
 			return {
+				coopStrategy: "点击报名后显示",
 				icon_copy: 'https://horastar.obs.cn-east-3.myhuaweicloud.com/talent_upload/icon-copy.png',
 				navH: getApp().globalData.navHeight,
 				canvasUrl: '',
@@ -480,7 +486,7 @@
 						fontWeight: "", // 100 - 700
 					},
 					btnType: "type2",
-					onLeftClick: '/pages/tasksquare/tasksquare',
+					onLeftClick: '',
 					/* type2 按钮 */
 					type2Config: {
 						// 左图标
@@ -531,7 +537,7 @@
 							type: 'image',
 							content: this.img,
 							width: 300,
-							height: 300,
+							height: 320,
 							x: 0,
 							y: 0,
 						},
@@ -540,51 +546,75 @@
 							type: 'text',
 							content: this.title,
 							color: '#333333',
-							size: 12,
+							weight: 'bold',
+							size: '12px',
 							width: 200,
-							height: 10,
-							x: 10,
-							y: 320,
+							height: 20,
+							x: 20,
+							y: 340,
 						},
 						// 文案1
 						{
 							type: 'text',
 							content: "招募人数：" + this.information.taskNum,
 							color: '#333333',
-							size: 10,
+							size: '10px',
 							width: 60,
-							height: 10,
-							x: 10,
-							y: 340,
+							height: 20,
+							x: 20,
+							y: 370,
 						},
 						// 文案2
 						{
 							type: 'text',
 							content: "扫码立即报名",
 							color: '#333333',
-							size: 10,
+							size: '10px',
 							width: 60,
-							height: 10,
-							x: 80,
-							y: 340,
+							height: 20,
+							x: 110,
+							y: 370,
 						},
 						// logo
+						// {
+						// 	type: 'image',
+						// 	content: this.younggee_logo,
+						// 	width: 120,
+						// 	height: 50,
+						// 	x: 10,
+						// 	y: 370,
+						// },
+						// 文案3
 						{
-							type: 'image',
-							content: this.younggee_logo,
-							width: 120,
-							height: 50,
-							x: 10,
-							y: 350,
+							type: 'text',
+							content: "发布任务请登录",
+							color: '#333333',
+							size: '10px',
+							width: 70,
+							height: 20,
+							x: 20,
+							y: 400,
+						},
+						{
+							type: 'text',
+							content: "www.younggee.com",
+							color: '#333333',
+							size: '10px',
+							// style: 'italic',
+							width: 60,
+							height: 20,
+							x: 90,
+							y: 400,
 						},
 						// 二维码
 						{
 							type: 'qr',
 							content: this.head,
-							width: 75,
-							height: 75,
-							x: 210,
-							y: 305,
+							projectid: this.projectid,
+							width: 80,
+							height: 80,
+							x: 215,
+							y: 325,
 						},
 					]
 					return tmplist
@@ -625,7 +655,6 @@
 			}
 		},
 		onLoad(options) {
-			getRouter();
 			// if (options.q) {
 			// 	let queryAll = decodeURIComponent(options.q);
 			// 	this.projectid = getQueryString(queryAll, 'id')
@@ -633,10 +662,11 @@
 			// 	this.projectid = options.id
 			// }
 			console.log(options)
-			this.projectid = options.id
 			const scene = decodeURIComponent(options.scene);
 			if (scene != "undefined") {
 				this.projectid = scene;
+			} else {
+				this.projectid = options.id
 			}
 			this.share.path = 'https://younggee.com/wxapp/taskdetail?action=taskdetail&id=' + this.projectid
 			console.log("share path: ", this.share.path)
@@ -655,6 +685,9 @@
 				});
 			},
 			postlist() {
+				// uni.showModal({
+				// 	content: "项目id为："+this.projectid,
+				// })
 				this.$https.post('/youngee/c/p/get-qrcode', {
 						scene: this.projectid,
 						page: 'pages/tasksquare/taskdetail',
@@ -725,6 +758,7 @@
 						this.hasNoProjectPhoto = this.information.ProjectPhoto === null ? true : false;
 						this.information.Product = JSON.parse(res.data.data.product_snap);
 						this.information.Product.ProductPhoto = JSON.parse(res.data.data.product_photo_snap);
+						this.information.Product.ProductPrice = money(this.information.Product.ProductPrice)
 						// 分享图里的
 						for (let i = 0; i < this.information.Product.ProductPhoto.length; i++) {
 							if (this.information.Product.ProductPhoto[i].Symbol === 1) {
@@ -736,6 +770,7 @@
 						this.share.title = this.information.project_name
 
 						this.price = this.information.Product.ProductPrice
+
 						this.information.Product.ProductType = this.product_types[parseInt(this.information
 							.Product
 							.ProductType) - 1].label
@@ -793,13 +828,12 @@
 						for (let i = 0; i < this.coop_choice.length; ++i) {
 							this.coop_choice[i].showWarning = false
 							this.coop_choice[i].warningText = "不符合报名条件"
-
+							this.coop_choice[i].offer = null
 							this.coop_choice[i].show_followers_low = fansview(this.coop_choice[i].followers_low)
 							this.coop_choice[i].show_followers_up = fansview(this.coop_choice[i].followers_up)
 							let fee_form = this.coop_choice[i].fee_form
-							this.coop_choice[i].fee_form_t = fee_form === 1 ? '产品置换' : (fee_form === 2 ? '' +
-								this
-								.coop_choice[i].t_offer + '元/人' :
+							this.coop_choice[i].fee_form_t = fee_form === 1 ? '产品置换' : (fee_form === 2 ? '固定稿费' +
+								money(this.coop_choice[i].t_offer) + '元' :
 								'创作者自报价')
 						}
 					}
@@ -832,13 +866,23 @@
 						"?" +
 						"project_id" +
 						"=" +
-						this.projectid +
-						"&account_id" +
-						"=" +
-						this.account[0].account_id)
+						this.projectid)
 					.then(res => {
+						console.log(res);
+						let task;
 						if (res.data.code === 0) {
 							this.isSign = res.data.data.is_sign;
+							task = res.data.data.task_info
+						}
+						if (this.isSign) {
+							for (let i = 0; i < this.coop_choice.length; ++i) {
+								if (this.coop_choice[i].strategy_id === task.strategy_id) {
+									let fee_form = this.coop_choice[i].fee_form
+									this.coopStrategy = fee_form === 1 ? '产品置换' : (fee_form === 2 ? '固定稿费' +
+										money(task.task_reward) + '元' :
+										'创作者自报价' + money(task.task_reward) + '元')
+								}
+							}
 						}
 					})
 			},
@@ -909,7 +953,7 @@
 			},
 			toggle(type) {
 				let that = this
-				if (that.talent.is_bind_info === 0 || that.talent.is_bind_location === 0) {
+				if ( that.talent.is_bind_location === 0) {
 					// 前往个人信息绑定三合一界面
 					uni.showModal({
 						content: '请先绑定个人信息',
@@ -933,7 +977,8 @@
 							}
 						}
 					});
-				} else if (that.account.length === 0) {
+				} 
+				else if (that.account.length === 0) {
 					uni.showModal({
 						content: '请先绑定社媒账号',
 						success: function(res) {
@@ -1002,7 +1047,7 @@
 						this.hackReset = false;
 						this.hackReset = true;
 					}, 2000)
-				} else if (this.strategy.fee_form === 3 && this.strategy.offer === 0) {
+				} 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;
@@ -1014,6 +1059,8 @@
 					}, 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,
@@ -1058,7 +1105,7 @@
 					this.$refs.popup2.open(type)
 					this.$refs.popup1.close()
 				}
-			},
+			}
 		}
 	};
 </script>
@@ -1384,12 +1431,10 @@
 
 	.rleft p {
 		font-size: 24rpx;
-		color: #999999;
 	}
 
 	.rright p {
 		font-size: 24rpx;
-		color: #999999;
 	}
 
 	.tasks {

pages/tasksquare/tasksquare.vue

@@ -82,6 +82,7 @@
 					<swiper-item v-for="item in list1" @click="pick(item)">
 						<image :src="item.img" mode="scaleToFill" style="width: 100%;height: 100%;"></image>
 					</swiper-item>
+
 				</swiper>
 			</view>
 
@@ -254,8 +255,14 @@
 					{
 						img: 'https://horastar.obs.cn-east-3.myhuaweicloud.com/talent/home7.png',
 						name: '/pages/tasksquare/cooperation'
+						// name: 'http://www.baidu.com/'
+					},
+					{
+						img: 'https://horastar.obs.cn-east-3.myhuaweicloud.com/talent_upload/guanwang.png',
+						name: '/pages/tasksquare/guanwang'
 					}
 				],
+			
 				//弹窗
 				type: 'center',
 				formData: {
@@ -593,11 +600,12 @@
 				});
 			},
 			pick(item) {
-				// console.log(item)
+				console.log(item)
 				uni.navigateTo({
 					url: item.name
 				});
 			},
+	
 			//弹出层
 			change(e) {
 				console.log('当前模式：' + e.type + ',状态：' + e.show);

pages/workspace/datarecord.vue

@@ -9,19 +9,19 @@
 				<p style="margin-bottom: 10rpx;">上传时间：{{item.create_at}}</p>
 				<view style="display: flex;margin-bottom: 10rpx;">
 					<view style="width: 400rpx;">小眼睛阅读数/播放量</view>
-					<view style="width: 100rpx;border: 1rpx;">{{item.play_number}}</view>
+					<view style="border: 1rpx;">{{item.show_play_number}}</view>
 				</view>
 				<view style="display: flex;margin-bottom: 10rpx;">
 					<view style="width: 400rpx;">点赞数</view>
-					<view style="width: 100rpx;border: 1rpx;">{{item.like_number}}</view>
+					<view style="border: 1rpx;">{{item.show_like_number}}</view>
 				</view>
 				<view style="display: flex;margin-bottom: 10rpx;">
 					<view style="width: 400rpx;">收藏数</view>
-					<view style="width: 100rpx;border: 1rpx;">{{item.collect_number}}</view>
+					<view style="border: 1rpx;">{{item.show_collect_number}}</view>
 				</view>
 				<view style="display: flex;margin-bottom: 10rpx;">
 					<view style="width: 400rpx;">评论数</view>
-					<view style="width: 100rpx;border: 1rpx;">{{item.comment_number}}</view>
+					<view style="border: 1rpx;">{{item.show_comment_number}}</view>
 				</view>
 				<!-- 图片 -->
 
@@ -36,11 +36,15 @@
 				<p>{{item.revise_opinion}}</p>
 			</view>
 		</view>
+		<view style="height: 100rpx;width: 100%;"></view>
 	</view>
 </template>
 
 <script>
 	import mvBar from "@/components/mys_navBar/mysNavBar";
+	import {
+		fansview
+	} from '@/components/utils.js';
 	export default {
 		components: {
 			mvBar,
@@ -97,6 +101,12 @@
 					.then(res => {
 						console.log(res)
 						this.List = res.data.data
+						for (let i = 0; i < this.List.length; ++i) {
+							this.List[i].show_play_number = fansview(this.List[i].play_number)
+							this.List[i].show_like_number = fansview(this.List[i].like_number)
+							this.List[i].show_collect_number = fansview(this.List[i].collect_number)
+							this.List[i].show_comment_number = fansview(this.List[i].comment_number)
+						}
 					})
 			},
 		}

pages/workspace/deliveryInformation.vue

@@ -23,29 +23,34 @@
 				</view> -->
 			</view>
 
-			<view class="logistics1" style="margin: 0 27%;">
-				<p style="margin-bottom: 10rpx;">物流公司：{{logistics.company_name}}</p>
+			<view class="logistics1">
+				<view>
+					<p style="margin-bottom: 10rpx;">物流公司：{{logistics.company_name}}</p>
+					<span style="display: flex;align-items: center;">
+						<p>物流单号：{{logistics.logistics_number}}</p>
+						<image :src="icon_copy" mode="" style="width: 40rpx;height: 40rpx;"
+							@click="handleCopy(logistics.logistics_number)" />
+					</span>
+				</view>
+			</view>
+		</view>
+
+		<view v-if="projectForm == 2" class="logistics1" style="margin: 0;">
+			<view>
 				<span style="display: flex;align-items: center;">
-					<p>物流单号：{{logistics.logistics_number}}</p>
+					<p>券码信息：{{logistics.coupon_code_information}}</p>
 					<image :src="icon_copy" mode="" style="width: 40rpx;height: 40rpx;"
-						@click="handleCopy(logistics.logistics_number)" />
+						@click="handleCopy(logistics.coupon_code_information)" />
 				</span>
 			</view>
 		</view>
 
-		<view v-if="projectForm == 2" style="margin: 0 27%;">
-			<span style="display: flex;align-items: center;">
-				<p>券码信息：{{logistics.coupon_code_information}}</p>
-				<image :src="icon_copy" mode="" style="width: 40rpx;height: 40rpx;"
-					@click="handleCopy(logistics.coupon_code_information)" />
-			</span>
-		</view>
-
-		<view v-if="projectForm == 3" style="margin: 0 10%;">
-			<p style="margin-bottom: 30rpx;">探店时间</p>
-			<p>{{logistics.explorestore_starttime}} &nbsp;&nbsp;至&nbsp;&nbsp;{{logistics.explorestore_endtime}}</p>
+		<view v-if="projectForm == 3" class="logistics1" style="margin: 0;">
+			<view>
+				<p style="margin-bottom: 30rpx;">探店时间</p>
+				<p>{{logistics.explorestore_starttime}} &nbsp;&nbsp;至&nbsp;&nbsp;{{logistics.explorestore_endtime}}</p>
+			</view>
 		</view>
-
 	</view>
 </template>
 
@@ -184,7 +189,10 @@
 	}
 
 	.logistics1 {
-		margin-left: 15%;
 		margin-top: 50rpx;
+		display: flex;
+		flex-flow: column;
+		align-items: center;
+		justify-content: center;
 	}
 </style>

pages/workspace/editaddress.vue

@@ -327,8 +327,8 @@
 		display: block;
 		cursor: pointer;
 		padding-left: 20rpx !important;
-		padding-top: 14rpx !important;
-		color: grey !important;
+		/* padding-top: 14rpx !important;
+		color: grey !important; */
 	}
 
 	/deep/.uni-forms-item__inner {
@@ -623,8 +623,8 @@
 		display: block;
 		cursor: pointer;
 		padding-left: 20rpx !important;
-		padding-top: 14rpx !important;
-		color: grey !important;
+		// padding-top: 14rpx !important;
+		// color: grey !important;
 	}
 
 	/deep/.uni-date-x--border {

pages/workspace/linkrecord.vue

@@ -19,6 +19,7 @@
 				<p>{{item.revise_opinion}}</p>
 			</view>
 		</view>
+		<view style="height: 100rpx;width: 100%;"></view>
 	</view>
 </template>
 

pages/workspace/scriptrecord.vue

@@ -16,6 +16,7 @@
 				<text>{{item.revise_opinion}}</text>
 			</view>
 		</view>
+		<view style="height: 100rpx;width: 100%;"></view>
 	</view>
 </template>
 

pages/workspace/sketchrecord.vue

@@ -1,5 +1,5 @@
 <template>
-	<view style="position: relative;">
+	<view style="position: relative">
 		<!-- 胶囊 -->
 		<mvBar :mysNavConfig="mysNavConfig"></mvBar>
 		<view :style="{marginTop:navH}"></view>
@@ -8,9 +8,12 @@
 			<view style="margin: 20rpx;">
 				<p style="margin-bottom: 10rpx;">上传时间：{{item.create_at}}</p>
 				<!-- 图片 -->
-				<view style="display: flex;" v-if="item.type == 1">
-					<view v-for="photo in item.Photo">
-						<image :src="photo.photo_url" mode="aspectFill" style="width: 150rpx;height: 150rpx;"></image>
+				<view v-if="item.type == 1">
+					<view class="image-list">
+						<!-- 图文 -->
+						<view class="image-item" v-for="photo in item.Photo">
+							<image :src="photo.photo_url" mode="aspectFill" style="width: 100%;height: 100%;"></image>
+						</view>
 					</view>
 				</view>
 				<!-- 视频 -->
@@ -26,6 +29,7 @@
 				<text>{{item.revise_opinion}}</text>
 			</view>
 		</view>
+		<view style="height: 100rpx;width: 100%;"></view>
 	</view>
 </template>
 
@@ -103,4 +107,17 @@
 		width: 100%;
 		border-bottom: 1rpx solid #dadada;
 	}
+	
+	.image-list {
+		margin: 0 2.5rpx;
+		display: flex;
+		flex-wrap: wrap;
+		// justify-content: space-between;
+	}
+	
+	.image-item {
+		width: 220rpx;
+		height: 220rpx;
+		margin: 10rpx 7.5rpx;
+	}
 </style>

pages/workspace/taskdetail.vue

@@ -54,15 +54,21 @@
 			</view>
 
 			<view class="basicInfo">
-				<image :src="product.PhotoUrl" style="width: 150rpx;height: 150rpx;" mode="">
-				</image>
-				<view class="basicInfo_txt">
-					<p style="margin-bottom: 10rpx;font-size: 35rpx;">{{project.project_name}}</p>
-					<p style="font-size: 30rpx;">商品价值：{{project.Product.showProductPrice}}元</p>
+				<view class="tpc-txt1">
+					<image :src="product.PhotoUrl" style="width: 150rpx;height: 150rpx;" mode="">
+					</image>
+					<view class="basicInfo_txt">
+						<p style="font-size: 30rpx;">{{project.project_name}}</p>
+						<!-- <p style="font-size: 30rpx;">商品价值：{{project.Product.showProductPrice}}元</p> -->
+					</view>
+				</view>
+				<view class="tpc-txt2" @click="toTaskDeatail()">
+					<p>查看</p>
+					<image class="tpc-icon" :src="picture.icon_right"></image>
 				</view>
 			</view>
 
-			<view class="keyInfo">
+			<!-- <view class="keyInfo">
 				<view style="margin-bottom: 40rpx;">
 					<p style="font-size: 36rpx;">关键任务信息</p>
 				</view>
@@ -103,9 +109,9 @@
 					</view>
 				</view>
 			</view>
-
+ -->
 			<view class="task-progress">
-				<p style="font-size: 32rpx;">任务进度</p>
+				<!-- <p style="font-size: 32rpx;">任务进度</p> -->
 				<view class="task-progress-card" v-bind:style="task.task_stage == 1 ? 'background-color: #f2d241' : ''">
 					<view class="tpc-txt1">
 						<p>报名信息</p>
@@ -116,7 +122,7 @@
 					</view>
 				</view>
 				<view class="task-progress-card"
-					v-if="(task.task_stage >= 5 && task.task_stage <= 15) || ((task.task_stage === 16 || task.task_stage === 3) && task.logistics_status >= 2) && !isSpecial"
+					v-if="((task.task_stage >= 5 && task.task_stage <= 15) || ((task.task_stage === 16 || task.task_stage === 3) && task.logistics_status >= 2)) && !isSpecial"
 					v-bind:style="task.task_stage >= 5 && task.task_stage <= 6 ? 'background-color: #f2d241' : ''">
 					<view class="tpc-txt1">
 						<p>物流信息</p>
@@ -254,7 +260,7 @@
 					<view style="padding: 10rpx 0;">
 						<p>报名时间：{{task.create_date}}</p>
 					</view>
-					<view v-if="task.task_stage > 1" style="padding: 10rpx 0;">
+					<view v-if="task.task_stage > 1 && task.task_stage != 3" style="padding: 10rpx 0;">
 						<p>确认合作：{{task.select_date}}</p>
 					</view>
 					<view v-for="(item,index) in taskLogs" style="padding: 10rpx 0;">
@@ -322,9 +328,9 @@
 					"商家将在申请截止后5天内审核完毕",
 					"请仔细查看任务要求和任务详情，开始执行任务吧！",
 					"账号未达到入选标准，请小主尝试申请其他任务吧",
-					"发货后可在任务进度中查看物流单号",
-					"请在物流进度中查看物流单号/虚拟产品兑换码",
-					"请在物流进度中查看物流单号/虚拟产品兑换码",
+					"发货后可在物流信息中查看物流单号/虚拟产品兑换码/探店时间",
+					"请在物流进度中查看物流单号/虚拟产品兑换码/探店时间",
+					"请在物流进度中查看物流单号/虚拟产品兑换码/探店时间",
 					"请在任务进度中上传拍摄脚本，商家审核通过后再进行拍摄",
 					"商家正在审核脚本，请耐心等待。",
 					"请在任务进度中上传图文/视频初稿，商家审核通过后再进行发布",
@@ -333,16 +339,16 @@
 					"商家正在审核链接，请耐心等待。",
 					"恭喜链接审核通过，请在作品发布7天后上传作品数据。",
 					"商家正在审核数据，请耐心等待。",
-					"本项目已结案，可申请佣金提现。",
+					"本任务已结案，可申请佣金提现。",
 					"长时间未上传，任务已终止。",
 				],
 				infoMsg3: [
 					"企业将在5个工作日内完成核对账号信息，请耐心等待",
 					"请仔细查看任务要求和任务详情，开始执行任务吧！",
 					"账号非企业定向邀请账号，请小主尝试申请其他任务吧",
-					"发货后可在任务进度中查看物流单号",
-					"请在物流进度中查看物流单号/虚拟产品兑换码",
-					"请在物流进度中查看物流单号/虚拟产品兑换码",
+					"发货后可在物流信息中查看物流单号/虚拟产品兑换码/探店时间",
+					"请在物流进度中查看物流单号/虚拟产品兑换码/探店时间",
+					"请在物流进度中查看物流单号/虚拟产品兑换码/探店时间",
 					"请在任务进度中上传拍摄脚本，商家审核通过后再进行拍摄",
 					"请在任务进度中上传拍摄脚本，商家审核通过后再进行拍摄",
 					"请在任务进度中上传图文/视频初稿，商家审核通过后再进行发布",
@@ -351,7 +357,7 @@
 					"恭喜作品审核通过，请及时发布并在任务进度中上传发布链接。",
 					"恭喜链接审核通过，请在作品发布7天后上传作品数据。",
 					"恭喜链接审核通过，请在作品发布7天后上传作品数据。",
-					"本项目已结案，可申请佣金提现。",
+					"本任务已结案，可前往任务大厅查看报名其他任务。",
 					"长时间未上传，任务已终止。",
 				],
 				platform: [
@@ -731,7 +737,7 @@
 					this.project = res.data.data.project_detail
 					this.project.Product = JSON.parse(res.data.data.project_detail.product_snap);
 					this.project.Product.showProductPrice = money(this.project.Product.ProductPrice)
-					
+
 					let ProductPhoto = JSON.parse(res.data.data.project_detail.product_photo_snap);
 					for (let j = 0; j < ProductPhoto.length; ++j) {
 						if (ProductPhoto[j].Symbol == 1) {
@@ -748,7 +754,7 @@
 							.fee_form ===
 							2 ?
 							'固定稿费 ' +
-							this.task.task_reward : '创作者自报价 ' + this.task.task_reward)
+							money(this.task.task_reward) : '创作者自报价 ' + money(this.task.task_reward))
 					}
 
 
@@ -880,6 +886,17 @@
 					url: '/pages/workspace/datarecord?textObj=' + encodeURIComponent(data)
 				});
 			},
+			toTaskDeatail() {
+				if (this.isSpecial) {
+					uni.navigateTo({
+						url: '/pages/tasksquare/specialTask/specialTaskDetail?id=' + this.project.project_id
+					});
+				} else {
+					uni.navigateTo({
+						url: '/pages/tasksquare/taskdetail?id=' + this.project.project_id
+					});
+				}
+			},
 			toApplyinfo() {
 				var data = {
 					account: this.account,
@@ -1038,13 +1055,40 @@
 
 	.basicInfo {
 		display: flex;
+		align-items: center;
+		justify-content: center;
 		margin-top: 20rpx;
-		padding: 20rpx 40rpx;
+		padding: 20rpx;
+		font-size: 30rpx;
 		background-color: #FFFFFF;
 
 		.basicInfo_txt {
+			display: flex;
+			align-items: center;
+			justify-content: center;
 			margin-left: 40rpx;
-			padding-top: 20rpx;
+			// padding-top: 20rpx;
+		}
+
+		.tpc-txt1 {
+			display: flex;
+			justify-content: flex-start;
+			// margin-left: 20rpx;
+
+		}
+
+		.tpc-txt2 {
+			display: flex;
+			align-items: center;
+			justify-content: flex-end;
+			padding-right: 10rpx;
+			// margin-right: 20rpx;
+			flex: 1;
+
+			.tpc-icon {
+				width: 30rpx;
+				height: 30rpx;
+			}
 		}
 	}
 

pages/workspace/uploaddata.vue

@@ -12,32 +12,68 @@
 			</view>
 		</view>
 		<view v-if="!loading && !onlyShow">
-			<view style="margin: 40rpx;">
+			<view style="margin: 40rpx 20rpx;">
 				<uni-forms :modelValue="formData" validate-trigger="bind" err-show-type="undertext" label-width="150">
 					<uni-forms-item name="play_number" label="小眼睛阅读数/播放量">
-						<uni-easyinput type="digit" maxlength=10 :inputBorder="false" v-model="formData.play_number"
-							placeholder="输入">
-						</uni-easyinput>
+						<view class="number-inupt">
+							<uni-easyinput type="number" v-model="playsCount" :inputBorder="false" placeholder="输入"
+								style="width:200rpx" v-if="playsCountInfo === 1" @input="onInput1">
+							</uni-easyinput>
+							<uni-easyinput type="digit" v-model="playsCount" :inputBorder="false" placeholder="输入"
+								style="width:200rpx" v-else @input="onInput2">
+							</uni-easyinput>
+							<picker @change="bindPickerChange1" :value="index" :range="Range" range-key="label"
+								style="z-index: 999;background-color: #fcdf41;padding: 0 10rpx;border-radius: 5rpx;">
+								<view>{{ playsLabel }}</view>
+							</picker>
+						</view>
 					</uni-forms-item>
 					<uni-forms-item name="like_number" label="点赞数">
-						<uni-easyinput type="digit" maxlength=10 :inputBorder="false" v-model="formData.like_number"
-							placeholder="输入">
-						</uni-easyinput>
+						<view class="number-inupt">
+							<uni-easyinput type="number" v-model="likesCount" :inputBorder="false" placeholder="输入"
+								style="width:200rpx" v-if="likesCountInfo === 1" @input="onInput3">
+							</uni-easyinput>
+							<uni-easyinput type="digit" v-model="likesCount" :inputBorder="false" placeholder="输入"
+								style="width:200rpx" v-else @input="onInput4">
+							</uni-easyinput>
+							<picker @change="bindPickerChange2" :value="index2" :range="Range" range-key="label"
+								style="z-index: 999;background-color: #fcdf41;padding: 0 10rpx;border-radius: 5rpx;">
+								<view>{{ likesLabel }}</view>
+							</picker>
+						</view>
 					</uni-forms-item>
 					<uni-forms-item name="collect_number" label="收藏数">
-						<uni-easyinput type="digit" maxlength=10 :inputBorder="false" v-model="formData.collect_number"
-							placeholder="输入">
-						</uni-easyinput>
+						<view class="number-inupt">
+							<uni-easyinput type="number" v-model="collectsCount" :inputBorder="false" placeholder="输入"
+								style="width:200rpx" v-if="collectsCountInfo === 1" @input="onInput5">
+							</uni-easyinput>
+							<uni-easyinput type="digit" v-model="collectsCount" :inputBorder="false" placeholder="输入"
+								style="width:200rpx" v-else @input="onInput6">
+							</uni-easyinput>
+							<picker @change="bindPickerChange3" :value="index3" :range="Range" range-key="label"
+								style="z-index: 999;background-color: #fcdf41;padding: 0 10rpx;border-radius: 5rpx;">
+								<view>{{ collectsLabel }}</view>
+							</picker>
+						</view>
 					</uni-forms-item>
 					<uni-forms-item name="comment_number" label="评论数">
-						<uni-easyinput type="digit" maxlength=10 :inputBorder="false" v-model="formData.comment_number"
-							placeholder="输入">
-						</uni-easyinput>
+						<view class="number-inupt">
+							<uni-easyinput type="number" v-model="commentsCount" :inputBorder="false" placeholder="输入"
+								style="width:200rpx" v-if="commentsCountInfo === 1" @input="onInput7">
+							</uni-easyinput>
+							<uni-easyinput type="digit" v-model="commentsCount" :inputBorder="false" placeholder="输入"
+								style="width:200rpx" v-else @input="onInput8">
+							</uni-easyinput>
+							<picker @change="bindPickerChange4" :value="index4" :range="Range" range-key="label"
+								style="z-index: 999;background-color: #fcdf41;padding: 0 10rpx;border-radius: 5rpx;">
+								<view>{{ commentsLabel }}</view>
+							</picker>
+						</view>
 					</uni-forms-item>
 				</uni-forms>
 			</view>
 
-			<view style="margin: 0 40rpx;">
+			<view style="margin: 0 20rpx;">
 				<p style="font-size: 14px;margin-bottom: 20rpx;">上传小眼睛阅读数/播放量截图</p>
 				<htz-image-upload :max="1" mediaType="image" name="file" :chooseNum="1" v-model="imageData"
 					@chooseSuccess="ceshiChooseSuccess1">
@@ -54,19 +90,19 @@
 			<view style="margin: 20rpx;">
 				<view style="display: flex;margin-bottom: 10rpx;">
 					<view style="width: 400rpx;">小眼睛阅读数/播放量</view>
-					<view style="width: 100rpx;border: 1rpx;">{{formData.show_play_number}}</view>
+					<view style="border: 1rpx;">{{formData.show_play_number}}</view>
 				</view>
 				<view style="display: flex;margin-bottom: 10rpx;">
 					<view style="width: 400rpx;">点赞数</view>
-					<view style="width: 100rpx;border: 1rpx;">{{formData.show_like_number}}</view>
+					<view style="border: 1rpx;">{{formData.show_like_number}}</view>
 				</view>
 				<view style="display: flex;margin-bottom: 10rpx;">
 					<view style="width: 400rpx;">收藏数</view>
-					<view style="width: 100rpx;border: 1rpx;">{{formData.show_collect_number}}</view>
+					<view style="border: 1rpx;">{{formData.show_collect_number}}</view>
 				</view>
 				<view style="display: flex;margin-bottom: 10rpx;">
 					<view style="width: 400rpx;">评论数</view>
-					<view style="width: 100rpx;border: 1rpx;">{{formData.show_comment_number}}</view>
+					<view style="border: 1rpx;">{{formData.show_comment_number}}</view>
 				</view>
 				<!-- 图片 -->
 
@@ -94,6 +130,10 @@
 		},
 		data() {
 			return {
+				hasClicked1: false,
+				hasClicked2: false,
+				hasClicked3: false,
+				hasClicked4: false,
 				onlyShow: false,
 				loading: true,
 				navH: getApp().globalData.navHeight,
@@ -110,6 +150,39 @@
 					show_collect_number: "",
 					show_commet_number: "",
 				},
+
+				index1: 0,
+				playsLabel: "选择单位",
+				playsCount: null,
+				playsCountInfo: 1,
+				index2: 0,
+				likesLabel: "选择单位",
+				likesCount: null,
+				likesCountInfo: 1,
+				index3: 0,
+				collectsLabel: "选择单位",
+				collectsCount: null,
+				collectsCountInfo: 1,
+				index4: 0,
+				commentsLabel: "选择单位",
+				commentsCount: null,
+				commentsCountInfo: 1,
+				Range: [{
+						value: 1,
+						label: '个'
+					},
+					{
+						value: 10000,
+						label: '万'
+					},
+					{
+						value: 100000000,
+						label: '亿'
+					}
+				],
+
+
+
 				// rules: {
 				// 	// 对play_number字段进行必填验证
 				// 	play_number: {
@@ -239,14 +312,38 @@
 
 			submit() {
 				// 校验
-				if (this.formData.play_number == "" || this.formData.like_number == "" || this.formData.collect_number ==
-					"" || this.formData.comment_number == "") {
+				if (this.playsCount == null || this.playsCount * this.playsCountInfo < 0 || this.playsLabel == "选择单位") {
+					uni.showToast({
+						title: '请输入正确播放量',
+						icon: 'none'
+					})
+					return
+				}
+				this.formData.play_number = this.playsCount * this.playsCountInfo
+				if (this.likesCount == null || this.likesCount * this.likesCountInfo < 0 || this.likesLabel == "选择单位") {
+					uni.showToast({
+						title: '请输入正确点赞数',
+						icon: 'none'
+					})
+					return
+				}
+				this.formData.like_number = this.likesCount * this.likesCountInfo
+				if (this.collectsCount == null || this.collectsCount * this.collectsCountInfo < 0 || this.collectsLabel == "选择单位") {
+					uni.showToast({
+						title: '请输入正确收藏数',
+						icon: 'none'
+					})
+					return
+				}
+				this.formData.collect_number = this.collectsCount * this.collectsCountInfo
+				if (this.commentsCount == null || this.commentsCount * this.commentsCountInfo < 0 || this.commentsLabel == "选择单位") {
 					uni.showToast({
-						title: '请输入10位以内的数字',
+						title: '请输入正确评论数',
 						icon: 'none'
 					})
 					return
 				}
+				this.formData.comment_number = this.commentsCount * this.commentsCountInfo
 
 				if (this.imageData.length == 0) {
 					uni.showToast({
@@ -376,10 +473,180 @@
 					return v.toString(16);
 				});
 			},
+			// 量级选择
+			bindPickerChange1: function(e) {
+				if (this.index1 !== e.detail.value) {
+					this.playsCount = null
+				}
+				this.index1 = e.detail.value;
+				this.playsLabel = this.Range[this.index1].label
+				this.playsCountInfo = this.Range[this.index1].value
+				console.log(this.playsCountInfo, this.playsLabel)
+			},
+			// 量级选择
+			bindPickerChange2: function(e) {
+				if (this.index2 !== e.detail.value) {
+					this.likesCount = null
+				}
+				this.index2 = e.detail.value;
+				this.likesLabel = this.Range[this.index2].label
+				this.likesCountInfo = this.Range[this.index2].value
+				console.log(this.likesCountInfo, this.likesLabel)
+			},
+			// 量级选择
+			bindPickerChange3: function(e) {
+				if (this.index3 !== e.detail.value) {
+					this.collectsCount = null
+				}
+				this.index3 = e.detail.value;
+				this.collectsLabel = this.Range[this.index3].label
+				this.collectsCountInfo = this.Range[this.index3].value
+				console.log(this.collectsCountInfo, this.collectsLabel)
+			},
+			// 量级选择
+			bindPickerChange4: function(e) {
+				if (this.index4 !== e.detail.value) {
+					this.commentsCount = null
+				}
+				this.index4 = e.detail.value;
+				this.commentsLabel = this.Range[this.index4].label
+				this.commentsCountInfo = this.Range[this.index4].value
+				console.log(this.commentsCountInfo, this.commentsLabel)
+			},
+			onInput1(e) {
+				// 验证是否是纯数字
+				const isNumber = /^\d*$/.test(e)
+				// 过滤非数字
+				e = e.replace(/\D/g, '')
+				if (!isNumber || e < 0 || e > 9999) {
+					uni.showToast({
+						title: '请输入[0,9999]区间的整数',
+						icon: 'none'
+					})
+					console.log('请输入[0,9999]区间的整数')
+				}
+				this.$nextTick(() => {
+					this.playsCount = (e >= 0 && e <= 9999 && e.match(/^\d*/g)[0]) ? e : null
+				})
+			},
+			onInput2(e) {
+				console.log(e)
+				e = (e.match(/^\d*(\.?\d{0,1})/g)[0]) || null
+				// //重新赋值给input
+				if (e < 0 || e > 9999.9) {
+					uni.showToast({
+						title: '请输入[1,9999.9]区间内的数',
+						icon: 'none'
+					})
+					console.log('请输入[1,9999.9]区间内的数')
+				}
+				this.$nextTick(() => {
+					this.playsCount = (e > 0 && e <= 9999.9) ? e : null
+				})
+			},
+			onInput3(e) {
+				// 验证是否是纯数字
+				const isNumber = /^\d*$/.test(e)
+				// 过滤非数字
+				e = e.replace(/\D/g, '')
+				if (!isNumber || e < 0 || e > 9999) {
+					uni.showToast({
+						title: '请输入[0,9999]区间的整数',
+						icon: 'none'
+					})
+					console.log('请输入[0,9999]区间的整数')
+				}
+				this.$nextTick(() => {
+					this.likesCount = (e >= 0 && e <= 9999 && e.match(/^\d*/g)[0]) ? e : null
+				})
+			},
+			onInput4(e) {
+				console.log(e)
+				e = (e.match(/^\d*(\.?\d{0,1})/g)[0]) || null
+				// //重新赋值给input
+				if (e < 0 || e > 9999.9) {
+					uni.showToast({
+						title: '请输入[1,9999.9]区间内的数',
+						icon: 'none'
+					})
+					console.log('请输入[1,9999.9]区间内的数')
+				}
+				this.$nextTick(() => {
+					this.likesCount = (e > 0 && e <= 9999.9) ? e : null
+				})
+			},
+			onInput5(e) {
+				// 验证是否是纯数字
+				const isNumber = /^\d*$/.test(e)
+				// 过滤非数字
+				e = e.replace(/\D/g, '')
+				if (!isNumber || e < 0 || e > 9999) {
+					uni.showToast({
+						title: '请输入[0,9999]区间的整数',
+						icon: 'none'
+					})
+					console.log('请输入[0,9999]区间的整数')
+				}
+				this.$nextTick(() => {
+					this.collectsCount = (e >= 0 && e <= 9999 && e.match(/^\d*/g)[0]) ? e : null
+				})
+			},
+			onInput6(e) {
+				console.log(e)
+				e = (e.match(/^\d*(\.?\d{0,1})/g)[0]) || null
+				// //重新赋值给input
+				if (e < 0 || e > 9999.9) {
+					uni.showToast({
+						title: '请输入[1,9999.9]区间内的数',
+						icon: 'none'
+					})
+					console.log('请输入[1,9999.9]区间内的数')
+				}
+				this.$nextTick(() => {
+					this.collectsCount = (e > 0 && e <= 9999.9) ? e : null
+				})
+			},
+			onInput7(e) {
+				// 验证是否是纯数字
+				const isNumber = /^\d*$/.test(e)
+				// 过滤非数字
+				e = e.replace(/\D/g, '')
+				if (!isNumber || e < 0 || e > 9999) {
+					uni.showToast({
+						title: '请输入[0,9999]区间的整数',
+						icon: 'none'
+					})
+					console.log('请输入[0,9999]区间的整数')
+				}
+				this.$nextTick(() => {
+					this.commentsCount = (e >= 0 && e <= 9999 && e.match(/^\d*/g)[0]) ? e : null
+				})
+			},
+			onInput8(e) {
+				console.log(e)
+				e = (e.match(/^\d*(\.?\d{0,1})/g)[0]) || null
+				// //重新赋值给input
+				if (e < 0 || e > 9999.9) {
+					uni.showToast({
+						title: '请输入[1,9999.9]区间内的数',
+						icon: 'none'
+					})
+					console.log('请输入[1,9999.9]区间内的数')
+				}
+				this.$nextTick(() => {
+					this.commentsCount = (e > 0 && e <= 9999.9) ? e : null
+				})
+			}
 		}
 	}
 </script>
-
+<style>
+	/deep/ .uni-forms-item__content {
+		display: flex !important;
+		align-items: center !important;
+		/* justify-content: space-between; */
+	}
+</style>
 <style lang="scss" scoped>
 	.signup {
 		box-shadow: 0rpx 5rpx 40rpx #ccc;
@@ -408,4 +675,9 @@
 		}
 
 	}
+
+	.number-inupt {
+		display: flex !important;
+		align-items: center !important;
+	}
 </style>

pages/workspace/uploadlink.vue

@@ -36,8 +36,8 @@
 			<view style="margin: 20rpx;">
 				<!-- 图片 -->
 				<p>{{link_url}}</p>
-				<view style="display: flex;">
-					<image :src="imageData" mode="aspectFit"></image>
+				<view>
+					<image :src="imageData" mode="scaleToFill"></image>
 				</view>
 			</view>
 		</view>

pages/workspace/uploadscript.vue

@@ -14,21 +14,23 @@
 
 		<view v-if="!loading && !onlyShow">
 			<!-- 多行输入框 -->
-			<uni-easyinput type="text" :inputBorder="false" v-model="title" placeholder="在此填写让人眼前一亮的标题吧"
-				:placeholderStyle="placeholderStyle">
-			</uni-easyinput>
-			<view style="padding: 40rpx 30rpx 150rpx;font-size: 16px">
-				<textarea v-model="text" maxlength="5000" auto-height="true" placeholder="在此编辑发布脚本/粘贴文字" />
+			<view style="padding: 20rpx 30rpx 0;">
+				<uni-easyinput type="text" :inputBorder="false" v-model="title" placeholder="在此填写让人眼前一亮的标题吧"
+					:placeholderStyle="placeholderStyle">
+				</uni-easyinput>
+			</view>
+			<view style="padding: 40rpx 30rpx 150rpx;font-size: 30rpx;">
+				<textarea v-model="text" maxlength="5000" auto-height="true" placeholder="添加正文(任务未要求可不填写进行提交)" />
 			</view>
 			<view class="signup">
 				<button type="default" class="but1" :loading="loading" @click="submit()">
 					提交脚本</button>
 			</view>
 		</view>
-		
-		<view v-if="onlyShow">
-			<p style="font-size: 16px">{{title}}</p>
-			<view style="padding: 40rpx 30rpx 150rpx;font-size: 12px">
+
+		<view v-if="onlyShow" style="width: 100%;">
+			<p style="font-size: 30rpx;padding: 20rpx 30rpx 0 ;">{{title}}</p>
+			<view style="padding: 40rpx 30rpx 150rpx;font-size: 30rpx;">
 				<text> {{text}}</text>
 			</view>
 		</view>
@@ -45,7 +47,7 @@
 			return {
 				onlyShow: false,
 				loading: true,
-				placeholderStyle: "font-size:16px",
+				placeholderStyle: "font-size: 30rpx;",
 				navH: getApp().globalData.navHeight,
 				taskId: "",
 				title: "",
@@ -118,20 +120,20 @@
 
 			async submit() {
 				// 检验标题和内容是否为空
-				if (this.title == '') {
-					uni.showToast({
-						title: "请填写脚本标题",
-						icon: 'none'
-					})
-					return
-				}
-				if (this.text == '') {
-					uni.showToast({
-						title: "请填写脚本内容",
-						icon: 'none'
-					})
-					return
-				}
+				// if (this.title == '') {
+				// 	uni.showToast({
+				// 		title: "请填写脚本标题",
+				// 		icon: 'none'
+				// 	})
+				// 	return
+				// }
+				// if (this.text == '') {
+				// 	uni.showToast({
+				// 		title: "请填写脚本内容",
+				// 		icon: 'none'
+				// 	})
+				// 	return
+				// }
 				let that = this
 				uni.showModal({
 					title: '提示',
@@ -166,6 +168,14 @@
 	}
 </script>
 
+<style>
+	/deep/ .uni-easyinput__content-input {
+		font-size: 30rpx !important;
+		padding: 0 !important;
+	}
+</style>
+
+
 <style lang="scss" scoped>
 	.signup {
 		box-shadow: 0rpx 5rpx 40rpx #ccc;

pages/workspace/uploadsketch.vue

@@ -8,7 +8,7 @@
 				<image style="height: 60rpx;width: 60rpx;" src="../../static/img/icon-clock.png"></image>
 			</view>
 			<view style="display: flex;justify-content: center;">
-				<p style="font-size: 32rpx;">查看修改/反馈记录</p>
+				<p style="font-size: 30rpx;">查看修改/反馈记录</p>
 			</view>
 		</view>
 
@@ -35,11 +35,13 @@
 				</htz-image-upload>
 			</view>
 
-			<uni-easyinput type="text" :inputBorder="false" v-model="title" placeholder="在此填写让人眼前一亮的标题吧"
-				:placeholderStyle="placeholderStyle">
-			</uni-easyinput>
+			<view style="padding: 20rpx 30rpx 0;">
+				<uni-easyinput type="text" :inputBorder="false" v-model="title" placeholder="在此填写让人眼前一亮的标题吧"
+					:placeholderStyle="placeholderStyle">
+				</uni-easyinput>
+			</view>
 			<!-- 多行输入框 -->
-			<view style="padding: 40rpx 20rpx 150rpx;font-size: 16px">
+			<view style="padding: 40rpx 30rpx 150rpx;font-size: 30rpx;">
 				<textarea v-model="text" maxlength="2000" auto-height="true" placeholder="添加正文" />
 			</view>
 			<view class="signup">
@@ -50,19 +52,24 @@
 		</view>
 
 		<view v-if="!loading && onlyShow">
-			<view style="margin: 20rpx; 50rpx">
-				<!-- 图文 -->
-				<view style="display: flex;" v-if="activeRadio == '图文'">
-					<view v-for="photo in imageData">
-						<image :src="photo" mode="aspectFill" style="width: 150rpx;height: 150rpx;"></image>
+			<view v-if="activeRadio == '图文'">
+				<view class="image-list">
+					<!-- 图文 -->
+					<view class="image-item" v-for="photo in imageData">
+						<image :src="photo" mode="aspectFill" style="width: 100%;height: 100%;"
+							@click="handlePreviewImage1(photo)"></image>
 					</view>
 				</view>
-				<!-- 视频 -->
-				<view style="display: flex;" v-if="activeRadio == '视频'">
-					<video :src="videoData[0]"></video>
+			</view>
+			<!-- 视频 -->
+			<view style="display: flex;align-items: center;justify-content: center;" v-if="activeRadio == '视频'">
+				<video :src="videoData[0]"></video>
+			</view>
+			<view>
+				<p style="font-size: 30rpx;padding: 20rpx 30rpx 0 ;">{{title}}</p>
+				<view style="padding: 40rpx 30rpx 150rpx;font-size: 30rpx;">
+					<text style="font-size: 30rpx;"> {{text}}</text>
 				</view>
-				<p style="font-size: 16px">{{title}}</p>
-				<text style="font-size: 12px">{{text}}</text>
 			</view>
 		</view>
 	</view>
@@ -82,7 +89,7 @@
 			return {
 				onlyShow: false,
 				loading: true,
-				placeholderStyle: "font-size:16px",
+				placeholderStyle: "font-size: 30rpx;",
 				navH: getApp().globalData.navHeight,
 				taskId: "",
 				title: "",
@@ -131,6 +138,14 @@
 				this.activeRadio = e.detail.value;
 				console.log(this.activeRadio);
 			},
+			handlePreviewImage1(item) {
+				console.log("image src: ", item)
+				let that = this
+				wx.previewImage({
+					current: item, // 当前显示图片的http链接
+					urls: that.imageData // 需要预览的图片http链接列表
+				})
+			},
 			async getSketch() {
 				this.loading = true
 				uni.showLoading({
@@ -415,6 +430,13 @@
 	}
 </script>
 
+<style>
+	/deep/ .uni-easyinput__content-input {
+		font-size: 30rpx !important;
+		padding: 0 !important;
+	}
+</style>
+
 <style lang="scss" scoped>
 	.signup {
 		box-shadow: 0rpx 5rpx 40rpx #ccc;
@@ -428,6 +450,19 @@
 		z-index: 99;
 	}
 
+	.image-list {
+		margin: 0 22.5rpx;
+		display: flex;
+		flex-wrap: wrap;
+		// justify-content: space-between;
+	}
+
+	.image-item {
+		width: 220rpx;
+		height: 220rpx;
+		margin: 10rpx 7.5rpx;
+	}
+
 	.but1 {
 		width: 60%;
 		background-color: #f2d22d;

pages/workspace/workspace.vue

@@ -21,7 +21,7 @@
 					<p v-bind:class="showList3?'lor':'unlor'">待传链接</p>
 				</view>
 				<span class="point" v-if="showPoint3" key="2"></span>
-			</view> 
+			</view>
 			<view class="menu-item" @click="toShow4()">
 				<view class="menu-item-p">
 					<p v-bind:class="showList4?'lor':'unlor'">待传数据</p>
@@ -195,7 +195,6 @@
 			this.token = uni.getStorageSync('token')
 			await this.$https.get('/youngee/c/t/g/is-login')
 				.then(res => {
-					console.log(res)
 					if (res.data.code == 403) {
 						this.token = ""
 						uni.clearStorage();
@@ -206,7 +205,8 @@
 				this.showList3 = false;
 				this.showList4 = false;
 				this.showList1 = true;
-				this.getList();
+				this.getList(1);
+				// this.getExeNum();
 			} else {
 				uni.showModal({
 					content: '请先登录',
@@ -219,77 +219,71 @@
 			}
 		},
 		methods: {
-			async getList() {
+			// getExeNum() {
+			// 	return this.$https.get('/youngee/c/t/g/get-task-exe-num')
+			// 		.then(res => {
+			// 			if (res.data.data != null) {
+			// 				let nums = res.data.data
+
+			// 				this.showPoint1 = false
+			// 				this.showPoint2 = false
+			// 				this.showPoint3 = false
+			// 				this.showPoint4 = false
+			// 				for (let i = 0; i < nums.length; ++i) {
+			// 					if (nums[i].task_stage == 7 && nums[i]["COUNT(*)"] != 0) {
+			// 						this.showPoint1 = true
+			// 					}
+			// 					if (nums[i].task_stage == 9 && nums[i]["COUNT(*)"] != 0) {
+			// 						this.showPoint2 = true
+			// 					}
+			// 					if (nums[i].task_stage == 11 && nums[i]["COUNT(*)"] != 0) {
+			// 						this.showPoint3 = true
+			// 					}
+			// 					if (nums[i].task_stage == 13 && nums[i]["COUNT(*)"] != 0) {
+			// 						this.showPoint4 = true
+			// 					}
+			// 				}
+
+			// 			}
+			// 		});
+			// },
+			async getList(value) {
 				this.loading = true
 				uni.showLoading({
 					title: '加载中'
 				});
-				var taskList = [];
-				this.showPoint1 = false
-				this.showPoint2 = false
-				this.showPoint3 = false
-				this.showPoint4 = false
-				await this.$https.get('/youngee/c/t/g/get-task-exe-list').then(res => {
-					console.log(res)
-					taskList = res.data.data.list1
-					if (taskList != null) {
-						this.showPoint1 = true
-						for (let i = 0; i < taskList.length; ++i) {
-							let productPhoto = JSON.parse(taskList[i].product_photo_snap);
-							for (let j = 0; j < productPhoto.length; j++) {
-								if (productPhoto[j].Symbol == 1) {
-									taskList[i].product_img_url = productPhoto[j].PhotoUrl
+				this.$https.get('/youngee/c/t/g/get-task-exe-num')
+					.then(res => {
+						if (res.data.data != null) {
+							let nums = res.data.data
+							this.showPoint1 = false
+							this.showPoint2 = false
+							this.showPoint3 = false
+							this.showPoint4 = false
+							for (let i = 0; i < nums.length; ++i) {
+								if (nums[i].task_stage == 7 && nums[i]["COUNT(*)"] != 0) {
+									this.showPoint1 = true
 								}
-							}
-
-							if ((taskList[i].task_stage == 7 && taskList[i].script_status == 3) ||
-								(taskList[i].task_stage == 9 && taskList[i].sketch_status == 3) ||
-								(taskList[i].task_stage == 11 && taskList[i].link_status == 3) ||
-								(taskList[i].task_stage == 13 && taskList[i].data_status == 3)) {
-								taskList[i].isShowModify = true
-							} else {
-								taskList[i].isShowModify = false
-							}
-							for (let j = 0; j < this.taskStageList.length; ++j) {
-								if (taskList[i].task_stage == this.taskStageList[j]
-									.task_stage_id)
-									taskList[i].task_stage_txt = this.taskStageList[j]
-									.task_stage
-							}
-						}
-					}
-					this.List1 = taskList;
-					taskList = res.data.data.list2
-					if (taskList != null) {
-						this.showPoint2 = true
-						for (let i = 0; i < taskList.length; ++i) {
-							let productPhoto = JSON.parse(taskList[i].product_photo_snap);
-							for (let j = 0; j < productPhoto.length; j++) {
-								if (productPhoto[j].Symbol == 1) {
-									taskList[i].product_img_url = productPhoto[j].PhotoUrl
+								if (nums[i].task_stage == 9 && nums[i]["COUNT(*)"] != 0) {
+									this.showPoint2 = true
+								}
+								if (nums[i].task_stage == 11 && nums[i]["COUNT(*)"] != 0) {
+									this.showPoint3 = true
+								}
+								if (nums[i].task_stage == 13 && nums[i]["COUNT(*)"] != 0) {
+									this.showPoint4 = true
 								}
-							}
-
-							if ((taskList[i].task_stage == 7 && taskList[i].script_status == 3) ||
-								(taskList[i].task_stage == 9 && taskList[i].sketch_status == 3) ||
-								(taskList[i].task_stage == 11 && taskList[i].link_status == 3) ||
-								(taskList[i].task_stage == 13 && taskList[i].data_status == 3)) {
-								taskList[i].isShowModify = true
-							} else {
-								taskList[i].isShowModify = false
-							}
-							for (let j = 0; j < this.taskStageList.length; ++j) {
-								if (taskList[i].task_stage == this.taskStageList[j]
-									.task_stage_id)
-									taskList[i].task_stage_txt = this.taskStageList[j]
-									.task_stage
 							}
 						}
-					}
-					this.List2 = taskList;
-					taskList = res.data.data.list3
+					});
+				var taskList = [];
+				await this.$https.get('/youngee/c/t/g/get-task-exe-list' +
+					"?" +
+					"taskStage" +
+					"=" +
+					value).then(res => {
+					taskList = res.data.data.list1
 					if (taskList != null) {
-						this.showPoint3 = true
 						for (let i = 0; i < taskList.length; ++i) {
 							let productPhoto = JSON.parse(taskList[i].product_photo_snap);
 							for (let j = 0; j < productPhoto.length; j++) {
@@ -314,36 +308,137 @@
 							}
 						}
 					}
-					
-					this.List3 = taskList;
-					taskList = res.data.data.list4
-					if (taskList != null) {
-						this.showPoint4 = true
-						for (let i = 0; i < taskList.length; ++i) {
-							let productPhoto = JSON.parse(taskList[i].product_photo_snap);
-							for (let j = 0; j < productPhoto.length; j++) {
-								if (productPhoto[j].Symbol == 1) {
-									taskList[i].product_img_url = productPhoto[j].PhotoUrl
-								}
-							}
 
-							if ((taskList[i].task_stage == 7 && taskList[i].script_status == 3) ||
-								(taskList[i].task_stage == 9 && taskList[i].sketch_status == 3) ||
-								(taskList[i].task_stage == 11 && taskList[i].link_status == 3) ||
-								(taskList[i].task_stage == 13 && taskList[i].data_status == 3)) {
-								taskList[i].isShowModify = true
-							} else {
-								taskList[i].isShowModify = false
-							}
-							for (let j = 0; j < this.taskStageList.length; ++j) {
-								if (taskList[i].task_stage == this.taskStageList[j]
-									.task_stage_id)
-									taskList[i].task_stage_txt = this.taskStageList[j]
-									.task_stage
-							}
-						}
+					switch (value) {
+						case 1:
+							this.List1 = taskList;
+							break;
+						case 2:
+							this.List2 = taskList;
+							break;
+						case 3:
+							this.List3 = taskList;
+							break;
+						case 4:
+							this.List4 = taskList;
+							break;
+						default:
+							break;
 					}
-					this.List4 = taskList;
+
+					// taskList = res.data.data.list1
+					// if (taskList != null) {
+					// 	this.showPoint1 = true
+					// 	for (let i = 0; i < taskList.length; ++i) {
+					// 		let productPhoto = JSON.parse(taskList[i].product_photo_snap);
+					// 		for (let j = 0; j < productPhoto.length; j++) {
+					// 			if (productPhoto[j].Symbol == 1) {
+					// 				taskList[i].product_img_url = productPhoto[j].PhotoUrl
+					// 			}
+					// 		}
+
+					// 		if ((taskList[i].task_stage == 7 && taskList[i].script_status == 3) ||
+					// 			(taskList[i].task_stage == 9 && taskList[i].sketch_status == 3) ||
+					// 			(taskList[i].task_stage == 11 && taskList[i].link_status == 3) ||
+					// 			(taskList[i].task_stage == 13 && taskList[i].data_status == 3)) {
+					// 			taskList[i].isShowModify = true
+					// 		} else {
+					// 			taskList[i].isShowModify = false
+					// 		}
+					// 		for (let j = 0; j < this.taskStageList.length; ++j) {
+					// 			if (taskList[i].task_stage == this.taskStageList[j]
+					// 				.task_stage_id)
+					// 				taskList[i].task_stage_txt = this.taskStageList[j]
+					// 				.task_stage
+					// 		}
+					// 	}
+					// }
+					// this.List1 = taskList;
+					// taskList = res.data.data.list2
+					// if (taskList != null) {
+					// 	this.showPoint2 = true
+					// 	for (let i = 0; i < taskList.length; ++i) {
+					// 		let productPhoto = JSON.parse(taskList[i].product_photo_snap);
+					// 		for (let j = 0; j < productPhoto.length; j++) {
+					// 			if (productPhoto[j].Symbol == 1) {
+					// 				taskList[i].product_img_url = productPhoto[j].PhotoUrl
+					// 			}
+					// 		}
+
+					// 		if ((taskList[i].task_stage == 7 && taskList[i].script_status == 3) ||
+					// 			(taskList[i].task_stage == 9 && taskList[i].sketch_status == 3) ||
+					// 			(taskList[i].task_stage == 11 && taskList[i].link_status == 3) ||
+					// 			(taskList[i].task_stage == 13 && taskList[i].data_status == 3)) {
+					// 			taskList[i].isShowModify = true
+					// 		} else {
+					// 			taskList[i].isShowModify = false
+					// 		}
+					// 		for (let j = 0; j < this.taskStageList.length; ++j) {
+					// 			if (taskList[i].task_stage == this.taskStageList[j]
+					// 				.task_stage_id)
+					// 				taskList[i].task_stage_txt = this.taskStageList[j]
+					// 				.task_stage
+					// 		}
+					// 	}
+					// }
+					// this.List2 = taskList;
+					// taskList = res.data.data.list3
+					// if (taskList != null) {
+					// 	this.showPoint3 = true
+					// 	for (let i = 0; i < taskList.length; ++i) {
+					// 		let productPhoto = JSON.parse(taskList[i].product_photo_snap);
+					// 		for (let j = 0; j < productPhoto.length; j++) {
+					// 			if (productPhoto[j].Symbol == 1) {
+					// 				taskList[i].product_img_url = productPhoto[j].PhotoUrl
+					// 			}
+					// 		}
+
+					// 		if ((taskList[i].task_stage == 7 && taskList[i].script_status == 3) ||
+					// 			(taskList[i].task_stage == 9 && taskList[i].sketch_status == 3) ||
+					// 			(taskList[i].task_stage == 11 && taskList[i].link_status == 3) ||
+					// 			(taskList[i].task_stage == 13 && taskList[i].data_status == 3)) {
+					// 			taskList[i].isShowModify = true
+					// 		} else {
+					// 			taskList[i].isShowModify = false
+					// 		}
+					// 		for (let j = 0; j < this.taskStageList.length; ++j) {
+					// 			if (taskList[i].task_stage == this.taskStageList[j]
+					// 				.task_stage_id)
+					// 				taskList[i].task_stage_txt = this.taskStageList[j]
+					// 				.task_stage
+					// 		}
+					// 	}
+					// }
+
+					// this.List3 = taskList;
+					// taskList = res.data.data.list4
+					// if (taskList != null) {
+					// 	this.showPoint4 = true
+					// 	for (let i = 0; i < taskList.length; ++i) {
+					// 		let productPhoto = JSON.parse(taskList[i].product_photo_snap);
+					// 		for (let j = 0; j < productPhoto.length; j++) {
+					// 			if (productPhoto[j].Symbol == 1) {
+					// 				taskList[i].product_img_url = productPhoto[j].PhotoUrl
+					// 			}
+					// 		}
+
+					// 		if ((taskList[i].task_stage == 7 && taskList[i].script_status == 3) ||
+					// 			(taskList[i].task_stage == 9 && taskList[i].sketch_status == 3) ||
+					// 			(taskList[i].task_stage == 11 && taskList[i].link_status == 3) ||
+					// 			(taskList[i].task_stage == 13 && taskList[i].data_status == 3)) {
+					// 			taskList[i].isShowModify = true
+					// 		} else {
+					// 			taskList[i].isShowModify = false
+					// 		}
+					// 		for (let j = 0; j < this.taskStageList.length; ++j) {
+					// 			if (taskList[i].task_stage == this.taskStageList[j]
+					// 				.task_stage_id)
+					// 				taskList[i].task_stage_txt = this.taskStageList[j]
+					// 				.task_stage
+					// 		}
+					// 	}
+					// }
+					// this.List4 = taskList;
 				})
 				uni.hideLoading();
 				this.loading = false
@@ -353,38 +448,34 @@
 				this.showList3 = false;
 				this.showList4 = false;
 				this.showList1 = true;
-				this.getList();
+				this.getList(1);
 			},
 			toShow2() {
 				this.showList1 = false;
 				this.showList3 = false;
 				this.showList4 = false;
 				this.showList2 = true;
-				this.getList();
+				this.getList(2);
 			},
 			toShow3() {
 				this.showList2 = false;
 				this.showList1 = false;
 				this.showList4 = false;
 				this.showList3 = true;
-				this.getList();
+				this.getList(3);
 			},
 			toShow4() {
 				this.showList2 = false;
 				this.showList1 = false;
 				this.showList3 = false;
 				this.showList4 = true;
-				this.getList();
+				this.getList(4);
 			},
 			toDetail(item) {
 				uni.navigateTo({
 					url: '/pages/workspace/taskdetail?taskId=' + item.task_id,
-					success(res) {
-						console.log(res);
-					},
-					fail(err) {
-						console.log(err);
-					}
+					success(res) {},
+					fail(err) {}
 				});
 			},
 		}
@@ -485,8 +576,8 @@
 	}
 
 	.point {
-		width: 6px;
-		height: 6px;
+		width: 20rpx;
+		height: 20rpx;
 		background: red;
 		border-radius: 50%;
 	}