Browse Source

更新

master
luyisha 3 years ago
parent
commit
f948e09b23
  1. 1
      common/js/app.js
  2. 7
      components/page/pageComponents/goodsStyle.vue
  3. 6
      components/page/pageComponents/tabContro.vue
  4. 26
      components/template/partTimeJob.vue
  5. 52
      components/template/pic_text/pic_text.vue
  6. 733
      components/template/tabs/tabs-copy.vue
  7. 1
      main.js
  8. 18
      pages.json
  9. 18
      pages/mainPages/Settled/Settled.vue
  10. 5
      pages/mainPages/sendInformation/sendInformation.vue
  11. 4
      pages/mainPages/userCenter/userCenter.vue
  12. 2
      pages/mainPages/userset/userset.vue
  13. 5
      pages/subPages/Equity/Equity.vue
  14. 121
      pages/subPages/Equity/record/record.vue
  15. 13
      pages/subPages/createCommodity/index.vue
  16. 4
      pages/subPages/goods/index.vue
  17. 24
      pages/subPages/homepage/private/private.vue
  18. 19
      pages/subPages/merchant/merchantOrder/merchantOrder.vue
  19. 70
      pages/subPages/merchant/set/set.vue
  20. 9
      pages/subPages/mineCollection/mineCollection.vue
  21. 152
      pages/subPages2/hirePlatform/addResume/addResume.vue
  22. 9
      pages/subPages2/hirePlatform/recruitmentList/recruitmentList.vue
  23. 4
      pagesA/campusActivities/campusActivities.vue
  24. 110
      pagesA/campusActivities/index.vue
  25. 7
      pagesA/campusActivities/myActivities.vue
  26. 19
      pagesA/identityList/bloggerCertification.vue
  27. 19
      pagesA/identityList/teacherCertification.vue
  28. 16
      pagesA/instantMessenger/instantMessenger.vue
  29. 238
      pagesA/lifeServices/lifeServices.vue

1
common/js/app.js

