Skip to content

H
haoban-3
Commit 032b6302 by crushh
Options

update: dist

parent eb51596e
Showing with 42 additions and 129 deletions
index.html
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<link rel="shortcut icon" href="./favicon.ico" /> <link rel="shortcut icon" href="./favicon.ico" />
<title>好办管理平台</title> <title>好办管理平台</title>
<link rel="stylesheet" type="text/css" href="//web-1251519181.file.myqcloud.com/custom-element/custom-element.1.0.73.css" /> <link rel="stylesheet" type="text/css" href="//web-1251519181.file.myqcloud.com/custom-element/custom-element.1.0.74.css" />
<!--好办后台3.0--> <!--好办后台3.0-->
<!-- <link rel="stylesheet" type="text/css" href="//at.alicdn.com/t/font_1628375_vcg1gtmx7lb.css" /> --> <!-- <link rel="stylesheet" type="text/css" href="//at.alicdn.com/t/font_1628375_vcg1gtmx7lb.css" /> -->
<script src="//at.alicdn.com/t/font_1628375_vcg1gtmx7lb.js"></script> <script src="//at.alicdn.com/t/font_1628375_vcg1gtmx7lb.js"></script>
......
src/views/salesleads/actCodeManage/attractFlowLink/detail.vue
...@@ -108,7 +108,7 @@ ...@@ -108,7 +108,7 @@
<div class="table"> <div class="table">
<div class="search"> <div class="search">
<el-input class="w-260" placeholder="请输入标题" v-model="landingPage.pageSearchText" @keyup.native="toInput" clearable @clear="getList"></el-input> <el-input class="w-260" placeholder="请输入标题" v-model="landingPage.pageSearchText" @keyup.native="toInput" clearable @clear="getList"></el-input>
<el-button plain class="ylbtn" @click="addTemp">新建模板</el-button> <el-button plain class="blueBtn" @click="addTemp">新建模板</el-button>
</div> </div>
<el-table :data="landingData" height="426" :loading="landingLoading"> <el-table :data="landingData" height="426" :loading="landingLoading">
<el-table-column width="55"> <el-table-column width="55">
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
<el-table-column prop="pageTitle" label="页面标题" minWidth="156" show-overflow-tooltip> </el-table-column> <el-table-column prop="pageTitle" label="页面标题" minWidth="156" show-overflow-tooltip> </el-table-column>
<el-table-column prop="guideComment" label="引导语" show-overflow-tooltip></el-table-column> <el-table-column prop="guideComment" label="引导语" show-overflow-tooltip></el-table-column>
</el-table> </el-table>
<el-pagination class="paginationBox" background @current-change="getList" :current-page="landingPage.pageNum" layout="prev, pager,next " :page-size="landingPage.pageSize" :total="total"></el-pagination> <el-pagination class="paginationBox" background @current-change="getList" :current-page.sync="landingPage.pageNum" :page-size.sync="landingPage.pageSize" layout="prev, pager,next " :total="total"></el-pagination>
</div> </div>
</el-form-item> </el-form-item>
<div class="preview" v-if="landingForm && Object.keys(landingForm).length"> <div class="preview" v-if="landingForm && Object.keys(landingForm).length">
...@@ -298,6 +298,7 @@ export default { ...@@ -298,6 +298,7 @@ export default {
const { result, totalCount } = res.data.result; const { result, totalCount } = res.data.result;
if (result) { if (result) {
this.total = totalCount; this.total = totalCount;
this.landingData = result; this.landingData = result;
} }
}) })
......
src/views/salesleads/actCodeManage/attractFlowLink/info.vue
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
<el-date-picker class="w256" v-model="dateDefault" type="daterange" range-separator="~" start-placeholder="创建开始日期" end-placeholder="创建结束日期" :default-time="['00:00:00', '23:59:59']" :picker-options="pickerOptions()" @change="onDateChange" value-format="yyyy-MM-dd"> </el-date-picker> <el-date-picker class="w256" v-model="dateDefault" type="daterange" range-separator="~" start-placeholder="创建开始日期" end-placeholder="创建结束日期" :default-time="['00:00:00', '23:59:59']" :picker-options="pickerOptions()" @change="onDateChange" value-format="yyyy-MM-dd"> </el-date-picker>
</div> </div>
</div> </div>
<new-add-chart :charData="charData" id="new-add-chart"></new-add-chart> <new-add-chart :charData="charData" id="new-add-chart" style="margin-top:26px"></new-add-chart>
<dm-sub-title> <dm-sub-title>
<div class="title"> <div class="title">
<span>查看明细</span> <span>查看明细</span>
...@@ -116,57 +116,9 @@ export default { ...@@ -116,57 +116,9 @@ export default {
filters, filters,
statisticsClerk, statisticsClerk,
loading: false, loading: false,
activeName: this.$route.query.type, activeName: this.$route.query.type ? this.$route.query.type : 'first',
link: { link: {},
// linkId: 419648718594129960, page: {},
// customRuleJson: '{"fw_store":{"open":1,"zs":1,"dz":1,"dy":1},"xg_store":{"open":1,"zs":1,"dz":1,"dy":0}}',
// linkType: 2,
// memberLabelId: 'fd6b44967aa647bcadfad10706244c56',
// memberLabelName: '测试121212-木瑾0630测试标签值50',
// name: '活码链接-711',
// pageId: 418460224953786370,
// remark: '说明',
// linkUrl: 'www.baidu.com',
// storeList: [
// {
// storeId: 'ff80808181e0effb0181e26a674c000e',
// storeName: '测试有赞商城',
// storeCode: '991001'
// },
// {
// storeId: 'ff80808181e0effb0181e128d0b70000',
// storeName: '达达店铺',
// storeCode: 'DADA'
// }
// ],
// storeRuleJson: '{"store_type":2,"open":0,"store":{"dz":0,"dy":1,"ndz":0,"ndy":1}, "city_store":{"open":1,"dz":1,"dy":1}}',
// welcomeId: '04af9e55515d4352be0b2a3119005ce9',
// enterpriseId: 'ff8080815dacd3a2015dacd3ef5c0000',
// wxEnterpriseId: 'ca66a01b79474c40b3e7c7f93daf1a3b',
// createTime: 1657594862000,
// createorId: 'fefd1c81641711e69d0818c58a146fd2',
// creatorName: '艾蜜雪管理员'
},
page: {
// createTime: 1657594862000,
// createorId: 'fefd1c81641711e69d0818c58a146fd2',
// createorName: '艾蜜雪管理员',
// enterpriseId: 'ff8080815dacd3a2015dacd3ef5c0000',
// guideComment: '长按保存图片并识别二维码添加您的专属导购',
// merchantLogo: 'https://pic01-10001430.image.myqcloud.com/d4b383df-8eb1-49d6-9c84-8e3e36958464',
// merchantName: '金华达摩11',
// merchantPhoneNumber: '12-31322',
// modifierId: 'fefd1c81641711e69d0818c58a146fd2',
// modifierName: '艾蜜雪管理员',
// pageBackgroundImg: '',
// pageCode: 'MB01419872763172380673',
// pageId: '419872763172380673',
// pageName: 'test1',
// pageTitle: '嗡嗡嗡嗡嗡嗡嗡嗡嗡嗡',
// status: 1,
// updateTime: 1657594862000,
// wxEnterpriseId: 'ca66a01b79474c40b3e7c7f93daf1a3b'
},
originTargetList: [ originTargetList: [
[ [
{ {
...@@ -306,6 +258,7 @@ export default { ...@@ -306,6 +258,7 @@ export default {
mounted() { mounted() {
this.getDetail(); this.getDetail();
this.getChartList(); this.getChartList();
this.statisticsTotal();
document.getElementById('hb-layout-pager-one').addEventListener('scroll', this.scrollMethod); document.getElementById('hb-layout-pager-one').addEventListener('scroll', this.scrollMethod);
}, },
destroyed() { destroyed() {
......
src/views/salesleads/actCodeManage/attractFlowLink/landingPage/detail.vue
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
</el-form-item> </el-form-item>
<el-form-item label="页面背景"> <el-form-item label="页面背景">
<single-upload uploadType="1" :showTips="false" :imgSrc.sync="form.pageBackgroundImg" :field="''" class="app-set" :uploadLimit="2" :imgType="['image/jpeg', 'image/jpg', 'image/png', 'image/gif']"> </single-upload> <single-upload uploadType="1" :showTips="false" :imgSrc.sync="form.pageBackgroundImg" :field="''" class="app-set" :uploadLimit="2" :imgType="['image/jpeg', 'image/jpg', 'image/png', 'image/gif']"> </single-upload>
<p style="margin-top: 6px;font-size: 12px;color: #909399;line-height: 17px;">图片建议尺寸 750*1334px，格式 jpg/png/gif，大小 200KB 以内。</p> <p style="margin-top: 6px;font-size: 12px;color: #909399;line-height: 17px;">图片建议尺寸 750*1334px，格式 jpg/png/gif，大小 2M 以内。</p>
</el-form-item> </el-form-item>
<el-form-item label="引导语" prop="guideComment"> <el-form-item label="引导语" prop="guideComment">
<el-input show-word-limit placeholder="请输入引导语" type="textarea" v-model="form.guideComment" maxlength="50" class="w-340" :autosize="{ minRows: 4, maxRows: 6 }"></el-input> <el-input show-word-limit placeholder="请输入引导语" type="textarea" v-model="form.guideComment" maxlength="50" class="w-340" :autosize="{ minRows: 4, maxRows: 6 }"></el-input>
......
src/views/salesleads/actCodeManage/attractFlowLink/landingPage/list.vue
...@@ -186,7 +186,7 @@ export default { ...@@ -186,7 +186,7 @@ export default {
}, },
goLinkDetail(referId) { goLinkDetail(referId) {
console.log(referId); console.log(referId);
this.$router.push(`/ladingPageEdit/${referId}`); this.$router.push(`/attractFlowLinkInfo/${referId}`);
} }
} }
}; };
......
src/views/salesleads/actCodeManage/attractFlowLink/newAddChart.vue
...@@ -49,72 +49,7 @@ export default { ...@@ -49,72 +49,7 @@ export default {
width: this.width, width: this.width,
padding: [20, 40, 80, 80] padding: [20, 40, 80, 80]
}); });
// this.charData = [ this.chart.data(this.charData);
// { addNum: 1, bizDate: '2022-07-11', clickNum: 11, clickTimes: 12 },
// { addNum: 2, bizDate: '2022-07-12', clickNum: 22, clickTimes: 13 },
// { addNum: 3, bizDate: '2022-07-13', clickNum: 33, clickTimes: 14 },
// { addNum: 4, bizDate: '2022-07-14', clickNum: 44, clickTimes: 15 },
// { addNum: 5, bizDate: '2022-07-15', clickNum: 55, clickTimes: 15 },
// { addNum: 6, bizDate: '2022-07-16', clickNum: 66, clickTimes: 14 },
// { addNum: 7, bizDate: '2022-07-17', clickNum: 77, clickTimes: 14 },
// { addNum: 8, bizDate: '2022-07-18', clickNum: 88, clickTimes: 10 },
// { addNum: 9, bizDate: '2022-07-19', clickNum: 99, clickTimes: 120 }
// ];
this.chart.data(this.charData, {
bizDate: {
// type: 'cat', //分类
alias: '日期' //别名
},
addNum: {
alias: '今日添加人数'
},
clickNum: {
alias: '今日点击人数'
},
clickTimes: {
alias: '今日点击人次'
}
});
//坐标轴配置(法一配置)
this.chart.axis('bizDate', {
line: {
style: {
stroke: '#606266',
lineDash: [3, 3]
}
},
tickLine: {
style: {
fill: '#E4E7ED',
lineDash: [3, 3]
}
},
label: {
style: {
fill: '#606266'
}
}
});
// this.chart.axis('新增人数', {
// grid: {
// line: {
// type: 'line',
// style: {
// stroke: '#E4E7ED',
// lineDash: [3, 3]
// }
// }
// },
// label: {
// style: {
// fill: '#606266'
// },
// formatter: val => {
// // 格式化参数值
// return val;
// }
// }
// });
// 图例 // 图例
this.chart.legend({ this.chart.legend({
custom: true, custom: true,
...@@ -125,18 +60,39 @@ export default { ...@@ -125,18 +60,39 @@ export default {
{ name: '今日点击人数', value: 'clickNum', marker: { symbol: 'line', style: { stroke: '#14C9C9', lineWidth: 12, lineHeight: 8 } } } { name: '今日点击人数', value: 'clickNum', marker: { symbol: 'line', style: { stroke: '#14C9C9', lineWidth: 12, lineHeight: 8 } } }
] ]
}); });
this.chart.tooltip({
showCrosshairs: true,
shared: true,
itemTpl: `<div style="margin-bottom: 10px;list-style:none;">
<span style="background-color:{color};" class="g2-tooltip-marker"></span>
{name}: {value}
</div>`
});
this.chart this.chart
.line() .line()
.position('bizDate*addNum') .position('bizDate*addNum')
.color('#4B74E8'); .color('#4B74E8')
.tooltip('addNum', addNum => {
return {
name: '今日添加人数',
value: addNum
};
});
this.chart this.chart
.line() .line()
.position('bizDate*clickTimes') .position('bizDate*clickTimes')
.tooltip('clickTimes', clickTimes => {
return { name: '今日点击人次', value: clickTimes };
})
.color('#D6B38C'); .color('#D6B38C');
this.chart this.chart
.line() .line()
.position('bizDate*clickNum') .position('bizDate*clickNum')
.tooltip('clickNum', clickNum => {
return { name: '今日点击人数', value: clickNum };
})
.color('#14C9C9'); .color('#14C9C9');
this.chart.removeInteraction('legend-filter'); // 自定义图例，移除默认的分类图例筛选交互 this.chart.removeInteraction('legend-filter'); // 自定义图例，移除默认的分类图例筛选交互
......
src/views/salesleads/components/welcomesItem.vue
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<div class="welcomeTable"> <div class="welcomeTable">
<div class="wtabTop"> <div class="wtabTop">
<el-input class="w260" placeholder="请输入标题" v-model="welcomePage.title" @change="onSearch" clearable></el-input> <el-input class="w260" placeholder="请输入标题" v-model="welcomePage.title" @change="onSearch" clearable></el-input>
<el-button plain class="ylbtn" @click="changeRoute">新建欢迎语</el-button> <el-button plain class="blueBtn" @click="changeRoute">新建欢迎语</el-button>
</div> </div>
<el-table :data="welcomeTableData" max-height="300px"> <el-table :data="welcomeTableData" max-height="300px">
<el-table-column width="55"> <el-table-column width="55">
...@@ -233,10 +233,7 @@ export default { ...@@ -233,10 +233,7 @@ export default {
line-height: 19px; line-height: 19px;
} }
} }
.ylbtn {
border: 1px solid #2f54eb;
color: #2f54eb;
}
.addPic { .addPic {
font-size: 14px; font-size: 14px;
padding-right: 4px; padding-right: 4px;
......
static/css/public.css
...@@ -1441,3 +1441,8 @@ ui调整 ...@@ -1441,3 +1441,8 @@ ui调整
color: #909399; color: #909399;
line-height: 17px; line-height: 17px;
} }
.blueBtn {
border: 1px solid #2f54eb;
color: #2f54eb;
}
\ No newline at end of file
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