Browse Source

更新

master
luyisha 3 years ago
parent
commit
0ad4e3b3cb
  1. 1
      components/page/pageComponents/goodsStyle.vue
  2. 1
      components/page/pageComponents/tabContro.vue
  3. 4
      components/template/pic_text/pic_text.vue
  4. 54
      components/template/postListTwo.vue
  5. 4
      components/template/tabBar.vue
  6. 45
      components/template/tabs/tabs-copy.vue
  7. 9
      pages.json
  8. 2
      pages/mainPages/index/index.vue
  9. 10
      pages/mainPages/userCenter/userCenter.vue
  10. 3
      pages/subPages/Equity/Topping/Topping.vue
  11. 18
      pages/subPages/Equity/person/person.vue
  12. 8
      pages/subPages/goods/index.vue
  13. 42
      pages/subPages/homepage/homepage/homepage.vue
  14. 8
      pagesA/campusActivities/activitiesExtend.vue
  15. 15
      pagesA/campusActivities/index.vue
  16. 145
      pagesA/lifeServices/lifeServices.vue
  17. BIN
      static/play.png

1
components/page/pageComponents/goodsStyle.vue

@ -630,6 +630,7 @@ export default {
}
},
navigateTo(url,exdetail) {
// console.log(url,exdetail, '---------');
let isHttpUrl = url.indexOf('https') !== -1;
if(exdetail){
this.goUrl = url;

1
components/page/pageComponents/tabContro.vue

@ -639,6 +639,7 @@
})
}
console.log(requestData, 'requestData------');
App._post_form(requestUrl, requestData, res => {
if (isPage) {

4
components/template/pic_text/pic_text.vue

@ -342,7 +342,7 @@ export default {
// this.videoContext.play();
},
changeSize(e){
console.log(e.detail.width, e.detail.height, e.detail.duration);
// console.log(e.detail.width, e.detail.height, e.detail.duration);
if(e.detail.width > e.detail.height){
this.videoWidth = '77vw';
this.videoHeight = e.detail.height/e.detail.width*77+'vw';
@ -359,7 +359,7 @@ export default {
}
},
changeImgSize(e){
console.log(e.detail.width, e.detail.height, '单张图片尺寸');
// console.log(e.detail.width, e.detail.height, '');
this.singleImgW = e.detail.width;
this.singleImgH = e.detail.height;
},

54
components/template/postListTwo.vue

@ -2,7 +2,9 @@
<view class="postListTwo" @click="goPostDetails">
<image v-if="itemInfos.img[0]" :src="itemInfos.img[0]" mode="aspectFill" @click.stop="imgPre(itemInfos.shareimg)"></image>
<!-- <image v-else :src="itemInfos.video_img_link" mode="aspectFill"></image> -->
<video v-else object-fit="cover" :src="itemInfos.video_link" @click.stop="" :poster="itemInfos.video_img_link"></video>
<video :id="'pagevideo'+indexNumber" v-else object-fit="cover"
:src="itemInfos.video_link" @click.stop="" :poster="itemInfos.video_img_link"
@play="stopOther()"></video>
<view class="cont">
{{itemInfos.content}}
</view>
@ -47,7 +49,13 @@
},
isMe: {
type: Boolean
}
},
currentPlay: {//
type: Number | String
},
stopVideo: {
type: Number
},
},
data() {
return {
@ -79,14 +87,14 @@
coverShow: false,
text: '',
phoneHight: 0,
videoContext:null,
fabulous_num: null,
fabulous_avatar: null,
isComment: false,
myMid:0,
poster:'',
isShowMenu: false
isShowMenu: false,
videoContext: null,
query: '',
};
},
watch: {
@ -100,6 +108,29 @@
},
deep: true, //
immediate: true //immediatewatchhandlertruewatchhandlerfalse使watchhandler
},
stopVideo: {
handler(newVal, oldVal){
if(!!this.itemInfos.video_link){
// this.videoContext.stop();
if(this.indexNumber!==this.currentPlay){
//
this.videoContext.stop();
}else{
//
this.query.select('.postListTwo').boundingClientRect(data=>{
if(data){
// console.log(data.top,'');
if(data.top<80||data.top==80){
// console.log('');
this.videoContext.stop();
}
}
}).exec();
}
}
}
}
},
mounted() {
@ -113,10 +144,9 @@
// console.log(_this.itemInfos)
_this.init();
},
onReady(){
// createVideoContext uni video
// this.videoContext = uni.createVideoContext('myvideo');
// this.videoContext.requestFullScreen();
onReady(){
this.videoContext = wx.createVideoContext('pagevideo'+this.indexNumber, this);
this.query = uni.createSelectorQuery().in(this);
},
onShow() {
let _this = this;
@ -193,7 +223,11 @@
App.navigationTo({
url: 'pages/subPages/postRelease/postRelease?id=' + this.itemInfos.id
})
}
},
stopOther(){
this.$emit('changePlay', this.indexNumber);
},
}
};
</script>