@ -133,6 +133,7 @@ let App = {
} }
this.img_root = this.siteInfo.siteroot + `${this.base}/resource/image/`; this.img_root = this.siteInfo.siteroot + `${this.base}/resource/image/`;
this.img_root_new = this.siteInfo.siteroot + `addons/weliam_smartcity/data/img/`; this.img_root_new = this.siteInfo.siteroot + `addons/weliam_smartcity/data/img/`;
this.img_root_new2 = this.siteInfo.siteroot + `attachment/`;
let apiObj = this.urlToObj(this.api_root); let apiObj = this.urlToObj(this.api_root);
if (!!apiObj.token && apiObj.token !== "undefined") { if (!!apiObj.token && apiObj.token !== "undefined") {
uni.setStorageSync('weliam_user_token', apiObj.token) uni.setStorageSync('weliam_user_token', apiObj.token)

7
components/page/pageComponents/goodsStyle.vue

@ -4,7 +4,8 @@
<view class="goods-container" v-if="logos"> <view class="goods-container" v-if="logos">
<!-- 新加注释 - 技能培训等第二版选项卡和内容 --> <!-- 新加注释 - 技能培训等第二版选项卡和内容 -->
<tabs :cc_id="cc_id" @changeChildType="changeChildType"></tabs> <!-- <tabs :cc_id="cc_id" @changeChildType="changeChildType"></tabs> -->
<tabs-c :cc_id="cc_id" @changeChildType="changeChildType" v-if="goodsStyleType === 'rush'"></tabs-c>
<!-- 抢购 --> <!-- 抢购 -->
<block v-if="goodsStyleType === 'rush'"> <block v-if="goodsStyleType === 'rush'">
<view <view
@ -502,6 +503,7 @@
import App from '@/common/js/app.js'; import App from '@/common/js/app.js';
import PopManager from '@/components/template/PopManager'; import PopManager from '@/components/template/PopManager';
import tabs from '@/components/template/tabs/tabs.vue'; import tabs from '@/components/template/tabs/tabs.vue';
import tabsC from '@/components/template/tabs/tabs-copy.vue';
export default { export default {
data() { data() {
return { return {
@ -515,7 +517,8 @@ export default {
}, },
components:{ components:{
PopManager, PopManager,
tabs tabs,
tabsC
}, },
props: { props: {
isdiyPage: { isdiyPage: {

6
components/page/pageComponents/tabContro.vue

@ -392,13 +392,15 @@
// let tabItem = Object.keys(newData)[0]; // let tabItem = Object.keys(newData)[0];
let tabItem = 0;//this.selectTabBar_two(newData[tabItem],0) let tabItem = 0;//this.selectTabBar_two(newData[tabItem],0)
let arr112 = Object.keys(newData); let arr112 = Object.keys(newData);
console.log(this.newCC_id, 'this.newCC_id-------', arr112)
for(let j = 0;j <arr112.length; j++){ for(let j = 0;j <arr112.length; j++){
if(j+1 == this.newCC_id){ if(newData[arr112[j]].cc_id == this.newCC_id){
tabItem = Object.keys(newData)[j]; tabItem = arr112[j];
} }
} }
if (this.controType === 'options2') { if (this.controType === 'options2') {
console.log(this.onekey, '(this.onekey)----', newData[tabItem],tabItem)
if(this.onekey){ if(this.onekey){
this.selectTabBar_two(newData[this.onekey],0) this.selectTabBar_two(newData[this.onekey],0)
}else{ }else{

26
components/template/partTimeJob.vue

@ -34,8 +34,11 @@
<view class="dis-il-block company-name" style="color: #000;font-size: 30upx;"> <view class="dis-il-block company-name" style="color: #000;font-size: 30upx;">
{{item.title}} {{item.title}}
</view> </view>
<view class="dis-il-block wprk-top" v-if="item.is_top != 0">
</view>
<view style="font-size: 30upx;font-family: DINPro; <view style="font-size: 30upx;font-family: DINPro;
font-weight: 600;color: #FF4444;">{{item.salary}}</view> font-weight: 600;color: #FF4444;flex:1;text-align: right;">{{item.salary}}</view>
<view class="dis-il-block company-authentication" v-if="item.release.is_authentication != 0"> <view class="dis-il-block company-authentication" v-if="item.release.is_authentication != 0">
已认证 已认证
</view> </view>
@ -113,6 +116,17 @@
border-radius: 20upx!important; border-radius: 20upx!important;
background-color: #FFFFFF!important; background-color: #FFFFFF!important;
} }
.wprk-top{
background: #F1C426;
border-radius: 4upx;
font-size: 22upx;
font-family: PingFang SC;
font-weight: 500;
padding: 2upx 5upx;
margin-left: 20upx;
color: #FFFFFF;
}
.workList{ .workList{
padding: 0upx 24upx 0upx; padding: 0upx 24upx 0upx;
background-color: #FFFFFF; background-color: #FFFFFF;
@ -125,16 +139,6 @@
font-weight: bold; font-weight: bold;
color: #333333; color: #333333;
} }
.wprk-top{
background: #F1C426;
border-radius: 4upx;
font-size: 22upx;
font-family: PingFang SC;
font-weight: 500;
padding: 2upx 5upx;
margin-left: 20upx;
color: #FFFFFF;
}
.wprk-pay{ .wprk-pay{
float: right; float: right;
font-size: 30upx; font-size: 30upx;

52
components/template/pic_text/pic_text.vue

@ -28,11 +28,21 @@
</view> </view>
</view> </view>
<view class="dis-flex img-wrapper" v-if="!itemInfos.video_link"> <view class="dis-flex img-wrapper" v-if="!itemInfos.video_link">
<block v-if="itemInfos.img.length!==1">
<view v-for="(item,index) in itemInfos.img" :key="index" class="img-item"> <view v-for="(item,index) in itemInfos.img" :key="index" class="img-item">
<image :src="item" mode="aspectFill" @click.stop="imgPre(index,itemInfos.img)"></image> <image :src="item" mode="aspectFill" @click.stop="imgPre(index,itemInfos.img)"></image>
</view> </view>
<view style="width: 25vw;"></view> <view style="width: 25vw;"></view>
<view style="width: 25vw;"></view> <view style="width: 25vw;"></view>
</block>
<block v-else>
<view v-if="singleImgW>singleImgH" class="img-item-single-w" :style="{ height: `calc(${singleImgH} / ${singleImgW} * 50vw)` }">
<image :src="itemInfos.img[0]" mode="aspectFit" @click.stop="imgPre(0,itemInfos.img)" @load="changeImgSize"></image>
</view>
<view v-if="singleImgW<singleImgH" class="img-item-single-h" :style="{ width: `calc(${singleImgW} / ${singleImgH} * 50vw)` }">
<image :src="itemInfos.img[0]" mode="aspectFit" @click.stop="imgPre(0,itemInfos.img)"></image>
</view>
</block>
</view> </view>
<view class="dis-flex video-wrapper" v-if="!!itemInfos.video_link&&itemInfos.img.length==0" <view class="dis-flex video-wrapper" v-if="!!itemInfos.video_link&&itemInfos.img.length==0"
style="position: relative;"> style="position: relative;">
@ -59,17 +69,17 @@
<view class="dis-flex comment-wrapper"> <view class="dis-flex comment-wrapper">
<button open-type="share" :id="itemInfos.id" <button open-type="share" :id="itemInfos.id"
style="margin: 0;background: transparent;padding: 0;line-height: normal;font-size: 13px;" @click.stop="share"> style="margin: 0;background: transparent;padding: 0;line-height: normal;font-size: 13px;" @click.stop="share">
<image style="width: 36rpx;height: 36rpx;vertical-align: middle;margin-right: 10rpx;" src="https://qingyuan.xingtongworld.com/addons/weliam_smartcity/data/img/share-two.png" mode=""></image> <image style="width: 36rpx;height: 36rpx;vertical-align: middle;margin-right: 10rpx;" :src="imageRootNew+'share-two.png'" mode=""></image>
{{itemInfos.share}} {{itemInfos.share}}
</button> </button>
<view class="" @click.stop="commentShow=true"> <view class="" @click.stop="editCom">
<image style="width: 36rpx;height: 36rpx;vertical-align: middle;margin-right: 10rpx;" src="https://qingyuan.xingtongworld.com/addons/weliam_smartcity/data/img/fa-comment.png" mode=""></image> <image style="width: 36rpx;height: 36rpx;vertical-align: middle;margin-right: 10rpx;" :src="imageRootNew+'fa-comment.png'" mode=""></image>
<text v-if="itemInfos.comment_list.total">{{itemInfos.comment_list.total}}</text> <text v-if="itemInfos.comment_list.total">{{itemInfos.comment_list.total}}</text>
<text v-else>0</text> <text v-else>0</text>
</view> </view>
<view class="" @click.stop="fabulous"> <view class="" @click.stop="fabulous">
<image v-if="!itemInfos.is_fabulous" style="width: 36rpx;height: 36rpx;vertical-align: middle;margin-right: 10rpx;" src="https://qingyuan.xingtongworld.com/addons/weliam_smartcity/data/img/appreciate-grey.png" mode=""></image> <image v-if="!itemInfos.is_fabulous" style="width: 36rpx;height: 36rpx;vertical-align: middle;margin-right: 10rpx;" :src="imageRootNew+'appreciate-grey.png'" mode=""></image>
<image v-else style="width: 36rpx;height: 36rpx;vertical-align: middle;margin-right: 10rpx;" src="https://qingyuan.xingtongworld.com/addons/weliam_smartcity/data/img/appreciate-red.png" mode=""></image> <image v-else style="width: 36rpx;height: 36rpx;vertical-align: middle;margin-right: 10rpx;" :src="imageRootNew+'appreciate-red.png'" mode=""></image>
{{itemInfos.fabulous_num}} {{itemInfos.fabulous_num}}
</view> </view>
</view> </view>
@ -115,7 +125,9 @@ export default {
listVideoHeight: '40vw', listVideoHeight: '40vw',
detailVideoHeight: '60vw', detailVideoHeight: '60vw',
videoContext: '', videoContext: '',
query: '' query: '',
singleImgW: '2',
singleImgH: '1',
} }
}, },
components:{ components:{
@ -190,6 +202,9 @@ export default {
}, },
share(){ share(){
},
editCom(){
this.commentShow=true;
}, },
// //
submit(){ submit(){
@ -343,9 +358,20 @@ export default {
// console.log(this.videoWidth, this.videoHeight) // console.log(this.videoWidth, this.videoHeight)
} }
}, },
changeImgSize(e){
console.log(e.detail.width, e.detail.height, '单张图片尺寸');
this.singleImgW = e.detail.width;
this.singleImgH = e.detail.height;
},
stopOther(){ stopOther(){
this.$emit('changePlay', this.index); this.$emit('changePlay', this.index);
} },
updateImgW(){
return { width: `calc(${this.singleImgW} / ${this.singleImgH} * 50vw)` };
},
updateImgH(){
return { height: `calc(${this.singleImgH} / ${this.singleImgW} * 50vw)` };
},
}, },
onReady(){ onReady(){
// createVideoContext uni video // createVideoContext uni video
@ -458,6 +484,18 @@ export default {
border-radius: 5px; border-radius: 5px;
overflow: hidden; overflow: hidden;
} }
.img-item-single-w{
width: 50vw;
margin-bottom: 1vw;
border-radius: 5px;
overflow: hidden;
}
.img-item-single-h{
height: 50vw;
margin-bottom: 1vw;
border-radius: 5px;
overflow: hidden;
}
image{ image{
width: 100%; width: 100%;
height: 100%; height: 100%;

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

@ -0,0 +1,733 @@
<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>
<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':'')"
@click="changeIndex(index1)"
:style="cc_id=='6'?'margin-right:20px;':''">
{{item1.name}}
</view>
<!-- cc_id=='6'是校园活动生活服务的样式和校园活动一样 -->
</scroll-view>
<view class="tabs-content">
<swiper class="tabs-banner" :indicator-dots="true" v-if="bannerList.length>0">
<swiper-item v-for="(item2,index2) in bannerList" :key="index2" @click="navigatorTo(item2.link)">
<image :src="item2.thumb" mode="widthFix"></image>
</swiper-item>
</swiper>
<scroll-view class="tabs-video" :scroll-x="true">
<view v-for="(item3,index3) in videoList" :key="index3" class="tabs-video-item">
<view style="">
<video @click="handleV(item3)" :src="item3.video_link" object-fit="cover"
:show-center-play-btn="false" :controls="false" :direction="0" :poster="item3.video_cover"></video>
</view>
<view class="video-txt">
{{item3.title}}
</view>
</view>
</scroll-view>
</view>
<PopManager :show="videoshow" type="center">
<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"
@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="videoTxt">
<view class="text-area">
<!-- <image src="../../../static/chooseCade/BG.png" mode=""
style="width: 80upx;height: 80upx;background: #FFF;border-radius: 50%;overflow: hidden;"></image> -->
{{videoTxt}}
</view>
<view class="dis-flex comment-wrapper">
<button open-type="share" :id="currentVideo.id"
style="margin: 0;background: transparent;padding: 0;line-height: normal;font-size: 13px;color: #333;height: 36rpx;"
@click.stop="share">
<image style="width: 36rpx;height: 36rpx;vertical-align: middle;margin-right: 10rpx;" :src="imageRootNew+'share-two.png'" mode=""></image>
{{currentVideo.share}}
</button>
<view class="" @click.stop="showComment">
<image style="width: 36rpx;height: 36rpx;vertical-align: middle;margin-right: 10rpx;" :src="imageRootNew+'fa-comment.png'" mode=""></image>
<text v-if="currentVideo.listTotal">{{currentVideo.listTotal}}</text>
<text v-else>0</text>
</view>
<view class="" @click.stop="fabulous">
<image v-if="!currentVideo.is_like" style="width: 36rpx;height: 36rpx;vertical-align: middle;margin-right: 10rpx;" :src="imageRootNew+'appreciate-grey.png'" mode=""></image>
<image v-else style="width: 36rpx;height: 36rpx;vertical-align: middle;margin-right: 10rpx;" :src="imageRootNew+'appreciate-red.png'" mode=""></image>
{{currentVideo.likenum||0}}
</view>
</view>
</view>
</view>
</PopManager>
<!-- 评论区弹窗 -->
<view class="comment-area" :class="commentShow?'commentShow':''">
<view style="text-align: center;line-height: 40px;">
{{currentVideo.listTotal}}条评论
<text style="float: right;font-size: 20px;margin-right: 20upx;" @click="hideComment">×</text>
</view>
<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%;"><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%;"><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>
</view>
</view>
</view>
<view class="" v-else style="text-align: center;">
暂无评论
</view>
<view class="" v-if="currentVideo.CommentList.length!=currentVideo.listTotal"
style="text-align: center;margin: 10px 0px;color: #666;" @click="showMoreComment">
展开更多评论
</view>
</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" />
<view class="comment-a-b-btn" @click="submitComment">发送</view>
</view>
</view>
</view>
</template>
<script>
import App from '@/common/js/app.js';
import PopManager from '@/components/template/PopManager';
export default{
data(){
return {
keyword: '',
current_index: 0,
tabList: [],
child_id: 0,
bannerList: [],
videoList: [],
videoshow: false,
videolint: '',
videoTxt: '',
currentVideo: {
listTotal: 0,
CommentList: []
},
commentShow: false,
currentVideoW: '',
currentVideoH: '',
play: true,
editComment: '',
pid: '',// id
oneid: '',// id
placeholderText: '输入评论',
comment_onePage: 1,
}
},
components: {
PopManager
},
props: {
pageType: {
type: Number | String,
default: ''
},
cc_id: {
// 1~47~96
type: Number | String,
default: 0
},
searchNeed: {
type: Boolean,
default: false
}
},
computed:{
updateWH(){
if(this.currentVideoW>this.currentVideoH){
// console.log({ width:'100vw', height: `calc(${this.currentVideoH} / ${this.currentVideoW} * 100vw)` });
return `width:100vw; height: calc(${this.currentVideoH} / ${this.currentVideoW} * 100vw);top: 50%;transform: translateY(-50%);`;
}
if(this.currentVideoW<this.currentVideoH){
// console.log({ height:'100vh', width: `calc(${this.currentVideoW} / ${this.currentVideoH} * 100vh)` });
// return `height:calc(100vh - 140rpx); width: calc(${this.currentVideoW} / ${this.currentVideoH} * (100vh - 140rpx))`;
return `height:calc(100vh - 140rpx); width: 100vw`;
}
},
},
created() {
this.getTabData();
},
mounted() {
// createVideoContext uni video
this.videoContext = uni.createVideoContext('myvideo', this);
// this.videoContext.requestFullScreen();
},
methods: {
getTabData(){
App._post_form(
`&p=cultivateClass&do=getCultivateClassChildList`,
{cc_id: this.cc_id},
res => {
if(res.data.length>0){
this.tabList = res.data;
console.log(res.data);
this.child_id = res.data[0].id;
this.getInfoData();
this.$emit('changeChildType',this.child_id);
}
},
false,
() => {
// this.loadlogo = true;
}
);
},
getInfoData(){
App._post_form(
`&p=cultivateClass&do=getCultivateClassInfo`,
{cc_id: this.child_id},
res => {
this.bannerList = res.data.advs;
this.videoList = res.data.video;
// this.videoList = [...res.data.video, ...res.data.video, ...res.data.video, ...res.data.video];
},
false,
() => {
// this.loadlogo = true;
}
);
},
changeIndex(i){
this.current_index = i;
this.child_id = this.tabList[i].id;
this.getInfoData();
this.keyword = '';
this.$emit('changeChildType',this.child_id);
},
navigatorTo(link){
console.log(23232)
uni.navigateTo({
url:'/'+link
})
},
//
handleV(content){
console.log(111, content);
this.videoshow = true;
this.videolint = content.video_link;
this.videoTxt = content.title;
this.currentVideo = {...content, CommentList: [], listTotal: 0,};
// this.videoContext.requestFullScreen({
// direction:0
// })
this.play = true;
this.editComment = '';
this.oneid = "";
this.pid = '';
this.comment_onePage = 1;
this.placeholderText = '输入评论';
//
let data = {
video_id: this.currentVideo.id,
oneid: '',//id
pindex: this.comment_onePage,
psize: 10
}
this.getVideoComment(data);
},
//
getVideoComment(data){
App._post_form(
`&p=cultivateClass&do=getVideoComment`,
data,
res => {
console.log(res);
if(this.comment_onePage===1){
for(let item of res.data.list){
this.currentVideo.CommentList.push({
...item,
comment_twoPage: 1//
})
}
this.currentVideo.listTotal = res.data.total;
}else{
for(let item of res.data.list){
this.currentVideo.CommentList.push({
...item,
comment_twoPage: 1//
})
}
this.currentVideo.listTotal = res.data.total;
}
this.comment_onePage++;
},
false,
() => {
// this.loadlogo = true;
}
);
},
//
showMoreComment(){
let data = {
video_id: this.currentVideo.id,
oneid: '',//id
pindex: this.comment_onePage,
psize: 10
}
this.getVideoComment(data);
},
// //
getChildCommentList(indexA, id){
let data = {
video_id: this.currentVideo.id,
oneid: id,//id
pindex: this.currentVideo.CommentList[indexA].comment_twoPage,
psize: 10
};
App._post_form(
`&p=cultivateClass&do=getVideoComment`,
data,
res => {
console.log(res);
if(res.data.list.length>0){
}
if(this.currentVideo.CommentList[indexA].comment_twoPage === 1){
this.currentVideo.CommentList[indexA].childCommentList = res.data.list;
}else{
this.currentVideo.CommentList[indexA].childCommentList = [...this.currentVideo.CommentList[indexA].childCommentList, ...res.data.list];
}
if(res.data.total == this.currentVideo.CommentList[indexA].childCommentList.length){
this.currentVideo.CommentList[indexA].comment_twoPage = 0;
}else{
this.currentVideo.CommentList[indexA].comment_twoPage++;
}
console.log(this.currentVideo.CommentList[indexA].comment_twoPage, '当前评论comment_twoPage');
},
false,
() => {
// this.loadlogo = true;
}
);
},
showComment(){
this.commentShow=true;
},
hideComment(){
this.commentShow=false;
this.editComment = "";
this.oneid = "";
this.pid = '';
this.placeholderText = '输入评论';
},
hideVideo(){
this.videoshow = false;
this.hideComment();
},
videoControl(e){
console.log(e);
if(this.play){
this.play = false;
this.videoContext.pause();
}else{
this.play = true;
this.videoContext.play();
}
},
search(){
this.$emit('search', this.keyword)
},
share(){
App._post_form(
`&p=cultivateClass&do=shareNum`,
{id: this.currentVideo.id},
res => {
this.currentVideo.share++;
},
false,
() => {
// this.loadlogo = true;
}
);
},
fabulous(item){
App._post_form(
`&p=cultivateClass&do=fabulous`,
{id: this.currentVideo.id},
res => {
this.currentVideo.is_like = !this.currentVideo.is_like;
this.videoList.map(item=>{
if(item.id == this.currentVideo.id){
item.is_like = this.currentVideo.is_like;
if(item.is_like){
item.likenum ++;
uni.showToast({
title:'点赞成功',
icon:'none'
})
}else{
item.likenum --;
uni.showToast({
title:'取消点赞',
icon:'none'
})
}
}
})
},
false,
() => {
// this.loadlogo = true;
}
);
},
submitComment(){
let _this = this;
let data = {
video_id: this.currentVideo.id,
text: this.editComment,
pid: this.pid,
oneid: this.oneid
}
App._post_form(
`&p=cultivateClass&do=comment`,
data,
res => {
uni.showToast({
title:'评论成功',
icon:'none'
})
//
let data1 = {
video_id: _this.currentVideo.id,
oneid: '',//id
pindex: 1,
psize: 10
}
_this.comment_onePage = 1;
//
// _this.getVideoComment(data1);
//
// if(_this.placeholderText == ''){
// this.currentVideo.CommentList.unshift();
// this.currentVideo.listTotal++;
// }
//
// if(_this.placeholderText == ''){
// let indexA;
// for(let i = 0;i<_this.currentVideo.CommentList.length;i++){
// if(_this.currentVideo.CommentList[i].id==_this.oneid){
// indexA = i;
// }
// }
// _this.currentVideo.CommentList[indexA].comment_twoPage = 1;
// _this.getChildCommentList(indexA, _this.oneid)
// }
_this.editComment = "";
_this.oneid = "";
_this.pid = '';
_this.placeholderText = '输入评论';
},
false,
() => {
// this.loadlogo = true;
}
);
},
//
editReply(index1, index2){
console.log(index1, index2);
this.oneid = this.currentVideo.CommentList[index1].id;
if(index2){
this.pid = this.currentVideo.CommentList[index1].childCommentList[index2].id;
}else{
this.pid = this.currentVideo.CommentList[index1].id;
}
this.placeholderText = '回复评论'
console.log(this.pid,'this.pid,当前要回复的评论的id');
console.log(this.oneid,'this.oneid,当前要回复的评论的一级评论id');
// this.placeholderText = '';
},
changeSize(e){
// console.log(e.detail.width, e.detail.height, '');
this.currentVideoW = e.detail.width;
this.currentVideoH = e.detail.height;
},
}
}
</script>
<style lang="scss" scoped>
.search-box{
width: 700upx;
height: 34px;
margin: 10px auto;
border: 1px solid #509DFD;
border-radius: 30px;
background-color: #fff;
display: flex;
align-items: center;
.search-inp{
flex-grow: 1;
padding: 0px 10px 0px 20px;
font-size: 14px;
}
.search-btn{
width: 120upx;
height: 30px;
background-color: #509DFD;
border-radius: 15px;
color: #fff;
font-size: 12px;
padding: 0px;
margin-right: 2px;
}
}
.tabs-bar{
width: 100%;
height: 40px;
padding: 0px 10upx;
box-sizing: border-box;
white-space: nowrap;
::-webkit-scrollbar{
display: none;
}
.tabs-bar-item{
display: inline-block;
line-height: 20px;
padding: 10px;
font-size: 14px;
color: #666;
&.active1{
color: #333;
font-size: 18px;
position: relative;
}
&.active1::after{
content: '';
width: 26px;
height: 4px;
position: absolute;
bottom: 0px;
left: 50%;
transform: translateX(-50%);
background-color: #509DFD;
border-radius: 2px;
}
&.active2{
font-weight: bold;
color: #333;
position: relative;
}
&.active2::after{
content: '';
width: 20px;
height: 3px;
position: absolute;
bottom: 0px;
left: 50%;
transform: translateX(-50%);
background-color: #f00;
}
}
}
.tabs-content{
width: 100%;
padding: 30upx;
box-sizing: border-box;
.tabs-banner{
width: 100%;
height: 300upx;
border-radius: 20upx;
transform: translate3d(0, 0, 0);
overflow: hidden;
background-color: #fff;
margin-bottom: 40upx;
image{
width:100%;
}
}
.tabs-video{
width: 100%;
white-space: nowrap;
::-webkit-scrollbar{
display: none;
}
.tabs-video-item{
width: 200upx;
display: inline-block;
margin-right: 20upx;
}
video{
width: 200upx;
height: 300upx;
border-radius: 20upx;
overflow: hidden;
}
.video-txt{
width: 100%;
font-size: 14px;
white-space: nowrap; text-overflow: ellipsis; overflow: hidden;
}
}
}
.status_bar{
height: calc(var(--status-bar-height) * 2);
width: 100%;
background-color: #000;
}
.videoNavBar{
width: 100vw;
position: absolute;
left: 0upx;
// top: calc(var(--status-bar-height) * 2);
//
top: 0px;
z-index: 1;
color: #999;
padding: 16upx 30upx 16upx;
}
.myvideo{
position: absolute;
}
.videoTxt{
width: 100vw;
position: absolute;
left: 0upx;
bottom: 0;
z-index: 1;
font-size: 28upx;
padding: 20upx 0upx 80upx;
box-sizing: border-box;
color: #ddd;
// background-color: rgba(255,255,255,0.1);
white-space: break-spaces;
.text-area{
padding: 70px 30upx 70upx;
background-image: linear-gradient(rgba(0,0,0,0), rgba(0,0,0,.4));
}
.comment-wrapper{
height: 25px;
margin: 5px auto 0px;
justify-content: space-between;
font-size: 13px;
color: #333;
padding: 0px 30upx;
}
}
.comment-area{
position: fixed;z-index: 1000;
// bottom: 0px;
bottom: -60vh;
width: 100vw;height: 60vh;left: 0px;
background-color: #FFF;
border-radius: 10px 10px 0px 0px;
display: flex;flex-direction: column;
justify-content: start;
transition: 0.5s;
&.commentShow{
bottom: 0px;
transition: 0.5s;
.comment-a-b{
bottom: 0px;
transition: 0.5s;
}
}
.comment-a-list{
font-size: 14px;
margin: 10px auto;
height: calc(60vh - 120px);
.comment-item{
display: flex;
// justify-content: space-between;
align-items: center;
flex-wrap: wrap;
padding: 10upx 30upx;
.comment-item-child{
// width: 80vw;
margin-left: 30px;
display: flex;
align-items: center;
padding: 10rpx 0px;
flex-wrap: wrap;
}
.reply{
padding: 4rpx 10rpx;
border-radius: 30px;
font-size: 11px;
background: #ececec;
}
}
}
.comment-a-b{
position: fixed;z-index: 1001;
left: 0px;
transition: 0.5s;bottom: -60vh;
width: 100vw;min-height: 40px;
padding-bottom: 20px;
display: flex;
align-items: flex-end;
background-color: #FFF;
.comment-a-b-inp{
flex: 1;
padding: 10rpx 20rpx;
margin: 0rpx 30rpx;
background: #ececec;
border-radius: 15px;
font-size: 14px;
// line-height: 30px;
}
/deep/.comment-a-b-inp-p{
color: #ccc;
}
.comment-a-b-btn{
width: 60px;
height: 30px;
line-height: 30px;
border-radius: 30px;
background: #ccc;
text-align: center;
margin-right: 30rpx;
}
}
}
</style>

1
main.js

@ -26,6 +26,7 @@ Vue.mixin({
imgfixUrls: AppFunction.imgfix, imgfixUrls: AppFunction.imgfix,
imageRoot: AppFunction.img_root, imageRoot: AppFunction.img_root,
imageRootNew: AppFunction.img_root_new, imageRootNew: AppFunction.img_root_new,
imageRootNew2: AppFunction.img_root_new2,
shareDataInfo: {}, shareDataInfo: {},
onShowPageTitle: false onShowPageTitle: false
} }

18
pages.json

@ -101,6 +101,15 @@
"navigationBarTitleText": "实卡绑定" "navigationBarTitleText": "实卡绑定"
} }
} }
,{
"path" : "pagesA/lifeServices/lifeServices",
"style" :
{
"navigationBarTitleText": "",
"enablePullDownRefresh": false
}
}
], ],
"subPackages": [ "subPackages": [
{ {
@ -620,6 +629,15 @@
"navigationBarTitleText": "我的权益" "navigationBarTitleText": "我的权益"
} }
}
,{
"path" : "record/record",
"style" :
{
"navigationBarTitleText": "充值记录",
"enablePullDownRefresh": false
}
} }
] ]
}, },

18
pages/mainPages/Settled/Settled.vue

@ -187,7 +187,7 @@
<view> <view>
<!-- 图片预览循环模板 --> <!-- 图片预览循环模板 -->
<view class="imgPreview" v-if="userInfo.business_license !== ''"> <view class="imgPreview" v-if="userInfo.business_license !== ''">
<image :src="userInfo.business_license" /> <image :src="imageRootNew2 + userInfo.business_license" />
<image :src="imgfixUrls + 'merchant/close.png'" class="close" @click="closePreview(7)" /> <image :src="imgfixUrls + 'merchant/close.png'" class="close" @click="closePreview(7)" />
</view> </view>
<!-- 图片预览循环模板 --> <!-- 图片预览循环模板 -->
@ -1221,7 +1221,7 @@
_this.userInfo.recruit_long_img.push(aa.data.img); _this.userInfo.recruit_long_img.push(aa.data.img);
} }
if (type == 7) { if (type == 7) {
_this.userInfo.business_license=aa.data.img; _this.userInfo.business_license=aa.data.image;
} }
} }
@ -1263,7 +1263,7 @@
_this.userInfo.recruit_long_img.push(aa.data.img); _this.userInfo.recruit_long_img.push(aa.data.img);
} }
if (type == 7) { if (type == 7) {
_this.userInfo.business_license=aa.data.img; _this.userInfo.business_license=aa.data.image;
} }
} }
} }
@ -1317,6 +1317,14 @@
let cityListCenter = []; let cityListCenter = [];
let cityListRight = []; let cityListRight = [];
App._post_form('&p=store&do=storeSettled', data, res => { App._post_form('&p=store&do=storeSettled', data, res => {
// if(res.data.havestore){
// App.showError("", function() {
// // uni.navigateBack({
// // delta: 1
// // })
// // return;
// })
// }
_this.userInfo = { ..._this.userInfo, _this.userInfo = { ..._this.userInfo,
...res.data ...res.data
}; };
@ -1395,6 +1403,10 @@
}; };
console.log(idis); console.log(idis);
}, err=>{
uni.navigateBack({
delta: 1
})
}); });
}, },
checkRight(id) { checkRight(id) {

5
pages/mainPages/sendInformation/sendInformation.vue

@ -39,7 +39,7 @@
<!-- 选择类型提示 --> <!-- 选择类型提示 -->
<view class="checkTips"><span> 请选择发布类别 </span></view> <view class="checkTips"><span> 参与你感兴趣的话题 </span></view>
<!-- 选择类型提示 --> <!-- 选择类型提示 -->
<!-- 选择分类列表 --> <!-- 选择分类列表 -->
@ -104,7 +104,8 @@
</view> </view>
</PopManager> </PopManager>
<TabBars :tabBarAct="0" :pageType="'9'" /> <!-- <TabBars :tabBarAct="0" :pageType="'9'" /> -->
<TabBars :tabBarAct="0" />
</view> </view>
</template> </template>

4
pages/mainPages/userCenter/userCenter.vue

@ -186,8 +186,8 @@
<image :src="imageRootNew+'rule-blue.png'" mode=""></image> <image :src="imageRootNew+'rule-blue.png'" mode=""></image>
</navigator> </navigator>
<!-- 普通用户 --> <!-- 普通用户 -->
<navigator class="content_box1" :url="'/pages/subPages2/hirePlatform/addResume/addResume'" <navigator class="content_box1" :url="'/pages/subPages2/hirePlatform/addResume/addResume'">
v-else> <!-- v-else> -->
<view style="font-size: 14px!important;">我的简历</view> <view style="font-size: 14px!important;">我的简历</view>
<image :src="imageRootNew+'jianli.png'" mode=""></image> <image :src="imageRootNew+'jianli.png'" mode=""></image>
</navigator> </navigator>

2
pages/mainPages/userset/userset.vue

@ -37,7 +37,7 @@
<view class="content-box b-f padding-box-all bor-radius-10upx f-28 t-c" @click="clearToken">{{languageStatus!=1?'退出登录':'로그아웃'}}</view> <view class="content-box b-f padding-box-all bor-radius-10upx f-28 t-c" @click="clearToken">{{languageStatus!=1?'退出登录':'로그아웃'}}</view>
</view> </view>
<view style="color: gray;width: 300rpx;text-align: center;position: fixed; <view style="color: gray;width: 300rpx;text-align: center;position: fixed;
bottom: 30rpx;left: 50%;margin-left: -150rpx;font-size: 23rpx;">当前版本号:1.0.15</view> bottom: 30rpx;left: 50%;margin-left: -150rpx;font-size: 23rpx;">当前版本号:1.0.17</view>
<!-- <bindPhone :phoneShow="phoneShow" @clickmask="closePop" @mobileBulr="mobileBulr"></bindPhone> --> <!-- <bindPhone :phoneShow="phoneShow" @clickmask="closePop" @mobileBulr="mobileBulr"></bindPhone> -->
<PhoneMask :show1="show1" @clickmask1="closePop1"></PhoneMask> <PhoneMask :show1="show1" @clickmask1="closePop1"></PhoneMask>
<PopManager :show="show2" @clickmask="closeshow"> <PopManager :show="show2" @clickmask="closeshow">

5
pages/subPages/Equity/Equity.vue

@ -5,6 +5,9 @@
<image :src="imageRootNew+'Equity.png'" ></image> <image :src="imageRootNew+'Equity.png'" ></image>
</view> </view>
<view class="rightBox"> <view class="rightBox">
<navigator style="font-size: 14px;text-align: right;margin-bottom: 20upx;color: #509DFD;"
hover-class="none"
url="/pages/subPages/Equity/record/record">充值记录</navigator>
<view style="text-align: right;font-weight: bold;margin-bottom: 20upx;">我的权益</view> <view style="text-align: right;font-weight: bold;margin-bottom: 20upx;">我的权益</view>
<button button-hover="{background-color: rgba(120, 181, 255, 0.1); opacity: 0.7;}" class="button" @click="buy" type="default">购买vip特权包</button> <button button-hover="{background-color: rgba(120, 181, 255, 0.1); opacity: 0.7;}" class="button" @click="buy" type="default">购买vip特权包</button>
</view> </view>
@ -199,7 +202,7 @@
width: 40%; width: 40%;
height: 344upx; height: 344upx;
margin-right: 3%; margin-right: 3%;
padding-top: 90upx; padding-top: 30upx;
font-size: 38upx; font-size: 38upx;
// border: 1px solid blue; // border: 1px solid blue;
} }

