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

代码合并更新‘

Browse Source 
git commit -m 代码合并更新‘
This commit is contained in:
jia 2023-09-19 18:38:08 +08:00
parent 4c5a5325a2
commit 6a2b4c9cbd
19 changed files with 763 additions and 358 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
App.vue
View File

@ -85,7 +85,6 @@
}, 6000) }, 6000)
} }
// #ifdef APP-PLUS // #ifdef APP-PLUS
//监听uni小程序发送的事件 //监听uni小程序发送的事件
mp.onUniMPEventReceive(ret => { mp.onUniMPEventReceive(ret => {

16
components/zbpSwiper.vue
View File

@ -65,14 +65,14 @@
type: Boolean, type: Boolean,
default: false default: false
}, },
location_Arr: { // location_Arr: {
type: Object, // type: Object,
default: () => ({}) // default: () => ({})
}, // },
town: { // town: {
type: String, // type: String,
default: false // default: false
}, // },
}, },
data() { data() {

4
manifest.json
View File

@ -2,8 +2,8 @@
"name" : "惠农生活", "name" : "惠农生活",
"appid" : "__UNI__3A527D1", "appid" : "__UNI__3A527D1",
"description" : "", "description" : "",
"versionName" : "1.3.8", "versionName" : "1.4.1",
"versionCode" : 138, "versionCode" : 141,
"transformPx" : false, "transformPx" : false,
/* 5+App特有相关 */ /* 5+App特有相关 */
"app-plus" : { "app-plus" : {

3
pages.json
View File

@ -128,8 +128,7 @@
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
} }, {
,{
"path": "uni_modules/guyue-updater/pages/updater", "path": "uni_modules/guyue-updater/pages/updater",
"style": { "style": {
"app-plus": { "app-plus": {

2
pages/moreProject/moreProject.vue
View File

@ -350,7 +350,7 @@
<text class="text">商户设置</text> <text class="text">商户设置</text>
</view> </view>
<view class="examine" @click="navigator(`/pages/product/transactionApplication/index?mer_id=${mer_id}&business_status=${userInfoData.mer_info.business_status}`, '交易申请')"> <view class="examine" v-if="userInfoData.mer_info.setting_status==1" @click="navigator(`/pages/product/transactionApplication/index?mer_id=${mer_id}&business_status=${userInfoData.mer_info.business_status}`, '交易申请')">
<image class="icon_img" src="@/static/images/jy.png" mode="aspectFill"> <image class="icon_img" src="@/static/images/jy.png" mode="aspectFill">
</image> </image>
<text class="text">交易申请</text> <text class="text">交易申请</text>

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

@ -16,28 +16,61 @@
</view> </view>
</view> --> </view> -->
<view class="" v-if="cloudList.length>0">
<view class=""> <view class="">
<!-- <view :style="`height: ${appInfo.top}px;background-color: red;z-index: 99999;`"></view> --> <view class="">
<!-- <transition name="fade"> --> <view v-if="showtit">
<view :class="{'head':true,'show':showtit}" style="padding-top: var(--status-bar-height);" <view :class="{'head':true,'show':showtit}" style="padding-top: var(--status-bar-height);">
v-if="showtit">
<view style="display: flex;align-items: center;"> <view style="display: flex;align-items: center;">
<u--image :showLoading="true" src="/static/images/LHYC/FH.png" width="50.82rpx" <u--image :showLoading="true" v-if="cloudList.length>0" src="/static/images/LHYC/FH.png"
width="50.82rpx" height="50.82rpx" @click='goBack'></u--image>
<u--image v-else :showLoading="true" src="/static/images/LHYC/PFH.png" width="50.82rpx"
height="50.82rpx" @click='goBack'></u--image> height="50.82rpx" @click='goBack'></u--image>
<view class="head_tit"> <view class="head_tit" :style="{color:cloudList.length>0?'':'black'}">
{{town}}里海云仓 {{town}}里海云仓
</view> </view>
<view class="sl" :class="{actsl:showSelect}" @click="showSelect=!showSelect">
<u--image :showLoading="true" src="/static/images/GXSC/BSL.png" width="33.29rpx"
height="33.29rpx"></u--image>
</view>
</view>
<view class="" style="display: flex;align-items: center;">
<view style="display: flex;align-items: center;z-index: 999999;">
<u--image :showLoading="true" src="/static/images/LHYC/DWB.png" width="50.82rpx"
height="50.82rpx"></u--image>
<view class="town_name" :style="{color:cloudList.length>0?'':'black'}"
@click="showpick">{{street}}</view>
</view> </view>
<view class="head_r" @click="showPop=true"> <view class="head_r" @click="showPop=true">
<u--image :showLoading="true" src="/static/images/LHYC/QB.png" width="50.82rpx" <u--image v-if="cloudList.length>0" :showLoading="true" src="/static/images/LHYC/QB.png"
width="50.82rpx" height="50.82rpx"></u--image>
<u--image v-else :showLoading="true" src="/static/images/LHYC/QB.png" width="50.82rpx"
height="50.82rpx"></u--image> height="50.82rpx"></u--image>
<text>全部</text> <text :style="{color:cloudList.length>0?'':'black'}">全部</text>
</view>
</view>
</view>
<view class="selected-list" :style="`top:${headtop}px`" :class="{actSel:showSelect}">
<div class="triangle-up"></div>
<view
@click="navgo(`/pages/nongKe/supply_chain/supplier?type_id=10&street_id=${street_code}&townName=${street}`)">
供销综合云市场 <text></text>
</view>
<view class="selected-li">
供销综合云商品 <text> <u--image style="margin-left: 40rpx;" :showLoading="true"
src="/static/images/GXSC/XZ.png" width="24.53rpx" height="24.53rpx"></u--image>
</text>
</view> </view>
</view> </view>
<!-- </transition> --> </view>
<!-- <transition name="fade"> -->
<!-- 滚动 --> <!-- 滚动 -->
<view :class="{'heads':true,'show':!showtit}" style="padding-top: var(--status-bar-height);"> <view :class="{'heads':true,'show':!showtit}" style="padding-top: var(--status-bar-height);">
<view style="align-items: center;display: flex;justify-content: space-between;"> <view style="align-items: center;display: flex;justify-content: space-between;">
@ -67,8 +100,8 @@
</view> </view>
</view> </view>
</view> </view>
<!-- </transition> -->
<view class="box"> <view class="box" v-if="cloudList.length>0">
<view :class="act_swiper"> <view :class="act_swiper">
<swiper :autoplay="false" :active-class="activeClass" :interval="3000" class="swipers" <swiper :autoplay="false" :active-class="activeClass" :interval="3000" class="swipers"
:circular="true" previous-margin='0rpx' next-margin='0rpx' :current="current" :circular="true" previous-margin='0rpx' next-margin='0rpx' :current="current"
@ -83,8 +116,7 @@
</view> </view>
<!-- <u--image :showLoading="true" src="/static/images/LHYC/BG.png" width="750rpx"
height="998.83rpx"></u--image> -->
<view class="menu" v-if="showtit" style="transition: 1s;"> <view class="menu" v-if="showtit" style="transition: 1s;">
<swiper :autoplay="false" :active-class="activeClass" :interval="3000" class="swiper" <swiper :autoplay="false" :active-class="activeClass" :interval="3000" class="swiper"
:circular="true" previous-margin='270rpx' next-margin='270rpx' :current="current" :circular="true" previous-margin='270rpx' next-margin='270rpx' :current="current"
@ -99,7 +131,6 @@
</swiper> </swiper>
</view> </view>
<!-- 商品列表 --> <!-- 商品列表 -->
<transition name="fade">
<view class="content"> <view class="content">
<view class="content_sift" :style="{position:pocls,top:(headtop)+'px'}" v-if="!showtit"> <view class="content_sift" :style="{position:pocls,top:(headtop)+'px'}" v-if="!showtit">
<view :class="{act:item.act,price_sift:true}" v-for="item,index in actList" :key="index" <view :class="{act:item.act,price_sift:true}" v-for="item,index in actList" :key="index"
@ -117,7 +148,7 @@
<view class="empty" v-if='showLoading'> <view class="empty" v-if='showLoading'>
<u-loading-icon v-if='showLoading' text="加载中" textSize="18"></u-loading-icon> <u-loading-icon v-if='showLoading' text="加载中" textSize="18"></u-loading-icon>
</view> </view>
<view class="goods" @click="godDetail(item)" v-else v-for="item,index in goodsList"> <view class="goods" @click="goodDetail(item)" v-else v-for="item,index in goodsList">
<view class="left"> <view class="left">
<u--image :showLoading="true" :src="item.image" width="192.76rpx" <u--image :showLoading="true" :src="item.image" width="192.76rpx"
height="192.76rpx"></u--image> height="192.76rpx"></u--image>
@ -142,13 +173,6 @@
￥30.00 ￥30.00
</view> </view>
</view> </view>
<!-- :style="{'transform': `translateY(${trnList[index].bottom}) translateX(${trnList[index].left})`,'transition':'1s'}" -->
<!-- <view class="good_price_r" @click.stop="addcart(item)">
<u--image :class="'act_class'+index" class="act_class"
:showLoading="true" src="/static/images/LHYC/J.png"
width="49.07rpx" height="49.07rpx"></u--image>
</view> -->
<view class="good_price_r"> <view class="good_price_r">
<view :class="{x_tra:trnList[index].bottom }" <view :class="{x_tra:trnList[index].bottom }"
:style="`transform:translateY(${trnList[index].bottom}px);transition:${trnList[index].bottom?1:0}s cubic-bezier(0.4, -0.9, 0.75, 1);`" :style="`transform:translateY(${trnList[index].bottom}px);transition:${trnList[index].bottom?1:0}s cubic-bezier(0.4, -0.9, 0.75, 1);`"
@ -175,7 +199,7 @@
<view class="info"> <view class="info">
<u--image :showLoading="true" src="/static/images/noCart.png" width="400.09rpx" <u--image :showLoading="true" src="/static/images/noCart.png" width="400.09rpx"
height="400.09rpx"></u--image> height="400.09rpx"></u--image>
<view class="" style="text-align: center;"> <view class="" style="text-align: center;color:#999">
暂无商品 暂无商品
</view> </view>
</view> </view>
@ -208,13 +232,13 @@
</view> </view>
</view> </view>
</view> </view>
</transition>
</view> </view>
<!-- http://192.168.1.5:8080/ -->
</view> </view>
<!-- 组件 --> <!-- 组件 -->
<view<u-popup mode="right" :show="showPop" @close="showPop=false" @open="showPop=true"> <view class="" v-if="showPop">
<u-popup mode="right" :show="showPop" @close="showPop=false" @open="showPop=true">
<view class="pop"> <view class="pop">
<view style="height: var(--status-bar-height);"></view> <view style="height: var(--status-bar-height);"></view>
<view class="pop_head" style="display: flex;"> <view class="pop_head" style="display: flex;">
@ -224,7 +248,7 @@
里海云仓 里海云仓
</view> </view>
</view> </view>
<view class="pop_content"> <view class="pop_content" v-if="cloudList.length">
<view class="pop_li" @click="all(index)" v-for="item,index in cloudList" :key="index"> <view class="pop_li" @click="all(index)" v-for="item,index in cloudList" :key="index">
<u--image :showLoading="true" :src="item.background" width="84.11rpx" <u--image :showLoading="true" :src="item.background" width="84.11rpx"
height="84.11rpx"></u--image> height="84.11rpx"></u--image>
@ -238,20 +262,36 @@
</view> </view>
</view> </view>
</view> </view>
</view>
</u-popup>
</view> <view v-else>
<view class="empty" style="" v-else> <!-- <u--image :showLoading="true" src="/static/images/LHYC/PFH.png" width="50.82rpx" height="50.82rpx"
<view style="height: var(--status-bar-height);"></view>
<view style="padding: 10rpx;">
<u--image :showLoading="true" src="/static/images/LHYC/PFH.png" width="50.82rpx" height="50.82rpx"
@click='goBack'></u--image> @click='goBack'></u--image>
</view> </view> -->
<view class="info"> <view class="yuncangempty">
<u--image :showLoading="true" src="/static/images/noCart.png" width="400.09rpx" <u--image :showLoading="true" src="/static/images/noCart.png" width="400.09rpx"
height="400.09rpx"></u--image> height="400.09rpx"></u--image>
<view class="" style="text-align: center;"> <view class="" style="text-align: center;color:#999">
当前区域暂无云仓
</view>
</view>
</view>
</view>
</u-popup>
</view>
</view>
<view class="empty" style="" v-if="cloudList.length<=0">
<view style="height: var(--status-bar-height);"></view>
<view style="padding: 10rpx;">
<view class="info">
<u--image :showLoading="true" src="/static/images/noCart.png" width="400.09rpx"
height="400.09rpx"></u--image>
<view class="" style="text-align: center;color:#999">
当前区域暂无云仓 当前区域暂无云仓
</view> </view>
</view> </view>
@ -260,7 +300,18 @@
<!-- 多规格购物车 --> <!-- 多规格购物车 -->
<view class="" style="z-index: 9999;">
<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse">
</authorize>
<view class="" :style="`height:${appInfo.bottom}px;background-color:white`">
</view>
</view>
<view class="">
<u-picker :defaultIndex="defaInd" :show="showPicker" ref="uPicker" :columns="columnData" @confirm="confirm"
@cancel="showPicker = false" @change="changeHandler" keyName="name"></u-picker>
</view>
<view class="" v-if="showcartpop">
<u-popup :show="showcartpop" @close="closecartpop" @open="opencartpop"> <u-popup :show="showcartpop" @close="closecartpop" @open="opencartpop">
<view class="sku"> <view class="sku">
<view class="sku_head"> <view class="sku_head">
@ -282,8 +333,6 @@
</view> </view>
</view> </view>
</view> </view>
<view class="sku_size"> <view class="sku_size">
<view class="" style="margin-bottom: 10rpx;"> <view class="" style="margin-bottom: 10rpx;">
尺码 尺码
@ -292,7 +341,6 @@
<text class="size_li" :class="{act_size_li:item.sku==skusize}" <text class="size_li" :class="{act_size_li:item.sku==skusize}"
v-for="(item,index) in skuform.sku" @click="skusizechange(item.sku)">{{item.sku}}</text> v-for="(item,index) in skuform.sku" @click="skusizechange(item.sku)">{{item.sku}}</text>
<!-- <text class="size_li">{item.sku}</text> -->
</view> </view>
</view> </view>
<view class="sku_num"> <view class="sku_num">
@ -304,9 +352,7 @@
</view> </view>
</view> </view>
<view class="skuaddcart" @click="skuaddcart"> <view class="skuaddcart" @click="skuaddcart">
确定 确定
</view> </view>
</view> </view>
@ -314,19 +360,6 @@
</view> </view>
<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse">
</authorize>
<view class="" :style="`height:${appInfo.bottom}px;background-color:white`">
</view>
</view>
</view> </view>
</template> </template>
@ -350,13 +383,27 @@
import { import {
goShopDetail goShopDetail
} from '@/libs/order.js' } from '@/libs/order.js'
// 7200 = 8 = 80000 8616
import { import {
postCartAdd, postCartAdd,
} from '@/api/store.js'; } from '@/api/store.js';
import authorize from '@/components/Authorize'; import authorize from '@/components/Authorize';
import {
getArea,
getStreet
} from '@/api/article.js';
import {
getIndexData,
getDiy
} from '@/api/api.js'
import {
getGeocoder
} from '@/api/store.js';
import { import {
mapGetters mapGetters
} from "vuex"; } from 'vuex'
import Cache from '@/utils/cache';
export default { export default {
components: { components: {
authorize, authorize,
@ -364,10 +411,10 @@
data() { data() {
let src = 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13'; let src = 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13';
return { return {
skuform: { skuform: {},
defaInd: [0, 0],
showPicker: false,
}, columnData: [],
skusize: 0, skusize: 0,
skuNumber: 1, skuNumber: 1,
showcartpop: false, showcartpop: false,
@ -383,10 +430,12 @@
isEmpty: false, isEmpty: false,
winHeight: 0, winHeight: 0,
cloudList: [], cloudList: [],
street: '',
street_code: '', street_code: '',
totalMoney: 0, totalMoney: 0,
town: '', town: '',
list: [1, 1, 1, 1, 1], list: [1, 1, 1, 1, 1],
showSelect: false,
showPop: false, showPop: false,
keyword: "", keyword: "",
showLoading: false, showLoading: false,
@ -430,10 +479,40 @@
this.street_code = e.street this.street_code = e.street
this.town = e.town this.town = e.town
this.getCloundShop() this.getCloundShop()
this.street = e.town
this.Area()
let that = this
setTimeout(() => {
uni.createSelectorQuery()
.in(this)
.select('.flags')
.boundingClientRect(rect => {
that.headtop = rect.top
})
.exec();
uni.createSelectorQuery()
.in(this)
.select('.flags')
.boundingClientRect(rect => {
this.headtop = rect.top
})
.exec();
uni.createSelectorQuery()
.in(this)
.select('.cart')
.boundingClientRect(rect => {
// console.log(this.cartTagInfo, 6666)
this.cartTagInfo = rect
})
.exec();
// console.log(that.headtop)
}, 500)
// console.log(this.appInfo, "手机信息") // console.log(this.appInfo, "手机信息")
}, },
onShow() { onShow() {
this.cartFn() this.cartFn()
this.showSelect = false
}, },
// 分页 // 分页
onReachBottom() { onReachBottom() {
@ -443,7 +522,7 @@
this.flag = true this.flag = true
cloudWarehouse({ cloudWarehouse({
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,
keyword: this.keyword, keyword: this.keyword,
page_num: this.page_num page_num: this.page_num
@ -472,8 +551,6 @@
// } // }
// }) // })
}, },
onPageScroll(e) { onPageScroll(e) {
let that = this let that = this
this.showtit = !Boolean(e.scrollTop) this.showtit = !Boolean(e.scrollTop)
@ -494,22 +571,6 @@
} }
}) })
.exec(); .exec();
if (this.headtop) return
uni.createSelectorQuery()
.in(this)
.select('.flags')
.boundingClientRect(rect => {
this.headtop = rect.top
})
.exec();
uni.createSelectorQuery()
.in(this)
.select('.cart')
.boundingClientRect(rect => {
this.cartTagInfo = rect
})
.exec();
}, },
onPullDownRefresh() { onPullDownRefresh() {
this.getCloundShop() this.getCloundShop()
@ -517,11 +578,94 @@
this.cartFn() this.cartFn()
uni.stopPullDownRefresh() uni.stopPullDownRefresh()
}, },
// onReachBottom() {
// console.log("daidi")
// },
methods: { methods: {
showpick() {
this.showPicker = !this.showPicker
},
swiperClick(item) {
const url = item.info[1].value
uni.navigateTo({
url: url
})
},
selectLocation() {
this.isSelectPlace ? this.showPicker = true : ''
},
confirm(e) {
this.showPicker = false
this.$emit('selectPlce', e)
this.$emit('change', e)
this.street = e.value[1].name
this.$nextTick(() => {
this.$bus.$emit('value-updated', e.value[1].name + ',' + e.value[1].code);
})
// this.sotreParam.street_id = e.value[1].code
this.street_code = e.value[1].code
this.getCloundShop()
this.town = e.value[1].name
// this.storeMerchantList()
},
changeHandler(e) {
const {
columnIndex,
value,
values,
index,
picker = this.$refs.uPicker
} = e;
if (columnIndex === 0) {
getStreet({
area_code: value[0]['code']
}).then(res => {
picker.setColumnValues(1, res.data);
});
}
},
Area() {
let that = this
getArea({
city_code: 510500
}).then(res => {
this.$refs.uPicker.setColumnValues(0, res.data);
this.Street(res.data[0]['code']);
// console.log(res.data, 66666)
});
},
Street(code) {
getStreet({
area_code: code
}).then(res => {
this.$refs.uPicker.setColumnValues(1, res.data);
});
},
swiperChange(e) {
let {
current,
source
} = e.detail;
if (source === 'autoplay' || source === 'touch') {
this.bgColor = this.swiper.url[e.detail.current]['img']
this.$emit('kkchange', this.bgColor)
}
},
// 对象转数组
objToArr(data) {
let obj = Object.keys(data).sort();
let m = obj.map(key => data[key]);
return m;
},
skusizechange(i) { skusizechange(i) {
this.skusize = i this.skusize = i
@ -554,9 +698,8 @@
}, },
valChange(e) { valChange(e) {
console.log(e.value)
this.skuNumber = e.value this.skuNumber = e.value
// this.valChange = e.value
}, },
closecartpop() { closecartpop() {
this.showcartpop = false this.showcartpop = false
@ -578,7 +721,7 @@
}, },
cartFn() { cartFn() {
getCartList().then(res => { getCartList().then(res => {
console.log(res) // console.log(res)
this.totalMoney = 0 this.totalMoney = 0
this.cartList = res.data.list this.cartList = res.data.list
this.cartList.forEach(e => { this.cartList.forEach(e => {
@ -594,7 +737,7 @@
this.goodsNum = res.data[0].count this.goodsNum = res.data[0].count
}) })
}, },
godDetail(item) { goodDetail(item) {
goShopDetail(item, this.uid).then(res => { goShopDetail(item, this.uid).then(res => {
if (this.isLogin) { if (this.isLogin) {
initiateAssistApi(item.activity_id).then(res => { initiateAssistApi(item.activity_id).then(res => {
@ -617,7 +760,6 @@
}) })
}, },
serch() { serch() {
// console.log(this.keyword)
this.getList() this.getList()
}, },
goBack() { goBack() {
@ -648,7 +790,7 @@
this.status = "loading" this.status = "loading"
cloudWarehouse({ cloudWarehouse({
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,
keyword: this.keyword, keyword: this.keyword,
page_num: this.page_num page_num: this.page_num
@ -666,14 +808,12 @@
}, },
addcart(item, i) { addcart(item, i) {
// console.log(this.isLogin)
if (!this.isLogin) { if (!this.isLogin) {
this.isAuto = true; this.isAuto = true;
this.isShowAuth = true this.isShowAuth = true
return return
} }
// console.log(item.sku[''] ? "1" : "2")
if (item.sku['']) { if (item.sku['']) {
let data = { let data = {
cart_num: 1, cart_num: 1,
@ -683,14 +823,11 @@
product_type: item.product_type, product_type: item.product_type,
spread_id: "", spread_id: "",
} }
let that = this let that = this
// return
uni.createSelectorQuery().in(this).select(`.act_class${i}`).boundingClientRect(data1 => { uni.createSelectorQuery().in(this).select(`.act_class${i}`).boundingClientRect(data1 => {
that.trnList[i].left = this.cartTagInfo.left - data1.left; that.trnList[i].left = this.cartTagInfo.left - data1.left;
that.trnList[i].bottom = this.cartTagInfo.top - data1.top; that.trnList[i].bottom = this.cartTagInfo.top - data1.top;
console.log(that.trnList[i])
let timer = setTimeout(() => { let timer = setTimeout(() => {
that.trnList[i].left = 0 that.trnList[i].left = 0
that.trnList[i].bottom = 0 that.trnList[i].bottom = 0
@ -710,7 +847,6 @@
}) })
}).catch(err => { }).catch(err => {
// this.act_cart = false
uni.showToast({ uni.showToast({
title: err, title: err,
icon: "none", icon: "none",
@ -725,11 +861,8 @@
this.showcartpop = true this.showcartpop = true
const keys = Object.keys(item.sku); const keys = Object.keys(item.sku);
const firstKey = keys[0]; const firstKey = keys[0];
// console.log(keys[0])
this.skusize = keys[0] this.skusize = keys[0]
// console.log(this.skuform)
} }
return return
@ -758,6 +891,7 @@
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
}).then(res => { }).then(res => {
this.trnList = []
this.goodsList = res.data.list this.goodsList = res.data.list
this.goodsList.forEach(item => { this.goodsList.forEach(item => {
this.trnList.push({ this.trnList.push({
@ -766,8 +900,6 @@
}) })
}) })
}) })
// console.log(this.cloudList)
data.length < 1 ? Toast("暂无云仓") : '';
} }
} }
} }
@ -786,6 +918,39 @@
} }
} }
.selected-list {
padding: 24rpx 14rpx;
border-radius: 10.51rpx 10.51rpx 10.51rpx 10.51rpx;
background-color: #fff;
position: absolute;
left: 100rpx;
font-size: 29.79rpx;
z-index: 9999;
// top: 100rpx;
opacity: 0;
transition: 0.5s;
.triangle-up {
width: 0;
height: 0;
border-left: 10rpx solid transparent;
border-right: 10rpx solid transparent;
border-bottom: 10rpx solid white;
position: absolute;
top: -10rpx;
}
.selected-li {
margin-top: 35rpx;
color: #F84221;
display: flex;
align-items: center;
}
}
.sku { .sku {
padding: 20rpx; padding: 20rpx;
@ -1018,8 +1183,15 @@
.head_tit { .head_tit {
margin-left: 20rpx; margin-left: 20rpx;
font-size: 40rpx; font-size: 40rpx;
// background-color: red;
width: 40vw;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
// font-weight: 700; // font-weight: 700;
transform: skewX(-10deg); // transform: skewX(-10deg);
} }
@ -1029,7 +1201,7 @@
.head { .head {
position: fixed; position: fixed;
z-index: 100; z-index: 999;
color: white; color: white;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
@ -1068,6 +1240,17 @@
} }
.town_name {
margin-right: 50rpx;
// background-color: red;
max-width: 15vw;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.goods_list { .goods_list {
min-height: 95vh; min-height: 95vh;
padding: 0 10rpx; padding: 0 10rpx;
@ -1232,91 +1415,91 @@
height: 35rpx; height: 35rpx;
} }
.cloud_entrepot { // .cloud_entrepot {
background: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13/ycbg.png") no-repeat; // background: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13/ycbg.png") no-repeat;
background-size: cover; // background-size: cover;
padding-bottom: 92.98rpx; // padding-bottom: 92.98rpx;
} // }
.head-wrapper { // .head-wrapper {
height: 485.96rpx; // height: 485.96rpx;
width: 100%; // width: 100%;
background: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13/top.png") no-repeat; // background: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13/top.png") no-repeat;
background-size: cover; // background-size: cover;
margin-bottom: 49.12rpx; // margin-bottom: 49.12rpx;
} // }
.town-title { // .town-title {
margin: 0 auto; // margin: 0 auto;
width: 100%; // width: 100%;
text-align: center; // text-align: center;
font-size: 50.88rpx; // font-size: 50.88rpx;
color: #fff; // color: #fff;
margin-bottom: 28.07rpx; // margin-bottom: 28.07rpx;
&::after { // &::after {
content: ''; // content: '';
display: inline-block; // display: inline-block;
width: 66.67rpx; // width: 66.67rpx;
height: 31.58rpx; // height: 31.58rpx;
background: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13/you.png") no-repeat; // background: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13/you.png") no-repeat;
background-size: cover; // background-size: cover;
margin-left: 24.56rpx; // margin-left: 24.56rpx;
} // }
&::before { // &::before {
content: ''; // content: '';
display: inline-block; // display: inline-block;
width: 66.67rpx; // width: 66.67rpx;
height: 31.58rpx; // height: 31.58rpx;
background: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13/zuo.png") no-repeat; // background: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13/zuo.png") no-repeat;
background-size: cover; // background-size: cover;
margin-right: 24.56rpx; // margin-right: 24.56rpx;
} // }
} // }
.body-wrapper { // .body-wrapper {
width: 694.74rpx; // width: 694.74rpx;
display: flex; // display: flex;
justify-content: space-between; // justify-content: space-between;
flex-wrap: wrap; // flex-wrap: wrap;
margin: 0 auto; // margin: 0 auto;
.item { // .item {
width: 336.84rpx; // width: 336.84rpx;
height: 100%; // height: 100%;
padding: 24.56rpx 28.07rpx; // padding: 24.56rpx 28.07rpx;
margin-bottom: 21.05rpx; // margin-bottom: 21.05rpx;
background-repeat: no-repeat; // background-repeat: no-repeat;
background-size: 100% 100%; // background-size: 100% 100%;
box-sizing: border-box; // box-sizing: border-box;
text { // text {
display: block; // display: block;
font-size: 24.56rpx; // font-size: 24.56rpx;
color: #999; // color: #999;
margin-bottom: 14.04rpx; // margin-bottom: 14.04rpx;
} // }
.item-title { // .item-title {
font-size: 31.58rpx; // font-size: 31.58rpx;
color: #333; // color: #333;
} // }
.chakan-btn { // .chakan-btn {
width: 114.04rpx; // width: 114.04rpx;
height: 49.12rpx; // height: 49.12rpx;
font-size: 28.07rpx; // font-size: 28.07rpx;
text-align: center; // text-align: center;
line-height: 49.12rpx; // line-height: 49.12rpx;
color: #fff; // color: #fff;
margin-top: auto; // margin-top: auto;
background: linear-gradient(90deg, #FE5300 0%, #F84221 100%); // background: linear-gradient(90deg, #FE5300 0%, #F84221 100%);
border-radius: 50px; // border-radius: 50px;
} // }
} // }
} // }
.empty { .empty {
// display: flex; // display: flex;
@ -1363,4 +1546,27 @@
display: flex; display: flex;
align-items: center; align-items: center;
} }
.sl {
margin-left: 20rpx;
transform: rotate(180deg);
transition: 0.5s;
}
.actsl {
transform: rotate(0deg);
}
.actSel {
opacity: 1;
// transform: translateX(100rpx);
}
.yuncangempty {
margin: 20vh 0;
display: flex;
flex-direction: column;
align-items: center
}
</style> </style>

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

@ -14,21 +14,44 @@
<view class="back" @click='backjJump()' style="margin-right: 17rpx;"> <view class="back" @click='backjJump()' style="margin-right: 17rpx;">
<view class="iconfont icon-xiangzuo" style="color: #333333;"></view> <view class="iconfont icon-xiangzuo" style="color: #333333;"></view>
</view> </view>
<view class="" style="font-size: 40rpx;font-weight: 700;transform: skewX(-10deg);"> <view class="" style="font-size: 40rpx;font-weight: 700;">
供销综合云市场 供销综合云市场
</view> </view>
<view style="margin-left: 20rpx;transition: 0.3s;" @click="showSelect=!showSelect"
:class="{selects:showSelect}">
<u--image :showLoading="true" src="/static/images/GXSC/XL.png" width="33.29rpx"
height="33.29rpx"></u--image>
</view> </view>
</view>
<view class="">
<view style="position: relative;width: 289.14rpx;">
<u-search borderColor="#FF6D20" bgColor="white" @change="test" :showAction="false"
placeholder="请输入..." v-model="sotreParam.keyword" class="serch_cls"></u-search>
<u--image @tap="searchSubmit" class="img_cls" :showLoading="true"
src="/static/images/GXSC/SS.png" width="115.65rpx" height="56.82rpx"></u--image>
</view> </view>
<view class='iconfont search-right' <!-- 搜索框 -->
@click="goMap(`/pages/nongKe/supply_chain/maps?street_id=${street_id}`)"> <view style="position: relative;width: 289.14rpx;" v-if="showSerch">
<u--image :showLoading="true" src="/static/images/GXSC/DW.png" width="50.82rpx" <u-search borderColor="#FF6D20" bgColor="white" @change="test" :showAction="false"
placeholder="请输入..." v-model="sotreParam.keyword" @search="onInputConfirm"
class="serch_cls"></u-search>
<u--image @tap="searchSubmit" class="img_cls" :showLoading="true"
src="/static/images/GXSC/SSBT.png" width="115.65rpx" height="56.82rpx"></u--image>
</view>
<!-- 位置 -->
<view v-else style="display: flex;align-items: center;" @click="showPicker=!showPicker">
<u--image @tap="showSerch=!showSerch" style="margin-right: 30rpx;" :showLoading="true"
src="/static/images/GXSC/SS.png" width="49rpx" height="49rpx"></u--image>
<u--image :showLoading="true" src="/static/images/GXSC/DW1.png" width="50.82rpx"
height="50.82rpx"></u--image> height="50.82rpx"></u--image>
<view class="town_name">{{street}}</view>
</view>
</view>
<view class="selected-list" :class="{actSel:showSelect}">
<div class="triangle-up"></div>
<view class="selected-li">
供销综合云市场 <text> <u--image style="margin-left: 40rpx;" :showLoading="true"
src="/static/images/GXSC/XZ.png" width="24.53rpx" height="24.53rpx"></u--image> </text>
</view>
<view class=""
@click="navGoto(`/pages/nongKe/cloud_entrepot/index?street=${street_id}&town=${street}`)">
供销综合云商品
</view> </view>
</view> </view>
@ -36,12 +59,13 @@
</view> </view>
<view class="content"> <view class="content">
<view style="background-color: red;height: 10px"> <view style="height: 10px">
</view> </view>
<view class="hot_serch"> <view class="hot_serch">
<text>热搜:</text> <text @click="hotSerchFn('小张副食')">小张副食</text> <text <text>热搜:</text>
@click="hotSerchFn('正新酒店')">正新酒店</text> <text @click="hotSerchFn('小张副食')">小张副食</text>
<text @click="hotSerchFn('正新酒店')">正新酒店</text>
<text @click="hotSerchFn('麻辣鸡')">麻辣鸡</text> <text @click="hotSerchFn('麻辣鸡')">麻辣鸡</text>
<text @click="hotSerchFn('手撕椒麻鸡')">手撕椒麻鸡</text> <text @click="hotSerchFn('手撕椒麻鸡')">手撕椒麻鸡</text>
</view> </view>
@ -274,6 +298,11 @@
<image :src="image"></image> <image :src="image"></image>
<image src="@/static/images/guanbi.png" class="guanbi" @click="close"></image> <image src="@/static/images/guanbi.png" class="guanbi" @click="close"></image>
</u-popup> </u-popup>
<view class="">
<u-picker :defaultIndex="defaInd" :show="showPicker" ref="uPicker" :columns="columnData" @confirm="confirm"
@cancel="showPicker = false" @change="changeHandler" keyName="name"></u-picker>
</view>
</view> </view>
</view> </view>
@ -303,6 +332,18 @@
configMap configMap
} from '@/utils'; } from '@/utils';
import easyLoadimage from '@/components/easy-loadimage/easy-loadimage.vue'; import easyLoadimage from '@/components/easy-loadimage/easy-loadimage.vue';
import {
getArea,
getStreet
} from '@/api/article.js';
import {
getIndexData,
getDiy
} from '@/api/api.js'
import Cache from '@/utils/cache';
const app = getApp(); const app = getApp();
export default { export default {
components: { components: {
@ -312,6 +353,9 @@
}, },
data() { data() {
return { return {
defaInd: [0, 0],
columnData: [],
showSerch: false,
imgList: [ imgList: [
"/static/images/GXSC/BBY.png", "/static/images/GXSC/BBY.png",
"/static/images/GXSC/NYSC.png", "/static/images/GXSC/NYSC.png",
@ -331,6 +375,7 @@
"/static/images/GXSC/JDMS.png", "/static/images/GXSC/JDMS.png",
], ],
street_id: "", street_id: "",
showSelect: false,
price: 0, price: 0,
stock: 0, stock: 0,
nows: false, nows: false,
@ -348,6 +393,8 @@
downKey: 0, downKey: 0,
downStatus: false, downStatus: false,
menuList: [], menuList: [],
street: "",
showPicker: false,
// 下拉菜单 // 下拉菜单
downMenu: [{ downMenu: [{
title: '默认', title: '默认',
@ -406,6 +453,7 @@
onLoad(options) { onLoad(options) {
// console.log(options); // console.log(options);
this.street_id = options.street_id this.street_id = options.street_id
this.street = options.townName
this.product_type = options.product_type ?? 0 this.product_type = options.product_type ?? 0
if (options.street_id != undefined) { if (options.street_id != undefined) {
this.sotreParam.street_id = options.street_id this.sotreParam.street_id = options.street_id
@ -424,7 +472,7 @@
supMenuApi().then(res => { supMenuApi().then(res => {
this.menuList = res.data this.menuList = res.data
}) })
this.Area()
}, },
computed: { computed: {
downMenus: function() { downMenus: function() {
@ -445,11 +493,103 @@
}, mapGetters(['viewColor'])), }, mapGetters(['viewColor'])),
}, },
methods: { methods: {
selectLocation() {
this.isSelectPlace ? this.showPicker = true : ''
},
confirm(e) {
this.showPicker = false
this.$emit('selectPlce', e)
this.$emit('change', e)
this.street = e.value[1].name
this.$nextTick(() => {
this.$bus.$emit('value-updated', e.value[1].name + ',' + e.value[1].code);
})
this.sotreParam.street_id = e.value[1].code
this.street_id = e.value[1].code
this.storeMerchantList()
},
changeHandler(e) {
const {
columnIndex,
value,
values,
index,
picker = this.$refs.uPicker
} = e;
if (columnIndex === 0) {
getStreet({
area_code: value[0]['code']
}).then(res => {
picker.setColumnValues(1, res.data);
});
}
},
Area() {
getArea({
city_code: 510500
}).then(res => {
this.$refs.uPicker.setColumnValues(0, res.data);
// this.Street(res.data[0]['code']);
// console.log(res.data, 66666)
});
},
Street(code) {
getStreet({
area_code: code
}).then(res => {
this.$refs.uPicker.setColumnValues(1, res.data);
console.log(res.data, 9999)
});
},
swiperChange(e) {
let {
current,
source
} = e.detail;
if (source === 'autoplay' || source === 'touch') {
this.bgColor = this.swiper.url[e.detail.current]['img']
this.$emit('kkchange', this.bgColor)
}
},
onInputConfirm() {
this.showSerch = false
this.searchSubmit()
},
// 对象转数组
objToArr(data) {
let obj = Object.keys(data).sort();
let m = obj.map(key => data[key]);
return m;
},
async getBanner(id) {
let that = this;
const {
data
} = await getDiy({
id: 0
})
that.styleConfig = that.objToArr(data.value);
/* 循环数组得到数据*/
that.styleConfig.forEach((item, index, arr) => {
if (item.name == 'headerSerch' || item.name == 'homeComb') {
if (item.name == 'homeComb') {
that.swiper.url = item.swiperConfig.list
}
}
})
this.bgColor = this.swiper.url[0].img
},
test() { test() {
if (this.sotreParam.keyword.length > 3) { if (this.sotreParam.keyword.length > 3) {
this.sotreParam.keyword.slice(0, 3) this.sotreParam.keyword.slice(0, 3)
this.sotreParam.keyword = this.sotreParam.keyword.slice(0, 3) + "..." this.sotreParam.keyword = this.sotreParam.keyword.slice(0, 3) + "..."
console.log(this.sotreParam.keyword)
} }
// console.log(this.sotreParam.keyword.length) // console.log(this.sotreParam.keyword.length)
}, },
@ -462,6 +602,11 @@
url url
}) })
}, },
navGoto(url) {
uni.redirectTo({
url
})
},
navGo(id) { navGo(id) {
uni.navigateTo({ uni.navigateTo({
url: `/pages/nongKe/supply_chain/supplierA?type_id=10&merchant_category_id=${id}&street_id=${this.street_id}` url: `/pages/nongKe/supply_chain/supplierA?type_id=10&merchant_category_id=${id}&street_id=${this.street_id}`
@ -644,7 +789,7 @@
// console.log(rqData) // console.log(rqData)
storeMerchantList(rqData).then(res => { storeMerchantList(rqData).then(res => {
this.count = res.data.count this.count = res.data.count
this.storeList = this.storeList.concat(res.data.list) this.storeList = (res.data.list)
this.loading = false this.loading = false
this.loadingIcon = false this.loadingIcon = false
}) })
@ -667,6 +812,7 @@
let that = this; let that = this;
that.$set(that.sotreParam, 'keyword', this.sotreParam.keyword); that.$set(that.sotreParam, 'keyword', this.sotreParam.keyword);
this.set_where(this.firstKey) this.set_where(this.firstKey)
this.showSerch = false
}, },
// 右侧切换 // 右侧切换
bindRight() { bindRight() {
@ -674,7 +820,7 @@
this.rightBox = true this.rightBox = true
}, },
// 组件确定 // 组件确定
confirm(data) { confirm1(data) {
let arr1 = [], let arr1 = [],
arr2 = [] arr2 = []
if (data.storeTypeArr.length == 0) { if (data.storeTypeArr.length == 0) {
@ -737,6 +883,9 @@
onPullDownRefresh() { onPullDownRefresh() {
uni.stopPullDownRefresh() uni.stopPullDownRefresh()
}, },
onShow() {
this.showSelect = false
},
//上划加载更多 //上划加载更多
onReachBottom() { onReachBottom() {
if (this.count === this.storeList.length) { if (this.count === this.storeList.length) {
@ -832,7 +981,7 @@
height: auto; height: auto;
background-color: white; background-color: white;
padding: 20rpx; padding: 20rpx;
border-radius: 20rpx; // border-radius: 20rpx;
display: flex; display: flex;
// align-items: center; // align-items: center;
@ -873,6 +1022,11 @@
} }
} }
.selects {
transform: rotate(180deg);
}
.search-right.styleType2 .right-text, .search-right.styleType2 .right-text,
.search-right.styleType3 .right-text { .search-right.styleType3 .right-text {
@ -901,6 +1055,16 @@
} }
} }
.town_name {
overflow: hidden;
white-space: nowrap;
/* 设置文本不换行 */
text-overflow: ellipsis;
max-width: 25vw;
font-size: 14px;
/* 设置溢出文本为省略号 */
}
.hot_serch { .hot_serch {
color: #B3B3B3; color: #B3B3B3;
display: flex; display: flex;
@ -1086,6 +1250,43 @@
margin-left: 10rpx; margin-left: 10rpx;
} }
.selected-list {
padding: 24rpx 14rpx;
border-radius: 10.51rpx 10.51rpx 10.51rpx 10.51rpx;
background-color: #fff;
position: absolute;
left: 100rpx;
font-size: 29.79rpx;
opacity: 0;
transition: 0.5s;
height: 0;
.triangle-up {
width: 0;
height: 0;
border-left: 10rpx solid transparent;
border-right: 10rpx solid transparent;
border-bottom: 10rpx solid white;
position: absolute;
top: -10rpx;
}
.selected-li {
margin-bottom: 35rpx;
color: #F84221;
display: flex;
align-items: center;
}
}
.actSel {
opacity: 1;
height: auto;
// transform: translateX(100rpx);
}
.store-wrapper { .store-wrapper {
margin-top: 235rpx; margin-top: 235rpx;
border-top: 1px solid #F6F6F6; border-top: 1px solid #F6F6F6;

2
pages/store/settled/index.vue
View File

@ -421,7 +421,7 @@
//获取商户入驻申请协议 //获取商户入驻申请协议
shoplist() { shoplist() {
agreeiness().then(res => { agreeiness().then(res => {
console.log(res) // console.log(res)
this.detail = res.data this.detail = res.data
}) })
}, },

2
pages/supply_chains/supply_chains.vue
View File

@ -36,7 +36,7 @@
<view class="list"> <view class="list">
<navigator hover-class="none" <navigator hover-class="none"
:url="`/pages/nongKe/supply_chain/supplier?type_id=10&street_id=${street_id}`"> :url="`/pages/nongKe/supply_chain/supplier?type_id=10&street_id=${street_id}&townName=${town}`">
<view class="list-m"> <view class="list-m">
<image src="@/static/images/f6.png" mode="aspectFit"></image> <image src="@/static/images/f6.png" mode="aspectFit"></image>
<view class="list-title"> <view class="list-title">

BIN
static/images/GXSC/BSL.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
static/images/GXSC/DW1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
static/images/GXSC/QB.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
static/images/GXSC/SL.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
static/images/GXSC/SS.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.7 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

BIN
static/images/GXSC/SSBT.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.7 KiB

BIN
static/images/GXSC/XL.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
static/images/GXSC/XZ.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 942 B

BIN
static/images/LHYC/DWB.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
static/images/LHYC/QB.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB