fmk
/
huixiang_app
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

ios更改

dart3_last
fmk 2 years ago
parent
ec18602e1c
commit
20adc38490
9 changed files with 102 additions and 104 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 152
      ios/Podfile.lock
  2. 1
      lib/community/headlines/article_list.dart
  3. 36
      lib/community/headlines/headlines_column_details.dart
  4. 2
      lib/retrofit/min_api.dart
  5. 2
      lib/retrofit/retrofit_api.dart
  6. 2
      lib/settlement/settlement.dart
  7. 7
      lib/settlement/settlement_view/activity_coupon_remarks.dart
  8. 2
      lib/vip/vip_view/vip_top.dart

152
ios/Podfile.lock
Unescape View File

@ -14,168 +14,168 @@ PODS:
- AFNetworking/Serialization (4.0.1)
- AFNetworking/UIKit (4.0.1):
- AFNetworking/NSURLSession
- BaiduMapKit/Base (6.2.0)
- BaiduMapKit/Map (6.2.0):
- BaiduMapKit/Base (6.5.1)
- BaiduMapKit/Map (6.5.1):
- BaiduMapKit/Base
- BaiduMapKit/Search (6.2.0):
- BaiduMapKit/Search (6.5.1):
- BaiduMapKit/Base
- BaiduMapKit/Utils (6.2.0):
- BaiduMapKit/Utils (6.5.1):
- BaiduMapKit/Base
- BMKLocationKit (2.0.0)
- BMKLocationKit (2.0.4)
- Flutter (1.0.0)
- flutter_baidu_mapapi_base (2.0.0):
- BaiduMapKit/Utils (= 6.2.0)
- flutter_baidu_mapapi_base (3.1.0):
- BaiduMapKit/Utils (= 6.5.1)
- Flutter
- flutter_baidu_mapapi_map (2.0.0):
- BaiduMapKit/Map (= 6.2.0)
- flutter_baidu_mapapi_map (3.1.0):
- BaiduMapKit/Map (= 6.5.1)
- Flutter
- flutter_baidu_mapapi_base
- flutter_baidu_mapapi_search (0.0.1):
- BaiduMapKit/Search (= 6.2.0)
- flutter_baidu_mapapi_search (3.1.0):
- BaiduMapKit/Search (= 6.5.1)
- Flutter
- flutter_baidu_mapapi_base
- flutter_baidu_mapapi_utils (2.0.0):
- BaiduMapKit/Utils (= 6.2.0)
- flutter_baidu_mapapi_utils (3.1.0):
- BaiduMapKit/Utils (= 6.5.1)
- Flutter
- flutter_baidu_mapapi_base
- flutter_bmflocation (1.0.3):
- BMKLocationKit
- flutter_bmflocation (2.0.1):
- BMKLocationKit (~> 2.0.4)
- Flutter
- fluwx (0.0.1):
- Flutter
- "OpenWeChatSDK (~> 1.9.2+1)"
- OpenWeChatSDK (~> 1.9.6)
- image_pickers (0.0.1):
- AFNetworking
- Flutter
- ZLPhotoBrowser-objc (= 1.0.4)
- mob_sharesdk (4.4.0):
- mob_sharesdk/ShareSDK (= 4.4.0)
- mob_sharesdk (4.4.8):
- mob_sharesdk/ShareSDK (= 4.4.8)
- MOBFoundation (>= 3.2.9)
- mob_sharesdk/ShareSDK (4.4.0):
- mob_sharesdk/ShareSDK (4.4.8):
- MOBFoundation (>= 3.2.9)
- mob_sharesdk/ShareSDKExtension (4.4.0):
- mob_sharesdk/ShareSDKExtension (4.4.8):
- mob_sharesdk/ShareSDK
- MOBFoundation (>= 3.2.9)
- mob_sharesdk/ShareSDKPlatforms/DingTalk (4.4.0):
- mob_sharesdk/ShareSDKPlatforms/DingTalk (4.4.8):
- mob_sharesdk/ShareSDK
- MOBFoundation (>= 3.2.9)
- mob_sharesdk/ShareSDKPlatforms/Douyin (4.4.0):
- mob_sharesdk/ShareSDKPlatforms/Douyin (4.4.8):
- mob_sharesdk/ShareSDK
- MOBFoundation (>= 3.2.9)
- mob_sharesdk/ShareSDKPlatforms/Dropbox (4.4.0):
- mob_sharesdk/ShareSDKPlatforms/Dropbox (4.4.8):
- mob_sharesdk/ShareSDK
- MOBFoundation (>= 3.2.9)
- mob_sharesdk/ShareSDKPlatforms/Evernote (4.4.0):
- mob_sharesdk/ShareSDKPlatforms/Evernote (4.4.8):
- mob_sharesdk/ShareSDK
- MOBFoundation (>= 3.2.9)
- mob_sharesdk/ShareSDKPlatforms/Facebook (4.4.0):
- mob_sharesdk/ShareSDKPlatforms/Facebook (4.4.8):
- mob_sharesdk/ShareSDK
- MOBFoundation (>= 3.2.9)
- mob_sharesdk/ShareSDKPlatforms/Flickr (4.4.0):
- mob_sharesdk/ShareSDKPlatforms/Flickr (4.4.8):
- mob_sharesdk/ShareSDK
- MOBFoundation (>= 3.2.9)
- mob_sharesdk/ShareSDKPlatforms/GooglePlus (4.4.0):
- mob_sharesdk/ShareSDKPlatforms/GooglePlus (4.4.8):
- mob_sharesdk/ShareSDK
- MOBFoundation (>= 3.2.9)
- mob_sharesdk/ShareSDKPlatforms/Instagram (4.4.0):
- mob_sharesdk/ShareSDKPlatforms/Instagram (4.4.8):
- mob_sharesdk/ShareSDK
- MOBFoundation (>= 3.2.9)
- mob_sharesdk/ShareSDKPlatforms/Instapaper (4.4.0):
- mob_sharesdk/ShareSDKPlatforms/Instapaper (4.4.8):
- mob_sharesdk/ShareSDK
- MOBFoundation (>= 3.2.9)
- mob_sharesdk/ShareSDKPlatforms/Kakao (4.4.0):
- mob_sharesdk/ShareSDKPlatforms/Kakao (4.4.8):
- mob_sharesdk/ShareSDK
- MOBFoundation (>= 3.2.9)
- mob_sharesdk/ShareSDKPlatforms/KuaiShou (4.4.0):
- mob_sharesdk/ShareSDKPlatforms/KuaiShou (4.4.8):
- mob_sharesdk/ShareSDK
- MOBFoundation (>= 3.2.9)
- mob_sharesdk/ShareSDKPlatforms/Line (4.4.0):
- mob_sharesdk/ShareSDKPlatforms/Line (4.4.8):
- mob_sharesdk/ShareSDK
- MOBFoundation (>= 3.2.9)
- mob_sharesdk/ShareSDKPlatforms/LinkedIn (4.4.0):
- mob_sharesdk/ShareSDKPlatforms/LinkedIn (4.4.8):
- mob_sharesdk/ShareSDK
- MOBFoundation (>= 3.2.9)
- mob_sharesdk/ShareSDKPlatforms/Messenger (4.4.0):
- mob_sharesdk/ShareSDKPlatforms/Messenger (4.4.8):
- mob_sharesdk/ShareSDK
- MOBFoundation (>= 3.2.9)
- mob_sharesdk/ShareSDKPlatforms/MingDao (4.4.0):
- mob_sharesdk/ShareSDKPlatforms/MingDao (4.4.8):
- mob_sharesdk/ShareSDK
- MOBFoundation (>= 3.2.9)
- mob_sharesdk/ShareSDKPlatforms/Oasis (4.4.0):
- mob_sharesdk/ShareSDKPlatforms/Oasis (4.4.8):
- mob_sharesdk/ShareSDK
- MOBFoundation (>= 3.2.9)
- mob_sharesdk/ShareSDKPlatforms/Pinterest (4.4.0):
- mob_sharesdk/ShareSDKPlatforms/Pinterest (4.4.8):
- mob_sharesdk/ShareSDK
- MOBFoundation (>= 3.2.9)
- mob_sharesdk/ShareSDKPlatforms/Pocket (4.4.0):
- mob_sharesdk/ShareSDKPlatforms/Pocket (4.4.8):
- mob_sharesdk/ShareSDK
- MOBFoundation (>= 3.2.9)
- mob_sharesdk/ShareSDKPlatforms/QQ (4.4.0):
- mob_sharesdk/ShareSDKPlatforms/QQ (4.4.8):
- mob_sharesdk/ShareSDK
- MOBFoundation (>= 3.2.9)
- mob_sharesdk/ShareSDKPlatforms/Reddit (4.4.0):
- mob_sharesdk/ShareSDKPlatforms/Reddit (4.4.8):
- mob_sharesdk/ShareSDK
- MOBFoundation (>= 3.2.9)
- mob_sharesdk/ShareSDKPlatforms/SinaWeibo (4.4.0):
- mob_sharesdk/ShareSDKPlatforms/SinaWeibo (4.4.8):
- mob_sharesdk/ShareSDK
- MOBFoundation (>= 3.2.9)
- mob_sharesdk/ShareSDKPlatforms/SMS (4.4.0):
- mob_sharesdk/ShareSDKPlatforms/SMS (4.4.8):
- mob_sharesdk/ShareSDK
- MOBFoundation (>= 3.2.9)
- mob_sharesdk/ShareSDKPlatforms/SnapChat (4.4.0):
- mob_sharesdk/ShareSDKPlatforms/SnapChat (4.4.8):
- mob_sharesdk/ShareSDK
- MOBFoundation (>= 3.2.9)
- mob_sharesdk/ShareSDKPlatforms/Telegram (4.4.0):
- mob_sharesdk/ShareSDKPlatforms/Telegram (4.4.8):
- mob_sharesdk/ShareSDK
- MOBFoundation (>= 3.2.9)
- mob_sharesdk/ShareSDKPlatforms/TikTok (4.4.0):
- mob_sharesdk/ShareSDKPlatforms/TikTok (4.4.8):
- mob_sharesdk/ShareSDK
- MOBFoundation (>= 3.2.9)
- mob_sharesdk/ShareSDKPlatforms/Twitter (4.4.0):
- mob_sharesdk/ShareSDKPlatforms/Twitter (4.4.8):
- mob_sharesdk/ShareSDK
- MOBFoundation (>= 3.2.9)
- mob_sharesdk/ShareSDKPlatforms/VKontakte (4.4.0):
- mob_sharesdk/ShareSDKPlatforms/VKontakte (4.4.8):
- mob_sharesdk/ShareSDK
- MOBFoundation (>= 3.2.9)
- mob_sharesdk/ShareSDKPlatforms/WatermelonVideo (4.4.0):
- mob_sharesdk/ShareSDKPlatforms/WatermelonVideo (4.4.8):
- mob_sharesdk/ShareSDK
- MOBFoundation (>= 3.2.9)
- mob_sharesdk/ShareSDKPlatforms/WeChat_Lite (4.4.0):
- mob_sharesdk/ShareSDKPlatforms/WeChat_Lite (4.4.8):
- mob_sharesdk/ShareSDK
- MOBFoundation (>= 3.2.9)
- mob_sharesdk/ShareSDKPlatforms/WeWork (4.4.0):
- mob_sharesdk/ShareSDKPlatforms/WeWork (4.4.8):
- mob_sharesdk/ShareSDK
- MOBFoundation (>= 3.2.9)
- mob_sharesdk/ShareSDKPlatforms/WhatsApp (4.4.0):
- mob_sharesdk/ShareSDKPlatforms/WhatsApp (4.4.8):
- mob_sharesdk/ShareSDK
- MOBFoundation (>= 3.2.9)
- mob_sharesdk/ShareSDKPlatforms/Yixin (4.4.0):
- mob_sharesdk/ShareSDKPlatforms/Yixin (4.4.8):
- mob_sharesdk/ShareSDK
- MOBFoundation (>= 3.2.9)
- mob_sharesdk/ShareSDKPlatforms/YouDaoNote (4.4.0):
- mob_sharesdk/ShareSDKPlatforms/YouDaoNote (4.4.8):
- mob_sharesdk/ShareSDK
- MOBFoundation (>= 3.2.9)
- mob_sharesdk/ShareSDKRestoreScene (4.4.0):
- mob_sharesdk/ShareSDKRestoreScene (4.4.8):
- mob_sharesdk/ShareSDKExtension
- MOBFoundation (>= 3.2.9)
- mob_sharesdk/ShareSDKUI (4.4.0):
- mob_sharesdk/ShareSDKUI (4.4.8):
- mob_sharesdk/ShareSDK
- MOBFoundation (>= 3.2.9)
- MOBFoundation (3.2.26)
- MOBFoundation (3.2.37)
- number_precision (0.0.1):
- Flutter
- "OpenWeChatSDK (1.9.2+1)"
- OpenWeChatSDK (1.9.6)
- package_info (0.0.1):
- Flutter
- path_provider (0.0.1):
- Flutter
- "permission_handler (5.0.1+1)":
- "permission_handler (5.1.0+2)":
- Flutter
- scan (0.0.1):
- Flutter
- SDWebImage (5.12.1):
- SDWebImage/Core (= 5.12.1)
- SDWebImage/Core (5.12.1)
- SDWebImage (5.13.4):
- SDWebImage/Core (= 5.13.4)
- SDWebImage/Core (5.13.4)
- shared_preferences_ios (0.0.1):
- Flutter
- sharesdk_plugin (1.1.3):
@ -217,7 +217,7 @@ PODS:
- mob_sharesdk/ShareSDKPlatforms/YouDaoNote
- mob_sharesdk/ShareSDKRestoreScene
- mob_sharesdk/ShareSDKUI
- SSZipArchive (2.4.2)
- SSZipArchive (2.4.3)
- thumbnails (0.0.1):
- Flutter
- tobias (0.0.1):
@ -323,28 +323,28 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
AFNetworking: 7864c38297c79aaca1500c33288e429c3451fdce
BaiduMapKit: 907c6d9b74f66c3ff4741fc4b568ae0b339917f8
BMKLocationKit: 097814ef672b1e57e86e6c1968d7892fb78002bf
BaiduMapKit: f227cfb43581e91466fb4f1344f655eab5788777
BMKLocationKit: 688d8e1194980b96fc9a6585c0eb42e62fbaf780
Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a
flutter_baidu_mapapi_base: 90fddba11ec4435406a7211d6ee905b4311c31db
flutter_baidu_mapapi_map: 771bf00671832b1fcddb17733518cd631529df16
flutter_baidu_mapapi_search: 4cffaa74e739a4114595c4f82f790e1783bb612d
flutter_baidu_mapapi_utils: a5bd582b91ecd35be1bc45558b38f49d5684f70a
flutter_bmflocation: 12f1ba91bae4b16d78d4f475023e0254ed351f1c
fluwx: 79c66b6d795ab8208262ada215d9e60388cfe492
flutter_baidu_mapapi_base: cb406be78c3a949fb58a45dc6627f139d580bd37
flutter_baidu_mapapi_map: 81c4e6e93dc668e311d9b521421deaf292390434
flutter_baidu_mapapi_search: 13a360334e91abea0bcf820546b2ef4548e42e08
flutter_baidu_mapapi_utils: f6a5d23da26b0e58f1ae9908da7ba87fd48384b1
flutter_bmflocation: 1bd73181196567fe1529f765aa4f8e2615a8a3cf
fluwx: 1649fdbdb0a7e24f3a371ca0f302e25dc1c022ab
image_pickers: 5e6ec7083f9363d014c0fb061f1b9cd97bb5e451
mob_sharesdk: c771f001e00739d24301a9fa250247601efe7a3c
MOBFoundation: 2abd23c80c33d1337d30dc4b0018ed914cef8f8e
mob_sharesdk: b707987dfbe7e180ea60ddf4b5db30126ac98390
MOBFoundation: 2fcfc8b48bf311ace31e99c941b70f573c88880a
number_precision: 26fa2be2212f9d1429f92d667d6b0aa4df0058d8
OpenWeChatSDK: 67375e7d4154c22f7ba6b1c334b121473e7d515c
OpenWeChatSDK: 8fb6c3c7ce9a57f37d001060282de1f138d09940
package_info: 873975fc26034f0b863a300ad47e7f1ac6c7ec62
path_provider: f96fff6166a8867510d2c25fdcc346327cc4b259
permission_handler: eac8e15b4a1a3fba55b761d19f3f4e6b005d15b6
permission_handler: ccb20a9fad0ee9b1314a52b70b76b473c5f8dab0
scan: aea35bb4aa59ccc8839c576a18cd57c7d492cc86
SDWebImage: 4dc3e42d9ec0c1028b960a33ac6b637bb432207b
SDWebImage: e5cc87bf736e60f49592f307bdf9e157189298a3
shared_preferences_ios: 548a61f8053b9b8a49ac19c1ffbc8b92c50d68ad
sharesdk_plugin: ad2cacfb74c4b82fbc4100cc882d05507f908aed
SSZipArchive: e7b4f3d9e780c2acc1764cd88fbf2de28f26e5b2
SSZipArchive: fe6a26b2a54d5a0890f2567b5cc6de5caa600aef
thumbnails: bb4f4e9bb4b51c8ae4e6ad9a2fa81373f9b634ad
tobias: 2aded9b83e3663b907360a800d8e3c13284f25c5
TPNS-iOS: 36c335eff80670de6ede780ab827f679d78f64ff

