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

ios更改

zyh
fmk 3 years ago
parent
97399ce718
commit
c0c62a1bde
6 changed files with 340 additions and 329 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. 87
      lib/mine/mine_view/mine_item.dart
  3. 2
      lib/retrofit/min_api.dart
  4. 2
      lib/retrofit/retrofit_api.dart
  5. 13
      lib/store/store_order.dart
  6. 31
      lib/union/union_list.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 = 5;
CURRENT_PROJECT_VERSION = 6;
DEVELOPMENT_TEAM = YF3Q8DVP52;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
@ -666,7 +666,7 @@
"$(PROJECT_DIR)/baidu",
"$(PROJECT_DIR)/Runner/baidu",
);
MARKETING_VERSION = 2.0.5;
MARKETING_VERSION = 2.0.6;
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 = 5;
CURRENT_PROJECT_VERSION = 6;
DEVELOPMENT_TEAM = YF3Q8DVP52;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
@ -866,7 +866,7 @@
"$(PROJECT_DIR)/baidu",
"$(PROJECT_DIR)/Runner/baidu",
);
MARKETING_VERSION = 2.0.5;
MARKETING_VERSION = 2.0.6;
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 = 5;
CURRENT_PROJECT_VERSION = 6;
DEVELOPMENT_TEAM = YF3Q8DVP52;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
@ -957,7 +957,7 @@
"$(PROJECT_DIR)/baidu",
"$(PROJECT_DIR)/Runner/baidu",
);
MARKETING_VERSION = 2.0.5;
MARKETING_VERSION = 2.0.6;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = (
"$(inherited)",

87
lib/mine/mine_view/mine_item.dart
Unescape View File

@ -228,29 +228,29 @@ class _MineItem extends State<MineItem> {
Row(
children: [
///我的砍价
Expanded(child:
InkWell(
onTap: () {
Navigator.of(context)
.pushNamed('/router/bargain_group_order',
arguments: {"type":3});
},
child: mineItem(
S.of(context).wodekanjia,
"assets/image/bargain.webp",
),
),),
///我的拼团
Expanded(child: InkWell(
onTap: () {
Navigator.of(context).pushNamed('/router/bargain_group_order',
arguments: {"type":1});
},
child: mineItem(
S.of(context).wodepintuan,
"assets/image/collage.webp",
),
),),
// Expanded(child:
// InkWell(
// onTap: () {
// Navigator.of(context)
// .pushNamed('/router/bargain_group_order',
// arguments: {"type":3});
// },
// child: mineItem(
// S.of(context).wodekanjia,
// "assets/image/bargain.webp",
// ),
// ),),
// ///我的拼团
// Expanded(child: InkWell(
// onTap: () {
// Navigator.of(context).pushNamed('/router/bargain_group_order',
// arguments: {"type":1});
// },
// child: mineItem(
// S.of(context).wodepintuan,
// "assets/image/collage.webp",
// ),
// ),),
///商户入驻
Expanded(child: InkWell(
onTap: () {
@ -272,6 +272,27 @@ class _MineItem extends State<MineItem> {
"assets/image/fan_kui.webp",
),
),),
///联系客服
Expanded(child: InkWell(
onTap: () {
showCallMobile();
},
child: mineItem(
"联系客服",
"assets/image/icon_mine_online_service.webp",
),
),),
Expanded(child:Container(),),
// ///帮助反馈
// Expanded(child: InkWell(
// onTap: () {
// Navigator.of(context).pushNamed('/router/help_feedback_page');
// },
// child: mineItem(
// S.of(context).bangzhuyufankui,
// "assets/image/fan_kui.webp",
// ),
// ),),
// Expanded(child: InkWell(
// onTap: () {
// Navigator.of(context).pushNamed('/router/qr_share', arguments: {});
@ -308,16 +329,16 @@ class _MineItem extends State<MineItem> {
// "assets/image/bill_gl.webp",
// ),
// ),),
///联系客服
Expanded(child: InkWell(
onTap: () {
showCallMobile();
},
child: mineItem(
"联系客服",
"assets/image/icon_mine_online_service.webp",
),
),),
// ///联系客服
// Expanded(child: InkWell(
// onTap: () {
// showCallMobile();
// },
// child: mineItem(
// "联系客服",
// "assets/image/icon_mine_online_service.webp",
// ),
// ),),
Expanded(child:Container(),),
Expanded(child:Container(),),
Expanded(child:Container(),),

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 = "http://192.168.10.236:8765/app/";///线上
const serviceBaseUrl = "https://pos.api.lotus-wallet.com/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 = "http://192.168.10.236:8766/app/";///线上
const serviceBaseUrl = "https://pos.platform.lotus-wallet.com/app/";///线上
@RestApi(baseUrl: localBaseUrl)
abstract class ApiService {

13
lib/store/store_order.dart
Unescape View File

@ -203,17 +203,7 @@ class _StoreOrderPage extends State<StoreOrderPage>
@override
Widget build(BuildContext context) {
return WillPopScope(
onWillPop: () async {
if (dialogShowing) {
debugPrint("ssssasdadsasdadasd");
SmartDialog.dismiss();
return false;
} else {
return true;
}
},
child: Container(
return Container(
color: Colors.white,
child: Stack(
children: [
@ -532,7 +522,6 @@ class _StoreOrderPage extends State<StoreOrderPage>
),
],
),
),
);
}

31
lib/union/union_list.dart
Unescape View File

@ -55,21 +55,22 @@ class _UnionList extends State<UnionList> {
itemBuilder: (context, position) {
return InkWell(
onTap: () {
if (widget.storeList[position].posType.code == "NORMALSTORE") {
showDeleteDialog();
} else if (widget.storeList[position].posType.code ==
"RETAILSTORE" &&
widget.storeList[position].storeName == "一心回乡商城") {
Navigator.of(context).pushNamed(
'/router/shopping_mall_home',
arguments: {
"type": 0,
"id": widget.storeList[position].id,
"tenant": widget.storeList[position].tenantCode,
"storeName": widget.storeList[position].storeName
},
);
} else {
// if (widget.storeList[position].posType.code == "NORMALSTORE") {
// showDeleteDialog();
// } else if (widget.storeList[position].posType.code ==
// "RETAILSTORE" &&
// widget.storeList[position].storeName == "一心回乡商城") {
// Navigator.of(context).pushNamed(
// '/router/shopping_mall_home',
// arguments: {
// "type": 0,
// "id": widget.storeList[position].id,
// "tenant": widget.storeList[position].tenantCode,
// "storeName": widget.storeList[position].storeName
// },
// );
// } else
{
Navigator.of(context).pushNamed(
'/router/store_order',
arguments: {

Write Preview
Loading…
Cancel
Save