保留支付账号版本

components/request.js

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

components/requesttoken111.js

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

pages/mycenter/mycenter.vue

@@ -194,6 +194,9 @@
 			</uni-popup>
 		</view>
 
+		<!-- <view class="" style="text-align: center;margin: 5% 0;">
+			<button size="mini" @tap="toSpecialTask()">专项测试</button>
+		</view> -->
 		<!-- </view> -->
 	</view>
 </template>
@@ -297,7 +300,9 @@
 					})
 				await this.$https.get('/youngee/c/t/g/has-un-read-message')
 					.then(res => {
-						this.hasUnReadMessage = res.data.data === 0 ? false : true;
+						if (res.data.code === 0) {
+							this.hasUnReadMessage = res.data.data === 0 ? false : true;
+						}
 					})
 			} else { // 未登录
 				// this.login();
@@ -306,6 +311,11 @@
 		},
 		onLoad() {},
 		methods: {
+			toSpecialTask() {				
+				uni.navigateTo({
+					url: '/pages/tasksquare/specialTask/specialTaskDetail?id=' + "2301618427"
+				});
+			},
 			init() {
 				let rect = uni.getMenuButtonBoundingClientRect();
 				let screenWidth = uni.getSystemInfoSync().screenWidth;

pages/mycenter/myincome/applywithdraw.vue

@@ -69,6 +69,10 @@
 			<button type="default" class="btn1" @click="withdraw()">
 				确认提现</button>
 		</view>
+		<view style="margin: 30rpx;padding: 30rpx 10rpx;background-color: #eaeaea;border-radius: 5rpx;">
+			<p style="color: #878994;">样叽严格按照《用户协议》及《隐私政策;</p>
+			<p style="color: #878994;">用户输入的银行卡号和支付宝账号信息仅在用户提现时使用。</p>
+		</view>
 	</view>
 </template>
 

pages/mycenter/myinformation/mybank.vue

@@ -47,6 +47,11 @@
 			<view>
 				<button class="btn1" @click="submitForm()">保存</button>
 			</view>
+			<view style="margin: 30rpx;padding: 30rpx 10rpx;background-color: #eaeaea;border-radius: 5rpx;">
+				<p style="color: #878994;">样叽严格按照《用户协议》及《隐私政策;</p>
+				<p style="color: #878994;">用户输入的银行卡号和支付宝账号信息仅在用户提现时使用。</p>
+			</view>
+
 		</view>
 
 

pages/mycenter/myinformation/myzhifubao.vue

@@ -29,6 +29,10 @@
 			<view>
 				<button class="btn1" @click="submitForm()">保存</button>
 			</view>
+			<view style="margin: 30rpx;padding: 30rpx 10rpx;background-color: #eaeaea;border-radius: 5rpx;">
+				<p style="color: #878994;">样叽严格按照《用户协议》及《隐私政策;</p>
+				<p style="color: #878994;">用户输入的银行卡号和支付宝账号信息仅在用户提现时使用。</p>
+			</view>
 		</view>
 
 
@@ -54,7 +58,7 @@
 					bank_card_id: '',
 					alipay_number: '',
 					alipay_real_name: '',
-					alipay_card_id: '',					
+					alipay_card_id: '',
 				},
 				oldRegion: region,
 				region: [
@@ -160,7 +164,7 @@
 				} else if (this.formData.alipay_real_name == "") {
 					f2 = false;
 					message2 = "请输入正确的姓名"
-				}else if (this.formData.alipay_card_id.length != 18) {
+				} else if (this.formData.alipay_card_id.length != 18) {
 					f2 = false;
 					message2 = "请输入正确的身份证号"
 				};

pages/tasksquare/specialTask/information.vue

@@ -57,7 +57,7 @@
 			</view>
 			<view class="account_fans">
 				<p style="padding-right: 20rpx;color:#A8A8A8;">粉丝数</p>
-				<p>{{account.fans_count}}</p>
+				<p>{{account.show_fans_count}}</p>
 			</view>
 			<view class="account_btn" @click="editAccount(item)">
 				<image :src="picture.togoimg" mode="" style="width: 16rpx;height: 30rpx;"></image>
@@ -73,6 +73,9 @@
 
 <script>
 	import mvBar from "@/components/mys_navBar/mysNavBar";
+	import {
+		fansview
+	} from '@/components/utils.js';
 	export default {
 		components: {
 			mvBar
@@ -144,6 +147,7 @@
 									this.account = account[i]
 								}
 							}
+							this.account.show_fans_count = fansview(this.account.fans_count)
 						}
 					})
 			},
