Browse Source

更新

master
luyisha 3 years ago
parent
commit
f86c1ba489
  1. 78
      components/page/pageComponents/goodsStyle.vue
  2. 8
      components/page/pageComponents/tabContro.vue
  3. 4
      components/template/diypages.vue
  4. 15
      components/template/pic_text/pic_text.vue
  5. 9
      components/template/postListTwo.vue
  6. 31
      components/template/tabs/tabs-copy.vue
  7. 4
      pages.json
  8. 73
      pages/mainPages/index/diypage.vue
  9. 4
      pages/subPages2/hirePlatform/recruitmentList/recruitmentList.vue
  10. 4
      pagesA/campusActivities/index.vue
  11. 5
      pagesA/identityList/bloggerCertification.vue
  12. 5
      pagesA/identityList/teacherCertification.vue
  13. 38
      pagesA/lifeServices/lifeServices.vue
  14. 17
      pagesA/studentIdentification/studentIdentification.vue

78
components/page/pageComponents/goodsStyle.vue

@ -5,12 +5,12 @@
<view class="goods-container" v-if="logos">
<!-- 新加注释 - 技能培训等第二版选项卡和内容 -->
<!-- <tabs :cc_id="cc_id" @changeChildType="changeChildType"></tabs> -->
<tabs-c :cc_id="cc_id" @changeChildType="changeChildType" v-if="goodsStyleType === 'rush'"></tabs-c>
<tabs-c :cc_id="cc_id" @changeChildType="changeChildType" v-if="goodsStyleType === 'rush'" @search="search" :searchNeed="true"></tabs-c>
<!-- 抢购 -->
<block v-if="goodsStyleType === 'rush'">
<view
class="goods-box b-f dis-flex m-btm20 p-r"
v-for="(goodsItem, index) in goodslistData"
v-for="(goodsItem, index) in showListData"
:key="index"
@click="navigateTo(goodsItem.url,goodsItem.exdetail)"
:class="!isdiyPage ? 'bor-radius-10upx' : ''"
@ -512,7 +512,12 @@ export default {
imgstyle: {},
exdetail:{},
goUrl:'',
cc_child_id:''//id
cc_child_id:'',//id
keyword: "",
lat: "",
lng: "",
dataList: [],//
page: 1,// 使
};
},
components:{
@ -562,8 +567,25 @@ export default {
default: 1
}
},
computed: {},
computed: {
showListData(){
if(this.keyword==""){
return this.goodslistData;
}else{
return this.dataList;
}
}
},
onShow() {},
created() {
let _this = this;
uni.getLocation({
success: function(res) {
_this.lat = res.latitude;
_this.lng = res.longitude;
}
});
},
mounted() {
this.imgstyle = uni.getStorageSync('imgstyle');
},
@ -655,8 +677,54 @@ export default {
},
changeChildType(e){
this.cc_child_id = e;
this.keyword="";
this.$emit('cultivateClassChange', this.cc_child_id);
}
},
search(e){
this.keyword = e;
if(this.keyword==""){
return;
}
this.page = 1;
let _this = this;
let data = {
cate_id: "0",
is_total: "1",
cc_id: this.cc_id,
cc_child_id: this.cc_child_id,
page: this.page,
sort: 3,
lng: this.lng,
lat: this.lat,
title: this.keyword
}
console.log(data, 'p------');
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=>{
});
},
}
};
</script>

8
components/page/pageComponents/tabContro.vue