121
pages/subPages/Equity/record/record.vue

@ -0,0 +1,121 @@
<template>
<view style="min-height: 100vh;background-color: #f8f8f8;box-sizing: border-box;">
<view class="content_wrapper">
<view v-for="(item,index) in dataList" :key="index" class="list-item">
<view class="text-box">
<view style="font-size: 14px;line-height: 22px;font-weight: bold;">{{item.storename}}</view>
<view class="text">订单号{{item.orderno}}</view>
<view class="text">支付金额{{item.price}}</view>
<view class="text">订单状态
<text v-if="item.status==8">待发货</text>
<text v-if="item.status==7">已退款</text>
<text v-if="item.status==6">待退款</text>
<text v-if="item.status==5">已取消</text>
<text v-if="item.status==4">待收货待消费</text>
<text v-if="item.status==3">已完成</text>
<text v-if="item.status==2">已消费</text>
<text v-if="item.status==1">已支付</text>
<text v-if="item.status==0">未支付</text>
</view>
<view class="text" v-if="item.status==3">付款时间{{formatDate(item.paytime)}}</view>
</view>
</view>
<view class="" v-if="dataList.length==0">
<loadmore :isMore="true" v-if="dataList.length=='0'" />
</view>
</view>
</view>
</template>
<script>
import App from '@/common/js/app.js';
import loadmore from '@/components/template/loadmore.vue'
export default {
data() {
return {
page: 1,
dataList: [],
}
},
components: {
loadmore
},
onLoad(e){
},
onShow() {
this.getList();
},
methods: {
getList(){
let _this = this;
App._post_form('&p=rights&do=getRightsOrderList', {page:_this.page, page_index: 10}, res => {
if(_this.page===1){
if(res.data.length>0){
_this.setData({
dataList: res.data
})
}
}else{
if(res.data.length>0){
let dataList = _this.dataList.concat(res.data);
_this.setData({
dataList
})
}
}
}, false, err=>{
});
},
formatDate(timestamp){
let date = new Date(parseInt(timestamp) * 1000);
let Year = date.getFullYear();
let Moth = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1);
let Day = (date.getDate() < 10 ? '0' + date.getDate() : date.getDate());
let Hour = (date.getHours() < 10 ? '0' + date.getHours() : date.getHours());
let Minute = (date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes());
let Sechond = (date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds());
let GMT = Year + '-' + Moth + '-' + Day + ' '+ Hour +':'+ Minute + ':' + Sechond;
return GMT;
}
},
onReachBottom(){
this.page++;
this.getList();
}
}
</script>
<style lang="scss">
.dis-flex{
display: flex;
align-items: center;
}
.content_wrapper{
padding: 10px 15px;
.list-item{
display: flex;
padding: 15px 0px;
border-bottom: 1px solid #efefef;
}
image{
width: 80px;
height: 80px;
border-radius: 6px;
margin-right: 10px;
}
.text-box{
flex: 1;
overflow: hidden;
display: flex;
flex-direction: column;
justify-content: space-between;
}
.text{
display: -webkit-box;//将盒子转换为弹性盒子 -webkit-box-orient: vertical;//文本显示方式,默认水平 -webkit-line-clamp: 2;//设置显示多少行 overflow: hidden;
font-size: 13px;
color: #999;
}
}
</style>

