Commit 9b68d35350a29e19dd75fecf4549baeae664d515

Authored by wdn127929
1 parent 327989c4

发版5.1.2

... ... @@ -14,23 +14,8 @@ if (flutterRoot == null) {
// def flutterVersionCode = "100"
// if (flutterVersionCode == null) {
// flutterVersionCode = '100'
// }
// def flutterVersionName = "1.0.0"
// if (flutterVersionName == null) {
// flutterVersionName = '1.0.0'
// }
def flutterVersionCode = "512"
... ... @@ -42,11 +27,6 @@ if (flutterVersionCode == null) {
}
def flutterVersionName = "5.1.2"
if (flutterVersionName == null) {
... ...
... ... @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 46;
objectVersion = 50;
objects = {
/* Begin PBXBuildFile section */
... ... @@ -518,7 +518,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 51100;
CURRENT_PROJECT_VERSION = 512;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = release;
... ... @@ -533,7 +533,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 5.1.1;
MARKETING_VERSION = 5.1.2;
PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
PRODUCT_NAME = Runner;
PROVISIONING_PROFILE_SPECIFIER = "";
... ... @@ -664,7 +664,7 @@
CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements";
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 51100;
CURRENT_PROJECT_VERSION = 512;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = release;
... ... @@ -679,7 +679,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 5.1.1;
MARKETING_VERSION = 5.1.2;
PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
PRODUCT_NAME = Runner;
PROVISIONING_PROFILE_SPECIFIER = "";
... ... @@ -700,7 +700,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 51100;
CURRENT_PROJECT_VERSION = 512;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = release;
... ... @@ -715,7 +715,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 5.1.1;
MARKETING_VERSION = 5.1.2;
PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
PRODUCT_NAME = Runner;
PROVISIONING_PROFILE_SPECIFIER = "";
... ...
... ... @@ -3,10 +3,10 @@ import 'package:fluwx/fluwx.dart';
class Constant {
static const int status_success = 200; //服务器返回成功
// static const WXMiniProgramType wxMiniProgramType =
// WXMiniProgramType.RELEASE; //正式版
static const WXMiniProgramType wxMiniProgramType =
WXMiniProgramType.PREVIEW; //体验版
WXMiniProgramType.RELEASE; //正式版
// static const WXMiniProgramType wxMiniProgramType =
// WXMiniProgramType.PREVIEW; //体验版
// static const WXMiniProgramType wxMiniProgramType =
// WXMiniProgramType.TEST; //开发版
... ...
... ... @@ -235,7 +235,8 @@ class CommentsImageModel {
? new ImageAve.fromJson(json['imageAve'])
: null;
url = json['url'];
avinfo =json['avinfo'] == null ? null : jsonEncode(json['avinfo']);
avinfo = json['avinfo'] == null ? null : jsonEncode(json['avinfo']);
print(avinfo);
}
Map<String, dynamic> toJson() {
... ...
... ... @@ -55,7 +55,6 @@ class _CouponSettingPageState extends State<CouponSettingPage> {
void initState() {
super.initState();
WidgetsBinding.instance.addPostFrameCallback((_) async {
_couponNetworkData();
getSellerTemplateConf();
});
}
... ... @@ -113,6 +112,7 @@ class _CouponSettingPageState extends State<CouponSettingPage> {
welcome = marketingCenterProvider.markDataModel.marketing.wecomle;
setState(() {});
_couponNetworkData();
}
}
... ...
... ... @@ -425,7 +425,7 @@ class _FeastFollowUpPageState extends State<FeastFollowUpPage> {
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
'${data.rname} 跟单经理:${data.nickName ?? data.account}',
'${data.rname} 跟单经理:${data.nickName ?? data.account ?? ''}',
style: TextStyle(
fontWeight: FontWeight.bold,
color: MyColours.color_000000,
... ... @@ -858,7 +858,8 @@ class _FeastFollowUpPageState extends State<FeastFollowUpPage> {
return InkWell(
onTap: () {
//点击进入宴会详情
NavigatorUtil.goFeastDetailPage(context, data.id,needChange: false);
NavigatorUtil.goFeastDetailPage(context, data.id,
needChange: false);
},
child: buildFeastTypeItem(data));
// '剑南春52度500ml', '1150元/份 不可议价'
... ...
... ... @@ -110,6 +110,11 @@ class _BookInfoPageState extends State<BookInfoPage> {
marketingCenterProvider.markDataModel.home.isFirstImage == '1'
? true
: false;
if (_uploadImageProvider.firstImage.qiniuUrl != null &&
marketingCenterProvider.markDataModel.home.isFirstImage == null) {
//
addFirstImage = true;
}
}
if (marketingCenterProvider.markDataModel.reserve != null) {
... ... @@ -142,6 +147,11 @@ class _BookInfoPageState extends State<BookInfoPage> {
marketingCenterProvider.markDataModel.marketing.logo != ''
? 1
: 0;
if (_uploadImageProvider.logo.qiniuUrl != null &&
marketingCenterProvider.markDataModel.marketing.isLogo == null) {
//
addLogo = true;
}
}
marketingCenterProvider.pageStateBookInfo = PageState.Success;
... ...
... ... @@ -997,13 +997,13 @@ class _MarkingInteractionPageState extends State<MarkingInteractionPage> {
isTranspond = !isTranspond;
});
}, select: isTranspond),
_storeItemWidget('向被邀请客人开放“确认到店”功能。',
'被邀客人点击确认到店后,方便请客人了解被邀客人是否确认,同时,被邀客人的信息会加入到餐厅客户池中,方便餐厅维护客户。',
onTap: () {
setState(() {
isArrival = !isArrival;
});
}, select: isArrival),
// _storeItemWidget('向被邀请客人开放“确认到店”功能。',
// '被邀客人点击确认到店后,方便请客人了解被邀客人是否确认,同时,被邀客人的信息会加入到餐厅客户池中,方便餐厅维护客户。',
// onTap: () {
// setState(() {
// isArrival = !isArrival;
// });
// }, select: isArrival),
_storeItemWidget('向客人开放“在线预订”功能。',
'客人和被邀客人可以通过邀请函,直接点击在线预订,向商家提交预订需求,无需通过电话,经理可以详细了解客户需求并安排预订。',
onTap: () {
... ...
... ... @@ -205,6 +205,75 @@ class _InvitationThemeHomePageState extends State<InvitationThemeHomePage> {
Utils.setBarStatus(true, color: Colors.white);
}
List<Widget> imagesWidgets() {
List<Widget> images = [];
for (int i = 0; i < marketingCenterProvider.templeteDatas.length; i++) {
SellerTemplateColorListSunModel themeSunModel =
marketingCenterProvider.templeteDatas[i];
images.add(InkWell(
onTap: () {
// _selectTheme(themeDatas[themeColor].urls[index].id);
//跳转到下一页
NavigatorUtil.goInvitationThemeHomePreviewPage(
context, themeSunModel);
},
child: Container(
width: (ScreenUtil().screenWidth - w(32) - w(15)) / 2,
// height: w(390),
margin: EdgeInsets.only(right: i % 2 == 0 ? w(15) : 0),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(r(10)),
border: Border.all(
color: themeType == themeSunModel.id
? MyColours.color_005AA7
: MyColours.color_DBDBDB,
width: themeType == themeSunModel.id ? w(2) : w(1))),
child: Column(
children: [
// VEmptyView(10),
ClipRRect(
borderRadius: BorderRadius.only(
topLeft: Radius.circular(r(8)),
topRight: Radius.circular(r(8))),
child: CachedNetworkImage(
imageUrl: themeSunModel.colors == null ||
themeSunModel.colors.length == 0
? themeSunModel.url
: themeSunModel
.colors[themeColor == null
? 0
: themeSunModel.colors.indexWhere((element) =>
element.colorName ==
themeSunModel.themeColorDefault)]
.url,
width: (ScreenUtil().screenWidth - w(32) - w(15)) / 2,
height: w(348),
fit: BoxFit.fitWidth,
alignment: Alignment.topCenter,
),
),
VEmptyView(20),
Container(
padding:
EdgeInsets.symmetric(vertical: w(7), horizontal: w(3)),
width: double.infinity,
child: Text(
themeSunModel.templateName,
maxLines: 1,
overflow: TextOverflow.ellipsis,
textAlign: TextAlign.left,
style: TextStyle(
color: MyColours.color_000000, fontSize: font(14)),
),
)
],
),
)));
}
marketingCenterProvider.templeteDatas.forEach((themeSunModel) {});
return images;
}
@override
Widget build(BuildContext context) {
marketingCenterProvider =
... ... @@ -229,84 +298,94 @@ class _InvitationThemeHomePageState extends State<InvitationThemeHomePage> {
child: Column(
children: [
VEmptyView(24),
GridView.builder(
Padding(
padding: EdgeInsets.symmetric(horizontal: w(16)),
controller: controller,
// padding: EdgeInsets.only(top: ScreenUtil().getAdapterSize(10)),
shrinkWrap: true,
itemCount: marketingCenterProvider.templeteDatas.length,
//SliverGridDelegateWithFixedCrossAxisCount 构建一个横轴固定数量Widget
gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
//横轴元素个数
crossAxisCount: 2,
//纵轴间距
mainAxisSpacing: w(15),
//横轴间距
crossAxisSpacing: w(15),
//子组件宽高长度比例
childAspectRatio:
(ScreenUtil().screenWidth - w(62)) / 2 / 370),
itemBuilder: (BuildContext context, int index) {
SellerTemplateColorListSunModel themeSunModel =
marketingCenterProvider.templeteDatas[index];
return InkWell(
onTap: () {
// _selectTheme(themeDatas[themeColor].urls[index].id);
//跳转到下一页
NavigatorUtil.goInvitationThemeHomePreviewPage(
context, themeSunModel);
},
child: Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(r(10)),
border: Border.all(
color: themeType == themeSunModel.id
? MyColours.color_005AA7
: MyColours.color_DBDBDB,
width: themeType == themeSunModel.id
? w(2)
: w(1))),
child: Column(
children: [
VEmptyView(10),
CachedNetworkImage(
imageUrl: themeSunModel.colors == null ||
themeSunModel.colors.length == 0
? themeSunModel.url
: themeSunModel
.colors[themeColor == null
? 0
: themeSunModel.colors
.indexWhere((element) =>
element.colorName ==
themeSunModel
.themeColorDefault)]
.url,
width:
(ScreenUtil().screenWidth - w(62)) / 2,
height: w(348),
fit: BoxFit.fitWidth,
alignment: Alignment.topCenter,
),
VEmptyView(20),
Container(
padding: EdgeInsets.symmetric(
vertical: w(6), horizontal: w(2)),
width: double.infinity,
child: Text(
themeSunModel.templateName,
maxLines: 1,
overflow: TextOverflow.ellipsis,
textAlign: TextAlign.left,
style: TextStyle(
color: MyColours.color_000000,
fontSize: font(14)),
),
)
],
),
));
}),
child: Wrap(
runSpacing: w(15),
// spacing: w(15),
children: imagesWidgets(),
)),
VEmptyView(24),
// GridView.builder(
// padding: EdgeInsets.symmetric(horizontal: w(16)),
// controller: controller,
// // padding: EdgeInsets.only(top: ScreenUtil().getAdapterSize(10)),
// shrinkWrap: true,
// itemCount: marketingCenterProvider.templeteDatas.length,
// //SliverGridDelegateWithFixedCrossAxisCount 构建一个横轴固定数量Widget
// gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
// //横轴元素个数
// crossAxisCount: 2,
// //纵轴间距
// mainAxisSpacing: w(15),
// //横轴间距
// crossAxisSpacing: w(15),
// //子组件宽高长度比例
// // childAspectRatio:
// // (ScreenUtil().screenWidth - w(62)) / 2 / 370
// ),
// itemBuilder: (BuildContext context, int index) {
// SellerTemplateColorListSunModel themeSunModel =
// marketingCenterProvider.templeteDatas[index];
// return InkWell(
// onTap: () {
// // _selectTheme(themeDatas[themeColor].urls[index].id);
// //跳转到下一页
// NavigatorUtil.goInvitationThemeHomePreviewPage(
// context, themeSunModel);
// },
// child: Container(
// height: w(385),
// decoration: BoxDecoration(
// borderRadius: BorderRadius.circular(r(10)),
// border: Border.all(
// color: themeType == themeSunModel.id
// ? MyColours.color_005AA7
// : MyColours.color_DBDBDB,
// width: themeType == themeSunModel.id
// ? w(2)
// : w(1))),
// child: Column(
// children: [
// VEmptyView(10),
// CachedNetworkImage(
// imageUrl: themeSunModel.colors == null ||
// themeSunModel.colors.length == 0
// ? themeSunModel.url
// : themeSunModel
// .colors[themeColor == null
// ? 0
// : themeSunModel.colors
// .indexWhere((element) =>
// element.colorName ==
// themeSunModel
// .themeColorDefault)]
// .url,
// width:
// (ScreenUtil().screenWidth - w(62)) / 2,
// height: w(348),
// fit: BoxFit.fitWidth,
// alignment: Alignment.topCenter,
// ),
// VEmptyView(20),
// Container(
// padding: EdgeInsets.symmetric(
// vertical: w(6), horizontal: w(2)),
// width: double.infinity,
// child: Text(
// themeSunModel.templateName,
// maxLines: 1,
// overflow: TextOverflow.ellipsis,
// textAlign: TextAlign.left,
// style: TextStyle(
// color: MyColours.color_000000,
// fontSize: font(14)),
// ),
// )
// ],
// ),
// ));
// }),
],
)))
],
... ...
... ... @@ -272,11 +272,13 @@ class _InvitationThemeHomePreviewPageState
.user
.sellerid,
'type': themeType,
'lite_class': widget
.themeSunModel
.colors[widget.themeSunModel.colors.indexWhere(
(element) => element.colorName == themeColor)]
.liteClass
'lite_class': themeColor == null
? null
: widget
.themeSunModel
.colors[widget.themeSunModel.colors.indexWhere(
(element) => element.colorName == themeColor)]
.liteClass
};
bool success = await marketingCenterProvider
... ...
... ... @@ -55,7 +55,6 @@ class _RechargeSettingPageState extends State<RechargeSettingPage> {
void initState() {
super.initState();
WidgetsBinding.instance.addPostFrameCallback((_) async {
_getNewRechargeList();
getSellerTemplateConf();
});
}
... ... @@ -114,6 +113,7 @@ class _RechargeSettingPageState extends State<RechargeSettingPage> {
welcome = marketingCenterProvider.markDataModel.marketing.wecomle;
setState(() {});
_getNewRechargeList();
}
}
... ...