修改

.gitignore

@@ -16,4 +16,4 @@ selenium-debug.log
 *.njsproj
 *.sln
 .svn
-.dist
+.dist

.postcssrc.js

@@ -1,10 +1,10 @@
 // https://github.com/michael-ciniawsky/postcss-load-config
 
 module.exports = {
-  "plugins": {
+  plugins: {
     "postcss-import": {},
     "postcss-url": {},
     // to edit target browsers: use "browserslist" field in package.json
-    "autoprefixer": {}
+    autoprefixer: {}
   }
-}
+};

src/main.js

@@ -55,7 +55,8 @@ import {
   Switch,
   Uploader,
   Radio,
-  RadioGroup
+  RadioGroup,
+  Overlay
   // eslint-disable-next-line no-irregular-whitespace,import/no-duplicates
 } from "vant";
 Vue.use(DropdownMenu)
@@ -90,7 +91,8 @@ Vue.use(DropdownMenu)
   .use(Switch)
   .use(Uploader)
   .use(RadioGroup)
-  .use(Radio);
+  .use(Radio)
+  .use(Overlay);
 // import "@/lib/flexible.js";
 
 // main.js

src/pages/homeIndex/index.vue

@@ -4,28 +4,33 @@
       <div class="homeTitle">
         <div class="homeTitleLeft" style="visibility: hidden" v-if="isCreateOrg == false">
           <van-dropdown-menu>
-            <van-dropdown-item @change="changeOrg" v-model="value1" :options="org_arr"/>
+            <van-dropdown-item @change="changeOrg" v-model="value1" :options="org_arr" />
           </van-dropdown-menu>
         </div>
-        <div class="homeTitleLeft"  v-if="isCreateOrg == true">
+        <div class="homeTitleLeft" v-if="isCreateOrg == true">
           <van-dropdown-menu>
-            <van-dropdown-item @change="changeOrg" v-model="value1" :options="org_arr"/>
+            <van-dropdown-item @change="changeOrg" v-model="value1" :options="org_arr" />
           </van-dropdown-menu>
         </div>
         <div class="homeTitleRight">
           <i class="iconfont icon-sousuo search1" @click="toSearch"></i>
           <!--<van-icon class="iconOne" name="comment-o"/>-->
-          <van-icon class="iconOne" name="add-o" @click="toCreateOrg"/>
+          <van-icon name="plus" class="iconOne" @click="toCreateOrg" />
         </div>
       </div>
     </van-sticky>
     <div class="banner">
       <van-swipe class="my-swipe" :autoplay="3000" indicator-color="white">
-        <van-swipe-item v-for="(banner, index) in this.banners" @click="jump(banner.url)" :key="index">
+        <van-swipe-item
+          v-for="(banner, index) in this.banners"
+          @click="jump(banner.url)"
+          :key="index"
+        >
           <img :src="banner.thumb" alt />
         </van-swipe-item>
       </van-swipe>
     </div>
+    <van-overlay :show="show" @click="show = false" />
     <!--<div class="noticeBox">-->
     <!--<i class="iconfont icon-public-notice notice"></i>-->
     <!--<div class="noticeNews">-->
@@ -45,30 +50,31 @@
     <!--</div>-->
     <div class="background1"></div>
 
-
-    <div class="management" v-if="this.$store.getters.user.admin.id ==  this.$store.getters.user.org.creator&&this.isCreateOrg">
+    <div
+      class="management"
+      v-if="this.$store.getters.user.admin.id ==  this.$store.getters.user.org.creator&&this.isCreateOrg"
+    >
       <div class="managementTitle">
         <div class="managementName">
           管理控制台
           <span>（仅管理员可见）</span>
         </div>
         <div class="setting" @click="toConsole()">
-          <van-icon name="setting-o"/>
-          管理
+          <van-icon name="setting-o" />管理
         </div>
       </div>
       <div class="managementBox">
         <div class="managementOne" @click="toStaffManage()">
-          <img src="../../assets/images/M1.png" alt/>员工管理
+          <img src="../../assets/images/M1.png" alt />员工管理
         </div>
         <div class="managementOne" @click="toRoleManage()">
-          <img src="../../assets/images/M2.png" alt/>权限管理
+          <img src="../../assets/images/M2.png" alt />权限管理
         </div>
         <div class="managementOne" @click="toConfigCenter()">
