Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
T
tl_estate
Project
Project
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
hujun
tl_estate
Commits
0a25f431
Commit
0a25f431
authored
Nov 06, 2018
by
agping
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
分佣提成 加提示
parent
00f69041
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
6 deletions
+22
-6
account_statement.html
application/index/view/finance/account_statement.html
+1
-0
shopList.vue
public/appnew/src/components/shop/shopList.vue
+21
-6
No files found.
application/index/view/finance/account_statement.html
View file @
0a25f431
...
@@ -350,6 +350,7 @@
...
@@ -350,6 +350,7 @@
</table>
</table>
<div
class=
"detail-modal-maid-bottom-btn-area text-right"
>
<div
class=
"detail-modal-maid-bottom-btn-area text-right"
>
<span
class=
"text-danger"
style=
"float: left;"
>
注:晚上11:00—12:00维护期间,提交和修改的业绩无法统计,请避免在此期间提交和修改业绩
</span>
<div
href=
"#modal_date_select"
data-toggle=
"modal"
>
打开收佣日期选择框(默认隐藏)
</div>
<div
href=
"#modal_date_select"
data-toggle=
"modal"
>
打开收佣日期选择框(默认隐藏)
</div>
<a
id=
"maid_ok_btn"
class=
"btn btn-primary"
data-toggle=
"modal"
>
确认分佣
</a>
<a
id=
"maid_ok_btn"
class=
"btn btn-primary"
data-toggle=
"modal"
>
确认分佣
</a>
<a
id=
"maid_save_btn"
class=
"btn btn-primary"
data-toggle=
"modal"
>
保存
</a>
<a
id=
"maid_save_btn"
class=
"btn btn-primary"
data-toggle=
"modal"
>
保存
</a>
...
...
public/appnew/src/components/shop/shopList.vue
View file @
0a25f431
...
@@ -3,8 +3,8 @@
...
@@ -3,8 +3,8 @@
<nav>
<nav>
<div
class=
"top-city-select-area flex-center"
>
<div
class=
"top-city-select-area flex-center"
>
<select
@
change=
"changeCity"
>
<select
@
change=
"changeCity"
>
<option
value=
"
10001
"
>
上海市
</option>
<option
value=
"
上海市
"
>
上海市
</option>
<option
value=
"
10002
"
>
杭州市
</option>
<option
value=
"
杭州市
"
>
杭州市
</option>
</select>
</select>
</div>
</div>
<div
class=
"nav-main"
>
<div
class=
"nav-main"
>
...
@@ -40,9 +40,12 @@
...
@@ -40,9 +40,12 @@
</main>
</main>
<div
class=
"mark-shop-choose"
v-for=
"(item, index) in mainDataChoose"
:key=
"item.title"
v-show=
"(initTabNumMainChoose == index) && item.isShow"
>
<div
class=
"mark-shop-choose"
v-for=
"(item, index) in mainDataChoose"
:key=
"item.title"
v-show=
"(initTabNumMainChoose == index) && item.isShow"
>
<div
v-show=
"index == 0"
>
<div
v-show=
"index == 0"
>
<ul
class=
"mark-shop-choose-ul"
>
<ul
class=
"mark-shop-choose-ul
mark-shop-choose-ul-left
"
>
<li>
区域
</li>
<li>
区域
</li>
</ul>
</ul>
<ul
class=
"mark-shop-choose-ul mark-shop-choose-ul-right"
>
<li>
商圈
</li>
</ul>
</div>
</div>
<div
v-show=
"index == 1"
>
<div
v-show=
"index == 1"
>
<ul
class=
"mark-shop-choose-ul"
>
<ul
class=
"mark-shop-choose-ul"
>
...
@@ -108,7 +111,7 @@
...
@@ -108,7 +111,7 @@
initTabNumYeTai
:
''
,
initTabNumYeTai
:
''
,
initTabNumArea
:
''
,
initTabNumArea
:
''
,
initTabNumRent
:
''
,
initTabNumRent
:
''
,
init
TabCity
:
'
'
,
init
SelectCity
:
'上海市
'
,
mainDataChoose
:[{
mainDataChoose
:[{
'title'
:
'区域'
,
'title'
:
'区域'
,
'isShow'
:
false
,
'isShow'
:
false
,
...
@@ -189,7 +192,7 @@
...
@@ -189,7 +192,7 @@
url
:
'/api/filtrateConditionV2'
,
url
:
'/api/filtrateConditionV2'
,
responseType
:
'json'
,
responseType
:
'json'
,
data
:
{
data
:
{
'city'
:
_this
.
init
Tab
City
,
'city'
:
_this
.
init
Select
City
,
}
}
})
})
.
then
(
function
(
response
)
{
.
then
(
function
(
response
)
{
...
@@ -223,7 +226,8 @@
...
@@ -223,7 +226,8 @@
},
},
changeCity
(
c
)
{
changeCity
(
c
)
{
let
_this
=
this
;
let
_this
=
this
;
_this
.
initTabCity
=
c
.
target
.
value
;
_this
.
initSelectCity
=
c
.
target
.
value
;
_this
.
getChooseList
();
},
},
tabYeTai
(
index
){
tabYeTai
(
index
){
let
_this
=
this
;
let
_this
=
this
;
...
@@ -497,5 +501,16 @@
...
@@ -497,5 +501,16 @@
color
:
#1A1A1A
;
color
:
#1A1A1A
;
width
:
1.8rem
;
width
:
1.8rem
;
}
}
.mark-shop-choose-ul-left
,
.mark-shop-choose-ul-right
{
width
:
50%
;
float
:
left
;
}
.mark-shop-choose-ul-right
{
text-align
:
center
;
}
.mark-shop-choose-ul-left
{
padding-left
:
.62rem
;
box-sizing
:
border-box
;
}
</
style
>
</
style
>
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