6.21 1.1.05

修改定位权限描述
优惠券和广告隐藏

lib/beans/template_bean_entity.dart

@@ -10,4 +10,5 @@ class TemplateBeanData with JsonConvert<TemplateBeanData> {
 	int id;
 	String template;
 	int ownerUid;
+	int shopUid;
 }

lib/generated/json/template_bean_entity_helper.dart

@@ -31,6 +31,11 @@ templateBeanDataFromJson(TemplateBeanData data, Map<String, dynamic> json) {
 				? int.tryParse(json['owner_uid'])
 				: json['owner_uid'].toInt();
 	}
+	if (json['shop_uid'] != null) {
+		data.shopUid = json['shop_uid'] is String
+				? int.tryParse(json['shop_uid'])
+				: json['shop_uid'].toInt();
+	}
 	return data;
 }
 
@@ -39,5 +44,6 @@ Map<String, dynamic> templateBeanDataToJson(TemplateBeanData entity) {
 	data['id'] = entity.id;
 	data['template'] = entity.template;
 	data['owner_uid'] = entity.ownerUid;
+	data['shop_uid'] = entity.shopUid;
 	return data;
 }

lib/main.dart

@@ -28,6 +28,7 @@ import 'package:fluwx/fluwx.dart';
 import 'package:pull_to_refresh/pull_to_refresh.dart';
 import 'package:rxdart/rxdart.dart';
 
+import 'beans/app_store_review_bean_entity.dart';
 import 'beans/coupon_bean_entity.dart';
 import 'beans/my_shop_bean_entity.dart';
 import 'beans/new_order_bean_entity.dart';
@@ -145,6 +146,7 @@ class MyApp extends StatelessWidget with WidgetsBindingObserver {
         couponBulletBox(arg);
       }
     });
+    isItUnderReview();
     return super.createElement();
   }
 
@@ -1346,6 +1348,21 @@ class MyApp extends StatelessWidget with WidgetsBindingObserver {
       }
     }, (error) {});
   }
+
+  void isItUnderReview() {
+    MyDio().post('/model/appStoreReview', {}, (response, hasError) {
+      if(!hasError){
+        AppStoreReviewBeanEntity e = AppStoreReviewBeanEntity().fromJson(json.decode(response.data.toString()));
+        print(e.data);
+        if(e.data&&Platform.isIOS){
+            MyCookie().underReview = true;
+        }else{
+          MyCookie().underReview = false;
+        }
+        EventBus().emit('appStoreReview');
+      }
+    }, (error) { });
+  }
 }
 
 class FallbackCupertinoLocalisationsDelegate

lib/my_tools/dims.dart

@@ -20,7 +20,7 @@ var shopUserDims = [
 ];
 
 var orderTemplateDims = [
-  "id", "sid", "template",'owner_uid'
+  "id", "sid", "template",'owner_uid','shop_uid'
 ];
 
 var shopDims = [

lib/my_tools/my_cookie.dart

@@ -30,6 +30,7 @@ class MyCookie {
   DisableScreenshots plugin;
   MyLocation location;
   bool haveNoPay = false;
+  bool underReview = true;
 
   getUT() {
     return 'user=${loginInformation.data.user}&token=${loginInformation.data.token}';

lib/my_tools/order_processing/order_processing.dart

@@ -140,8 +140,8 @@ class OrderProcessing {
     w:
     for (int i = 0; i < orderTemplate.length; i++) {
       print(
-          '=======================|${orderTemplate[i].ownerUid}||${shop.shopUid}|=======================');
-      if (orderTemplate[i].ownerUid == shop.shopUid) {
+          '=======================|${orderTemplate[i].shopUid}||${shop.shopUid}|=======================');
+      if (orderTemplate[i].shopUid == shop.shopUid) {
         if (parseOrder(orderTemplate[i])) {
           break w;
         }
@@ -151,7 +151,7 @@ class OrderProcessing {
     } else {
       v:
       for (int i = 0; i < orderTemplate.length; i++) {
-        if (orderTemplate[i].ownerUid == 0) {
+        if (orderTemplate[i].shopUid == 0) {
           if (parseOrder(orderTemplate[i])) {
             break v;
           }
@@ -462,7 +462,7 @@ class OrderProcessing {
           orderHash = '';
           matchTemplate();
           if (orderHash == '') {
-            showToast('店铺选择错误');
+            // showToast('店铺选择错误');
             shop = oldShop;
             matchTemplate();
           } else {

lib/paegs/gang_page/gang_in_page/gang_information_page/add_template_page/add_template_page.dart

@@ -87,7 +87,7 @@ class _AddTemplatePageState extends State<AddTemplatePage> {
   }
 
   void saveTemplate() {
-    var object = {'template': controller.text.toString(),'owner_uid':widget.shop.shopUid};
+    var object = {'template': controller.text.toString(),'owner_uid':widget.shop.ownerUid,'shop_uid':widget.shop.shopUid};
     MyDio().save({'key': 'order_template', 'object': object},
         (response, hasError) {
       if (!hasError) {

lib/paegs/login_page/login_page.dart

@@ -379,6 +379,7 @@ class _LoginPageState extends State<LoginPage> {
         if(e.data&&Platform.isIOS){
           setState(() {
             showBrowse = true;
+            MyCookie().underReview = showBrowse;
           });
         }
       }

lib/paegs/mine_page/mine_page.dart

@@ -43,6 +43,11 @@ class _MinePageState extends State<MinePage> {
     EventBus().on('userChange', (arg) {
       setState(() {});
     });
+    EventBus().on('appStoreReview', (arg) {
+      setState(() {
+
+      });
+    });
   }
 
   @override
@@ -50,6 +55,7 @@ class _MinePageState extends State<MinePage> {
     // TODO: implement dispose
     super.dispose();
     EventBus().off('userChange');
+    EventBus().off('appStoreReview');
   }
 
   RefreshController controller = RefreshController();
@@ -230,7 +236,7 @@ class _MinePageState extends State<MinePage> {
                               ],
                             ),
                           ),
-                          GestureDetector(
+                         if(!MyCookie().underReview) GestureDetector(
                             onTap: () {
                               MyTools().toPage(context, CouponPage(), (then) {
                                 queryPersonalInformation();
@@ -327,7 +333,7 @@ class _MinePageState extends State<MinePage> {
                       queryPersonalInformation();
                     });
                   }),
-                  functionItem('images/svg/广告.svg', '广告', () {
+                  if(!MyCookie().underReview)functionItem('images/svg/广告.svg', '广告', () {
                     MyTools().toPage(context, AdvertisingPage(), (then) {});
                   }),
                   functionItem('images/svg/处罚.svg', '投诉', () {