2.0版本final

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')

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方式

pages/mycenter/mycenter.vue

@@ -6,11 +6,11 @@
 		<view>
 			<view class="head" v-if="token">
 				<view class="head-left">
-					<view class="head-avator"  @click="toUserInfo()">
+					<view class="head-avator" @click="toUserInfo()">
 						<image :src="avatarUrl" mode="" style="width: 100%;height: 100%;border-radius: 100rpx;" />
 					</view>
 					<view>
-						<p style="padding-bottom: 20rpx;font-size: 35rpx;"  @click="toUserInfo()">{{nickName}}</p>
+						<p style="padding-bottom: 20rpx;font-size: 35rpx;" @click="toUserInfo()">{{nickName}}</p>
 						<span style="display: flex;align-items: center;">
 							<p style="font-size: 25rpx;">ID:{{information.id}}</p>
 							<image :src="picture.icon_copy" mode="" style="width: 40rpx;height: 40rpx;"
@@ -41,7 +41,7 @@
 
 			<view class="show-income1">
 				<view>
-					<view style="display: flex;align-items: center;">
+					<view style="display: flex;align-items: center;margin-left: 5%;">
 						<p>我获得的收益总数</p>
 						<image id="helpicon" :src="picture.icon_help" mode=""
 							style="width: 35rpx;height: 35rpx;padding-left: 10rpx;" @click="showHelp = true" />
@@ -63,8 +63,9 @@
 				</view>
 
 				<view class="show-income1-text">
-					<view>
-						<p style="font-size: 40rpx;font-weight:bold;color: #F0D232;padding-left: 40rpx;" @click="toincome('can')">
+					<view style="padding-left: 5%;">
+						<p style="font-size: 40rpx;font-weight:bold;color: #F0D232;"
+							@click="toincome('can')">
 							{{information.showIncome?information.showIncome:'0.00'}}
 						</p>
 					</view>
@@ -118,14 +119,33 @@
 			</view>
 
 			<view class="show-body">
-				<view class="show-info">
-					<view class="show-info-text" @click="handleInformation()">
-						<image class="show-info-icon" :src="picture.icon_person"></image>
+				<view class="show-body2">
+					<view class="show-body2-text" @click="handleInformation()">
+						<image class="show-info-icon" style="width: 60rpx;height: 60rpx;padding-bottom: 15rpx;" :src="picture.icon_person"></image>
 						<p>我的信息</p>
 					</view>
+					<view class="show-body2-text" @click="handleSubmitTask()">
+						<image class="show-info-icon" :src="picture.icon_edit"></image>
+						<p>发布任务</p>
+					</view>
+					<view class="show-body2-text">
+						<p style="color: #fff;">联系客服</p>
+					</view>
+					<view class="show-body2-text">
+						<p style="color: #fff;">客服</p>
+					</view>
 				</view>
 			</view>
 
+			<view class="contact" @click="toggle4('center')">
+				<view class="contt">
+					<!-- <image class="img2" src="https://horastar.obs.cn-east-3.myhuaweicloud.com/talent/home2.png" mode=""></image> -->
+					<image class="img1"
+						src="https://horastar.obs.cn-east-3.myhuaweicloud.com/talent/kefu_20211124192542.png" mode="">
+					</image>
+
+				</view>
+			</view>
 
 			<!-- 普通弹窗  公众号-->
 			<uni-popup ref="popup2" class="share" background-color="#fff" @change="change">
@@ -174,26 +194,90 @@
 				</view>
 			</uni-popup>
 
-			<!-- 普通弹窗  客服-->
-			<uni-popup ref="popup4" class="share" background-color="#fff" @change="change">
+			<!-- 普通弹窗  公众号-->
+			<uni-popup ref="popup4" class="share" background-color="#fff" @change="change" :maskClick="false">
 				<view class="popup-content" :class="{ 'popup-height': type === 'left' || type === 'right' }">
 					<view class="sharepage">