@ -143,7 +143,7 @@
</block>
<!-- 抢购 -->
<block v-if="currentTab ==='rush' || tabParms.goods_type ==='rush'">
<view class="b-e6 padding-box-all" style="padding-bottom: 70upx;">
<view class="b-e6 padding-box-all" style="padding-bottom: 70upx;padding-top: 0px;">
<goods-style goodsStyleType="rush" :goodslistData="rush_goodsList" @remindSuccess="remindSuccess"
:cc_id="newCC_id" @cultivateClassChange="cultivateClassChange"></goods-style>
</view>
@ -392,7 +392,7 @@
// let tabItem = Object.keys(newData)[0];
let tabItem = 0;//this.selectTabBar_two(newData[tabItem],0)
let arr112 = Object.keys(newData);
console.log(this.newCC_id, 'this.newCC_id-------', arr112)
// console.log(this.newCC_id, 'this.newCC_id-------', arr112)
for(let j = 0;j <arr112.length; j++){
if(newData[arr112[j]].cc_id == this.newCC_id){
tabItem = arr112[j];
@ -400,7 +400,7 @@
}
if (this.controType === 'options2') {
console.log(this.onekey, '(this.onekey)----', newData[tabItem],tabItem)
// console.log(this.onekey, '(this.onekey)----', newData[tabItem],tabItem)
if(this.onekey){
this.selectTabBar_two(newData[this.onekey],0)
}else{
@ -639,7 +639,7 @@
})
}
console.log(requestData, 'requestData------');
// console.log(requestData, 'requestData------');
App._post_form(requestUrl, requestData, res => {
if (isPage) {

4
components/template/diypages.vue

@ -523,9 +523,9 @@
<view class="span f-28 onelist-hidden">{{!!switchCity?switchCity:currentaidCity }}</view>
</view> -->
<!-- 新加注释 - 技能培训等新增返回按钮 -->
<view class="search-h-t1-r f-30" style="color: #999999;" @click="cancelBtn">
<!-- <view class="search-h-t1-r f-30" style="color: #999999;" @click="cancelBtn">
<view class="search-h-t1-r-lk" style="padding-right: 20upx;height: 30px;line-height: 30px;margin-top: 4px;"><text class="iconfont icon-pullleft" style="font-size: 30upx;padding-right: 10upx;"></text>返回</view>
</view>
</view> -->
<!-- <navigator class="searchbox2-l" url="/pages/subPages/search/search" hover-class="none" :style="'color: '+item.style.areaColor">
<! </navigator> -->
<view class="searchbox2-r">

15
components/template/pic_text/pic_text.vue

@ -175,12 +175,21 @@ export default {
//
this.query.select('.video-wrapper').boundingClientRect(data=>{
if(data){
console.log(data.top,'视频在屏幕的高度');
// console.log(data.top,'',data);
if(this.isDetail && (data.top==0 || data.top<0) && this.index==this.currentPlay){// 详情页
console.log('视频暂停');
// console.log('');
this.videoContext.stop();
}else if(!this.isDetail && (data.top==90 || data.top<90) && this.index==this.currentPlay){// 首页
console.log('视频暂停');
// console.log('');
this.videoContext.stop();
}
let winH = uni.getSystemInfoSync().windowHeight;
console.log(winH);
if(!this.isDetail &&(data.bottom + 85 == winH || data.bottom + 85 > winH)){//
// console.log('');
this.videoContext.stop();
}else if(this.isDetail && (data.bottom == winH || data.bottom > winH)){//
// console.log('');
this.videoContext.stop();
}
}

9
components/template/postListTwo.vue

@ -2,7 +2,7 @@
<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 :id="'pagevideo'+indexNumber" v-else object-fit="cover"
<video class="pagevideo" :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">
@ -119,13 +119,18 @@
this.videoContext.stop();
}else{
//
this.query.select('.postListTwo').boundingClientRect(data=>{
this.query.select('.pagevideo').boundingClientRect(data=>{
if(data){
// console.log(data.top,'');
if(data.top<80||data.top==80){
// console.log('');
this.videoContext.stop();
}
let winH = uni.getSystemInfoSync().windowHeight;
if(data.bottom + 85 == winH || data.bottom + 85 > winH){
// console.log('');
this.videoContext.stop();
}
}
}).exec();
}

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

@ -1,14 +1,16 @@
<template>
<view class="">
<view class="search-box" v-if="searchNeed">
<input class="search-inp" type="text" v-model="keyword">
<button class="search-btn" @click="search">搜索</button>
<view style="padding: 10px 0px;" v-if="searchNeed">
<view class="search-box">
<input class="search-inp" type="text" v-model="keyword">
<button class="search-btn" @click="search">搜索</button>
</view>
</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'||cc_id=='51'))?'active1': (current_index==index1?'active2':'')"
:class="(current_index==index1?'active1': '')"
@click="changeIndex(index1)"
:style="(cc_id=='6'||cc_id=='51')?'margin-right:20px;':''">
style="margin-right:20px">
{{item1.name}}
</view>
<!-- cc_id=='6'是校园活动生活服务51的样式和校园活动一样 -->
@ -34,7 +36,7 @@
</view>
<PopManager :show="videoshow" type="center">
<view v-if="videoshow && cc_id<5" class="status_bar"></view>
<!-- <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="false" object-fit="cover"
@ -94,7 +96,11 @@
<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 style="font-size: 12px;color: #999;margin-left: 20upx;">
{{item2.nickname}}
<text style="font-size: 9px;margin: 0px 4px;"></text>
{{item2.quilt_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>
@ -501,9 +507,8 @@
<style lang="scss" scoped>
.search-box{
width: 700upx;
width: 100%;
height: 34px;
margin: 10px auto;
border: 1px solid #509DFD;
border-radius: 30px;
background-color: #fff;
@ -527,8 +532,8 @@
}
.tabs-bar{
width: 100%;
height: 40px;
padding: 0px 10upx;
height: 30px;
// padding: 0px 10upx;
box-sizing: border-box;
white-space: nowrap;
@ -539,7 +544,7 @@
.tabs-bar-item{
display: inline-block;
line-height: 20px;
padding: 10px;
padding: 5px 0px;
font-size: 14px;
color: #666;
&.active1{
@ -577,7 +582,7 @@
}
.tabs-content{
width: 100%;
padding: 30upx;
padding: 30upx 0px;
box-sizing: border-box;
.tabs-banner{

4
pages.json

@ -10,8 +10,8 @@
{
"path": "pages/mainPages/index/diypage",
"style": {
"navigationStyle": "custom",
"navigationBarTitleText": "-"
// "navigationStyle": "custom",
"navigationBarTitleText": ""
// "enableScroll" : false
}
},

73
pages/mainPages/index/diypage.vue

@ -1,18 +1,15 @@
<template>
<view class="app" :style="{paddingBottom:pageType == '13'?'0rpx':'130rpx', paddingTop: '90px'}">
<!-- 上面代码移除掉的样式backgroundColor: datas.page.background, -->
<view class="status_bar">
<!-- 这里是状态栏 -->
</view>
<navigationBar custom="true">
<view class="app" :style="{paddingBottom:pageType == '13'?'0rpx':'130rpx'}">
<!-- 上面代码移除掉的样式backgroundColor: datas.page.background,paddingTop: '90px' -->
<!-- <view class="status_bar"></view> -->
<!-- <navigationBar custom="true">
<view :style="{width: '100vw',height: '50px'}" style="background-color: #FFFFFF;position: fixed;z-index: 999;top:40px;">
<view :style="{padding: '10px', paddingLeft: '20px'}" style="display: flex;">
<!-- <image :style="{verticalAlign: 'middle', width: 94 + 'px',height: 30 + 'px'}" src="../../../static/logo.png" mode=""></image> -->
<image :style="{verticalAlign: 'middle', width: 30 + 'px',height: 30 + 'px'}" :src="imageRootNew+'logo.png'" mode=""></image>
<view style="font-size: 18px;font-weight: bold;line-height: 30px;margin-left: 4px;">粤职才</view>
</view>
</view>
</navigationBar>
</navigationBar> -->
<!-- :style="{'background-color:'!!pageInfo?pageInfo.background:'#FFD93F'}" -->
<view class="container" >
@ -169,6 +166,24 @@ export default {
this.homePageInfo(this.ids);
this.newCC_id = e.cc_id;//
this.sort = e.sort;//
let title;
switch(e.cc_id){
case '1':
title = '技能培训';
break;
case '3':
title = '学历提升';
break;
case '4':
title = '岗前培训';
break;
}
setTimeout(()=>{
uni.setNavigationBarTitle({
title:title
})
}, 500)
},
onHide() {
let _this = this,
@ -190,9 +205,9 @@ export default {
if (!!this.pageInfo && this.pageInfo.title) {
// #ifndef H5
uni.setNavigationBarTitle({
title: this.pageInfo.title
});
// uni.setNavigationBarTitle({
// title: this.pageInfo.title
// });
// #endif
// #ifdef H5
document.title = this.pageInfo.title || '⁣​';
@ -327,9 +342,9 @@ export default {
//
if (!!res.data.page.title) {
// #ifdef MP-WEIXIN
uni.setNavigationBarTitle({
title: res.data.page.title
});
// uni.setNavigationBarTitle({
// title: res.data.page.title
// });
// #endif
// #ifdef H5
let pagetitle = uni.getStorageSync('TextSubstitution').sysname;
@ -356,18 +371,24 @@ export default {
diypagesDataArray.push(diypagesData[i]);
}
//
if(type==3 && diypagesDataArray[1].id == 'options2'){
// const res = await _this.getCultivateClassList();
App._post_form('&p=store&do=getCultivateClassList', {}, res => {
console.log(res, '78123791840294-23o5')
diypagesDataArray[1].data = res.data;
diypagesDataArray[1].newCC_id = _this.newCC_id;
laterProcedure();
}, false, () => {
}
)
if(type==3 && diypagesDataArray[0].id == 'search2'){
// this.$delete(this.diypagesData, 'D1234567890');
this.$delete(diypagesDataArray, '0');
// console.log(this.diypagesData, '-----------', diypagesDataArray)
if(type==3 && diypagesDataArray[0].id == 'options2'){
// const res = await _this.getCultivateClassList();
App._post_form('&p=store&do=getCultivateClassList', {}, res => {
// console.log(res, '78123791840294-23o5')
diypagesDataArray[0].data = res.data;
diypagesDataArray[0].newCC_id = _this.newCC_id;
laterProcedure();
}, false, () => {
}
)
}
}else{
laterProcedure();
}

4
pages/subPages2/hirePlatform/recruitmentList/recruitmentList.vue

@ -24,7 +24,9 @@
<view v-if="loadlogo">
<!-- <tabs :cc_id="cc_id" :pageType="job_type" @changeChildType="changeChildType"></tabs> -->
<tabs-c :cc_id="cc_id" :pageType="job_type" @changeChildType="changeChildType"></tabs-c>
<view style="padding: 0px 30upx;">
<tabs-c :cc_id="cc_id" :pageType="job_type" @changeChildType="changeChildType"></tabs-c>
</view>
<block v-if="job_type!=2">
<work-List :flag="false" :inviteList="inviteList"></work-List>
</block>

4
pagesA/campusActivities/index.vue

@ -1,6 +1,8 @@
<template>
<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 style="padding: 0px 30upx;">
<tabs-c :cc_id="cc_id" pageType="" @changeChildType="changeChildType" @search="search" :searchNeed="true"></tabs-c>
</view>
<view class="content_wrapper">
<view v-for="(item,index) in dataList" :key="index" class="list-item" @click="toDetail(item.id)">
<image :src="item.promotional_img" mode="aspectFill"></image>

5
pagesA/identityList/bloggerCertification.vue

@ -111,7 +111,7 @@ export default {
let _this = this;
_this.getInfo(mid);
},
//
//
getInfo(mid) {
let _this = this;
let data = {
@ -133,7 +133,8 @@ export default {
code: _this.bloggerInfo.code,
screenshot: _this.bloggerInfo.screenshot
};
if(data.name==''){
if(data.name.replace(/(^\s*)|(\s*$)/g, "")==''){
//
uni.showToast({
icon:'none',
title: '姓名不能为空',

5
pagesA/identityList/teacherCertification.vue

@ -120,7 +120,7 @@ export default {
let _this = this;
_this.getInfo(mid);
},
//
//
getInfo(mid) {
let _this = this;
let data = {
@ -144,7 +144,8 @@ export default {
code: _this.teacherInfo.code,
documents: _this.teacherInfo.document_img
};
if(data.name==''){
if(data.name.replace(/(^\s*)|(\s*$)/g, "")==''){
//
uni.showToast({
icon:'none',
title: '姓名不能为空',

38
pagesA/lifeServices/lifeServices.vue

@ -1,6 +1,8 @@
<template>
<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 style="padding: 0px 30upx;">
<tabs-c :cc_id="cc_id" pageType="" @changeChildType="changeChildType" @search="search" :searchNeed="true"></tabs-c>
</view>
<view class="content_wrapper">
<view v-for="(item,index) in dataList" :key="index" class="list-item" @click="toDetail(item.url)">
<view class="img-box">
@ -12,14 +14,14 @@
<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
{{item.distance}}
</view>
</view>
</view>
<view class="text-box">
<view class="text1">{{item.goods_name}}</view>
<view class="text2">
<text style="color: #D3101E;font-size: 14px;margin-left: -2px;">{{item.price}}</text>
<text style="color: #D3101E;font-size: 12px;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>
@ -43,13 +45,28 @@
dataList: [],
cc_id: "51",//
cc_cc_id: '',//
keyword: "",
keyword: "",
lat: "",
lng: ""
}
},
components: {
loadmore,
tabsC
},
created() {
let _this = this;
uni.getLocation({
success: function(res) {
console.log(res, 11111)
_this.lat = res.latitude;
_this.lng = res.longitude;
},
fail(err) {
console.log(err, 222222)
}
});
},
onLoad(e){
console.log(e, '-----');
if(e.cc_id){
@ -68,7 +85,9 @@
// cc_child_id: this.cc_cc_id,
cc_id: this.cc_id,
page: this.page,
sort: 3
sort: 3,
lng: this.lng,
lat: this.lat
}
if(type=='search'){
data.title = this.keyword;
@ -124,7 +143,14 @@
this.page = 1;
this.cc_cc_id = e;
this.keyword = '';
this.getList();
if(this.lng){
this.getList();
}else{
setTimeout(()=>{
this.changeChildType(e)
},200)
}
},
search(e){
this.keyword = e;

17
pagesA/studentIdentification/studentIdentification.vue

@ -165,7 +165,22 @@ export default {
// #ifdef H5
wxApi.wxRegister();
// #endif
_this.getInfo(mid);
_this.verifyInfo(mid);
},
//
verifyInfo(mid) {
let _this = this;
let data = {
mid: mid
};
App._post_form('&p=Certified&do=initApplyCertified', data, res => {
_this.getInfo(mid);
}, (err)=>{
console.log(err.data.message);
uni.navigateBack({
delta: 1
})
});
},
//
getInfo(mid) {

Loading…
Cancel
Save