Merge branch 'master' of http://git.ichunt.net/xiaokang/H5_2.0

.gitignore

@@ -3,4 +3,5 @@
 /unpackage
 /unpackage
 /*.hbuilderx
 /*.hbuilderx
 /.DS_Store
 /.DS_Store
-/node_modules
+/node_modules
\ No newline at end of file
+/node_modules/query-string

pages/mine/shoporder.vue

@@ -91,7 +91,7 @@
                     </view>
                     </view>
                     <view class="h2">币种</view>
                     <view class="h2">币种</view>
                     <view class="tab row">
                     <view class="tab row">
-                        <view class="box  row rowCenter verCenter" v-for="(item, index) in currency_arr" :class="{ curr: currencyIndex == index }" :key="index">{{ item }}</view>
+                        <view class="box  row rowCenter verCenter" v-for="(item, index) in currency_arr" :class="{ curr: currencyIndex == index }" :key="index" @click="filterTab(index)">{{ item }}</view>
                     </view>
                     </view>
                 </view>
                 </view>
                 <view class="btn row bothSide verCenter">
                 <view class="btn row bothSide verCenter">
@@ -181,7 +181,9 @@ export default {
         /**
         /**
          * 筛选
          * 筛选
          */
          */
-        filterChange() {},
+        filterChange(index) {
+            this.currencyIndex = index;
+        },
         /**
         /**
          * 立即支付
          * 立即支付
          * @param {Object} order_id
          * @param {Object} order_id