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

package.json

@@ -17,6 +17,7 @@
     "src/common/monent.js",
     "src/common/modules.js",
     "src/common/http.js",
+    "src/common/crypto-js.js",
     "src/apps",
     "src/saas"
   ],

src/apps/AppMessageNotification/SelectUser.vue

@@ -28,13 +28,10 @@
       </div>
        -->
       <div class="type-content">
-        <p class="title">选择标签</p>
+        <div class="type-list" v-for="(item, index) in tagList" :key="index">
-        <div class="type-list">
+          <p>{{item.name}}</p>
-          <div v-for="(item, index) in tagList" :key="index">
+          <div class="list">
-            <p>{{item.name}}</p>
+            <div class="item" :class="items.isCheck ? 'active' : ''" v-for="(items, indexs) in item.tagList" :key="indexs" @click="typeClick(index, indexs)">{{items.name}}</div>
-            <div class="list">
-              <div class="item" :class="items.isCheck ? 'active' : ''" v-for="(items, indexs) in item.tagList" :key="indexs" @click="typeClick(index, indexs)">{{items.name}}</div>
-            </div>
           </div>
         </div>
       </div>
@@ -158,12 +155,13 @@ export default {
       margin-bottom: 24px;
     }
     .type-content{
-      padding: 34px 32px;
+
-      background-color: #fff;
     }
     .type-list{
       padding-left: 16px;
-      margin-top: 32px;
+      margin-bottom: 16px;
+      padding: 34px 32px 32px;
+      background-color: #fff;
       p{
         line-height: 44px;
         margin-bottom: 24px;
@@ -172,20 +170,19 @@ export default {
       }
       .list{
         overflow: hidden;
-        margin-bottom: 32px;
         .item{
-          padding: 0 32px;
+          padding: 12px 32px;
-          line-height: 56px;
           float: left;
-          text-align: center;
+          font-size: 28px;
-          border-radius: 28px;
+          font-family: PingFangSC-Regular, PingFang SC;
-          border: 1px solid #ddd;
+          color: #333;
+          line-height: 40px;
+          background-color: #F3F4F7;
+          border-radius: 4px;
           margin: 0 16px 16px 0;
-          font-size: 30px;
         }
         .active{
           background-color: #3192F4;
-          border: 1px solid #3192F4;
           color: #fff;
         }
       }

src/common/modules.js

@@ -1,6 +1,6 @@
 import http from "./http";
 import Vue from "vue";
-import CryptoJS from "../utils/crypto-js";
+import CryptoJS from "./crypto-js";
 
 /**
  * 登录方法

src/pages/loading.vue

@@ -10,7 +10,12 @@
     </u-radio-group>
     <input class="codeText" v-model="search" placeholder="搜索要查找的应用"/>
     <div flex class="appsPane wrap">
-      <b v-for="app in appsList" :key="app.id" @tap="handleGotoApp(app)" :class="{beta:app.isBeta}">{{ app.label }}({{ app.name }})</b>
+      <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>
@@ -29,8 +34,8 @@ export default {
     appsList() {
       let {search, currentLib} = this
       return this.apps.filter(e => {
-        if (/beta/.test(e.libPath)) {
+        if (/\/project\//.test(e.libPath)) {
-          e.isBeta = true
+          e.project = e.libPath.replace(/.*project\/([^\/]+)\/.+/, '$1')
         }
         return (currentLib == "apps" && e.libPath.indexOf("project") > -1) || e.libPath.indexOf(currentLib) > -1
       }).filter(e => !!search ? e.label?.indexOf(search) > -1 : true) || []
@@ -110,33 +115,27 @@ export default {
   .appsPane {
     justify-content: center;
     margin-top: 16px;
-    padding: 0 16px;
+
+    .item {
+      width: 100%;
+      font-size: 28px;
+      padding: 0 32px;
+      height: 64px;
+      border-bottom: 1px solid #ddd;
+
+      &:nth-of-type(2n) {
+        background: rgba(#26f, .02);
+      }
+    }
 
     b {
       cursor: pointer;
-      font-size: 24px;
+      margin-right: 16px;
-      background: $uni-color-primary;
+      display: block;
-      color: #fff;
+    }
-      padding: 8px;
-      margin: 8px 4px;
-      border-radius: 8px;
-      font-weight: normal;
 
-      &.beta {
+    .appName {
-        background: $uni-color-warning;
+      text-align: right;
-        position: relative;
-
-        &:before {
-          position: absolute;
-          top: 0;
-          right: 0;
-          content: "beta";
-          transform: translate(-8px, -50%);
-          color: $uni-color-error;
-          z-index: 20220613952;
-          font-weight: bold;
-        }
-      }
     }
   }
 }