From cdde7de1dff46c120e4c30da9752a9fc379384e8 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Mon, 21 Oct 2024 10:02:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E8=A7=84=E6=A0=BC=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E7=BC=96=E8=BE=91=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pageProduct/add-Product/add-Product.vue       |  1 +
 .../choose-specifications.vue                 | 30 ++++++++++++++-----
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/pageProduct/add-Product/add-Product.vue b/pageProduct/add-Product/add-Product.vue
index 6e85673..7ed6956 100644
--- a/pageProduct/add-Product/add-Product.vue
+++ b/pageProduct/add-Product/add-Product.vue
@@ -1475,6 +1475,7 @@
 		uni.$on('emitspecificationsSave', function(data) {
 			FormData.specificationsGroup = data
 			FormData.specId = data.specId
+			FormData.specsInfoName=data.specsInfoName
 			skuList.list = data.result.map(v => {
 				return {
 					...v.skus,
diff --git a/pageProduct/add-specifications/choose-specifications.vue b/pageProduct/add-specifications/choose-specifications.vue
index 5366d42..cea6292 100644
--- a/pageProduct/add-specifications/choose-specifications.vue
+++ b/pageProduct/add-specifications/choose-specifications.vue
@@ -23,29 +23,29 @@
 								</uni-data-picker>
 							</uni-forms-item>
 						</view> -->
-						<view class=" u-m-t-32">
-							<view class="u-m-t-16" v-for="(item,index) in FormData.selectSpec" :key="index">
+						<view class=" ">
+							<view class="u-m-t-32" v-for="(item,index) in FormData.selectSpec" :key="index">
 								<view class="font-bold">
 									{{item.name}}
 								</view>
-
 								<view class="u-m-t-16">
-									<up-checkbox-group :labelSize="12" :size="14" :activeColor="color.ColorMain"
+									<!-- <up-checkbox-group :labelSize="12" :size="14" :activeColor="color.ColorMain"
 										shape="circle" v-model="item.selectSpecResult" placement="row"
 										@change="createResult">
 										<up-checkbox :customStyle="{marginRight: '60rpx',marginBottom:'16rpx'}"
 											v-for="(item, index) in item.value" :key="index" :label="item.text"
 											:name="item.value">
 										</up-checkbox>
-									</up-checkbox-group>
+									</up-checkbox-group> -->
 
-								<!-- 	<uni-data-checkbox @change="createResult" multiple :selectedColor="color.ColorMain"
+									<uni-data-checkbox @change="createResult" multiple :selectedColor="color.ColorMain"
 										v-model="item.selectSpecResult" :localdata="item.value">
-										</uni-data-checkbox> -->
+										</uni-data-checkbox>
 
 								</view>
 
 							</view>
+							<view class="u-p-b-16"></view>
 						</view>
 					</view>
 
@@ -382,16 +382,27 @@
 
 	function createResult() {
 		let arr = []
+		// for(let i in FormData.selectSpec){
+		// 	const selectSpecResult=FormData.selectSpec[i].selectSpecResult
+		// 	if(selectSpecResult.length>0){
+		// 		arr.push({
+		// 			value: selectSpecResult,
+		// 			name: FormData.selectSpec[i].name
+		// 		})
+		// 	}
+		// }
 		for (let k of FormData.selectSpec) {
 			if (k.selectSpecResult.length) {
-				console.log(k);
+				console.log(k.selectSpecResult.length);
 				arr.push({
 					value: k.selectSpecResult,
 					name: k.name
 				})
 			}
 		}
+		console.log(arr);
 		const spes = combineSpecs(arr)
+		console.log(spes);
 		const result = spes.filter(v => {
 			return !Array.isArray(v)
 		}).map(v => {
@@ -652,6 +663,9 @@
 	.my-switch {
 		transform: scale(0.7);
 	}
+	::v-deep .uni-data-checklist .checklist-group .checklist-box .checkbox__inner{
+		border-radius: 50%;
+	}
 
 	::v-deep .uni-forms-item__error {
 		display: none !important;