Merge remote-tracking branch 'origin/develop' into develop_liyi

ios/Runner/Assets.xcassets/skyAppIcon.appiconset/Contents.json

@@ -1,117 +1,122 @@
 {
   "images" : [
     {
-      "filename" : "icon-20@2x.png",
+      "size" : "20x20",
       "idiom" : "iphone",
-      "scale" : "2x",
+      "filename" : "Icon-App-20x20@2x.png",
-      "size" : "20x20"
+      "scale" : "2x"
     },
     {
-      "filename" : "icon-20@3x.png",
+      "size" : "20x20",
       "idiom" : "iphone",
-      "scale" : "3x",
+      "filename" : "Icon-App-20x20@3x.png",
-      "size" : "20x20"
+      "scale" : "3x"
     },
     {
+      "size" : "29x29",
       "idiom" : "iphone",
-      "scale" : "1x",
+      "filename" : "Icon-App-29x29@1x.png",
-      "size" : "29x29"
+      "scale" : "1x"
     },
     {
-      "filename" : "icon-29@2x.png",
+      "size" : "29x29",
       "idiom" : "iphone",
-      "scale" : "2x",
+      "filename" : "Icon-App-29x29@2x.png",
-      "size" : "29x29"
+      "scale" : "2x"
     },
     {
-      "filename" : "icon-29@3x.png",
+      "size" : "29x29",
       "idiom" : "iphone",
-      "scale" : "3x",
+      "filename" : "Icon-App-29x29@3x.png",
-      "size" : "29x29"
+      "scale" : "3x"
     },
     {
-      "filename" : "icon-40@2x.png",
+      "size" : "40x40",
       "idiom" : "iphone",
-      "scale" : "2x",
+      "filename" : "Icon-App-40x40@2x.png",
-      "size" : "40x40"
+      "scale" : "2x"
     },
     {
-      "filename" : "icon-40@3x.png",
+      "size" : "40x40",
       "idiom" : "iphone",
-      "scale" : "3x",
+      "filename" : "Icon-App-40x40@3x.png",
-      "size" : "40x40"
+      "scale" : "3x"
     },
     {
-      "filename" : "icon-60@2x.png",
+      "size" : "60x60",
       "idiom" : "iphone",
-      "scale" : "2x",
+      "filename" : "Icon-App-60x60@2x.png",
-      "size" : "60x60"
+      "scale" : "2x"
     },
     {
-      "filename" : "icon-60@3x.png",
+      "size" : "60x60",
       "idiom" : "iphone",
-      "scale" : "3x",
+      "filename" : "Icon-App-60x60@3x.png",
-      "size" : "60x60"
+      "scale" : "3x"
     },
     {
+      "size" : "20x20",
       "idiom" : "ipad",
-      "scale" : "1x",
+      "filename" : "Icon-App-20x20@1x.png",
-      "size" : "20x20"
+      "scale" : "1x"
     },
     {
-      "filename" : "icon-20@2x 1.png",
+      "size" : "20x20",
       "idiom" : "ipad",
-      "scale" : "2x",
+      "filename" : "Icon-App-20x20@2x.png",
-      "size" : "20x20"
+      "scale" : "2x"
     },
     {
+      "size" : "29x29",
       "idiom" : "ipad",
-      "scale" : "1x",
+      "filename" : "Icon-App-29x29@1x.png",
-      "size" : "29x29"
+      "scale" : "1x"
     },
     {
-      "filename" : "icon-29@2x 1.png",
+      "size" : "29x29",
       "idiom" : "ipad",
-      "scale" : "2x",
+      "filename" : "Icon-App-29x29@2x.png",
-      "size" : "29x29"
+      "scale" : "2x"
     },
     {
+      "size" : "40x40",
       "idiom" : "ipad",
-      "scale" : "1x",
+      "filename" : "Icon-App-40x40@1x.png",
-      "size" : "40x40"
+      "scale" : "1x"
     },
     {
-      "filename" : "icon-40@2x 1.png",
+      "size" : "40x40",
       "idiom" : "ipad",
-      "scale" : "2x",
+      "filename" : "Icon-App-40x40@2x.png",
-      "size" : "40x40"
+      "scale" : "2x"
     },
     {
+      "size" : "76x76",
       "idiom" : "ipad",
-      "scale" : "1x",
+      "filename" : "Icon-App-76x76@1x.png",
-      "size" : "76x76"
+      "scale" : "1x"
     },
     {
-      "filename" : "icon-76@2x.png",
+      "size" : "76x76",
       "idiom" : "ipad",
-      "scale" : "2x",
+      "filename" : "Icon-App-76x76@2x.png",
-      "size" : "76x76"
+      "scale" : "2x"
     },
     {
-      "filename" : "icon-83.5@2x.png",
+      "size" : "83.5x83.5",
       "idiom" : "ipad",
-      "scale" : "2x",
+      "filename" : "Icon-App-83.5x83.5@2x.png",
-      "size" : "83.5x83.5"
+      "scale" : "2x"
     },
     {
-      "filename" : "icon-1024.png",
+      "size" : "1024x1024",
       "idiom" : "ios-marketing",
-      "scale" : "1x",
+      "filename" : "Icon-App-1024x1024@1x.png",
-      "size" : "1024x1024"
+      "scale" : "1x"
     }
   ],
   "info" : {
-    "author" : "xcode",
+    "version" : 1,
-    "version" : 1
+    "author" : "xcode"
   }
 }

lib/mine/mine/starLockMine_page.dart

@@ -199,21 +199,21 @@ class StarLockMinePageState extends State<StarLockMinePage> with BaseWidget {
             Get.toNamed(Routers.mineSetPage);
           }),
           //上架审核
-          if (F.isLite)
+          // if (F.isLite)
-            Container()
+          //   Container()
-          else
+          // else
-            mineItem('images/mine/icon_mine_main_vip.png', '增值服务'.tr, () {
+          mineItem('images/mine/icon_mine_main_vip.png', '增值服务'.tr, () {
-              Get.back();
+            Get.back();
-              Get.toNamed(Routers.valueAddedServicesPage);
+            Get.toNamed(Routers.valueAddedServicesPage);
-            }),
+          }),
-          if (F.isLite)
+          // if (F.isLite)
-            Container()
+          //   Container()
-          else
+          // else
-            mineItem('images/mine/icon_mine_main_shoppingcart.png', '配件商城'.tr,
+          mineItem('images/mine/icon_mine_main_shoppingcart.png', '配件商城'.tr,
-                () {
+              () {
-              Get.back();
+            Get.back();
-              Get.toNamed(Routers.lockMallPage);
+            Get.toNamed(Routers.lockMallPage);
-            }),
+          }),
           if (F.isSKY && Get.locale!.languageCode == 'zh')
             mineItem('images/mine/icon_mine_main_supportStaff.png', '客服'.tr,
                 () {