Skip to content

M
marketing
Commit 3421b442 by zhangmeng
Options

Merge branch 'master' into dev 

* master:
  修复卡券投放不能选取营销场景的bug
  临时发布 卡券备注名限制改为10

# Conflicts:
#	dist/index.html
#	dist/static/css/app.1d82a5a6816bc5796024ca95599baea5.css
#	dist/static/css/app.234d378a01e3c6e1bda666f27b191ad3.css
#	dist/static/css/app.af066c509331a2c0b6f4d2a253c8d6e6.css
parents 7043c31e 1b05ee89
Showing with 31 additions and 15 deletions
dist.zip 0 → 100644
File added
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.234d378a01e3c6e1bda666f27b191ad3.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.3f18e95f77f4e3e2015f.js></script><script type=text/javascript src=/marketing/static/js/app.0229f0ed4405681a9393.js></script></body></html>
\ No newline at end of file
<<<<<<< HEAD
<!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.234d378a01e3c6e1bda666f27b191ad3.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.3f18e95f77f4e3e2015f.js></script><script type=text/javascript src=/marketing/static/js/app.0229f0ed4405681a9393.js></script></body></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.1d82a5a6816bc5796024ca95599baea5.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.ad484ea676beca0f8899.js></script><script type=text/javascript src=/marketing/static/js/app.43b0b43b0c9faa908da8.js></script></body></html>
>>>>>>> master
dist/static/css/app.1d82a5a6816bc5796024ca95599baea5.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.43b0b43b0c9faa908da8.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/card/card-info.vue
......@@ -14,7 +14,7 @@
</el-form-item>
<el-form-item prop="subName" label="备注名">
<dm-input v-model="form.subName" class="w400" placeholder="请输入备注名称" :disabled="isEdit || isInfo" :maxlength="9"></dm-input>
<dm-input v-model="form.subName" class="w400" placeholder="请输入备注名称" :disabled="isEdit || isInfo" :maxlength="10"></dm-input>
</el-form-item>
<el-form-item prop="subTitle" label="卡券副标题">
......
src/views/card/group-send.vue
......@@ -3,27 +3,29 @@
<div class="dm-form__wrap">
<h3 class="dm-title__label">基础设置</h3>
<el-form-item label="活动名称" prop="putOnName">
<dm-input class="w250" v-model="info.putOnName" :maxlength="9" :disabled="infoFlag"></dm-input>
<dm-input class="w250" v-model="info.putOnName" :maxlength="9" :disabled="isInfo"></dm-input>
</el-form-item>
<el-form-item label="投放卡券">
<el-input class="w250" v-model="info.cardName" disabled></el-input>
</el-form-item>
<el-form-item label="发送时间">
<el-select class="w250" v-model="info.putOnType" :disabled="infoFlag">
<el-select class="w250" v-model="info.putOnType" :disabled="isInfo">
<el-option v-for="(v,i) in putOnTypeOptions" :key="i" :value="v.value" :label="v.label"></el-option>
</el-select>
<el-date-picker :disabled="infoFlag" class="w250" v-if="info.putOnType" v-model="info.putOnTime" type="datetime" placeholder="选择日期时间" align="right" :picker-options="pickerOptions"></el-date-picker>
<el-date-picker :disabled="isInfo" class="w250" v-if="info.putOnType" v-model="info.putOnTime" type="datetime" placeholder="选择日期时间" align="right" :picker-options="pickerOptions"></el-date-picker>
</el-form-item>
<el-form-item label="营销场景">
<span>{{info.sceneSettingName || '--'}}</span>
<el-select class="w250" v-model="info.sceneSettingId" :disabled="isInfo">
<el-option v-for="(v,i) in sceneSettingOptions" :key="i" :value="v.sceneSettingId" :label="v.sceneName"></el-option>
</el-select>
</el-form-item>
</div>
<div class="dm-form__wrap">
<h3 class="dm-title__label">会员设置</h3>
<div class="pb20">
<span class="dm-input_label pr10">选择会员</span>
<el-radio :disabled="infoFlag" v-model="info.memberType" :label="0">会员筛选</el-radio>
<el-radio :disabled="infoFlag" v-model="info.memberType" :label="1">指定会员</el-radio>
<el-radio :disabled="isInfo" v-model="info.memberType" :label="0">会员筛选</el-radio>
<el-radio :disabled="isInfo" v-model="info.memberType" :label="1">指定会员</el-radio>
</div>
<div v-show="!info.memberType">
<vue-gic-people :projectName="projectName" :useId="useId" :hasSearchData="hasSearchData" :sceneValue="sceneValue" ref="peopleFilter" @findFilter="findFilter" @getBackData="getBackData" @editHide= "editHide" @editShow="editShow" @hideBtn="hideBtn"/>
......@@ -35,15 +37,15 @@
<vue-gic-confirm-people v-show="info.memberType" idType="memberId" @get-data="getConfirmData" :list="memberList"></vue-gic-confirm-people>
</div>
<div class="btn-wrap_fixed" :class="{'on':asideShow}">
<el-button v-if="!infoFlag" type="primary" @click="submit('info')">提 交</el-button>
<el-button v-if="!isInfo" type="primary" @click="submit('info')">提 交</el-button>
<el-button @click="$router.go(-1)">返回</el-button>
</div>
</el-form>
</template>
<script>
import { checkPutonMemberIds, saveUpdatePutonCard, getCardPutonDetail } from '@/service/api/cardApi.js'
import { sceneSettingList } from '@/service/api/wechatApi.js'
import { formateDateTimeByType } from '@/utils/index.js'
import { checkPutonMemberIds, saveUpdatePutonCard, getCardPutonDetail } from '@/service/api/cardApi.js';
import { formateDateTimeByType } from '@/utils/index.js';
import { sceneSettingList } from '@/service/api/commonApi.js';
export default {
name: 'card-group',
data () {
......@@ -78,9 +80,10 @@ export default {
rules:{
putOnName:{required:true,message:'活动名称不能为空',trigger:'blur'}
},
sceneSettingOptions:[],
memberList:[],
editFlag:this.$route.meta.type === 'edit',
infoFlag:this.$route.meta.type === 'info',
isInfo:this.$route.meta.type === 'info',
}
},
computed: {
......@@ -90,9 +93,12 @@ export default {
},
created() {
console.log(this.$route.meta.type)
if (this.editFlag || this.infoFlag) {
if (this.editFlag || this.isInfo) {
this.getCardPutonDetail();
}
// if (this.isInfo) {
this.sceneSettingList();
// }
this.$store.commit('mutations_breadcrumb',[{name:'营销管理',path:''},{name:'卡券营销',path:'/card'},{name:'卡券库',path:'/card/list'},{name:'卡券群发',path:''}])
},
methods:{
......@@ -255,7 +261,14 @@ export default {
}
}
})
},
async sceneSettingList() {
let res = await sceneSettingList();
if (res.errorCode === 0) {
this.sceneSettingOptions = res.result || [];
}
}
},
}
</script>
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