Skip to content

C
clique-web
Commit d547a969 by huaying
Options

Merge branch 'feature/7月-会员积分' into test

parents 95f09dc4 c3494c08
Showing with 48 additions and 40 deletions
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;">
......
src/components/memberShip/point-form.vue
......@@ -89,14 +89,14 @@
</el-form-item>
<dm-sub-title type="fill" text="积分有效期" style="margin-bottom: 20px; margin-top:40px;"/>
<el-form-item label="有效期:" prop="integralExpireType" class="padding-0 yearY" >
<el-tooltip placement="right" effect="light">
<div slot="content" style="line-height:20px">
<p style="color:#595959 font-size:14px;font-weight:600">规则说明：</p>
<p style="color:#e6a23c">
<el-popover width="520" trigger="hover" placement="right">
<div style="line-height:20px">
<p style="color:#303133;font-size:12px;font-weight:600">规则说明：</p>
<p style="color:#e6a23c;font-size:12px;">
仅GIC计算积分时，配置的积分有效期才会生效，<br/>
ERP计算积分时，此配置项不生效；
</p>
<ul>
<ul style="color:#303133;font-size:12px;">
<li>1、永久有效：客户获取的积分永久有效，系统不会清零；</li>
<li>2、按年失效：在第X年的X月X日失效：例：设置第二年的12月1日失效，则2021年获取的所有积分在2022年12月1日失效；</li>
<li>3、按月失效：在第X个月的X日失效：例：设置第二月的1日失效，则3月获取的所有积分在4月1日失效；</li>
......@@ -104,8 +104,8 @@
<li>5、修改积分有效期后，已经获取的积分有效期不变，后续获取的积分按照修改后的积分有效期生效；</li>
</ul>
</div>
<i class="iconfont icon-QuestionCircleOutlined" style="font-size:12px;color:#606266;"></i>
</el-tooltip>
<i slot="reference" class="iconfont icon-QuestionCircleOutlined" style="font-size:14px;color:#606266;"></i>
</el-popover>
<span style="font-size: 12px;color: #909399;line-height: 1;padding-left: 5px;">适用于所有方式获取的积分</span>
<div class="radio-cell mb20">
<el-radio v-model="ruleForm.integralExpireType" label="1" @change="radioExpireType1">永久有效</el-radio>
......@@ -191,7 +191,7 @@ export default {
const dayList = ()=> {
let arr = []
for(let i = 1; i < 28; i++){
arr.push({key: i,value: i})
arr.push({key: `${i}`,value: `${i}`})
}
arr.push({key: '0', value: '月末'})
return arr;
......
src/view/companyGroup/membershipSystem/addPointSystem.vue
......@@ -245,14 +245,14 @@
<el-form-item label="积分有效期：" prop="userGeneralIntegralExpireRule" class="eff">
<el-radio v-model="ruleForm.userGeneralIntegralExpireRule" :label="1">通用积分策略有效期</el-radio>
<el-radio v-model="ruleForm.userGeneralIntegralExpireRule" :label="0">自定义有效期
<el-tooltip placement="right" effect="light">
<div slot="content" style="line-height:20px">
<p style="color:#595959 font-size:14px;font-weight:600">规则说明：</p>
<p style="color:#e6a23c">
<el-popover width="520" trigger="hover" placement="right">
<div style="line-height:20px">
<p style="color:#303133;font-size:12px;font-weight:600">规则说明：</p>
<p style="color:#e6a23c;font-size:12px;">
仅GIC计算积分时，配置的积分有效期才会生效，<br/>
ERP计算积分时，此配置项不生效；
</p>
<ul>
<ul style="color:#303133;font-size:12px;">
<li>1、永久有效：客户获取的积分永久有效，系统不会清零；</li>
<li>2、按年失效：在第X年的X月X日失效：例：设置第二年的12月1日失效，则2021年获取的所有积分在2022年12月1日失效；</li>
<li>3、按月失效：在第X个月的X日失效：例：设置第二月的1日失效，则3月获取的所有积分在4月1日失效；</li>
......@@ -260,16 +260,16 @@
<li>5、修改积分有效期后，已经获取的积分有效期不变，后续获取的积分按照修改后的积分有效期生效；</li>
</ul>
</div>
<i class="iconfont icon-QuestionCircleOutlined" style="font-size:12px;color:#606266;"></i>
</el-tooltip>
<i slot="reference" class="iconfont icon-QuestionCircleOutlined" style="font-size:14px;color:#606266;"></i>
</el-popover>
</el-radio>
<!-- 通用积分有效期 -->
<div v-if="ruleForm.userGeneralIntegralExpireRule == 1">
<div class="mt16" v-if="ruleForm.userGeneralIntegralExpireRule == 1">
<div class="radio-cell" v-if="timeType == 1">
<el-radio v-model="ruleForm.integralExpireType" label="1" @change="radioExpireType1" disabled="true">永久有效</el-radio>
<el-radio v-model="timeType" :label="1" @change="radioExpireType1" disabled="true">永久有效</el-radio>
</div>
<div class="radio-cell" v-else-if="timeType == 2">
<el-radio v-model="ruleForm.integralExpireType" label="2" disabled="true"><label>按年失效：</label></el-radio>
<el-radio v-model="timeType" :label="2" disabled="true"><label>按年失效：</label></el-radio>
<label>每年获取的所有积分，在</label>
<el-select v-model="yearYT" placeholder="请选择" style="width:120px;margin-right:20px" disabled="true">
<el-option v-for="n in yearList" :key="n.key" :label="n.value" :value="n.key"></el-option>
......@@ -285,7 +285,7 @@
<label>日失效</label>
</div>
<div class="radio-cell" v-else-if="timeType == 3">
<el-radio v-model="ruleForm.integralExpireType" label="3" disabled="true"><label>按月失效：</label></el-radio>
<el-radio v-model="timeType" :label="3" disabled="true"><label>按月失效：</label></el-radio>
<label>每月获取的所有积分，在</label>
<el-select v-model="mouthMT" placeholder="请选择" style="width:120px;margin-right:20px" disabled="true">
<el-option v-for="n in mouthList" :key="n.key" :label="n.value" :value="n.key"></el-option>
......@@ -298,9 +298,9 @@
</div>
<!-- <div class="radio-cell" v-else-if="timeType == 0 || timeType == null"> -->
<div class="radio-cell" v-else-if="timeType == 0">
<el-radio v-model="ruleForm.integralExpireType" label="0" disabled="true">
<el-radio v-model="timeType" :label="0" disabled="true">
<label>每天获取的所有积分，在获取之日起</label></el-radio>
<el-input placeholder="请输入" style="width:115px" v-model="effectiveDays" @keyup.native="formatInput($event)" disabled="true"></el-input>
<el-input placeholder="请输入" style="width:115px" v-model="effectiveDays" @keyup.native="formatInputNum($event)" disabled="true"></el-input>
<label>天后失效</label>
<span style="font-size: 12px;color: #909399;line-height: 1;padding-left: 10px;">建议不超过3年(1095天)</span>
</div>
......@@ -309,7 +309,7 @@
</div>
</div>
<!-- 自定义有效期 -->
<div class="form-child p20" v-if="ruleForm.userGeneralIntegralExpireRule == 0">
<div style="margin-top:10px;" class="form-child p20" v-if="ruleForm.userGeneralIntegralExpireRule == 0">
<div class="radio-cell mb20">
<el-radio class="yearY" v-model="ruleForm.integralExpireType" :label="2" @change="radioExpireType1">按年失效：</el-radio>
<label>每年获取的所有积分，在</label>
......@@ -341,7 +341,7 @@
<div class="radio-cell">
<el-radio class="integralGetEffectiveDays" v-model="ruleForm.integralExpireType" :label="0" @change="radioExpireType1">按天失效：</el-radio>
<label>每天获取的所有积分，在获取之日起</label>
<el-input placeholder="请输入" style="width:115px" v-model="ruleForm.integralGetEffectiveDays" @keyup.native="formatInput($event)"></el-input>
<el-input placeholder="请输入" style="width:115px" v-model="ruleForm.integralGetEffectiveDays" @keyup.native="formatInputNum($event)"></el-input>
<label>天后失效</label>
<span style="font-size: 12px;color: #909399;line-height: 1;padding-left: 10px;">建议不超过3年(1095天)</span>
</div>
......@@ -429,7 +429,7 @@ export default {
const dayList = ()=> {
let arr = []
for(let i = 1; i < 28; i++){
arr.push({key: i,value: i})
arr.push({key: `${i}`,value: `${i}`})
}
arr.push({key: '0', value: '月末'})
return arr;
......@@ -1534,6 +1534,9 @@ export default {
};
</script>
<style lang="scss" scoped>
.mt16 {
margin-top: 7px;
}
.selectwm {
width:120px;
margin:0 10px;
......
src/view/companyGroup/membershipSystem/editPointSystem.vue
......@@ -434,14 +434,14 @@
<el-form-item label="积分有效期:" prop="userGeneralIntegralExpireRule">
<el-radio v-model="ruleForm.userGeneralIntegralExpireRule" @change="radiouserGeneralIntegralExpireRule" :label="1">通用积分策略有效期</el-radio>
<el-radio v-model="ruleForm.userGeneralIntegralExpireRule" @change="radiouserGeneralIntegralExpireRule" :label="0">自定义有效期
<el-tooltip placement="right" effect="light">
<div slot="content" style="line-height:20px">
<p style="color:#595959 font-size:14px;font-weight:600">规则说明：</p>
<p style="color:#e6a23c">
<el-popover width="520" trigger="hover" placement="right">
<div style="line-height:20px">
<p style="color:#303133;font-size:12px;font-weight:600">规则说明：</p>
<p style="color:#e6a23c;font-size:12px;">
仅GIC计算积分时，配置的积分有效期才会生效，<br/>
ERP计算积分时，此配置项不生效；
</p>
<ul>
<ul style="color:#303133;font-size:12px;">
<li>1、永久有效：客户获取的积分永久有效，系统不会清零；</li>
<li>2、按年失效：在第X年的X月X日失效：例：设置第二年的12月1日失效，则2021年获取的所有积分在2022年12月1日失效；</li>
<li>3、按月失效：在第X个月的X日失效：例：设置第二月的1日失效，则3月获取的所有积分在4月1日失效；</li>
......@@ -449,16 +449,16 @@
<li>5、修改积分有效期后，已经获取的积分有效期不变，后续获取的积分按照修改后的积分有效期生效；</li>
</ul>
</div>
<i class="iconfont icon-QuestionCircleOutlined" style="font-size:12px;color:#606266;"></i>
</el-tooltip>
<i slot="reference" class="iconfont icon-QuestionCircleOutlined" style="font-size:14px;color:#606266;"></i>
</el-popover>
</el-radio>
<!-- 通用积分有效期 -->
<div v-if="ruleForm.userGeneralIntegralExpireRule == 1">
<div class="mt16" v-if="ruleForm.userGeneralIntegralExpireRule == 1">
<div class="radio-cell" v-if="timeType == 1">
<el-radio v-model="ruleForm.integralExpireType" label="1" @change="radioExpireType1" disabled="true">永久有效</el-radio>
<el-radio v-model="timeType" :label="1" @change="radioExpireType1" disabled="true">永久有效</el-radio>
</div>
<div class="radio-cell" v-else-if="timeType == 2">
<el-radio v-model="ruleForm.integralExpireType" label="2" disabled="true"><label>按年失效：</label></el-radio>
<el-radio v-model="timeType" :label="2" disabled="true"><label>按年失效：</label></el-radio>
<label>每年获取的所有积分，在</label>
<el-select v-model="yearYT" placeholder="请选择" style="width:120px;margin-right:20px" disabled="true">
<el-option v-for="n in yearList" :key="n.key" :label="n.value" :value="n.key"></el-option>
......@@ -474,7 +474,7 @@
<label>日失效</label>
</div>
<div class="radio-cell" v-else-if="timeType == 3">
<el-radio v-model="ruleForm.integralExpireType" label="3" disabled="true"><label>按月失效：</label></el-radio>
<el-radio v-model="timeType" :label="3" disabled="true"><label>按月失效：</label></el-radio>
<label>每月获取的所有积分，在</label>
<el-select v-model="mouthMT" placeholder="请选择" style="width:120px;margin-right:20px" disabled="true">
<el-option v-for="n in mouthList" :key="n.key" :label="n.value" :value="n.key"></el-option>
......@@ -486,9 +486,9 @@
<label>日失效</label>
</div>
<div class="radio-cell" v-else-if="timeType == 0 || timeType == null">
<el-radio v-model="ruleForm.integralExpireType" label="0" disabled="true">
<el-radio v-model="timeType" :label="0" disabled="true">
<label>每天获取的所有积分，在获取之日起</label></el-radio>
<el-input placeholder="请输入" style="width:115px" v-model="effectiveDays" @keyup.native="formatInput($event)" disabled="true"></el-input>
<el-input placeholder="请输入" style="width:115px" v-model="effectiveDays" @keyup.native="formatInputNum($event)" disabled="true"></el-input>
<label>天后失效</label>
<span style="font-size: 12px;color: #909399;line-height: 1;padding-left: 10px;">建议不超过3年(1095天)</span>
</div>
......@@ -497,7 +497,7 @@
</div>
</div>
<!-- 自定义有效期 -->
<div class="form-child" style="padding:20px" v-if="ruleForm.userGeneralIntegralExpireRule == 0">
<div class="form-child" style="padding:20px; margin-top:10px;" v-if="ruleForm.userGeneralIntegralExpireRule == 0">
<div class="radio-cell mb20">
<el-radio v-model="ruleForm.integralExpireType" :label="2" @change="radioExpireType1">按年失效：</el-radio>
<label>每年获取的所有积分，在</label>
......@@ -529,7 +529,7 @@
<div class="radio-cell">
<el-radio v-model="ruleForm.integralExpireType" :label="0" @change="radioExpireType1">按天失效：</el-radio>
<label>每天获取的所有积分，在获取之日起</label>
<el-input placeholder="请输入" style="width:115px" v-model="ruleForm.integralGetEffectiveDays" @keyup.native="formatInput($event)"></el-input>
<el-input placeholder="请输入" style="width:115px" v-model="ruleForm.integralGetEffectiveDays" @keyup.native="formatInputNum($event)"></el-input>
<label>天后失效</label>
<span style="font-size: 12px;color: #909399;line-height: 1;padding-left: 10px;">建议不超过3年(1095天)</span>
</div>
......@@ -627,7 +627,7 @@ export default {
const dayList = ()=> {
let arr = []
for(let i = 1; i < 28; i++){
arr.push({key: i,value: i})
arr.push({key: `${i}`,value: `${i}`})
}
arr.push({key: '0', value: '月末'})
return arr;
......@@ -1861,6 +1861,9 @@ export default {
};
</script>
<style lang="scss" scoped>
.mt16 {
margin-top: 6px;
}
.selectwm {
width:120px;
margin:0 10px;
......
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