Merge branch 'feature_yf' of HolaBIP/youngee_c_web_v2 into feature_ls

App.vue

@@ -6,6 +6,7 @@
 		onLaunch: function() {
 			console.warn('当前组件仅支持 uni_modules 目录结构 ，请升级 HBuilderX 到 3.1.0 版本以上！')
 			console.log('App Launch')
+			this.autoUpdate()
 			wx.getSystemInfo({
 				success: res => {
 					this.globalData.navHeight = res.statusBarHeight + 52 + "px"; // 赋值导航高度
@@ -20,6 +21,74 @@
 		},
 		onHide: function() {
 			console.log('App Hide')
+		},
+		methods: {
+			autoUpdate: function() {
+				var self = this
+				// 获取小程序更新机制兼容
+				if (wx.canIUse('getUpdateManager')) {
+					const updateManager = wx.getUpdateManager()
+					//1. 检查小程序是否有新版本发布
+					updateManager.onCheckForUpdate(function(res) {
+						console.log("新版本检测：", res)
+						// 请求完新版本信息的回调
+						if (res.hasUpdate) {
+							//检测到新版本，需要更新，给出提示
+							wx.showModal({
+								title: '更新提示',
+								content: '检测到新版本，是否下载新版本并重启小程序？',
+								success: function(res) {
+									if (res.confirm) {
+										//2. 用户确定下载更新小程序，小程序下载及更新静默进行
+										self.downLoadAndUpdate(updateManager)
+									} else if (res.cancel) {
+										//用户点击取消按钮的处理，如果需要强制更新，则给出二次弹窗，如果不需要，则这里的代码都可以删掉了
+										wx.showModal({
+											title: '温馨提示~',
+											content: '本次版本更新涉及到新的功能添加，旧版本无法正常访问的哦~',
+											showCancel: false, //隐藏取消按钮
+											confirmText: "确定更新", //只保留确定更新按钮
+											success: function(res) {
+												if (res.confirm) {
+													//下载新版本，并重新应用
+													self.downLoadAndUpdate(
+														updateManager)
+												}
+											}
+										})
+									}
+								}
+							})
+						}
+					})
+				} else {
+					// 如果希望用户在最新版本的客户端上体验您的小程序，可以这样子提示
+					wx.showModal({
+						title: '提示',
+						content: '当前微信版本过低，无法使用该功能，请升级到最新微信版本后重试。'
+					})
+				}
+			},
+			/**
+			 * 下载小程序新版本并重启应用
+			 */
+			downLoadAndUpdate: function(updateManager) {
+				var self = this
+				wx.showLoading();
+				//静默下载更新小程序新版本
+				updateManager.onUpdateReady(function() {
+					wx.hideLoading()
+					//新的版本已经下载好，调用 applyUpdate 应用新版本并重启
+					updateManager.applyUpdate()
+				})
+				updateManager.onUpdateFailed(function() {
+					// 新的版本下载失败
+					wx.showModal({
+						title: '已经有新版本了哟~',
+						content: '新版本已经上线啦~，请您删除当前小程序，重新搜索打开哟~',
+					})
+				})
+			}
 		}
 	}
 </script>
@@ -40,6 +109,24 @@
 		/* padding-top: 23%; */
 	}
 
+	/deep/ textarea {
+		width: auto;
+	}
+
+	/deep/ .uni-forms-item__content {
+		display: flex !important;
+		align-items: center !important;
+		/* justify-content: space-between; */
+	}
+
+	p {
+		word-break: break-all;
+	}
+
+	text {
+		word-break: break-all;
+	}
+
 	/deep/ textarea{
 		width: auto;
 	}
@@ -70,4 +157,4 @@
 	/deep/ .share1 .uni-popup .uni-popup__wrapper{
 				 width: 85% !important;
 	} */
-</style>
+</style>

pages/tasksquare/tasksquare.vue

@@ -83,6 +83,7 @@
 						<image :src="item.img" mode="scaleToFill" style="width: 100%;height: 100%;"></image>
 					</swiper-item>
 
+
 				</swiper>
 			</view>
 
@@ -128,20 +129,29 @@
 			</view>
 		</view>
 		<!-- 普通弹窗  公众号-->
-		<uni-popup ref="popup4" class="share" background-color="#fff" @change="change">
+		<uni-popup ref="popup4" class="share" background-color="#fff" @change="change" :maskClick="false">
 			<view class="popup-content" :class="{ 'popup-height': type === 'left' || type === 'right' }">
 				<view class="sharepage">
 					<view class="projecttext1">
-						<image src="https://horastar.obs.cn-east-3.myhuaweicloud.com/talent/project15.png"
-							style="width: 80rpx; height: 80rpx;" mode=""></image>
-						<span>YoungGee</span>
-					</view>
-					<view class="" style="margin-top: 5%;">
-						<p style='color: #333333;font-size: 28rpx;text-align: center;'>扫码联系</p>
+						<image src="https://horastar.obs.cn-east-3.myhuaweicloud.com/talent/younggee_logo.png"
+							style="width: 250rpx; height: 80rpx;" mode=""></image>
+						<!-- <span>YoungGee</span> -->
 					</view>
 					<view class="sharemap">
-						<image src="https://horastar.obs.cn-east-3.myhuaweicloud.com/talent/kefu.png"
-							style="width: 400rpx;height: 400rpx;" mode=""></image>
+						<image :src="kefuUrl" style="width: 400rpx;height: 400rpx;" mode=""></image>
+					</view>
+					<view style="margin: 30rpx 0;">
+						<button class="butmin1" size="mini" @tap="saveImage">保存二维码</button>
+					</view>
+					<view class="sharetxt">
+						<text>
+							使用样叽的过程中，有任何疑问，\n
+							请添加上方微信。\n
+							我们保证及时全力为您解决！
+						</text>
+					</view>
+					<view style="margin: 30rpx 0;">
+						<button class="butmin" size="mini" @tap="closepop">知道了</button>
 					</view>
 				</view>
 
@@ -162,6 +172,11 @@
 <script>
 	import aTip from "@/components/mys-tip_1.0.01/a_tip/aTip";
 	import request from '@/components/request.js';
+	import {
+		saveImageToPhotosAlbum,
+		showToast,
+		downloadFile
+	} from '@/uni_modules/sakura-canvas/js_sdk/util'
 	/* 默认首页路径 */
 	const homePath = "/pages/pupu/pupudao";
 	/* 默认首页图标路径 */
@@ -237,6 +252,7 @@
 		},
 		data() {
 			return {
+				kefuUrl: "https://horastar.obs.cn-east-3.myhuaweicloud.com/talent/kefu.jpeg",
 				navH: getApp().globalData.navHeight,
 				token: '',
 				per: 0,
@@ -257,11 +273,17 @@
 						name: '/pages/tasksquare/cooperation'
 						// name: 'http://www.baidu.com/'
 					},
+					{
+						img: 'https://horastar.obs.cn-east-3.myhuaweicloud.com/talent_upload/guanwang.png',
+						name: '/pages/tasksquare/guanwang'
+						// name: 'http://www.baidu.com/'
+					},
 					{
 						img: 'https://horastar.obs.cn-east-3.myhuaweicloud.com/talent_upload/guanwang.png',
 						name: '/pages/tasksquare/guanwang'
 					}
 				],