-						<view class="Tasktext1">
-							<image :src="picture.task15" mode=""></image>
-							<span>YoungGee</span>
-						</view>
-						<view class="" style="margin-top: 5%;">
-							<p style='color: #333333;font-size: 28rpx;text-align: center;'>扫码联系</p>
+						<view class="projecttext1">
+							<image src="https://horastar.obs.cn-east-3.myhuaweicloud.com/talent/younggee_logo.png"
+								style="width: 250rpx; height: 80rpx;" mode=""></image>
+							<!-- <span>YoungGee</span> -->
 						</view>
 						<view class="sharemap">
-							<image src="https://horastar.obs.cn-east-3.myhuaweicloud.com/talent/kefu.png" mode="">
-							</image>
+							<image :src="kefuUrl" style="width: 400rpx;height: 400rpx;" mode=""></image>
+						</view>
+						<view style="margin: 30rpx 0;">
+							<button class="butmin1" size="mini" @tap="saveImage">保存二维码</button>
+						</view>
+						<view class="sharetxt">
+							<text>
+								使用样叽的过程中，有任何疑问，\n
+								请添加上方微信。\n
+								我们保证及时全力为您解决！
+							</text>
+						</view>
+						<view style="margin: 30rpx 0;">
+							<button class="butmin" size="mini" @tap="closepop">知道了</button>
 						</view>
 					</view>
+
 				</view>
 			</uni-popup>
 		</view>
 
+		<!-- 普通弹窗  公众号-->
+		<uni-popup ref="popup4" class="share" background-color="#fff" @change="change" :maskClick="false">
+			<view class="popup-content" :class="{ 'popup-height': type === 'left' || type === 'right' }">
+				<view class="sharepage">
+					<view class="projecttext1">
+						<image src="https://horastar.obs.cn-east-3.myhuaweicloud.com/talent/younggee_logo.png"
+							style="width: 250rpx; height: 80rpx;" mode=""></image>
+						<!-- <span>YoungGee</span> -->
+					</view>
+					<view class="sharemap">
+						<image :src="kefuUrl" style="width: 400rpx;height: 400rpx;" mode=""></image>
+					</view>
+					<view style="margin: 30rpx 0;">
+						<button class="butmin1" size="mini" @tap="saveImage">保存二维码</button>
+					</view>
+					<view class="sharetxt">
+						<text>
+							使用样叽的过程中，有任何疑问，\n
+							请添加上方微信。\n
+							我们保证及时全力为您解决！
+						</text>
+					</view>
+					<view style="margin: 30rpx 0;">
+						<button class="butmin" size="mini" @tap="closepop">知道了</button>
+					</view>
+				</view>
+
+			</view>
+		</uni-popup>
+
+
+		<!-- 普通弹窗  发布任务-->
+		<uni-popup ref="popup5" class="share" background-color="#fff" @change="change">
+			<view class="popup-content" :class="{ 'popup-height': type === 'left' || type === 'right' }">
+				<view class="sharepage">
+					<view class="projecttext1">
+						<span style="color: #f72424;font-size: 36rpx;line-height: 50rpx;">发布任务请用PC登录</span>
+						<span style="color: #f72424;font-size: 36rpx;line-height: 50rpx;">www.younggee.com</span>
+					</view>
+					<view class="projecttext1" style="height: 40rpx;margin: 60rpx 0 10rpx;">
+						<span style="font-size: 28rpx;line-height: 30rpx;">使用有任何疑问请联系样叽客服</span>
+					</view>
+					<view class="sharemap">
+						<image :src="kefuUrl" style="width: 400rpx;height: 400rpx;" mode=""></image>
+					</view>
+					<view style="margin: 30rpx 0;">
+						<button class="butmin1" size="mini" @tap="saveImage">保存二维码</button>
+					</view>
+				</view>
+
+			</view>
+		</uni-popup>
+
 		<!-- <view class="" style="text-align: center;margin: 5% 0;">
 			<button size="mini" @tap="toSpecialTask()">专项测试</button>
 		</view> -->
@@ -202,6 +286,11 @@
 
 <script>
 	import mvBar from "@/components/mys_navBar/mysNavBar";
