Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-app

config/index.js

@@ -1,8 +1,8 @@
 const dev = {
 	baseUrl: 'https://www.zthymaoyi.com',
 	// baseUrlNew: 'http://api1.eliangeyun.com/',
-	baseUrlNew: 'http://192.168.1.117:8090/',
-	// baseUrlNew: 'http://192.168.1.119:9100/',
+	// baseUrlNew: 'http://192.168.1.117:8090/',
+	baseUrlNew: 'http://192.168.1.119:9100/',
 	// baseUrlNew: 'http://api1.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false

pages/task/my_task.vue

@@ -80,6 +80,13 @@
 				copyTaskInfo: []
 			};
 		},
+		onBackPress(e) {
+			if (uni.getStorageSync("everyTask")) {
+				uni.switchTab({
+				    url: '/pages/user/user'
+				});
+			}
+		},
 		watch: {
 			checked(val) {
 				uni.setStorageSync("everyTask", this.checked)