From 672b78150f9fec76517287b9f7f381d4bc3c02c3 Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Fri, 17 Jan 2025 12:15:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/model/info.js                      |  7 ++++
 components/couponList/couponList.vue   |  3 ++
 components/couponPopup/couponPopup.vue | 15 +++++---
 config.js                              |  2 +-
 pages/index/category.vue               | 63 ++++++++++++++++++++++------------
 pages/index/order.vue                  |  9 +++--
 6 files changed, 69 insertions(+), 30 deletions(-)

diff --git a/api/model/info.js b/api/model/info.js
index fdbc62c..a695abd 100644
--- a/api/model/info.js
+++ b/api/model/info.js
@@ -103,6 +103,13 @@ const api = {
 		url: '/info_common/getCartPageList',
 		method: 'GET',
 	},
+	// 领取新人优惠券
+	getRiceCoupon: {
+		url: '/info_common/getRiceCoupon',
+		method: 'GET',
+		limit: 500,
+		auth: true,
+	},
 }
 
 export default api
\ No newline at end of file
diff --git a/components/couponList/couponList.vue b/components/couponList/couponList.vue
index b3bced2..0db611d 100644
--- a/components/couponList/couponList.vue
+++ b/components/couponList/couponList.vue
@@ -83,6 +83,9 @@
 
 			//格式化年月日
 			formatDate(date) {
+				if(!date){
+					return ''
+				}
 				date = new Date(date.replace(/-/g,'/'));
 				// const year = date.getFullYear();
 				const month = String(date.getMonth() + 1).padStart(2, '0'); // 月份从0开始，需要加1，并且确保是两位数
diff --git a/components/couponPopup/couponPopup.vue b/components/couponPopup/couponPopup.vue
index e82a924..1fa604e 100644
--- a/components/couponPopup/couponPopup.vue
+++ b/components/couponPopup/couponPopup.vue
@@ -5,10 +5,11 @@
 		customStyle="background-color: transparent;"
 		:z-index="999999">
 			<view class="couponPopup-wrapper">
-				<view class="main-container">
+				<view class="main-container"
+				@click="toCoupon">
 					<view class="body">
 						<image :src="configList.wx_image" mode="widthFix" class="coupon-bg"></image>
-						<image @click="close" src="@/static/image/coupon/close-btn.png" mode="widthFix"
+						<image @click.stop="close" src="@/static/image/coupon/close-btn.png" mode="widthFix"
 							class="close-btn">
 						</image>
 						<view class="coupon-money">
@@ -20,7 +21,7 @@
 						<image :src="configList.qd_image" mode="widthFix" class="register-success"></image>
 						<view class="shopping">（购物即可抵扣！）</view>
 					</view>
-					<image @click="close" 
+					<image
 					:src="configList.down_image" mode="widthFix" 
 					class="examine"></image>
 				</view>
@@ -48,8 +49,12 @@
 			//跳转优惠券页面
 			toCoupon() {
 				this.$refs.couponPopup.close()
-				uni.navigateTo({
-					url: "/pages_order/mine/coupon"
+				this.$api('getRiceCoupon', res => {
+					if(res.code == 200){
+						uni.navigateTo({
+							url: "/pages_order/mine/coupon"
+						})
+					}
 				})
 			},
 			close(){
diff --git a/config.js b/config.js
index 1660015..8ece511 100644
--- a/config.js
+++ b/config.js
@@ -6,7 +6,7 @@ import uvUI from '@/uni_modules/uv-ui-tools'
 Vue.use(uvUI);
 
 // 当前环境
-const type = 'dev'
+const type = 'prod'
 
 
 // 环境配置
diff --git a/pages/index/category.vue b/pages/index/category.vue
index b724dfd..3a007bd 100644
--- a/pages/index/category.vue
+++ b/pages/index/category.vue
@@ -25,27 +25,41 @@
 		<!-- 分类商品列表 -->
 		<view class="category"
 		v-else>
+			
+			<view class="tabs">
+				<uv-tabs 
+				:list="category" 
+				:activeStyle="{color : '#f00', fontWeight : 600}" 
+				lineColor="#f00"
+				:inactiveStyle="{color: 'rgba(0,0,0,.8)'}" 
+				lineHeight="8rpx" 
+				lineWidth="50rpx" 
+				:current="current"
+				@click="clickTabs"></uv-tabs>
+			</view>
+		
 			<uv-vtabs 
-			:list="category" 
-			:current="current"
+			:list="category[current].children" 
+			:current="currentChildren"
 			keyName="name" 
+			:chain="true"
 			@change="change">
-				<view class="list">
-					<uv-vtabs-item>
-						<view class="category-item"
-						v-for="(item, index) in category[current].children" :key="index">
-							<view class="category-title">
-								{{ item.name }}
-							</view>
-							
-							<productItem :item="pro"
-							v-for="(pro, i) in item.shopList" :key="i"
-							@click="$utils.navigateTo(`/pages_order/product/productDetail?id=${pro.id}`)" />
-						</view>
-					
-						<uv-empty mode="list" v-if="category[current].children.length == 0"></uv-empty>
-					</uv-vtabs-item>
-				</view>
+				<!-- <view class="list"> -->
+					<template v-for="(item, index) in category[current].children">
+							<uv-vtabs-item :index="index" :key="index">
+								<view class="category-item">
+									<view class="category-title">
+										{{ item.name }}
+									</view>
+									
+									<productItem :item="pro"
+									v-for="(pro, i) in item.shopList" :key="i"
+									@click="$utils.navigateTo(`/pages_order/product/productDetail?id=${pro.id}`)" />
+								</view>
+						</uv-vtabs-item>
+					</template>
+					<uv-empty mode="list" v-if="category[current].children.length == 0"></uv-empty>
+				<!-- </view> -->
 			</uv-vtabs>
 		</view>
 
@@ -73,6 +87,7 @@
 			return {
 				mixinsListApi: 'getClassShopPageList',
 				current : 0,
+				currentChildren : 0,
 			}
 		},
 		computed: {
@@ -100,7 +115,11 @@
 		methods: {
 			change(e) {
 				// this.queryParams.classId = this.category[e].id
-				this.current = e
+				this.currentChildren = e
+			},
+			clickTabs({index}){
+				this.current = index
+				this.currentChildren = 0
 			},
 			search(){
 				for(let i = 0;i < 10;i++){
@@ -116,15 +135,15 @@
 <style scoped lang="scss">
 	.page {
 		/deep/ .uv-vtabs {
-			height: calc(100vh - 470rpx) !important;
+			height: calc(100vh - 600rpx) !important;
 		}
 
 		/deep/ .uv-vtabs__bar {
-			height: calc(100vh - 470rpx) !important;
+			height: calc(100vh - 600rpx) !important;
 		}
 
 		/deep/ .uv-vtabs__content {
-			height: calc(100vh - 470rpx) !important;
+			height: calc(100vh - 600rpx) !important;
 		}
 
 		.search {
diff --git a/pages/index/order.vue b/pages/index/order.vue
index 0a10a59..3bcff02 100644
--- a/pages/index/order.vue
+++ b/pages/index/order.vue
@@ -5,8 +5,13 @@
 
 		<!-- 订单筛选 -->
 		<view class="tabs">
-			<uv-tabs :list="tabs" :activeStyle="{color : '#fff', fontWeight : 600}" lineColor="#fff"
-			:inactiveStyle="{color: 'rgba(255,255,255,.8)'}" lineHeight="8rpx" lineWidth="50rpx" :current="current"
+			<uv-tabs :list="tabs" 
+			:activeStyle="{color : '#fff', fontWeight : 600}" 
+			lineColor="#fff"
+			:inactiveStyle="{color: 'rgba(255,255,255,.8)'}" 
+			lineHeight="8rpx" 
+			lineWidth="50rpx" 
+			:current="current"
 			@click="clickTabs"></uv-tabs>
 		</view>