Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/home/index.vue

.env.development

@@ -1,2 +1,2 @@
-VUE_APP_JTXT_URL = "http://192.168.18.193:8081"
-VUE_APP_LANXIN_APPID = "557824-1114112"
+VUE_APP_JTXT_URL = "http://8.141.68.219:8080"
+VUE_APP_LANXIN_APPID = "557824-1114112"

src/views/home/index.vue

@@ -22,6 +22,7 @@
         />
       </van-dropdown-menu>
     </div>
+    </van-nav-bar>
     <transition name="tab" mode="out-in">
       <component :is="currentComponents" class="page" />
     </transition>
@@ -79,9 +80,7 @@ export default {
           iconInactive: require("@/assets/image/homeTab/person.png"),
           iconActive: require("@/assets/image/homeTab/personActive.png")
         }
-      ],
-      engineeringWorkChooseValue: null, // 工种选择的值
-      engineeringWorkList: "" // 工种可选列表
+      ]
     };
   },
   computed: {
@@ -124,13 +123,6 @@ export default {
     },
     // 初始化
     initFun() {
-      this.engineeringWorkList = [
-        { text: "桥隧工", value: "QiaoSuiGong" },
-        // { text: "测量工", value: "CeLiangGong" },
-        { text: "线路工", value: "XianLuGong" }
-      ];
-      this.engineeringWorkChooseValue = this.engineeringWorkList[0].value;
-      this.handleChangeEngneeringWorkFun(this.engineeringWorkChooseValue);
       // 获取所有用户
       this.$_http
         .get(this.$_API.JTXT_GET_USER_ADMIN_USERS)
@@ -154,21 +146,6 @@ export default {
     onChangeTabFun(index) {
       this.currentComponents = this.tabbars[this.activeTabName].pageName;
     },
-    // 操作：选择了工种
-    handleChangeEngneeringWorkFun(value) {
-      let resultItem = null;
-      for (let i = 0; i < this.engineeringWorkList.length; i++) {
-        let item = this.engineeringWorkList[i];
-        if (value === item.value) {
-          resultItem = item;
-          break;
-        }
-      }
-      this.$store.commit("updateUserItemStore", {
-        field: "chooseEngneeringWork",
-        value: resultItem
-      });
-    },
     // 获取所有收藏
     getCollection() {
       let path = {
@@ -289,15 +266,6 @@ export default {
 .home-box {
   height: 100%; // 不要设置vh，手机浏览器计算问题
   padding-bottom: 2rem; // 多2em，避免tab栏挡住内容
-  .dropdown-div {
-    position: absolute;
-    top: 0;
-    right: 0.5rem;
-    width: 5rem;
-    height: 2.09091rem;
-    overflow: hidden;
-    z-index: 1000;
-  }
 }
 </style>
 <style lang="scss">

src/views/home/learn/page-learn.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="page-learn">
     <van-tabs :active="active" @click="rootChange" line-width="10px">
       <!-- 根目录 -->
       <van-tab
@@ -13,6 +13,20 @@
         </PageLearnRecommend>
       </van-tab>
     </van-tabs>
+    <div class="dropdown-div">
+      <van-dropdown-menu active-color="#1989fa">
+        <van-dropdown-item
+          v-model="engineeringWorkChooseValue"
+          :options="engineeringWorkList"
+          :title="
+            engineeringWorkChooseValue
+              ? engineeringWorkChooseValue.text
+              : '工种选择'
+          "
+          @change="handleChangeEngneeringWorkFun"
+        />
+      </van-dropdown-menu>
+    </div>
   </div>
 </template>
 
@@ -33,16 +47,41 @@ export default {
       learnRootList: [],
       choosedRootIndex: 0,
       swiperList: [],
-      parentId: ""
+      parentId: "",
+      engineeringWorkChooseValue: null, // 工种选择的值
+      engineeringWorkList: [] // 工种可选列表
     };
   },
   computed: {},
   created() {
+    this.engineeringWorkList = [
+      { text: "桥隧工", value: "QiaoSuiGong" },
+      // { text: "测量工", value: "CeLiangGong" },
+      { text: "线路工", value: "XianLuGong" }
+    ];
+    this.engineeringWorkChooseValue = this.engineeringWorkList[0].value;
+    this.handleChangeEngneeringWorkFun(this.engineeringWorkChooseValue);
+
     this.getSwiperListDataFun();
     this.getLearnRootList();
   },
   mounted() {},
   methods: {
+    // 操作：选择了工种
+    handleChangeEngneeringWorkFun(value) {
+      let resultItem = null;
+      for (let i = 0; i < this.engineeringWorkList.length; i++) {
+        let item = this.engineeringWorkList[i];
+        if (value === item.value) {
+          resultItem = item;
+          break;
+        }
+      }
+      this.$store.commit("updateUserItemStore", {
+        field: "chooseEngneeringWork",
+        value: resultItem
+      });
+    },
     // 查询轮播图数据列表
     getSwiperListDataFun() {
       this.swiperList = [
@@ -83,9 +122,35 @@ export default {
 };
 </script>
 
+<style lang="scss">
+.page-learn {
+  .van-tabs__wrap--scrollable {
+    padding-right: 3rem;
+  }
+  .van-dropdown-menu__bar {
+    height: 1.5rem;
+  }
+  .van-dropdown-menu__title {
+    padding-left: 0;
+  }
+}
+</style>
 <style lang="scss" scoped>
 @import "~@/styles/mixin";
 .contentBody {
   background-color: #fff;
 }
+.page-learn {
+  position: relative;
+  .dropdown-div {
+    position: absolute;
+    top: 0;
+    right: 0;
+    width: 3rem;
+    height: 1.5rem;
+    overflow: hidden;
+    z-index: 1000;
+    background-color: blanchedalmond;
+  }
+}
 </style>