From fd16796aa3131e5b94498f5a55c166ecb2544f90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=AF=85?= <1335909236@qq.com>
Date: Wed, 24 Dec 2025 14:55:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E8=AF=A6=E6=83=85=E9=A1=B5=E5=8F=AF=E5=BE=97?=
 =?UTF-8?q?=E7=A7=AF=E5=88=86=E6=95=B0=E6=8D=AE=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E8=AE=A2=E5=8D=95=E7=9A=84=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E4=BC=A0=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/shop/goods/index.css       | 12 ++++++++++++
 packages/shop/goods/index.vue       |  1 +
 packages/shop/goodsSubmit/index.vue |  3 ++-
 packages/shopEnter/index/index.vue  | 19 ++++++++-----------
 4 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/packages/shop/goods/index.css b/packages/shop/goods/index.css
index 93c9f068..a44411e3 100644
--- a/packages/shop/goods/index.css
+++ b/packages/shop/goods/index.css
@@ -111,6 +111,18 @@ image {
     text-decoration: line-through;
 }
 
+.integral{
+    float: right;
+    font-size: 26rpx;
+    color: #fff;
+    position: absolute;
+    right: 20rpx;
+    width: auto;
+    padding: 5rpx 10rpx;
+    background-color: #FF370B;
+    border-radius: 10rpx;
+}
+
 .GGBox {
     margin: 0 20rpx;
     display: flex;
diff --git a/packages/shop/goods/index.vue b/packages/shop/goods/index.vue
index 262647d5..04e966be 100644
--- a/packages/shop/goods/index.vue
+++ b/packages/shop/goods/index.vue
@@ -28,6 +28,7 @@
 			<view class="MoneyUnit">/{{ currentGG.goods_unit }}</view>
 
 			<view class="oldMoney">￥{{ currentGG.market_price }}</view>
+			<view class="integral" v-if="currentGG.available_points_count > 0">可得{{ currentGG.available_points_count }}个积分</view>
 		</view>
 
 		<!-- 规格 -->
diff --git a/packages/shop/goodsSubmit/index.vue b/packages/shop/goodsSubmit/index.vue
index d4d0e168..bab8a8c0 100644
--- a/packages/shop/goodsSubmit/index.vue
+++ b/packages/shop/goodsSubmit/index.vue
@@ -382,7 +382,8 @@ export default {
                                 receiving_phone: this.defAddress.phone,
                                 receiving_address: this.defAddress.address + this.defAddress.house_number,
                                 merchant_id: this.defAddress.address_id,
-                                goods_and_count: []
+                                goods_and_count: [],
+                                get_points: item.commodity_goods_info.available_points_count,
                             };
                         }
                         acc[supplierId].goods_and_count.push({
diff --git a/packages/shopEnter/index/index.vue b/packages/shopEnter/index/index.vue
index a2b86fa5..1ea3d242 100644
--- a/packages/shopEnter/index/index.vue
+++ b/packages/shopEnter/index/index.vue
@@ -68,8 +68,7 @@
 					<u-upload :fileList="imgList" @afterRead="afterReadImg" @delete="deletePic" name="1" multiple
 						:maxCount="10">
 						<view class="imgCon">
-							<image
-								src="https://static.hshuishang.com/property-img-file/com_imageImg.png"
+							<image src="https://static.hshuishang.com/property-img-file/com_imageImg.png"
 								mode="widthFix"></image>
 							上传图片
 						</view>
@@ -83,8 +82,7 @@
 					<u-upload :fileList="imgList3" @afterRead="afterReadImg2" @delete="deletePic2" name="1" multiple
 						:maxCount="10">
 						<view class="imgCon">
-							<image
-								src="https://static.hshuishang.com/property-img-file/com_imageImg.png"
+							<image src="https://static.hshuishang.com/property-img-file/com_imageImg.png"
 								mode="widthFix"></image>
 							上传图片
 						</view>
@@ -98,8 +96,7 @@
 					<u-upload :fileList="imgList5" @afterRead="afterReadImg3" @delete="deletePic3" name="1" multiple
 						:maxCount="1">
 						<view class="imgCon">
-							<image
-								src="https://static.hshuishang.com/property-img-file/com_imageImg.png"
+							<image src="https://static.hshuishang.com/property-img-file/com_imageImg.png"
 								mode="widthFix"></image>
 							上传图片
 						</view>
@@ -377,7 +374,7 @@ export default {
 				that.confirmClassify = ''
 				NavgateTo("../sucess/index")
 			}).catch(res => {
-				if(res.message.includes("agent_nil")) {
+				if (res.message.includes("agent_nil")) {
 					uni.showToast({
 						title: '未找到对应的代理商信息',
 						icon: 'none',
@@ -388,21 +385,21 @@ export default {
 
 		// 省市区
 		getPro() {
-			return request(MapApi.getArea, "POST", {}).then(res => {
+			return request(MapApi.getArea, "POST", {}, {}, false).then(res => {
 				this.pro = res.rows
 			})
 		},
 		getCity(e) {
 			return request(MapApi.getArea, "POST", {
 				parent_ad_code: e
-			}).then(res => {
+			}, {}, false).then(res => {
 				this.city = res.rows
 			})
 		},
 		getBuss(e) {
 			return request(MapApi.getArea, "POST", {
 				parent_ad_code: e
-			}).then(res => {
+			}, {}, false).then(res => {
 				this.buss = res.rows
 			})
 		},
@@ -410,7 +407,7 @@ export default {
 			const params = {
 				is_shop: 1,
 			}
-			return request(apiArr.getMerChantCateList, "POST", params).then(res => {
+			return request(apiArr.getMerChantCateList, "POST", params, {}, false).then(res => {
 				this.classify = res.rows
 			})
 		},