4
components/template/tabBar.vue

@ -218,7 +218,7 @@
data: !!this.tabBarData && this.tabBarData.length > 0 ? this.tabBarData : this.menu
},
pageIndex;
console.log(this.tabBarData, this.menu)
// console.log(this.tabBarData, this.menu)
// #ifdef H5
let pageObj = currentPage.$mp.query;
// debugger
@ -248,7 +248,7 @@
}
TabBarsData.data.data = tablist;
console.log(TabBarsData.data)
// console.log(TabBarsData.data)
return TabBarsData.data
}
}

45
components/template/tabs/tabs-copy.vue

@ -6,12 +6,12 @@
</view>
<scroll-view class="tabs-bar" :scroll-x="true">
<view class="tabs-bar-item" v-for="(item1,index1) in tabList" :key="index1"
:class="(current_index==index1&&cc_id=='6')?'active1': (current_index==index1?'active2':'')"
:class="(current_index==index1&&(cc_id=='6'||cc_id=='51'))?'active1': (current_index==index1?'active2':'')"
@click="changeIndex(index1)"
:style="cc_id=='6'?'margin-right:20px;':''">
:style="(cc_id=='6'||cc_id=='51')?'margin-right:20px;':''">
{{item1.name}}
</view>
<!-- cc_id=='6'是校园活动生活服务的样式和校园活动一样 -->
<!-- cc_id=='6'是校园活动生活服务51的样式和校园活动一样 -->
</scroll-view>
<view class="tabs-content">
<swiper class="tabs-banner" :indicator-dots="true" v-if="bannerList.length>0">
@ -37,12 +37,15 @@
<view v-if="videoshow && cc_id<5" class="status_bar"></view>
<view v-if="videoshow" style="width: 100vw;height: 100vh;position: relative;background-color: #000;">
<video id="myvideo" :src="videolint"
:style="updateWH" class="myvideo" :show-play-btn="true" object-fit="cover"
:style="updateWH" class="myvideo" :show-play-btn="false" object-fit="cover"
@click.stop="videoControl" :show-fullscreen-btn="false" :autoplay="true" :direction="0"
@loadedmetadata="changeSize" @ended="play=false"></video>
<view class="videoNavBar">
<text class="iconfont icon-roundleftfill" style="font-size: 48upx;" @click="hideVideo"></text>
</view>
<view class="playBtnArea" @click.stop="videoControl" v-if="!play">
<img src="../../../static/play.png" alt="">
</view>
<view class="videoTxt">
<view class="text-area">
<!-- <image src="../../../static/chooseCade/BG.png" mode=""
@ -79,17 +82,27 @@
<scroll-view scroll-y="true" class="comment-a-list">
<view v-if="currentVideo.CommentList&&currentVideo.CommentList.length>0">
<view v-for="(item1,index1) in currentVideo.CommentList" :key="index1" class="comment-item">
<view style="width: 100%;display: flex;align-items: center;margin-bottom: 10upx;">
<image :src="item1.avatar" mode="" style="width: 48upx;height: 48upx;border-radius: 50%;"></image>
<view style="font-size: 12px;color: #999;margin-left: 20upx;">{{item1.nickname}}</view>
</view>
<view style="width: 100%;"><text>{{item1.content}}</text></view>
<view style="font-size: 11px;color: #999;margin-right: 20upx;">{{item1.createtime}}</view>
<view class="reply" @click="editReply(index1)">回复</view>
<!-- 二级评论区 -->
<view class="comment-item-child" v-if="item1.childCommentList" v-for="(item2,index2) in item1.childCommentList" :key="index2">
<view style="width: 100%;display: flex;align-items: center;margin-bottom: 10upx;">
<image :src="item2.avatar" mode="" style="width: 48upx;height: 48upx;border-radius: 50%;"></image>
<view style="font-size: 12px;color: #999;margin-left: 20upx;">{{item2.nickname}}</view>
</view>
<view style="width: 100%;"><text>{{item2.content}}</text></view>
<view style="font-size: 11px;color: #999;margin-right: 20upx;">{{item2.createtime}}</view>
<view class="reply" @click="editReply(index1, index2)">回复</view>
</view>
<!-- 二级评论区 -->
<view style="width: 100%;font-size: 12px;margin-top: 10upx;color: #666;" v-if="item1.is_query" @click="getChildCommentList(index1, item1.id)">
<text v-if="item1.comment_twoPage==1">---展开回复</text><text v-else-if="item1.comment_twoPage>0">---更多回复</text>
<text v-if="item1.comment_twoPage==1">---展开{{item1.reply_count}}回复</text><text v-else-if="item1.comment_twoPage>0">---更多回复</text>
</view>
</view>
</view>
@ -104,7 +117,7 @@
</scroll-view>
<view class="comment-a-b">
<textarea v-model="editComment" :placeholder="placeholderText" class="comment-a-b-inp" placeholder-class="comment-a-b-inp-p"
:fixed="true" :auto-height="true" :adjust-position="false" />
:fixed="true" :auto-height="true" :adjust-position="true" />
<view class="comment-a-b-btn" @click="submitComment">发送</view>
</view>
</view>
@ -461,13 +474,16 @@
//
editReply(index1, index2){
console.log(index1, index2);
let objname;
this.oneid = this.currentVideo.CommentList[index1].id;
if(index2){
if(index2!==undefined){
this.pid = this.currentVideo.CommentList[index1].childCommentList[index2].id;
objname = this.currentVideo.CommentList[index1].childCommentList[index2].nickname;
}else{
this.pid = this.currentVideo.CommentList[index1].id;
objname = this.currentVideo.CommentList[index1].nickname;
}
this.placeholderText = '回复评论'
this.placeholderText = '回复'+objname+'的评论';
console.log(this.pid,'this.pid,当前要回复的评论的id');
console.log(this.oneid,'this.oneid,当前要回复的评论的一级评论id');
@ -619,6 +635,19 @@
color: #999;
padding: 16upx 30upx 16upx;
}
.playBtnArea{
width: 30vw;
height: 30vw;
position: absolute;
left: 35vw;
top: calc(50vh - 15vw);
z-index: 2;
img{
width: 100%;
height: 100%;
}
}
.myvideo{
position: absolute;
}

9
pages.json

@ -105,7 +105,7 @@
"path" : "pagesA/lifeServices/lifeServices",
"style" :
{
"navigationBarTitleText": "",
"navigationBarTitleText": "生活服务",
"enablePullDownRefresh": false
}
@ -1917,6 +1917,13 @@
"navigationBarTitleText": "我的校园活动"
}
},
{
"path": "activitiesExtend",
"style": {
"navigationBarTitleText": "校园活动"
}
}
]
},

