From 48171fb19a0cf81cb89d8f4eeb431f1e722718c9 Mon Sep 17 00:00:00 2001
From: tianyi <13521030702@163.com>
Date: Fri, 21 Aug 2026 09:15:01 +0800
Subject: [PATCH] 1

---
 pages/shop/addGoods.vue  | 43 +++++++++++++++-------------
 pages/shop/goodsList.vue | 60 ++++++++++++++++++++++++++++++++--------
 2 files changed, 72 insertions(+), 31 deletions(-)

diff --git a/pages/shop/addGoods.vue b/pages/shop/addGoods.vue
index 9e4cbe5..3827682 100644
--- a/pages/shop/addGoods.vue
+++ b/pages/shop/addGoods.vue
@@ -23,7 +23,7 @@
 					</view>
 					<view style="overflow-x: scroll;display: flex;width: 350rpx;">
 						<view v-if="formData.productPicture !=''" style="width: 160rpx;height: 160rpx;margin-left: 20rpx;">
-							<image :src="formData.productPicture" alt="" class="upload-img">
+							<img :src="formData.productPicture" alt="" class="upload-img">
 						</view>
 					</view>
 				</uni-forms-item>
@@ -31,8 +31,9 @@
 					<input type="digit" class="content-input" v-model="formData.orderFiled" placeholder="请输入排名">
 				</uni-forms-item>
 				<uni-forms-item label="商品分类" name="editTitle">
-					<view @click="goGategoryLow" style="height:70rpx;border: 4rpx solid #eee;display: flex;flex: 1;border-radius: 10rpx;">
-						<text class="content-input" style="height:70rpx;border: 0;">{{typeItem.categoryName}}</text>
+					<view style="border: 4rpx solid #eee;display: flex;flex: 1;border-radius: 10rpx;">
+						<input type="text" placeholder="请选择商品分类" disabled v-model="typeItem.categoryName"
+							class="content-input" @tap="goGategoryLow" style="border: 0;">
 						<uni-icons type="right" size="16"
 							style="margin-left: 40rpx;line-height: 70rpx;"></uni-icons>
 					</view>
@@ -55,7 +56,9 @@
 						<view v-for="(item,index) in formData.productGroupBuyPrices" :key="index" style="display: flex;margin-top:10rpx;">
 							<input type="number" min="2" class="content-input" v-model="item.groupCount" style="padding-right: 20rpx;margin-right: 20rpx;width: 100px;" placeholder="成团人数" />
 							<input type="digit" class="content-input" v-model="item.groupPrice" style="padding-right: 20rpx;width: 100px;" placeholder="拼团价格"/>
-							<view @click="delGroup(index)" v-if="formData.productGroupBuyPrices.length>1" style="width: 240rpx;height: 60rpx;line-height: 60rpx;color: red;border:none;background: #fff;">删除</view>
+							<view class="group-delete-btn" @tap.stop="delGroup(index)">
+								<uni-icons type="trash" size="20" color="#ff4d4f"></uni-icons>
+							</view>
 						</view>
 						<view @click="addGroup()" style="margin-top: 10rpx;width: 160rpx;height: 60rpx;text-align: center;line-height: 60rpx;background: rgba(0, 35, 28, 1);border-radius: 60rpx;color: rgba(166, 255, 234, 1);">
 							新增拼团
@@ -116,6 +119,7 @@
 				<uni-forms-item label="详细图文" name="startPayNum">
 					<view class="xiangxi-box">
 						<sp-editor
+							:keys="keys" 
 							@init="initEditor" 
 							@input="inputOver" 
 							@upinImage="upinImage" 
@@ -237,7 +241,6 @@
 		onShow() {
 			this.attrId = uni.getStorageSync('attrId');
 			this.shopMerchantType = uni.getStorageSync('shopMerchantType');
-			
 			if (this.hasSelectedTypeItem(this.typeItem)) {
 				this.typeItem = JSON.parse(JSON.stringify(this.typeItem))
 				this.formData.categoryId = this.typeItem.id
@@ -385,7 +388,10 @@
 						this.productCategoryList = Array.isArray(res.result) ? res.result : []
 						this.syncSelectedCategory()
 					} else {
-						this.tui.toast(res.message)
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
 					}
 				})
 			},
