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

Merge branch 'new_revision_app' into dev 

# Conflicts:
#	lib/main.dart
#	lib/order/write_off_page.dart
new_revision_app
wurong 2 years ago
parent
464f1f2377 eab02a046c
commit
90656357c5
4 changed files with 146 additions and 34 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. 3
      lib/main.dart
  2. 12
      lib/order/write_off_page.dart
  3. 75
      lib/store/store_html.dart
  4. 48
      lib/store/store_view/store_info.dart

3
lib/main.dart
Unescape View File

@ -66,6 +66,7 @@ import 'package:huixiang/store/shopping/shopping_home/group_page_details.dart';
import 'package:huixiang/store/shopping/shopping_home/search_page.dart'; import 'package:huixiang/store/shopping/shopping_home/search_page.dart';
import 'package:huixiang/store/shopping/shopping_mall_home.dart'; import 'package:huixiang/store/shopping/shopping_mall_home.dart';
import 'package:huixiang/setting/user_service_page.dart'; import 'package:huixiang/setting/user_service_page.dart';
import 'package:huixiang/store/store_html.dart';
import 'package:huixiang/store/store_order.dart'; import 'package:huixiang/store/store_order.dart';
import 'package:huixiang/settlement/settlement.dart'; import 'package:huixiang/settlement/settlement.dart';
import 'package:huixiang/store/store_view/product_meals_sku.dart'; import 'package:huixiang/store/store_view/product_meals_sku.dart';
@ -429,4 +430,6 @@ Map<String, WidgetBuilder> routers = <String, WidgetBuilder>{
SystemNotice(), SystemNotice(),
'/router/video_edit': (context, {arguments}) => '/router/video_edit': (context, {arguments}) =>
VideoEdit(), VideoEdit(),
'/router/store_html': (context, {arguments}) =>
StoreHtml(arguments:arguments),
}; };

12
lib/order/write_off_page.dart
Unescape View File

@ -104,16 +104,16 @@ class _WriteOffPage extends State<WriteOffPage> {
children: [ children: [
Container( Container(
alignment: Alignment.topCenter, alignment: Alignment.topCenter,
height: 470.h, // height: 530.h,
// height:530.h height:470.h,
child: Stack( child: Stack(
alignment: Alignment.topCenter, alignment: Alignment.topCenter,
children: [ children: [
Image.asset( Image.asset(
"assets/image/write_off_bg.webp", "assets/image/write_off_bg.webp",
width: MediaQuery.of(context).size.width * 0.912, width: MediaQuery.of(context).size.width * 0.912,
// height: 540.h,
height: 480.h, height: 480.h,
// height:540.h
fit: BoxFit.fill, fit: BoxFit.fill,
), ),
LayoutBuilder(builder: (context, constraints) { LayoutBuilder(builder: (context, constraints) {
@ -199,9 +199,9 @@ class _WriteOffPage extends State<WriteOffPage> {
// color: Colors.black, // color: Colors.black,
// drawText: false, // drawText: false,
// ), // ),
// SizedBox( SizedBox(
// height: 16.h, height: 16.h,
// ), ),
Expanded(child: QrImage( Expanded(child: QrImage(
data: "{\"type\":\"wiped\",\"memberCouponId\":\"${coupon["memberCouponId"]}\"}", data: "{\"type\":\"wiped\",\"memberCouponId\":\"${coupon["memberCouponId"]}\"}",
version: QrVersions.auto, version: QrVersions.auto,

75
lib/store/store_html.dart
Unescape View File

@ -0,0 +1,75 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_html/flutter_html.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:huixiang/utils/font_weight.dart';
class StoreHtml extends StatefulWidget {
final Map<String, dynamic> arguments;
StoreHtml({this.arguments});
@override
State<StatefulWidget> createState() {
return _StoreHtml();
}
}
class _StoreHtml extends State<StoreHtml> with WidgetsBindingObserver {
@override
void initState() {
super.initState();
}
@override
Widget build(BuildContext context) {
return Container(
color: Colors.white,
padding:EdgeInsets.only(top:MediaQuery.of(context).padding.top+17.h,left: 16.w,right: 16.w),
child: Column(
children: [
Row(
children: [
GestureDetector(
behavior: HitTestBehavior.opaque,
onTap:(){
Navigator.of(context).pop();
},
child:Image.asset(
"assets/image/integral_return.webp",
height: 24,
width: 24,
)
),
Expanded(child:
Container(
alignment: Alignment.center,
margin: EdgeInsets.only(right: 24.w),
child: Text(
"店铺详情",
style: TextStyle(
color: Colors.black,
fontSize: 17.sp,
fontWeight: MyFontWeight.regular,
),
),
),),
],
),
Container(
child: Html(
data: widget.arguments["remark"] ?? "",
customImageRenders: {
networkSourceMatcher(): networkImageRender(
loadingWidget: () {
return Container();
},
),
},
),
)
],
),
);
}
}

48
lib/store/store_view/store_info.dart
Unescape View File

@ -30,7 +30,7 @@ class _StoreInfoView extends State<StoreInfoView> {
// top: 5.h, // top: 5.h,
// bottom: 6.h, // bottom: 6.h,
), ),
height: MediaQuery.of(context).size.width >= 650 ? 180.h :166.h, height: MediaQuery.of(context).size.width >= 650 ? 180.h : 166.h,
padding: EdgeInsets.all(12.w), padding: EdgeInsets.all(12.w),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.white, color: Colors.white,
@ -54,7 +54,10 @@ class _StoreInfoView extends State<StoreInfoView> {
Expanded( Expanded(
child: Column( child: Column(
children: [ children: [
Container( Row(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Expanded(child: Container(
alignment: Alignment.centerLeft, alignment: Alignment.centerLeft,
child: Text( child: Text(
widget.storeInfo != null widget.storeInfo != null
@ -67,6 +70,40 @@ class _StoreInfoView extends State<StoreInfoView> {
fontWeight: MyFontWeight.medium, fontWeight: MyFontWeight.medium,
), ),
), ),
)),
// GestureDetector(
// behavior: HitTestBehavior.opaque,
// onTap: (){
// Navigator.of(context).pushNamed('/router/store_html',arguments: {"remark":widget.storeInfo.remark});
// },
// child: Container(
// padding: EdgeInsets.symmetric(horizontal:8.w,vertical:3.h),
// decoration: BoxDecoration(
// borderRadius: BorderRadius.circular(2),
// border: Border.all(
// color:Color(0xFFEDEDED),
// )
// ),
// child: Row(
// children: [
// Text(
// "店铺详情",
// style: TextStyle(
// fontWeight: MyFontWeight.regular,
// fontSize: 12.sp,
// color: Color(0xFF4C4C4C),
// ),
// ),
// Image.asset(
// "assets/image/icon_right_z.webp",
// height:12.h,
// width:12.w,
// )
// ],
// ),
// ),
// )
],
), ),
Row( Row(
children: [ children: [
@ -128,10 +165,8 @@ class _StoreInfoView extends State<StoreInfoView> {
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
Expanded( Expanded(
child:Text( child: Text(
"${S.of(context).dizhi}:${widget.storeInfo != null "${S.of(context).dizhi}:${widget.storeInfo != null ? widget.storeInfo.address : ""}",
? widget.storeInfo.address
: ""}",
maxLines: 2, maxLines: 2,
textAlign: TextAlign.justify, textAlign: TextAlign.justify,
style: TextStyle( style: TextStyle(
@ -187,7 +222,6 @@ class _StoreInfoView extends State<StoreInfoView> {
); );
} }
showCallMobile() { showCallMobile() {
showCupertinoModalPopup( showCupertinoModalPopup(
context: context, context: context,

Write Preview
Loading…
Cancel
Save