update 更新任务大厅与选品广场名称及优先级，更新我的页面ui，精简到一页

add 增加更方便的带货链接按钮，以及物流信息查看按钮

components/mys_navBar/mysNavBar.vue

@@ -101,7 +101,7 @@
 </template>
 <script>
 	/* 默认首页路径 */
-	const homePath = "/pages/tasksquare/tasksquare";
+	const homePath = "/pages/selectionsquare/selectionsquare";
 	/* 默认首页图标路径 */
 	const homeIconPath = "";
 	/* 默认返回图标路径 */

page_mycenter/myselection/myselection.vue

@@ -174,7 +174,7 @@
 					navFixed: true,
 					/* 标题 （屏幕中心居中 两边图标中心居中使用slot center1） */
 					navTitle: {
-						text: "选品广场",
+						text: "带货任务",
 						color: "",
 						fontSize: "32rpx", // px upx rpx
 						fontWeight: "normal", // 100 - 700

page_mycenter/mytask/mytask.vue

@@ -207,7 +207,7 @@
 					navFixed: true,
 					/* 标题 （屏幕中心居中 两边图标中心居中使用slot center1） */
 					navTitle: {
-						text: "我的任务",
+						text: "种草任务",
 						color: "",
 						fontSize: "32rpx", // px upx rpx
 						fontWeight: "normal", // 100 - 700

page_selectionsquare/selectiondetail/selectiondetail.vue

@@ -76,7 +76,7 @@
 					<view class="circularmark">
 						<p>领样要求</p>
 					</view>
-					<view class="markcontent">						
+					<view class="markcontent">
 						<p>{{selection.sample_condition}}</p>
 					</view>
 				</view>
@@ -143,7 +143,7 @@
 											@tap="downloadFile(item.file_url, item.file_name)">点击下载</button>
 									</view>
 								</view>
-								<view  v-else class="diagram" v-for="item in briefFiles">
+								<view v-else class="diagram" v-for="item in briefFiles">
 									<image :src="item.file_url" mode="widthFix"></image>
 								</view>
 							</view>
@@ -170,7 +170,7 @@
 							</view>
 
 							<view style="display:flex;justify-content: center;" v-if="isPhoto == 2">
-								<view  type="default" @click="downloadVideo(exampleImgs[0].file_url)">下载视频</view>
+								<view type="default" @click="downloadVideo(exampleImgs[0].file_url)">下载视频</view>
 							</view>
 							<view class="diagram" v-for="item in exampleImgs" v-if="isPhoto == 1">
 								<image :src="item.file_url" mode="widthFix"></image>
@@ -179,7 +179,7 @@
 					</view>
 				</view>
 			</view>
-			
+
 			<view class="" id="wrap2">
 				<view class="home" style="padding-top: 0;">
 					<view class="">
@@ -205,8 +205,12 @@
 				<button type="default" class="but1" v-if="!isSign && !ddl" @click="submit()">立即申请</button>
 				<button type="default" class="but1" disabled v-if="isSign && !ddl"> 已报名 </button>
 				<button type="default" class="but1" disabled v-if="ddl"> 报名结束 </button>
+
+				<button type="default" class="but2" @click="handleCopy(selection.product_url)">
+					复制带货链接
+				</button>
 				<button type="default" class="but2" @click="toggle1('bottom')">
-					<image src="https://horastar.obs.cn-east-3.myhuaweicloud.com/talent/task8.png" mode=""></image>
+					<!-- <image src="https://horastar.obs.cn-east-3.myhuaweicloud.com/talent/task8.png" mode=""></image> -->
 					分享
 				</button>
 			</view>
@@ -732,7 +736,8 @@
 							.sample_mode) - 1]
 						this.selection.show_task_mode = this.task_mode_info[parseInt(this.selection
 							.task_mode) - 1]
-						this.selection.isNeedCondition = parseInt(this.selection.sample_mode) === 2 || parseInt(this.selection.task_mode) === 1 ? true : false
+						this.selection.isNeedCondition = parseInt(this.selection.sample_mode) === 2 || parseInt(
+							this.selection.task_mode) === 1 ? true : false
 						this.selection.isNeedSample = parseInt(this.selection.sample_mode) === 3 ? false : true
 						this.selection.show_task_reward = money(this.selection.task_reward)
 						this.selection.show_estimated_income = money(this.selection.estimated_income)
@@ -1617,12 +1622,12 @@
 	}
 
 	.but1 {
-		width: 60%;
+		// width: 60%;
 		background-color: #f2d22d;
 		border-radius: 20rpx;
 		font-size: 36rpx;
 		line-height: 200%;
-		letter-spacing: 10rpx;
+		// letter-spacing: 10rpx;
 		font-weight: 500;
 		height: 80%;
 
@@ -1665,16 +1670,16 @@
 	}
 
 	.but2 {
-		width: 25%;
+		// width: 25%;
 		background-color: #FFFFFF;
 		border: 2rpx solid #f2d22d;
 		border-radius: 20rpx;
 		font-size: 36rpx;
 		line-height: 180%;
-		letter-spacing: 10rpx;
+		// letter-spacing: 10rpx;
 		font-weight: 500;
 		position: relative;
-		text-indent: 0.5em;
+		// text-indent: 0.5em;
 		height: 80%;
 	}
 