-          <img src="../../assets/images/M3.png" alt/>配置中心
+          <img src="../../assets/images/M3.png" alt />配置中心
         </div>
         <div class="managementOne" @click="toOrgSetting()">
-          <img src="../../assets/images/M4.png" alt/>机构设置
+          <img src="../../assets/images/M4.png" alt />机构设置
         </div>
       </div>
     </div>
@@ -76,231 +82,219 @@
     <div class="management" v-if="!this.isCreateOrg">
       <div class="managementTitle">
         <div class="managementName">
-          管理控制台<span>（仅管理员可见）</span>
+          管理控制台
+          <span>（仅管理员可见）</span>
+        </div>
+        <div class="setting">
+          <van-icon name="setting-o" />管理
         </div>
-        <div class="setting"><van-icon name="setting-o" />管理</div>
       </div>
       <div class="managementBox">
         <div class="managementOne" @click="toStaffManage()">
-          <img src="../../assets/images/M1.png" alt="" />员工管理
+          <img src="../../assets/images/M1.png" alt />员工管理
         </div>
         <div class="managementOne" @click="toRoleManage()">
-          <img src="../../assets/images/M2.png" alt="" />权限管理
+          <img src="../../assets/images/M2.png" alt />权限管理
         </div>
         <div class="managementOne" @click="toConfigCenter()">
-          <img src="../../assets/images/M3.png" alt="" />配置中心
+          <img src="../../assets/images/M3.png" alt />配置中心
         </div>
         <div class="managementOne" @click="toOrgSetting()">
-          <img src="../../assets/images/M4.png" alt="" />机构设置
+          <img src="../../assets/images/M4.png" alt />机构设置
         </div>
       </div>
     </div>
 
-
-
-
-
     <div class="application">
       <div class="applicationTitle">
         <div class="applicationName">应用工作台</div>
         <!--<div class="applicationService">+ 更多应用</div>-->
       </div>
       <div class="applicationBox">
-        <div v-for="(item, index) in this.apps" :key="index"  :class="item.open_status == 1? 'applicationOne':'applicationOne opacity'" @click="jumpApp(item)">
-          <img :src="item.url" alt/>{{item.name}}
+        <div
+          v-for="(item, index) in this.apps"
+          :key="index"
+          :class="item.open_status == 1? 'applicationOne':'applicationOne opacity'"
+          @click="jumpApp(item)"
+        >
+          <img :src="item.url" alt />
+          {{item.name}}
         </div>
       </div>
     </div>
   </div>
 </template>
 <script>
