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

代码跟新

Browse Source
This commit is contained in:
jia 2023-09-04 09:55:56 +08:00
parent f9c1183c6c
commit 84bff6824d
6 changed files with 154 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
components/WaterfallsFlowItem/WaterfallsFlowItemo.vue
View File

@ -4,7 +4,7 @@
<image :src="item.image" mode="widthFix" class="item-img" />
<view class="title">{{item.title}}</view>
<view class="tag">
<!-- <view class="tag">
<view class="tag-one">
自营商品
</view>
@ -13,7 +13,7 @@
<text class="tag-twoa">折</text>
<text class="tag-twob">满20包邮</text>
</view>
</view>
</view> -->
<view class="relase">
<view class="relase-one">
{{item.rate}}
@ -46,11 +46,10 @@
},
methods: {
gogogo(item) {
uni.navigateTo({
url:'/pages/goods_details/index?id='+item.product_id
url: '/pages/goods_details/index?id=' + item.product_id
})
},
@ -140,14 +139,14 @@
.relase-one {
font-size: 26rpx;
font-family: SF Pro Display-Regular Italic, SF Pro Display;
font-weight: normal;
font-weight: 600;
color: #FF6D20;
}
.relase-two {
font-size: 23rpx;
font-family: PingFang SC-Regular, PingFang SC;
font-weight: 400;
font-weight: 500;
color: #B3B3B3;
margin-left: 13rpx;
}
@ -158,15 +157,17 @@
margin-bottom: 10rpx;
color: #F84221;
font-size: 44rpx;
font-weight: 600;
span {
color: #F84221;
font-size: 30rpx;
font-weight: 500;
}
text {
color: #F84221;
font-size: 37rpx;
font-size: 37rpx;
font-weight: 400;
}
}

44
components/zbpSwiper.vue
View File

