取消用户信息授权

components/header/head.vue

@@ -69,7 +69,10 @@
 			handleBluetoothClick() {
 				let that = this
 				if (!that.token) {
-                    that.$store.commit("changeUserLogin", true)
+					uni.redirectTo({
+						url: '/pageTwo/login/login'
+					})
+					// that.$store.commit("changeUserLogin", true)
 					return
 				}
 				uni.openBluetoothAdapter({
@@ -92,7 +95,10 @@
 			},
 			// 登录
 			handleLogin() {
-                this.$store.commit("changeUserLogin", true);
+				uni.redirectTo({
+					url: '/pageTwo/login/login'
+				})
+				// that.$store.commit("changeUserLogin", true)
 			},
 			handleDrawer() {
 				this.$store.commit("changeDrawe", true);

components/ren-calendar/ren-calendar.vue

@@ -265,7 +265,10 @@
             changeMonth(type) {
                 let that = this
                 if (!uni.getStorageSync('token')) {
-                    this.$store.commit("changeUserLogin", true);
+                    uni.redirectTo({
+                    	url: '/pageTwo/login/login'
+                    })
+                    // that.$store.commit("changeUserLogin", true)
                     return
                 }
                 if (type == 'pre') {

components/userLogin.vue

@@ -41,7 +41,10 @@
     },
     methods: {
       onTap() {
-        this.$store.commit("changeUserLogin", false);
+        uni.redirectTo({
+        	url: '/pageTwo/login/login'
+        })
+        // that.$store.commit("changeUserLogin", true)
       },
       getUserInfo() {
         let that = this

pageTwo/login/login.vue

@@ -110,8 +110,8 @@
 					phone: that.phone,
 					tenantId: uni.getStorageSync('tenantid'),
 					sessionId: uni.getStorageSync('sessionid'),
-					name: that.infoRes.name,
+					name: "",
-					headImg: that.infoRes.headimg,
+					headImg: "",
 					code: that.code,
 					isvrcode: true,
 				}).then(res => {

pages/compk/compk.vue

@@ -142,7 +142,10 @@
       handlePK() {
         let that = this
         if (!uni.getStorageSync('token')) {
-          this.$store.commit("changeUserLogin", true);
+          uni.redirectTo({
+          	url: '/pageTwo/login/login'
+          })
+          // that.$store.commit("changeUserLogin", true)
           return
         }
         if (that.isActive.length != 2) {

pages/index/active.vue

@@ -110,7 +110,10 @@
 				let that = this
 				that.devices = []
 				if (!that.token) {
-					that.$store.commit("changeUserLogin", true)
+					uni.redirectTo({
+						url: '/pageTwo/login/login?url=active' + '&code=' + that.code
+					})
+					// that.$store.commit("changeUserLogin", true)
 					return
 				}
 				uni.openBluetoothAdapter({

pages/index/index.vue

@@ -373,7 +373,10 @@
       handleBluetoothClick() {
         let that = this
         if (!that.token) {
-          that.$store.commit("changeUserLogin", true)
+         uni.redirectTo({
+         	url: '/pageTwo/login/login'
+         })
+         // that.$store.commit("changeUserLogin", true)
           return
         }
         uni.openBluetoothAdapter({
@@ -416,7 +419,10 @@
       clickTool(ind) {
         let that = this
         if (!that.token) {
-          that.$store.commit("changeUserLogin", true);
+          uni.redirectTo({
+          	url: '/pageTwo/login/login'
+          })
+          // that.$store.commit("changeUserLogin", true)
           return
         }
         if (ind == 0) {
@@ -472,7 +478,10 @@
       },
       // 登录
       handleLogin() {
-        this.$store.commit("changeUserLogin", true);
+        uni.redirectTo({
+        	url: '/pageTwo/login/login'
+        })
+        // that.$store.commit("changeUserLogin", true)
       },
       handleDrawer() {
         this.$store.commit("changeDrawe", true);

pages/me/me.vue

@@ -137,7 +137,10 @@
     methods: {
       handleLogin() {
         if (!uni.getStorageSync('token')) {
-          this.$store.commit("changeUserLogin", true);
+          uni.redirectTo({
+          	url: '/pageTwo/login/login'
+          })
+          // that.$store.commit("changeUserLogin", true)
           return
         }
       },
@@ -170,7 +173,10 @@
       handleClick(ind) {
         let that = this
         if (!uni.getStorageSync('token')) {
-          this.$store.commit("changeUserLogin", true);
+          uni.redirectTo({
+          	url: '/pageTwo/login/login'
+          })
+          // that.$store.commit("changeUserLogin", true)
           return
         }
         if (ind == 'adult' && that.configBox.referappid) {
@@ -193,7 +199,10 @@
       },
       navTo(url) {
         if (!uni.getStorageSync('token')) {
-          this.$store.commit("changeUserLogin", true);
+          uni.redirectTo({
+          	url: '/pageTwo/login/login'
+          })
+          // that.$store.commit("changeUserLogin", true)
           return
         }
         uni.navigateTo({
@@ -202,7 +211,10 @@
       },
       handleEditClick() {
         if (!uni.getStorageSync('token')) {
-          this.$store.commit("changeUserLogin", true);
+          uni.redirectTo({
+          	url: '/pageTwo/login/login'
+          })
+          // that.$store.commit("changeUserLogin", true)
           return
         }
         this.$store.commit("changeEdit", true);

pages/target/target.vue

@@ -35,9 +35,9 @@
 				</view>
 				<view class="blockC">
 					<view v-if="lineData&&lineData.categories.length&&handTrue">
-            <qiun-data-charts type="area" :chartData="lineData" :canvas2d="true" canvasId="charts09" :cHeight="480"
+						<qiun-data-charts type="area" :chartData="lineData" :canvas2d="true" canvasId="charts09"
-              :cWidth="680" :animation="false" :opts="{enableScroll:true,xAxis:{scrollShow:false,itemCount:3}}"
+							:cHeight="480" :cWidth="680" :animation="false"
-              :ontouch="true" />
+							:opts="{enableScroll:true,xAxis:{scrollShow:false,itemCount:3}}" :ontouch="true" />
 					</view>
 					<view class="nolist" v-else>
 						<icon class="iconfont icon-zanwu"></icon>
@@ -199,7 +199,10 @@
 			handAllTime(ind) {
 				let that = this
 				if (!uni.getStorageSync('token')) {
-          this.$store.commit("changeUserLogin", true);
+					uni.redirectTo({
+						url: '/pageTwo/login/login'
+					})
+					// that.$store.commit("changeUserLogin", true)
 					return
 				}
 				this.active = ind
@@ -212,7 +215,10 @@
 			},
 			handleClick(ind) {
 				if (!uni.getStorageSync('token')) {
-          this.$store.commit("changeUserLogin", true);
+					uni.redirectTo({
+						url: '/pageTwo/login/login'
+					})
+					// that.$store.commit("changeUserLogin", true)
 					return
 				}
 				if (ind == 0) {

unpackage/dist/dev/mp-weixin/components/ren-calendar/ren-calendar.js

@@ -415,7 +415,10 @@ var _default2 = {
     changeMonth: function changeMonth(type) {
       var that = this;
       if (!uni.getStorageSync('token')) {
-        this.$store.commit("changeUserLogin", true);
+        uni.redirectTo({
+          url: '/pageTwo/login/login'
+        });
+        // that.$store.commit("changeUserLogin", true)
         return;
       }
       if (type == 'pre') {

unpackage/dist/dev/mp-weixin/components/userLogin.js

@@ -143,7 +143,10 @@ var _default = {
   computed: _objectSpread({}, (0, _vuex.mapState)(["user", "isLogin"])),
   methods: {
     onTap: function onTap() {
-      this.$store.commit("changeUserLogin", false);
+      uni.redirectTo({
+        url: '/pageTwo/login/login'
+      });
+      // that.$store.commit("changeUserLogin", true)
     },
     getUserInfo: function getUserInfo() {
       var that = this;

unpackage/dist/dev/mp-weixin/pageTwo/login/login.js

@@ -199,8 +199,8 @@ var _default = {
         phone: that.phone,
         tenantId: uni.getStorageSync('tenantid'),
         sessionId: uni.getStorageSync('sessionid'),
-        name: that.infoRes.name,
+        name: "",
-        headImg: that.infoRes.headimg,
+        headImg: "",
         code: that.code,
         isvrcode: true
       }).then(function (res) {

unpackage/dist/dev/mp-weixin/pages/compk/compk.js

@@ -291,7 +291,10 @@ var _default = {
     handlePK: function handlePK() {
       var that = this;
       if (!uni.getStorageSync('token')) {
-        this.$store.commit("changeUserLogin", true);
+        uni.redirectTo({
+          url: '/pageTwo/login/login'
+        });
+        // that.$store.commit("changeUserLogin", true)
         return;
       }
       if (that.isActive.length != 2) {

unpackage/dist/dev/mp-weixin/pages/index/active.js

@@ -282,7 +282,10 @@ var _default = {
       var that = this;
       that.devices = [];
       if (!that.token) {
-        that.$store.commit("changeUserLogin", true);
+        uni.redirectTo({
+          url: '/pageTwo/login/login?url=active' + '&code=' + that.code
+        });
+        // that.$store.commit("changeUserLogin", true)
         return;
       }
       uni.openBluetoothAdapter({

unpackage/dist/dev/mp-weixin/pages/index/index.js

@@ -423,7 +423,10 @@ var _default = {
       var _this3 = this;
       var that = this;
       if (!that.token) {
-        that.$store.commit("changeUserLogin", true);
+        uni.redirectTo({
+          url: '/pageTwo/login/login'
+        });
+        // that.$store.commit("changeUserLogin", true)
         return;
       }
       uni.openBluetoothAdapter({
@@ -466,7 +469,10 @@ var _default = {
     clickTool: function clickTool(ind) {
       var that = this;
       if (!that.token) {
-        that.$store.commit("changeUserLogin", true);
+        uni.redirectTo({
+          url: '/pageTwo/login/login'
+        });
+        // that.$store.commit("changeUserLogin", true)
         return;
       }
       if (ind == 0) {
@@ -520,7 +526,10 @@ var _default = {
     },
     // 登录
     handleLogin: function handleLogin() {
-      this.$store.commit("changeUserLogin", true);
+      uni.redirectTo({
+        url: '/pageTwo/login/login'
+      });
+      // that.$store.commit("changeUserLogin", true)
     },
     handleDrawer: function handleDrawer() {
       this.$store.commit("changeDrawe", true);

unpackage/dist/dev/mp-weixin/pages/me/me.js

@@ -182,7 +182,10 @@ var _default = {
   methods: {
     handleLogin: function handleLogin() {
       if (!uni.getStorageSync('token')) {
-        this.$store.commit("changeUserLogin", true);
+        uni.redirectTo({
+          url: '/pageTwo/login/login'
+        });
+        // that.$store.commit("changeUserLogin", true)
         return;
       }
     },
@@ -215,7 +218,10 @@ var _default = {
     handleClick: function handleClick(ind) {
       var that = this;
       if (!uni.getStorageSync('token')) {
-        this.$store.commit("changeUserLogin", true);
+        uni.redirectTo({
+          url: '/pageTwo/login/login'
+        });
+        // that.$store.commit("changeUserLogin", true)
         return;
       }
       if (ind == 'adult' && that.configBox.referappid) {
@@ -238,7 +244,10 @@ var _default = {
     },
     navTo: function navTo(url) {
       if (!uni.getStorageSync('token')) {
-        this.$store.commit("changeUserLogin", true);
+        uni.redirectTo({
+          url: '/pageTwo/login/login'
+        });
+        // that.$store.commit("changeUserLogin", true)
         return;
       }
       uni.navigateTo({
@@ -247,7 +256,10 @@ var _default = {
     },
     handleEditClick: function handleEditClick() {
       if (!uni.getStorageSync('token')) {
-        this.$store.commit("changeUserLogin", true);
+        uni.redirectTo({
+          url: '/pageTwo/login/login'
+        });
+        // that.$store.commit("changeUserLogin", true)
         return;
       }
       this.$store.commit("changeEdit", true);

unpackage/dist/dev/mp-weixin/pages/target/target.js

@@ -294,7 +294,10 @@ var _default = {
     handAllTime: function handAllTime(ind) {
       var that = this;
       if (!uni.getStorageSync('token')) {
-        this.$store.commit("changeUserLogin", true);
+        uni.redirectTo({
+          url: '/pageTwo/login/login'
+        });
+        // that.$store.commit("changeUserLogin", true)
         return;
       }
       this.active = ind;
@@ -307,7 +310,10 @@ var _default = {
     },
     handleClick: function handleClick(ind) {
       if (!uni.getStorageSync('token')) {
-        this.$store.commit("changeUserLogin", true);
+        uni.redirectTo({
+          url: '/pageTwo/login/login'
+        });
+        // that.$store.commit("changeUserLogin", true)
         return;
       }
       if (ind == 0) {