Skip to content

T
techbook
Commit e3ae7b49 authored by zhangyanni's avatar zhangyanni
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents deeda232 84dcb5be
Show whitespace changes
Inline Side-by-side
Showing with 37 additions and 31 deletions
src/App.vue
View file @ e3ae7b49
......@@ -75,10 +75,11 @@
//埋点
maiDianFunc(data) {
if (data.type == 'report-channel-list-click') {
this.$router.push({
path: '/activitydetail',
query: {id: data.channelId, ismyevent: 0, type: data.channelType}
});
// this.$router.push({
// path: '/activitydetail',
// query: {id: data.channelId, ismyevent: 0, type: data.channelType}
// });
window.open(this.publicFun.getCurrentHrefEnv()+"/activitydetail?id="+data.channelId+'&ismyevent=0&type='+data.channelType + this.publicFun.getTargetBlankFlag(2));
}
let params = {
type: data.type,
......
src/views/findeventpage/api/api.js
View file @ e3ae7b49
......@@ -109,6 +109,11 @@ export default {
dataGroupAllLists (){
return api.fetchGet('/business/report/dataGroupAllList');
},
//所有分类新排序
selectActivityDataList (){
return api.fetchGet('/business/activityEnter/selectActivityDataList');
},
//交换名片列表
selectActivityCardList(params){
return api.fetchPost("/base/emp/selectActivityCardList",params);
......
src/views/findeventpage/newEventpage.vue
View file @ e3ae7b49
......@@ -36,23 +36,10 @@
end-placeholder="结束日期">
</el-date-picker>
</div>
<el-popover
placement="top"
width="200"
trigger="hover">
<div class="centerQrCode" style="text-align: center">
<span style="font-size: 12px;">扫描下面的二维码获得发布资格</span>
<img :src="activityContact.contactImg" alt="" style="width: 140px;height: 140px;margin: 15px;">
<p style="font-size: 12px;">请使用微信扫描二维码</p>
<p style="font-size: 12px;color: #1A1A1E;font-weight: bold;margin-top: 10px;">客服微信：{{activityContact.contactWay}}</p>
</div>
<p v-if="activityContact.contactImg" class="condition_state_btn" slot="reference"><span>免费发布活动</span></p>
</el-popover>
<p v-if="activityContact.contactImg" @click="vueQrVisible = true" class="condition_state_btn" slot="reference"><span>免费发布活动</span></p>
</div>
<div class="gendisplay">
<page-screen :style="Citychecked?'':'height: 50px;overflow: hidden;'" :screenlist="getHotCitylist" :labelWidth="true" :screenchildListIf="false" ref="projectCitychild" titleName="活动区域" @changecheck="projectCityData"></page-screen>
<page-screen :style="Citychecked?'':'height: 50px;overflow: hidden;'" :screenlist="getHotCitylist" :labelWidth="true" :screenchildListIf="true" ref="projectCitychild" titleName="活动区域" @changecheck="projectCityData"></page-screen>
<i class="iconfont" @click="Citychecked = !Citychecked" :class="Citychecked?'icon-xiala-copy':'icon-xiala'"></i>
</div>
<div class="gendisplay">
......@@ -170,6 +157,14 @@
</div>
</div>
<el-dialog :visible.sync="vueQrVisible" width="360px" :close-on-click-moda="false" center>
<div style="text-align: center;margin: 0 20px;">
<img :src="activityContact.contactImg" alt="" style="width: 140px;height: 140px;margin: 15px;padding: 5px;border: 1px solid #E8E8E8;">
<p style="color: #1A1A1E;">添加客服微信获取发布资格添加客服微信获取发布资格</p>
<p style="color: #1A1A1E;margin-top: 10px;">客服微信：{{activityContact.contactWay}}</p>
</div>
</el-dialog>
<signupbar :detailInfo="detailInfo" :tabName="activeName" :secondStepInfo="secondStepInfo" @getresourcesdata="getresourcesdata" @cancelVisible="cancelVisible" :applyVisible="applyVisible" v-if="applyVisible"></signupbar>
......@@ -190,6 +185,7 @@
name: "newEventpage",
data() {
return {
vueQrVisible:false,
groupalllist:[],
groupchecked:false,
Citychecked:false,
......@@ -223,6 +219,10 @@
pageScreen,signupbar,expertVisible,VueQRCodeComponent
},
methods:{
//二维码
isVueQrVisible(data){
this.vueQrVisible = data;
},
//合作伙伴链接
handleToLink(item) {
window.open(item.partnerUrl);
......@@ -267,7 +267,7 @@
this.resourcesdata();
},
getdataGroupAllLists(){
api.dataGroupAllLists().then(response => {
api.selectActivityDataList().then(response => {
if(response.code == 0) {
response.result.forEach( ( item ) => {
item.checked = false;
......@@ -481,9 +481,9 @@
resourcesdata(){
this.searchs.dataIds = this.eventdataIds?this.eventdataIds.join(','):'';
let params = this.searchs;
if(params.channelCity instanceof Array){
params.channelCity = params.channelCity.join(',');
}
// if(params.channelCity instanceof Array){
// params.channelCity = params.channelCity.join(',');
// }
let searchsurl = '/base/channel/searchActivity?';
api.showList(searchsurl,params).then(response => {
if(response.code == 0) {
......
src/views/loginregister/pages/emailRegisterCmpt.vue
View file @ e3ae7b49
......@@ -167,8 +167,8 @@
this.publicFun.setUserInfoCookieType(that.Base64.encode(JSON.stringify(res.result)));
if(this.publicFun.isgetUserRoleFunc(1)) this.$router.push("/sys.user");
else {
if(this.publicFun.isgetUserRoleFunc(8)||this.publicFun.isgetUserRoleFunc(4)||this.publicFun.isgetUserRoleFunc(7)) this.$router.push({path:"/seeprojectlist",query:{remind:true}});
else this.$router.push("/seeprojectlist");
if(this.publicFun.isgetUserRoleFunc(8)||this.publicFun.isgetUserRoleFunc(4)||this.publicFun.isgetUserRoleFunc(7)) this.$router.push({path:"/peoplefinfo",query:{remind:true}});
else this.$router.push("/peoplefinfo");
}
setTimeout(function(){
that.flag=0;
......
src/views/publishactivity/pubactivities.vue
View file @ e3ae7b49
......@@ -163,16 +163,16 @@
<!--新增-->
<el-dialog title="合伙伙伴" :visible.sync="partnerVisible" :append-to-body="true" :close-on-click-modal="false" @close="closeSensor" width="700px" class="dialogWrap">
<el-dialog title="合作伙伴" :visible.sync="partnerVisible" :append-to-body="true" :close-on-click-modal="false" @close="closeSensor" width="700px" class="dialogWrap">
<el-form label-position="right" label-width="120px" :model="partnerData" :rules="rules" ref="partnerData" style="margin:0 100px 0 60px">
<el-form-item label="合伙伙伴logo：" ref="guestimg" prop="partnerLogo">
<el-form-item label="合作伙伴logo：" ref="guestimg" prop="partnerLogo">
<p class="imgTitle">仅支持PNG，JPG，JPEG，最大不超过400K,尺寸348*148px；</p>
<div class="uploadImg">
<up-img :actionUrl="'/base/upload/uploadOriginalImg'" @dataEvent_size="dataEventSize" @dataEvent="Backimg" :iseventPartner="true" :channelPic="partnerData.partnerLogo" :upmax="0.4"></up-img>
</div>
</el-form-item>
<el-form-item label="合伙伙伴名称：" prop="partnerName">
<el-input v-model="partnerData.partnerName" maxlength="40" placeholder="请输入合伙伙伴名称"></el-input>
<el-form-item label="合作伙伴名称：" prop="partnerName">
<el-input v-model="partnerData.partnerName" maxlength="40" placeholder="请输入合作伙伴名称"></el-input>
</el-form-item>
<el-form-item label="链接地址：" prop="partnerUrl">
<el-input v-model="partnerData.partnerUrl" maxlength="150" placeholder="请输入链接地址"></el-input>
......@@ -236,8 +236,8 @@
contactData:{},
selectpartnerlist:[],
rules:{
partnerName: [{required: true,message: '请输入合伙伙伴名称',trigger: 'blur'}],
partnerLogo: [{required: true,message: '请上传合伙伙伴logo',trigger: 'blur'}],
partnerName: [{required: true,message: '请输入合作伙伴名称',trigger: 'blur'}],
partnerLogo: [{required: true,message: '请上传合作伙伴logo',trigger: 'blur'}],
},
contactrules:{
contactWay: [{required: true,message: '请输入联系方式',trigger: 'blur'}],
......
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