Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
H
hs-app-project
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
李星剑
hs-app-project
Commits
3c5161bc
Commit
3c5161bc
authored
Feb 15, 2022
by
DongRuifen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
我的面料
parent
3be9fdea
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
933 additions
and
377 deletions
+933
-377
index.js
src/config/request/apiList/plm/index.js
+4
-2
index.js
src/config/request/apiList/plm/materialinfo/index.js
+45
-0
pages.json
src/pages.json
+28
-0
fabricTitle.vue
src/pages/home/components/fabricTitle.vue
+82
-48
detail.vue
src/pages/home/detail.vue
+254
-0
editFabric.vue
src/pages/home/editFabric.vue
+127
-0
fabricList.vue
src/pages/home/fabricList.vue
+33
-6
index.vue
src/pages/home/index.vue
+359
-320
login.vue
src/pages/user/login/login.vue
+1
-1
backimg.png
src/static/images/home/backimg.png
+0
-0
No files found.
src/config/request/apiList/plm/index.js
View file @
3c5161bc
...
...
@@ -10,10 +10,12 @@
import
stylelibraryorder
from
'./stylelibraryorder/index'
import
modelingtask
from
'./modelingtask'
import
mobileBrand
from
'./mobileBrand'
import
branddevelop
from
"./branddevelop"
;
import
materialinfo
from
'./materialinfo'
// import branddevelop from "./branddevelop";
export
default
{
...
stylelibraryorder
,
...
modelingtask
,
...
mobileBrand
,
...
branddevelop
...
materialinfo
,
// ...branddevelop
}
src/config/request/apiList/plm/materialinfo/index.js
0 → 100644
View file @
3c5161bc
import
config
from
"../config/index"
;
let
className
=
'materialinfo'
let
baseUrl
=
`
${
config
.
baseUrl
}
/
${
className
}
`
export
default
{
[
className
]:
{
'getMaterialList'
:
{
url
:
`
${
baseUrl
}
/getMaterialList`
,
method
:
"post"
,
},
'getMaterialById'
:
{
url
:
`
${
baseUrl
}
/getMaterialById`
,
method
:
"get"
,
},
// 'updateMaterial': {
// url: `${baseUrl}/updateMaterial`,
// method: "post",
// },
},
// 品类接口
category
:
{
query
:
{
url
:
"/gdep-mdm/category/query"
,
method
:
"post"
}
},
// 数据字典
dict
:
{
dictionaryList
:
{
url
:
"/gdep-system/dict/dictionaryList"
,
method
:
"post"
}
},
modelingtask
:
{
materialDetail
:
{
url
:
"/gdep-plm/modelingtask/materialDetail"
,
method
:
"get"
}
},
info
:
{
updateMaterial
:
{
url
:
"/gdep-mdm/materialinfo/updateMaterial"
,
method
:
"post"
}
},
}
\ No newline at end of file
src/pages.json
View file @
3c5161bc
...
...
@@ -296,6 +296,34 @@
}
}
},
{
"path"
:
"pages/home/detail"
,
"style"
:
{
"navigationBarTitleText"
:
"面料详情"
,
"navigationBarTextStyle"
:
"white"
,
"enablePullDownRefresh"
:
false
,
"navigationStyle"
:
"custom"
,
"mp-alipay"
:
{
"transparentTitle"
:
"always"
,
"titlePenetrate"
:
"YES"
,
"allowsBounceVertical"
:
"NO"
}
}
},
{
"path"
:
"pages/home/editFabric"
,
"style"
:
{
"navigationBarTitleText"
:
"编辑面料信息"
,
"navigationBarTextStyle"
:
"white"
,
"enablePullDownRefresh"
:
false
,
"navigationStyle"
:
"custom"
,
"mp-alipay"
:
{
"transparentTitle"
:
"always"
,
"titlePenetrate"
:
"YES"
,
"allowsBounceVertical"
:
"NO"
}
}
},
{
"path"
:
"pages/home/fabricDetails"
,
"style"
:
{
...
...
src/pages/home/components/fabricTitle.vue
View file @
3c5161bc
<
template
>
<view>
<view
class=
"home_con_content_order u-m-t-30"
v-for=
"item in tableData"
>
<view
class=
"home_con_content_order u-m-t-30"
v-for=
"item,index in tableData"
@
click=
"goDetail(item)"
:key=
"index"
>
<image
style=
"width: 100%;height: 160rpx;"
src=
"../../../static/images/home/1@2x.png"
mode=
""
></image>
<view
class=
"order_tit"
>
<view
class=
"u-flex justify-between u-font-32"
>
<span
class=
"color_DDA973 ov_hiden"
>
加厚荷兰绒绒布布料备份加厚荷兰绒绒布布料备份
</span>
<span><u-icon
size=
"24"
color=
"#fff"
name=
"arrow-right"
></u-icon></span>
<span
class=
"color_DDA973 ov_hiden"
>
{{
item
.
materialName
}}
</span>
<span>
<u-icon
size=
"24"
color=
"#fff"
name=
"arrow-right"
></u-icon>
</span>
</view>
<view
class=
"u-font-24 u-m-t-20 color_6F6F72"
>
<span
class=
"u-m-r-10"
>
针织
</span>
<span
v-for=
"itemMater,indexMater in dataList"
:key=
"indexMater"
>
<span
class=
"u-m-r-10"
v-if=
"itemMater.id==item.category"
>
{{
itemMater
.
name
}}
</span></span>
|
<span
class=
"u-m-l-10 u-m-r-10"
>
180
cm
</span>
<span
class=
"u-m-l-10 u-m-r-10"
>
{{
item
.
clothWidth
}}
cm
</span>
|
<span
class=
"u-m-l-10"
>
100%面备份面备份面备份面备份面备份面备份面备份面备份
</span>
<span
class=
"u-m-l-10"
>
{{
item
.
component
}}
</span>
</view>
</view>
</view>
...
...
@@ -20,50 +24,80 @@
</
template
>
<
script
>
export
default
{
props
:
{
tableData
:
{
type
:
Array
,
default
:
[]
}
},
data
()
{
return
{};
}
};
export
default
{
props
:
{
tableData
:
{
type
:
Array
,
default
:
[],
}
},
data
()
{
return
{
imgUrl
:
this
.
$IMG_URL
,
dataList
:
[]
};
},
created
()
{
this
.
$http
(
"category.query"
,
{}).
then
(
res
=>
{
let
{
code
,
data
}
=
res
;
if
(
code
===
200
)
{
this
.
dataList
=
data
;
}
})
},
methods
:
{
goDetail
(
item
)
{
console
.
log
(
333
)
this
.
$router
.
push
({
path
:
"/pages/home/detail"
,
query
:
{
id
:
item
.
id
}
})
},
},
};
</
script
>
<
style
scoped
lang=
"scss"
>
.home_con_content_order
{
position
:
relative
;
display
:
flex
;
align-items
:
center
;
justify-content
:
space-between
;
height
:
160rpx
;
border-radius
:
8rpx
;
overflow
:
hidden
;
.order_tit
{
position
:
absolute
;
width
:
75%
;
right
:
0
;
flex-direction
:
column
;
.home_con_content_order
{
position
:
relative
;
display
:
flex
;
justify-content
:
center
;
padding
:
20rpx
;
flex
:
1
;
height
:
100%
;
background
:
rgba
(
17
,
21
,
30
,
0
.5
);
align-items
:
center
;
justify-content
:
space-between
;
height
:
160rpx
;
border-radius
:
8rpx
;
overflow
:
hidden
;
.order_tit
{
position
:
absolute
;
width
:
75%
;
right
:
0
;
flex-direction
:
column
;
display
:
flex
;
justify-content
:
center
;
padding
:
20rpx
;
flex
:
1
;
height
:
100%
;
background
:
rgba
(
17
,
21
,
30
,
0
.5
);
}
}
.ov_hiden
{
overflow
:
hidden
;
text-overflow
:
ellipsis
;
white-space
:
nowrap
;
}
.color_DDA973
{
color
:
#dda973
;
}
.color_6F6F72
{
color
:
#6f6f72
;
}
}
.ov_hiden
{
overflow
:
hidden
;
text-overflow
:
ellipsis
;
white-space
:
nowrap
;
}
.color_DDA973
{
color
:
#dda973
;
}
.color_6F6F72
{
color
:
#6f6f72
;
}
</
style
>
</
style
>
\ No newline at end of file
src/pages/home/detail.vue
0 → 100644
View file @
3c5161bc
<
template
>
<view
class=
"whole"
>
<view
class=
"back"
>
<view
style=
"display:flex"
>
<u-navbar
:is-back=
"true"
:background=
"
{ backgroundColor: '#F5F5F5' }" title="面料详情">
<view
class=
"nav-nav"
@
click=
"edit()"
>
编辑
</view>
</u-navbar>
</view>
<view
:class=
"fabricObj.materialPictureVOList.length>4?'back-two':'back-back'"
>
<view
class=
"row"
style=
"color:#F5B674"
>
{{
fabricObj
.
materialName
}}
</view>
<view
class=
"row"
style=
"color:#fff"
>
<view
v-for=
"item,index in dataList"
:key=
"index"
>
<view
v-if=
"item.id==fabricObj.category"
>
{{
item
.
name
}}
</view>
</view>
|
{{
fabricObj
.
clothWidth
}}
cm|
{{
fabricObj
.
component
}}
</view>
<view
style=
"display:flex;flex-wrap: wrap;"
>
<view
class=
"row"
v-for=
"item,index in fabricObj.materialPictureVOList"
:key=
"index"
style=
"margin-right:30rpx"
>
<view
@
click=
"previewImage(`$
{imgUrl}${item.fileCode}`)">
<image
:src=
"`$
{imgUrl}${item.fileCode}`" mode="aspectFill"
style="width:120rpx;height:120rpx;display:flex">
</image>
</view>
</view>
</view>
</view>
</view>
<view
class=
"whole-bottom"
>
<view
:class=
"fabricObj.materialPictureVOList.length>4?'body-two':'body'"
>
<view
class=
"font"
><strong>
已上架款式
</strong></view>
<view
class=
"item"
v-for=
"itemTab,indexTab in tableList"
:key=
"indexTab"
>
<view
class=
"item-left"
>
<view
@
click=
"previewImage(`$
{imgUrl}${itemTab.originalImageCode}`)">
<image
class=
"item-img"
:src=
"`$
{imgUrl}${itemTab.originalImageCode}`" mode="aspectFill">
</image>
</view>
<!--
<image
class=
"item-img"
src=
"../../static/images/home/1@2x.png"
mode=
""
></image>
-->
</view>
<view
class=
"item-right"
>
<view
class=
"right-one"
>
{{
itemTab
.
styleTag
}}
</view>
<view
class=
"right-two"
>
<view
class=
"two-left"
>
款号
</view>
<view
class=
"two-right"
>
{{
itemTab
.
styleCode
}}
</view>
</view>
<view
class=
"right-two"
>
<view
class=
"two-left"
>
品类
</view>
<view
class=
"two-right"
v-for=
"itemId,indexId in dataList"
:key=
"indexId"
>
<view
v-if=
"itemId.id==itemTab.categoryId"
>
{{
itemId
.
name
}}
</view>
</view>
</view>
<!--
<view>
<u-tag
:text=
"itemTab.styleTag"
bg-color=
"#f6f3ef"
border-color=
"#f6f3ef"
size=
"mini"
color=
"#AF8D66"
type=
"success"
/>
</view>
-->
<view
v-for=
"itemTagVo,indexTagVo in itemTab.styleLibraryTagVOList"
:key=
"indexTagVo"
>
<u-tag
v-if=
"!itemTagVo.isDeleted"
:text=
"itemTagVo.materialTagName"
bg-color=
"#f6f3ef"
border-color=
"#f6f3ef"
size=
"mini"
color=
"#AF8D66"
type=
"success"
/>
</view>
</view>
</view>
</view>
</view>
</view>
</
template
>
<
script
>
import
utils
from
"../../mixins/utils"
export
default
{
mixins
:
[
utils
],
data
()
{
return
{
imgUrl
:
this
.
$IMG_URL
,
id
:
""
,
fabricObj
:
{},
tableList
:
[],
dataList
:
[],
};
},
watch
:
{
id
:
{
handler
()
{
this
.
materialDetail
()
this
.
detail
()
}
}
},
onLoad
(
option
)
{
this
.
id
=
option
.
id
this
.
materialDetail
()
this
.
detail
()
this
.
$http
(
"category.query"
,
{}).
then
(
res
=>
{
let
{
code
,
data
}
=
res
;
if
(
code
===
200
)
{
this
.
dataList
=
data
;
}
})
},
onShow
()
{
this
.
id
=
this
.
$route
.
query
.
id
this
.
materialDetail
()
this
.
detail
()
},
created
()
{
this
.
materialDetail
()
this
.
detail
()
this
.
id
=
this
.
$route
.
query
.
id
},
methods
:
{
materialDetail
()
{
this
.
$http
(
'materialinfo.getMaterialById'
,
this
.
id
).
then
(
res
=>
{
let
{
code
,
data
}
=
res
;
if
(
code
===
200
)
{
this
.
fabricObj
=
data
;
}
});
},
detail
()
{
this
.
$http
(
'modelingtask.materialDetail'
,
this
.
id
).
then
(
res
=>
{
let
{
code
,
data
}
=
res
;
if
(
code
===
200
)
{
this
.
tableList
=
data
.
styleLibraryTaskItemVOList
;
}
});
},
edit
()
{
this
.
$router
.
push
({
path
:
"/pages/home/editFabric"
,
query
:
{
id
:
this
.
id
}
})
}
}
}
</
script
>
<
style
lang=
"scss"
scoped
>
.whole
{
// padding: 0 30rpx;
background
:
#f5f5f5
;
.back
{
background
:
url(../../static/images/home/backimg.png)
no-repeat
;
background-size
:
100%
100%
;
height
:
580rpx
;
padding
:
0
30rpx
;
padding-top
:
100rpx
;
.nav-nav
{
display
:
flex
;
justify-content
:
end
;
margin-right
:
40rpx
;
width
:
100%
;
}
.back-two
{
background
:
#3b342f
;
height
:
410rpx
;
padding
:
30rpx
30rpx
;
opacity
:
0
.8
;
}
.back-back
{
background
:
#3b342f
;
height
:
340rpx
;
padding
:
30rpx
30rpx
;
opacity
:
0
.8
;
// margin-top: 80rpx;
}
}
.row
{
display
:
flex
;
margin-bottom
:
18rpx
;
.img
{
width
:
60px
;
height
:
60px
;
margin-right
:
30rpx
;
}
}
.whole-bottom
{
padding
:
0
30rpx
;
.body
{
background
:
#ffffff
;
border-radius
:
4px
;
padding
:
30rpx
;
margin-top
:
-60rpx
;
}
.body-two
{
background
:
#ffffff
;
border-radius
:
4px
;
padding
:
30rpx
;
// margin-top: -60rpx;
}
.font
{
padding-bottom
:
30rpx
;
}
.item
{
padding-bottom
:
30rpx
;
display
:
flex
;
.item-left
{
margin-right
:
20rpx
;
.item-img
{
width
:
80px
;
height
:
80px
;
}
}
}
.item
:last-child
{
padding-bottom
:
0px
;
}
.item-right
{
.right-one
{
font-weight
:
bold
;
}
.right-two
{
display
:
flex
;
color
:
rgba
(
0
,
0
,
0
,
0
.40
);
.two-left
{
margin-right
:
40rpx
;
}
}
}
}
}
</
style
>
\ No newline at end of file
src/pages/home/editFabric.vue
0 → 100644
View file @
3c5161bc
<
template
>
<view
class=
"whole"
>
<u-navbar
:is-back=
"true"
:background=
"
{ backgroundColor: '#F5F5F5' }" title="编辑面料信息">
</u-navbar>
<view
class=
"body"
>
<!--
<view
class=
"title"
>
面料基本信息
</view>
<view></view>
<view>
<u-input
v-model=
"detail.referToBrand"
></u-input>
</view>
-->
<u-form
:model=
"detailInfo"
label-position=
"top"
ref=
"uForm"
>
<hs-tip-title
title=
"面料基本信息"
></hs-tip-title>
<u-form-item
label=
"面料名称"
prop=
"materialName"
required
>
<u-input
v-model=
"detailInfo.materialName"
placeholder=
"请输入面料名称"
/>
</u-form-item>
<view
class=
"title"
>
面料门幅
</view>
<u-number-box
v-model=
"detailInfo.clothWidth"
:step=
"1"
:input-width=
"160"
:input-height=
"60"
@
change=
"valChange"
style=
"margin-right:30rpx"
>
</u-number-box>
cm
<u-form-item
label=
"面料成分"
prop=
"component"
required
>
<u-input
v-model=
"detailInfo.component"
placeholder=
"请输入面料成分"
/>
</u-form-item>
</u-form>
</view>
<view
class=
"footer"
>
<view
class=
"footer-btn"
>
<u-button
@
click=
"submitBtn"
class=
"custom-style"
shape=
"circle"
>
提交
</u-button>
</view>
</view>
</view>
</
template
>
<
script
>
export
default
{
data
()
{
return
{
id
:
""
,
detailInfo
:
{},
value
:
2.2
,
tableList
:
[]
}
},
onLoad
(
option
)
{
this
.
id
=
option
.
id
this
.
detail
()
},
methods
:
{
valChange
()
{},
// 详情
detail
()
{
this
.
$http
(
'modelingtask.materialDetail'
,
this
.
id
).
then
(
res
=>
{
let
{
code
,
data
}
=
res
;
if
(
code
===
200
)
{
this
.
detailInfo
=
data
;
this
.
detailInfo
.
clothWidth
=
parseFloat
(
data
.
clothWidth
)
}
});
},
// 提交
submitBtn
()
{
console
.
log
(
"submit"
)
let
param
=
{
id
:
this
.
id
,
materialType
:
"面料"
,
materialName
:
this
.
detailInfo
.
materialName
,
clothWidth
:
this
.
detailInfo
.
clothWidth
,
component
:
this
.
detailInfo
.
component
,
}
this
.
$http
(
'info.updateMaterial'
,
param
).
then
(
res
=>
{
let
{
code
,
data
}
=
res
;
if
(
code
===
200
)
{
this
.
$router
.
push
({
path
:
"/pages/home/detail"
,
query
:
{
id
:
this
.
id
}
})
}
else
{
}
});
}
}
}
</
script
>
<
style
lang=
"scss"
scoped
>
.whole
{
background
:
#F5F5F5
;
.body
{
background
:
#fff
;
padding
:
30rpx
30rpx
;
.title
{
margin
:
30rpx
0
;
}
}
.footer
{
position
:
fixed
;
width
:
100%
;
bottom
:
0
;
z-index
:
998
;
background
:
#fff
;
box-shadow
:
0px
-4rpx
6rpx
0px
rgba
(
178
,
182
,
214
,
0
.1
);
padding-bottom
:
constant
(
safe-area-inset-bottom
);
padding-bottom
:
env
(
safe-area-inset-bottom
);
.footer-btn
{
padding
:
20rpx
60rpx
;
}
.custom-style
{
color
:
#fff
;
background
:
#000
;
}
}
}
</
style
>
\ No newline at end of file
src/pages/home/fabricList.vue
View file @
3c5161bc
...
...
@@ -7,9 +7,10 @@
<u-search
@
search=
"searchCli"
class=
""
bg-color=
"#fff"
border-color=
"#ececec"
placeholder=
"请输入面料名称"
:show-action=
"false"
v-model=
"search"
></u-search>
</u-sticky>
<view>
<view
class=
"u-m-t-30"
v-for=
"item in fiabricList"
>
<view
class=
"u-m-t-30"
>
<!-- 后期用公共组件 fabricTitle -->
<hs-material-thumbnail
@
click=
"detailFabric(item)"
:item=
"filterFiabric(item)"
></hs-material-thumbnail>
<!--
<hs-material-thumbnail
@
click=
"detailFabric(item)"
:item=
"filterFiabric(item)"
></hs-material-thumbnail>
-->
<fabricTitle
:tableData=
"fiabricList"
></fabricTitle>
</view>
</view>
</view>
...
...
@@ -18,18 +19,31 @@
<
script
>
import
home
from
'./mixin/index.js'
import
fabricTitle
from
"./components/fabricTitle.vue"
export
default
{
mixins
:[
home
],
components
:{
fabricTitle
},
data
()
{
return
{
size
:
5
,
search
:
''
,
fiabricList
:
[],
// dataList:[],
total
:
0
};
},
onLoad
()
{
this
.
materialList
();
// this.$http("category.query", {}).then(res => {
// let {
// code,
// data
// } = res;
// if (code === 200) {
// this.dataList = data;
// }
// })
},
// 上拉加载更多
onReachBottom
()
{
...
...
@@ -45,15 +59,28 @@ export default {
},
// 我的面料
materialList
()
{
this
.
$http
(
'orderTicket.materialList'
,
{
// this.$http('orderTicket.materialList', {
// size: this.size,
// materialCode: '',
// materialName: this.search
// }).then(res => {
// let { code, data } = res;
// if (code == 200) {
// this.fiabricList = data.data;
// this.total = data.total;
// }
// });
this
.
$http
(
'materialinfo.getMaterialList'
,
{
size
:
this
.
size
,
materialCode
:
''
,
materialName
:
this
.
search
"current"
:
1
,
"materialType"
:
"面料"
,
codeAndName
:
this
.
search
}).
then
(
res
=>
{
let
{
code
,
data
}
=
res
;
if
(
code
==
200
)
{
this
.
fiabricList
=
data
.
data
;
this
.
total
=
data
.
total
;
this
.
fiabricList
=
data
.
page
.
records
;
this
.
total
=
data
.
page
.
total
;
}
});
}
...
...
src/pages/home/index.vue
View file @
3c5161bc
...
...
@@ -4,7 +4,9 @@
<view
id=
"header"
class=
"back_img"
>
<u-navbar
title=
""
:border-bottom=
"false"
:background=
"background"
>
<template
slot=
"right"
>
<view
@
click=
"searchCli"
class=
"u-m-r-24 search"
><image
class=
"hs-img"
src=
"../../static/images/home/search@2x.png"
mode=
""
></image></view>
<view
@
click=
"searchCli"
class=
"u-m-r-24 search"
>
<image
class=
"hs-img"
src=
"../../static/images/home/search@2x.png"
mode=
""
></image>
</view>
</
template
>
</u-navbar>
</view>
...
...
@@ -24,21 +26,21 @@
<view
class=
"color_fff btn u-p-l-10 u-p-r-10"
@
click=
"sampleConfirm"
>
寄样确认
</view>
</view>
<!-- 具体内容 我的面料 -->
<!-- <view class="home_con u-m-t-20">--
>
<!-- <view class="home_con_tit">--
>
<!-- <view>--
>
<!-- <span class="u-font-32">我的面料</span>--
>
<!-- <span style="line-height: 0;" class="u-m-l-10 color_000 u-font-24">MY FABRIC</span>--
>
<!-- </view>--
>
<!-- <view class="u-font-24 color_d5aa7a" @click="seeFabric">查看更多</view>--
>
<!-- </view>--
>
<!-- <view class="home_con_fabric">--
>
<!-- <view class="home_con_content u-m-t-24" @click="detailFabric(item)" v-for="item in fiabricList">--
>
<!-- <image class="hs-img" src="../../static/images/home/1@2x.png" mode=""></image>--
>
<!-- <view class="home_con_content_font ov_hiden">{{ item.materialName }}</view>--
>
<!-- </view>--
>
<!-- </view>--
>
<!-- </view>--
>
<view
class=
"home_con u-m-t-20"
>
<view
class=
"home_con_tit"
>
<view
>
<span
class=
"u-font-32"
>
我的面料
</span
>
<span
style=
"line-height: 0;"
class=
"u-m-l-10 color_000 u-font-24"
>
MY FABRIC
</span
>
</view
>
<view
class=
"u-font-24 color_d5aa7a"
@
click=
"seeFabric"
>
查看更多
</view
>
</view
>
<view
class=
"home_con_fabric"
>
<view
class=
"home_con_content u-m-t-24"
@
click=
"detailFabric(item)"
v-for=
"item in fiabricList"
>
<image
class=
"hs-img"
src=
"../../static/images/home/1@2x.png"
mode=
""
></image
>
<view
class=
"home_con_content_font ov_hiden"
>
{{ item.materialName }}
</view
>
</view
>
</view
>
</view
>
<!-- 具体内容 我的订单 -->
<view
class=
"home_con u-m-t-20"
>
<view
class=
"home_con_tit"
>
...
...
@@ -50,27 +52,22 @@
</view>
<view
class=
"home_con_order"
>
<view
class=
"u-p-t-20 u-p-b-20 "
>
<u-search
placeholder=
"请输入客户名称"
v-model=
"keyWord"
border-color=
"#e1e1e1"
height=
"76"
@
search=
"searchPotentialCustomers"
bg-color=
"#fff"
:show-action=
"false"
></u-search>
<u-search
placeholder=
"请输入客户名称"
v-model=
"keyWord"
border-color=
"#e1e1e1"
height=
"76"
@
search=
"searchPotentialCustomers"
bg-color=
"#fff"
:show-action=
"false"
></u-search>
</view>
<view
class=
"item item--round"
v-for=
"(item) in list"
@
click=
"$Router.push({
<view
class=
"item item--round"
v-for=
"(item) in list"
@
click=
"$Router.push({
path: '/pages/order/item',
query:{
id: item.enterpriseId
}
})"
>
})"
>
<view
class=
"u-font-32 u-m-b-8 u-line-1"
>
{{ item.fullName }}
</view>
<view
class=
"u-font-24"
>
更新时间:{{ item.createTime }}
</view>
</view>
<!-- 加载更多 -->
<u-loadmore
v-if=
"!isEmpty"
height=
"80rpx"
:status=
"loadStatus"
icon-type=
"flower"
color=
"#ccc"
/>
<!-- 缺省页 -->
<hs-empty
v-if=
"isEmpty"
tipText=
"没有数据"
marginTop=
"100rpx"
:image=
"emptyImage"
></hs-empty>
<hs-empty
v-if=
"isEmpty"
tipText=
"没有数据"
marginTop=
"100rpx"
:image=
"emptyImage"
></hs-empty>
</view>
</view>
...
...
@@ -78,331 +75,373 @@
</view>
</template>
<
script
>
import
HsTabBar
from
"../../components/hs-tab-bar/hs-tab-bar"
;
export
default
{
components
:
{
HsTabBar
},
data
()
{
return
{
emptyImage
:
require
(
"@/static/images/components/empty/empty.png"
),
background
:
{
backgroundColor
:
'rgba(245,245,245,0)'
},
quantityNum
:
0
,
exceptionNum
:
0
,
abolishIds
:
[],
// 我的面料
fiabricList
:
[],
buts
:
[
{
name
:
'面料建模'
,
img
:
'../../static/images/home/fabricModeling@2x.png'
,
url
:
'/pages/fabricModeling/modelingOrder'
},
{
name
:
'搜款'
,
img
:
'../../static/images/home/styleEntrustment@2x.png'
,
url
:
'/pages/material/list'
import
HsTabBar
from
"../../components/hs-tab-bar/hs-tab-bar"
;
export
default
{
components
:
{
HsTabBar
},
data
()
{
return
{
emptyImage
:
require
(
"@/static/images/components/empty/empty.png"
),
background
:
{
backgroundColor
:
'rgba(245,245,245,0)'
},
{
name
:
'上架管理'
,
img
:
'../../static/images/home/styleManageme@2x.png'
,
url
:
'/pages/material/entrustManagement'
}
// TODO 旧版本 可能以后会用到
// {
// name: '面料建模',
// img: '../../static/images/home/fabricModeling@2x.png',
// url: '/pages/fabricModeling/modelingOrder'
// },
// {
// name: '款式委托',
// img: '../../static/images/home/styleEntrustment@2x.png',
// url: '/pages/home/styleEntrustment'
// },
// {
// name: '检测委托',
// img: '../../static/images/home/styleManageme@2x.png',
// url: ''
// },
// {
// name: '款式管理',
// img: '../../static/images/home/testCommission@2x.png',
// url: ''
// }
],
quantityNum
:
0
,
exceptionNum
:
0
,
abolishIds
:
[],
// 我的面料
fiabricList
:
[],
buts
:
[{
name
:
'面料建模'
,
img
:
'../../static/images/home/fabricModeling@2x.png'
,
url
:
'/pages/fabricModeling/modelingOrder'
},
{
name
:
'搜款'
,
img
:
'../../static/images/home/styleEntrustment@2x.png'
,
url
:
'/pages/material/list'
},
{
name
:
'上架管理'
,
img
:
'../../static/images/home/styleManageme@2x.png'
,
url
:
'/pages/material/entrustManagement'
}
// TODO 旧版本 可能以后会用到
// {
// name: '面料建模',
// img: '../../static/images/home/fabricModeling@2x.png',
// url: '/pages/fabricModeling/modelingOrder'
// },
// {
// name: '款式委托',
// img: '../../static/images/home/styleEntrustment@2x.png',
// url: '/pages/home/styleEntrustment'
// },
// {
// name: '检测委托',
// img: '../../static/images/home/styleManageme@2x.png',
// url: ''
// },
// {
// name: '款式管理',
// img: '../../static/images/home/testCommission@2x.png',
// url: ''
// }
],
keyWord
:
''
,
loadStatus
:
'loadmore'
,
pageOptions
:{
current
:
1
,
size
:
10
,
},
list
:
[]
};
},
computed
:{
isEmpty
(){
return
this
.
list
.
length
===
0
}
},
onLoad
()
{
// this.toBeSelectedQuantity();
// this.orderTicketExceptionNum();
// this.noSampleOrder();
// this.materialList();
// 潜在客户
this
.
potentialCustomersPage
();
},
onPageScroll
(
object
)
{
let
height
=
486
/
2
;
if
(
object
.
scrollTop
>=
height
)
{
this
.
background
.
backgroundColor
=
'rgba(245,245,245,1)'
;
}
else
{
this
.
background
.
backgroundColor
=
'rgba(245,245,245,0)'
;
}
},
methods
:
{
pay
(){
this
.
$Router
.
push
({
path
:
'/pages/webview/index'
})
},
searchPotentialCustomers
(){
this
.
pageOptions
=
{
current
:
1
,
size
:
10
,
keyWord
:
''
,
loadStatus
:
'loadmore'
,
pageOptions
:
{
current
:
1
,
size
:
10
,
},
list
:
[]
};
},
computed
:
{
isEmpty
()
{
return
this
.
list
.
length
===
0
}
},
onLoad
()
{
// this.toBeSelectedQuantity();
// this.orderTicketExceptionNum();
// this.noSampleOrder();
// this.materialList();
// 潜在客户
this
.
potentialCustomersPage
();
},
// 潜在客户
potentialCustomersPage
(){
this
.
loadStatus
=
'loading'
;
this
.
$http
(
"stylelibraryorder.potentialCustomersPage"
,{
...
this
.
pageOptions
,
customerName
:
this
.
keyWord
,
status
:
0
})
onPageScroll
(
object
)
{
let
height
=
486
/
2
;
if
(
object
.
scrollTop
>=
height
)
{
this
.
background
.
backgroundColor
=
'rgba(245,245,245,1)'
;
}
else
{
this
.
background
.
backgroundColor
=
'rgba(245,245,245,0)'
;
}
},
methods
:
{
pay
()
{
this
.
$Router
.
push
({
path
:
'/pages/webview/index'
})
},
searchPotentialCustomers
()
{
this
.
pageOptions
=
{
current
:
1
,
size
:
10
,
};
this
.
potentialCustomersPage
();
},
// 潜在客户
potentialCustomersPage
()
{
this
.
loadStatus
=
'loading'
;
this
.
$http
(
"stylelibraryorder.potentialCustomersPage"
,
{
...
this
.
pageOptions
,
customerName
:
this
.
keyWord
,
status
:
0
})
.
then
(
res
=>
{
let
{
code
,
data
}
=
res
;
let
{
code
,
data
}
=
res
;
if
(
code
===
200
)
{
if
(
Object
.
keys
(
data
).
length
>
0
)
{
if
(
Object
.
keys
(
data
).
length
>
0
)
{
this
.
list
=
data
.
records
;
this
.
pageOptions
.
pages
=
data
.
total
;
this
.
loadStatus
=
this
.
list
.
length
<
data
.
total
?
'loadmore'
:
'nomore'
;
}
else
{
this
.
loadStatus
=
this
.
list
.
length
<
data
.
total
?
'loadmore'
:
'nomore'
;
}
else
{
this
.
list
=
[]
this
.
loadStatus
=
'nomore'
;
}
}
})
},
// 触底加载更多
onReachBottom
()
{
if
(
this
.
pageOptions
.
current
<
this
.
pageOptions
.
pages
)
{
this
.
pageOptions
.
current
+=
1
;
this
.
potentialCustomersPage
();
}
},
// 选款总数
toBeSelectedQuantity
()
{
this
.
$http
(
'orderTicket.toBeSelectedQuantity'
,
{}).
then
(
res
=>
{
let
{
code
,
data
}
=
res
;
if
(
code
==
200
)
{
this
.
quantityNum
=
data
;
}
});
},
// 异常总数
orderTicketExceptionNum
()
{
this
.
$http
(
'orderTicket.orderTicketExceptionNum'
,
{}).
then
(
res
=>
{
let
{
code
,
data
}
=
res
;
if
(
code
==
200
)
{
this
.
exceptionNum
=
data
;
}
});
},
// 寄样单总数
noSampleOrder
()
{
this
.
$http
(
'orderTicket.noSampleOrder'
,
{}).
then
(
res
=>
{
let
{
code
,
data
}
=
res
;
if
(
code
==
200
)
{
this
.
abolishIds
=
data
;
},
// 触底加载更多
onReachBottom
()
{
if
(
this
.
pageOptions
.
current
<
this
.
pageOptions
.
pages
)
{
this
.
pageOptions
.
current
+=
1
;
this
.
potentialCustomersPage
();
}
});
},
// 我的面料
materialList
()
{
this
.
$http
(
'orderTicket.materialList'
,
{
size
:
4
,
materialCode
:
''
,
materialName
:
''
}).
then
(
res
=>
{
let
{
code
,
data
}
=
res
;
if
(
code
==
200
)
{
this
.
fiabricList
=
data
.
data
;
},
// 选款总数
toBeSelectedQuantity
()
{
this
.
$http
(
'orderTicket.toBeSelectedQuantity'
,
{}).
then
(
res
=>
{
let
{
code
,
data
}
=
res
;
if
(
code
==
200
)
{
this
.
quantityNum
=
data
;
}
});
},
// 异常总数
orderTicketExceptionNum
()
{
this
.
$http
(
'orderTicket.orderTicketExceptionNum'
,
{}).
then
(
res
=>
{
let
{
code
,
data
}
=
res
;
if
(
code
==
200
)
{
this
.
exceptionNum
=
data
;
}
});
},
// 寄样单总数
noSampleOrder
()
{
this
.
$http
(
'orderTicket.noSampleOrder'
,
{}).
then
(
res
=>
{
let
{
code
,
data
}
=
res
;
if
(
code
==
200
)
{
this
.
abolishIds
=
data
;
}
});
},
// 我的面料
materialList
()
{
this
.
$http
(
'orderTicket.materialList'
,
{
size
:
4
,
materialCode
:
''
,
materialName
:
''
}).
then
(
res
=>
{
let
{
code
,
data
}
=
res
;
if
(
code
==
200
)
{
this
.
fiabricList
=
data
.
data
;
}
});
},
searchCli
()
{
// 搜索面料===1 搜索建模===2
this
.
$Router
.
push
(
'/pages/home/search'
);
},
seeFabric
()
{
this
.
$Router
.
push
(
'/pages/home/fabricList'
);
},
detailFabric
(
data
)
{
this
.
$Router
.
push
(
'/pages/home/fabricDetails?id='
+
data
.
id
);
},
sampleConfirm
()
{
this
.
$Router
.
push
(
'/pages/home/sampleConfirmation?abolishIds='
+
this
.
abolishIds
);
},
goCli
(
url
)
{
if
(
url
)
{
this
.
$Router
.
push
(
url
);
}
else
{
uni
.
showToast
({
title
:
'该功能正在开发中...'
,
icon
:
'none'
})
}
});
},
searchCli
()
{
// 搜索面料===1 搜索建模===2
this
.
$Router
.
push
(
'/pages/home/search'
);
},
seeFabric
()
{
this
.
$Router
.
push
(
'/pages/home/fabricList'
);
},
detailFabric
(
data
)
{
this
.
$Router
.
push
(
'/pages/home/fabricDetails?id='
+
data
.
id
);
},
sampleConfirm
()
{
this
.
$Router
.
push
(
'/pages/home/sampleConfirmation?abolishIds='
+
this
.
abolishIds
);
},
goCli
(
url
)
{
if
(
url
)
{
this
.
$Router
.
push
(
url
);
}
else
{
uni
.
showToast
({
title
:
'该功能正在开发中...'
,
icon
:
'none'
})
}
}
}
};
};
</
script
>
<
style
lang=
"scss"
scoped
>
.item--round
{
border-radius
:
8rpx
;}
.item
{
padding
:
36rpx
30px
;
height
:
160rpx
;
background
:
url(~@/static/images/home/exhibition.png)
no-repeat
;
background-size
:
100%
100%
;
margin-bottom
:
20rpx
;
color
:
#fff
;
}
.item--round
{
border-radius
:
8rpx
;
}
.item
{
padding
:
36rpx
30px
;
height
:
160rpx
;
background
:
url(~@/static/images/home/exhibition.png)
no-repeat
;
background-size
:
100%
100%
;
margin-bottom
:
20rpx
;
color
:
#fff
;
}
.back_img
{
height
:
486rpx
;
width
:
100%
;
background
:
url(~@/static/images/home/exhibition.png)
no-repeat
;
background-size
:
100%
100%
;
}
.home_top
{
position
:
relative
;
width
:
100%
;
height
:
486rpx
;
.home_top_out
{
position
:
absolute
;
top
:
20rpx
;
.back_img
{
height
:
486rpx
;
width
:
100%
;
padding
:
0
20rpx
;
background
:
url(~@/static/images/home/exhibition.png)
no-repeat
;
background-size
:
100%
100%
;
}
.home_top
{
position
:
relative
;
width
:
100%
;
height
:
486rpx
;
.home_top_out
{
position
:
absolute
;
top
:
20rpx
;
width
:
100%
;
padding
:
0
20rpx
;
display
:
flex
;
justify-content
:
space-between
;
align-items
:
center
;
.out
{
width
:
32rpx
;
height
:
32rpx
;
}
}
}
.search
{
width
:
60rpx
;
height
:
60rpx
;
}
.tips
{
display
:
flex
;
justify-content
:
space-between
;
height
:
80rpx
;
align-items
:
center
;
.out
{
width
:
32rpx
;
height
:
32rpx
;
}
justify-content
:
space-around
;
padding
:
0
20rpx
;
}
}
.search
{
width
:
60rpx
;
height
:
60rpx
;
}
.tips
{
display
:
flex
;
height
:
80rpx
;
align-items
:
center
;
justify-content
:
space-around
;
padding
:
0
20rpx
;
}
.home_btn
{
width
:
100%
;
height
:
180rpx
;
display
:
flex
;
justify-content
:
space-around
;
align-items
:
center
;
text-align
:
center
;
background
:
#fff
;
}
.home_con
{
width
:
100%
;
box-sizing
:
border-box
;
padding
:
30rpx
;
background
:
#fff
;
.home_con_tit
{
.home_btn
{
width
:
100%
;
height
:
180rpx
;
display
:
flex
;
justify-content
:
space-between
;
align-items
:
flex-end
;
justify-content
:
space-around
;
align-items
:
center
;
text-align
:
center
;
background
:
#fff
;
}
.home_con_fabric
{
.home_con
{
width
:
100%
;
box-sizing
:
border-box
;
padding
:
30rpx
;
background
:
#fff
;
.home_con_tit
{
width
:
100%
;
display
:
flex
;
justify-content
:
space-between
;
align-items
:
flex-end
;
}
.home_con_fabric
{
display
:
flex
;
flex-wrap
:
wrap
;
justify-content
:
space-between
;
}
.home_con_order
{
// display: flex;
// flex-wrap: wrap;
// justify-content: space-between;
}
}
.home_con_content
{
position
:
relative
;
width
:
48%
;
height
:
160rpx
;
border-radius
:
8rpx
;
overflow
:
hidden
;
// background-image: url(../../static/images/home/1@2x.png);
.home_con_content_font
{
position
:
absolute
;
bottom
:
0
;
width
:
100%
;
height
:
60rpx
;
line-height
:
60rpx
;
box-sizing
:
border-box
;
padding
:
0
10rpx
;
background
:
rgba
(
255
,
255
,
255
,
0
.8
);
}
}
.home_con_content_order
{
display
:
flex
;
flex-wrap
:
wrap
;
align-items
:
center
;
justify-content
:
space-between
;
height
:
160rpx
;
border-radius
:
8rpx
;
overflow
:
hidden
;
.order_tit
{
flex-direction
:
column
;
display
:
flex
;
justify-content
:
center
;
padding
:
20rpx
;
flex
:
1
;
height
:
100%
;
background
:
rgba
(
172
,
166
,
166
,
0
.5
);
}
}
.home_con_order
{
// display: flex;
// flex-wrap: wrap;
// justify-content: space-between;
.ov_hiden
{
overflow
:
hidden
;
text-overflow
:
ellipsis
;
white-space
:
nowrap
;
}
}
.home_con_content
{
position
:
relative
;
width
:
48%
;
height
:
160rpx
;
border-radius
:
8rpx
;
overflow
:
hidden
;
// background-image: url(../../static/images/home/1@2x.png);
.home_con_content_font
{
position
:
absolute
;
bottom
:
0
;
width
:
100%
;
height
:
60rpx
;
line-height
:
60rpx
;
box-sizing
:
border-box
;
padding
:
0
10rpx
;
background
:
rgba
(
255
,
255
,
255
,
0
.8
);
.btn
{
line-height
:
50rpx
;
text-align
:
center
;
height
:
50rpx
;
border
:
1rpx
solid
#fff
;
}
}
.home_con_content_order
{
display
:
flex
;
align-items
:
center
;
justify-content
:
space-between
;
height
:
160rpx
;
border-radius
:
8rpx
;
overflow
:
hidden
;
.order_tit
{
flex-direction
:
column
;
display
:
flex
;
justify-content
:
center
;
padding
:
20rpx
;
flex
:
1
;
height
:
100%
;
background
:
rgba
(
172
,
166
,
166
,
0
.5
);
.color_000
{
color
:
rgba
(
0
,
0
,
0
,
0
.2
);
}
.color_d5aa7a
{
color
:
#d5aa7a
;
}
.color_dda973
{
color
:
#dda973
;
}
.color_fff
{
color
:
#fff
;
}
.background_d5aa7a
{
background
:
#d5aa7a
;
}
}
.ov_hiden
{
overflow
:
hidden
;
text-overflow
:
ellipsis
;
white-space
:
nowrap
;
}
.btn
{
line-height
:
50rpx
;
text-align
:
center
;
height
:
50rpx
;
border
:
1rpx
solid
#fff
;
}
.color_000
{
color
:
rgba
(
0
,
0
,
0
,
0
.2
);
}
.color_d5aa7a
{
color
:
#d5aa7a
;
}
.color_dda973
{
color
:
#dda973
;
}
.color_fff
{
color
:
#fff
;
}
.background_d5aa7a
{
background
:
#d5aa7a
;
}
</
style
>
</
style
>
\ No newline at end of file
src/pages/user/login/login.vue
View file @
3c5161bc
...
...
@@ -16,7 +16,7 @@ export default {
methods
:
{
async
login
()
{
await
this
.
$store
.
dispatch
(
'login'
,
{
account
:
'18
29795929
8'
,
account
:
'18
33234567
8'
,
password
:
'e10adc3949ba59abbe56e057f20f883e'
});
// await this.$store.dispatch('login', {
...
...
src/static/images/home/backimg.png
0 → 100644
View file @
3c5161bc
200 KB
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