13
pages/subPages/createCommodity/index.vue

@ -1102,7 +1102,7 @@
// //
submitTest(strings) { submitTest(strings) {
let _this = this; let _this = this;
console.log(strings, 'shabiacao'); console.log(strings, '-------------');
let adopt = true; let adopt = true;
if (strings == '' || strings == 'null') { if (strings == '' || strings == 'null') {
adopt = false; adopt = false;
@ -1192,6 +1192,13 @@
if (data.type == 'bargain' && data.rules.length != 0) { if (data.type == 'bargain' && data.rules.length != 0) {
data.rules = encode(data.rules); data.rules = encode(data.rules);
} }
if(data.cc_child_id==""){
uni.showToast({
title:'请选择商品分类',
icon:'none'
})
return;
}
if (_this.isladderVel == 1 && _this.goodsInfo.type == 'rush') { if (_this.isladderVel == 1 && _this.goodsInfo.type == 'rush') {
// _this.goodsInfo.goods.lp_set // _this.goodsInfo.goods.lp_set
for (let i = 0; i < _this.goodsInfo.goods.lp_set.length; i++) { for (let i = 0; i < _this.goodsInfo.goods.lp_set.length; i++) {
@ -1550,7 +1557,7 @@
id: _this.goodsInfo.id || id || '' id: _this.goodsInfo.id || id || ''
}; };
App._post_form('&p=Store&do=createGoods', data, res => { App._post_form('&p=Store&do=createGoods', data, res => {
// res.data.cultivate_class; _this.newTypeList = res.data.cultivate_class;
_this.goodsInfo['goods'] = res.data.goods; _this.goodsInfo['goods'] = res.data.goods;
if(!_this.goodsInfo.goods.is_describe_tip){ if(!_this.goodsInfo.goods.is_describe_tip){
@ -2081,7 +2088,7 @@
getNewCateList(index, type){ getNewCateList(index, type){
App._post_form( App._post_form(
`&p=cultivateClass&do=getCultivateClassChildList`, `&p=cultivateClass&do=getCultivateClassChildList`,
{cc_id: this.newTypeList[index].cc_id}, {cc_id: this.newTypeList[index].cc_id, storeid: this.goodsInfo.storeid},
res => { res => {
if(res.data.length>0){ if(res.data.length>0){
this.newCateList = res.data; this.newCateList = res.data;

4
pages/subPages/goods/index.vue

@ -997,11 +997,11 @@
<image :src="imgfixUrls + 'goods/home.png'"></image> <image :src="imgfixUrls + 'goods/home.png'"></image>
<view class="goods-footer-item-text">首页</view> <view class="goods-footer-item-text">首页</view>
</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> <button class="btn-normal report-btn" form-type="submit"></button>
<image :src="imgfixUrls + 'goods/flow.png'"></image> <image :src="imgfixUrls + 'goods/flow.png'"></image>
<view class="goods-footer-item-text">订单</view> <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')"> <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> <button class="btn-normal report-btn" form-type="submit"></button>
<image :src="imgfixUrls + 'goods/my.png'"></image> <image :src="imgfixUrls + 'goods/my.png'"></image>

24
pages/subPages/homepage/private/private.vue

@ -119,16 +119,38 @@ export default {
// App.navigationTo({ // App.navigationTo({
// url: 'pagesA/instantMessenger/instantMessenger?mid=' + item.other_party_id + '&other_party_type=' + item.other_party_type + '&type=1' + '&id=' // url: 'pagesA/instantMessenger/instantMessenger?mid=' + item.other_party_id + '&other_party_type=' + item.other_party_type + '&type=1' + '&id='
// }); // });
let getIDInfo = uni.getStorageSync('userinfo');
let getSetInfo = uni.getStorageSync('getSetInfo'); let getSetInfo = uni.getStorageSync('getSetInfo');
if(getSetInfo.type == 1){ if(getSetInfo.type == 1){
let send_type = item.send_type;
let id = '';
if(item.other_party_type == "2"){
// bug
send_type = "1";
id = getIDInfo.mid;
}else if(item.other_party_type == "1" && item.send_type=="2"){
//
id = getIDInfo.storeid;
}
App.navigationTo({ App.navigationTo({
url: 'pagesA/instantMessenger/instantMessenger?other_party_id=' + item.other_party_id + '&other_party_type=' + item.other_party_type+ '&type=1' + '&id=' url: 'pagesA/instantMessenger/instantMessenger?other_party_id=' + item.other_party_id + '&other_party_type=' + item.other_party_type+ '&type=' + send_type + '&id=' + id
}) })
}else{ }else{
//
App.navigationTo({ App.navigationTo({
url: 'pages/subPages/homepage/chat/chat?other_party_id=' + item.other_party_id + '&other_party_type=' + item.other_party_type+ '&type=1' + '&id=' url: 'pages/subPages/homepage/chat/chat?other_party_id=' + item.other_party_id + '&other_party_type=' + item.other_party_type+ '&type=1' + '&id='
}) })
} }
// let getIDInfo = uni.getStorageSync('userinfo');
// if(getIDInfo.identity == "" || getIDInfo.identity == ""){
// App.navigationTo({
// url: 'pagesA/instantMessenger/instantMessenger?other_party_id=' + item.other_party_id + '&other_party_type=' + item.other_party_type+ '&type=2' + '&id='
// })
// }else{
// App.navigationTo({
// url: 'pagesA/instantMessenger/instantMessenger?other_party_id=' + item.other_party_id + '&other_party_type=' + item.other_party_type+ '&type=1' + '&id='
// })
// }
console.log(item); console.log(item);
} }
}, },

19
pages/subPages/merchant/merchantOrder/merchantOrder.vue

@ -78,7 +78,9 @@
<view class="mbRight"> <view class="mbRight">
<view> <view>
<view class="mbRightTitle "> <view class="mbRightTitle ">
<view><span>{{newTypeList[item.cc_id-1]}}</span></view> <view>
<span>{{newTypeList[item.cc_id]}}</span>
</view>
<span class="dis-il-block" style="width: 330upx;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">{{item.goods_name}}</span> <span class="dis-il-block" style="width: 330upx;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">{{item.goods_name}}</span>
</view> </view>
<view class="mbRightBody"> <view class="mbRightBody">
@ -147,7 +149,7 @@
</view> </view>
</scroll-view> </scroll-view>
</view> </view>
<navBar :tabBarAct="1" /> <!-- <navBar :tabBarAct="1" /> -->
</view> </view>
<view class="addOrderButton f-50" @click="openAdd" v-if="hidegoods===0 && activityflag ==1"> <view class="addOrderButton f-50" @click="openAdd" v-if="hidegoods===0 && activityflag ==1">
@ -207,7 +209,13 @@
isMore: true, isMore: true,
indexs: null, indexs: null,
// typeList: ['', '', '', '', '', '', '','',''], // typeList: ['', '', '', '', '', '', '','',''],
newTypeList: ['技能培训', '资格考试', '学历提升', '岗前培训'], newTypeList: {
'1':'技能培训',
'2':'资格考试',
'3':'学历提升',
'4':'岗前培训',
'51':'生活服务'
},
total: null, total: null,
goodsList: [], goodsList: [],
typeShow: 'bottom', typeShow: 'bottom',
@ -245,9 +253,10 @@
categories: [ categories: [
{cc_id: "", name: '全部'}, {cc_id: "", name: '全部'},
{cc_id: "1", name: '技能培训'}, {cc_id: "1", name: '技能培训'},
{cc_id: "2", name: '资格考试'}, // {cc_id: "2", name: ''},
{cc_id: "3", name: '学历提升'}, {cc_id: "3", name: '学历提升'},
{cc_id: "4", name: '岗前培训'} {cc_id: "4", name: '岗前培训'},
{cc_id: "51", name: '生活服务'}
], ],
category: 0, category: 0,
}; };

70
pages/subPages/merchant/set/set.vue

@ -16,6 +16,10 @@
<span>姓名</span> <span>姓名</span>
<input placeholder="请输入姓名" :disabled="richText" v-model="userInfo.name" /> <input placeholder="请输入姓名" :disabled="richText" v-model="userInfo.name" />
</view> </view>
<view class="setInput">
<span>职务</span>
<input placeholder="请输入职务" :disabled="richText" v-model="userInfo.position" />
</view>
<view class="setInput"> <view class="setInput">
<span>电话</span> <span>电话</span>
<input placeholder="请输入联系电话" :disabled="richText" v-model="userInfo.mobile" type="number" /> <input placeholder="请输入联系电话" :disabled="richText" v-model="userInfo.mobile" type="number" />
@ -41,7 +45,7 @@
<image :src="imgfixUrls + 'merchant/right.svg'" /> <image :src="imgfixUrls + 'merchant/right.svg'" />
</view> </view>
<view class="userInfoInputMain"> <view class="userInfoInputMain" v-if="0">
<span>店铺详情</span> <span>店铺详情</span>
<view class="timePickerView" @click="openRich"> <view class="timePickerView" @click="openRich">
<view class="uni-input">富文本编辑</view> <view class="uni-input">富文本编辑</view>
@ -57,7 +61,7 @@
<span>定位</span> <span>定位</span>
</view> </view>
</view> </view>
<view class="userInfoInputMain"> <view class="userInfoInputMain" v-if="0">
<span>营业时间</span> <span>营业时间</span>
<view class="timePickerView"> <view class="timePickerView">
<w-pickerb :visible.sync="visibletimeone" mode="time" :value="storehours[0].startTime + ':00'" :current="false" <w-pickerb :visible.sync="visibletimeone" mode="time" :value="storehours[0].startTime + ':00'" :current="false"
@ -72,7 +76,7 @@
<image :src="imgfixUrls + 'merchant/right.svg'" /> <image :src="imgfixUrls + 'merchant/right.svg'" />
</view> </view>
<view class="userInfoInputMain"> <view class="userInfoInputMain" v-if="0">
<span>分段营业</span> <span>分段营业</span>
<view class="timePickerView"> <view class="timePickerView">
<picker @change="multistageChange" class="dataPicker" :value="multistageIndex" range-key="title" :range="multistageList"> <picker @change="multistageChange" class="dataPicker" :value="multistageIndex" range-key="title" :range="multistageList">
@ -83,7 +87,7 @@
</view> </view>
<image :src="imgfixUrls + 'merchant/right.svg'" /> <image :src="imgfixUrls + 'merchant/right.svg'" />
</view> </view>
<view class="userInfoInputMain" v-if="multistageIndex == 1"> <view class="userInfoInputMain" v-if="multistageIndex == 1 && 0">
<span>分段时间</span> <span>分段时间</span>
<view class="timePickerView"> <view class="timePickerView">
<w-pickerb :visible.sync="visibletimeoneT" mode="time" :value="storehours[1].startTime + ':00'" :current="false" <w-pickerb :visible.sync="visibletimeoneT" mode="time" :value="storehours[1].startTime + ':00'" :current="false"
@ -103,12 +107,37 @@
</view> </view>
</view> </view>
<!-- 营业执照 -->
<view class="userImg">
<view class="firstTitle">
<view class="firstTitleName">
<view class="line"></view>
<span>企业营业执照</span>
</view>
<view class="firstTitleTips"></view>
</view>
<view class="twiceTitle1">
<view>
<!-- 图片预览循环模板 -->
<view class="imgPreview" v-if="userInfo.business_license !== ''">
<image :src="imageRootNew2 + userInfo.business_license" />
<image :src="imgfixUrls + 'merchant/close.png'" class="close" @click="closePreview(7)" />
</view>
<!-- 图片预览循环模板 -->
<view class="userImgUpdata" @click="uploadFiles(7, 1)" v-if="userInfo.business_license == ''">
<image :src="imgfixUrls + 'merchant/addImg.svg'" />
</view>
</view>
</view>
</view>
<!-- 营业执照 -->
<view class="userInfo" style="margin-top: 30upx;" v-if="userInfoWork.is_recruit == 1"> <view class="userInfo" style="margin-top: 30upx;" v-if="userInfoWork.is_recruit == 1">
<view class="firstTitle"> <view class="firstTitle">
<view class="line"></view> <view class="line"></view>
<span>企业招聘信息</span> <span>企业招聘信息</span>
</view> </view>
<view class="inputPackage"> <view class="inputPackage" v-if="0">
<view class="userInfoInputMain"> <view class="userInfoInputMain">
<span>招聘状态</span> <span>招聘状态</span>
<view class="timePickerView"> <view class="timePickerView">
@ -146,7 +175,7 @@
</view> </view>
<view class="inputPackage" v-if="switchIndex == 1"> <view class="inputPackage" v-if="switchIndex == 1">
<view class="userInfoInputMain"> <view class="userInfoInputMain">
<span>企业规模</span> <span>所属行业</span>
<view class="timePickerView"> <view class="timePickerView">
<picker @change="industryChange" class="dataPicker" :value="industryIndex" range-key="title" :range="userInfoWork.industry"> <picker @change="industryChange" class="dataPicker" :value="industryIndex" range-key="title" :range="userInfoWork.industry">
<view class="uni-input">{{userInfoWork.industry[industryIndex].title}} <view class="uni-input">{{userInfoWork.industry[industryIndex].title}}
@ -162,7 +191,7 @@
<input placeholder="请输入企业亮点" :disabled="richText" v-model="userInfo.recruit_brighten" /> <input placeholder="请输入企业亮点" :disabled="richText" v-model="userInfo.recruit_brighten" />
</view> </view>
</view> </view>
<view class="twiceTitle" v-if="switchIndex == 1"> <view class="twiceTitle" v-if="switchIndex == 1 && 0">
<span>企业幻灯片(750X560)</span> <span>企业幻灯片(750X560)</span>
<view> <view>
<!-- 图片预览循环模板 --> <!-- 图片预览循环模板 -->
@ -255,7 +284,7 @@
<!-- 同城配送 --> <!-- 同城配送 -->
<!-- 家政信息区域 --> <!-- 家政信息区域 -->
<view class="userInfo" style="margin-top: 30upx;" v-if="userInfoWork.is_housekeep == 1"> <view class="userInfo" style="margin-top: 30upx;" v-if="userInfoWork.is_housekeep == 1 && 0">
<view class="userInfoPackage"> <view class="userInfoPackage">
<view class="firstTitle"> <view class="firstTitle">
<view class="line"></view> <view class="line"></view>
@ -299,7 +328,7 @@
</view> </view>
<!-- 家政信息区域 --> <!-- 家政信息区域 -->
<view class="userImg"> <view class="userImg" v-if="0">
<view class="firstTitle"> <view class="firstTitle">
<view class="line"></view> <view class="line"></view>
<span>店铺图片</span> <span>店铺图片</span>
@ -879,6 +908,9 @@
// _this.type5Url.push(aa.data.img); // _this.type5Url.push(aa.data.img);
_this.userInfo.recruit_long_img.push(aa.data.img); _this.userInfo.recruit_long_img.push(aa.data.img);
} }
if (type == 7) {
_this.userInfo.business_license=aa.data.image;
}
} }
return return
} }
@ -920,6 +952,9 @@
if (type == 6) { if (type == 6) {
// _this.type5Url.push(aa.data.img); // _this.type5Url.push(aa.data.img);
_this.userInfo.recruit_long_img.push(aa.data.img); _this.userInfo.recruit_long_img.push(aa.data.img);
}
if (type == 7) {
_this.userInfo.business_license=aa.data.image;
} }
} }
} }
@ -1131,6 +1166,9 @@
} }
} }
} }
if (type == 7) {
_this.userInfo.business_license='';
}
}, },
closeLogo() { closeLogo() {
let _this = this; let _this = this;
@ -1857,4 +1895,18 @@
} }
} }
} }
.firstTitleName {
>view {
vertical-align: middle;
}
>span {
vertical-align: middle;
margin-left: 16upx;
font-size: 24upx;
color: rgba(51, 51, 51, 1);
}
}
.userInfoPackage { padding: 34upx; } .firstTitleTips { >span { vertical-align: middle; font-size: 24upx; color: rgba(51, 51, 51, 1); margin-right: 14upx; } >image { vertical-align: middle; width: 18upx; height: 26upx; } }
</style> </style>

