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

ios，

new_revision_app
fmk 2 years ago
parent
81837a2724
commit
1b5a815a37
8 changed files with 68 additions and 88 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      ios/Runner.xcodeproj/project.pbxproj
  2. 2
      lib/login/new_login_page.dart
  3. 4
      lib/message/system_details.dart
  4. 4
      lib/message/system_message.dart
  5. 134
      lib/order/order_detail_page.dart
  6. 2
      lib/settlement/settlement.dart
  7. 2
      lib/utils/status_utils.dart
  8. 2
      lib/view_widget/new_coupon_widget.dart

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

@ -617,7 +617,7 @@
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 3; CURRENT_PROJECT_VERSION = 4;
DEVELOPMENT_TEAM = YF3Q8DVP52; DEVELOPMENT_TEAM = YF3Q8DVP52;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
@ -819,7 +819,7 @@
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 3; CURRENT_PROJECT_VERSION = 4;
DEVELOPMENT_TEAM = YF3Q8DVP52; DEVELOPMENT_TEAM = YF3Q8DVP52;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
@ -912,7 +912,7 @@
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 3; CURRENT_PROJECT_VERSION = 4;
DEVELOPMENT_TEAM = YF3Q8DVP52; DEVELOPMENT_TEAM = YF3Q8DVP52;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (

2
lib/login/new_login_page.dart
Unescape View File

@ -416,7 +416,7 @@ class _NewLoginPage extends State<NewLoginPage> {
Container( Container(
height: 30.h, height: 30.h,
width: MediaQuery.of(context).size.width - 100.w, width: MediaQuery.of(context).size.width - 100.w,
margin: EdgeInsets.only(bottom:5.h), margin: EdgeInsets.only(bottom:10.h),
child: TextField( child: TextField(
style: TextStyle( style: TextStyle(
height: 1.h, height: 1.h,

4
lib/message/system_details.dart
Unescape View File

@ -243,7 +243,7 @@ class _SystemDetails extends State<SystemDetails> {
? "assets/image/icon_system_message.webp" ? "assets/image/icon_system_message.webp"
: (message.typed == 2) : (message.typed == 2)
? "assets/image/icon_system_message.webp" ? "assets/image/icon_system_message.webp"
: "assets/image/c_z.webp", : "assets/image/icon_cz.webp",
width: 24.w, width: 24.w,
height: 24.h, height: 24.h,
), ),
@ -370,7 +370,7 @@ class _SystemDetails extends State<SystemDetails> {
? "assets/image/icon_system_message.webp" ? "assets/image/icon_system_message.webp"
: (message.typed == 2) : (message.typed == 2)
? "assets/image/icon_system_message.webp" ? "assets/image/icon_system_message.webp"
: "assets/image/c_z.webp", : "assets/image/icon_cz.webp",
width: 24.w, width: 24.w,
height: 24.h, height: 24.h,
), ),

4
lib/message/system_message.dart
Unescape View File

@ -154,6 +154,7 @@ class _SystemMessagePage extends State<SystemMessagePage> {
// ), // ),
// ], // ],
// ), // ),
backgroundColor: Colors.white,
body: SmartRefresher( body: SmartRefresher(
enablePullDown: true, enablePullDown: true,
enablePullUp: true, enablePullUp: true,
@ -363,6 +364,7 @@ class _SystemMessagePage extends State<SystemMessagePage> {
), ),
], ],
), ),
if(title != S.of(context).xitongxiaoxi)
Container( Container(
margin: EdgeInsets.only(top: 12.h), margin: EdgeInsets.only(top: 12.h),
width: double.infinity, width: double.infinity,
@ -643,7 +645,7 @@ class _SystemMessagePage extends State<SystemMessagePage> {
? "assets/image/icon_system_message.webp" ? "assets/image/icon_system_message.webp"
: (message.typed == 2) : (message.typed == 2)
? "assets/image/icon_system_message.webp" ? "assets/image/icon_system_message.webp"
: "assets/image/c_z.webp", : "assets/image/icon.webp",
width: 40.w, width: 40.w,
height: 40.h, height: 40.h,
), ),

134
lib/order/order_detail_page.dart
Unescape View File

@ -39,14 +39,17 @@ class _OrderDetailPage extends State<OrderDetailPage> {
ApiService apiService; ApiService apiService;
MinApiService minService; MinApiService minService;
int jumpState; int jumpState;
final RefreshController refreshController = RefreshController();
@override @override
void initState() { void initState() {
super.initState(); super.initState();
SharedPreferences.getInstance().then((value) { SharedPreferences.getInstance().then((value) {
apiService = ApiService(Dio(), apiService = ApiService(
context: context, token: value.getString("token"), showLoading: true); Dio(),
context: context,
token: value.getString("token"),
showLoading: true
);
queryDetails(); queryDetails();
}); });
jumpState = widget.arguments["jumpState"]; jumpState = widget.arguments["jumpState"];
@ -63,7 +66,7 @@ class _OrderDetailPage extends State<OrderDetailPage> {
String tenant = orderInfo.tenantCode; String tenant = orderInfo.tenantCode;
String storeId = orderInfo.storeId; String storeId = orderInfo.storeId;
SharedPreferences.getInstance().then( SharedPreferences.getInstance().then(
(value) => { (value) => {
value.setString('minToken', minToken), value.setString('minToken', minToken),
value.setString('tenant', tenant), value.setString('tenant', tenant),
value.setString('storeId', storeId), value.setString('storeId', storeId),
@ -91,19 +94,16 @@ class _OrderDetailPage extends State<OrderDetailPage> {
queryDetails() async { queryDetails() async {
if (apiService == null) { if (apiService == null) {
SharedPreferences value = await SharedPreferences.getInstance(); SharedPreferences value = await SharedPreferences.getInstance();
apiService = ApiService(Dio(), apiService = ApiService(
Dio(),
context: context, context: context,
token: value.getString("token"), token: value.getString("token"),
showLoading: false); showLoading: false
);
} }
BaseData<OrderInfo> baseData = await apiService BaseData<OrderInfo> baseData = await apiService
.orderDetail(widget.arguments["id"]) .orderDetail(widget.arguments["id"])
.catchError((error) { .catchError((error) {});
SmartDialog.showToast(AppUtils.dioErrorTypeToString(error.type),
alignment: Alignment.center);
refreshController.refreshFailed();
refreshController.loadFailed();
});
if (baseData != null && baseData.isSuccess) { if (baseData != null && baseData.isSuccess) {
orderInfo = baseData.data; orderInfo = baseData.data;
payStatus = orderInfo.payStatus; payStatus = orderInfo.payStatus;
@ -123,12 +123,8 @@ class _OrderDetailPage extends State<OrderDetailPage> {
setState(() { setState(() {
statusTitle(); statusTitle();
}); });
refreshController.refreshCompleted(); }else{
refreshController.loadComplete(); SmartDialog.showToast(baseData.msg,alignment: Alignment.center);
} else {
SmartDialog.showToast(baseData.msg, alignment: Alignment.center);
refreshController.refreshFailed();
refreshController.loadFailed();
} }
} }
@ -163,70 +159,52 @@ class _OrderDetailPage extends State<OrderDetailPage> {
leadingColor: Colors.white, leadingColor: Colors.white,
brightness: Brightness.dark, brightness: Brightness.dark,
), ),
body: SmartRefresher( body: Container(
controller: refreshController, child: SingleChildScrollView(
enablePullDown: true, physics: BouncingScrollPhysics(),
enablePullUp: false, child: Container(
header: MyHeader(), child: Column(
footer: CustomFooter( children: [
builder: (context, mode) { ///订单状态显示
return MyFooter(mode); OrderStatus(
}, orderStatus,
), isTakeOut,
onRefresh:(){ sendStatus,
setState(() { payStatus,
queryDetails(); refundStatus,
}); title,
}, center,
physics: BouncingScrollPhysics(), orderInfo,
scrollController: ScrollController(), ),
child: Container(
child: SingleChildScrollView(
physics: BouncingScrollPhysics(),
child: Container(
child: Column(
children: [
///订单状态显示
OrderStatus(
orderStatus,
isTakeOut,
sendStatus,
payStatus,
refundStatus,
title,
center,
orderInfo,
),
///订单取货地址，或， 收货地址 ///订单取货地址，或， 收货地址
if(orderInfo != null && orderInfo.addressExt != null) if(orderInfo != null && orderInfo.addressExt != null)
OrderAddress( OrderAddress(
orderStatus, orderStatus,
isTakeOut, isTakeOut,
sendStatus, sendStatus,
payStatus, payStatus,
refundStatus, refundStatus,
title, title,
center, center,
paySelected, paySelected,
_orderCancel, _orderCancel,
orderInfo, orderInfo,
jumpState jumpState
), ),
///订单商品 ///订单商品
if(orderInfo != null) if(orderInfo != null)
OrderCommodity(orderInfo), OrderCommodity(orderInfo),
///显示订单信息 ///显示订单信息
if(orderInfo != null) if(orderInfo != null)
OrderInfoView(orderInfo, isTakeOut), OrderInfoView(orderInfo, isTakeOut),
Container( Container(
height: 42.h, height: 42.h,
), ),
], ],
),
), ),
), ),
), ),

2
lib/settlement/settlement.dart
Unescape View File

@ -518,7 +518,7 @@ class _Settlement extends State<Settlement> {
placeOrderFirst.storeId = storeInfo.id; placeOrderFirst.storeId = storeInfo.id;
placeOrderFirst.subcribeTime = null; placeOrderFirst.subcribeTime = null;
placeOrderFirst.tableId = "$tableId"; placeOrderFirst.tableId = "$tableId";
for(int i = 0;i<placeOrderFirst.shoppingCartSkuItemList.length;i++){ for(int i = 0;i<shopCarGoods.shoppingCartSkuItemList.length;i++){
placeOrderFirst.shoppingCartSkuItemList[i].setMealDataList = shopCarGoods.shoppingCartSkuItemList[i].setMealDataList; placeOrderFirst.shoppingCartSkuItemList[i].setMealDataList = shopCarGoods.shoppingCartSkuItemList[i].setMealDataList;
} }

2
lib/utils/status_utils.dart
Unescape View File

@ -174,7 +174,7 @@ class StatusUtils {
Expanded( Expanded(
flex: 1, flex: 1,
child: Container( child: Container(
margin: EdgeInsets.only(left: 37.w), margin: EdgeInsets.only(left: 20.w),
alignment: Alignment.centerLeft, alignment: Alignment.centerLeft,
child: Text( child: Text(
S.of(context).qudanhao(dayFlowCode), S.of(context).qudanhao(dayFlowCode),

2
lib/view_widget/new_coupon_widget.dart
Unescape View File

@ -88,7 +88,7 @@ class NewCouponWidget extends StatelessWidget {
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
style: TextStyle( style: TextStyle(
fontSize: 15.sp, fontSize: 15.sp,
height: 1.2.h, height: 1.3.h,
fontWeight: MyFontWeight.semi_bold, fontWeight: MyFontWeight.semi_bold,
color: Color(0xFF0D0D0D), color: Color(0xFF0D0D0D),
), ),

Write Preview
Loading…
Cancel
Save