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

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

Browse Source
This commit is contained in:
jia 2023-09-11 14:10:54 +08:00
commit cda132d920
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,7 +16,6 @@
</view> </view>
</view> --> </view> -->
<view class="" v-if="cloudList.length>0"> <view class="" v-if="cloudList.length>0">
<view class=""> <view class="">
<!-- <view style="height: var(--status-bar-height);"></view> --> <!-- <view style="height: var(--status-bar-height);"></view> -->
@ -98,15 +97,15 @@
</swiper-item> </swiper-item>
</swiper> </swiper>
</view> </view>
<transition name="fade">
<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}" v-for="item,index in actList" :key="index" <view :class="{act:item.act}" v-for="item,index in actList" :key="index"
@click="screenGoods(item.screen,index)"> @click="screenGoods(item.screen,index)">
{{item.tit}} {{item.tit}}
</view> </view>
</view> </view>
<transition name="fade">
<view class="content">
<view class="goods_list" v-if="goodsList.length>0"> <view class="goods_list" v-if="goodsList.length>0">
<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>
@ -147,7 +146,7 @@
</view> </view>
</view> </view>
<view style="height: 100rpx;"> <view style="height: 100rpx;">
<u-loadmore :status="status" /> <!-- <u-loadmore :status="status" /> -->
</view> </view>
</view> </view>
@ -225,8 +224,12 @@
height="400.09rpx"></u--image> height="400.09rpx"></u--image>
</view> </view>
</view>
<view class="" :style="`height:${appInfo.bottom}px;background-color:white`">
</view> </view>
</view> </view>
@ -334,7 +337,7 @@
.in(this) .in(this)
.select('.content') .select('.content')
.boundingClientRect(rect => { .boundingClientRect(rect => {
console.log(rect) // console.log(rect)
if (rect.top <= this.headtop) { if (rect.top <= this.headtop) {
this.pocls = 'fixed' this.pocls = 'fixed'
this.act_swiper = 'act_swiper' this.act_swiper = 'act_swiper'
@ -367,7 +370,6 @@
methods: { methods: {
cartFn() { cartFn() {
getCartList().then(res => { getCartList().then(res => {
this.cartList = res.data.list this.cartList = res.data.list
this.cartList[0].list.forEach(e => { this.cartList[0].list.forEach(e => {
this.totalMoney = this.totalMoney + Number(e.productAttr.price) * e.cart_num this.totalMoney = this.totalMoney + Number(e.productAttr.price) * e.cart_num
@ -644,7 +646,8 @@
} }
.goods_list { .goods_list {
min-height: 100vh;
// background-color: red;
.goods { .goods {
display: flex; display: flex;
@ -719,7 +722,7 @@
// } // }
.content_sift { .content_sift {
width: 730rpx; width: 750rpx;
padding: 22rpx 0; padding: 22rpx 0;
display: flex; display: flex;
justify-content: space-around; justify-content: space-around;
@ -875,7 +878,7 @@
// align-items: center; // align-items: center;
// padding: 20vh 0; // padding: 20vh 0;
position: relative; position: relative;
height: 85vh; height: 100vh;
.info { .info {
position: absolute; position: absolute;