Merge remote-tracking branch 'origin/master'

.dart_tool/package_config.json

@@ -249,7 +249,7 @@
     },
     {
       "name": "intl",
-      "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/intl-0.15.7",
+      "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/intl-0.16.0",
       "packageUri": "lib/",
       "languageVersion": "2.0"
     },
@@ -351,7 +351,7 @@
     },
     {
       "name": "plugin_platform_interface",
-      "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/plugin_platform_interface-1.0.2",
+      "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/plugin_platform_interface-1.0.3",
       "packageUri": "lib/",
       "languageVersion": "2.1"
     },
@@ -614,7 +614,7 @@
       "languageVersion": "2.1"
     }
   ],
-  "generated": "2020-09-30T07:04:49.977484Z",
+  "generated": "2020-09-30T09:06:30.237124Z",
   "generator": "pub",
   "generatorVersion": "2.7.2"
 }

example/ios/Podfile.lock

@@ -99,6 +99,8 @@ PODS:
     - Flutter
   - path_provider_windows (0.0.1):
     - Flutter
+  - "permission_handler (5.0.1+1)":
+    - Flutter
   - Reachability (3.2)
   - save_image (0.0.1):
     - Flutter
@@ -185,6 +187,7 @@ DEPENDENCIES:
   - path_provider_linux (from `.symlinks/plugins/path_provider_linux/ios`)
   - path_provider_macos (from `.symlinks/plugins/path_provider_macos/ios`)
   - path_provider_windows (from `.symlinks/plugins/path_provider_windows/ios`)
+  - permission_handler (from `.symlinks/plugins/permission_handler/ios`)
   - save_image (from `.symlinks/plugins/save_image/ios`)
   - share_extend (from `.symlinks/plugins/share_extend/ios`)
   - shared_preferences (from `.symlinks/plugins/shared_preferences/ios`)
@@ -256,6 +259,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/path_provider_macos/ios"
   path_provider_windows:
     :path: ".symlinks/plugins/path_provider_windows/ios"
+  permission_handler:
+    :path: ".symlinks/plugins/permission_handler/ios"
   save_image:
     :path: ".symlinks/plugins/save_image/ios"
   share_extend:
@@ -317,6 +322,7 @@ SPEC CHECKSUMS:
   path_provider_linux: 4d630dc393e1f20364f3e3b4a2ff41d9674a84e4
   path_provider_macos: f760a3c5b04357c380e2fddb6f9db6f3015897e0
   path_provider_windows: a2b81600c677ac1959367280991971cb9a1edb3b
+  permission_handler: eac8e15b4a1a3fba55b761d19f3f4e6b005d15b6
   Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
   save_image: 1d4bdcb69832f573215c0e2971fe9e572dfc1c84
   securityGuard: 9c04c44a3b663f36e15064042abfc107fa07133c

example/ios/Runner.xcodeproj/project.pbxproj

@@ -448,6 +448,7 @@
 			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
@@ -469,6 +470,7 @@
 				PROVISIONING_PROFILE_SPECIFIER = cn.zhios.zhiying_dev;
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = 1;
 				VERSIONING_SYSTEM = "apple-generic";
 			};
 			name = Profile;
@@ -585,6 +587,7 @@
 			baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
@@ -607,6 +610,7 @@
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = 1;
 				VERSIONING_SYSTEM = "apple-generic";
 			};
 			name = Debug;
@@ -616,6 +620,7 @@
 			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
@@ -637,6 +642,7 @@
 				PROVISIONING_PROFILE_SPECIFIER = cn.zhios.zhiying_dev;
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = 1;
 				VERSIONING_SYSTEM = "apple-generic";
 			};
 			name = Release;

example/ios/Runner/AppDelegate.m

@@ -27,8 +27,8 @@
 // 获取设置
 - (NSDictionary*)getSetting {
     return @{
-        //@"domain": @"http://inapi.izhyin.cn"
-        @"domain": @"http://192.168.0.113:5000"
+        @"domain": @"http://inapi.izhyin.cn"
+        //@"domain": @"http://192.168.0.113:5000"
     };
 }
 

example/ios/Runner/Base.lproj/LaunchScreen.storyboard

@@ -1,8 +1,10 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12121" systemVersion="16G29" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+    <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12089"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
         <!--View Controller-->
@@ -14,24 +16,14 @@
                         <viewControllerLayoutGuide type="bottom" id="xbc-2k-c8Z"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <subviews>
-                            <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" image="LaunchImage" translatesAutoresizingMaskIntoConstraints="NO" id="YRO-k0-Ey4">
-                            </imageView>
-                        </subviews>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                        <constraints>
-                            <constraint firstItem="YRO-k0-Ey4" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="1a2-6s-vTC"/>
-                            <constraint firstItem="YRO-k0-Ey4" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="4X2-HB-R7a"/>
-                        </constraints>
                     </view>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="53" y="375"/>
+            <point key="canvasLocation" x="76.811594202898561" y="251.11607142857142"/>
         </scene>
     </scenes>
-    <resources>
-        <image name="LaunchImage" width="168" height="185"/>
-    </resources>
 </document>

example/ios/Runner/Info.plist

@@ -10,26 +10,189 @@
 	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
-
-	<key>MOBAppKey</key>
-    <string>30dc33054b635</string>
-    <key>MOBAppSecret</key>
-    <string>396e98c293130c9976fb7428b6b434d6</string>
-
 	<key>CFBundleName</key>
-	<string>zhiying_base_widget_example</string>
+	<string>智莺生活</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
 	<string>$(FLUTTER_BUILD_NAME)</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
+	<key>CFBundleURLTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>CFBundleURLName</key>
+			<string>WBkey</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>wb</string>
+			</array>
+		</dict>
+		<dict>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>CFBundleURLName</key>
+			<string>QQ10JZ</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>tencent1111030588</string>
+			</array>
+		</dict>
+		<dict>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>CFBundleURLName</key>
+			<string>WBSecret</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>sina.</string>
+			</array>
+		</dict>
+		<dict>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>CFBundleURLName</key>
+			<string>QQ16JZ</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>QQ4238fb3c</string>
+			</array>
+		</dict>
+		<dict>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>CFBundleURLName</key>
+			<string>tb</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>tbopen31333495</string>
+			</array>
+		</dict>
+		<dict>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>CFBundleURLName</key>
+			<string>weixin</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>wx</string>
+			</array>
+		</dict>
+		<dict>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+			</array>
+		</dict>
+		<dict>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>CFBundleURLName</key>
+			<string>JD</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>sdkback</string>
+			</array>
+		</dict>
+	</array>
 	<key>CFBundleVersion</key>
 	<string>$(FLUTTER_BUILD_NUMBER)</string>
+	<key>LSApplicationQueriesSchemes</key>
+	<array>
+		<string>otpauth</string>
+		<string>iosamap</string>
+		<string>baidumap</string>
+		<string>vipshop</string>
+		<string>jdlogin</string>
+		<string>openapp</string>
+		<string>openapp.jdmobile</string>
+		<string>pinduoduo</string>
+		<string>wechat</string>
+		<string>tbopen</string>
+		<string>tmall</string>
+		<string>taobao</string>
+		<string>weixin</string>
+		<string>weixinULAPI</string>
+		<string>sinaweibohd</string>
+		<string>sinaweibo</string>
+		<string>sinaweibosso</string>
+		<string>weibosdk</string>
+		<string>weibosdk2.5</string>
+		<string>weibosdk2</string>
+		<string>mqqapi</string>
+		<string>mqq</string>
+		<string>mqqOpensdkSSoLogin</string>
+		<string>mqqconnect</string>
+		<string>mqqopensdkdataline</string>
+		<string>mqqopensdkgrouptribeshare</string>
+		<string>mqqopensdkfriend</string>
+		<string>mqqopensdkapi</string>
+		<string>mqqopensdkapiV2</string>
+		<string>mqqopensdkapiV3</string>
+		<string>mqzoneopensdk</string>
+		<string>wtloginmqq</string>
+		<string>wtloginmqq2</string>
+		<string>mqqwpa</string>
+		<string>mqzone</string>
+		<string>mqzonev2</string>
+		<string>mqzoneshare</string>
+		<string>wtloginqzone</string>
+		<string>mqzonewx</string>
+		<string>mqzoneopensdkapiV2</string>
+		<string>mqqopensdkapiV4</string>
+		<string>mqzoneopensdkapi19</string>
+		<string>mqzoneopensdkapi</string>
+		<string>mqqbrowser</string>
+		<string>mttbrowser</string>
+		<string>renrenios</string>
+		<string>renrenapi</string>
+		<string>renren</string>
+		<string>renreniphone</string>
+		<string>laiwangsso</string>
+		<string>yixin</string>
+		<string>yixinopenapi</string>
+		<string>instagram</string>
+		<string>whatsapp</string>
+		<string>line</string>
+		<string>fbapi</string>
+		<string>fb</string>
+		<string>fb-messenger-api</string>
+		<string>fbauth2</string>
+		<string>fbshareextension</string>
+		<string>alipays</string>
+		<string>alitrip</string>
+		<string>fleamarket</string>
+		<string>youku</string>
+	</array>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
-	<key>UILaunchStoryboardName</key>
-	<string>LaunchScreen</string>
+	<key>MOBAppKey</key>
+	<string>30dc33054b635</string>
+	<key>MOBAppSecret</key>
+	<string>396e98c293130c9976fb7428b6b434d6</string>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
+	<key>NSCameraUsageDescription</key>
+	<string>获取相机权限更换头像或者扫码</string>
+	<key>NSContactsUsageDescription</key>
+	<string>获取访问通信录权限添加联系人信息</string>
+	<key>NSLocationAlwaysUsageDescription</key>
+	<string>获取定位权限用于搜索附近的网点和查找附近的油站信息</string>
+	<key>NSLocationWhenInUseUsageDescription</key>
+	<string>获取定位权限用于搜索附近的网点和查找附近的油站信息</string>
+	<key>NSMicrophoneUsageDescription</key>
+	<string>获取访问麦克风权限录制语音或视频</string>
+	<key>NSPhotoLibraryAddUsageDescription</key>
+	<string>获取访问相册权限更换头像</string>
+	<key>NSPhotoLibraryUsageDescription</key>
+	<string>获取访问相册权限更换头像</string>
 	<key>UIMainStoryboardFile</key>
 	<string>Main</string>
 	<key>UISupportedInterfaceOrientations</key>
