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

Merge branch 'old' of https://gitea.lihaink.cn/mkm/nk-shop2.0 into wpf

Browse Source
This commit is contained in:
weipengfei 2023-09-05 10:43:44 +08:00
commit db0c91f3d9
7 changed files with 1008 additions and 1097 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
pages/gather/gather.vue
View File

@ -1,29 +1,25 @@
<template>
<view class="gather">
<view @click="selectLocation" v-if="isFshow">
<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 class="site-box flex_a_c_j_sb" :style="{'background-color':backColor}">
<view :class="['place_wrapper','flex_a_c',isFshow?'sitebox':'']" @click="selectLocation">
<view :class="['iconfont','icon-weizhi',isFshow?'sitebox':'']" style="color:#000;margin-left: 20rpx;">
</view>
<view class="town_name" style="color:#000;">{{street}}</view>
</view>
<navigator url="/pages/chat/customer_list/index?type=0" hover-class="none">
<view :class="['iconfont','icon-xiaoxi',isFshow?'sitebox':'']" style="color:#000;"></view>
</navigator>
</view>
<!-- <view class="site-box ','flex_a_c_j_sb'" v-if="ishshow">
<view class="bg-img">
<img :src="bgColor" alt="">
</view>
</view> -->
</view>
</view>
<zbpSwiper
:isSelectPlace="true"
@ -191,7 +187,7 @@ export default {
columnData: [],
bgColor: '',
isFshow: false,
backColor: 'rgba(248, 66, 33, 0)'
backColor: 'rgba(252, 252, 252, 0)'
};
},
computed: {
@ -242,13 +238,13 @@ export default {
onPageScroll (e) {
const scrollTop = e.scrollTop;
if (scrollTop <= 20) {
this.backColor = 'rgba(248, 66, 33, 0)'
this.backColor = 'rgba(252, 252, 252, 0)'
this.isFshow = false
} else if (20 < scrollTop && scrollTop <= 100) {
this.backColor = 'rgba(248, 66, 33, .5)'
this.backColor = 'rgba(252, 252, 252, .5)'
this.isFshow = true
} else if (scrollTop > 100) {
this.backColor = 'rgba(248, 66, 33, 1)'
this.backColor = 'rgba(252, 252, 252, 1)'
this.isFshow = true
@ -285,13 +281,13 @@ export default {
if (scrollTop <= 20) {
this.backColor = 'rgba(248, 66, 33, 0)'
this.backColor = 'rgba(252, 252, 252, 0)'
this.isFshow = false
} else if (20 < scrollTop && scrollTop <= 100) {
this.backColor = 'rgba(248, 66, 33, .5)'
this.backColor = 'rgba(252, 252, 252, .5)'
this.isFshow = true
} else if (scrollTop > 100) {
this.backColor = 'rgba(248, 66, 33, 1)'
this.backColor = 'rgba(252, 252, 252, 1)'
this.isFshow = true

125
pages/index/index.vue
View File

@ -5,12 +5,12 @@
<view class="site-box flex_a_c_j_sb" :style="{'background-color':backColor}">
<view :class="['place_wrapper','flex_a_c',isFshow?'sitebox':'']" @click="selectLocation">
<view :class="['iconfont','icon-weizhi',isFshow?'sitebox':'']" style="margin-left: 20rpx;">
<view :class="['iconfont','icon-weizhi',isFshow?'sitebox':'']" style="color:#000;margin-left: 20rpx;">
</view>
<view class="town_name">{{street}}</view>
<view class="town_name" style="color:#000;">{{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>
<view :class="['iconfont','icon-xiaoxi',isFshow?'sitebox':'']" style="color:#000;"></view>
</navigator>
</view>
<!-- <view class="site-box ','flex_a_c_j_sb'" v-if="ishshow">
@ -37,78 +37,6 @@
</view>
<view class="goodslist">
<WaterfallsFlow :wfList='cateGoods' />
<!-- <view class="goods">
<view v-for="(item,index) in cateGoods" :key="index">
<view :class="[index%2==0?'goods_item':'goods_items']" @click="gogogo(item)">
<view class="kk" v-if="index%2==0">
<image :src="item.image[0]" mode="aspectFit" style="width:'365rpx';height:251rpx">
</image>
</view>
<view style="width:'365rpx';height:336rpx" v-else>
<image :src="item.image[0]" mode="aspectFit" style="width:'365rpx';height:336rpx">
</image>
</view>
<view class="goods_item_img" v-if="item.video_link.length>0">
<image src="@/static/images/sp.png" mode="aspectFit"></image>
</view>
<view class="botm">
<view class="title">{{item.title}}</view>
<view class="goods_info flex_a_c">
<view class="l_info flex_a_c">
<image :src="(item.author && item.author.avatar) || '/static/images/f.png'"
mode="aspectFit" class="g_img"></image>
<view class="g_name">{{item.author && item.author.nickname}}</view>
</view>
<view class="nice_box" @click.stop="giveStart(item)">
<text class="iconfont"
:class="item.relevance_id ? 'icon-shoucang1' : 'icon-dianzan'"></text>
<text class="collect">{{item.count_start}}</text>
</view>
</view>
</view>
</view>
</view>
</view> -->
<!--<view class="goods">
<view v-for="(item,i) in cateGoods" :key="i" v-if='i%2!=0'>
<view class="goods_item" @click="gogogo(item)">
<view style="height: 251rpx;">
<u--image :src="item.image[0]" width="356rpx" height="251rpx" :showLoading="true"
lazyLoad fade duration="450">
<template v-slot:loading>
<u-loading-icon color="#f5f5f5"></u-loading-icon>
</template>
</u--image>
</view>
<view class="goods_item_img" v-if="item.video_link.length>0">
<image src="@/static/images/sp.png" mode="aspectFit"></image>
</view>
<view class="botm">
<view class="title">{{item.title}}</view>
<view class="goods_info flex_a_c">
<view class="l_info flex_a_c">
<image :src="(item.author && item.author.avatar) || '/static/images/f.png'"
mode="aspectFit" class="g_img"></image>
<view class="g_name">{{item.author && item.author.nickname}}</view>
</view>
<view class="nice_box" @click.stop="giveStart(item)">
<text class="iconfont"
:class="item.relevance_id ? 'icon-shoucang1' : 'icon-dianzan'"></text>
<text class="collect">{{item.count_start}}</text>
</view>
</view>
</view>
</view>
</view>
</view>
-->
</view>
<view class="empty_wrapper" v-if="emptyShow">
<u-empty :show="emptyShow" mode="list" icon="http://cdn.uviewui.com/uview/empty/list.png"></u-empty>
@ -215,7 +143,7 @@
streeta_id: '',
street: '',
bgColor: '',
backColor: 'rgba(248, 66, 33, 0)',
backColor: 'rgba(252, 252, 252, 0)',
isFshow: false,
scrollTop: 0,
show: true
@ -226,7 +154,6 @@
this.getCateList()
this.cateGoods = []
this.getGoods()
this.Area()
uni.stopPullDownRefresh()
},
@ -254,7 +181,6 @@
onReachBottom() {
if (this.status == 'nomore') return;
this.status = 'loading';
this.where.page = ++this.where.page;
this.getGoods()
},
@ -279,15 +205,15 @@
// 导航条颜色透明渐变
if (scrollTop <= 20) {
this.backColor = 'rgba(248, 66, 33, 0)'
this.backColor = 'rgba(252, 252, 252, 0.0)'
this.isFshow = false
this.show = true
} else if (20 < scrollTop && scrollTop <= 100) {
this.backColor = 'rgba(248, 66, 33, .5)'
this.backColor = 'rgba(255, 255, 255, 0.5)'
this.isFshow = true
this.show = false
} else if (scrollTop > 100) {
this.backColor = 'rgba(248, 66, 33, 1)'
this.backColor = 'rgba(252, 252, 252, 1.0)'
this.isFshow = true
this.show = false
}
@ -309,7 +235,6 @@
// console.log("header 滚动距离 ", scrollTop);
// 更新——滚动前，滚动条距文档顶部的距离
this.oldScrollTop = scrollTop;
//变量windowHeight是可视区的高度
let windowHeight =
document.documentElement.clientHeight || document.body.clientHeight;
@ -322,15 +247,14 @@
//你想做的事情
// console.log("header 你已经到底部了");
}
if (scrollTop <= 20) {
this.backColor = 'rgba(248, 66, 33, 0)'
this.backColor = 'rgba(252, 252, 252, 0.0)'
this.isFshow = false
} else if (20 < scrollTop && scrollTop <= 100) {
this.backColor = 'rgba(248, 66, 33, .5)'
this.backColor = 'rgba(255, 255, 255, 0.5)'
this.isFshow = true
} else if (scrollTop > 100) {
this.backColor = 'rgba(248, 66, 33, 1)'
this.backColor = 'rgba(252, 252, 252, 1.0)'
this.isFshow = true
@ -399,7 +323,7 @@
this.street = e.value[1].name
this.$nextTick(() => {
this.$nextTick(() => {
this.$bus.$emit('value-updated',e.value[1].name + ',' +e.value[1].code);
})
@ -478,23 +402,24 @@
graphicLstApi(this.where).then(res => {
this.cateGoods.push(...res.data.list)
if (res.data.list.length < this.where.limit) this.status = 'nomore'
if (this.where.page == 1 && res.data.list.length <= 0) this.emptyShow = true
if (item) {
// if (item) {
if (item.index == 1 && this.cateGoods[0]) {
uni.navigateTo({
// #ifdef MP || H5
url: `/pages/short_video/nvueSwiper/index?id=${this.cateGoods[0].community_id}`
// #endif
// #ifdef APP
url: `/pages/short_video/appSwiper/index?id=${this.cateGoods[0].community_id}`
// #endif
})
}
}
// if (item.index == 1 && this.cateGoods[0]) {
// uni.navigateTo({
// // #ifdef MP || H5
// url: `/pages/short_video/nvueSwiper/index?id=${this.cateGoods[0].community_id}`
// // #endif
// // #ifdef APP
// url: `/pages/short_video/appSwiper/index?id=${this.cateGoods[0].community_id}`
// // #endif
// })
// }
// }
})
},
@ -512,6 +437,7 @@
this.cateGoods = []
this.where.category_id = item.category_id
this.emptyShow = false
this.status = 'loadmore'
this.where.page = 1
this.getGoods(item)
this.street_id = item.id
@ -529,7 +455,6 @@
type: 'wgs84',
timeout: '10',
success: (res) => {
this.isshow = false
let latitude, longitude;
latitude = res.latitude.toString();

51
pages/nongKe/specialty/index.vue
View File

@ -15,17 +15,17 @@
<view class="head_tit_r" style="font-size: 29.79rpx;">
江阳区 <text style="margin-left: 10rpx;" class="iconfont icon-xiangxia"></text>
<view class="" style="font-size: 22.78rpx;">
晴天30
晴天30℃
</view>
</view>
</view>
<view class="head_serch">
<view style="position: relative;">
<u-search borderColor="#FF6D20" bgColor="white" :showAction="false" placeholder="搜索店铺名称"
v-model="keyword" class="serch_cls"></u-search>
<u--image class="img_cls" style="position: absolute; top: 3px;right: 3px;" :showLoading="true"
src="/static/images/MYTC/SS.png" width="115.65rpx" height="56.82rpx"></u--image>
<!-- <u-search borderColor="#FF6D20" bgColor="white" :showAction="false" placeholder="搜索店铺名称"
v-model="keyword" class="serch_cls"></u-search> -->
<!-- <u--image class="img_cls" style="position: absolute; top: 3px;right: 3px;" :showLoading="true"
src="/static/images/MYTC/SS.png" width="115.65rpx" height="56.82rpx"></u--image> -->
</view>
</view>
@ -38,12 +38,12 @@
<u-scroll-list>
<view v-for="(item, index) in list" :key="index" class="goods_card">
<u--image :showLoading="true" src="https://cdn.uviewui.com/uview/album/1.jpg"
width="210.28rpx" height="210.28rpx" @click="click"></u--image>
width="210.28rpx" height="210.28rpx"></u--image>
<view class="goods_tit">
笑口常开地方就是的开发建设的开发建设的,v空间和客户可怜见立刻就
</view>
<view class="goods_price">
$10.00
￥ 10.00
</view>
<!-- <image :src="item.thumb"></image> -->
@ -54,7 +54,7 @@
</view>
</view>
<view class="store">
<view class="store" style="background-color: white;">
<view class="goods_list">
<view class="goods_cards" @click="goStore(item.mer_id)" v-for="(item,index) in storeList" :key="index">
<view class="left">
@ -66,7 +66,7 @@
<text class="flag">特产</text>
<text class="com_name">{{item.mer_name}}</text>
<text
style="font-weight: normal; font-size: 10rpx;color: red;padding:0 10rpx; border-radius: 10rpx; border: 1px solid red;">{{item.type_name}}</text>
style="font-weight: normal; font-size: 10rpx;color: #737373;padding:0 10rpx; border-radius: 10rpx; border: 1px solid #737373;">{{item.type_name}}</text>
</view>
<view class="li">
<u--image v-for="item,index in [1,1,,1,1,1]" :key="index" :showLoading="true"
@ -74,7 +74,7 @@
<text style="margin-left: 10rpx;color: #FF6D20; ">5.0</text>
<text>月销2000+</text>
<text>20分钟</text>
<text>1.1KM</text>
<text>1.1km</text>
</view>
<view class="li" style="align-items: center;">
<u--image :showLoading="true" src="/static/images/GXSC/DH.png" width="33.85rpx"
@ -93,7 +93,23 @@
</view>
<view class="">
assa
<u-scroll-list>
<view v-for="(item, index) in list" :key="index" style="margin-right: 20rpx;">
<u--image :showLoading="true" src="https://cdn.uviewui.com/uview/album/1.jpg"
width="164.72rpx" height="164.72rpx"></u--image>
<view class="goods_tit_a">
笑口常开地方就是的开发建设的开发建设的,v空间和客户可怜见立刻就
</view>
<view style="color: red;">
$10.00
</view>
<!-- <image :src="item.thumb"></image> -->
</view>
<!-- <view v-for="(item, index) in list" :key="index">
<image :src="item.thumb"></image>
</view> -->
</u-scroll-list>
</view>
<!-- <view class="">
<u-scroll-list>
@ -133,7 +149,7 @@
data() {
return {
keyword: "",
list: [1, 1, 1, 1, 1, 1, 1, 1, ],
list: [1, 1, 1, 11, 1, 11, 11],
storeList: [1, 1, 1, 1, 1, 1, 1, 1, 1]
}
},
@ -238,12 +254,17 @@
margin-right: 20rpx;
width: 158rpx;
height: 158rpx;
background-color: red;
// background-color: red;
border-radius: 20rpx;
overflow: hidden;
}
.right {
// box-sizing: border-box;
width: 75vw;
overflow: hidden;
// background-color: red;
.heads {
font-weight: bold;
@ -263,6 +284,10 @@
margin-right: 20rpx;
}
.goods_price_a {
color: #F84221;
}
.goods_tit_a {
overflow: hidden;
text-overflow: ellipsis;

6
pages/nongKe/supply_chain/suppliers.vue
View File

@ -30,13 +30,13 @@
<view class="line" :class="{'font-line':firstKey == item.key}">
</view>
</view>
<view class="item" @click="bindRight">
<!-- <view class="item" @click="bindRight">
<view>筛选
<!-- <text class="iconfont icon-shaixuan"></text> -->
</view>
<view class="line">
</view>
</view>
</view> -->
</view>
</view>
<!-- 店铺 -->

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

@ -1,6 +1,6 @@
<template>
<view class="container">
<!--
注意：这是 App 所用页面，请勿引入微信小程序或浏览器运行，最好运行在真机
@ -315,7 +315,7 @@
<mentioned ref="mentioned" @close="closePopup" :list="moreList" :uid="authorUid"></mentioned>
</view>
</uni-popup>
<!--<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize> -->
<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
<view class="fixed-head">
<view class="sys-head" :style="{height:statusBarHeight}"></view>
<view class="tool-bar" @click='goBack()'>
@ -489,7 +489,7 @@
// console.log('到后台');
},
onLoad(options) {
this.videoID = options.id || 0;
this.isUser = options.user == 1 ? true : false;
this.userUid = options.uid ? options.uid : 0;
@ -595,7 +595,7 @@
}
});
},
// #endif
/**
* 获取个人用户信息
@ -657,15 +657,15 @@
}
});
},
// // 授权回调
// onLoadFun() {
// this.isShowAuth = false
// this.getUserInfo()
// },
// 授权关闭
// authColse: function(e) {
// this.isShowAuth = e
// },
// 授权回调
onLoadFun() {
this.isShowAuth = false
this.getUserInfo()
},
//授权关闭
authColse: function(e) {
this.isShowAuth = e
},
moreTap(item) {
item.isMore = !item.isMore;
},
@ -690,35 +690,26 @@
getData() {
// 这里就是数据加载完以后再向后端发送数据的地方,
let that = this;
if (!that.loadVideo) return
that.loadVideo = true
deoList(that.videoID).then(res => {
that.loadVideo = false
that.getVideoData([res.data]);
}).catch(err => {
return uni.showToast({
title: err,
icon: 'none',
duration: 2000
});
})
// that.isUser ?
// myVideoList(that.userUid, {
// page: that.page,
// limit: that.limit,
// is_star: that.isSatrt,
// community_id: that.videoID
// }).then(res => {
// if (!that.loadVideo) return
// that.loadVideo = true
// '
// deoList(that.videoID).then(res => {
// that.loadVideo = false
// that.getVideoData(res.data.list);
// }).catch(err => {
// return uni.showToast({
// title: err,
// icon: 'none',
// duration: 2000
// });
// }) :
// that.getVideoData([res.data]);
// }).catch(err => {
// return uni.showToast({
// title: err,
// icon: 'none',
// duration: 2000
// });
// })'
// that.isUser ?
videoList().then(res=>{
that.getVideoData(res.data.list);
})
//:
// graphicLstApi({
// page: that.page,
// limit: that.limit,
@ -750,19 +741,18 @@
})
},
getVideoData(list) {
console.log(list,'111111')
if (list.length == 0) return
let that = this;
that.loadVideo = list.length == that.limit
// that.page = that.page + 1;
that.page = 1
that.page = that.page + 1
var msg = list
for (let i = 0; i < msg.length; i++) {
msg[i]['isMore'] = false
msg[i]['community_id'] = msg[i]['community_id'].toString()
that.dataList.push(msg[i])
}
console.log(that.dataList)
if (that.dataList.length !== 0) {
that.dataList[that.k].state = 'play';
setTimeout(function() {
@ -888,9 +878,9 @@
// 这个方法主要就是用来第一次进入视频播放时用来处理
deoList(this.videoID).then(async (res) => {
this.loadVideo = false
this.page = 1;
this.userUid=res.data.uid
this.page = this.page + 1;
var msg = [res.data];
console.log(res.data)
for (let i = 0; i < msg.length; i++) {
msg[i]['isMore'] = false
msg[i]['playIng'] = false
@ -900,7 +890,7 @@
msg[i]['community_id'] = msg[i]['community_id'].toString()
}
this.dataList = msg;
console.log(this.dataList)
if (this.dataList.length !== 0) {
this.dataList[this.k].state = 'play';
uni.createVideoContext(this.dataList[this.k].community_id, this).play()

165
pages/short_video/nvueSwiper/index.nvue
View File

@ -15,7 +15,7 @@
<!-- 头部导航 -->
<!-- <view v-if="!isUser" class="header" :style="{backgroundColor:currentNav==1?'':'#ffffff'}">
<!-- <view v-if="!isUser" class="header" :style="{backgroundColor:'#Fff'}">
<view class="tool-bar">
<view class='iconfont icon-xiangzuo' @tap='goBack'></view>
@ -27,10 +27,14 @@
<text class="tName" :class="currentNav==1?'on':''">推荐</text>
</view>
<view class="items" @click.stop="navTap(3)">
<text class="tName" :class="currentNav==3?'on':''">列表</text>
<text class="tName" :class="currentNav==3?'on':''">热点资讯</text>
</view>
<view class="items" @click.stop="navTap(4)">
<text class="tName" :class="currentNav==4?'on':''">社区</text>
</view>
</view> -->
<swiper v-show="currentNav !== 3" :style="'width: '+ windowWidth +'px; height: '+ windowHeight +'px;'"
<swiper v-show="currentNav !== 3&&currentNav != 4" :style="'width: '+ windowWidth +'px; height: '+ windowHeight +'px;'"
:vertical="true" @animationfinish="animationfinish" @change="change" :current="k" :indicator-dots="false">
<swiper-item v-for="(list,index) in dataList">
<view v-if="max > index">
@ -54,7 +58,6 @@
5.show-loading：这里默认去掉播放转圈的标志
v-if="Math.abs(k-index)<=1"
-->
<video :id="list.community_id+''+index" :loop="true" :muted="list.isplay"
:autoplay="index == k && isRoutine" :controls="false" :http-cache="true"
:page-gesture="false" :show-fullscreen-btn="false" :show-loading="false"
@ -162,7 +165,7 @@
<navigator v-if="list.author && userInfo.uid != list.author.uid" hover-class="none"
:url="'/pages/plantGrass/plant_user/index?id='+list.uid" class="pictrue">
<image class="userAvatar"
:src="list.author&&list.author.avatar || '/static/images/f.png'" mode="aspectFit">
:src="list.author&&list.author.avatar || '/static/images/f.png'" mode="aspectFill">
</image>
<view v-if="!list.is_fans || !userInfo.uid" class="guanzhu"
@click.stop="followAuthor(list)"><text
@ -227,13 +230,13 @@
@scrolltolower="getGoods()">
<block v-for="(item,index) in cateGoods" :key="index">
<view class="goods_item" @click="gogogo(item)">
<image class="goods_img" :src="item.image[0]" mode="aspectFit"></image>
<image class="goods_img" :src="item.image[0]" mode="aspectFill"></image>
<view class="botm">
<view class="title">{{item.title}}</view>
<view class="goods_info flex_a_c">
<view class="l_info flex_a_c">
<image :src="(item.author && item.author.avatar) || '/static/images/f.png'"
mode="aspectFit" class="g_img"></image>
mode="aspectFill" class="g_img"></image>
<view class="g_name">{{item.author && item.author.nickname}}</view>
</view>
<view class="nice_box flex_a_c" @click.stop="giveStart(item)">
@ -246,6 +249,7 @@
</view>
</block>
</scroll-view>
<!-- <view class="video-list" v-if="currentNav === 3"
:style="'width: '+ windowWidth +'px; height: '+ windowHeight +'px;'">
@ -294,7 +298,9 @@
<!-- #endif -->
</view>
<canvas class="canvas" canvas-id='myCanvas' v-if="canvasStatus"></canvas>
<!-- <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize> -->
<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
</view>
</template>
@ -311,6 +317,7 @@
} from '@/utils';
import comment from '@/components/comment.vue';
import mentioned from '@/components/mentioned.vue';
import {
HTTP_REQUEST_URL
} from '@/config/app';
@ -335,11 +342,13 @@
components: {
comment,
mentioned,
authorize
authorize,
},
computed: configMap({
community_reply_status: 0
}, mapGetters(['isLogin', 'uid'])),
data() {
return {
isTriggered: false,
@ -352,7 +361,7 @@
deleteHeight: 0,
dataList: [],
k: 0,
max: 1,
max: 2,
oldVideo: "",
voice: "",
timeout: "",
@ -420,7 +429,6 @@
watch: {
k(new_k, old_k) {
const max = new_k + 2;
if (this.max < max) {
this.max = max;
}
@ -428,7 +436,6 @@
this.oldCurrent = this.currentNav
return false
}
this.dataList[old_k].playIng = false //如果视频暂停，就加载封面
this.dataList[old_k].isplay = true
this.dataList[old_k].state = 'pause'
@ -451,7 +458,6 @@
}
},
onLoad(options) {
console.log(options)
this.getOptions(options);
this.videoID = options.id;
this.isUser = options.user == 1 ? true : false;
@ -736,56 +742,62 @@
},
get() {
let that = this
that.loadVideo = true
deoList(that.videoID).then(res => {
// console.log(res.data)
that.videoData([res.data])
if (res.data.list.length < that.limit) {
this.loadMore = false;
// 1.这里引入后端请求数据
if(this.videoID){
deoList(this.videoID).then(res => {
that.videoData([res.data])
if (res.data.list.length < that.limit) {
this.loadMore = false;
}
}).catch(err => {
return uni.showToast({
title: err,
icon: 'none',
duration: 2000
});
})
this.videoID=''
}else{
videoList().then(res=>{
that.videoData(res.data.list);
})
}
}).catch(err => {
return uni.showToast({
title: err,
icon: 'none',
duration: 2000
});
})
// myVideoList(that.userUid, {
// page: that.page,
// limit: that.limit,
// is_star: that.isSatrt,
// community_id: that.videoID
// }).then(res => {
// that.videoData(res.data.list)
// if (res.data.list.length < that.limit) {
// this.loadMore = false;
// }
// }).catch(err => {
// return uni.showToast({
// title: err,
// icon: 'none',
// duration: 2000
// });
// })
// :
// graphicLstApi({
// page: that.page,
// limit: that.limit,
// category_id: -1
// }).then(res => {
// that.videoData(res.data.list)
// if (res.data.list.length < that.limit) {
// this.loadMore = false;
// }
// }).catch(err => {
// return uni.showToast({
// title: err,
// icon: 'none',
// duration: 2000
// });
// })
// that.isUser ?
// myVideoList(that.userUid, {
// page: that.page,
// limit: that.limit,
// is_star: that.isSatrt,
// community_id: that.videoID
// }).then(res => {
// that.videoData(res.data.list)
// if (res.data.list.length < that.limit) {
// this.loadMore = false;
// }
// }).catch(err => {
// return uni.showToast({
// title: err,
// icon: 'none',
// duration: 2000
// });
// }) :
// graphicLstApi({
// page: that.page,
// limit: that.limit,
// category_id: -1
// }).then(res => {
// that.videoData(res.data.list)
// if (res.data.list.length < that.limit) {
// this.loadMore = false;
// }
// }).catch(err => {
// return uni.showToast({
// title: err,
// icon: 'none',
// duration: 2000
// });
// })
that.loadVideo = true
},
getFocusList() {
let that = this;
@ -821,21 +833,16 @@
msg[i]['isplay'] = true
msg[i]['loading'] = false
that.dataList.push(msg[i])
{console.log(i,that.k)}
//#ifndef H5
if (i == 0 && that.k == 0) {
this.dataList[0].isplay = false
this.dataList[0].playIng = true
this.dataList[0].state = 'play'
this.dataList[0].loading = false
console.log('32')
uni.createVideoContext(that.dataList[0].community_id + '' + 0, that).play()
}
//#endif
}
//#ifdef MP
if (this.k == 0) {
this.videoShare(this.dataList[0]);
@ -1282,8 +1289,6 @@
z-index: 9;
width: 750rpx;
height: 120rpx;
flex-direction: row;
justify-content: center;
align-items: center;
@ -1305,7 +1310,7 @@
margin-right: 40rpx;
margin-left: 20rpx;
font-size: 30rpx;
color: #000;
color: #333;
margin-top: 60rpx;
}
}
@ -1313,12 +1318,24 @@
.items {
margin: 0 30rpx;
image {
width: 58rpx;
height: 58rpx;
}
.tName {
color: #000;
font-size: 32rpx;
font-size: 33rpx;
font-family: PingFang SC-Medium, PingFang SC;
font-weight: 500;
color: #737373;
line-height: 50px;
&.on {
font-size: 38rpx;
font-size: 33rpx;
font-family: PingFang SC-Medium, PingFang SC;
font-weight: 500;
color: #333333;
}
}
@ -1395,7 +1412,7 @@
.userInfo {
position: absolute;
bottom: 120px;
bottom: 60rpx;
right: 20rpx;
flex-direction: column;
text-align: center;

1618
pages/supply_chains/supply_chains.vue
View File

File diff suppressed because it is too large Load Diff