2
pages/mainPages/index/index.vue

@ -212,7 +212,7 @@ export default {
picTextList
},
onReady(){
console.log('onReady比onLoad慢')
// console.log('onReadyonLoad')
},
onLoad(e) {
console.log('onLoad')

10
pages/mainPages/userCenter/userCenter.vue

@ -186,8 +186,8 @@
<image :src="imageRootNew+'rule-blue.png'" mode=""></image>
</navigator>
<!-- 普通用户 -->
<navigator class="content_box1" :url="'/pages/subPages2/hirePlatform/addResume/addResume'">
<!-- v-else> -->
<navigator class="content_box1" :url="'/pages/subPages2/hirePlatform/addResume/addResume'"
v-else>
<view style="font-size: 14px!important;">我的简历</view>
<image :src="imageRootNew+'jianli.png'" mode=""></image>
</navigator>
@ -586,6 +586,12 @@
});
return;
}
if(url.indexOf('pagesA/campusActivities/myActivities') != -1 && this.memberInfo.identity=='达人'){//
App.navigationTo({
url: 'pagesA/campusActivities/activitiesExtend'
});
return;
}
if(this.memberInfo.identity=='企业' || this.memberInfo.identity=='商家'){//-id
uni.setStorageSync('checkStoreid', this.memberInfo.storeid);
App.navigationTo({

3
pages/subPages/Equity/Topping/Topping.vue

@ -69,7 +69,7 @@
data() {
return {
jobList: [],
selectType: 1,
selectType: "",
useDay: '',
selectOption: 1,
selectOptTxt: '一天',
@ -136,6 +136,7 @@
this.diyPrice = res.data.price;
this.jobList = res.data.filter_data.recruit;
this.selectType = this.jobList[0].recruit_id;
this.selectOptLs = res.data.num_data;
for(let key in this.selectOptLs){

18
pages/subPages/Equity/person/person.vue

@ -26,9 +26,10 @@
{{ item.recruit_title }}
</view>
<input class="inputSel" v-model="useDay" v-if="item.recruit_id == selectType0" style="border: 1px solid #85BAFC"
type="number" placeholder-style="color: #CACACA" placeholder="请输入使用份数" />
type="number" placeholder-style="color: #CACACA" :auto-focus="true" placeholder="请输入使用份数"/>
<input class="inputSel" value="" :disabled="true" v-else style="border: 1px solid #ffffff"
type="number" placeholder-style="color: #CACACA" placeholder="请输入使用份数" />
type="number" placeholder-style="color: #CACACA" placeholder="请输入使用份数"
@click="clickItem(item, 1)" />
</view>
@ -136,19 +137,6 @@
this.useDay = nVal || '';
}, 500)
},
// positionList: {
// deep:true,// vue2
// handler (nPVal) {
// console.log(nPVal,this.selectType0, 111);
// clearTimeout(this.lock_1);
// this.lock_1 = setTimeout(()=>{
// console.log(nPVal,this.selectType0);
// for(let i=0;i<this.positionList.length;i++){
// // this.positionList[i].num = '';//
// }
// }, 500)
// }
// },
diySelect(nVal){
clearTimeout(this.lock_2);
this.lock_2 = setTimeout(()=>{

8
pages/subPages/goods/index.vue

@ -709,17 +709,17 @@
</view>
<!-- 底部菜单 -->
<view class="goods-footer dis-flex flex-dir-row flex-y-center border-line border-top" :style="{ 'padding-bottom': isPadding ? '20px' : '','z-index':getTipShow || istag?'9998':'999' }">
<view class="dis-flex flex-y-center" style="width: 50%;">
<view class="dis-flex flex-y-center" style="width: 50%;padding: 0px 25px;box-sizing: border-box;">
<view class="goods-footer-item dis-flex flex-dir-column flex-x-center p-r" @click="footerNav('home')">
<button class="btn-normal report-btn" form-type="submit" style="overflow: hidden;"></button>
<image :src="imgfixUrls + 'goods/home.png'"></image>
<view class="goods-footer-item-text">首页</view>
</view>
<view class="goods-footer-item dis-flex flex-dir-column flex-x-center p-r" @click="footerNav('order')">
<!-- <view class="goods-footer-item dis-flex flex-dir-column flex-x-center p-r" @click="footerNav('order')">
<button class="btn-normal report-btn" form-type="submit"></button>
<image :src="imgfixUrls + 'goods/flow.png'"></image>
<view class="goods-footer-item-text">订单</view>
</view>
</view> -->
<view class="goods-footer-item dis-flex flex-dir-column flex-x-center" @click="footerNav('user')">
<button class="btn-normal report-btn" form-type="submit"></button>
<image :src="imgfixUrls + 'goods/my.png'"></image>
@ -991,7 +991,7 @@
</view> -->
<!-- 底部菜单 -->
<view class="goods-footer dis-flex flex-dir-row flex-y-center border-line border-top" :style="{ 'padding-bottom': isPadding ? '20px' : '','z-index':getTipShow || istag?'9998':'999' }">
<view class="dis-flex flex-y-center" style="width: 50%;">
<view class="dis-flex flex-y-center" style="width: 50%;padding: 0px 25px;box-sizing: border-box;">
<view class="goods-footer-item dis-flex flex-dir-column flex-x-center p-r" @click="footerNav('home')">
<button class="btn-normal report-btn" form-type="submit" style="overflow: hidden;"></button>
<image :src="imgfixUrls + 'goods/home.png'"></image>

42
pages/subPages/homepage/homepage/homepage.vue

@ -105,7 +105,9 @@
<view class="dis-flex flex-warp flex-x-between issueWrapper" style="padding: 10px;">
<view class="issueItem" v-for="(issueItem,index) in invitationListData" :key="index">
<!-- <post-list :itemInfo="issueItem" :indexNumber="index" :indexShow='indexShow' @operationShow="operationShow"></post-list> -->
<post-list-two :itemInfo="issueItem" :indexNumber="index" :indexShow='indexShow' @operationShow="operationShow" @delet="deletPost" :isMe="isMe"></post-list-two>
<post-list-two :itemInfo="issueItem" :indexNumber="index" :indexShow='indexShow'
@operationShow="operationShow" @delet="deletPost" :isMe="isMe"
@changePlay="changePlay()" :stopVideo="stopVideo" :currentPlay="currentPlay"></post-list-two>
</view>
</view>
</block>
@ -273,7 +275,12 @@
isBlack: false,
lock1: false,
lock2: false,
isMe: false
isMe: false,
stopVideo: 0,
scrollTimer: null,
currentPlay: -2,//,-2
scrollLock: false,
}
},
@ -289,6 +296,13 @@
},
computed: {
},
watch: {
scrollLock: {
handler(newVal, oldVal){
this.changeScrollLock();
}
}
},
onLoad(e) {
let _this = this,
@ -545,6 +559,8 @@
this.lock2 = false;
}
}
//
this.scrollLock = true;
},
//
ReachBottom(e) {
@ -763,8 +779,26 @@
this.userInfo.is_interest = false;
})
},
}
changePlay(e){
this.stopVideo++;//=
this.currentPlay = e;
},
changeScrollLock(){
if(this.scrollLock){
clearTimeout(this.scrollTimer);
}
this.scrollTimer = setTimeout(()=>{
this.stopVideo++;
this.scrollLock = false;
console.log(this.stopVideo);
}, 500)
},
},
onPageScroll(e){
//
// this.scrollLock = true;
},
}
</script>