page_selectionsquare/selectiondetail/success.vue

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

page_tasksquare/wholetask/success.vue

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

page_workspace/selection/assignment/upload.vue

@@ -10,14 +10,14 @@
 					placeholder="请上传正确链接~" />
 			</view>
 
-			<view style="margin: 0 40rpx;">
+		<!-- 	<view style="margin: 0 40rpx;">
 				<p style="margin-bottom: 20rpx;">上传作业数据截图</p>
 				<htz-image-upload :max="1" mediaType="image" name="file" :chooseNum="1" v-model="imageData"
 					@chooseSuccess="ceshiChooseSuccess1">
 				</htz-image-upload>
 				<p style="height: 50px;font-size: 32rpx;width: 100%;color: #808090;">上传作业数据截图（直播任务请上传销量截图）
 				</p>
-			</view>
+			</view> -->
 
 			<view class="signup">
 				<button type="default" class="but1" @click="submit()">
@@ -90,6 +90,13 @@
 		methods: {
 			submit() {
 				// 校验
+				if (this.link_url === "") {
+					uni.showToast({
+						title: '请输入正确的发布链接',
+						icon: 'none'
+					})
+					return
+				}
 				// if (this.link_url != "" && (this.link_url.substring(0, 8) != "https://" && this.link_url.substring(0, 7) !=
 				// 		"http://")) {
 				// 	uni.showToast({
@@ -98,13 +105,13 @@
 				// 	})
 				// 	return
 				// }
-				if (this.imageData.length == 0) {
-					uni.showToast({
-						title: '请上传收录/发布截图',
-						icon: 'none'
-					})
-					return
-				}
+				// if (this.imageData.length == 0) {
+				// 	uni.showToast({
+				// 		title: '请上传收录/发布截图',
+				// 		icon: 'none'
+				// 	})
+				// 	return
+				// }
 				let that = this
 				uni.showModal({
 					title: '提示',
@@ -204,7 +211,7 @@
 					fail: function(e) {
 						console.log(e);
 						uni.showToast({
-							title: '上传失败22222',
+							title: '上传失败',
 							icon: '失败'
 						});
 					}

page_workspace/selection/logistics/logisticsdetail.vue

@@ -0,0 +1,194 @@
+<template>
+	<view v-show="!is_loading">
+		<!-- 胶囊 -->
+		<mvBar :mysNavConfig="mysNavConfig"></mvBar>
+		<view :style="{paddingTop:navH}" style="background-color: #fff;"></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.full_detail_addr}}</p>
+			</view>
+		</view>
+
+		<view class="logistics1">
+			<view>
+				<p style="margin-bottom: 10rpx;">物流公司：{{logistics_company}}</p>
+				<p>物流单号：{{logistics_number}}
+					<image :src="picture.icon_copy" mode="" class="copy-img" @click="handleCopy(logistics_number)" />
+				</p>
+			</view>
+		</view>
+
+		<view class="logistics-detail" v-for="item in logisticsData">
+			<view class="logistics-item">
+				<p>{{ item.context }}</p>
+				<p>{{ item.time }}</p>
+			</view>
+		</view>
+		<view style="height: 100rpx;"></view>
+	</view>
+</template>
+
+<script>
+	import region from '@/components/pca-code.json';
+	import mvBar from "@/components/mys_navBar/mysNavBar";
+	export default {
+		components: {
+			mvBar,
+		},
+		data() {
+			return {
+				navH: getApp().globalData.navHeight,
+				picture: getApp().globalData.picture,
+				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",
+					},
+				},
+				task_id: "",
+				logistics_number: "",
+				logistics_company: "",
+				logisticsData: [{
+					context: "",
+					time: ""
+				}],
+				address: {},
+				is_loading: true,
+			}
+		},
+		async onLoad(options) {
+			let data = options.textObj.replace(/""/g, "");
+			data = JSON.parse(decodeURIComponent(data))
+			this.task_id = data.taskId
+			uni.showLoading({
+				title: '加载中'
+			});
+			this.is_loading = true
+			await this.getLogisticsDetail(this.task_id)
+			this.is_loading = false
+			uni.hideLoading();
+		},
+		methods: {
+			getLogisticsDetail(secTaskId) {
+				// 获取物流信息
+				return this.$https.get('/youngee/c/api/t/secTask/logistics/detail?task_id=' + secTaskId).then(res => {
+					console.log(res)
+					let resData = res.data.data
+					this.logistics_number = resData.logistics_number
+					this.logistics_company = resData.logistics_company
+					this.logisticsData = resData.logistics_context.data
+
+					// 地址解析
+					this.address = JSON.parse(resData.address_snap);
+					let a = this.address.region_code.toString().slice(0, 2)
+					let b = this.address.region_code.toString().slice(0, 4)
+					let c = 0
+					for (var i = 0; i < region.length; i++) {
+						if (region[i].code == a) {
+							a = region[i].name
+							for (var j = 0; j < region[i].children.length; j++) {
+								if (region[i].children[j].code == b) {
+									b = region[i].children[j].name
+									for (var o = 0; o < region[i].children[j].children.length; o++) {
+										if (region[i].children[j].children[o].code == this.address
+											.region_code) {
+											c = region[i].children[j].children[o].name
+										}
+									}
+								}
+
+							}
+						}
+					}
+					this.address.full_detail_addr = a + b + c + this.address.detail_addr
+				})
+			}
+		}
+	}
+</script>
+
+
+<style lang="scss" scoped>
+	p {
+		font-size: 30rpx;
+	}
+
+	.address {
+		display: flex;
+		margin: 20rpx 0;
+		// padding: 20rpx 20rpx;
+		background-color: #FFFFFF;
+		justify-content: flex-start;
+		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: 50rpx;
+		display: flex;
+		flex-flow: column;
+		align-items: flex-start;
+		justify-content: center;
+	}
+
+	.logistics-detail {
+		padding: 20rpx 30rpx;
+	}
+
+	.logistics-item {
+		background-color: #f1f1f1;
+		padding: 10rpx 30rpx;
+	}
+</style>

page_workspace/selection/sectaskdetail.vue

@@ -183,7 +183,7 @@
 					navFixed: true,
 					/* 标题 （屏幕中心居中 两边图标中心居中使用slot center1） */
 					navTitle: {
-						text: "选品任务详情",
+						text: "带货任务详情",
 						color: "",
 						fontSize: "32rpx", // px upx rpx
 						fontWeight: "", // 100 - 700
@@ -387,14 +387,21 @@
 				});
 			},
 			toLogisticsinfo() {
+				// var data = {
+				// 	address: this.address,
+				// 	taskId: this.task.task_id,
+				// 	projectForm: this.project.project_form
+				// };
+				// data = JSON.stringify(data)
+				// uni.navigateTo({
+				// 	url: '/page_workspace/task/information/deliveryInformation?textObj=' + encodeURIComponent(data)
+				// });
 				var data = {
-					address: this.address,
 					taskId: this.task.task_id,
-					projectForm: this.project.project_form
 				};
 				data = JSON.stringify(data)
 				uni.navigateTo({
-					url: '/page_workspace/task/information/deliveryInformation?textObj=' + encodeURIComponent(data)
+					url: '/page_workspace/selection/logistics/logisticsdetail?textObj=' + encodeURIComponent(data)
 				});
 			},
 			editAddress() {

page_workspace/task/information/deliveryInformation.vue

@@ -17,10 +17,6 @@
 					</view>
 					<p class='ipon'>{{address.full_detail_addr}}</p>
 				</view>
-				<!-- <view class="address_edit" @click="editAddress()">
-					<image :src="picture.icon_edit" mode="">
-					</image>
-				</view> -->
 			</view>
 
 			<view class="logistics1">
@@ -74,7 +70,7 @@
 				},
 				mysNavConfig: {
 					/* 开启单页显示首页图标 */
-					isHome: true,
+					isHome: false,
 					/* 固定导航  */
 					navFixed: true,
 					/* 标题 （屏幕中心居中 两边图标中心居中使用slot center1） */

page_workspace/task/taskdetail.vue

@@ -350,7 +350,7 @@
 					navFixed: true,
 					/* 标题 （屏幕中心居中 两边图标中心居中使用slot center1） */
 					navTitle: {
-						text: "我的任务详情",
+						text: "种草任务详情",
 						color: "",
 						fontSize: "32rpx", // px upx rpx
 						fontWeight: "", // 100 - 700

pages.json

@@ -1,5 +1,16 @@
 {
 	"pages": [{
+			"path": "pages/selectionsquare/selectionsquare",
+			"style": {
+				"enablePullDownRefresh": true,
+				"onReachBottomDistance": 100,
+				"navigationBarTitleText": "YoungGee",
+				"navigationStyle": "custom",
+				"app-plus": {
+					"titleNView": false
+				}
+			}
+		}, {
 			"path": "pages/tasksquare/tasksquare",
 			"style": {
 				"enablePullDownRefresh": true,
@@ -49,17 +60,6 @@
 				"navigationStyle": "custom",
 				"navigationBarTextStyle": "black"
 			}
-		}, {
-			"path": "pages/selectionsquare/selectionsquare",
-			"style": {
-				"enablePullDownRefresh": true,
-				"onReachBottomDistance": 100,
-				"navigationBarTitleText": "YoungGee",
-				"navigationStyle": "custom",
-				"app-plus": {
-					"titleNView": false
-				}
-			}
 		}
 	],
 	"subPackages": [{
@@ -374,6 +374,13 @@
 					"navigationStyle": "custom",
 					"navigationBarTextStyle": "black"
 				}
+			}, {
+				"path": "selection/logistics/logisticsdetail",
+				"style": {
+					"navigationBarTitleText": "YoungGee",
+					"navigationStyle": "custom",
+					"navigationBarTextStyle": "black"
+				}
 			}]
 		}
 	],
