Skip to content

E
ElectricitySheep
Commit f9fa4085 authored by zhengke's avatar zhengke
Browse files
Options

修改

parent 3a2ca17b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 816 additions and 56 deletions
src/components/blindDate/activityInfo.vue
View file @ f9fa4085
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
background: #fff; background: #fff;
width: 740px; width: 740px;
min-height: 500px; min-height: 500px;
margin-top:10px;
} }
.activityTitle { .activityTitle {
...@@ -137,9 +138,38 @@ ...@@ -137,9 +138,38 @@
color: #2d64b3; color: #2d64b3;
} }
.activeInfoMain {
width: 100%;
background-color: #f7f8fa;
margin-top: 10px;
padding: 15px;
border-radius: 10px;
font-size: 14px;
color: #333;
}
.activeSpace {
display: flex;
justify-content: space-between;
margin-bottom: 10px;
}
.active_LeftTitle {
width: 100px;
text-align: right;
}
.activeRightCon {
width: 140px;
text-align: left;
}
</style> </style>
<template> <template>
<div class="activityInfo"> <div class="activityInfo">
<div class="head-title">
<span @click="CommonJump('recruitStick')" class="blue point">招募贴</span> / 招募贴详情
</div>
<div class="activityMain"> <div class="activityMain">
<div class="activityFlex"> <div class="activityFlex">
<div class="active_NameLeft"> <div class="active_NameLeft">
...@@ -150,13 +180,54 @@ ...@@ -150,13 +180,54 @@
<div class="aUserName">{{dataList.UserName}}</div> <div class="aUserName">{{dataList.UserName}}</div>
</div> </div>
<div> <div>
<div class="activityTitle">{{dataList.ActivityTitle}}</div> <div class="activityTitle">
<div class="activityContent"> <template v-if="labelArr&&labelArr.length>0">
{{dataList.Content}} <el-tag v-for="(tag,index) in labelArr" size="mini" :key="index">
{{tag}}
</el-tag>
</template>
<span style="margin-left:5px;">{{dataList.ActivityTitle}}</span>
</div>
<div class="activityContent" v-html="dataList.Content"></div>
<div style="display:flex;justify-content:space-between;margin-bottom:10px;">
<div class="commonDate">回复数：{{dataList.ReplyNum}}</div>
<div class="commonDate">{{dataList.CreateDate}}</div>
</div> </div>
<div class="activeImgContent" v-for="(item,index) in dataList.ImageList" :key="index"> <div class="activeImgContent" v-for="(item,index) in dataList.ImageList" :key="index">
<img :src="item" alt="" /> <img :src="item" alt="" />
</div> </div>
<div class="activeInfoMain">
<div class="activeSpace">
<div style="display:flex;">
<div class="active_LeftTitle">是否开启报名：</div>
<div class="activeRightCon">{{dataList.IsOpenEnroll==1?'是':'否'}}</div>
</div>
<div style="display:flex;">
<div class="active_LeftTitle">截止报名日期：</div>
<div class="activeRightCon">{{dataList.Deadline}}</div>
</div>
</div>
<div class="activeSpace">
<div style="display:flex;">
<div class="active_LeftTitle">活动开始时间：</div>
<div class="activeRightCon">{{dataList.StartTime}}</div>
</div>
<div style="display:flex;">
<div class="active_LeftTitle">活动结束时间：</div>
<div class="activeRightCon">{{dataList.EndTime}}</div>
</div>
</div>
<div class="activeSpace">
<div style="display:flex;">
<div class="active_LeftTitle">男数量：</div>
<div class="activeRightCon">{{dataList.ManNum}}</div>
</div>
<div style="display:flex;">
<div class="active_LeftTitle">女数量：</div>
<div class="activeRightCon">{{dataList.WoManNum}}</div>
</div>
</div>
</div>
</div> </div>
</div> </div>
<div> <div>
...@@ -173,6 +244,9 @@ ...@@ -173,6 +244,9 @@
<div class="activityContent" style="margin-top:0;"> <div class="activityContent" style="margin-top:0;">
{{subItem.Content}} {{subItem.Content}}
</div> </div>
<div style="text-align:right;margin-bottom:10px;">
<span class="commonDate">{{subItem.CreateDate}}</span>
</div>
<div class="activeImgContent" v-for="(item,index) in subItem.ImageList" :key="index"> <div class="activeImgContent" v-for="(item,index) in subItem.ImageList" :key="index">
<img :src="item" alt="" /> <img :src="item" alt="" />
</div> </div>
...@@ -202,8 +276,8 @@ ...@@ -202,8 +276,8 @@
<img src="../../assets/img/userman/del.png" alt="" /> <img src="../../assets/img/userman/del.png" alt="" />
</div> </div>
</div> </div>
<el-pagination style="text-align:center" background @current-change="handleCurrentChange" :page-size="comMsg.pageSize" <el-pagination style="text-align:center" background @current-change="handleCurrentChange"
layout="prev, pager, next" :total="pageCount"> :page-size="comMsg.pageSize" layout="prev, pager, next" :total="pageCount">
</el-pagination> </el-pagination>
</div> </div>
</div> </div>
...@@ -222,7 +296,11 @@ ...@@ -222,7 +296,11 @@
<div class="activityContent" style="margin-top:0;"> <div class="activityContent" style="margin-top:0;">
{{replyObj.Content}} {{replyObj.Content}}
</div> </div>
<div class="activeImgContent" v-if="replyObj.ImageList.length>0" v-for="(Iitem,Iindex) in replyObj.ImageList" :key="Iindex"> <div style="text-align:right;margin-bottom:10px;">
<span class="commonDate">{{replyObj.CreateDate}}</span>
</div>
<div class="activeImgContent" v-if="replyObj.ImageList.length>0" v-for="(Iitem,Iindex) in replyObj.ImageList"
:key="Iindex">
<img :src="Iitem" alt="" /> <img :src="Iitem" alt="" />
</div> </div>
<div class="activeComment"> <div class="activeComment">
...@@ -243,14 +321,15 @@ ...@@ -243,14 +321,15 @@
<img src="../../assets/img/userman/del.png" alt="" /> <img src="../../assets/img/userman/del.png" alt="" />
</div> </div>
</div> </div>
<el-pagination style="text-align:center;padding:0;margin-top:15px;" background @current-change="handleCurrentReplay" :page-size="replayMsg.pageSize" <el-pagination style="text-align:center;padding:0;margin-top:15px;" background
layout="prev, pager, next" :total="replayCount"> @current-change="handleCurrentReplay" :page-size="replayMsg.pageSize" layout="prev, pager, next"
:total="replayCount">
</el-pagination> </el-pagination>
</div> </div>
</div> </div>
</div> </div>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button type="primary" size="small" @click="showCompoent = false">确定</el-button> <el-button type="danger" size="small" @click="showCompoent = false">取消</el-button>
</span> </span>
</el-dialog> </el-dialog>
...@@ -277,10 +356,11 @@ ...@@ -277,10 +356,11 @@
dataList: {}, dataList: {},
compentList: [], compentList: [],
pageCount: 0, pageCount: 0,
replayCount:0, replayCount: 0,
replayList: [], replayList: [],
showCompoent: false, //显示评论弹窗 showCompoent: false, //显示评论弹窗
replyObj:{} replyObj: {},
labelArr: [], //标签数组
} }
}, },
created() {}, created() {},
...@@ -298,6 +378,10 @@ ...@@ -298,6 +378,10 @@
this.apipost("/api/Miai/GetActivityInfo", this.msg, res => { this.apipost("/api/Miai/GetActivityInfo", this.msg, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.dataList = res.data.data; this.dataList = res.data.data;
this.labelArr = [];
if(this.dataList.Label){
this.labelArr.push(this.dataList.Label);
}
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
...@@ -320,7 +404,7 @@ ...@@ -320,7 +404,7 @@
this.getCommentList(); this.getCommentList();
}, },
//回复翻页 //回复翻页
handleCurrentReplay(val){ handleCurrentReplay(val) {
this.replayMsg.pageIndex = val; this.replayMsg.pageIndex = val;
this.getSecondReply(); this.getSecondReply();
}, },
...@@ -359,8 +443,8 @@ ...@@ -359,8 +443,8 @@
}); });
}, },
//点击更多评论 //点击更多评论
getCompentItem(item){ getCompentItem(item) {
this.showCompoent=true; this.showCompoent = true;
this.replyObj = item; this.replyObj = item;
this.replayMsg.ParentId = item.Id; this.replayMsg.ParentId = item.Id;
this.getSecondReply(); this.getSecondReply();
......
src/components/blindDate/blindDateIndex.vue
View file @ f9fa4085
...@@ -59,6 +59,7 @@ ...@@ -59,6 +59,7 @@
width: 100%; width: 100%;
height: 100%; height: 100%;
background-color: #f3f3f3; background-color: #f3f3f3;
overflow: hidden;
} }
.blindDateIndex .mainRightTop { .blindDateIndex .mainRightTop {
......
src/components/blindDate/recruitStick.vue
View file @ f9fa4085
...@@ -15,6 +15,10 @@ ...@@ -15,6 +15,10 @@
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
} }
.recruitContent img {
width: 40px;
}
</style> </style>
<template> <template>
<div class="recruitStick"> <div class="recruitStick">
...@@ -33,38 +37,62 @@ ...@@ -33,38 +37,62 @@
</div> </div>
<div style="padding: 20px;background: #fff;"> <div style="padding: 20px;background: #fff;">
<el-table :data="tableData" header-cell-class-name="headClass" style="width: 100%" border> <el-table :data="tableData" header-cell-class-name="headClass" style="width: 100%" border>
<el-table-column prop="Id" label="ID" width="100"> <el-table-column prop="Id" label="ID" width="60">
</el-table-column> </el-table-column>
<el-table-column prop="ActivityTitle" label="标题"> <el-table-column prop="ActivityTitle" label="标题" min-width="200">
</el-table-column> </el-table-column>
<el-table-column prop="UserName" label="用户名称"> <el-table-column prop="UserName" label="用户信息" width="200">
<template slot-scope="scope">
<div style="display:flex;align-items:center;">
<img :src="scope.row.Photo" style="width:35px;height:35px;border-radius:50%;" />
<span style="display:inline-block;margin-left:5px;">{{scope.row.UserName}}</span>
</div>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="Photo" label="头像"> <el-table-column prop="ImageList" label="图片" width="80">
<template slot-scope="scope"> <template slot-scope="scope">
<img :src="scope.row.Photo" style="width:35px;height:35px;border-radius:50%;" /> <img v-for="(item,index) in scope.row.ImageList" style="width:50px;" :key="index" :src="item" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="Content" label="内容"> <el-table-column prop="ReplyNum" label="回复数量" width="80">
</el-table-column>
<el-table-column prop="EnrollNum" label="报名人数" width="80">
</el-table-column>
<el-table-column prop="EnrollNum" label="是否开启报名" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="recruitContent">{{scope.row.Content}}</div> <span v-if="scope.row.IsOpenEnroll==1" style="color:green">是</span>
<span v-if="scope.row.IsOpenEnroll==2" style="color:red">否</span>
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column prop="ImageList" label="图片"> <el-table-column label="标签" width="70">
</el-table-column> --> <template slot-scope="scope" v-if="scope.row.Label">
<el-table-column prop="ReplyNum" label="回复数量"> <el-tag>
{{scope.row.Label}}
</el-tag>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="Deadline" label="截止报名日期"> <el-table-column label="活动时间" width="220">
<template slot-scope="scope">
<div>开始时间：{{scope.row.StartTime}}</div>
<div>结束时间：{{scope.row.EndTime}}</div>
</template>
</el-table-column>
<el-table-column prop="ManNum" label="男数量" width="70">
</el-table-column> </el-table-column>
<el-table-column fixed="right" label="操作" width="180"> <el-table-column prop="WoManNum" label="女数量" width="70">
</el-table-column>
<el-table-column prop="Deadline" label="截止报名日期" width="150">
</el-table-column>
<el-table-column fixed="right" label="操作" width="130">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tooltip class="item" effect="dark" content="删除" placement="top"> <el-tooltip class="item" effect="dark" content="查看详情" placement="top">
<img src="../../assets/img/setup/del.png" alt="" class="imgstyle" @click="delete_b(scope.row)"> <img src="../../assets/img/userman/icon-show.png" alt="" class="imgstyle" @click="goDetail(scope.row)">
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="报名列表" placement="top"> <el-tooltip class="item" effect="dark" content="报名列表" placement="top">
<img src="../../assets/img/userman/order.png" alt="" class="imgstyle" @click="goorderList(scope.row)"> <img src="../../assets/img/userman/order.png" alt="" class="imgstyle" @click="goorderList(scope.row)">
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="查看详情" placement="top"> <el-tooltip class="item" effect="dark" content="删除" placement="top">
<img src="../../assets/img/userman/icon-show.png" alt="" class="imgstyle" @click="goDetail(scope.row)"> <img src="../../assets/img/setup/del.png" alt="" class="imgstyle" @click="delete_b(scope.row)">
</el-tooltip> </el-tooltip>
</template> </template>
</el-table-column> </el-table-column>
...@@ -136,24 +164,24 @@ ...@@ -136,24 +164,24 @@
}); });
}, },
//招募贴报名列表 //招募贴报名列表
goorderList(item){ goorderList(item) {
this.$router.push({ this.$router.push({
name: 'registrationList', name: 'registrationList',
query: { query: {
Id:item.Id, Id: item.Id,
blank: "y" blank: "y"
} }
}); });
}, },
//查看详情 //查看详情
goDetail(item){ goDetail(item) {
this.$router.push({ this.$router.push({
name: 'activityInfo', name: 'activityInfo',
query: { query: {
Id:item.Id, Id: item.Id,
blank: "y" blank: "y"
} }
}); });
} }
}, },
} }
......
src/components/blindDate/registrationList.vue
View file @ f9fa4085
...@@ -18,7 +18,10 @@ ...@@ -18,7 +18,10 @@
</style> </style>
<template> <template>
<div class="recruitStick"> <div class="recruitStick">
<div style="padding: 20px;background: #fff;"> <div class="head-title">
<span @click="CommonJump('recruitStick')" class="blue point">招募贴</span> / 报名列表
</div>
<div style="margin-top:10px;padding: 20px;background: #fff;">
<el-table :data="tableData" header-cell-class-name="headClass" style="width: 100%" border> <el-table :data="tableData" header-cell-class-name="headClass" style="width: 100%" border>
<el-table-column prop="Name" label="姓名"> <el-table-column prop="Name" label="姓名">
<template slot-scope="scope"> <template slot-scope="scope">
......
src/components/blindDate/starsList.vue
View file @ f9fa4085
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<el-button type="primary" class="el-button--small" @click="addRecharge">新增</el-button> <el-button type="primary" class="el-button--small" @click="addRecharge">新增</el-button>
</div> </div>
</div> </div>
<div style="padding: 20px;background: #fff;margin-top: 20px"> <div style="padding: 20px;background: #fff;margin-top: 10px">
<el-table :data="tableData" header-cell-class-name="headClass" style="width: 100%" border> <el-table :data="tableData" header-cell-class-name="headClass" style="width: 100%" border>
<el-table-column prop="ID" label="ID" width="100"> <el-table-column prop="ID" label="ID" width="100">
</el-table-column> </el-table-column>
...@@ -23,8 +23,8 @@ ...@@ -23,8 +23,8 @@
</el-table-column> </el-table-column>
<el-table-column prop="IsGive" label="是否赠送星星数"> <el-table-column prop="IsGive" label="是否赠送星星数">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="scope.row.IsGive==0" type="info">不赠送</el-tag> <el-tag v-if="scope.row.IsGive==0" size="small" type="info">不赠送</el-tag>
<el-tag v-if="scope.row.IsGive>0" type="warning">赠送{{scope.row.GivePoint}}星星数</el-tag> <el-tag v-if="scope.row.IsGive>0" size="small" type="warning">赠送{{scope.row.GivePoint}}星星数</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column fixed="right" label="操作" width="180"> <el-table-column fixed="right" label="操作" width="180">
......
src/components/sallCenter/plugin/educationCustom.vue
View file @ f9fa4085
...@@ -231,7 +231,7 @@ ...@@ -231,7 +231,7 @@
</div> </div>
<div class="diy-goods"> <div class="diy-goods">
<div class="diy-component-preview" <div class="diy-component-preview"
:style="{'backgroundColor':data.backgroundColor,'borderRadius':data.SearchFilletPX+'px'}"> :style="{'backgroundColor':data.backgroundColor}">
<div :flex="cMainFlex" :style="{marginLeft:data.PaddingLeft+'px', <div :flex="cMainFlex" :style="{marginLeft:data.PaddingLeft+'px',
marginRight:data.PaddingRight+'px',marginTop:data.PaddingTop+'px', marginRight:data.PaddingRight+'px',marginTop:data.PaddingTop+'px',
marginBottom:data.PaddingBottom+'px'}"> marginBottom:data.PaddingBottom+'px'}">
...@@ -241,15 +241,15 @@ ...@@ -241,15 +241,15 @@
<div v-for="(goods,goodsIndex) in cCatGoodsList(cat, catIndex)" class="goods-item" :key="goodsIndex" <div v-for="(goods,goodsIndex) in cCatGoodsList(cat, catIndex)" class="goods-item" :key="goodsIndex"
:class="data.catPosition==='left'?'goods-cat-list':''"> :class="data.catPosition==='left'?'goods-cat-list':''">
<div style="display: inline-block;" :style="cGoodsItemWidth"> <div style="display: inline-block;" :style="cGoodsItemWidth">
<div :style="{'borderRadius':data.SearchFilletPX+'px'}" :flex="cGoodsItemFlex" style="position: relative;border:1px solid rgb(226, 226, 226)"> <div :style="{'borderRadius':data.SearchFilletPX+'px'}" :flex="cGoodsItemFlex" style="position: relative;border:1px solid rgb(226, 226, 226);overflow:hidden">
<div class="goods-pic" <div class="goods-pic"
:class="'goods-pic-'+data.goodsCoverProportion+' goods-pic-fill-'+data.fill" :class="'goods-pic-'+data.goodsCoverProportion+' goods-pic-fill-'+data.fill"
:style="'background-image: url('+getIconLink(goods.picUrl)+')'"> :style="'background-image: url('+getIconLink(goods.picUrl)+')'">
</div> </div>
<div :style="cGoodsItemInfoStyle"> <div :style="cGoodsItemInfoStyle">
<div class="goods-name" :class="data.listStyle===-1?'goods-name-static':''"> <div class="goods-name" :class="data.listStyle===-1?'goods-name-static':''">
<div style="font-size:16px;">{{goods.name}}</div> <div style="font-size:30px;">{{goods.name}}</div>
<div style="font-size:14px;margin-top:10px;">{{goods.lableName}}</div> <div style="font-size:25px;margin-top:10px;">{{goods.lableName}}</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -475,7 +475,7 @@ ...@@ -475,7 +475,7 @@
linkUrl:'' //链接 linkUrl:'' //链接
} }
if(this.data.list.length<this.data.goodsLength){ if(this.data.list.length<this.data.goodsLength){
if(this.data.list.length>0){ // if(this.data.list.length>0){
for(var i=0;i<this.data.list.length;i++){ for(var i=0;i<this.data.list.length;i++){
if(this.data.list[i].linkUrl==''){ if(this.data.list[i].linkUrl==''){
this.Error(`请选择第${i+1}个的链接`); this.Error(`请选择第${i+1}个的链接`);
...@@ -483,7 +483,7 @@ ...@@ -483,7 +483,7 @@
} }
} }
this.data.list.push(obj); this.data.list.push(obj);
} // }
}else{ }else{
this.Error('超出自定义数量'); this.Error('超出自定义数量');
} }
......
src/components/sallCenter/plugin/miaiactiviCustom.vue 0 → 100644
View file @ f9fa4085
This diff is collapsed.
src/components/sallCenter/templateEdit.vue
View file @ f9fa4085
...@@ -302,6 +302,8 @@ ...@@ -302,6 +302,8 @@
:index="index" :dataLeng="dataList.length"></miaiuser> :index="index" :dataLeng="dataList.length"></miaiuser>
<miaiactivitytype v-if="item.Id=='miaiactivitytype'" :mData="item" @getSord="getSord" @comDelPlugin="comDelPlugin" <miaiactivitytype v-if="item.Id=='miaiactivitytype'" :mData="item" @getSord="getSord" @comDelPlugin="comDelPlugin"
:index="index" :dataLeng="dataList.length"></miaiactivitytype> :index="index" :dataLeng="dataList.length"></miaiactivitytype>
<miaiactiviCustom v-if="item.Id=='miaiactiviCustom'" :mcData="item" @getSord="getSord" @comDelPlugin="comDelPlugin"
:index="index" :dataLeng="dataList.length" ></miaiactiviCustom>
</div> </div>
</div> </div>
</div> </div>
...@@ -419,6 +421,8 @@ ...@@ -419,6 +421,8 @@
import navPage from "../sallCenter/plugin/nav-page" import navPage from "../sallCenter/plugin/nav-page"
import miaiuser from "../sallCenter/plugin/miaiuser" import miaiuser from "../sallCenter/plugin/miaiuser"
import miaiactivitytype from "../sallCenter/plugin/miaiactivitytype" import miaiactivitytype from "../sallCenter/plugin/miaiactivitytype"
import miaiactiviCustom from "../sallCenter/plugin/miaiactiviCustom"
import ChooseImg from "@/components/global/ChooseImg.vue"; import ChooseImg from "@/components/global/ChooseImg.vue";
export default { export default {
...@@ -497,7 +501,8 @@ ...@@ -497,7 +501,8 @@
educationteacher, educationteacher,
navPage, navPage,
miaiuser, miaiuser,
miaiactivitytype miaiactivitytype,
miaiactiviCustom
}, },
methods: { methods: {
//选择图片 //选择图片
...@@ -1376,7 +1381,7 @@ ...@@ -1376,7 +1381,7 @@
} }
this.dataList.push(zxObj); this.dataList.push(zxObj);
break; break;
//自定义列表 //教育自定义
case 'educationCustom': case 'educationCustom':
let customObj = { let customObj = {
Id: 'educationCustom', Id: 'educationCustom',
...@@ -1531,6 +1536,25 @@ ...@@ -1531,6 +1536,25 @@
} }
this.dataList.push(miaiactivityData); this.dataList.push(miaiactivityData);
break; break;
//相亲自定义
case 'miaiactiviCustom':
let miaiacObj = {
Id: 'miaiactiviCustom',
isCked: false,
data: {
goodsLength: 10, //商品数量
listStyle: -1, //列表样式[-1-列表模式,0-左右滑动,1-一行一个,2-一行两个3-一行三个]
backgroundColor: '#fff', //背景颜色
PaddingTop: 0, //上边距
PaddingBottom: 0, //下边距
PaddingLeft: 0, //左边距
PaddingRight: 0, //右边距
SearchFilletPX: 0, //组件圆角
list: [] //自定义列表
}
}
this.dataList.push(miaiacObj);
break;
} }
}, },
//给子组件调用 重新排序上移下移 //给子组件调用 重新排序上移下移
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment