xt / Flutter-ReserveApp · Commits

Go to a project

Commit 356e7d13c3327ed555fa608a2653f748d90ac38f

Authored by wdn127929
1 parent b64488e4
build: skipped

详情页面客户没有归属客情的时候,不展示“客户详情”按钮 丢失 重补

Inline Side-by-side
Showing 5 changed files with 71 additions and 56 deletions
@@ -18,19 +18,19 @@ if (flutterRoot == null) { @@ -18,19 +18,19 @@ if (flutterRoot == null) {
18 18
19 19
20 20
21 -def flutterVersionCode = "517" 21 +def flutterVersionCode = "518"
22 if (flutterVersionCode == null) { 22 if (flutterVersionCode == null) {
23 - flutterVersionCode = '517' 23 + flutterVersionCode = '518'
24 24
25 25
26 26
27 } 27 }
28 28
29 29
30 -def flutterVersionName = "5.1.7" 30 +def flutterVersionName = "5.1.8"
31 31
32 if (flutterVersionName == null) { 32 if (flutterVersionName == null) {
33 - flutterVersionName = '5.1.7' 33 + flutterVersionName = '5.1.8'
34 34
35 35
36 } 36 }
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 archiveVersion = 1; 3 archiveVersion = 1;
4 classes = { 4 classes = {
5 }; 5 };
6 - objectVersion = 46; 6 + objectVersion = 50;
7 objects = { 7 objects = {
8 8
9 /* Begin PBXBuildFile section */ 9 /* Begin PBXBuildFile section */
@@ -3103,47 +3103,64 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -3103,47 +3103,64 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
3103 .rnameStr == 3103 .rnameStr ==
3104 '')) 3104 ''))
3105 ? SizedBox() 3105 ? SizedBox()
3106 - : Padding(  
3107 - padding:  
3108 - EdgeInsets.only(  
3109 - top: w(10)),  
3110 - child: Align(  
3111 - alignment: Alignment  
3112 - .centerRight,  
3113 - child:  
3114 - RoundButton(  
3115 - text: '客户详情',  
3116 - width: w(72),  
3117 - height: w(22),  
3118 - borderColor:  
3119 - MyColours  
3120 - .color_438E93,  
3121 - textColor: MyColours  
3122 - .color_438E93,  
3123 - gradientStart:  
3124 - MyColours  
3125 - .color_ffffff,  
3126 - gradientEnd:  
3127 - MyColours  
3128 - .color_ffffff,  
3129 - isBold: true,  
3130 - fontSize: 24,  
3131 - onPressed: () {  
3132 - if (!collectStoreProvider  
3133 - .sellerPreserve) {  
3134 - //没有购买客情维护模块  
3135 - //提示购买 3106 + : detailEntity
  3107 + .gid ==
  3108 + null ||
  3109 + detailEntity
  3110 + .phone ==
  3111 + '' ||
  3112 + detailEntity
  3113 + .phone ==
  3114 + null
  3115 + ? SizedBox()
  3116 + : Padding(
  3117 + padding: EdgeInsets
  3118 + .only(
  3119 + top: w(
  3120 + 10)),
  3121 + child: Align(
  3122 + alignment:
  3123 + Alignment
  3124 + .centerRight,
  3125 + child:
  3126 + RoundButton(
  3127 + text:
  3128 + '客户详情',
  3129 + width:
  3130 + w(72),
  3131 + height:
  3132 + w(22),
  3133 + borderColor:
  3134 + MyColours
  3135 + .color_438E93,
  3136 + textColor:
  3137 + MyColours
  3138 + .color_438E93,
  3139 + gradientStart:
  3140 + MyColours
  3141 + .color_ffffff,
  3142 + gradientEnd:
  3143 + MyColours
  3144 + .color_ffffff,
  3145 + isBold:
  3146 + true,
  3147 + fontSize:
  3148 + 24,
  3149 + onPressed:
  3150 + () {
  3151 + if (!collectStoreProvider
  3152 + .sellerPreserve) {
  3153 + //没有购买客情维护模块
  3154 + //提示购买
3136 3155
3137 - DialogUtil.showSellerVersionBuyDialog(  
3138 - context,  
3139 - '客情维护',  
3140 - (v) {});  
3141 - return;  
3142 - }  
3143 - //gid 跳转客户详情页面  
3144 - CustomerBySellerSunModel  
3145 - userHistoryEntity =  
3146 - CustomerBySellerSunModel( 3156 + DialogUtil.showSellerVersionBuyDialog(
  3157 + context,
  3158 + '客情维护',
  3159 + (v) {});
  3160 + return;
  3161 + }
  3162 + //gid 跳转客户详情页面
  3163 + CustomerBySellerSunModel userHistoryEntity = CustomerBySellerSunModel(
3147 null, 3164 null,
3148 null, 3165 null,
3149 detailEntity 3166 detailEntity
@@ -3163,14 +3180,14 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -3163,14 +3180,14 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
3163 null, 3180 null,
3164 null); 3181 null);
3165 3182
3166 - NavigatorUtil.goCustomerDetailPage(  
3167 - context,  
3168 - userHistoryEntity,  
3169 - FromPage  
3170 - .FromPageMessagePage);  
3171 - },  
3172 - ),  
3173 - )) 3183 + NavigatorUtil.goCustomerDetailPage(
  3184 + context,
  3185 + userHistoryEntity,
  3186 + FromPage
  3187 + .FromPageMessagePage);
  3188 + },
  3189 + ),
  3190 + ))
3174 ], 3191 ],
3175 ), 3192 ),
3176 3193
@@ -82,7 +82,7 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver { @@ -82,7 +82,7 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
82 }); 82 });
83 WidgetsBinding.instance.addPostFrameCallback((_) async { 83 WidgetsBinding.instance.addPostFrameCallback((_) async {
84 //获取商家的版本信息 84 //获取商家的版本信息
85 - // getSellerVersion(); 85 + getSellerVersion();
86 86
87 ///获取商家时间区间内订单数量 87 ///获取商家时间区间内订单数量
88 _getSellerReserveTotal(); 88 _getSellerReserveTotal();
@@ -134,8 +134,6 @@ class CollectStoreProvider with ChangeNotifier { @@ -134,8 +134,6 @@ class CollectStoreProvider with ChangeNotifier {
134 sellerNormalEdate = element.edate; 134 sellerNormalEdate = element.edate;
135 } 135 }
136 }); 136 });
137 -  
138 - sellerNormal = true;  
139 if (!sellerNormal) { 137 if (!sellerNormal) {
140 //超能版或者标准版过期 138 //超能版或者标准版过期
141 App.sp.setStringList("sellerEdate", ['-1']); 139 App.sp.setStringList("sellerEdate", ['-1']);