Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_wxcp_app into dev

src/common/axios.js

@@ -19,8 +19,6 @@ instance.interceptors.request.use(config => {
     if (['xaxc'].includes(module)) {
       config.url = config.url.replace(/(app|auth|admin)\//, "api/")
     }
-  } else if (sessionStorage.getItem("prj") == "saas" || module == "saas") {
-    config.baseURL = '/online'
   } else config.baseURL = "/lan"
   return config
 }, err => {

src/main.js

@@ -35,7 +35,7 @@ const app = new Vue({
   ...App
 });
 let params = {}
-if (sessionStorage.getItem("prj")?.indexOf("saas") > -1) {//上架版
+if (/saas/.test(location.pathname) > -1) {//上架版
   params = {action: "/app/wxcptp/portal/agentSign", corpId: "ww596787bb70f08288"}
 }
 if (/AppCountryAlbum/.test(location.pathname)) {//乡村相册版

src/package.json

@@ -0,0 +1,18 @@
+{
+  "name": "dvcp-wxcp-apps",
+  "version": "1.0.0",
+  "description": "全库应用,用于构建版本使用",
+  "files": [
+    "apps",
+    "project",
+    "components",
+    "src/common/util.js",
+    "src/common/dict.js",
+    "src/common/monent.js",
+    "src/common/modules.js",
+    "src/common/http.js",
+    "src/common/crypto-js.js"
+  ],
+  "dependencies": {
+  }
+}

src/pages/loading.vue

@@ -5,23 +5,19 @@
     <!--    <div class="iconfont iconfont-iconLogo"/>-->
     <ai-result v-if="result.tips" v-bind="result"/>
     <input v-if="!!$route.query.code" class="codeText" :value="$route.query.code"/>
-    <u-radio-group v-model="currentLib" @change="handleSwitchSystem">
-      <u-radio v-for="(op,i) in libs" :key="i" :name="op.dir">{{ op.label }}</u-radio>
-    </u-radio-group>
     <input class="codeText" v-model="search" placeholder="搜索要查找的应用"/>
     <div flex class="appsPane wrap">
       <div class="item" flex v-for="app in appsList" :key="app.id" @tap="handleGotoApp(app)">
         <b v-text="app.label"/>
         <u-tag v-if="app.project" :text="app.project" mode="dark" shape="circle" size="mini"/>
         <div class="appName fill" v-text="app.name"/>
-
       </div>
     </div>
   </section>
 </template>
 
 <script>
-import {mapActions, mapMutations, mapState} from 'vuex'
+import {mapActions, mapState} from 'vuex'
 import AiResult from "../components/AiResult";
 import AiSelect from "../components/AiSelect";
 
@@ -30,14 +26,14 @@ export default {
   components: {AiSelect, AiResult},
   inject: ['root'],
   computed: {
-    ...mapState(['token', 'openUser', 'user', 'apps']),
+    ...mapState(['apps']),
     appsList() {
-      let {search, currentLib} = this
+      let {search} = this
       return this.apps.filter(e => {
         if (/\/project\//.test(e.libPath)) {
           e.project = e.libPath.replace(/.*project\/([^\/]+)\/.+/, '$1')
         }
-        return (currentLib == "apps" && e.libPath.indexOf("project") > -1) || e.libPath.indexOf(currentLib) > -1
+        return e
       }).filter(e => !!search ? e.label?.indexOf(search) > -1 : true) || []
     },
     currentApp() {
@@ -47,27 +43,16 @@ export default {
   data() {
     return {
       result: {},
-      libs: [
-        {label: "通用版", dir: "apps"},
-        {label: "上架版", dir: "saas"},
-      ],
-      currentLib: "apps",
       search: ""
     }
   },
   methods: {
-    ...mapMutations(['logout', 'setApps']),
     ...mapActions(['agentSign']),
     handleGotoApp(app) {
       uni.navigateTo({url: `${app.libPath}`})
     },
-    handleSwitchSystem() {
-      sessionStorage.setItem("prj", this.currentLib)
-      this.logout()
-    },
   },
   onLoad() {
-    this.currentLib = sessionStorage.getItem("prj") || "apps"
     this.agentSign(this.$route.query)
   },
   onShow() {

src/pages/login.vue

@@ -55,6 +55,8 @@ export default {
               corpId = 'ww596787bb70f08288'
           if (/\/project\/police\//.test(libPath)) {
             module = 'hnjc'
+          } else if (/\/project\/saas\//.test(libPath)) {
+            module = 'online'
           } else if (/\/project\/xicheng\//.test(libPath)) {
             module = 'xaxc'
           } else if (/\/project\/beta\//.test(libPath)) {