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) {
def flutterVersionCode = "460"
def flutterVersionCode = "461"
if (flutterVersionCode == null) {
flutterVersionCode = '460'
flutterVersionCode = '461'
}
def flutterVersionName = "4.6.0"
def flutterVersionName = "4.6.1"
if (flutterVersionName == null) {
flutterVersionName = '4.6.0'
flutterVersionName = '4.6.1'
}
... ...
... ... @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 50;
objectVersion = 46;
objects = {
/* Begin PBXBuildFile section */
... ... @@ -505,7 +505,7 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 444;
CURRENT_PROJECT_VERSION = 461;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = release;
... ... @@ -515,15 +515,12 @@
);
INFOPLIST_FILE = Runner/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 4.4.4;
MARKETING_VERSION = 4.6.1;
PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
PRODUCT_NAME = Runner;
PROVISIONING_PROFILE_SPECIFIER = "";
... ... @@ -654,7 +651,7 @@
CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements";
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 444;
CURRENT_PROJECT_VERSION = 461;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = release;
... ... @@ -664,15 +661,12 @@
);
INFOPLIST_FILE = Runner/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 4.4.4;
MARKETING_VERSION = 4.6.1;
PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
PRODUCT_NAME = Runner;
PROVISIONING_PROFILE_SPECIFIER = "";
... ... @@ -693,7 +687,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 444;
CURRENT_PROJECT_VERSION = 461;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = release;
... ... @@ -703,15 +697,12 @@
);
INFOPLIST_FILE = Runner/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 4.4.4;
MARKETING_VERSION = 4.6.1;
PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
PRODUCT_NAME = Runner;
PROVISIONING_PROFILE_SPECIFIER = "";
... ...
... ... @@ -64,8 +64,8 @@ class _BookInfoPageState extends State<BookInfoPage> {
_initData(context);
await marketingCenterProvider.getTableList(context);
await _getStoreBaseinfo();
await _getCustomerActivityBaseinfo();
_getStoreBaseinfo();
_getCustomerActivityBaseinfo();
await getSellerTemplateConf();
});
... ... @@ -451,7 +451,9 @@ class _BookInfoPageState extends State<BookInfoPage> {
ClipRRect(
borderRadius: BorderRadius.circular(r(35)),
child: Image.network(
_baseIndoProvider.baseInfoSunModel.photo ==
_baseIndoProvider.baseInfoSunModel == null ||
_baseIndoProvider
.baseInfoSunModel.photo ==
null ||
_baseIndoProvider
.baseInfoSunModel.photo ==
... ... @@ -469,7 +471,7 @@ class _BookInfoPageState extends State<BookInfoPage> {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
'专属服务：${_baseIndoProvider.baseInfoSunModel.name}',
'专属服务：${_baseIndoProvider.baseInfoSunModel == null || _baseIndoProvider.baseInfoSunModel.name == null ? Provider.of<UserModel>(context, listen: false).user.nickName : _baseIndoProvider.baseInfoSunModel.name}',
style: TextStyle(
color: MyColours.color_999999,
fontWeight: FontWeight.bold,
... ... @@ -477,7 +479,7 @@ class _BookInfoPageState extends State<BookInfoPage> {
),
VEmptyView(16),
Text(
'服务电话：${_baseIndoProvider.baseInfoSunModel.phone}',
'服务电话：${_baseIndoProvider.baseInfoSunModel == null || _baseIndoProvider.baseInfoSunModel.phone == null ? Provider.of<UserModel>(context, listen: false).user.userphone : _baseIndoProvider.baseInfoSunModel.phone}',
style: TextStyle(
color: MyColours.color_999999,
fontWeight: FontWeight.bold,
... ...
... ... @@ -754,6 +754,10 @@ class _FirstImagePageState extends State<FirstImagePage> {
Utils.showToast('请输入店铺slogan!');
return false;
}
if (_uploadImageProvider.firstImage.qiniuUrl == null) {
Utils.showToast('请上传餐厅照片!');
return false;
}
if (_uploadImageProvider.firstImage.process < 1 &&
_uploadImageProvider.firstImage.process > 0) {
... ...
... ... @@ -81,42 +81,42 @@ class _MarketingCenterHomePageState extends State<MarketingCenterHomePage> {
child: SingleChildScrollView(
child: Column(
children: [
InkWell(
onTap: () {
// NavigatorUtil.goWebPage(context, '隐私政策', "zc",
// need: true);
},
child: Padding(
padding: EdgeInsets.only(
left: w(16),
top: w(12),
bottom: w(12),
right: w(12)),
child: Row(
children: [
Text(
'会员充值优惠活动',
style: TextStyle(
color: MyColours.color_515151,
fontSize: ScreenUtil().setWidth(32)),
),
Spacer(),
Container(
padding: EdgeInsets.symmetric(
horizontal: w(7), vertical: w(4)),
child: Image.asset(
"assets/arrow_right_new.png",
width: ScreenUtil().setWidth(18),
height: ScreenUtil().setWidth(32),
),
)
],
))),
Padding(
padding: EdgeInsets.only(left: w(16)),
child: MyDivider(double.infinity, w(0.5),
color: MyColours.color_E7E7E7)),
VEmptyView(24),
// InkWell(
// onTap: () {
// // NavigatorUtil.goWebPage(context, '隐私政策', "zc",
// // need: true);
// },
// child: Padding(
// padding: EdgeInsets.only(
// left: w(16),
// top: w(12),
// bottom: w(12),
// right: w(12)),
// child: Row(
// children: [
// Text(
// '会员充值优惠活动',
// style: TextStyle(
// color: MyColours.color_515151,
// fontSize: ScreenUtil().setWidth(32)),
// ),
// Spacer(),
// Container(
// padding: EdgeInsets.symmetric(
// horizontal: w(7), vertical: w(4)),
// child: Image.asset(
// "assets/arrow_right_new.png",
// width: ScreenUtil().setWidth(18),
// height: ScreenUtil().setWidth(32),
// ),
// )
// ],
// ))),
// Padding(
// padding: EdgeInsets.only(left: w(16)),
// child: MyDivider(double.infinity, w(0.5),
// color: MyColours.color_E7E7E7)),
// VEmptyView(24),
Padding(
padding: EdgeInsets.only(
left: w(16), top: w(12), bottom: w(12), right: w(12)),
... ...
... ... @@ -73,7 +73,7 @@ class _ApplyOutStoreItemPageState extends State<ApplyOutStoreItemPage> {
),
Expanded(
child: Container(
height: ScreenUtil().setWidth(16 * 2),
// height: ScreenUtil().setWidth(16 * 2),
alignment: Alignment.centerRight,
child: TextField(
maxLines: 1,
... ... @@ -192,7 +192,7 @@ class _ApplyOutStoreItemPageState extends State<ApplyOutStoreItemPage> {
),
Expanded(
child: Container(
height: ScreenUtil().setWidth(16 * 2),
// height: ScreenUtil().setWidth(16 * 2),
alignment: Alignment.centerRight,
child: Text(
subTitle,
... ...
... ... @@ -128,7 +128,7 @@ class _ApplyOutStorePageState extends State<ApplyOutStorePage> {
),
Expanded(
child: Container(
height: ScreenUtil().setWidth(16 * 2),
// height: ScreenUtil().setWidth(16 * 2),
alignment: Alignment.centerRight,
child: Text(
widget.wineManageDetail.rname +
... ...
... ... @@ -89,7 +89,7 @@ class _CreateStoreWinePageState extends State<CreateStoreWinePage> {
),
Expanded(
child: Container(
height: ScreenUtil().setWidth(16 * 2),
// height: ScreenUtil().setWidth(16 * 2),
alignment: Alignment.centerRight,
child: TextField(
maxLines: 1,
... ... @@ -219,8 +219,8 @@ class _CreateStoreWinePageState extends State<CreateStoreWinePage> {
),
Expanded(
child: Container(
height:
ScreenUtil().setWidth(16 * 2),
// height:
// ScreenUtil().setWidth(16 * 2),
alignment: Alignment.centerRight,
child: TextField(
maxLines: 1,
... ...
... ... @@ -50,7 +50,7 @@ class _CreateWineItemPageState extends State<CreateWineItemPage> {
),
Expanded(
child: Container(
height: ScreenUtil().setWidth(16 * 2),
// height: ScreenUtil().setWidth(16 * 2),
alignment: Alignment.centerRight,
child: TextField(
maxLines: 1,
... ...
... ... @@ -162,7 +162,7 @@ class _OutStoreRecordDetailPageState extends State<OutStoreRecordDetailPage> {
),
Expanded(
child: Container(
height: ScreenUtil().setWidth(16 * 2),
// height: ScreenUtil().setWidth(16 * 2),
alignment: Alignment.centerRight,
child: Text(
'${widget.outWineRecordSunModel.rname}${widget.outWineRecordSunModel.sexStr}',
... ...
... ... @@ -48,7 +48,7 @@ class _OutStoreRecordItemPageState extends State<OutStoreRecordItemPage> {
),
Expanded(
child: Container(
height: ScreenUtil().setWidth(16 * 2),
// height: ScreenUtil().setWidth(16 * 2),
alignment: Alignment.centerRight,
child: Text(
subTitle,
... ...
... ... @@ -160,7 +160,7 @@ class _OutStoreRecordPageState extends State<OutStoreRecordPage> {
),
Expanded(
child: Container(
height: ScreenUtil().setWidth(16 * 2),
// height: ScreenUtil().setWidth(20 * 2),
alignment: Alignment.centerRight,
child: Text(
'${storeWineProvider.outWineRecordData[0].rname}${storeWineProvider.outWineRecordData[0].sexStr}',
... ...
... ... @@ -271,6 +271,7 @@ class _StoreWineManageHomePageState extends State<StoreWineManageHomePage>
Offstage(
offstage: searchC.text == '',
child: GestureDetector(
behavior: HitTestBehavior.opaque,
child: Container(
padding: EdgeInsets.symmetric(
horizontal: ScreenUtil().setWidth(40),
... ... @@ -285,18 +286,18 @@ class _StoreWineManageHomePageState extends State<StoreWineManageHomePage>
),
),
onTap: () {
WidgetsBinding.instance.addPostFrameCallback(((_) {
searchC.clear();
// customerProvider.searchData('');
FocusScope.of(context)
.requestFocus(FocusNode()); //点击空白处隐藏键盘
if (tabController.index == 0) {
_getStoreWineBySeller(context, showLoading: false);
}
if (tabController.index == 1) {
_getStoreWineCheckList(context, showLoading: false);
}
}));
// WidgetsBinding.instance.addPostFrameCallback(((_) {
searchC.clear();
// customerProvider.searchData('');
FocusScope.of(context)
.requestFocus(FocusNode()); //点击空白处隐藏键盘
if (tabController.index == 0) {
_getStoreWineBySeller(context, showLoading: false);
}
if (tabController.index == 1) {
_getStoreWineCheckList(context, showLoading: false);
}
// }));
},
)),
// Offstage(
... ...
... ... @@ -46,7 +46,7 @@ class _WineDetailItemPageState extends State<WineDetailItemPage> {
),
Expanded(
child: Container(
height: ScreenUtil().setWidth(16 * 2),
// height: ScreenUtil().setWidth(16 * 2),
alignment: Alignment.centerRight,
child: Text(
subTitle,
... ...
... ... @@ -159,7 +159,7 @@ class _WineDetailPageState extends State<WineDetailPage> {
),
Expanded(
child: Container(
height: ScreenUtil().setWidth(16 * 2),
// height: ScreenUtil().setWidth(16 * 2),
alignment: Alignment.centerRight,
child: Text(
'${model.wineManageDetail.rname}${model.wineManageDetail.sexStr}',
... ...
... ... @@ -21,9 +21,8 @@ class BaseIndoProvider with ChangeNotifier {
TextEditingController phoneController = TextEditingController();
TextEditingController nameController = TextEditingController();
TextEditingController pnumController = TextEditingController();
TextEditingController pnumController = TextEditingController();
List sexList;
List<UserHistoryEntity> userHistorys = []; //历史录入
BaseIndoProvider() {
... ...
... ... @@ -139,7 +139,11 @@ class StoreWineProvider with ChangeNotifier {
pageStateAll = PageState.Empty;
} else {
wineManageList = WineManageFaModel.fromJson(baseResp.responseData).data;
pageStateAll = PageState.Success;
if (wineManageList.length == 0) {
pageStateAll = PageState.Empty;
} else {
pageStateAll = PageState.Success;
}
}
notifyListeners();
return true;
... ...
... ... @@ -1528,6 +1528,11 @@ class Utils {
String _userName = "gh_487873d353b3";
String _path =
"pages/customer/index?id=$rid&hasInvitation=1&hasSellerShare=1&uid=$uid";
// if (Provider.of<UserModel>(context, listen: false).user.sellerid == '677') {
// //京厨九跳转新的邀请函地址
// _path =
// "pages/customer/index?id=$rid&hasInvitation=1&hasSellerShare=1&uid=$uid";
// }
String _description = "进入查看包间详情，转发同行好友，还可一键导航到饭店";
// Uint8List source = await testComporessList(context, _thumbnail);
... ... @@ -1538,6 +1543,9 @@ class Utils {
title: _title,
path: _path,
description: _description,
miniProgramType: WXMiniProgramType.PREVIEW, //体验版
// miniProgramType: WXMiniProgramType.RELEASE //正式版
// miniProgramType: WXMiniProgramType.TEST //开发版
// thumbnail: WeChatImage.binary(source)
thumbnail: WeChatImage.network(_thumbnail)
// thumbnail: WeChatImage.binary(image)
... ...