1

App.vue

@@ -4,14 +4,6 @@
 	
 	export default {
 		
-		onLaunch: function() {
-			uni.authorize({
-				scope: 'scope.userLocation',
-				success: function() {
-
-				}
-			})
-		},
 		onShow: function(options) {
 			const targetPath = getEnterShareTarget(options)
 			if (targetPath) {

manifest.json

@@ -96,11 +96,11 @@
             "subPackages" : true
         },
         "permission" : {
-            "scope.userLocation" : {
-                "desc" : "用于自动识别所在区域并展示附近内容"
-            },
             "scope.writePhotosAlbum" : {
                 "desc" : "你的图片将保存到手机相册"
+            },
+            "scope.userLocation" : {
+                "desc" : "用于自动识别所在区域并展示附近内容"
             }
         },
         "requiredPrivateInfos" : [ "getLocation", "chooseLocation" ]

package5/planet/pkHall.vue

@@ -35,7 +35,7 @@
 					</view>
 					<button class="share-mini" open-type="share" @tap.stop="setShareRoom(room)">分享</button>
 				</view>
-				<view class="empty" v-if="!myRooms.length && !myRoomsLoading">暂无房间，先开一间等同学来挑战</view>
+				<view class="empty" v-if="!myRooms.length && !myRoomsLoading">暂无房间，先开一间等好友来挑战</view>
 				<view class="load-more" v-if="myRooms.length">{{myRoomsLoadText}}</view>
 			</view>
 
@@ -71,7 +71,7 @@
 					</view>
 					<button class="share-mini" open-type="share" @tap.stop="setShareRoom(room)">邀请</button>
 				</view>
-				<view class="empty" v-if="!hotRooms.length && !hotLoading">还没有公开擂台，先开一间等同学来挑战</view>
+				<view class="empty" v-if="!hotRooms.length && !hotLoading">还没有公开擂台，先开一间等好友来挑战</view>
 				<view class="load-more" v-if="hotRooms.length">{{hotLoadText}}</view>
 			</view>
 		</scroll-view>