Merge remote-tracking branch 'origin/development' into uat

src/assets/json/authMenuList.json

@@ -724,35 +724,18 @@
           ]
         },
         {
-          "path": "/dynamicManagement/friendCoupon",
-          "name": "friendCoupon",
-          "component": "/dynamicManagement/friendCoupon",
+          "path": "/dynamicManagement/friendRelation",
+          "name": "friendRelation",
+          "component": "/dynamicManagement/friendRelation",
           "meta": {
-            "icon": "Tickets",
-            "title": "好友赠券管理",
+            "icon": "User",
+            "title": "好友关系管理",
             "isLink": "",
             "isHide": false,
             "isFull": false,
             "isAffix": false,
             "isKeepAlive": false
-          },
-          "children": [
-            {
-              "path": "/dynamicManagement/friendCouponDetail",
-              "name": "friendCouponDetail",
-              "component": "/dynamicManagement/friendCouponDetail",
-              "meta": {
-                "icon": "Document",
-                "title": "好友优惠券详情",
-                "activeMenu": "/dynamicManagement/friendCoupon",
-                "isLink": "",
-                "isHide": true,
-                "isFull": false,
-                "isAffix": false,
-                "isKeepAlive": false
-              }
-            }
-          ]
+          }
         },
         {
           "path": "/operationManagement/couponTemplate",
@@ -862,18 +845,35 @@
       ]
     },
     {
-      "path": "/dynamicManagement/friendRelation",
-      "name": "friendRelation",
-      "component": "/dynamicManagement/friendRelation",
+      "path": "/dynamicManagement/friendCoupon",
+      "name": "friendCoupon",
+      "component": "/dynamicManagement/friendCoupon",
       "meta": {
-        "icon": "User",
-        "title": "好友关系管理",
+        "icon": "Tickets",
+        "title": "好友赠券管理",
         "isLink": "",
         "isHide": false,
         "isFull": false,
         "isAffix": false,
         "isKeepAlive": false
-      }
+      },
+      "children": [
+        {
+          "path": "/dynamicManagement/friendCouponDetail",
+          "name": "friendCouponDetail",
+          "component": "/dynamicManagement/friendCouponDetail",
+          "meta": {
+            "icon": "Document",
+            "title": "好友优惠券详情",
+            "activeMenu": "/dynamicManagement/friendCoupon",
+            "isLink": "",
+            "isHide": true,
+            "isFull": false,
+            "isAffix": false,
+            "isKeepAlive": false
+          }
+        }
+      ]
     },
     {
       "path": "/dynamicManagement",