Merge branch 'main' of http://122.51.230.86:3000/dianliang/oil-station

gasStation-uni/pagesMy/myorder/myorder.vue

@@ -7,8 +7,12 @@
         <view class="r-num">{{ cardBalance.points || 0 }}</view>
       </view>
       <view class="tab-bs">
-				<view class="w_box" @click="show1 = true">类型筛选 <u-icon name="arrow-down-fill"></u-icon> </view>
+        <view class="w_box" @click="show1 = true">类型筛选
-				<view class="w_box" @click="show = true">全部时间 <u-icon name="arrow-down-fill"></u-icon> </view>
+          <u-icon name="arrow-down-fill"></u-icon>
+        </view>
+        <view class="w_box" @click="show = true">全部时间
+          <u-icon name="arrow-down-fill"></u-icon>
+        </view>
       </view>
       <view class="bai_box" v-for="(item,index) in pointsList" :key="index">
         <view class="left-img">
@@ -76,13 +80,14 @@
       </view> -->
       <u-datetime-picker :show="show" v-model="value1" mode="year-month" @cancel="cancel1"
                          @confirm="confirm1"></u-datetime-picker>
-			<u-picker :show="show1" :columns="columns" @cancel="cancel" @confirm="confirm"></u-picker>
+      <u-picker :show="show1" :columns="columns" @cancel="cancel" keyName="label" @confirm="confirm"></u-picker>
     </view>
   </view>
 </template>
 
 <script>
 import request from '../../utils/request'
+
 export default {
   data() {
     return {
@@ -98,8 +103,44 @@
       show1: false,
       value1: Number(new Date()),
       columns: [
-					['全部类型', '消费有礼', '充值有礼', '积分兑换', '开卡有礼', '邀请有礼', '生日有礼', '推荐会员充值有礼',
+        [{
-						'推荐会员推荐有礼', '每日签到', '大转盘抽奖', '九宫格抽奖'
+          label: '全部类型',
+          value: null
+        }, {
+          label: '消费有礼',
+          value: ''
+        }, {
+          label: '充值有礼',
+          value: ''
+        }, {
+          label: '积分兑换',
+          value: ''
+        }, {
+          label: '开卡有礼',
+          value: ''
+        }, {
+          label: '邀请有礼',
+          value: ''
+        }, {
+          label: '生日有礼',
+          value: ''
+        }, {
+          label: '推荐会员充值有礼',
+          value: ''
+        },
+          {
+            label: '推荐会员推荐有礼',
+            value: ''
+          }, {
+          label: '每日签到',
+          value: ''
+        }, {
+          label: '大转盘抽奖',
+          value: ''
+        }, {
+          label: '九宫格抽奖',
+          value: ''
+        }
         ]
       ],
       queryParams: {
@@ -167,9 +208,9 @@
     confirm(e) {
       this.queryParams.pageNo = 1
       if (e.value[0] == '全部类型') {
-					this.queryParams.type = ""
+        this.queryParams.type = null
       } else {
-					this.queryParams.type = e.value[0]
+        this.queryParams.type = e.value[0].type
       }
       this.getList()
       this.show1 = false