|
@@ -18,13 +18,26 @@
|
|
|
<searchBox placeholder="手机号、车牌号、姓名、客户单位" @search='search($event)'></searchBox>
|
|
|
</view>
|
|
|
|
|
|
- <view class="boxstate">
|
|
|
- <view class="typeBox">
|
|
|
- <view class="type" @click="changeType" v-if="selectTab==0">核销状态</view>
|
|
|
- <view class="type" @click="changeType" v-if="selectTab==1">未核销</view>
|
|
|
- <view class="type" @click="changeType" v-if="selectTab==3">已核销</view>
|
|
|
- <image src="../../static/img/arrow_down.png" mode="" style="width: 24rpx;height: 24rpx;"></image>
|
|
|
+ <view class="boxstate">
|
|
|
+ <view class="sxBox">
|
|
|
+ <view class="typeBox">
|
|
|
+ <view class="type" @click="changeType" v-if="selectTab==0">核销状态</view>
|
|
|
+ <view class="type" @click="changeType" v-if="selectTab==1">未核销</view>
|
|
|
+ <view class="type" @click="changeType" v-if="selectTab==3">已核销</view>
|
|
|
+ <image src="../../static/img/arrow_down.png" mode="" style="width: 24rpx;height: 24rpx;"></image>
|
|
|
+ </view>
|
|
|
+ <view>
|
|
|
+ <picker @change="bindPickerChange" :value="pickerindex" :range-key="'shopName'" :range="pickerarray">
|
|
|
+ <view class="typeBox">
|
|
|
+ <view class="shopnamesx">
|
|
|
+ {{shopName}}
|
|
|
+ </view>
|
|
|
+ <image src="../../static/img/arrow_down.png" mode="" style="width: 24rpx;height: 24rpx;"></image>
|
|
|
+ </view>
|
|
|
+ </picker>
|
|
|
+ </view>
|
|
|
</view>
|
|
|
+
|
|
|
<view class="black" v-if="showSift==true">
|
|
|
<view class="siftBox">
|
|
|
<view class="siftItem" @click="tab(0)">
|
|
@@ -49,7 +62,7 @@
|
|
|
|
|
|
|
|
|
<view class="contentBox">
|
|
|
- <view class="itemHistory" v-for="(item,index) in itemData" :key="index">
|
|
|
+ <view class="itemHistory" v-for="(item,index) in itemData" :key="index" @click="godetail(item)">
|
|
|
<view class="itemTop">
|
|
|
<image :src="item.HeadImg" mode="" class="icon"></image>
|
|
|
<view class="topRight">
|
|
@@ -67,6 +80,8 @@
|
|
|
<view class="timeBox"><span class="leftTitle">报名时间:</span>{{item.CreateTime}}</view>
|
|
|
<view class="zhuangtaiBox" v-if="item.WriteoffState==1"><span class="leftTitle">核销状态:</span> 未核销</view>
|
|
|
<view class="zhuangtaiBox" v-if="item.WriteoffState==3"><span class="leftTitle">核销状态:</span> 已核销 {{item.WriteoffTime}}</view>
|
|
|
+ <view class="timeBox"><span class="leftTitle">报名门店:</span>{{item.ShopName}}</view>
|
|
|
+ <view class="timeBox" v-if="item.WriteoffState==3" style="display: flex;"><span class="leftTitle">核销门店:</span> <view style="width: 500rpx;">{{item.WriteoffShopName}}</view> </view>
|
|
|
</view>
|
|
|
|
|
|
<!-- 上拉 加载更多 -->
|
|
@@ -99,17 +114,60 @@
|
|
|
searchValue: '',
|
|
|
showSift: false,
|
|
|
selectTab: 0,
|
|
|
-
|
|
|
+ pickerindex:0,
|
|
|
+ pickerarray: [],
|
|
|
+ shopName:'',
|
|
|
+ shopId:'',
|
|
|
}
|
|
|
},
|
|
|
onLoad(opt) {
|
|
|
+ this.getShopinfo();
|
|
|
this.activity = JSON.parse(opt.activity);
|
|
|
console.log('activity==', this.activity);
|
|
|
this.page = 1
|
|
|
- this.myOrderCoupon()
|
|
|
+ //this.myOrderCoupon()
|
|
|
},
|
|
|
methods: {
|
|
|
-
|
|
|
+ godetail(e){
|
|
|
+ uni.navigateTo({
|
|
|
+ url: "../myOrder/activityOrderDetail?id=" + e.ID
|
|
|
+ })
|
|
|
+ },
|
|
|
+ bindPickerChange(e){
|
|
|
+ console.log(e)
|
|
|
+ this.shopName=this.pickerarray[e.detail.value].shopName
|
|
|
+ this.shopId=this.pickerarray[e.detail.value].id
|
|
|
+ this.page = 1
|
|
|
+ this.myOrderCoupon()
|
|
|
+ },
|
|
|
+ getShopinfo(){
|
|
|
+ this.$http('openH5SetTheGuest/getShopInfo',{},'GET').then(res => {
|
|
|
+ this.shopName=res.data.shopName;
|
|
|
+ /* this.mrshopId=res.data.id;
|
|
|
+ this.mrshopName=res.data.shopName; */
|
|
|
+ this.shopId=res.data.id
|
|
|
+ this.getShopList();
|
|
|
+ this.myOrderCoupon()
|
|
|
+
|
|
|
+ })
|
|
|
+ },
|
|
|
+ getShopList(){
|
|
|
+
|
|
|
+ this.$http('openH5SetTheGuest/getShopList', {
|
|
|
+
|
|
|
+ },'GET').then(res => {
|
|
|
+
|
|
|
+ this.pickerarray=res.data;
|
|
|
+ /* this.pickerarray.forEach((item,index)=>{
|
|
|
+
|
|
|
+ if(this.mrshopId==item.id){
|
|
|
+ this.pickerindex=index;
|
|
|
+
|
|
|
+ }
|
|
|
+ }) */
|
|
|
+ //console.log(this.pickerarray[this.pickerindex])
|
|
|
+ })
|
|
|
+ },
|
|
|
changeType() {
|
|
|
this.showSift = !this.showSift
|
|
|
// console.log('showSift==', this.showSift);
|
|
@@ -136,7 +194,8 @@
|
|
|
name: this.searchValue,
|
|
|
writeoffState: this.selectTab ? this.selectTab : '',
|
|
|
page: this.page,
|
|
|
- limit: 10,
|
|
|
+ limit: 99,
|
|
|
+ shopId:this.shopId
|
|
|
}, 'GET').then(res => {
|
|
|
uni.hideLoading();
|
|
|
// var list = res.data.Items
|
|
@@ -189,6 +248,18 @@
|
|
|
</script>
|
|
|
|
|
|
<style>
|
|
|
+ .sxBox{
|
|
|
+ display: flex;
|
|
|
+ justify-content: space-between;
|
|
|
+ background: #FFFFFF;
|
|
|
+ }
|
|
|
+ .shopnamesx{
|
|
|
+ height: 40rpx;
|
|
|
+ font-size: 28rpx;
|
|
|
+ font-weight: 400;
|
|
|
+ color: #666666;
|
|
|
+ line-height: 40rpx;
|
|
|
+ }
|
|
|
.box {
|
|
|
min-height: 100vh;
|
|
|
background-color: #F4F5F7;
|
|
@@ -336,7 +407,7 @@
|
|
|
}
|
|
|
|
|
|
.timeBox {
|
|
|
- height: 33rpx;
|
|
|
+ /* height: 33rpx; */
|
|
|
font-size: 24rpx;
|
|
|
font-weight: 400;
|
|
|
color: #3C3C3C;
|