Skip to content

C
clique-web
Commit a4fef048 by 曾经
Options

Merge branch 'master' into feature/停复机 

* master: (32 commits)
  update: dist
  update: dist
  fix: dd
  update: dist
  fix: 有效期
  fix: 积分有效天数检验
  fix: 积分策略提示信息ui
  fix: 引入图标库
  fix: 积分策略提示文案ui修改
  fix: dd
  fix: jifen
  fix； 积分有效期
  update: 修复会员卡设置bug
  update: 修复会员卡设置bug
  fix: 积分有效期校验
  fix: 积分老数据兼容修改
  fix: 积分校验提示信息修改
  fix: 积分通用和抵现校验定位
  fix: 积分禁用
  update: dist
  ...

# Conflicts:
#	dist/index.html
#	dist/static/js/37.29a4b9c1745d64cfc6cd.js
#	dist/static/js/37.29a4b9c1745d64cfc6cd.js.map
#	dist/static/js/37.5a65b0174f843f0d8be9.js
#	dist/static/js/37.5a65b0174f843f0d8be9.js.map
#	dist/static/js/37.fa399aea4c5a144ef8fb.js
#	dist/static/js/37.fa399aea4c5a144ef8fb.js.map
#	dist/static/js/38.619d17c30edaf714d4e6.js
#	dist/static/js/38.91e212527125ab12b5b1.js
#	dist/static/js/38.c87321412b595001a395.js
#	dist/static/js/5.307b129f1a13ed13c71d.js.map
#	dist/static/js/6.51f127d5a5b283212b70.js.map
#	dist/static/js/6.cb35c9668cf721acc599.js
#	dist/static/js/6.cb35c9668cf721acc599.js.map
#	dist/static/js/8.b88326ad14d012ad7898.js
#	dist/static/js/manifest.b02394884ed74e79518b.js.map
#	dist/static/js/manifest.cdeb591d1beb41b20702.js.map
#	dist/static/js/manifest.ebdf2db04429972d1c41.js.map
parents 8934b079 bec62c9e
Showing with 136 additions and 88 deletions
config/proxyList.js
module.exports = {
proxyList: {
'/api-auth/': {
target: 'http://gicdev.demogic.com/api-auth/',
target: 'http://www.gicdev.com/api-auth/',
changeOrigin: true,
pathRewrite: {
'^/api-auth': ''
}
},
'/api-admin/': {
target: 'http://gicdev.demogic.com/api-admin/',
target: 'http://www.gicdev.com/api-admin/',
changeOrigin: true,
pathRewrite: {
'^/api-admin': ''
}
},
'/api-plug/': {
target: 'http://gicdev.demogic.com/api-plug/',
target: 'http://www.gicdev.com/api-plug/',
changeOrigin: true,
pathRewrite: {
'^/api-plug': ''
}
},
'/api-mall/': {
target: 'http://gicdev.demogic.com/api-mall/',
target: 'http://www.gicdev.com/api-mall/',
changeOrigin: true,
pathRewrite: {
'^/api-mall': ''
......
index.html
......@@ -3,6 +3,8 @@
<head>
<meta charset="utf-8">
<link rel="shortcut icon" href="./favicon.ico"/>
<script src="//at.alicdn.com/t/c/font_3380872_l18pdwht2eo.js"></script> <!-- 3.0新版商户后台 -->
<link rel="stylesheet" type="text/css" href="//at.alicdn.com/t/c/font_3380872_l18pdwht2eo.css" /> <!-- 3.0新版商户后台 -->
<title>GIC-集团后台</title>
</head>
<body style="background-color: #f0f2f5;min-width: 1400px;">
......@@ -12,7 +14,7 @@
(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;
host = host.indexOf('localhost') > -1 || host.indexOf('192.168') > -1 ? 'www.gicdev.com' : host;
document.write('<script src="//'+ host + src +'"><\/script>')
})()
</script>
......
src/api/api.js
......@@ -5,7 +5,7 @@ import { Message } from 'element-ui';
// Vue.axios.defaults.timeout = 30000;
var local = window.location.origin;
if (local.indexOf('localhost') != -1) {
local = 'http://gicdev.demogic.com';
local = 'http://www.gicdev.com';
}
Vue.axios.interceptors.request.use(
config => {
......
src/common/js/error.js
......@@ -7,7 +7,7 @@ export default {
errorMsg: function(response) {
var local = window.location.origin;
if (local.indexOf('localhost') != -1) {
local = 'http://gicdev.demogic.com';
local = 'http://www.gicdev.com';
}
if (response.errorCode != 0) {
if (response.errorCode == 401) {
......
src/common/js/excel_config.js
......@@ -5,6 +5,6 @@
var config = window.location.origin; // 获取域名和协议
// eslint-disable-next-line
module.exports = {
// config: 'http://gicdev.demogic.com',
// config: 'http://www.gicdev.com',
config
};
src/utils/validate.js
......@@ -40,3 +40,20 @@ export function validateEmail(email) {
const re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
return re.test(email);
}
/** 表单校验滚动到第一个错误项
* @param {Object} that vue实例
* this.scrollToError(this);
*/
export const scrollToError = (that, className = 'is-error') => {
that.$nextTick(_ => {
const isError = document.getElementsByClassName(className);
isError[0].scrollIntoView({
// 滚动到指定节点
// 值有start,center,end，nearest，当前显示在视图区域中间
block: 'center',
// 值有auto、instant,smooth，缓动动画（当前是慢速的）
behavior: 'smooth'
});
});
};
src/view/companyGroup/integral/cliqueCard.vue
......@@ -355,7 +355,7 @@ export default {
postRequest('/api-admin/download-clique-settlement', para).then(res => {
let config = window.location.origin; // 获取域名和协议
if (config.indexOf('localhost') > -1) {
config = 'http://gicdev.demogic.com';
config = 'http://www.gicdev.com';
}
window.location.href = config + '/api-admin/download-clique-settlement?requestProject=' + this.repProjectName;
});
......
src/view/companyGroup/login.vue
......@@ -20,7 +20,7 @@ export default {
let host = window.location.origin;
log('当前host:', host);
if (host.indexOf('localhost') != '-1') {
that.baseUrl = 'http://gicdev.demogic.com';
that.baseUrl = 'http://www.gicdev.com';
} else {
that.baseUrl = host;
}
......
src/view/companyGroup/membershipSystem/addGroupGrade.vue
......@@ -146,11 +146,11 @@
<el-input v-model="ruleForm.upLevelHighcost" @focus="inputFocus('upLevelHighcost', 'money')" @keyup.native="formatInput($event)"></el-input>
<label> 元 </label>
</div>
<div class="check-cell">
<!-- <div class="check-cell">
<el-checkbox v-model="ruleForm.upLevelDaystoredSelect">当天储值满</el-checkbox>
<el-input v-model="ruleForm.upLevelDaystored" @focus="inputFocus('upLevelDaystored', 'money')" @keyup.native="formatInput($event)"></el-input>
<label> 元 </label>
</div>
</div> -->
<div class="check-cell">
<el-checkbox v-model="ruleForm.upLevelSumcostSelect"></el-checkbox>
<el-input v-model="ruleForm.upLevelSumcostDays" @focus="inputFocus('upLevelSumcostDays', 'day')" @keyup.native="formatInput($event)"></el-input>
......@@ -165,13 +165,13 @@
<el-input v-model="ruleForm.upLevelCosttimes" @focus="inputFocus('upLevelCosttimes', 'day')" @keyup.native="formatInput($event)"></el-input>
<label> 次 </label>
</div>
<div class="check-cell">
<!-- <div class="check-cell">
<el-checkbox v-model="ruleForm.upLevelSumstoredSelect"></el-checkbox>
<el-input v-model="ruleForm.upLevelSumstoredDays" @focus="inputFocus('upLevelSumstoredDays', 'day')" @keyup.native="formatInput($event)"></el-input>
<label>天内储值满</label>
<el-input v-model="ruleForm.upLevelSumstored" @focus="inputFocus('upLevelSumstored', 'money')" @keyup.native="formatInput($event)"></el-input>
<label> 元 </label>
</div>
</div> -->
<div class="check-cell">
<el-checkbox v-model="ruleForm.upLevelSumintegralSelect"></el-checkbox>
<el-input v-model="ruleForm.upLevelSumintegralDays" @focus="inputFocus('upLevelSumintegralDays', 'day')" @keyup.native="formatInput($event)"></el-input>
......@@ -205,13 +205,13 @@
<el-input v-model="ruleForm.lowLevelHighcost" @focus="inputFocus('lowLevelHighcost', 'money')" @keyup.native="formatInput($event)"></el-input>
<label> 元 </label>
</div>
<div class="check-cell">
<!-- <div class="check-cell">
<el-checkbox v-model="ruleForm.lowLevelDaystoredSelect"></el-checkbox>
<el-input v-model="ruleForm.lowLevelDaystoredDays" @focus="inputFocus('lowLevelDaystoredDays', 'day')" @keyup.native="formatInput($event)"></el-input>
<label>天内单天储值满</label>
<el-input v-model="ruleForm.lowLevelDaystored" @focus="inputFocus('lowLevelDaystored', 'money')" @keyup.native="formatInput($event)"></el-input>
<label> 元 </label>
</div>
</div> -->
<div class="check-cell">
<el-checkbox v-model="ruleForm.lowLevelSumcostSelect"></el-checkbox>
<el-input v-model="ruleForm.lowLevelSumcostDays" @focus="inputFocus('lowLevelSumcostDays', 'day')" @keyup.native="formatInput($event)"></el-input>
......@@ -226,13 +226,13 @@
<el-input v-model="ruleForm.lowLevelCosttimes" @focus="inputFocus('lowLevelCosttimes', 'day')" @keyup.native="formatInput($event)"></el-input>
<label> 次 </label>
</div>
<div class="check-cell">
<!-- <div class="check-cell">
<el-checkbox v-model="ruleForm.lowLevelSumstoredSelect"></el-checkbox>
<el-input v-model="ruleForm.lowLevelSumstoredDays" @focus="inputFocus('lowLevelSumstoredDays', 'day')" @keyup.native="formatInput($event)"></el-input>
<label>天内储值满</label>
<el-input v-model="ruleForm.lowLevelSumstored" @focus="inputFocus('lowLevelSumstored', 'money')" @keyup.native="formatInput($event)"></el-input>
<label> 元 </label>
</div>
</div> -->
<div class="check-cell">
<el-checkbox v-model="ruleForm.lowLevelSumintegralSelect"></el-checkbox>
<el-input v-model="ruleForm.lowLevelSumintegralDays" @focus="inputFocus('lowLevelSumintegralDays', 'day')" @keyup.native="formatInput($event)"></el-input>
......@@ -333,11 +333,11 @@ export default {
upLevelSumstoredDays: '0',
upLevelSumintegralSelect: false, //x天内获得x积分
upLevelSumintegral: '0',
upLevelSumintegralDays: '',
upLevelSumintegralDays: '0',
upLevelConsumeSelect: false, // x天内消费满x元-开关
upLevelConsumeCost: '0', // x天内消费满x元
autoDowngrade: true, //自动降级 1启用 2停用
gradeEffectDay: '0', //自升级之日起算X天
gradeEffectDay: 0, //自升级之日起算X天
lowLevelHighcostDays: '0', //x天内单天消费满x元
lowLevelHighcost: '0',
lowLevelHighcostSelect: false,
......
src/view/companyGroup/membershipSystem/addIntegralSytem.vue
......@@ -32,7 +32,7 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="人群定向：" v-if="ruleForm.useCrowd == 2" prop class="padding-0">
<el-form-item label="人群定向：" v-if="ruleForm.useCrowd == 2" prop class="padding-0 selectCount">
<el-button @click="showPeople">已设置{{ selectCount }}项筛选</el-button>
</el-form-item>
<el-form-item label="适用条件：" class="padding-0">
......@@ -80,7 +80,7 @@
<!-- 商品品牌 -->
<el-select
size="small"
class="fl w240"
class="fl w240 valueWx"
@change="selectGoodsStoreWx"
v-if="item.channelRelationProType == 2"
v-model="valueWx"
......@@ -95,7 +95,7 @@
></el-option>
</el-select>
<!-- 商品品类 -->
<div v-if="item.channelRelationProType == 3" class="fl goods-cate">
<div v-if="item.channelRelationProType == 3" class="fl goods-cate cateDataWx">
<goodsCate
ref="selectGoodsCate"
:selectCateType="selectCateTypeWx"
......@@ -105,16 +105,16 @@
</div>
<el-button
style="width:202px"
class="fl"
class="fl goodsListWx"
v-if="item.channelRelationProType == 4"
@click="showGoodsDialog('wx')"
>已选{{ goodsListWx.length }}件商品</el-button>
</el-form-item>
<el-form-item label="折扣控制：" prop="region" class="margin-20">
<div class="radio-cell">
<el-radio v-model="item.integralUseDiscountControl" label="1" @change="radioEvent2">所有折扣商品都适用</el-radio>
<el-radio v-model="item.integralUseDiscountControl" label="1" @change="radioEventn(2)">所有折扣商品都适用</el-radio>
</div>
<div class="radio-cell margin-20 padding-bottom-20">
<div class="radio-cell margin-20 padding-bottom-20 zk0">
<el-radio v-model="item.integralUseDiscountControl" label="2">折扣</el-radio>
<el-input-number
placeholder="请输入"
......@@ -164,9 +164,9 @@
</el-form-item>
<el-form-item label="折扣控制：" prop="region" class="input-margin-b margin-20 padding-bottom-20">
<div class="radio-cell">
<el-radio v-model="item.integralUseDiscountControl" label="1" @change="radioEvent1">所有折扣商品都适用</el-radio>
<el-radio v-model="item.integralUseDiscountControl" label="1" @change="radioEventn(1)">所有折扣商品都适用</el-radio>
</div>
<div class="radio-cell margin-20">
<div class="radio-cell margin-20 zk1">
<el-radio v-model="item.integralUseDiscountControl" label="2">折扣</el-radio>
<el-input-number placeholder="请输入" v-model="item.integralUseDiscountControlLower" :precision="2" :controls="false" :max="10.0" :min="1"></el-input-number>
<label>至</label>
......@@ -184,7 +184,7 @@
<div>
<el-radio v-model="ruleForm.integralUseStatus" label="0" @change="radioEvent()">不支持抵现</el-radio>
</div>
<div class="margin-20">
<div class="margin-20 integralUse">
<el-radio v-model="ruleForm.integralUseStatus" label="1">每使用</el-radio>
<el-input-number
placeholder="请输入"
......@@ -292,7 +292,7 @@ import strLength from '@/common/js/strlen';
import { getRequest, postRequest, postJson } from '@/api/api';
import { log } from '@/utils/index.js';
import wmMixins from './strategy.js';
import { scrollToError } from '@/utils/validate';
const timeStramp = {
year: new Date().getFullYear(),
month: new Date().getMonth(),
......@@ -304,6 +304,7 @@ export default {
mixins: [wmMixins],
data() {
return {
scrollToError,
repProjectName: 'gic-clique',
navpath: [
{
......@@ -484,15 +485,9 @@ export default {
// this.selectReplayStyle()
},
methods: {
radioEvent2() {
// console.log(this.ruleForm.channelType, 78787);
this.ruleForm.channelList[0].integralUseDiscountControlLower = undefined;
this.ruleForm.channelList[0].integralUseDiscountControlUpper = undefined;
},
radioEvent1() {
// console.log(this.ruleForm.channelType, 78787);
this.ruleForm.channelList[1].integralUseDiscountControlLower = undefined;
this.ruleForm.channelList[1].integralUseDiscountControlUpper = undefined;
radioEventn(n) {
this.ruleForm.channelList[n].integralUseDiscountControlLower = undefined;
this.ruleForm.channelList[n].integralUseDiscountControlUpper = undefined;
},
radioEvent() {
this.ruleForm.integralUse.fee = undefined;
......@@ -513,19 +508,23 @@ export default {
if (!!data.channelList[i].openStatus && data.channelList[i].integralUseDiscountControl == 2) {
if (!data.channelList[i].integralUseDiscountControlUpper || !data.channelList[i].integralUseDiscountControlLower) {
obj.flag = false;
this.scrollToError(this, `zk${i}`);
obj.text = '请填写折扣';
}
if (parseInt(data.channelList[i].integralUseDiscountControlUpper) > 10 || parseInt(data.channelList[i].integralUseDiscountControlLower) > 10 || Number(data.channelList[i].integralUseDiscountControlUpper) <= Number(data.channelList[i].integralUseDiscountControlLower)) {
obj.flag = false;
this.scrollToError(this, `zk${i}`);
obj.text = '折扣格式有误';
}
}
if (data.channelList[i].channelType == 1 && !data.channelList[i].enterpriseRelationIdArr.length) {
obj.flag = false;
this.scrollToError(this, `zk${i}`);
obj.text = '请选择商户';
}
if (data.channelList[i].channelType == 9 && !data.channelList[i].enterpriseRelationIdArr.length) {
obj.flag = false;
this.scrollToError(this, `zk${i}`);
obj.text = '请选择商户';
}
if (data.channelList[i].channelType == 3) {
......@@ -589,15 +588,18 @@ export default {
// }
let flag = !data.integralUse.fee || String(data.integralUse.integral) == '';
if (data.integralUseStatus == 1 && flag) {
this.scrollToError(this, 'integralUse');
that.$message.error('请填写抵现规则');
return;
}
if (data.integralUseStatus == 1) {
if (!Number(data.integralUse.fee)) {
this.scrollToError(this, 'integralUse');
showMsg.showmsg('抵现规则中的抵现金额不能为0', 'error');
return;
}
if (!Number(data.integralUse.integral)) {
this.scrollToError(this, 'integralUse');
showMsg.showmsg('抵现规则中的使用积分不能为0', 'error');
return;
}
......@@ -649,16 +651,19 @@ export default {
// 微信商城
// 适用商品
if (item.channelRelationProType == 2 && this.valueWx.length < 1) {
this.scrollToError(this, 'valueWx');
// 商品品牌
showMsg.showmsg('请选择商品品牌', 'error');
return (saveBool = false);
}
if (item.channelRelationProType == 3 && this.cateDataWx.length < 1) {
this.scrollToError(this, 'cateDataWx');
// 商品品类
showMsg.showmsg('请选择商品品类', 'error');
return (saveBool = false);
}
if (item.channelRelationProType == 4 && this.goodsListWx.length < 1) {
this.scrollToError(this, 'goodsListWx');
// 单件商品
showMsg.showmsg('请选择单件商品', 'error');
return (saveBool = false);
......@@ -667,6 +672,7 @@ export default {
});
// 自定义人群
if (data.useCrowd == 2 && this.selectCount < 1) {
this.scrollToError(this, 'selectCount');
showMsg.showmsg('请选择人群定向', 'error');
return;
}
......@@ -699,7 +705,8 @@ export default {
}
})
} else {
log('error submit!!');
this.scrollToError(this);
showMsg.showmsg('表单信息未填写完整','error')
return false;
}
});
......
src/view/companyGroup/membershipSystem/addMemberGrade.vue
......@@ -37,11 +37,11 @@
<el-input v-model="ruleForm.upLevelHighcost" @focus="inputFocus('upLevelHighcost', 'money')" @keyup.native="formatInput($event)"></el-input>
<label> 元 </label>
</div>
<div class="check-cell">
<!-- <div class="check-cell">
<el-checkbox v-model="ruleForm.upLevelDaystoredSelect">当天储值满</el-checkbox>
<el-input v-model="ruleForm.upLevelDaystored" @focus="inputFocus('upLevelDaystored', 'money')" @keyup.native="formatInput($event)"></el-input>
<label> 元 </label>
</div>
</div> -->
<div class="check-cell">
<el-checkbox v-model="ruleForm.upLevelSumcostSelect"></el-checkbox>
<el-input v-model="ruleForm.upLevelSumcostDays" @focus="inputFocus('upLevelSumcostDays', 'day')" @keyup.native="formatInput($event)"></el-input>
......@@ -56,13 +56,13 @@
<el-input v-model="ruleForm.upLevelCosttimes" @focus="inputFocus('upLevelCosttimes', 'day')" @keyup.native="formatInput($event)"></el-input>
<label> 次 </label>
</div>
<div class="check-cell">
<!-- <div class="check-cell">
<el-checkbox v-model="ruleForm.upLevelSumstoredSelect"></el-checkbox>
<el-input v-model="ruleForm.upLevelSumstoredDays" @focus="inputFocus('upLevelSumstoredDays', 'day')" @keyup.native="formatInput($event)"></el-input>
<label>天内储值满</label>
<el-input v-model="ruleForm.upLevelSumstored" @focus="inputFocus('upLevelSumstored', 'money')" @keyup.native="formatInput($event)"></el-input>
<label> 元 </label>
</div>
</div> -->
<div class="check-cell">
<el-checkbox v-model="ruleForm.upLevelSumintegralSelect"></el-checkbox>
<el-input v-model="ruleForm.upLevelSumintegralDays" @focus="inputFocus('upLevelSumintegralDays', 'day')" @keyup.native="formatInput($event)"></el-input>
......@@ -96,13 +96,13 @@
<el-input v-model="ruleForm.lowLevelHighcost" @focus="inputFocus('lowLevelHighcost', 'money')" @keyup.native="formatInput($event)"></el-input>
<label> 元 </label>
</div>
<div class="check-cell">
<!-- <div class="check-cell">
<el-checkbox v-model="ruleForm.lowLevelDaystoredSelect"></el-checkbox>
<el-input v-model="ruleForm.lowLevelDaystoredDays" @focus="inputFocus('lowLevelDaystoredDays', 'day')" @keyup.native="formatInput($event)"></el-input>
<label>天内单天储值满</label>
<el-input v-model="ruleForm.lowLevelDaystored" @focus="inputFocus('lowLevelDaystored', 'money')" @keyup.native="formatInput($event)"></el-input>
<label> 元 </label>
</div>
</div> -->
<div class="check-cell">
<el-checkbox v-model="ruleForm.lowLevelSumcostSelect"></el-checkbox>
<el-input v-model="ruleForm.lowLevelSumcostDays" @focus="inputFocus('lowLevelSumcostDays', 'day')" @keyup.native="formatInput($event)"></el-input>
......@@ -117,13 +117,13 @@
<el-input v-model="ruleForm.lowLevelCosttimes" @focus="inputFocus('lowLevelCosttimes', 'day')" @keyup.native="formatInput($event)"></el-input>
<label> 次 </label>
</div>
<div class="check-cell">
<!-- <div class="check-cell">
<el-checkbox v-model="ruleForm.lowLevelSumstoredSelect"></el-checkbox>
<el-input v-model="ruleForm.lowLevelSumstoredDays" @focus="inputFocus('lowLevelSumstoredDays', 'day')" @keyup.native="formatInput($event)"></el-input>
<label>天内储值满</label>
<el-input v-model="ruleForm.lowLevelSumstored" @focus="inputFocus('lowLevelSumstored', 'money')" @keyup.native="formatInput($event)"></el-input>
<label> 元 </label>
</div>
</div> -->
<div class="check-cell">
<el-checkbox v-model="ruleForm.lowLevelSumintegralSelect"></el-checkbox>
<el-input v-model="ruleForm.lowLevelSumintegralDays" @focus="inputFocus('lowLevelSumintegralDays', 'day')" @keyup.native="formatInput($event)"></el-input>
......
src/view/companyGroup/membershipSystem/companyGroupInfo.vue
......@@ -160,7 +160,7 @@ export default {
let host = window.location.origin;
log('当前host:', host);
if (host.indexOf('localhost') != '-1') {
that.baseUrl = 'http://gicdev.demogic.com';
that.baseUrl = 'http://www.gicdev.com';
} else {
that.baseUrl = host;
}
......@@ -197,7 +197,7 @@ export default {
let baseUrl;
log('当前host:', host);
if (host.indexOf('localhost') != '-1') {
baseUrl = 'http://gicdev.demogic.com';
baseUrl = 'http://www.gicdev.com';
} else {
baseUrl = host;
}
......@@ -428,8 +428,10 @@ export default {
that.areaOptions = JSON.parse(obj);
// that.areaOptions = JSON.parse(JSON.stringify(newEnterprise.region))
// 时间
if (!!newEnterprise.storeBusinessTime) {
if (typeof newEnterprise.storeBusinessTime == 'string' && newEnterprise.storeBusinessTime.indexOf(':') > 0) {
newEnterprise.storeBusinessTime = newTime.timeToDate(newEnterprise.storeBusinessTime);
} else {
newEnterprise.storeBusinessTime = []
}
// 长度
......
src/view/companyGroup/membershipSystem/editGroupGrade.vue
......@@ -139,11 +139,11 @@
<el-input v-model="ruleForm.upLevelHighcost" @focus="inputFocus('upLevelHighcost', 'money')" @keyup.native="formatInput($event)"></el-input>
<label> 元 </label>
</div>
<div class="check-cell">
<!-- <div class="check-cell">
<el-checkbox v-model="ruleForm.upLevelDaystoredSelect">当天储值满</el-checkbox>
<el-input v-model="ruleForm.upLevelDaystored" @focus="inputFocus('upLevelDaystored', 'money')" @keyup.native="formatInput($event)"></el-input>
<label> 元 </label>
</div>
</div> -->
<div class="check-cell">
<el-checkbox v-model="ruleForm.upLevelSumcostSelect"></el-checkbox>
<el-input v-model="ruleForm.upLevelSumcostDays" @focus="inputFocus('upLevelSumcostDays', 'day')" @keyup.native="formatInput($event)"></el-input>
......@@ -158,13 +158,13 @@
<el-input v-model="ruleForm.upLevelCosttimes" @focus="inputFocus('upLevelCosttimes', 'day')" @keyup.native="formatInput($event)"></el-input>
<label> 次 </label>
</div>
<div class="check-cell">
<!-- <div class="check-cell">
<el-checkbox v-model="ruleForm.upLevelSumstoredSelect"></el-checkbox>
<el-input v-model="ruleForm.upLevelSumstoredDays" @focus="inputFocus('upLevelSumstoredDays', 'day')" @keyup.native="formatInput($event)"></el-input>
<label>天内储值满</label>
<el-input v-model="ruleForm.upLevelSumstored" @focus="inputFocus('upLevelSumstored', 'money')" @keyup.native="formatInput($event)"></el-input>
<label> 元 </label>
</div>
</div> -->
<div class="check-cell">
<el-checkbox v-model="ruleForm.upLevelSumintegralSelect"></el-checkbox>
<el-input v-model="ruleForm.upLevelSumintegralDays" @focus="inputFocus('upLevelSumintegralDays', 'day')" @keyup.native="formatInput($event)"></el-input>
......@@ -198,13 +198,13 @@
<el-input v-model="ruleForm.lowLevelHighcost" @focus="inputFocus('lowLevelHighcost', 'money')" @keyup.native="formatInput($event)"></el-input>
<label> 元 </label>
</div>
<div class="check-cell">
<!-- <div class="check-cell">
<el-checkbox v-model="ruleForm.lowLevelDaystoredSelect"></el-checkbox>
<el-input v-model="ruleForm.lowLevelDaystoredDays" @focus="inputFocus('lowLevelDaystoredDays', 'day')" @keyup.native="formatInput($event)"></el-input>
<label>天内单天储值满</label>
<el-input v-model="ruleForm.lowLevelDaystored" @focus="inputFocus('lowLevelDaystored', 'money')" @keyup.native="formatInput($event)"></el-input>
<label> 元 </label>
</div>
</div> -->
<div class="check-cell">
<el-checkbox v-model="ruleForm.lowLevelSumcostSelect"></el-checkbox>
<el-input v-model="ruleForm.lowLevelSumcostDays" @focus="inputFocus('lowLevelSumcostDays', 'day')" @keyup.native="formatInput($event)"></el-input>
......@@ -219,13 +219,13 @@
<el-input v-model="ruleForm.lowLevelCosttimes" @focus="inputFocus('lowLevelCosttimes', 'day')" @keyup.native="formatInput($event)"></el-input>
<label> 次 </label>
</div>
<div class="check-cell">
<!-- <div class="check-cell">
<el-checkbox v-model="ruleForm.lowLevelSumstoredSelect"></el-checkbox>
<el-input v-model="ruleForm.lowLevelSumstoredDays" @focus="inputFocus('lowLevelSumstoredDays', 'day')" @keyup.native="formatInput($event)"></el-input>
<label>天内储值满</label>
<el-input v-model="ruleForm.lowLevelSumstored" @focus="inputFocus('lowLevelSumstored', 'money')" @keyup.native="formatInput($event)"></el-input>
<label> 元 </label>
</div>
</div> -->
<div class="check-cell">
<el-checkbox v-model="ruleForm.lowLevelSumintegralSelect"></el-checkbox>
<el-input v-model="ruleForm.lowLevelSumintegralDays" @focus="inputFocus('lowLevelSumintegralDays', 'day')" @keyup.native="formatInput($event)"></el-input>
......@@ -329,7 +329,7 @@ export default {
upLevelConsumeSelect: false, // x天内消费满x元-开关
upLevelConsumeCost: '', // x天内消费满x元
autoDowngrade: true, //自动降级 1启用 2停用
gradeEffectDay: '', //自升级之日起算X天
gradeEffectDay: '0', //自升级之日起算X天
lowLevelHighcostDays: '', //x天内单天消费满x元
lowLevelHighcost: '',
lowLevelHighcostSelect: false,
......@@ -609,7 +609,7 @@ export default {
data.upLevelSumstoredDays = data.upLevelSumstoredDays || 0;
data.upLevelSumstored = data.upLevelSumstored || 0;
data.upLevelSumintegralDays = data.upLevelSumintegralDays || 0;
data.upLevelSumintegral = data.upLevelSumintegra
data.upLevelSumintegral = data.upLevelSumintegral || 0;
data.upLevelConsumeCost = data.upLevelConsumeCost || 0;
data.gradeEffectDay = data.gradeEffectDay || 0;
......
src/view/companyGroup/membershipSystem/editMemberGrade.vue
......@@ -37,11 +37,11 @@
<el-input v-model="ruleForm.upLevelHighcost" @focus="inputFocus('upLevelHighcost', 'money')" @keyup.native="formatInput($event)"></el-input>
<label> 元 </label>
</div>
<div class="check-cell">
<!-- <div class="check-cell">
<el-checkbox v-model="ruleForm.upLevelDaystoredSelect">当天储值满</el-checkbox>
<el-input v-model="ruleForm.upLevelDaystored" @focus="inputFocus('upLevelDaystored', 'money')" @keyup.native="formatInput($event)"></el-input>
<label> 元 </label>
</div>
</div> -->
<div class="check-cell">
<el-checkbox v-model="ruleForm.upLevelSumcostSelect"></el-checkbox>
<el-input v-model="ruleForm.upLevelSumcostDays" @focus="inputFocus('upLevelSumcostDays', 'day')" @keyup.native="formatInput($event)"></el-input>
......@@ -56,13 +56,13 @@
<el-input v-model="ruleForm.upLevelCosttimes" @focus="inputFocus('upLevelCosttimes', 'day')" @keyup.native="formatInput($event)"></el-input>
<label> 次 </label>
</div>
<div class="check-cell">
<!-- <div class="check-cell">
<el-checkbox v-model="ruleForm.upLevelSumstoredSelect"></el-checkbox>
<el-input v-model="ruleForm.upLevelSumstoredDays" @focus="inputFocus('upLevelSumstoredDays', 'day')" @keyup.native="formatInput($event)"></el-input>
<label>天内储值满</label>
<el-input v-model="ruleForm.upLevelSumstored" @focus="inputFocus('upLevelSumstored', 'money')" @keyup.native="formatInput($event)"></el-input>
<label> 元 </label>
</div>
</div> -->
<div class="check-cell">
<el-checkbox v-model="ruleForm.upLevelSumintegralSelect"></el-checkbox>
<el-input v-model="ruleForm.upLevelSumintegralDays" @focus="inputFocus('upLevelSumintegralDays', 'day')" @keyup.native="formatInput($event)"></el-input>
......@@ -96,13 +96,13 @@
<el-input v-model="ruleForm.lowLevelHighcost" @focus="inputFocus('lowLevelHighcost', 'money')" @keyup.native="formatInput($event)"></el-input>
<label> 元 </label>
</div>
<div class="check-cell">
<!-- <div class="check-cell">
<el-checkbox v-model="ruleForm.lowLevelDaystoredSelect"></el-checkbox>
<el-input v-model="ruleForm.lowLevelDaystoredDays" @focus="inputFocus('lowLevelDaystoredDays', 'day')" @keyup.native="formatInput($event)"></el-input>
<label>天内单天储值满</label>
<el-input v-model="ruleForm.lowLevelDaystored" @focus="inputFocus('lowLevelDaystored', 'money')" @keyup.native="formatInput($event)"></el-input>
<label> 元 </label>
</div>
</div> -->
<div class="check-cell">
<el-checkbox v-model="ruleForm.lowLevelSumcostSelect"></el-checkbox>
<el-input v-model="ruleForm.lowLevelSumcostDays" @focus="inputFocus('lowLevelSumcostDays', 'day')" @keyup.native="formatInput($event)"></el-input>
......@@ -117,13 +117,13 @@
<el-input v-model="ruleForm.lowLevelCosttimes" @focus="inputFocus('lowLevelCosttimes', 'day')" @keyup.native="formatInput($event)"></el-input>
<label> 次 </label>
</div>
<div class="check-cell">
<!-- <div class="check-cell">
<el-checkbox v-model="ruleForm.lowLevelSumstoredSelect"></el-checkbox>
<el-input v-model="ruleForm.lowLevelSumstoredDays" @focus="inputFocus('lowLevelSumstoredDays', 'day')" @keyup.native="formatInput($event)"></el-input>
<label>天内储值满</label>
<el-input v-model="ruleForm.lowLevelSumstored" @focus="inputFocus('lowLevelSumstored', 'money')" @keyup.native="formatInput($event)"></el-input>
<label> 元 </label>
</div>
</div> -->
<div class="check-cell">
<el-checkbox v-model="ruleForm.lowLevelSumintegralSelect"></el-checkbox>
<el-input v-model="ruleForm.lowLevelSumintegralDays" @focus="inputFocus('lowLevelSumintegralDays', 'day')" @keyup.native="formatInput($event)"></el-input>
......
src/view/companyGroup/membershipSystem/memberCardSet.vue
......@@ -716,7 +716,6 @@ export default {
that.getMemberSetInfo();
that.getTempInfo();
that.getEnterprise();
this.getOpenThird();
}
};
</script>
......
src/view/companyGroup/membershipSystem/pointSystem.vue
......@@ -113,6 +113,7 @@
{{ scope.row.perpetualFlag | normalizeStatus(scope.row.endValidTime) }}
</template>
</el-table-column>
<el-table-column prop="createUserName" label="创建人" show-overflow-tooltip></el-table-column>
<el-table-column label="操作" min-width="100px">
<template slot-scope="scope">
<el-button @click="handleEditClick(scope.row, 'edit')" type="text">编辑</el-button>
......@@ -226,6 +227,7 @@
{{ scope.row.perpetualFlag | normalizeStatus(scope.row.endValidTime) }}
</template>
</el-table-column>
<el-table-column prop="createUserName" label="创建人" show-overflow-tooltip></el-table-column>
<el-table-column label="操作" min-width="100px">
<template slot-scope="scope">
<el-button @click="handleEditClick2(scope.row)" type="text">编辑</el-button>
......@@ -332,6 +334,23 @@ export default {
this.pageNum1 = 1;
this.getIntefralInfo();
},
handleSizeChange(pageSize) {
if (this.activeName == 'second') {
this.pageSize = pageSize;
} else if (this.activeName == 'third') {
this.pageSize1 = pageSize;
}
this.handleCurrentChange(1);
},
handleCurrentChange(pageNum) {
if (this.activeName == 'second') {
this.pageNum = pageNum;
this.getPointInfo();
} else if (this.activeName == 'third') {
this.pageNum1 = pageNum;
this.getIntefralInfo();
}
},
// 新增
handleAdd(flag) {
if (!this.tpnEditBool) {
......@@ -395,6 +414,8 @@ export default {
let param = {
requestProject: that.projectName,
keyword: that.keywords,
currPage: this.pageNum,
pageSize: this.pageSize,
strategyType: 1
};
// postRequest('/api-admin/get-member-integral-setting', param)
......@@ -423,8 +444,6 @@ export default {
// 6月迭代抖音修改
that.totalCount = resData.result.totalCount;
that.pageSize = resData.result.pageSize;
that.pageNum = resData.result.pageNum;
that.achieveTableData = resData.result.result;
that.achieveTableData.forEach((ele,index)=>{
ele.integralGet = JSON.parse(ele.integralGet);
......@@ -444,6 +463,8 @@ export default {
var params = {
requestProject: that.projectName,
keyword: that.keywords1,
currPage: this.pageNum1,
pageSize: this.pageSize1,
strategyType: 2
}
postRequest('/api-admin/query-integral-setting',params)
......@@ -453,8 +474,6 @@ export default {
if (resData.errorCode == 0) {
// 6月迭代修改
that.totalCount1 = resData.result.totalCount;
that.pageSize1 = resData.result.pageSize;
that.pageNum1 = resData.result.pageNum;
that.exchangeTableData = resData.result.result;
that.exchangeTableData.forEach((ele,index)=>{
ele.integralGet = JSON.parse(ele.integralGet);
......@@ -480,6 +499,8 @@ export default {
item.integralGetDiscountControlLower = String(item.integralGetDiscountControlLower);
item.integralUseDiscountControlUpper = String(item.integralUseDiscountControlUpper);
item.integralUseDiscountControlLower = String(item.integralUseDiscountControlLower);
item.integralExpireType = String(item.integralExpireType);
item.integralExpireRule = String(item.integralExpireRule);
// item.integralGet = JSON.parse(item.integralGet);
// item.integralUse = JSON.parse(item.integralUse);
......
src/view/linktools/linktools.vue
......@@ -474,7 +474,7 @@ export default {
parentId: 'tb-cid-11'
};
that.axios
.post('http://gicdev.demogic.com:9310/api-mall/list_mall_goods_category', qs.stringify(para))
.post('http://www.gicdev.com:9310/api-mall/list_mall_goods_category', qs.stringify(para))
.then(res => {
log(res, res.data, res.data.errorCode);
let resData = res.data;
......@@ -539,7 +539,7 @@ export default {
let that = this;
let para = {};
that.axios
.post('http://gicdev.demogic.com:9310/api-mall/list_mall_goods_tag_tree', qs.stringify(para))
.post('http://www.gicdev.com:9310/api-mall/list_mall_goods_tag_tree', qs.stringify(para))
.then(res => {
log(res, res.data, res.data.errorCode);
let resData = res.data;
......@@ -641,7 +641,7 @@ export default {
parentId: parentId
};
that.axios
.post('http://gicdev.demogic.com:9310/api-mall/list_mall_goods_category', qs.stringify(para))
.post('http://www.gicdev.com:9310/api-mall/list_mall_goods_category', qs.stringify(para))
.then(res => {
let resData = res.data;
if (resData.errorCode == 0) {
......@@ -784,7 +784,7 @@ export default {
// that.total = 50;
that.axios
.post('http://gicdev.demogic.com:9310/api-mall/page-mall-goods', qs.stringify(para))
.post('http://www.gicdev.com:9310/api-mall/page-mall-goods', qs.stringify(para))
.then(res => {
log(res, res.data, res.data.errorCode);
let resData = res.data;
......@@ -954,7 +954,7 @@ export default {
};
that.axios
.post('http://gicdev.demogic.com:9310/api-plug/list-link-data', qs.stringify(para))
.post('http://www.gicdev.com:9310/api-plug/list-link-data', qs.stringify(para))
.then(res => {
log(res, res.data, res.data.errorCode);
let resData = res.data;
......@@ -1036,7 +1036,7 @@ export default {
};
that.axios
.post('http://gicdev.demogic.com:9310/api-plug/query-store-by-code-name', qs.stringify(para))
.post('http://www.gicdev.com:9310/api-plug/query-store-by-code-name', qs.stringify(para))
.then(res => {
log(res, res.data, res.data.errorCode);
let resData = res.data;
......@@ -1074,7 +1074,7 @@ export default {
};
that.axios
.post('http://gicdev.demogic.com:9310/api-auth/do-login', qs.stringify(para))
.post('http://www.gicdev.com:9310/api-auth/do-login', qs.stringify(para))
.then(res => {
log(res, res.data, res.data.errorCode);
that.getLinksList(0, 1);
......
src/view/linktools/linktoolspage.vue
......@@ -463,7 +463,7 @@ export default {
parentId: 'tb-cid-11'
};
that.axios
.post('http://gicdev.demogic.com:9310/api-mall/list_mall_goods_category', qs.stringify(para))
.post('http://www.gicdev.com:9310/api-mall/list_mall_goods_category', qs.stringify(para))
.then(res => {
log(res, res.data, res.data.errorCode);
let resData = res.data;
......@@ -528,7 +528,7 @@ export default {
let that = this;
let para = {};
that.axios
.post('http://gicdev.demogic.com:9310/api-mall/list_mall_goods_tag_tree', qs.stringify(para))
.post('http://www.gicdev.com:9310/api-mall/list_mall_goods_tag_tree', qs.stringify(para))
.then(res => {
let resData = res.data;
if (resData.errorCode == 0) {
......@@ -602,7 +602,7 @@ export default {
parentId: parentId
};
that.axios
.post('http://gicdev.demogic.com:9310/api-mall/list_mall_goods_category', qs.stringify(para))
.post('http://www.gicdev.com:9310/api-mall/list_mall_goods_category', qs.stringify(para))
.then(res => {
let resData = res.data;
if (resData.errorCode == 0) {
......@@ -738,7 +738,7 @@ export default {
// that.total = 50;
that.axios
.post('http://gicdev.demogic.com:9310/api-mall/page-mall-goods', qs.stringify(para))
.post('http://www.gicdev.com:9310/api-mall/page-mall-goods', qs.stringify(para))
.then(res => {
log(res, res.data, res.data.errorCode);
let resData = res.data;
......@@ -907,7 +907,7 @@ export default {
};
that.axios
.post('http://gicdev.demogic.com:9310/api-plug/list-link-data', qs.stringify(para))
.post('http://www.gicdev.com:9310/api-plug/list-link-data', qs.stringify(para))
.then(res => {
log(res, res.data, res.data.errorCode);
let resData = res.data;
......@@ -989,7 +989,7 @@ export default {
};
that.axios
.post('http://gicdev.demogic.com:9310/api-plug/query-store-by-code-name', qs.stringify(para))
.post('http://www.gicdev.com:9310/api-plug/query-store-by-code-name', qs.stringify(para))
.then(res => {
log(res, res.data, res.data.errorCode);
let resData = res.data;
......@@ -1027,7 +1027,7 @@ export default {
};
that.axios
.post('http://gicdev.demogic.com:9310/api-auth/do-login', qs.stringify(para))
.post('http://www.gicdev.com:9310/api-auth/do-login', qs.stringify(para))
.then(res => {
log(res, res.data, res.data.errorCode);
that.getLinksList(0, 1);
......
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