Merge branch 'master' into dev

package-lock.json

@@ -17137,6 +17137,11 @@
       "resolved": "https://registry.npmmirror.com/vue/-/vue-2.5.17.tgz",
       "integrity": "sha512-mFbcWoDIJi0w0Za4emyLiW72Jae0yjANHbCVquMKijcavBGypqlF7zHRgMa5k4sesdv7hv2rB4JPdZfR+TPfhQ=="
     },
+    "vue-async-manager": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmmirror.com/vue-async-manager/-/vue-async-manager-0.2.1.tgz",
+      "integrity": "sha512-TY56PMbne1tGkO2cb7g6aWr7CD31OZSxtz7VsdEaQUzuHkMO7Vmza350mxxDrGcPTQs0IShiCnN3Or9pwgLWpw=="
+    },
     "vue-bus": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/vue-bus/-/vue-bus-1.2.1.tgz",

package.json

@@ -66,6 +66,7 @@
     "vant": "^2.10.3",
     "vconsole": "^3.15.1",
     "vue": "2.5.17",
+    "vue-async-manager": "^0.2.1",
     "vue-bus": "^1.1.0",
     "vue-calendar-component": "^2.8.2",
     "vue-clamp": "^0.4.0",
@@ -75,8 +76,8 @@
     "vue-moment": "^4.0.0",
     "vue-navigation": "^1.1.4",
     "vue-radial-progress": "^0.2.10",
-    "vue-video-player": "^5.0.2",
     "vue-router": "^3.4.9",
+    "vue-video-player": "^5.0.2",
     "vue2-animate": "^2.1.2",
     "vuedraggable": "^2.24.3",
     "vuex": "3.0.1",

src/mobile/App.vue

@@ -1,9 +1,15 @@
 <template>
-  <div id="app">
+  <Suspense>
+    <div id="Loading" slot="fallback">
+      <div class="loader-inner ball-beat">
+        <div></div>
+        <div></div>
+        <div></div>
+      </div>
+    </div>
     <navigation>
       <router-view></router-view>
     </navigation>
-
     <Tabbar
       v-if="['demandList', 'demandCreate'].includes(this.$route.name)"
       route
@@ -17,7 +23,7 @@
         <span class="f16">服务台</span>
       </TabbarItem>
     </Tabbar>
-  </div>
+  </Suspense>
 </template>
 
 <script>

src/mobile/components/xFrom/sysComponents/ExpectBeginTimeSelect.vue

@@ -43,7 +43,7 @@
 </template>
 
 <script>
-import { Field, Popup, Icon, Picker } from "vant";
+import { Field, Popup, Icon, Picker, DatetimePicker } from "vant";
 import mixins from "../../mixins";
 import moment from "moment";
 export default {
@@ -52,6 +52,7 @@ export default {
     Icon,
     Popup,
     Picker,
+    DatetimePicker,
   },
   mixins: [mixins],
   props: {
@@ -129,13 +130,16 @@ export default {
         item.label = item.value;
       }
       item.text = item.label;
-      item.children = item.children.map((item1) => {
-        item1.value = item1.label;
-        item1.text = item.label;
-        return item1;
-      });
+      if (item.children) {
+        item.children = item.children.map((item1) => {
+          item1.value = item1.label;
+          item1.text = item1.label;
+          return item1;
+        });
+      }
       return item;
     });
+    console.log(this.setting);
     this.minDate = moment(this.setting[0].value).toDate();
     this.maxDate = moment(this.setting[this.setting.length - 1].value).toDate();
   },

src/mobile/main.js

@@ -7,9 +7,11 @@ import { initMainCfg } from "./pages/baseIndex";
 import priceDecimal from './directives/priceDecimal'
 import Navigation from 'vue-navigation'
 import Vconsole from 'vconsole'
+import VueAsyncManager from "vue-async-manager"
 /** 事件传递 */
 import VueBus from 'vue-bus'
 Vue.use(VueBus)
+Vue.use(VueAsyncManager)
 Vue.directive('price', priceDecimal)
 Vue.use(Navigation, { router })
 if (process.env.NODE_ENV !== 'production') {

src/mobile/router.js

@@ -1,5 +1,6 @@
 import Vue from 'vue'
 import Router from 'vue-router'
+import { lazy } from 'vue-async-manager'
 
 Router.prototype.push = function (location, onComplete, onAbort) {
     this.isBack = false; //判断当前路由是否是返回，用于App.vue中给路由跳转添加动画
@@ -20,7 +21,7 @@ export default new Router({
         {
             path: '/saas',
             name: 'saas',
-            component: () => import('./pages/BlankLayout.vue'),
+            component: lazy(() => import('./pages/BlankLayout.vue')),
             meta: { //用于main.js中页面动态添加title
                 title: '大客户服务管理系统'
             },
@@ -37,7 +38,7 @@ export default new Router({
                 {
                     path: 'create',
                     name: 'demandCreate',
-                    component: () => import('./pages/saas/create.vue'),
+                    component: lazy(() => import('./pages/saas/create.vue')),
                     meta: { //用于main.js中页面动态添加title
                         title: '发需求',
                         keepAlive: true
@@ -46,7 +47,7 @@ export default new Router({
                 {
                     path: 'demandDetail',
                     name: 'demandDetail',
-                    component: () => import('./pages/saas/demandDetail/index.vue'),
+                    component: lazy(() => import('./pages/saas/demandDetail/index.vue')),
                     meta: { //用于main.js中页面动态添加title
                         title: '需求详情',
                     },
@@ -54,7 +55,7 @@ export default new Router({
                 {
                     path: 'list',
                     name: 'demandList',
-                    component: () => import('./pages/saas/list.vue'),
+                    component: lazy(() => import('./pages/saas/list.vue')),
                     meta: { //用于main.js中页面动态添加title
                         title: '服务台',
                     },