mkm/new_shop_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

下拉

Browse Source
This commit is contained in:
1154079537 2024-05-11 14:38:31 +08:00
parent 8f7ba8ba4e
commit ed54b94354
6 changed files with 607 additions and 515 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
pages/chat/customer_list/index.vue
View File

@ -12,10 +12,11 @@
<view class="con line1" v-if="item.last && item.last.msn_type == 2">[表情]</view> <view class="con line1" v-if="item.last && item.last.msn_type == 2">[表情]</view>
<view class="con line1" v-if="item.last && item.last.msn_type == 3">[图片]</view> <view class="con line1" v-if="item.last && item.last.msn_type == 3">[图片]</view>
<view class="con line1" v-if="item.last && item.last.msn_type == 4">[商品]</view> <view class="con line1" v-if="item.last && item.last.msn_type == 4">[商品]</view>
<view class="con line1" v-if="item.last && (item.last.msn_type == 5 || item.last.msn_type == 6)">[订单]</view> <view class="con line1"
v-if="item.last && (item.last.msn_type == 5 || item.last.msn_type == 6)">[订单]</view>
</view> </view>
<view class="right-box"> <view class="right-box">
<view class="time">{{item.last && item.last.create_time.split(' ')[1] || ''}}</view> <view class="time">{{item.display_time}}</view>
<view class="num" v-if="item.num>0">{{item.num}}</view> <view class="num" v-if="item.num>0">{{item.num}}</view>
</view> </view>
</div> </div>
@ -23,18 +24,21 @@
<block v-if="type == 1 && list.length>0" v-for="(item,index) in list" :key="index"> <block v-if="type == 1 && list.length>0" v-for="(item,index) in list" :key="index">
<div class="item acea-row" @click="goPage(item)"> <div class="item acea-row" @click="goPage(item)">
<view class="logo"> <view class="logo">
<image :src="(item.user && item.user.avatar) ? item.user.avatar : '/static/images/f.png'" mode=""></image> <image :src="(item.user && item.user.avatar) ? item.user.avatar : '/static/images/f.png'"
mode=""></image>
</view> </view>
<view class="info"> <view class="info">
<view class="name">{{item.user && item.user.nickname}}</view> <view class="name">{{item.user && item.user.nickname}}</view>
<view class="con line1" v-if="item.last && item.last.msn_type == 1">{{item.last.msn}}</view> <view class="con line1" v-if="item.last && item.last.msn_type == 1">{{item.last.msn}}</view>
<view class="con line1" v-if="item.last && item.last.msn_type == 2">[表情]</view> <view class="con line1" v-if="item.last && item.last.msn_type == 2">[表情]</view>
<view class="con line1" v-if="item.last && item.last.msn_type == 3">[图片]</view> <view class="con line1" v-if="item.last && item.last.msn_type == 3">[图片]</view>
<view class="con line1" v-if="item.last && (item.last.msn_type == 4 || item.last.msn_type == 7)">[商品]</view> <view class="con line1"
<view class="con line1" v-if="item.last && (item.last.msn_type == 5 || item.last.msn_type == 6)">[订单]</view> v-if="item.last && (item.last.msn_type == 4 || item.last.msn_type == 7)">[商品]</view>
<view class="con line1"
v-if="item.last && (item.last.msn_type == 5 || item.last.msn_type == 6)">[订单]</view>
</view> </view>
<view class="right-box"> <view class="right-box">
<view class="time">{{item.last && item.last.create_time.split(' ')[1]}}</view> <view class="time">{{item.display_time}}</view>
<view class="num" v-if="item.num>0">{{item.num}}</view> <view class="num" v-if="item.num>0">{{item.num}}</view>
</view> </view>
</div> </div>
@ -57,9 +61,16 @@
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
import emptyPage from '@/components/emptyPage.vue' import emptyPage from '@/components/emptyPage.vue'
import { serviceList, serviceUserList } from "@/api/user"; import {
import { toLogin } from '@/libs/login.js'; serviceList,
import { mapGetters } from "vuex"; serviceUserList
} from "@/api/user";
import {
toLogin
} from '@/libs/login.js';
import {
mapGetters
} from "vuex";
export default { export default {
name: "CustomerList", name: "CustomerList",
components: { components: {
@ -207,6 +218,7 @@
transform: rotate(180deg); transform: rotate(180deg);
font-size: 36rpx; font-size: 36rpx;
} }
.popupn { .popupn {
position: fixed; position: fixed;
width: 100%; width: 100%;
@ -217,17 +229,20 @@
height: 90rpx; height: 90rpx;
line-height: 90rpx; line-height: 90rpx;
z-index: 100; z-index: 100;
.title { .title {
max-width: 560rpx; max-width: 560rpx;
margin: 0 auto; margin: 0 auto;
position: relative; position: relative;
} }
.iconfont { .iconfont {
display: inline-block; display: inline-block;
position: relative; position: relative;
top: 4rpx; top: 4rpx;
right: 0; right: 0;
} }
.mer_logo { .mer_logo {
width: 34rpx; width: 34rpx;
height: 34rpx; height: 34rpx;
@ -235,36 +250,44 @@
top: 6rpx; top: 6rpx;
right: 10px; right: 10px;
} }
.mer_name { .mer_name {
display: inline-block; display: inline-block;
max-width: 650rpx; max-width: 650rpx;
} }
.invoice-content { .invoice-content {
background-color: #ffffff; background-color: #ffffff;
} }
} }
.list_count { .list_count {
margin-top: 104rpx; margin-top: 104rpx;
} }
.item { .item {
align-items: center; align-items: center;
border-bottom: 1px solid #eee; border-bottom: 1px solid #eee;
padding: 20rpx 30rpx; padding: 20rpx 30rpx;
background-color: #fff; background-color: #fff;
.logo image { .logo image {
width: 88rpx; width: 88rpx;
height: 88rpx; height: 88rpx;
border-radius: 50%; border-radius: 50%;
} }
.info { .info {
width: 334rpx; width: 334rpx;
margin-left: 20rpx; margin-left: 20rpx;
.con { .con {
margin-top: 10rpx; margin-top: 10rpx;
color: #999999; color: #999999;
font-size: 24rpx; font-size: 24rpx;
} }
} }
.right-box { .right-box {
flex: 1; flex: 1;
display: flex; display: flex;
@ -272,9 +295,11 @@
align-items: flex-end; align-items: flex-end;
font-size: 20rpx; font-size: 20rpx;
color: #BBBBBB; color: #BBBBBB;
.time { .time {
margin-bottom: 10rpx; margin-bottom: 10rpx;
} }
.num { .num {
min-width: 6px; min-width: 6px;
background-color: var(--view-theme); background-color: var(--view-theme);

119
pages/cloud_warehouse/home/home.vue
View File

@ -6,18 +6,15 @@
.wholeSale { .wholeSale {
background-color: #f8fafb !important; background-color: #f8fafb !important;
.wholeSale-header-search-wrap {
padding: 30rpx 20rpx 0;
background-color: #fff;
}
.wholeSale-header { .wholeSale-header {
position: fixed; position: sticky;
width: 100%;
top: 0; top: 0;
left: 0;
background-color: #40AE36;
z-index: 100; z-index: 100;
margin-bottom: 20rpx;
background-color: #40AE36;
.scrollview { .scrollview {
display: flex; display: flex;
@ -52,21 +49,20 @@
} }
} }
.wholeSale-category { .wholeSale-section {
margin: 0 20rpx 20rpx; padding: 0rpx 20rpx;
background-color: #fff; background-color: #fff;
border-radius: 10rpx; transition: height .5s;
padding: 20rpx 20rpx 1rpx 20rpx; overflow: hidden;
.wholeSale-search { .wholeSale-nav {
display: flex; display: flex;
align-items: center; align-items: center;
margin-bottom: 40rpx; margin-bottom: 20rpx;
.icon { .icon {
margin-right: 20rpx; margin-right: 20rpx;
} }
}
.search_content { .search_content {
flex: 1; flex: 1;
@ -102,12 +98,12 @@
color: #fff; color: #fff;
} }
} }
}
.category { .category {
width: 100%; width: 100%;
overflow: hidden; overflow: auto;
margin-bottom: 20rpx; margin-bottom: 20rpx;
transition: height .8s;
.category-wrap { .category-wrap {
display: flex; display: flex;
@ -181,18 +177,49 @@
} }
} }
} }
} }
.wholeSale-con { .wholeSale-con {
height: 100vh;
margin: 0 20rpx; margin: 0 20rpx;
padding-bottom: 30rpx; padding-bottom: 30rpx;
} }
.comprehensive {
display: flex;
justify-content: space-between;
align-items: center;
padding: 0 50rpx;
[class^=comprehensive-] {
display: flex;
align-items: center;
text {
margin-right: 12rpx;
font-size: 26rpx;
color: #666666;
}
image {
width: 28rpx;
height: 28rpx;
}
.loudou {
width: 24rpx;
height: 24rpx;
}
}
}
} }
</style> </style>
<template> <template>
<view class="wholeSale"> <view class="wholeSale">
<!-- 顶部导航栏适配不同机 --> <!-- 顶部 -->
<view class="wholeSale-header"> <view class="wholeSale-header">
<!-- 适配不同机 -->
<view style="height: var(--status-bar-height);background-color: #40af37;"></view> <view style="height: var(--status-bar-height);background-color: #40af37;"></view>
<view style="display: flex;padding: 20rpx 28rpx;background-color: #40af37;color: #fff;"> <view style="display: flex;padding: 20rpx 28rpx;background-color: #40af37;color: #fff;">
<view style="display: flex;font-weight: bold;font-size: 32rpx;"><u-icon style="margin-right: 20rpx;" <view style="display: flex;font-weight: bold;font-size: 32rpx;"><u-icon style="margin-right: 20rpx;"
@ -200,10 +227,9 @@
</view> </view>
</view> </view>
<view class="wholeSale-category-wrap" :style="{height:'65px'}"></view> <!-- 分类区域 -->
<view class="wholeSale-section" :style="{height:wrapHeight}">
<view class="wholeSale-category"> <view class="wholeSale-nav">
<view class="wholeSale-search">
<view @click="navTo(`/pages/columnGoods/goods_search/index?back=true&searchVal=${where.keyword}`)" <view @click="navTo(`/pages/columnGoods/goods_search/index?back=true&searchVal=${where.keyword}`)"
hover-class="none" class="search_content flex_a_c_j_sb"> hover-class="none" class="search_content flex_a_c_j_sb">
<view class="flex_a_c search_content_wrap"> <view class="flex_a_c search_content_wrap">
@ -251,9 +277,12 @@
<!-- 内容 --> <!-- 内容 -->
<view class="wholeSale-con"> <view class="wholeSale-con">
<scroll-view :scroll-y="true" @scrolltolower="onScrollBottom" @scroll="onScroll" style="height: 100%;"
@refresherrefresh="refresh">
<!-- 流水瀑布 --> <!-- 流水瀑布 -->
<WaterfallsFlow :wfList='hostProduct' @itemTap="goDetail" :type="0" /> <WaterfallsFlow :wfList='hostProduct' @itemTap="goDetail" :type="0" />
<loadmore :type="isLoading"></loadmore> <loadmore :type="isLoading"></loadmore>
</scroll-view>
</view> </view>
</view> </view>
</template> </template>
@ -288,8 +317,9 @@
deduction_rate: '', //抵扣比例 deduction_rate: '', //抵扣比例
rand: 1 rand: 1
}, },
distance: 20, wrapHeight: 'auto',
scrollTop: 0 maxHeight: '',
scrollTop: 0,
} }
}, },
onLoad(option) { onLoad(option) {
@ -301,16 +331,30 @@
}, },
onPageScroll(e) { onPageScroll(e) {
uni.$emit('scroll'); uni.$emit('scroll');
this.scrollTop = e.scrollTop;
}, },
onPullDownRefresh() { onPullDownRefresh() {
this.getProductslist(true); this.getProductslist(true);
}, },
methods: { methods: {
refresh(e) {
console.log(e);
},
onScrollBottom(e) {
this.getProductslist();
},
onScroll(e) {
if (this.scrollTop > e.target.scrollTop) { //上拉
this.wrapHeight = '352rpx';
} else {
this.wrapHeight = 0;
}
this.scrollTop = e.target.scrollTop;
},
navTo(url) { navTo(url) {
uni.navigateTo({ uni.navigateTo({
url: url, url: url,
@ -324,9 +368,11 @@
} }
}) })
}, },
navBack() { navBack() {
uni.navigateBack(); uni.navigateBack();
}, },
tabsChange(e) { tabsChange(e) {
this.tabsCurr = e; this.tabsCurr = e;
}, },
@ -348,6 +394,11 @@
if (e == 0) this.where.cate_pid = this.store_category[this.cate_change] if (e == 0) this.where.cate_pid = this.store_category[this.cate_change]
.store_category_id; // 如若选中全部, 则取父级id .store_category_id; // 如若选中全部, 则取父级id
this.getProductslist(true); this.getProductslist(true);
this.$util.getDom(this, '.wholeSale-section', (res) => {
this.maxHeight = res.height + 'px';
})
}, },
getStoreCategory() { getStoreCategory() {
getStoreCategory(259).then(res => { getStoreCategory(259).then(res => {
@ -361,13 +412,13 @@
cate_name: '全部', cate_name: '全部',
store_category_id: '' store_category_id: ''
}) })
})
// 分类 setTimeout(() => {
this.$nextTick(() => { this.$util.getDom(this, '.wholeSale-section', (res) => {
this.$util.getDom(this, '.wholeSale-category', (res) => { this.wrapHeight = res.height + 'px';
this.categoryHeight = res.height; this.maxHeight = res.height;
}) })
}, 300)
}) })
}, },
getProductslist(reLoad = false) { getProductslist(reLoad = false) {

3
pages/index/index.vue
View File

@ -1094,9 +1094,6 @@
this.loadGoods(e); this.loadGoods(e);
}, },
loadGoods(e = 1) { loadGoods(e = 1) {
console.log(e);
this.$nextTick(() => { this.$nextTick(() => {
if (e == 1) return this.get_host_product(0); if (e == 1) return this.get_host_product(0);
if (e == 2) return this.get_host_home({ if (e == 2) return this.get_host_home({

6
pages/whole_sale/index.vue
View File

@ -265,7 +265,7 @@
limit: 20, limit: 20,
sale_type: 2, //1为零售, 2为批发 sale_type: 2, //1为零售, 2为批发
mer_type: 1, mer_type: 1,
mer_cate_pid: '', // cate_pid: '', //
cate_id: '', cate_id: '',
keyword: '', keyword: '',
deduction_rate: '', //抵扣比例 deduction_rate: '', //抵扣比例
@ -422,7 +422,7 @@
store_category_id: '' store_category_id: ''
}) })
this.cate_change_children = 0; this.cate_change_children = 0;
if (this.tabsCurr == 1) this.where.mer_cate_pid = this.store_category[e].store_category_id; if (this.tabsCurr == 1) this.where.cate_pid = this.store_category[e].store_category_id;
else { else {
this.where.cate_pid = this.store_category[e].store_category_id; this.where.cate_pid = this.store_category[e].store_category_id;
this.where.cate_id = ""; this.where.cate_id = "";
@ -436,7 +436,7 @@
}, },
changeChildrenCate(e) { changeChildrenCate(e) {
this.cate_change_children = e; this.cate_change_children = e;
let key = 'mer_cate_pid'; let key = 'cate_pid';
if (this.tabsCurr != 1) key = 'cate_id'; if (this.tabsCurr != 1) key = 'cate_id';
this.where[key] = this.store_category_children[e].store_category_id; this.where[key] = this.store_category_children[e].store_category_id;
if (e == 0) this.where[key] = this.store_category[this.cate_change].store_category_id; // 如若选中全部, 则取父级id if (e == 0) this.where[key] = this.store_category[this.cate_change].store_category_id; // 如若选中全部, 则取父级id

39
utils/mixin.js
View File

@ -1,20 +1,39 @@
const mixins = { const mixins = {
data() { data() {
return { return {
totalHeight: 0, wrapHeight: 'auto',
scrollInfo: undefined, clientY: 0,
userMoney: undefined maxHeight: 0,
} }
}, },
// 顶部导航栏透明滚动
onPageScroll(e) {
this.scrollInfo = e;
},
methods: { watch: {
getPageScroll() { 'where.cate_pid'(newVal, oldVal) {
this.$utils.getDom(); // if (newVal && !oldVal) {
// this.wrapHeight = this.wrapHeight + 24;
// this.maxHeight = this.wrapHeight;
// }
// if (!newVal && oldVal) {
// this.wrapHeight = this.wrapHeight - 24;
// this.maxHeight = this.wrapHeight;
// }
} }
},
methods: {
// 移动
onTouchMove(e) {
// const moveDistance = e.changedTouches[0].clientY - this.clientY;
// if (moveDistance > 5) {
// this.wrapHeight = this.maxHeight;
// } else {
// this.wrapHeight = 0;
// }
},
// 开始触摸屏幕
onTouchStart(e) {
// this.clientY = e.changedTouches[0].clientY;
},
} }
} }
export default mixins; export default mixins;