From bd727f76b45fbb7140df7e1d0f5ee8ee92fad70c Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Mon, 13 Dec 2021 10:16:08 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=A1=86=E6=9E=B6=E4=BD=93?=
 =?UTF-8?q?=E7=B3=BB=E9=87=8D=E6=96=B0=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bin/serve.js                           |  10 +--
 src/App.vue                            |   1 +
 src/apps/AppInterview/AppInterview.vue | 104 ++++++++++---------------
 src/apps/index.js                      |  25 ------
 src/common/util.js                     |   9 +++
 src/components/AiBack.vue              |   4 +-
 src/main.js                            |   2 -
 src/pages/loading.vue                  |   3 +-
 8 files changed, 61 insertions(+), 97 deletions(-)
 delete mode 100644 src/apps/index.js

diff --git a/bin/serve.js b/bin/serve.js
index 91cc9de7..effe9275 100644
--- a/bin/serve.js
+++ b/bin/serve.js
@@ -56,20 +56,20 @@ const start = () => {
   chalkTag.info('开始生成pages.json...')
   let json = {
     easycom: {
-      "^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
+      "^u-(.*)": "uview-ui/components/u-$1/u-$1.vue",
+      "^(Ai|V)(.*)": "@/components/$1$2.vue"
     },
     pages: [
       {path: 'pages/loading'},
-      {path: 'pages/login'},
-      {path: 'pages/mainEntry', style: {navigationBarTitleText: "村微产品应用库"}}
+      {path: 'pages/login'}
     ],
     globalStyle: {
       pageOrientation: "auto",
       navigationStyle: "custom"
     }
   }
-  findApp('src/utils', file => {
-    if (/.*\\.+\\App[^\\]+\.vue/g.test(file)) {
+  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, '/')
diff --git a/src/App.vue b/src/App.vue
index 0f76ba2e..725dffca 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -48,6 +48,7 @@ body {
 
 uni-page-body {
   // min-height: 100%;
+  min-height: 100vh;
   background: #f5f5f5;
   position: relative;
 }
diff --git a/src/apps/AppInterview/AppInterview.vue b/src/apps/AppInterview/AppInterview.vue
index c8cabc3a..bc8e7eb8 100644
--- a/src/apps/AppInterview/AppInterview.vue
+++ b/src/apps/AppInterview/AppInterview.vue
@@ -1,52 +1,42 @@
 <template>
   <div class="AppInterview">
-    <template v-if="!showDetail">
-      <ai-top-fixed>
-        <div flex>
-          <ai-date placeholder="日期选择" mode="range" @change="handleDateSearch"/>
-          <u-search placeholder="请输入标题" :show-action="false" v-model="search.title" @search="current=1,getList()"/>
-        </div>
-      </ai-top-fixed>
-      <template v-if="list.length>0">
-        <ai-card :ref="'aiCard' + index" v-for="(e,index) in list" :key="index" @click.native="goDetail(e.id,1)">
-          <template #custom>
-            <div flex>
-              <b class="fill">{{ e.title }}</b>
-            </div>
-            <div flex v-if="!!e.fileList" class="wrap" @click.stop>
-              <ai-image v-for="(op,i) in e.fileList.slice(0,3)" :src="op.accessUrl" preview :key="i"/>
-            </div>
-            <div class="bottom">{{ e.createTime }}</div>
-          </template>
-          <template #menu>
-            <div class="menu" @tap.stop="goDetail(e.id)">编辑</div>
-            <div class="menu" @tap.stop="handleDelete(e.id, index)">删除</div>
-          </template>
-        </ai-card>
-        <u-loadmore :status="loadmore" color="#999" font-size="24"
-                    margin-top="32" margin-bottom="80"/>
-      </template>
-      <div class="no-message" v-else>
-        <image src="https://cdn.cunwuyun.cn/wxAdmin/img/message.png"/>
-        <p>您还未添加过入户调查走访<br>点击<b>新增按钮</b>试试吧~</p>
+    <AiTopFixed>
+      <div flex>
+        <AiDate placeholder="日期选择" mode="range" @change="handleDateSearch"/>
+        <u-search placeholder="请输入标题" :show-action="false" v-model="search.title" @search="current=1,getList()"/>
       </div>
-      <ai-fixed-btn>
-        <div class="addBtn iconfont iconfont-iconfangda" @tap="gotoAdd()"/>
-      </ai-fixed-btn>
+    </AiTopFixed>
+    <template v-if="list.length>0">
+      <AiCard :ref="'aiCard' + index" v-for="(e,index) in list" :key="index" @click.native="goDetail(e.id,1)">
+        <template #custom>
+          <div flex>
+            <b class="fill">{{ e.title }}</b>
+          </div>
+          <div flex v-if="!!e.fileList" class="wrap" @click.stop>
+            <AiImage v-for="(op,i) in e.fileList.slice(0,3)" :src="op.accessUrl" preview :key="i"/>
+          </div>
+          <div class="bottom">{{ e.createTime }}</div>
+        </template>
+        <template #menu>
+          <div class="menu" @tap.stop="goDetail(e.id)">编辑</div>
+          <div class="menu" @tap.stop="handleDelete(e.id, index)">删除</div>
+        </template>
+      </AiCard>
+      <u-loadmore :status="loadmore" color="#999" font-size="24"
+                  margin-top="32" margin-bottom="80"/>
     </template>
-    <interview-detail v-else/>
+    <div class="no-message" v-else>
+      <image src="https://cdn.cunwuyun.cn/wxAdmin/img/message.png"/>
+      <p>您还未添加过入户调查走访<br>点击<b>新增按钮</b>试试吧~</p>
+    </div>
+    <AiFixedBtn>
+      <div class="addBtn iconfont iconfont-iconfangda" @tap="gotoAdd()"/>
+    </AiFixedBtn>
   </div>
 </template>
 
 <script>
-import AiSelect from "../../components/AiSelect";
-import AiTopFixed from "../../components/AiTopFixed";
-import AiCard from "../../components/AiCard";
-import AiImage from "../../components/AiImage";
-import AiDate from "../../components/AiDate";
-import AiFixedBtn from "../../components/AiFixedBtn";
-import InterviewDetail from "./interviewDetail";
-import AiBack from "../../components/AiBack";
+import qs from "query-string"
 
 export default {
   name: "AppInterview",
@@ -54,7 +44,6 @@ export default {
   inject: {
     root: {}
   },
-  components: {AiBack, InterviewDetail, AiFixedBtn, AiDate, AiImage, AiCard, AiTopFixed, AiSelect},
   data() {
     return {
       search: {title: ""},
@@ -66,25 +55,9 @@ export default {
   computed: {
     loadmore() {
       return this.pages <= this.current ? 'loading ' : 'nomore'
-    },
-    showDetail() {
-      return this.$route.hash == "#add"
     }
   },
   methods: {
-    emitShow() {
-      document.title = "调查走访"
-      if (this.showDetail) {
-        document.title = this.$route.query.detail ? "走访详情" : "新增走访"
-      } else {
-        this.current = 1;
-        this.getList()
-      }
-    },
-    emitReachBottom() {
-      this.current++;
-      this.getList()
-    },
     getList() {
       this.$http.post('/app/appinterview/list-xcx', null, {
         params: {
@@ -102,10 +75,10 @@ export default {
     goDetail(id, readonly) {
       let query = {id}
       readonly && (query.detail = 1)
-      this.root.goto({hash: "#add", query})
+      uni.navigateTo({url: `./interviewDetail?${qs.stringify(query)}`})
     },
     gotoAdd() {
-      this.root.goto({hash: "#add"})
+      uni.navigateTo({url: `./interviewDetail`})
     },
     handleDelete(ids, index) {
       this.$refs[`aiCard${index}`][0].handleClose()
@@ -126,7 +99,16 @@ export default {
       this.current = 1
       this.getList()
     }
-  }
+  },
+  onShow() {
+    document.title = "调查走访"
+    this.current = 1;
+    this.getList()
+  },
+  onReachBottom() {
+    this.current++;
+    this.getList()
+  },
 }
 </script>
 
diff --git a/src/apps/index.js b/src/apps/index.js
deleted file mode 100644
index d674aa43..00000000
--- a/src/apps/index.js
+++ /dev/null
@@ -1,25 +0,0 @@
-const install = function (Vue) {
-  if (install.installed) return
-  // 遍历注册全局组件
-  let apps = []
-  let contexts = require.context('.', true, /\.(\/.+)\/App[^\/]+\.vue$/)
-  if (contexts) {
-    contexts.keys().map(e => {
-      if (contexts(e).default) {
-        apps.push(contexts(e).default)
-        Vue.component(contexts(e).default.name, contexts(e).default)
-      }
-    })
-  }
-  return Promise.resolve(apps)
-}
-
-// 判断是否是直接引入文件
-if (typeof window !== 'undefined' && window.Vue) {
-  install(window.Vue)
-}
-
-export default {
-  // 导出的对象必须具有 install，才能被 Vue.use() 方法安装
-  install
-}
diff --git a/src/common/util.js b/src/common/util.js
index 343befad..71cef55d 100644
--- a/src/common/util.js
+++ b/src/common/util.js
@@ -43,5 +43,14 @@ export default {
   },
   formatName: (name) => {
     return Array.from(name)?.slice(-2)?.toString() || "";
+  },
+  loading: title => {
+    uni.showLoading({
+      title: title ? title : '加载中',
+      mask: true
+    })
+  },
+  hideLoading: () => {
+    uni.hideLoading()
   }
 }
diff --git a/src/components/AiBack.vue b/src/components/AiBack.vue
index a198969a..1e0002c3 100644
--- a/src/components/AiBack.vue
+++ b/src/components/AiBack.vue
@@ -47,8 +47,8 @@ export default {
       } else if (this.custom) {
         this.$emit("back")
       } else if (this.custom) {
-      } else this.root.goto({}, () => {
-        if (this.eventName != '') {
+      } else uni.navigateBack({
+        success: () => {
           uni.$emit(this.eventName, this.data)
         }
       })
diff --git a/src/main.js b/src/main.js
index 28503603..8b63de46 100644
--- a/src/main.js
+++ b/src/main.js
@@ -4,7 +4,6 @@ import store from './store';
 import axios from './common/axios';
 import utils from './common/util';
 import ui from 'uview-ui'
-import apps from './apps/index'
 
 const loading = title => {
   uni.showLoading({
@@ -21,7 +20,6 @@ Vue.prototype.$loading = loading
 Vue.prototype.$hideLoading = hideLoading
 
 Vue.use(ui)
-Vue.use(apps)
 Vue.config.productionTip = false;
 Vue.prototype.$store = store;
 //初始化接口工具类
diff --git a/src/pages/loading.vue b/src/pages/loading.vue
index ddd141b5..863695c6 100644
--- a/src/pages/loading.vue
+++ b/src/pages/loading.vue
@@ -47,8 +47,7 @@ export default {
       })
     },
     handleGotoApp(app) {
-      console.log(app)
-      uni.navigateTo({url: `./mainEntry?app=${app.key}`})
+      uni.navigateTo({url: `/apps${app.path}`})
     },
     handleLogin() {
       uni.navigateTo({url: "./login"})