9
pages/subPages/mineCollection/mineCollection.vue

@ -66,8 +66,11 @@
</view> </view>
</view> </view>
<!-- 收藏店铺循环模板 --> <!-- 收藏店铺循环模板 -->
<view class="tips"> <!-- <view class="tips">
<span>{{ scdpText }}</span> <span>{{ scdpText }}</span>
</view> -->
<view v-if="storeCollectList.length==0">
<load-more :isMore="storeCollectList.length==0" style="line-height: 80upx;"></load-more>
</view> </view>
</scroll-view> </scroll-view>
<!-- 列表区域 --> <!-- 列表区域 -->
@ -75,10 +78,10 @@
<TabBars :tabBarAct="0" :pageType="''" /> <TabBars :tabBarAct="0" :pageType="''" />
<!-- 列表 --> <!-- 列表 -->
<view v-if="type == 3"> <view v-if="type == 3" :style="{ height: scollHeight }">
<business-card :is_Add="false" ref="businesscard" :businCard_list="cardlist" @chrbusinCard="chrbusinCard" :is_have="is_have"></business-card> <business-card :is_Add="false" ref="businesscard" :businCard_list="cardlist" @chrbusinCard="chrbusinCard" :is_have="is_have"></business-card>
<view v-if="loadingMore"> <view v-if="loadingMore">
<load-more :isMore="loadingMore"></load-more> <load-more :isMore="loadingMore" style="line-height: 80upx;"></load-more>
</view> </view>
</view> </view>

