Browse Source

m—更改

ff_new
fmk 3 years ago
parent
commit
f9615219dc
  1. 2
      android/app/src/main/AndroidManifest.xml
  2. BIN
      assets/image/2x/qr_share_bg_yq.png
  3. BIN
      assets/image/2x/share_image_bg_yq.png
  4. BIN
      assets/image/3x/qr_share_bg_yq.png
  5. BIN
      assets/image/3x/share_image_bg_yq.png
  6. 2
      ios/Podfile
  7. 120
      ios/Podfile.lock
  8. 33
      ios/Runner.xcodeproj/project.pbxproj
  9. 2
      ios/Runner/Info.plist
  10. 4
      ios/zh-Hans.lproj/InfoPlist.strings
  11. 2
      lib/community/headlines/article_page.dart
  12. 11
      lib/store/store_view/product_sku.dart
  13. 2
      lib/view_widget/invite_success_dialog.dart
  14. 12
      lib/view_widget/new_people_reward.dart
  15. 4
      pubspec.lock

2
android/app/src/main/AndroidManifest.xml

@ -35,7 +35,7 @@
</queries>
<application
android:label="回乡"
android:label="一心回乡"
android:name=".HxApplication"
android:icon="@mipmap/ic_launcher">
<activity

BIN
assets/image/2x/qr_share_bg_yq.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 138 KiB

After

Width:  |  Height:  |  Size: 50 KiB

BIN
assets/image/2x/share_image_bg_yq.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 78 KiB

After

Width:  |  Height:  |  Size: 148 KiB

BIN
assets/image/3x/qr_share_bg_yq.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 269 KiB

After

Width:  |  Height:  |  Size: 138 KiB

BIN
assets/image/3x/share_image_bg_yq.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 148 KiB

After

Width:  |  Height:  |  Size: 78 KiB

2
ios/Podfile

@ -1,5 +1,5 @@
# Uncomment this line to define a global platform for your project
# platform :ios, '9.0'
platform :ios, '10.0'
# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
ENV['COCOAPODS_DISABLE_STATS'] = 'true'

120
ios/Podfile.lock

