From 8229afcc8ee04ebd60b897a0a5997f1925a6d38b Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Sun, 29 Sep 2024 16:13:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E7=AE=A1=E7=90=86=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pageProduct/add-Product/add-Product.vue        |  3 ++-
 .../add-Product/components/choose-danwei.vue   |  6 +++---
 .../add-Product/components/choose-haocai.vue   |  6 +++---
 pageProduct/index/components/goods.vue         |  9 +++++----
 pageProduct/index/index.vue                    | 18 +++++++++++++-----
 .../specification-template.vue                 |  4 ++--
 6 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/pageProduct/add-Product/add-Product.vue b/pageProduct/add-Product/add-Product.vue
index b86622e..5c44874 100644
--- a/pageProduct/add-Product/add-Product.vue
+++ b/pageProduct/add-Product/add-Product.vue
@@ -1,9 +1,10 @@
 <template>
-	<view class="u-p-30 safe-page">
+	<view class="u-p-30 safe-page min-page">
 		<up-sticky v-if="option.type==='edit'" offset-top="20" zIndex="99">
 			<myTabs :list="tabsList" v-model="tabsCurrent"></myTabs>
 		</up-sticky>
 		<view class="box">
+				
 			<template v-if="tabsCurrent===0">
 				<view class="basic">
 					<uni-forms :model="FormData" :rules="rules" :border="true" label-position="top"
diff --git a/pageProduct/add-Product/components/choose-danwei.vue b/pageProduct/add-Product/components/choose-danwei.vue
index 4daf729..7fdf82a 100644
--- a/pageProduct/add-Product/components/choose-danwei.vue
+++ b/pageProduct/add-Product/components/choose-danwei.vue
@@ -109,9 +109,9 @@
 	}
 	function blur() {
 		console.log('blur');
-		setTimeout(()=>{
-			popShow.value = false
-		},100)
+		// setTimeout(()=>{
+		// 	popShow.value = false
+		// },100)
 	}
 	onMounted(() => {
 		setText()
diff --git a/pageProduct/add-Product/components/choose-haocai.vue b/pageProduct/add-Product/components/choose-haocai.vue
index df10e21..f4dc2d6 100644
--- a/pageProduct/add-Product/components/choose-haocai.vue
+++ b/pageProduct/add-Product/components/choose-haocai.vue
@@ -99,9 +99,9 @@
 	}
 
 	function blur() {
-		setTimeout(()=>{
-			popShow.value = false
-		},100)
+		// setTimeout(()=>{
+		// 	popShow.value = false
+		// },100)
 	}
 	onMounted(() => {
 		setText()
diff --git a/pageProduct/index/components/goods.vue b/pageProduct/index/components/goods.vue
index 3ff669c..5952ee7 100644
--- a/pageProduct/index/components/goods.vue
+++ b/pageProduct/index/components/goods.vue
@@ -47,7 +47,7 @@
 				<view class="u-m-t-24">
 					<template v-if="data.skuList.length>=2">
 						<view class="u-flex u-flex-wrap w-full gap-10  u-col-top">
-							<view class="u-font-24 info-p-l u-m-t-14">规格：</view>
+							<view class="u-font-24 info-p-l u-m-t-6">规格：</view>
 							<view class="skd" v-for="(item,index) in data.skuList" :key="index"
 								@click="guigeClick(index)">
 								<text>{{item.specSnap||item.name}}</text>
@@ -325,7 +325,7 @@
 	}
 
 	.skd {
-		padding: 20rpx 20rpx 14rpx 20rpx;
+		padding: 10rpx 38rpx 8rpx 40rpx;
 		background: #F0F2F5;
 		border-radius: 4rpx;
 		position: relative;
@@ -339,9 +339,10 @@
 			right: 0;
 			top: 0;
 			font-size: 12rpx;
+			height: 18rpx;
+			line-height: 18rpx;
 			right: 0;
-			padding: 2rpx 4rpx;
-			border-radius: 0rpx 4rpx 4rpx 4rpx;
+			border-radius: 0rpx 2rpx 2rpx 8rpx;
 		}
 
 		.tag-primary {
diff --git a/pageProduct/index/index.vue b/pageProduct/index/index.vue
index 808a84e..4534a9d 100644
--- a/pageProduct/index/index.vue
+++ b/pageProduct/index/index.vue
@@ -50,8 +50,11 @@
 			<template v-if="pageData.hasAjax&&!pageData.goodsList.length">
 				<my-img-empty tips="未找到相关商品"></my-img-empty>
 			</template>
-			<my-pagination :totalElements="pageData.totalElements" :size="pageData.query.size"
-				@change="pageChange"></my-pagination>
+			<template v-if="pageData.goodsList.length">
+				<my-pagination :totalElements="pageData.totalElements" :size="pageData.query.size"
+					@change="pageChange"></my-pagination>
+			</template>
+			
 			<view style="height: 100rpx;"></view>
 		</view>
 
@@ -476,11 +479,15 @@
 			}
 		});
 	}
-
+	
+	function resetQuery(){
+		pageData.totalElements=0;
+		pageData.query.page=0;
+	}
 
 	function statesTableClick(index) {
-		
-		pageData.stateCurrent = index
+		pageData.stateCurrent = index;
+		resetQuery()
 		console.log(index);
 		if(index==0){
 			pageData.query.isPauseSale=''
@@ -540,6 +547,7 @@
 
 	function searchFunc() {
 		console.log('searchFunc');
+		resetQuery()
 		getGoodsList()
 	}
 
diff --git a/pageProduct/specification-template/specification-template.vue b/pageProduct/specification-template/specification-template.vue
index 9bb460b..6de52a4 100644
--- a/pageProduct/specification-template/specification-template.vue
+++ b/pageProduct/specification-template/specification-template.vue
@@ -9,7 +9,7 @@
 		</view>
 
 		<my-model :showBtn="modelData.showBtn" ref="model" @confirm="modelConfirm" :title="modelData.title" :desc="modelData.desc">
-			<template #desc>
+			<template #desc> 
 				<view class="u-p-30 u-m-t-40 u-p-b-60" v-if="specificationsData">
 					<view class="u-flex u-row-between">
 						<view>当前状态</view>
@@ -135,7 +135,7 @@
 		specificationsData.sellOut=false
 		specificationsData.index=arr[0]
 		specificationsData.optionIndex=arr[1]
-		modelOpen()
+		// modelOpen()
 	}
 	function pageChange(page) {
 		pageData.query.page=page-1