152
pages/subPages2/hirePlatform/addResume/addResume.vue

@ -204,18 +204,18 @@
</view> </view>
<view v-else class="uni-input twoLevelList"> <view v-else class="uni-input twoLevelList">
<view class="dis-il-block" style="width: 90%;" v-if="businessList.length == 1"> <view class="dis-il-block" style="width: 90%;" v-if="businessList.length == 1">
<view class="dis-il-block" style="padding: 5upx 10upx;background-color: #FF4444;color: #FFFFFF;border-radius: 6upx;"> <view class="dis-il-block" style="padding: 8upx 16upx;background-color: #FF4444;color: #FFFFFF;border-radius: 6upx;">
{{ businessList[0].title }} {{ businessList[0].title }}
<text class="iconfont icon-close_light" style="font-size: 26upx;padding-left: 10upx;" @click.stop="splicebusinde(0)"></text> <text class="iconfont icon-close_light" style="font-size: 26upx;padding-left: 10upx;" @click.stop="splicebusinde(0)"></text>
<!-- <text class="iconfont icon-close_light"></text> --> <!-- <text class="iconfont icon-close_light"></text> -->
</view> </view>
</view> </view>
<view class="dis-il-block" style="width: 90%;" v-if="businessList.length == 2"> <view class="dis-il-block" style="width: 90%;" v-if="businessList.length == 2">
<view class="dis-il-block" style="padding: 5upx 10upx;background-color: #FF4444;color: #FFFFFF;border-radius: 6upx;margin-right: 10upx;"> <view class="dis-il-block" style="padding: 8upx 16upx;background-color: #FF4444;color: #FFFFFF;border-radius: 6upx;margin-right: 20upx;margin-bottom: 20upx;">
{{ businessList[0].title }} {{ businessList[0].title }}
<text class="iconfont icon-close_light" style="font-size: 26upx;padding-left: 10upx;" @click.stop="splicebusinde(0)"></text> <text class="iconfont icon-close_light" style="font-size: 26upx;padding-left: 10upx;" @click.stop="splicebusinde(0)"></text>
</view> </view>
<view class="dis-il-block" style="padding: 5upx 10upx;background-color: #FF4444;color: #FFFFFF;border-radius: 6upx;"> <view class="dis-il-block" style="padding: 8upx 16upx;background-color: #FF4444;color: #FFFFFF;border-radius: 6upx;">
{{ businessList[1].title }} {{ businessList[1].title }}
<text class="iconfont icon-close_light" style="font-size: 26upx;padding-left: 10upx;" @click.stop="splicebusinde(1)"></text> <text class="iconfont icon-close_light" style="font-size: 26upx;padding-left: 10upx;" @click.stop="splicebusinde(1)"></text>
</view> </view>
@ -225,16 +225,17 @@
<!-- {{businessList[0].title}},{{businessList[1].title}},{{businessList[2].title}} --> <!-- {{businessList[0].title}},{{businessList[1].title}},{{businessList[2].title}} -->
<view <view
class="dis-il-block t-c" class="dis-il-block t-c"
style="padding: 5upx 10upx;background-color: #FF4444;color: #FFFFFF;border-radius: 6upx;margin-right: 10upx;margin-bottom: 20upx;" style="padding: 8upx 16upx;background-color: #FF4444;color: #FFFFFF;border-radius: 6upx;margin-right: 20upx;margin-bottom: 20upx;"
> >
{{ businessList[0].title }} {{ businessList[0].title }}
<text class="iconfont icon-close_light" style="font-size: 26upx;padding-left: 10upx;" @click.stop="splicebusinde(0)"></text> <text class="iconfont icon-close_light" style="font-size: 26upx;padding-left: 10upx;" @click.stop="splicebusinde(0)"></text>
</view> </view>
<view class="dis-il-block t-c" style="padding: 5upx 10upx;background-color: #FF4444;color: #FFFFFF;border-radius: 6upx;margin-right: 10upx;"> <view class="dis-il-block t-c"
style="padding: 8upx 16upx;background-color: #FF4444;color: #FFFFFF;border-radius: 6upx;margin-right: 20upx;margin-bottom: 20upx;">
{{ businessList[1].title }} {{ businessList[1].title }}
<text class="iconfont icon-close_light" style="font-size: 26upx;padding-left: 10upx;" @click.stop="splicebusinde(1)"></text> <text class="iconfont icon-close_light" style="font-size: 26upx;padding-left: 10upx;" @click.stop="splicebusinde(1)"></text>
</view> </view>
<view class="dis-il-block t-c" style="padding: 5upx 10upx;background-color: #FF4444;color: #FFFFFF;border-radius: 6upx;"> <view class="dis-il-block t-c" style="padding: 8upx 16upx;background-color: #FF4444;color: #FFFFFF;border-radius: 6upx;">
{{ businessList[2].title }} {{ businessList[2].title }}
<text class="iconfont icon-close_light" style="font-size: 26upx;padding-left: 10upx;" @click.stop="splicebusinde(2)"></text> <text class="iconfont icon-close_light" style="font-size: 26upx;padding-left: 10upx;" @click.stop="splicebusinde(2)"></text>
</view> </view>
@ -323,7 +324,7 @@
</view> </view>
</view> </view>
<view style="padding-bottom: 100upx;"> <view style="padding-bottom: 100upx;">
<view class="t-c" style="width: 90vw;height: 80upx;line-height: 80upx;background-color: #FF4444;color: #FFFFFF;border-radius: 60upx;" @click="submit"> </view> <view class="t-c" style="height: 80upx;line-height: 80upx;background-color: #FF4444;color: #FFFFFF;border-radius: 60upx;" @click="submit"> </view>
</view> </view>
</view> </view>
<!-- #ifdef H5 --> <!-- #ifdef H5 -->
@ -361,7 +362,7 @@
</view> </view>
<view style="flex: 0.33;overflow: auto;"> <view style="flex: 0.33;overflow: auto;">
<view <view
:class="item.checked ? 'industryclass-item classcheck f-28' : 'industryclass-item f-28'" :class="item.checked2 ? 'industryclass-item isclasschecked f-28' : (item.checked ? 'industryclass-item classcheck f-28' : 'industryclass-item f-28')"
v-for="(item, index) in industrysubdivide" v-for="(item, index) in industrysubdivide"
@click="clickclass(item)" @click="clickclass(item)"
> >
@ -714,7 +715,7 @@ export default{
klis:false, klis:false,
isOpenLaction:false, isOpenLaction:false,
userInfo:{ userInfo:{
graduated_school: {}
}, },
phoneHeight:null, phoneHeight:null,
latlngs:null, latlngs:null,
@ -737,7 +738,7 @@ export default{
genderList:['男','女'], genderList:['男','女'],
genderIndex:0, genderIndex:0,
educationList:[], educationList:[],
workTypeList:[{title:'全职',id:1},{title:'兼职',id:2}], workTypeList:[{title:'全职',id:1},{title:'兼职',id:2},{title:'实习',id:3}],
workTypeIndex:0, workTypeIndex:0,
educationIndex:0, educationIndex:0,
incumbencyList:[ incumbencyList:[
@ -788,7 +789,7 @@ export default{
label:this.userInfo.graduated_school[key] label:this.userInfo.graduated_school[key]
}) })
} }
// console.log(arr, ''); console.log(arr, '学校类型数组');
return arr; return arr;
}, },
}, },
@ -817,9 +818,9 @@ export default{
}, // },
onShow() { // onShow() {
let _this = this; // let _this = this;
// #ifdef H5 // #ifdef H5
window.addEventListener( window.addEventListener(
'message', 'message',
@ -878,9 +879,10 @@ export default{
{}, {},
res => { res => {
if(!res.data) return if(!res.data) return
console.log(res,'提交结果'); console.log(res,'查询结果');
if(!!res.data.name){
_this.userInfo = res.data; _this.userInfo = res.data;
// // --
_this.educationList.map((item,index)=>{ _this.educationList.map((item,index)=>{
if(item.id == _this.userInfo.education_label_id){ if(item.id == _this.userInfo.education_label_id){
_this.educationIndex = index; _this.educationIndex = index;
@ -913,7 +915,9 @@ export default{
_this.userInfo.provinceid = _this.userInfo.expect_work_province; _this.userInfo.provinceid = _this.userInfo.expect_work_province;
_this.userInfo.areaid = _this.userInfo.expect_work_city; _this.userInfo.areaid = _this.userInfo.expect_work_city;
_this.userInfo.distid = _this.userInfo.expect_work_area; _this.userInfo.distid = _this.userInfo.expect_work_area;
_this.businessList = _this.userInfo.show_expect_position; _this.businessList = _this.userInfo.show_expect_position;//
// expect_position: ["24", "55"],
// show_expect_position: [{id: "24", title: "/"}]
_this.owenscitylist.map((item,index)=>{ _this.owenscitylist.map((item,index)=>{
if(item.id == _this.userInfo.provinceid){ if(item.id == _this.userInfo.provinceid){
_this.provinceidName = item.name; _this.provinceidName = item.name;
@ -929,15 +933,21 @@ export default{
}) })
} }
}) })
}else{
_this.userInfo.graduated_school = res.data.graduated_school;
}
// _this.expect_position // _this.expect_position
_this.loadlogo = !_this.loadlogo; _this.loadlogo = !_this.loadlogo;
_this.loadlogo = !_this.loadlogo; _this.loadlogo = !_this.loadlogo;
console.log(_this.userInfo, 111111);
}, },
false, false,
() => { () => {
} }
); );
}, },
//
redactSchoolWork(item,index){ redactSchoolWork(item,index){
// this.work_experience = item; // this.work_experience = item;
let objString = JSON.stringify(item); let objString = JSON.stringify(item);
@ -1200,8 +1210,8 @@ export default{
delete data.distid; delete data.distid;
delete data.logo; delete data.logo;
delete data.show_avatar; delete data.show_avatar;
delete data.industry_id; delete data.industry_id;//
delete data.industry_pid; delete data.industry_pid;//
delete data.show_expect_position; delete data.show_expect_position;
delete data.graduated_school; delete data.graduated_school;
console.log(data); console.log(data);
@ -1210,6 +1220,7 @@ export default{
uni.showToast({ uni.showToast({
icon:'none', icon:'none',
title:'请完善资料' title:'请完善资料'
// title:key
}); });
return return
@ -1285,6 +1296,7 @@ export default{
this.pickerindex = e.detail.value; this.pickerindex = e.detail.value;
this.userInfo.meralid = this.pickerarray[this.pickerindex].id; this.userInfo.meralid = this.pickerarray[this.pickerindex].id;
}, },
//
clickclassTwo(item){ clickclassTwo(item){
if(this.businessList.length == 3 && !item.checked){ if(this.businessList.length == 3 && !item.checked){
uni.showToast({ uni.showToast({
@ -1325,8 +1337,10 @@ export default{
this.userInfo.expect_position = [this.businessList[0].id]; this.userInfo.expect_position = [this.businessList[0].id];
}else if(this.businessList.length == 2){ }else if(this.businessList.length == 2){
this.userInfo.expect_position = [this.businessList[0].id,this.businessList[1].id]; this.userInfo.expect_position = [this.businessList[0].id,this.businessList[1].id];
}else{ }else if(this.businessList.length == 3){
this.userInfo.expect_position = [this.businessList[0].id,this.businessList[1].id,this.businessList[2].id]; this.userInfo.expect_position = [this.businessList[0].id,this.businessList[1].id,this.businessList[2].id];
}else{
this.userInfo.expect_position = [];
} }
@ -1334,28 +1348,82 @@ export default{
this.loadlogo = true; this.loadlogo = true;
console.log(item) console.log(item)
}, },
//
clickclass(item){ clickclass(item){
// console.log(item); // console.log(item);
// this.userInfo.industry_id.push(item.id);//id
this.industrysubdivide.map(items=>{
items.checked = false;
if(item.id == items.id){
items.checked = true;
}
});
App._post_form( App._post_form(
`&p=recruit&do=industryList&type=3&pid=${item.id}`, `&p=recruit&do=industryList&type=3&pid=${item.id}`,
{}, {},
res => { res => {
this.industrysublevel = res.data; this.industrysublevel = res.data;
this.industrysublevel.map(item=>{ // if(this.industrysublevel.length!=0){
item.checked = false; //
this.industrysublevel.map(item1=>{
item1.checked = false;
this.businessList.map(items=>{ this.businessList.map(items=>{
if(items.id == item.id){ if(items.id == item1.id){
item.checked = true; item1.checked = true;
} }
}) })
}) })
//industrysubdivide
this.industrysubdivide.map(items=>{
items.checked = false;
if(item.id == items.id){
items.checked = true;
}
});
// }
//使
if(this.industrysublevel.length==0 && 0){
// id
if(this.businessList.length == 3 && !item.checked2){
uni.showToast({
icon:'none',
title:'最多选择三个职位'
});
return
}
if(!item.checked2){
this.businessList.push(item);
console.log(this.businessList, 'this.businessList');
this.userInfo.expect_position.push(item.id);
this.industrysubdivide.map(items=>{
if(item.id == items.id){
items.checked2 = true;
}
});
}else{
this.businessList.map((items,index)=>{
if(items.id == item.id){
this.businessList.splice(index,1)
// this.userInfo.expect_position.splice(item.id);
}
});
this.industrysubdivide.map(items=>{
items.checked2 = false;
this.businessList.map(it=>{
if(it.id == items.id){
items.checked2 = true;
}
})
});
}
if(this.businessList.length == 1){
this.userInfo.expect_position = [this.businessList[0].id];
}else if(this.businessList.length == 2){
this.userInfo.expect_position = [this.businessList[0].id,this.businessList[1].id];
}else if(this.businessList.length == 3){
this.userInfo.expect_position = [this.businessList[0].id,this.businessList[1].id,this.businessList[2].id];
}else{
this.userInfo.expect_position = [];
}
}
this.loadlogo = false; this.loadlogo = false;
this.loadlogo = true; this.loadlogo = true;
@ -1377,7 +1445,9 @@ export default{
this.loadlogo = false; this.loadlogo = false;
this.loadlogo = true; this.loadlogo = true;
}, },
//
clickindustry(item){ clickindustry(item){
// this.userInfo.industry_pid.push(item.id);//id
this.industry.map(items=>{ this.industry.map(items=>{
items.checked = false; items.checked = false;
if(item.id == items.id){ if(item.id == items.id){
@ -1393,6 +1463,17 @@ export default{
item.checked = false; item.checked = false;
}) })
// 使
//
// this.industrysubdivide.map(item1=>{
// item1.checked2 = false;
// this.businessList.map(items=>{
// if(items.id == item1.id){
// item1.checked2 = true;
// }
// })
// })
this.loadlogo = false; this.loadlogo = false;
this.loadlogo = true; this.loadlogo = true;
}, },
@ -1836,19 +1917,22 @@ page {
width: 180upx; width: 180upx;
margin: 20upx 0; margin: 20upx 0;
height: 180upx; height: 180upx;
border-radius: 10upx; // border-radius: 10upx;
border: 1upx solid #cccccc; // border: 1upx solid #cccccc;
position: relative; position: relative;
overflow: hidden; // overflow: hidden;
.imgs { .imgs {
width: 180upx; width: 180upx;
height: 180upx; height: 180upx;
border-radius: 10upx;
overflow: hidden;
} }
.close { .close {
position: absolute; position: absolute;
width: 30upx; width: 30upx;
height: 30upx; height: 30upx;
right: 10upx; // right: 10upx;
right: -50upx;
top: 10upx; top: 10upx;
} }
} }

9
pages/subPages2/hirePlatform/recruitmentList/recruitmentList.vue

@ -23,7 +23,8 @@
</view> </view>
<view v-if="loadlogo"> <view v-if="loadlogo">
<tabs :pageType="job_type" :cc_id="cc_id" @changeChildType="changeChildType"></tabs> <!-- <tabs :cc_id="cc_id" :pageType="job_type" @changeChildType="changeChildType"></tabs> -->
<tabs-c :cc_id="cc_id" :pageType="job_type" @changeChildType="changeChildType"></tabs-c>
<block v-if="job_type!=2"> <block v-if="job_type!=2">
<work-List :flag="false" :inviteList="inviteList"></work-List> <work-List :flag="false" :inviteList="inviteList"></work-List>
</block> </block>
@ -55,6 +56,7 @@
import TabBars from '@/components/template/tabBar.vue'; import TabBars from '@/components/template/tabBar.vue';
import nonemores from '@/components/template/nonemores.vue'; import nonemores from '@/components/template/nonemores.vue';
import tabs from '@/components/template/tabs/tabs.vue'; import tabs from '@/components/template/tabs/tabs.vue';
import tabsC from '@/components/template/tabs/tabs-copy.vue';
export default{ export default{
data(){ data(){
return{ return{
@ -90,7 +92,8 @@
Loadlogo, Loadlogo,
TabBars, TabBars,
nonemores, nonemores,
tabs tabs,
tabsC
}, },
onLoad(e) { onLoad(e) {
console.log(e, e.job_type, 'p---------') console.log(e, e.job_type, 'p---------')
@ -113,7 +116,7 @@
title = '就业招聘'; title = '就业招聘';
break; break;
case '2': case '2':
title = '学兼职'; title = '学兼职';
break; break;
case '3': case '3':
title = '实习实践'; title = '实习实践';

4
pagesA/campusActivities/campusActivities.vue

@ -3,6 +3,10 @@
<view class="content_wrapper"> <view class="content_wrapper">
<image :src="activitiesInfo.promotional_img" mode="widthFix" style="width: calc(100vw - 20px);"></image> <image :src="activitiesInfo.promotional_img" mode="widthFix" style="width: calc(100vw - 20px);"></image>
<view style="font-size: 18px;line-height: 30px;font-weight: bold;margin: 16px 0px;">{{activitiesInfo.title}}</view> <view style="font-size: 18px;line-height: 30px;font-weight: bold;margin: 16px 0px;">{{activitiesInfo.title}}</view>
<view class="text">
发布人{{activitiesInfo.nickname}}
<image style="width: 60upx;height: 60upx" :src="activitiesInfo.avatar"></image>
</view>
<view class="text">发布时间{{activitiesInfo.publish_time}}</view> <view class="text">发布时间{{activitiesInfo.publish_time}}</view>
<view class="text" v-html="activitiesInfo.describe"></view> <view class="text" v-html="activitiesInfo.describe"></view>
</view> </view>

110
pagesA/campusActivities/index.vue

@ -1,15 +1,22 @@
<template> <template>
<view style="min-height: 100vh;background-color: #f8f8f8;box-sizing: border-box;"> <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 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.id)">
<image :src="item.promotional_img" mode="aspectFill"></image> <image :src="item.promotional_img" mode="aspectFill"></image>
<view class="text-box"> <view class="text-box">
<view style="font-size: 14px;line-height: 22px;font-weight: bold;">{{item.title}}</view> <view class="text1">{{item.title}}</view>
<!-- <view class="text" v-html="item.describe"></view> --> <view class="text2">
<view class="text">{{item.publish_time}}</view> {{item.nickname}}
<image style="width: 60upx;height: 60upx" :src="activitiesInfo.avatar"></image>
</view> </view>
<view class="text2">{{item.publish_time}}</view>
</view> </view>
<view class="" v-if="dataList.length==0"> <view class="label" v-if="item.cc_name && cc_cc_id == 18">
{{item.cc_name}}
</view>
</view>
<view v-if="dataList.length==0" style="width: 100%;">
<loadmore :isMore="true" v-if="dataList.length=='0'" /> <loadmore :isMore="true" v-if="dataList.length=='0'" />
</view> </view>
</view> </view>
@ -19,28 +26,56 @@
<script> <script>
import App from '@/common/js/app.js'; import App from '@/common/js/app.js';
import loadmore from '@/components/template/loadmore.vue' import loadmore from '@/components/template/loadmore.vue'
import tabsC from '@/components/template/tabs/tabs-copy.vue';
export default { export default {
data() { data() {
return { return {
page: 1, page: 1,
dataList: [] dataList: [],
cc_id: "6",//
cc_cc_id: '',//
keyword: "",
} }
}, },
components: { components: {
loadmore loadmore,
tabsC
},
onLoad(e){
console.log(e, '-----');
if(e.cc_id){
this.cc_id = e.cc_id;
};
}, },
onShow() { onShow() {
this.getList(); // this.getList();
}, },
methods: { methods: {
getList(){ getList(type){
let _this = this; let _this = this;
App._post_form('&p=student&do=campusActivitiesList', {page:_this.page, size: 10}, res => { let data = {
page:_this.page, size: 10,
cc_id: this.cc_cc_id==18?'':this.cc_cc_id//18
}
if(type=='search'){
data = {
page:_this.page,
size: 10,
cc_id: this.cc_cc_id==18?'':this.cc_cc_id,//18
title: this.keyword
}
}
console.log(data, 'p------');
App._post_form('&p=student&do=campusActivitiesList', data, res => {
if(_this.page===1){ if(_this.page===1){
if(res.data.data.length>0){ if(res.data.data.length>0){
_this.setData({ _this.setData({
dataList: res.data.data dataList: res.data.data
}) })
}else{
_this.setData({
dataList: []
})
} }
}else{ }else{
if(res.data.data.length>0){ if(res.data.data.length>0){
@ -58,10 +93,26 @@
uni.navigateTo({ uni.navigateTo({
url:'/pagesA/campusActivities/campusActivities?id='+id url:'/pagesA/campusActivities/campusActivities?id='+id
}) })
},
changeChildType(e){
console.log(e);
this.page = 1;
this.cc_cc_id = e;
this.keyword = '';
this.getList();
},
search(e){
this.keyword = e;
this.page = 1;
this.getList('search');
} }
}, },
onReachBottom(){ onReachBottom(){
this.page++; this.page++;
if(this.keyword){
this.getList('search');
return;
}
this.getList(); this.getList();
} }
} }
@ -73,17 +124,26 @@
align-items: center; align-items: center;
} }
.content_wrapper{ .content_wrapper{
padding: 10px 15px;
.list-item{
display: flex; display: flex;
padding: 15px 0px; flex-wrap: wrap;
border-bottom: 1px solid #efefef; justify-content: space-between;
padding: 0px 15px 20px 15px;
.list-item{
width: 48%;
// display: flex;
// padding: 15px 0px;
background-color: #FFF;
// border-bottom: 1px solid #efefef;
box-shadow: 0px 0px 6px 0px rgba(0, 0, 0, 0.05);
margin-bottom: 15px;
position: relative;
} }
image{ image{
width: 80px; width: 100%;
height: 80px; height: 200px;
border-radius: 6px; border-radius: 5px 5px 0px 0px;
margin-right: 10px; margin-bottom: 5px;
} }
.text-box{ .text-box{
flex: 1; flex: 1;
@ -91,11 +151,25 @@
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: space-between; justify-content: space-between;
padding: 0px 10px 10px;
} }
.text{ .text1{
height: 44px;
font-size: 14px;line-height: 22px;font-weight: bold;
display: -webkit-box;//将盒子转换为弹性盒子 -webkit-box-orient: vertical;//文本显示方式,默认水平 -webkit-line-clamp: 2;//设置显示多少行 overflow: hidden;
}
.text2{
display: -webkit-box;//将盒子转换为弹性盒子 -webkit-box-orient: vertical;//文本显示方式,默认水平 -webkit-line-clamp: 2;//设置显示多少行 overflow: hidden; display: -webkit-box;//将盒子转换为弹性盒子 -webkit-box-orient: vertical;//文本显示方式,默认水平 -webkit-line-clamp: 2;//设置显示多少行 overflow: hidden;
font-size: 13px; font-size: 13px;
color: #999; color: #999;
} }
.label{
position: absolute;
top: 0px;
font-size: 10px;
padding: 3px 5px;
color: #666;
background: rgba(255,255,255,0.5);
}
} }
</style> </style>

7
pagesA/campusActivities/myActivities.vue

@ -5,8 +5,11 @@
<image :src="item.promotional_img" mode="aspectFill"></image> <image :src="item.promotional_img" mode="aspectFill"></image>
<view class="text-box"> <view class="text-box">
<view style="font-size: 14px;line-height: 22px;font-weight: bold;">{{item.title}}</view> <view style="font-size: 14px;line-height: 22px;font-weight: bold;">{{item.title}}</view>
<!-- <view class="text" v-html="item.describe"></view> --> <view class="text">
<view class="text">{{item.publish_time}}</view> 发布人{{item.nickname}}
<image style="width: 60upx;height: 60upx" :src="activitiesInfo.avatar"></image>
</view>
<view class="text">发布时间{{item.publish_time}}</view>
</view> </view>
</view> </view>
<view class="" v-if="dataList.length==0"> <view class="" v-if="dataList.length==0">

19
pagesA/identityList/bloggerCertification.vue

@ -118,9 +118,6 @@ export default {
mid: mid mid: mid
}; };
App._post_form('&p=Certified&do=initApplyCertified', data, res => { App._post_form('&p=Certified&do=initApplyCertified', data, res => {
_this.setData({
bloggerInfo: res.data
})
}, (err)=>{ }, (err)=>{
console.log(err.data.message); console.log(err.data.message);
uni.navigateBack({ uni.navigateBack({
@ -152,14 +149,14 @@ export default {
}); });
return ; return ;
} }
// if(data.code==''){ if(data.code==''){
// uni.showToast({ uni.showToast({
// icon:'none', icon:'none',
// title: '', title: '验证码不能为空',
// duration: 2000 duration: 2000
// }); });
// return ; return ;
// } }
if(data.documents==''){ if(data.documents==''){
uni.showToast({ uni.showToast({
icon:'none', icon:'none',

19
pagesA/identityList/teacherCertification.vue

@ -127,9 +127,6 @@ export default {
mid: mid mid: mid
}; };
App._post_form('&p=Certified&do=initApplyCertified', data, res => { App._post_form('&p=Certified&do=initApplyCertified', data, res => {
_this.setData({
teacherInfo: res.data
})
}, (err)=>{ }, (err)=>{
console.log(err.data.message); console.log(err.data.message);
uni.navigateBack({ uni.navigateBack({
@ -171,6 +168,22 @@ export default {
}); });
return ; return ;
} }
if(data.mobile==''){
uni.showToast({
icon:'none',
title: '联系电话不能为空',
duration: 2000
});
return ;
}
if(data.code==''){
uni.showToast({
icon:'none',
title: '验证码不能为空',
duration: 2000
});
return ;
}
if(data.documents==''){ if(data.documents==''){
uni.showToast({ uni.showToast({
icon:'none', icon:'none',

16
pagesA/instantMessenger/instantMessenger.vue

@ -532,6 +532,21 @@ export default {
this.setFomeData.send_type = e.type; this.setFomeData.send_type = e.type;
this.setFomeData.id = e.id || ''; this.setFomeData.id = e.id || '';
this.setFomeData.i = App.siteInfo.uniacid; this.setFomeData.i = App.siteInfo.uniacid;
// let getIDInfo = uni.getStorageSync('userinfo');
// if(getIDInfo.identity == "" || getIDInfo.identity == ""){
// // this.setFomeData.send_type = 2;
// getIDInfo.storeid;
// }else{
// this.setFomeData.id = getIDInfo.mid;
// }
// get
// other_party_id:this.setFomeData.receive_id,//ID
// other_party_type:this.setFomeData.receive_type,//12
// type:this.setFomeData.send_type,//12
// id:this.setFomeData.id//ID
this.setFomeData.source = App.getClientType(); this.setFomeData.source = App.getClientType();
setTimeout(()=>{ setTimeout(()=>{
@ -677,6 +692,7 @@ export default {
} }
}); });
}, },
//
getchatting(){ getchatting(){
let _this = this; let _this = this;
let data = { let data = {

238
pagesA/lifeServices/lifeServices.vue

@ -0,0 +1,238 @@
<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 class="content_wrapper">
<view v-for="(item,index) in dataList" :key="index" class="list-item" @click="toDetail(item.id)">
<view class="img-box">
<image :src="item.promotional_img" mode="aspectFill"></image>
<view class="text3">
<text>{{item.city}}/{{item.address}}</text>
|
<text>{{item.km}}km</text>
</view>
</view>
<view class="text-box">
<view class="text1">{{item.title}}</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>
</view>
</view>
</view>
<view v-if="dataList.length==0" style="width: 100%;">
<loadmore :isMore="true" v-if="dataList.length=='0'" />
</view>
</view>
</view>
</template>
<script>
import App from '@/common/js/app.js';
import loadmore from '@/components/template/loadmore.vue'
import tabsC from '@/components/template/tabs/tabs-copy.vue';
export default {
data() {
return {
page: 1,
dataList: [],
cc_id: "51",//
cc_cc_id: '',//
keyword: "",
}
},
components: {
loadmore,
tabsC
},
onLoad(e){
console.log(e, '-----');
if(e.cc_id){
this.cc_id = e.cc_id;
};
},
onShow() {
// this.getList();
},
methods: {
getList(type){
let _this = this;
let data = {
page:_this.page, size: 10,
cc_id: this.cc_cc_id
}
if(type=='search'){
data = {
page:_this.page,
size: 10,
cc_id: this.cc_cc_id,
title: this.keyword
}
}
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: '北站',
}]
}, false, err=>{
});
},
toDetail(id){
// uni.navigateTo({
// url:'/pagesA/campusActivities/campusActivities?id='+id
// })
},
changeChildType(e){
console.log(e);
this.page = 1;
this.cc_cc_id = e;
this.keyword = '';
this.getList();
},
search(e){
this.keyword = e;
this.page = 1;
this.getList('search');
}
},
onReachBottom(){
this.page++;
if(this.keyword){
this.getList('search');
return;
}
this.getList();
}
}
</script>
<style lang="scss">
.dis-flex{
display: flex;
align-items: center;
}
.content_wrapper{
display: flex;
flex-wrap: wrap;
justify-content: space-between;
padding: 0px 12px 20px 12px;
.list-item{
width: 340upx;
// display: flex;
// padding: 15px 0px;
background-color: #FFF;
// border-bottom: 1px solid #efefef;
box-shadow: 0px 0px 6px 0px rgba(0, 0, 0, 0.05);
margin-bottom: 11px;
position: relative;
}
.img-box{
width: 340upx;
height: 252upx;
position: relative;
margin-bottom: 5px;
image{
width: 100%;
height: 100%;
border-radius: 5px 5px 0px 0px;
}
.text3{
width: 100%;
padding: 4px 8px;
box-sizing: border-box;
position: absolute;
bottom: 0px;
left: 0px;
color: #fff;
background: rgba(0,0,0,0.2);
font-size: 12px;
display: flex;
justify-content: space-between;
}
}
.text-box{
flex: 1;
overflow: hidden;
display: flex;
flex-direction: column;
justify-content: space-between;
padding: 0px 10px 10px;
}
.text1{
height: 44px;
font-size: 14px;line-height: 22px;
display: -webkit-box;//将盒子转换为弹性盒子 -webkit-box-orient: vertical;//文本显示方式,默认水平 -webkit-line-clamp: 2;//设置显示多少行 overflow: hidden;
color: #444;
}
.text2{
display: flex;
align-items: center;
}
.label{
position: absolute;
top: 0px;
font-size: 10px;
padding: 3px 5px;
color: #666;
background: rgba(255,255,255,0.5);
}
}
</style>
Loading…
Cancel
Save