['核销记录样式改版，新增老板端筛选记录，优惠券首页新增返回按钮']

pages.json

@@ -479,7 +479,7 @@
 			"style": {
 				"navigationBarTitleText": "扫码验证",
 				"navigationBarTextStyle": "white",
-				"navigationBarBackgroundColor": "#039bfe"
+				"navigationBarBackgroundColor": "#076cff"
 			}
 		}, {
 			"path": "pages/verification/history",
@@ -487,7 +487,7 @@
 			"style": {
 				"navigationBarTitleText": "核销记录",
 				"navigationBarTextStyle": "white",
-				"navigationBarBackgroundColor": "#f40c50"
+				"navigationBarBackgroundColor": "#076cff"
 			}
 		}, {
 			"path": "pages/shop/lists",

pages/coupons/couponList.vue

@@ -4,7 +4,7 @@
 		<view style="position: relative;z-index: 3;">
 			<!-- 搜索... -->
 			<view class="mine-top-contant">
-				<u-navbar :is-back="false" :background="background" title="企业优惠券中心" title-color="#fff"
+				<u-navbar back-icon-color='#fff' :background="background" title="企业优惠券中心" title-color="#fff"
 					:border-bottom='false'>
 				</u-navbar>
 				<!--banner-->

pages/property/coupon/index.vue

@@ -4,7 +4,7 @@
 		<view style="position: relative;z-index: 3;">
 			<!-- 搜索... -->
 			<view class="mine-top-contant">
-				<u-navbar :is-back="false" :background="background" title="企业优惠券中心" title-color="#fff"
+				<u-navbar :background="background" title="企业优惠券中心" title-color="#fff"
 					:border-bottom='false'>
 				</u-navbar>
 				<!--banner-->

pages/verification/history.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="Record" v-if="loaded">
 		<view class="record-top">
-			<image src="/static/images/record_bg.png" mode="widthFix" class="record-bg" />
+			<image src="/static/images/ver-bg.png" mode="widthFix" class="record-bg" />
 			<view class="record-top-nav">
 				<view :class="['record-top-item',type==='year'?'selectTopItem':'']" @click="selectType('year')">按年
 				</view>
@@ -31,6 +31,18 @@
 			</view>
 		</view>
 
+		<view class="boss" v-if="isBos">
+			<view class="boss-left">
+				<image src="/static/images/boss.png" mode="mode" class="boss-img">我是BOSS
+			</view>
+			<view class="boss-right" @click="shopShow = true">
+				<u-select v-model="shopShow" :list="ShopList" @confirm="shopConfirm" value-name='store_id'
+					label-name='name' />
+				门店：<u-icon name="arrow-down" color="#606266" label-color='#606266' margin-right='10' label-pos='left'
+					:label='store_id?store_name:"全部门店"' size="28" />
+			</view>
+		</view>
+
 		<!-- 列表。。。 -->
 		<view class="lists" v-if="lists.length>0">
 			<view class="list-item" v-for="(item,index) in lists" :key='index'>
@@ -55,9 +67,11 @@
 					</view>
 				</view>
 				<view class="list-item-content" v-else>
-					<image class="good-img" v-if='item.source.type ==="goods"' :src="item.source.cover" mode="aspectFill" />
+					<image class="good-img" v-if='item.source.type ==="goods"' :src="item.source.cover"
+						mode="aspectFill" />
 					<view class="list-item-right">
-						<view class="content-item" v-if='item.source.type ==="goods"'>兑换商品名称：{{item.source.name}} </view>
+						<view class="content-item" v-if='item.source.type ==="goods"'>兑换商品名称：{{item.source.name}}
+						</view>
 						<view class="content-item"> 优惠券规格：满 {{item.coupon.full}} 减 {{item.coupon.price}} </view>
 						<view class="content-item">优惠券类型：{{item.coupon.type.text}}</view>
 						<view class="content-item">核销时间：{{item.used_at}}</view>
@@ -74,7 +88,7 @@
 		</view>
 		<!-- 无列表 -->
 		<no-list v-if="lists.length === 0 && scantype === 'goods'" name='no-in' txt="没有任何权证核销记录" />
-		<no-list v-if="lists.length === 0 && scantype === 'coupons'" name='no-out' txt="没有任何优惠券记录" />
+		<no-list v-if="lists.length === 0 && scantype === 'coupons'" name='no-out' txt="没有任何优惠券核销记录" />
 
 		<!-- <u-toast ref="uToast" /> -->
 		<u-toast ref="uToast" />
@@ -104,7 +118,12 @@
 				currentMonth: new Date().toISOString().slice(0, 7),
 				currentYear: new Date().toISOString().slice(0, 4),
 				account: '',
-				loaded:false
+				loaded: false,
+				shopShow: false,
+				ShopList: [],
+				store_name: '',
+				store_id: '',
+				isBos:false
 			}
 		},
 		onLoad() {
@@ -130,7 +149,7 @@
 					page: this.page,
 					date_type: this.type,
 					date: this.date,
-					type: 'my'
+					store_id:this.store_id
 				}
 				let apiUrl = ''
 				if (this.scantype === 'goods') {
@@ -145,6 +164,8 @@
 					this.lists = this.lists.concat(res.lists.data)
 					this.has_more = res.lists.page.has_more
 					this.loaded = true
+					this.ShopList = [{name:'全部',store_id:''},...res.stores]
+					this.isBos = res.isBos
 				}).catch(err => {
 					this.$refs.uToast.show({
 						title: err.message,
@@ -157,6 +178,7 @@
 			selectCoinType(type) {
 				if (this.scantype !== type) {
 					this.scantype = type
+					this.store_id = ''
 					this.reset()
 				}
 			},
@@ -180,6 +202,7 @@
 								day: false
 							}
 							this.date = this.currentYear
+							this.store_id = ''
 							this.reset()
 							break;
 						case 'month':
@@ -190,6 +213,7 @@
 								day: false
 							}
 							this.date = this.currentMonth
+							this.store_id = ''
 							this.reset()
 							break;
 						case 'day':
@@ -200,12 +224,13 @@
 								day: false
 							}
 							this.date = this.currentDay
+							this.store_id = ''
 							this.reset()
 							break;
 					}
 				}
 			},
