Merge branch 'gh' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test

pageCoupon/index.vue

@@ -1,4 +1,5 @@
 <template>
+	<view class="container">
 		<!-- 顶部菜单 -->
 			<view class="tagClass">
 				<view class="tag-item" @tap="tagClick(item)" :class="{active:item.type===pageData.query.type}"
@@ -7,7 +8,7 @@
 				</view>
 			</view>
 			<!-- 搜搜 -->
-<!-- 	<view class="search">
+		<!-- 	<view class="search">
 				<up-input
 					    placeholder="搜索优惠券名称"
 					    prefixIcon="search"
@@ -32,13 +33,14 @@
 					<view class="couponContentListcontent">
 						<view>
 							<view> 使用门槛 </view>
-					<view> 满 {{ item.fullAmount }} 元减 {{ item.discountAmount }} 元 </view>
+							<view v-if="item.type == 1"> 满 {{ item.fullAmount }} 元减 {{ item.discountAmount }} 元 </view>
+							<view v-if="item.type == 2"> 满 {{ item.fullAmount }} 元可用 </view>
 						</view>
 						<view>
 							<view> 领取方式 </view>
 							<view> 用户不可自行领取 </view>
 						</view>
-				<view>
+						<view v-if="item.type == 1">
 							<view> 有效期 </view>
 							<view> 领券后{{ item.validDays }}天过期 </view>
 						</view>
@@ -79,6 +81,7 @@
 			<view class="bottomPop">
 				<button @click="addCoupon">+添加{{pageData.status.tagName}}</button>
 			</view>
+	</view>
 </template>
 
 <script setup>
@@ -182,6 +185,9 @@
 	body{
 		background-color: #f9f9f9;
 	}
+	.container{
+		position: relative;
+	}
 	.tagClass {
 		width: 100%;
 		white-space: nowrap;
@@ -190,6 +196,9 @@
 		padding-top: 44rpx;
 		padding: 32rpx 28rpx;
 		background-color: #fff;
+		position: fixed;
+		top: 79rpx;
+		z-index: 999;
 		.tag-item {
 			display: inline-block;
 			padding: 10rpx 24rpx;
@@ -244,7 +253,7 @@
 		/* height: 544rpx; */
 		margin: 32rpx auto 0;
 		margin-bottom: 32rpx;
-		padding: 0 28rpx 182rpx 28rpx;
+		padding: 122rpx 28rpx 182rpx 28rpx;
 	}
 	.couponContent {
 		/* background-color: #f9f9f9; */