Merge branch 'dev' of https://gitcode.net/dcloud/hello-uni-app-x into dev

pages/API/get-app/get-app.uvue

 <template>
   <!-- #ifdef APP -->
-  <scroll-view style="flex:1;padding-bottom: 20px;">
+  <scroll-view style="flex: 1; padding-bottom: 20px">
   <!-- #endif -->
     <view>
       <page-head title="getApp"></page-head>
@@ -18,7 +18,9 @@
           <text class="uni-common-mt">globalData Map: {{ originGlobalData.myMap }}</text>
           <text class="uni-common-mt">globalData func 返回值: {{ originGlobalDataFuncRes }}</text>
         </template>
-        <button @click="setGlobalData" class="uni-common-mt">set globalData</button>
+        <button @click="setGlobalData" class="uni-common-mt">
+          set globalData
+        </button>
         <template v-if="newGlobalData.bool">
           <text class="uni-common-mt bold">更新后的 globalData:</text>
           <text class="uni-common-mt">globalData string: {{ newGlobalData.str }}</text>
@@ -32,7 +34,7 @@
           <text class="uni-common-mt">globalData func 返回值: {{ newGlobalDataFuncRes }}</text>
         </template>
         <text class="uni-common-mt">点击按钮调用 App.uvue methods</text>
-        <text class="margin-top:6px;">increasetLifeCycleNum 方法</text>
+        <text class="uni-common-mt">increasetLifeCycleNum 方法</text>
         <button class="uni-common-mt" @click="_increasetLifeCycleNum">
           increase lifeCycleNum
         </button>