@@ -47,176 +210,7 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
-    <key>NSCameraUsageDescription</key>
-    <string>获取相机权限更换头像或者扫码</string>
-    <key>NSContactsUsageDescription</key>
-    <string>获取访问通信录权限添加联系人信息</string>
-    <key>NSLocationAlwaysUsageDescription</key>
-    <string>获取定位权限用于搜索附近的网点和查找附近的油站信息</string>
-    <key>NSLocationWhenInUseUsageDescription</key>
-    <string>获取定位权限用于搜索附近的网点和查找附近的油站信息</string>
-    <key>NSMicrophoneUsageDescription</key>
-    <string>获取访问麦克风权限录制语音或视频</string>
-    <key>NSPhotoLibraryAddUsageDescription</key>
-    <string>获取访问相册权限更换头像</string>
-    <key>NSPhotoLibraryUsageDescription</key>
-    <string>获取访问相册权限更换头像</string>
-    <key>io.flutter.embedded_views_preview</key>
-    <string>YES</string>
-    <key>LSRequiresIPhoneOS</key>
-    <true/>
-    <key>NSAppTransportSecurity</key>
-    <dict>
-        <key>NSAllowsArbitraryLoads</key>
-        <true/>
-    </dict>
-    <key>CFBundleURLTypes</key>
-    <array>
-        <dict>
-            <key>CFBundleTypeRole</key>
-            <string>Editor</string>
-            <key>CFBundleURLName</key>
-            <string>WBkey</string>
-            <key>CFBundleURLSchemes</key>
-            <array>
-                <string>wb</string>
-            </array>
-        </dict>
-        <dict>
-            <key>CFBundleTypeRole</key>
-            <string>Editor</string>
-            <key>CFBundleURLName</key>
-            <string>QQ10JZ</string>
-            <key>CFBundleURLSchemes</key>
-            <array>
-                <string>tencent1111030588</string>
-            </array>
-        </dict>
-        <dict>
-            <key>CFBundleTypeRole</key>
-            <string>Editor</string>
-            <key>CFBundleURLName</key>
-            <string>WBSecret</string>
-            <key>CFBundleURLSchemes</key>
-            <array>
-                <string>sina.</string>
-            </array>
-        </dict>
-        <dict>
-            <key>CFBundleTypeRole</key>
-            <string>Editor</string>
-            <key>CFBundleURLName</key>
-            <string>QQ16JZ</string>
-            <key>CFBundleURLSchemes</key>
-            <array>
-                <string>QQ4238fb3c</string>
-            </array>
-        </dict>
-        <dict>
-            <key>CFBundleTypeRole</key>
-            <string>Editor</string>
-            <key>CFBundleURLName</key>
-            <string>tb</string>
-            <key>CFBundleURLSchemes</key>
-            <array>
-                <string>tbopen31333495</string>
-            </array>
-        </dict>
-        <dict>
-            <key>CFBundleTypeRole</key>
-            <string>Editor</string>
-            <key>CFBundleURLName</key>
-            <string>weixin</string>
-            <key>CFBundleURLSchemes</key>
-            <array>
-                <string>wx</string>
-            </array>
-        </dict>
-        <dict>
-            <key>CFBundleTypeRole</key>
-            <string>Editor</string>
-            <key>CFBundleURLSchemes</key>
-            <array>
-                <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-            </array>
-        </dict>
-        <dict>
-            <key>CFBundleTypeRole</key>
-            <string>Editor</string>
-            <key>CFBundleURLName</key>
-            <string>JD</string>
-            <key>CFBundleURLSchemes</key>
-            <array>
-                <string>sdkback</string>
-            </array>
-        </dict>
-    </array>
-    <key>LSApplicationQueriesSchemes</key>
-    <array>
-        <string>otpauth</string>
-        <string>iosamap</string>
-        <string>baidumap</string>
-        <string>vipshop</string>
-        <string>jdlogin</string>
-        <string>openapp</string>
-        <string>openapp.jdmobile</string>
-        <string>pinduoduo</string>
-        <string>wechat</string>
-        <string>tbopen</string>
-        <string>tmall</string>
-        <string>taobao</string>
-        <string>weixin</string>
-        <string>weixinULAPI</string>
-        <string>sinaweibohd</string>
-        <string>sinaweibo</string>
-        <string>sinaweibosso</string>
-        <string>weibosdk</string>
-        <string>weibosdk2.5</string>
-        <string>weibosdk2</string>
-        <string>mqqapi</string>
-        <string>mqq</string>
-        <string>mqqOpensdkSSoLogin</string>
-        <string>mqqconnect</string>
-        <string>mqqopensdkdataline</string>
-        <string>mqqopensdkgrouptribeshare</string>
-        <string>mqqopensdkfriend</string>
-        <string>mqqopensdkapi</string>
-        <string>mqqopensdkapiV2</string>
-        <string>mqqopensdkapiV3</string>
-        <string>mqzoneopensdk</string>
-        <string>wtloginmqq</string>
-        <string>wtloginmqq2</string>
-        <string>mqqwpa</string>
-        <string>mqzone</string>
-        <string>mqzonev2</string>
-        <string>mqzoneshare</string>
-        <string>wtloginqzone</string>
-        <string>mqzonewx</string>
-        <string>mqzoneopensdkapiV2</string>
-        <string>mqqopensdkapiV4</string>
-        <string>mqzoneopensdkapi19</string>
-        <string>mqzoneopensdkapi</string>
-        <string>mqqbrowser</string>
-        <string>mttbrowser</string>
-        <string>renrenios</string>
-        <string>renrenapi</string>
-        <string>renren</string>
-        <string>renreniphone</string>
-        <string>laiwangsso</string>
-        <string>yixin</string>
-        <string>yixinopenapi</string>
-        <string>instagram</string>
-        <string>whatsapp</string>
-        <string>line</string>
-        <string>fbapi</string>
-        <string>fb</string>
-        <string>fb-messenger-api</string>
-        <string>fbauth2</string>
-        <string>fbshareextension</string>
-        <string>alipays</string>
-        <string>alitrip</string>
-        <string>fleamarket</string>
-        <string>youku</string>
-    </array>
+	<key>io.flutter.embedded_views_preview</key>
+	<string>YES</string>
 </dict>
 </plist>

