修复bug

packageA/achievement/index.js

@@ -7,27 +7,7 @@ const _Http = getApp().globalData.http,
 Page({
   data: {
     dropdownItem: 0,
-    dropdown: [{
-        text: getApp().globalData.Language.getMapText('作业看板'),
-        value: 0
-      },
-      {
-        text: getApp().globalData.Language.getMapText('线索'),
-        value: 1
-      },
-      {
-        text: getApp().globalData.Language.getMapText('客户'),
-        value: 2
-      },
-      {
-        text: getApp().globalData.Language.getMapText('项目商机'),
-        value: 3
-      },
-      {
-        text: getApp().globalData.Language.getMapText('作业单据'),
-        value: 4
-      }
-    ],
+
     filtratelist: [],
     showFiltrate: false,
     active: {
@@ -39,6 +19,29 @@ Page({
   onLoad(options) {
     this.refreshData();
     getApp().globalData.Language.getLanguagePackage(this, '作业看板');
+    this.setData({
+      dropdown: [{
+          text: getApp().globalData.Language.getMapText('作业看板'),
+          value: 0
+        },
+        {
+          text: getApp().globalData.Language.getMapText('线索'),
+          value: 1
+        },
+        {
+          text: getApp().globalData.Language.getMapText('客户'),
+          value: 2
+        },
+        {
+          text: getApp().globalData.Language.getMapText('项目商机'),
+          value: 3
+        },
+        {
+          text: getApp().globalData.Language.getMapText('作业单据'),
+          value: 4
+        }
+      ]
+    })
   },
   openFiltrate() {
     this.setData({

packageA/achievement/modules/bills.js

@@ -3,11 +3,6 @@ Component({
     options: {
         addGlobalClass: true
     },
-    lifetimes: {
-        attached: function () {
-            this.selectComponent("#Yl_Filtrate1").queryMonths(1)
-        }
-    },
     data: {
         content: {
             nocache: true,
@@ -56,6 +51,7 @@ Component({
     lifetimes: {
         attached: function () {
             getApp().globalData.Language.getLanguagePackage(this)
+            this.selectComponent("#Yl_Filtrate1").queryMonths(1)
         }
     },
     methods: {

packageA/achievement/modules/client.js

@@ -3,11 +3,6 @@ Component({
     options: {
         addGlobalClass: true
     },
-    lifetimes: {
-        attached: function () {
-            this.selectComponent("#Yl_Filtrate1").queryMonths(1)
-        }
-    },
     data: {
         content: {
             nocache: true,
@@ -56,6 +51,7 @@ Component({
     lifetimes: {
         attached: function () {
             getApp().globalData.Language.getLanguagePackage(this)
+            this.selectComponent("#Yl_Filtrate1").queryMonths(1)
         }
     },
     methods: {

packageA/achievement/modules/clue.js

@@ -3,11 +3,6 @@ Component({
     options: {
         addGlobalClass: true
     },
-    lifetimes: {
-        attached: function () {
-            this.selectComponent("#Yl_Filtrate1").queryMonths(1)
-        }
-    },
     data: {
         content: {
             nocache: true,
@@ -56,6 +51,7 @@ Component({
     lifetimes: {
         attached: function () {
             getApp().globalData.Language.getLanguagePackage(this)
+            this.selectComponent("#Yl_Filtrate1").queryMonths(1)
         }
     },
     methods: {

packageA/achievement/modules/project.js

@@ -51,6 +51,7 @@ Component({
     lifetimes: {
         attached: function () {
             getApp().globalData.Language.getLanguagePackage(this)
+            this.selectComponent("#Yl_Filtrate1").queryMonths(1)
         }
     },
     methods: {

pages/college/index.js

@@ -38,9 +38,18 @@ Page({
         }).then(res => {
             if (res.code != '1') return this.selectMenu(index + 1)
             let str = JSON.stringify(res.data).replace(/classname/g, 'text').replace(/sat_courseware_classid/g, 'id');
-            this.setData({
-                items: JSON.parse(str)
+            let items = JSON.parse(str)
+            items.unshift({
+                children: [],
+                createdate: "2024-10-21 09:04:09",
+                id: '',
+                parentid: 0,
+                rowindex: 1,
+                text: "全部"
             })
+            this.setData({
+                items
+            });
         })
     },
     toDetail(e) {
@@ -117,6 +126,15 @@ Page({
         this.setData({
             mainActiveIndex: detail.index || 0,
         });
+        let item = this.data.items[detail.index]
+        if (item.children.length == 0) {
+            this.setData({
+                activeId: item.id,
+                showText: item.text,
+            })
+            this.selectComponent('#item').toggle(false);
+            this.selectList(true);
+        }
     },
     onClickItem({
         detail = {}

pages/college/index.wxml

@@ -1,7 +1,7 @@
 <van-search value="{{ content.where.condition }}" shape="round" background="var(--primary)" bindchange='startSearch' bind:clear='closeSearch' placeholder="{{language['关键字']||'请输入搜索关键词'}}" />
 <!-- 下拉菜单 -->
 <van-dropdown-menu class="menu" activeColor='var(--assist)'>
-    <van-dropdown-item id="item" title="{{showText||language['默认']||'默认'}}">
+    <van-dropdown-item id="item" title="{{showText||language['全部']||'全部'}}">
         <van-tree-select items="{{ items }}" main-active-class='main-active' content-active-class='content-active' main-active-index="{{ mainActiveIndex }}" active-id="{{activeId}}" bind:click-nav="onClickNav" bind:click-item="onClickItem" />
     </van-dropdown-item>
     <view class="switch">

pages/promotional/index.js

@@ -11,8 +11,8 @@ Page({
         mainActiveIndex: 0, //分类选择器打开分类的下标
         activeId: null, //分类选择器选择id
         activeName: null,
-        sat_sharematerial_classid1: 0,
-        sat_sharematerial_classid2: 0,
+        sat_sharematerial_classid1: '',
+        sat_sharematerial_classid2: '',
         items: [], //分类列表
         total: 0,
         sort: [],
@@ -66,7 +66,7 @@ Page({
         if (this.data.content.pageNumber > this.data.content.pageTotal) return;
         let content = this.data.content;
         content.where.sat_sharematerial_classid1 = this.data.sat_sharematerial_classid1;
-        content.where.sat_sharematerial_classid2 = this.data.sat_sharematerial_classid2;
+        content.where.sat_sharematerial_classid2 = this.data.sat_sharematerial_classid2 || '';
         if (this.data.sort[0]) content.sort = this.data.sort;
         _Http.basic({
             "classname": "saletool.sharematerial.sharematerial",
@@ -158,6 +158,14 @@ Page({
             if (res.code != '1') return this.selectMenu(index + 1, res);
             let str = JSON.stringify(res.data).replace(/classname/g, 'text').replace(/sat_sharematerial_classid/g, 'id'),
                 items = JSON.parse(str)
+            items.unshift({
+                children: [],
+                createdate: "2024-10-21 09:04:09",
+                id: '',
+                parentid: 0,
+                rowindex: 1,
+                text: "全部"
+            })
             this.setData({
                 items
             });
@@ -195,7 +203,6 @@ Page({
         });
         this.selectComponent('#item').toggle(false);
         this.getList(true);
-        console.log("onClickItem", detail)
     },
     onClickNav({
         detail = {}
@@ -207,7 +214,7 @@ Page({
         if (item.children.length == 0) {
             this.setData({
                 sat_sharematerial_classid1: item.id,
-                sat_sharematerial_classid2: 0,
+                sat_sharematerial_classid2: '',
                 activeId: item.id,
                 activeName: item.text,
             })