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

Merge branch 'old' of https://gitea.lihaink.cn/mkm/nk-shop2.0 into old

Browse Source
This commit is contained in:
wpf 2023-11-05 20:26:07 +08:00
commit f7313b878e
6 changed files with 1313 additions and 1263 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api/requesta.js
View File

@ -6,6 +6,9 @@ export function getCityCloundShop(data) {
export function cloudWarehouse(data) { export function cloudWarehouse(data) {
return request.get("store/product/cloudWarehouse", data); return request.get("store/product/cloudWarehouse", data);
} }
export function townCloud(data) {
return request.get("store/product/town_cloud", data);
}
/** /**
* 供销市场标签 * 供销市场标签
* @returns {*} * @returns {*}

4
manifest.json
View File

@ -2,8 +2,8 @@
"name" : "惠农生活", "name" : "惠农生活",
"appid" : "__UNI__3A527D1", "appid" : "__UNI__3A527D1",
"description" : "", "description" : "",
"versionName" : "1.5.4", "versionName" : "1.5.5",
"versionCode" : 154, "versionCode" : 155,
"transformPx" : false, "transformPx" : false,
/* 5+App特有相关 */ /* 5+App特有相关 */
"app-plus" : { "app-plus" : {

122
pages/index/index.vue
View File

@ -2,16 +2,25 @@
<view class="Circle_friends"> <view class="Circle_friends">
<view class="circle_friends_wrapper"> <view class="circle_friends_wrapper">
<view v-if="isFshow"> <view v-if="isFshow">
<view class="site-box flex_a_c_j_sb" :style="{ 'opacity': backColor,}"> <view class="site-box flex_a_c_j_sb" :style="{ opacity: backColor }">
<view :class="['place_wrapper', 'flex_a_c', isFshow ? 'sitebox' : '']" @click="selectLocation"> <view
<view :class="['iconfont', 'icon-weizhi', isFshow ? 'sitebox' : '']" :class="['place_wrapper', 'flex_a_c', isFshow ? 'sitebox' : '']"
style=" margin-left: 20rpx"> @click="selectLocation"
>
<view
:class="['iconfont', 'icon-weizhi', isFshow ? 'sitebox' : '']"
style="margin-left: 20rpx"
>
</view> </view>
<view class="town_name">{{ street }}</view> <view class="town_name">{{ street }}</view>
</view> </view>
<navigator url="/pages/chat/customer_list/index?type=0" hover-class="none"> <navigator
<view :class="['iconfont', 'icon-xiaoxi', isFshow ? 'sitebox' : '']"></view> url="/pages/chat/customer_list/index?type=0"
hover-class="none"
>
<view
:class="['iconfont', 'icon-xiaoxi', isFshow ? 'sitebox' : '']"
></view>
</navigator> </navigator>
</view> </view>
<!--<view class="site-box ','flex_a_c_j_sb'" v-if="ishshow"> <!--<view class="site-box ','flex_a_c_j_sb'" v-if="ishshow">
@ -22,7 +31,6 @@
</view> </view>
<view class="" v-if="!isFshow"> <view class="" v-if="!isFshow">
<view class="site-box1 flex_a_c_j_sb"> <view class="site-box1 flex_a_c_j_sb">
<view class="place_wrapper flex_a_c" @click="selectLocation"> <view class="place_wrapper flex_a_c" @click="selectLocation">
<view class="iconfont icon-weizhi"></view> <view class="iconfont icon-weizhi"></view>
<view class="town_name">{{ street }}</view> <view class="town_name">{{ street }}</view>
@ -33,21 +41,28 @@
<!-- <view class="" @click="getPositionFn"> <!-- <view class="" @click="getPositionFn">
获取定位失败,点击允许 获取定位失败,点击允许
</view> --> </view> -->
<navigator url="/pages/chat/customer_list/index?type=0" hover-class="none"> <navigator
<view class="iconfont icon-xiaoxi" style="color:#fff;"> </view> url="/pages/chat/customer_list/index?type=0"
hover-class="none"
>
<view class="iconfont icon-xiaoxi" style="color: #fff"> </view>
</navigator> </navigator>
</view> </view>
</view> </view>
<zbpSwiper
<zbpSwiper ref="list" :isSelectPlace="true" :town="street" :show="show" :location_Arr="locationArr" ref="list"
@change="dchange"> :isSelectPlace="true"
:town="street"
:show="show"
:location_Arr="locationArr"
@change="dchange"
>
</zbpSwiper> </zbpSwiper>
<!-- <view class="zhibo" @click="zhibo">
<view class="zhibo" @click="zhibo">
<image src="@/static/img/zhi.png" mode="aspectFit"></image> <image src="@/static/img/zhi.png" mode="aspectFit"></image>
</view> </view> -->
<view class="tabs_wrapper"> <view class="tabs_wrapper">
<!-- <u-tabs :list="tabsData.list" @click="tabsChange" lineColor="#F84221" keyName="cate_name" <!-- <u-tabs :list="tabsData.list" @click="tabsChange" lineColor="#F84221" keyName="cate_name"
@ -56,9 +71,16 @@
<image src="@/static/images/zk.png" mode=""></image> <image src="@/static/images/zk.png" mode=""></image>
</view> --> </view> -->
<view class="" style="width: 670rpx;"> <view class="" style="width: 670rpx">
<u-tabs :list="tabsData.list" @click="tabsChange" itemStyle=" height: 33px;" lineColor="#F84221" <u-tabs
:current="current" keyName="cate_name" :activeStyle="activeStyle"></u-tabs> :list="tabsData.list"
@click="tabsChange"
itemStyle=" height: 33px;"
lineColor="#F84221"
:current="current"
keyName="cate_name"
:activeStyle="activeStyle"
></u-tabs>
</view> </view>
<view class="tabs_wrapper-img" @click="open"> <view class="tabs_wrapper-img" @click="open">
<image src="@/static/images/zk.png" mode=""></image> <image src="@/static/images/zk.png" mode=""></image>
@ -66,18 +88,37 @@
</view> </view>
<view class=""> </view> <view class=""> </view>
<view class="goodslist"> <view class="goodslist">
<WaterfallsFlow :wfList="productList" @itemTap='itemTap' :type="1" /> <WaterfallsFlow :wfList="productList" @itemTap="itemTap" :type="1" />
</view> </view>
<view class='loadingicon acea-row row-center-wrapper' v-if='productList.length > 0'> <view
<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}} class="loadingicon acea-row row-center-wrapper"
v-if="productList.length > 0"
>
<text
class="loading iconfont icon-jiazai"
:hidden="loading == false"
></text
>{{ loadTitle }}
</view> </view>
<view class="empty_wrapper" v-if="emptyShow"> <view class="empty_wrapper" v-if="emptyShow">
<u-empty :show="emptyShow" mode="list" icon="http://cdn.uviewui.com/uview/empty/list.png"></u-empty> <u-empty
:show="emptyShow"
mode="list"
icon="http://cdn.uviewui.com/uview/empty/list.png"
></u-empty>
</view> </view>
</view> </view>
<u-picker :defaultIndex="[0, 0]" :show="showPicker" ref="uPicker" :columns="columnData" @confirm="confirm" <u-picker
@cancel="showPicker = false" @change="changeHandler" keyName="name"></u-picker> :defaultIndex="[0, 0]"
:show="showPicker"
ref="uPicker"
:columns="columnData"
@confirm="confirm"
@cancel="showPicker = false"
@change="changeHandler"
keyName="name"
></u-picker>
<!-- <view class="bg_color"></view> --> <!-- <view class="bg_color"></view> -->
@ -93,24 +134,31 @@
</m-tabbar> --> </m-tabbar> -->
<uni-popup ref="popup" type="bottom"> <uni-popup ref="popup" type="bottom">
<view class="classpage"> <view class="classpage">
<view class="classpage-one"> <view class="classpage-one">
全部分类 全部分类
<image src="@/static/images/cuo.png" mode="" @click="cuo"></image> <image src="@/static/images/cuo.png" mode="" @click="cuo"></image>
</view> </view>
<view class="classpage-two"> <view class="classpage-two"> 点击进入分类 </view>
点击进入分类
</view>
<view class="classpage-three"> <view class="classpage-three">
<view class="" v-for="(item,i) in tabsData.list" :key='i' @click="tabsChange2(item,i)"> <view
class=""
v-for="(item, i) in tabsData.list"
:key="i"
@click="tabsChange2(item, i)"
>
{{ item.cate_name }} {{ item.cate_name }}
</view> </view>
</view> </view>
</view> </view>
</uni-popup> </uni-popup>
<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse" <authorize
:isGoIndex="false"></authorize> @onLoadFun="onLoadFun"
:isAuto="isAuto"
:isShowAuth="isShowAuth"
@authColse="authColse"
:isGoIndex="false"
></authorize>
<view class="location" v-if="isshow"> <view class="location" v-if="isshow">
<view class="locationa"> 位置权限使用说明 </view> <view class="locationa"> 位置权限使用说明 </view>
<view class="locationb"> 用于向你推荐最近门店 </view> <view class="locationb"> 用于向你推荐最近门店 </view>
@ -781,8 +829,6 @@
image { image {
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
} }
@ -830,7 +876,6 @@
padding-right: 10rpx; padding-right: 10rpx;
.classpage-one { .classpage-one {
text-align: center; text-align: center;
image { image {
@ -862,12 +907,11 @@
height: 81rpx; height: 81rpx;
line-height: 81rpx; line-height: 81rpx;
text-align: center; text-align: center;
background: #FFFFFF; background: #ffffff;
border-radius: 11rpx 11rpx 11rpx 11rpx; border-radius: 11rpx 11rpx 11rpx 11rpx;
opacity: 1; opacity: 1;
border: 2rpx solid #707070; border: 2rpx solid #707070;
} }
} }
} }
@ -941,7 +985,6 @@
.iconfont { .iconfont {
font-size: 35.09rpx; font-size: 35.09rpx;
} }
} }
.site-box { .site-box {
@ -964,7 +1007,7 @@
padding-top: 25rpx; padding-top: 25rpx;
/* #endif */ /* #endif */
// background-color: #e5e5e5; // background-color: #e5e5e5;
background: url('@/static/images/bg2.png') no-repeat; background: url("@/static/images/bg2.png") no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
padding-right: 20rpx; padding-right: 20rpx;
@ -1035,7 +1078,6 @@
width: 40rpx; width: 40rpx;
height: 40rpx; height: 40rpx;
margin-top: 10rpx; margin-top: 10rpx;
} }
} }