example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/Contents.json

@@ -33,7 +33,7 @@
     {
       "size" : "40x40",
       "idiom" : "iphone",
-      "filename" : "icon-40@2x.png",
+      "filename" : "icon-40@2x-1.png",
       "scale" : "2x"
     },
     {
@@ -57,25 +57,25 @@
     {
       "size" : "20x20",
       "idiom" : "ipad",
-      "filename" : "icon-20-ipad.png",
+      "filename" : "icon-20.png",
       "scale" : "1x"
     },
     {
       "size" : "20x20",
       "idiom" : "ipad",
-      "filename" : "icon-20@2x-ipad.png",
+      "filename" : "icon-20@2x-1.png",
       "scale" : "2x"
     },
     {
       "size" : "29x29",
       "idiom" : "ipad",
-      "filename" : "icon-29-ipad.png",
+      "filename" : "icon-30.png",
       "scale" : "1x"
     },
     {
       "size" : "29x29",
       "idiom" : "ipad",
-      "filename" : "icon-29@2x-ipad.png",
+      "filename" : "icon-29@2x-1.png",
       "scale" : "2x"
     },
     {
@@ -111,7 +111,7 @@
     {
       "size" : "1024x1024",
       "idiom" : "ios-marketing",
-      "filename" : "icon-1024.png",
+      "filename" : "iTunesArtwork@2x.png",
       "scale" : "1x"
     }
   ],

lib/pages/goods_details_page/goods_details_page.dart

@@ -56,7 +56,8 @@ class GoodsDetailsContainer extends StatefulWidget {
 class _GoodsDetailsContainerState extends State<GoodsDetailsContainer> {
   bool _isEnded = false;
   ScrollController _controller = ScrollController();
-  RefreshController _refreshController = RefreshController(initialRefresh: false);
+  RefreshController _refreshController =
+      RefreshController(initialRefresh: false);
 
   void _onLoading() async {
     // await Future.delayed(Duration(milliseconds: 1000));
@@ -133,12 +134,16 @@ class _GoodsDetailsContainerState extends State<GoodsDetailsContainer> {
     return Scaffold(
       backgroundColor: Colors.white,
       body: Container(
-        color: Color(0xfff1f1f1),
-        child: CustomScrollView(
-          controller: _controller,
-          slivers: _createContent(context, datas ?? []),
-        ),
-      ),
+          color: Color(0xfff1f1f1),
+          child: Stack(
+            children: <Widget>[
+              CustomScrollView(
+                controller: _controller,
+                slivers: _createContent(context, datas ?? []),
+              ),
+              _getAppBarWidget(),
+            ],
+          )),
 
       /// appBar
       // Align(alignment: Alignment.topCenter, child: _getAppBarWidget()),

lib/pages/launch_page/launch_page.dart

@@ -45,8 +45,10 @@ class _LaunchPageState extends State<LaunchPage> {
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
-      body: Center(child: Text('这个是启动页，正在初始化...')),
+    return Image.asset(
+      'assets/images/launch_image/launch_image.png',
+      package: 'zhiying_base_widget',
+      fit: BoxFit.cover,
     );
   }
 }

lib/register.dart

@@ -1,8 +1,6 @@
 import 'package:sharesdk_plugin/sharesdk_interface.dart';
 import 'package:sharesdk_plugin/sharesdk_register.dart';
-import 'package:zhiying_base_widget/pages/bil_detail_page/bil_detail_page.dart';
 import 'package:zhiying_base_widget/pages/favorite_page/favorite_page.dart';
-import 'package:flutter/cupertino.dart';
 import 'package:zhiying_base_widget/pages/goods_details_page/goods_details_page.dart';
 import 'package:zhiying_base_widget/pages/invited_friends/invited_friends.dart';
 import 'package:zhiying_base_widget/pages/launch_page/launch_page.dart';
@@ -11,14 +9,12 @@ import 'package:zhiying_base_widget/pages/mine_detail_page/mine_detail_page.dart
 import 'package:zhiying_base_widget/pages/orders_page/orders_page.dart';
 import 'package:zhiying_base_widget/pages/search_page/item/search_item_page.dart';
 import 'package:zhiying_base_widget/pages/search_result_page/item/search_result_item_page.dart';
-import 'package:zhiying_base_widget/pages/search_think_page/search_think_page.dart';
+import 'package:zhiying_base_widget/pages/search_result_page/search_result_page.dart';
 import 'package:zhiying_base_widget/pages/security_page/security_bind_alipay/security_bind_alipay_page.dart';
 import 'package:zhiying_base_widget/pages/security_page/security_mobile/security_mobile.dart';
 import 'package:zhiying_base_widget/pages/security_page/security_page.dart';
 import 'package:zhiying_base_widget/pages/security_page/security_password/security_password.dart';
 import 'package:zhiying_base_widget/pages/setting_page/setting_page.dart';
-import 'package:zhiying_base_widget/pages/search_result_page/search_result_page.dart';
-import 'package:zhiying_base_widget/pages/wallet_page/wallet_page.dart';
 import 'package:zhiying_base_widget/pages/webview/base_webview.dart';
 import 'package:zhiying_base_widget/widgets/goods_details/footer/goods_details_footer_widget.dart';
 import 'package:zhiying_base_widget/widgets/goods_details/price/goods_details_price_widget.dart';
@@ -26,7 +22,6 @@ import 'package:zhiying_base_widget/widgets/goods_details/slide_banner/goods_det
 import 'package:zhiying_base_widget/widgets/goods_details/store/store_widget.dart';
 import 'package:zhiying_base_widget/widgets/goods_details/upgrade_tip/upgrade_tip_widget.dart';
 import 'package:zhiying_base_widget/widgets/home/home_banner/home_banner_creater.dart';
-import 'package:zhiying_base_widget/widgets/home/home_banner/home_banner_widget.dart';
 import 'package:zhiying_base_widget/widgets/home/home_goods/home_goods_creater.dart';
 import 'package:zhiying_base_widget/widgets/home/home_notice/home_notice_widget.dart';
 import 'package:zhiying_base_widget/widgets/home/home_slide_banner/home_slide_banner_creater.dart';
@@ -37,11 +32,9 @@ import 'package:zhiying_base_widget/widgets/mine/mine_nav/mine_nav_bg.dart';
 import 'package:zhiying_base_widget/widgets/mine/mine_nav/mine_nav_creater.dart';
 import 'package:zhiying_base_widget/widgets/mine/mine_quick_entry/mine_quick_entry.dart';
 import 'package:zhiying_base_widget/widgets/others/normal_nav/normal_nav_creater.dart';
+import 'package:zhiying_base_widget/widgets/search/tabbar/search_tab_creater.dart';
 import 'package:zhiying_base_widget/widgets/search_result/sort/search_result_sort_widget.dart';
 import 'package:zhiying_base_widget/widgets/search_result/tarbar/search_result_tab_creater.dart';
-import 'package:zhiying_base_widget/widgets/search/appbar/search_appbar_creater.dart';
-import 'package:zhiying_base_widget/widgets/search/input/search_input_creater.dart';
-import 'package:zhiying_base_widget/widgets/search/tabbar/search_tab_creater.dart';
 import 'package:zhiying_base_widget/widgets/wallet/wallet_appbar/wallet_appbar.dart';
 import 'package:zhiying_base_widget/widgets/wallet/wallet_bil/wallet_bil.dart';
 import 'package:zhiying_base_widget/widgets/wallet/wallet_data/wallet_data.dart';
@@ -51,6 +44,7 @@ import 'package:zhiying_comm/util/defalut_widget_creater.dart';
 import 'package:zhiying_comm/zhiying_comm.dart';
 
 import 'pages/search_page/search_page.dart';
+import 'pages/wallet_page/wallet_page.dart';
 import 'widgets/goods_details/coupon/counpon_widget.dart';
 import 'widgets/goods_details/detail_img/goods_details_img.dart';
 import 'widgets/goods_details/evaluate/goods_details_evaluate_widget.dart';
@@ -58,14 +52,10 @@ import 'widgets/goods_details/recommend/goods_detail_commend_creater.dart';
 import 'widgets/goods_details/title/goods_details_title_widget.dart';
 import 'widgets/home/home_quick_entry/home_quick_entry.dart';
 import 'widgets/home/home_sreach/home_sreach_creater.dart';
-import 'widgets/search/appbar/search_appbar_creater.dart';
-import 'widgets/search/appbar/search_appbar_widget.dart';
 import 'widgets/search/history_tag/search_history_tag.dart';
 import 'widgets/search/hot_tag/search_hot_tag_widget.dart';
-import 'widgets/search/input/search_input_creater.dart';
 import 'widgets/search/input/search_input_widget.dart';
 import 'widgets/search/tabbar/search_tab_creater.dart';
-import 'widgets/search/tabbar/search_tab_widget.dart';
 import 'widgets/search_result/goods_list/search_result_goods_list_widget.dart';
 import 'widgets/search_result/search_input/search_result_input.dart';
 
@@ -93,6 +83,10 @@ class BaseWidgetRegister {
       register.setupQQ("1111030588", "XoHKlrBybXy7ORBt");
       SharesdkPlugin.regist(register);
     });
+
+    Application.addMethod(() async {
+      return Future.delayed(Duration(seconds: 2));
+    });
   }
 
   // 注册页面
@@ -277,8 +271,8 @@ class BaseWidgetRegister {
         DefaultWidgetCreater((model) => MineQuickEntry(model)));
     WidgetFactory.regist('profile_my_functions',
         DefaultWidgetCreater((model) => MineQuickEntry(model)));
-    WidgetFactory.regist('profile_carousel',
-        DefaultWidgetCreater((model) => HomeBannerWidget(model)));
+    // WidgetFactory.regist('profile_carousel', DefaultWidgetCreater((model) => HomeBannerWidget(model)));
+    // WidgetFactory.regist('profile_carousel', HomeBannerCreater());
 
     // ==================== 钱包
     WidgetFactory.regist(

lib/widgets/home/home_slide_banner/home_slide_banner.dart

@@ -1,10 +1,9 @@
+import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_swiper/flutter_swiper.dart';
 import 'package:provider/provider.dart';
-import 'package:zhiying_base_widget/pages/goods_details_page/goods_details_page.dart';
 import 'package:zhiying_base_widget/pages/main_page/notifier/main_page_bg_notifier.dart';
-import 'package:cached_network_image/cached_network_image.dart';
 import 'package:zhiying_comm/zhiying_comm.dart';
 
 import 'bloc/bloc.dart';
@@ -28,7 +27,9 @@ class _HomeSlideBannerState extends State<HomeSlideBanner> {
   @override
   Widget build(BuildContext context) {
     return BlocProvider<HomeSlideBannerBloc>(
-      create: (_) => HomeSlideBannerBloc(repository: HomeSlideBannerRepository())..add(HomeBannerInitEvent(model: widget?.model)),
+      create: (_) =>
+          HomeSlideBannerBloc(repository: HomeSlideBannerRepository())
+            ..add(HomeBannerInitEvent(model: widget?.model)),
       child: HomeSlideBannerContainer(),
     );
   }
@@ -36,11 +37,11 @@ class _HomeSlideBannerState extends State<HomeSlideBanner> {
 
 class HomeSlideBannerContainer extends StatefulWidget {
   @override
-  _HomeSlideBannerContainerState createState() => _HomeSlideBannerContainerState();
+  _HomeSlideBannerContainerState createState() =>
+      _HomeSlideBannerContainerState();
 }
 
 class _HomeSlideBannerContainerState extends State<HomeSlideBannerContainer> {
-
   /// 子元素点击事件
   void _itemOnClick(IndexCarousel model) {
     print('点击了 $model');
@@ -80,7 +81,17 @@ class _HomeSlideBannerContainerState extends State<HomeSlideBannerContainer> {
   }
 
   Widget _getMainWidget(HomeSlideBannerModel datas) {
+    Future.delayed(Duration.zero, () {
+      Provider.of<MainPageBgNotifier>(context, listen: false)
+          .switchBg(Container(
+        width: double.infinity,
+        height: 200,
+        color: Colors.redAccent,
+      ));
+    });
+
     return Container(
+      margin: EdgeInsets.all(10),
       width: double.infinity,
       height: 140,
       child: Swiper(
@@ -98,13 +109,15 @@ class _HomeSlideBannerContainerState extends State<HomeSlideBannerContainer> {
         loop: true,
         autoplay: true,
         onTap: (index) => _itemOnClick(datas.index_carousel_list[index]),
-        pagination: _getSwiperStyleByType(datas, datas?.index_carousel_list?.length ?? 0),
+        pagination: _getSwiperStyleByType(
+            datas, datas?.index_carousel_list?.length ?? 0),
         onIndexChanged: (index) {
           //print('切换下一页');
-          Provider.of<MainPageBgNotifier>(context, listen: false).switchBg(Container(
+          Provider.of<MainPageBgNotifier>(context, listen: false)
+              .switchBg(Container(
             width: double.infinity,
             height: 200,
-            color: Colors.primaries[(index + 2) % Colors.primaries.length],
+            color: Colors.redAccent,
           ));
         },
       ),
@@ -112,50 +125,71 @@ class _HomeSlideBannerContainerState extends State<HomeSlideBannerContainer> {
   }
 
   /// 获取进度样式
-  SwiperPlugin _getSwiperStyleByType(HomeSlideBannerModel model, int pageCount) {
-
-    if('1' != model.pagination_open){
+  SwiperPlugin _getSwiperStyleByType(
+      HomeSlideBannerModel model, int pageCount) {
+    if ('1' != model.pagination_open) {
       return null;
     }
 
     if ('type_number' == model.pagination) {
-      return _getNumswiperPlugin(pageCount, model.pagination_select_color, model.pagination_unselect_color);
+      return _getNumswiperPlugin(pageCount, model.pagination_select_color,
+          model.pagination_unselect_color);
     }
     if ('type_point' == model.pagination) {
-      return _swiperCustomPaginationDito(pageCount, model.pagination_select_color, model.pagination_unselect_color);
+      return _swiperCustomPaginationDito(pageCount,
+          model.pagination_select_color, model.pagination_unselect_color);
     }
     if ('type_bar' == model.pagination) {
-      return _swiperCustomPagination(pageCount, model.pagination_select_color, model.pagination_unselect_color);
+      return _swiperCustomPagination(pageCount, model.pagination_select_color,
+          model.pagination_unselect_color);
     }
     return null;
   }
 
   /// 数字样式
-  SwiperPlugin _getNumswiperPlugin(int pageCount, String selectColor, String unselectColor) {
-    return SwiperCustomPagination(builder: (BuildContext context, SwiperPluginConfig config) {
+  SwiperPlugin _getNumswiperPlugin(
+      int pageCount, String selectColor, String unselectColor) {
+    return SwiperCustomPagination(
+        builder: (BuildContext context, SwiperPluginConfig config) {
       return Align(
         alignment: Alignment(0.0, 0.9),
         child: Container(
             padding: const EdgeInsets.symmetric(vertical: 5, horizontal: 18),
-            decoration: BoxDecoration(borderRadius: BorderRadius.circular(13), color: HexColor.fromHex('#4D000000')),
+            decoration: BoxDecoration(
+                borderRadius: BorderRadius.circular(13),
+                color: HexColor.fromHex('#4D000000')),
             child: RichText(
-              text: TextSpan(text: '${config.activeIndex + 1}', style: TextStyle(fontSize: 12, color: HexColor.fromHex(selectColor)), children: [
-                TextSpan(text: '/', style: TextStyle(fontSize: 12, color: HexColor.fromHex(unselectColor))),
-                TextSpan(text: '$pageCount', style: TextStyle(fontSize: 12, color: HexColor.fromHex(unselectColor))),
-              ]),
+              text: TextSpan(
+                  text: '${config.activeIndex + 1}',
+                  style: TextStyle(
+                      fontSize: 12, color: HexColor.fromHex(selectColor)),
+                  children: [
+                    TextSpan(
+                        text: '/',
+                        style: TextStyle(
+                            fontSize: 12,
+                            color: HexColor.fromHex(unselectColor))),
+                    TextSpan(
+                        text: '$pageCount',
+                        style: TextStyle(
+                            fontSize: 12,
+                            color: HexColor.fromHex(unselectColor))),
+                  ]),
             )),
       );
     });
   }
 
   /// 自定义进度条
-  SwiperPlugin _swiperCustomPagination(int pageCount, String selectColor, String unselectColor) {
+  SwiperPlugin _swiperCustomPagination(
+      int pageCount, String selectColor, String unselectColor) {
     List list = [];
     for (int i = 0; i < pageCount; i++) {
       list.add(i);
     }
 
-    return SwiperCustomPagination(builder: (BuildContext context, SwiperPluginConfig config) {
+    return SwiperCustomPagination(
+        builder: (BuildContext context, SwiperPluginConfig config) {
       return Align(
         alignment: Alignment(0.0, 0.9),
         child: Row(
@@ -164,10 +198,13 @@ class _HomeSlideBannerContainerState extends State<HomeSlideBannerContainer> {
           children: list.map((index) {
             var borderRadius;
             if (index == 0) {
-              borderRadius = BorderRadius.only(topLeft: Radius.circular(2), bottomLeft: Radius.circular(2));
+              borderRadius = BorderRadius.only(
+                  topLeft: Radius.circular(2), bottomLeft: Radius.circular(2));
             }
             if (index == list.length - 1) {
-              borderRadius = BorderRadius.only(topRight: Radius.circular(2), bottomRight: Radius.circular(2));
+              borderRadius = BorderRadius.only(
+                  topRight: Radius.circular(2),
+                  bottomRight: Radius.circular(2));
             }
 
             if (index == config.activeIndex) {
@@ -177,7 +214,11 @@ class _HomeSlideBannerContainerState extends State<HomeSlideBannerContainer> {
             return Container(
               height: 4,
               width: 25,
-              decoration: BoxDecoration(borderRadius: borderRadius, color: index == config.activeIndex ? HexColor.fromHex(selectColor) : HexColor.fromHex(unselectColor)),
+              decoration: BoxDecoration(
+                  borderRadius: borderRadius,
+                  color: index == config.activeIndex
+                      ? HexColor.fromHex(selectColor)
+                      : HexColor.fromHex(unselectColor)),
             );
           }).toList(),
         ),
@@ -186,7 +227,14 @@ class _HomeSlideBannerContainerState extends State<HomeSlideBannerContainer> {
   }
 
   /// 圆形进度条
-  SwiperPlugin _swiperCustomPaginationDito(int pageCount, String selectColor, String unselectColor) {
-    return SwiperPagination(margin: const EdgeInsets.only(), builder: DotSwiperPaginationBuilder( color: HexColor.fromHex(unselectColor), activeColor: HexColor.fromHex(selectColor), size: 8, activeSize: 8));
+  SwiperPlugin _swiperCustomPaginationDito(
+      int pageCount, String selectColor, String unselectColor) {
+    return SwiperPagination(
+        margin: const EdgeInsets.only(),
+        builder: DotSwiperPaginationBuilder(
+            color: HexColor.fromHex(unselectColor),
+            activeColor: HexColor.fromHex(selectColor),
+            size: 8,
+            activeSize: 8));
   }
 }

lib/widgets/share/share_alert.dart

@@ -3,6 +3,7 @@ import 'dart:ui';
 
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
+import 'package:permission_handler/permission_handler.dart';
 import 'package:share_extend/share_extend.dart';
 import 'package:sharesdk_plugin/sharesdk_plugin.dart';
 import 'package:zhiying_base_widget/utils/image_download_util/image_download_util.dart';
@@ -10,8 +11,6 @@ import 'package:zhiying_base_widget/widgets/share/models/share_data_model.dart';
 import 'package:zhiying_base_widget/widgets/share/models/share_icon_model.dart';
 import 'package:zhiying_comm/zhiying_comm.dart';
 
-import 'package:permission_handler/permission_handler.dart';
-
 class ShareAlert extends StatelessWidget {
   final String skipIdentifier;
   final Widget child;
@@ -64,10 +63,10 @@ class _ShareAlertContentState extends State<_ShareAlertContent> {
   void initState() {
     NetUtil.request('/api/v1/mod/${widget.skipIdentifier}',
         method: NetMethod.GET, onCache: (data) {
-          _parseData(data);
-        }, onSuccess: (data) {
-          _parseData(data);
-        }, onError: (err) {});
+      _parseData(data);
+    }, onSuccess: (data) {
+      _parseData(data);
+    }, onError: (err) {});
 
     super.initState();
   }
@@ -119,7 +118,7 @@ class _ShareAlertContentState extends State<_ShareAlertContent> {
               ),
               Container(
                 margin:
-                EdgeInsets.only(left: 12, right: 12, top: 10, bottom: 10),
+                    EdgeInsets.only(left: 12, right: 12, top: 10, bottom: 10),
                 child: _createIcons(),
               ),
               GestureDetector(

pubspec.yaml

@@ -60,8 +60,8 @@ flutter:
     pluginClass: ZhiyingBaseWidgetPlugin
 
   # To add assets to your plugin package, add an assets section, like this:
-  # assets:
-  #  - images/a_dot_burr.jpeg
+  assets:
+    - assets/images/launch_image/launch_image.png
   #  - images/a_dot_ham.jpeg
   #
   # For details regarding assets in packages, see