4.15 1.0.3

lib/msgDB/my_msg_db.dart

@@ -1,6 +1,3 @@
-import 'dart:convert';
-
-import 'package:bbyyy/beans/msg_bean_data_entity.dart';
 import 'package:bbyyy/beans/message_bean_entity.dart';
 import 'package:bbyyy/msgDB/sql_manager.dart';
 import 'package:bbyyy/my_tools/event_bus.dart';
@@ -52,27 +49,22 @@ class MsgDB extends BaseDbProvider {
     data.forEach((element) {
       DateTime d1 = DateTime.parse(element.sentAt);
       DateTime d2;
-      try{ d2 = DateTime.parse(lastTime);}catch(e){}
-      if(d2==null){
-        int noRead  = MyCookie().prefs.getInt(
-            '未读消息$roomName');
-        if(noRead==null){
+      try {
+        d2 = DateTime.parse(lastTime);
+      } catch (e) {}
+      if (d2 == null) {
+        int noRead = MyCookie().prefs.getInt('未读消息$roomName');
+        if (noRead == null) {
           noRead = 0;
         }
         noRead++;
-        MyCookie().prefs.setInt(
-            '未读消息$roomName',
-            noRead);
-      }else{
-        if(d1.isAfter(d2)){
-          int noRead  = MyCookie().prefs.getInt(
-              '未读消息$roomName');
+        MyCookie().prefs.setInt('未读消息$roomName', noRead);
+      } else {
+        if (d1.isAfter(d2)) {
+          int noRead = MyCookie().prefs.getInt('未读消息$roomName');
           noRead++;
-          MyCookie().prefs.setInt(
-              '未读消息$roomName',
-              noRead);
-        }else{
-        }
+          MyCookie().prefs.setInt('未读消息$roomName', noRead);
+        } else {}
       }
       batch.insert(name, element.toJson());
     });
@@ -124,4 +116,4 @@ class MsgDB extends BaseDbProvider {
 
   //删除保存记录前的聊天数据
   delPassMsg() {}
-}
+}

lib/paegs/ad_details_page/ad_details_page.dart

@@ -1,20 +1,15 @@
 import 'dart:convert';
 
 import 'package:bbyyy/beans/ad_bean_entity.dart';
-import 'package:bbyyy/beans/alipay_result_bean_entity.dart';
 import 'package:bbyyy/beans/goods_bean_entity.dart';
 import 'package:bbyyy/beans/my_shop_bean_entity.dart';
-import 'package:bbyyy/beans/pay_by_alipay_bean_entity.dart';
 import 'package:bbyyy/beans/smart_order_bean_entity.dart';
-import 'package:bbyyy/beans/user_balance_entity.dart';
 import 'package:bbyyy/https/MyDio.dart';
-import 'package:bbyyy/https/my_request.dart';
 import 'package:bbyyy/https/url.dart';
 import 'package:bbyyy/my_tools/AsperctRaioImage.dart';
 import 'package:bbyyy/my_tools/const.dart';
 import 'package:bbyyy/my_tools/dims.dart';
 import 'package:bbyyy/my_tools/easy_loading/easy_loading.dart';
-import 'package:bbyyy/my_tools/event_bus.dart';
 import 'package:bbyyy/my_tools/my_colors.dart';
 import 'package:bbyyy/my_tools/my_cookie.dart';
 import 'package:bbyyy/my_tools/my_tools.dart';
@@ -22,10 +17,9 @@ import 'package:bbyyy/my_tools/my_views.dart';
 import 'package:bbyyy/paegs/gang_page/gang_in_page/gang_in_page.dart';
 import 'package:bbyyy/paegs/mine_page/advertising_page/new_ad_page.dart';
 import 'package:bbyyy/paegs/product_details_page/product_details_page.dart';
-import 'package:bbyyy/pay/pay_tools.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:tobias/tobias.dart';
+
 import '../../paegs/pay_page/pay_page.dart';
 
 class AdDetailsPage extends StatefulWidget {
@@ -49,9 +43,9 @@ class _AdDetailsPageState extends State<AdDetailsPage> {
             widget.canBeModified
                 ? GestureDetector(
                     onTap: () {
-                      MyTools().toPage(context, NewAdPage(widget.data), (then){
-                        if(then is bool){
-                          if(!then){
+                      MyTools().toPage(context, NewAdPage(widget.data), (then) {
+                        if (then is bool) {
+                          if (!then) {
                             Navigator.pop(context);
                           }
                         }

lib/paegs/chat_page/chat_data.dart

@@ -1,26 +1,22 @@
 import 'package:bbyyy/beans/message_bean_entity.dart';
-import 'package:bbyyy/beans/msg_bean_data_entity.dart';
 import 'package:bbyyy/beans/my_shop_bean_entity.dart';
-import 'package:bbyyy/https/MyDio.dart';
 import 'package:flutter/material.dart';
 
-class ChatData{
+class ChatData {
   ChatData._internal();
 
   static ChatData _singleton = ChatData._internal();
 
-  factory ChatData()=> _singleton;
+  factory ChatData() => _singleton;
 
   MyShopBeanDataData chatWith;
 
   BuildContext context;
   List<MessageBeanContent> msges = [];
 
-
-  clean(){
+  clean() {
     context = null;
     chatWith = null;
     msges.clear();
   }
 }
-

lib/paegs/chat_page/chat_page.dart

@@ -2,7 +2,6 @@ import 'dart:convert';
 
 import 'package:bbyyy/beans/goods_bean_entity.dart';
 import 'package:bbyyy/beans/message_bean_entity.dart';
-import 'package:bbyyy/beans/msg_bean_data_entity.dart';
 import 'package:bbyyy/beans/my_shop_bean_entity.dart';
 import 'package:bbyyy/beans/user_vp_bean_entity.dart';
 import 'package:bbyyy/https/MyDio.dart';
@@ -17,7 +16,6 @@ import 'package:bbyyy/my_tools/my_tools.dart';
 import 'package:bbyyy/my_tools/my_views.dart';
 import 'package:bbyyy/paegs/chat_page/chat_data.dart';
 import 'package:bbyyy/paegs/chat_page/chat_page_view.dart';
-import 'package:disable_screenshots/disable_screenshots.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:pull_to_refresh/pull_to_refresh.dart';
@@ -36,7 +34,6 @@ class ChatPage extends StatefulWidget {
 }
 
 class _ChatPageState extends State<ChatPage> {
-
   FocusNode _focusNode = FocusNode();
   AutoScrollController _scrollController;
   RefreshController _refreshController =
@@ -44,7 +41,6 @@ class _ChatPageState extends State<ChatPage> {
   int page = 1;
   List<MessageBeanContent> msges = [];
 
-
   @override
   void initState() {
     super.initState();
@@ -69,7 +65,9 @@ class _ChatPageState extends State<ChatPage> {
       child: Scaffold(
         body: Column(
           children: [
-            MyViews().myAppBar(widget.chatWith.userUid==0?'客服':widget.chatWith.userName, context, []),
+            MyViews().myAppBar(
+                widget.chatWith.userUid == 0 ? '客服' : widget.chatWith.userName,
+                context, []),
             // ChatPageView().goodsInfo(widget.goods),
             Expanded(
               child: Container(
@@ -136,8 +134,8 @@ class _ChatPageState extends State<ChatPage> {
   }
 
   queryMessage() async {
-    MsgDB msgDB = MsgDB(
-        'table${MyCookie().getUID()}_${widget.chatWith.userUid}');
+    MsgDB msgDB =
+        MsgDB('table${MyCookie().getUID()}_${widget.chatWith.userUid}');
     if (!msgDB.isTableExits) {
       await msgDB.open();
     }
@@ -147,7 +145,7 @@ class _ChatPageState extends State<ChatPage> {
     }
     maps.forEach((element) {
       MessageBeanContent msg =
-      MessageBeanContent().fromJson(json.decode(json.encode(element)));
+          MessageBeanContent().fromJson(json.decode(json.encode(element)));
       msges.add(msg);
       ChatData().msges = msges;
     });
@@ -171,18 +169,21 @@ class _ChatPageState extends State<ChatPage> {
     MyDio().query({
       "key": "user_vp",
       "filters": {
-        "conditions": ["user_uid == ${widget.chatWith.userUid}","vp_key == $vpKeyChatWaterMark"]
+        "conditions": [
+          "user_uid == ${widget.chatWith.userUid}",
+          "vp_key == $vpKeyChatWaterMark"
+        ]
       },
       "dims": userVpDims,
       "paging": [1, 2000]
     }, (response, hasError) {
       UserVpBeanEntity entity =
-      UserVpBeanEntity().fromJson(json.decode(response.data.toString()));
-      if(entity.data.data.length != 0){
+          UserVpBeanEntity().fromJson(json.decode(response.data.toString()));
+      if (entity.data.data.length != 0) {
         MyCookie().plugin.addWatermark(context, "${MyCookie().getUID()}",
             rowCount: 4, columnCount: 8);
         print('asdfnfansfionasifnioasfn');
-      }else{
+      } else {
         watermarkQuery2();
         print('41515115151');
       }
@@ -190,22 +191,25 @@ class _ChatPageState extends State<ChatPage> {
     }, (error) {});
   }
 
-  void watermarkQuery2(){
+  void watermarkQuery2() {
     MyDio().query({
       "key": "user_vp",
       "filters": {
-        "conditions": ["user_uid == ${MyCookie().getUID()}","vp_key == $vpKeyChatWaterMark"]
+        "conditions": [
+          "user_uid == ${MyCookie().getUID()}",
+          "vp_key == $vpKeyChatWaterMark"
+        ]
       },
       "dims": userVpDims,
       "paging": [1, 2000]
     }, (response, hasError) {
       UserVpBeanEntity entity =
-      UserVpBeanEntity().fromJson(json.decode(response.data.toString()));
-      if(entity.data.data.length != 0){
+          UserVpBeanEntity().fromJson(json.decode(response.data.toString()));
+      if (entity.data.data.length != 0) {
         MyCookie().plugin.addWatermark(context, "${MyCookie().getUID()}",
             rowCount: 4, columnCount: 8);
         print('asdfnfansfionasifnioasfn');
-      }else{
+      } else {
         print('41515115151');
       }
       setState(() {});

lib/paegs/gang_page/create_a_gang_page/create_a_gang_page.dart

@@ -1,24 +1,18 @@
 import 'dart:convert';
 import 'dart:io';
 
-import 'package:bbyyy/beans/alipay_result_bean_entity.dart';
 import 'package:bbyyy/beans/annual_fee_order_bean_entity.dart';
 import 'package:bbyyy/beans/commodity_category_bean_entity.dart';
 import 'package:bbyyy/beans/fixed_price_bean_entity.dart';
-import 'package:bbyyy/beans/pay_by_alipay_bean_entity.dart';
 import 'package:bbyyy/beans/upload_image_bean_entity.dart';
-import 'package:bbyyy/beans/user_balance_entity.dart';
 import 'package:bbyyy/https/MyDio.dart';
 import 'package:bbyyy/https/my_request.dart';
 import 'package:bbyyy/https/url.dart';
-import 'package:bbyyy/my_tools/const.dart';
 import 'package:bbyyy/my_tools/easy_loading/easy_loading.dart';
-import 'package:bbyyy/my_tools/event_bus.dart';
 import 'package:bbyyy/my_tools/my_colors.dart';
 import 'package:bbyyy/my_tools/my_cookie.dart';
 import 'package:bbyyy/my_tools/my_tools.dart';
 import 'package:bbyyy/my_tools/my_views.dart';
-import 'package:bbyyy/pay/pay_tools.dart';
 import 'package:flustars/flustars.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
@@ -26,7 +20,7 @@ import 'package:flutter/services.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:image_cropper/image_cropper.dart';
 import 'package:image_picker/image_picker.dart';
-import 'package:tobias/tobias.dart';
+
 import '../../../paegs/pay_page/pay_page.dart';
 
 class CreateAGangPage extends StatefulWidget {
@@ -253,8 +247,7 @@ class _CreateAGangPageState extends State<CreateAGangPage> {
                           child: Container(
                             child: Row(
                               children: [
-                                MyViews()
-                                    .myText('货帮类型', MyColors.c333333, 15),
+                                MyViews().myText('货帮类型', MyColors.c333333, 15),
                                 DropdownButtonHideUnderline(
                                   child: DropdownButton(
                                     isDense: true,
@@ -1195,8 +1188,11 @@ class _CreateAGangPageState extends State<CreateAGangPage> {
                   Expanded(
                     child: GestureDetector(
                       onTap: () {
-                        MyTools().toPage(context,
-                            PayPage(order.data.orderUid, false, double.parse(feePricing)), (then) {});
+                        MyTools().toPage(
+                            context,
+                            PayPage(order.data.orderUid, false,
+                                double.parse(feePricing)),
+                            (then) {});
                         // getUserWalletBalance((re, hE) {
                         //   if (!hE) {
                         //     UserBalanceEntity balance = UserBalanceEntity()

lib/paegs/gang_page/gang_in_page/gang_in_page.dart

@@ -1,20 +1,15 @@
 import 'dart:convert';
 import 'dart:math';
 
-import 'package:bbyyy/beans/alipay_result_bean_entity.dart';
 import 'package:bbyyy/beans/goods_bean_entity.dart';
 import 'package:bbyyy/beans/my_shop_bean_entity.dart';
 import 'package:bbyyy/beans/new_order_bean_entity.dart';
-import 'package:bbyyy/beans/pay_by_alipay_bean_entity.dart';
 import 'package:bbyyy/beans/smart_order_bean_entity.dart';
 import 'package:bbyyy/beans/store_bean_entity.dart';
-import 'package:bbyyy/beans/user_balance_entity.dart';
 import 'package:bbyyy/https/MyDio.dart';
-import 'package:bbyyy/https/my_request.dart';
 import 'package:bbyyy/https/url.dart';
 import 'package:bbyyy/my_tools/const.dart';
 import 'package:bbyyy/my_tools/dims.dart';
-import 'package:bbyyy/my_tools/easy_loading/easy_loading.dart';
 import 'package:bbyyy/my_tools/event_bus.dart';
 import 'package:bbyyy/my_tools/my_colors.dart';
 import 'package:bbyyy/my_tools/my_cookie.dart';
@@ -22,17 +17,16 @@ import 'package:bbyyy/my_tools/my_tools.dart';
 import 'package:bbyyy/my_tools/my_views.dart';
 import 'package:bbyyy/paegs/chat_page/chat_page.dart';
 import 'package:bbyyy/paegs/gang_page/gang_in_page/pay_to_the_helper_page/pay_to_the_helper_page.dart';
-import 'package:bbyyy/pay/pay_tools.dart';
+import 'package:bbyyy/paegs/pay_page/pay_page.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_slidable/flutter_slidable.dart';
 import 'package:flutter_svg/svg.dart';
 import 'package:pull_to_refresh/pull_to_refresh.dart';
-import 'package:tobias/tobias.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 import 'gang_information_page/gang_information_page.dart';
-import 'package:bbyyy/paegs/pay_page/pay_page.dart';
+
 class GangInPage extends StatefulWidget {
   MyShopBeanDataData data;
   NewOrderBeanContent order;
@@ -189,7 +183,9 @@ class _GangInPageState extends State<GangInPage> {
                                         ))
                                       ],
                                     ),
-                                    Container(height: 10,),
+                                    Container(
+                                      height: 10,
+                                    ),
                                     Text(
                                       store == null
                                           ? '货帮介绍：暂无'
@@ -201,7 +197,10 @@ class _GangInPageState extends State<GangInPage> {
                                       maxLines: 3,
                                       overflow: TextOverflow.ellipsis,
                                       softWrap: true,
-                                    ),  Container(height: 10,),
+                                    ),
+                                    Container(
+                                      height: 10,
+                                    ),
                                     Row(
                                       children: [
                                         SvgPicture.asset(
@@ -227,23 +226,43 @@ class _GangInPageState extends State<GangInPage> {
                                           ),
                                         ),
                                       ],
-                                    ),  Container(height: 10,),
+                                    ),
+                                    Container(
+                                      height: 10,
+                                    ),
                                     GestureDetector(
-                                      onTap: (){
+                                      onTap: () {
                                         launch('tel:${store.mobile}');
                                       },
                                       behavior: HitTestBehavior.translucent,
                                       child: Container(
                                         decoration: BoxDecoration(
                                           color: MyColors.cFF4233,
-                                          borderRadius: BorderRadius.circular(20),
+                                          borderRadius:
+                                              BorderRadius.circular(20),
                                         ),
                                         height: 40,
-                                        child: Row(children: [
-                                          SvgPicture.asset('images/svg/电话.svg',color: Colors.white,height: 24,width: 24,),
-                                          Container(width: 4,),
-                                          Text(store==null?'':store.mobile,style: TextStyle(color: Colors.white,fontSize: 15),),
-                                        ],mainAxisAlignment: MainAxisAlignment.center,),
+                                        child: Row(
+                                          children: [
+                                            SvgPicture.asset(
+                                              'images/svg/电话.svg',
+                                              color: Colors.white,
+                                              height: 24,
+                                              width: 24,
+                                            ),
+                                            Container(
+                                              width: 4,
+                                            ),
+                                            Text(
+                                              store == null ? '' : store.mobile,
+                                              style: TextStyle(
+                                                  color: Colors.white,
+                                                  fontSize: 15),
+                                            ),
+                                          ],
+                                          mainAxisAlignment:
+                                              MainAxisAlignment.center,
+                                        ),
                                         alignment: Alignment.center,
                                       ),
                                     )
@@ -530,7 +549,8 @@ class _GangInPageState extends State<GangInPage> {
                                 border: Border.all(
                                     color: MyColors.cFF4233, width: 1)),
                             height: 40,
-                            child: MyViews().myText('联系帮主', MyColors.cFF4233, 14),
+                            child:
+                                MyViews().myText('联系帮主', MyColors.cFF4233, 14),
                             alignment: Alignment.center),
                       ),
                     ),
@@ -790,7 +810,7 @@ class _GangInPageState extends State<GangInPage> {
     showPayDialog(data, context, () {
       Navigator.pop(context);
       MyTools().toPage(context,
-          PayPage(widget.order.uID, false,widget.order.amount), (then) {});
+          PayPage(widget.order.uID, false, widget.order.amount), (then) {});
       // getUserWalletBalance((re, hE) {
       //   if (!hE) {
       //     UserBalanceEntity balance =

lib/paegs/gang_page/gang_in_page/pay_to_the_helper_page/pay_to_the_helper_page.dart

@@ -3,18 +3,15 @@ import 'dart:convert';
 import 'package:bbyyy/beans/my_shop_bean_entity.dart';
 import 'package:bbyyy/beans/offline_payment_bean_entity.dart';
 import 'package:bbyyy/beans/store_bean_entity.dart';
-import 'package:bbyyy/beans/user_balance_entity.dart';
 import 'package:bbyyy/https/MyDio.dart';
 import 'package:bbyyy/https/url.dart';
 import 'package:bbyyy/my_tools/const.dart';
 import 'package:bbyyy/my_tools/dims.dart';
-import 'package:bbyyy/my_tools/event_bus.dart';
 import 'package:bbyyy/my_tools/my_colors.dart';
 import 'package:bbyyy/my_tools/my_cookie.dart';
 import 'package:bbyyy/my_tools/my_tools.dart';
 import 'package:bbyyy/my_tools/my_views.dart';
 import 'package:bbyyy/paegs/pay_page/pay_page.dart';
-import 'package:bbyyy/pay/pay_tools.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 
@@ -207,7 +204,7 @@ class _PayToTheHelperPageState extends State<PayToTheHelperPage> {
 
   void payTheOrder(int orderUID) {
     _controller.clear();
-    MyTools().toPage(context, PayPage(orderUID,true,amount), (then) {
+    MyTools().toPage(context, PayPage(orderUID, true, amount), (then) {
       if (then is String) {
         if (then == '支付成功') {
           Navigator.pop(context);

lib/paegs/guest_login_page/root_page.dart

@@ -1,12 +1,9 @@
-import 'package:bbyyy/https/my_request.dart';
 import 'package:bbyyy/my_tools/easy_loading/easy_loading.dart';
 import 'package:bbyyy/my_tools/event_bus.dart';
 import 'package:bbyyy/my_tools/global.dart';
 import 'package:bbyyy/my_tools/my_colors.dart';
 import 'package:bbyyy/my_tools/my_cookie.dart';
-import 'package:bbyyy/my_tools/my_datas.dart';
 import 'package:bbyyy/my_tools/my_views.dart';
-import 'package:bbyyy/paegs/home_page/home_page.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 

lib/paegs/mine_page/advertising_page/advertising_page.dart

@@ -3,14 +3,11 @@ import 'dart:convert';
 import 'package:bbyyy/beans/ad_bean_entity.dart';
 import 'package:bbyyy/https/MyDio.dart';
 import 'package:bbyyy/my_tools/dims.dart';
-import 'package:bbyyy/my_tools/my_colors.dart';
 import 'package:bbyyy/my_tools/my_cookie.dart';
 import 'package:bbyyy/my_tools/my_tools.dart';
 import 'package:bbyyy/my_tools/my_views.dart';
 import 'package:bbyyy/paegs/ad_details_page/ad_details_page.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_slidable/flutter_slidable.dart';
-import 'package:flutter_svg/svg.dart';
 import 'package:pull_to_refresh/pull_to_refresh.dart';
 
 import 'new_ad_page.dart';

lib/paegs/mine_page/advertising_page/related_products_page.dart

@@ -8,17 +8,13 @@ import 'package:bbyyy/my_tools/my_colors.dart';
 import 'package:bbyyy/my_tools/my_cookie.dart';
 import 'package:bbyyy/my_tools/my_views.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_slidable/flutter_slidable.dart';
-import 'package:pull_to_refresh/pull_to_refresh.dart';
 
 class RelatedProductsPage extends StatefulWidget {
   @override
   _RelatedProductsPageState createState() => _RelatedProductsPageState();
 }
 
-
 class _RelatedProductsPageState extends State<RelatedProductsPage> {
-
   List<GoodsBeanDataData> data = [];
 
   @override
@@ -27,6 +23,7 @@ class _RelatedProductsPageState extends State<RelatedProductsPage> {
     super.initState();
     queryProducts();
   }
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(
@@ -37,82 +34,99 @@ class _RelatedProductsPageState extends State<RelatedProductsPage> {
             child: data.length == 0
                 ? SingleChildScrollView(child: noData())
                 : ListView.builder(
-              itemBuilder: (c, index) {
-                return GestureDetector(
-                  onTap: (){
-                    Navigator.pop(context,data[index]);
-                  },
-                  behavior: HitTestBehavior.translucent,
-                  child: Container(
-                    padding: EdgeInsets.only(left: 8, right: 8, bottom: 7, top: 18),
-                    decoration: BoxDecoration(
-                      color: Colors.white,
-                      borderRadius: BorderRadius.all(
-                        Radius.circular(4),
-                      ),
-                    ),
-                    margin: EdgeInsets.only(left: 10, right: 10, bottom: 10),
-                    child: Column(
-                      children: [
-                        Row(
-                          children: [
-                            ClipRRect(child: MyViews().netImg(imgURL(data[index].shopPic), 25, 25),borderRadius: BorderRadius.circular(12.5),),
-                            Container(
-                              margin: EdgeInsets.only(left: 10),
-                              child: Text(
-                                data[index].shopName,
-                                style: TextStyle(color: MyColors.c333333, fontSize: 14),
-                              ),
-                            ),
-                          ],
-                        ),
-                        Container(
-                          height: 0.5,
-                          color: MyColors.cE7E7E7,
-                          margin: EdgeInsets.only(top: 14),
-                        ),
-                        Row(
-                          children: [
-                            Container(
-                              child: MyViews().netImg(imgURL(data[index].coverPath), 50, 50,
-                                  placeholder: 'images/svg/goodsDefImg.svg'),
-                              margin: EdgeInsets.only(right: 8, top: 11, bottom: 11),
+                    itemBuilder: (c, index) {
+                      return GestureDetector(
+                        onTap: () {
+                          Navigator.pop(context, data[index]);
+                        },
+                        behavior: HitTestBehavior.translucent,
+                        child: Container(
+                          padding: EdgeInsets.only(
+                              left: 8, right: 8, bottom: 7, top: 18),
+                          decoration: BoxDecoration(
+                            color: Colors.white,
+                            borderRadius: BorderRadius.all(
+                              Radius.circular(4),
                             ),
-                            Expanded(
-                              child: Container(
-                                child: Column(
-                                  children: [
-                                    Text(
-                                      '${data[index].title}',
-                                      style: TextStyle(color: MyColors.c333333, fontSize: 13),
+                          ),
+                          margin:
+                              EdgeInsets.only(left: 10, right: 10, bottom: 10),
+                          child: Column(
+                            children: [
+                              Row(
+                                children: [
+                                  ClipRRect(
+                                    child: MyViews().netImg(
+                                        imgURL(data[index].shopPic), 25, 25),
+                                    borderRadius: BorderRadius.circular(12.5),
+                                  ),
+                                  Container(
+                                    margin: EdgeInsets.only(left: 10),
+                                    child: Text(
+                                      data[index].shopName,
+                                      style: TextStyle(
+                                          color: MyColors.c333333,
+                                          fontSize: 14),
+                                    ),
+                                  ),
+                                ],
+                              ),
+                              Container(
+                                height: 0.5,
+                                color: MyColors.cE7E7E7,
+                                margin: EdgeInsets.only(top: 14),
+                              ),
+                              Row(
+                                children: [
+                                  Container(
+                                    child: MyViews().netImg(
+                                        imgURL(data[index].coverPath), 50, 50,
+                                        placeholder:
+                                            'images/svg/goodsDefImg.svg'),
+                                    margin: EdgeInsets.only(
+                                        right: 8, top: 11, bottom: 11),
+                                  ),
+                                  Expanded(
+                                    child: Container(
+                                      child: Column(
+                                        children: [
+                                          Text(
+                                            '${data[index].title}',
+                                            style: TextStyle(
+                                                color: MyColors.c333333,
+                                                fontSize: 13),
+                                          ),
+                                          Row(
+                                            children: [
+                                              Text(
+                                                '￥${data[index].price}',
+                                                style: TextStyle(
+                                                    color: MyColors.cFF4233,
+                                                    fontSize: 12),
+                                              ),
+                                            ],
+                                            mainAxisAlignment:
+                                                MainAxisAlignment.spaceBetween,
+                                          )
+                                        ],
+                                        mainAxisAlignment:
+                                            MainAxisAlignment.spaceBetween,
+                                        crossAxisAlignment:
+                                            CrossAxisAlignment.start,
+                                      ),
+                                      height: 50,
                                     ),
-                                    Row(
-                                      children: [
-                                        Text(
-                                          '￥${data[index].price}',
-                                          style: TextStyle(
-                                              color: MyColors.cFF4233, fontSize: 12),
-                                        ),
-                                      ],
-                                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                                    )
-                                  ],
-                                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                                  crossAxisAlignment: CrossAxisAlignment.start,
-                                ),
-                                height: 50,
+                                  )
+                                ],
                               ),
-                            )
-                          ],
+                            ],
+                          ),
                         ),
-                      ],
-                    ),
+                      );
+                    },
+                    itemCount: data.length,
+                    padding: EdgeInsets.only(top: 10),
                   ),
-                );
-              },
-              itemCount: data.length,
-              padding: EdgeInsets.only(top: 10),
-            ),
           ),
         ],
       ),
@@ -130,10 +144,10 @@ class _RelatedProductsPageState extends State<RelatedProductsPage> {
     }, (response, hasError) {
       if (!hasError) {
         GoodsBeanEntity entity =
-        GoodsBeanEntity().fromJson(json.decode(response.data.toString()));
+            GoodsBeanEntity().fromJson(json.decode(response.data.toString()));
         data = entity.data.data;
         setState(() {});
       }
-    }, (error) { });
+    }, (error) {});
   }
 }

lib/paegs/picture_display_page/picture_display_page.dart

@@ -1,8 +1,6 @@
 import 'package:bbyyy/my_tools/AsperctRaioImage.dart';
-import 'package:bbyyy/my_tools/my_views.dart';
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_svg/svg.dart';
 
 class PictureDisplayPage extends StatefulWidget {
   String imagePath;
@@ -26,12 +24,18 @@ class _PictureDisplayPageState extends State<PictureDisplayPage> {
                   builder: (context, snapshot, url) {
                 double h = (snapshot.data.height.toDouble() / 5);
                 double w = (snapshot.data.width.toDouble() / 5);
-                bool fw = h/w>=MediaQuery.of(context).size.height/MediaQuery.of(context).size.width;
+                bool fw = h / w >=
+                    MediaQuery.of(context).size.height /
+                        MediaQuery.of(context).size.width;
                 print('h-------------$h\nw----------------$w');
                 return CachedNetworkImage(
                   imageUrl: widget.imagePath,
-                  height: fw?h/w*MediaQuery.of(context).size.width:MediaQuery.of(context).size.height,
-                  width: fw?MediaQuery.of(context).size.width:w/h*MediaQuery.of(context).size.height,
+                  height: fw
+                      ? h / w * MediaQuery.of(context).size.width
+                      : MediaQuery.of(context).size.height,
+                  width: fw
+                      ? MediaQuery.of(context).size.width
+                      : w / h * MediaQuery.of(context).size.height,
                 );
               }),
               onTap: () {

lib/paegs/root_page/root_page.dart

@@ -6,7 +6,6 @@ import 'package:bbyyy/https/my_request.dart';
 import 'package:bbyyy/my_tools/dims.dart';
 import 'package:bbyyy/my_tools/easy_loading/easy_loading.dart';
 import 'package:bbyyy/my_tools/event_bus.dart';
-import 'package:bbyyy/my_tools/my_colors.dart';
 import 'package:bbyyy/my_tools/my_cookie.dart';
 import 'package:bbyyy/my_tools/my_datas.dart';
 import 'package:bbyyy/nsq/nsq.dart' as Nsq;

pubspec.lock

@@ -1,6 +1,13 @@
 # Generated by pub
 # See https://dart.dev/tools/pub/glossary#lockfile
 packages:
+  amap_location:
+    dependency: "direct main"
+    description:
+      name: amap_location
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "0.2.0"
   archive:
     dependency: transitive
     description:

pubspec.yaml

@@ -60,6 +60,7 @@ dependencies:
   install_plugin: ^2.0.1 #安装apk
   url_launcher: ^6.0.3
   launch_review: ^3.0.1
+  amap_location: ^0.2.0
 
 
 dev_dependencies: