Merge branch 'feat-mendian'

src/pages.json

@@ -1,5 +1,5 @@
-{
-  "pages": [
+{
+  "pages": [
     {
       "path": "pages/index"
     },
@@ -9,118 +9,136 @@
     {
       "path": "pages/friend-battle"
     },
-    {
-      "path": "pages/point-book"
-    },
-    {
-      "path": "pages/point-book-rank"
-    },
-    {
-      "path": "pages/my-like-list"
-    },
-    {
-      "path": "pages/audio-test"
-    },
-    {
-      "path": "pages/about-us"
-    },
-    {
-      "path": "pages/webview",
-      "style": {
-        "navigationBarTitleText": ""
-      }
-    },
-    {
-      "path": "pages/melee-battle"
-    },
-    {
-      "path": "pages/battle-result"
-    },
-    {
-      "path": "pages/friend-battle-result"
-    },
-    {
-      "path": "pages/point-book-edit"
-    },
-    {
-      "path": "pages/point-book-create"
-    },
-    {
-      "path": "pages/point-book-list"
-    },
-    {
-      "path": "pages/point-book-detail"
-    },
-    {
-      "path": "pages/point-book-detail-share"
-    },
-    {
-      "path": "pages/match-page"
-    },
-    {
-      "path": "pages/user"
-    },
-    {
-      "path": "pages/grade-intro"
-    },
-    {
-      "path": "pages/rank-intro"
-    },
-    {
-      "path": "pages/my-growth"
-    },
-    {
-      "path": "pages/first-try"
-    },
-    {
-      "path": "pages/practise"
-    },
-    {
-      "path": "pages/practise-one"
-    },
-    {
-      "path": "pages/practise-two"
-    },
-    {
-      "path": "pages/battle-room"
-    },
-    {
-      "path": "pages/ranking"
-    },
-    {
-      "path": "pages/rank-list"
-    },
-    {
-      "path": "pages/match-detail"
-    },
-    {
-      "path": "pages/melee-bow-data"
-    },
+    {
+      "path": "pages/point-book"
+    },
+    {
+      "path": "pages/point-book-rank"
+    },
+    {
+      "path": "pages/my-like-list"
+    },
+    {
+      "path": "pages/audio-test"
+    },
+    {
+      "path": "pages/calibration"
+    },
+    {
+      "path": "pages/about-us"
+    },
+    {
+      "path": "pages/webview",
+      "style": {
+        "navigationBarTitleText": ""
+      }
+    },
+    {
+      "path": "pages/melee-battle"
+    },
+    {
+      "path": "pages/battle-result"
+    },
+    {
+      "path": "pages/friend-battle-result"
+    },
+    {
+      "path": "pages/point-book-edit"
+    },
+    {
+      "path": "pages/point-book-create"
+    },
+    {
+      "path": "pages/point-book-list"
+    },
+    {
+      "path": "pages/point-book-detail"
+    },
+    {
+      "path": "pages/point-book-detail-share"
+    },
+    {
+      "path": "pages/match-page"
+    },
+    {
+      "path": "pages/my-device"
+    },
+    {
+      "path": "pages/device-intro"
+    },
+    {
+      "path": "pages/user"
+    },
+    {
+      "path": "pages/grade-intro"
+    },
+    {
+      "path": "pages/rank-intro"
+    },
+    {
+      "path": "pages/my-growth"
+    },
+    {
+      "path": "pages/first-try"
+    },
+    {
+      "path": "pages/practise"
+    },
+    {
+      "path": "pages/practise-one"
+    },
+    {
+      "path": "pages/practise-two"
+    },
+    {
+      "path": "pages/battle-room"
+    },
+    {
+      "path": "pages/ranking"
+    },
+    {
+      "path": "pages/rank-list"
+    },
+    {
+      "path": "pages/match-detail"
+    },
+    {
+      "path": "pages/melee-bow-data"
+    },
     {
       "path": "pages/mine-bow-data"
+    },
+    {
+      "path": "pages/ota-wifi",
+      "style": {
+        "navigationStyle": "custom"
+      }
     }
   ],
-  "globalStyle": {
-    "backgroundColor": "@bgColor",
-    "backgroundColorBottom": "@bgColorBottom",
-    "backgroundColorTop": "@bgColorTop",
-    "backgroundTextStyle": "@bgTxtStyle",
-    "navigationBarBackgroundColor": "#000000",
-    "navigationBarTextStyle": "@navTxtStyle",
-    "navigationBarTitleText": "Uni Creator",
-    "navigationStyle": "custom",
-    "enablePullDownRefresh": false
-  },
-  "easycom": {
-    "autoscan": true,
-    "custom": {
-      "^uni-(.*)": "@dcloudio/uni-ui/lib/uni-$1/uni-$1.vue"
-    }
-  },
+  "globalStyle": {
+    "backgroundColor": "@bgColor",
+    "backgroundColorBottom": "@bgColorBottom",
+    "backgroundColorTop": "@bgColorTop",
+    "backgroundTextStyle": "@bgTxtStyle",
+    "navigationBarBackgroundColor": "#000000",
+    "navigationBarTextStyle": "@navTxtStyle",
+    "navigationBarTitleText": "Uni Creator",
+    "navigationStyle": "custom",
+    "enablePullDownRefresh": false
+  },
+  "easycom": {
+    "autoscan": true,
+    "custom": {
+      "^uni-(.*)": "@dcloudio/uni-ui/lib/uni-$1/uni-$1.vue"
+    }
+  },
   "subPackages": [
     {
       "root": "pages/coin",
       "pages": [
+        {
+          "path": "vip-intro"
+        },
         {
           "path": "index"
         },
@@ -178,48 +196,48 @@
     },
     {
       "root": "pages/member",
-      "pages": [
-        {
-          "path": "orders"
-        },
-        {
-          "path": "order-detail"
-        },
-        {
-          "path": "be-vip"
-        },
-        {
-          "path": "vip-intro"
-        },
-        {
-          "path": "agreement"
-        }
-      ]
-    },
-    {
-      "root": "pages/team-battle",
-      "pages": [
-        {
-          "path": "index"
-        },
-        {
-          "path": "team-bow-data"
-        }
-      ]
-    },
-    {
-      "root": "pages/training",
-      "pages": [
-        {
-          "path": "index"
-        },
-        {
-          "path": "difficulty"
-        },
-        {
-          "path": "practise-one"
-        }
-      ]
-    }
-  ]
-}
+      "pages": [
+        {
+          "path": "orders"
+        },
+        {
+          "path": "order-detail"
+        },
+        {
+          "path": "be-vip"
+        },
+        {
+          "path": "vip-intro"
+        },
+        {
+          "path": "agreement"
+        }
+      ]
+    },
+    {
+      "root": "pages/team-battle",
+      "pages": [
+        {
+          "path": "index"
+        },
+        {
+          "path": "team-bow-data"
+        }
+      ]
+    },
+    {
+      "root": "pages/training",
+      "pages": [
+        {
+          "path": "index"
+        },
+        {
+          "path": "difficulty"
+        },
+        {
+          "path": "practise-one"
+        }
+      ]
+    }
+  ]
+}