diff --git a/pages/nongKe/supply_chain/suppliers.vue b/pages/nongKe/supply_chain/suppliers.vue
index d6dc7e4..622db03 100644
--- a/pages/nongKe/supply_chain/suppliers.vue
+++ b/pages/nongKe/supply_chain/suppliers.vue
@@ -30,13 +30,13 @@
-
+
+
-
+ -->
diff --git a/pages/short_video/appSwiper/index.nvue b/pages/short_video/appSwiper/index.nvue
index 952185d..994a540 100644
--- a/pages/short_video/appSwiper/index.nvue
+++ b/pages/short_video/appSwiper/index.nvue
@@ -1,6 +1,6 @@
-
+
+
@@ -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()
diff --git a/pages/short_video/nvueSwiper/index.nvue b/pages/short_video/nvueSwiper/index.nvue
index 20e5574..3b2a460 100644
--- a/pages/short_video/nvueSwiper/index.nvue
+++ b/pages/short_video/nvueSwiper/index.nvue
@@ -15,7 +15,7 @@
-
-
@@ -54,7 +58,6 @@
5.show-loading：这里默认去掉播放转圈的标志
v-if="Math.abs(k-index)<=1"
-->
-
@@ -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,55 @@
},
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;
- }
- }).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
- // });
- // })
+ // 1.这里引入后端请求数据
+ 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
+ });
+ })
+ // 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 +826,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 +1282,6 @@
z-index: 9;
width: 750rpx;
height: 120rpx;
-
-
flex-direction: row;
justify-content: center;
align-items: center;
@@ -1305,7 +1303,7 @@
margin-right: 40rpx;
margin-left: 20rpx;
font-size: 30rpx;
- color: #000;
+ color: #333;
margin-top: 60rpx;
}
}
@@ -1313,12 +1311,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 +1405,7 @@
.userInfo {
position: absolute;
- bottom: 120px;
+ bottom: 60rpx;
right: 20rpx;
flex-direction: column;
text-align: center;
diff --git a/pages/supply_chains/supply_chains.vue b/pages/supply_chains/supply_chains.vue
index de5301f..58a64d5 100644
--- a/pages/supply_chains/supply_chains.vue
+++ b/pages/supply_chains/supply_chains.vue
@@ -245,7 +245,7 @@ export default {
where1: {
page: 1,
- limit: 6
+ limit: 10
},
currentItemId: 69, // 默认获取 社区的数据 0 表示推荐 || 69 社区
keyword: '',
@@ -293,7 +293,6 @@ export default {
onReachBottom() {
if (this.status == 'nomore') return;
this.status = 'loading';
-
this.where.page = ++this.where.page;
this.list()
},
@@ -349,13 +348,11 @@ export default {
list(id) {
if (id) {
spuInfo(id, this.where1).then(res => {
- // console.log(res)
- this.cateGoods = res.data.list
+ this.cateGoods.push(...res.data.list)
})
} else {
getProductHot(1, 10).then(res => {
- // console.log(res)
- this.cateGoods = res.data.list
+ this.cateGoods.push(...res.data.list)
})
}