Skip to content

M
marketing
Commit 056369ae by zhangmeng
Options

add:卡券门店组件调整

parent 70b1dc09
Showing with 250 additions and 249 deletions
dist.zip
No preview for this file type
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.7e5924ccbe59110f3fcdb16aaddb4de4.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.0d0cf2dff971ab70b0c0.js></script><script type=text/javascript src=/marketing/static/js/app.0996aec4e6bad96a0744.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.0f5e134289ef300afd562176f1a625a4.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.779f07208635c5c1ba1d.js></script><script type=text/javascript src=/marketing/static/js/app.1df20c7a3170c421e892.js></script></body></html>
\ No newline at end of file
dist/static/js/app.0996aec4e6bad96a0744.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.1df20c7a3170c421e892.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
package-lock.json
......@@ -360,9 +360,9 @@
}
},
"@gic-test/vue-gic-header": {
"version": "1.4.1",
"resolved": "http://www.gicdev.com:7001/@gic-test/vue-gic-header/download/@gic-test/vue-gic-header-1.4.1.tgz",
"integrity": "sha1-Q/+l6KNeOfMpw/K4TAHex+p0vl8=",
"version": "1.4.2",
"resolved": "http://www.gicdev.com:7001/@gic-test/vue-gic-header/download/@gic-test/vue-gic-header-1.4.2.tgz",
"integrity": "sha1-waBkoKJo/e5FTNMmkmZqAwnvyfc=",
"requires": {
"axios": "^0.18.0",
"vue": "^2.5.11"
......@@ -447,9 +447,9 @@
}
},
"@gic-test/vue-gic-store-new": {
"version": "1.3.1",
"resolved": "http://www.gicdev.com:7001/@gic-test/vue-gic-store-new/download/@gic-test/vue-gic-store-new-1.3.1.tgz",
"integrity": "sha1-LnxE2Et4r3i9Li37ndSULpIZ5q0=",
"version": "1.3.2",
"resolved": "http://www.gicdev.com:7001/@gic-test/vue-gic-store-new/download/@gic-test/vue-gic-store-new-1.3.2.tgz",
"integrity": "sha1-vDRAmsy39B40ilagP41H4eBvglE=",
"requires": {
"axios": "^0.18.0",
"qs": "^6.5.2",
......
src/router/routes.js
......@@ -4,7 +4,7 @@ import page403 from '@/views/error/403';
import page404 from '@/views/error/404';
import page500 from '@/views/error/500';
// import test from './modules/test'
import test from './modules/test'
//微信营销
import wechat from './modules/wechat';
......@@ -54,6 +54,6 @@ export default [
path: '*',
name: '未知领域',
component: page404
}
// test
},
test
];
src/test/component/dmStore/index.css
......@@ -13,7 +13,7 @@
}
.w240 {
width: 240px;
width: 240px!important;
}
.vertical-middle {
......
src/test/component/dmStore/index.js
import storeNew from "./index.vue";
import storeCard from "./store-card.vue";
import storeGroup from "./store-group.vue";
import storeCard from "./card.vue";
import storeGroup from "./group.vue";
const gicStoreNew = {
install(Vue, options) {
Vue.component(storeNew.name, storeNew)
Vue.component(storeNew.name, storeNew)
}
}
if (typeof window !== 'undefined' && window.Vue) {
......@@ -12,10 +12,9 @@ if (typeof window !== 'undefined' && window.Vue) {
}
export default gicStoreNew;
export const gicStoreCard = {
install(Vue, options) {
Vue.component(storeCard.name, storeCard)
Vue.component(storeCard.name, storeCard)
}
}
if (typeof window !== 'undefined' && window.Vue) {
......@@ -24,7 +23,7 @@ if (typeof window !== 'undefined' && window.Vue) {
export const gicStoreGroup = {
install(Vue, options) {
Vue.component(storeGroup.name, storeGroup)
Vue.component(storeGroup.name, storeGroup)
}
}
if (typeof window !== 'undefined' && window.Vue) {
......
src/test/component/dmStore/index.vue
......@@ -20,48 +20,56 @@ import optionArea from './options/option-area';
import optionTags from './options/option-tags';
import optionGroup from './options/option-group';
import optionPart from './options/option-part';
const leftList = [{label:'所有门店',value:0},
{label:'门店类型',value:1},
{label:'门店标签',value:2},
{label:'门店区域',value:3},
{label:'门店分组',value:4},
{label:'部分门店',value:5}
];
const typeList = [{label:'自营',value:'0'},
{label:'联营',value:'1'},
{label:'代理',value:'2'},
{label:'代销',value:'3'},
{label:'托管',value:'4'}];
const leftList = [
{ label: '所有门店', value: 0 },
{ label: '门店类型', value: 1 },
{ label: '门店标签', value: 2 },
{ label: '门店区域', value: 3 },
{ label: '门店分组', value: 4 },
{ label: '部分门店', value: 5 }
];
const typeList = [
{ label: '自营', value: '0' },
{ label: '联营', value: '1' },
{ label: '代理', value: '2' },
{ label: '代销', value: '3' },
{ label: '托管', value: '4' }];
export default {
name:'vue-gic-store-new',
props:{
uuid:{
type:String,
default:''
name: 'vue-gic-store-new',
props: {
uuid: {
type: String,
default: ''
},
options: {
type:Array,
type: Array,
default() {
return [0,1,2,3,4,5]
return [0, 1, 2, 3, 4, 5];
}
},
isAdd:{
isAdd: {
type: Boolean,
default: true
},
flag:{
type:Boolean,
default:true
default:false
}
},
components:{
'option-type':optionType,
'option-area':optionArea,
'option-tags':optionTags,
'option-group':optionGroup,
'option-part':optionPart
components: {
'option-type': optionType,
'option-area': optionArea,
'option-tags': optionTags,
'option-group': optionGroup,
'option-part': optionPart
},
watch:{
watch: {
storeType(val) {
if (!val) {
this.$emit('update:uuid',this.cacheUuid);
// debugger;
this.isSendCache = true;
this.saveInit(this.isSendCache);
}
},
......@@ -75,41 +83,44 @@ export default {
},
isSendCache(val) {
console.log(val)
if (val) {
this.$emit('update:uuid',this.cacheUuid);
this.$nextTick(_=> {
console.log(this.uuid)
})
}
}
},
data() {
return {
storeType:0, // 一级选择值
leftList:[],
storeType: 0, // 一级选择值
leftList: [],
// 创建一个新的uuid
newUuid:uuidv1().replace(/-/g,''),
newUuid: uuidv1().replace(/-/g,''),
// 编辑情况下的备份id
cacheUuid:uuidv1().replace(/-/g,''), // 生成uuid
cacheUuid: uuidv1().replace(/-/g,''), // 生成uuid
// 编辑的情况下是否发送备份ID
isSendCache:false,
}
isSendCache: false
};
},
created() {
console.log(this.isAdd)
if (this.options instanceof Array) {
leftList.map( v => {
if (this.options.indexOf(v.value) >= 0) {
this.leftList.push(v);
}
})
});
}
this.init();
if (!this.flag) {
this.init();
} else {
this.newUuid = this.uuid;
// 这里保存备份id
this.saveInit(true);
if (this.newUuid) {
this.getStoreConfig();
}
}
},
methods:{
methods: {
// 获取配置项
init() {
this.storeType = 0;
......@@ -118,18 +129,18 @@ export default {
2 并传给父级
3 保存
*/
debugger;
if (this.isAdd) {
this.$emit('update:uuid',this.newUuid);
// 这是保存新的id
this.saveInit();
}
/*如果有uuid的情况下
1 创建一个新的uuid备用 newUUid
2 保存 一下这个新的uuid
3 用父级传来的uuid获取配置项
*/
else {
this.saveInit();
} else {
/*如果有uuid的情况下
*1 创建一个新的uuid备用 newUUid
*2 保存 一下这个新的uuid
*3 用父级传来的uuid获取配置项
*/
this.newUuid = this.uuid;
// 这里保存备份id
this.saveInit(true);
......@@ -142,10 +153,10 @@ export default {
getStoreConfig() {
return new Promise((resolve,reject) => {
let params = {
key:this.isAdd?this.newUuid:(this.isSendCache?this.cacheUuid:this.uuid),
currentPage:1,
pageSize:20
}
key: this.isAdd ? this.newUuid : (this.isSendCache ? this.cacheUuid : this.uuid),
currentPage: 1,
pageSize: 20
};
this.axios.post(baseUrl + '/api-plug/get-store-widget-config?requestProject=gic-web',qs.stringify(params)).then(res => {
if (res.data.errorCode === 0) {
this.storeType = res.data.result.selectType || 0;
......@@ -155,67 +166,66 @@ export default {
if (this.storeType === 1) {
list.map(v => {
typeList.map(w => {
if (v.id == w.value) {
computedList.push({id:v.id,name:w.label})
if (v.id === w.value) {
computedList.push({ id: v.id, name: w.label });
}
})
})
});
});
}
leftList.map(v => {
if (this.storeType === v.value) {
name = v.label;
}
})
resolve({list:this.storeType === 1?computedList:list,type:res.data.result.selectType || 0,name:name});
});
resolve({ list: this.storeType === 1 ? computedList : list, type: res.data.result.selectType || 0, name: name });
} else {
reject('接口错误');
reject(new Error('接口错误'));
}
}).catch(err => {
reject(err);
console.log(err)
})
})
console.log(err);
});
});
},
// 保存
saveInit(isCacheUuid = false) {
let params = {
selectType:0,
key:isCacheUuid?this.cacheUuid:this.newUuid,
isAll:0,
value:'',
removeItems:'',
isClique:0
selectType: 0,
key: isCacheUuid ? this.cacheUuid : this.newUuid,
isAll: 0,
value: '',
removeItems: '',
isClique: 0
};
this.axios.post(baseUrl + '/api-plug/save-store-widget?requestProject=gic-web',qs.stringify(params)).then(res => {
}).catch(err => {
console.log(err)
})
console.log(err);
});
},
// 判断门店是否保存
// 判断门店是否保存
isStoreSave() {
return new Promise((resolve,reject) => {
let params = {
key:this.isAdd?this.newUuid:(this.isSendCache?this.cacheUuid:this.uuid),
selectType:this.storeType
}
key: this.isAdd ? this.newUuid : (this.isSendCache ? this.cacheUuid : this.uuid),
selectType: this.storeType
};
if (params.selectType === 0) {
resolve(true);
}
this.axios.post(baseUrl + '/api-plug/is-empty?requestProject=gic-web',qs.stringify(params)).then(res => {
console.log(res);
if (res.data.errorCode === 0) {
resolve(res.data.result);
} else {
reject(new Error('系统错误'));
}
}).catch(err => {
reject(new Error('系统错误'));
})
})
},
}).catch( err => {
console.log(err);
});
});
}
}
}
};
</script>
<style lang="scss">
......
src/test/component/dmStore/options/option-area.vue
......@@ -114,7 +114,7 @@ export default {
console.log(this.uuid,this.cacheUuid);
},
methods:{
methods: {
// 获取树形结构
async getAreaTree() {
let res = await this.axios.get(baseUrl + '/api-plug/dict-district-tree?requestProject=gic-web')
......@@ -241,7 +241,7 @@ export default {
// 把老数据拷贝到新的临时id上
copyStoreWidget() {
this.axios.get(baseUrl + '/api-plug/copy-store-widget?requestProject=gic-web&oldKey='+this.uuid+'&newKey='+this.cacheUuid).then(res => {
if(res.data.errorCode === 0) {
if (res.data.errorCode === 0) {
console.log('拷贝成功');
}
})
......@@ -249,4 +249,3 @@ export default {
}
}
</script>
src/test/component/dmStore/options/option-group.vue
......@@ -50,7 +50,7 @@
</div>
<!-- 操作按钮 -->
<div class="dm-store__btn">
<el-button class="dm-store__btn--cancel" type="text" @click="popoverShow = false">关 闭</el-button>
<el-button class="dm-store__btn--cancel" type="text" @click="popoverShow = false">确 定</el-button>
</div>
</el-popover>
</template>
......
src/test/component/dmStore/options/option-part.vue
......@@ -57,7 +57,7 @@
</div>
<!-- 操作按钮 -->
<div class="dm-store__btn">
<el-button class="dm-store__btn--cancel" type="text" @click="popoverShow = false">关 闭</el-button>
<el-button class="dm-store__btn--cancel" type="text" @click="popoverShow = false">确 定</el-button>
</div>
</el-popover>
</template>
......
src/test/component/dmStore/options/option-tags.vue
......@@ -44,15 +44,13 @@
<span class="gray-color dm-store__inputtag--tips" v-show="rightList.length === 0">请选择门店</span>
</div>
<el-popover placement="top-start" popper-class="select-shop__popper" width="300" trigger="hover">
<el-tag class="dm-store__total--tag" v-for="v in rightList" :key="v.id" @close="deleteRightItems(v.id)" closable>
{{v.name}}
</el-tag>
<el-tag class="dm-store__total--tag" v-for="v in rightList" :key="v.id" @close="deleteRightItems(v.id)" closable>{{v.name}}</el-tag>
<span slot="reference" class="dm-store__inputtag--total" v-show="rightList.length">共{{params.isAll?rightTotal:rightList.length}}项</span>
</el-popover>
</el-popover>
</div>
<!-- 操作按钮 -->
<div class="dm-store__btn">
<el-button class="dm-store__btn--cancel" type="text" @click="popoverShow = false">关 闭</el-button>
<el-button class="dm-store__btn--cancel" type="text" @click="popoverShow = false">确 定</el-button>
</div>
</el-popover>
</template>
......@@ -60,57 +58,57 @@
import qs from 'qs';
import { baseUrl } from '../config';
export default {
name:'options-tags',
props:{
uuid:{
type:String,
default:''
name: 'options-tags',
props: {
uuid: {
type: String,
default: ''
},
cacheUuid:{
type:String,
default:''
cacheUuid: {
type: String,
default: ''
},
isAdd:{
type:Boolean,
default:true
isAdd: {
type: Boolean,
default: true
},
isCache:{
type:Boolean,
default:false
isCache: {
type: Boolean,
default: false
}
},
data() {
return {
popoverShow:false,
leftList:[],
rightList:[],
leftValue:'',
rightValue:'',
leftCheckList:[],
rightCheckList:[],
params:{
selectType:2, // 是 int 下拉选择项
key:'', // 是 string 32位唯一值
isAll:0, // 是 int 是否勾选全部 1是 0否
value:'', //否 string isAll=0时，必填，选中项id，多个逗号分隔
removeItems:'', //否 string isAll=1，取消选中项的id，多个逗号分隔
isClique:0
popoverShow: false,
leftList: [],
rightList: [],
leftValue: '',
rightValue: '',
leftCheckList: [],
rightCheckList: [],
params: {
selectType: 2, //下拉选择项
key: '', //32位唯一值
isAll: 0, //是否勾选全部 1是 0否
value: '', //isAll=0时，必填，选中项id，多个逗号分隔
removeItems: '', //否isAll=1，取消选中项的id，多个逗号分隔
isClique: 0
},
rightParams:{
key:this.uuid,
selectType:2,
search:this.rightValue,
currentPage:1,
pageSize:20
rightParams: {
key: this.uuid,
selectType: 2,
search: this.rightValue,
currentPage: 1,
pageSize: 20
},
rightHoverIndex:null,
rightTotal:0,
leftTotal:0,
moreShow:false,
moreLoading:false
}
rightHoverIndex: null,
rightTotal: 0,
leftTotal: 0,
moreShow: false,
moreLoading: false
};
},
computed:{
computed: {
computedLeftCount() {
if (this.params.isAll) {
let minuend = this.leftList.length - this.leftCheckList.length;
......@@ -130,22 +128,22 @@ export default {
}
console.log(this.uuid,this.cacheUuid);
},
methods:{
methods: {
// 右侧搜索
rightSearch() {
this.rightParams.currentPage = 1;
this.getRightList().then(res => {
this.rightList = res;
})
});
},
// 拉取左侧数据
getLeftList() {
this.axios.get(baseUrl + '/api-plug/tag-list?requestProject=gic-web&search='+this.leftValue).then(res => {
this.axios.get(baseUrl + '/api-plug/tag-list?requestProject=gic-web&search=' + this.leftValue).then(res => {
this.leftList = res.data.result.result || [];
this.leftTotal = res.data.result.totalCount || 0;
}).catch(err => {
console.log(err)
})
console.log(err);
});
},
// 拉取右侧数据
getRightList() {
......@@ -170,13 +168,13 @@ export default {
}
}).catch(err => {
reject(new Error('获取列表错误'));
console.log(err)
console.log(err);
});
})
},
// 左侧数据移动到右侧
saveToRight() {
this.params.key = this.isAdd ? this.uuid: this.cacheUuid;
this.params.key = this.isAdd ? this.uuid : this.cacheUuid;
if (this.params.isAll) {
this.params.removeItems = this.leftList.filter(v => {
return this.leftCheckList.indexOf(v.tagId) < 0;
......@@ -184,7 +182,7 @@ export default {
} else {
this.params.value = this.leftCheckList.join(',');
if (!this.params.value) {
this.$message({type:"warning",message:"门店选择不能为空"});
this.$message({ type: "warning", message: "门店选择不能为空" });
return;
}
}
......@@ -196,15 +194,15 @@ export default {
this.$nextTick(_ => {
this.getRightList().then(res => {
this.rightList = res;
})
});
})
}).catch(err => {
console.log(err)
})
console.log(err);
});
},
// 删除右侧全部
deleteRightAll() {
this.axios.get(baseUrl + '/api-plug/remove-allitems?requestProject=gic-web&key=' + (this.isAdd ? this.uuid: this.cacheUuid)).then(res => {
this.axios.get(baseUrl + '/api-plug/remove-allitems?requestProject=gic-web&key=' + (this.isAdd ? this.uuid : this.cacheUuid)).then(res => {
if (res.data.errorCode === 0) {
if (!this.isAdd) {
this.$emit('update:isCache',true);
......@@ -213,23 +211,22 @@ export default {
this.$nextTick(_ => {
this.getRightList().then(res => {
this.rightList = res;
})
})
});
});
} else {
this.$message({type:'error',message:'清除全部失败'});
this.$message({ type: 'error', message: '清除全部失败' });
}
}).catch(err => {
console.log(err)
})
console.log(err);
});
},
// 删除右侧单选或者多选数据
deleteRightItems(item) {
let params = {
key:this.isAdd ? this.uuid : this.cacheUuid,
removeItems:item || this.rightCheckList.join(',')
}
key: this.isAdd ? this.uuid : this.cacheUuid,
removeItems: item || this.rightCheckList.join(',')
};
console.log(this.isAdd,this.uuid ,this.cacheUuid,this.deleteRightItems);
// return;
// debugger;
......@@ -242,11 +239,11 @@ export default {
this.$nextTick(_ => {
this.getRightList().then(res => {
this.rightList = res;
})
});
this.rightCheckList = [];
})
});
}).catch(err => {
console.log(err)
console.log(err);
})
},
// 选中所有数据
......@@ -260,19 +257,18 @@ export default {
if (res instanceof Array) {
res.map(v => {
this.rightList.push(v);
})
});
}
})
});
},
// 把老数据拷贝到新的临时id上
copyStoreWidget() {
this.axios.get(baseUrl + '/api-plug/copy-store-widget?requestProject=gic-web&oldKey='+this.uuid+'&newKey='+this.cacheUuid).then(res => {
if(res.data.errorCode === 0) {
this.axios.get(baseUrl + '/api-plug/copy-store-widget?requestProject=gic-web&oldKey=' + this.uuid + '&newKey=' + this.cacheUuid).then(res => {
if (res.data.errorCode === 0) {
console.log('拷贝成功');
}
})
});
}
}
}
};
</script>
src/test/component/dmStore/options/option-type.vue
......@@ -13,12 +13,12 @@
</div>
<el-popover placement="top-start" popper-class="select-shop__popper" width="300" trigger="hover">
<el-tag v-for="(v,i) in checkedList" class="dm-store__total--tag" size="small" :key="i" closable @close="delItem(v)">{{filterLabel(v)}}</el-tag>
<span slot="reference" class="dm-store__inputtag--total" v-show="checkedList.length">共{{checkedList.length}}项</span>
</el-popover>
<span slot="reference" class="dm-store__inputtag--total" v-show="checkedList.length">共{{checkedList.length}}项</span>
</el-popover>
</div>
<!-- 操作按钮 -->
<div class="dm-store__btn">
<el-button class="dm-store__btn--cancel" type="text" @click="popoverShow = false">关 闭</el-button>
<el-button class="dm-store__btn--cancel" type="text" @click="popoverShow = false">确 定</el-button>
</div>
</el-popover>
</template>
......@@ -26,23 +26,23 @@
import qs from 'qs';
import { baseUrl } from '../config';
export default {
name:'options-type',
props:{
uuid:{
type:String,
default:''
name: 'options-type',
props: {
uuid: {
type: String,
default: ''
},
cacheUuid:{
type:String,
default:''
cacheUuid: {
type: String,
default: ''
},
isAdd:{
type:Boolean,
default:true
isAdd: {
type: Boolean,
default: true
},
isCache:{
type:Boolean,
default:false
isCache: {
type: Boolean,
default: false
}
},
created() {
......@@ -54,26 +54,26 @@ export default {
},
data() {
return {
typeList:[
{label:'自营',value:'0'},
{label:'联营',value:'1'},
{label:'代理',value:'2'},
{label:'代销',value:'3'},
{label:'托管',value:'4'},
],
checkedList:[],
popoverShow:false,
params:{
selectType:1, // 是 int 下拉选择项
key:'', // 是 string 32位唯一值
isAll:0, // 是 int 是否勾选全部 1是 0否
value:'', //否 string isAll=0时，必填，选中项id，多个逗号分隔
removeItems:'', //否 string isAll=1，取消选中项的id，多个逗号分隔
isClique:0
},
}
typeList: [
{ label: '自营', value: '0' },
{ label: '联营', value: '1' },
{ label: '代理', value: '2' },
{ label: '代销', value: '3' },
{ label: '托管', value: '4' }
],
checkedList: [],
popoverShow: false,
params: {
selectType: 1, //下拉选择项
key: '', // 32位唯一值
isAll: 0, //是否勾选全部 1是 0否
value: '', //isAll=0时，必填，选中项id，多个逗号分隔
removeItems: '', //isAll=1，取消选中项的id，多个逗号分隔
isClique: 0
}
};
},
methods:{
methods: {
// label 的filter
filterLabel(val) {
let result = '';
......@@ -87,26 +87,26 @@ export default {
// 拉取右侧数据
getRightList() {
let params = {
key:this.isCache ? this.cacheUuid : this.uuid,
selectType:1,
search:'',
currentPage:1,
pageSize:20
}
key: this.isCache ? this.cacheUuid : this.uuid,
selectType: 1,
search: '',
currentPage: 1,
pageSize: 20
};
this.axios.post(baseUrl + '/api-plug/list-right-data?requestProject=gic-web',qs.stringify(params)).then(res => {
if (res.data.errorCode === 0) {
this.checkedList = ((res.data.result && res.data.result.result) || []).map(v => v.id);
}
}).catch(err => {
console.log(err)
console.log(err);
})
},
// 保存
saveToRight() {
this.params.key = this.isAdd ? this.uuid: this.cacheUuid;
this.params.key = this.isAdd ? this.uuid : this.cacheUuid;
this.params.value = this.checkedList.join(',');
if (!this.params.value) {
this.$message({type:"warning",message:"门店选择不能为空"});
this.$message({ type: "warning", message: "门店选择不能为空" });
return;
}
this.axios.post(baseUrl + '/api-plug/save-store-widget?requestProject=gic-web',qs.stringify(this.params)).then(res => {
......@@ -121,12 +121,12 @@ export default {
// 删除右侧单选或者多选数据
delItem(v) {
let params = {
key:this.isAdd ? this.uuid : this.cacheUuid,
removeItems:v,
value:''
}
console.log(this.isAdd,this.uuid ,this.cacheUuid)
this.axios.post(baseUrl + '/api-plug/remove-items?requestProject=gic-web',qs.stringify(params)).then(res => {
key: this.isAdd ? this.uuid : this.cacheUuid,
removeItems: v,
value: ''
};
console.log(this.isAdd, this.uuid, this.cacheUuid)
this.axios.post(baseUrl + '/api-plug/remove-items?requestProject=gic-web', qs.stringify(params)).then(res => {
if (!this.isAdd) {
this.$emit('update:isCache',true);
}
......@@ -139,13 +139,12 @@ export default {
},
// 把老数据拷贝到新的临时id上
copyStoreWidget() {
this.axios.get(baseUrl + '/api-plug/copy-store-widget?requestProject=gic-web&oldKey='+this.uuid+'&newKey='+this.cacheUuid).then(res => {
if(res.data.errorCode === 0) {
this.axios.get(baseUrl + '/api-plug/copy-store-widget?requestProject=gic-web&oldKey=' + this.uuid + '&newKey=' + this.cacheUuid).then(res => {
if (res.data.errorCode === 0) {
console.log('拷贝成功');
}
})
}
}
}
};
</script>
src/test/component/dmStore/optionsGroup/option-group.vue
......@@ -50,7 +50,7 @@
</div>
<!-- 操作按钮 -->
<div class="dm-store__btn">
<el-button class="dm-store__btn--cancel" type="text" @click="popoverShow = false">关 闭</el-button>
<el-button class="dm-store__btn--cancel" type="text" @click="popoverShow = false">确 定</el-button>
</div>
</el-popover>
</template>
......
src/test/component/dmStore/optionsGroup/option-part.vue
......@@ -57,7 +57,7 @@
</div>
<!-- 操作按钮 -->
<div class="dm-store__btn">
<el-button class="dm-store__btn--cancel" type="text" @click="popoverShow = false">关 闭</el-button>
<el-button class="dm-store__btn--cancel" type="text" @click="popoverShow = false">确 定</el-button>
</div>
</el-popover>
</template>
......
src/test/component/dmStore/optionsGroup/option-tags.vue
......@@ -50,7 +50,7 @@
</div>
<!-- 操作按钮 -->
<div class="dm-store__btn">
<el-button class="dm-store__btn--cancel" type="text" @click="popoverShow = false">关 闭</el-button>
<el-button class="dm-store__btn--cancel" type="text" @click="popoverShow = false">确 定</el-button>
</div>
</el-popover>
</template>
......
src/test/component/dmStore/optionsGroup/option-type.vue
......@@ -18,7 +18,7 @@
</div>
<!-- 操作按钮 -->
<div class="dm-store__btn">
<el-button class="dm-store__btn--cancel" type="text" @click="popoverShow = false">关 闭</el-button>
<el-button class="dm-store__btn--cancel" type="text" @click="popoverShow = false">确 定</el-button>
</div>
</el-popover>
</template>
......
src/test/component/dmStore/store-card.vue
......@@ -117,13 +117,11 @@ export default {
value:'', //否 string isAll=0时，必填，选中项id，多个逗号分隔
removeItems:'', //否 string isAll=1，取消选中项的id，多个逗号分隔
_key:'',
isClique:0
},
leftParams:{
searchParam:'',
pageSize:20,
currentPage:1,
isClique:0
},
rightParams:{
key:'',
......
src/views/game/znm/strategy.vue
......@@ -85,7 +85,7 @@ export default {
let res = await znmStrategy({ gamePrizeStrategyId: this.dataId || '' });
this.loading = false;
this.gradeList = res.result.gradeList;
this.useId = res.result.searchId;
this.useId = res.result.searchId || '';
this.peopleFilterReRender = false;
this.$nextTick(_ => {
this.peopleFilterReRender = true;
......
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