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

config/proxy.js

@@ -18,7 +18,7 @@
     },
     '/groupmeal/': {
      // target: 'http://10.2.1.26:21995/groupmeal/',
-      target:'http://10.2.1.26:21995/',
+      target:'http://localhost:5248/',
       changeOrigin: true,
       secure: false, //关闭证书验证
       pathRewrite: {

dist/asset-manifest.json

@@ -1,10 +1,10 @@
 {
   "/umi.css": "/umi.2d7db433.css",
-  "/umi.js": "/umi.ead5a002.js",
+  "/umi.js": "/umi.b8ce9347.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",
+  "/t__plugin-layout__Layout.js": "/t__plugin-layout__Layout.5f5d853d.async.js",
   "/p__user__login.css": "/p__user__login.2f84d6a8.chunk.css",
-  "/p__user__login.js": "/p__user__login.5f918461.async.js",
+  "/p__user__login.js": "/p__user__login.95372b40.async.js",
   "/p__sys__menus.js": "/p__sys__menus.3d4f3428.async.js",
   "/p__sys__dictionary__dicttype.css": "/p__sys__dictionary__dicttype.f6838307.chunk.css",
   "/p__sys__dictionary__dicttype.js": "/p__sys__dictionary__dicttype.23fb8d43.async.js",

dist/company/account/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.ead5a002.js"></script>
+    <script src="/umi.b8ce9347.js"></script>
   </body>
 </html>

dist/company/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.ead5a002.js"></script>
+    <script src="/umi.b8ce9347.js"></script>
   </body>
 </html>

dist/database/basic/batching/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.ead5a002.js"></script>
+    <script src="/umi.b8ce9347.js"></script>
   </body>
 </html>

dist/database/goods/goodsInfo/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.ead5a002.js"></script>
+    <script src="/umi.b8ce9347.js"></script>
   </body>
 </html>

dist/database/goods/goodsattribute/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.ead5a002.js"></script>
+    <script src="/umi.b8ce9347.js"></script>
   </body>
 </html>

dist/database/goods/goodstypemanage/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.ead5a002.js"></script>
+    <script src="/umi.b8ce9347.js"></script>
   </body>
 </html>

dist/database/goods/newgoods/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.ead5a002.js"></script>
+    <script src="/umi.b8ce9347.js"></script>
   </body>
 </html>

dist/database/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.ead5a002.js"></script>
+    <script src="/umi.b8ce9347.js"></script>
   </body>
 </html>

dist/device/deviceInfo/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.ead5a002.js"></script>
+    <script src="/umi.b8ce9347.js"></script>
   </body>
 </html>

dist/device/deviceVesion/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.ead5a002.js"></script>
+    <script src="/umi.b8ce9347.js"></script>
   </body>
 </html>

dist/device/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.ead5a002.js"></script>
+    <script src="/umi.b8ce9347.js"></script>
   </body>
 </html>

dist/device/product/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.ead5a002.js"></script>
+    <script src="/umi.b8ce9347.js"></script>
   </body>
 </html>

dist/device/productmanage/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.ead5a002.js"></script>
+    <script src="/umi.b8ce9347.js"></script>
   </body>
 </html>

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

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.ead5a002.js"></script>
+    <script src="/umi.b8ce9347.js"></script>
   </body>
 </html>

dist/groupMeal/applet/appidmanager/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.ead5a002.js"></script>
+    <script src="/umi.b8ce9347.js"></script>
   </body>
 </html>

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

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.ead5a002.js"></script>
+    <script src="/umi.b8ce9347.js"></script>
   </body>
 </html>

dist/groupMeal/applet/basicconfiguration/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.ead5a002.js"></script>
+    <script src="/umi.b8ce9347.js"></script>
   </body>
 </html>

dist/groupMeal/applet/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.ead5a002.js"></script>
+    <script src="/umi.b8ce9347.js"></script>
   </body>
 </html>

dist/groupMeal/applet/paytemplate/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.ead5a002.js"></script>
+    <script src="/umi.b8ce9347.js"></script>
   </body>
 </html>

dist/groupMeal/member/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.ead5a002.js"></script>
+    <script src="/umi.b8ce9347.js"></script>
   </body>
 </html>

dist/groupMeal/member/memberInfo/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.ead5a002.js"></script>
+    <script src="/umi.b8ce9347.js"></script>
   </body>
 </html>

dist/groupMeal/member/membertag/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.ead5a002.js"></script>
+    <script src="/umi.b8ce9347.js"></script>
   </body>
 </html>

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

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.ead5a002.js"></script>
+    <script src="/umi.b8ce9347.js"></script>
   </body>
 </html>

dist/groupMeal/oneCard/ReportStatistics/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.ead5a002.js"></script>
+    <script src="/umi.b8ce9347.js"></script>
   </body>
 </html>

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

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.ead5a002.js"></script>
+    <script src="/umi.b8ce9347.js"></script>
   </body>
 </html>

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

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.ead5a002.js"></script>
+    <script src="/umi.b8ce9347.js"></script>
   </body>
 </html>

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

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.ead5a002.js"></script>
+    <script src="/umi.b8ce9347.js"></script>
   </body>
 </html>

dist/groupMeal/oneCard/gate/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.ead5a002.js"></script>
+    <script src="/umi.b8ce9347.js"></script>
   </body>
 </html>

dist/groupMeal/oneCard/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.ead5a002.js"></script>
+    <script src="/umi.b8ce9347.js"></script>
   </body>
 </html>

dist/groupMeal/oneCard/machine/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.ead5a002.js"></script>
+    <script src="/umi.b8ce9347.js"></script>
   </body>
 </html>

dist/groupMeal/oneCard/memberAccount/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.ead5a002.js"></script>
+    <script src="/umi.b8ce9347.js"></script>
   </body>
 </html>

dist/groupMeal/oneCard/storedValueCard/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.ead5a002.js"></script>
+    <script src="/umi.b8ce9347.js"></script>
   </body>
 </html>

dist/groupMeal/shop/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.ead5a002.js"></script>
+    <script src="/umi.b8ce9347.js"></script>
   </body>
 </html>

dist/groupMealOrder/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.ead5a002.js"></script>
+    <script src="/umi.b8ce9347.js"></script>
   </body>
 </html>

dist/groupMealOrder/orderflow/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.ead5a002.js"></script>
+    <script src="/umi.b8ce9347.js"></script>
   </body>
 </html>

dist/groupMealOrder/thirdAuthorize/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.ead5a002.js"></script>
+    <script src="/umi.b8ce9347.js"></script>
   </body>
 </html>

dist/groupMealOrder/thirdOrder/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.ead5a002.js"></script>
+    <script src="/umi.b8ce9347.js"></script>
   </body>
 </html>

dist/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.ead5a002.js"></script>
+    <script src="/umi.b8ce9347.js"></script>
   </body>
 </html>

dist/org/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.ead5a002.js"></script>
+    <script src="/umi.b8ce9347.js"></script>
   </body>
 </html>

dist/org/orgamange/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.ead5a002.js"></script>
+    <script src="/umi.b8ce9347.js"></script>
   </body>
 </html>

dist/org/roles/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.ead5a002.js"></script>
+    <script src="/umi.b8ce9347.js"></script>
   </body>
 </html>

dist/org/users/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.ead5a002.js"></script>
+    <script src="/umi.b8ce9347.js"></script>
   </body>
 </html>

dist/sys/dictionary/dicttype/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.ead5a002.js"></script>
+    <script src="/umi.b8ce9347.js"></script>
   </body>
 </html>

dist/sys/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.ead5a002.js"></script>
+    <script src="/umi.b8ce9347.js"></script>
   </body>
 </html>

dist/sys/menus/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.ead5a002.js"></script>
+    <script src="/umi.b8ce9347.js"></script>
   </body>
 </html>

dist/user/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.ead5a002.js"></script>
+    <script src="/umi.b8ce9347.js"></script>
   </body>
 </html>

dist/user/login/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.ead5a002.js"></script>
+    <script src="/umi.b8ce9347.js"></script>
   </body>
 </html>

dist/welcome/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.ead5a002.js"></script>
+    <script src="/umi.b8ce9347.js"></script>
   </body>
 </html>

src/app.jsx

@@ -41,7 +41,7 @@ export async function getInitialState() {
       const data = [
         {
           path: '/welcome',
-          name: '连锁经营平台',
+          name: '黑菠萝智慧团餐',
           icon: 'smile',
           hideInMenu: true,
           component: './Welcome',

src/pages/user/login/index.jsx

@@ -115,11 +115,8 @@ const Login = () => {
         </div>
 
         <div className={styles.main}>
-          <div className={styles.title}>连锁经营平台</div>
+          <div className={styles.title}>黑菠萝智慧团餐</div>
           <ProForm
-            initialValues={{
-              autoLogin: true,
-            }}
             submitter={{
               searchConfig: {
                 submitText: intl.formatMessage({