Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
clique-web
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
clique
clique-web
Commits
f97df62e
Commit
f97df62e
authored
Jun 23, 2022
by
huaying
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix; 特殊积分获取策略编辑
parent
034b6e5b
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
72 additions
and
32 deletions
+72
-32
point-form.vue
src/components/memberShip/point-form.vue
+20
-6
addIntegralSytem.vue
src/view/companyGroup/membershipSystem/addIntegralSytem.vue
+13
-10
addPointSystem.vue
src/view/companyGroup/membershipSystem/addPointSystem.vue
+26
-10
editIntegralSytem.vue
src/view/companyGroup/membershipSystem/editIntegralSytem.vue
+13
-6
editPointSystem.vue
src/view/companyGroup/membershipSystem/editPointSystem.vue
+0
-0
No files found.
src/components/memberShip/point-form.vue
View file @
f97df62e
<
template
>
<
template
>
<div
class=
"form-wrap"
>
<div>
<div
class=
"form-wrap"
style=
"margin-bottom:180px;"
>
<el-form
:model=
"ruleForm"
:rules=
"rules"
ref=
"ruleForm"
label-width=
"90px"
class=
"demo-ruleForm"
>
<el-form
:model=
"ruleForm"
:rules=
"rules"
ref=
"ruleForm"
label-width=
"90px"
class=
"demo-ruleForm"
>
<dm-sub-title
type=
"fill"
text=
"积分获取策略"
style=
"margin-bottom: 20px;margin-top:10px;"
/>
<dm-sub-title
type=
"fill"
text=
"积分获取策略"
style=
"margin-bottom: 20px;margin-top:10px;"
/>
<el-form-item
label=
"获取规则:"
prop=
"integralGetStatus"
>
<el-form-item
label=
"获取规则:"
prop=
"integralGetStatus"
>
...
@@ -92,17 +93,18 @@
...
@@ -92,17 +93,18 @@
<el-input
v-model=
"ruleForm.effectiveTime"
@
keyup
.
native=
"formatInput($event)"
></el-input><label>
天
</label>
<span
style=
"font-size: 12px;color: #828282;line-height: 1;padding-left: 10px;"
>
适用于所有方式获取的积分
</span>
<el-input
v-model=
"ruleForm.effectiveTime"
@
keyup
.
native=
"formatInput($event)"
></el-input><label>
天
</label>
<span
style=
"font-size: 12px;color: #828282;line-height: 1;padding-left: 10px;"
>
适用于所有方式获取的积分
</span>
</el-form-item>
</el-form-item>
<dm-sub-title
type=
"fill"
text=
"积分说明"
style=
"margin-bottom: 20px; margin-top:40px;"
/>
<dm-sub-title
type=
"fill"
text=
"积分说明"
style=
"margin-bottom: 20px; margin-top:40px;"
/>
<el-form-item
label=
""
prop=
"desc"
class=
"margin-20"
>
<el-form-item
label=
""
label-width=
"0"
prop=
"desc"
class=
"margin-20"
>
<div
class=
"tinymce-wrap"
>
<div
class=
"tinymce-wrap"
>
<editor
id=
"tinymce"
v-model=
"ruleForm.integralScript"
:init=
"init"
></editor>
<editor
id=
"tinymce"
v-model=
"ruleForm.integralScript"
:init=
"init"
></editor>
</div>
</div>
<!--
<div
v-html=
'tinymceHtml'
></div>
-->
<!--
<div
v-html=
'tinymceHtml'
></div>
-->
</el-form-item>
</el-form-item>
<el-form-item
style=
"margin-bottom: 48px"
>
<el-button
:disabled=
"contactBool"
type=
"primary"
@
click=
"submitForm('ruleForm')"
>
保存
</el-button>
</el-form-item>
</el-form>
</el-form>
</div>
</div>
<div
class=
"bottom"
>
<el-button
:disabled=
"contactBool"
type=
"primary"
@
click=
"submitForm('ruleForm')"
style=
"margin:13px 0 0 -220px;"
>
保存
</el-button>
</div>
</div>
</
template
>
</
template
>
<
script
type=
"text/javascript"
>
<
script
type=
"text/javascript"
>
import
{
postRequest
,
postForm
}
from
'@/api/api'
;
import
{
postRequest
,
postForm
}
from
'@/api/api'
;
...
@@ -452,6 +454,17 @@ export default {
...
@@ -452,6 +454,17 @@ export default {
};
};
</
script
>
</
script
>
<
style
lang=
"less"
scoped
>
<
style
lang=
"less"
scoped
>
.bottom
{
position
:
fixed
;
bottom
:
0px
;
left
:
200px
;
width
:
100%
;
height
:
55px
;
//
margin
:
25px
;
text-align
:
center
;
background
:
#FFFFFF
;
box-shadow
:
1px
-2px
8px
0px
rgba
(
220
,
223
,
230
,
0.6
);
}
.form-wrap
{
.form-wrap
{
.el-radio
{
.el-radio
{
margin-right
:
0
;
margin-right
:
0
;
...
@@ -492,7 +505,8 @@ export default {
...
@@ -492,7 +505,8 @@ export default {
}
}
.tinymce-wrap
{
.tinymce-wrap
{
width
:
890px
;
width
:
1000px
;
height
:
254px
;
/deep/
.mce-tinymce
{
/deep/
.mce-tinymce
{
-webkit-box-shadow
:
none
;
-webkit-box-shadow
:
none
;
...
...
src/view/companyGroup/membershipSystem/addIntegralSytem.vue
View file @
f97df62e
...
@@ -232,17 +232,10 @@
...
@@ -232,17 +232,10 @@
</el-date-picker>
</el-date-picker>
</div>
</div>
</el-form-item>
</el-form-item>
<el-form-item>
<el-row>
<el-button
:disabled=
"tpnEditBool"
type=
"primary"
@
click=
"submitForm('ruleForm')"
>
保 存
</el-button>
<el-button
@
click=
"goBack"
>
返 回
</el-button>
</el-row>
</el-form-item>
</el-form>
</el-form>
<div
class=
"bottom"
>
<el-button
:disabled=
"tpnEditBool"
type=
"primary"
@
click=
"submitForm('ruleForm')"
style=
"margin:13px 0 0 -220px;"
>
保 存
</el-button>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
...
@@ -1045,6 +1038,16 @@ export default {
...
@@ -1045,6 +1038,16 @@ export default {
};
};
</
script
>
</
script
>
<
style
lang=
"less"
scoped
>
<
style
lang=
"less"
scoped
>
.bottom
{
position
:
fixed
;
bottom
:
0px
;
left
:
200px
;
width
:
100%
;
height
:
55px
;
text-align
:
center
;
background
:
#FFFFFF
;
box-shadow
:
1px
-2px
8px
0px
rgba
(
220
,
223
,
230
,
0.6
);
}
.right-box
{
.right-box
{
padding
:
20px
;
padding
:
20px
;
}
}
...
...
src/view/companyGroup/membershipSystem/addPointSystem.vue
View file @
f97df62e
...
@@ -253,7 +253,8 @@
...
@@ -253,7 +253,8 @@
<el-radio
v-model=
"ruleForm.perpetualFlag"
:label=
"1"
>
永久有效
</el-radio>
<el-radio
v-model=
"ruleForm.perpetualFlag"
:label=
"1"
>
永久有效
</el-radio>
<el-radio
v-model=
"ruleForm.perpetualFlag"
:label=
"0"
>
<el-radio
v-model=
"ruleForm.perpetualFlag"
:label=
"0"
>
在该时段内有效
在该时段内有效
<el-date-picker
</el-radio>
<div
style=
"marginTop:10px;"
><el-date-picker
v-if=
"ruleForm.perpetualFlag === 0"
v-if=
"ruleForm.perpetualFlag === 0"
v-model=
"ruleForm.perpetualDate"
v-model=
"ruleForm.perpetualDate"
type=
"datetimerange"
type=
"datetimerange"
...
@@ -262,14 +263,16 @@
...
@@ -262,14 +263,16 @@
format=
"yyyy-MM-dd HH:mm:ss"
format=
"yyyy-MM-dd HH:mm:ss"
value-format=
"timestamp"
value-format=
"timestamp"
:default-time=
"['00:00:00', '23:59:59']"
>
:default-time=
"['00:00:00', '23:59:59']"
>
</el-date-picker>
</el-date-picker></div>
</el-radio>
</el-form-item>
</el-form-item>
<
el-form-item
>
<
!-- <el-form-item style="bottom"
>
<el-button
:disabled=
"tpnEditBool"
type=
"primary"
@
click=
"submitForm('ruleForm')"
>
保 存
</el-button>
<el-button :disabled="tpnEditBool" type="primary" @click="submitForm('ruleForm')"
style="margin:13px 0 0 -220px;"
>保 存</el-button>
<el-button @click="goBack">返 回</el-button>
<el-button @click="goBack">返 回</el-button>
</el-form-item>
</el-form-item>
-->
</el-form>
</el-form>
<div
class=
"bottom"
>
<el-button
:disabled=
"tpnEditBool"
type=
"primary"
@
click=
"submitForm('ruleForm')"
style=
"margin:13px 0 0 -220px;"
>
保 存
</el-button>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
...
@@ -1282,6 +1285,19 @@ export default {
...
@@ -1282,6 +1285,19 @@ export default {
};
};
</
script
>
</
script
>
<
style
lang=
"scss"
scoped
>
<
style
lang=
"scss"
scoped
>
.bottom
{
position
:
fixed
;
bottom
:
0px
;
left
:
200px
;
width
:
100%
;
height
:
55px
;
text-align
:
center
;
background
:
#FFFFFF
;
box-shadow
:
1px
-2px
8px
0px
rgba
(
220
,
223
,
230
,
0.6
);
}
.el-radio
{
margin-right
:
0
;
}
.setting-tips
{
.setting-tips
{
margin-left
:
16px
;
margin-left
:
16px
;
font-size
:
12px
;
font-size
:
12px
;
...
@@ -1290,7 +1306,7 @@ export default {
...
@@ -1290,7 +1306,7 @@ export default {
line-height
:
17px
;
line-height
:
17px
;
}
}
.attention-wrap
{
.attention-wrap
{
padding
:
2
4px
32
px
;
padding
:
2
0
px
;
background
:
#fff
;
background
:
#fff
;
-webkit-box-sizing
:
border-box
;
-webkit-box-sizing
:
border-box
;
-moz-box-sizing
:
border-box
;
-moz-box-sizing
:
border-box
;
...
@@ -1310,13 +1326,13 @@ export default {
...
@@ -1310,13 +1326,13 @@ export default {
vertical-align
:
top
;
vertical-align
:
top
;
width
:
300px
;
width
:
300px
;
}
}
.attention-content-wrap
{
//
.attention-content-wrap
{
}
//
}
}
}
.form-wrap
{
.form-wrap
{
.el-input
{
.el-input
{
width
:
1
78
px
;
width
:
1
15
px
;
padding
:
0
10px
;
padding
:
0
10px
;
&.w-300
{
&.w-300
{
width
:
300px
;
width
:
300px
;
...
...
src/view/companyGroup/membershipSystem/editIntegralSytem.vue
View file @
f97df62e
...
@@ -225,13 +225,10 @@
...
@@ -225,13 +225,10 @@
></el-date-picker>
></el-date-picker>
</div>
</div>
</el-form-item>
</el-form-item>
<el-form-item>
<el-row>
<el-button
:disabled=
"tpnEditBool"
type=
"primary"
@
click=
"submitForm('ruleForm')"
>
保 存
</el-button>
<el-button
@
click=
"goBack"
>
返 回
</el-button>
</el-row>
</el-form-item>
</el-form>
</el-form>
<div
class=
"bottom"
>
<el-button
:disabled=
"tpnEditBool"
type=
"primary"
@
click=
"submitForm('ruleForm')"
style=
"margin:13px 0 0 -220px;"
>
保 存
</el-button>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
...
@@ -1141,6 +1138,16 @@ export default {
...
@@ -1141,6 +1138,16 @@ export default {
};
};
</
script
>
</
script
>
<
style
lang=
"less"
scoped
>
<
style
lang=
"less"
scoped
>
.bottom
{
position
:
fixed
;
bottom
:
0px
;
left
:
200px
;
width
:
100%
;
height
:
55px
;
text-align
:
center
;
background
:
#FFFFFF
;
box-shadow
:
1px
-2px
8px
0px
rgba
(
220
,
223
,
230
,
0.6
);
}
.right-box
{
.right-box
{
padding
:
20px
;
padding
:
20px
;
}
}
...
...
src/view/companyGroup/membershipSystem/editPointSystem.vue
View file @
f97df62e
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment