xt / Flutter-ReserveApp · Commits

Go to a project

Commit e4185d48bb5f52875bd1cc9f2732db12bbc0c235

Authored by wdn127929
1 parent 94a0e8a7
build: skipped

客户存酒+微信小程序跳转到体验版

Inline Side-by-side
Showing 18 changed files with 100 additions and 91 deletions
@@ -14,16 +14,16 @@ if (flutterRoot == null) { @@ -14,16 +14,16 @@ if (flutterRoot == null) {
14 14
15 15
16 16
17 -def flutterVersionCode = "460" 17 +def flutterVersionCode = "461"
18 if (flutterVersionCode == null) { 18 if (flutterVersionCode == null) {
19 - flutterVersionCode = '460' 19 + flutterVersionCode = '461'
20 } 20 }
21 21
22 22
23 23
24 -def flutterVersionName = "4.6.0" 24 +def flutterVersionName = "4.6.1"
25 if (flutterVersionName == null) { 25 if (flutterVersionName == null) {
26 - flutterVersionName = '4.6.0' 26 + flutterVersionName = '4.6.1'
27 } 27 }
28 28
29 29
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 archiveVersion = 1; 3 archiveVersion = 1;
4 classes = { 4 classes = {
5 }; 5 };
6 - objectVersion = 50; 6 + objectVersion = 46;
7 objects = { 7 objects = {
8 8
9 /* Begin PBXBuildFile section */ 9 /* Begin PBXBuildFile section */
@@ -505,7 +505,7 @@ @@ -505,7 +505,7 @@
505 CODE_SIGN_IDENTITY = "iPhone Developer"; 505 CODE_SIGN_IDENTITY = "iPhone Developer";
506 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; 506 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
507 CODE_SIGN_STYLE = Automatic; 507 CODE_SIGN_STYLE = Automatic;
508 - CURRENT_PROJECT_VERSION = 444; 508 + CURRENT_PROJECT_VERSION = 461;
509 DEVELOPMENT_TEAM = 8J59HM8B82; 509 DEVELOPMENT_TEAM = 8J59HM8B82;
510 ENABLE_BITCODE = NO; 510 ENABLE_BITCODE = NO;
511 FLUTTER_BUILD_MODE = release; 511 FLUTTER_BUILD_MODE = release;
@@ -515,15 +515,12 @@ @@ -515,15 +515,12 @@
515 ); 515 );
516 INFOPLIST_FILE = Runner/Info.plist; 516 INFOPLIST_FILE = Runner/Info.plist;
517 IPHONEOS_DEPLOYMENT_TARGET = 11.0; 517 IPHONEOS_DEPLOYMENT_TARGET = 11.0;
518 - LD_RUNPATH_SEARCH_PATHS = (  
519 - "$(inherited)",  
520 - "@executable_path/Frameworks",  
521 - ); 518 + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
522 LIBRARY_SEARCH_PATHS = ( 519 LIBRARY_SEARCH_PATHS = (
523 "$(inherited)", 520 "$(inherited)",
524 "$(PROJECT_DIR)/Flutter", 521 "$(PROJECT_DIR)/Flutter",
525 ); 522 );
526 - MARKETING_VERSION = 4.4.4; 523 + MARKETING_VERSION = 4.6.1;
527 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 524 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
528 PRODUCT_NAME = Runner; 525 PRODUCT_NAME = Runner;
529 PROVISIONING_PROFILE_SPECIFIER = ""; 526 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -654,7 +651,7 @@ @@ -654,7 +651,7 @@
654 CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements"; 651 CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements";
655 CODE_SIGN_IDENTITY = "iPhone Developer"; 652 CODE_SIGN_IDENTITY = "iPhone Developer";
656 CODE_SIGN_STYLE = Automatic; 653 CODE_SIGN_STYLE = Automatic;
657 - CURRENT_PROJECT_VERSION = 444; 654 + CURRENT_PROJECT_VERSION = 461;
658 DEVELOPMENT_TEAM = 8J59HM8B82; 655 DEVELOPMENT_TEAM = 8J59HM8B82;
659 ENABLE_BITCODE = NO; 656 ENABLE_BITCODE = NO;
660 FLUTTER_BUILD_MODE = release; 657 FLUTTER_BUILD_MODE = release;
@@ -664,15 +661,12 @@ @@ -664,15 +661,12 @@
664 ); 661 );
665 INFOPLIST_FILE = Runner/Info.plist; 662 INFOPLIST_FILE = Runner/Info.plist;
666 IPHONEOS_DEPLOYMENT_TARGET = 11.0; 663 IPHONEOS_DEPLOYMENT_TARGET = 11.0;
667 - LD_RUNPATH_SEARCH_PATHS = (  
668 - "$(inherited)",  
669 - "@executable_path/Frameworks",  
670 - ); 664 + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
671 LIBRARY_SEARCH_PATHS = ( 665 LIBRARY_SEARCH_PATHS = (
672 "$(inherited)", 666 "$(inherited)",
673 "$(PROJECT_DIR)/Flutter", 667 "$(PROJECT_DIR)/Flutter",
674 ); 668 );
675 - MARKETING_VERSION = 4.4.4; 669 + MARKETING_VERSION = 4.6.1;
676 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 670 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
677 PRODUCT_NAME = Runner; 671 PRODUCT_NAME = Runner;
678 PROVISIONING_PROFILE_SPECIFIER = ""; 672 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -693,7 +687,7 @@ @@ -693,7 +687,7 @@
693 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; 687 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
694 CODE_SIGN_IDENTITY = "iPhone Developer"; 688 CODE_SIGN_IDENTITY = "iPhone Developer";
695 CODE_SIGN_STYLE = Automatic; 689 CODE_SIGN_STYLE = Automatic;
696 - CURRENT_PROJECT_VERSION = 444; 690 + CURRENT_PROJECT_VERSION = 461;
697 DEVELOPMENT_TEAM = 8J59HM8B82; 691 DEVELOPMENT_TEAM = 8J59HM8B82;
698 ENABLE_BITCODE = NO; 692 ENABLE_BITCODE = NO;
699 FLUTTER_BUILD_MODE = release; 693 FLUTTER_BUILD_MODE = release;
@@ -703,15 +697,12 @@ @@ -703,15 +697,12 @@
703 ); 697 );
704 INFOPLIST_FILE = Runner/Info.plist; 698 INFOPLIST_FILE = Runner/Info.plist;
705 IPHONEOS_DEPLOYMENT_TARGET = 11.0; 699 IPHONEOS_DEPLOYMENT_TARGET = 11.0;
706 - LD_RUNPATH_SEARCH_PATHS = (  
707 - "$(inherited)",  
708 - "@executable_path/Frameworks",  
709 - ); 700 + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
710 LIBRARY_SEARCH_PATHS = ( 701 LIBRARY_SEARCH_PATHS = (
711 "$(inherited)", 702 "$(inherited)",
712 "$(PROJECT_DIR)/Flutter", 703 "$(PROJECT_DIR)/Flutter",
713 ); 704 );
714 - MARKETING_VERSION = 4.4.4; 705 + MARKETING_VERSION = 4.6.1;
715 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 706 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
716 PRODUCT_NAME = Runner; 707 PRODUCT_NAME = Runner;
717 PROVISIONING_PROFILE_SPECIFIER = ""; 708 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -64,8 +64,8 @@ class _BookInfoPageState extends State<BookInfoPage> { @@ -64,8 +64,8 @@ class _BookInfoPageState extends State<BookInfoPage> {
64 _initData(context); 64 _initData(context);
65 65
66 await marketingCenterProvider.getTableList(context); 66 await marketingCenterProvider.getTableList(context);
67 - await _getStoreBaseinfo();  
68 - await _getCustomerActivityBaseinfo(); 67 + _getStoreBaseinfo();
  68 + _getCustomerActivityBaseinfo();
69 69
70 await getSellerTemplateConf(); 70 await getSellerTemplateConf();
71 }); 71 });
@@ -451,7 +451,9 @@ class _BookInfoPageState extends State<BookInfoPage> { @@ -451,7 +451,9 @@ class _BookInfoPageState extends State<BookInfoPage> {
451 ClipRRect( 451 ClipRRect(
452 borderRadius: BorderRadius.circular(r(35)), 452 borderRadius: BorderRadius.circular(r(35)),
453 child: Image.network( 453 child: Image.network(
454 - _baseIndoProvider.baseInfoSunModel.photo == 454 + _baseIndoProvider.baseInfoSunModel == null ||
  455 + _baseIndoProvider
  456 + .baseInfoSunModel.photo ==
455 null || 457 null ||
456 _baseIndoProvider 458 _baseIndoProvider
457 .baseInfoSunModel.photo == 459 .baseInfoSunModel.photo ==
@@ -469,7 +471,7 @@ class _BookInfoPageState extends State<BookInfoPage> { @@ -469,7 +471,7 @@ class _BookInfoPageState extends State<BookInfoPage> {
469 crossAxisAlignment: CrossAxisAlignment.start, 471 crossAxisAlignment: CrossAxisAlignment.start,
470 children: [ 472 children: [
471 Text( 473 Text(
472 - '专属服务：${_baseIndoProvider.baseInfoSunModel.name}', 474 + '专属服务：${_baseIndoProvider.baseInfoSunModel == null || _baseIndoProvider.baseInfoSunModel.name == null ? Provider.of<UserModel>(context, listen: false).user.nickName : _baseIndoProvider.baseInfoSunModel.name}',
473 style: TextStyle( 475 style: TextStyle(
474 color: MyColours.color_999999, 476 color: MyColours.color_999999,
475 fontWeight: FontWeight.bold, 477 fontWeight: FontWeight.bold,
@@ -477,7 +479,7 @@ class _BookInfoPageState extends State<BookInfoPage> { @@ -477,7 +479,7 @@ class _BookInfoPageState extends State<BookInfoPage> {
477 ), 479 ),
478 VEmptyView(16), 480 VEmptyView(16),
479 Text( 481 Text(
480 - '服务电话：${_baseIndoProvider.baseInfoSunModel.phone}', 482 + '服务电话：${_baseIndoProvider.baseInfoSunModel == null || _baseIndoProvider.baseInfoSunModel.phone == null ? Provider.of<UserModel>(context, listen: false).user.userphone : _baseIndoProvider.baseInfoSunModel.phone}',
481 style: TextStyle( 483 style: TextStyle(
482 color: MyColours.color_999999, 484 color: MyColours.color_999999,
483 fontWeight: FontWeight.bold, 485 fontWeight: FontWeight.bold,
@@ -754,6 +754,10 @@ class _FirstImagePageState extends State<FirstImagePage> { @@ -754,6 +754,10 @@ class _FirstImagePageState extends State<FirstImagePage> {
754 Utils.showToast('请输入店铺slogan!'); 754 Utils.showToast('请输入店铺slogan!');
755 return false; 755 return false;
756 } 756 }
  757 + if (_uploadImageProvider.firstImage.qiniuUrl == null) {
  758 + Utils.showToast('请上传餐厅照片!');
  759 + return false;
  760 + }
757 761
758 if (_uploadImageProvider.firstImage.process < 1 && 762 if (_uploadImageProvider.firstImage.process < 1 &&
759 _uploadImageProvider.firstImage.process > 0) { 763 _uploadImageProvider.firstImage.process > 0) {
@@ -81,42 +81,42 @@ class _MarketingCenterHomePageState extends State<MarketingCenterHomePage> { @@ -81,42 +81,42 @@ class _MarketingCenterHomePageState extends State<MarketingCenterHomePage> {
81 child: SingleChildScrollView( 81 child: SingleChildScrollView(
82 child: Column( 82 child: Column(
83 children: [ 83 children: [
84 - InkWell(  
85 - onTap: () {  
86 - // NavigatorUtil.goWebPage(context, '隐私政策', "zc",  
87 - // need: true);  
88 - },  
89 - child: Padding(  
90 - padding: EdgeInsets.only(  
91 - left: w(16),  
92 - top: w(12),  
93 - bottom: w(12),  
94 - right: w(12)),  
95 - child: Row(  
96 - children: [  
97 - Text(  
98 - '会员充值优惠活动',  
99 - style: TextStyle(  
100 - color: MyColours.color_515151,  
101 - fontSize: ScreenUtil().setWidth(32)),  
102 - ),  
103 - Spacer(),  
104 - Container(  
105 - padding: EdgeInsets.symmetric(  
106 - horizontal: w(7), vertical: w(4)),  
107 - child: Image.asset(  
108 - "assets/arrow_right_new.png",  
109 - width: ScreenUtil().setWidth(18),  
110 - height: ScreenUtil().setWidth(32),  
111 - ),  
112 - )  
113 - ],  
114 - ))),  
115 - Padding(  
116 - padding: EdgeInsets.only(left: w(16)),  
117 - child: MyDivider(double.infinity, w(0.5),  
118 - color: MyColours.color_E7E7E7)),  
119 - VEmptyView(24), 84 + // InkWell(
  85 + // onTap: () {
  86 + // // NavigatorUtil.goWebPage(context, '隐私政策', "zc",
  87 + // // need: true);
  88 + // },
  89 + // child: Padding(
  90 + // padding: EdgeInsets.only(
  91 + // left: w(16),
  92 + // top: w(12),
  93 + // bottom: w(12),
  94 + // right: w(12)),
  95 + // child: Row(
  96 + // children: [
  97 + // Text(
  98 + // '会员充值优惠活动',
  99 + // style: TextStyle(
  100 + // color: MyColours.color_515151,
  101 + // fontSize: ScreenUtil().setWidth(32)),
  102 + // ),
  103 + // Spacer(),
  104 + // Container(
  105 + // padding: EdgeInsets.symmetric(
  106 + // horizontal: w(7), vertical: w(4)),
  107 + // child: Image.asset(
  108 + // "assets/arrow_right_new.png",
  109 + // width: ScreenUtil().setWidth(18),
  110 + // height: ScreenUtil().setWidth(32),
  111 + // ),
  112 + // )
  113 + // ],
  114 + // ))),
  115 + // Padding(
  116 + // padding: EdgeInsets.only(left: w(16)),
  117 + // child: MyDivider(double.infinity, w(0.5),
  118 + // color: MyColours.color_E7E7E7)),
  119 + // VEmptyView(24),
120 Padding( 120 Padding(
121 padding: EdgeInsets.only( 121 padding: EdgeInsets.only(
122 left: w(16), top: w(12), bottom: w(12), right: w(12)), 122 left: w(16), top: w(12), bottom: w(12), right: w(12)),
@@ -73,7 +73,7 @@ class _ApplyOutStoreItemPageState extends State<ApplyOutStoreItemPage> { @@ -73,7 +73,7 @@ class _ApplyOutStoreItemPageState extends State<ApplyOutStoreItemPage> {
73 ), 73 ),
74 Expanded( 74 Expanded(
75 child: Container( 75 child: Container(
76 - height: ScreenUtil().setWidth(16 * 2), 76 + // height: ScreenUtil().setWidth(16 * 2),
77 alignment: Alignment.centerRight, 77 alignment: Alignment.centerRight,
78 child: TextField( 78 child: TextField(
79 maxLines: 1, 79 maxLines: 1,
@@ -192,7 +192,7 @@ class _ApplyOutStoreItemPageState extends State<ApplyOutStoreItemPage> { @@ -192,7 +192,7 @@ class _ApplyOutStoreItemPageState extends State<ApplyOutStoreItemPage> {
192 ), 192 ),
193 Expanded( 193 Expanded(
194 child: Container( 194 child: Container(
195 - height: ScreenUtil().setWidth(16 * 2), 195 + // height: ScreenUtil().setWidth(16 * 2),
196 alignment: Alignment.centerRight, 196 alignment: Alignment.centerRight,
197 child: Text( 197 child: Text(
198 subTitle, 198 subTitle,
@@ -128,7 +128,7 @@ class _ApplyOutStorePageState extends State<ApplyOutStorePage> { @@ -128,7 +128,7 @@ class _ApplyOutStorePageState extends State<ApplyOutStorePage> {
128 ), 128 ),
129 Expanded( 129 Expanded(
130 child: Container( 130 child: Container(
131 - height: ScreenUtil().setWidth(16 * 2), 131 + // height: ScreenUtil().setWidth(16 * 2),
132 alignment: Alignment.centerRight, 132 alignment: Alignment.centerRight,
133 child: Text( 133 child: Text(
134 widget.wineManageDetail.rname + 134 widget.wineManageDetail.rname +
@@ -89,7 +89,7 @@ class _CreateStoreWinePageState extends State<CreateStoreWinePage> { @@ -89,7 +89,7 @@ class _CreateStoreWinePageState extends State<CreateStoreWinePage> {
89 ), 89 ),
90 Expanded( 90 Expanded(
91 child: Container( 91 child: Container(
92 - height: ScreenUtil().setWidth(16 * 2), 92 + // height: ScreenUtil().setWidth(16 * 2),
93 alignment: Alignment.centerRight, 93 alignment: Alignment.centerRight,
94 child: TextField( 94 child: TextField(
95 maxLines: 1, 95 maxLines: 1,
@@ -219,8 +219,8 @@ class _CreateStoreWinePageState extends State<CreateStoreWinePage> { @@ -219,8 +219,8 @@ class _CreateStoreWinePageState extends State<CreateStoreWinePage> {
219 ), 219 ),
220 Expanded( 220 Expanded(
221 child: Container( 221 child: Container(
222 - height:  
223 - ScreenUtil().setWidth(16 * 2), 222 + // height:
  223 + // ScreenUtil().setWidth(16 * 2),
224 alignment: Alignment.centerRight, 224 alignment: Alignment.centerRight,
225 child: TextField( 225 child: TextField(
226 maxLines: 1, 226 maxLines: 1,
@@ -50,7 +50,7 @@ class _CreateWineItemPageState extends State<CreateWineItemPage> { @@ -50,7 +50,7 @@ class _CreateWineItemPageState extends State<CreateWineItemPage> {
50 ), 50 ),
51 Expanded( 51 Expanded(
52 child: Container( 52 child: Container(
53 - height: ScreenUtil().setWidth(16 * 2), 53 + // height: ScreenUtil().setWidth(16 * 2),
54 alignment: Alignment.centerRight, 54 alignment: Alignment.centerRight,
55 child: TextField( 55 child: TextField(
56 maxLines: 1, 56 maxLines: 1,
@@ -162,7 +162,7 @@ class _OutStoreRecordDetailPageState extends State<OutStoreRecordDetailPage> { @@ -162,7 +162,7 @@ class _OutStoreRecordDetailPageState extends State<OutStoreRecordDetailPage> {
162 ), 162 ),
163 Expanded( 163 Expanded(
164 child: Container( 164 child: Container(
165 - height: ScreenUtil().setWidth(16 * 2), 165 + // height: ScreenUtil().setWidth(16 * 2),
166 alignment: Alignment.centerRight, 166 alignment: Alignment.centerRight,
167 child: Text( 167 child: Text(
168 '${widget.outWineRecordSunModel.rname}${widget.outWineRecordSunModel.sexStr}', 168 '${widget.outWineRecordSunModel.rname}${widget.outWineRecordSunModel.sexStr}',
@@ -48,7 +48,7 @@ class _OutStoreRecordItemPageState extends State<OutStoreRecordItemPage> { @@ -48,7 +48,7 @@ class _OutStoreRecordItemPageState extends State<OutStoreRecordItemPage> {
48 ), 48 ),
49 Expanded( 49 Expanded(
50 child: Container( 50 child: Container(
51 - height: ScreenUtil().setWidth(16 * 2), 51 + // height: ScreenUtil().setWidth(16 * 2),
52 alignment: Alignment.centerRight, 52 alignment: Alignment.centerRight,
53 child: Text( 53 child: Text(
54 subTitle, 54 subTitle,
@@ -160,7 +160,7 @@ class _OutStoreRecordPageState extends State<OutStoreRecordPage> { @@ -160,7 +160,7 @@ class _OutStoreRecordPageState extends State<OutStoreRecordPage> {
160 ), 160 ),
161 Expanded( 161 Expanded(
162 child: Container( 162 child: Container(
163 - height: ScreenUtil().setWidth(16 * 2), 163 + // height: ScreenUtil().setWidth(20 * 2),
164 alignment: Alignment.centerRight, 164 alignment: Alignment.centerRight,
165 child: Text( 165 child: Text(
166 '${storeWineProvider.outWineRecordData[0].rname}${storeWineProvider.outWineRecordData[0].sexStr}', 166 '${storeWineProvider.outWineRecordData[0].rname}${storeWineProvider.outWineRecordData[0].sexStr}',
@@ -271,6 +271,7 @@ class _StoreWineManageHomePageState extends State<StoreWineManageHomePage> @@ -271,6 +271,7 @@ class _StoreWineManageHomePageState extends State<StoreWineManageHomePage>
271 Offstage( 271 Offstage(
272 offstage: searchC.text == '', 272 offstage: searchC.text == '',
273 child: GestureDetector( 273 child: GestureDetector(
  274 + behavior: HitTestBehavior.opaque,
274 child: Container( 275 child: Container(
275 padding: EdgeInsets.symmetric( 276 padding: EdgeInsets.symmetric(
276 horizontal: ScreenUtil().setWidth(40), 277 horizontal: ScreenUtil().setWidth(40),
@@ -285,18 +286,18 @@ class _StoreWineManageHomePageState extends State<StoreWineManageHomePage> @@ -285,18 +286,18 @@ class _StoreWineManageHomePageState extends State<StoreWineManageHomePage>
285 ), 286 ),
286 ), 287 ),
287 onTap: () { 288 onTap: () {
288 - WidgetsBinding.instance.addPostFrameCallback(((_) {  
289 - searchC.clear();  
290 - // customerProvider.searchData('');  
291 - FocusScope.of(context)  
292 - .requestFocus(FocusNode()); //点击空白处隐藏键盘  
293 - if (tabController.index == 0) {  
294 - _getStoreWineBySeller(context, showLoading: false);  
295 - }  
296 - if (tabController.index == 1) {  
297 - _getStoreWineCheckList(context, showLoading: false);  
298 - }  
299 - })); 289 + // WidgetsBinding.instance.addPostFrameCallback(((_) {
  290 + searchC.clear();
  291 + // customerProvider.searchData('');
  292 + FocusScope.of(context)
  293 + .requestFocus(FocusNode()); //点击空白处隐藏键盘
  294 + if (tabController.index == 0) {
  295 + _getStoreWineBySeller(context, showLoading: false);
  296 + }
  297 + if (tabController.index == 1) {
  298 + _getStoreWineCheckList(context, showLoading: false);
  299 + }
  300 + // }));
300 }, 301 },
301 )), 302 )),
302 // Offstage( 303 // Offstage(
@@ -46,7 +46,7 @@ class _WineDetailItemPageState extends State<WineDetailItemPage> { @@ -46,7 +46,7 @@ class _WineDetailItemPageState extends State<WineDetailItemPage> {
46 ), 46 ),
47 Expanded( 47 Expanded(
48 child: Container( 48 child: Container(
49 - height: ScreenUtil().setWidth(16 * 2), 49 + // height: ScreenUtil().setWidth(16 * 2),
50 alignment: Alignment.centerRight, 50 alignment: Alignment.centerRight,
51 child: Text( 51 child: Text(
52 subTitle, 52 subTitle,
@@ -159,7 +159,7 @@ class _WineDetailPageState extends State<WineDetailPage> { @@ -159,7 +159,7 @@ class _WineDetailPageState extends State<WineDetailPage> {
159 ), 159 ),
160 Expanded( 160 Expanded(
161 child: Container( 161 child: Container(
162 - height: ScreenUtil().setWidth(16 * 2), 162 + // height: ScreenUtil().setWidth(16 * 2),
163 alignment: Alignment.centerRight, 163 alignment: Alignment.centerRight,
164 child: Text( 164 child: Text(
165 '${model.wineManageDetail.rname}${model.wineManageDetail.sexStr}', 165 '${model.wineManageDetail.rname}${model.wineManageDetail.sexStr}',
@@ -21,9 +21,8 @@ class BaseIndoProvider with ChangeNotifier { @@ -21,9 +21,8 @@ class BaseIndoProvider with ChangeNotifier {
21 21
22 TextEditingController phoneController = TextEditingController(); 22 TextEditingController phoneController = TextEditingController();
23 TextEditingController nameController = TextEditingController(); 23 TextEditingController nameController = TextEditingController();
24 - TextEditingController pnumController = TextEditingController(); 24 + TextEditingController pnumController = TextEditingController();
25 25
26 -  
27 List sexList; 26 List sexList;
28 List<UserHistoryEntity> userHistorys = []; //历史录入 27 List<UserHistoryEntity> userHistorys = []; //历史录入
29 BaseIndoProvider() { 28 BaseIndoProvider() {
@@ -139,7 +139,11 @@ class StoreWineProvider with ChangeNotifier { @@ -139,7 +139,11 @@ class StoreWineProvider with ChangeNotifier {
139 pageStateAll = PageState.Empty; 139 pageStateAll = PageState.Empty;
140 } else { 140 } else {
141 wineManageList = WineManageFaModel.fromJson(baseResp.responseData).data; 141 wineManageList = WineManageFaModel.fromJson(baseResp.responseData).data;
142 - pageStateAll = PageState.Success; 142 + if (wineManageList.length == 0) {
  143 + pageStateAll = PageState.Empty;
  144 + } else {
  145 + pageStateAll = PageState.Success;
  146 + }
143 } 147 }
144 notifyListeners(); 148 notifyListeners();
145 return true; 149 return true;
@@ -1528,6 +1528,11 @@ class Utils { @@ -1528,6 +1528,11 @@ class Utils {
1528 String _userName = "gh_487873d353b3"; 1528 String _userName = "gh_487873d353b3";
1529 String _path = 1529 String _path =
1530 "pages/customer/index?id=$rid&hasInvitation=1&hasSellerShare=1&uid=$uid"; 1530 "pages/customer/index?id=$rid&hasInvitation=1&hasSellerShare=1&uid=$uid";
  1531 + // if (Provider.of<UserModel>(context, listen: false).user.sellerid == '677') {
  1532 + // //京厨九跳转新的邀请函地址
  1533 + // _path =
  1534 + // "pages/customer/index?id=$rid&hasInvitation=1&hasSellerShare=1&uid=$uid";
  1535 + // }
1531 String _description = "进入查看包间详情，转发同行好友，还可一键导航到饭店"; 1536 String _description = "进入查看包间详情，转发同行好友，还可一键导航到饭店";
1532 // Uint8List source = await testComporessList(context, _thumbnail); 1537 // Uint8List source = await testComporessList(context, _thumbnail);
1533 1538
@@ -1538,6 +1543,9 @@ class Utils { @@ -1538,6 +1543,9 @@ class Utils {
1538 title: _title, 1543 title: _title,
1539 path: _path, 1544 path: _path,
1540 description: _description, 1545 description: _description,
  1546 + miniProgramType: WXMiniProgramType.PREVIEW, //体验版
  1547 + // miniProgramType: WXMiniProgramType.RELEASE //正式版
  1548 + // miniProgramType: WXMiniProgramType.TEST //开发版
1541 // thumbnail: WeChatImage.binary(source) 1549 // thumbnail: WeChatImage.binary(source)
1542 thumbnail: WeChatImage.network(_thumbnail) 1550 thumbnail: WeChatImage.network(_thumbnail)
1543 // thumbnail: WeChatImage.binary(image) 1551 // thumbnail: WeChatImage.binary(image)