init feature_yf

components/mys_navBar/mysNavBar.vue

@@ -47,7 +47,7 @@
             marginLeft: navBarLeft,
             borderRadius: mysNavConfig.type2Config.radius,
           }" v-if="mysNavConfig.btnType == 'type2' && !isHome">
-					<view class="btn_back" @tap="onLeftClick"  >
+					<view class="btn_back" @tap="onLeftClick">
 						<image class="nv_icon" :src="mysNavConfig.type2Config.leftPath"
 							:style="{ height: btnHeight, width: iconW }" mode="aspectFit" />
 					</view>
@@ -101,7 +101,7 @@
 </template>
 <script>
 	/* 默认首页路径 */
-	const homePath = "/pages/pupu/pupudao";
+	const homePath = "/pages/tasksquare/tasksquare";
 	/* 默认首页图标路径 */
 	const homeIconPath = "";
 	/* 默认返回图标路径 */
@@ -128,6 +128,7 @@
 						opacityTime: 100,
 						/* 左侧按钮样式 可选 type1 type2 （type2根据小程序胶囊位置调整） */
 						btnType: "type1",
+						onLeftClick: "",
 						/* type1 左侧文字配置 */
 						leftText: {
 							text: "",
@@ -251,8 +252,14 @@
 			},
 			/* 点击左侧 */
 			onLeftClick() {
-				if (this.mysNavConfig.isCustomFn) {
-					this.$emit("onLeftClick");
+				// if (this.mysNavConfig.isCustomFn) {
+				// 	this.$emit("onLeftClick");
+				// }
+				if (this.mysNavConfig.onLeftClick != "") {
+					console.log(this.mysNavConfig.onLeftClick)
+					uni.switchTab({
+						url: this.mysNavConfig.onLeftClick
+					});
 				} else {
 					console.log("back");
 					uni.navigateBack();
@@ -471,7 +478,7 @@
 		/* #ifndef APP-PLUS-NVUE */
 		white-space: nowrap;
 		overflow: hidden;
-		font-weight:550;
+		font-weight: 550;
 		/* #endif */
 		/* #ifdef APP-PLUS-NVUE */
 		lines: 1;

components/request.js

@@ -2,9 +2,8 @@
 
 export default {
 	config: {
-			// baseUrl: "http://192.168.0.200:8199",  //默认的公共域名
-				// baseUrl: "http://139.159.133.107:8200",  //默认的公共域名
-				baseUrl: "https://talent.younggee.com:8199",  //默认的公共域名
+		baseUrl: "http://192.168.31.155:8200",	//本地开发
+		// baseUrl: "https://talent.younggee.com:8201",  //默认的公共域名
 		},
 	// 获取用户 token
 	// let userToken = uni.getStorageSync('userInfo')

components/requesttoken111.js

@@ -2,15 +2,13 @@
 //通用uni-app网络请求
 export default {
 	config: {
-		// baseUrl: "http://192.168.0.200:8199",//默认的公共域名
-		// baseUrl: "http://139.159.133.107:8200", 
-		baseUrl: "https://talent.younggee.com:8199",  //默认的公共域名
+		baseUrl: "http://192.168.31.155:8200",	//本地开发
+		// baseUrl: "https://talent.younggee.com:8201",  //默认的公共域名
 		  
 		header: {
 			'Content-Type':'application/json;charset=UTF-8',   //默认get方式
 			'token':uni.getStorageSync('token'),
 			'cookie':uni.getStorageSync('cookie'),
-			
 		},
 		data: {},			//上行参数
 		method: "GET",     //默认GET方式

pages.json

@@ -16,23 +16,23 @@
 			"style": {
 				"navigationBarTitleText": "YoungGee",
 				"navigationStyle": "custom",
-				"app-plus": {
-					"titleNView": false
-				}
+				"navigationBarTextStyle": "black"
 			}
 		},
 		{
 			"path": "pages/login/login",
 			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
+				"navigationBarTitleText": "YoungGee",
+				"navigationStyle": "custom",
+				"navigationBarTextStyle": "black"
 			}
 		},
 		{
-			"path": "pages/worksapce/worksapce",
+			"path": "pages/workspace/workspace",
 			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
+				"navigationBarTitleText": "YoungGee",
+				"navigationStyle": "custom",
+				"navigationBarTextStyle": "black"
 			}
 		},
 		{
@@ -43,7 +43,89 @@
 				"navigationBarTextStyle": "black"
 			}
 		}, {
-			"path": "pages/mycenter/personinfo",
+			"path": "pages/mycenter/myinformation/personinfo",
+			"style": {
+				"navigationBarTitleText": "YoungGee",
+				"navigationStyle": "custom",
+				"navigationBarTextStyle": "black"
+			}
+
+		}, {
+			"path": "pages/mycenter/myinformation/mylocation",
+			"style": {
+				"navigationBarTitleText": "YoungGee",
+				"navigationStyle": "custom",
+				"navigationBarTextStyle": "black"
+			}
+
+		}, {
+			"path": "pages/mycenter/myinformation/myaccount",
+			"style": {
+				"navigationBarTitleText": "YoungGee",
+				"navigationStyle": "custom",
+				"navigationBarTextStyle": "black"
+			}
+		}, {
+			"path": "pages/mycenter/myinformation/mybank",
+			"style": {
+				"navigationBarTitleText": "YoungGee",
+				"navigationStyle": "custom",
+				"navigationBarTextStyle": "black"
+			}
+		}, {
+			"path": "pages/mycenter/myinformation/addlocation",
+			"style": {
+				"navigationBarTitleText": "YoungGee",
+				"navigationStyle": "custom",
+				"navigationBarTextStyle": "black"
+			}
+		}, {
+			"path": "pages/mycenter/myinformation/bindaccount",
+			"style": {
+				"navigationBarTitleText": "YoungGee",
+				"navigationStyle": "custom",
+				"navigationBarTextStyle": "black"
+			}
+		}, {
+			"path": "pages/tasksquare/bindinfo",
+			"style": {
+				"navigationBarTitleText": "YoungGee",
+				"navigationStyle": "custom",
+				"navigationBarTextStyle": "black"
+			}
+
+		}, {
+			"path": "pages/test/test",
+			"style": {
+				"navigationBarTitleText": "YoungGee",
+				"navigationStyle": "custom",
+				"navigationBarTextStyle": "black"
+			}
+		}, {
+			"path": "pages/tasksquare/guide",
+			"style": {
+				"navigationBarTitleText": "YoungGee",
+				"navigationStyle": "custom",
+				"navigationBarTextStyle": "black"
+			}
+		}, {
+			"path": "pages/tasksquare/cooperation",
+			"style": {
+				"navigationBarTitleText": "YoungGee",
+				"navigationStyle": "custom",
+				"navigationBarTextStyle": "black"
+			}
+
+		}, {
+			"path": "pages/tasksquare/information",
+			"style": {
+				"navigationBarTitleText": "YoungGee",
+				"navigationStyle": "custom",
+				"navigationBarTextStyle": "black"
+			}
+
+		}, {
+			"path": "pages/tasksquare/success",
 			"style": {
 				"navigationBarTitleText": "YoungGee",
 				"navigationStyle": "custom",
@@ -51,7 +133,7 @@
 			}
 
 		}, {
-			"path": "pages/mycenter/mylocation",
+			"path": "pages/mycenter/mytask/mytask",
 			"style": {
 				"navigationBarTitleText": "YoungGee",
 				"navigationStyle": "custom",
@@ -59,36 +141,40 @@
 			}
 
 		}, {
-			"path": "pages/mycenter/myaccount",
+			"path": "pages/mycenter/mytask/executetask",
 			"style": {
 				"navigationBarTitleText": "YoungGee",
 				"navigationStyle": "custom",
 				"navigationBarTextStyle": "black"
 			}
+
 		}, {
-			"path": "pages/mycenter/mybank",
+			"path": "pages/mycenter/mytask/endtask",
 			"style": {
 				"navigationBarTitleText": "YoungGee",
 				"navigationStyle": "custom",
 				"navigationBarTextStyle": "black"
 			}
+
 		}, {
-			"path": "pages/mycenter/addlocation",
+			"path": "pages/mycenter/mytask/applytask",
 			"style": {
 				"navigationBarTitleText": "YoungGee",
 				"navigationStyle": "custom",
 				"navigationBarTextStyle": "black"
 			}
+
 		}, {
-			"path": "pages/mycenter/bindaccount",
+			"path": "pages/workspace/taskdetail",
 			"style": {
 				"navigationBarTitleText": "YoungGee",
 				"navigationStyle": "custom",
 				"navigationBarTextStyle": "black"
 			}
+
 		}
 	    ,{
-            "path" : "pages/tasksquare/bindinfo",
+            "path" : "pages/workspace/applyInformation",
 			"style": {
 				"navigationBarTitleText": "YoungGee",
 				"navigationStyle": "custom",
@@ -97,16 +183,17 @@
             
         }
         ,{
-            "path" : "pages/test/test",
-			"style": {
+            "path" : "pages/workspace/deliveryInformation",
+            "style" :                                                                                    
+            {
 				"navigationBarTitleText": "YoungGee",
 				"navigationStyle": "custom",
 				"navigationBarTextStyle": "black"
-			}
+            }
             
         }
         ,{
-            "path" : "pages/tasksquare/guide",
+            "path" : "pages/workspace/uploadscript",
 			"style": {
 				"navigationBarTitleText": "YoungGee",
 				"navigationStyle": "custom",
@@ -115,7 +202,7 @@
             
         }
         ,{
-            "path" : "pages/tasksquare/cooperation",
+            "path" : "pages/workspace/scriptrecord",
 			"style": {
 				"navigationBarTitleText": "YoungGee",
 				"navigationStyle": "custom",
@@ -138,14 +225,14 @@
 		"selectedColor": "#FFE040",
 		"backgroundColor": "#ffffff",
 		"list": [{
-				"text": "任务广场",
+				"text": "任务大厅",
 				"pagePath": "pages/tasksquare/tasksquare",
 				"iconPath": "static/img/icon-square1.png",
 				"selectedIconPath": "static/img/icon-square2.png"
 			},
 			{
 				"text": "工作台",
-				"pagePath": "pages/worksapce/worksapce",
+				"pagePath": "pages/workspace/workspace",
 				"iconPath": "static/img/icon-workspace1.png",
 				"selectedIconPath": "static/img/icon-workspace2.png"
 			},

pages/login/login.vue

@@ -1,68 +1,70 @@
 <template>
-	<view class="container">
-		<view class="head">
-			<view class="head-image">
-				<image :src="defaultavatarUrl" mode="" style="border-radius: 50%; width: 100%;height: 100%;"></image>
-			</view>
-			<view class="head-text">
-				<p style="font-weight:bold;font-size: 35rpx;padding-bottom: 20rpx;">样叽</p>
-				<p style="font-weight:bold;font-size: 35rpx;">YounGee</p>
+		<view class="container">
+			<view class="head">
+				<view class="head-image">
+					<image :src="defaultavatarUrl" mode="" style="border-radius: 50%; width: 100%;height: 100%;">
+					</image>
+				</view>
+				<view class="head-text">
+					<p style="font-weight:bold;font-size: 35rpx;padding-bottom: 20rpx;">样叽</p>
+					<p style="font-weight:bold;font-size: 35rpx;">YounGee</p>
+				</view>
 			</view>
-		</view>
-		<view class="body">
-			<button class="login-btn" @click="toggle('bottom')">微信授权</button>
-			<button class="exit-btn" @click="exit()">取消登录</button>
-			<view class="xieyi">
-				<uni-data-checkbox multiple class="xieyi-btn" v-model="value" :localdata="range" @change="select">
-				</uni-data-checkbox>
-				<p class="xieyi-read">阅读并同意</p>
-				<a class="xieyi-content" src="">《用户协议及隐私政策》</a>
+			<view class="body">
+				<button class="login-btn" @click="toggle('bottom')">微信授权</button>
+				<button class="exit-btn" @click="exit()">取消登录</button>
+				<view class="xieyi">
+					<uni-data-checkbox multiple class="xieyi-btn" v-model="value" :localdata="range" @change="select">
+					</uni-data-checkbox>
+					<p class="xieyi-read">阅读并同意</p>
+					<a class="xieyi-content" src="">《用户协议及隐私政策》</a>
+				</view>
 			</view>
-		</view>
-		<view>
-			<!-- 底部普通弹窗 -->
-			<uni-popup ref="popup" background-color="#fff" @change="change" style="border-radius: 20rpx;">
-				<view class="popup-content" :class="{ 'popup-height': type === 'left' || type === 'right' }"
-					style="    ">
-					<view class=""
-						style="width: 90%; margin: 0 auto; margin-top: 10% !important;margin-bottom: 10% !important;">
-						<view class="Tasktext">
-							<image :src="picture.task15" mode=""></image>
-							<span>YoungGee申请使用</span>
-						</view>
-						<view class="">
-							<h5>你的微信头像、昵称、地区及性别信息</h5>
-						</view>
-						<!-- 黑线 -->
-						<view class="" style="border-bottom: 2rpx solid #C0C0C0;margin-top: 3%;margin-bottom: 3%;">
-						</view>
-						<view class="" style="display: flex;justify-content:space-around;">
-
-							<image :src="picture.jpg7" mode="" style="width: 84rpx;height: 84rpx;border-radius: 10rpx;">
-							</image>
-							<view class="" style="width: 70%;">
-								<p style='color: #000000; font-size: 28rpx;'>昵称</p>
-								<p style='color: #999999; font-size: 24rpx;margin-top: 2%;'>微信个人信息</p>
+			<view>
+				<!-- 底部普通弹窗 -->
+				<uni-popup ref="popup" background-color="#fff" @change="change" style="border-radius: 20rpx;">
+					<view class="popup-content" :class="{ 'popup-height': type === 'left' || type === 'right' }"
+						style="    ">
+						<view class=""
+							style="width: 90%; margin: 0 auto; margin-top: 10% !important;margin-bottom: 10% !important;">
+							<view class="Tasktext">
+								<image :src="picture.task15" mode=""></image>
+								<span>YoungGee申请使用</span>
 							</view>
-							<view class="" style="margin-top: 3%;">
-								<image :src="picture.png6" mode="" style="width: 32rpx;height: 22rpx;"></image>
+							<view class="">
+								<h5>你的微信头像、昵称、地区及性别信息</h5>
+							</view>
+							<!-- 黑线 -->
+							<view class="" style="border-bottom: 2rpx solid #C0C0C0;margin-top: 3%;margin-bottom: 3%;">
+							</view>
+							<view class="" style="display: flex;justify-content:space-around;">
+
+								<image :src="picture.jpg7" mode=""
+									style="width: 84rpx;height: 84rpx;border-radius: 10rpx;">
+								</image>
+								<view class="" style="width: 70%;">
+									<p style='color: #000000; font-size: 28rpx;'>昵称</p>
+									<p style='color: #999999; font-size: 24rpx;margin-top: 2%;'>微信个人信息</p>
+								</view>
+								<view class="" style="margin-top: 3%;">
+									<image :src="picture.png6" mode="" style="width: 32rpx;height: 22rpx;"></image>
+								</view>
 							</view>
-						</view>
 
-						<!-- 黑线 -->
-						<view class="" style="border-bottom: 2rpx solid #C0C0C0;margin-top: 3%;margin-bottom: 3%;">
-						</view>
-						<view class="butto" style="margin-top: 3%;">
-							<button class="mini-btn" size="mini" @tap="Reset"
-								style="background-color: #F2F2F2;color:#20AC19 ; margin-right: 5%;">拒绝</button>
-							<button class="mini-btn" size="mini" @tap="determine"
-								style="background-color: #20AC19;color:#F2F2F2 ;margin-left: 5%;">允许</button>
+							<!-- 黑线 -->
+							<view class="" style="border-bottom: 2rpx solid #C0C0C0;margin-top: 3%;margin-bottom: 3%;">
+							</view>
+							<view class="butto" style="margin-top: 3%;">
+								<button class="mini-btn" size="mini" @tap="Reset"
+									style="background-color: #F2F2F2;color:#20AC19 ; margin-right: 5%;">拒绝</button>
+								<button class="mini-btn" size="mini" @tap="determine"
+									style="background-color: #20AC19;color:#F2F2F2 ;margin-left: 5%;">允许</button>
+							</view>
 						</view>
 					</view>
-				</view>
-			</uni-popup>
+				</uni-popup>
+			</view>
 		</view>
-	</view>
 </template>
 
 <script>
@@ -255,14 +257,14 @@
 		font-size: 35rpx;
 		background-color: #F0D232;
 		border: none;
-		border-radius: 0;
+		border-radius: 10rpx;
 	}
 
 	.exit-btn {
 		margin: 30rpx;
 		font-size: 35rpx;
 		border: 1rpx solid #000000;
-		border-radius: 0;
+		border-radius: 10rpx;
 	}
 
 	.xieyi {

pages/mycenter/mycenter.vue

@@ -2,7 +2,8 @@
 	<view>
 		<!-- 胶囊 -->
 		<mvBar :mysNavConfig="mysNavConfig"></mvBar>
-		<view class="home">
+		<view style="margin-top: 160rpx;"></view>
+		<view>
 			<view class="head" v-if="token">
 				<view class="head-avator">
 					<image :src="avatarUrl" mode="" style="border-radius: 50%; width: 100%;height: 100%;">
@@ -14,6 +15,7 @@
 				</view>
 				<image class="head-message" :src="picture.icon_message"></image>
 			</view>
+			
 			<view class="head" v-if="!token">
 				<view class="head-avator">
 					<image :src="picture.defaultavatarUrl" mode="" @tap="login"
@@ -24,6 +26,7 @@
 					<p @tap="login" style="font-size: 30rpx;">点击登录账号</p>
 				</view>
 			</view>
+			
 			<view class="show-income1">
 				<view class="show-income1-text">
 					<p>我获得的收益总数</p>
@@ -37,24 +40,24 @@
 			</view>
 			<view class="show-income2">
 				<view class="show-income2-text" @click="toincome('can')">
-					<p style="padding-bottom: 20rpx;color: #807F7A;">可提现</p>
+					<p style="padding-bottom: 20rpx;">可提现</p>
 					<p>{{information.canwithdraw?information.canwithdraw:0}}</p>
 				</view>
 				<view class="show-income2-text" @click="toincome('ed')">
-					<p style="padding-bottom: 20rpx;color: #807F7A;">已提现</p>
+					<p style="padding-bottom: 20rpx;">已提现</p>
 					<p>{{information.withdrawed?information.withdrawed:0}}</p>
 				</view>
 				<view class="show-income2-text" @click="toincome('ing')">
-					<p style="padding-bottom: 20rpx;color: #807F7A;">提现中</p>
+					<p style="padding-bottom: 20rpx;">提现中</p>
 					<p>{{information.withdrawing?information.withdrawing:0}}</p>
 				</view>
 			</view>
-			<view class="show-body">
+			<view class="show-body" style="border-bottom: 1rpx solid #c8c8c8;">
 				<view class="show-body1">
-					<view class="show-body1-text1">
+					<view class="show-body1-text1" @click="tomytask('all')">
 						<p>我的任务</p>
 					</view>
-					<view class="show-body1-text2">
+					<view class="show-body1-text2" @click="tomytask('all')">
 						<image class="show-body1-icon" :src="picture.icon_right"></image>
 					</view>
 				</view>
@@ -63,18 +66,15 @@
 						<p class="task-num-p">{{information.task_all?information.task_all:0}}</p>
 						<p padding>全部任务</p>
 					</view>
-					<view class="shu-line"></view>
 					<view class="show-body2-text" @click="tomytask('apply')">
 						<p class="task-num-p">{{information.task_apply?information.task_apply:0}}
 						<p>
 						<p>已报名</p>
 					</view>
-					<view class="shu-line"></view>
 					<view class="show-body2-text" @click="tomytask('execute')">
 						<p class="task-num-p">{{information.task_execute?information.task_execute:0}}</p>
 						<p>执行中</p>
 					</view>
-					<view class="shu-line"></view>
 					<view class="show-body2-text" @click="tomytask('end')">
 						<p class="task-num-p">{{ information.task_end ? information.task_end:0}}</p>
 						<p>已结束</p>
@@ -220,23 +220,44 @@
 					},
 				},
 				codeImg: '',
-				information: {
-
-				},
+				information: {},
 			};
 		},
 		onShow() {
-			this.nickName = uni.getStorageSync('nickName')
-			this.avatarUrl = uni.getStorageSync('avatarUrl')
-			this.token = uni.getStorageSync('token')
-			console.log(this.token)
-			if (this.token !== '')
-				this.gettalentinfo()
-		},
-		onLoad() {
+			// 显示加载中
+			uni.showLoading({
+				title: '加载中'
+			});
 
+			// 判断是否登录
+			this.isLogin()
+			if (this.token !== '') { // 若登录
+				this.nickName = uni.getStorageSync('nickName')
+				this.avatarUrl = uni.getStorageSync('avatarUrl')
+				
+				this.gettalentinfo()	// 获取达人基本信息
+				this.getTaskNum()	// 获取参与任务数量
+			} else { // 未登录
+				uni.hideLoading();
+			}
 		},
+		onLoad() {},
 		methods: {
+			// 判断登陆是否过期
+			isLogin() {
+				if (this.token == '') {
+					this.token = uni.getStorageSync('token')
+				}
+				this.$https.get('/youngee/c/t/g/is-login')
+					.then(res => {
+						console.log(res)
+						if (res.data.code == 403) {
+							this.token = ""
+							uni.clearStorage();
+						}
+					})
+			},
+			// 获取达人基本信息
 			gettalentinfo() {
 				this.$https.get('/youngee/c/t/g/get-talent-info')
 					.then(res => {
@@ -244,6 +265,20 @@
 						this.information = res.data.data
 					})
 			},
+			// 获取达人参与任务数量
+			getTaskNum() {
+				this.$https.get('/youngee/c/t/g/get-task-num')
+					.then(res => {
+						console.log(res)
+						this.information.task_all = res.data.data.all_num
+						this.information.task_apply = res.data.data.sign_up_num
+						this.information.task_execute = res.data.data.going_on_num
+						this.information.task_end = res.data.data.completed_num
+
+						uni.hideLoading();
+
+					})
+			},
 			// 进入登录页面
 			login() {
 				uni.navigateTo({
@@ -254,7 +289,7 @@
 			personinfo() {
 				if (this.token !== '')
 					uni.navigateTo({
-						url: '/pages/mycenter/personinfo'
+						url: '/pages/mycenter/myinformation/personinfo'
 					});
 				else
 					this.login()
@@ -263,7 +298,7 @@
 			mylocation() {
 				if (this.token !== '')
 					uni.navigateTo({
-						url: '/pages/mycenter/mylocation'
+						url: '/pages/mycenter/myinformation/mylocation'
 					});
 				else
 					this.login()
@@ -272,7 +307,7 @@
 			myaccount() {
 				if (this.token !== '')
 					uni.navigateTo({
-						url: '/pages/mycenter/myaccount'
+						url: '/pages/mycenter/myinformation/myaccount'
 					});
 				else
 					this.login()
@@ -281,7 +316,7 @@
 			mybank() {
 				if (this.token !== '')
 					uni.navigateTo({
-						url: '/pages/mycenter/mybank'
+						url: '/pages/mycenter/myinformation/mybank'
 					});
 				else
 					this.login()
@@ -296,85 +331,64 @@
 			},
 			// 进入我的任务页面
 			tomytask(tab) {
+				if (this.token !== '') {
+					switch (tab) {
+						case "all":
+							uni.navigateTo({
+								url: '/pages/mycenter/mytask/mytask'
+							});
+							break;
+						case "execute":
+							uni.navigateTo({
+								url: '/pages/mycenter/mytask/executetask'
+							});
+							break;
+						case "apply":
+							uni.navigateTo({
+								url: '/pages/mycenter/mytask/applytask'
+							});
+							break;
+						case "end":
+							uni.navigateTo({
+								url: '/pages/mycenter/mytask/endtask'
+							});
+							break;
+					}
+				} else
+					this.login()
 				console.log(tab)
-			}
-		},
-		// 保留两位小数点
-		toDecimal(x) {
-			var f = parseFloat(x);
-			if (isNaN(f)) {
-				return;
-			}
-			f = Math.round(x * 100) / 100;
-			return f;
-		},
-		//弹出层
-		change(e) {
-			console.log('当前模式：' + e.type + ',状态：' + e.show);
-		},
-		togo2(type) {
-			this.type2 = type
-			// open 方法传入参数 等同在 uni-popup 组件上绑定 type属性
-			this.$refs.popup2.open(type)
-			// this.$refs.popup1.close()
-		},
-		togo3(type) {
-			this.type3 = type
-			// open 方法传入参数 等同在 uni-popup 组件上绑定 type属性
-			this.$refs.popup3.open(type)
-			// this.$refs.popup1.close()
-		},
-		togo4(type) {
-			this.type4 = type
-			// open 方法传入参数 等同在 uni-popup 组件上绑定 type属性
-			this.$refs.popup4.open(type)
-			// this.$refs.popup1.close()
-		},
-		// 进入关于样叽
-		about() {
-			uni.navigateTo({
-				url: '/pages/my/aboutyg'
-			});
-		},
-		// 进入个人信息
-		personal() {
-			uni.navigateTo({
-				url: '/pages/my/personal'
-			});
-		},
-		// 进入收货地址
-		receiving() {
-			uni.navigateTo({
-				url: '/pages/my/receiving'
-			});
-		},
-		// 进入卜卜币页面
-		ppcurrency() {
-			uni.navigateTo({
-				url: '/pages/ppcurrency/ppcurrency'
-			});
-		},
-		// 进入个人账号页面
-		gameplayer() {
-			uni.navigateTo({
-				url: '/pages/gameplayer/gameplayer'
-			});
-		},
-		// 进入任务列表页面
-
-		mymission(typee) {
-			if (this.token !== '') {
-				uni.navigateTo({
-					url: '/pages/mymission/mymission?typee=' + typee
-				});
-			} else {
-				uni.showToast({
-					title: '请先登录',
-					icon: 'none',
-					duration: 2000
-				});
-			}
-
+			},
+			// 保留两位小数点
+			toDecimal(x) {
+				var f = parseFloat(x);
+				if (isNaN(f)) {
+					return;
+				}
+				f = Math.round(x * 100) / 100;
+				return f;
+			},
+			//弹出层
+			change(e) {
+				console.log('当前模式：' + e.type + ',状态：' + e.show);
+			},
+			togo2(type) {
+				this.type2 = type
+				// open 方法传入参数 等同在 uni-popup 组件上绑定 type属性
+				this.$refs.popup2.open(type)
+				// this.$refs.popup1.close()
+			},
+			togo3(type) {
+				this.type3 = type
+				// open 方法传入参数 等同在 uni-popup 组件上绑定 type属性
+				this.$refs.popup3.open(type)
+				// this.$refs.popup1.close()
+			},
+			togo4(type) {
+				this.type4 = type
+				// open 方法传入参数 等同在 uni-popup 组件上绑定 type属性
+				this.$refs.popup4.open(type)
+				// this.$refs.popup1.close()
+			},
 		},
 	};
 </script>
@@ -396,8 +410,6 @@
 		height: 200rpx;
 		position: relative;
 		margin: 2% 3% 3%;
-		border: 1rpx solid #BCBCBC;
-		border-radius: 10rpx;
 	}
 
 	.head-avator {
@@ -425,8 +437,6 @@
 		align-items: center;
 		height: 120rpx;
 		margin: 0 3%;
-		border: 1rpx solid #BCBCBC;
-		border-radius: 10rpx;
 	}
 
 	.show-income1-text {
@@ -443,7 +453,6 @@
 		width: 200rpx;
 		text-align: center;
 		background-color: #F0D232;
-		border: 1rpx solid #BCBCBC;
 		border-radius: 15rpx;
 		font-size: 35rpx;
 		line-height: 180%;
@@ -455,9 +464,8 @@
 		justify-content: space-between;
 		height: 150rpx;
 		margin: 0 3% 3%;
-		border: 1rpx solid #BCBCBC;
-		border-radius: 10rpx;
 		background-color: #F0D232;
+		border-radius: 10rpx;
 	}
 
 	.show-income2-text {
@@ -468,8 +476,6 @@
 	.show-body {
 		height: 250rpx;
 		margin: 0 3% 3%;
-		border: 1rpx solid #BCBCBC;
-		border-radius: 10rpx;
 	}
 
 	.show-body1 {
@@ -480,14 +486,14 @@
 
 	.show-body1-text1 {
 		display: flex;
-		justify-content: flex-start; 
+		justify-content: flex-start;
 		margin-left: 20rpx;
 		// margin-right: 480rpx;
 	}
 
 	.show-body1-text2 {
 		display: flex;
-		justify-content: flex-end; 
+		justify-content: flex-end;
 		margin-right: 20rpx;
 		flex: 1;
 		// display: flex;

pages/mycenter/addlocation.vue → pages/mycenter/myinformation/addlocation.vue

@@ -23,17 +23,17 @@
 			<view style="margin: 0 20rpx;">
 				<uni-forms :rules="rules" :modelValue="formData" ref="form" validate-trigger="bind"
 					err-show-type="undertext">
-					<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>
-					<uni-forms-item name="phone" required label="联系电话">
+					<uni-forms-item name="phone" required label="电话">
 						<uni-easyinput type="number" maxlength="11" :inputBorder="true" v-model="formData.phone"
 							placeholder="请输入联系电话">
 						</uni-easyinput>
 					</uni-forms-item>
 
-					<uni-forms-item name="fregion" required label="所在地区">
+					<uni-forms-item name="fregion" required label="地区">
 						<picker class="picker" mode="multiSelector" :range="region" range-key="name"
 							:value="regionIndex" @change="pickerChange" @columnchange="pickerColumnchange">
 							<view class="pbox" :class="{'pbox_hover':regionStr != '请选择省市区'}">
@@ -47,10 +47,6 @@
 							placeholder="请输入详细地址(省/市/县/镇/)">
 						</uni-easyinput>
 					</uni-forms-item>
-					<uni-forms-item name="mail_code" required label="邮政编码">
-						<uni-easyinput type="text" :inputBorder="true" v-model="formData.mail_code" placeholder="邮政编码">
-						</uni-easyinput>
-					</uni-forms-item>
 					</uni-group>
 				</uni-forms>
 				<view class="setdeault" v-if="ismodify == '0'">
@@ -114,7 +110,6 @@
 					phone: '',
 					detailregion: '',
 					fregion: '',
-					mail_code: '',
 					setdefault: false,
 				},
 				index: 0,
@@ -122,12 +117,6 @@
 				data: {},
 				show: false,
 				rules: {
-					mail_code: {
-						rules: [{
-							required: true,
-							errorMessage: '请输入邮政编码'
-						}, ]
-					},
 					detailregion: {
 						rules: [{
 							required: true,
@@ -217,7 +206,6 @@
 						this.formData.phone = res.data.data.phone_number
 						this.formData.detailregion = res.data.data.detail_addr
 						this.formData.fregion = res.data.data.region_code
-						this.formData.mail_code = res.data.data.mail_code
 						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
@@ -250,7 +238,6 @@
 				this.$refs.form.validate().then(res => {
 
 					const iphoneReg1 = /^1[0-9]{10}$/
-					const mailReg = /\d{6}/
 					if (!iphoneReg1.test(this.formData.phone)) {
 						uni.showToast({
 							title: '电话号码格式不正确',
@@ -258,13 +245,6 @@
 						})
 						return
 					}
-					if (!mailReg.test(this.formData.mail_code)) {
-						uni.showToast({
-							title: '邮政编码格式不正确',
-							icon: 'none'
-						})
-						return
-					}
 					uni.showToast({
 						title: '提交成功'
 					})
@@ -275,7 +255,6 @@
 								detail_addr: this.formData.detailregion,
 								phone_number: this.formData.phone,
 								receiver_name: this.formData.name,
-								mail_code: this.formData.mail_code,
 							})
 							.then(res => {
 								console.log(res)
@@ -287,7 +266,6 @@
 								detail_addr: this.formData.detailregion,
 								phone_number: this.formData.phone,
 								receiver_name: this.formData.name,
-								mail_code: this.formData.mail_code,
 								default_tag: this.formData.setdefault
 							})
 							.then(res => {

pages/mycenter/bindaccount.vue → pages/mycenter/myinformation/bindaccount.vue

@@ -65,6 +65,7 @@
 		},
 		data() {
 			return {
+				isUpdate: false,
 				accountId: '',
 				platform: {
 					platform_id: '',
@@ -142,6 +143,9 @@
 				this.accountId = parseInt(options.account_id)
 				this.isBind = false
 			}
+			// if (options.isUpdate) {
+			// 	this.isUpdate = true
+			// }
 			this.getinfo()
 		},
 		methods: {
@@ -426,8 +430,7 @@
 	.heng-line {
 		margin-top: 60rpx;
 		margin-bottom: 50rpx;
-		border: 1rpx solid #DCDCDC;
-
+		border-bottom: 1rpx solid #DCDCDC;
 	}
 
 	.signupbtn p {
@@ -435,9 +438,11 @@
 	}
 
 	.exit-btn {
-		width: 120%;
+		width: 200rpx;
 		text-align: center;
+		padding: 10rpx 30rpx;
 		background-color: #C0C0C0;
+		border: 0;
 		border-radius: 10rpx;
 		color: #FFFFFF;
 		font-size: 30rpx;
@@ -447,7 +452,9 @@
 	.main-btn {
 		width: 300rpx;
 		text-align: center;
+		padding: 10rpx 20rpx;
 		background-color: #FCCF41;
+		border: 0;
 		border-radius: 10rpx;
 		color: #000000;
 		font-size: 30rpx;

pages/mycenter/myaccount.vue → pages/mycenter/myinformation/myaccount.vue

@@ -144,14 +144,15 @@
 			},
 			// 前往绑定账号
 			bindaccount(item) {
+				console.log("11", item)
 				uni.navigateTo({
-					url: '/pages/mycenter/bindaccount?platform_id=' + item.id
+					url: '/pages/mycenter/myinformation/bindaccount?platform_id=' + item.id
 				});
 			},
 			// 前往账号详情
 			accountdetail(item) {
 				uni.navigateTo({
-					url: '/pages/mycenter/bindaccount?platform_id=' + item.platform_id + '&account_id=' + item
+					url: '/pages/mycenter/myinformation/bindaccount?platform_id=' + item.platform_id + '&account_id=' + item
 						.account_id
 				});
 			}

pages/mycenter/mylocation.vue → pages/mycenter/myinformation/mylocation.vue

@@ -95,7 +95,7 @@
 		},
 		data() {
 			return {
-				weixinimage: "../../static/img/icon-weixin.png",
+				weixinimage: "../../../static/img/icon-weixin.png",
 				picture: {
 					icon_edit:'https://horastar.obs.cn-east-3.myhuaweicloud.com/youngee/talent_upload/icon-edit.png',
 					icon_del:'https://horastar.obs.cn-east-3.myhuaweicloud.com/youngee/talent_upload/icon-del.png',
@@ -159,16 +159,12 @@
 					.then(res => {
 						console.log(res)
 						this.list = res.data.data
-						if (this.list.length == 0)
-							uni.navigateTo({
-								url: '/pages/mycenter/addlocation?ismodify=0'
-							});
 					})
 			},
 			// 进入添加收货地址
 			addreceipt() {
 				uni.navigateTo({
-					url: '/pages/mycenter/addlocation?ismodify=0'
+					url: '/pages/mycenter/myinformation/addlocation?ismodify=0'
 				});
 			},
 			chooseAddr() {
@@ -242,7 +238,7 @@
 			edit(item) {
 				console.log(item.receiver_name)
 				uni.navigateTo({
-					url: '/pages/mycenter/addlocation?address_id=' + item.address_id + '&ismodify=1'
+					url: '/pages/mycenter/myinformation/addlocation?address_id=' + item.address_id + '&ismodify=1'
 				});
 			},
 			// 删除地址
@@ -367,7 +363,7 @@
 	.taskimg {
 		width: 30rpx;
 		height: 30rpx;
-		background-image: url(../../static/home/home12.png);
+		background-image: url(../../../static/home/home12.png);
 		background-size: 30rpx;
 		background-repeat: no-repeat;
 		box-sizing: border-box;
@@ -375,7 +371,7 @@
 		vertical-align: middle;
 
 		&.on {
-			background-image: url(../../static/home/home13.png);
+			background-image: url(../../../static/home/home13.png);
 
 		}
 	}

pages/mycenter/personinfo.vue → pages/mycenter/myinformation/personinfo.vue

@@ -44,18 +44,11 @@
 							</view>
 						</picker>
 					</uni-forms-item>
-					<uni-forms-item name="sex" required label="性别">
-						<uni-data-checkbox v-model="formData.sex" :localdata="sex1"></uni-data-checkbox>
-					</uni-forms-item>
 					<uni-forms-item name="phone" required label="联系电话">
 						<uni-easyinput type="number" maxlength="11" :inputBorder="true" v-model="formData.phone"
 							placeholder="请输入联系电话">
 						</uni-easyinput>
 					</uni-forms-item>
-					<uni-forms-item name="wechat" required label="微信号">
-						<uni-easyinput type="text" :inputBorder="true" v-model="formData.wechat" placeholder="请输入微信号">
-						</uni-easyinput>
-					</uni-forms-item>
 					</uni-group>
 				</uni-forms>
 				<button class="btn1" @click="submitForm('form')">保存</button>
@@ -135,18 +128,18 @@
 				data: {},
 				show: false,
 				rules: {
-					wechat: {
-						rules: [{
-							required: true,
-							errorMessage: '请输入微信号'
-						}, ]
-					},
-					sex: {
-						rules: [{
-							required: true,
-							errorMessage: '请选择性别'
-						}, ]
-					},
+					// wechat: {
+					// 	rules: [{
+					// 		required: true,
+					// 		errorMessage: '请输入微信号'
+					// 	}, ]
+					// },
+					// sex: {
+					// 	rules: [{
+					// 		required: true,
+					// 		errorMessage: '请选择性别'
+					// 	}, ]
+					// },
 					phone: {
 						rules: [{
 								required: true,
@@ -275,9 +268,7 @@
 								this.regionStr = a + ' ' + b + ' ' + c
 								this.formData.visitStoreRegion = res.data.data.visit_store_region
 							}
-							this.formData.sex = res.data.data.talent_gender
 							this.formData.phone = res.data.data.talent_phone_number
-							this.formData.wechat = res.data.data.talent_wx_number
 						}
 					})
 			},
@@ -301,8 +292,6 @@
 			 * @param {Object} form
 			 */
 			submitForm(form) {
-
-				// console.log(this.formData);
 				this.$refs[form]
 					.submit()
 					.then(res => {
@@ -322,8 +311,6 @@
 								talent_age_bracket: this.formData.age,
 								talent_nationality: this.formData.nationality,
 								visit_store_region: this.formData.visitStoreRegion,
-								talent_gender: this.formData.sex,
-								talent_wx_number: this.formData.wechat,
 								talent_phone_number: this.formData.phone,
 							})
 							.then(res => {

pages/mycenter/mytask/applytask.vue

@@ -0,0 +1,211 @@
+<template>
+	<view>
+		<!-- 胶囊 -->
+		<mvBar :mysNavConfig="mysNavConfig"></mvBar>
+		<view style="height: 180rpx;width: 100%; position: fixed;background-color: #FFFFFF;top: 0;z-index: 8;">
+		</view>
+		<view class="menu">
+			<view class="menu-item" @click="toAll()">
+				<p>全部</p>
+			</view>
+			<view class="menu-item">
+				<p class='lor'>已报名</p>
+			</view>
+			<view class="menu-item" @click="toexecute()">
+				<p>执行中</p>
+			</view>
+			<view class="menu-item" @click="toEnd()">
+				<p>已结束</p>
+			</view>
+		</view>
+		
+		<view class="home">
+			<view class="task" v-for="item in applyList">
+				<view @click="toDetail(item)">
+					<view class="task-head">
+						<view class="task-head-account">
+							<image :src="item.platform_icon_url" style="height: 50rpx;width: 50rpx;"></image>
+							<p style="margin-left: 20rpx;">{{item.platform_nick_name}}</p>
+						</view>
+						<view class="task-head-status">
+							<p>{{item.task_stage_txt}}</p>
+						</view>
+					</view>
+					<view class="task-info">
+						<image :src="item.product_img_url" style="height: 120rpx;width: 120rpx;"></image>
+						<p style="margin-left: 50rpx;">{{item.project_name}}</p>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import mvBar from "@/components/mys_navBar/mysNavBar";
+	export default {
+		components: {
+			mvBar,
+		},
+		data() {
+			return {
+				allList: [],
+				applyList: [],
+				goingList: [],
+				endList: [],
+				taskStageList: [],
+				mysNavConfig: {
+					/* 开启单页显示首页图标 */
+					isHome: true,
+					/* 固定导航  */
+					navFixed: true,
+					/* 标题 （屏幕中心居中 两边图标中心居中使用slot center1） */
+					navTitle: {
+						text: "我的信息",
+						color: "",
+						fontSize: "32rpx", // px upx rpx
+						fontWeight: "normal", // 100 - 700
+					},
+					btnType: "type2",
+					onLeftClick: "/pages/mycenter/mycenter",
+					/* type2 按钮 */
+					type2Config: {
+						// 左图标
+						leftPath: "/static/img/png2.png",
+						// 右图标
+						rightPath: "/static/img/png4.png",
+						// 圆角
+						radius: "40rpx",
+					},
+				},
+			}
+		},
+		onLoad() {
+			uni.showLoading({
+				title: '加载中'
+			});
+			this.getInfoTable();
+		},
+		methods: {
+			getInfoTable() {
+				this.$https.get('/youngee/c/g/get-info-tables')
+					.then(res => {
+						console.log(res)
+						this.taskStageList = res.data.data.TaskStage
+						this.getList()
+					})
+			},
+			getList() {
+				console.log("run func getList")
+				this.$https.get('/youngee/c/t/g/get-task-brief-list').then(res => {
+					console.log(res)
+					this.applyList = res.data.data.sgin_up_Task_info_list
+					if (this.applyList != null) {
+						for (let i = 0; i < this.applyList.length; ++i) {
+							for (let j = 0; j < this.taskStageList.length; ++j) {
+								if (this.applyList[i].task_stage == this.taskStageList[j].task_stage_id)
+									this.applyList[i].task_stage_txt = this.taskStageList[j].task_stage
+							}
+						}
+					}
+
+					console.log(this.applyList)
+					uni.hideLoading();
+				})
+			},
+			toAll() {
+				uni.navigateTo({
+					url: '/pages/mycenter/mytask/mytask'
+				});
+			},
+			toexecute() {
+				uni.navigateTo({
+					url: '/pages/mycenter/mytask/executetask'
+				});
+			},
+			toEnd() {
+				uni.navigateTo({
+					url: '/pages/mycenter/mytask/endtask'
+				});
+			},
+			toDetail(item) {
+				console.log("func toDetail running")
+				uni.navigateTo({
+					url: '/pages/workspace/taskdetail?taskId=' + item.task_id,
+					success(res) {
+						console.log(res);
+					},
+					fail(err) {
+						console.log(err);
+					}
+				});
+
+				console.log("func toDetail end")
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	view {
+		font-size: 14px;
+		line-height: inherit;
+	}
+
+	.menu {
+		position: fixed;
+		top: 180rpx;
+		border-bottom: #FCCF41;
+		background-color: #FFFFFF;
+		justify-content: space-around;
+		height: 5%;
+		width: 100%;
+		display: flex;
+		z-index: 10;
+	}
+
+	.menu-item p {
+		font-weight: 600;
+
+		&.lor {
+			border-bottom: 5rpx solid #F0D232;
+			color: #F0D232;
+			padding-bottom: 15rpx;
+		}
+	}
+
+	.home {
+		margin-top: 100rpx;
+	}
+
+	.task {
+		margin-bottom: 20rpx;
+		border-bottom: 1rpx #d7d7d7 solid;
+
+		.task-head {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			padding: 10rpx 20rpx;
+
+			.task-head-account {
+				display: flex;
+			}
+
+			.task-head-status {
+				color: red;
+			}
+		}
+
+		.task-info {
+			display: flex;
+			align-items: center;
+			padding: 10rpx 20rpx;
+
+		}
+	}
+
+	.line {
+		border-bottom: 1rpx #AAAAAA solid;
+	}
+</style>

pages/mycenter/mytask/endtask.vue

@@ -0,0 +1,212 @@
+<template>
+	<view>
+		<!-- 胶囊 -->
+		<mvBar :mysNavConfig="mysNavConfig"></mvBar>
+		<view style="height: 180rpx;width: 100%; position: fixed;background-color: #FFFFFF;top: 0;z-index: 8;">
+		</view>
+		<view class="menu">
+			<view class="menu-item" @click="toAll()">
+				<p>全部</p>
+			</view>
+			<view class="menu-item" @click="toApply()">
+				<p>已报名</p>
+			</view>
+			<view class="menu-item" @click="toexecute()">
+				<p>执行中</p>
+			</view>
+			<view class="menu-item">
+				<p class='lor'>已结束</p>
+			</view>
+		</view>
+		
+		<view class="home">
+			<view class="task" v-for="item in endList">
+				<view @click="toDetail(item)">
+					<view class="task-head">
+						<view class="task-head-account">
+							<image :src="item.platform_icon_url" style="height: 50rpx;width: 50rpx;"></image>
+							<p style="margin-left: 20rpx;">{{item.platform_nick_name}}</p>
+						</view>
+						<view class="task-head-status">
+							<p>{{item.task_stage_txt}}</p>
+						</view>
+					</view>
+					<view class="task-info">
+						<image :src="item.product_img_url" style="height: 120rpx;width: 120rpx;"></image>
+						<p style="margin-left: 50rpx;">{{item.project_name}}</p>
+					</view>
+				</view>
+			</view>
+		</view>
+		
+	</view>
+</template>
+
+<script>
+	import mvBar from "@/components/mys_navBar/mysNavBar";
+	export default {
+		components: {
+			mvBar,
+		},
+		data() {
+			return {
+				allList: [],
+				applyList: [],
+				goingList: [],
+				endList: [],
+				taskStageList: [],
+				mysNavConfig: {
+					/* 开启单页显示首页图标 */
+					isHome: true,
+					/* 固定导航  */
+					navFixed: true,
+					/* 标题 （屏幕中心居中 两边图标中心居中使用slot center1） */
+					navTitle: {
+						text: "我的信息",
+						color: "",
+						fontSize: "32rpx", // px upx rpx
+						fontWeight: "normal", // 100 - 700
+					},
+					btnType: "type2",
+					onLeftClick: "/pages/mycenter/mycenter",
+					/* type2 按钮 */
+					type2Config: {
+						// 左图标
+						leftPath: "/static/img/png2.png",
+						// 右图标
+						rightPath: "/static/img/png4.png",
+						// 圆角
+						radius: "40rpx",
+					},
+				},
+			}
+		},
+		onLoad() {
+			uni.showLoading({
+				title: '加载中'
+			});
+			this.getInfoTable();
+		},
+		methods: {
+			getInfoTable() {
+				this.$https.get('/youngee/c/g/get-info-tables')
+					.then(res => {
+						console.log(res)
+						this.taskStageList = res.data.data.TaskStage
+						this.getList()
+					})
+			},
+			getList() {
+				console.log("run func getList")
+				this.$https.get('/youngee/c/t/g/get-task-brief-list').then(res => {
+					console.log(res)
+					this.endList = res.data.data.completed_Task_info_list
+					if (this.endList != null) {
+						for (let i = 0; i < this.endList.length; ++i) {
+							for (let j = 0; j < this.taskStageList.length; ++j) {
+								if (this.endList[i].task_stage == this.taskStageList[j].task_stage_id)
+									this.endList[i].task_stage_txt = this.taskStageList[j].task_stage
+							}
+						}
+					}
+
+					console.log(this.endList)
+					uni.hideLoading();
+				})
+			},
+			toAll() {
+				uni.navigateTo({
+					url: '/pages/mycenter/mytask/mytask'
+				});
+			},
+			toApply() {
+				uni.navigateTo({
+					url: '/pages/mycenter/mytask/applytask'
+				});
+			},
+			toexecute() {
+				uni.navigateTo({
+					url: '/pages/mycenter/mytask/executetask'
+				});
+			},
+			toDetail(item) {
+				console.log("func toDetail running")
+				uni.navigateTo({
+					url: '/pages/workspace/taskdetail?taskId=' + item.task_id,
+					success(res) {
+						console.log(res);
+					},
+					fail(err) {
+						console.log(err);
+					}
+				});
+
+				console.log("func toDetail end")
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	view {
+		font-size: 14px;
+		line-height: inherit;
+	}
+
+	.menu {
+		position: fixed;
+		top: 180rpx;
+		border-bottom: #FCCF41;
+		background-color: #FFFFFF;
+		justify-content: space-around;
+		height: 5%;
+		width: 100%;
+		display: flex;
+		z-index: 10;
+	}
+
+	.menu-item p {
+		font-weight: 600;
+
+		&.lor {
+			border-bottom: 5rpx solid #F0D232;
+			color: #F0D232;
+			padding-bottom: 15rpx;
+		}
+	}
+
+	.home {
+		margin-top: 100rpx;
+	}
+
+	.task {
+		margin-bottom: 20rpx;
+		border-bottom: 1rpx #d7d7d7 solid;
+
+		.task-head {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			padding: 10rpx 20rpx;
+
+			.task-head-account {
+				display: flex;
+			}
+
+			.task-head-status {
+				color: red;
+			}
+		}
+
+		.task-info {
+			display: flex;
+			align-items: center;
+			padding: 10rpx 20rpx;
+
+		}
+	}
+
+	.line {
+		border-bottom: 1rpx #AAAAAA solid;
+	}
+</style>

pages/mycenter/mytask/executetask.vue

@@ -0,0 +1,211 @@
+<template>
+	<view>
+		<!-- 胶囊 -->
+		<mvBar :mysNavConfig="mysNavConfig"></mvBar>
+		<view style="height: 180rpx;width: 100%; position: fixed;background-color: #FFFFFF;top: 0;z-index: 8;">
+		</view>
+		<view class="menu">
+			<view class="menu-item" @click="toAll()">
+				<p>全部</p>
+			</view>
+			<view class="menu-item" @click="toApply()">
+				<p>已报名</p>
+			</view>
+			<view class="menu-item">
+				<p  class='lor'>执行中</p>
+			</view>
+			<view class="menu-item" @click="toEnd()">
+				<p>已结束</p>
+			</view>
+		</view>
+		
+		<view class="home">
+			<view class="task" v-for="item in goingList">
+				<view @click="toDetail(item)">
+					<view class="task-head">
+						<view class="task-head-account">
+							<image :src="item.platform_icon_url" style="height: 50rpx;width: 50rpx;"></image>
+							<p style="margin-left: 20rpx;">{{item.platform_nick_name}}</p>
+						</view>
+						<view class="task-head-status">
+							<p>{{item.task_stage_txt}}</p>
+						</view>
+					</view>
+					<view class="task-info">
+						<image :src="item.product_img_url" style="height: 120rpx;width: 120rpx;"></image>
+						<p style="margin-left: 50rpx;">{{item.project_name}}</p>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import mvBar from "@/components/mys_navBar/mysNavBar";
+	export default {
+		components: {
+			mvBar,
+		},
+		data() {
+			return {
+				allList: [],
+				applyList: [],
+				goingList: [],
+				endList: [],
+				taskStageList: [],
+				mysNavConfig: {
+					/* 开启单页显示首页图标 */
+					isHome: true,
+					/* 固定导航  */
+					navFixed: true,
+					/* 标题 （屏幕中心居中 两边图标中心居中使用slot center1） */
+					navTitle: {
+						text: "我的信息",
+						color: "",
+						fontSize: "32rpx", // px upx rpx
+						fontWeight: "normal", // 100 - 700
+					},
+					btnType: "type2",
+					onLeftClick: "/pages/mycenter/mycenter",
+					/* type2 按钮 */
+					type2Config: {
+						// 左图标
+						leftPath: "/static/img/png2.png",
+						// 右图标
+						rightPath: "/static/img/png4.png",
+						// 圆角
+						radius: "40rpx",
+					},
+				},
+			}
+		},
+		onLoad() {
+			uni.showLoading({
+				title: '加载中'
+			});
+			this.getInfoTable();
+		},
+		methods: {
+			getInfoTable() {
+				this.$https.get('/youngee/c/g/get-info-tables')
+					.then(res => {
+						console.log(res)
+						this.taskStageList = res.data.data.TaskStage
+						this.getList()
+					})
+			},
+			getList() {
+				console.log("run func getList")
+				this.$https.get('/youngee/c/t/g/get-task-brief-list').then(res => {
+					console.log(res)
+					this.goingList = res.data.data.going_on_Task_info_list
+					if (this.goingList != null) {
+						for (let i = 0; i < this.goingList.length; ++i) {
+							for (let j = 0; j < this.taskStageList.length; ++j) {
+								if (this.goingList[i].task_stage == this.taskStageList[j].task_stage_id)
+									this.goingList[i].task_stage_txt = this.taskStageList[j].task_stage
+							}
+						}
+					}
+
+					console.log(this.goingList)
+					uni.hideLoading();
+				})
+			},
+			toAll() {
+				uni.navigateTo({
+					url: '/pages/mycenter/mytask/mytask'
+				});
+			},
+			toApply() {
+				uni.navigateTo({
+					url: '/pages/mycenter/mytask/applytask'
+				});
+			},
+			toEnd() {
+				uni.navigateTo({
+					url: '/pages/mycenter/mytask/endtask'
+				});
+			},
+			toDetail(item) {
+				console.log("func toDetail running")
+				uni.navigateTo({
+					url: '/pages/workspace/taskdetail?taskId=' + item.task_id,
+					success(res) {
+						console.log(res);
+					},
+					fail(err) {
+						console.log(err);
+					}
+				});
+
+				console.log("func toDetail end")
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	view {
+		font-size: 14px;
+		line-height: inherit;
+	}
+
+	.menu {
+		position: fixed;
+		top: 180rpx;
+		border-bottom: #FCCF41;
+		background-color: #FFFFFF;
+		justify-content: space-around;
+		height: 5%;
+		width: 100%;
+		display: flex;
+		z-index: 10;
+	}
+
+	.menu-item p {
+		font-weight: 600;
+
+		&.lor {
+			border-bottom: 5rpx solid #F0D232;
+			color: #F0D232;
+			padding-bottom: 15rpx;
+		}
+	}
+
+	.home {
+		margin-top: 100rpx;
+	}
+
+	.task {
+		margin-bottom: 20rpx;
+		border-bottom: 1rpx #d7d7d7 solid;
+
+		.task-head {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			padding: 10rpx 20rpx;
+
+			.task-head-account {
+				display: flex;
+			}
+
+			.task-head-status {
+				color: red;
+			}
+		}
+
+		.task-info {
+			display: flex;
+			align-items: center;
+			padding: 10rpx 20rpx;
+
+		}
+	}
+
+	.line {
+		border-bottom: 1rpx #AAAAAA solid;
+	}
+</style>

pages/mycenter/mytask/mytask.vue

@@ -0,0 +1,228 @@
+<template>
+	<view>
+		<!-- 胶囊 -->
+		<mvBar :mysNavConfig="mysNavConfig"></mvBar>
+		<view style="height: 180rpx;width: 100%; position: fixed;background-color: #FFFFFF;top: 0;z-index: 8;">
+		</view>
+		<view class="menu">
+			<view class="menu-item">
+				<p class='lor'>全部</p>
+			</view>
+			<view class="menu-item" @click="toApply()">
+				<p>已报名</p>
+			</view>
+			<view class="menu-item" @click="toexecute()">
+				<p>执行中</p>
+			</view>
+			<view class="menu-item" @click="toEnd()">
+				<p>已结束</p>
+			</view>
+		</view>
+
+		<view class="home">
+			<view class="task" v-for="item in allList">
+				<view @click="toDetail(item)">
+					<view class="task-head">
+						<view class="task-head-account">
+							<image :src="item.platform_icon_url" style="height: 50rpx;width: 50rpx;"></image>
+							<p style="margin-left: 20rpx;">{{item.platform_nick_name}}</p>
+						</view>
+						<view class="task-head-status">
+							<p>{{item.task_stage_txt}}</p>
+						</view>
+					</view>
+					<view class="task-info">
+						<image :src="item.product_img_url" style="height: 120rpx;width: 120rpx;"></image>
+						<p style="margin-left: 50rpx;">{{item.project_name}}</p>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import mvBar from "@/components/mys_navBar/mysNavBar";
+	export default {
+		components: {
+			mvBar,
+		},
+		data() {
+			return {
+				allList: [],
+				applyList: [],
+				goingList: [],
+				endList: [],
+				taskStageList: [],
+				list: [{
+					account: {
+						platform: "https://horastar.obs.cn-east-3.myhuaweicloud.com/talent/lQLPDhrXwll1_MsjI7CSK_6e62AG2AGOvh1HgAcA_35_35.png",
+						nickname: "丸子在成都",
+					},
+					status: "待确认",
+					mainphoto: "https://static1.paizi.com/uploadfile/2018/1013/20181013013207465.png",
+					taskname: "醉码头火锅太古里店",
+				}, {
+					account: {
+						platform: "https://horastar.obs.cn-east-3.myhuaweicloud.com/talent/pingtai2.png",
+						nickname: "成都的一颗丸子",
+					},
+					status: "待确认",
+					mainphoto: "https://tse1-mm.cn.bing.net/th/id/R-C.978cb3a3b27875a0cc9d78a254b30b8f?rik=yrP2kNCtfQYEgQ&riu=http%3a%2f%2fnews.southcn.com%2fgd%2fcontent%2fimages%2fattachement%2fpng%2fsite4%2f20190917%2feca86b61fd551eeb23c507.png&ehk=xuWbgLrNmyhNJaByMZPJrX81PrzXrLHqHM%2fdYatFhrs%3d&risl=&pid=ImgRaw&r=0&sres=1&sresct=1",
+					taskname: "奥运吉祥物冰墩墩盲盒",
+				}, ],
+				mysNavConfig: {
+					/* 开启单页显示首页图标 */
+					isHome: true,
+					/* 固定导航  */
+					navFixed: true,
+					/* 标题 （屏幕中心居中 两边图标中心居中使用slot center1） */
+					navTitle: {
+						text: "我的信息",
+						color: "",
+						fontSize: "32rpx", // px upx rpx
+						fontWeight: "normal", // 100 - 700
+					},
+					btnType: "type2",
+					onLeftClick: "/pages/mycenter/mycenter",
+					/* type2 按钮 */
+					type2Config: {
+						// 左图标
+						leftPath: "/static/img/png2.png",
+						// 右图标
+						rightPath: "/static/img/png4.png",
+						// 圆角
+						radius: "40rpx",
+					},
+				},
+			}
+		},
+		onLoad() {
+			uni.showLoading({
+				title: '加载中'
+			});
+			this.getInfoTable();
+		},
+		methods: {
+			getInfoTable() {
+				this.$https.get('/youngee/c/g/get-info-tables')
+					.then(res => {
+						console.log(res)
+						this.taskStageList = res.data.data.TaskStage
+						this.getList()
+					})
+			},
+			getList() {
+				console.log("run func getList")
+				this.$https.get('/youngee/c/t/g/get-task-brief-list').then(res => {
+					console.log(res)
+					this.allList = res.data.data.all_Task_info_list
+					if (this.allList != null) {
+						for (let i = 0; i < this.allList.length; ++i) {
+							for (let j = 0; j < this.taskStageList.length; ++j) {
+								if (this.allList[i].task_stage == this.taskStageList[j].task_stage_id)
+									this.allList[i].task_stage_txt = this.taskStageList[j].task_stage
+							}
+						}
+					}
+
+					console.log(this.allList)
+					uni.hideLoading();
+				})
+			},
+			toApply() {
+				uni.navigateTo({
+					url: '/pages/mycenter/mytask/applytask'
+				});
+			},
+			toexecute() {
+				uni.navigateTo({
+					url: '/pages/mycenter/mytask/executetask'
+				});
+			},
+			toEnd() {
+				uni.navigateTo({
+					url: '/pages/mycenter/mytask/endtask'
+				});
+			},
+			toDetail(item) {
+				console.log("func toDetail running")
+				uni.navigateTo({
+					url: '/pages/workspace/taskdetail?taskId=' + item.task_id,
+					success(res) {
+						console.log(res);
+					},
+					fail(err) {
+						console.log(err);
+					}
+				});
+
+				console.log("func toDetail end")
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	view {
+		font-size: 14px;
+		line-height: inherit;
+	}
+
+	.menu {
+		position: fixed;
+		top: 180rpx;
+		border-bottom: #FCCF41;
+		background-color: #FFFFFF;
+		justify-content: space-around;
+		height: 5%;
+		width: 100%;
+		display: flex;
+		z-index: 10;
+	}
+
+	.menu-item p {
+		font-weight: 600;
+
+		&.lor {
+			border-bottom: 5rpx solid #F0D232;
+			color: #F0D232;
+			padding-bottom: 15rpx;
+		}
+	}
+
+	.home {
+		margin-top: 100rpx;
+	}
+
+	.task {
+		margin-bottom: 20rpx;
+		border-bottom: 1rpx #d7d7d7 solid;
+
+		.task-head {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			padding: 10rpx 20rpx;
+
+			.task-head-account {
+				display: flex;
+			}
+
+			.task-head-status {
+				color: red;
+			}
+		}
+
+		.task-info {
+			display: flex;
+			align-items: center;
+			padding: 10rpx 20rpx;
+
+		}
+	}
+
+	.line {
+		border-bottom: 1rpx #AAAAAA solid;
+	}
+</style>

pages/tasksquare/bindinfo.vue

@@ -29,18 +29,13 @@
 							</view>
 						</picker>
 					</uni-forms-item>
-					<uni-forms-item name="sex" required label="性别">
-						<uni-data-checkbox v-model="formData.sex" :localdata="sex1"></uni-data-checkbox>
-					</uni-forms-item>
 					<uni-forms-item name="phone" required label="联系电话">
 						<uni-easyinput type="number" maxlength="11" :inputBorder="true" v-model="formData.phone"
 							placeholder="请输入联系电话">
 						</uni-easyinput>
 					</uni-forms-item>
-					<uni-forms-item name="wechat" required label="微信号">
-						<uni-easyinput type="text" :inputBorder="true" v-model="formData.wechat" placeholder="请输入微信号">
-						</uni-easyinput>
-					</uni-forms-item>
+
+					<view class="line"></view>
 
 					<view class="title">
 						<p>收货地址</p>
@@ -69,15 +64,13 @@
 							placeholder="请输入详细地址(省/市/县/镇/)">
 						</uni-easyinput>
 					</uni-forms-item>
-					<uni-forms-item name="mail_code" required label="邮政编码">
-						<uni-easyinput type="text" :inputBorder="true" v-model="formData.mail_code" placeholder="邮政编码">
-						</uni-easyinput>
-					</uni-forms-item>
 					<view class="setdeault">
 						<view class="setdeault-text">设为默认收货地址</view>
 						<switch style='zoom:.8;' @change="setDefault" />
 					</view>
 
+					<view class="line"></view>
+
 					<view class="title">
 						<p>{{platform.platform_name}}账号</p>
 					</view>
@@ -103,11 +96,9 @@
 						</uni-forms-item>
 					</view>
 				</uni-forms>
-				<button class="btn1" @click="submitForm('form')">保存</button>
 			</view>
-
-
 		</view>
+		<button class="btn1" @click="submitForm('form')">保存</button>
 
 	</view>
 </template>
@@ -125,6 +116,7 @@
 		},
 		data() {
 			return {
+				address: [],
 				accountId: '',
 				platform: {
 					platform_id: '',
@@ -149,17 +141,14 @@
 				regionStr: '请选择省市区',
 				regionStr1: '请选择省市区',
 				formData: {
-					wechat: '',
 					age: '',
 					nationality: '',
 					phone: '',
-					sex: '',
 					visitStoreRegion: '',
 					name: '',
 					tel: '',
 					detailregion: '',
 					fregion: '',
-					mail_code: '',
 					setdefault: false,
 					platform_nickname: '',
 					fans_count: '',
@@ -169,13 +158,6 @@
 				index1: 0,
 				Xage: '请选择',
 				Xskintype: '请选择',
-				sex1: [{
-					text: '男',
-					value: 1
-				}, {
-					text: '女',
-					value: 2
-				}],
 				array: [{
 					age_bracket_discribe: '请选择',
 					age_aid: 0
@@ -208,30 +190,12 @@
 				data: {},
 				show: false,
 				rules: {
-					wechat: {
-						rules: [{
-							required: true,
-							errorMessage: '请输入微信号'
-						}, ]
-					},
-					sex: {
-						rules: [{
-							required: true,
-							errorMessage: '请选择性别'
-						}, ]
-					},
 					phone: {
 						rules: [{
 							required: true,
 							errorMessage: '请输入联系电话'
 						}, ]
 					},
-					mail_code: {
-						rules: [{
-							required: true,
-							errorMessage: '请输入邮政编码'
-						}, ]
-					},
 					detailregion: {
 						rules: [{
 							required: true,
@@ -313,6 +277,7 @@
 			this.$refs.form.setRules(this.rules)
 		},
 		onShow() {
+			this.getDefaultAddress()
 			this.getlist()
 		},
 		onLoad(options) {
@@ -323,7 +288,6 @@
 			}
 		},
 		methods: {
-
 			// 信息表
 			getlist() {
 				this.$https.get('/youngee/c/g/get-info-tables')
@@ -386,9 +350,7 @@
 								this.regionStr = a + ' ' + b + ' ' + c
 								this.formData.visitStoreRegion = res.data.data.visit_store_region
 							}
-							this.formData.sex = res.data.data.talent_gender
 							this.formData.phone = res.data.data.talent_phone_number
-							this.formData.wechat = res.data.data.talent_wx_number
 						}
 					})
 			},
@@ -419,6 +381,37 @@
 				else
 					this.formData.setdefault = 0
 			},
+			getDefaultAddress() {
+				this.$https.get('/youngee/c/t/g/get-talent-default-address').then(res => {
+
+					this.formData.name = res.data.data.receiver_name
+					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
+					for (var i = 0; i < region.length; i++) {
+						if (region[i].code == a) {
+							a = region[i].name
+							for (var j = 0; j < region[i].children.length; j++) {
+								if (region[i].children[j].code == b) {
+									b = region[i].children[j].name
+									for (var o = 0; o < region[i].children[j].children.length; o++) {
+										if (region[i].children[j].children[o].code == res.data.data.region_code) {
+											c = region[i].children[j].children[o].name
+										}
+									}
+								}
+
+							}
+						}
+					}
+					this.regionStr1 = a + ' ' + b + ' ' + c
+				})
+			},
 
 			/**
 			 * 手动提交
@@ -429,7 +422,6 @@
 				this.$refs.form.validate().then(res => {
 
 					const iphoneReg1 = /^1[0-9]{10}$/
-					const mailReg = /\d{6}/
 					const urlReg =
 						/(ht|f)tp(s?)\:\/\/[0-9a-zA-Z]([-.\w]*[0-9a-zA-Z])*(:(0-9)*)*(\/?)([a-zA-Z0-9\-\.\?\,\'\/\\\+&amp;%$#_]*)?/
 
@@ -440,13 +432,6 @@
 						})
 						return
 					}
-					if (!mailReg.test(this.formData.mail_code)) {
-						uni.showToast({
-							title: '邮政编码格式不正确',
-							icon: 'none'
-						})
-						return
-					}
 					if (!urlReg.test(this.formData.home_page_url)) {
 						uni.showToast({
 							title: '主页链接格式不正确',
@@ -462,8 +447,6 @@
 							talent_age_bracket: this.formData.age,
 							talent_nationality: this.formData.nationality,
 							visit_store_region: this.formData.visitStoreRegion,
-							talent_gender: this.formData.sex,
-							talent_wx_number: this.formData.wechat,
 							talent_phone_number: this.formData.phone,
 						})
 						.then(res => {
@@ -475,7 +458,6 @@
 							detail_addr: this.formData.detailregion,
 							phone_number: this.formData.phone,
 							receiver_name: this.formData.name,
-							mail_code: this.formData.mail_code,
 							default_tag: this.formData.setdefault
 						})
 						.then(res => {
@@ -878,17 +860,18 @@
 		// line-height: inherit;
 	}
 
+	.line {
+		width: 96%;
+		margin: 10rpx 2%;
+		border-bottom: 1rpx solid #bbbbbb;
+	}
+
 	.title {
-		background-color: #EEEEEE;
 		height: 80rpx;
 		display: flex;
 		align-items: center;
 	}
 
-	.title p {
-		padding-left: 10rpx;
-	}
-
 	.menu {
 		position: fixed;
 		top: 180rpx;
@@ -918,7 +901,8 @@
 	}
 
 	.btn1 {
-		margin: 30rpx;
+		width: 100%;
+		margin-top: 30rpx;
 		font-size: 35rpx;
 		color: #FFFFFF;
 		background-color: #F0D232;

pages/tasksquare/information.vue

@@ -0,0 +1,380 @@
+<template>
+	<view>
+		<!-- 胶囊 -->
+		<mvBar :mysNavConfig="mysNavConfig"></mvBar>
+		<view style="margin-top: 160rpx;"></view>
+		<view class="basicInfo">
+			<image :src="mainImg" style="width: 150rpx;height: 150rpx;" mode="">
+			</image>
+			<view class="basicInfo_txt">
+				<p style="margin-bottom: 10rpx;font-size: 35rpx;font-weight: 550;">{{project.project_name}}</p>
+				<p style="font-size: 30rpx;">商品价值：{{project.Product.product_price}}</p>
+			</view>
+		</view>
+
+		<view class="address">
+			<view>
+				<image class="address_icon" :src="picture.icon_loc" mode="">
+				</image>
+			</view>
+			<view style="width: 70%;">
+				<view style="display: flex;">
+					<p class='ipon' style="padding-right: 100rpx;">{{address.receiver_name}}</p>
+					<p class='ipon'>{{address.phone_number}}</p>
+				</view>
+				<p class='ipon'>{{address.detail_addr}}</p>
+			</view>
+			<view class="address_edit" @click="editAddress()">
+				<image :src="picture.icon_edit" mode="">
+				</image>
+			</view>
+
+		</view>
+
+		<view class="keyInfo">
+			<h3>关键任务信息</h3>
+			<p style="font-weight: 600;margin-top: 10rpx;">合作方式</p>
+			<view style="display: flex;font-weight: 600;padding-top: 10rpx;">
+				<p>粉丝量{{strategy.followers_low}}-{{strategy.followers_up}}
+					&nbsp;&nbsp;
+					稿费-{{strategy.fee_form_t}}
+				</p>
+				<view v-if="strategy.fee_form!=1">
+					<p>{{strategy.offer}}</p>
+				</view>
+
+			</view>
+			<view style="display: flex;margin-top: 10rpx;">
+				<p style="font-weight: 600;">社媒平台：</p>
+				<p>{{project.project_platform_t}}</p>
+			</view>
+			<p style="font-weight: 600;margin-top: 10rpx;">任务要求</p>
+			<view class="keyInfo_task">
+				<view style="display: flex;align-items: center;margin: 5rpx 0;">
+					<p>内容形式：</p>
+					<p class="keyInfo_task_txt">{{project.content}}</p>
+
+					<p style="margin-left: 50rpx;">任务形式：</p>
+					<p class="keyInfo_task_txt">{{project.project_form}}</p>
+				</view>
+				<p style="margin: 5rpx 0;">商品描述：</p>
+				<p class="keyInfo_task_txt"> {{project.Product.product_detail}}
+				</p>
+				<p style="margin: 5rpx 0;">任务详情：</p>
+				<p class="keyInfo_task_txt"> {{project.project_detail}} </p>
+			</view>
+		</view>
+
+		<view class="account">
+			<view class="account_txt" @click="editAccount(item)">
+				<image :src="project.PlatformInfo.platform_icon" mode=""></image>
+				<span>{{account.platform_nickname}}</span>
+			</view>
+			<view class="account_fans">
+				<p style="padding-right: 20rpx;color:#A8A8A8;">粉丝数</p>
+				<p>{{account.fans_count}}</p>
+			</view>
+			<view class="account_btn" @click="editAccount(item)">
+				<image :src="picture.togoimg" mode="" style="width: 16rpx;height: 30rpx;"></image>
+			</view>
+		</view>
+
+		<view class="block"></view>
+		<view class="submit">
+			<button type="default" class="submit_btn" @click="submit()"> 确认报名</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import mvBar from "@/components/mys_navBar/mysNavBar";
+	export default {
+		components: {
+			mvBar
+		},
+		data() {
+			return {
+				mainImg: "https://horastar.obs.cn-east-3.myhuaweicloud.com/backstage_upload/bb531ede-28b5-49a0-8431-a1608fd35890.png",
+				account_id: -1,
+				address_id: -1,
+				address: null,
+				project: null,
+				account: null,
+				strategy: null,
+				picture: {
+					togoimg: 'https://horastar.obs.cn-east-3.myhuaweicloud.com/talent/task16.png',
+					icon_edit: 'https://horastar.obs.cn-east-3.myhuaweicloud.com/youngee/talent_upload/icon-edit.png',
+					icon_loc: 'https://horastar.obs.cn-east-3.myhuaweicloud.com/youngee/talent_upload/icon-loc.png',
+					home8: 'https://horastar.obs.cn-east-3.myhuaweicloud.com/talent/home8.png',
+					home10: 'https://horastar.obs.cn-east-3.myhuaweicloud.com/talent/home10.png',
+					home11: 'https://horastar.obs.cn-east-3.myhuaweicloud.com/talent/home11.png',
+				},
+				thirdPlatform: [],
+				mysNavConfig: {
+					isHome: false,
+					/* 固定导航  */
+					navFixed: true,
+					/* 标题 （屏幕中心居中 两边图标中心居中使用slot center1） */
+					navTitle: {
+						text: "信息确认",
+						color: "",
+						fontSize: "32rpx", // px upx rpx
+						fontWeight: "", // 100 - 700
+					},
+					btnType: "type2",
+					onLeftClick: '',
+					/* type2 按钮 */
+					type2Config: {
+						// 左图标
+						leftPath: "https://horastar.obs.cn-east-3.myhuaweicloud.com/talent/png2.png",
+						// 右图标
+						rightPath: "https://horastar.obs.cn-east-3.myhuaweicloud.com/talent/png4.png",
+						// 圆角
+						radius: "40rpx",
+					},
+				},
+			}
+		},
+		onShow() {
+			// 根据address_id查询address
+			this.getDefaultAddress();
+			// 查询account	
+			this.getAccount();
+		},
+		onLoad(options) {
+			this.textObj = options.textObj.replace(/""/g, "");
+			this.textObj = JSON.parse(decodeURIComponent(this.textObj))
+			// this.textObj = JSON.parse(decodeURIComponent(options.textObj))
+			console.log(this.textObj)
+			this.project = this.textObj.information
+			this.strategy = this.textObj.strategy
+		},
+		methods: {
+			getAccount() {
+				this.$https.get('/youngee/c/t/g/get-talent-account')
+					.then(res => {
+						console.log(res)
+						if (res.data.code !== -3) {
+							let account = res.data.data
+							while (this.project == null) {}
+							for (var i = 0; i < account.length; i++) {
+								if (this.project.project_platform == account[i].platform_id) {
+									this.account = account[i]
+								}
+							}
+						}
+					})
+			},
+			getDefaultAddress() {
+				this.$https.get('/youngee/c/t/g/get-talent-default-address').then(res => {
+					console.log("address")
+					console.log(res.data.data)
+					this.address = res.data.data;
+				})
+			},
+			editAddress() {
+				uni.navigateTo({
+					url: '/pages/mycenter/addlocation?address_id=' + this.address.address_id + '&ismodify=1'
+				});
+			},
+			editAccount() {
+				uni.navigateTo({
+					url: '/pages/mycenter/bindaccount?platform_id=' + this.account.platform_id + '&account_id=' +
+						this.account.account_id
+				});
+			},
+			// 提交确认报名
+			submit() {
+				console.log(this.project)
+				// 1. 判断任务是否截止
+				this.$https.get('/youngee/c/t/g/get-project-detail' +
+					"?" +
+					"projectid" +
+					"=" +
+					this.project.project_id
+				).then(res => {
+					console.log(res)
+					// 当前时间
+					var newdate = new Date()
+					// 截止时间
+					var endTime = new Date(res.data.data.recruit_ddl.replace(/-/g, "/"));
+					console.log(endTime)
+					if (endTime - newdate < 0) {
+						// 招募截止
+						uni.showToast({
+							title: "任务已结束",
+							duration: 1000,
+						});
+						uni.navigateTo({
+							url: '/pages/tasksquare/tasksquare'
+						});
+					}
+				})
+
+				// 2. 插入一条任务
+				this.$https.post('/youngee/c/t/p/sign-up-task', {
+					address_id: this.address.address_id,
+					project_id: this.project.project_id,
+					strategy_id: this.strategy.strategy_id,
+					offer: this.strategy.offer,
+				}).then(res => {
+					console.log(res.data.data)
+					if (res.data.code == 0) {
+						uni.navigateTo({
+							url: '/pages/tasksquare/success'
+						});
+					}
+				})
+			},
+			// 信息表
+			getInfoList() {
+				this.$http.get('/youngee/c/g/get-info-tables')
+					.then(res => {
+						this.hobby = []
+						console.log(res)
+						this.thirdPlatform = res.data.data.ThirdPlatform
+
+						for (var i = 0; i < this.listsrc.length; i++) {
+							var obj = {}
+							obj.text = this.listsrc[i].platform_name
+							obj.value = this.listsrc[i].id
+							this.hobby.push(obj)
+						}
+					})
+			},
+
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.basicInfo {
+		display: flex;
+		margin: 0 40rpx;
+
+		.basicInfo_txt {
+			margin-left: 40rpx;
+			padding-top: 20rpx;
+		}
+	}
+
+	.address {
+		display: flex;
+		margin: 50rpx 40rpx 0;
+		justify-content: space-around;
+
+		.address_icon {
+			vertical-align: middle;
+			width: 50rpx;
+			height: 50rpx;
+			display: inline-block;
+			padding-right: 30rpx;
+		}
+
+		.address_edit {}
+
+		.address_edit image {
+			vertical-align: middle;
+			width: 50rpx;
+			height: 50rpx;
+			display: inline-block;
+			padding-right: 14rpx;
+		}
+
+		.ipon {
+			color: #333333;
+			font-size: 30rpx;
+			font-weight: 500;
+			margin-bottom: 10rpx;
+		}
+	}
+
+	.keyInfo {
+		margin: 50rpx 40rpx 0;
+
+		.keyInfo_task {
+			color: #999999;
+
+			.keyInfo_task_txt {
+				border: 1rpx solid #CCCCCC;
+				border-radius: 10rpx;
+				padding: 10rpx;
+			}
+		}
+	}
+
+	.keyInfo h3 {
+		font-weight: 600;
+	}
+
+	.keyInfo p {
+		font-size: 30rpx;
+	}
+
+	.account {
+		display: flex;
+		align-items: center;
+		// justify-content: space-between;
+		width: 90%;
+		padding: 16rpx;
+		margin-top: 50rpx;
+		font-size: 35rpx;
+
+		.account_txt {
+			display: inline-block;
+			padding: 0 0 0 1%;
+			width: 400rpx;
+		}
+
+		.account_txt image {
+			vertical-align: middle;
+			width: 50rpx;
+			height: 50rpx;
+			display: inline-block;
+			padding-right: 14rpx;
+		}
+
+		.account_fans {
+			display: flex;
+			width: 250rpx;
+		}
+
+		.account_fans p {
+			display: inline-block;
+			color: #333333;
+			font-weight: 550;
+		}
+
+		.account_btn {}
+	}
+
+	.block {
+		width: 100%;
+		height: 100rpx;
+		margin-top: 5%;
+	}
+
+	.submit {
+		box-shadow: 0rpx 5rpx 40rpx #ccc;
+		width: 100%;
+		position: fixed;
+		bottom: 0rpx;
+		display: flex;
+		height: 90rpx;
+		padding-top: 2%;
+		background-color: #FFFFFF;
+
+		.submit_btn {
+			width: 60%;
+			background-color: #FCCF41;
+			border-radius: 20rpx;
+			font-size: 36rpx;
+			line-height: 200%;
+			letter-spacing: 10rpx;
+			font-weight: 500;
+			height: 80%;
+		}
+
+	}
+</style>

pages/tasksquare/success.vue

@@ -0,0 +1,295 @@
+<template>
+	<view>
+		<!-- 胶囊 -->
+		<mvBar :mysNavConfig="mysNavConfig"></mvBar>
+		<view class="home">
+			<view class="card">
+				<view class=""
+					style="display: flex;justify-content:space-around;width: 80%;margin: 0 auto;margin-top: 20rpx;margin-bottom: 20rpx;align-items: center;">
+					<!-- <image src="https://horastar.obs.cn-east-3.myhuaweicloud.com/talent/task21.png" mode=""
+						style="width: 112rpx;height: 130rpx;"></image> -->
+					<image src="../../static/img/sucess.png" mode=""
+						style="width: 150rpx;height: 150rpx;"></image>
+					<view class="" style="font-size: 32rpx;">
+						<p>已报名成功</p>
+						<p>今日报名次数剩余：{{times}}次</p>
+						<p>分享任务可获得更多任务~</p>
+						<!-- 	<p class='ipon' style='margin-top: 5rpx;'>今日报名次数剩余：4次</p>
+					<p class='ipon'>分享任务可申请更多任务</p> -->
+					</view>
+
+				</view>
+			</view>
+			<view class="card" style="margin-top: 6%;">
+				<view class="" style="width: 90%;margin: 0 auto;margin-top: 20rpx;margin-bottom: 20rpx;">
+
+					<p class='ipon1' style='margin-top: 5rpx;'>1.任务确认结果可随时在<span
+							style="color: deepskyblue;">我的任务</span>中查看 </p>
+					<p class='ipon1'> 2.品牌同意合作后我们会再次与您确认合作意向和收货地址，请及时操作，否则资格可能会被取消~ </p>
+					<p class='ipon1'>3.请<span style="color: deepskyblue;">订阅</span>我们的通知消息~以防止超时操作的情况~</p>
+					<p class='ipon1'> 4.点击右上角添加小程序，能更快找到我们哦~</p>
+					<view class="" style="width: 80%;background-color: #C9C9C9;border-radius: 10rpx;">
+						<view class="Tasktext">
+							<image src="https://horastar.obs.cn-east-3.myhuaweicloud.com/talent/task20.png" mode="">
+							</image>
+							<span>样叽</span>
+							<image src="https://horastar.obs.cn-east-3.myhuaweicloud.com/talent/task16.png"
+								style="width: 20rpx;margin-left: 2%; height: 26rpx;" mode=""></image>
+						</view>
+						<view class=""
+							style="border-bottom: 2rpx solid #333333;width: 95%; margin: 0 auto; margin-top: 2%;margin-bottom: 2%;">
+						</view>
+						<view class=""
+							style="display: flex;justify-content:space-around;margin-top: 5%;padding-bottom: 10rpx;">
+							<view class="" style="margin: 0 auto;">
+								<view class="iimmg" style="margin: 0 auto;">
+									<image src="https://horastar.obs.cn-east-3.myhuaweicloud.com/talent/task22.png"
+										mode=""></image>
+								</view>
+								<p class='ppan'>发送给朋友</p>
+							</view>
+
+							<view class="" style="margin: 0 auto;">
+								<view class="iimmg" style="margin: 0 auto;">
+									<image src="https://horastar.obs.cn-east-3.myhuaweicloud.com/talent/task23.png"
+										mode=""></image>
+								</view>
+								<p class='ppan'>添加到我的小程序</p>
+							</view>
+						</view>
+					</view>
+				</view>
+
+
+			</view>
+			<view class="" style="width: 100%;height: 180rpx;"> </view>
+		</view>
+		<view class="signup">
+			<view class="signuptext">
+				<button type="default" class="but1" @click="dingyue()"> 订阅通知</button>
+			</view>
+
+			<view class="signupbut">
+				<button type="default" class="but1" @click="mymission()"> 查看任务</button>
+
+			</view>
+
+		</view>
+
+	</view>
+</template>
+
+<script>
+	import mvBar from "@/components/mys_navBar/mysNavBar";
+	export default {
+		components: {
+			mvBar,
+		},
+		data() {
+			return {
+				times: 5,
+				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: "/pages/tasksquare/tasksquare",
+					/* type2 按钮 */
+					type2Config: {
+						// 左图标
+						leftPath: "/static/img/png2.png",
+						// 右图标
+						rightPath: "/static/img/png4.png",
+						// 圆角
+						radius: "40rpx",
+					},
+					/* 定义右侧图标 */
+					// rightIconPath: "/static/s.png",
+				},
+			};
+		},
+		methods: {
+			// 进入任务列表页面
+
+			mymission() {
+				uni.navigateTo({
+					url: '/pages/mymission/mymission'
+				});
+			},
+			dingyue() {
+				uni.showToast({
+					title: '订阅成功',
+					duration: 2000
+				});
+			},
+		}
+	};
+</script>
+<style>
+	page {
+		background-color: #F4F4F4;
+	}
+</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;
+	}
+
+	.card {
+		width: 88%;
+		padding: 24rpx;
+		margin-top: 30rpx;
+		border-radius: 10rpx;
+		background-color: #ffffff;
+		margin: 0 auto;
+		box-shadow: 0px 0px 10rpx 2rpx #FFFFFF;
+	}
+
+	.ipon {
+		color: #333333;
+		font-size: 26rpx;
+		font-weight: 500;
+		margin-bottom: 10rpx;
+	}
+
+	.ipon1 {
+		color: #333333;
+		font-size: 32rpx;
+		margin-bottom: 5%;
+	}
+
+	.signup {
+		box-shadow: 0rpx 5rpx 40rpx #ccc;
+		width: 100%;
+		position: fixed;
+		bottom: 0rpx;
+		display: flex;
+		height: 90rpx;
+		padding-top: 2%;
+		background-color: #FFFFFF;
+		justify-content: space-around;
+	}
+
+	.signuptext {
+		text-align: center;
+		margin-top: 2%;
+
+	}
+
+	.signuptext p {
+		font-size: 60%;
+		color: #333333;
+	}
+
+	.signupbut {
+		text-align: center;
+		margin-top: 2%;
+	}
+
+	.but1 {
+		width: 120%;
+		text-align: center;
+		background-color: dodgerblue;
+		border-radius: 10rpx;
+		color: white;
+		font-size: 28rpx;
+		line-height: 200%;
+		justify-content: center;
+		font-weight: 500;
+		height: 80%;
+	}
+
+	.Tasktext {
+		// padding-top: 5%;
+		padding: 6%;
+		// height: 80rpx;
+		margin-top: 2%;
+	}
+
+	.Tasktext span {
+		color: #333333;
+		font-size: 60%;
+		font-weight: 550;
+		text-indent: 2em;
+
+	}
+
+	.Tasktext image {
+		vertical-align: middle;
+		width: 50rpx;
+		height: 50rpx;
+		display: inline-block;
+		padding-right: 14rpx;
+	}
+
+	.iimmg {
+		width: 80rpx;
+		height: 80rpx;
+		background-color: #FFFFFF;
+		border-radius: 15%;
+	}
+
+	.iimmg image {
+		width: 60%;
+		height: 60%;
+		padding: 20%;
+	}
+
+	.ppan {
+		font-size: 60%;
+		margin-top: 1%;
+	}
+</style>

pages/tasksquare/taskdetail.vue

@@ -1,8 +1,8 @@
 <template>
-	<view style="position: relative;" v-if="!tyy">
+	<view style="position: relative;">
 		<!-- 胶囊 -->
 		<mvBar :mysNavConfig="mysNavConfig"></mvBar>
-		<view class="" id="wrap0">
+		<view class="" id="wrap0" v-if="!tyy">
 
 			<view class="home" style="padding-top: 180rpx;">
 
@@ -10,7 +10,9 @@
 					<swiper class="swiper" circular :indicator-dots="true" :autoplay="true" :interval="3000"
 						:duration="1000">
 						<swiper-item v-for="item in carousel_images">
-							<image :src="item" mode="" style="width: 100% ;height: 100% ;"></image>
+							<image :src="item" mode="aspectFill" style="width: 100%;height: 100%;"
+								@click="previewImage1(item)">
+							</image>
 						</swiper-item>
 					</swiper>
 
@@ -30,15 +32,15 @@
 						</view>
 						<view class="tasks">
 							<view class="tasksleft">
-								<p><span style="color: #FDD442;font-size: 120% ;">{{information.taskNum}}</span>
+								<p><span style="color: #FDD442;font-size: 50rpx ;">{{information.taskNum}}</span>
 								</p>
-								<p>任务数量</p>
+								<p style="font-weight: 600;">任务数量</p>
 							</view>
 							<view class="title-left"></view>
 							<view class="tasksright">
-								<p><span style="color: #FDD442;font-size: 120% ;">{{information.apply_num}}</span>
+								<p><span style="color: #FDD442;font-size: 50rpx ;">{{information.apply_num}}</span>
 								</p>
-								<p>报名人数</p>
+								<p style="font-weight: 600;">报名人数</p>
 							</view>
 						</view>
 					</view>
@@ -51,15 +53,18 @@
 						<p>任务奖励</p>
 					</view>
 					<view class="markcontent">
-						<view style="display: flex;margin: 5rpx 0;">
-							<p>商品价值：</p>
-							<p class="wvp" style="padding: 0 30rpx;">{{information.Product.product_price}}元</p>
+						<view style="display: flex;margin: 10rpx 0;">
+							<p class="label">商品价值：</p>
+							<p class="wvp" style="padding: 0;">{{information.Product.product_price}}元</p>
 						</view>
-						<view style="display: flex;margin: 5rpx 0;">
-							<p v-if="information.Product.product_url !== ''">商品链接：</p>
-							<p class="wvp">{{information.Product.product_url}}</p>
+						<view style="display: flex;;margin: 10rpx 0;">
+							<p class="label" v-if="information.Product.product_url !== ''">商品链接：</p>
+							<p class="wvp" style="padding: 0;">{{information.Product.product_url}}</p>
+						</view>
+						<view style="display: flex;margin: 10rpx 0;">
+							<p class="label">合作佣金：</p>
+							<p style="color: #f2d22d;">点击报名后显示</p>
 						</view>
-						<p>合作佣金：点击报名后显示</p>
 					</view>
 				</view>
 				<view class="">
@@ -67,19 +72,17 @@
 						<p>账号要求</p>
 					</view>
 					<view class="markcontent">
-						<view style="display: flex;margin: 5rpx 0;">
-							<p>社媒平台：</p>
+						<view style="display: flex;margin: 10rpx 0;">
+							<p class="label">社媒平台：</p>
 							<p class="wvp">{{information.PlatformInfo.platform_name}}</p>
-							<p style="padding-left: 50rpx;">任务形式：</p>
-							<p class="wvp">{{information.project_form}}</p>
 						</view>
-						<view style="display: flex;margin: 5rpx 0;">
-							<p>创作者类型: </p>
-							<p class="wvp" v-for="(item,index) in information.talent_type">{{item}}</p>
+						<view style="display: flex;margin: 10rpx 0;">
+							<p class="label">任务形式：</p>
+							<p class="wvp">{{information.project_form}}</p>
 						</view>
-						<view style="display: flex;margin: 5rpx 0;">
-							<p>粉丝数要求: </p>
-							<p class="wvp" v-for="(item,index) in information.Numfensi">{{item}}</p>
+						<view style="display: flex;margin: 10rpx 0;">
+							<p class="label">创作者类型: </p>
+							<p class="wvp1" v-for="(item,index) in information.talent_type">{{item}}</p>
 						</view>
 					</view>
 				</view>
@@ -92,14 +95,14 @@
 							<p>任务要求</p>
 						</view>
 						<view class="markcontent">
-							<view style="display: flex;margin: 5rpx 0;">
-								<p>内容形式：</p>
+							<view style="display: flex;margin: 10rpx 0;">
+								<p class="label">内容形式：</p>
 								<p class="wvp">{{information.content}}</p>
 							</view>
-							<p style="margin: 5rpx 0;">商品描述：</p>
+							<p style="font-weight: 600;margin: 10rpx 0;">商品描述：</p>
 							<p class="wvp" style="margin: 0;padding: 10rpx 0;"> {{information.Product.product_detail}}
 							</p>
-							<p style="margin: 5rpx 0;">任务详情：</p>
+							<p style="font-weight: 600;margin: 10rpx 0;">任务详情：</p>
 							<p class="wvp" style="margin: 0;padding: 10rpx 0;"> {{information.project_detail}} </p>
 						</view>
 					</view>
@@ -133,9 +136,11 @@
 			</view>
 
 			<view class="signup">
-				<button type="default" class="but1" :disabled="tyy" :class="{'on':item.title == '1',}"
-					@click="toggle('bottom')" v-if="Registered==0"> 立即报名</button>
-				<button type="default" class="but1" disabled v-if="Registered==1"> 已报名 </button>
+				<button type="default" class="but1" :loading="loading" :disabled="tyy"
+					:class="{'on':item.title == '1',}" @click="toggle('bottom')" v-if="isSign==0 && ddl == 0">
+					立即报名</button>
+				<button type="default" class="but1" disabled v-if="isSign==1 && ddl == 0"> 已报名 </button>
+				<button type="default" class="but1" disabled v-if="ddl==1"> 报名结束 </button>
 				<button type="default" class="but2" @click="toggle1('bottom')">
 					<image src="https://horastar.obs.cn-east-3.myhuaweicloud.com/talent/task8.png" mode=""></image>
 					分享
@@ -150,12 +155,20 @@
 								<image :src="img" style="width: 250rpx;height: 235rpx;margin-top: -9% ;" mode="">
 								</image>
 								<view class="samplecharacter">
-									<p style='color: #666666;font-size: 80% ;'>
-										{{ information.IsBuySamples.buy_samples_type==1?'样叽拍单返款':'不拍单'}}<span
-											style='font-size: 120% ;color: #FCA641;margin-right: 3% ;'
-											v-if="information.IsBuySamples.buy_samples_type==1">￥{{information.IsBuySamples.buySamplesRefund}}</span>
-									</p>
-									<p style='color: #999999;font-size: 60% ;'>品牌合作，作品合格返还。不合格，筛选后返还。</p>
+									<p>{{information.project_name}}</p>
+								</view>
+							</view>
+							<!-- 黑线 -->
+							<view class=""
+								style="border-bottom: 2rpx solid #C0C0C0;margin-top: 3% ;margin-bottom: 3% ;">
+							</view>
+							<!-- 商品价值及任务形式 -->
+							<view style="display: flex;align-items: center;justify-content: space-between;">
+								<view style="margin-left: 20rpx;font-size: 30rpx;">
+									<p>商品价值：{{information.Product.product_price}}RMB</p>
+								</view>
+								<view style="margin-right: 20rpx;font-size: 30rpx;">
+									<p>任务形式：{{information.project_form}}</p>
 								</view>
 							</view>
 							<!-- 黑线 -->
@@ -163,21 +176,26 @@
 								style="border-bottom: 2rpx solid #C0C0C0;margin-top: 3% ;margin-bottom: 3% ;">
 							</view>
 							<view class="" style="margin-left: 3% ;">
-								<h3>产品规格</h3>
+								<!-- <h3>产品规格</h3> -->
 								<view class="">
 									<uni-data-checkbox mode="tag" v-model="value" :localdata="sex">
 									</uni-data-checkbox>
 								</view>
 							</view>
 							<view class="" style="margin-left: 3% ; ">
-								<h3>合作选择（平台账号不达标不能选择）</h3>
-								<view class="" style="display: flex;">
-									<view class="buu">
-										<uni-data-checkbox mode="tag" v-model="value1" :localdata="coop_choice">
-										</uni-data-checkbox>
+								<p style="font-size: 30rpx;">合作选择（平台账号不达标不能选择）</p>
+								<view id="coop_box">
+									<view v-for="item in coop_choice" :key="item.strategy_id" class="coop_box_btn"
+										:class="strategy_id==item.strategy_id?'borderColor':''"
+										@click="coopClick(item)">
+										<p>粉丝量{{item.followers_low}}-{{item.followers_up}}
+											稿费-{{item.fee_form_t}}
+										</p>
+										<view v-if="item.fee_form==3">
+											<input class="offer_input" type="digit" placeholder="0.0"
+												v-model="item.offer" />
+										</view>
 									</view>
-
-
 								</view>
 
 							</view>
@@ -186,9 +204,10 @@
 								style="border-bottom: 2rpx solid #C0C0C0;margin-top: 3% ;margin-bottom: 3% ;">
 							</view>
 							<view class="butto">
-								<!-- <button class="mini-btn"  size="mini" @tap="Reset" style="background-color: #FFFFFF;">更新账号</button> -->
+								<button class="mini-btn" size="mini" @tap="Reset"
+									style="background-color: #FFFFFF;">更新账号信息</button>
 								<button class="mini-btn" size="mini" @tap="determine"
-									style="background-color: #FCCF41;">立即报名</button>
+									style="background-color: #f2d22d;">立即报名</button>
 							</view>
 						</view>
 					</view>
@@ -242,7 +261,6 @@
 			</view>
 		</view>
 	</view>
-	</view>
 </template>
 
 <script>
@@ -262,6 +280,13 @@
 		},
 		data() {
 			return {
+				ddl: "",
+				loading: true,
+				isSign: 0,
+				strategy_id: 0,
+				strategy: null,
+				input_offer: 0.0,
+				chooseBtn: 0,
 				share: {
 					title: "",
 					path: '',
@@ -292,7 +317,7 @@
 				topp1: '',
 				topp2: '',
 				scrollTop: '',
-				activeColor: '#FCCF41',
+				activeColor: '#f2d22d',
 				value: '',
 				value1: '',
 				sex: [],
@@ -379,9 +404,6 @@
 				talent: {},
 				account: [],
 				information: {},
-				token: '',
-				fensishu: '',
-				Registered: '0',
 				zhanghaocode: '',
 				product_detail_images: [],
 				codeImg: '',
@@ -390,33 +412,54 @@
 		},
 		async created() {},
 		onShow() {
-			this.fensishu = ''
-			this.token = uni.getStorageSync('token')
+			uni.showLoading({
+				title: '加载中'
+			});
 			this.getProjectDetail()
-			console.log(this.token)
-			// this.value=''
-			// this.value1=''
+			// this.getlist3()
 		},
 		onLoad(options) {
 			// 传过来的id
-			// console.log(options)
+			console.log(options)
 			this.projectid = options.id
+			this.ddl = parseInt(options.ddl)
 			const scene = decodeURIComponent(options.scene);
 			if (scene != "undefined") {
 				this.projectid = scene;
 			}
-
 			this.share.path = '/pages/tasksquare/taskdetail?id=' + this.projectid
 			this.postlist()
-
 		},
 		onReady() { // 注意：想要拿到元素实例，需要在实例已经挂载到页面上才可以
 
 		},
 		methods: {
+			previewImage1(item){
+				console.log("image src: ", item)
+				let that = this
+				wx.previewImage({
+					current: item, // 当前显示图片的http链接
+					urls: that.carousel_images // 需要预览的图片http链接列表
+				})
+			},
+			coopClick(value) {
+				console.log("选中了" + value.strategy_id);
+				if (this.account[0].fans_count < value.followers_low) {
+					// 提示“粉丝量不符合报名条件”
+					uni.showToast({
+						title: '粉丝量不符合报名条件',
+						icon: 'none',
+						duration: 2000
+					});
+				} else {
+					this.strategy_id = value.strategy_id;
+					console.log(this.strategy_id)
+					this.strategy = value;
+				}
+			},
 
 			postlist() {
-				this.$http.post('/youngee/c/p/get-qrcode', {
+				this.$https.post('/youngee/c/p/get-qrcode', {
 						scene: this.projectid,
 						page: 'pages/tasksquare/taskdetails',
 					})
@@ -426,13 +469,13 @@
 					})
 			},
 			getProjectDetail() {
-				this.$http.get('/youngee/c/t/g/get-project-detail' +
+				this.$https.get('/youngee/c/t/g/get-project-detail' +
 					"?" +
 					"projectid" +
 					"=" +
 					this.projectid
 				).then(res => {
-					console.log(res)
+					// console.log(res)
 					this.information = res.data.data
 
 					// 分享图里的
@@ -508,32 +551,41 @@
 					this.information.recruit_ddl = this.information.recruit_ddl.substr(0, 10);
 
 					// 合作选择
-					var arr1 = [];
-					for (let i = 0; i < this.information.RecruitStrategy.length; ++i) {
-						let fee_form = this.information.RecruitStrategy[i].fee_form
-						let str1 = '粉丝量' + this.information.RecruitStrategy[i].followers_low + ' - ' + this
-							.information
-							.RecruitStrategy[i].followers_up + '   稿费：'
-						let str2 = fee_form == 1 ? '产品置换' : (fee_form == 2 ? '稿费' : '创作者自报价')
-						let str3 = fee_form == 2 ? '' + this.information.RecruitStrategy[i].offer + '元/人' : ''
-						let str = str1 + str2 + str3
-						let choice = {
-							value: this.information.RecruitStrategy[i].strategy_id,
-							fee_form: fee_form,
-							text: str
-						}
-						arr1.push(choice)
+					// var arr1 = [];
+					// for (let i = 0; i < this.information.RecruitStrategy.length; ++i) {
+					// 	let fee_form = this.information.RecruitStrategy[i].fee_form
+					// 	let str1 = '粉丝量' + this.information.RecruitStrategy[i].followers_low + ' - ' + this
+					// 		.information
+					// 		.RecruitStrategy[i].followers_up + '   稿费：'
+					// 	let str2 = fee_form == 1 ? '产品置换' : (fee_form == 2 ? '稿费' : '创作者自报价')
+					// 	let str3 = fee_form == 2 ? '' + this.information.RecruitStrategy[i].offer + '元/人' : ''
+					// 	let str = str1 + str2 + str3
+					// 	let choice = {
+					// 		value: this.information.RecruitStrategy[i].strategy_id,
+					// 		fee_form: fee_form,
+					// 		text: str
+					// 	}
+					// 	arr1.push(choice)
+					// }
+					// this.coop_choice = arr1
+
+					// 合作选择
+					this.coop_choice = this.information.RecruitStrategy
+					for (let i = 0; i < this.coop_choice.length; ++i) {
+						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].offer + '元/人' :
+							'创作者自报价')
 					}
-					this.coop_choice = arr1
+					console.log("choice")
+					console.log(this.coop_choice)
 
 					this.getlist2()
 					this.getlist3()
 
-					this.tyy = false
-
 				})
 			},
-			//达人信息
+			// 达人信息
 			getlist2() {
 				this.$https.get('/youngee/c/t/g/get-talent-info')
 					.then(res => {
@@ -549,6 +601,7 @@
 						console.log("account")
 						console.log(res.data.data)
 						var accounts = res.data.data
+						this.account = []
 						if (res.data.code !== -3) {
 							for (var i = 0; i < accounts.length; i++) {
 								if (this.information.project_platform == accounts[i].platform_id) {
@@ -556,6 +609,33 @@
 								}
 							}
 						}
+						this.isSignUp()
+						console.log(this.account)
+					})
+			},
+			isSignUp() {
+				console.log("func isSignUp run")
+
+				if (this.account.length == 0) {
+					this.loading = false
+					uni.hideLoading();
+					this.tyy = false
+					return
+				}
+				this.$https.get('/youngee/c/t/g/is-sign-up-task' +
+						"?" +
+						"project_id" +
+						"=" +
+						this.projectid +
+						"&account_id" +
+						"=" +
+						this.account[0].account_id)
+					.then(res => {
+						console.log(res)
+						this.isSign = res.data.data;
+						this.loading = false
+						uni.hideLoading();
+						this.tyy = false
 					})
 			},
 			// 位运算方法
@@ -693,27 +773,24 @@
 			},
 			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_info == 0 || that.talent.is_bind_location == 0 ||
+					that.account.length == 0) {
 					// 前往个人信息绑定三合一界面
 					uni.showModal({
 						content: '请先绑定个人信息',
 						success: function(res) {
 							if (res.confirm) {
-								console.log(that.talent)
-								console.log("in")
-
 								if (that.account.length == 0) {
 									uni.navigateTo({
 										url: '/pages/tasksquare/bindinfo?platform_id=' + that
 											.information.project_platform
 									})
-
 								} else {
 									uni.navigateTo({
-										url: '/pages/tasksquare/bindinfo?platform_id=' + that
-											.information
-											.project_platform + '&account_id=' + that.account[0]
-											.account_id
+										url: '/pages/tasksquare/bindinfo?platform_id=' +
+											that.information.project_platform +
+											'&account_id=' +
+											that.account[0].account_id
 									})
 								};
 							} else if (res.cancel) {
@@ -919,9 +996,6 @@
 					this.$refs.popup2.open(type)
 					this.$refs.popup1.close()
 				}
-
-
-
 			},
 			preservation() {
 				uni.showToast({
@@ -934,16 +1008,44 @@
 			},
 			// 更新账号
 			Reset() {
-				uni.showToast({
-					title: '更新成功',
-					duration: 1000
+				console.log("Reset func running")
+				uni.navigateTo({
+					url: '/pages/mycenter/myinformation/bindaccount?platform_id=' + this
+						.information
+						.project_platform + '&account_id=' + this.account[0].account_id,
+
+					success(res) {
+						console.log(res);
+					},
+					fail(err) {
+						console.log(err);
+					}
 				});
+				// uni.showToast({
+				// 	title: '更新成功',
+				// 	duration: 1000
+				// });
 			},
 			//进入信息确认页面
 			determine() {
-				if (this.value === '' || this.value1 === '') {
+				console.log(this.strategy_id)
+				if (this.strategy_id == 0 || this.strategy == null) {
+					uni.showToast({
+						title: '请选择合作方式',
+						icon: 'none',
+						duration: 2000
+					});
+				} else if (this.account[0].fans_count < this.strategy.followers_low) {
+					// 提示“粉丝量不符合报名条件”
 					uni.showToast({
-						title: '请选择产品规格和合作选择',
+						title: '粉丝量不符合报名条件',
+						icon: 'none',
+						duration: 2000
+					});
+				} else if (this.strategy.fee_form == 3 && this.strategy.offer == 0) {
+					console.log(this.strategy)
+					uni.showToast({
+						title: '请填写自报价金额',
 						icon: 'none',
 						duration: 2000
 					});
@@ -951,16 +1053,17 @@
 					this.$refs.popup.close()
 					var data = {
 							projectid: this.projectid,
-							guige: this.value,
-							dengji: this.value1,
+							information: this.information,
+							account: this.account[0].account_id,
+							strategy: this.strategy,
 						},
 						data = JSON.stringify(data)
+					console.log("data")
+					console.log(data)
 					uni.navigateTo({
-						url: '/pages/task/information?textObj=' + data
+						url: '/pages/tasksquare/information?textObj=' + encodeURIComponent(data)
 					});
 				}
-
-
 			},
 		}
 	};
@@ -980,14 +1083,48 @@
 	}
 </style>
 <style lang="scss" scoped>
+	#coop_box {
+		// display: flex;
+		margin-top: 15rpx;
+	}
+
+	#coop_box .coop_box_btn {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		width: 700rpx;
+		// height: 50rpx;
+		border: 2px solid #f9f9f9;
+		border-radius: 15rpx;
+		font-size: 30rpx;
+		text-align: center;
+		// line-height: 40px;
+		cursor: pointer;
+	}
+
+	.borderColor {
+		border: 2px solid #f7d43c !important;
+	}
+
+	.offer_input {
+		width: 50rpx;
+		border: 1px solid #cccccc;
+	}
+
 	.wvp {
-		background-color: #FFFFFF;
-		padding: 0 20rpx;
-		border: 1rpx solid #AAAAAA;
+		// padding: 0 20rpx;
 		border-radius: 10rpx;
 		margin: 0 5rpx;
 	}
 
+	.wvp1 {
+		padding: 0 30rpx;
+		border-radius: 10rpx;
+		margin: 0 10rpx;
+		background-color: #f2d22d;
+		border: 10rpx;
+	}
+
 	.my-canvas {
 		position: fixed;
 		top: -99999999999rpx;
@@ -1173,17 +1310,19 @@
 	.uni-margin-wrap {
 		width: 690rpx;
 		width: 100%;
-		;
 	}
 
 	.swiper {
 		height: 750rpx;
+		display: flex;
+		justify-content: center;
 	}
 
 	.swiper-item {
 		display: block;
-		height: 400rpx;
-		line-height: 400rpx;
+		width: 100%;
+		height: 750rpx;
+		line-height: 750rpx;
 		text-align: center;
 	}
 
@@ -1284,14 +1423,12 @@
 	}
 
 	.tasksleft p {
-		font-size: 90%;
-		color: #999999;
+		font-size: 30rpx;
 		text-align: center;
 	}
 
 	.tasksright p {
-		font-size: 90%;
-		color: #999999;
+		font-size: 30rpx;
 		text-align: center;
 	}
 
@@ -1306,8 +1443,8 @@
 		margin: 2% auto;
 		width: 26%;
 		padding: 10rpx;
-		background-color: #FCCF41;
-		border-radius: 30rpx;
+		background-color: #f2d22d;
+		border-radius: 10rpx;
 		position: relative;
 	}
 
@@ -1333,12 +1470,12 @@
 	}
 
 	.markcontent {
-		width: 100%;
-		background-color: #E4E4E4;
+		// width: 100%;
+		// background-color: #E4E4E4;
+		margin: 0 30rpx;
 		border-radius: 20rpx;
 		padding-top: 2%;
 		padding-bottom: 2%;
-
 	}
 
 	.markcontent p {
@@ -1349,7 +1486,7 @@
 
 	.markcontent span {
 		font-size: 24rpx;
-		color: #333333;
+		// color: #333333;
 		// margin: 3% ;
 	}
 
@@ -1369,7 +1506,7 @@
 
 	.markcontent1 p {
 		font-size: 24rpx;
-		color: #333333;
+		// color: #333333;
 		// margin: 3% ;
 		text-indent: 2em;
 	}
@@ -1378,7 +1515,7 @@
 		width: 120rpx;
 		height: 120rpx;
 		border-radius: 50%;
-		background-color: #FCCF41;
+		background-color: #f2d22d;
 		margin: 0 auto;
 	}
 
@@ -1399,7 +1536,7 @@
 
 	.but1 {
 		width: 60%;
-		background-color: #FCCF41;
+		background-color: #f2d22d;
 		border-radius: 20rpx;
 		font-size: 36rpx;
 		line-height: 200%;
@@ -1414,10 +1551,23 @@
 
 	}
 
+	/** 必须提升样式优先权(!important) **/
+	button[disabled] {
+		width: 60%;
+		border-radius: 20rpx;
+		font-size: 36rpx;
+		line-height: 200%;
+		letter-spacing: 10rpx;
+		font-weight: 500;
+		height: 80%;
+		color: white !important;
+		background: #c4c1c1 !important;
+	}
+
 	.but2 {
 		width: 25%;
 		background-color: #FFFFFF;
-		border: 2rpx solid #FCCF41;
+		border: 2rpx solid #f2d22d;
 		border-radius: 20rpx;
 		font-size: 36rpx;
 		line-height: 180%;
@@ -1495,8 +1645,8 @@
 		line-height: 70rpx;
 		margin: 10rpx;
 		font-size: 80%;
-		box-shadow: 0rpx 0rpx 0rpx 5rpx #FCCF41;
-		border: 0rpx solid #FCCF41 !important;
+		box-shadow: 0rpx 0rpx 0rpx 5rpx #f2d22d;
+		border: 0rpx solid #f2d22d !important;
 	}
 
 	/deep/ .uni-data-checklist .checklist-group .checklist-box.is--tag {
@@ -1506,7 +1656,7 @@
 	}
 
 	/deep/ .uni-data-checklist .checklist-group .checklist-box.is--tag.is-checked {
-		background-color: #FCCF41 !important;
+		background-color: #f2d22d !important;
 	}
 
 	/deep/.uni-data-checklist .checklist-group .checklist-box.is--tag.is-checked .checklist-text {
@@ -1664,8 +1814,13 @@
 		font-size: 90%;
 
 		&.lor {
-			border-bottom: 2rpx solid #FCCF41;
+			border-bottom: 2rpx solid #f2d22d;
 
 		}
 	}
+
+	.label {
+		font-weight: 600;
+		width: 130rpx;
+	}
 </style>

pages/tasksquare/tasksquare.vue

@@ -50,17 +50,17 @@
 				<uni-popup ref="popup" background-color="#fff" @change="change">
 					<view class="popup-content" :class="{ 'popup-height': type === 'left' || type === 'right' }">
 						<view class="option" style="margin-top: 20%;">
-							<h3>社媒平台</h3>
+							<h3 style="margin-bottom: 10rpx;">社媒平台</h3>
 							<uni-data-checkbox mode="tag" multiple v-model="formData.hobby" :localdata="hobby">
 							</uni-data-checkbox>
 						</view>
 						<view class="option">
-							<h3>稿费形式</h3>
+							<h3 style="margin-bottom: 10rpx;">稿费形式</h3>
 							<uni-data-checkbox mode="tag" multiple v-model="formData.hobby1" :localdata="hobby1">
 							</uni-data-checkbox>
 						</view>
 						<view class="option">
-							<h3>任务形式</h3>
+							<h3 style="margin-bottom: 10rpx;">任务形式</h3>
 							<uni-data-checkbox mode="tag" multiple v-model="formData.hobby2" :localdata="hobby2">
 							</uni-data-checkbox>
 						</view>
@@ -454,18 +454,17 @@
 		methods: {
 			// 判断登陆是否过期
 			isLogin() {
-				if (this.token !== '') {
-					this.$https.get('/youngee/c/t/g/is-login')
-						.then(res => {
-							console.log(res)
-							if (res.data.code == 403) {
-								uni.clearStorage();
-							}
-						})
-				} else {
+				if (this.token == '') {
 					this.token = uni.getStorageSync('token')
-					console.log(this.token)
 				}
+				this.$https.get('/youngee/c/t/g/is-login')
+					.then(res => {
+						console.log(res)
+						if (res.data.code == 403) {
+							this.token = ""
+							uni.clearStorage();
+						}
+					})
 			},
 			// 信息表
 			getInfoList() {
@@ -503,57 +502,71 @@
 					20 + this.filtCondition
 				).then(res => {
 					console.log(res)
-					this.max_page = res.data.data.max_page
-					for (var i = 0; i < res.data.data.ProjectInfos.length; i++) {
-						// 封面图片
-						res.data.data.ProjectInfos[i].coverphoto = res.data.data.ProjectInfos[i].ProductInfo
-							.ProductCovers.photo_url
-						// 获取平台图片
-						for (var j = 0; j < this.listsrc.length; j++) {
-							if (res.data.data.ProjectInfos[i].project_platform == this.listsrc[j].id) {
-								res.data.data.ProjectInfos[i].project_imgper = this.listsrc[j].platform_icon
+					if (res.data.code == -4) {
+						this.projectList = []
+						uni.showToast({
+							title: '没有满足条件的任务',
+							icon: 'none',
+							duration: 2000
+						});
+					} else {
+						this.max_page = res.data.data.max_page
+						for (var i = 0; i < res.data.data.ProjectInfos.length; i++) {
+							// 封面图片
+							res.data.data.ProjectInfos[i].coverphoto = res.data.data.ProjectInfos[i].ProductInfo
+								.ProductCovers.photo_url
+							// 获取平台图片
+							for (var j = 0; j < this.listsrc.length; j++) {
+								if (res.data.data.ProjectInfos[i].project_platform == this.listsrc[j].id) {
+									res.data.data.ProjectInfos[i].project_imgper = this.listsrc[j].platform_icon
+								}
 							}
-						}
-						this.listsrc
-
-						// 价值除100
-						// res.data.data.ProjectInfos[i].ProductInfo.product_price = Number(res.data.data
-						// 	.ProjectInfos[i]
-						// 	.ProductInfo.product_price) * 0.01
-
-						// 任务数量&稿费形式
-						res.data.data.ProjectInfos[i].taskNum = 0
-						for (var j = 0; j < res.data.data.ProjectInfos[i].RecruitStrategys.length; j++) {
-							res.data.data.ProjectInfos[i].taskNum = Number(res.data.data.ProjectInfos[i]
-								.taskNum) + Number(res.data.data.ProjectInfos[i].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
+							this.listsrc
+
+							// 价值除100
+							// res.data.data.ProjectInfos[i].ProductInfo.product_price = Number(res.data.data
+							// 	.ProjectInfos[i]
+							// 	.ProductInfo.product_price) * 0.01
+
+							// 任务数量&稿费形式
+							res.data.data.ProjectInfos[i].taskNum = 0
+
+							if (res.data.data.ProjectInfos[i].RecruitStrategys) {
+								for (var j = 0; j < res.data.data.ProjectInfos[i].RecruitStrategys.length; j++) {
+									res.data.data.ProjectInfos[i].taskNum = Number(res.data.data.ProjectInfos[i]
+										.taskNum) + Number(res.data.data.ProjectInfos[i].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
+									}
+								}
 							}
 
-							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
+							//结束时间
+							var newdate = new Date()
+							// console.log(newdate)
+							var endTime = new Date(res.data.data.ProjectInfos[i].recruit_ddl.replace(/-/g, "/"));
+							// console.log(beginTime)
+							if (endTime - newdate < 0) {
+								res.data.data.ProjectInfos[i].deadlinetype = 0
+							} else {
+								res.data.data.ProjectInfos[i].deadlinetype = 1
 							}
+							res.data.data.ProjectInfos[i].recruit_ddl = this.thistime(res.data.data.ProjectInfos[i]
+								.recruit_ddl)
+
 						}
-						//结束时间
-						var newdate = new Date()
-						// console.log(newdate)
-						var endTime = new Date(res.data.data.ProjectInfos[i].recruit_ddl.replace(/-/g, "/"));
-						// console.log(beginTime)
-						if (endTime - newdate < 0) {
-							res.data.data.ProjectInfos[i].deadlinetype = 0
-						} else {
-							res.data.data.ProjectInfos[i].deadlinetype = 1
-						}
-						res.data.data.ProjectInfos[i].recruit_ddl = this.thistime(res.data.data.ProjectInfos[i]
-							.recruit_ddl)
+						this.projectList = res.data.data.ProjectInfos
+						console.log(this.projectList)
 
 					}
-					this.projectList = res.data.data.ProjectInfos
-					console.log(this.projectList)
 
 				})
 			},
@@ -664,10 +677,11 @@
 					title: '加载中'
 				});
 				console.log('重置')
-				this.formData.hobby = [],
-					this.formData.hobby1 = [],
-					this.filtCondition = '',
-					this.getProjectList()
+				this.formData.hobby = [];
+				this.formData.hobby1 = [];
+				this.formData.hobby2 = [];
+				this.filtCondition = '';
+				this.getProjectList()
 				uni.hideLoading();
 			},
 			toggle4(type) {
@@ -735,30 +749,30 @@
 			// 进入任务详情
 			project(item) {
 				console.log(item.project_id)
-				if (item.deadlinetype == 0) {
-					uni.showToast({
-						title: '此任务已结束',
-						icon: 'none',
-						duration: 2000
+				if (this.token == '') {
+					uni.showModal({
+						content: '请先登录',
+						success: function(res) {
+							if (res.confirm) {
+								uni.navigateTo({
+									url: '/pages/login/login'
+								});
+							} else if (res.cancel) {
+								console.log('用户点击取消');
+							}
+						}
 					});
 				} else {
-					if (this.token == '') {
-						uni.showModal({
-							content: '请先登录',
-							success: function(res) {
-								if (res.confirm) {
-									uni.navigateTo({
-										url: '/pages/login/login'
-									});
-								} else if (res.cancel) {
-									console.log('用户点击取消');
-								}
-							}
-						});
-					} else {
+					if (item.deadlinetype == 0) {
 						uni.navigateTo({
-							url: '/pages/tasksquare/taskdetail?id=' + item.project_id
+							url: '/pages/tasksquare/taskdetail?id=' + item.project_id + "&ddl=1"
 						});
+					} else {
+						{
+							uni.navigateTo({
+								url: '/pages/tasksquare/taskdetail?id=' + item.project_id + "&ddl=0"
+							});
+						}
 					}
 				}
 			},
@@ -891,6 +905,7 @@
 
 	//弹出层
 	/deep/ .uni-data-checklist .checklist-group .checklist-box {
+		background-color: #FFFFFF !important;
 		border-radius: 20rpx !important;
 		padding: 8rpx 30rpx !important;
 		border: 0 !important;
@@ -902,19 +917,22 @@
 	}
 
 	/deep/ .mini-btn {
-		height: 55rpx;
-		width: 150rpx;
-		line-height: 55rpx;
-		margin: 30rpx;
-		letter-spacing: 4rpx
+		height: 70rpx;
+		width: 250rpx;
+		line-height: 70rpx;
+		margin: 20rpx;
+		letter-spacing: 4rpx;
+		color: white;
 	}
 
 	/deep/ .mini-btn1 {
-		height: 55rpx;
-		width: 350rpx;
-		line-height: 55rpx;
-		margin: 30rpx;
-		letter-spacing: 4rpx
+		height: 70rpx;
+		width: 400rpx;
+		line-height: 70rpx;
+		margin: 20rpx;
+		letter-spacing: 4rpx;
+		color: white;
+		;
 	}
 
 	/deep/ .uni-data-checklist .checklist-group .checklist-box.is--tag.is-checked {
@@ -927,6 +945,7 @@
 
 	.option {
 		padding: 5rpx 18rpx;
+		// background-color: #FFFFFF;
 	}
 
 	//其他

pages/worksapce/worksapce.vue

@@ -1,22 +0,0 @@
-<template>
-	<view>
-		
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				
-			}
-		},
-		methods: {
-			
-		}
-	}
-</script>
-
-<style>
-
-</style>

pages/workspace/applyInformation.vue

@@ -0,0 +1,106 @@
+<template>
+	<view style="position: relative;">
+		<!-- 胶囊 -->
+		<mvBar :mysNavConfig="mysNavConfig"></mvBar>
+		<view style="margin-top: 160rpx;"></view>
+		<view style="font-size: 25rpx;margin: 0rpx 20rpx;align:center;">
+			<p>这里记录报名时的账号信息，不可更改，合作以报名时的信息为准</p>
+		</view>
+		<view class="account-info">
+			<view class="ac-txt">
+				<p style="width: 200rpx;">昵称</p>
+				<p>{{account.platform_nickname}}</p>
+			</view>
+			<view class="ac-txt">
+				<p style="width: 200rpx;">粉丝数</p>
+				<p>{{account.fans_count}}</p>
+			</view>
+			<view class="ac-link">
+				<p>{{account.home_page_url}}</p>
+			</view>
+			<view class="ac-photo">
+				<p>主页截图</p>
+				<image :src="account.home_page_capture_url" class="ac-photo-img"></image>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import mvBar from "@/components/mys_navBar/mysNavBar";
+	export default {
+		components: {
+			mvBar,
+		},
+		data() {
+			return {
+				account: {},
+				mysNavConfig: {
+					/* 开启单页显示首页图标 */
+					isHome: true,
+					/* 固定导航  */
+					navFixed: true,
+					/* 标题 （屏幕中心居中 两边图标中心居中使用slot center1） */
+					navTitle: {
+						text: "我的信息",
+						color: "",
+						fontSize: "32rpx", // px upx rpx
+						fontWeight: "normal", // 100 - 700
+					},
+					btnType: "type2",
+					onLeftClick: '',
+					/* type2 按钮 */
+					type2Config: {
+						// 左图标
+						leftPath: "/static/img/png2.png",
+						// 右图标
+						rightPath: "/static/img/png4.png",
+						// 圆角
+						radius: "40rpx",
+					},
+				},
+			}
+		},
+		onLoad(options) {
+			let data = options.textObj.replace(/""/g, "");
+			data = JSON.parse(decodeURIComponent(data))
+			this.account = data.account
+			console.log(this.account)
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.account-info {
+		padding: 30rpx;
+		font-size: 30rpx;
+
+		.ac-txt {
+			display: flex;
+			padding-left: 20rpx;
+			margin-top: 30rpx;
+		}
+
+		.ac-link {
+			margin-top: 30rpx;
+			background-color: #EBEBEB;
+			padding: 20rpx;
+		}
+
+		.ac-photo {
+			display: flex;
+			align-items: center;
+			margin: 20rpx;
+				
+			.ac-photo-img{
+				width: 300rpx;
+				height: 300rpx;
+				padding-left: 30rpx;
+			}
+		}
+
+	}
+</style>

pages/workspace/deliveryInformation.vue

@@ -0,0 +1,169 @@
+<template>
+	<view style="position: relative;">
+		<!-- 胶囊 -->
+		<mvBar :mysNavConfig="mysNavConfig"></mvBar>
+		<view style="margin-top: 160rpx;"></view>
+
+
+
+		<view v-if="projectForm == 1">
+
+			<view class="address">
+				<view class="address_icon">
+					<image style="width: 50rpx;height: 50rpx;" :src="picture.icon_loc" mode="">
+					</image>
+				</view>
+				<view style="width: 70%;">
+					<view style="display: flex;">
+						<p class='ipon' style="padding-right: 100rpx;">{{address.receiver_name}}</p>
+						<p class='ipon'>{{address.phone_number}}</p>
+					</view>
+					<p class='ipon'>{{address.detail_addr}}</p>
+				</view>
+				<view class="address_edit" @click="editAddress()">
+					<image :src="picture.icon_edit" mode="">
+					</image>
+				</view>
+			</view>
+
+			<view class="logistics1">
+				<p style="margin-bottom: 10rpx;">物流公司：{{logistics.company_name}}</p>
+				<p>物流单号：{{logistics.logistics_number}}</p>
+			</view>
+		</view>
+
+		<view v-if="projectForm == 2" style="margin: 0 10%;">
+			<p>券码信息：{{logistics.coupon_code_information}}</p>
+		</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>
+
+	</view>
+</template>
+
+<script>
+	import mvBar from "@/components/mys_navBar/mysNavBar";
+	export default {
+		components: {
+			mvBar,
+		},
+		data() {
+			return {
+				address: {},
+				taskId: "",
+				projectForm: "",
+				logistics: {},
+				picture: {
+					togoimg: 'https://horastar.obs.cn-east-3.myhuaweicloud.com/talent/task16.png',
+					icon_edit: 'https://horastar.obs.cn-east-3.myhuaweicloud.com/youngee/talent_upload/icon-edit.png',
+					icon_loc: 'https://horastar.obs.cn-east-3.myhuaweicloud.com/youngee/talent_upload/icon-loc.png',
+					icon_right: 'https://horastar.obs.cn-east-3.myhuaweicloud.com/talent_upload/icon-arrow-right.png',
+					home8: 'https://horastar.obs.cn-east-3.myhuaweicloud.com/talent/home8.png',
+					home10: 'https://horastar.obs.cn-east-3.myhuaweicloud.com/talent/home10.png',
+					home11: 'https://horastar.obs.cn-east-3.myhuaweicloud.com/talent/home11.png',
+				},
+				mysNavConfig: {
+					/* 开启单页显示首页图标 */
+					isHome: true,
+					/* 固定导航  */
+					navFixed: true,
+					/* 标题 （屏幕中心居中 两边图标中心居中使用slot center1） */
+					navTitle: {
+						text: "物流信息",
+						color: "",
+						fontSize: "32rpx", // px upx rpx
+						fontWeight: "normal", // 100 - 700
+					},
+					btnType: "type2",
+					onLeftClick: '',
+					/* type2 按钮 */
+					type2Config: {
+						// 左图标
+						leftPath: "/static/img/png2.png",
+						// 右图标
+						rightPath: "/static/img/png4.png",
+						// 圆角
+						radius: "40rpx",
+					},
+				},
+			}
+		},
+		onLoad(options) {
+			let data = options.textObj.replace(/""/g, "");
+			data = JSON.parse(decodeURIComponent(data))
+			this.address = data.address
+			this.taskId = data.taskId
+			this.projectForm = data.projectForm
+
+			uni.showLoading({
+				title: '加载中'
+			});
+			this.getTaskInfo()
+		},
+		methods: {
+			getTaskInfo() {
+				this.$https.get('/youngee/c/t/g/get-task-logistics-info' +
+					"?" +
+					"task_id" +
+					"=" +
+					this.taskId
+				).then(res => {
+					this.logistics = res.data.data
+					this.logistics.explorestore_starttime = this.logistics.explorestore_starttime.slice(0, 16)
+					this.logistics.explorestore_endtime = this.logistics.explorestore_endtime.slice(0, 16)
+					this.loading = false;
+					uni.hideLoading();
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	p {
+		font-size: 30rpx;
+	}
+
+	.address {
+		display: flex;
+		margin: 20rpx 0;
+		// padding: 20rpx 20rpx;
+		background-color: #FFFFFF;
+		justify-content: space-around;
+		align-items: center;
+
+		.address_icon {
+			width: 15%;
+			vertical-align: middle;
+			display: flex;
+			justify-content: center;
+		}
+
+		.address_edit {
+			width: 15%;
+		}
+
+		.address_edit image {
+			vertical-align: middle;
+			width: 50rpx;
+			height: 50rpx;
+			display: inline-block;
+			padding-right: 14rpx;
+		}
+
+		.ipon {
+			color: #333333;
+			font-size: 30rpx;
+			font-weight: 500;
+			margin-bottom: 10rpx;
+		}
+	}
+
+	.logistics1 {
+		margin-left: 15%;
+		margin-top: 50rpx;
+	}
+</style>

pages/workspace/scriptrecord.vue

@@ -0,0 +1,111 @@
+<template>
+	<view style="position: relative;">
+		<!-- 胶囊 -->
+		<mvBar :mysNavConfig="mysNavConfig"></mvBar>
+		<view style="margin-top: 160rpx;"></view>
+
+		<view class="script" v-for="item in List">
+			<view style="margin: 20rpx;">
+				<p style="margin-bottom: 10rpx;">上传时间：{{item.create_at}}</p>
+				<p>{{item.content}}</p>
+			</view>
+			<view class="heng-line" v-if="item.is_review"></view>
+			<view style="margin: 20rpx;color: red;" v-if="item.is_review">
+				<p style="margin-bottom: 10rpx;">驳回时间：{{item.reject_at}}</p>
+				<p>{{item.revise_opinion}}</p>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import mvBar from "@/components/mys_navBar/mysNavBar";
+	export default {
+		components: {
+			mvBar,
+		},
+		data() {
+			return {
+				List: [{
+					create_at: "2022-7-10 13:00",
+					content: "脚本内容",
+					reject_at: "2022-7-11 13:00",
+					revise_opinion: "驳回意见",
+					is_review: 1,
+				}, {
+					create_at: "2022-7-11 13:00",
+					content: "脚本内容2",
+					reject_at: "2022-7-12 13:00",
+					revise_opinion: "驳回意见2",
+					is_review: 1,
+				}, {
+					create_at: "2022-7-11 13:00",
+					content: "脚本内容3",
+					reject_at: "",
+					revise_opinion: "",
+					is_review: 0,
+				}],
+				mysNavConfig: {
+					/* 开启单页显示首页图标 */
+					isHome: true,
+					/* 固定导航  */
+					navFixed: true,
+					/* 标题 （屏幕中心居中 两边图标中心居中使用slot center1） */
+					navTitle: {
+						text: "查看修改/反馈记录",
+						color: "",
+						fontSize: "32rpx", // px upx rpx
+						fontWeight: "normal", // 100 - 700
+					},
+					btnType: "type2",
+					onLeftClick: '',
+					/* type2 按钮 */
+					type2Config: {
+						// 左图标
+						leftPath: "/static/img/png2.png",
+						// 右图标
+						rightPath: "/static/img/png4.png",
+						// 圆角
+						radius: "40rpx",
+					},
+				},
+			}
+		},
+
+		onShow() {
+			this.getList();
+		},
+
+		onLoad(options) {
+			let data = options.textObj.replace(/""/g, "");
+			data = JSON.parse(decodeURIComponent(data))
+			this.taskId = data.taskId
+			console.log(this.taskId)
+		},
+		methods: {
+			// 获取达人基本信息
+			getList() {
+				this.$https.get('/youngee/c/t/g/get-task-script' +
+						"?" +
+						"task_id" +
+						"=" +
+						this.taskId)
+					.then(res => {
+						console.log(res)
+						this.List = res.data.data
+					})
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.script {
+		margin-bottom: 100rpx;
+	}
+
+	.heng-line {
+		width: 100%;
+		border-bottom: 1rpx solid #dadada;
+	}
+</style>

pages/workspace/taskdetail.vue

@@ -0,0 +1,584 @@
+<template>
+	<view>
+		<!-- 胶囊 -->
+		<mvBar :mysNavConfig="mysNavConfig"></mvBar>
+		<view style="margin-top: 160rpx;"></view>
+
+		<view v-if="loading">
+			<view style="display: flex;justify-content: center;font-size: 50rpx;">
+				<p>加载中</p>
+			</view>
+		</view>
+		<view v-if="!loading">
+			<!-- 任务状态 -->
+			<view style="padding-bottom: 30rpx;">
+				<view style="display: flex;justify-content: center;font-size: 44rpx;padding-bottom: 20rpx;">
+					<p>{{msg1}}</p>
+					<view class="upload-btn" v-if="showUpload" @click="toUpload()">
+						<image src="../../static/img/icon-upload.png" style="height: 40rpx;width: 40rpx;"></image>
+						<p style="font-size: 32rpx;">快速上传</p>
+					</view>
+				</view>
+				<view style="display: flex;justify-content: center;font-size: 30rpx;">
+					<p>{{msg2}}</p>
+				</view>
+				<view style="display: flex;justify-content: center;font-size: 30rpx;" v-if="msg3 != ''">
+					<p>{{msg3}}</p>
+				</view>
+			</view>
+			
+			<view style="display: flex;justify-content: center;align-items: center;">
+				<image style="height: 60rpx;width: 60rpx;" src="../../static/img/icon-time.png"></image>
+				<p style="font-size: 30rpx;color: #f2d241;">剩余时间：{{timeLeft}}</p>
+			</view>
+
+			<view class="address">
+				<view class="address_icon">
+					<image style="width: 50rpx;height: 50rpx;" :src="picture.icon_loc" mode="">
+					</image>
+				</view>
+				<view style="width: 70%;">
+					<view style="display: flex;">
+						<p class='ipon' style="padding-right: 100rpx;">{{address.receiver_name}}</p>
+						<p class='ipon'>{{address.phone_number}}</p>
+					</view>
+					<p class='ipon'>{{address.detail_addr}}</p>
+				</view>
+				<view class="address_edit" @click="editAddress()">
+					<image :src="picture.icon_edit" mode="">
+					</image>
+				</view>
+			</view>
+
+			<view class="basicInfo">
+				<image :src="product.photo_url" style="width: 150rpx;height: 150rpx;" mode="">
+				</image>
+				<view class="basicInfo_txt">
+					<p style="margin-bottom: 10rpx;font-size: 35rpx;font-weight: 550;">{{project.project_name}}</p>
+					<p style="font-size: 30rpx;">商品价值：{{project.Product.product_price}}</p>
+				</view>
+			</view>
+
+			<view class="keyInfo">
+				<view style="margin-bottom: 40rpx;">
+					<p style="font-size: 36rpx;font-weight: 550;">关键任务信息</p>
+				</view>
+				<view>
+					<p style="font-weight: 600;margin-bottom: 10rpx;">合作方式</p>
+					<p>粉丝量：{{strategy.followers_low}}-{{strategy.followers_up}}
+						&nbsp;&nbsp;
+						稿费：{{strategy.fee_form_t}}
+					</p>
+				</view>
+
+				<view class="line"></view>
+
+				<view style="margin-top: 20rpx;margin-bottom: 10rpx;">
+					<p style="font-weight: 600;margin-bottom: 10rpx;">社媒平台：</p>
+					<p>{{project.project_platform_t}}</p>
+				</view>
+
+				<view class="line"></view>
+
+				<p style="font-weight: 600;margin-top: 10rpx;">任务要求</p>
+				<view class="keyInfo_task">
+					<view style="display: flex;align-items: center;margin: 10rpx 0;">
+						<p>内容形式：</p>
+						<p>{{project.content}}</p>
+					</view>
+					<view style="display: flex;align-items: center;margin: 10rpx 0;">
+						<p>任务形式：</p>
+						<p>{{project.project_form_t}}</p>
+					</view>
+					<view style="margin-top: 20rpx;margin-bottom: 10rpx;">
+						<p>商品描述：</p>
+						<p> {{project.Product.product_detail}}
+						</p>
+					</view>
+					<view style="margin-top: 20rpx;margin-bottom: 10rpx;">
+						<p>任务详情：</p>
+						<p> {{project.project_detail}} </p>
+					</view>
+				</view>
+			</view>
+
+			<view class="task-progress">
+				<p style="font-size: 32rpx;font-weight: 600;">任务进度</p>
+				<view class="task-progress-card" v-bind:style="task.task_stage == 1 ? 'background-color: #f2d241' : ''">
+					<view class="tpc-txt1">
+						<p>报名信息</p>
+					</view>
+					<view class="tpc-txt2" @click="toApplyinfo()">
+						<p>查看</p>
+						<image class="tpc-icon" :src="picture.icon_right"></image>
+					</view>
+				</view>
+				<view class="task-progress-card" v-if="task.task_stage >= 6" v-bind:style="task.task_stage == 6 ? 'background-color: #f2d241' : ''">
+					<view class="tpc-txt1">
+						<p>物流信息</p> 
+					</view>
+					<view class="tpc-txt2" @click="toLogisticsinfo()">
+						<p>查看</p>
+						<image class="tpc-icon" :src="picture.icon_right"></image>
+					</view>
+				</view>
+				<view class="task-progress-card"  v-if="task.task_stage >= 8" v-bind:style="task.task_stage == 8 ? 'background-color: #f2d241' : ''">
+					<view class="tpc-txt1">
+						<p>上传拍摄脚本</p>
+					</view>
+					<view class="tpc-txt2"  @click="toUpload()" v-if="task.script_status == 1">
+						<p style="color: red;">待添加</p>
+						<image class="tpc-icon" :src="picture.icon_right"></image>
+					</view>
+					<view class="tpc-txt2"  @click="toUpload()" v-if="task.script_status == 2">
+						<p style="color: #fff;">已添加</p>
+						<image class="tpc-icon" :src="picture.icon_right"></image>
+					</view>
+					<view class="tpc-txt2"  @click="toUpload()" v-if="task.script_status == 3">
+						<p style="color: red;">待修改</p>
+						<image class="tpc-icon" :src="picture.icon_right"></image>
+					</view>
+					<view class="tpc-txt2"  @click="toUpload()" v-if="task.script_status == 4">
+						<p style="color: #fff;">已修改</p>
+						<image class="tpc-icon" :src="picture.icon_right"></image>
+					</view>
+					<view class="tpc-txt2"  @click="toRecord()" v-if="task.script_status == 5">
+						<p>查看</p>
+						<image class="tpc-icon" :src="picture.icon_right"></image>
+					</view>
+				</view>
+				<view class="task-progress-info">
+					<view style="padding: 10rpx 0;">
+						<p>任务id：{{task.task_id}}</p>
+					</view>
+					<view style="padding: 10rpx 0;">
+						<p>报名时间：{{task.create_date}}</p>
+					</view>
+					<view v-if="task.task_stage > 1" style="padding: 10rpx 0;">
+						<p>确认合作：{{task.select_date}}</p>
+					</view>
+					<view v-if="task.task_stage > 5" style="padding: 10rpx 0;">
+						<p>发货时间：{{task.delivery_date}}</p>
+					</view>
+				</view>
+			</view>
+
+			<view class="block"></view>
+			<view class="submit" v-if="false">
+				<button type="default" class="submit_btn" @click="submit()"> 确认提交</button>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import mvBar from "@/components/mys_navBar/mysNavBar";
+	export default {
+		components: {
+			mvBar
+		},
+		data() {
+			return {
+				showUpload: false,
+				loading: true,
+				timeLeft: "3天5小时28分",
+				msg1: "",
+				msg2: "",
+				msg3: "",
+				infoMsg1: [
+					"等待企业确认合作",
+					"等待企业确认合作",
+					"恭喜任务申请成功！",
+					"任务申请失败",
+					"等待发货中",
+					"商家已发货",
+					"等待上传拍摄脚本",
+					"等待上传拍摄脚本",
+					"等待上传拍摄脚本",
+					"等待上传拍摄脚本",
+					"等待上传初稿",
+					"等待上传初稿",
+					"等待上传初稿",
+					"等待上传链接",
+					"等待上传链接",
+					"等待上传链接",
+					"等待上传作品数据",
+					"等待上传作品数据",
+					"已结案",
+					"任务终止",
+					"任务终止",
+				],
+				infoMsg2: [
+					"商家将在申请截止后5天内审核完毕",
+					"商家将在申请截止后5天内审核完毕",
+					"请仔细查看任务要求和任务详情，开始执行任务吧！",
+					"账号未达到入选标准，请小主尝试申请其他任务吧！",
+					"发货后可在任务进度中查看物流单号",
+					"请在物流进度中查看物流单号/虚拟产品兑换码",
+					"请在任务进度中上传拍摄脚本，商家审核通过后再进行拍摄",
+					"请在任务进度中上传拍摄脚本，商家审核通过后再进行拍摄",
+					"请在任务进度中上传拍摄脚本，商家审核通过后再进行拍摄",
+					"请在任务进度中上传拍摄脚本，商家审核通过后再进行拍摄",
+					"请在任务进度中上传图文/视频初稿，商家审核通过后再进行发布",
+					"请在任务进度中上传图文/视频初稿，商家审核通过后再进行发布",
+					"请在任务进度中上传图文/视频初稿，商家审核通过后再进行发布",
+					"恭喜作品审核通过，请及时发布并在任务进度中上传发布链接。",
+					"恭喜作品审核通过，请及时发布并在任务进度中上传发布链接。",
+					"恭喜作品审核通过，请及时发布并在任务进度中上传发布链接。",
+					"恭喜链接审核通过，请在作品发布7天后上传作品数据。",
+					"恭喜链接审核通过，请在作品发布7天后上传作品数据。",
+					"本项目已结案，可申请佣金提现。",
+					"长时间未上传，任务已终止。",
+					"长时间未上传，任务已终止。",
+				],
+				platform: [
+					"小红书",
+					"抖音",
+					"微博",
+					"快手",
+					"B站",
+					"大众点评",
+					"知乎",
+				],
+				task: {},
+				address: {},
+				project: {},
+				product: {},
+				account: {},
+				strategy: {},
+				picture: {
+					togoimg: 'https://horastar.obs.cn-east-3.myhuaweicloud.com/talent/task16.png',
+					icon_edit: 'https://horastar.obs.cn-east-3.myhuaweicloud.com/youngee/talent_upload/icon-edit.png',
+					icon_loc: 'https://horastar.obs.cn-east-3.myhuaweicloud.com/youngee/talent_upload/icon-loc.png',
+					icon_right: 'https://horastar.obs.cn-east-3.myhuaweicloud.com/talent_upload/icon-arrow-right.png',
+					home8: 'https://horastar.obs.cn-east-3.myhuaweicloud.com/talent/home8.png',
+					home10: 'https://horastar.obs.cn-east-3.myhuaweicloud.com/talent/home10.png',
+					home11: 'https://horastar.obs.cn-east-3.myhuaweicloud.com/talent/home11.png',
+				},
+				task_type_info: ["实体商品寄拍", "虚拟产品测评", "线下探店打卡", "素材微原创"],
+				mysNavConfig: {
+					isHome: false,
+					/* 固定导航  */
+					navFixed: true,
+					/* 标题 （屏幕中心居中 两边图标中心居中使用slot center1） */
+					navTitle: {
+						text: "信息确认",
+						color: "",
+						fontSize: "32rpx", // px upx rpx
+						fontWeight: "", // 100 - 700
+					},
+					btnType: "type2",
+					onLeftClick: '',
+					/* type2 按钮 */
+					type2Config: {
+						// 左图标
+						leftPath: "https://horastar.obs.cn-east-3.myhuaweicloud.com/talent/png2.png",
+						// 右图标
+						rightPath: "https://horastar.obs.cn-east-3.myhuaweicloud.com/talent/png4.png",
+						// 圆角
+						radius: "40rpx",
+					},
+				},
+			}
+		},
+		onShow(){
+			uni.showLoading({
+				title: '加载中'
+			});
+			console.log("onLoad run")
+			this.getTaskInfo()
+		},
+		onLoad(options) {
+			this.taskId = options.taskId
+		},
+		methods: {
+			getTaskInfo() {
+				this.$https.get('/youngee/c/t/g/get-task-detail' +
+					"?" +
+					"task_id" +
+					"=" +
+					this.taskId
+				).then(res => {
+					console.log(res)
+					this.task = res.data.data.task_info
+					this.address = JSON.parse(res.data.data.task_info.talent_post_addr_snap);
+					this.account = JSON.parse(res.data.data.task_info.talent_platform_info_snap);
+					this.project = res.data.data.project_detail
+					this.product = res.data.data.product_photo
+					this.strategy = res.data.data.strategy
+
+					this.strategy.fee_form_t = this.strategy.fee_form == 1 ? '产品置换' : (this.strategy.fee_form ==
+						2 ?
+						'固定稿费 ' +
+						this.task.task_reward : '创作者自报价 ' + this.task.task_reward)
+
+					// 任务形式
+					if (this.project.content_type == 1) this.project.content = "图文"
+					else if (this.project.content_type == 2) this.project.content = "视频"
+
+					// 任务类型
+					this.project.project_form_t = this.task_type_info[this.project.project_form - 1]
+
+					// 社媒平台
+					this.project.project_platform_t = this.platform[this.project.project_platform - 1]
+					console.log("社媒平台：", this.project.project_platform_t)
+
+					// 不同任务阶段提示消息
+					this.msg1 = this.infoMsg1[this.task.task_stage - 1]
+					this.msg2 = this.infoMsg2[this.task.task_stage - 1]
+					if (this.task.task_stage >= 8 && this.task.task_stage <= 10) {
+						this.msg3 = "延迟上传脚本，可能导致佣金扣除。"
+					} else if (this.task.task_stage >= 11 && this.task.task_stage <= 13) {
+						this.msg3 = "延迟上传初稿，可能导致佣金扣除。"
+					} else if (this.task.task_stage >= 14 && this.task.task_stage <= 16) {
+						this.msg3 = "延迟上传链接，可能导致佣金扣除。"
+					} else if (this.task.task_stage >= 17 && this.task.task_stage <= 18) {
+						this.msg3 = "延迟上传作品数据，可能导致佣金扣除。"
+					}
+					
+					if(this.task.task_stage == 8 || this.task.task_stage == 11 || this.task.task_stage == 14 || this.task.task_stage == 17){
+						this.showUpload = true
+					}
+					this.loading = false;
+					uni.hideLoading();
+
+				})
+			},
+			
+			toUpload(){
+				var data = {
+					taskId: this.task.task_id,
+					scriptStatus: this.task.script_status
+				};
+				data = JSON.stringify(data)
+				if(this.task.task_stage == 8){	// 上传脚本
+					uni.navigateTo({
+						url: '/pages/workspace/uploadscript?textObj=' + encodeURIComponent(data)
+					});
+				}
+			},
+
+			toRecord() {
+				var data = {
+					taskId: this.task.task_id,
+				};
+				data = JSON.stringify(data)
+				uni.navigateTo({
+					url: '/pages/workspace/scriptrecord?textObj=' + encodeURIComponent(data)
+				});
+			},
+			toApplyinfo() {
+				var data = {
+					account: this.account,
+				};
+				data = JSON.stringify(data)
+				uni.navigateTo({
+					url: '/pages/workspace/applyInformation?textObj=' + encodeURIComponent(data)
+				});
+			},
+
+			toLogisticsinfo() {
+				console.log(this.project.project_form)
+				var data = {
+					address: this.address,
+					taskId: this.task.task_id,
+					projectForm: this.project.project_form
+				};
+				data = JSON.stringify(data)
+				uni.navigateTo({
+					url: '/pages/workspace/deliveryInformation?textObj=' + encodeURIComponent(data)
+				});
+			},
+		}
+	}
+</script>
+
+
+<style lang="scss" scoped>
+	.basicInfo {
+		display: flex;
+		margin-top: 20rpx;
+		padding: 20rpx 40rpx;
+		background-color: #FFFFFF;
+
+		.basicInfo_txt {
+			margin-left: 40rpx;
+			padding-top: 20rpx;
+		}
+	}
+
+	.upload-btn {
+		display: flex;
+		background-color: #f2d241;
+		border-radius: 10rpx;
+		padding: 5rpx;
+		margin-left: 20rpx;
+		cursor: pointer;
+	}
+
+	.address {
+		display: flex;
+		margin: 20rpx 0;
+		// padding: 20rpx 20rpx;
+		background-color: #FFFFFF;
+		justify-content: space-around;
+		align-items: center;
+
+		.address_icon {
+			width: 15%;
+			vertical-align: middle;
+			display: flex;
+			justify-content: center;
+		}
+
+		.address_edit {
+			width: 15%;
+		}
+
+		.address_edit image {
+			vertical-align: middle;
+			width: 50rpx;
+			height: 50rpx;
+			display: inline-block;
+			padding-right: 14rpx;
+		}
+
+		.ipon {
+			color: #333333;
+			font-size: 30rpx;
+			font-weight: 500;
+			margin-bottom: 10rpx;
+		}
+	}
+
+	.keyInfo {
+		padding: 20rpx 20rpx;
+		background-color: #FFFFFF;
+
+		.keyInfo_task {
+			color: #999999;
+		}
+	}
+
+	.keyInfo h3 {
+		font-weight: 600;
+	}
+
+	.keyInfo p {
+		font-size: 30rpx;
+	}
+
+	.account {
+		display: flex;
+		align-items: center;
+		// justify-content: space-between;
+		// width: 90%;
+		margin: 20rpx 0;
+		padding: 20rpx 20rpx;
+		background-color: #FFFFFF;
+		font-size: 35rpx;
+
+		.account_txt {
+			display: inline-block;
+			padding: 0 0 0 1%;
+			width: 400rpx;
+		}
+
+		.account_txt image {
+			vertical-align: middle;
+			width: 50rpx;
+			height: 50rpx;
+			display: inline-block;
+			padding-right: 14rpx;
+		}
+
+		.account_fans {
+			display: flex;
+			width: 250rpx;
+		}
+
+		.account_fans p {
+			display: inline-block;
+			color: #333333;
+			font-weight: 550;
+		}
+
+		.account_btn {}
+	}
+
+	.task-progress {
+		padding: 20rpx;
+
+		.task-progress-card {
+			margin: 15rpx 0;
+			display: flex;
+			align-items: center;
+			// margin: 20rpx;
+			padding: 10rpx;
+			font-size: 30rpx;
+			border-radius: 10rpx;
+
+			.tpc-txt1 {
+				display: flex;
+				justify-content: flex-start;
+				// margin-left: 20rpx;
+
+			}
+
+			.tpc-txt2 {
+				display: flex;
+				align-items: center;
+				justify-content: flex-end;
+				// margin-right: 20rpx;
+				flex: 1;
+
+				.tpc-icon {
+					width: 30rpx;
+					height: 30rpx;
+				}
+			}
+		}
+
+		.task-progress-info {
+			padding: 10rpx;
+			font-size: 30rpx;
+			border-radius: 10rpx;
+			background-color: #f2f2f2;
+		}
+	}
+
+	.block {
+		width: 100%;
+		height: 100rpx;
+		margin-top: 5%;
+	}
+
+	.submit {
+		box-shadow: 0rpx 5rpx 40rpx #ccc;
+		width: 100%;
+		position: fixed;
+		bottom: 0rpx;
+		display: flex;
+		height: 90rpx;
+		padding-top: 2%;
+		background-color: #FFFFFF;
+
+		.submit_btn {
+			width: 60%;
+			background-color: #FCCF41;
+			border-radius: 20rpx;
+			font-size: 36rpx;
+			line-height: 200%;
+			letter-spacing: 10rpx;
+			font-weight: 500;
+			height: 80%;
+		}
+
+	}
+
+	.line {
+		border-bottom: 1rpx solid #d5d5d5;
+		width: 98%;
+		margin: 10rpx 1%;
+	}
+</style>

pages/workspace/uploadscript.vue

@@ -0,0 +1,139 @@
+<template>
+	<view style="position: relative;">
+		<!-- 胶囊 -->
+		<mvBar :mysNavConfig="mysNavConfig"></mvBar>
+		<view style="margin-top: 160rpx;"></view>
+		<view @click="toRecord()">
+			<view style="display: flex;justify-content: center;">
+				<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: 30rpx;">查看修改/反馈记录</p>
+			</view>
+		</view>
+
+		<!-- 多行输入框 -->
+		<view style="margin: 40rpx;">
+			<textarea v-model="text" placeholder="在此编辑发布脚本/粘贴文字" />
+		</view>
+		<view class="signup">
+			<button type="default" :disabled="isSubmit" class="but1" :loading="loading"
+				:class="{'on':item.title == '1',}" @click="submit()">
+				提交脚本</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import mvBar from "@/components/mys_navBar/mysNavBar";
+	export default {
+		components: {
+			mvBar,
+		},
+		data() {
+			return {
+				taskId: "",
+				text: "",
+				scriptStatus: "",
+				isSubmit: false,
+				mysNavConfig: {
+					/* 开启单页显示首页图标 */
+					isHome: true,
+					/* 固定导航  */
+					navFixed: true,
+					/* 标题 （屏幕中心居中 两边图标中心居中使用slot center1） */
+					navTitle: {
+						text: "上传脚本",
+						color: "",
+						fontSize: "32rpx", // px upx rpx
+						fontWeight: "normal", // 100 - 700
+					},
+					btnType: "type2",
+					onLeftClick: '',
+					/* type2 按钮 */
+					type2Config: {
+						// 左图标
+						leftPath: "/static/img/png2.png",
+						// 右图标
+						rightPath: "/static/img/png4.png",
+						// 圆角
+						radius: "40rpx",
+					},
+				},
+			}
+		},
+
+		onLoad(options) {
+			let data = options.textObj.replace(/""/g, "");
+			data = JSON.parse(decodeURIComponent(data))
+			this.taskId = data.taskId
+			this.scriptStatus = data.scriptStatus
+			if (this.scriptStatus != 1 && this.scriptStatus != 3) {
+				this.isSubmit = true
+			}
+		},
+		methods: {
+			toRecord() {
+				var data = {
+					taskId: this.taskId,
+				};
+				data = JSON.stringify(data)
+				uni.navigateTo({
+					url: '/pages/workspace/scriptrecord?textObj=' + encodeURIComponent(data)
+				});
+			},
+
+			submit() {
+				let that = this
+				uni.showModal({
+					title: '提示',
+					content: '提交后无法修改并进行审核，确认提交？',
+					success: function(res) {
+						if (res.confirm) {
+							that.$https.post('/youngee/c/t/p/add-task-script', {
+									task_id: that.taskId,
+									content: that.text,
+								})
+								.then(res => {
+									console.log(res)
+									uni.navigateBack()
+								})
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				});
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.signup {
+		box-shadow: 0rpx 5rpx 40rpx #ccc;
+		width: 100%;
+		position: fixed;
+		bottom: 0rpx;
+		display: flex;
+		height: 90rpx;
+		padding-top: 2%;
+		background-color: #FFFFFF;
+	}
+
+	.but1 {
+		width: 60%;
+		background-color: #f2d22d;
+		border-radius: 20rpx;
+		font-size: 36rpx;
+		line-height: 200%;
+		letter-spacing: 10rpx;
+		font-weight: 500;
+		height: 80%;
+
+		&.on {
+			background-color: #C0C0C0;
+
+		}
+
+	}
+</style>

pages/workspace/workspace.vue

@@ -0,0 +1,336 @@
+<template>
+	<view>
+		<!-- 胶囊 -->
+		<mvBar :mysNavConfig="mysNavConfig"></mvBar>
+		<view style="height: 160rpx;width: 100%; position: fixed;background-color: #FFFFFF;top: 0;z-index: 8;">
+		</view>
+		<view class="menu">
+			<view class="menu-item" @click="toShow1()">
+				<p v-bind:class="showList1?'lor':''">待传脚本</p>
+			</view>
+			<view class="menu-item" @click="toShow2()">
+				<p v-bind:class="showList2?'lor':''">待传初稿</p>
+			</view>
+			<view class="menu-item" @click="toShow3()">
+				<p v-bind:class="showList3?'lor':''">待发布</p>
+			</view>
+			<view class="menu-item" @click="toShow4()">
+				<p v-bind:class="showList4?'lor':''">待传数据</p>
+			</view>
+		</view>
+
+		<view class="home" v-if="showList1">
+			<view class="task" v-for="item in List1">
+				<view @click="toDetail(item)">
+					<view class="task-head">
+						<view class="task-head-account">
+							<image :src="item.platform_icon_url" style="height: 50rpx;width: 50rpx;"></image>
+							<p style="margin-left: 20rpx;">{{item.platform_nick_name}}</p>
+						</view>
+						<view class="task-head-status">
+							<p>{{item.task_stage_txt}}</p>
+						</view>
+					</view>
+					<view class="task-info">
+						<image :src="item.product_img_url" style="height: 120rpx;width: 120rpx;"></image>
+						<p style="margin-left: 50rpx;">{{item.project_name}}</p>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="home" v-if="showList2">
+			<view class="task" v-for="item in List2">
+				<view @click="toDetail(item)">
+					<view class="task-head">
+						<view class="task-head-account">
+							<image :src="item.platform_icon_url" style="height: 50rpx;width: 50rpx;"></image>
+							<p style="margin-left: 20rpx;">{{item.platform_nick_name}}</p>
+						</view>
+						<view class="task-head-status">
+							<p>{{item.task_stage_txt}}</p>
+						</view>
+					</view>
+					<view class="task-info">
+						<image :src="item.product_img_url" style="height: 120rpx;width: 120rpx;"></image>
+						<p style="margin-left: 50rpx;">{{item.project_name}}</p>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="home" v-if="showList3">
+			<view class="task" v-for="item in List3">
+				<view @click="toDetail(item)">
+					<view class="task-head">
+						<view class="task-head-account">
+							<image :src="item.platform_icon_url" style="height: 50rpx;width: 50rpx;"></image>
+							<p style="margin-left: 20rpx;">{{item.platform_nick_name}}</p>
+						</view>
+						<view class="task-head-status">
+							<p>{{item.task_stage_txt}}</p>
+						</view>
+					</view>
+					<view class="task-info">
+						<image :src="item.product_img_url" style="height: 120rpx;width: 120rpx;"></image>
+						<p style="margin-left: 50rpx;">{{item.project_name}}</p>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="home" v-if="showList4">
+			<view class="task" v-for="item in List4">
+				<view @click="toDetail(item)">
+					<view class="task-head">
+						<view class="task-head-account">
+							<image :src="item.platform_icon_url" style="height: 50rpx;width: 50rpx;"></image>
+							<p style="margin-left: 20rpx;">{{item.platform_nick_name}}</p>
+						</view>
+						<view class="task-head-status">
+							<p>{{item.task_stage_txt}}</p>
+						</view>
+					</view>
+					<view class="task-info">
+						<image :src="item.product_img_url" style="height: 120rpx;width: 120rpx;"></image>
+						<p style="margin-left: 50rpx;">{{item.project_name}}</p>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import mvBar from "@/components/mys_navBar/mysNavBar";
+	export default {
+		components: {
+			mvBar,
+		},
+		data() {
+			return {
+				showList1: true,
+				showList2: false,
+				showList3: false,
+				showList4: false,
+				List1: [],
+				List2: [],
+				List3: [],
+				List4: [],
+				taskStageList: [],
+				mysNavConfig: {
+					/* 开启单页显示首页图标 */
+					isHome: true,
+					/* 固定导航  */
+					navFixed: true,
+					/* 标题 （屏幕中心居中 两边图标中心居中使用slot center1） */
+					navTitle: {
+						text: "工作台",
+						color: "",
+						fontSize: "32rpx", // px upx rpx
+						fontWeight: "normal", // 100 - 700
+					},
+				},
+				list: [{
+					account: {
+						platform: "https://horastar.obs.cn-east-3.myhuaweicloud.com/talent/lQLPDhrXwll1_MsjI7CSK_6e62AG2AGOvh1HgAcA_35_35.png",
+						nickname: "丸子在成都",
+					},
+					status: "待确认",
+					mainphoto: "https://static1.paizi.com/uploadfile/2018/1013/20181013013207465.png",
+					taskname: "醉码头火锅太古里店",
+				}, {
+					account: {
+						platform: "https://horastar.obs.cn-east-3.myhuaweicloud.com/talent/pingtai2.png",
+						nickname: "成都的一颗丸子",
+					},
+					status: "待确认",
+					mainphoto: "https://tse1-mm.cn.bing.net/th/id/R-C.978cb3a3b27875a0cc9d78a254b30b8f?rik=yrP2kNCtfQYEgQ&riu=http%3a%2f%2fnews.southcn.com%2fgd%2fcontent%2fimages%2fattachement%2fpng%2fsite4%2f20190917%2feca86b61fd551eeb23c507.png&ehk=xuWbgLrNmyhNJaByMZPJrX81PrzXrLHqHM%2fdYatFhrs%3d&risl=&pid=ImgRaw&r=0&sres=1&sresct=1",
+					taskname: "奥运吉祥物冰墩墩盲盒",
+				}],
+			}
+		},
+		onShow() {
+			this.isLogin()
+		},
+		methods: {
+			// 判断登陆是否过期
+			isLogin() {
+				if (this.token == '') {
+					this.token = uni.getStorageSync('token')
+				}
+				this.$https.get('/youngee/c/t/g/is-login')
+					.then(res => {
+						console.log(res)
+						if (res.data.code == 403) {
+							this.token = ""
+							uni.clearStorage();
+							uni.showModal({
+								content: '请先登录',
+								success: function(res) {
+									uni.navigateTo({
+										url: '../login/login'
+									});
+								}
+							});
+						} else {
+							uni.showLoading({
+								title: '加载中'
+							});
+							this.getInfoTable();
+						}
+					})
+			},
+			getInfoTable() {
+				this.$https.get('/youngee/c/g/get-info-tables')
+					.then(res => {
+						console.log(res)
+						this.taskStageList = res.data.data.TaskStage
+						this.getList()
+					})
+			},
+			getList() {
+				console.log("run func getList")
+				this.$https.get('/youngee/c/t/g/get-task-exe-list').then(res => {
+					console.log(res)
+					this.List1 = res.data.data.list1
+					this.List2 = res.data.data.list2
+					this.List3 = res.data.data.list3
+					this.List4 = res.data.data.list4
+					if (this.List1 != null) {
+						for (let i = 0; i < this.List1.length; ++i) {
+							for (let j = 0; j < this.taskStageList.length; ++j) {
+								if (this.List1[i].task_stage == this.taskStageList[j].task_stage_id)
+									this.List1[i].task_stage_txt = this.taskStageList[j].task_stage
+							}
+						}
+					}
+					if (this.List2 != null) {
+						for (let i = 0; i < this.List2.length; ++i) {
+							for (let j = 0; j < this.taskStageList.length; ++j) {
+								if (this.List2[i].task_stage == this.taskStageList[j].task_stage_id)
+									this.List2[i].task_stage_txt = this.taskStageList[j].task_stage
+							}
+						}
+					}
+					if (this.List3 != null) {
+						for (let i = 0; i < this.List3.length; ++i) {
+							for (let j = 0; j < this.taskStageList.length; ++j) {
+								if (this.List3[i].task_stage == this.taskStageList[j].task_stage_id)
+									this.List3[i].task_stage_txt = this.taskStageList[j].task_stage
+							}
+						}
+					}
+					if (this.List4 != null) {
+						for (let i = 0; i < this.List4.length; ++i) {
+							for (let j = 0; j < this.taskStageList.length; ++j) {
+								if (this.List4[i].task_stage == this.taskStageList[j].task_stage_id)
+									this.List4[i].task_stage_txt = this.taskStageList[j].task_stage
+							}
+						}
+					}
+					uni.hideLoading();
+				})
+			},
+			toShow1() {
+				this.showList2 = false;
+				this.showList3 = false;
+				this.showList4 = false;
+				this.showList1 = true;
+			},
+			toShow2() {
+				this.showList1 = false;
+				this.showList3 = false;
+				this.showList4 = false;
+				this.showList2 = true;
+			},
+			toShow3() {
+				this.showList2 = false;
+				this.showList1 = false;
+				this.showList4 = false;
+				this.showList3 = true;
+			},
+			toShow4() {
+				this.showList2 = false;
+				this.showList1 = false;
+				this.showList3 = false;
+				this.showList4 = true;
+			},
+			toDetail(item) {
+				uni.navigateTo({
+					url: '/pages/workspace/taskdetail?taskId=' + item.task_id,
+					success(res) {
+						console.log(res);
+					},
+					fail(err) {
+						console.log(err);
+					}
+				});
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	view {
+		font-size: 14px;
+		line-height: inherit;
+	}
+
+	.menu {
+		position: fixed;
+		top: 160rpx;
+		border-bottom: #FCCF41;
+		background-color: #FFFFFF;
+		justify-content: space-around;
+		height: 5%;
+		width: 100%;
+		display: flex;
+		z-index: 10;
+	}
+
+	.menu-item p {
+		font-weight: 600;
+
+		&.lor {
+			border-bottom: 5rpx solid #F0D232;
+			color: #F0D232;
+			padding-bottom: 15rpx;
+		}
+	}
+
+	.home {
+		margin-top: 100rpx;
+	}
+
+	.task {
+		margin-bottom: 20rpx;
+		border-bottom: 1rpx #d7d7d7 solid;
+
+		.task-head {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			padding: 10rpx 20rpx;
+
+			.task-head-account {
+				display: flex;
+			}
+
+			.task-head-status {
+				color: red;
+			}
+		}
+
+		.task-info {
+			display: flex;
+			align-items: center;
+			padding: 10rpx 20rpx;
+
+		}
+	}
+
+	.line {
+		border-bottom: 1rpx #AAAAAA solid;
+	}
+</style>

unpackage/dist/dev/.sourcemap/mp-weixin/pages/mycenter/mytask/excutetask.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["uni-app:///main.js"],"names":["wx","__webpack_require_UNI_MP_PLUGIN__","__webpack_require__","createPage","Page"],"mappings":";;;;;;;;;;kDAAA;AACA;AACA,iH,6FAFmBA,EAAE,CAACC,iCAAH,GAAuCC,mBAAvC;AAGnBC,UAAU,CAACC,mBAAD,CAAV,C","file":"pages/mycenter/mytask/excutetask.js","sourcesContent":["import 'uni-pages';wx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;\nimport Vue from 'vue'\nimport Page from './pages/mycenter/mytask/excutetask.vue'\ncreatePage(Page)"],"sourceRoot":""}

unpackage/dist/dev/.sourcemap/mp-weixin/pages/mycenter/mytask/excutetask/excutetask.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["uni-app:///main.js"],"names":["wx","__webpack_require_UNI_MP_PLUGIN__","__webpack_require__","createPage","Page"],"mappings":";;;;;;;;;;kDAAA;AACA;AACA,4H,6FAFmBA,EAAE,CAACC,iCAAH,GAAuCC,mBAAvC;AAGnBC,UAAU,CAACC,mBAAD,CAAV,C","file":"pages/mycenter/mytask/excutetask/excutetask.js","sourcesContent":["import 'uni-pages';wx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;\nimport Vue from 'vue'\nimport Page from './pages/mycenter/mytask/excutetask/excutetask.vue'\ncreatePage(Page)"],"sourceRoot":""}

unpackage/dist/dev/.sourcemap/mp-weixin/pages/worksapce/taskdetail.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["uni-app:///main.js"],"names":["wx","__webpack_require_UNI_MP_PLUGIN__","__webpack_require__","createPage","Page"],"mappings":";;;;;;;;;;kDAAA;AACA;AACA,2G,6FAFmBA,EAAE,CAACC,iCAAH,GAAuCC,mBAAvC;AAGnBC,UAAU,CAACC,mBAAD,CAAV,C","file":"pages/worksapce/taskdetail.js","sourcesContent":["import 'uni-pages';wx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;\nimport Vue from 'vue'\nimport Page from './pages/worksapce/taskdetail.vue'\ncreatePage(Page)"],"sourceRoot":""}

unpackage/dist/dev/.sourcemap/mp-weixin/pages/workspace/deliveryInformation/deliveryInformation.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["uni-app:///main.js"],"names":["wx","__webpack_require_UNI_MP_PLUGIN__","__webpack_require__","createPage","Page"],"mappings":";;;;;;;;;;kDAAA;;;AAGA;AACA,iJ,8FAHA;AACAA,EAAE,CAACC,iCAAH,GAAuCC,mBAAvC,CAGAC,UAAU,CAACC,4BAAD,CAAV,C","file":"pages/workspace/deliveryInformation/deliveryInformation.js","sourcesContent":["import 'uni-pages';\n// @ts-ignore\nwx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;\nimport Vue from 'vue'\nimport Page from './pages/workspace/deliveryInformation/deliveryInformation.vue'\ncreatePage(Page)"],"sourceRoot":""}