@@ -391,30 +398,28 @@
 		"selectedColor": "#FFE040",
 		"backgroundColor": "#ffffff",
 		"list": [{
-				"text": "任务大厅",
-				"pagePath": "pages/tasksquare/tasksquare",
-				"iconPath": "static/img/icon-square1.png",
-				"selectedIconPath": "static/img/icon-square2.png"
-			},
-			{
-				"text": "选品广场",
-				"pagePath": "pages/selectionsquare/selectionsquare",
-				"iconPath": "static/img/icon-shop1.png",
-				"selectedIconPath": "static/img/icon-shop2.png"
-			},
-			{
-				"text": "工作台",
-				"pagePath": "pages/workspace/workspace",
-				"iconPath": "static/img/icon-workspace1.png",
-				"selectedIconPath": "static/img/icon-workspace2.png"
-			},
-			{
-				"text": "我的",
-				"pagePath": "pages/mycenter/mycenter",
-				"iconPath": "static/img/icon-my1.png",
-				"selectedIconPath": "static/img/icon-my2.png"
-			}
-		]
+			"text": "带货",
+			"pagePath": "pages/selectionsquare/selectionsquare",
+			"iconPath": "static/img/icon-shop1.png",
+			"selectedIconPath": "static/img/icon-shop2.png"
+		}, {
+			"text": "种草",
+			"pagePath": "pages/tasksquare/tasksquare",
+			"iconPath": "static/img/zhongcao-hui.png",
+			"selectedIconPath": "static/img/zhongcao.png"
+			// "iconPath": "static/img/icon-square1.png",
+			// "selectedIconPath": "static/img/icon-square2.png",
+		}, {
+			"text": "工作台",
+			"pagePath": "pages/workspace/workspace",
+			"iconPath": "static/img/icon-workspace1.png",
+			"selectedIconPath": "static/img/icon-workspace2.png"
+		}, {
+			"text": "我的",
+			"pagePath": "pages/mycenter/mycenter",
+			"iconPath": "static/img/icon-my1.png",
+			"selectedIconPath": "static/img/icon-my2.png"
+		}]
 	},
 	"condition": { //模式配置，仅开发期间生效
 		"current": 0, //当前激活的模式(list 的索引项)

pages/mycenter/mycenter.vue

@@ -38,21 +38,48 @@
 				</view>
 			</view>
 
-			<view class="show-income1">
-				<view class="show-income1-left">
-					<view class="show-income1-left-up">
+			<view class="show-income">
+				<view class="income1">
+					<!-- <p> 我的钱包 </p> -->
+					<view style="display: flex;align-items: center;">
+						<p>我的钱包</p>
+						<image id="helpicon" :src="picture.icon_help" mode=""
+							style="width: 35rpx;height: 35rpx;padding-left: 10rpx;" @click="showIncomeHelp = true" />
+					</view>
+					<view class="tip_box" v-if="showIncomeHelp">
+						<view class="container" :style="{
+					  'margin-right': cotainerMargin + 'px',
+					  backgroundColor: '#404040', borderRadius: '5px' }">
+
+							<view class="tips">
+								<p>{{incomeHelpText}}</p>
+							</view>
+							<view class="close" @click="showIncomeHelp = false">
+								<image class="closeImg" src="../../static/delete.png" />
+							</view>
+						</view>
+					</view>
+					<p @click="toIncome('can')" style="margin-right: -40rpx;font-size: 28rpx;"> 去提现> </p>
+				</view>
+
+				<view class="income2">
+
+					<view class="income2-item" @click="toIncome('can')">
+						<p>总收益</p>
+						<p>{{information.showIncome?information.showIncome:'0.0'}}</p>
+					</view>
+					<!-- <view class="income2-item">
 						<view style="display: flex;align-items: center;">
-							<p>我获得的收益总数</p>
+							<p @click="toIncome('can')">总收益</p>
 							<image id="helpicon" :src="picture.icon_help" mode=""
 								style="width: 35rpx;height: 35rpx;padding-left: 10rpx;"
 								@click="showIncomeHelp = true" />
 						</view>
-						<!-- <view class="tip_box" v-if="showIncomeHelp" :style="{ top: boxTop + 'px'}"> -->
 						<view class="tip_box" v-if="showIncomeHelp">
 							<view class="container" :style="{
-						  'margin-right': cotainerMargin + 'px',
-						  backgroundColor: '#404040', borderRadius: '5px' }">
-								<!-- 提示文字 -->
+					  'margin-right': cotainerMargin + 'px',
+					  backgroundColor: '#404040', borderRadius: '5px' }">
+
 								<view class="tips">
 									<p>{{incomeHelpText}}</p>
 								</view>