+	import {
+		saveImageToPhotosAlbum,
+		showToast,
+		downloadFile
+	} from '@/uni_modules/sakura-canvas/js_sdk/util';
 	import {
 		money
 	} from '@/components/utils.js';
@@ -211,6 +300,7 @@
 		},
 		data() {
 			return {
+				kefuUrl: "https://horastar.obs.cn-east-3.myhuaweicloud.com/talent/kefu.jpeg",
 				navH: getApp().globalData.navHeight,
 				hasUnReadMessage: false,
 				Text: "在平台产生的总收益【可提现+已提现+提现中】",
@@ -223,6 +313,7 @@
 					icon_help: 'https://horastar.obs.cn-east-3.myhuaweicloud.com/talent_upload/icon-help.png',
 					icon_copy: 'https://horastar.obs.cn-east-3.myhuaweicloud.com/talent_upload/icon-copy.png',
 					icon_person: 'https://horastar.obs.cn-east-3.myhuaweicloud.com/youngee/talent_upload/icon-person.png',
+					icon_edit: 'https://horastar.obs.cn-east-3.myhuaweicloud.com/talent_upload/icon-edit2.png',
 					icon_location: 'https://horastar.obs.cn-east-3.myhuaweicloud.com/youngee/talent_upload/icon-location.png',
 					icon_account: 'https://horastar.obs.cn-east-3.myhuaweicloud.com/youngee/talent_upload/icon-account.png',
 					icon_rmb: 'https://horastar.obs.cn-east-3.myhuaweicloud.com/youngee/talent_upload/icon-rmb.png',
@@ -428,12 +519,46 @@
 				this.$refs.popup3.open(type)
 				// this.$refs.popup1.close()
 			},
-			togo4(type) {
+			toggle4(type) {
 				this.type4 = type
 				// open 方法传入参数 等同在 uni-popup 组件上绑定 type属性
 				this.$refs.popup4.open(type)
 				// this.$refs.popup1.close()
 			},
+			// 保存图片
+			async saveImage() {
+				// showToast('保存成功')
+				wx.downloadFile({
+					url: this.kefuUrl,
+					success: function(res) {
+						wx.saveImageToPhotosAlbum({
+							filePath: res.tempFilePath,
+							success: function(data) {
+								wx.showToast({
+									title: "保存成功",
+									icon: "success",
+									duration: 2000
+								})
+							},
+							fail: function(err) {
+								console.log(err);
+							},
+							complete(res) {
+								console.log(res);
+							}
+						})
+					}
+				})
+			},
+			closepop() {
+				this.$refs.popup4.close()
+			},
+			// 进入个人资料
+			handleSubmitTask() {
+				// open 方法传入参数 等同在 uni-popup 组件上绑定 type属性
+				this.$refs.popup5.open()
+				// this.$refs.popup1.close()
+			},
 		},
 	};
 </script>
@@ -506,6 +631,7 @@
 		display: flex;
 		align-items: center;
 		justify-content: space-between;
+		padding: 0 5%;
 		margin-top: 30rpx;
 	}
 
@@ -516,7 +642,7 @@
 
 	.show-income1-btn {
 		width: auto;
-		padding: 0 40rpx;
+		// padding: 0 40rpx;
 		text-align: center;
 		background-color: #F0D232;
 		border-radius: 15rpx;
@@ -532,10 +658,11 @@
 		margin: 0 3% 3%;
 		background-color: #F0D232;
 		border-radius: 10rpx;
-		padding: 0 40rpx;
+		padding: 0 5%;
 	}
 
 	.show-income2-text {
+		width: 24%;
 		text-align: center;
 	}
 
@@ -578,11 +705,12 @@
 		display: flex;
 		align-items: center;
 		justify-content: space-between;
-		padding: 0 40rpx;
+		padding: 0 5%;
 	}
 
 	.show-body2-text {
 		// width: 150rpx;
+		width: 22%;
 		text-align: center;
 	}
 
