From eea22bacc783a770f28a8b7fd0d7e22c196bda97 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Wed, 17 Nov 2021 17:13:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81=E5=BA=93=E5=B7=A5=E7=A8=8B?=
 =?UTF-8?q?=E7=9B=AE=E5=BD=95=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bin/serve.js                                  | 15 ++++++++----
 package.json                                  |  7 +++---
 .../AppInterview/AppInterview.vue             |  4 ++--
 src/{pages => apps}/AppInterview/detail.vue   |  0
 src/pages/loading.vue                         | 23 +++++++++++++++----
 src/store/index.js                            | 23 +------------------
 6 files changed, 37 insertions(+), 35 deletions(-)
 rename src/{pages => apps}/AppInterview/AppInterview.vue (99%)
 rename src/{pages => apps}/AppInterview/detail.vue (100%)

diff --git a/bin/serve.js b/bin/serve.js
index fbfa7d52..687b9f02 100644
--- a/bin/serve.js
+++ b/bin/serve.js
@@ -58,15 +58,22 @@ const start = () => {
     easycom: {
       "^u-(.*)": "@/uview/components/u-$1/u-$1.vue"
     },
-    pages: [],
+    pages: [
+      {path: 'pages/loading'},
+      {path: 'pages/login'}
+    ],
     globalStyle: {
       pageOrientation: "auto",
       navigationStyle: "custom"
     }
   }