@@ -61,74 +88,66 @@
 								</view>
 							</view>
 						</view>
+						<p @click="toIncome('can')">{{information.showIncome?information.showIncome:'0.0'}}</p>
+					</view> -->
+					<view class="income2-item" @click="toIncome('can')">
+						<p>可提现</p>
+						<p>{{information.showCanwithdraw?information.showCanwithdraw:'0.0'}}</p>
 					</view>
-					<view class="show-income1-left-down">
-						<p @click="toIncome('can')">
-							{{information.showIncome?information.showIncome:'0.0'}}
-						</p>
+					<view class="income2-item" @click="toIncome('ed')">
+						<p>已提现</p>
+						<p>{{information.showWithdrawed?information.showWithdrawed:'0.0'}}</p>
+					</view>
+					<view class="income2-item" @click="toIncome('ing')">
+						<p>提现中</p>
+						<p>{{information.showWithdrawing?information.showWithdrawing:'0.0'}}</p>
 					</view>
 				</view>
-				<view class="show-income1-right">
+
+				<view class="income3" @click="toPoint()">
 					<view>
-						<button class="show-income1-btn" type="default" @click="toIncome('can')">提现</button>
+						<p>创作者积分：0</p>
+					</view>
+					<view>
+						<image style="height: 20rpx;width: 20rpx;" :src="picture.icon_right"></image>
 					</view>
 				</view>
-			</view>
 
-			<view class="show-income2">
-				<view class="show-income2-text" @click="toIncome('can')">
-					<p style="padding-bottom: 20rpx;">可提现</p>
-					<p>{{information.showCanwithdraw?information.showCanwithdraw:'0.0'}}</p>
-				</view>
-				<view class="show-income2-text" @click="toIncome('ed')">
-					<p style="padding-bottom: 20rpx;">已提现</p>
-					<p>{{information.showWithdrawed?information.showWithdrawed:'0.0'}}</p>
-				</view>
-				<view class="show-income2-text" @click="toIncome('ing')">
-					<p style="padding-bottom: 20rpx;">提现中</p>
-					<p>{{information.showWithdrawing?information.showWithdrawing:'0.0'}}</p>
-				</view>
 			</view>
 
-			<view class="show-income1">
-				<view class="show-income1-left">
-					<view class="show-income1-left-up" style="margin-bottom: 10rpx;">
-						<view style="display: flex;align-items: center;">
-							<p>创作者积分</p>
-							<image id="helpicon" :src="picture.icon_help" mode=""
-								style="width: 35rpx;height: 35rpx;padding-left: 10px" @click="showPointHelp = true" />
-						</view>
-
-						<!-- <view class="tip_box" v-if="showPointHelp" :style="{ top: boxTop + 'px'}"> -->
-						<view class="tip_box" v-if="showPointHelp">
-							<view class="container" :style="{
-								  'margin-right': cotainerMargin + 'px',
-								  backgroundColor: '#404040', borderRadius: '5px' }">
-								<view class="tips">
-									<p>{{pointHelpText}}</p>
-								</view>
-								<view class="close" @click="showPointHelp = false">
-									<image class="closeImg" src="../../static/delete.png" />
-								</view>
-							</view>
-						</view>
+			<view class="show-body">
+				<view class="show-body1">
+					<view class="show-body1-text1" @click="toMySec(0)">
+						<p>带货任务</p>
 					</view>
-					<view class="show-income1-left-down">
-						<p @click="toPoint()">
-							{{information.showIncome?information.showIncome:'0'}}
-						</p>
+					<view class="show-body1-text2" @click="toMySec(0)">
+						<image class="show-body1-icon" :src="picture.icon_right"></image>
 					</view>
 				</view>
-
-				<view class="show-income1-right" @click="toPoint()">
-					<image class="show-body1-icon" :src="picture.icon_right"></image>
+				<view class="show-body2">
+					<view class="show-body2-text" @click="toMySec(0)">
+						<p class="task-num-p">{{numInfo.numAllSec}}</p>
+						<p padding>全部任务</p>
+					</view>
+					<view class="show-body2-text" @click="toMySec(1)">
+						<p class="task-num-p">{{numInfo.numApplySec}}</p>
+						<p>已报名</p>
+					</view>
+					<view class="show-body2-text" @click="toMySec(2)">
+						<p class="task-num-p">{{numInfo.numExecuteSec}}</p>
+						<p>执行中</p>
+					</view>
+					<view class="show-body2-text" @click="toMySec(3)">
+						<p class="task-num-p">{{numInfo.numEndSec}}</p>
+						<p>已结束</p>
+					</view>
 				</view>
 			</view>
 
-			<view class="show-body" style="border-bottom: 1rpx solid #c8c8c8;">
+			<view class="show-body">
 				<view class="show-body1">
 					<view class="show-body1-text1" @click="toMyTask('all')">
-						<p>我的任务</p>
+						<p>种草任务</p>
 					</view>
 					<view class="show-body1-text2" @click="toMyTask('all')">
 						<image class="show-body1-icon" :src="picture.icon_right"></image>
