From 8c3de544c2398f309aa4e895d2c3d2789287feee Mon Sep 17 00:00:00 2001
From: guoxing <1369478551@qq.com>
Date: Tue, 9 Jan 2024 00:03:02 +0800
Subject: [PATCH] 20231-9

---
 src/views/commodity/commodityAdd.vue  | 26 +++++++++++++-------------
 src/views/marketingCard/appletAdd.vue |  4 ++--
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/views/commodity/commodityAdd.vue b/src/views/commodity/commodityAdd.vue
index 260b63e..79ea5bd 100644
--- a/src/views/commodity/commodityAdd.vue
+++ b/src/views/commodity/commodityAdd.vue
@@ -31,29 +31,29 @@
 						oninput="value=value.replace(/[^0-9]/g,'')" />
 				</div>
 				<div class="item">
-					<span class="item_text">单价：</span>
+					<span class="item_text">价格 (元/斤)：</span>
 					<el-input v-model="formobj.price" placeholder="" class="item_input" clearable
 						oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
 				</div>
-				<div class="item">
+				<!-- <div class="item">
 					<span class="item_text">标准单位：</span>
-					<el-input v-model="formobj.unitName" placeholder="例如：份" class="item_input" clearable />
-				</div>
+					<el-input  v-model="formobj.unitName" placeholder="例如：份" :readonly="true" class="item_input" clearable />
+				</div> -->
 				<div class="item">
-					<span class="item_text">规格单位：</span>
-					<el-input v-model="formobj.specificationUnit" placeholder="例如：斤/瓶/袋/箱/盒" class="item_input" clearable />
+					<span class="item_text">商品单位：</span>
+					<el-input type="hidden" v-model="formobj.specificationUnit" placeholder="例如：斤/瓶/袋/箱/盒" class="item_input" clearable />
 				</div>
 				<div class="item">
-					<span class="item_text">每份数量：</span>
-					<el-input v-model="formobj.weight" placeholder="每份的重量,例如：30" class="item_input" clearable oninput="value=value.replace(/[^0-9]/g,'')" />
+					<span class="item_text">规格 (斤/份)：</span>
+					<el-input v-model="formobj.weight" placeholder="例如：30" class="item_input" clearable oninput="value=value.replace(/[^0-9]/g,'')" />
 				</div>
 				<div class="item">
-					<span class="item_text">标准规格：</span>
+					<span class="item_text">规格描述：</span>
 					<el-input v-model="formobj.remarks" placeholder="例如：一份30斤" class="item_input" clearable />
 				</div>
 				<div class="item">
-					<span class="item_text">商品介绍：</span>
-					<el-input v-model="formobj.content" placeholder="商品介绍" class="item_input" clearable />
+					<span class="item_text">商品简介：</span>
+					<el-input v-model="formobj.content" placeholder="商品简介" class="item_input" clearable />
 				</div>
 
 				<div class="item" style="margin-bottom: 100px;margin-top: 100px;">
@@ -98,7 +98,7 @@
 					code: '',
 					barcode: '',
 					price: "",
-					unitName: "",
+					unitName: "份",
 					specificationUnit:"",
 					weight:"",
 					remarks: "",
@@ -150,7 +150,7 @@
 					code: '',
 					barcode: '',
 					price: "",
-					unitName: "",
+						unitName: "份",
 					specificationUnit:"",
 					weight:"",
 					remarks: "",
diff --git a/src/views/marketingCard/appletAdd.vue b/src/views/marketingCard/appletAdd.vue
index 2eeb05b..ae0d8e8 100644
--- a/src/views/marketingCard/appletAdd.vue
+++ b/src/views/marketingCard/appletAdd.vue
@@ -168,14 +168,14 @@
 					</td>
 				</tr>
 				<tr>
-					<td>商品数量</td>
+					<td>份数</td>
 					<td>
 						<el-input v-model="GiftBagGood.goodsNumber" style="width:100%"
 							oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" @input="input"></el-input>
 					</td>
 				</tr>
 				<tr>
-					<td>商品价格</td>
+					<td>单价</td>
 					<td>
 						<!-- <span style="width:100%">{{GiftBagGood.price}}</span> -->
 						<el-input v-model="GiftBagGood.price" style="width:100%"