-  findApp('src/pages', file => {
-    if (/.*\\(.+)\.vue/g.test(file)) {
-      json.pages.push({path: file.replace(/^src\\(.*).vue/g, '$1').replace(/\\/g,'/')})
+  findApp('src/apps', file => {
+    if (/.*\\.+\\App[^\\]+\.vue/g.test(file)) {
+      let app = {
+        name: file.replace(/.*\\([^\\]+).vue/g, '$1'),
+        path: file.replace(/^src\\(.*).vue/g, '$1').replace(/\\/g, '/')
+      }
+      json.pages.push(app)
     }
   }).then(() => {
     fsExtra.outputJson('src/pages.json', json, () => {
diff --git a/package.json b/package.json
index 0d34bd50..0c4646af 100644
--- a/package.json
+++ b/package.json
@@ -5,12 +5,12 @@
   "author": "Kubbo",
   "scripts": {
     "dev": "node bin/serve.js&&cross-env NODE_ENV=development UNI_PLATFORM=h5 vue-cli-service uni-serve --minimize",
-    "lib": "npm unpublish --force&&npm publish"
+    "lib": "npm unpublish --force&&npm publish",
+    "pages": "node bin/serve.js"
   },
   "files": [
     "src/components",
-    "src/pages",
-    "src/pages.json"
+    "src/apps"
   ],
   "dependencies": {
     "@amap/amap-jsapi-loader": "^1.0.1",
@@ -64,6 +64,7 @@
     "node-sass": "npm:dart-sass@^1.25.0",
     "postcss-comment": "^2.0.0",
     "sass-loader": "^7.1.0",
+    "uview-ui": "^2.0.3",
     "vue-template-compiler": "^2.6.11"
   },
   "browserslist": [
diff --git a/src/pages/AppInterview/AppInterview.vue b/src/apps/AppInterview/AppInterview.vue
similarity index 99%
rename from src/pages/AppInterview/AppInterview.vue
rename to src/apps/AppInterview/AppInterview.vue
index d549c725..8f38285d 100644
--- a/src/pages/AppInterview/AppInterview.vue
+++ b/src/apps/AppInterview/AppInterview.vue
@@ -45,14 +45,14 @@ import AiFixedBtn from "../../components/AiFixedBtn";
 
 export default {
   name: "AppInterview",
-  label: "调查走访",
+  appName: "调查走访",
   components: {AiFixedBtn, AiDate, AiImage, AiCard, AiTopFixed, AiSelect},
   data() {
     return {
       search: {title: ""},
       list: [],
       current: 1,
-      pages: 0
+      pages: 0,
     }
   },
   computed: {
diff --git a/src/pages/AppInterview/detail.vue b/src/apps/AppInterview/detail.vue
similarity index 100%
rename from src/pages/AppInterview/detail.vue
rename to src/apps/AppInterview/detail.vue
diff --git a/src/pages/loading.vue b/src/pages/loading.vue
index 7e9ad3fc..4a5f2eab 100644
--- a/src/pages/loading.vue
+++ b/src/pages/loading.vue
@@ -10,7 +10,7 @@
       <b v-for="app in apps" :key="app.key" @tap="redirectTo(app.path)">{{ app.name }}</b>
     </div>
   </section>
-</template>
+</template>0
 
 <script>
 import {mapActions, mapState} from 'vuex'
@@ -22,14 +22,15 @@ export default {
   components: {UTag, AiResult},
   inject: ['root'],
   computed: {
-    ...mapState(['token', 'apps', 'openUser', 'user']),
+    ...mapState(['token', 'openUser', 'user']),
     currentApp() {
       return this.apps.find(e => e.key == this.$route.query.app) || {}
     }
   },
   data() {
     return {
-      result: {}
+      result: {},
+      apps: []
     }
   },
   methods: {
@@ -38,16 +39,30 @@ export default {
       let {query, hash} = this.$route
       delete query.app
       uni.navigateTo({
-        url: `/pages${path}`, success: () => {
+        url: `/apps${path}`, success: () => {
           this.$router.push({query, hash})
+        },
+        fail: err => {
+          console.error(err)
         }
       })
     },
     handleLogin() {
       uni.navigateTo({url: "./login"})
+    },
+    getApps() {
+      this.apps = []
+      let applications = require.context('../apps', true, /\.(\/.+)\/App[^\/]+\.vue$/)
+      applications.keys().map(path => {
+        if (applications(path).default) {
+          let {name: key, appName: name} = applications(path).default
+          this.apps.push({key, name, path: path.replace(/^\.(.+).vue$/g, '$1')})
+        }
+      })
     }
   },
   created() {
+    this.getApps()
     this.result = {
       tips: "欢迎进入开发应用",
     }
diff --git a/src/store/index.js b/src/store/index.js
index 1b9baff9..2a52f0b4 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -5,26 +5,7 @@ import http from '../common/axios'
 import CryptoJS from '../utils/crypto-js'
 
 Vue.use(Vuex)
-let agentSignURL = "", apiList = [], agentConfig = {},
-    apps = [
-      {name: '调查走访', key: "interview", path: '/interview/AppInterview'},
-      {name: '工作去向', key: "whereabouts", path: '/whereabouts/whereabouts'},
-      {name: '随手拍', key: "snapshot", path: '/snapshot/snapshot'},
-      {name: '随心问', key: "casuallyask", path: '/casuallyask/casuallyask'},
-      {name: '网上办事', key: "workonline", path: '/workonline/workonline'},
-      {name: '居民画像', key: "resident", path: '/resident/comp'},
-      {name: '话术库', key: "quickReply", path: '/quickReply/quickReply'},
-      {name: '积分超市', key: "supermarket", path: '/supermarket/supermarket'},
-      {name: '调查问卷', key: "askForm", path: '/askForm/askForm'},
-      {name: '问卷表单', key: "askFormIndex", path: '/askForm/index'},
-      {name: '会议通知', key: "meetingNotice", path: '/meetingNotice/meetingNotice'},
-      {name: '公文流转', key: "documentFlow", path: '/documentFlow/documentFlow'},
-      {name: '工作任务', key: "workTask", path: '/workTask/workTask'},
-      {name: '通知公告', key: "notification", path: '/notification/notification'},
-      {name: '智慧监测', key: "guardianship", path: '/guardianship/guardianship'},
-      {name: '广播通知', key: "broadcast", path: '/bigHorn/bigHorn'},
-      {name: '视频监控', key: "videoMonitor", path: '/videoSurveillance/videoSurveillance'},
-    ]
+let agentSignURL = "", apiList = [], agentConfig = {}
 const store = new Vuex.Store({
   state: {
     token: "",
@@ -33,11 +14,9 @@ const store = new Vuex.Store({
     openUser: {},
     dicts: [],
     user: {},
-    apps,
   },
   mutations: {
     login(state, token) {
-      state.apps = apps
       state.token = token
     },
     logout(state) {