4
pages/nongKe/cloud_entrepot/index.vue
View File

@ -136,6 +136,8 @@
item.rate item.rate
}}</text> }}</text>
<text>{{ item.reply_count }}评论</text> <text>{{ item.reply_count }}评论</text>
<text v-if="item.merchant.distance" style="margin-left: 10rpx;">{{item.merchant.distance}}</text>
</view> </view>
<view class="good_price"> <view class="good_price">
<view class="good_price_l"> <view class="good_price_l">
@ -148,7 +150,7 @@
item.price item.price
}}</text> }}</text>
</view> </view>
<view class="old_price"> ￥30.00 </view> <!-- <view class="old_price"> ￥30.00 </view> -->
</view> </view>
<view class="good_price_r"> <view class="good_price_r">
<view :class="{ x_tra: trnList[index]?trnList[index].bottom:0 }" :style="`transform:translateY(${ <view :class="{ x_tra: trnList[index]?trnList[index].bottom:0 }" :style="`transform:translateY(${

13
pages/nongKe/cloud_entrepot/indexa.vue
View File

@ -200,15 +200,16 @@
<view class="good_score"> <view class="good_score">
<text style="margin-right: 10rpx;color: #F84221;">{{item.rate}}</text> <text style="margin-right: 10rpx;color: #F84221;">{{item.rate}}</text>
<text>{{item.reply_count}}评论</text> <text>{{item.reply_count}}评论</text>
<text v-if="item.merchant.distance">{{item.merchant.distance}}</text>
</view> </view>
<view class="good_price"> <view class="good_price">
<view class="good_price_l"> <view class="good_price_l">
<view class="" style="color: #F84221;font-size: 22.78rpx;font-weight: bold;"> <view class="" style="color: #F84221;font-size: 22.78rpx;font-weight: bold;">
￥<text style="font-size: 30rpx;">{{item.price}}</text> ￥<text style="font-size: 30rpx;">{{item.price}}</text>
</view> </view>
<view class="old_price"> <!-- <view class="old_price">
￥30.00 ￥30.00
</view> </view> -->
</view> </view>
<view class="good_price_r"> <view class="good_price_r">
<view :class="{x_tra:trnList[index]?trnList[index].bottom:0 }" <view :class="{x_tra:trnList[index]?trnList[index].bottom:0 }"
@ -401,7 +402,7 @@
<script> <script>
import { import {
cloudWarehouse, townCloud,
getCityCloundShop getCityCloundShop
} from '@/api/requesta.js' } from '@/api/requesta.js'
import { import {
@ -549,7 +550,7 @@
this.status = "loading" this.status = "loading"
this.page_num += 1 this.page_num += 1
// this.flag = true // this.flag = true
cloudWarehouse({ townCloud({
street_code: this.street_code, street_code: this.street_code,
category_id: this.cloudList[this.current]?.category_id || "", category_id: this.cloudList[this.current]?.category_id || "",
order: this.type, order: this.type,
@ -831,7 +832,7 @@
this.showLoading = true this.showLoading = true
this.status = "loading" this.status = "loading"
this.page_num = 1; this.page_num = 1;
cloudWarehouse({ townCloud({
street_code: this.street_code, street_code: this.street_code,
category_id: this.cloudList[this.current]?.category_id || "", category_id: this.cloudList[this.current]?.category_id || "",
order: this.type, order: this.type,
@ -933,7 +934,7 @@
street_code: this.street_code street_code: this.street_code
}) })
this.cloudList = data this.cloudList = data
cloudWarehouse({ townCloud({
street_code: this.street_code, street_code: this.street_code,
category_id: this.cloudList[this.current].category_id, category_id: this.cloudList[this.current].category_id,
location: this.location location: this.location

2
pages/nongKe/supply_chain/supplier.vue
View File

@ -121,6 +121,8 @@
src="/static/images/GXSC/PF.png" width="20.85rpx" height="19.85rpx"></u--image> 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 style="margin-left: 20rpx;color: #FF6D20; ">5.0</text>
<text>月销{{item.sales}}</text> <text>月销{{item.sales}}</text>
<text v-if="item.distance">距离{{item.distance}}</text>
</view> </view>
<view class="li" style="align-items: center;"> <view class="li" style="align-items: center;">
<u--image :showLoading="true" src="/static/images/GXSC/DH.png" width="33.85rpx" <u--image :showLoading="true" src="/static/images/GXSC/DH.png" width="33.85rpx"