1
lib/community/headlines/article_list.dart
Unescape View File

@ -162,7 +162,6 @@ class _ArticleList extends State<ArticleList> {
color: Color(0xFF8D8D8D),
),
)),
Spacer()
],
)

36
lib/community/headlines/headlines_column_details.dart
Unescape View File

@ -395,7 +395,7 @@ class _HeadlinesColumnDetails extends State<HeadlinesColumnDetails>
Text(
articles?.mainTitle ?? "",
overflow: TextOverflow.ellipsis,
maxLines: 1,
maxLines: 2,
style: TextStyle(
fontSize: 14.sp,
height: 1.2.h,
@ -408,7 +408,7 @@ class _HeadlinesColumnDetails extends State<HeadlinesColumnDetails>
child: Text(
articles?.viceTitle ?? "",
overflow: TextOverflow.ellipsis,
maxLines: 3,
maxLines: 1,
style: TextStyle(
fontSize: 12.sp,
height: 1.2.h,
@ -420,19 +420,19 @@ class _HeadlinesColumnDetails extends State<HeadlinesColumnDetails>
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Expanded(
child: Text(
articles?.author?.name ?? "",
overflow: TextOverflow.ellipsis,
maxLines: 1,
style: TextStyle(
fontSize: 12.sp,
fontWeight: MyFontWeight.medium,
color: Color(0xFF8E8E8E),
),
),
),
SizedBox(width: 8),
// Expanded(
// child: Text(
// articles?.author?.name ?? "",
// overflow: TextOverflow.ellipsis,
// maxLines: 1,
// style: TextStyle(
// fontSize: 12.sp,
// fontWeight: MyFontWeight.medium,
// color: Color(0xFF8E8E8E),
// ),
// ),
// ),
// SizedBox(width: 8),
Image.asset(
"assets/image/browse.webp",
width: 14,
@ -448,14 +448,14 @@ class _HeadlinesColumnDetails extends State<HeadlinesColumnDetails>
color: Color(0xFF8D8D8D),
),
)),
Text(
articles?.createTime ?? "",
Expanded(child: Text(
(articles?.createTime?.split(" ")[0]) ?? "",
style: TextStyle(
fontSize: 12.sp,
fontWeight: MyFontWeight.regular,
color: Color(0xFF8D8D8D),
),
),
)),
],
),
],

