diff --git a/manifest.json b/manifest.json
index 1903591..bec2db9 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "惠农生活",
"appid" : "__UNI__3A527D1",
"description" : "",
- "versionName" : "1.7.9",
- "versionCode" : 179,
+ "versionName" : "1.8.0",
+ "versionCode" : 180,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {
diff --git a/pages.json b/pages.json
index 26c9611..fbd292e 100644
--- a/pages.json
+++ b/pages.json
@@ -1820,15 +1820,15 @@
{
"pagePath": "pages/index/index",
"iconPath": "static/tabbar_icon/a.png",
- "selectedIconPath": "static/tabbar_icon/a-a.png",
+ "selectedIconPath": "static/tabbar_icon/a-a.png"
// "text": "泸州"
- "text": "供销"
+ // "text": "供销"
},
{
"pagePath": "pages/gather/gather",
"iconPath": "static/tabbar_icon/b.png",
- "selectedIconPath": "static/tabbar_icon/b-a.png",
- "text": "生产"
+ "selectedIconPath": "static/tabbar_icon/b-a.png"
+ // "text": "生产"
},
// {
// "pagePath": "pages/plant_release/index",
@@ -1840,14 +1840,14 @@
{
"pagePath": "pages/order_addcart/order_addcart_t",
"iconPath": "static/tabbar_icon/d.png",
- "selectedIconPath": "static/tabbar_icon/d-a.png",
- "text": "购物车"
+ "selectedIconPath": "static/tabbar_icon/d-a.png"
+ // "text": "购物车"
},
{
"pagePath": "pages/user/index",
"iconPath": "static/tabbar_icon/e.png",
- "selectedIconPath": "static/tabbar_icon/e-a.png",
- "text": "我的"
+ "selectedIconPath": "static/tabbar_icon/e-a.png"
+ // "text": "我的"
}
]
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 1847535..8f12afd 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -18,16 +18,23 @@
</view>
<view class="" v-if="!isFshow">
- <view class="site-box1 flex_a_c_j_sb">
-
- <view class="place_wrapper flex_a_c" @click="changeMap">
- <view class="iconfont icon-weizhi"></view>
- <view class="town_name">{{street||'定位中' }}</view>
- <!-- <view class="town_name rotate-box" @click.stop="getPositionFn()"><uni-icons type="loop"
- color="#fff"></uni-icons></view> -->
+ <view class="site-box1">
+ <view class="box flex_a_c_j_sb">
+ <view class="place_wrapper flex_a_c" @click="changeMap">
+ <view class="iconfont icon-weizhi"></view>
+ <view class="town_name">{{street||'定位中' }}</view>
+ </view>
+ <navigator url="/pages/chat/customer_list/index?type=0" hover-class="none">
+ <view class="iconfont icon-xiaoxi" style="color:#fff;"> </view>
+ </navigator>
</view>
- <navigator url="/pages/chat/customer_list/index?type=0" hover-class="none">
- <view class="iconfont icon-xiaoxi" style="color:#fff;"> </view>
+ <navigator url="/pages/columnGoods/goods_search/index" hover-class="none" class="search_content flex_a_c_j_sb home_search">
+ <view class="flex_a_c">
+ <view class="iconfont icon-sousuo" style="font-size: 39rpx;"></view>
+ <input type="text" v-model="keyword" placeholder="搜索产品或店铺" placeholder-style="font-size: 30rpx;"
+ disabled>
+ </view>
+ <button class="search_btn">搜索</button>
</navigator>
</view>
</view>
@@ -43,10 +50,10 @@
</zbpSwiper> -->
<view class="home_list">
- <image class="left" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/home_img/home_yuncang.webp"></image>
+ <image class="left" @click="go_shop" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/home_img/home_yuncang.webp"></image>
<view class="right">
- <image class="top" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/home_img/home_shichang.webp"></image>
- <image class="bottom" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/home_img/home_my.webp"></image>
+ <image class="top" @click="navgo(`/pages/nongKe/supply_chain/supplierB?type_id=10,17&street_id=${street_id}&townName=${town}`)" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/home_img/home_shichang.webp"></image>
+ <image class="bottom" @click="navgo('/pages/nongKe/specialty/index?type_code=PersonalStore&street_id='+street_id)" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/home_img/home_my.webp"></image>
</view>
</view>
<view class="home_recommend">
@@ -783,27 +790,59 @@ import activityCard from "@/components/activityCard.vue"
/* #endif */
margin-bottom: 26.32rpx;
position: absolute;
- top: 45rpx;
+ top: 105rpx;
left: 20rpx;
z-index: 9999 !important;
- // 位置
- .place_wrapper {
- color: #fff;
- margin-right: 0rpx;
-
- font-size: 30rpx;
-
- .town_name {
- margin-left: 21rpx;
+ .box{
+ // 位置
+ .place_wrapper {
+ color: #fff;
+ margin-right: 0rpx;
+
+ font-size: 30rpx;
+
+ .town_name {
+ margin-left: 21rpx;
+ }
}
+
+ .iconfont {
+ font-size: 35.09rpx;
+ }
+
}
-
- .iconfont {
- font-size: 35.09rpx;
+
+ .search_content {
+ margin: 0 auto;
+ margin-top: 25rpx;
+ width: 706rpx;
+ height: 64rpx;
+ padding: 2px 2px 2px 21.05rpx;
+ border-radius: 175rpx;
+ background: #fff;
+ margin-bottom: 21rpx;
+ position: relative;
+ box-sizing: border-box;
+
+ .icon-sousuo {
+ font-size: 26.32rpx;
+ font-weight: bold;
+ color: #c8c7c6;
+ margin-right: 17.54rpx;
+ }
+
+ .search_btn {
+ color: #fff;
+ width: 105.26rpx;
+ height: 56rpx;
+ line-height: 56rpx;
+ background: #f84221;
+ border-radius: 100px;
+ font-size: 28.07rpx;
+ }
}
-
}
.location {
diff --git a/pages/users/user_money/money.vue b/pages/users/user_money/money.vue
index 90bc3ab..4b883ee 100644
--- a/pages/users/user_money/money.vue
+++ b/pages/users/user_money/money.vue
@@ -94,7 +94,7 @@
}, {
name: '充值记录'
}],
- changeList: [10, 15, 20, 50, 100],
+ changeList: [0.01, 15, 20, 50, 100],
nowChange: 0,
nowPrice: 0,
priceCount: 1,
diff --git a/static/tabbar_icon/a-a.png b/static/tabbar_icon/a-a.png
index 8b07313..f92d4c4 100644
Binary files a/static/tabbar_icon/a-a.png and b/static/tabbar_icon/a-a.png differ
diff --git a/static/tabbar_icon/a.png b/static/tabbar_icon/a.png
index 526b79a..ee73a64 100644
Binary files a/static/tabbar_icon/a.png and b/static/tabbar_icon/a.png differ
diff --git a/static/tabbar_icon/b-a.png b/static/tabbar_icon/b-a.png
index 5454788..3451092 100644
Binary files a/static/tabbar_icon/b-a.png and b/static/tabbar_icon/b-a.png differ
diff --git a/static/tabbar_icon/b.png b/static/tabbar_icon/b.png
index 8fdc5a9..8304862 100644
Binary files a/static/tabbar_icon/b.png and b/static/tabbar_icon/b.png differ
diff --git a/static/tabbar_icon/d-a.png b/static/tabbar_icon/d-a.png
index c4fc7ac..e37a912 100644
Binary files a/static/tabbar_icon/d-a.png and b/static/tabbar_icon/d-a.png differ
diff --git a/static/tabbar_icon/d.png b/static/tabbar_icon/d.png
index ac87a08..b66315b 100644
Binary files a/static/tabbar_icon/d.png and b/static/tabbar_icon/d.png differ
diff --git a/static/tabbar_icon/e-a.png b/static/tabbar_icon/e-a.png
index 71532de..ff47370 100644
Binary files a/static/tabbar_icon/e-a.png and b/static/tabbar_icon/e-a.png differ
diff --git a/static/tabbar_icon/e.png b/static/tabbar_icon/e.png
index 4aa833d..f12061c 100644
Binary files a/static/tabbar_icon/e.png and b/static/tabbar_icon/e.png differ