-  // import "../libs/rem.js";
-  import { Toast } from "vant";
-
-  import {GetHomeData,ChangeOrg} from "@/api/home";
-  import "../../libs/rem.js";
-  import "../../styles/newStyle.scss";
-  import {setRem} from "@/libs/functionRem";
-
-  export default {
-    data() {
-      return {
-        value1: 0,
-        isCreateOrg: false,
-        org_arr: [],
-        banners: [],
-        apps: [],
-        option1: [
-          {text: "新款商品", value: 0},
-          {text: "全部商品全部商品全部商品全部商品全部商品全部商品", value: 1},
-          {text: "活动商品", value: 2}
-        ]
-      };
+// import "../libs/rem.js";
+import { Toast } from "vant";
+
+import { GetHomeData, ChangeOrg } from "@/api/home";
+import "../../libs/rem.js";
+import "../../styles/newStyle.scss";
+import { setRem } from "@/libs/functionRem";
+
+export default {
+  data() {
+    return {
+      show: true,
+      value1: 0,
+      isCreateOrg: false,
+      org_arr: [],
+      banners: [],
+      apps: [],
+      option1: [
+        { text: "新款商品", value: 0 },
+        { text: "全部商品全部商品全部商品全部商品全部商品全部商品", value: 1 },
+        { text: "活动商品", value: 2 }
+      ]
+    };
+  },
+  methods: {
+    toStaffManage() {
+      if (this.isCreateOrg) {
+        this.$router.push({ path: "/manageconsole/staff" });
+      } else {
+        this.$toast({
+          message: "你尚未创建机构，请先创建机构"
+        });
+      }
     },
-    methods: {
-      toStaffManage(){
-        if(this.isCreateOrg){
-          this.$router.push({path: "/manageconsole/staff"});
-        }else{
-          this.$toast({
-            message: "你尚未创建机构，请先创建机构"
-          });
-        }
-
-      },toRoleManage(){
-        if(this.isCreateOrg){
-          this.$router.push({path: "/manageconsole/role"});
-        }else{
-          this.$toast({
-            message: "你尚未创建机构，请先创建机构"
-          });
-        }
-      },toConfigCenter(){
-        if(this.isCreateOrg){
-
-
-        }else{
-          this.$toast({
-            message: "你尚未创建机构，请先创建机构"
-          });
-        }
-
-      },toOrgSetting(){
-        if(this.isCreateOrg){
-
-
-        }else{
-          this.$toast({
-            message: "你尚未创建机构，请先创建机构"
-          });
-        }
-
-      },
-      changeOrg(value){
-        Toast.loading({forbidClick: true, duration: 0})
-        let params={
-          org_id : value
-
-        }
-        ChangeOrg(params).then(response => {
-          if (response.data.state === 1) {
-            var user = response.data.data.user;
-            var admin = response.data.data.admin;
-            var org = response.data.data.org;
-            var subscibe = response.data.data.subscibe;
-            var config_list = response.data.data.config_list;
-            var template_info = response.data.data.template_info;
-            var filed_list = response.data.data.filed_list;
-            this.$store.dispatch("InitUserInfo", {
-              admin: admin,
-              user: user,
-              org: org,
-              subscibe: subscibe,
-              template_info: template_info,
-              filed_list: filed_list
-            });
-            this.$store.dispatch("SetConfigList", config_list);
-            this.GetHomeData()
-            Toast.success('切换机构成功')
-          } else {
-            Toast.fail(response.data.msg)
-          }
+    toRoleManage() {
+      if (this.isCreateOrg) {
+        this.$router.push({ path: "/manageconsole/role" });
+      } else {
+        this.$toast({
+          message: "你尚未创建机构，请先创建机构"
         });
-
-
-      },
-      jump(url){
-        window.location.href = url
-      },jumpApp(app){
-        if(!this.isCreateOrg){
-          Toast.fail('你尚未创建机构,无法使用该功能')
-          return
-        }
-        if(app.open_status == 0){
-          Toast.success('敬请期待')
-          return
-        }
-        switch (app.app_type) {
-          case 6:
-            this.toPatients()
-            break
-          case 7:
-            this.$router.push({ path: "/main" });
-            break
-          case 8:
-
-            break
-          case 9:
-
-            break
-          case 10:
-
-            break
-          case 11:
-
-            break
-          case 12:
-
-            break
-          case 13:
-
-            break
-          case 14:
-
-            break
+      }
+    },
+    toConfigCenter() {
+      if (this.isCreateOrg) {
+      } else {
+        this.$toast({
+          message: "你尚未创建机构，请先创建机构"
+        });
+      }
+    },
+    toOrgSetting() {
+      if (this.isCreateOrg) {
+      } else {
+        this.$toast({
+          message: "你尚未创建机构，请先创建机构"
+        });
+      }
+    },
+    changeOrg(value) {
+      Toast.loading({ forbidClick: true, duration: 0 });
+      let params = {
+        org_id: value
+      };
+      ChangeOrg(params).then(response => {
+        if (response.data.state === 1) {
+          var user = response.data.data.user;
+          var admin = response.data.data.admin;
+          var org = response.data.data.org;
+          var subscibe = response.data.data.subscibe;
+          var config_list = response.data.data.config_list;
+          var template_info = response.data.data.template_info;
+          var filed_list = response.data.data.filed_list;
+          this.$store.dispatch("InitUserInfo", {
+            admin: admin,
+            user: user,
+            org: org,
+            subscibe: subscibe,
+            template_info: template_info,
+            filed_list: filed_list
+          });
+          this.$store.dispatch("SetConfigList", config_list);
+          this.GetHomeData();
+          Toast.success("切换机构成功");
+        } else {
+          Toast.fail(response.data.msg);
         }
-
-
-
-
-      },toCreateOrg(){
-        this.$router.push({path: "/perfectOrg"});
-
-      },
-      toPatients() {
-        this.$router.push({path: "/patients"});
-      },
-      toSearch() {
-        this.$router.push({path: "/search"});
-      }, GetHomeData() {
-        GetHomeData().then(response => {
-          if (response.data.state === 1) {
-            this.isCreateOrg = response.data.data.isCreateOrg
-            if(this.isCreateOrg){
-              this.orgs = response.data.data.orgs
-              this.apps = response.data.data.apps
-              this.banners = response.data.data.banners
-              this.org_arr = []
-              for (let i = 0; i < this.orgs.length; i++){
-                let obj= {
-                  text: this.orgs[i].org_name,
-                  value: this.orgs[i].id
-
-                }
-                this.org_arr.push(obj)
-              }
-              this.value1 = this.$store.getters.user.org.id
-            }else{
-              this.apps = response.data.data.apps
-              this.banners = response.data.data.banners
+      });
+    },
+    jump(url) {
+      window.location.href = url;
+    },
+    jumpApp(app) {
+      if (!this.isCreateOrg) {
+        Toast.fail("你尚未创建机构,无法使用该功能");
+        return;
+      }
+      if (app.open_status == 0) {
+        Toast.success("敬请期待");
+        return;
+      }
+      switch (app.app_type) {
+        case 6:
+          this.toPatients();
+          break;
+        case 7:
+          this.$router.push({ path: "/main" });
+          break;
+        case 8:
+          break;
+        case 9:
+          break;
+        case 10:
+          break;
+        case 11:
+          break;
+        case 12:
+          break;
+        case 13:
+          break;
+        case 14:
+          break;
+      }
+    },
+    toCreateOrg() {
+      this.$router.push({ path: "/perfectOrg" });
+    },
+    toPatients() {
+      this.$router.push({ path: "/patients" });
+    },
+    toSearch() {
+      this.$router.push({ path: "/search" });
+    },
+    GetHomeData() {
+      GetHomeData().then(response => {
+        if (response.data.state === 1) {
+          this.isCreateOrg = response.data.data.isCreateOrg;
+          if (this.isCreateOrg) {
+            this.orgs = response.data.data.orgs;
+            this.apps = response.data.data.apps;
+            this.banners = response.data.data.banners;
+            this.org_arr = [];
+            for (let i = 0; i < this.orgs.length; i++) {
+              let obj = {
+                text: this.orgs[i].org_name,
+                value: this.orgs[i].id
+              };
+              this.org_arr.push(obj);
             }
+            this.value1 = this.$store.getters.user.org.id;
           } else {
-            this.$toast({
-              message: response.data.msg
-            });
+            this.apps = response.data.data.apps;
+            this.banners = response.data.data.banners;
           }
-        });
-
-      },toConsole(){
-        this.$router.push({path: "/manageconsole"});
-
-      },
+        } else {
+          this.$toast({
+            message: response.data.msg
+          });
+        }
+      });
     },
-    created() {
-      this.GetHomeData()
-      setRem();
+    toConsole() {
+      this.$router.push({ path: "/manageconsole" });
     }
-  };
+  },
+  created() {
+    this.GetHomeData();
+    setRem();
+  }
+};
 </script>
 <style lang="scss" scoped>
 .page_homeIndex {
@@ -455,6 +449,10 @@
     opacity: 0.5;
     filter: alpha(opacity=40);
   }
+  .van-overlay {
+    top: 3.125rem;
+    z-index: 9;
+  }
 }
 </style>
 <style lang="scss"></style>

src/pages/my/index.vue

@@ -7,7 +7,7 @@
           <img v-if="roleInfo.avatar != ''" :src="roleInfo.avatar" alt />
           <img
             v-if="roleInfo.avatar == ''"
-            src="../../assets/images/default_avatar.jpg"
+            src="../../assets/images/mydefault.png"
             alt
           />
         </div>
@@ -35,7 +35,7 @@
       <router-link to="/ElectronicSignature">
         <div class="myInfo1">
           <div class="myInfoLeft">
-            <img src="../../assets/images/myIcon1.png" alt />
+            <img src="../../assets/images/myIcon9.png" alt />
             <p>电子签名</p>
           </div>
           <van-icon class="arrow" name="arrow" />
@@ -201,7 +201,7 @@ export default {
       width: 4.375rem;
       height: 4.375rem;
       background: rgba(50, 50, 50, 1);
-      border: 2px solid rgba(255, 255, 255, 1);
+      // border: 2px solid rgba(255, 255, 255, 1);
       border-radius: 50%;
       img {
         border-radius: 50%;

src/pages/my/myInfo.vue

@@ -11,7 +11,7 @@
           <img v-if="roleInfo.avatar != ''" :src="roleInfo.avatar" alt />
           <img
             v-if="roleInfo.avatar == ''"
-            src="../../assets/images/default_avatar.jpg"
+            src="../../assets/images/mydefault.png"
             alt
           />
           <van-icon class="arrow" name="arrow" />