update lang

Author: JaimeCheng

cloudfunctions/trending/fetch.js

@@ -6,13 +6,17 @@ const GITEE_URL = 'https://gitee.com';
 async function fetchData({ lang = '', page = 1 } = {}) {
   const data = await fetch(`${GITEE_URL}/explore/all?lang=${lang}&page=${page}`);
   const $ = cheerio.load(await data.text());
-  const langs = $('.explore-languagues__container .menu a').get().map(a => {
+
+  var langs = $('.explore-project__selection-container .actions .dropdown:nth-of-type(2) .menu a').get().map(a => {
     const queryArr = $(a).attr('href').split('=');
     return {
       query: queryArr.length === 2 ? queryArr[1] : '',
-      val: $(a).find('span:first-child').text()
+      val: $(a).text()
     };
   })
+  // if (!lang && langs[0].val !== '全部语言') {
+  //   langs.unshift({query: '', val: '全部语言'})
+  // }
 
   const trending = {
     daily: [],

miniprogram/pages/explore/explore.js

@@ -8,6 +8,7 @@ Page({
     active: 0,
     index: 0,
     lang: '',
+    currLang: '全部语言',
     page: 1,
     total_pages: 100,
     langArr: [],
@@ -68,11 +69,13 @@ Page({
   },
   bindPickerChange: function(e) {
     this.setData({
-      index: e.detail.value,
+      index: 0,
+      // index: e.detail.value,
       lang: this.data.langArr[e.detail.value].query,
       page: 1,
       repos: [],
-      loading: true
+      loading: true,
+      currLang: this.data.langArr[e.detail.value].val
     })
     this.getTrending()
   },

miniprogram/pages/explore/explore.wxml

@@ -40,9 +40,15 @@
 
 <image class="btm-loading" hidden="{{ !btmloading }}" src="../../assets/loading.gif"></image>
 
-<picker bindchange="bindPickerChange" value="{{index}}" range="{{langArr}}" range-key="val">
+<!-- <picker bindchange="bindPickerChange" value="{{index}}" range="{{langArr}}" range-key="val">
   <view class="picker">
     <view wx:if="{{langArr.length > 0}}" class="mybtn-primary fixed-btn">选择语言: {{langArr[index].val}}</view>
   </view>
+</picker> -->
+
+<picker bindchange="bindPickerChange" value="{{index}}" range="{{langArr}}" range-key="val">
+  <view class="picker">
+    <view wx:if="{{langArr.length > 0}}" class="mybtn-primary fixed-btn">选择语言: {{currLang}}</view>
+  </view>
 </picker>