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

首页邀请成功弹窗更改; 

下单结算页面已优惠更改,折扣价+会员优惠价
ff_new
w-R 3 years ago
parent
56d8b04cc1
commit
785ca66e2b
9 changed files with 30 additions and 23 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      assets/svg/lianmeng.svg
  2. 1
      lib/mine/mine_page.dart
  3. 5
      lib/mine/mine_vip/mine_vip_core.dart
  4. 6
      lib/mine/recharge_page.dart
  5. 8
      lib/retrofit/retrofit_api.dart
  6. 2
      lib/retrofit/retrofit_api.g.dart
  7. 4
      lib/settlement/settlement_view/settlement_order_commodity.dart
  8. 2
      lib/view_widget/mine_vip_view.dart
  9. 5
      lib/view_widget/vip_dialog.dart

20
assets/svg/lianmeng.svg
Unescape View File

@ -1,13 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="30px" height="30px" viewBox="0 0 30 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>编组 5</title>
<title>编组 7</title>
<g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="净币首页" transform="translate(-126.000000, -733.000000)">
<g id="编组-30" transform="translate(126.000000, 733.000000)">
<rect id="矩形" x="0" y="0" width="30" height="30"></rect>
<rect id="矩形" x="2.04545455" y="2.04545455" width="25.9090909" height="25.9090909"></rect>
<path d="M16,3.57735027 L24.3923048,8.42264973 C25.011107,8.77991532 25.3923048,9.44016936 25.3923048,10.1547005 L25.3923048,19.8452995 C25.3923048,20.5598306 25.011107,21.2200847 24.3923048,21.5773503 L16,26.4226497 C15.3811978,26.7799153 14.6188022,26.7799153 14,26.4226497 L5.60769515,21.5773503 C4.988893,21.2200847 4.60769515,20.5598306 4.60769515,19.8452995 L4.60769515,10.1547005 C4.60769515,9.44016936 4.988893,8.77991532 5.60769515,8.42264973 L14,3.57735027 C14.6188022,3.22008468 15.3811978,3.22008468 16,3.57735027 Z" id="多边形" stroke="#E6E6E6" stroke-width="2"></path>
<path d="M13.908056,11.5007309 C14.2275574,11.0606835 14.5358769,10.6356362 14.7667416,10.2112707 C14.9974698,10.6356362 15.3057894,11.0608199 15.6254271,11.5008672 C16.4399307,12.6228721 17.3632529,13.8944686 17.3632529,15.6007943 C17.3632529,15.9449776 17.2968435,16.2785245 17.1655248,16.5928441 C17.0354518,16.9074318 16.8439959,17.1929468 16.6023405,17.4327114 C16.3650118,17.670759 16.0832792,17.8599243 15.7731096,17.9894865 C15.4641082,18.0898506 15.0711065,18.3061243 14.7667416,18.7667627 C14.4622402,18.3061243 14.0692385,18.0898506 13.7603735,17.9894865 C13.4500255,17.8596841 13.1680523,17.6704513 12.9303244,17.4324386 C12.44314,16.9474696 12.1695128,16.2882121 12.1700929,15.6007943 C12.1700929,13.8944686 13.0932797,12.6228721 13.908056,11.5008672 L13.908056,11.5007309 Z M12.4563224,17.9052134 C12.759475,18.2086593 13.1197259,18.4490583 13.5162815,18.6125347 C13.5251452,18.6160802 13.5340089,18.6193529 13.5432817,18.6222166 C13.7974646,18.7026715 14.1457388,18.9073542 14.3618762,19.4275837 C14.4078309,19.5380388 14.4311492,19.6554484 14.4314219,19.7762671 L14.4314219,19.7794034 C14.4314219,19.7807671 14.431831,19.781858 14.431831,19.7830853 C14.4321428,20.2032531 14.599822,20.6059874 14.8977876,20.9022265 C14.9632424,20.9674086 15.0488792,21 15.1346523,21 C15.2699196,21.0001293 15.3919398,20.9187458 15.443794,20.7938122 C15.4956481,20.6688785 15.46712,20.5250094 15.3715169,20.4293154 C15.1988178,20.2576852 15.1017314,20.0242458 15.1017885,19.7807671 L15.1019248,19.7794034 L15.1019248,19.7762671 C15.1019533,19.656597 15.1255863,19.5381077 15.1714706,19.4275837 C15.3876079,18.9073542 15.7360185,18.7025351 15.9900651,18.6222166 C15.9992015,18.6193529 16.0082015,18.6160802 16.0169288,18.6125347 C16.4133431,18.4492941 16.7733978,18.2089641 17.0762062,17.9054862 C17.3799942,17.6038627 17.6207162,17.2447961 17.7843457,16.8492088 C17.9495838,16.453831 18.0342381,16.0294472 18.0333537,15.6009306 C18.0333537,13.6777858 16.999024,12.2533251 16.1678841,11.1088201 C15.6674273,10.4193625 15.2350163,9.82372354 15.0916975,9.25208468 C15.0903339,9.24676647 15.0878793,9.24226645 15.086243,9.23708461 C15.0765625,9.20537491 15.0623225,9.17524134 15.04397,9.14762967 C15.0320893,9.12967026 15.0183797,9.11299022 15.0030608,9.09785673 C14.9642156,9.05864541 14.916088,9.0298908 14.8631511,9.01426545 C14.8578329,9.01276545 14.8533328,9.01017453 14.8478783,9.00881088 C14.8433783,9.00771997 14.8387419,9.00785634 14.8342419,9.00690179 C14.8225751,9.0045468 14.810783,9.00286222 14.7989235,9.00185631 C14.7779957,8.99947603 14.7568708,8.99938458 14.7359232,9.00158358 C14.7232414,9.00267449 14.7106959,9.00444723 14.6982867,9.00703815 C14.6939231,9.00785634 14.6896958,9.00785634 14.6854685,9.00894725 C14.680423,9.01017453 14.6761957,9.01262908 14.6712866,9.01399273 C14.6287093,9.02657715 14.5890714,9.04753189 14.5546952,9.07562936 C14.5383341,9.08929505 14.5231865,9.10435131 14.5094223,9.12062956 C14.5021949,9.12935687 14.4956495,9.13835691 14.4893767,9.1479024 C14.4707266,9.17524649 14.4564636,9.20533682 14.4471038,9.23708461 C14.4456038,9.24226645 14.4430129,9.24676647 14.4416492,9.25208468 C14.2984668,9.82372354 13.8660558,10.4193625 13.3653263,11.1088201 C12.5343227,12.2531887 11.5,13.6776495 11.5,15.6007943 C11.5,16.0330689 11.5834549,16.4529344 11.7481829,16.848527 C11.9122547,17.2439577 12.1529193,17.6030314 12.4563224,17.9050771 L12.4563224,17.9052134 Z" id="形状" stroke="#E6E6E6" stroke-width="2" fill-rule="nonzero"></path>
<g id="联盟门店" transform="translate(-126.000000, -733.000000)">
<g id="编组-7" transform="translate(126.000000, 733.000000)">
<g id="编组-13备份">
<rect id="矩形" x="0" y="0" width="30" height="30"></rect>
<rect id="矩形" x="2.04545455" y="2.04545455" width="25.9090909" height="25.9090909"></rect>
</g>
<g id="Icon-header-19" transform="translate(6.532840, 4.770117)" fill="#32A060" fill-rule="nonzero" stroke="#32A060" stroke-width="2">
<g id="编组">
<polygon id="路径" points="4.56034383 11.0976885 6.22803379 12.0903374 3.39843685 16.9921843 0 15.0005808 0 4.99941921 8.66070391 0 10.3914508 0.998954582"></polygon>
<polygon id="路径" points="14.018552 2.97363225 11.1889551 7.87547915 12.7587409 8.90231153 6.92763387 19.0010454 8.65838076 20 17.3190847 15.0005808 17.3190847 4.99941921"></polygon>
</g>
</g>
</g>
</g>
</g>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.7 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

1
lib/mine/mine_page.dart
Unescape View File

@ -103,7 +103,6 @@ class _MinePage extends State<MinePage> with AutomaticKeepAliveClientMixin {
await apiService.queryInfo().catchError((onError) {
_refreshController.refreshFailed();
});
if (baseDate != null && baseDate.isSuccess) {
userInfo = baseDate.data;
SharedPreferences.getInstance().then(

5
lib/mine/mine_vip/mine_vip_core.dart
Unescape View File

@ -176,7 +176,6 @@ class _MineVipCore extends State<MineVipCore> {
Column(
children: [
SizedBox(height: 40),
Container(
child:Row(
children: [
@ -643,8 +642,8 @@ class _MineVipCore extends State<MineVipCore> {
alignment: Alignment.bottomCenter,
children: [
MImage(
(vipBenefitList.actived || (vipBenefitList.actived && vipBenefitList.have) ||(vipBenefitList.actived && !vipBenefitList.have))?
(vipBenefitList?.icon ?? ""):(vipBenefitList?.iconGrey ?? ""),
(!vipBenefitList.actived || (!vipBenefitList.actived && !vipBenefitList.have) || (vipBenefitList.actived && !vipBenefitList.have))?
(vipBenefitList?.iconGrey ?? ""):(vipBenefitList?.icon ?? ""),
width: 36,
height: 36,
// fit: BoxFit.cover,

6
lib/mine/recharge_page.dart
Unescape View File

@ -101,7 +101,7 @@ class _RechargePage extends State<RechargePage> {
hintText: "",
controller: controller,
padding: EdgeInsets.all(20),
errorText: S.of(context).chongzhizuixiaojine(0.1),
errorText: S.of(context).chongzhizuixiaojine(100),
titleColor: Color(0xFF727272),
errorTextColor: Color(0xFF32A060),
radius: 8,
@ -117,7 +117,7 @@ class _RechargePage extends State<RechargePage> {
onChanged: (value) {
if (value != null &&
value != "" &&
double.tryParse(value) < 10) {
double.tryParse(value) < 100) {
color = Colors.red;
} else {
color = Colors.black;
@ -319,7 +319,7 @@ class _RechargePage extends State<RechargePage> {
}
int amount = int.tryParse(money);
if (checkIndex == 1) {
if (amount < 0.001) {
if (amount < 100) {
SmartDialog.showToast(S.of(context).chongzhizuixiaojine(0.001),
alignment: Alignment.center);
return;

8
lib/retrofit/retrofit_api.dart
Unescape View File

@ -56,15 +56,15 @@ part 'retrofit_api.g.dart';
// const base_url = "https://pos.platform.lotus-wallet.com/app/"; ///正式
// const baseUrl = "https://pos.platform.lotus-wallet.com/app/"; ///正式
// const base_url = "http://192.168.10.236:8766/app/"; ///费韬
// const baseUrl = "http://192.168.10.236:8766/app/"; ///费韬
const base_url = "http://192.168.10.236:8766/app/"; ///费韬
const baseUrl = "http://192.168.10.236:8766/app/"; ///费韬
// const base_url = "http://192.168.10.37:8766/app/";
// const baseUrl = "http://192.168.10.37:8766/app/";
const base_url = "http://192.168.10.130:8766/app/";///詹云久
const baseUrl = "http://192.168.10.130:8766/app/";///詹云久
// const base_url = "http://192.168.10.130:8766/app/";///詹云久
// const baseUrl = "http://192.168.10.130:8766/app/";///詹云久
@RestApi(baseUrl: baseUrl)
abstract class ApiService {

2
lib/retrofit/retrofit_api.g.dart
Unescape View File

@ -9,7 +9,7 @@ part of 'retrofit_api.dart';
class _ApiService implements ApiService {
_ApiService(this._dio, {this.baseUrl}) {
ArgumentError.checkNotNull(_dio, '_dio');
baseUrl ??= 'http://192.168.10.130:8766/app/';
baseUrl ??= 'http://192.168.10.236:8766/app/';
}
final Dio _dio;

4
lib/settlement/settlement_view/settlement_order_commodity.dart
Unescape View File

@ -341,7 +341,9 @@ class _SettlementOrderCommodity extends State<SettlementOrderCommodity> {
),
Container(
child: Text(
"已优惠:￥${(widget.minOrderInfo != null) ? (widget.minOrderInfo.discountAmount ?? "0") : (widget.settleOrderInfo.discountAmount ?? "0")}",
"已优惠:￥${(widget.minOrderInfo != null) ? (widget.minOrderInfo.discountAmount ?? "0") : (double.parse(widget.settleOrderInfo.discountAmount ?? "0")
+ double.parse(widget?.settleOrderInfo?.benefitDiscountAmount ?? "0"))
}",
style: TextStyle(
fontSize: 12.sp,
color: Color(0xFF7B7B7B),

2
lib/view_widget/mine_vip_view.dart
Unescape View File

@ -217,7 +217,7 @@ class MineVipView extends StatelessWidget {
// rank > rankMax
// ? S.of(context).dangqiandengji
// : "${S.of(context).jifen_(rankMax - rank)} ${S.of(context).daoxiayidengji}",
(vipLevel < curLevel)?"":(((rank ?? 0) > rankMax || curLevel == 3)
(vipLevel < curLevel)?"":(((rank ?? 0) > rankMax || curLevel == 3 || curLevel ==2)
? S.of(context).dangqiandengji
: "消费￥${rankMax - (rank ?? 0)}元 ${S.of(context).daoxiayidengji}"),
overflow: TextOverflow.ellipsis,

5
lib/view_widget/vip_dialog.dart
Unescape View File

@ -215,7 +215,8 @@ class _VipDialog extends State<VipDialog> {
alignment: Alignment.bottomCenter,
children: [
MImage(
vipBenefitList?.icon ?? "",
(!vipBenefitList.actived || (!vipBenefitList.actived && !vipBenefitList.have) || (vipBenefitList.actived && !vipBenefitList.have))?
(vipBenefitList?.iconGrey ?? ""):(vipBenefitList?.icon ?? ""),
width: 36,
height: 36,
// fit: BoxFit.cover,
@ -250,7 +251,7 @@ class _VipDialog extends State<VipDialog> {
],
),
),
if (!vipBenefitList.actived && !vipBenefitList.have)
if (!vipBenefitList.actived && !vipBenefitList.have || vipBenefitList.actived && !vipBenefitList.have )
Container(
decoration: new BoxDecoration(
color: Color(0xFFA29E9E),

Write Preview
Loading…
Cancel
Save