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

ios更改

zyh
fmk 3 years ago
parent
fab0182c61
commit
baf4b4facd
10 changed files with 28 additions and 29 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. 12
      ios/Runner.xcodeproj/project.pbxproj
  2. 2
      lib/home/home_page.dart
  3. 14
      lib/home/home_view/discount_zone.dart
  4. 1
      lib/home/home_view/home_recommend_goods.dart
  5. 4
      lib/home/home_view/top_selling_list.dart
  6. 2
      lib/mine/mine_page.dart
  7. 2
      lib/retrofit/min_api.dart
  8. 2
      lib/retrofit/retrofit_api.dart
  9. 10
      lib/union/union_list.dart
  10. 8
      lib/view_widget/mine_vip_entry.dart

12
ios/Runner.xcodeproj/project.pbxproj
Unescape View File

@ -616,7 +616,7 @@
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 2.0.2;
CURRENT_PROJECT_VERSION = 4;
DEVELOPMENT_TEAM = YF3Q8DVP52;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
@ -666,7 +666,7 @@
"$(PROJECT_DIR)/baidu",
"$(PROJECT_DIR)/Runner/baidu",
);
MARKETING_VERSION = 2.0.2;
MARKETING_VERSION = 2.0.4;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = (
"$(inherited)",
@ -816,7 +816,7 @@
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 2.0.2;
CURRENT_PROJECT_VERSION = 4;
DEVELOPMENT_TEAM = YF3Q8DVP52;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
@ -866,7 +866,7 @@
"$(PROJECT_DIR)/baidu",
"$(PROJECT_DIR)/Runner/baidu",
);
MARKETING_VERSION = 2.0.2;
MARKETING_VERSION = 2.0.4;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = (
"$(inherited)",
@ -907,7 +907,7 @@
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 2.0.2;
CURRENT_PROJECT_VERSION = 4;
DEVELOPMENT_TEAM = YF3Q8DVP52;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
@ -957,7 +957,7 @@
"$(PROJECT_DIR)/baidu",
"$(PROJECT_DIR)/Runner/baidu",
);
MARKETING_VERSION = 2.0.2;
MARKETING_VERSION = 2.0.4;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = (
"$(inherited)",

2
lib/home/home_page.dart
Unescape View File

@ -513,7 +513,7 @@ class HomePageState extends State<HomePage> with AutomaticKeepAliveClientMixin {
// });
// }),
///特惠专区
//特惠专区
DiscountZone(coupons),
///特惠专区-推荐商品展示

14
lib/home/home_view/discount_zone.dart
Unescape View File

@ -51,12 +51,12 @@ class _DiscountZone extends State<DiscountZone> {
)),
if(widget.coupon.length != 0)
Container(
height: 100,
margin: EdgeInsets.only(top: 10),
height: 100.h,
margin: EdgeInsets.only(top: 10.h),
child: ListView.builder(
scrollDirection: Axis.horizontal,
physics: BouncingScrollPhysics(),
padding: EdgeInsets.symmetric(horizontal: 10),
padding: EdgeInsets.symmetric(horizontal: 10.w),
itemBuilder: (context, position) {
return GestureDetector(
onTap: (){
@ -91,7 +91,7 @@ class _DiscountZone extends State<DiscountZone> {
Expanded(
flex: 2,
child: Container(
margin: EdgeInsets.only(top: 12,bottom: 12,left: 20,right: 27),
margin: EdgeInsets.only(top: 12.h,bottom: 12.h,left: 20.w,right: 27.w),
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.start,
@ -107,7 +107,7 @@ class _DiscountZone extends State<DiscountZone> {
color: Color(0xFFFFA607),
),
),
SizedBox(height:5),
SizedBox(height:5.w),
(coupon.useStartTime == null &&
coupon.useEndTime == null)?
Text(
@ -135,13 +135,13 @@ class _DiscountZone extends State<DiscountZone> {
Expanded(
flex: 1,
child:Container(
margin: EdgeInsets.only(top: 12,bottom: 12),
margin: EdgeInsets.only(top: 12.h,bottom: 12.h),
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Expanded(child: Container(
padding: EdgeInsets.only(right: 5),
padding: EdgeInsets.only(right: 5.w),
child:discountWidget(coupon),
)),
],

1
lib/home/home_view/home_recommend_goods.dart
Unescape View File

@ -12,7 +12,6 @@ import 'package:huixiang/utils/font_weight.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
class HomeRecommendGoods extends StatefulWidget {
// final List<CommodityZone> commodityZone;
final HomeRank homeRank;
HomeRecommendGoods(this.homeRank);

4
lib/home/home_view/top_selling_list.dart
Unescape View File

@ -32,7 +32,7 @@ class _TopSellingList extends State<TopSellingList> {
@override
Widget build(BuildContext context) {
return Container(
height: 347.h,
height: 388.h,
width: double.infinity,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(6),
@ -64,7 +64,7 @@ class _TopSellingList extends State<TopSellingList> {
),
),
Container(
height: 280.h,
height: 330.h,
child: ListView.builder(
scrollDirection: Axis.horizontal,
physics: BouncingScrollPhysics(),

2
lib/mine/mine_page.dart
Unescape View File

@ -245,7 +245,7 @@ class MinePageState extends State<MinePage> with AutomaticKeepAliveClientMixin {
),
),
Container(
margin: EdgeInsets.only(top: 265),
margin: EdgeInsets.only(top: 285.h),
child: Column(
children: [
///我的订单

2
lib/retrofit/min_api.dart
Unescape View File

@ -40,7 +40,7 @@ part 'min_api.g.dart';
// const base_url = "http://192.168.10.37:8765/app/";
const localBaseUrl = "http://192.168.10.236:8765/app/";///本地
const serviceBaseUrl = "https://pos.api.lotus-wallet.com/app/";///线上
const serviceBaseUrl = "http://192.168.10.236:8765/app/";///线上
///调用小程序的接口

2
lib/retrofit/retrofit_api.dart
Unescape View File

@ -72,7 +72,7 @@ part 'retrofit_api.g.dart';
// const base_url = "http://192.168.10.132:8766/app/";///詹云久
const localBaseUrl = "http://192.168.10.236:8766/app/";///本地
const serviceBaseUrl = "https://pos.platform.lotus-wallet.com/app/";///线上
const serviceBaseUrl = "http://192.168.10.236:8766/app/";///线上
@RestApi(baseUrl: localBaseUrl)
abstract class ApiService {

10
lib/union/union_list.dart
Unescape View File

@ -152,7 +152,7 @@ class _UnionList extends State<UnionList> {
)
]),
width: double.infinity,
height: 228,
height: 228.h,
child: Stack(
children: [
Positioned(
@ -163,7 +163,7 @@ class _UnionList extends State<UnionList> {
child: MImage(
store.facade,
width: double.infinity,
height: 140,
height: 140.h,
fit: BoxFit.cover,
errorSrc: "assets/image/default_1.webp",
fadeSrc: "assets/image/default_1.webp",
@ -180,11 +180,11 @@ class _UnionList extends State<UnionList> {
child: Container(),
),
Positioned(
bottom: 16,
left: 12,
bottom: 16.h,
left: 12.w,
right: 0,
child: Container(
height: 100,
height: 100.h,
child: Row(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start,

8
lib/view_widget/mine_vip_entry.dart
Unescape View File

@ -70,9 +70,9 @@ class MineVipEntry extends StatelessWidget {
Widget widget = Container(
width: double.infinity,
padding: EdgeInsets.only(top: 12.h, bottom: 35.h, left: 12, right: 12),
padding: EdgeInsets.only(top: 12.h, bottom: 35.h, left: 12.w, right: 12.w),
// margin: EdgeInsets.symmetric(horizontal: 14),
margin: EdgeInsets.only(top: 15,left: 14,right: 14,bottom:15),
margin: EdgeInsets.only(top: 15.h,left: 14.w,right: 14.w,bottom:15.h),
decoration: BoxDecoration(
color: Color(0xFF3D3D5D),
borderRadius: BorderRadius.only(
@ -100,7 +100,7 @@ class MineVipEntry extends StatelessWidget {
height: 24,
),
SizedBox(
width: 4,
width: 4.w,
),
Expanded(
child: Text(
@ -128,7 +128,7 @@ class MineVipEntry extends StatelessWidget {
],
),
SizedBox(
height: 14,
height: 14.h,
),
Container(
height: 4.h,

Write Preview
Loading…
Cancel
Save