Skip to content

M
marketing
Commit 9a3729df by zhangmeng
Options

修改了dm-input

parent 323680af
Showing with 47 additions and 103 deletions
dist/index.html
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" href=./static/img/favicon.ico><title>GIC后台</title><link rel=stylesheet type=text/css href=static/css/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link href=/marketing/static/css/app.72f18b5df0589179b0e8de0c76cdd02b.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/marketing/static/js/manifest.0a85049e489e85ac5f0a.js></script><script type=text/javascript src=/marketing/static/js/vendor.5e217650c1daa1d5040e.js></script><script type=text/javascript src=/marketing/static/js/app.e47379f1a32bc0fe5102.js></script></body></html>
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" href=./static/img/favicon.ico><title>GIC后台</title><link rel=stylesheet type=text/css href=static/css/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link href=/marketing/static/css/app.e19cd365cf7df39002c97015995137cd.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/marketing/static/js/manifest.0a85049e489e85ac5f0a.js></script><script type=text/javascript src=/marketing/static/js/vendor.f8eb9c0e6e65e1972c06.js></script><script type=text/javascript src=/marketing/static/js/app.274637d04922785132e4.js></script></body></html>
\ No newline at end of file
dist/static/js/app.274637d04922785132e4.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.e47379f1a32bc0fe5102.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
src/test/example/static-com.vue
<template>
<div >
<div class="dm-wrap">
<p>dm-input</p>
<dm-input class="w200" type="text" v-model="value" :maxlength="20"></dm-input>
</div>
<div class="dm-wrap">
<p>dm-delete</p>
<dm-delete @confirm="delData(scope.row)" tips="是否删除?">
<el-form class="dm-wrap" ref="form" :model="form" label-width="120px">
<el-form-item label="dm-input">
<p>:byteType="0" 一个汉字算1个字，字母数字1个字</p>
<dm-input class="w200" type="text" v-model="form.inputValue0" :byteType="0" :maxlength="4"></dm-input>
<p>:byteType="1" 一个汉字算1个字，字母数字0.5个字</p>
<dm-input class="w200" type="text" v-model="form.inputValue1" :byteType="1" :maxlength="4"></dm-input>
<p>:byteType="2" 一个汉字算2个字，字母数字1个字</p>
<dm-input class="w200" type="text" v-model="form.inputValue2" :byteType="2" :maxlength="4"></dm-input>
</el-form-item>
<el-form-item label="dm-delete">
<dm-delete @confirm="delData" tips="是否删除?">
<el-button type="text">删除</el-button>
</dm-delete>
</div>
<div class="dm-wrap">
<p>dm-form-item</p>
<el-form :model="form" ref="form" :rules="rules" label-width="80px">
<dm-form-item prop="proName" label="标题" tooltip="这是一段测试文字">
<dm-input class="w200" type="text" v-model="value" :maxlength="20"></dm-input>
</dm-form-item>
</el-form>
</div>
</div>
</el-form-item>
<dm-form-item prop="proName" label="dm-form-item" tooltip="这是一段测试文字">
<dm-input class="w200" type="text" v-model="form.formItemValue" :maxlength="20"></dm-input>
</dm-form-item>
</el-form>
</template>
<script>
......@@ -30,13 +24,18 @@ export default {
data() {
return {
value:'',
form:{},
form:{
inputValue0:'哈哈22',
inputValue1:'哈哈哈22',
inputValue2:'哈22',
formItemValue:''
},
rules:{}
}
},
methods:{
delData(row) {
delData() {
this.$tips({type:'warning',message:'删除成功'});
}
}
......
src/views/card/card-info.vue
......@@ -10,15 +10,15 @@
</el-form-item>
<el-form-item prop="cardName" label="卡券名称">
<dm-input v-model="form.cardName" class="w400" placeholder="请输入卡券名称" :disabled="isEdit || isInfo" :maxlength="9"></dm-input>
<dm-input v-model="form.cardName" class="w400" placeholder="请输入卡券名称" :disabled="isEdit || isInfo" :cn="0" :maxlength="9"></dm-input>
</el-form-item>
<el-form-item prop="subName" label="备注名">
<dm-input v-model="form.subName" class="w400" placeholder="请输入备注名称" :disabled="isEdit || isInfo" :maxlength="10"></dm-input>
<dm-input v-model="form.subName" class="w400" placeholder="请输入备注名称" :disabled="isEdit || isInfo" :cn="1" :maxlength="10"></dm-input>
</el-form-item>
<el-form-item prop="subTitle" label="卡券副标题">
<dm-input v-model="form.subTitle" class="w400" placeholder="请输入卡券副标题" :disabled="isEdit || isInfo" :maxlength="18"></dm-input>
<dm-input v-model="form.subTitle" class="w400" placeholder="请输入卡券副标题" :disabled="isEdit || isInfo" :cn="2" :maxlength="18"></dm-input>
</el-form-item>
<el-form-item prop="erpDemoCode" label="demo券号">
......
src/views/card/partials/card-item.vue
......@@ -13,8 +13,7 @@
<p class="ellipsis-100">有效期：<span v-if="item.cardEffectiveMode !== 0">领取后第{{item.startDay+1}}-{{item.limitDay+item.startDay}}天</span>
<span v-if="item.cardEffectiveMode === 0">{{formateDateTimeByType(item.beginDate,'yyyy-MM-dd')}} 至 {{formateDateTimeByType(item.endDate,'yyyy-MM-dd')}}</span>
</p>
<p class="ellipsis-100">使用条件：
<el-popover placement="top-start" width="200" trigger="hover" :content="item.useCondition | filterUseCondition">
<p class="ellipsis-100">使用条件：<el-popover placement="top-start" width="200" trigger="hover" :content="item.useCondition | filterUseCondition">
<span slot="reference" class="ellipsis-100">{{item.useCondition | filterUseCondition}}</span>
</el-popover>
</p>
......@@ -101,12 +100,12 @@ export default {
var _useCondition = JSON.parse(val)
return (typeof _useCondition.sale_limit === 'undefined' ? ""
: ((typeof _useCondition.sale_limit.fee === 'undefined' ? ""
: "最低消费满" + _useCondition.sale_limit.fee + "；") + (typeof _useCondition.sale_limit.goods === 'undefined' ? ""
: (_useCondition.sale_limit.fee ? ("最低消费满" + _useCondition.sale_limit.fee) : '无最低消费要求') + "；") + (typeof _useCondition.sale_limit.goods === 'undefined' ? ""
: "消费指定商品" + _useCondition.sale_limit.goods + "；")))
+ (typeof _useCondition["goods"] === 'undefined' ? ""
: ((typeof _useCondition.goods.ok === 'undefined' ? ""
: "适用商品（" + _useCondition.goods.ok + ")；") + (typeof _useCondition.goods.no === 'undefined' ? ""
: "不适用商品（" + _useCondition.goods.no + ")；")))
: "适用商品（" + (_useCondition.goods.ok || '无') + ")；") + (typeof _useCondition.goods.no === 'undefined' ? ""
: "不适用商品（" + (_useCondition.goods.no || '无') + ")；")))
+ ((typeof _useCondition.only === 'undefined' || (_useCondition.only == 0)) ? ""
: "不可与其他优惠共享")
}
......
src/views/ecm/addEdit.vue
......@@ -98,32 +98,7 @@ export default {
loading:false,
effectActionOptions:[{value:'subscribe',label:'关注触发'},{value:'authentication',label:'认证触发'}],
// {value:'consume',label:'消费触发'}
dayOptions:[
{value:0,label:'0:00'},
{value:1,label:'1:00'},
{value:2,label:'2:00'},
{value:3,label:'3:00'},
{value:4,label:'4:00'},
{value:5,label:'5:00'},
{value:6,label:'6:00'},
{value:7,label:'7:00'},
{value:8,label:'8:00'},
{value:9,label:'9:00'},
{value:10,label:'10:00'},
{value:11,label:'11:00'},
{value:12,label:'12:00'},
{value:13,label:'13:00'},
{value:14,label:'14:00'},
{value:15,label:'15:00'},
{value:16,label:'16:00'},
{value:17,label:'17:00'},
{value:18,label:'18:00'},
{value:19,label:'19:00'},
{value:20,label:'20:00'},
{value:21,label:'21:00'},
{value:22,label:'22:00'},
{value:23,label:'23:00'},
],
dayOptions:Array(24).fill().map((v,i) =>({value:i,label:i+':00'})),
sceneSettingIdOptions:[],
form:{
ecmPlanName:'',
......@@ -208,23 +183,18 @@ export default {
},
// 显示编辑,保存按钮隐藏,确认按钮显示 (子组件会调用)
editShow() {
var that = this
console.log('editShow')
that.toggleTag = true
that.saveTag = false
this.toggleTag = true
this.saveTag = false
},
// 显示保存按钮,隐藏确认按钮显示 (子组件会调用)
editHide() {
var that = this
console.log('editHide')
that.toggleTag = false
that.saveTag = true
this.toggleTag = false
this.saveTag = true
},
// 隐藏保存按钮和确认按钮 (子组件会调用)
hideBtn() {
var that = this
that.toggleTag = false;
that.saveTag = false
this.toggleTag = false;
this.saveTag = false
},
async sceneSettingList() {
let res = await sceneSettingList();
......@@ -273,32 +243,6 @@ export default {
this.ecmPlanId = res.result.templateEcmPlanId || '';
}
},
//提交表单验证人数 只有人员筛选需要
// async checkMessageSendCount() {
// if (this.form.effectType) {
// const params = {
// memberSearchDTO:this.form.memberSearchDTO
// }
// const res = await checkMessageSendCount(params);
// if (res.errorCode === 0) {
// let msg = `合计发送${res.result}人，是否发送?`
// if (this.form.marketingType === 'message') {
// msg = `合计发送${res.result}人，短信按67字/条分割成多条并按条计费，请注意控制短信文本长度，是否发送?`
// }
// this.$confirm(msg,'提示', {
// confirmButtonText: '确定',
// cancelBUttonText: '取消',
// type: 'warning'
// }).then(() => {
// this.saveEcmInfo();
// }).catch(() => {
// this.$tips({type: 'info',message: '已取消发送'});
// });
// }
// } else {
// this.saveEcmInfo();
// }
// },
//提交保存
submit (formName) {
if(this.checkBeginEndTime()) return;
......
src/views/ecm/marketing-event/index.vue
<template>
<section class="dm-marketing">
<!-- 操作区 -->
<div class="dm-marketing__opt--wrap">
<div class="dm-marketing__opt--wrap" v-if="list.length === 0">
<span class="dm-marketing__opt--label">添加内容</span>
<i class="el-icon-plus dm-marketing__opt--icon" @click="optTopShow = !optTopShow"></i>
<transition name="fade">
......@@ -23,10 +23,12 @@
</div>
</div>
</div>
<i class="el-icon-plus dm-marketing__opt--icon--bottom" v-if="list.length && list.length < maxEventCount" @click="optShow = !optShow"></i>
<transition name="fade">
<opt @addItem="addItem" :options="options" v-if="list.length && list.length < maxEventCount && optShow" style="margin:20px 0 0 15px;"></opt>
</transition>
<div class="dm-marketing__opt--wrap" @mouseleave="optShow = false">
<i class="el-icon-plus dm-marketing__opt--icon--bottom" v-if="list.length && list.length < maxEventCount" @mouseover="optShow = true"></i>
<transition name="fade">
<opt @addItem="addItem" :options="options" v-if="list.length && list.length < maxEventCount && optShow" style="margin:20px 0 0 15px;"></opt>
</transition>
</div>
<!-- 弹窗组件 -->
<component :is="dialogCom" @sendItem="saveToList" :item="currentItem" :show.sync="dialogShow"></component>
</section>
......
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