礼品卡兑换记录

gasStation-uni/pages.json

@@ -49,6 +49,7 @@
 						"navigationStyle": "custom"
 					}
 				},
+
 				{
 					"path": "Address/Address",
 					"style": {
@@ -156,16 +157,18 @@
 					}
 				},
 				{
-					"path": "integral/integral",
+					"path": "Coupons/Coupons",
 					"style": {
-						"navigationBarTitleText": "我的积分",
+						"navigationBarTitleText": "设置",
 						"navigationStyle": "custom"
 					}
 				},
+
+
 				{
-					"path": "Coupons/Coupons",
+					"path": "integral/integral",
 					"style": {
-						"navigationBarTitleText": "我的券",
+						"navigationBarTitleText": "我的积分",
 						"navigationStyle": "custom"
 					}
 				},

gasStation-uni/pages/my/my.vue

@@ -32,7 +32,7 @@
 					</view>
 
 					<text style="color: #999999;">|</text>
-					<view class="jg-box">
+					<view class="jg-box" @click="toCoupons">
 						<view class="jg-box-title">卡券</view>
 						<view class="jg-box-nmb">0</view>
 					</view>
@@ -246,6 +246,11 @@
 				uni.navigateTo({
 					url: '/pagesMy/feedback/feedback'
 				})
+			},
+			toCoupons() {
+				uni.navigateTo({
+					url: '/pagesMy/Coupons/Coupons'
+				})
 			}
 		}
 	}

gasStation-uni/pagesHome/RechargeRecords/RechargeRecords.vue

@@ -17,11 +17,11 @@
 
 					<view class="but-box">
 						<view class="huis">兑换卡号</view>
-						<view class="">￥{{item.number || "暂无"}}</view>
+						<view class="">{{item.number || "暂无"}}</view>
 					</view>
 					<view class="but-box">
 						<view class="huis">兑换金额</view>
-						<view class="reds">{{item.cardAmount || "暂无"}}元</view>
+						<view class="reds">￥{{item.cardAmount || "暂无"}}元</view>
 					</view>
 					<view class="but-box">
 						<view class="huis">订单时间</view>
@@ -111,6 +111,17 @@
 					}
 				})
 			},
+      /*getGiftRecords() {
+        request({
+          url: '/business/marketingActivity/cardGift/selectAllRecords',
+          method: 'get',
+        }).then(res => {
+          console.log(res)
+          if (res.code == 200) {
+            this.list = res.data.records
+          }
+        })
+      },*/
 
 		}
 	}

gasStation-uni/pagesMy/Coupons/Coupons.vue

@@ -57,9 +57,7 @@
 				list1: [{
 					name: '全部',
 				}, {
-					name: '抵用券',
+					name: '优惠券',
-				}, {
-					name: '折扣券'
 				}, {
 					name: '兑换券'
 				}, {