11.18

images/svg/自营-灰色.svg

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="21px" height="20px" viewBox="0 0 21 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>自营-灰色</title>
+    <g id="自营-灰色" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="编组" transform="translate(1.000000, 1.000000)" stroke="#999999" stroke-width="1.05">
+            <path d="M16.6748433,18 L2.3252125,18 C1.04099495,18 0,16.9435964 0,15.6404267 L0,2.35964124 C0,1.05647157 1.04099495,1.13299398e-05 2.3252125,1.13299398e-05 L16.6748433,1.13299398e-05 C17.9590051,1.13299398e-05 19,1.05647157 19,2.35964124 L19,15.6404267 C19,16.9435964 17.9590051,18 16.6748433,18 Z" id="Stroke-1"></path>
+            <line x1="12.0303245" y1="4.65799884" x2="18.9476265" y2="4.65799884" id="Stroke-3"></line>
+            <line x1="0.0524405113" y1="4.65799884" x2="6.86836722" y2="4.65799884" id="Stroke-5"></line>
+            <polygon id="Stroke-7" points="6.86835048 0 6.86835048 9.71140126 9.55820149 8.79418598 11.9190851 9.71140126 12.1317165 0"></polygon>
+        </g>
+    </g>
+</svg>

images/svg/自营-红色.svg

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="21px" height="20px" viewBox="0 0 21 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>自营-红色</title>
+    <g id="自营-红色" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="编组" transform="translate(1.000000, 1.000000)">
+            <path d="M16.6747875,18 L2.32515667,18 C1.04099495,18 0,16.9435957 0,15.6404253 L0,2.3596314 C0,1.0564609 1.04099495,0 2.32515667,0 L16.6747875,0 C17.9590051,0 19,1.0564609 19,2.3596314 L19,15.6404253 C19,16.9435957 17.9590051,18 16.6747875,18" id="Fill-1" fill="#FF4233"></path>
+            <line x1="12.0302686" y1="4.65799045" x2="18.9475707" y2="4.65799045" id="Stroke-5" stroke="#FFFFFF" stroke-width="1.05"></line>
+            <line x1="0.0523846879" y1="4.65799045" x2="6.8683114" y2="4.65799045" id="Stroke-7" stroke="#FFFFFF" stroke-width="1.05"></line>
+            <polyline id="Stroke-9" stroke="#FFFFFF" stroke-width="1.05" points="6.86828907 1.69949203e-05 6.86828907 9.71136771 9.5581959 8.79420851 11.9190237 9.71136771 12.1316551 1.69949203e-05"></polyline>
+        </g>
+    </g>
+</svg>

lib/https/MyDio.dart

@@ -61,11 +61,11 @@ class MyDio {
   }
 
   post(String url, data, SCallBack sCallBack, FCallBack fCallBack) async {
-    // (dio.httpClientAdapter as DefaultHttpClientAdapter).onHttpClientCreate  = (client) {
-    //   client.badCertificateCallback=(X509Certificate cert, String host, int port){
-    //     return true;
-    //   };
-    // };
+    (dio.httpClientAdapter as DefaultHttpClientAdapter).onHttpClientCreate  = (client) {
+      client.badCertificateCallback=(X509Certificate cert, String host, int port){
+        return true;
+      };
+    };
     // (dio.httpClientAdapter as DefaultHttpClientAdapter).onHttpClientCreate  = (client) {
     //   print('fmamisfmaifmasi');
     //   SecurityContext sc = SecurityContext();

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

@@ -252,8 +252,8 @@ class _AddAssistantPageState extends State<AddAssistantPage> {
       showToast('请选择添加的助手');
       return;
     }
-    print(json.encode(date));
-    MyDio().updateM({"key": "shop_user", "values": date}, (response, hasError) {
+    print(json.decode(json.encode(date).replaceAll('shop_id', 'shop_uid').replaceAll('user_id', 'user_uid')));
+    MyDio().updateM({"key": "shop_user", "values": json.decode(json.encode(date).replaceAll('shop_id', 'shop_uid').replaceAll('user_id', 'user_uid'))}, (response, hasError) {
       if (!hasError) {
         showToast(isAdd ? '添加成功' : '移除成功');
         Navigator.pop(context);

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

@@ -154,8 +154,10 @@ class _AddPartnerPageState extends State<AddPartnerPage> {
     MyDio().update({
       "key": "shop_user",
       "values": {
+        "shop_uid": member.shopUid,
+        "role": shopUserPartner,
         "id": member.id,
-        'role':shopUserPartner ,
+        "user_uid": member.userUid
       }
     }, (response, hasError) {
       if(!hasError){

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

@@ -154,8 +154,10 @@ class _RemovePartnerPageState extends State<RemovePartnerPage> {
     MyDio().update({
       "key": "shop_user",
       "values": {
+        "shop_uid": member.shopUid,
+        "role": shopUserMember,
         "id": member.id,
-        'role':shopUserMember ,
+        "user_uid": member.userUid
       }
     }, (response, hasError) {
       if(!hasError){