Skip to content

M
marketing
Commit 47750f4d by zhangmeng
Options

新增门店选择组件

parent dc74a613
Showing with 83 additions and 49 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.fde2c0616f5f7d9da0da4a2c463012ee.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.6b464a5bf69f693bb00d.js></script><script type=text/javascript src=/marketing/static/js/app.2f0a9078f57d17746a8d.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.af066c509331a2c0b6f4d2a253c8d6e6.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.5921f5fa7fb6df700852.js></script></body></html>
\ No newline at end of file
index.html
......@@ -3,6 +3,7 @@
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<!-- <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests"> -->
<link rel="shortcut icon" href="./static/img/favicon.ico">
<title>GIC后台</title>
<link rel="stylesheet" type="text/css" href="static/css/iconfont.css">
......
package.json
......@@ -21,6 +21,7 @@
"packele": "^1.0.5",
"scriptjs": "^2.5.8",
"tinymce": "^4.8.2",
"uuid": "^3.3.2",
"v-charts": "^1.17.8",
"viser-vue": "^2.2.5",
"vue": "^2.5.2",
......
src/assets/style/base/index.scss
......@@ -130,6 +130,7 @@
height: 60px;
border-radius: 4px;
margin-right:8px;
display: inline-block;
}
.fw500 {
......
src/main.js
......@@ -21,11 +21,10 @@ import vueGicPeople from '@gic-test/vue-gic-people'
import vueGicConfirmPeople from '@gic-test/vue-gic-confirm-people/src/lib'
import packele from 'packele'
import preview from 'vue-photo-preview/src/lib/index.js'
import 'vue-photo-preview/dist/skin.css'
// import preview from 'vue-photo-preview/src/lib/index.js'
// import 'vue-photo-preview/dist/skin.css'
// Vue.use(preview)
Vue.config.productionTip = false
Vue.use(preview)
Vue.use(packele)
Vue.use(ElementUI)
Vue.use(vueGicHeader)
......
src/router/routes.js
......@@ -5,6 +5,7 @@ import page404 from '@/views/error/404'
import page500 from '@/views/error/500'
import test from '@/test'
import staticCom from '@/test/static-com'
......@@ -80,6 +81,6 @@ export default [
path: '/staticcom',
name: '测试组件',
component: staticCom
}
},
]
src/test/dmStore/index.vue
<template>
<section class="dm-store clearfix">
<el-select v-model="leftValue" placeholder="请选择" class="w200 fl">
<section class="dm-store">
<el-select v-model="leftValue" placeholder="请选择" class="w200 inline-block">
<el-option v-for="(v,i) in leftList" :key="i" :label="v.label" :value="v.value"></el-option>
</el-select>
<com-type v-show="leftValue === 1" ref="typeRef" :checked="typeList" @get-emit="emitTypeList"></com-type>
<com-area v-show="leftValue === 3"></com-area>
<el-checkbox :indeterminate="true" v-model="checkAll">全选</el-checkbox>
<el-checkbox :indeterminate="false" v-model="checkAll">全选</el-checkbox>
<el-checkbox :indeterminate="false" v-model="checkTrue">全选</el-checkbox>
<com-type v-if="leftValue === 1" :uuid="newUuid"></com-type>
<com-tags v-if="leftValue === 2" :uuid="newUuid"></com-tags>
<com-area v-if="leftValue === 3" :uuid="newUuid"></com-area>
<com-group v-if="leftValue === 4" :uuid="newUuid"></com-group>
<com-part v-if="leftValue === 5" :uuid="newUuid"></com-part>
</section>
</template>
<script>
import comType from './com-type';
import comArea from './com-area';
import comType from './partials/com-type';
import comArea from './partials/com-area';
import comTags from './partials/com-tags';
import comPart from './partials/com-part';
import comGroup from './partials/com-group';
import uuidv1 from 'uuid/v1';
import qs from 'qs';
import { baseUrl } from './config';
export default {
name:'dm-store',
name:'vue-gic-store-new',
props:{
uuid:{
type:String,
default:''
}
},
components:{
'com-type':comType,
'com-area':comArea
'com-area':comArea,
'com-tags':comTags,
'com-part':comPart,
'com-group':comGroup
},
data() {
return {
leftValue:3, // 一级选择值
leftValue:0, // 一级选择值
leftList:[ // 一级列表
{label:'所有门店',value:0},
{label:'门店类型',value:1},
......@@ -32,35 +46,36 @@ export default {
{label:'门店分组',value:4},
{label:'部分门店',value:5}
],
typeList:[0,1], // 选中的门店类型
isIndeterminate:true,
checkAll:false,
checkTrue:true
newUuid:uuidv1().replace(/-/g,'') // 生成uuid
}
},
created() {
setTimeout(v => {
this.typeList = [
0,1,2,3
]
this.$nextTick(_ => {
this.$refs.typeRef.init();
})
},3000)
this.init();
},
methods:{
emitTypeList(val) {
console.log(val)
// this.typeList = val;
},
test() {
this.checkAll = !this.checkAll
// 获取配置项
init() {
this.newUuid = this.uuid || this.newUuid;
if (!this.uuid) {
this.$emit('update:uuid',this.newUuid);
} else {
let params = {
key:this.newUuid,
currentPage:1,
pageSize:20
}
this.axios.post(baseUrl + '/api-plug/get-store-widget-config?requestProject=gic-web',qs.stringify(params)).then(res => {
this.comList = res.data.result.config.result || [];
this.leftValue = res.data.result.selectType || 0;
}).catch(err => {
console.log(err)
})
}
}
}
}
</script>
<style lang="scss">
@import url('./index.scss');
@import url('./index.css');
</style>
src/test/index.vue
<template>
<div>
<div>
<dm-store style="padding:20px;"></dm-store>
<p>新版门店</p>
<vue-gic-store-new style="padding:20px;" :uuid="uuid"></vue-gic-store-new>
</div>
<div>
<p>新版卡券门店</p>
<vue-gic-store-card style="padding:20px;" :uuid="uuid"></vue-gic-store-card>
</div>
<div>
<p>老版门店</p>
<vue-gic-store-linkage style="padding:20px;" :msg="sendChildData"></vue-gic-store-linkage>
</div>
</div>
</template>
<script>
import dmStore from './dmStore';
import Vue from 'vue';
import gicStoreNew from './dmStore/index.js';
import { gicStoreCard } from './dmStore/index.js';
// import gicStoreNew from '@gic-test/vue-gic-store-new';
// import { gicStoreCard } from '@gic-test/vue-gic-store-new';
Vue.use(gicStoreNew)
Vue.use(gicStoreCard)
export default {
components:{
'dm-store':dmStore
},
data() {
return {
uuid:'',
sendChildData:{
storeType:0,
storeGroupIds:'',
......
src/views/card/cardInfo.js
......@@ -222,6 +222,7 @@ export default {
list.push(JSON.parse(v));
})
}
this.sendChildData.storeIds = list;
this.form.image = {
......
src/views/card/group-send.vue
......@@ -177,7 +177,7 @@ export default {
// this.$tips({type:'warning',message:'投放人数不能大于1000'});
// return ;
// }
this.$confirm(`合计发送${sumPerson}人，存在已投放过该卡券的会员${reducePerson}人，是否剔除这些会员并发送？`, '提示', {
this.$confirm(`合计发送${sumPerson}人，是否发送？`, '提示', {
confirmButtonText: '确定',
cancelBUttonText: '取消',
type: 'warning'
......
src/views/wechat/record.vue
......@@ -2,7 +2,7 @@
* @Author: zhangmeng
* @Date: 2018-08-14 15:45:36
* @Last Modified by: zhangmeng
* @Last Modified time: 2018-10-23 15:34:32
* @Last Modified time: 2018-10-24 20:57:29
*/
<template>
<section class="dm-wrap">
......@@ -33,7 +33,7 @@
</div>
</template>
</el-table-column>
<el-table-column label="操作" align="left" width="160px" fixed="right">
<el-table-column label="操作" align="left" width="180px" fixed="right">
<template slot-scope="scope" >
<el-button type="text" v-if="scope.row.contentType === 0 && scope.row.sendStatus === 1 && scope.row.couponType === 1" @click="queryData(scope.row)">数据</el-button>
<dm-delete @confirm="delData(scope.row)" tips="是否删除该发送记录?">
......
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