Commit b18f769dd3eca68b01755931478b289af4bec291

Authored by wdn127929
1 parent 33071fff

营销中心优惠券okok

@@ -14,16 +14,16 @@ if (flutterRoot == null) { @@ -14,16 +14,16 @@ if (flutterRoot == null) {
14 14
15 15
16 16
17 -def flutterVersionCode = "472" 17 +def flutterVersionCode = "473"
18 if (flutterVersionCode == null) { 18 if (flutterVersionCode == null) {
19 - flutterVersionCode = '472' 19 + flutterVersionCode = '473'
20 } 20 }
21 21
22 22
23 23
24 -def flutterVersionName = "4.7.2" 24 +def flutterVersionName = "4.7.3"
25 if (flutterVersionName == null) { 25 if (flutterVersionName == null) {
26 - flutterVersionName = '4.7.2' 26 + flutterVersionName = '4.7.3'
27 } 27 }
28 28
29 29
@@ -1269,6 +1269,35 @@ class _MarkingPreviewPageState extends State<MarkingPreviewPage> { @@ -1269,6 +1269,35 @@ class _MarkingPreviewPageState extends State<MarkingPreviewPage> {
1269 } 1269 }
1270 1270
1271 _rechargeWiddget() { 1271 _rechargeWiddget() {
  1272 + String couponsDesc = '';
  1273 + if (_marketingCenterProvider.markDataModel.marketing.couponData != null) {
  1274 + if (_marketingCenterProvider.markDataModel.marketing.couponData.expDate ==
  1275 + null) {
  1276 + couponsDesc =
  1277 + _marketingCenterProvider.markDataModel.marketing.couponData.desc;
  1278 + } else {
  1279 + if (_marketingCenterProvider
  1280 + .markDataModel.marketing.couponData.expDate.isNone) {
  1281 + couponsDesc = '无限制,' +
  1282 + _marketingCenterProvider
  1283 + .markDataModel.marketing.couponData.desc ??
  1284 + '';
  1285 + } else if (_marketingCenterProvider
  1286 + .markDataModel.marketing.couponData.expDate.isBirthday) {
  1287 + couponsDesc = '会员生日当天可用,' +
  1288 + _marketingCenterProvider
  1289 + .markDataModel.marketing.couponData.desc ??
  1290 + '';
  1291 + } else if (_marketingCenterProvider
  1292 + .markDataModel.marketing.couponData.expDate.isWeek) {
  1293 + couponsDesc =
  1294 + '${_marketingCenterProvider.markDataModel.marketing.couponData.expDate.weekShow},' +
  1295 + _marketingCenterProvider
  1296 + .markDataModel.marketing.couponData.desc ??
  1297 + '';
  1298 + }
  1299 + }
  1300 + }
1272 return Container( 1301 return Container(
1273 padding: EdgeInsets.symmetric(horizontal: w(20), vertical: w(8)), 1302 padding: EdgeInsets.symmetric(horizontal: w(20), vertical: w(8)),
1274 child: Column( 1303 child: Column(
@@ -1287,13 +1316,18 @@ class _MarkingPreviewPageState extends State<MarkingPreviewPage> { @@ -1287,13 +1316,18 @@ class _MarkingPreviewPageState extends State<MarkingPreviewPage> {
1287 '推荐店内代金券优惠', 1316 '推荐店内代金券优惠',
1288 _marketingCenterProvider 1317 _marketingCenterProvider
1289 .markDataModel.marketing.couponData.aname, 1318 .markDataModel.marketing.couponData.aname,
  1319 + couponsDesc,
  1320 + _marketingCenterProvider
  1321 + .markDataModel.marketing.couponData.price ??
  1322 + "",
1290 _marketingCenterProvider 1323 _marketingCenterProvider
1291 - .markDataModel.marketing.couponData.desc,  
1292 - '100',  
1293 - '5折',  
1294 - '去抢购'  
1295 -  
1296 - ) 1324 + .markDataModel.marketing.couponData.use !=
  1325 + null &&
  1326 + _marketingCenterProvider
  1327 + .markDataModel.marketing.couponData.use.isCash
  1328 + ? '${(double.parse(_marketingCenterProvider.markDataModel.marketing.couponData.price) / double.parse(_marketingCenterProvider.markDataModel.marketing.couponData.use.cash)) * 10}折'
  1329 + : '',
  1330 + '去抢购')
1297 : SizedBox(), 1331 : SizedBox(),
1298 _marketingCenterProvider.markDataModel.marketing.isRecharge == '1' 1332 _marketingCenterProvider.markDataModel.marketing.isRecharge == '1'
1299 ? _markingItem( 1333 ? _markingItem(
@@ -1303,8 +1337,7 @@ class _MarkingPreviewPageState extends State<MarkingPreviewPage> { @@ -1303,8 +1337,7 @@ class _MarkingPreviewPageState extends State<MarkingPreviewPage> {
1303 rechargeContent, 1337 rechargeContent,
1304 '', 1338 '',
1305 '', 1339 '',
1306 - '去充值'  
1307 - ) 1340 + '去充值')
1308 : SizedBox(), 1341 : SizedBox(),
1309 VEmptyView(20), 1342 VEmptyView(20),
1310 // MyDivider( 1343 // MyDivider(