Browse Source

更新部分样式问题及数据显示问题

zhengJ_docnet 4 years ago
parent
commit
d5f6cf598e
5 changed files with 19 additions and 12 deletions
  1. 3 3
      common/utils/https.js
  2. 3 1
      pages/index/index.vue
  3. 10 5
      pages/login/login.vue
  4. 2 2
      pages/mypersonal/personal.vue
  5. 1 1
      pages/setting/setting.vue

+ 3 - 3
common/utils/https.js

@@ -2,9 +2,9 @@ const weather = 'https://free-api.heweather.net/s6/weather'
 const future = 'http://v.juhe.cn/weather/index'
 const air = 'https://free-api.heweather.net/s6/air/now'
 const locl = 'http://apis.juhe.cn/geo/'
-const QQ_MAP_KEY1 = '********************************'
-const QQ_MAP_KEY2 = '********************************'
-const QQ_MAP_KEY3 = '********************************'
+const QQ_MAP_KEY1 = '630ac2e3d80941b48c80fe3a8ed1a042'
+const QQ_MAP_KEY2 = 'c649beb3621c84ee57c365f45a9a6ed4'
+const QQ_MAP_KEY3 = 'dd35eaa26348f268f1f02b4a8fbe4aaf'
 
 
 //添加finally事件

+ 3 - 1
pages/index/index.vue

@@ -96,7 +96,9 @@
 		</view>
 		
 		<view class="uni-common-mt" v-if="setting.gesture && pwState">
-			<mpvue-gesture-lock :containerWidth="590" :cycleRadius="70" @end="onEnd"></mpvue-gesture-lock>
+			<view style="width: 100vw;">
+				<mpvue-gesture-lock :containerWidth="590" :cycleRadius="70" @end="onEnd"></mpvue-gesture-lock>
+			</view>
 			<view class="uni-center">{{text}}</view>
 		</view>
 	</view>

+ 10 - 5
pages/login/login.vue

@@ -32,13 +32,18 @@
 					//用户拒绝
 					console.log("拒绝授权", e);
 				} else {
-					app.getloading("加载中...")
 					console.log("用户允许微信授权", e);
+					uni.showLoading({
+						title:"加载中..."
+					})
 					// 这里可以发送code到后台换取秘钥
-					this.setUserinfo()
-					// uni.reLaunch({
-					// 	url:"/pages/index/index"
-					// })
+					this.setUserinfo(e.detail.userInfo)
+					setTimeout(function() {
+						uni.hideLoading()
+						uni.reLaunch({
+							url:"/pages/index/index"
+						})
+					}, 100);
 				}		
 			},
 		}

+ 2 - 2
pages/mypersonal/personal.vue

@@ -166,7 +166,7 @@
 			signClick() {
 				var obj = {}
 				//#ifdef MP-WEIXIN
-				if(this.userinfo) {
+				if(this.userInfo) {
 				//#endif
 					if(this.signState.status) {
 						return
@@ -185,7 +185,7 @@
 					})
 				}
 				//#endif
-			},
+			}
 		}
 	}
 </script>

+ 1 - 1
pages/setting/setting.vue

@@ -311,6 +311,7 @@
 				console.log(e.detail.value)
 				//#ifndef H5
 					this.setScreenBrightness(e.detail.value)
+					this.screenBrightness = e.detail.value
 				//#endif
 			},
 			setScreenBrightness (val) {
@@ -318,7 +319,6 @@
 				    value: val / 100,
 				    success: function () {
 				        console.log('success')
-						this.screenBrightness = val
 				    }
 				})
 			},