-			// 点击确认按钮
+			// 点击确认按钮年月日
 			confirm(e) {
 				let type = this.type
 				switch (type) {
@@ -222,6 +247,12 @@
 						this.reset()
 						break;
 				}
+			},
+			// 筛选门店信息
+			shopConfirm(e) {
+				this.store_id = e[0].value
+				this.store_name = e[0].label
+				this.reset()
 			}
 		}
 	}
@@ -238,7 +269,7 @@
 	.record-top {
 		width: calc(100% - 60rpx);
 		height: 360rpx;
-		background-image: linear-gradient(to left, #f40c50, #f40c50);
+		background-image: linear-gradient(to left, #076cff, #076cff);
 		box-shadow: 0 10rpx 20rpx 0rpx rgba($color: $main-color, $alpha: 0.4);
 		margin: 0 30rpx;
 		border-radius: 20rpx;
@@ -337,10 +368,46 @@
 		}
 	}
 
+	.boss {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+		box-sizing: border-box;
+		padding: 30rpx;
+		background-color: #fff;
+
+		.boss-left {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			justify-content: center;
+			box-sizing: border-box;
+			font-size: 32rpx;
+			font-weight: bold;
+		}
+
+		.boss-right {
+			font-size: 28rpx;
+
+			u-icon {
+				padding-left: 20rpx;
+			}
+		}
+
+		.boss-img {
+			width: 90rpx;
+			height: 90rpx;
+			border-radius: 50%;
+			margin-right: 20rpx;
+		}
+	}
+
 	// 列表
 	.lists {
-		box-shadow: 0 10rpx 20rpx 0rpx rgba($color: #000, $alpha: 0.4);
+		// box-shadow: 0 10rpx 20rpx 0rpx rgba($color: #000, $alpha: 0.4);
 		padding: 20rpx;
+
 		.list-item {
 			background-color: #fff;
 			width: 100%;
@@ -357,6 +424,7 @@
 				justify-content: space-between;
 				box-sizing: border-box;
 				padding: 20rpx 0;
+
 				.left {
 					flex: 1;
 					display: flex;
@@ -364,6 +432,7 @@
 					align-items: center;
 					justify-content: flex-start;
 					box-sizing: border-box;
+
 					.title {
 						width: 520rpx;
 						overflow: hidden;
@@ -372,14 +441,16 @@
 						text-overflow: ellipsis;
 						white-space: nowrap;
 					}
+
 					.tags {
 						padding: 4rpx 10rpx;
 						border-radius: 20rpx 0 20rpx 0;
-						background-color: #f40c50;
+						background-color: #076cff;
 						font-size: 26rpx;
 						color: #fff;
 					}
 				}
+
 				// .right{
 				// 	padding: 20rpx 30rpx;
 				// }
@@ -396,14 +467,17 @@
 				justify-content: flex-start;
 				box-sizing: border-box;
 				border-bottom: solid 1rpx #f7f7f7;
+
 				.good-img {
 					margin-right: 20rpx;
 					width: 160rpx;
 					height: 160rpx;
 					border-radius: 10rpx;
 				}
+
 				.list-item-right {
 					flex: 1;
+
 					.content-item {
 						padding: 10rpx 0;
 					}
@@ -419,14 +493,16 @@
 				font-size: 30rpx;
 				padding: 20rpx 0 0 0;
 				font-weight: bold;
+
 				.avatar {
 					width: 70rpx;
 					height: 70rpx;
 					border-radius: 50%;
 					margin-right: 10rpx;
 				}
+
 				.shop-name {
-					background-color: #f40c50;
+					background-color: #076cff;
 					color: #fff;
 					font-size: 24rpx;
 					font-weight: 400;