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

gasStation-uni/pagesMy/myorder/myorder.vue

@@ -4,11 +4,15 @@
       <view class="card_box">
 
         <view style="margin: 13px 0px;">当前积分</view>
-				<view class="r-num">{{cardBalance.points || 0}}</view>
+        <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">
@@ -17,18 +21,18 @@
         </view>
         <view style="width: 85%;">
           <view class="right-box">
-						<view class="l-text">{{item.changeReason}}</view>
+            <view class="l-text">{{ item.changeReason }}</view>
-						<view class="r-text" v-if="item.changeType==1">{{item.pointsChange}}</view>
+            <view class="r-text" v-if="item.changeType==1">{{ item.pointsChange }}</view>
-						<view class="r-text" v-else-if="item.changeType==0">-{{item.pointsChange}}</view>
+            <view class="r-text" v-else-if="item.changeType==0">-{{ item.pointsChange }}</view>
             <view class="r-text" v-else>0</view>
           </view>
           <view class="right-box">
             <view class="">会员积分</view>
-						<view class="">余额{{item.currentPoints || 0}}</view>
+            <view class="">余额{{ item.currentPoints || 0 }}</view>
           </view>
           <view class="right-box">
-						<view class="">{{item.storeName}}</view>
+            <view class="">{{ item.storeName }}</view>
-						<view class="">{{item.createTime}}</view>
+            <view class="">{{ item.createTime }}</view>
           </view>
         </view>
       </view>
@@ -76,14 +80,15 @@
       </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'
+import request from '../../utils/request'
-	export default {
+
+export default {
   data() {
     return {
       query: {
@@ -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
@@ -196,23 +237,23 @@
       this.show = false
     }
   }
-	}
+}
 </script>
 
 <style scoped lang="scss">
-	.centenr {
+.centenr {
   width: 100%;
   height: 100vh;
   background: #F9F9F9;
-	}
+}
 
-	.Candywrapper {
+.Candywrapper {
   background: #F9F9F9;
   box-sizing: border-box;
   padding: 10px;
-	}
+}
 
-	.card_box {
+.card_box {
   width: 100%;
   height: 90px;
   background: url('../../static/imgs/jf.png') no-repeat;
@@ -221,40 +262,40 @@
   padding: 10px;
   color: #fff;
   font-size: 14px;
-	}
+}
 
-	.r-size {
+.r-size {
   width: 100%;
   display: flex;
   align-items: center;
   justify-content: flex-end;
-	}
+}
 
-	.r-num {
+.r-num {
   font-weight: 600;
   font-size: 20px;
   color: #FFFFFF;
-	}
+}
 
-	.tab-bs {
+.tab-bs {
   width: 100%;
   display: flex;
   align-items: center;
   justify-content: space-between;
   background: #fff;
   margin: 15px auto;
-	}
+}
 
-	.w_box {
+.w_box {
   width: 50%;
   display: flex;
   align-items: center;
   justify-content: center;
   box-sizing: border-box;
   padding: 15px;
-	}
+}
 
-	.bai_box {
+.bai_box {
   width: 100%;
   box-sizing: border-box;
   padding: 15px 10px;
@@ -262,37 +303,37 @@
   display: flex;
   align-items: center;
   justify-content: space-between;
-	}
+}
 
-	.left-img {
+.left-img {
   margin-right: 10px;
 
   image {
     width: 40px;
     height: 40px;
   }
-	}
+}
 
-	.right-box {
+.right-box {
   width: 100%;
   display: flex;
   align-items: center;
   justify-content: space-between;
   font-size: 12px;
   color: #666666;
-	}
+}
 
-	.l-text {
+.l-text {
   font-size: 16px;
   color: #333333;
   margin-bottom: 5px;
   font-weight: bold;
-	}
+}
 
-	.r-text {
+.r-text {
   font-size: 16px;
   color: #333333;
   margin-bottom: 5px;
   font-weight: bold;
-	}
+}
 </style>