Skip to content

H
haoban-3
Commit f688879a by crushh
Options

Merge branch 'feature/act-code' into dev

parents 6c49b756 963456dd
Showing with 82 additions and 77 deletions
src/views/salesleads/actCodeManage/attractFlowLink/detail.vue
......@@ -15,7 +15,7 @@
<el-input placeholder="请输入链接名称" class="w-340" :maxlength="30" show-word-limit v-model="form.name"></el-input>
</el-form-item>
<el-form-item label="链接描述" prop="remark">
<el-input placeholder="请输入链接描述" type="textarea" class="w-340" :maxlength="100" :autosize="{ minRows: 3, maxRows: 5 }" show-word-limit v-model="form.remark"></el-input>
<el-input placeholder="请输入链接描述" type="textarea" class="w-340" :maxlength="100" :autosize="{ minRows: 4, maxRows: 6 }" show-word-limit v-model="form.remark"></el-input>
</el-form-item>
<el-form-item label="链接标签" required prop="memberLabelId" class="memberTag-form-item">
<el-button plain v-if="!form.memberLabelId" @click="tagsDialogVisible = true"><i class="iconfont-components3 icon-cp-PlusOutlined addPic"></i>添加标签</el-button>
......@@ -178,10 +178,10 @@ export default {
storeData: [],
form: {
linkType: 1,
// memberLabelName: '',
// memberLabelId: '',
memberLabelName: '测试标签值名称重复- 温州青童时代店',
memberLabelId: 'edd3901afd1e418d93fdc3b50bb24784',
memberLabelName: '',
memberLabelId: '',
// memberLabelName: '测试标签值名称重复- 温州青童时代店',
// memberLabelId: 'edd3901afd1e418d93fdc3b50bb24784',
storeList: [],
name: '',
pageId: '',
......
src/views/salesleads/actCodeManage/attractFlowLink/newAddChart.vue
<template>
<div>
<div :id="id"></div>
<div :id="id" class="chart--nodata"></div>
<div v-if="!charData.length" class="chart--nodata">
<div>
<img class="image-120" src="@/assets/no-data.svg" />
......@@ -29,11 +29,7 @@ export default {
return [];
}
},
id: String,
width: {
type: Number,
default: 1192
}
id: String
},
mounted() {
setTimeout(() => {
......@@ -54,9 +50,10 @@ export default {
if (!this.charData.length) return;
this.chart = new G2.Chart({
container: this.id,
height: 359,
autoFit: true,
forceFit: true,
width: this.width,
padding: [20, 40, 80, 80]
});
this.chart.data(this.charData);
......@@ -139,7 +136,7 @@ export default {
</script>
<style lang="scss" scoped>
.chart--nodata {
height: 256px;
height: 359px;
width: 100%;
display: flex;
justify-content: center;
......
src/views/salesleads/components/welcomesItem.vue
<template>
<div>
<el-row>
<el-col :span="17">
<el-form-item label="设置欢迎语">
<el-radio-group @change="radioChange" v-model="welcomeType">
<el-radio :label="1">{{ welcomeName == 'code' ? '活码' : '链接' }}欢迎语</el-radio>
<el-radio :label="2">不发送欢迎语</el-radio>
</el-radio-group>
<ul class="tabs" v-if="welcomeType == 1">
<li>1.下方的欢迎语取自【设置-欢迎语设置】中的“特殊欢迎语”；</li>
<li>
2.配置“<span>{{ welcomeName == 'code' ? '活码' : '链接' }}</span
>欢迎语”后，通过此活码添加好友后，系统自动推送此处所配置的欢迎语
</li>
<li>（根据企业微信规则，若所添加的该成员在企业微信后台已经配置了欢迎语，那么会推送企微后台所配置的欢迎语，不会推送此处的欢迎语）</li>
</ul>
<ul class="tabs" v-if="welcomeType == 2">
<li>
通过此<span>{{ welcomeName == 'code' ? '活码' : '链接' }}</span
>添加好友后，系统不推送欢迎语，及时在【设置-欢迎语设置】中为该成员配置了欢迎语。
</li>
<li>（根据企业微信规则，若所添加的该成员在企业微信后台已经配置了欢迎语，那么企微后台的欢迎语会照常推送）</li>
</ul>
</el-form-item>
<el-form-item label="选择欢迎语" v-if="welcomeType == 1">
<div class="welcomeTable">
<div class="wtabTop">
<el-input class="w260" placeholder="请输入标题" v-model="welcomePage.title" @keyup.native="toInput" clearable @clear="onSearch"></el-input>
<el-button plain class="blueBtn" @click="changeRoute">新建欢迎语</el-button>
</div>
<el-table :data="welcomeTableData" max-height="300px" @row-click="getCurrentRow">
<el-table-column width="55">
<template slot-scope="{ row }">
<el-radio :label="row.welcomeId" @change.native="getCurrentRow(row)" v-model="welcomeId"><i></i></el-radio>
</template>
</el-table-column>
<el-table-column prop="title" label="标题" width="158px"></el-table-column>
<el-table-column prop="welcomeContent" label="内容" show-overflow-tooltip></el-table-column>
<el-table-column label="附件" width="200px" show-overflow-tooltip>
<template slot-scope="{ row }">
<el-popover placement="top-start" trigger="hover" v-if="row.welcomeMediaList && row.welcomeMediaList.length">
<div class="flexBox" v-for="item in row.welcomeMediaList" :key="item.welcomeMediaId">
<svg-icon :iconname="iconType[item.mediaType]" size="16" style="margin-right: 13px;"> </svg-icon>
<span class="popverText">{{ item.mediaTitle }}</span>
</div>
<div slot="reference" class="flexBox" v-if="row.welcomeMediaList && row.welcomeMediaList.length">
<svg-icon :iconname="iconType[row.welcomeMediaList[0].mediaType]" size="40" style="margin-right: 10px;"> </svg-icon>
<span class="wrapText"> {{ row.welcomeMediaList[0].mediaTitle }}</span>
</div>
</el-popover>
<div v-else>--</div>
</template>
</el-table-column>
</el-table>
<el-pagination class="paginationBox" background @current-change="handleCurrentChange" :current-page="welcomePage.pageNum" layout=" prev, pager, next " :page-size="welcomePage.pageSize" :total="totalNum"></el-pagination>
<div class="welcomBox">
<div>
<el-form-item label="设置欢迎语">
<el-radio-group @change="radioChange" v-model="welcomeType">
<el-radio :label="1">{{ welcomeName == 'code' ? '活码' : '链接' }}欢迎语</el-radio>
<el-radio :label="2">不发送欢迎语</el-radio>
</el-radio-group>
<ul class="tabs" v-if="welcomeType == 1">
<li>1.下方的欢迎语取自【设置-欢迎语设置】中的“特殊欢迎语”；</li>
<li>
2.配置“<span>{{ welcomeName == 'code' ? '活码' : '链接' }}</span
>欢迎语”后，通过此活码添加好友后，系统自动推送此处所配置的欢迎语
</li>
<li>（根据企业微信规则，若所添加的该成员在企业微信后台已经配置了欢迎语，那么会推送企微后台所配置的欢迎语，不会推送此处的欢迎语）</li>
</ul>
<ul class="tabs" v-if="welcomeType == 2">
<li>
通过此<span>{{ welcomeName == 'code' ? '活码' : '链接' }}</span
>添加好友后，系统不推送欢迎语，及时在【设置-欢迎语设置】中为该成员配置了欢迎语。
</li>
<li>（根据企业微信规则，若所添加的该成员在企业微信后台已经配置了欢迎语，那么企微后台的欢迎语会照常推送）</li>
</ul>
</el-form-item>
<el-form-item label="选择欢迎语" v-if="welcomeType == 1">
<div class="welcomeTable">
<div class="wtabTop">
<el-input class="w260" placeholder="请输入标题" v-model="welcomePage.title" @keyup.native="toInput" clearable @clear="onSearch"></el-input>
<el-button plain class="blueBtn" @click="changeRoute">新建欢迎语</el-button>
</div>
</el-form-item>
</el-col>
<el-col :span="7" v-if="welcomeType == 1 && welcomeContent != ''">
<p class="welcomeTitle">欢迎语预览</p>
<previewWelcome :welcomeContent="welcomeContent" :mediaList="welcomeMediaList"></previewWelcome>
</el-col>
</el-row>
<el-table :data="welcomeTableData" max-height="300px" @row-click="getCurrentRow">
<el-table-column width="55">
<template slot-scope="{ row }">
<el-radio :label="row.welcomeId" @change.native="getCurrentRow(row)" v-model="welcomeId"><i></i></el-radio>
</template>
</el-table-column>
<el-table-column prop="title" label="标题" width="158px"></el-table-column>
<el-table-column prop="welcomeContent" label="内容" show-overflow-tooltip></el-table-column>
<el-table-column label="附件" width="200px" show-overflow-tooltip>
<template slot-scope="{ row }">
<el-popover placement="top-start" trigger="hover" v-if="row.welcomeMediaList && row.welcomeMediaList.length">
<div class="flexBox" v-for="item in row.welcomeMediaList" :key="item.welcomeMediaId">
<svg-icon :iconname="iconType[item.mediaType]" size="16" style="margin-right: 13px;"> </svg-icon>
<span class="popverText">{{ item.mediaTitle }}</span>
</div>
<div slot="reference" class="flexBox" v-if="row.welcomeMediaList && row.welcomeMediaList.length">
<svg-icon :iconname="iconType[row.welcomeMediaList[0].mediaType]" size="40" style="margin-right: 10px;"> </svg-icon>
<span class="wrapText"> {{ row.welcomeMediaList[0].mediaTitle }}</span>
</div>
</el-popover>
<div v-else>--</div>
</template>
</el-table-column>
</el-table>
<el-pagination class="paginationBox" background @current-change="handleCurrentChange" :current-page="welcomePage.pageNum" layout=" prev, pager, next " :page-size="welcomePage.pageSize" :total="totalNum"></el-pagination>
</div>
</el-form-item>
</div>
<div v-if="welcomeType == 1 && welcomeContent != ''">
<p class="welcomeTitle">欢迎语预览</p>
<previewWelcome :welcomeContent="welcomeContent" :mediaList="welcomeMediaList" class="phone"></previewWelcome>
</div>
</div>
</template>
......@@ -199,6 +197,9 @@ export default {
};
</script>
<style lang="less" scoped>
.welcomBox {
display: flex;
}
.m20 {
margin: 20px;
}
......@@ -231,12 +232,19 @@ export default {
padding-right: 4px;
}
.welcomeTitle {
text-align: center;
// text-align: center;
margin-left: 197px;
margin-bottom: 26px;
margin-top: 6px;
font-weight: 500;
color: #303133;
font-size: 14px;
font-family: PingFangSC-Medium, PingFang SC;
}
.phone {
.iphone {
margin-left: 60px !important;
}
}
.welcomeTable {
width: 720px;
......
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