@ -72,16 +72,16 @@
default: () => ({})
},
town: {
type:String,
type: String,
default: false
},
},
data() {
return {
defaInd: [0, 0],
street: '',
showPicker: false,
styleConfig: [],
columnData: [],
@ -101,12 +101,12 @@
}
},
watch:{
street(nval,val) {
this.street=nval
}
},
watch: {
street(nval, val) {
this.street = nval
}
},
created() {
this.getBanner()
@ -115,11 +115,11 @@
},
mounted() {
uni.$on('add', (res)=> {
this.street=res.split(',')[0]
uni.$on('add', (res) => {
this.street = res.split(',')[0]
})
this.$bus.$on('value-updated', (newValue) => {
// 更新父组件的值
// 更新组件的值
this.street = newValue.split(',')[0]
});
},
@ -135,19 +135,25 @@
this.isSelectPlace ? this.showPicker = true : ''
},
confirm(e) {
this.showPicker = false
this.$emit('selectPlce', e)
this.$emit('change', e)
this.street = e.value[1].name
uni.$emit('add',e.value[1].name+','+e.value[1].code)
this.$bus.$emit('value-updated',
e.value[1].name + ',' +
e.value[1].code);
// this.$nextTick(() => {
// uni.$emit('add', e.value[1].name + ',' + e.value[1].code)
// this.$bus.$emit('value-updated',
// e.value[1].name + ',' +
// e.value[1].code);
// })
uni.$emit('add', e.value[1].name + ',' + e.value[1].code)
this.$bus.$emit('value-updated',
e.value[1].name + ',' +
e.value[1].code);
},
changeHandler(e) {
const {

4
config/app.js
View File

@ -24,8 +24,8 @@ if (process.env.NODE_ENV === "development") {
// httpApiThree = 'baseUrlTest' // h5跨域配置
// #endif
} else if (process.env.NODE_ENV === 'production') {
// httpApi = 'https://shop.lihaink.cn' // 生产
httpApi = "https://crmeb-test.shop.lihaink.cn"
httpApi = 'https://shop.lihaink.cn' // 生产
// httpApi = "https://crmeb-test.shop.lihaink.cn"
httpApiTwo = 'https://nk.lihaink.cn' // 生产
httpApiThree = 'http://ceshi-oa.lihaink.cn' //生产
}

182
pages/gather/gather.vue
View File

@ -1,18 +1,19 @@
<template>
<view class="gather">
<!-- <view class="site-box flex_a_c_j_sb">
<view class="place_wrapper flex_a_c" @click="selectLocation">
<view class="iconfont icon-weizhi" style="margin-left: 20rpx;"></view>
<view class="town_name">{{street}}</view>
<view @click="selectLocation">
<view class="site-box flex_a_c_j_sb" :style="{'background-color':backColor}">
<view :class="['place_wrapper','flex_a_c',isFshow?'sitebox':'']">
<view :class="['iconfont','icon-weizhi',isFshow?'sitebox':'']" style="margin-left: 20rpx;">
</view>
<view class="town_name">{{street}}</view>
</view>
<navigator url="/pages/chat/customer_list/index?type=0" hover-class="none">
<view :class="['iconfont','icon-xiaoxi',isFshow?'sitebox':'']" style="color:#fff;"></view>
</navigator>
</view>
<navigator url="/pages/chat/customer_list/index?type=0" hover-class="none">
<view class="iconfont icon-xiaoxi" style="color:#fff;"></view>
</navigator>
<view class="bg-img" v-if="isFshow">
<img :src="bgColor" alt="">
</view>
</view> -->
</view>
<zbpSwiper :isSelectPlace="true" :location_Arr="locationArr" :town='street' @kkchange='kkchange'></zbpSwiper>
<u-empty :show="jurisdiction" marginTop="260" mode="permission" :text="emptyText"
@ -136,7 +137,10 @@
nowMenuList: [],
street: '',
showPicker: false,
columnData: []
columnData: [],
bgColor: '',
isFshow: false,
backColor: 'rgba(248, 66, 33, 0)'
};
},
computed: {
@ -157,7 +161,7 @@
this.jurisdiction = true
}
this.getUserInfo()
},
onPullDownRefresh() {
@ -165,16 +169,16 @@
uni.stopPullDownRefresh()
},
mounted() {
if(this.street.length<=0){
this.selfLocation()
if (this.street.length <= 0) {
this.appLocation()
}
// #ifdef H5
// 监听页面滚动事件
window.addEventListener("scroll", this.scrolling);
// #endif
this.$bus.$on('value-updated', (newValue) => {
// 更新父组件的值
this.street = newValue.split(',')[0]
});
@ -182,18 +186,65 @@
},
// #ifdef APP-PLUS
onPageScroll(e) {
// this.scrollTop = e.scrollTop;
console.log(e.scrollTop)
if (e.scrollTop > 0) {
this.isFshow = true
} else {
const scrollTop = e.scrollTop;
if (scrollTop <= 20) {
this.backColor = 'rgba(248, 66, 33, 0)'
this.isFshow = false
} else if (20 < scrollTop && scrollTop <= 100) {
this.backColor = 'rgba(248, 66, 33, .5)'
this.isFshow = true
} else if (scrollTop > 100) {
this.backColor = 'rgba(248, 66, 33, 1)'
this.isFshow = true
}
},
// #endif
methods: {
scrolling() {
// 滚动条距文档顶部的距离
let scrollTop =
window.pageYOffset ||
document.documentElement.scrollTop ||
document.body.scrollTop;
// 滚动条滚动的距离
let scrollStep = scrollTop - this.oldScrollTop;
// console.log("header 滚动距离 ", scrollTop);
// 更新——滚动前，滚动条距文档顶部的距离
this.oldScrollTop = scrollTop;
//变量windowHeight是可视区的高度
let windowHeight =
document.documentElement.clientHeight || document.body.clientHeight;
//变量scrollHeight是滚动条的总高度
let scrollHeight =
document.documentElement.scrollHeight || document.body.scrollHeight;
//滚动条到底部的条件
if (scrollTop + windowHeight == scrollHeight) {
//你想做的事情
// console.log("header 你已经到底部了");
}
if (scrollTop <= 20) {
this.backColor = 'rgba(248, 66, 33, 0)'
this.isFshow = false
} else if (20 < scrollTop && scrollTop <= 100) {
this.backColor = 'rgba(248, 66, 33, .5)'
this.isFshow = true
} else if (scrollTop > 100) {
this.backColor = 'rgba(248, 66, 33, 1)'
this.isFshow = true
}
},
// 初始化菜单
initMenu() {
let all = uni.getStorageSync('gatherAllMenuList');
@ -307,8 +358,8 @@
let town = res.data.address_reference.town.title
let street_id = res.data.address_reference.town.id
this.street = res.data.address_component.street
uni.$emit('add',town+','+street_id)
uni.$emit('add', town + ',' + street_id)
}).catch(err => {
uni.showToast({
title: err,
@ -327,43 +378,7 @@
});
},
scrolling() {
// 滚动条距文档顶部的距离
let scrollTop =
window.pageYOffset ||
document.documentElement.scrollTop ||
document.body.scrollTop;
// 滚动条滚动的距离
let scrollStep = scrollTop - this.oldScrollTop;
// console.log("header 滚动距离 ", scrollTop);
// 更新——滚动前，滚动条距文档顶部的距离
this.oldScrollTop = scrollTop;
//变量windowHeight是可视区的高度
let windowHeight =
document.documentElement.clientHeight || document.body.clientHeight;
//变量scrollHeight是滚动条的总高度
let scrollHeight =
document.documentElement.scrollHeight || document.body.scrollHeight;
//滚动条到底部的条件
if (scrollTop + windowHeight == scrollHeight) {
//你想做的事情
// console.log("header 你已经到底部了");
}
if (scrollStep < 0) {
this.isFshow = false
// console.log("header 滚动条向上滚动了！");
} else {
this.isFshow = true
// console.log("header 滚动条向下滚动了！");
}
// 判断是否到了最顶部
if (scrollTop <= 0) {
this.isFshow = false
// console.log("header 到了最顶部")
}
},
kkchange(e) {
this.bgColor = e
@ -401,36 +416,30 @@
.gather {
padding-bottom: 164.91rpx;
background: linear-gradient(180deg, #FFFFFF 0%, #F6F6F6 100%);
position: relative;
}
.bg-img {
position: absolute;
width: 100%;
height: 100%;
top: 0;
/* #ifdef MP || APP-PLUS */
z-index: -100;
/* #endif */
/* #ifdef H5 */
z-index: -100;
/* #endif */
z-index: -100;
filter: blur(0);
overflow: hidden;
.sitebox {
animation-name: fadeIn;
animation-duration: 3s;
animation-fill-mode: forwards;
}
@keyframes fadeIn {
from {
opacity: 0;
}
img {
width: 100%;
height: 100%;
filter: blur(30rpx);
transform: scale(1.5);
to {
opacity: 1;
}
}
.site-box {
width: 100%;
/* #ifdef MP || APP-PLUS */
height: 170rpx;
height: 160rpx;
/* #endif */
/* #ifdef H5 */
height: 120rpx;
@ -440,7 +449,15 @@
top: 0rpx;
position: fixed;
z-index: 999;
padding-top: 30rpx;
/* #ifdef MP || APP-PLUS */
padding-top: 75rpx;
/* #endif */
/* #ifdef H5 */
padding-top: 25rpx;
/* #endif */
padding-right: 20rpx;
// 位置
@ -449,17 +466,20 @@
margin-right: 24.56rpx;
font-size: 30rpx;
opacity: 0;
.town_name {
margin-left: 21rpx;
}
}
.iconfont {
opacity: 0;
font-size: 30rpx;
font-size: 35.09rpx;
}
}
.top_box {
// padding-top: 180rpx;
background: linear-gradient(#36A2FF, #fff);

5
pages/short_video/appSwiper/index.nvue
View File

@ -655,7 +655,7 @@
}
});
},
// 授权回调
// // 授权回调
onLoadFun() {
this.isShowAuth = false
this.getUserInfo()
@ -751,7 +751,8 @@
if (list.length == 0) return
let that = this;
that.loadVideo = list.length == that.limit
that.page = that.page + 1;
// that.page = that.page + 1;
that.page =1
var msg = list
for (let i = 0; i < msg.length; i++) {
msg[i]['isMore'] = false

26
pages/supply_chains/supply_chains.vue
View File

@ -290,13 +290,20 @@
// 监听页面滚动事件
window.addEventListener("scroll", this.scrolling);
// #endif
this.$bus.$on('value-updated', (newValue) => {
// 更新父组件的值
this.street = newValue.split(',')[0]
});
//解决第一次进入页面监听不到值
this.$nextTick(()=>{
this.$bus.$on('value-updated', (newValue) => {
// 更新父组件的值
this.street = newValue.split(',')[0]
this.town=newValue.split(',')[0]
this.street_id=newValue.split(',')[1]
});
})
if(this.street.length<=0){
this.selfLocation()
this.selfLocation()
}
},
@ -315,13 +322,6 @@
this.isFshow = true
} else if (e.scrollTop == 0) {
this.ishshow = false
this.isFshow = false
} else {
this.ishshow = false
this.isFshow = false
}
},
// #endif