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

部分更新

master
w-R 3 years ago
parent
9362b67dd4
commit
09ef7c1411
11 changed files with 37 additions and 31 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. 4
      lib/home/points_mall_page.dart
  2. 4
      lib/mine/vip_card_page.dart
  3. 4
      lib/mine/vip_detail_page.dart
  4. 4
      lib/order/exchange_history_page.dart
  5. 2
      lib/order/logistics_information_page.dart
  6. 4
      lib/order/order_history_page.dart
  7. 12
      lib/retrofit/retrofit_api.dart
  8. 5
      lib/retrofit/retrofit_api.g.dart
  9. 4
      lib/setting/about_page.dart
  10. 4
      lib/union/union_details_page.dart
  11. 21
      lib/union/union_page.dart

4
lib/home/points_mall_page.dart
Unescape View File

@ -448,8 +448,8 @@ class _PointsMallPage extends State<PointsMallPage>
borderRadius: BorderRadius.only(topRight: Radius.circular(4)), borderRadius: BorderRadius.only(topRight: Radius.circular(4)),
child: Image.asset( child: Image.asset(
"assets/image/icon_hot_right_top.png", "assets/image/icon_hot_right_top.png",
width: 36.w, width: 36,
height: 36.h, height: 36,
fit: BoxFit.cover, fit: BoxFit.cover,
), ),
), ),

4
lib/mine/vip_card_page.dart
Unescape View File

@ -145,8 +145,8 @@ class _VipCardPage extends State<VipCardPage> {
children: [ children: [
MImage( MImage(
(vipCard?.storeList?.length ?? 0) > 0 ? vipCard.storeList[0].logo : "", (vipCard?.storeList?.length ?? 0) > 0 ? vipCard.storeList[0].logo : "",
width: 54.w, width: 54,
height: 54.h, height: 54,
fit: BoxFit.cover, fit: BoxFit.cover,
radius: BorderRadius.circular(4), radius: BorderRadius.circular(4),
errorSrc: "assets/image/default_1.png", errorSrc: "assets/image/default_1.png",

4
lib/mine/vip_detail_page.dart
Unescape View File

@ -192,8 +192,8 @@ class _VipDetailPage extends State<VipDetailPage> {
(vipCard?.storeList?.length ?? 0) > 0 (vipCard?.storeList?.length ?? 0) > 0
? vipCard.storeList[0].logo ? vipCard.storeList[0].logo
: "", : "",
width: 40.w, width: 40,
height: 40.h, height: 40,
radius: BorderRadius.circular(4), radius: BorderRadius.circular(4),
fit: BoxFit.cover, fit: BoxFit.cover,
errorSrc: "assets/image/default_1.png", errorSrc: "assets/image/default_1.png",

4
lib/order/exchange_history_page.dart
Unescape View File

@ -334,8 +334,8 @@ class _ExchangeHistoryList extends State<ExchangeHistoryList> {
return Image.asset("assets/image/default_1.png", return Image.asset("assets/image/default_1.png",
fit: BoxFit.cover); fit: BoxFit.cover);
}, },
width: 66.w, width: 66,
height: 66.h, height: 66,
fit: BoxFit.cover, fit: BoxFit.cover,
), ),
SizedBox( SizedBox(

2
lib/order/logistics_information_page.dart
Unescape View File

@ -397,7 +397,7 @@ class _LogisticsInformationPage extends State<LogisticsInformationPage> {
} }
String tripStatus(String type) { String tripStatus(String type) {
String tripStatus = "assets/image/icon_sign.png"; String tripStatus = "●";
if (type.contains("已签收")) { if (type.contains("已签收")) {
tripStatus = "assets/image/icon_sign.png"; tripStatus = "assets/image/icon_sign.png";
} else if (type.contains("派送中")) { } else if (type.contains("派送中")) {

4
lib/order/order_history_page.dart
Unescape View File

@ -473,8 +473,8 @@ class _OrderHistoryList extends State<OrderHistoryList>
children: [ children: [
MImage( MImage(
e.skuImg, e.skuImg,
width: 75.w, width: 75,
height: 75.w, height: 75,
fit: BoxFit.cover, fit: BoxFit.cover,
errorSrc: "assets/image/default_1.png", errorSrc: "assets/image/default_1.png",
fadeSrc: "assets/image/default_1.png", fadeSrc: "assets/image/default_1.png",

12
lib/retrofit/retrofit_api.dart
Unescape View File

@ -14,11 +14,11 @@ import 'package:shared_preferences/shared_preferences.dart';
part 'retrofit_api.g.dart'; part 'retrofit_api.g.dart';
const base_url = "https://pos.platform.lotus-wallet.com/app/"; ///正式 // const base_url = "https://pos.platform.lotus-wallet.com/app/";///正式
const baseUrl = "https://pos.platform.lotus-wallet.com/app/"; ///正式 // const baseUrl = "https://pos.platform.lotus-wallet.com/app/";///正式
// const base_url = "http://192.168.10.236:8766/app/"; const base_url = "http://192.168.10.236:8766/app/";
// const baseUrl = "http://192.168.10.236:8766/app/"; const baseUrl = "http://192.168.10.236:8766/app/";
/// 本地 /// 本地
@ -322,6 +322,6 @@ abstract class ApiService {
///查询物流轨迹 ///查询物流轨迹
@GET("/order/getShippingTrace/{shipperCode}/{logisticCode}") @GET("/order/getShippingTrace/{shipperCode}/{logisticCode}")
Future<BaseData> shippingTrace(@Path("shipperCode") String shipperCode, @Path("logisticCode") String logisticCode); Future<BaseData> shippingTrace(@Path("shipperCode") String shipperCode,
@Path("logisticCode") String logisticCode);
} }

5
lib/retrofit/retrofit_api.g.dart
Unescape View File

@ -9,7 +9,10 @@ part of 'retrofit_api.dart';
class _ApiService implements ApiService { class _ApiService implements ApiService {
_ApiService(this._dio, {this.baseUrl}) { _ApiService(this._dio, {this.baseUrl}) {
ArgumentError.checkNotNull(_dio, '_dio'); ArgumentError.checkNotNull(_dio, '_dio');
baseUrl ??= 'https://pos.platform.lotus-wallet.com/app/'; // baseUrl ??= 'https://pos.platform.lotus-wallet.com/app/';
baseUrl ??= 'http://192.168.10.236:8766/app/';
} }
final Dio _dio; final Dio _dio;

4
lib/setting/about_page.dart
Unescape View File

@ -52,8 +52,8 @@ class _AboutPage extends State<AboutPage> {
children: [ children: [
Image.asset( Image.asset(
"assets/image/icon_about_logo.png", "assets/image/icon_about_logo.png",
width: 130.w, width: 130,
height: 130.h, height: 130,
), ),
Padding( Padding(
padding: EdgeInsets.only(top: 32.h, bottom: 5.h), padding: EdgeInsets.only(top: 32.h, bottom: 5.h),

4
lib/union/union_details_page.dart
Unescape View File

@ -255,8 +255,8 @@ class _UnionDetailsPage extends State<UnionDetailsPage> {
}, },
child: Image.asset( child: Image.asset(
"assets/image/icon_union_call.png", "assets/image/icon_union_call.png",
width: 24.w, width: 24,
height: 24.h, height: 24,
), ),
) )
], ],

21
lib/union/union_page.dart
Unescape View File

@ -22,8 +22,6 @@ import 'package:huixiang/view_widget/classic_header.dart';
import 'package:huixiang/view_widget/custom_image.dart'; import 'package:huixiang/view_widget/custom_image.dart';
import 'package:huixiang/view_widget/icon_text.dart'; import 'package:huixiang/view_widget/icon_text.dart';
import 'package:huixiang/view_widget/item_title.dart'; import 'package:huixiang/view_widget/item_title.dart';
import 'package:huixiang/view_widget/request_permission.dart';
import 'package:permission_handler/permission_handler.dart';
import 'package:pull_to_refresh/pull_to_refresh.dart'; import 'package:pull_to_refresh/pull_to_refresh.dart';
import 'package:shared_preferences/shared_preferences.dart'; import 'package:shared_preferences/shared_preferences.dart';
import 'package:flutter/rendering.dart'; import 'package:flutter/rendering.dart';
@ -432,8 +430,8 @@ class _UnionPage extends State<UnionPage>
children: [ children: [
MImage( MImage(
store.logo, store.logo,
width: 100.h, width: 100,
height: 100.h, height: 100,
fit: BoxFit.cover, fit: BoxFit.cover,
errorSrc: "assets/image/default_1.png", errorSrc: "assets/image/default_1.png",
fadeSrc: "assets/image/default_1.png", fadeSrc: "assets/image/default_1.png",
@ -526,8 +524,8 @@ class _UnionPage extends State<UnionPage>
padding: EdgeInsets.only(top: 1.h, left: 2, right: 2), padding: EdgeInsets.only(top: 1.h, left: 2, right: 2),
child: Image.asset( child: Image.asset(
"assets/image/icon_union_location_black.png", "assets/image/icon_union_location_black.png",
width: 14.w, width: 14,
height: 14.w, height: 14,
), ),
), ),
Expanded( Expanded(
@ -554,7 +552,8 @@ class _UnionPage extends State<UnionPage>
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
IconText( IconText(
(store.openStartTime == null && store.openEndTime == null) (store.openStartTime == null &&
store.openEndTime == null)
? S.of(context).quantian ? S.of(context).quantian
: "${store.openStartTime.substring(0, store.openStartTime.lastIndexOf(":"))} - ${store.openEndTime.substring(0, store.openEndTime.lastIndexOf(":"))}", : "${store.openStartTime.substring(0, store.openStartTime.lastIndexOf(":"))} - ${store.openEndTime.substring(0, store.openEndTime.lastIndexOf(":"))}",
textStyle: TextStyle( textStyle: TextStyle(
@ -567,8 +566,12 @@ class _UnionPage extends State<UnionPage>
Visibility( Visibility(
child: Text( child: Text(
(store.distance ?? 0) > 1000 (store.distance ?? 0) > 1000
? S.of(context).gongli(((store.distance ?? 0) / 1000 * 100) .toInt() / 100.0) ? S.of(context).gongli(
: S.of(context).mi(((store.distance ?? 0) * 100).toInt() / 100.0), ((store.distance ?? 0) / 1000 * 100).toInt() /
100.0)
: S.of(context).mi(
((store.distance ?? 0) * 100).toInt() /
100.0),
style: TextStyle( style: TextStyle(
color: Color(0xFF4C4C4C), color: Color(0xFF4C4C4C),
fontSize: 12, fontSize: 12,

Write Preview
Loading…
Cancel
Save