瀏覽代碼

对接菜单接口

凉纪 2 年之前
父節點
當前提交
c20114ea01

+ 5 - 0
src/assets/css/index.scss

@@ -14,3 +14,8 @@ body .app {
   padding-bottom: 100px;
   background-color: rgb(245, 245, 249);
 }
+
+.van-empty__image{
+  height: 223px;
+  width: 223px;
+}

+ 10 - 3
src/components/dateCell/index.vue

@@ -3,7 +3,7 @@
     <van-cell v-if="disabled" :title="title" :label="selected" />
     <van-cell v-else :title="title" is-link :label="selected" @click="clickItem">
       <template #right-icon>
-        <van-icon name="underway-o" style="font-weight: 600;line-height: inherit;color:#008cd6;" />
+        <van-icon name="underway-o" class="date-icon"/>
       </template>
     </van-cell>
     <van-popup v-model="showPicker" round  position="bottom" :close-on-popstate="true" get-container="#app">
@@ -96,6 +96,13 @@ export default {
 }
 </script>
 
-<style scoped>
-
+<style lang="scss">
+.date-icon{
+  font-weight: 500;
+  line-height: inherit;
+  width: 42px;
+  height: 42px;
+  color: #008cd6;
+  font-size: 42px;
+}
 </style>

+ 2 - 1
src/utils/globalMixins.js

@@ -45,7 +45,8 @@ export default {
         getDict( dict ).then(res => {
           let { code, data } = res;
           if (code == 200) {
-            this[dict] = data;
+            this.observers[dict] = data;
+            //this[dict] = data;
             //return  this[dict].find(v=> s == v.dictValue).dictLabel;
           }
         })

+ 3 - 3
src/views/home/menu.vue

@@ -3,9 +3,9 @@
     <top-bar></top-bar>
     <div class="menu-list">
       <div class="menu-list-item" v-for="(v,i) in menuList" :key="i">
-        <p @click="onclick">{{v.name}}</p>
+        <p @click="onclick">{{v.meta.title}}</p>
         <van-grid border :column-num="3">
-          <van-grid-item v-for="(item,index) in v.list" :key="index" icon="smile-o" :text="item.menu" :to="item.path" />
+          <van-grid-item v-for="(item,index) in v.children" :key="index" :icon="item.meta.icon" :text="item.meta.title" :to="item.path" />
         </van-grid>
 <!--          <li v-for="(item,index) in v.list" :key="index">-->
 <!--            <div></div>-->
@@ -141,7 +141,7 @@ export default {
     getMenuList(){
       getMenu().then(res=>{
         console.log(res,'res')
-        //this.menuList = res.data
+        this.menuList = res.data
       })
     },
     onclick(){

+ 2 - 1
src/views/menu/educationStatistics/index.vue

@@ -73,6 +73,7 @@ export default {
     getPlanList(){
       planList(this.query.orgId).then(res=>{
         this.planList = res.data;
+        if(res.data.length === 0) return this.$toast('暂无教育计划');
         this.query.planId = res.data[0].id;
         this.query.date = formatDate(new Date(),'YYYY-MM');
         this.getDataList();
@@ -82,7 +83,7 @@ export default {
       let data = {
         ...this.query
       }
-      data.date = `${this.query.date}-01`;
+      data.date = this.query.date && `${this.query.date}-01`;
       if(!this.query.orgId) return this.$toast('请选择机构');
       dataList(data).then(res=>{
         this.dataList = res.data;