weapps-plugin-jingtong-verify 1.3.9 → 1.4.1-dev

package/weapps-plugin-jingtong-verify/pages/nation-list/nation-list.js

@@ -1,98 +1,111 @@
-// pages/authenticate/countrySerchList/countrySerchList.js
-const { nation } = require("../../utils/country")
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    searchValue: '',
-    nationsList: [],
-    cid_type: '',
-    language: ''
-  },
-  /**
-   * 使用match方法实现模糊查询
-   * @param  {Array}  list     进行查询的数组
-   * @param  {String} keyWord  查询的关键词
-   * @return {Array}           查询的结果
-   */
-  fuzzyQuery(list, keyWord) {
-    let arr = [];
-    for (let i = 0; i < list.length; i++) {
-      if (list[i].name.match(keyWord) != null) {
-        arr.push(list[i]);
-      }
-    }
-    return arr;
-  },
-
-  handleChange(e) {
-    let { value } = e.detail
-    let nationsList = this.fuzzyQuery(nation, value)
-    this.setData({
-      nationsList
-    })
-  },
-
-  handleChoose(e) {
-    const { value, name } = e.detail
-    const { cid_type } = this.data
-    let formDataTemp = wx.getStorageSync('tif.formDataTemp')
-    formDataTemp[cid_type].nation = value
-    formDataTemp[cid_type].nation_name = name
-    wx.setStorageSync('tif.formDataTemp', formDataTemp)
-    var pages = getCurrentPages(); // 当前页面
-    var prevPage = pages[pages.length - 2]; // 上一页面
-    prevPage.setData({
-       // 直接给上一个页面赋值
-      hadChoseNation: true
-    });
-    wx.navigateBack({
-      delta: 1
-    })
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
-    wx.hideShareMenu()
-    
-    const language = wx.getStorageSync('tif.currentLanguage') || 'zh_CN'
-    const { cid_type } = options
-    this.setData({
-      cid_type,
-      language
-    })
-    this.initDomText(language)
-  },
-
-  // 根据语言环境，初始化文案
-  initDomText(language) {
-    const navigationBarTitleText = {
-      zh_CN: '国籍',
-      en: 'Nationality'
-    }
-    let title = this.data.cid_type === '700' ? navigationBarTitleText['en'] : navigationBarTitleText[language]
-    wx.setNavigationBarTitle({
-      title
-    })
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
-    this.setData({
-      nationsList: nation
-    })
-  }
+// pages/authenticate/countrySerchList/countrySerchList.js
+const { nation, fullNation } = require("../../utils/country")
+const nationFull = fullNation()
+
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    searchValue: '',
+    nationsList: [],
+    cid_type: '',
+    language: ''
+  },
+  /**
+   * 使用match方法实现模糊查询
+   * @param  {Array}  list     进行查询的数组
+   * @param  {String} keyWord  查询的关键词
+   * @return {Array}           查询的结果
+   */
+  fuzzyQuery(list, keyWord) {
+    let arr = [];
+    for (let i = 0; i < list.length; i++) {
+      if (list[i].name.match(keyWord) != null) {
+        arr.push(list[i]);
+      }
+    }
+    return arr;
+  },
+
+  whoNation() {
+    if (this.data.cid_type === '516') {
+      // 港澳居民来往内地通行证：加入中国
+      console.log('加入中国', nationFull.length)
+      return nationFull
+    } else {
+      console.log('国籍', nation.length)
+      return nation
+    }
+  },
+
+  handleChange(e) {
+    let { value } = e.detail
+    let nationsList = this.fuzzyQuery(this.whoNation(), value)
+    this.setData({
+      nationsList
+    })
+  },
+
+  handleChoose(e) {
+    const { value, name } = e.detail
+    const { cid_type } = this.data
+    let formDataTemp = wx.getStorageSync('tif.formDataTemp')
+    formDataTemp[cid_type].nation = value
+    formDataTemp[cid_type].nation_name = name
+    wx.setStorageSync('tif.formDataTemp', formDataTemp)
+    var pages = getCurrentPages(); // 当前页面
+    var prevPage = pages[pages.length - 2]; // 上一页面
+    prevPage.setData({
+       // 直接给上一个页面赋值
+      hadChoseNation: true
+    });
+    wx.navigateBack({
+      delta: 1
+    })
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    const { cid_type } = options
+    this.setData({
+      cid_type
+    })
+
+    wx.hideShareMenu()
+    const language = wx.getStorageSync('tif.currentLanguage') || 'zh_CN'
+    this.setData({
+      nationsList: this.whoNation(),
+      language
+    })
+    this.initDomText(language)
+  },
+
+  // 根据语言环境，初始化文案
+  initDomText(language) {
+    const navigationBarTitleText = {
+      zh_CN: '国籍',
+      en: 'Nationality'
+    }
+    let title = this.data.cid_type === '700' ? navigationBarTitleText['en'] : navigationBarTitleText[language]
+    wx.setNavigationBarTitle({
+      title
+    })
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+  }
 })

package/weapps-plugin-jingtong-verify/pages/nation-list/nation-list.json

@@ -1,7 +1,7 @@
-{
-  "navigationBarTitleText": "国籍",
-  "usingComponents": {
-    "g-search": "../../components/gsd-ui/g-search/index",
-    "g-index-list": "../../components/gsd-ui/g-index-list/index"
-  }
+{
+  "navigationBarTitleText": "国籍",
+  "usingComponents": {
+    "g-search": "../../components/gsd-ui/g-search/index",
+    "g-index-list": "../../components/gsd-ui/g-index-list/index"
+  }
 }

package/weapps-plugin-jingtong-verify/pages/nation-list/nation-list.wxml

@@ -1,9 +1,9 @@
-<!--weapps-plugin-citycode/pages/nation-list/nation-list.wxml-->
-<g-index-list
-  list="{{ nationsList }}"
-  bind:choose="handleChoose"
-  >
-  <view slot="header">
-    <g-search value="{{searchValue}}" placeholder="{{ cid_type === '700' ? '' : '请输入国籍' }}" bind:change="handleChange"/>
-  </view>
-</g-index-list>
+<!--weapps-plugin-citycode/pages/nation-list/nation-list.wxml-->
+<g-index-list
+  list="{{ nationsList }}"
+  bind:choose="handleChoose"
+  >
+  <view slot="header">
+    <g-search value="{{searchValue}}" placeholder="{{ cid_type === '700' ? '' : '请输入国籍' }}" bind:change="handleChange"/>
+  </view>
+</g-index-list>

package/weapps-plugin-jingtong-verify/pages/nation-list/nation-list.wxss

@@ -1,2 +1,2 @@
-/* weapps-plugin-citycode/pages/nation-list/nation-list.wxss */
+/* weapps-plugin-citycode/pages/nation-list/nation-list.wxss */
 @import '../../components/gsd-ui/static/style/main';