10.18

images/svg/添加成员.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1634537229632" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2428" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M535.179636 546.164364a272.756364 272.756364 0 1 1 0-545.512728 272.756364 272.756364 0 0 1 0 545.512728z m0-466.106182a191.115636 191.115636 0 0 0-191.301818 191.301818 191.115636 191.115636 0 0 0 191.301818 191.301818 191.115636 191.115636 0 0 0 191.301819-191.301818c0-103.796364-85.457455-191.301818-191.301819-191.301818z" p-id="2429"></path><path d="M87.412364 995.979636a40.820364 40.820364 0 0 1-40.727273-40.727272c0-268.660364 219.834182-488.494545 488.494545-488.494546 22.388364 0 40.727273 18.338909 40.727273 40.727273a40.820364 40.820364 0 0 1-40.727273 40.727273c-223.883636 0-407.086545 183.156364-407.086545 407.04a40.820364 40.820364 0 0 1-40.680727 40.727272zM936.168727 812.776727h-313.483636a40.820364 40.820364 0 0 1-40.680727-40.680727c0-22.388364 18.292364-40.727273 40.680727-40.727273h313.483636c22.341818 0 40.680727 18.338909 40.680728 40.727273a40.820364 40.820364 0 0 1-40.680728 40.680727z" p-id="2430"></path><path d="M779.403636 969.541818a40.820364 40.820364 0 0 1-40.680727-40.727273V615.330909c0-22.388364 18.292364-40.727273 40.680727-40.727273s40.727273 18.338909 40.727273 40.727273v313.437091a40.820364 40.820364 0 0 1-40.727273 40.680727z" p-id="2431"></path></svg>

lib/beans/my_shop_bean_entity.dart

@@ -56,6 +56,8 @@ class MyShopBeanDataData extends ISuspensionBean  with JsonConvert<MyShopBeanDat
   String recommenderPic;
   @JSONField(name: "user_remark")
   String userRemark;
+  @JSONField(name: "introducer_uid")
+  int introducerUID;
 
   String tagIndex;
 

lib/generated/json/my_shop_bean_entity_helper.dart