@@ -617,6 +745,7 @@
 		height: 50rpx;
 		padding-bottom: 20rpx;
 	}
+	
 
 	.butto {
 		text-align: center;
@@ -742,11 +871,23 @@
 
 	}
 
-	//弹窗
-	.sharepage {
-		width: 90%;
-		margin: 0 auto;
-		// position: relative;
+	.share {
+		text-align: center;
+		line-height: 10rpx;
+		margin-top: 10rpx;
+	}
+
+	.share image {
+		vertical-align: middle;
+		width: 25rpx;
+		height: 25rpx;
+		display: inline-block
+	}
+
+	.share p {
+		// display: inline-block;
+		font-size: 24rpx;
+		// color: #333333;
 	}
 
 	/deep/ .share.uni-popup .uni-popup__wrapper {
@@ -778,18 +919,6 @@
 		padding-right: 14rpx;
 	}
 
-	.sharemap {
-		margin: 0 auto;
-		text-align: center;
-		margin-top: 15%;
-		margin-bottom: 15%;
-	}
-
-	.sharemap image {
-		width: 400rpx;
-		height: 400rpx;
-
-	}
 
 	.butmin {
 		height: 48rpx;
@@ -849,4 +978,91 @@
 		background: red;
 		border-radius: 50%;
 	}
+
+	.contt {
+		position: relative;
+	}
+
+	.contact {
+		position: fixed;
+		top: 80%;
+		right: 13%;
+	}
+
+	.img1 {
+		width: 84rpx;
+		height: 124rpx;
+		position: absolute;
+	}
+
+	//弹窗
+	.sharepage {
+		// width: 90%;
+		margin: 0 auto;
+		// position: relative;
+	}
+
+	/deep/ .share.uni-popup .uni-popup__wrapper {
+		width: 70%;
+
+		border-radius: 15rpx;
+	}
+
+	.projecttext1 {
+		// padding-top: 5%;
+		padding: 0 0 0 1%;
+		height: 80rpx;
+		margin: 5% 0;
+		text-align: center;
+	}
+
+	.projecttext1 image {
+		vertical-align: middle;
+		width: 80rpx;
+		height: 80rpx;
+		display: inline-block;
+		padding-right: 14rpx;
+	}
+
+	.sharemap {
+		margin: 0 auto;
+		text-align: center;
+		// margin-top: 15%;
+		// margin-bottom: 15%;
+	}
+
+	.sharemap image {
+		width: 400rpx;
+		height: 400rpx;
+
+	}
+
+	.sharetxt {
+		height: 100rpx;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.sharetxt text {
+		font-size: 24rpx;
+		text-align: left;
+		line-height: 20rpx
+	}
+
+	.butmin {
+		// height: 48rpx;
+		width: 250rpx;
+		background-color: #FCCF41;
+		line-height: 48rpx;
+	}
+
+	.butmin1 {
+		// height: 48rpx;
+		width: 250rpx;
+		background-color: #fff;
+		border: #000000 1rpx solid;
+		line-height: 48rpx;
+	}
 </style>

pages/mycenter/myinformation/bindaccount.vue

@@ -145,8 +145,16 @@
 							errorMessage: '请上传主页截图',
 						}]
 					}
-				}
-
+				},
+				urlRegList: [
+					/(.*)http(s?)\:\/\/((www\.)?)(xiaohongshu\.com)(.*)/,
+					/(.*)http(s?)\:\/\/((www\.)?)((v\.)?)(douyin\.com)(.*)/,
+					/(.*)http(s?)\:\/\/((www\.)?)((m\.)?)(weibo\.(com|cn))(.*)/,
+					/(.*)http(s?)\:\/\/((www\.)?)((v|kpfshanghai)\.m\.chenzhongtech\.com)(.*)/,
+					/(.*)http(s?)\:\/\/((www\.)?)(b23\.tv)(.*)/,
+					/(.*)http(s?)\:\/\/((www\.)?)((m\.)?)(dianping\.(com|cn))(.*)/,
+					/(.*)http(s?)\:\/\/((www\.)?)(zhihu\.com)(.*)/,
+				]
 			}
 		},
 		onReady() {},
@@ -223,8 +231,7 @@
 			 * @param {Object} form
 			 */
 			submitForm(form) {
-				const urlReg =
-					/(ht|f)tp(s?)\:\/\/[0-9a-zA-Z]([-.\w]*[0-9a-zA-Z])*(:(0-9)*)*(\/?)([a-zA-Z0-9\-\.\?\,\'\/\\\+&%$#_]*)?/
+				const urlReg = this.urlRegList[this.platform.platform_id - 1]
 				if (!urlReg.test(this.formData.home_page_url)) {
 					uni.showToast({
 						title: '主页链接格式不正确',
@@ -336,7 +343,8 @@
 				console.log('ceshiChooseSuccess', tempFilePaths, e);
 				if (e == 0) {
 					this.store = 'talent_upload/' + this.guid() + '.png'
-					// this.store = 'talent_upload/guanwang.png'
+					// this.store = 'talent_upload/icon-edit2.png'
+					// this.store = 'youngee/talent_upload/icon-edit.2png'
 				} else if (e == 1) {
 					this.store = 'talent_upload/' + this.guid() + '.mp4'
 				}

pages/mycenter/myinformation/mylocation.vue

@@ -162,23 +162,14 @@
 					url: '/pages/mycenter/myinformation/addlocation?ismodify=0'
 				});
 			},
-			chooseAddr() {
+			async 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', {
+					async success(res) {
+						await that.$https.post('/youngee/c/t/p/add-talent-address', {
 								region_code: res.nationalCode,
-								detail_addr: res.provinceName + res.cityName + res.countyName + res.detailInfo,
+								detail_addr: res.provinceName + res.cityName + res.countyName + res
+									.detailInfo,
 								phone_number: res.telNumber,
 								receiver_name: res.userName,
 								mail_code: res.postalCode,
@@ -186,7 +177,6 @@
 							})
 							.then(res => {
 								console.log(res)
-								that.getlist()
 							})
 					},
 					fail: (res) => {
@@ -209,28 +199,6 @@
 							title: '修改成功'
 						})
 					})
-				// var that = this;
-				// uni.showModal({
-				// 	title: '提示',
-				// 	content: '确认修改默认地址',
-				// 	success: function(res) {
-
-				// 		if (res.confirm) {
-				// 			that.$https.post('/youngee/c/t/p/change-default-delivery-addr', {
-				// 					address_id: item.address_id,
-				// 				})
-				// 				.then(res => {
-				// 					console.log(res)
-				// 					that.getlist()
-				// 					uni.showToast({
-				// 						title: '修改成功'
-				// 					})
-				// 				})
-				// 		} else if (res.cancel) {
-				// 			console.log('用户点击取消');
-				// 		}
-				// 	},
-				// })
 			},
 			// 编辑地址				
 			edit(item) {

pages/tasksquare/bindinfo.vue

@@ -7,7 +7,7 @@
 			<view style="margin: 0 20rpx;">
 				<uni-forms :value="formData" ref="form" :rules="rules" validate-trigger="bind"
 					err-show-type="undertext">
-<!-- 					<view class="title">
+					<!-- 					<view class="title">
 						<p>个人资料</p>
 					</view> -->
 					<!-- <uni-forms-item name="age" label="年龄区间">
@@ -40,10 +40,10 @@
 
 
 					<view class="but2">
-						<view class="title" >
+						<view class="title">
 							<p>收货地址:</p>
 						</view>
-<!-- 					<button type="default" class="btn3" @click="chooseAddr()">
+						<!-- 					<button type="default" class="btn3" @click="chooseAddr()">
 						<image class="weixinlogo" :src="weixinimage">
 						</image>
 						<p class="auto-text">
@@ -51,26 +51,26 @@
 					</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 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">
 						<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>
@@ -156,6 +156,7 @@
 		},
 		data() {
 			return {
+				isGetAddress: false,
 				weixinimage: "../../static/img/icon-weixin.png",
 				navH: getApp().globalData.navHeight,
 				hasClicked: false,
@@ -177,6 +178,7 @@
 					[],
 					[]
 				],
+				addressInfo: {},
 				// 选择省市区的下标Index  传则默认选中传递的
 				regionIndex: [0, 0, 0],
 				regionIndex1: [0, 0, 0],
@@ -251,6 +253,15 @@
 				}],
 				data: {},
 				show: false,
