Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
H
hls-xcmg-vue-app
Project
Project
Details
Activity
Releases
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
xugong
hls-xcmg-vue-app
Commits
acf5eafa
Commit
acf5eafa
authored
Nov 08, 2019
by
786817560
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
'scroll修改、经销商还款计划页面升级、我的收藏列表升级'
parent
dde74047
Changes
7
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
489 additions
and
288 deletions
+489
-288
contract-records.vue
src/pages/contractInquire/contract-records.vue
+8
-2
contract-signing.vue
src/pages/contractSigning/contract-signing.vue
+12
-2
contract-list.vue
src/pages/distributorSign/contract-list.vue
+24
-9
financ-details.vue
src/pages/distributorSign/financ-details.vue
+343
-202
financing-trial.vue
src/pages/financingTrial/financing-trial.vue
+10
-3
my-product-list.Vue
src/pages/myProductCollection/my-product-list.Vue
+81
-67
product-list.vue
src/pages/productQuery/product-list.vue
+11
-3
No files found.
src/pages/contractInquire/contract-records.vue
View file @
acf5eafa
<!--
* @Author: your name
* @Date: 2019-10-31 09:49:57
* @LastEditTime: 2019-1
0-31 16:58:23
* @LastEditTime: 2019-1
1-08 15:16:00
* @LastEditors: Please set LastEditors
* @Description: 合同查询--记录
* @FilePath:
...
...
@@ -30,7 +30,10 @@
</div>
<h-content
v-if=
"data!==null"
class=
"pay-content"
>
<scroll
ref=
"scrollList"
>
<scroll
ref=
"scroll"
:updateData=
"[lists]"
:pullUp=
"true"
>
<div
v-for=
"(item,index) in lists"
:key=
"index"
class=
"contract-item"
>
<div
class=
"header"
>
...
...
@@ -116,6 +119,9 @@ export default {
vm
.
data
=
1
}
vm
.
lists
=
res
.
lists
if
(
res
.
lists
.
length
>
0
&&
res
.
lists
.
length
<
10
)
{
vm
.
$refs
.
scroll
.
update
(
true
)
}
}
else
{
hlsPopup
.
showLongCenter
(
res
.
message
)
}
...
...
src/pages/contractSigning/contract-signing.vue
View file @
acf5eafa
<!--
* @Author: your name
* @Date: 2019-09-29 10:02:11
* @LastEditTime: 2019-11-08 1
0:42:48
* @LastEditTime: 2019-11-08 1
4:49:14
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
-->
...
...
@@ -26,7 +26,9 @@
<h-content
v-if=
"num === 1"
>
<scroll
ref=
"scrollList"
ref=
"scroll"
:updateData=
"[submitLists]"
:pullUp=
"true"
>
<div
class=
"wrap"
>
<div
v-for=
"(item,index) in submitLists"
:key=
"index"
class=
"contract-lists"
>
...
...
@@ -51,6 +53,8 @@
<h-content
v-if=
"num === 2"
>
<scroll
ref=
"scrollList"
:updateData=
"[approvedLists]"
:pullUp=
"true"
>
<div
class=
"wrap"
>
<div
v-for=
"(item,index) in approvedLists"
:key=
"index"
class=
"contract-lists"
>
...
...
@@ -125,6 +129,12 @@ export default {
if
(
res
.
result
===
'S'
)
{
vm
.
submitLists
=
res
.
lists
.
filter
(
item
=>
item
.
confirm_status
===
'SUBMIT'
)
vm
.
approvedLists
=
res
.
lists
.
filter
(
item
=>
item
.
confirm_status
===
'APPROVED'
)
if
(
vm
.
submitLists
.
length
>
0
&&
vm
.
submitLists
.
length
<
10
)
{
vm
.
$refs
.
scroll
.
update
(
true
)
}
if
(
vm
.
approvedLists
.
length
>
0
&&
vm
.
approvedLists
.
length
<
10
)
{
vm
.
$refs
.
scrollList
.
update
(
true
)
}
}
else
{
hlsPopup
.
showLongCenter
(
res
.
message
)
}
...
...
src/pages/distributorSign/contract-list.vue
View file @
acf5eafa
...
...
@@ -21,7 +21,9 @@
</div>
<h-content
v-if=
"tabNum === 0"
>
<scroll
ref=
"scrollList"
ref=
"scroll"
:updateData=
"[submitLists]"
:pullUp=
"true"
>
<div
class=
"wrap"
>
<div
v-for=
"(item,index) in submitLists"
:key=
"index"
class=
"contract-lists"
>
...
...
@@ -46,6 +48,8 @@
<h-content
v-if=
"tabNum === 1"
>
<scroll
ref=
"scrollList"
:updateData=
"[approvedLists]"
:pullUp=
"true"
>
<div
class=
"wrap"
>
<div
v-for=
"(item,index) in approvedLists"
:key=
"index"
class=
"contract-lists"
>
...
...
@@ -86,6 +90,11 @@ export default {
}
},
created
()
{
this
.
getLists
()
},
methods
:
{
// 查询签约列表
getLists
()
{
let
vm
=
this
let
url
=
$config
.
basePath
+
'prj_confirm_list_query'
let
param
=
{
...
...
@@ -97,11 +106,17 @@ export default {
if
(
res
.
result
===
'S'
)
{
vm
.
submitLists
=
res
.
lists
.
filter
(
item
=>
item
.
confirm_status
===
'SUBMIT'
)
vm
.
approvedLists
=
res
.
lists
.
filter
(
item
=>
item
.
confirm_status
===
'APPROVED'
)
// vm.lists = res.lists
if
(
vm
.
submitLists
.
length
>
0
&&
vm
.
submitLists
.
length
<
10
)
{
vm
.
$refs
.
scroll
.
update
(
true
)
}
if
(
vm
.
approvedLists
.
length
>
0
&&
vm
.
approvedLists
.
length
<
10
)
{
vm
.
$refs
.
scrollList
.
update
(
true
)
}
}
else
{
hlsPopup
.
showLongCenter
(
res
.
message
)
}
})
},
methods
:
{
goDetails
(
item
)
{
window
.
sessionStorage
.
setItem
(
'bp_class'
,
item
.
bp_class
)
window
.
sessionStorage
.
setItem
(
'project_id'
,
item
.
project_id
)
...
...
src/pages/distributorSign/financ-details.vue
View file @
acf5eafa
This diff is collapsed.
Click to expand it.
src/pages/financingTrial/financing-trial.vue
View file @
acf5eafa
...
...
@@ -2,7 +2,7 @@
* @Descrip 融资试算
* @Author: your name
* @Date: 2019-09-29 17:09:49
* @LastEditTime: 2019-11-0
7 17:02:01
* @LastEditTime: 2019-11-0
8 14:42:12
* @LastEditors: Please set LastEditors
-->
<
template
>
...
...
@@ -20,9 +20,10 @@
<input
type=
"text"
placeholder=
"请输入产品名称"
>
</div>
<scroll
ref=
"scrollList"
ref=
"scroll"
:updateData=
"[lists]"
:pullUp=
"true"
>
<section
v-for=
"(item,index) in lists"
:key=
"index"
>
<div
class=
"descript"
@
click=
"goDetails(item.product_plan_id)"
>
<img
src=
"@/assets/trial/product.png"
alt=
""
>
...
...
@@ -114,6 +115,9 @@ export default {
vm
.
hlsPopup
.
hideLoading
()
if
(
res
.
result
===
'S'
)
{
vm
.
lists
=
res
.
lists
if
(
res
.
lists
.
length
>
0
&&
res
.
lists
.
length
<
10
)
{
vm
.
$refs
.
scroll
.
update
(
true
)
}
}
else
{
hlsPopup
.
showLongCenter
(
res
.
message
)
}
...
...
@@ -126,6 +130,9 @@ export default {
vm
.
hlsPopup
.
hideLoading
()
if
(
res
.
result
===
'S'
)
{
vm
.
lists
=
res
.
lists
if
(
res
.
lists
.
length
>
0
&&
res
.
lists
.
length
<
10
)
{
vm
.
$refs
.
scroll
.
update
(
true
)
}
}
else
{
hlsPopup
.
showLongCenter
(
res
.
message
)
}
...
...
src/pages/myProductCollection/my-product-list.Vue
View file @
acf5eafa
<!--
* @Author: your name
* @Date: 2019-10-22 20:26:28
* @LastEditTime: 2019-10-29 10:08:31
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \hls-xcmg-vue-app\src\pages\myProductCollection\my-product-list.Vue
-->
/**
* @Author Sean
...
...
@@ -26,30 +18,36 @@
<img
src=
"@/assets/distributorSign/search.png"
alt=
""
>
</div>
</div>
<list-item
v-for=
"item in productList"
:key=
"item.product_id"
>
<scroll
ref=
"scroll"
:updateData=
"[productList]"
:pullUp=
"true"
>
<div
class=
"division-box"
>
<list-item
v-for=
"(item,index) in productList"
:key=
"index"
>
<item
:proportion=
"[1,4]"
@
click
.
native=
"goDetailed(item.product_id,item.collect_status,item.bp_id)"
>
<div
slot=
"name"
class=
"item-pic"
>
<img
src=
"@/assets/homePage/WechatIMG2 Copy@2x.png"
alt=
""
>
</div>
<div
slot=
"content"
class=
"item-content"
>
<div
class=
"pro-name"
>
<p>
{{
item
.
product_name
}}
</p>
<img
class=
"arrow"
src=
"@/assets/productQuery/getIn.png"
alt=
""
>
</div>
<div
class=
"centers"
>
<p
class=
"firsts1"
>
经销商
</p>
<p
class=
"firsts1"
>
{{
item
.
bp_type_n
}}
</p>
<p
class=
"seconds1"
>
{{
item
.
bp_name
}}
</p>
</div>
<div
class=
"centers"
>
<p
class=
"firsts1"
>
参数项
</p>
<p
class=
"seconds1"
>
{{
item
.
product_code
}}
</p>
</div>
<div
class=
"centers"
>
<p
class=
"firsts1"
>
产品名称
</p>
<p
class=
"seconds1"
>
{{
item
.
product_name
}}
</p>
</div>
</div>
<div
slot=
"right-icon"
>
<img
class=
"arrow"
src=
"@/assets/productQuery/getIn.png"
alt=
""
>
</div>
</item>
</list-item>
</div>
</scroll>
</h-content>
</h-view>
</
template
>
...
...
@@ -89,6 +87,9 @@ export default {
hlsPopup
.
hideLoading
()
if
(
res
.
result
===
'S'
)
{
vm
.
productList
=
res
.
lists
if
(
res
.
lists
.
length
>
0
&&
res
.
lists
.
length
<
10
)
{
vm
.
$refs
.
scroll
.
update
(
true
)
}
}
else
{
hlsPopup
.
showLongCenter
(
res
.
message
)
}
...
...
@@ -144,11 +145,11 @@ export default {
}
}
}
.arrow
{
width: 16
px;
height: 16px;
// margin-left: 30px;
margin-top: 16
px;
.division-box
{
padding: 8
px;
}
.hls-list-item {
border-radius: 4
px;
}
.item-pic {
width: 100px;
...
...
@@ -159,28 +160,39 @@ export default {
}
}
.item-content {
// height: 102px;
width: 100%;
margin-left: 20px;
.centers:nth-of-type(1) {
margin-top: 16px;
.pro-name {
height: 42px;
width: 100%;
position: relative;
border-bottom: 1px solid #F3F3F7;
.arrow {
position: absolute;
width: 16px;
height: 16px;
right: 0;
top: 13px;
}
.centers:nth-of-type(2) {
margin-top: 6px;
p {
height: 42px;
line-height: 42px;
font-family: PingFangSC-Semibold;
font-size: 15px;
color: #4B4A4B;
letter-spacing: 0;
font-weight: 600;
}
.centers:nth-of-type(3) {
margin-top: 6px;
}
.centers {
// margin-top: 6px;
// white-space: nowrap;
// width: 100%;
font-family: PingFangSC-Semibold;
font-size: 13px;
color: rgba(56,63,69,0.60);
letter-spacing: 0.5px;
display: flex;
flex-direction: row;
margin-top: 8px;
.firsts1 {
width: 60px;
height: 17px;
...
...
@@ -194,8 +206,10 @@ export default {
height: auto;
font-family: PingFangSC-Regular;
font-size: 13px;
color: #383F45
;
color: #4B4A4B
;
}
}
}
</
style
>
src/pages/productQuery/product-list.vue
View file @
acf5eafa
...
...
@@ -18,6 +18,12 @@
<img
src=
"@/assets/distributorSign/search.png"
alt=
""
>
</div>
</div>
<scroll
ref=
"scroll"
:updateData=
"[lists]"
:pullUp=
"true"
>
<div
class=
"division-box"
>
<list-item
v-for=
"(item,index) in lists"
:key=
"index"
>
...
...
@@ -39,10 +45,10 @@
<p
class=
"seconds1"
>
{{
item
.
product_code
}}
</p>
</div>
</div>
<div
slot=
"right-icon"
/>
</item>
</list-item>
</div>
</scroll>
</h-content>
</h-view>
</
template
>
...
...
@@ -78,6 +84,9 @@ export default {
res
.
lists
.
forEach
(
item
=>
{
item
[
'url'
]
=
process
.
env
.
filePath
+
'attachment_id='
+
item
.
product_attachment_id
+
'&access_token='
+
window
.
localStorage
.
access_token
})
if
(
res
.
lists
.
length
>
0
&&
res
.
lists
.
length
<
10
)
{
vm
.
$refs
.
scroll
.
update
(
true
)
}
// vm.picLists = res.lists
// console.log('........',vm.picLists)
}
else
{
...
...
@@ -137,8 +146,7 @@ export default {
.division-box {
padding: 8px;
}
.hls-list-item
{
.hls-list-item {
border-radius: 4px;
}
.item-pic {
...
...
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