@@ -123,6 +123,11 @@ myShopBeanDataDataFromJson(MyShopBeanDataData data, Map<String, dynamic> json) {
 	if (json['user_remark'] != null) {
 		data.userRemark = json['user_remark'].toString();
 	}
+	if (json['introducer_uid'] != null) {
+		data.introducerUID = json['introducer_uid'] is String
+				? int.tryParse(json['introducer_uid'])
+				: json['introducer_uid'].toInt();
+	}
 	if (json['tagIndex'] != null) {
 		data.tagIndex = json['tagIndex'].toString();
 	}
@@ -154,6 +159,7 @@ Map<String, dynamic> myShopBeanDataDataToJson(MyShopBeanDataData entity) {
 	data['recommender_name'] = entity.recommenderName;
 	data['recommender_pic'] = entity.recommenderPic;
 	data['user_remark'] = entity.userRemark;
+	data['introducer_uid'] = entity.introducerUID;
 	data['tagIndex'] = entity.tagIndex;
 	return data;
 }

lib/my_tools/dims.dart

@@ -20,7 +20,8 @@ var shopUserDims = [
   "recommender_uid",
   "recommender_name",
   "user_remark",
-  "recommender_pic"
+  "recommender_pic",
+  "introducer_uid"
 ];
 
 var orderTemplateDims = [

lib/paegs/gang_page/gang_in_page/gang_in_page.dart

@@ -223,10 +223,10 @@ class _GangInPageState extends State<GangInPage> {
                       MyTools().toPage(
                           context, ShopFlowPage(widget.data), (then) {});
                       break;
-                    case '推荐人':
-                      MyTools().toPage(
-                          context, ReferrerPage(data: widget.data), (then) {});
-                      break;
+                    // case '推荐人':
+                    //   MyTools().toPage(
+                    //       context, ReferrerPage(data: widget.data), (then) {});
+                    //   break;
                     case '发送红包':
                       MyTools().toPage(
                           context, SendRedEnvelopePage(widget.data), (then) {
@@ -301,7 +301,7 @@ class _GangInPageState extends State<GangInPage> {
                           ],
                         ),
                       ),
-                    if (MyCookie().getUID() == widget.data.ownerUid )
+                    if (MyCookie().getUID() == widget.data.ownerUid)
                       PopupMenuItem<String>(
                         value: '收款二维码',
                         child: Row(
@@ -343,27 +343,27 @@ class _GangInPageState extends State<GangInPage> {
                           ],
                         ),
                       ),
-                    if (viewReferralAuthority(widget.data.role))
-                      PopupMenuItem<String>(
-                        value: '推荐人',
-                        child: Row(
-                          children: [
-                            SvgPicture.asset(
-                              'images/svg/推荐人.svg',
-                              height: 20,
-                              width: 20,
-                            ),
-                            Container(
-                              child: Text(
-                                '推荐人',
-                                style: TextStyle(
-                                    fontSize: 14, color: MyColors.c333333),
-                              ),
-                              margin: EdgeInsets.only(left: 5),
-                            ),
-                          ],
-                        ),
-                      ),
+                    // if (viewReferralAuthority(widget.data.role))
+                    //   PopupMenuItem<String>(
+                    //     value: '推荐人',
+                    //     child: Row(
+                    //       children: [
+                    //         SvgPicture.asset(
+                    //           'images/svg/推荐人.svg',
+                    //           height: 20,
+                    //           width: 20,
+                    //         ),
+                    //         Container(
+                    //           child: Text(
+                    //             '推荐人',
+                    //             style: TextStyle(
+                    //                 fontSize: 14, color: MyColors.c333333),
+                    //           ),
+                    //           margin: EdgeInsets.only(left: 5),
+                    //         ),
+                    //       ],
+                    //     ),
+                    //   ),
                     // PopupMenuItem<String>(
                     //   value: '发送红包',
                     //   child: Row(
@@ -776,21 +776,22 @@ class _GangInPageState extends State<GangInPage> {
                       child: Row(
                         children: [
                           Expanded(
-                              child: TextField(
-                            controller: _textEditingController,
-                            decoration: InputDecoration(
-                              border: InputBorder.none,
-                              disabledBorder: InputBorder.none,
-                              enabledBorder: InputBorder.none,
-                              focusedBorder: InputBorder.none,
-                              isDense: true,
-                              hintText: '请输入信息',
-                              hintStyle: TextStyle(
-                                  color: MyColors.c999999, fontSize: 16),
-                              contentPadding:
-                                  const EdgeInsets.fromLTRB(14, 4.5, 8, 4.5),
+                            child: TextField(
+                              controller: _textEditingController,
+                              decoration: InputDecoration(
+                                border: InputBorder.none,
+                                disabledBorder: InputBorder.none,
+                                enabledBorder: InputBorder.none,
+                                focusedBorder: InputBorder.none,
+                                isDense: true,
+                                hintText: '请输入信息',
+                                hintStyle: TextStyle(
+                                    color: MyColors.c999999, fontSize: 16),
+                                contentPadding:
+                                    const EdgeInsets.fromLTRB(14, 4.5, 8, 4.5),
+                              ),
                             ),
-                          )),
+                          ),
                           GestureDetector(
                             onTap: () {
                               controller.requestRefresh();
@@ -810,7 +811,28 @@ class _GangInPageState extends State<GangInPage> {
                               ),
                               alignment: Alignment.center,
                             ),
-                          )
+                          ),
+                          if(addMemberPermissions(widget.data.role))
+                          GestureDetector(
+                            onTap: () {
+                              MyTools().toPage(
+                                  context, AddMemberPage(store: store),
+                                      (then) {
+                                    controller.requestRefresh(needMove: false);
+                                  });
+                            },
+                            behavior: HitTestBehavior.translucent,
+                            child: Container(
+                              decoration: BoxDecoration(
+                                  borderRadius: BorderRadius.circular(20),
+                                  color: MyColors.cFF4233),
+                              height: 40,
+                              width: 40,
+                              margin: EdgeInsets.only(left: 10),
+                              child:SvgPicture.asset('images/svg/添加成员.svg',height: 18,width: 18,color: Colors.white,),
+                              alignment: Alignment.center,
+                            ),
+                          ),
                         ],
                       ),
                     ),
@@ -1387,7 +1409,7 @@ class _GangInPageState extends State<GangInPage> {
           canSendGood = true;
         }
         //自己在某个允许顾客间交易的私有店铺中
-        if (store.innerTrade&&store.private) {
+        if (store.innerTrade && store.private) {
           canSendGood = true;
         }
         setState(() {});

lib/paegs/gang_page/gang_in_page/gang_information_page/member_list_page/member_details_page.dart

@@ -234,143 +234,143 @@ class _MemberDetailsPageState extends State<MemberDetailsPage> {
                               ],
                             ),
                           ),
-                          Visibility(
-                            visible: widget.member.privateShop,
-                            child: Column(
-                              children: [
-                                Container(
-                                  height: 0.5,
-                                  margin: EdgeInsets.symmetric(horizontal: 15),
-                                  color: MyColors.cE7E7E7,
-                                ),
-                                Container(
-                                  height: 55,
-                                  alignment: Alignment.center,
-                                  padding: EdgeInsets.symmetric(horizontal: 15),
-                                  child: Row(
-                                    children: [
-                                      Container(
-                                        width: 60,
-                                        child: Text(
-                                          '推荐人',
-                                          style: TextStyle(
-                                              color: MyColors.c333333,
-                                              fontSize: 15),
-                                        ),
-                                        margin: EdgeInsets.only(right: 28),
-                                      ),
-                                      Expanded(
-                                        child: GestureDetector(
-                                            onTap: () {
-                                              MyTools().toPage(
-                                                  context,
-                                                  SetRecommendedPersonPage(
-                                                      widget.member), (then) {
-                                                if (then
-                                                    is MyShopBeanDataData) {
-                                                  referrer.recommenderUid =
-                                                      then.userUid;
-                                                  referrer.recommenderPic =
-                                                      then.userPic;
-                                                  referrer.recommenderName =
-                                                      then.userName;
-                                                  setState(() {});
-                                                }
-                                              });
-                                            },
-                                            behavior:
-                                                HitTestBehavior.translucent,
-                                            child: Container(
-                                              height: 50,
-                                              alignment: Alignment.centerLeft,
-                                              child: referrer.recommenderName ==
-                                                          '' ||
-                                                      referrer.recommenderUid ==
-                                                          0
-                                                  ? Text(
-                                                      '暂无',
-                                                      style: TextStyle(
-                                                          color:
-                                                              MyColors.c999999,
-                                                          fontSize: 15),
-                                                    )
-                                                  : Row(
-                                                      children: [
-                                                        Row(
-                                                          children: [
-                                                            ClipRRect(
-                                                              child: MyViews().netImg(
-                                                                  imgURL(referrer
-                                                                      .recommenderPic),
-                                                                  30,
-                                                                  30),
-                                                              borderRadius:
-                                                                  BorderRadius
-                                                                      .circular(
-                                                                          15),
-                                                            ),
-                                                            Container(
-                                                              margin: EdgeInsets
-                                                                  .only(
-                                                                      left: 8),
-                                                              child: Text(
-                                                                '${referrer.recommenderName}(${referrer.recommenderUid})',
-                                                                style: TextStyle(
-                                                                    color: MyColors
-                                                                        .c999999,
-                                                                    fontSize:
-                                                                        15),
-                                                              ),
-                                                            ),
-                                                          ],
-                                                        ),
-                                                        GestureDetector(
-                                                          onTap: () {
-                                                            referrer.recommenderPic =
-                                                                '';
-                                                            referrer.recommenderName =
-                                                                '';
-                                                            referrer
-                                                                .recommenderUid = 0;
-                                                            setState(() {});
-                                                          },
-                                                          behavior:
-                                                              HitTestBehavior
-                                                                  .translucent,
-                                                          child: Container(
-                                                            decoration: BoxDecoration(
-                                                                color: MyColors
-                                                                    .cFF4233,
-                                                                borderRadius:
-                                                                    BorderRadius
-                                                                        .circular(
-                                                                            15)),
-                                                            height: 30,
-                                                            width: 60,
-                                                            child: Text(
-                                                              '移除',
-                                                              style: TextStyle(
-                                                                  color: Colors
-                                                                      .white,
-                                                                  fontSize: 10),
-                                                            ),
-                                                            alignment: Alignment
-                                                                .center,
-                                                          ),
-                                                        )
-                                                      ],
-                                                      mainAxisAlignment:
-                                                          MainAxisAlignment
-                                                              .spaceBetween,
-                                                    ),
-                                            )),
-                                      )
-                                    ],
-                                  ),
-                                ),
-                              ],
-                            ),
-                          ),
+                          // Visibility(
+                          //   visible: widget.member.privateShop,
+                          //   child: Column(
+                          //     children: [
+                          //       Container(
+                          //         height: 0.5,
+                          //         margin: EdgeInsets.symmetric(horizontal: 15),
+                          //         color: MyColors.cE7E7E7,
+                          //       ),
+                          //       Container(
+                          //         height: 55,
+                          //         alignment: Alignment.center,
+                          //         padding: EdgeInsets.symmetric(horizontal: 15),
+                          //         child: Row(
+                          //           children: [
+                          //             Container(
+                          //               width: 60,
+                          //               child: Text(
+                          //                 '推荐人',
+                          //                 style: TextStyle(
+                          //                     color: MyColors.c333333,
+                          //                     fontSize: 15),
+                          //               ),
+                          //               margin: EdgeInsets.only(right: 28),
+                          //             ),
+                          //             Expanded(
+                          //               child: GestureDetector(
+                          //                   onTap: () {
+                          //                     MyTools().toPage(
+                          //                         context,
+                          //                         SetRecommendedPersonPage(
+                          //                             widget.member), (then) {
+                          //                       if (then
+                          //                           is MyShopBeanDataData) {
+                          //                         referrer.recommenderUid =
+                          //                             then.userUid;
+                          //                         referrer.recommenderPic =
+                          //                             then.userPic;
+                          //                         referrer.recommenderName =
+                          //                             then.userName;
+                          //                         setState(() {});
+                          //                       }
+                          //                     });
+                          //                   },
+                          //                   behavior:
+                          //                       HitTestBehavior.translucent,
+                          //                   child: Container(
+                          //                     height: 50,
+                          //                     alignment: Alignment.centerLeft,
+                          //                     child: referrer.recommenderName ==
+                          //                                 '' ||
+                          //                             referrer.recommenderUid ==
+                          //                                 0
+                          //                         ? Text(
+                          //                             '暂无',
+                          //                             style: TextStyle(
+                          //                                 color:
+                          //                                     MyColors.c999999,
+                          //                                 fontSize: 15),
+                          //                           )
+                          //                         : Row(
+                          //                             children: [
+                          //                               Row(
+                          //                                 children: [
+                          //                                   ClipRRect(
+                          //                                     child: MyViews().netImg(
+                          //                                         imgURL(referrer
+                          //                                             .recommenderPic),
+                          //                                         30,
+                          //                                         30),
+                          //                                     borderRadius:
+                          //                                         BorderRadius
+                          //                                             .circular(
+                          //                                                 15),
+                          //                                   ),
+                          //                                   Container(
+                          //                                     margin: EdgeInsets
+                          //                                         .only(
+                          //                                             left: 8),
+                          //                                     child: Text(
+                          //                                       '${referrer.recommenderName}(${referrer.recommenderUid})',
+                          //                                       style: TextStyle(
+                          //                                           color: MyColors
+                          //                                               .c999999,
+                          //                                           fontSize:
+                          //                                               15),
+                          //                                     ),
+                          //                                   ),
+                          //                                 ],
+                          //                               ),
+                          //                               GestureDetector(
+                          //                                 onTap: () {
+                          //                                   referrer.recommenderPic =
+                          //                                       '';
+                          //                                   referrer.recommenderName =
+                          //                                       '';
+                          //                                   referrer
+                          //                                       .recommenderUid = 0;
+                          //                                   setState(() {});
+                          //                                 },
+                          //                                 behavior:
+                          //                                     HitTestBehavior
+                          //                                         .translucent,
+                          //                                 child: Container(
+                          //                                   decoration: BoxDecoration(
+                          //                                       color: MyColors
+                          //                                           .cFF4233,
+                          //                                       borderRadius:
+                          //                                           BorderRadius
+                          //                                               .circular(
+                          //                                                   15)),
+                          //                                   height: 30,
+                          //                                   width: 60,
+                          //                                   child: Text(
+                          //                                     '移除',
+                          //                                     style: TextStyle(
+                          //                                         color: Colors
+                          //                                             .white,
+                          //                                         fontSize: 10),
+                          //                                   ),
+                          //                                   alignment: Alignment
+                          //                                       .center,
+                          //                                 ),
+                          //                               )
+                          //                             ],
+                          //                             mainAxisAlignment:
+                          //                                 MainAxisAlignment
+                          //                                     .spaceBetween,
+                          //                           ),
+                          //                   )),
+                          //             )
+                          //           ],
+                          //         ),
+                          //       ),
+                          //     ],
+                          //   ),
+                          // ),
                           Container(
                             height: 0.5,
                             margin: EdgeInsets.symmetric(horizontal: 15),

lib/paegs/mine_page/bind_alipay_page/bind_alipay_page.dart

@@ -208,7 +208,7 @@ class _BindAlipayPageState extends State<BindAlipayPage> {
                   ),
                 ),
               ),
-            if (true)
+            if (showWeChat)
               Container(
                 height: 220,
                 margin: EdgeInsets.fromLTRB(15, 20, 15, 50),

lib/paegs/mine_page/mine_page.dart

@@ -357,10 +357,10 @@ class _MinePageState extends State<MinePage> {
                       queryPersonalInformation();
                     });
                   }),
-                  if (showRe)
-                    functionItem('images/svg/推荐人.svg', '推荐人', () {
-                      MyTools().toPage(context, ReferrerPage(), (then) {});
-                    }),
+                  // if (showRe)
+                  //   functionItem('images/svg/推荐人.svg', '推荐人', () {
+                  //     MyTools().toPage(context, ReferrerPage(), (then) {});
+                  //   }),
                   functionItem('images/svg/绑定.svg', '提现账号', () {
                     MyTools().toPage(context, BindAlipayPage(), (then) {
                       queryPersonalInformation();

lib/paegs/mine_page/wallet_page/withdraw_page/withdraw_page.dart

@@ -152,7 +152,7 @@ class _WithdrawPageState extends State<WithdrawPage> {
                           ),
                         ),
                       ),
-                    if (true)
+                    if (showWeChat)
                       GestureDetector(
                         onTap: () {
                           // if (!payWays[payWays

lib/paegs/pay_page/order_information_page.dart

@@ -684,7 +684,7 @@ class _OrderInformationPageState extends State<OrderInformationPage> {
                     }
                   }),
                 ),
-              if (true)
+              if (weChat)
                 CupertinoActionSheetAction(
                   child: Row(
                     children: [
@@ -702,13 +702,13 @@ class _OrderInformationPageState extends State<OrderInformationPage> {
                     mainAxisAlignment: MainAxisAlignment.center,
                   ),
                   onPressed: (() {
-                    // if (weChat) {
+                    if (weChat) {
                       payWay = 2;
                       setState(() {});
                       Navigator.pop(context, 'Edit');
-                    // } else {
-                    //   showToast('微信支付暂不可用');
-                    // }
+                    } else {
+                      showToast('微信支付暂不可用');
+                    }
                   }),
                 ),
               CupertinoActionSheetAction(

pubspec.yaml

@@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 1.1.17+1
+version: 1.1.18+1
 
 environment:
   sdk: ">=2.7.0 <3.0.0"