+				urlRegList: [
+					/(.*)http(s?)\:\/\/((www\.)?)(xiaohongshu\.com)(.*)/,
+					/(.*)http(s?)\:\/\/((www\.)?)((v\.)?)(douyin\.com)(.*)/,
+					/(.*)http(s?)\:\/\/((www\.)?)((m\.)?)(weibo\.(com|cn))(.*)/,
+					/(.*)http(s?)\:\/\/((www\.)?)((v|kpfshanghai)\.m\.chenzhongtech\.com)(.*)/,
+					/(.*)http(s?)\:\/\/((www\.)?)(b23\.tv)(.*)/,
+					/(.*)http(s?)\:\/\/((www\.)?)((m\.)?)(dianping\.(com|cn))(.*)/,
+					/(.*)http(s?)\:\/\/((www\.)?)(zhihu\.com)(.*)/,
+				],
 
 				mysNavConfig: {
 					/* 开启单页显示首页图标 */
@@ -371,30 +382,11 @@
 				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()
-							})
+						that.formData.number = res.telNumber
+						that.formData.detailregion = res.provinceName + res.cityName + res.countyName + res
+							.detailInfo
+						that.addressInfo = res
+						that.isGetAddress = true
 					},
 					fail: (res) => {
 						console.log(res)
@@ -567,24 +559,14 @@
 			 */
 			submitForm(form) {
 				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: '请填写正确的联系方式',
-							icon: 'none'
-						})
-						return
-					}
-					if (!iphoneReg1.test(this.formData.tel)) {
+					if (!this.isGetAddress) {
 						uni.showToast({
-							title: '请填写正确的电话号码',
+							title: '请填写收货地址',
 							icon: 'none'
 						})
 						return
 					}
+					const urlReg = this.urlRegList[this.platform.platform_id - 1]
 					if (!urlReg.test(this.formData.home_page_url)) {
 						uni.showToast({
 							title: '主页链接格式不正确',
@@ -592,7 +574,8 @@
 						})
 						return
 					}
-					if (this.fansCount == null || this.fansCount * this.fansCountInfo <= 0 || this.fansLabel == "选择单位") {
+					if (this.fansCount == null || this.fansCount * this.fansCountInfo <= 0 || this.fansLabel ==
+						"选择单位") {
 						uni.showToast({
 							title: '请填写粉丝量数量',
 							icon: 'none'
@@ -613,22 +596,25 @@
 
 					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 => {})
+					// 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 => {})
+
 
 					this.$https.post('/youngee/c/t/p/add-talent-address', {
-							region_code: this.formData.fregion,
-							detail_addr: this.formData.detailregion,
-							phone_number: this.formData.tel,
-							receiver_name: this.formData.name,
-							default_tag: this.formData.setdefault
+							region_code: this.addressInfo.nationalCode,
+							detail_addr: this.addressInfo.provinceName + this.addressInfo.cityName + this
+								.addressInfo.countyName + this.addressInfo.detailInfo,
+							phone_number: this.addressInfo.telNumber,
+							receiver_name: this.addressInfo.userName,
+							mail_code: this.addressInfo.postalCode,
+							default_tag: 1
 						})
 						.then(res => {})
 
@@ -998,7 +984,7 @@
 					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,
@@ -1103,12 +1089,14 @@
 			padding-bottom: 15rpx;
 		}
 	}
-	.but2{
+
+	.but2 {
 		width: 100%;
-		height:260rpx;
-		
+		height: 260rpx;
+
 	}
-	.but3{
+
+	.but3 {
 		// width: 27%;
 		// height:50rpx;
 		// display: flex;
@@ -1131,6 +1119,7 @@
 		align-items: center;
 		justify-content: center;
 	}
+
 	.setdeault {
 		display: flex;
 		justify-content: space-between;
@@ -1248,16 +1237,19 @@
 		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;

pages/tasksquare/taskdetail.vue

@@ -201,8 +201,8 @@
 											<view style="display: flex;align-items: center;justify-content: center;">
 												<p>稿费：{{item.fee_form_t}}</p>
 												<view v-if="item.fee_form===3">
-													<input class="offer_input" type="number" placeholder="请输入" 
-														v-model="item.offer"/>
+													<input class="offer_input" type="number" placeholder="请输入"
+														v-model="item.offer" />
 												</view>
 												<view v-if="item.fee_form===3">
 													<p>元</p>
@@ -816,10 +816,11 @@
 						if (this.information.content_type === 1) this.information.content = "图文"
 						else if (this.information.content_type === 2) this.information.content = "视频"
 
+						// 判断是否已报名结束
 						var newdate = new Date()
 						var endTime = new Date(this.information.recruit_ddl.replace(
 							/-/g, "/"));
-						this.ddl = endTime - newdate < 0 ? 1 : 0
+						this.ddl = endTime - newdate < 0 || this.information.project_status > 4 ? 1 : 0
 						// 报名截止日期
 						this.information.recruit_ddl = this.information.recruit_ddl.substr(0, 10);
 
@@ -953,7 +954,7 @@
 			},
 			toggle(type) {
 				let that = this
-				if ( that.talent.is_bind_location === 0) {
+				if (that.talent.is_bind_location === 0) {
 					// 前往个人信息绑定三合一界面
 					uni.showModal({
 						content: '请先绑定个人信息',
@@ -977,8 +978,7 @@
 							}
 						}
 					});
-				} 
-				else if (that.account.length === 0) {
+				} else if (that.account.length === 0) {
 					uni.showModal({
 						content: '请先绑定社媒账号',
 						success: function(res) {

pages/tasksquare/tasksquare.vue

@@ -165,7 +165,6 @@
 				</image>
 
 			</view>
-
 		</view>
 	</view>
 </template>
@@ -272,19 +271,15 @@
 						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'
-						// name: 'http://www.baidu.com/'
-					},
-					{
-						img: 'https://horastar.obs.cn-east-3.myhuaweicloud.com/talent_upload/guanwang.png',
-						name: '/pages/tasksquare/guanwang'
 					}
+					// {
+					// 	img: 'https://horastar.obs.cn-east-3.myhuaweicloud.com/talent_upload/guanwang.png',
+					// 	name: '/pages/tasksquare/guanwang'
+					// 	// name: 'http://www.baidu.com/'
+					// }
 				],
 
-			
+
 				//弹窗
 				type: 'center',
 				formData: {
@@ -460,7 +455,9 @@
 						// console.log(newdate)
 						var endTime = new Date(res.data.data.ProjectInfos[i].recruit_ddl.replace(
 							/-/g, "/"));
-						res.data.data.ProjectInfos[i].ddl = endTime - newdate < 0 ? 1 : 0
+						res.data.data.ProjectInfos[i].ddl = endTime - newdate < 0 || res.data.data
+							.ProjectInfos[i]
+							.project_status > 4 ? 1 : 0
 						res.data.data.ProjectInfos[i].recruit_ddl = this.thistime(res.data.data
 							.ProjectInfos[i]
 							.recruit_ddl)
@@ -628,7 +625,7 @@
 				});
 			},
 
-	
+
 			//弹出层
 			change(e) {
 				console.log('当前模式：' + e.type + ',状态：' + e.show);
@@ -674,11 +671,6 @@
 			},
 			// 保存图片
 			async saveImage() {
-				// let res = await saveImageToPhotosAlbum(this.kefuUrl)
-				// if (!res.success) {
-				// 	console.log(res)
-				// 	return
-				// }
 				// showToast('保存成功')
 				wx.downloadFile({
 					url: this.kefuUrl,