@ -59,15 +59,102 @@ PODS:
- mob_sharesdk/ShareSDKExtension (4.4.0):
- mob_sharesdk/ShareSDK
- MOBFoundation (>= 3.2.9)
- mob_sharesdk/ShareSDKPlatforms/DingTalk (4.4.0):
- mob_sharesdk/ShareSDK
- MOBFoundation (>= 3.2.9)
- mob_sharesdk/ShareSDKPlatforms/Douyin (4.4.0):
- mob_sharesdk/ShareSDK
- MOBFoundation (>= 3.2.9)
- mob_sharesdk/ShareSDKPlatforms/Dropbox (4.4.0):
- mob_sharesdk/ShareSDK
- MOBFoundation (>= 3.2.9)
- mob_sharesdk/ShareSDKPlatforms/Evernote (4.4.0):
- mob_sharesdk/ShareSDK
- MOBFoundation (>= 3.2.9)
- mob_sharesdk/ShareSDKPlatforms/Facebook (4.4.0):
- mob_sharesdk/ShareSDK
- MOBFoundation (>= 3.2.9)
- mob_sharesdk/ShareSDKPlatforms/Flickr (4.4.0):
- mob_sharesdk/ShareSDK
- MOBFoundation (>= 3.2.9)
- mob_sharesdk/ShareSDKPlatforms/GooglePlus (4.4.0):
- mob_sharesdk/ShareSDK
- MOBFoundation (>= 3.2.9)
- mob_sharesdk/ShareSDKPlatforms/Instagram (4.4.0):
- mob_sharesdk/ShareSDK
- MOBFoundation (>= 3.2.9)
- mob_sharesdk/ShareSDKPlatforms/Instapaper (4.4.0):
- mob_sharesdk/ShareSDK
- MOBFoundation (>= 3.2.9)
- mob_sharesdk/ShareSDKPlatforms/Kakao (4.4.0):
- mob_sharesdk/ShareSDK
- MOBFoundation (>= 3.2.9)
- mob_sharesdk/ShareSDKPlatforms/KuaiShou (4.4.0):
- mob_sharesdk/ShareSDK
- MOBFoundation (>= 3.2.9)
- mob_sharesdk/ShareSDKPlatforms/Line (4.4.0):
- mob_sharesdk/ShareSDK
- MOBFoundation (>= 3.2.9)
- mob_sharesdk/ShareSDKPlatforms/LinkedIn (4.4.0):
- mob_sharesdk/ShareSDK
- MOBFoundation (>= 3.2.9)
- mob_sharesdk/ShareSDKPlatforms/Messenger (4.4.0):
- mob_sharesdk/ShareSDK
- MOBFoundation (>= 3.2.9)
- mob_sharesdk/ShareSDKPlatforms/MingDao (4.4.0):
- mob_sharesdk/ShareSDK
- MOBFoundation (>= 3.2.9)
- mob_sharesdk/ShareSDKPlatforms/Oasis (4.4.0):
- mob_sharesdk/ShareSDK
- MOBFoundation (>= 3.2.9)
- mob_sharesdk/ShareSDKPlatforms/Pinterest (4.4.0):
- mob_sharesdk/ShareSDK
- MOBFoundation (>= 3.2.9)
- mob_sharesdk/ShareSDKPlatforms/Pocket (4.4.0):
- mob_sharesdk/ShareSDK
- MOBFoundation (>= 3.2.9)
- mob_sharesdk/ShareSDKPlatforms/QQ (4.4.0):
- mob_sharesdk/ShareSDK
- MOBFoundation (>= 3.2.9)
- mob_sharesdk/ShareSDKPlatforms/Reddit (4.4.0):
- mob_sharesdk/ShareSDK
- MOBFoundation (>= 3.2.9)
- mob_sharesdk/ShareSDKPlatforms/SinaWeibo (4.4.0):
- mob_sharesdk/ShareSDK
- MOBFoundation (>= 3.2.9)
- mob_sharesdk/ShareSDKPlatforms/SMS (4.4.0):
- mob_sharesdk/ShareSDK
- MOBFoundation (>= 3.2.9)
- mob_sharesdk/ShareSDKPlatforms/SnapChat (4.4.0):
- mob_sharesdk/ShareSDK
- MOBFoundation (>= 3.2.9)
- mob_sharesdk/ShareSDKPlatforms/Telegram (4.4.0):
- mob_sharesdk/ShareSDK
- MOBFoundation (>= 3.2.9)
- mob_sharesdk/ShareSDKPlatforms/TikTok (4.4.0):
- mob_sharesdk/ShareSDK
- MOBFoundation (>= 3.2.9)
- mob_sharesdk/ShareSDKPlatforms/Twitter (4.4.0):
- mob_sharesdk/ShareSDK
- MOBFoundation (>= 3.2.9)
- mob_sharesdk/ShareSDKPlatforms/VKontakte (4.4.0):
- mob_sharesdk/ShareSDK
- MOBFoundation (>= 3.2.9)
- mob_sharesdk/ShareSDKPlatforms/WatermelonVideo (4.4.0):
- mob_sharesdk/ShareSDK
- MOBFoundation (>= 3.2.9)
- mob_sharesdk/ShareSDKPlatforms/WeChat_Lite (4.4.0):
- mob_sharesdk/ShareSDK
- MOBFoundation (>= 3.2.9)
- mob_sharesdk/ShareSDKPlatforms/WhatsApp (4.4.0):
- mob_sharesdk/ShareSDK
- MOBFoundation (>= 3.2.9)
- mob_sharesdk/ShareSDKPlatforms/Yixin (4.4.0):
- mob_sharesdk/ShareSDK
- MOBFoundation (>= 3.2.9)
- mob_sharesdk/ShareSDKPlatforms/YouDaoNote (4.4.0):
- mob_sharesdk/ShareSDK
- MOBFoundation (>= 3.2.9)
- mob_sharesdk/ShareSDKRestoreScene (4.4.0):
- mob_sharesdk/ShareSDKExtension
- MOBFoundation (>= 3.2.9)
@ -92,9 +179,38 @@ PODS:
- Flutter
- mob_sharesdk
- mob_sharesdk/ShareSDKExtension
- mob_sharesdk/ShareSDKPlatforms/DingTalk
- mob_sharesdk/ShareSDKPlatforms/Douyin
- mob_sharesdk/ShareSDKPlatforms/Dropbox
- mob_sharesdk/ShareSDKPlatforms/Evernote
- mob_sharesdk/ShareSDKPlatforms/Facebook
- mob_sharesdk/ShareSDKPlatforms/Flickr
- mob_sharesdk/ShareSDKPlatforms/GooglePlus
- mob_sharesdk/ShareSDKPlatforms/Instagram
- mob_sharesdk/ShareSDKPlatforms/Instapaper
- mob_sharesdk/ShareSDKPlatforms/Kakao
- mob_sharesdk/ShareSDKPlatforms/KuaiShou
- mob_sharesdk/ShareSDKPlatforms/Line
- mob_sharesdk/ShareSDKPlatforms/LinkedIn
- mob_sharesdk/ShareSDKPlatforms/Messenger
- mob_sharesdk/ShareSDKPlatforms/MingDao
- mob_sharesdk/ShareSDKPlatforms/Oasis
- mob_sharesdk/ShareSDKPlatforms/Pinterest
- mob_sharesdk/ShareSDKPlatforms/Pocket
- mob_sharesdk/ShareSDKPlatforms/QQ
- mob_sharesdk/ShareSDKPlatforms/Reddit
- mob_sharesdk/ShareSDKPlatforms/SinaWeibo
- mob_sharesdk/ShareSDKPlatforms/SMS
- mob_sharesdk/ShareSDKPlatforms/SnapChat
- mob_sharesdk/ShareSDKPlatforms/Telegram
- mob_sharesdk/ShareSDKPlatforms/TikTok
- mob_sharesdk/ShareSDKPlatforms/Twitter
- mob_sharesdk/ShareSDKPlatforms/VKontakte
- mob_sharesdk/ShareSDKPlatforms/WatermelonVideo
- mob_sharesdk/ShareSDKPlatforms/WeChat_Lite
- mob_sharesdk/ShareSDKPlatforms/WhatsApp
- mob_sharesdk/ShareSDKPlatforms/Yixin
- mob_sharesdk/ShareSDKPlatforms/YouDaoNote
- mob_sharesdk/ShareSDKRestoreScene
- mob_sharesdk/ShareSDKUI
- sqflite (0.0.2):
@ -222,7 +338,7 @@ SPEC CHECKSUMS:
scan: aea35bb4aa59ccc8839c576a18cd57c7d492cc86
SDWebImage: 4dc3e42d9ec0c1028b960a33ac6b637bb432207b
shared_preferences: af6bfa751691cdc24be3045c43ec037377ada40d
sharesdk_plugin: 6d6634bb480174b607030f19fc9d84d68cfbf326
sharesdk_plugin: 5a59e49d2d5e55c8e8f67cc9ddf05172c2494a6b
sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904
SSZipArchive: e7b4f3d9e780c2acc1764cd88fbf2de28f26e5b2
thumbnails: bb4f4e9bb4b51c8ae4e6ad9a2fa81373f9b634ad
@ -235,6 +351,6 @@ SPEC CHECKSUMS:
WechatOpenSDK_Fuck: aa8f4b0af902837e887a1d40c62f06c060c1dc98
ZLPhotoBrowser-objc: c7657d3bc85ae231884e058d0e3638f619164736
PODFILE CHECKSUM: 7092aa3092b9508e0ccea9e76cd5fa33505dbb46
PODFILE CHECKSUM: 77c662d4cd560e96445691f5bf7f29e2b140072c
COCOAPODS: 1.11.2

