Merge remote-tracking branch 'remotes/old/zmj' into old

This commit is contained in:
jia 2023-09-11 11:56:59 +08:00
commit f3b6dfbe85

View File

@ -1,6 +1,6 @@
<template>
<view class="">
<!-- <view class="cloud_entrepot" :style="{'min-height': winHeight + 'px'}">
<!-- <view class="cloud_entrepot" :style="{'min-height': winHeight + 'px'}">
<view class="head-wrapper"></view>
<view class="town-title">{{town}}里海云仓</view>
<view class="body-wrapper">
@ -26,7 +26,7 @@
<u--image :showLoading="true" src="/static/images/LHYC/FH.png" width="50.82rpx"
height="50.82rpx" @click='goBack'></u--image>
<view class="head_tit">
通滩镇里海云仓
{{town}}里海云仓
</view>
</view>
<view class="head_r" @click="showPop=true">
@ -108,8 +108,6 @@
</view>
</view>
<view class="goods_list" v-if="goodsList.length>0">
<!-- <view style="background-color: white;height: 100rpx;" v-if="!showtit">
</view> -->
<view class="empty" v-if='showLoading'>
<u-loading-icon v-if='showLoading' text="加载中" textSize="18"></u-loading-icon>
</view>
@ -149,7 +147,7 @@
</view>
</view>
<view style="height: 100rpx;">
<u-loadmore :status="status" />
</view>
</view>
@ -162,7 +160,7 @@
</view>
</view>
<view class="card">
<view class="card" :style="`bottom:${appInfo.bottom}px`">
<view class="left">
<view class="" style="position: relative;">
<u--image :showLoading="true" src="/static/images/LHYC/GWC.png" width="63.09rpx"
@ -259,6 +257,7 @@
data() {
let src = 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13';
return {
appInfo: {},
pocls: "",
type: "",
act_swiper: "",
@ -279,6 +278,7 @@
cartList: [],
activeClass: 'activeClass',
headtop: "",
page_num: 1,
actList: [{
tit: '综合',
act: "",
@ -292,14 +292,9 @@
act: "",
screen: "price_asc"
}],
list3: [
'/static/images/LHYC/BG.png',
'/static/images/LHYC/WYLVYC.png',
'/static/images/LHYC/NFCPYC.png',
'/static/images/LHYC/BG.png',
'/static/images/LHYC/NFCPYC.png',
'/static/images/LHYC/NFCPYC.png',
],
status: "loadmore",
flag: false,
}
},
onLoad(e) {
@ -307,15 +302,31 @@
uni.getSystemInfo({
success: (res) => {
this.winHeight = res.windowHeight
this.appInfo = res.safeAreaInsets
},
});
this.street_code = e.street
this.town = e.town
this.getCloundShop()
},
onShow() {
//
// onReachBottom() {
// if (this.flag) return
// this.status = "loading"
// this.page_num += 1
// this.flag = true
// this.getList().then(res => {
// return
// this.goodsList = this.goodsList.concat(res.data.data)
// this.flag = false
// if (!res.data.data.length) {
// this.status = "nomore"
// this.flag = true
// }
// })
// },
},
onPageScroll(e) {
let that = this
this.showtit = !Boolean(e.scrollTop)
@ -323,6 +334,7 @@
.in(this)
.select('.content')
.boundingClientRect(rect => {
console.log(rect)
if (rect.top <= this.headtop) {
this.pocls = 'fixed'
this.act_swiper = 'act_swiper'
@ -419,7 +431,9 @@
street_code: this.street_code,
category_id: this.cloudList[this.current].category_id,
order: this.type,
keyword: this.keyword
keyword: this.keyword,
// page_num: this.page_num
}).then(res => {
this.goodsList = res.data.list
this.showLoading = false
@ -727,7 +741,7 @@
left: 50%;
transform: translateX(-50%);
position: fixed;
bottom: 0;
// bottom: 0;
background-color: #333333;
height: 101.64rpx;
border-radius: 50.82rpx;