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 9fdeb7d..d38c152 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 a0d6b95..a1ba0a6 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,87 +1,128 @@
-
-
-
-
-
-
-
- {{ street }}
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{street}}
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{loadTitle}}
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ loadTitle }}
+
+
+
+
+
-
+
-
+
-
-
-
-
-
- 全部分类
-
-
-
- 点击进入分类
-
-
-
- {{item.cate_name}}
-
-
-
-
-
-
- 位置权限使用说明
- 用于向你推荐最近门店
-
-
+
+
+
+ 全部分类
+
+
+ 点击进入分类
+
+
+ {{ item.cate_name }}
+
+
+
+
+
+
+ 位置权限使用说明
+ 用于向你推荐最近门店
+
+
\ No newline at end of file
+page {
+ background-color: #f4f7fe;
+
+ // background: linear-gradient(180deg, #FFFFFF 0%, #F6F6F6 100%);
+}
+
+.zhibo {
+ height: 130rpx;
+
+ image {
+ width: 100%;
+ height: 100%;
+ }
+}
+
+.location {
+ background-color: #f6f6f6;
+ width: 680rpx;
+ height: 150rpx;
+ position: absolute;
+ top: 0;
+ z-index: 9999;
+ border-radius: 20rpx;
+ left: 50%;
+ margin-left: -340rpx;
+ margin-top: 80rpx;
+ padding-left: 20rpx;
+
+ .locationa {
+ font-size: 28rpx;
+ color: #000;
+ font-weight: 500;
+ margin-top: 30rpx;
+ margin-bottom: 15rpx;
+ }
+
+ .locationb {
+ font-size: 20rpx;
+ color: #5a5a5a;
+ }
+}
+
+.Circle_friends {
+ position: relative;
+ padding: 0 0 87.72rpx 0;
+
+ background: linear-gradient(180deg, #ffffff 0%, #f6f6f6 100%);
+}
+
+.classpage {
+ width: 100%;
+ height: calc(100vh - 50px);
+ background-color: #fff;
+ position: relative;
+ padding-top: 40rpx;
+ padding-left: 40rpx;
+ padding-right: 10rpx;
+
+ .classpage-one {
+ text-align: center;
+
+ image {
+ position: absolute;
+ right: 25rpx;
+ width: 42rpx;
+ height: 42rpx;
+ }
+ }
+
+ .classpage-two {
+ font-size: 26rpx;
+ font-family: PingFang SC-Regular, PingFang SC;
+ font-weight: 400;
+ color: #333333;
+ margin-top: 77rpx;
+ }
+
+ .classpage-three {
+ display: flex;
+ flex-direction: row;
+ flex-wrap: wrap;
+ margin-top: 35rpx;
+
+ view {
+ margin-right: 20rpx;
+ margin-bottom: 14rpx;
+ width: 210rpx;
+ height: 81rpx;
+ line-height: 81rpx;
+ text-align: center;
+ background: #ffffff;
+ border-radius: 11rpx 11rpx 11rpx 11rpx;
+ opacity: 1;
+ border: 2rpx solid #707070;
+ }
+ }
+}
+
+// .bg-img {
+// position: absolute;
+// width: 100%;
+// height: 100%;
+
+// top: 0;
+// /* #ifdef MP || APP-PLUS */
+// z-index: -100;
+// /* #endif */
+// /* #ifdef H5 */
+// z-index: -100;
+// /* #endif */
+// z-index: -100;
+// filter: blur(0);
+// overflow: hidden;
+
+// img {
+// width: 100%;
+// height: 100%;
+// filter: blur(30rpx);
+// transform: scale(1.5);
+// }
+// }
+
+.sitebox {
+ animation-name: fadeIn;
+ animation-duration: 3s;
+ animation-fill-mode: forwards;
+}
+
+@keyframes fadeIn {
+ from {
+ opacity: 0;
+ }
+
+ to {
+ opacity: 1;
+ }
+}
+
+.site-box1 {
+ width: 706rpx;
+ /* #ifdef MP || APP-PLUS */
+ height: 160rpx;
+ /* #endif */
+ /* #ifdef H5 */
+ height: 120rpx;
+ /* #endif */
+ margin-bottom: 26.32rpx;
+ position: absolute;
+ top: 45rpx;
+ left: 20rpx;
+
+ z-index: 999;
+
+ // 位置
+ .place_wrapper {
+ color: #fff;
+ margin-right: 0rpx;
+
+ font-size: 30rpx;
+
+ .town_name {
+ margin-left: 21rpx;
+ }
+ }
+
+ .iconfont {
+ font-size: 35.09rpx;
+ }
+}
+
+.site-box {
+ width: 100%;
+ /* #ifdef MP || APP-PLUS */
+ height: 160rpx;
+ /* #endif */
+ /* #ifdef H5 */
+ height: 120rpx;
+ /* #endif */
+ margin-bottom: 26.32rpx;
+ position: absolute;
+ top: 0rpx;
+ position: fixed;
+ z-index: 999;
+ /* #ifdef MP || APP-PLUS */
+ padding-top: 75rpx;
+ /* #endif */
+ /* #ifdef H5 */
+ padding-top: 25rpx;
+ /* #endif */
+ // background-color: #e5e5e5;
+ background: url("@/static/images/bg2.png") no-repeat;
+ background-size: 100% 100%;
+
+ padding-right: 20rpx;
+
+ // 位置
+ .place_wrapper {
+ color: #fff;
+ margin-right: 24.56rpx;
+ font-size: 30rpx;
+
+ opacity: 0;
+
+ .town_name {
+ margin-left: 21rpx;
+ }
+ }
+
+ .iconfont {
+ opacity: 0;
+ color: #fff;
+ font-size: 30rpx;
+ font-size: 35.09rpx;
+ }
+}
+
+.circle_friends_wrapper {
+ position: relative;
+
+ z-index: 2;
+}
+
+/deep/.u-tabs__wrapper__nav__line {
+ width: 46rpx;
+ margin-left: -2rpx;
+}
+
+/deep/.u-tabs__wrapper__nav__item {
+ // padding: 0 0px;
+ padding-left: 0rpx;
+ padding-right: 20rpx;
+}
+
+.search_wrapper {
+ width: 694.74rpx;
+ margin: 0 auto;
+}
+
+.tabs_wrapper {
+ width: 720rpx;
+
+ margin: 0 auto;
+ margin-bottom: 21.05rpx;
+ // margin-left: -20rpx;
+ position: relative;
+}
+
+.tabs_wrapper-img {
+ width: 40rpx;
+ height: 60rpx;
+ position: absolute;
+ z-index: 888;
+
+ background-color: #fff;
+ right: 0rpx;
+ top: 0;
+
+ image {
+ width: 40rpx;
+ height: 40rpx;
+ margin-top: 10rpx;
+ }
+}
+
+.empty_wrapper {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+}
+
+.article_box {
+ height: 100%;
+ width: 694.74rpx;
+ margin: 0 auto;
+ background-color: #fff;
+ border-radius: 16rpx;
+ padding: 0 24.56rpx;
+ box-sizing: border-box;
+
+ .title-box {
+ height: 87.72rpx;
+
+ text {
+ font-size: 28.07rpx;
+ }
+ }
+
+ .article-item {
+ display: flex;
+ // height: 175.44rpx;
+ justify-content: space-between;
+ border-bottom: 1px solid #f0f0f0;
+ padding: 21.05rpx 0;
+
+ .text {
+ flex: 1;
+ height: 122.81rpx;
+ margin-right: 17.54rpx;
+ font-size: 24rpx;
+ color: #999;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+
+ .name {
+ font-size: 26.32rpx;
+ color: #282828;
+ }
+ }
+
+ .pictrue {
+ width: 175.44rpx;
+ height: 122.81rpx;
+
+ image {
+ width: 100%;
+ height: 100%;
+ border-radius: 8px;
+ }
+ }
+ }
+}
+
+.tabs_wrapper {
+ width: 723rpx;
+ margin: 0rpx auto;
+ margin-bottom: 21.05rpx;
+
+ .title {
+ font-size: 31.58rpx;
+ font-weight: bold;
+
+ &::before {
+ content: "";
+ display: inline-block;
+ width: 3px;
+ height: 31.58rpx;
+ background-color: #f84221;
+ margin-right: 7.02rpx;
+ }
+ }
+}
+
+.goodslist {
+ // display: flex;
+ margin: 0 auto;
+ width: 725rpx;
+}
+
+.goods {
+ margin: 0 auto;
+ width: 725rpx;
+
+ display: flex;
+ flex-wrap: wrap;
+ justify-content: space-between;
+
+ .goods_item {
+ width: 356rpx;
+ border: 1px solid;
+ border-radius: 8px;
+ overflow: hidden;
+ background-color: #fff;
+ display: flex;
+ flex-direction: column;
+ margin-bottom: 10.53rpx;
+ position: relative;
+ margin-top: -40rpx;
+
+ .kk {
+ width: 365rpx;
+ height: 251rpx;
+ }
+
+ .goods_item_img {
+ position: absolute;
+ top: 18rpx;
+ right: 18rpx;
+ width: 52rpx;
+ height: 52rpx;
+
+ image {
+ width: 100%;
+ height: 100%;
+ }
+ }
+
+ .goods_img {
+ width: 100%;
+ height: 294.74rpx;
+
+ /deep/.easy-loadimage {
+ width: 100%;
+ height: 294.74rpx;
+ // border-radius: 8rpx;
+ position: relative;
+ }
+ }
+
+ .botm {
+ flex: 1;
+ padding: 0 14.04rpx;
+ padding-bottom: 21.05rpx;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+
+ .title {
+ font-size: 30rpx;
+ font-family: PingFang SC-Medium, PingFang SC;
+ font-weight: 500;
+ color: #333333;
+ margin: 12px 0;
+ width: 100%;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display: -webkit-box;
+ -webkit-line-clamp: 2;
+ -webkit-box-orient: vertical;
+ }
+
+ .goods_info {
+ justify-content: space-between;
+
+ .g_img {
+ width: 49rpx;
+ height: 49rpx;
+ border-radius: 50%;
+ }
+
+ .g_name {
+ margin-left: 8.77rpx;
+ width: 100.63rpx;
+ text-overflow: ellipsis;
+ /* 溢出显示省略号 */
+ overflow: hidden;
+ /* 溢出隐藏 */
+ white-space: nowrap;
+ /* 强制不换行 */
+ }
+
+ .nice_box {
+ display: flex;
+ align-items: center;
+
+ .isshow {
+ color: #fe3530 !important;
+ }
+
+ .iconfont {
+ font-size: 30rpx;
+ }
+
+ .icon-shoucang1 {
+ color: #f84221;
+ }
+
+ .collect {
+ font-size: 24rpx;
+ margin-left: 5rpx;
+ }
+ }
+ }
+ }
+ }
+
+ .goods_items {
+ width: 356rpx;
+
+ border-radius: 8px;
+ overflow: hidden;
+ background-color: #fff;
+ display: flex;
+ flex-direction: column;
+ margin-bottom: 10.53rpx;
+ position: relative;
+
+ .goods_item_img {
+ position: absolute;
+ top: 18rpx;
+ right: 18rpx;
+ width: 52rpx;
+ height: 52rpx;
+
+ image {
+ width: 100%;
+ height: 100%;
+ }
+ }
+
+ .goods_img {
+ width: 100%;
+ height: 294.74rpx;
+
+ /deep/.easy-loadimage {
+ width: 100%;
+ height: 294.74rpx;
+ // border-radius: 8rpx;
+ position: relative;
+ }
+ }
+
+ .botm {
+ flex: 1;
+ padding: 0 14.04rpx;
+ padding-bottom: 21.05rpx;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+
+ .title {
+ font-size: 30rpx;
+ font-family: PingFang SC-Medium, PingFang SC;
+ font-weight: 500;
+ color: #333333;
+ margin: 12px 0;
+ width: 100%;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display: -webkit-box;
+ -webkit-line-clamp: 2;
+ -webkit-box-orient: vertical;
+ }
+
+ .goods_info {
+ justify-content: space-between;
+
+ .g_img {
+ width: 49rpx;
+ height: 49rpx;
+ border-radius: 50%;
+ }
+
+ .g_name {
+ margin-left: 8.77rpx;
+ width: 100.63rpx;
+ text-overflow: ellipsis;
+ /* 溢出显示省略号 */
+ overflow: hidden;
+ /* 溢出隐藏 */
+ white-space: nowrap;
+ /* 强制不换行 */
+ }
+
+ .nice_box {
+ display: flex;
+ align-items: center;
+
+ .isshow {
+ color: #fe3530 !important;
+ }
+
+ .iconfont {
+ font-size: 30rpx;
+ }
+
+ .icon-shoucang1 {
+ color: #f84221;
+ }
+
+ .collect {
+ font-size: 24rpx;
+ margin-left: 5rpx;
+ }
+ }
+ }
+ }
+ }
+}
+
diff --git a/pages/nongKe/cloud_entrepot/index.vue b/pages/nongKe/cloud_entrepot/index.vue
index d922d3e..3a3bf91 100644
--- a/pages/nongKe/cloud_entrepot/index.vue
+++ b/pages/nongKe/cloud_entrepot/index.vue
@@ -136,6 +136,8 @@
item.rate
}}
{{ item.reply_count }}评论
+ {{item.merchant.distance}}
+
@@ -148,7 +150,7 @@
item.price
}}
- ￥30.00
+
{{item.rate}}
{{item.reply_count}}评论
+ {{item.merchant.distance}}
￥{{item.price}}
-
+
import {
- cloudWarehouse,
+ townCloud,
getCityCloundShop
} from '@/api/requesta.js'
import {
@@ -549,7 +550,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,
@@ -831,7 +832,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,
@@ -933,7 +934,7 @@
street_code: this.street_code
})
this.cloudList = data
- cloudWarehouse({
+ townCloud({
street_code: this.street_code,
category_id: this.cloudList[this.current].category_id,
location: this.location
diff --git a/pages/nongKe/supply_chain/supplier.vue b/pages/nongKe/supply_chain/supplier.vue
index 93fc8a7..4da8a13 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">
5.0
月销{{item.sales}}
+ 距离{{item.distance}}
+