33
ios/Runner.xcodeproj/project.pbxproj

@ -657,6 +657,7 @@
9705A1C41CF9048500538489 /* Embed Frameworks */,
3B06AD1E1E4923F5004D2608 /* Thin Binary */,
120EAF7195D9AB3BB1E8FA2B /* [CP] Copy Pods Resources */,
8C1FAACB8CAD66760F3893D3 /* [CP] Embed Pods Frameworks */,
);
buildRules = (
);
@ -763,6 +764,23 @@
shellPath = /bin/sh;
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin\n";
};
8C1FAACB8CAD66760F3893D3 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
);
name = "[CP] Embed Pods Frameworks";
outputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
9740EEB61CF901F6004384FC /* Run Script */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
@ -912,7 +930,7 @@
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 41;
CURRENT_PROJECT_VERSION = 54;
DEVELOPMENT_TEAM = YF3Q8DVP52;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
@ -962,7 +980,7 @@
"$(PROJECT_DIR)/baidu",
"$(PROJECT_DIR)/Runner/baidu",
);
MARKETING_VERSION = 1.0.41;
MARKETING_VERSION = 1.0.54;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = (
"$(inherited)",
@ -1033,6 +1051,7 @@
};
97C147031CF9000F007C117D /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
@ -1141,7 +1160,7 @@
};
97C147061CF9000F007C117D /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "";
@ -1149,7 +1168,7 @@
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 41;
CURRENT_PROJECT_VERSION = 54;
DEVELOPMENT_TEAM = YF3Q8DVP52;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
@ -1199,7 +1218,7 @@
"$(PROJECT_DIR)/baidu",
"$(PROJECT_DIR)/Runner/baidu",
);
MARKETING_VERSION = 1.0.41;
MARKETING_VERSION = 1.0.54;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = (
"$(inherited)",
@ -1278,7 +1297,7 @@
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 41;
CURRENT_PROJECT_VERSION = 54;
DEVELOPMENT_TEAM = YF3Q8DVP52;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
@ -1328,7 +1347,7 @@
"$(PROJECT_DIR)/baidu",
"$(PROJECT_DIR)/Runner/baidu",
);
MARKETING_VERSION = 1.0.41;
MARKETING_VERSION = 1.0.54;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = (
"$(inherited)",

2
ios/Runner/Info.plist

@ -5,7 +5,7 @@
<key>CFBundleDevelopmentRegion</key>
<string>$(DEVELOPMENT_LANGUAGE)</string>
<key>CFBundleDisplayName</key>
<string>鄉</string>
<string>一心回鄉</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>

4
ios/zh-Hans.lproj/InfoPlist.strings

@ -7,8 +7,8 @@
*/
CFBundleName="回乡";
CFBundleDisplayName="回乡";
CFBundleName="一心回乡";
CFBundleDisplayName="一心回乡";
NSCameraUsageDescription="您的相机权限将用于更新头像使用";
NSPhotoLibraryUsageDescription="您的照片信息将用于更新头像使用";
NSLocationWhenInUseUsageDescription="您的定位位置信息将用于查看周围的门店";

2
lib/community/headlines/article_page.dart

@ -106,7 +106,7 @@ class _ArticlePage extends State<ArticlePage>
}
BaseData<PageInfo<Article>> baseData = await apiService.queryArticle({
"pageNum": pageNum,
"pageSize": 100,
"pageSize": 10,
"searchKey": "",
"state": 1,
"type": 2

11
lib/store/store_view/product_sku.dart

@ -114,8 +114,8 @@ class _ProductSku extends State<ProductSku> {
children: [
MImage(
widget.miNiDetail.imgs[0],
width: 70,
height: 70,
width: 75,
height: 75,
fit: BoxFit.cover,
errorSrc: "assets/image/default_1.png",
fadeSrc: "assets/image/default_1.png",
@ -123,7 +123,7 @@ class _ProductSku extends State<ProductSku> {
SizedBox(
width: 10,
),
Column(
Expanded(child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
@ -139,6 +139,8 @@ class _ProductSku extends State<ProductSku> {
child: Text(
": " +
(selectSkus.map((e) => "$e").toList().toString()),
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
color: Color(0xFF727272),
fontSize: 11.sp,
@ -167,7 +169,8 @@ class _ProductSku extends State<ProductSku> {
],
),
],
),
))
,
Spacer(),
InkWell(
onTap: () {

2
lib/view_widget/invite_success_dialog.dart

@ -47,7 +47,7 @@ class _InviteSuccessDialog extends State<InviteSuccessDialog> {
children: [
Image.asset(
"assets/image/yq.png",
width: 65,
width: 61,
height: 65,
),
SizedBox(height: 9.h,),

12
lib/view_widget/new_people_reward.dart

@ -152,9 +152,8 @@ class _NewPeopleReward extends State<NewPeopleReward> {
],
),
),
Expanded(
child: Padding(
padding: EdgeInsets.only(top: 4, bottom: 4),
Expanded(child:Padding(
padding: EdgeInsets.only(top: 4, bottom: 4,left:10),
child: Column(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.spaceBetween,
@ -180,7 +179,9 @@ class _NewPeopleReward extends State<NewPeopleReward> {
),
),
Text(
"有效期至:${(newUserCouponList.useEndTime != null && newUserCouponList.useEndTime != "") ? newUserCouponList.useEndTime.split(" ")[0] : "$newUserCouponList.useEndTime"}",
"有效期至:${(newUserCouponList.useEndTime != null && newUserCouponList.useEndTime != "")
? newUserCouponList.useEndTime.split(" ")[0]
: "$newUserCouponList.useEndTime"}",
overflow: TextOverflow.ellipsis,
maxLines: 2,
style: TextStyle(
@ -190,8 +191,7 @@ class _NewPeopleReward extends State<NewPeopleReward> {
),
)
],
)),
),
))),
],
),
);

4
pubspec.lock

@ -229,7 +229,7 @@ packages:
name: flutter_html
url: "https://pub.flutter-io.cn"
source: hosted
version: "2.2.0"
version: "2.2.1"
flutter_layout_grid:
dependency: transitive
description:
@ -475,7 +475,7 @@ packages:
name: path_provider_linux
url: "https://pub.flutter-io.cn"
source: hosted
version: "2.1.2"
version: "2.1.4"
path_provider_platform_interface:
dependency: transitive
description:

Loading…
Cancel
Save