@@ -427,7 +433,6 @@
 			submit() {
 				let that = this;
 				this.syncLunchBoxByMoreBuy()
-				this.normalizeGroupBuyPrices()
 				if (!this.validateProductSpecs()) {
 					return
 				}
@@ -549,17 +554,6 @@
 				}
 				return true
 			},
-			normalizeGroupBuyPrices() {
-				if (!Array.isArray(this.formData.productGroupBuyPrices)) {
-					this.formData.productGroupBuyPrices = []
-					return
-				}
-				this.formData.productGroupBuyPrices = this.formData.productGroupBuyPrices.filter((item) => {
-					const groupCount = item && item.groupCount !== undefined && item.groupCount !== null ? String(item.groupCount).trim() : ''
-					const groupPrice = item && item.groupPrice !== undefined && item.groupPrice !== null ? String(item.groupPrice).trim() : ''
-					return groupCount !== '' || groupPrice !== ''
-				})
-			},
 			isValidPrice(value) {
 				return /^\d+(\.\d{1,2})?$/.test(value) && Number(value) > 0
 			},
@@ -852,7 +846,7 @@
 				let that = this
 				this.NB.sendRequest("/app/productAttributeValue/selectByAttributeId", {
 					id: id,
-				}, false, 'get', 'application/x-www-form-urlencoded').then((res) => {
+				}, false, 'post', 'application/x-www-form-urlencoded').then((res) => {
 					if (res.code == 200) {
 						that.categorySonData = res.result
 						for (var i = 0; i < that.categorySonData.length; i++) {
@@ -1050,6 +1044,17 @@
 		box-sizing: border-box;
 		min-width: 0;
 	}
+	.group-delete-btn {
+		flex: 0 0 70rpx;
+		width: 70rpx;
+		height: 70rpx;
+		margin-left: 20rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		background: #fff;
+		border-radius: 10rpx;
+	}
 	.keyboard-safe-bottom {
 		height: 260rpx;
 	}
diff --git a/pages/shop/goodsList.vue b/pages/shop/goodsList.vue
index 03c0e1c..00a4587 100644
--- a/pages/shop/goodsList.vue
+++ b/pages/shop/goodsList.vue
@@ -262,9 +262,15 @@
 						}else{
 							this.shopList1[index].isPush = value
 						}
-						this.tui.toast('设置成功')
+						uni.showToast({
+							title: '设置成功',
+							icon: 'none'
+						})
 					} else {
-						this.tui.toast(res.message)
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
 					}
 				})
 			},
@@ -280,9 +286,15 @@
 							}, false, 'post', 'application/x-www-form-urlencoded').then((res) => {
 								if (res.code == 200) {
 									that.getShareList()
-									that.tui.toast('删除成功')
+									uni.showToast({
+										title: '删除成功',
+										icon: 'none'
+									})
 								} else {
-									that.tui.toast(res.message)
+									uni.showToast({
+										title: res.message,
+										icon: 'none'
+									})
 								}
 							})
 						}
@@ -300,9 +312,15 @@
 						}else{
 							this.shopList1[index].isMust = value
 						}
-						this.tui.toast('设置成功')
+						uni.showToast({
+							title: '设置成功',
+							icon: 'none'
+						})
 					} else {
-						this.tui.toast(res.message)
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
 					}
 				})
 			},
@@ -317,9 +335,15 @@
 							}else{
 								this.shopList1[index].delFlag = value
 							}
-							this.tui.toast('设置成功')
+							uni.showToast({
+								title: '设置成功',
+								icon: 'none'
+							})
 						} else {
-							this.tui.toast(res.message)
+							uni.showToast({
+								title: res.message,
+								icon: 'none'
+							})
 						}
 					})
 				}else{
@@ -332,9 +356,15 @@
 							}else{
 								this.shopList1[index].delFlag = value
 							}
-							this.tui.toast('设置成功')
+							uni.showToast({
+								title: '设置成功',
+								icon: 'none'
+							})
 						} else {
-							this.tui.toast(res.message)
+							uni.showToast({
+								title: res.message,
+								icon: 'none'
+							})
 						}
 					})
 				}
@@ -406,7 +436,10 @@
 						}
 						this.status = this.pageNum >= this.pages ? 'nomore' : 'loadmore'
 					} else {
-						this.tui.toast(res.message)
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
 					}
 				})
 			},
@@ -460,7 +493,10 @@
 						this.categoryId = this.indexList[0].id
 						this.getShareList();
 					} else {
-						this.tui.toast(res.message)
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
 					}
 				})
 			},