@@ -168,31 +172,14 @@
 			// 提交确认报名
 			submit() {
 				console.log(this.project)
-				
-				// 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 => {
-					if (res.data.code == 0) {
-						var data = {
-							task_id: res.data.data
-						};
-						data = JSON.stringify(data)
-						uni.navigateTo({
-							url: '/pages/tasksquare/success?textObj=' + encodeURIComponent(data)
-						});
-					}
-				})
-				
+
 				// 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) {
 						var data = {
 							task_id: res.data.data

pages/tasksquare/specialTask/specialTaskDetail.vue

@@ -148,7 +148,7 @@
 					<image :src="canvasUrl" mode="widthFix" style="width: 300px;height: 400px;margin-top: 30rpx;">
 					</image>
 					<mosoweCanvas ref="mosoweCanvasComponents" @canvasImage="_canvasImage" :lists="lists" height="400"
-						width="300" />
+						width="300" imgType="png" />
 
 					<view class="" style="text-align: center;margin: 5% 0;">
 						<button class="butmin" size="mini" @tap="saveImage">保存</button>
@@ -199,6 +199,7 @@
 				posterImg: '',
 				canvasId: 'myCanvas',
 				img: '',
+				younggee_logo: "https://horastar.obs.cn-east-3.myhuaweicloud.com/talent/younggee_logo.png",
 				task_type_info: ["实体商品寄拍", "虚拟产品测评", "线下探店打卡", "素材微原创"],
 				talent_type_info: ["美妆", "美食", "生活", "时尚", "测评", "旅行", "汽车", "萌宠", "游戏", "音乐", "舞蹈", "房产", "情感", "三农",
 					"园艺", "随拍", "图文控", "二次元", "母婴亲子", "颜值达人", "剧情搞笑", "运动健身", "家居家装", "科技数码", "教育培训", "才艺技能", "艺术文化",
@@ -409,17 +410,6 @@
 							x: 10,
 							y: 320,
 						},
-						// 文案1
-						{
-							type: 'text',
-							content: "招募人数：" + this.information.taskNum,
-							color: '#333333',
-							size: 10,
-							width: 60,
-							height: 10,
-							x: 10,
-							y: 340,
-						},
 						// 文案2
 						{
 							type: 'text',
@@ -428,7 +418,7 @@
 							size: 10,
 							width: 60,
 							height: 10,
-							x: 80,
+							x: 10,
 							y: 340,
 						},
 						// logo
@@ -489,17 +479,36 @@
 		},
 		onLoad(options) {
 			getRouter();
-			if (options.q) {
-				let queryAll = decodeURIComponent(options.q);
-				this.projectid = getQueryString(queryAll, 'id')
-			} else {
-				this.projectid = options.id
+			// if (options.q) {
+			// 	let queryAll = decodeURIComponent(options.q);
+			// 	this.projectid = getQueryString(queryAll, 'id')
+			// } else {
+			// 	this.projectid = options.id
+			// }
+			console.log(options)
+			this.projectid = options.id
+			const scene = decodeURIComponent(options.scene);
+			if (scene != "undefined") {
+				this.projectid = scene;
 			}
 			this.share.path = 'https://younggee.com/wxapp/specialtaskdetail?action=taskdetail&id=' + this.projectid
+			this.postlist()
 		},
 		onReady() { // 注意：想要拿到元素实例，需要在实例已经挂载到页面上才可以
 		},
 		methods: {
+			postlist() {
+				this.$https.post('/youngee/c/p/get-qrcode', {
+						scene: this.projectid,
+						page: 'pages/tasksquare/specialTask/specialTaskDetail',
+						// scene: this.taskid,
+						// page: 'pages/task/taskdetails',
+					})
+					.then(res => {
+						console.log(res)
+						this.head = 'data:image/png;base64,' + res.data.data;
+					})
+			},
 			// 判断登陆是否过期
 			isLogin() {
 				return this.$https.get('/youngee/c/t/g/is-login')
@@ -906,10 +915,11 @@
 	}
 
 	.butmin {
-		height: 48rpx;
-		background-color: #3397FA;
-		color: #FFFFFF;
-		line-height: 48rpx;
+		width: 30%;
+		background-color: #f2d22d;
+		border-radius: 20rpx;
+		font-size: 36rpx;
+		line-height: 2;
 	}
 
 	//视频轮播

pages/tasksquare/taskdetail.vue

@@ -583,18 +583,18 @@
 		},
 		onLoad(options) {
 			getRouter();
-			if (options.q) {
-				let queryAll = decodeURIComponent(options.q);
-				this.projectid = getQueryString(queryAll, 'id')
-			} else {
-				this.projectid = options.id
-			}
-			// console.log(options)
-			// this.projectid = options.id
-			// const scene = decodeURIComponent(options.scene);
-			// if (scene != "undefined") {
-			// 	this.projectid = scene;
+			// if (options.q) {
+			// 	let queryAll = decodeURIComponent(options.q);
+			// 	this.projectid = getQueryString(queryAll, 'id')
+			// } else {
+			// 	this.projectid = options.id
 			// }
+			console.log(options)
+			this.projectid = options.id
+			const scene = decodeURIComponent(options.scene);
+			if (scene != "undefined") {
+				this.projectid = scene;
+			}
 			this.share.path = 'https://younggee.com/wxapp/taskdetail?action=taskdetail&id=' + this.projectid
 			console.log("share path: ", this.share.path)
 			this.postlist()
@@ -605,10 +605,10 @@
 		methods: {
 			postlist() {
 				this.$https.post('/youngee/c/p/get-qrcode', {
-						// scene: this.projectid,
-						// page: 'pages/tasksquare/taskdetail',
-						scene: this.taskid,
-						page: 'pages/task/taskdetails',
+						scene: this.projectid,
+						page: 'pages/tasksquare/taskdetail',
+						// scene: this.taskid,
+						// page: 'pages/task/taskdetails',
 					})
 					.then(res => {
 						console.log(res)

pages/workspace/taskdetail.vue

@@ -23,12 +23,16 @@
 				</view>
 			</view>
 
-			<view style="display: flex;justify-content: center;align-items: center;" v-if="isShowUpload && !isSpecial">
+			<view style="display: flex;justify-content: center;align-items: center;" v-if="isShowUpload && !isSpecial && !isTimeOut">
 				<image style="height: 60rpx;width: 60rpx;" src="../../static/img/icon-time.png"></image>
-				<p style="font-size: 30rpx;color: #f2d241;" v-if="!isTimeOut">剩余时间：{{timeLeft}}</p>
-				<p style="font-size: 30rpx;color: #f2d241;" v-if="isTimeOut">超时：{{timeLeft}}</p>
+				<p style="font-size: 30rpx;color: #f2d241;">剩余时间：{{timeLeft}}</p>
 			</view>
 
+			<view style="display: flex;justify-content: center;align-items: center;" v-if="isShowUpload && !isSpecial && isTimeOut">
+				<image style="height: 60rpx;width: 60rpx;" src="../../static/img/icon-time2.png"></image>
+				<p style="font-size: 30rpx;color: ##f70c0c;">超时：{{timeLeft}}</p>
+			</view>
+			
 			<view class="address" v-if="!isSpecial">
 				<view class="address_icon">
 					<image style="width: 50rpx;height: 50rpx;" :src="picture.icon_loc" mode="">
@@ -429,7 +433,7 @@
 				switch (this.task.task_stage) {
 					case 7:
 						// 首次提交
-						if (this.task.script_status === 1) {
+						if (this.task.script_status === 1 || this.task.script_status === 2) {
 							let logistics = null;
 							await this.$https.get('/youngee/c/t/g/get-task-logistics-info' +
 								"?" +
@@ -439,7 +443,7 @@
 							).then(res => {
 								logistics = res.data.data
 							})
-							if (logistics.auto_script_break_at !== "") {
+							if (logistics.auto_script_break_at !== null && logistics.auto_script_break_at !== "") {
 								this.timeLeft = this.thistime(logistics.auto_script_break_at)
 							} else {
 								// 为脚本违约限制时间赋值并返回
@@ -450,7 +454,7 @@
 									this.timeLeft = this.thistime(res.data.data)
 								})
 							}
-						} else {
+						} else if (this.task.script_status === 3 || this.task.script_status === 4) {
 							let scriptList = null;
 							let script = null;
 							await this.$https.get('/youngee/c/t/g/get-task-script' +
@@ -466,7 +470,7 @@
 										}
 									}
 								})
-							if (script.auto_script_break_at !== "") {
+							if (script.auto_script_break_at !== null && script.auto_script_break_at !== "") {
 								this.timeLeft = this.thistime(script.auto_script_break_at)
 							} else {
 								// 为脚本违约限制时间赋值并返回
@@ -482,7 +486,7 @@
 						break;
 					case 9:
 						// 首次提交
-						if (this.task.sketch_status === 1) {
+						if (this.task.sketch_status === 1 || this.task.sketch_status === 2) {
 							if (this.project.content_type === 1) {
 								let logistics = null;
 								await this.$https.get('/youngee/c/t/g/get-task-logistics-info' +
@@ -493,7 +497,7 @@
 								).then(res => {
 									logistics = res.data.data
 								})
-								if (logistics.auto_sketch_break_at !== "") {
+								if (logistics.auto_sketch_break_at !== null && logistics.auto_sketch_break_at !== "") {
 									this.timeLeft = this.thistime(logistics.auto_sketch_break_at)
 								} else {
 									// 为初稿违约限制时间赋值并返回
@@ -517,7 +521,7 @@
 									})
 								for (let i = 0; i < scriptList.length; ++i) {
 									if (scriptList[i].is_ok === 1) {
-										if (scriptList[i].auto_sketch_break_at !== "") {
+										if (scriptList[i].auto_sketch_break_at !== null && scriptList[i].auto_sketch_break_at !== "") {
 											this.timeLeft = this.thistime(scriptList[i].auto_sketch_break_at)
 										} else {
 											// 为初稿违约限制时间赋值并返回
@@ -531,7 +535,7 @@
 									}
 								}
 							}
-						} else { //修改
+						} else if (this.task.sketch_status === 3 || this.task.sketch_status === 4){ //修改
 							let sketchList = null;
 							let sketch = null;
 							await this.$https.get('/youngee/c/t/g/get-task-sketch' +
@@ -547,7 +551,7 @@
 										}
 									}
 								})
-							if (sketch.auto_sketch_break_at !== "") {
+							if (sketch.auto_sketch_break_at !== null && sketch.auto_sketch_break_at !== "") {
 								this.timeLeft = this.thistime(sketch.auto_sketch_break_at)
 							} else {
 								// 为脚本违约限制时间赋值并返回
@@ -564,7 +568,7 @@
 						break;
 					case 11:
 						// 首次提交
-						if (this.task.link_status === 1) {
+						if (this.task.link_status === 1 || this.task.link_status === 2) {
 							let sketchList = null;
 							await this.$https.get('/youngee/c/t/g/get-task-sketch' +
 									"?" +
@@ -576,7 +580,7 @@
 								})
 							for (let i = 0; i < sketchList.length; ++i) {
 								if (sketchList[i].is_ok === 1) {
-									if (sketchList[i].auto_link_break_at !== "") {
+									if (sketchList[i].auto_link_break_at !== null && sketchList[i].auto_link_break_at !== "") {
 										this.timeLeft = this.thistime(sketchList[i].auto_link_break_at)
 									} else {
 										// 为链接违约限制时间赋值并返回
@@ -589,7 +593,7 @@
 									}
 								}
 							}
-						} else {
+						} else if(this.task.link_status === 3 || this.task.link_status === 4){
 							let linkList = null;
 							let link = null;
 							await this.$https.get('/youngee/c/t/g/get-task-link' +
@@ -605,7 +609,7 @@
 										}
 									}
 								})
-							if (link.auto_link_break_at !== "") {
+							if (link.auto_link_break_at !== null && link.auto_link_break_at !== "") {
 								this.timeLeft = this.thistime(link.auto_link_break_at)
 							} else {
 								// 为脚本违约限制时间赋值并返回
@@ -621,7 +625,7 @@
 						break;
 					case 13:
 						// 首次提交
-						if (this.task.data_status === 1) {
+						if (this.task.data_status === 1 || this.task.data_status === 2) {
 							let linkList = null;
 							await this.$https.get('/youngee/c/t/g/get-task-link' +
 									"?" +
@@ -634,7 +638,7 @@
 
 							for (let i = 0; i < linkList.length; ++i) {
 								if (linkList[i].is_ok === 1) {
-									if (linkList[i].auto_data_break_at !== "") {
+									if (linkList[i].auto_data_break_at !== null && linkList[i].auto_data_break_at !== "") {
 										this.timeLeft = this.thistime(linkList[i].auto_data_break_at)
 									} else {
 										// 为数据违约限制时间赋值并返回
@@ -647,7 +651,7 @@
 									}
 								}
 							}
-						} else {
+						} else if (this.task.data_status === 3 || this.task.data_status === 4){
 							let dataList = null;
 							let data = null;
 							await this.$https.get('/youngee/c/t/g/get-task-data' +
@@ -663,7 +667,7 @@
 										}
 									}
 								})
-							if (data.auto_data_break_at !== "") {
+							if (data.auto_data_break_at !== null && data.auto_data_break_at !== "") {
 								this.timeLeft = this.thistime(data.auto_data_break_at)
 							} else {
 								// 为脚本违约限制时间赋值并返回