Skip to content

I
integral-mall
Commit 43c2756e by crushh
Options

update: dist

parents 328bc180 3091304d
Showing with 46 additions and 21 deletions
dist/index.html
<!doctype html><html><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="stylesheet" href="./static/css/iconfont.css"><link rel="stylesheet" href="./static/css/common.css"><link rel="shortcut icon" type="image/x-icon" href="./static/img/favicon.ico"><title></title><script defer="defer" src="/integral-mall/js/main.dcc0ab3c7d307cb0ffd5.js"></script><link href="/integral-mall/css/main.147533379e0cf8eb06f8.css" rel="stylesheet"></head><body><div id="app"><div class="el-loading-spinner" style="width: 98%;"><svg viewBox="25 25 50 50" class="circular"><circle cx="50" cy="50" r="20" fill="none" class="path"></circle></svg></div></div><script>(function() {
<!doctype html><html><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="stylesheet" href="./static/css/iconfont.css"><link rel="stylesheet" href="./static/css/common.css"><link rel="shortcut icon" type="image/x-icon" href="./static/img/favicon.ico"><title></title><script defer="defer" src="/integral-mall/js/main.fc188d6b5f42d30e4e5d.js"></script><link href="/integral-mall/css/main.366ebeb20473cccbfa3c.css" rel="stylesheet"></head><body><div id="app"><div class="el-loading-spinner" style="width: 98%;"><svg viewBox="25 25 50 50" class="circular"><circle cx="50" cy="50" r="20" fill="none" class="path"></circle></svg></div></div><script>(function() {
var src = '/component/static/import-component.js?timestrap=' + new Date().getTime();
var host = window.location.host;
host = host.indexOf('localhost') > -1 || host.indexOf('192.168') > -1 ? 'gicdev.demogic.com' : host;
......
dist/js/main.dcc0ab3c7d307cb0ffd5.js → dist/js/main.fc188d6b5f42d30e4e5d.js
This source diff could not be displayed because it is too large. You can view the blob instead.
src/components/relatePop.vue
......@@ -97,6 +97,7 @@
<script>
import request from '@/service/request.js';
import ruleInfo from '@/components/ruleDetail.vue';
// import qs from 'qs';
export default {
name: 'RelatePop',
components: {
......@@ -146,22 +147,46 @@ export default {
getList () {
this.loading = true;
this.tableRadio = '';
request.get('/api-integral-mall/page-rule', { params: this.relateForm }).then(async (res) => {
request.get('/api-integral-mall/page-rule', { params: this.relateForm }).then(res => {
this.tableDate = res.data.result.result || [];
this.totalCount = res.data.result.totalCount;
this.tableDate = this.tableDate.splice(0);
if (this.echoRuleId) this.tableRadio = this.echoRuleId;
this.tableDate.forEach(async item => {
if (item.memberType == 3 && !item.showBack) {
const res = await this.echoData(item.filterJson);
item.showBack = res.data.result;
} else if (item.memberType == 4 && !item.showBack) {
const { storeMode, storeWidgetId } = JSON.parse(item.filterJson);
const res = await this.echoData2(storeWidgetId, storeMode);
const { data: { result: { result } } } = res;
if (result) {
item.showBack = result.map(item => item.name).join(',');
} else {
item.showBack = '所有门店';
}
}
});
}).finally(_ => {
this.loading = false;
});
},
echoData (row) {
echoData (filterJson) { // 取得人群筛选器回显文字
const form = new FormData();
form.append('params', row.filterJson);
form.append('params', filterJson);
form.append('requestProject', 'integral-mall');
form.append('sceneCode', 'member');
return request.post('/api-plug/screening-show-back', form);
},
echoData2 (key, type) { // 取得门店筛选器的文字回显
const form = new FormData();
form.append('key', key);
form.append('selectType', type);
form.append('currentPage', 1);
form.append('pageSize', 20);
return request.post('/api-plug/list-right-data', form);
},
closePop () {
this.tableRadio = '';
this.relateForm = {
......
src/components/ruleDetail.vue
......@@ -212,30 +212,30 @@ export default {
} else if (this.ruleForm.memberType == 3) {
if (this.hasEditGicPeople) {
this.$refs.peopleFilter.confirmSet().then(async () => {
const res = await this.echoData(this.ruleForm.filterJson);
this.ruleForm.showBack = res.data.result;
// const res = await this.echoData(this.ruleForm.filterJson);
// this.ruleForm.showBack = res.data.result;
this.submitRequest();
});
} else {
const res = await this.echoData(this.ruleForm.filterJson);
this.ruleForm.showBack = res.data.result;
// const res = await this.echoData(this.ruleForm.filterJson);
// this.ruleForm.showBack = res.data.result;
this.submitRequest();
}
} else if (this.ruleForm.memberType == 4) {
this.$refs.storeGroup.getStoreConfig().then(async (data) => {
let type = 0;
if (data.type != 0) {
type = 1;
}
const res = await this.echoData2(this.uuid, data.type);
const { data: { result: { result } } } = res;
console.log(result);
if (result) {
this.ruleForm.showBack = result.map(item => item.name).join(',');
} else {
this.ruleForm.showBack = '所有门店';
}
this.ruleForm.filterJson = JSON.stringify({ storeMode: type, storeWidgetId: this.uuid });
// let type = 0;
// if (data.type != 0) {
// type = 1;
// }
// const res = await this.echoData2(this.uuid, data.type);
// const { data: { result: { result } } } = res;
// console.log(result);
// if (result) {
// this.ruleForm.showBack = result.map(item => item.name).join(',');
// } else {
// this.ruleForm.showBack = '所有门店';
// }
this.ruleForm.filterJson = JSON.stringify({ storeMode: data.type, storeWidgetId: this.uuid });
this.ruleForm.searchJson = '';
this.ruleForm.searchId = this.uuid;
this.submitRequest();
......
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