From 3419dc148bdace558a97903544512f561270cd0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=93=E5=B9=B3=E8=89=BA?= <52643018@qq.com>
Date: Thu, 9 Sep 2021 18:22:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=85=91=E6=8D=A2=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E9=A1=B5=E9=9D=A2UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                                    |   7 ++
 pages/point/exchangeRecord/exchangeRecord.vue | 103 ++++++++++++++++++
 pages/point/shoppingMall/shoppingMall.vue     |   4 +-
 3 files changed, 112 insertions(+), 2 deletions(-)
 create mode 100644 pages/point/exchangeRecord/exchangeRecord.vue

diff --git a/pages.json b/pages.json
index 9e7fa47..637ce5d 100644
--- a/pages.json
+++ b/pages.json
@@ -945,6 +945,13 @@
 				"navigationBarTitleText": "家居专场",
 				"navigationStyle": "custom"
 			}
+		},
+		{
+			"path" : "pages/point/exchangeRecord/exchangeRecord",
+			"style" : {
+				"navigationBarTitleText": "兑换记录",
+				"navigationStyle": "custom"
+			}
 		}
     ],
 	"globalStyle": {
diff --git a/pages/point/exchangeRecord/exchangeRecord.vue b/pages/point/exchangeRecord/exchangeRecord.vue
new file mode 100644
index 0000000..64662bb
--- /dev/null
+++ b/pages/point/exchangeRecord/exchangeRecord.vue
@@ -0,0 +1,103 @@
+<template>
+	<view>
+		<lf-nav title="兑换记录" :showIcon="true" bgColor="#fff"></lf-nav>
+		<view class="head">
+			<u-search placeholder="搜你想要的" v-model="value" @custom="customClick"></u-search>
+		</view>
+		<view class="content">
+			<view class="card" v-for="(item, index) in 2" :key="index">
+				<view>
+					<text class="lf-iconfont icon-Group- lf-font-30"></text>
+					<text class="shop-name">精品超市</text>
+					<text class="lf-iconfont icon-xiangyou lf-font-24"></text>
+				</view>
+				<view class="lf-flex lf-m-t-20">
+					<image class="goods-img"></image>
+					<view class="info">
+						<view class="lf-font-26 lf-color-333 lf-line-2">爱他美较大婴儿配方奶粉较大配方奶粉较2段 </view>
+						<view class="lf-row-between" style="line-height: 1;">
+							<text class="lf-font-24 lf-color-777">1件；900g</text>
+							<text class="lf-font-32 lf-color-primary lf-font-bold">385</text>
+						</view>
+					</view>
+				</view>
+				<view class="order-num">
+					<text>兑换成功</text>
+					<text style="color: #F63434;">删除订单</text>
+				</view>
+			</view>
+		</view>
+		<u-back-top :scrollTop="pageScrollTop"></u-back-top>
+	</view>
+</template>
+
+<script>
+	export default {
+		data(){
+			return {
+				value: ''
+			}
+		},
+		onLoad(){
+			
+		},
+		methods: {
+			customClick(event){
+				console.log(event)
+			}
+		}
+	}
+</script>
+
+<style>
+	page{
+		background-color: #F8F8F8;
+	}
+</style>
+<style lang="scss" scoped="scoped">
+	.head{
+		padding: 30rpx 32rpx;
+		background-color: #FFFFFF;
+	}
+	.content{
+		padding: 30rpx 32rpx;
+		.card{
+			width: 686rpx;
+			height: 323rpx;
+			background: #FFFFFF;
+			border-radius: 20rpx;
+			padding: 30rpx;
+			box-sizing: border-box;
+			&:nth-child(n+2){
+				margin-top: 20rpx;
+			}
+			.shop-name{
+				font-size: 28rpx;
+				color: #222222;
+				font-weight: bold;
+				margin: 0 15rpx;
+			}
+			.goods-img{
+				width: 130rpx;
+				height: 130rpx;
+				border-radius: 5rpx;
+				margin-right: 15rpx;
+				background-color: #EEEEEE;
+			}
+			.info{
+				width: 480rpx;
+				height: 130rpx;
+				display: flex;
+				flex-direction: column;
+				justify-content: space-between;
+			}
+			.order-num{
+				font-size: 24rpx;
+				color: #555555;
+				display: flex;
+				justify-content: space-between;
+				margin-top: 28rpx;
+			}
+		}
+	}
+</style>
diff --git a/pages/point/shoppingMall/shoppingMall.vue b/pages/point/shoppingMall/shoppingMall.vue
index 8cd0333..cbf3a4a 100644
--- a/pages/point/shoppingMall/shoppingMall.vue
+++ b/pages/point/shoppingMall/shoppingMall.vue
@@ -14,11 +14,11 @@
 				<view class="lf-font-24">当前积分</view>
 			</view>
 			<view class="lf-flex">
-				<view class="item">
+				<view class="item" @click="$url('/pages/point/exchangeRecord/exchangeRecord')">
 					<text class="lf-iconfont icon-- lf-font-50"></text>
 					<text>兑换记录</text>
 				</view>
-				<view class="item">
+				<view class="item" @click="$url('/pages/store/cart/cart')">
 					<text class="lf-iconfont icon-- lf-font-50"></text>
 					<text>购物车</text>
 					<view class="angle-mark">99+</view>