8
pagesA/campusActivities/activitiesExtend.vue

@ -0,0 +1,8 @@
<template>
</template>
<script>
</script>
<style>
</style>

15
pagesA/campusActivities/index.vue

@ -54,16 +54,15 @@
getList(type){
let _this = this;
let data = {
page:_this.page, size: 10,
cc_id: this.cc_cc_id==18?'':this.cc_cc_id//18
page:_this.page, size: 10
}
if(type=='search'){
data = {
page:_this.page,
size: 10,
cc_id: this.cc_cc_id==18?'':this.cc_cc_id,//18
title: this.keyword
}
data.title = this.keyword;
}
if(this.cc_cc_id==18){//18
data.recommend = 1;
}else{
data.cc_id = this.cc_cc_id;
}
console.log(data, 'p------');
App._post_form('&p=student&do=campusActivitiesList', data, res => {

145
pagesA/lifeServices/lifeServices.vue

@ -2,21 +2,26 @@
<view style="min-height: 100vh;background-color: #f8f8f8;box-sizing: border-box;">
<tabs-c :cc_id="cc_id" pageType="" @changeChildType="changeChildType" @search="search" :searchNeed="true"></tabs-c>
<view class="content_wrapper">
<view v-for="(item,index) in dataList" :key="index" class="list-item" @click="toDetail(item.id)">
<view v-for="(item,index) in dataList" :key="index" class="list-item" @click="toDetail(item.url)">
<view class="img-box">
<image :src="item.promotional_img" mode="aspectFill"></image>
<image :src="item.logo" mode="aspectFill"></image>
<view class="text3">
<text>{{item.city}}/{{item.address}}</text>
|
<text>{{item.km}}km</text>
<!-- <text>{{item.city}}/{{item.address}}</text> -->
<text style="display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 1;overflow: hidden;">{{item.storename}}</text>
<text style="margin: 0px 3px;">|</text>
<view style="">
<text class="iconfont icon-daohang1"></text>
<!-- <image style="width: 20upx;height: 20upx;padding-right: 4upx;" :src="imgfixUrls + 'merchant/where.svg'" /> -->
{{item.stk}}km
</view>
</view>
</view>
<view class="text-box">
<view class="text1">{{item.title}}</view>
<view class="text1">{{item.goods_name}}</view>
<view class="text2">
<text style="color: #D3101E;">{{item.price}}</text>
<text style="color: #999999;font-size: 12px;margin: 0px 4px;text-decoration: line-through;">{{item.price1}}</text>
<text style="color: #999999;font-size: 12px;flex:1;text-align: right;">已售{{item.selled}}</text>
<text style="color: #D3101E;font-size: 14px;margin-left: -2px;">{{item.price}}</text>
<text style="color: #999999;font-size: 12px;margin: 0px 4px;text-decoration: line-through;">{{item.oldprice}}</text>
<text style="color: #999999;font-size: 12px;flex:1;text-align: right;">已售{{item.buy_num}}</text>
</view>
</view>
</view>
@ -58,84 +63,61 @@
getList(type){
let _this = this;
let data = {
page:_this.page, size: 10,
cc_id: this.cc_cc_id
cate_id: "0",
is_total: "1",
// cc_child_id: this.cc_cc_id,
cc_id: this.cc_id,
page: this.page,
sort: 3
}
if(type=='search'){
data = {
page:_this.page,
size: 10,
cc_id: this.cc_cc_id,
title: this.keyword
}
data.title = this.keyword;
}
if(this.cc_cc_id==54){//54
data.recommend = 1;
}else{
data.cc_child_id = this.cc_cc_id;
}
console.log(data, 'p------');
App._post_form('&p=student&do=campusActivitiesList', data, res => {
this.dataList = [{
id: '',
promotional_img: '',
title: 'XXXXXpdfwe废物i欧风街第三方',
nickname: '',
avatar: '',
publish_time: '',
cc_name: '',
price: 12,
selled: 34,
km: 23.5,
price1: 15,
city: '深圳龙华',
address: '北站',
},{
id: '',
promotional_img: '',
title: 'XXXXXpdfwe废物i欧风街第三方',
nickname: '',
avatar: '',
publish_time: '',
cc_name: '',
price: 12,
selled: 34,
km: 23.5,
price1: 15,
city: '深圳龙华',
address: '北站',
},{
id: '',
promotional_img: '',
title: 'XXXXXpdfwe废物i欧风街第三方',
nickname: '',
avatar: '',
publish_time: '',
cc_name: '',
price: 12,
selled: 34,
km: 23.5,
price1: 15,
city: '深圳龙华',
address: '北站',
},{
id: '',
promotional_img: '',
title: 'XXXXXpdfwe废物i欧风街第三方',
nickname: '',
avatar: '',
publish_time: '',
cc_name: '',
price: 12,
selled: 34,
km: 23.5,
price1: 15,
city: '深圳龙华',
address: '北站',
}]
App._post_form('&p=rush&do=homeList', data, res => {
if(_this.page===1){
if(res.data.list.length>0){
_this.setData({
dataList: res.data.list
})
}else{
_this.setData({
dataList: []
})
}
}else{
if(res.data.list.length>0){
let dataList = _this.dataList.concat(res.data.list);
_this.setData({
dataList
})
}
}
}, false, err=>{
});
},
toDetail(id){
// uni.navigateTo({
// url:'/pagesA/campusActivities/campusActivities?id='+id
// })
toDetail(url){
let isHttpUrl = url.indexOf('https') !== -1;
if (isHttpUrl) {
//#ifdef H5
location.href = url;
//#endif
//#ifdef MP-WEIXIN
App.navigationTo({
url
});
//#endif
} else {
App.navigationTo({
url
});
}
},
changeChildType(e){
console.log(e);
@ -205,6 +187,11 @@
font-size: 12px;
display: flex;
justify-content: space-between;
.iconfont{
font-size: 13px;
padding-right: 2px;
}
}
}

BIN
static/play.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB

Loading…
Cancel
Save