@@ -154,7 +173,7 @@
 				</view>
 			</view>
 
-			<view class="show-body" style="border-bottom: 1rpx solid #c8c8c8;">
+			<view class="show-body">
 				<view class="show-body1">
 					<view class="show-body1-text1" @click="toMyTeam('exe')">
 						<p>YOUNG之团</p>
@@ -182,43 +201,17 @@
 				</view>
 			</view>
 
-			<view class="show-body" style="border-bottom: 1rpx solid #c8c8c8;">
-				<view class="show-body1">
-					<view class="show-body1-text1" @click="toMySec(0)">
-						<p>选品广场</p>
-					</view>
-					<view class="show-body1-text2" @click="toMySec(0)">
-						<image class="show-body1-icon" :src="picture.icon_right"></image>
-					</view>
-				</view>
-				<view class="show-body2">
-					<view class="show-body2-text" @click="toMySec(1)">
-						<p class="task-num-p">{{numInfo.numApplySec}}</p>
-						<p padding>已报名</p>
-					</view>
-					<view class="show-body2-text" @click="toMySec(2)">
-						<p class="task-num-p">{{numInfo.numExecuteSec}}</p>
-						<p>执行中</p>
-					</view>
-					<view class="show-body2-text" @click="toMySec(3)">
-						<p class="task-num-p">{{numInfo.numEndSec}}</p>
-						<p>已结束</p>
-					</view>
-					<view class="show-body2-text">
-						<p style="color: #fff;">已结束</p>
-					</view>
-				</view>
-			</view>
 
-			<view class="show-body">
+			<view class="show-body" style="margin-top: 3%;">
 				<view class="show-body2">
 					<view class="show-body2-text" @click="handleInformation()">
-						<image class="show-info-icon" style="width: 60rpx;height: 60rpx;padding-bottom: 15rpx;"
+						<image class="show-info-icon" style="width: 50rpx;height: 50rpx;padding-bottom: 15rpx;"
 							:src="picture.icon_person"></image>
 						<p>我的信息</p>
 					</view>
 					<view class="show-body2-text" @click="handleSubmitTask()">
-						<image class="show-info-icon" :src="picture.icon_edit"></image>
+						<image class="show-info-icon" style="width: 50rpx;height: 50rpx;padding-bottom: 15rpx;"
+							:src="picture.icon_edit"></image>
 						<p>发布任务</p>
 					</view>
 					<view class="show-body2-text">
@@ -232,7 +225,6 @@
 
 			<view class="contact" @click="toggle4('center')">
 				<view class="contt">
-					<!-- <image class="img2" src="https://horastar.obs.cn-east-3.myhuaweicloud.com/talent/home2.png" mode=""></image> -->
 					<image class="img1"
 						src="https://horastar.obs.cn-east-3.myhuaweicloud.com/talent/kefu_20211124192542.png" mode="">
 					</image>
@@ -436,6 +428,7 @@
 					numExeTeam: 0,
 					numEndTeam: 0,
 
+					numAllSec: 0,
 					numApplySec: 0,
 					numExecuteSec: 0,
 					numEndSec: 0,
@@ -465,7 +458,7 @@
 				this.avatarUrl = uni.getStorageSync('avatarUrl');
 				// 获取达人基本信息
 				await this.getTalentInfo();
-				// 获取页面展示信息（任务数量、young之团数量、选品任务数量）
+				// 获取页面展示信息（任务数量、young之团数量、带货任务数量）
 				await this.getNumInfo();
 				// 获取未读消息条数
 				await this.getUnreadMessage();
@@ -510,6 +503,8 @@
 							this.numInfo.numApplySec = res.data.data.apply_sec_task_num
 							this.numInfo.numExecuteSec = res.data.data.exe_sec_task_num
 							this.numInfo.numEndSec = res.data.data.end_sec_task_num
+							this.numInfo.numAllSec = this.numInfo.numApplySec + this.numInfo.numExecuteSec + this
+								.numInfo.numEndSec
 						}
 					})
 			},
@@ -605,7 +600,7 @@
 				} else
 					this.login()
 			},
-			// 进入我的任务页面
+			// 进入种草任务页面
 			toMyTask(tab) {
 				console.log(tab)
 				if (this.token !== '') {
@@ -633,7 +628,7 @@
 				} else
 					this.login()
 			},
-			// 进入我的选品页面
+			// 进入我的带货任务页面
 			toMySec(tab) {
 				console.log("toMySec: ", tab)
 				if (this.token !== '') {
@@ -731,9 +726,9 @@
 		/* 垂直居中 */
 		align-items: center;
 		justify-content: space-between;
-		height: 200rpx;
+		// height: 200rpx;
 		position: relative;
-		margin: 2% 3% 3%;
+		margin: 0% 3%;
 	}
 
 	.head-left {
@@ -775,6 +770,42 @@
 		height: 60rpx;
 	}
 
+	.show-income {
+		height: 210rpx;
+		background-color: #F0D232;
+		border-radius: 10rpx;
+		margin: 3% 3% 0;
+		padding: 3% 6%;
+	}
+
+	.income1 {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+	}
+
+	.income2 {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		margin: 3% 0;
+
+		.income2-item {
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+		}
+	}
+
+	.income3 {
+		background-color: white;
+		border-radius: 10rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 2rpx 10rpx;
+	}
+
 	.show-income1 {
 		height: 150rpx;
 		margin: 0 3% 0 8%;
@@ -830,8 +861,8 @@
 	}
 
 	.show-body {
-		height: 250rpx;
-		margin: 0 3% 3%;
+		// height: 250rpx;
+		margin: 5% 3%;
 	}
 
 	.show-body1 {
@@ -843,7 +874,7 @@
 	.show-body1-text1 {
 		display: flex;
 		justify-content: flex-start;
-		margin-left: 40rpx;
+		// margin-left: 40rpx;
 		// margin-right: 480rpx;
 	}
 
@@ -879,7 +910,7 @@
 	}
 
 	.task-num-p {
-		padding-bottom: 40rpx;
+		padding-bottom: 10rpx;
 		font-size: 35rpx;
 		font-weight: bold;
 		color: #F0D232;
@@ -1238,4 +1269,4 @@
 		border: #000000 1rpx solid;
 		line-height: 48rpx;
 	}
-</style>
+</style>

pages/selectionsquare/selectionsquare.vue

@@ -193,7 +193,7 @@
 						},
 						/* 标题 */
 						navTitle: {
-							text: "选品广场",
+							text: "带货",
 							color: "",
 							fontSize: "32rpx", // px upx rpx
 							fontWeight: "normal", // blod

pages/tasksquare/tasksquare.vue

@@ -211,7 +211,7 @@
 						},
 						/* 标题 */
 						navTitle: {
-							text: "首页",
+							text: "种草",
 							color: "",
 							fontSize: "32rpx", // px upx rpx
 							fontWeight: "normal", // blod

pages/workspace/workspace.vue

@@ -5,17 +5,17 @@
 		<view :style="{paddingTop:navH}" style="background-color: #fff;"></view>
 		<view class="menu-head">
 			<view class="menu" style="padding-bottom: 10rpx;">
-				<view class="menu-item" @click="toShowTask()">
+				<view class="menu-item" @click="toShowSec()">
 					<view class="menu-item-p">
-						<p v-bind:class="showTask?'lor':'unlor'">任务大厅</p>
+						<p v-bind:class="showSec?'lor':'unlor'">带货</p>
 					</view>
-					<!-- <span class="point" v-if="showPoint1" key="0"></span> -->
+					<!-- <span class="point" v-if="showPoint2" key="1"></span> -->
 				</view>
-				<view class="menu-item" @click="toShowSec()">
+				<view class="menu-item" @click="toShowTask()">
 					<view class="menu-item-p">
-						<p v-bind:class="showSec?'lor':'unlor'">选品广场</p>
+						<p v-bind:class="showTask?'lor':'unlor'">种草</p>
 					</view>
-					<!-- <span class="point" v-if="showPoint2" key="1"></span> -->
+					<!-- <span class="point" v-if="showPoint1" key="0"></span> -->
 				</view>
 			</view>
 
@@ -195,9 +195,9 @@
 		</view>
 
 		<view class="home" v-if="showList[4] && !loading">
-			<view class="task" v-for="item in taskLists[4]" @click="toSecTaskDetail(item)">
+			<view class="task" v-for="item in taskLists[4]">
 				<view class="task-card">
-					<view class="task-head">
+					<view class="task-head" @click="toSecTaskDetail(item)">
 						<view class="task-head-account">
 							<image class="platform-img" :src="item.platform_icon_url"></image>
 							<p>{{item.platform_nick_name}}</p>
@@ -206,7 +206,7 @@
 							<p>{{item.task_stage_txt}}</p>
 						</view>
 					</view>
-					<view class="task-info">
+					<view class="task-info" @click="toSecTaskDetail(item)">
 						<view class="task-info-left">
 							<image class="project-img" :src="item.product_img_url"></image>
 							<view class="task-info-txt">
@@ -215,13 +215,19 @@
 								<p>预计收益：￥{{item.show_task_reward}}</p>
 							</view>
 						</view>
-						<view class="task-info-right" v-if="item.isShowModify">
+						<view class="task-info-right" v-if="item.isShowModify" @click="toSecTaskDetail(item)">
 							<image src="../../static/img/icon-edit.png" style="height: 60rpx;width: 60rpx;"></image>
 							<p style="font-size: 32rpx;color: #ffcb41;font-weight: 600">改</p>
 						</view>
 					</view>
-					<view style="text-align: right;" v-if="item.task_stage > 5">
-						<p style="display: inline-block;">实际收益：￥{{item.show_real_reward}}</p>
+					<view style="display: flex;justify-content: flex-end;margin-right: 10rpx;" >
+						<button type="default" class="but2" @click="toLogisticDetail(item.task_id)" v-if="item.task_stage > 7">
+							查看物流
+						</button>
+						<button type="default" class="but2" @click="handleCopy(item.product_url)">
+							复制带货链接
+						</button>
+						<p style="display: inline-block;" v-if="item.task_stage > 5">实际收益：￥{{item.show_real_reward}}</p>
 					</view>
 				</view>
 			</view>
@@ -246,10 +252,10 @@
 				navH: getApp().globalData.navHeight,
 				loading: true,
 				showPoint: [false, false, false, false, false],
-				showTask: true,
-				showSec: false,
+				showTask: false,
+				showSec: true,
 				showList: [
-					true, false, false, false, false
+					false, false, false, false, true
 				],
 				taskLists: [
 					[],
@@ -334,9 +340,31 @@
 				}
 			});
 			await this.getInfoList()
-			this.getTaskList(parseInt(curTab) + 1);
+
+			if (parseInt(curTab) < 4) {
+				this.getTaskList(parseInt(curTab));
+			} else {
+				this.getSecTaskList(parseInt(curTab));
+			}
 		},
 		methods: {
+			handleCopy(content) {
+				wx.setClipboardData({
+					data: content,
+					success: function(res) {
+						console.log("复制成功");
+					}
+				});
+			},
+			toLogisticDetail(secTaskId) {
+				var data = {
+					taskId: secTaskId,
+				};
+				data = JSON.stringify(data)
+				uni.navigateTo({
+					url: '/page_workspace/selection/logistics/logisticsdetail?textObj=' + encodeURIComponent(data)
+				});
+			},
 			getInfoList() {
 				return this.$http.get('/youngee/c/g/get-info-tables')
 					.then(res => {
@@ -431,6 +459,9 @@
 									taskList[i].product_img_url = productPhoto[j].PhotoUrl
 								}
 							}
+							
+							// 带货链接
+							taskList[i].product_url = product.product_url
 
 							// 待修改标识
 							if ((taskList[i].task_stage == 7 && taskList[i].script_status == 3) ||
@@ -722,4 +753,16 @@
 		background: red;
 		border-radius: 50%;
 	}
+	
+	.but2 {
+		background-color: #FFFFFF;
+		border: 1rpx solid #f2d22d;
+		border-radius: 20rpx;
+		font-size: 28rpx;
+		line-height: 180%;
+		font-weight: 500;
+		position: relative;
+		height: 80%;
+		margin: 0;
+	}
 </style>

unpackage/dist/dev/.sourcemap/mp-weixin/page_workspace/logistic/logisticsdetail.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["uni-app:///main.js"],"names":["wx","__webpack_require_UNI_MP_PLUGIN__","__webpack_require__","createPage","Page"],"mappings":";;;;;;;;;;;;;AAAA;AAGA;AACA;AAHA;AACAA,EAAE,CAACC,iCAAiC,GAAGC,mBAAmB;AAG1DC,UAAU,CAACC,wBAAI,CAAC,C","file":"page_workspace/logistic/logisticsdetail.js","sourcesContent":["import 'uni-pages';\n// @ts-ignore\nwx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;\nimport Vue from 'vue'\nimport Page from './page_workspace/logistic/logisticsdetail.vue'\ncreatePage(Page)"],"sourceRoot":""}

unpackage/dist/dev/.sourcemap/mp-weixin/page_workspace/logistics/logisticsdetail.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["uni-app:///main.js"],"names":["wx","__webpack_require_UNI_MP_PLUGIN__","__webpack_require__","createPage","Page"],"mappings":";;;;;;;;;;;;;AAAA;AAGA;AACA;AAHA;AACAA,EAAE,CAACC,iCAAiC,GAAGC,mBAAmB;AAG1DC,UAAU,CAACC,wBAAI,CAAC,C","file":"page_workspace/logistics/logisticsdetail.js","sourcesContent":["import 'uni-pages';\n// @ts-ignore\nwx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;\nimport Vue from 'vue'\nimport Page from './page_workspace/logistics/logisticsdetail.vue'\ncreatePage(Page)"],"sourceRoot":""}

unpackage/dist/dev/.sourcemap/mp-weixin/page_workspace/logisticsdetail.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["uni-app:///main.js"],"names":["wx","__webpack_require_UNI_MP_PLUGIN__","__webpack_require__","createPage","Page"],"mappings":";;;;;;;;;;;;;AAAA;AAGA;AACA;AAHA;AACAA,EAAE,CAACC,iCAAiC,GAAGC,mBAAmB;AAG1DC,UAAU,CAACC,wBAAI,CAAC,C","file":"page_workspace/logisticsdetail.js","sourcesContent":["import 'uni-pages';\n// @ts-ignore\nwx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;\nimport Vue from 'vue'\nimport Page from './page_workspace/logisticsdetail.vue'\ncreatePage(Page)"],"sourceRoot":""}