Merge remote-tracking branch 'origin' into feat/liujie

src/app.config.ts

@@ -1,13 +1,32 @@
 export default defineAppConfig({
   pages: [
+    'pages/login/index/index',
+    'pages/login/verification/index',
+    'pages/login/terms/index',
+    // 'pages/publishBall/index',
+    // 'pages/mapDisplay/index',
+    // 'pages/list/index',
     'pages/index/index',
     'pages/detail/index',
-    'pages/list/index',
   ],
   window: {
     backgroundTextStyle: 'light',
     navigationBarBackgroundColor: '#fff',
-    navigationBarTitleText: 'WeChat',
     navigationBarTextStyle: 'black'
+  },
+  permission: {
+    'scope.userLocation': {
+      desc: '你的位置信息将用于小程序位置接口的效果展示'
+    }
+  },
+  requiredPrivateInfos: [
+    'getLocation',
+    'chooseLocation'
+  ],
+  plugins: {
+    chooseLocation: {
+      version: "1.0.12",
+      provider: "wx76a9a06e5b4e693e"
+    }
   }
 })