2
lib/retrofit/min_api.dart
Unescape View File

@ -26,7 +26,7 @@ import 'data/shopping_home_config.dart';
part 'min_api.g.dart';
const localBaseUrl = "http://192.168.10.78:8765/app/";///本地
const localBaseUrl = "https://pos.api.lotus-wallet.com/app/";///本地
// const localBaseUrl = "https://2946-27-19-77-115.jp.ngrok.io/app/";///本地
const serviceBaseUrl = "https://pos.api.lotus-wallet.com/app/";///线上

2
lib/retrofit/retrofit_api.dart
Unescape View File

@ -62,7 +62,7 @@ import 'data/wx_pay.dart';
part 'retrofit_api.g.dart';
const localBaseUrl = "http://192.168.10.78:8766/app/";///本地
const localBaseUrl = "https://pos.platform.lotus-wallet.com/app/";///本地
// const localBaseUrl = "https://2946-27-19-77-115.jp.ngrok.io/app/";///本地
const serviceBaseUrl = "https://pos.platform.lotus-wallet.com/app/";///线上

2
lib/settlement/settlement.dart
Unescape View File

@ -80,7 +80,7 @@ class _Settlement extends State<Settlement> {
int count1 = 0;
String productId;
bool orderButton = false;
bool useVipPriceSelect = true;
bool useVipPriceSelect = false;
@override
void initState() {

7
lib/settlement/settlement_view/activity_coupon_remarks.dart
Unescape View File

@ -43,7 +43,7 @@ class ActivityCouponRemarks extends StatefulWidget {
}
class _ActivityCouponRemarks extends State<ActivityCouponRemarks> {
bool vipSelect = true;
bool vipSelect = false;
@override
Widget build(BuildContext context) {
@ -77,7 +77,6 @@ class _ActivityCouponRemarks extends State<ActivityCouponRemarks> {
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
if(widget?.settleOrderInfo?.memberVO?.isVip ?? false)
Row(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
@ -93,9 +92,9 @@ class _ActivityCouponRemarks extends State<ActivityCouponRemarks> {
),
),
),
Switch.adaptive(
CupertinoSwitch(
value: (widget.coupons != null && widget.coupons != ""||widget.promotions != null && widget.promotions != "") ? false:vipSelect,
materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
// materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
activeColor: Color(0xff32A060),
onChanged: (bool value) {
setState(() {

2
lib/vip/vip_view/vip_top.dart
Unescape View File

@ -459,7 +459,7 @@ class _VipTop extends State<VipTop> {
topLeft: const Radius.circular(8.0),
topRight: const Radius.circular(8.0))),
child: Container(
height: 265.h,
height: 275.h,
child: Column(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.center,

Write Preview
Loading…
Cancel
Save