提示语调整、格式调整

components/common/pica-area.vue

@@ -184,13 +184,13 @@ export default {
   methods: {
 
     ...mapActions({
-      setOrgList: 'setOrgList'
+      setOrgList: 'setOrgList',
+      setAreaDegree: 'setAreaDegree'
     }),
     async getHospitalsByRegionId(params) {
       await getHospitalsByRegionId(params).then(res => {
         if (res.code === "000000") {
           this.setOrgList(res.data.list)
-          console.log('@@@@@@@@@@@@@', res);
         }
       });
     },    
@@ -290,8 +290,9 @@ export default {
       if(item.degree == 0){
         return;
       }
-      if(item.degree == 4){
+      if(item.degree == 3 || item.degree == 4){
         // 调用机构接口
+        this.setAreaDegree(item.degree)
         this.getHospitalsByRegionId(this.queryParams);
         return;
       }
@@ -327,8 +328,9 @@ export default {
       if(item.degree == 0){
         return;
       }
-      if(item.degree == 4){
+      if(item.degree == 3 || item.degree == 4){
         // 调用机构接口
+        this.setAreaDegree(item.degree)
         this.getHospitalsByRegionId(this.queryParams);
         return;
       }
@@ -359,8 +361,9 @@ export default {
       if(item.degree == 0){
         return;
       }
-      if(item.degree == 4){
+      if(item.degree == 3 || item.degree == 4){
         // 调用机构接口
+        this.setAreaDegree(item.degree)
         this.getHospitalsByRegionId(this.queryParams);
         return;
       }
@@ -386,8 +389,9 @@ export default {
       if(item.degree == 0){
         return;
       }
-      if(item.degree == 4){
+      if(item.degree == 3 || item.degree == 4){
         // 调用机构接口
+        this.setAreaDegree(item.degree)
         this.getHospitalsByRegionId(this.queryParams);
         return;
       }
@@ -431,11 +435,10 @@ export default {
 <style lang="less" scoped>
 .select-wrapper {
   font-family: PingFangSC-Regular;
-
   .mask {
     position: fixed;
     z-index: 1000;
-    top: 124px;
+    top: 0;
     right: 0;
     left: 0;
     bottom: 0;

components/common/pica-org.vue

@@ -62,7 +62,6 @@ export default {
   watch: {
     orgList: {
       handler(newList) {
-        console.log('$$$$$$$$$4', newList)
         this.dataList = newList;
         this.dataList.map(a => {
           a.selected = false;
@@ -97,7 +96,7 @@ export default {
   .mask {
     position: fixed;
     z-index: 1000;
-    top: 124px;
+    top: 0;
     right: 0;
     left: 0;
     bottom: 0;

pages/index.vue

@@ -217,7 +217,7 @@ export default {
       allData: {},
       projectId: "",
       token:
-        "F24CD42F1CFA46829639228E9CFE1E3D" ||
+        "299F66567E7C48C78ADE418B364C5A35" ||
         "A62E9F92365547A29724F21F29BED4F6" ||
         "4556EDEAAE134FE1B6E1356BF9C1B8F9",
       isOrgStat: false,
@@ -297,6 +297,12 @@ export default {
 
     };
   },
+  computed: {
+    ...mapGetters({
+      orgList: "orgList",
+      areaDegree: "areaDegree"
+    }),
+  },
   async asyncData() {
     return {};
   },
@@ -488,6 +494,8 @@ export default {
       this.isShowArea = false;
     },
     orgConfirm(selData) {
+      this.$toast('res.message');
+
       let hospitalIds = [];
       let hospitalNames = [];
       let orgName = '';
@@ -514,10 +522,25 @@ export default {
       this.isShowOrg = false;
     },
     areaTabClick() {
-      this.isShowArea = true;
+      if(this.isShowOrg) {
+        this.isShowOrg = false;
+      }
+      this.isShowArea = !this.isShowArea;
     },
     orgTabClick() {
-      this.isShowOrg = true;
+      // if(this.isShowArea) {
+      //   this.isShowArea = false;
+      // }
+      if(this.orgDegree !== 3 && this.orgDegree !== 4) {
+        this.$toast('选择区/县后才可选择机构');
+        return;
+      }
+      if(this.orgList.length === 0) {
+        this.$toast('此区域下无机构');
+        return;
+      }
+      
+      this.isShowOrg = !this.isShowOrg;
     },
     resizeTheChart() {
       if (this.$refs.runTimes_creditChart) {

plugins/vue-inject.js

@@ -2,8 +2,10 @@ import Vue from 'vue'
 import rocNative from '@/utils/jsbridge'
 import echarts from 'echarts'
 import { DropdownMenu, DropdownItem } from 'vant';
+import { Toast } from 'vant';
 // import picaArea from 'pica-area'
 // Vue.use(picaArea)
+Vue.use(Toast)
 
 import VConsole from 'vconsole/dist/vconsole.min.js' //import vconsole
 let vConsole = new VConsole() // 初始化

service/api.js

@@ -20,7 +20,7 @@ Axios.interceptors.request.use(
     if (method === 'post' || method === 'put' || method === 'delete') {}
     if (config.withCredentials) {
       // config.headers.token = '3EB9111164E84A45B5B00428D52BC966';
-      config.headers.token = cookies.get('token') || 'F24CD42F1CFA46829639228E9CFE1E3D' || 'C284B868425D494386EAEF6C9AE99937';
+      config.headers.token = cookies.get('token') || '299F66567E7C48C78ADE418B364C5A35' || 'F24CD42F1CFA46829639228E9CFE1E3D' || 'C284B868425D494386EAEF6C9AE99937';
     }
     return config;
   },

store/index.js

@@ -8,6 +8,7 @@ export const state = () => ({
   orgList: [],
   examTimesList: [],
   examScoreList: [],
+  areaDegree: 0
 })
 export const getters = {
   projectId(state) {
@@ -15,7 +16,7 @@ export const getters = {
   },
   regionId(state) {
     return state.regionId;
-  },  
+  },
   regionDegree(state) {
     return state.regionDegree;
   },
@@ -37,44 +38,49 @@ export const getters = {
   examScoreList(state) {
     return state.examScoreList;
   },
+  areaDegree(state) {
+    return state.areaDegree;
+  },
 }
 export const mutations = {
   SET_PROJECT_ID(state, projectId) {
-    state.projectId  = projectId;
+    state.projectId = projectId;
   },
   SET_REGION_ID(state, regionId) {
-    state.regionId  = regionId;
-  },  
+    state.regionId = regionId;
+  },
   SET_REGION_DEGREE(state, regionDegree) {
-    state.regionDegree  = regionDegree;
+    state.regionDegree = regionDegree;
   },
   SET_USER_TOKEN(state, userToken) {
-    state.userToken  = userToken;
+    state.userToken = userToken;
   },
   SET_USER_MOBILE(state, userMobile) {
-    state.userMobile  = userMobile;
-  },  
+    state.userMobile = userMobile;
+  },
   SET_PROVINCE_LIST(state, provinceList) {
-    state.provinceList  = provinceList;
+    state.provinceList = provinceList;
   },
   SET_ORG_LIST(state, orgList) {
-    state.orgList  = orgList;
+    state.orgList = orgList;
   },
   SET_EXAM_TIMES_LIST(state, examTimesList) {
-    state.examTimesList  = examTimesList;
+    state.examTimesList = examTimesList;
   },
   SET_EXAM_SCORCE_LIST(state, examScoreList) {
-    state.examScoreList  = examScoreList;
+    state.examScoreList = examScoreList;
+  },
+  SET_AREA_DEGREE(state, areaDegree) {
+    state.areaDegree = areaDegree;
   },
-  
 }
 export const actions = {
-  setProjectId({ commit },  projectId) {
+  setProjectId({ commit }, projectId) {
     commit('SET_PROJECT_ID', projectId);
   },
   setRegionId({ commit }, regionId) {
     commit('SET_REGION_ID', regionId);
-  },  
+  },
   setRegionDegree({ commit }, regionDegree) {
     commit('SET_REGION_DEGREE', regionDegree);
   },
@@ -83,7 +89,7 @@ export const actions = {
   },
   setUserMobile({ commit }, userMobile) {
     commit('SET_USER_MOBILE', userMobile);
-  },  
+  },
   setProvinceList({ commit }, provinceList) {
     commit('SET_PROVINCE_LIST', provinceList);
   },
@@ -96,4 +102,7 @@ export const actions = {
   setExamScoreList({ commit }, examScoreList) {
     commit('SET_EXAM_SCORCE_LIST', examScoreList);
   },
+  setAreaDegree({ commit }, areaDegree) {
+    commit('SET_AREA_DEGREE', areaDegree);
+  },
 }
\ No newline at end of file