Merge branch 'master' of http://8.140.253.224:3000/root/school_uni

package1/myCenter/couponList.vue

@@ -0,0 +1,124 @@
+<template>
+	<!-- 优惠券列表 -->
+	<view class="page1">
+		<view class="title">
+			<view class="title-sreach">
+				<view class="back-btn" @tap="back" :style="{'padding-top': menuButtonInfo.top +'px'}">
+					<uni-icons type="left" size="28"></uni-icons>
+				</view>
+				<view class="title-name" :style="{'padding-top': menuButtonInfo.top +'px'}">
+					优惠券
+				</view>
+			</view>
+		</view>
+		<view class="content">
+			<view class="box1">
+				<view class="">
+					可用于：老王的店
+				</view>
+				<view class="">
+					满10减1
+				</view>
+			</view>
+			<view class="box1">
+				<view class="">
+					可用于：老王的店
+				</view>
+				<view class="">
+					无门槛券（3元）
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				menuButtonInfo: {}
+			}
+		},
+		onReachBottom() {
+			if (this.searchForm.pageNumber >= this.totalPages) return;
+			// this.status = 'loading';
+			this.searchForm.pageNumber++;
+			this.getShopList();
+	
+		},
+		onLoad(option) {
+	
+		},
+		onShow() {
+			this.menuButtonInfo = uni.getMenuButtonBoundingClientRect()
+		},
+		methods: {
+			back() {
+				uni.navigateBack()
+			}
+		}
+	
+	}
+</script>
+
+<style>
+	page {
+		width: 100%;
+		min-height: 100%;
+		font-size: 24rpx;
+		background: #F5F8F5;
+		color: #00231C;
+	}
+	
+	.page1 {
+		width: 100%;
+		min-height: 100vh;
+		font-size: 24rpx;
+		position: relative;
+		display: flex;
+		flex-direction: column;
+	}
+	
+	.title {
+		flex-shrink: 0;
+		background: url('https://jewel-shop.oss-cn-beijing.aliyuncs.com/8bc15960c2dc40268e295d6dd23aecce.png') no-repeat;
+		background-size: 100%;
+		width: 100%;
+		height: 400rpx;
+		padding-bottom: 20rpx;
+	}
+	
+	.title-sreach{
+		width: 100%;
+		display: flex;
+		height: 200rpx;
+		position: relative;
+	}
+	
+	.back-btn{
+		position: absolute;
+	}
+	.title-name{
+		padding-top: 55px;
+		font-size: 36rpx;
+		font-weight: 700;
+		flex: 1;
+		text-align: center;
+	}
+	.content {
+		flex: 1;
+		width: 95%;
+		overflow-y: auto;
+		-webkit-overflow-scrolling: touch;
+		    position: absolute;
+		    top: 200rpx;
+		    left: 2.5%;
+	}
+	.box1 {
+		width: 100%;
+		margin: 0 auto 20rpx;
+		background: #fff;
+		border-radius: 20rpx;
+		padding: 20rpx;
+	}
+</style>

pages.json

@@ -118,6 +118,12 @@
 				"navigationBarTitleText": "代取快递/跑腿",
 				"navigationStyle": "custom"
 			}
+		},{
+			"path": "myCenter/couponList",
+			"style": {
+				"navigationBarTitleText": "优惠券列表",
+				"navigationStyle": "custom"
+			}
 		},{
 			"path": "myCenter/addressList",
 			"style": {

pages/index/index.vue

@@ -445,6 +445,9 @@
 		data() {
 			return {
 				pages:[{
+					name:'优惠券列表111',
+					url:'/package1/myCenter/couponList'
+				},{
 					name:'订单列表111',
 					url:'/package1/order/orderList'
 				},{