Merge branch 'groupmealweb' of http://10.2.1.24:10244/zhaoy/BPA.SAAS.Web into groupmealweb

config/proxy.js

@@ -16,6 +16,14 @@
         '/saasbase/': '',
       },
     },
+    '/groupmeal/': {
+      target: 'http://10.2.1.26:21995/groupmeal/',
+      changeOrigin: true,
+      secure: false, //关闭证书验证
+      pathRewrite: {
+        '/groupmeal/': '',
+      },
+    },
     '/ordermanage/': {
       target: 'http://localhost:5248',
       changeOrigin: true,

config/routes.js

@@ -332,31 +332,31 @@ export default [
   {
     name: '订单管理',
     icon: 'BankFilled',
-    path: '/order',
+    path: '/groupMealOrder',
     routes: [
       {
         name: '订单流水',
         icon: 'smile',
-        path: '/order/orderflow',
-        component: './order/orderflow',
+        path: '/groupMealOrder/orderflow',
+        component: './groupMealOrder/orderflow',
       },
       {
         name: '第三方订单',
         icon: 'smile',
-        path: '/order/thirdOrder',
-        component: './order/thirdOrder',
+        path: '/groupMealOrder/thirdOrder',
+        component: './groupMealOrder/thirdOrder',
       },
       {
         name: '店铺授权',
         icon: 'smile',
-        path: '/order/thirdOrder',
-        component: './order/thirdOrder',
+        path: '/groupMealOrder/thirdOrder',
+        component: './groupMealOrder/thirdOrder',
       },
       {
         name: '授权管理',
         icon: 'smile',
-        path: '/order/thirdAuthorize',
-        component: './order/thirdAuthorize',
+        path: '/groupMealOrder/thirdAuthorize',
+        component: './groupMealOrder/thirdAuthorize',
       },
     ],
   },

dist/asset-manifest.json

@@ -1,6 +1,6 @@
 {
   "/umi.css": "/umi.2d7db433.css",
-  "/umi.js": "/umi.bced57ec.js",
+  "/umi.js": "/umi.2b13ce2c.js",
   "/t__plugin-layout__Layout.css": "/t__plugin-layout__Layout.e1129705.chunk.css",
   "/t__plugin-layout__Layout.js": "/t__plugin-layout__Layout.cbd27cb5.async.js",
   "/p__user__login.css": "/p__user__login.2f84d6a8.chunk.css",
@@ -22,12 +22,12 @@
   "/p__database__goods__newgoods.css": "/p__database__goods__newgoods.f3ef09c5.chunk.css",
   "/p__database__goods__newgoods.js": "/p__database__goods__newgoods.5acfdb51.async.js",
   "/p__database__goods__goodsInfo.css": "/p__database__goods__goodsInfo.67f6136b.chunk.css",
-  "/p__database__goods__goodsInfo.js": "/p__database__goods__goodsInfo.8673dc58.async.js",
-  "/p__device__product.js": "/p__device__product.bb6f9cfe.async.js",
-  "/p__device__deviceInfo.js": "/p__device__deviceInfo.51f55520.async.js",
+  "/p__database__goods__goodsInfo.js": "/p__database__goods__goodsInfo.6449e4cb.async.js",
+  "/p__device__product.js": "/p__device__product.ca8be7d4.async.js",
+  "/p__device__deviceInfo.js": "/p__device__deviceInfo.ec7cc1d2.async.js",
   "/p__device__deviceVesion.css": "/p__device__deviceVesion.63cc2960.chunk.css",
   "/p__device__deviceVesion.js": "/p__device__deviceVesion.009937ac.async.js",
-  "/p__device__productmanage.js": "/p__device__productmanage.e19199ac.async.js",
+  "/p__device__productmanage.js": "/p__device__productmanage.d3625a1c.async.js",
   "/p__groupMeal__shop.js": "/p__groupMeal__shop.4ce44015.async.js",
   "/p__groupMeal__member__memberInfo.js": "/p__groupMeal__member__memberInfo.ee9a88b6.async.js",
   "/p__groupMeal__member__membertag.css": "/p__groupMeal__member__membertag.f6838307.chunk.css",
@@ -72,9 +72,9 @@
   "/3001.2d63684e.async.js": "/3001.2d63684e.async.js",
   "/3537.6923ec17.async.js": "/3537.6923ec17.async.js",
   "/8798.db0157ab.chunk.css": "/8798.db0157ab.chunk.css",
-  "/8798.b35f0746.async.js": "/8798.b35f0746.async.js",
+  "/8798.995cba40.async.js": "/8798.995cba40.async.js",
   "/9396.3fe14a67.async.js": "/9396.3fe14a67.async.js",
-  "/2826.eb3e0255.async.js": "/2826.eb3e0255.async.js",
+  "/2826.0e07466f.async.js": "/2826.0e07466f.async.js",
   "/3059.b3e40214.async.js": "/3059.b3e40214.async.js",
   "/7973.006892df.async.js": "/7973.006892df.async.js",
   "/2255.a25b6bb8.async.js": "/2255.a25b6bb8.async.js",

dist/company/account/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.bced57ec.js"></script>
+    <script src="/umi.2b13ce2c.js"></script>
   </body>
 </html>

dist/company/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.bced57ec.js"></script>
+    <script src="/umi.2b13ce2c.js"></script>
   </body>
 </html>

dist/database/basic/batching/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.bced57ec.js"></script>
+    <script src="/umi.2b13ce2c.js"></script>
   </body>
 </html>

dist/database/goods/goodsInfo/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.bced57ec.js"></script>
+    <script src="/umi.2b13ce2c.js"></script>
   </body>
 </html>

dist/database/goods/goodsattribute/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.bced57ec.js"></script>
+    <script src="/umi.2b13ce2c.js"></script>
   </body>
 </html>

dist/database/goods/goodstypemanage/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.bced57ec.js"></script>
+    <script src="/umi.2b13ce2c.js"></script>
   </body>
 </html>

dist/database/goods/newgoods/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.bced57ec.js"></script>
+    <script src="/umi.2b13ce2c.js"></script>
   </body>
 </html>

dist/database/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.bced57ec.js"></script>
+    <script src="/umi.2b13ce2c.js"></script>
   </body>
 </html>

dist/device/deviceInfo/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.bced57ec.js"></script>
+    <script src="/umi.2b13ce2c.js"></script>
   </body>
 </html>

dist/device/deviceVesion/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.bced57ec.js"></script>
+    <script src="/umi.2b13ce2c.js"></script>
   </body>
 </html>

dist/device/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.bced57ec.js"></script>
+    <script src="/umi.2b13ce2c.js"></script>
   </body>
 </html>

dist/device/product/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.bced57ec.js"></script>
+    <script src="/umi.2b13ce2c.js"></script>
   </body>
 </html>

dist/device/productmanage/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.bced57ec.js"></script>
+    <script src="/umi.2b13ce2c.js"></script>
   </body>
 </html>

dist/groupMeal/applet/appidmanager/appid/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.bced57ec.js"></script>
+    <script src="/umi.2b13ce2c.js"></script>
   </body>
 </html>

dist/groupMeal/applet/appidmanager/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.bced57ec.js"></script>
+    <script src="/umi.2b13ce2c.js"></script>
   </body>
 </html>

dist/groupMeal/applet/appidmanager/payment/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.bced57ec.js"></script>
+    <script src="/umi.2b13ce2c.js"></script>
   </body>
 </html>

dist/groupMeal/applet/basicconfiguration/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.bced57ec.js"></script>
+    <script src="/umi.2b13ce2c.js"></script>
   </body>
 </html>

dist/groupMeal/applet/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.bced57ec.js"></script>
+    <script src="/umi.2b13ce2c.js"></script>
   </body>
 </html>

dist/groupMeal/applet/paytemplate/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.bced57ec.js"></script>
+    <script src="/umi.2b13ce2c.js"></script>
   </body>
 </html>

dist/groupMeal/member/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.bced57ec.js"></script>
+    <script src="/umi.2b13ce2c.js"></script>
   </body>
 </html>

dist/groupMeal/member/memberInfo/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.bced57ec.js"></script>
+    <script src="/umi.2b13ce2c.js"></script>
   </body>
 </html>

dist/groupMeal/member/membertag/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.bced57ec.js"></script>
+    <script src="/umi.2b13ce2c.js"></script>
   </body>
 </html>

dist/groupMeal/oneCard/ReportStatistics/dayConsumption/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.bced57ec.js"></script>
+    <script src="/umi.2b13ce2c.js"></script>
   </body>
 </html>

dist/groupMeal/oneCard/ReportStatistics/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.bced57ec.js"></script>
+    <script src="/umi.2b13ce2c.js"></script>
   </body>
 </html>

dist/groupMeal/oneCard/ReportStatistics/monthSummary/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.bced57ec.js"></script>
+    <script src="/umi.2b13ce2c.js"></script>
   </body>
 </html>

dist/groupMeal/oneCard/ReportStatistics/monthTimeSlot/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.bced57ec.js"></script>
+    <script src="/umi.2b13ce2c.js"></script>
   </body>
 </html>

dist/groupMeal/oneCard/ReportStatistics/reservation/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.bced57ec.js"></script>
+    <script src="/umi.2b13ce2c.js"></script>
   </body>
 </html>

dist/groupMeal/oneCard/gate/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.bced57ec.js"></script>
+    <script src="/umi.2b13ce2c.js"></script>
   </body>
 </html>

dist/groupMeal/oneCard/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.bced57ec.js"></script>
+    <script src="/umi.2b13ce2c.js"></script>
   </body>
 </html>

dist/groupMeal/oneCard/machine/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.bced57ec.js"></script>
+    <script src="/umi.2b13ce2c.js"></script>
   </body>
 </html>

dist/groupMeal/oneCard/memberAccount/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.bced57ec.js"></script>
+    <script src="/umi.2b13ce2c.js"></script>
   </body>
 </html>

dist/groupMeal/oneCard/storedValueCard/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.bced57ec.js"></script>
+    <script src="/umi.2b13ce2c.js"></script>
   </body>
 </html>

dist/groupMeal/shop/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.bced57ec.js"></script>
+    <script src="/umi.2b13ce2c.js"></script>
   </body>
 </html>

dist/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.bced57ec.js"></script>
+    <script src="/umi.2b13ce2c.js"></script>
   </body>
 </html>

dist/order/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.bced57ec.js"></script>
+    <script src="/umi.2b13ce2c.js"></script>
   </body>
 </html>

dist/order/orderflow/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.bced57ec.js"></script>
+    <script src="/umi.2b13ce2c.js"></script>
   </body>
 </html>

dist/order/thirdAuthorize/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.bced57ec.js"></script>
+    <script src="/umi.2b13ce2c.js"></script>
   </body>
 </html>

dist/order/thirdOrder/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.bced57ec.js"></script>
+    <script src="/umi.2b13ce2c.js"></script>
   </body>
 </html>

dist/org/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.bced57ec.js"></script>
+    <script src="/umi.2b13ce2c.js"></script>
   </body>
 </html>

dist/org/orgamange/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.bced57ec.js"></script>
+    <script src="/umi.2b13ce2c.js"></script>
   </body>
 </html>

dist/org/roles/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.bced57ec.js"></script>
+    <script src="/umi.2b13ce2c.js"></script>
   </body>
 </html>

dist/org/users/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.bced57ec.js"></script>
+    <script src="/umi.2b13ce2c.js"></script>
   </body>
 </html>

dist/sys/dictionary/dicttype/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.bced57ec.js"></script>
+    <script src="/umi.2b13ce2c.js"></script>
   </body>
 </html>

dist/sys/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.bced57ec.js"></script>
+    <script src="/umi.2b13ce2c.js"></script>
   </body>
 </html>

dist/sys/menus/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.bced57ec.js"></script>
+    <script src="/umi.2b13ce2c.js"></script>
   </body>
 </html>

dist/user/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.bced57ec.js"></script>
+    <script src="/umi.2b13ce2c.js"></script>
   </body>
 </html>

dist/user/login/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.bced57ec.js"></script>
+    <script src="/umi.2b13ce2c.js"></script>
   </body>
 </html>

dist/welcome/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.bced57ec.js"></script>
+    <script src="/umi.2b13ce2c.js"></script>
   </body>
 </html>

src/app.jsx

@@ -375,25 +375,25 @@ export async function getInitialState() {
         {
           name: '订单管理',
           icon: 'BankFilled',
-          path: '/order',
+          path: '/groupMealOrder',
           routes: [
             {
               name: '订单流水',
               icon: 'smile',
-              path: '/order/orderflow',
-              component: './order/orderflow',
+              path: '/groupMealOrder/orderflow',
+              component: './groupMealOrder/orderflow',
             },
             {
               name: '第三方订单',
               icon: 'smile',
-              path: '/order/thirdOrder',
-              component: './order/thirdOrder',
+              path: '/groupMealOrder/thirdOrder',
+              component: './groupMealOrder/thirdOrder',
             },
             {
               name: '授权管理',
               icon: 'smile',
-              path: '/order/thirdAuthorize',
-              component: './order/thirdAuthorize',
+              path: '/groupMealOrder/thirdAuthorize',
+              component: './groupMealOrder/thirdAuthorize',
             },
           ],
         },