From 57ef10088c5f92154370b86d168704913cec9294 Mon Sep 17 00:00:00 2001
From: shengchanzhe <179998674@qq.com>
Date: Sun, 5 Nov 2023 16:12:52 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/requesta.js                        | 3 +++
 manifest.json                          | 4 ++--
 pages/index/index.vue                  | 8 ++++----
 pages/nongKe/cloud_entrepot/indexa.vue | 8 ++++----
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/api/requesta.js b/api/requesta.js
index a2d0070..bc734bc 100644
--- a/api/requesta.js
+++ b/api/requesta.js
@@ -6,6 +6,9 @@ export function getCityCloundShop(data) {
 export function cloudWarehouse(data) {
 	return request.get("store/product/cloudWarehouse", data);
 }
+export function townCloud(data) {
+	return request.get("store/product/town_cloud", data);
+}
 /**
  * 供销市场标签
  * @returns {*}
diff --git a/manifest.json b/manifest.json
index 3fdc175..36f0bab 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "惠农生活",
     "appid" : "__UNI__3A527D1",
     "description" : "",
-    "versionName" : "1.5.4",
-    "versionCode" : 154,
+    "versionName" : "1.5.5",
+    "versionCode" : 155,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 8e2156d..0703086 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -30,9 +30,9 @@
 							获取定位失败,请手动选择
 						</view> -->
 					</view>
-					<view class="" @click="getPositionFn">
+		<!-- 			<view class="" @click="getPositionFn">
 						获取定位失败,点击允许
-					</view>
+					</view> -->
 					<navigator url="/pages/chat/customer_list/index?type=0" hover-class="none">
 						<view class="iconfont icon-xiaoxi" style="color:#fff;"> </view>
 					</navigator>
@@ -45,9 +45,9 @@
 			</zbpSwiper>
 
 
-			<view class="zhibo" @click="zhibo">
+<!-- 			<view class="zhibo" @click="zhibo">
 				<image src="@/static/img/zhi.png" mode="aspectFit"></image>
-			</view>
+			</view> -->
 
 			<view class="tabs_wrapper">
 				<!-- 	<u-tabs :list="tabsData.list" @click="tabsChange" lineColor="#F84221" keyName="cate_name"
diff --git a/pages/nongKe/cloud_entrepot/indexa.vue b/pages/nongKe/cloud_entrepot/indexa.vue
index 83aa4c7..77bb55c 100644
--- a/pages/nongKe/cloud_entrepot/indexa.vue
+++ b/pages/nongKe/cloud_entrepot/indexa.vue
@@ -401,7 +401,7 @@
 
 <script>
   import {
-    cloudWarehouse,
+    townCloud,
     getCityCloundShop
   } from '@/api/requesta.js'
   import {
@@ -547,7 +547,7 @@
       this.status = "loading"
       this.page_num += 1
       // this.flag = true
-      cloudWarehouse({
+      townCloud({
         street_code: this.street_code,
         category_id: this.cloudList[this.current]?.category_id || "",
         order: this.type,
@@ -829,7 +829,7 @@
         this.showLoading = true
         this.status = "loading"
         this.page_num = 1;
-        cloudWarehouse({
+        townCloud({
           street_code: this.street_code,
           category_id: this.cloudList[this.current]?.category_id || "",
           order: this.type,
@@ -930,7 +930,7 @@
           street_code: this.street_code
         })
         this.cloudList = data
-        cloudWarehouse({
+        townCloud({
           street_code: this.street_code,
           category_id: this.cloudList[this.current].category_id
         }).then(res => {

From 889e553cc26234715ae75b6ab0637d543bceeaa9 Mon Sep 17 00:00:00 2001
From: shengchanzhe <179998674@qq.com>
Date: Sun, 5 Nov 2023 18:48:36 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/nongKe/cloud_entrepot/index.vue  | 4 +++-
 pages/nongKe/cloud_entrepot/indexa.vue | 5 +++--
 pages/nongKe/supply_chain/supplier.vue | 2 ++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/pages/nongKe/cloud_entrepot/index.vue b/pages/nongKe/cloud_entrepot/index.vue
index 60998d3..cbb7c5b 100644
--- a/pages/nongKe/cloud_entrepot/index.vue
+++ b/pages/nongKe/cloud_entrepot/index.vue
@@ -136,6 +136,8 @@
                         item.rate
                       }}</text>
                       <text>{{ item.reply_count }}评论</text>
+					  <text v-if="item.merchant.distance" style="margin-left: 10rpx;">{{item.merchant.distance}}</text>
+					  
                     </view>
                     <view class="good_price">
                       <view class="good_price_l">
@@ -148,7 +150,7 @@
                             item.price
                           }}</text>
                         </view>
-                        <view class="old_price"> ￥30.00 </view>
+                        <!-- <view class="old_price"> ￥30.00 </view> -->
                       </view>
                       <view class="good_price_r">
                         <view :class="{ x_tra: trnList[index]?trnList[index].bottom:0 }" :style="`transform:translateY(${
diff --git a/pages/nongKe/cloud_entrepot/indexa.vue b/pages/nongKe/cloud_entrepot/indexa.vue
index 77bb55c..7b2992a 100644
--- a/pages/nongKe/cloud_entrepot/indexa.vue
+++ b/pages/nongKe/cloud_entrepot/indexa.vue
@@ -200,15 +200,16 @@
                     <view class="good_score">
                       <text style="margin-right: 10rpx;color: #F84221;">{{item.rate}}</text>
                       <text>{{item.reply_count}}评论</text>
+					  <text v-if="item.merchant.distance">{{item.merchant.distance}}</text>
                     </view>
                     <view class="good_price">
                       <view class="good_price_l">
                         <view class="" style="color: #F84221;font-size: 22.78rpx;font-weight: bold;">
                           ￥<text style="font-size: 30rpx;">{{item.price}}</text>
                         </view>
-                        <view class="old_price">
+   <!--                     <view class="old_price">
                           ￥30.00
-                        </view>
+                        </view> -->
                       </view>
                       <view class="good_price_r">
                         <view :class="{x_tra:trnList[index]?trnList[index].bottom:0 }"
diff --git a/pages/nongKe/supply_chain/supplier.vue b/pages/nongKe/supply_chain/supplier.vue
index 178274e..6827980 100644
--- a/pages/nongKe/supply_chain/supplier.vue
+++ b/pages/nongKe/supply_chain/supplier.vue
@@ -121,6 +121,8 @@
 									src="/static/images/GXSC/PF.png" width="20.85rpx" height="19.85rpx"></u--image>
 								<text style="margin-left: 20rpx;color: #FF6D20; ">5.0</text>
 								<text>月销{{item.sales}}</text>
+								<text v-if="item.distance">距离{{item.distance}}</text>
+								
 							</view>
 							<view class="li" style="align-items: center;">
 								<u--image :showLoading="true" src="/static/images/GXSC/DH.png" width="33.85rpx"