Merge remote-tracking branch 'origin/master'

asd-wx/common/utils/config.js

@@ -2,8 +2,8 @@
 // const baseUrl = "https://www.jieyi-autism.com/asdProject"
  //const baseUrl = "https://www.jieyi-autism.com/asdProject"
 //const baseUrl = "http://192.168.31.25:8082/asdProject"
-// const baseUrl = "https://www.jieyi-autism.com/asdProject"
+const baseUrl = "https://www.jieyi-autism.com/asdProject"
-const baseUrl = "http://127.0.0.1:8082/asdProject"
+//const baseUrl = "http://127.0.0.1:8082/asdProject"
 // const baseUrl = "https://localhost/asdProject"
 // const baseUrl = "https://43.140.199.34/jeecg-boot"
 // const baseUrl = "http://43.140.199.34:8080/jeecg-boot"

asd-wx/pages/tabbar/home/Home.vue

@@ -136,6 +136,44 @@
 			this.getArticleList();
 			this.getTableList();
 		},
+		onShareAppMessage: function() { // 分享到微信
+					// 更多参数配置，参考文档
+					return {
+						title: '孑医测评',
+						path: '/pages/tabbar/home/Home'
+					}
+		},
+		
+		onShareTimeline() { // 分享到朋友圈
+			return {
+				title: '孑医测评',
+				path: '/pages/tabbar/home/Home'
+			}
+		},
+		onShare() {
+			wx.showShareMenu({
+				withShareTicket: true,
+				success: function() {
+					console.log('成功开启分享菜单')
+				},
+				fail: function(res) {
+					console.log('开启分享菜单失败', res)
+				}
+			})
+
+			wx.onShareAppMessage(function() {
+				return {
+					title: '孑医测评',
+					path: '/pages/tabbar/home/Home',
+					success: function(res) {
+						console.log('分享成功', res)
+					},
+					fail: function(res) {
+						console.log('分享失败', res)
+					}
+				}
+			})
+		},
 		methods: {
 			// 用户拒绝授权的展示
 			showRefuseLocationPermission() {

asd-wx/util/config.js

@@ -1,7 +1,7 @@
 // const baseUrl = "http://localhost:8080/asdProject"
 
-//const baseUrl = "https://www.jieyi-autism.com/asdProject"
+const baseUrl = "https://www.jieyi-autism.com/asdProject"
-const baseUrl = "http://127.0.0.1:8082/asdProject"
+//const baseUrl = "http://127.0.0.1:8082/asdProject"
 export {
 	baseUrl
 }