mkm/nk-shop2.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
weipengfei 2024-02-03 16:01:52 +08:00
parent 6b1c9700d6
commit afec5c706d
3 changed files with 1989 additions and 1956 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifest.json
View File

@ -2,8 +2,8 @@
"name" : "惠农生活", "name" : "惠农生活",
"appid" : "__UNI__3A527D1", "appid" : "__UNI__3A527D1",
"description" : "", "description" : "",
"versionName" : "1.8.1", "versionName" : "1.8.6",
"versionCode" : 181, "versionCode" : 186,
"transformPx" : false, "transformPx" : false,
/* 5+App特有相关 */ /* 5+App特有相关 */
"app-plus" : { "app-plus" : {

25
pages/nongKe/specialty/index.vue
View File

@ -1,21 +1,16 @@
<template> <template>
<view style="background-color: #F0F2F5;min-height: 100vh"> <view style="background-color: #F0F2F5;min-height: 100vh">
<view style="height: var(--status-bar-height);"></view> <!-- <view style="height: var(--status-bar-height);"></view> -->
<image style="width:750rpx" mode="widthFix" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/new_activity/mingyoutechan.webp"></image>
<view class='productList' :style="viewColor"> <view class='productList' :style="viewColor">
<!-- 顶部 --> <!-- 顶部 -->
<view class="top"> <view class="top">
<!-- <view style="height: 10px;">
</view> -->
<view class="head_tit"> <view class="head_tit">
<view class="" style="display: flex;align-items: center;"> <view class="" style="display: flex;align-items: center;">
<view class="back" @click='backjJump()' style="margin-right: 17rpx;"> <view class="back" @click='backjJump()' style="margin-right: 17rpx;">
<!-- <u--image :showLoading="true" src="/static/images/LHYC/PFH.png" width="50.82rpx" <i class="iconfont icon-xiangzuo" style="font-size: 40rpx;text-align: left;color:#fff"></i>
height="50.82rpx"></u--image> -->
<i class="iconfont icon-xiangzuo" style="font-size: 40rpx;text-align: left;"></i>
</view> </view>
<view style="font-size: 40rpx;"> <view style="font-size: 40rpx;color:#fff;">
<!-- {{titName}} -->
名优特产 名优特产
</view> </view>
</view> </view>
@ -31,13 +26,10 @@
</view> </view>
</view> </view>
<view class="content"> <!-- <view class="content">
<view class="hot_serch"> <view class="hot_serch">
</view> </view>
</view> -->
</view>
<view class="goodslist"> <view class="goodslist">
<WaterfallsFlowp :wfList="storeList" @itemTap="itemTap" :type="1" /> <WaterfallsFlowp :wfList="storeList" @itemTap="itemTap" :type="1" />
</view> </view>
@ -559,7 +551,10 @@
/* #ifdef H5 */ /* #ifdef H5 */
padding-top: 30rpx; padding-top: 30rpx;
/* #endif */ /* #endif */
background-color: #F0F2F5; background: url('https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/new_activity/mingyoutechan.webp');
background-size: cover; /* 设置背景图片覆盖整个容器，可能会被裁剪以完全覆盖 */
background-position: top; /* 设置背景图片居中显示 */
background-repeat: no-repeat; /* 确保背景图片不重复 */
position: fixed; position: fixed;
z-index: 999; z-index: 999;
width: 100%; width: 100%;

100
pages/nongKe/specialty/short_index.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<view style="background-color: #ffffff;min-height: 100vh"> <view style="background-color: #ffffff;min-height: 100vh">
<view style="height: var(--status-bar-height);"></view> <!-- <view style="height: var(--status-bar-height);"></view> -->
<view class='productList' :style="viewColor"> <view class='productList' :style="viewColor">
<!-- 顶部 --> <!-- 顶部 -->
<view class="top"> <view class="top">
@ -31,15 +31,13 @@
</view> </view>
</view> </view>
<view class="content" style="background-color: #ff5c2d;"> <view class="content">
<view class="hot_serch"> <image style="width: 750rpx;" mode="widthFix"
</view> src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/new_activity/mingyouxinxi.webp"></image>
<view class="village-info" v-if="villageInfo.avatar"> <view class="village-info" v-if="villageInfo.avatar">
<image :src="villageInfo.avatar"></image> <image :src="villageInfo.avatar"></image>
<view> <view class="name"><u-icon name="account" color="#fff"></u-icon>负责人: {{villageInfo.master_name}}</view>
<view class="name"><u-icon name="account" color="#fff"></u-icon>{{villageInfo.master_name}}</view> <view class="phone"><u-icon name="phone" color="#fff"></u-icon>电话: {{villageInfo.master_phone}}</view>
<view class="phone"><u-icon name="phone" color="#fff"></u-icon>{{villageInfo.master_phone}}</view>
</view>
</view> </view>
</view> </view>
<view class="goodslist"> <view class="goodslist">
@ -60,8 +58,7 @@
<view class='money on'> <view class='money on'>
￥<text class='num'>{{item.price}}</text> ￥<text class='num'>{{item.price}}</text>
</view> </view>
<view v-if="item.show_svip_info.show_svip_price && item.svip_price" <view v-if="item.show_svip_info.show_svip_price && item.svip_price" class="acea-row row-middle">
class="acea-row row-middle">
<text class='vip-money'>￥{{item.svip_price}}</text> <text class='vip-money'>￥{{item.svip_price}}</text>
<view class="vipImg"> <view class="vipImg">
<image src="/static/images/svip.png"></image> <image src="/static/images/svip.png"></image>
@ -79,7 +76,8 @@
<!-- <text class="tags_item delivery" v-if="item.delivery_free == 1">包邮</text> --> <!-- <text class="tags_item delivery" v-if="item.delivery_free == 1">包邮</text> -->
<!-- <view class="ticket-big" v-if="!is_switch && item.issetCoupon">领券满{{item.issetCoupon.use_min_price}}减{{item.issetCoupon.coupon_price}}</view> --> <!-- <view class="ticket-big" v-if="!is_switch && item.issetCoupon">领券满{{item.issetCoupon.use_min_price}}减{{item.issetCoupon.coupon_price}}</view> -->
</view> </view>
<view class="score">{{item.rate}}评分 {{item.reply_count}}条评论 <text style="margin-left: 10rpx;" v-if="item.merchant">{{item.merchant.street_name}}</text></view> <view class="score">{{item.rate}}评分 {{item.reply_count}}条评论 <text style="margin-left: 10rpx;"
v-if="item.merchant">{{item.merchant.street_name}}</text></view>
<view class="company" v-if="item.merchant && hide_mer_status==0"> <view class="company" v-if="item.merchant && hide_mer_status==0">
<text class='name line1'>{{item.merchant.village_name}}</text> <text class='name line1'>{{item.merchant.village_name}}</text>
@ -227,7 +225,7 @@
show: false, show: false,
image: '', //图片, image: '', //图片,
credit_buy: '', //支持先货后款 credit_buy: '', //支持先货后款
villageInfo:{ //村公司信息 villageInfo: { //村公司信息
}, },
village_name: '' village_name: ''
@ -269,13 +267,13 @@
}, mapGetters(['viewColor'])), }, mapGetters(['viewColor'])),
}, },
methods: { methods: {
getVillageInfo(){ getVillageInfo() {
getVillageInfo({ getVillageInfo({
village_id: this.sotreParam.village_id village_id: this.sotreParam.village_id
}).then(res=>{ }).then(res => {
this.villageInfo = res.data.company; this.villageInfo = res.data.company;
console.log({...this.villageInfo}); console.log({ ...this.villageInfo });
}).catch(err=>{ }).catch(err => {
console.log(err); console.log(err);
}) })
}, },
@ -284,7 +282,7 @@
url: `/pages/nongKe/supply_chain/supplierA?type_id=10&?merchant_category_id=${id}` url: `/pages/nongKe/supply_chain/supplierA?type_id=10&?merchant_category_id=${id}`
}) })
}, },
itemTap(item){ itemTap(item) {
uni.navigateTo({ uni.navigateTo({
url: `/pages/goods_details/index_v?id=${item.product_id}&village_id=${this.sotreParam.village_id}`, url: `/pages/goods_details/index_v?id=${item.product_id}&village_id=${this.sotreParam.village_id}`,
fail: (err) => { fail: (err) => {
@ -464,10 +462,10 @@
if (this.latitude) { if (this.latitude) {
rqData.location = this.latitude + ',' + this.longitude rqData.location = this.latitude + ',' + this.longitude
} }
if(this.sotreParam.street_id){ if (this.sotreParam.street_id) {
rqData.street_id = this.sotreParam.street_id; rqData.street_id = this.sotreParam.street_id;
} }
if(this.sotreParam.village_id){ if (this.sotreParam.village_id) {
rqData.village_id = this.sotreParam.village_id; rqData.village_id = this.sotreParam.village_id;
} }
// console.log(rqData) // console.log(rqData)
@ -635,7 +633,13 @@
/* #ifdef H5 */ /* #ifdef H5 */
padding-top: 30rpx; padding-top: 30rpx;
/* #endif */ /* #endif */
background-color: #ff5c2d; background: url('https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/new_activity/mingyouxinxi.webp');
background-size: cover;
/* 设置背景图片覆盖整个容器，可能会被裁剪以完全覆盖 */
background-position: top;
/* 设置背景图片居中显示 */
background-repeat: no-repeat;
/* 确保背景图片不重复 */
color: #fff; color: #fff;
position: fixed; position: fixed;
z-index: 999; z-index: 999;
@ -644,7 +648,13 @@
} }
.content { .content {
padding: 20rpx; padding: 0;
position: relative;
overflow: hidden;
height: calc(var(--status-bar-height) + 210rpx);
/* #ifdef H5 */
height: 240rpx;
/* #endif */
} }
.menu_cls { .menu_cls {
@ -767,19 +777,43 @@
margin: 10rpx; margin: 10rpx;
} }
} }
.village-info{
height: 80rpx; .village-info {
position: absolute;
bottom: 20rpx;
left: 50%;
transform: translate(-50%);
height: 100rpx;
padding: 20rpx;
width: 700rpx;
display: flex; display: flex;
color: #fff; color: #fff;
padding-left: 20rpx; background: url('https://lihai001.oss-cn-chengdu.aliyuncs.com/def/643c4202402021508275295.png');
image{ background-size: 100%;
width: 70rpx; /* 设置背景图片覆盖整个容器，可能会被裁剪以完全覆盖 */
height: 70rpx; background-position: top;
/* 设置背景图片居中显示 */
background-repeat: no-repeat;
/* 确保背景图片不重复 */
image {
width: 60rpx;
height: 60rpx;
border-radius: 50%;
margin-right: 20rpx; margin-right: 20rpx;
} }
.name, .phone{
.name,
.phone {
display: flex; display: flex;
align-items: center; align-items: center;
font-size: 28rpx;
}
.name{
min-width: 270rpx;
}
.phone{
min-width: 300rpx;
} }
} }
@ -1227,6 +1261,7 @@
transform: translateY(-50%); transform: translateY(-50%);
} }
.goodslist { .goodslist {
margin: 0 auto; margin: 0 auto;
width: 725rpx; width: 725rpx;
@ -1258,6 +1293,7 @@
} }
} }
} }
.b-color { .b-color {
background-color: var(--view-theme) !important; background-color: var(--view-theme) !important;
border: 1px solid var(--view-theme) !important; border: 1px solid var(--view-theme) !important;
@ -1569,7 +1605,7 @@
} }
.text_flex{ .text_flex {
display: flex; display: flex;
align-items: center; align-items: center;
} }
@ -1927,7 +1963,8 @@
height: 30px; height: 30px;
line-height: 30px; line-height: 30px;
padding-left: 10px; padding-left: 10px;
.text_tip{
.text_tip {
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
@ -1946,7 +1983,8 @@
height: 30px; height: 30px;
line-height: 30px; line-height: 30px;
padding-left: 10px; padding-left: 10px;
.text_tip{
.text_tip {
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;