+
 			
 				//弹窗
 				type: 'center',
@@ -605,6 +627,7 @@
 					url: item.name
 				});
 			},
+
 	
 			//弹出层
 			change(e) {
@@ -649,6 +672,39 @@
 				this.$refs.popup4.open(type)
 				// this.$refs.popup1.close()
 			},
+			// 保存图片
+			async saveImage() {
+				// let res = await saveImageToPhotosAlbum(this.kefuUrl)
+				// if (!res.success) {
+				// 	console.log(res)
+				// 	return
+				// }
+				// showToast('保存成功')
+				wx.downloadFile({
+					url: this.kefuUrl,
+					success: function(res) {
+						wx.saveImageToPhotosAlbum({
+							filePath: res.tempFilePath,
+							success: function(data) {
+								wx.showToast({
+									title: "保存成功",
+									icon: "success",
+									duration: 2000
+								})
+							},
+							fail: function(err) {
+								console.log(err);
+							},
+							complete(res) {
+								console.log(res);
+							}
+						})
+					}
+				})
+			},
+			closepop() {
+				this.$refs.popup4.close()
+			},
 			xieyi() {
 				console.log('进入联系我们')
 			},
@@ -664,21 +720,25 @@
 					pages === 1 ? (this.isHome = true) : (this.isHome = false);
 				}
 				// 开启渐变 强制fixed
-				this.navBarTop = uni.getSystemInfoSync().statusBarHeight + "px";
+				this.navBarTop = uni.getSystemInfoSync().statusBarHeight +
+					"px";
 				if (!this.mysNavConfig.opacity) {
 					this.opacity = 1;
-					!this.mysNavConfig.isOpacity ? (this.opacity = 1) : ((this.mysNavConfig.navFixed = true), (this
+					!this.mysNavConfig.isOpacity ? (this.opacity = 1) : ((this
+						.mysNavConfig.navFixed = true), (this
 						.opacity = 0));
 				} else {
 					this.opacity = this.mysNavConfig.opacity;
-					!this.mysNavConfig.isOpacity ? "" : ((this.mysNavConfig.navFixed = true), (this.opacity = 0));
+					!this.mysNavConfig.isOpacity ? "" : ((this.mysNavConfig
+						.navFixed = true), (this.opacity = 0));
 				}
 
 				// #ifdef MP
 				this.initMP();
 				// #endif
 				// #ifdef APP-PLUS-NVUE
-				this.navBarHeight = 44 + uni.getSystemInfoSync().statusBarHeight + "px";
+				this.navBarHeight = 44 + uni.getSystemInfoSync()
+					.statusBarHeight + "px";
 				// #endif
 			},
 			/* 小程序初始化位置 */
@@ -696,8 +756,10 @@
 				this.inputHeight = rectHeight - 3 + "px";
 				this.navBarTop = rect.top + "px";
 				this.navBarLeft = gS.screenWidth - rect.right + "px";
-				this.navBarRight = gS.screenWidth - rect.right + rect.width + "px";
-				this.navBarHeight = gS.statusBarHeight + rectHeight + (rect.top - gS.statusBarHeight) * 2 + "px";
+				this.navBarRight = gS.screenWidth - rect.right + rect.width +
+					"px";
+				this.navBarHeight = gS.statusBarHeight + rectHeight + (rect
+					.top - gS.statusBarHeight) * 2 + "px";
 			},
 			/* 点击左侧 */
 			onLeftClick() {
@@ -713,11 +775,13 @@
 				console.log(item.project_id)
 				if (item.project_type === 1) {
 					uni.navigateTo({
-						url: '/pages/tasksquare/taskdetail?id=' + item.project_id
+						url: '/pages/tasksquare/taskdetail?id=' + item
+							.project_id
 					});
 				} else {
 					uni.navigateTo({
-						url: '/pages/tasksquare/specialTask/specialTaskDetail?id=' + item.project_id
+						url: '/pages/tasksquare/specialTask/specialTaskDetail?id=' +
+							item.project_id
 					});
 				}
 				// }
@@ -786,7 +850,7 @@
 </script>
 <style>
 	/deep/ .share .uni-popup .uni-popup__wrapper {
-		width: 70% !important;
+		width: 80% !important;
 		border-radius: 15rpx !important;
 	}
 </style>
@@ -811,7 +875,7 @@
 
 	//弹窗
 	.sharepage {
-		width: 90%;
+		// width: 90%;
 		margin: 0 auto;
 		// position: relative;
 	}
@@ -826,18 +890,10 @@
 		// padding-top: 5%;
 		padding: 0 0 0 1%;
 		height: 80rpx;
-		margin-top: 7%;
+		margin: 5% 0;
 		text-align: center;
 	}
 
-	.projecttext1 span {
-		color: #333333;
-		font-size: 100%;
-		font-weight: 550;
-		text-indent: 2em;
-
-	}
-
 	.projecttext1 image {
 		vertical-align: middle;
 		width: 80rpx;
@@ -849,8 +905,8 @@
 	.sharemap {
 		margin: 0 auto;
 		text-align: center;
-		margin-top: 15%;
-		margin-bottom: 15%;
+		// margin-top: 15%;
+		// margin-bottom: 15%;
 	}
 
 	.sharemap image {
@@ -859,10 +915,32 @@
 
 	}
 
+	.sharetxt {
+		height: 100rpx;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.sharetxt text {
+		font-size: 24rpx;
+		text-align: left;
+		line-height: 20rpx
+	}
+
 	.butmin {
-		height: 48rpx;
-		background-color: #3397FA;
-		color: #FFFFFF;
+		// height: 48rpx;
+		width: 250rpx;
+		background-color: #FCCF41;
+		line-height: 48rpx;
+	}
+
+	.butmin1 {
+		// height: 48rpx;
+		width: 250rpx;
+		background-color: #fff;
+		border: #000000 1rpx solid;
 		line-height: 48rpx;
 	}
 
@@ -1206,9 +1284,9 @@
 	}
 
 	.share p {
-		display: inline-block;
+		// display: inline-block;
 		font-size: 24rpx;
-		color: #333333;
+		// color: #333333;
 	}
 
 	.project {