Merge branch 'master' of http://git.zthymaoyi.com/zyw/tourism

uni_applet/js_sdk/share.js

@@ -14,7 +14,7 @@ export default {
 		console.log(1111)
 		let that = this;
 		// let imageUrl = that.shareUrl || '';
-		let imageUrl = 'https://taohaoliang.oss-cn-beijing.aliyuncs.com/pcfiles/min1.png'
+		// let imageUrl = 'https://taohaoliang.oss-cn-beijing.aliyuncs.com/pcfiles/min1.png'
 		if (res.from === 'button') {
 			console.log(2222)
 		//这块需要传参，不然链接地址进去获取不到数据
@@ -23,16 +23,16 @@ export default {
 			return {
 				title: '商品分享~',
 				path: path,
-				imageUrl: imageUrl,
+				// imageUrl: imageUrl,
 				content:'这里是分享内容啊！',
 				desc:"这里是自定义描述啊！"
 			};
 		}
 		if (res.from === 'menu') {
 			return {
-				title: '商通线上商城',
-				path: '/pages/tabBarPro/index/index',
-				imageUrl: imageUrl
+				title: '鲅鱼圈专属旅游平台~',
+				path: '/pages/food/food',
+				// imageUrl: imageUrl
 			};
 		}
 	},