Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
self-support
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
李俊赕
self-support
Commits
99704795
Commit
99704795
authored
Apr 30, 2021
by
郭晓清
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
https://git.banshouhui.com/lijundan/self-support
parents
cfbe9215
dba883c7
Changes
21
Show whitespace changes
Inline
Side-by-side
Showing
21 changed files
with
679 additions
and
125 deletions
+679
-125
project.config.json
project.config.json
+71
-0
App.vue
src/App.vue
+7
-3
order.js
src/common/api/order.js
+12
-1
complete-check.vue
src/components/complete-check/complete-check.vue
+210
-0
XhFiles.vue
src/components/createCom/XhFiles.vue
+19
-14
XhInput.vue
src/components/createCom/XhInput.vue
+35
-2
XhLocation.vue
src/components/createCom/XhLocation.vue
+2
-1
XhSelect.vue
src/components/createCom/XhSelect.vue
+45
-6
index.vue
src/components/order/index.vue
+4
-3
noOrder.vue
src/components/order/noOrder.vue
+1
-1
preview.vue
src/components/photo/preview.vue
+0
-1
index.vue
src/components/tabBarList/index.vue
+2
-2
index.vue
src/pages/index/index.vue
+47
-23
index.vue
src/pages/learn/index.vue
+79
-13
index.vue
src/pages/login/index.vue
+3
-3
complete.vue
src/pages/order/complete.vue
+129
-29
detail.vue
src/pages/order/detail.vue
+1
-0
feedback.vue
src/pages/order/feedback.vue
+1
-8
index.vue
src/pages/order/index.vue
+9
-9
jianbian@3x.png
src/static/photo/jianbian@3x.png
+0
-0
login.js
src/utils/login.js
+2
-6
No files found.
project.config.json
0 → 100644
View file @
99704795
{
"description"
:
"项目配置文件"
,
"packOptions"
:
{
"ignore"
:
[]
},
"setting"
:
{
"urlCheck"
:
true
,
"es6"
:
true
,
"enhance"
:
false
,
"postcss"
:
true
,
"preloadBackgroundData"
:
false
,
"minified"
:
true
,
"newFeature"
:
false
,
"coverView"
:
true
,
"nodeModules"
:
false
,
"autoAudits"
:
false
,
"showShadowRootInWxmlPanel"
:
true
,
"scopeDataCheck"
:
false
,
"uglifyFileName"
:
false
,
"checkInvalidKey"
:
true
,
"checkSiteMap"
:
true
,
"uploadWithSourceMap"
:
true
,
"compileHotReLoad"
:
false
,
"useMultiFrameRuntime"
:
true
,
"useApiHook"
:
true
,
"useApiHostProcess"
:
true
,
"babelSetting"
:
{
"ignore"
:
[],
"disablePlugins"
:
[],
"outputPath"
:
""
},
"enableEngineNative"
:
false
,
"bundle"
:
false
,
"useIsolateContext"
:
true
,
"useCompilerModule"
:
true
,
"userConfirmedUseCompilerModuleSwitch"
:
false
,
"userConfirmedBundleSwitch"
:
false
,
"packNpmManually"
:
false
,
"packNpmRelationList"
:
[],
"minifyWXSS"
:
true
},
"compileType"
:
"miniprogram"
,
"libVersion"
:
"2.16.0"
,
"appid"
:
"wx402a711597dddbaf"
,
"projectname"
:
"miniprogram-1"
,
"debugOptions"
:
{
"hidedInDevtools"
:
[]
},
"scripts"
:
{},
"isGameTourist"
:
false
,
"condition"
:
{
"search"
:
{
"list"
:
[]
},
"conversation"
:
{
"list"
:
[]
},
"game"
:
{
"list"
:
[]
},
"plugin"
:
{
"list"
:
[]
},
"gamePlugin"
:
{
"list"
:
[]
},
"miniprogram"
:
{
"list"
:
[]
}
}
}
src/App.vue
View file @
99704795
...
@@ -145,8 +145,12 @@ export default {
...
@@ -145,8 +145,12 @@ export default {
wxAppNo
:
that
.
globalData
.
wxAppNo
,
// 自营平台小程序
wxAppNo
:
that
.
globalData
.
wxAppNo
,
// 自营平台小程序
};
};
let
result
=
await
that
.
$u
.
api
.
loginWechatAuth
(
params
)
let
result
=
await
that
.
$u
.
api
.
loginWechatAuth
(
params
)
if
(
result
&&
result
.
code
==
200
&&
result
.
data
)
{
if
(
result
&&
result
.
code
==
200
&&
result
.
data
&&
result
.
data
.
token
)
{
that
.
setUserData
(
result
.
data
);
that
.
setUserData
(
result
.
data
);
}
else
{
uni
.
navigateTo
({
url
:
"pages/login/index"
})
}
}
}
else
{
}
else
{
uni
.
showModal
({
uni
.
showModal
({
...
...
src/common/api/order.js
View file @
99704795
...
@@ -111,6 +111,15 @@ let orderApiFun = function(vm){
...
@@ -111,6 +111,15 @@ let orderApiFun = function(vm){
*/
*/
let
saveCompleteData
=
async
(
params
=
{},
orderId
)
=>
await
vm
.
$u
.
post
(
prefix
+
vm
.
vuex_token
+
'/order/'
+
orderId
+
'/maintain/saveMaintainInfoV2'
,
params
);
let
saveCompleteData
=
async
(
params
=
{},
orderId
)
=>
await
vm
.
$u
.
post
(
prefix
+
vm
.
vuex_token
+
'/order/'
+
orderId
+
'/maintain/saveMaintainInfoV2'
,
params
);
/**
* 保内工单完工
*/
let
inOrderFinish
=
async
(
orderId
)
=>
await
vm
.
$u
.
post
(
prefix
+
vm
.
vuex_token
+
'/order/'
+
orderId
+
'/finishedAndConfirm'
,{},
{
'content-type'
:
'application/x-www-form-urlencoded'
});
/**
* 保外工单完工
*/
let
outOrderFinish
=
async
(
params
=
{},
orderId
)
=>
await
vm
.
$u
.
post
(
prefix
+
vm
.
vuex_token
+
'/order/'
+
orderId
+
'/v1/finishedAndConfirmOutGuaranteePeriod'
,
params
,
{
'content-type'
:
'application/x-www-form-urlencoded'
});
const
orderApi
=
{
const
orderApi
=
{
listByRecommendOrder
,
listByRecommendOrder
,
listOrderCount
,
listOrderCount
,
...
@@ -134,7 +143,9 @@ let orderApiFun = function(vm){
...
@@ -134,7 +143,9 @@ let orderApiFun = function(vm){
getSignDistance
,
getSignDistance
,
getCompleteConfigAndData
,
getCompleteConfigAndData
,
getMeasure
,
getMeasure
,
saveCompleteData
saveCompleteData
,
inOrderFinish
,
outOrderFinish
}
}
return
orderApi
return
orderApi
}
}
...
...
src/components/complete-check/complete-check.vue
0 → 100644
View file @
99704795
<!-- 完工校验弹窗 -->
<
template
>
<view>
<u-popup
v-model=
"open"
:mask-close-able=
"false"
border-radius=
"12"
ref=
"checkPopup"
mode=
"center"
width=
"690rpx"
>
<view
class=
"slot-content"
>
<view
class=
"check-status"
>
<u-image
width=
"224rpx"
height=
"224rpx"
:src=
"statusImage"
></u-image>
<text
:class=
"['status-txt',
{ 'pass-color': pass }]">
{{
statusTxt
}}
</text>
</view>
<view
class=
"check-list"
>
<view
class=
"u-flex u-row-between list-title"
>
<view
class=
"left-txt"
>
验证项
</view>
<view>
已提交/需提交
</view>
<view
class=
"right-txt"
>
结果
</view>
</view>
<view
class=
"u-flex u-row-between list-item"
v-for=
"(item, index) in listData"
:key=
"index"
>
<view
class=
"item-txt left-txt"
style=
"width: 160rpx;text-align: left;"
>
<u-icon
:name=
"item.pass ? passIcon : noPassIcon"
:label=
"item.label"
margin-left=
"12"
label-color=
"#333333"
label-size=
"28"
size=
"32"
></u-icon>
</view>
<view
class=
"item-txt"
>
{{
item
.
submitted
}}
/
{{
item
.
required
}}
</view>
<view
:class=
"['item-txt', 'right-txt', item.pass ? 'pass-color' : 'no-pass-color']"
style=
"width: 160rpx;text-align: right;"
>
{{
item
.
pass
?
"通过"
:
"未通过"
}}
</view>
</view>
</view>
<view
class=
"check-bottom"
>
<view
class=
"button cancel"
v-show=
"!pass"
@
tap=
"cancel"
>
取消
</view>
<view
class=
"button confirm"
@
tap=
"confirm"
>
{{
confirmText
}}
</view>
</view>
</view>
</u-popup>
</view>
</
template
>
<
script
>
/**
* modal 完工校验模态框
* @description 完工校验模态框,用于完工信息检查和提醒
* @property {Boolean} show 是否显示模态框
* @property {Boolean} pass 是否通过校验
* @property {Array} listData 完工信息项
* @event {Function} close 取消按钮被点击
* @event {Function} handle 去处理按钮被点击
* @event {Function} confirm 确认按钮被点击
* @example <u-modal :src="title" :content="content"></u-modal>
*/
export
default
{
name
:
"complete-check"
,
props
:
{
show
:
{
type
:
Boolean
,
default
:
false
},
pass
:
{
type
:
Boolean
,
default
:
false
},
listData
:
{
type
:
Array
,
default
(){
return
[
{
label
:
'基本信息'
,
submitted
:
3
,
required
:
3
,
pass
:
true
},
{
label
:
'勘察信息'
,
submitted
:
20
,
required
:
20
,
pass
:
true
},
{
label
:
'安装信息'
,
submitted
:
15
,
required
:
20
,
pass
:
false
}
]
}
}
},
data
()
{
return
{
open
:
this
.
show
};
},
watch
:
{
// 如果是异步关闭时,外部修改v-model的值为false时,重置内部的loading状态
// 避免下次打开的时候,状态混乱
show
(
n
)
{
this
.
open
=
n
}
},
computed
:
{
statusImage
()
{
if
(
this
.
pass
)
{
return
process
.
uniEnv
.
qn_base_url
+
'successful.png'
}
else
{
return
process
.
uniEnv
.
qn_base_url
+
'failure.png'
}
},
statusTxt
()
{
return
this
.
pass
?
"完工校验已通过"
:
"完工校验未通过"
},
confirmText
()
{
return
this
.
pass
?
"确定"
:
"去处理"
},
passIcon
()
{
return
process
.
uniEnv
.
qn_base_url
+
'icon/pass.png'
},
noPassIcon
()
{
return
process
.
uniEnv
.
qn_base_url
+
'icon/no-pass.png'
},
},
methods
:
{
cancel
()
{
this
.
$emit
(
'close'
)
},
confirm
()
{
if
(
this
.
pass
)
{
this
.
$emit
(
'confirm'
)
}
else
{
let
data
=
this
.
listData
.
find
((
item
,
index
)
=>
{
return
item
.
pass
==
false
;
})
this
.
$emit
(
'handle'
,
data
)
}
}
},
}
</
script
>
<
style
lang=
"scss"
>
.slot-content
{
padding
:
40rpx
30rpx
0rpx
30rpx
;
.check-status
{
margin-bottom
:
50rpx
;
display
:
flex
;
flex-direction
:
column
;
justify-content
:
center
;
align-items
:
center
;
.status-txt
{
height
:
46rpx
;
font-size
:
40rpx
;
font-weight
:
bold
;
color
:
#FA5A49
;
line-height
:
46rpx
;
}
}
.check-list
{
padding-top
:
40rpx
;
border-top
:
2rpx
solid
#F4F5F7
;
.list-title
{
height
:
28rpx
;
font-size
:
28rpx
;
font-weight
:
400
;
color
:
#999999
;
line-height
:
28rpx
;
margin-bottom
:
42rpx
;
}
.list-item
{
margin-bottom
:
40rpx
;
}
}
.check-bottom
{
display
:
flex
;
justify-content
:
center
;
align-items
:
center
;
.button
{
text-align
:
center
;
height
:
104rpx
;
width
:
300rpx
;
border-radius
:
52rpx
;
font-size
:
32rpx
;
font-weight
:
600
;
line-height
:
104rpx
;
}
.cancel
{
margin
:
36rpx
15rpx
52rpx
30rpx
;
border
:
2px
solid
#2272FF
;
color
:
#2272FF
;
}
.confirm
{
margin
:
36rpx
30rpx
52rpx
15rpx
;
background
:
#2272FF
;
color
:
#FFFFFF
;
}
}
}
.item-txt
{
height
:
32rpx
;
font-size
:
28rpx
;
font-weight
:
500
;
color
:
#333333
;
line-height
:
32rpx
;
}
.left-txt
{
width
:
160rpx
;
text-align
:
left
;
}
.right-txt
{
width
:
160rpx
;
text-align
:
right
;
}
.pass-color
{
color
:
#2272FF
!
important
;
}
.no-pass-color
{
color
:
#FA5A49
!
important
;;
}
</
style
>
src/components/createCom/XhFiles.vue
View file @
99704795
...
@@ -7,14 +7,14 @@
...
@@ -7,14 +7,14 @@
</view>
-->
</view>
-->
<view
class=
"pics u-flex u-flex-wrap"
>
<view
class=
"pics u-flex u-flex-wrap"
>
<view
class=
"img-list"
v-for=
"(item,index) in imgList"
:key=
"index"
>
<view
class=
"img-list"
v-for=
"(item,index) in imgList"
:key=
"index"
>
<u-image
class=
"pic"
width=
"1
70"
height=
"170"
:src=
"item.path
"
@
click
.
stop=
"prviewImage(item.path,index)"
></u-image>
<u-image
class=
"pic"
width=
"1
60"
height=
"160"
:src=
"item.path"
:border-radius=
"10
"
@
click
.
stop=
"prviewImage(item.path,index)"
></u-image>
<view
class=
"icon-del-box"
@
click
.
stop=
"delFile(index)"
>
<view
class=
"icon-del-box"
@
click
.
stop=
"delFile(index)"
>
<view
class=
"icon-del"
></view>
<view
class=
"icon-del"
></view>
<view
class=
"icon-del rotate"
></view>
<view
class=
"icon-del rotate"
></view>
</view>
</view>
</view>
</view>
<view
class=
"img-list"
>
<view
class=
"img-list"
>
<u-image
class=
"pic"
width=
"1
70rpx"
height=
"170"
@
click=
"selectUpload"
src=
"https://gitee.com/xuqu/uView/blob/master/static/uview/example/min_button.png
"
></u-image>
<u-image
class=
"pic"
width=
"1
60rpx"
height=
"160rpx"
:border-radius=
"10"
@
click=
"selectUpload"
:src=
"uploadImage
"
></u-image>
</view>
</view>
<!--
<u-image
class=
"pic"
v-for=
"item in 6"
width=
"170rpx"
height=
"170"
src=
"'https://cdn.uviewui.com/uview/example/fade.jpg"
></u-image>
-->
<!--
<u-image
class=
"pic"
v-for=
"item in 6"
width=
"170rpx"
height=
"170"
src=
"'https://cdn.uviewui.com/uview/example/fade.jpg"
></u-image>
-->
</view>
</view>
...
@@ -52,7 +52,10 @@
...
@@ -52,7 +52,10 @@
computed
:
{
computed
:
{
settings
()
{
settings
()
{
return
this
.
item
.
settings
||
[]
return
this
.
item
.
settings
||
[]
}
},
uploadImage
()
{
return
process
.
uniEnv
.
qn_base_url
+
'upload-file.png'
},
},
},
watch
:
{
watch
:
{
'takeStatus'
:
function
(
val
,
oldVal
){
'takeStatus'
:
function
(
val
,
oldVal
){
...
@@ -135,6 +138,14 @@
...
@@ -135,6 +138,14 @@
}
}
</
script
>
</
script
>
<
style
lang=
"scss"
scoped
>
<
style
lang=
"scss"
scoped
>
.img-list
{
position
:
relative
;
margin
:
8rpx
;
width
:
160rpx
;
height
:
160rpx
;
.pic
{
.pic
{
// margin-right: 15rpx;
// margin-right: 15rpx;
// margin-bottom: 15rpx;
// margin-bottom: 15rpx;
...
@@ -143,12 +154,6 @@
...
@@ -143,12 +154,6 @@
}
}
}
}
.img-list
{
position
:
relative
;
margin
:
8rpx
;
border
:
1px
solid
#eee
;
width
:
170rpx
;
height
:
170rpx
;
.icon-del-box
{
.icon-del-box
{
/* #ifndef APP-NVUE */
/* #ifndef APP-NVUE */
display
:
flex
;
display
:
flex
;
...
...
src/components/createCom/XhInput.vue
View file @
99704795
<!-- ******************* 输入框 ******************* -->
<!-- ******************* 输入框 ******************* -->
<
template
>
<
template
>
<view>
<view>
<u-input
:type=
"type"
class=
"input-item"
v-model=
"dataValue"
@
input=
"valueChange"
:border=
"true"
placeholder=
"请输入"
/>
<u-input
:type=
"type"
class=
"input-item"
v-model=
"dataValue"
@
input=
"valueChange"
:placeholder=
"placeholder"
:placeholder-style=
"placeholderStyle"
:custom-style=
"customStyle"
:clearable=
"false"
:border=
"border"
/>
</view>
</view>
</
template
>
</
template
>
...
@@ -11,7 +12,16 @@
...
@@ -11,7 +12,16 @@
name
:
'XhInput'
,
// 新建 input
name
:
'XhInput'
,
// 新建 input
components
:
{},
components
:
{},
mixins
:
[
stringMixin
],
mixins
:
[
stringMixin
],
props
:
{},
props
:
{
placeholder
:
{
type
:
String
,
default
:
'请输入'
},
width
:
{
// 例如:454rpx
type
:
String
,
default
:
'100%'
}
},
data
()
{
data
()
{
return
{}
return
{}
},
},
...
@@ -22,6 +32,29 @@
...
@@ -22,6 +32,29 @@
}
else
{
}
else
{
return
'text'
return
'text'
}
}
},
placeholderStyle
()
{
return
'color:#999999;font-size:26rpx'
},
customStyle
()
{
return
{
'background-color'
:
this
.
backgroundColor
,
'border-radius'
:
'12rpx'
,
'color'
:
'#333333'
,
'padding-left'
:
this
.
textarea
?
'0rpx'
:
'20rpx'
,
'width'
:
this
.
width
,
'font-size'
:
'26rpx'
,
'height'
:
'76rpx'
}
},
border
()
{
return
this
.
textarea
},
textarea
()
{
return
this
.
type
==
'textarea'
},
backgroundColor
()
{
return
this
.
textarea
?
'#FFFFFF'
:
'#F4F5F7'
}
}
},
},
watch
:
{},
watch
:
{},
...
...
src/components/createCom/XhLocation.vue
View file @
99704795
...
@@ -80,6 +80,7 @@
...
@@ -80,6 +80,7 @@
}
}
.location
{
.location
{
background
:
#F4F5F7
;
background
:
#F4F5F7
;
padding
:
10rpx
;
padding
:
10rpx
20rpx
;
border-radius
:
12rpx
;
}
}
</
style
>
</
style
>
src/components/createCom/XhSelect.vue
View file @
99704795
<!-- ******************* 单个下拉选择 ******************* -->
<!-- ******************* 单个下拉选择 ******************* -->
<
template
>
<
template
>
<view>
<view
class=
"xh-select"
>
<u-input
:value=
"text"
readOnly
@
click=
"show=true"
type=
"select"
/>
<u-input
:value=
"text"
readOnly
@
click=
"show=true"
:placeholder=
"placeholder"
:placeholder-style=
"placeholderStyle"
<u-action-sheet
:list=
"settings"
v-model=
"show"
@
click=
"actionSheetCallback"
></u-action-sheet>
:custom-style=
"customStyle"
:clearable=
"false"
></u-input>
<u-action-sheet
:list=
"settings"
v-model=
"show"
@
click=
"actionSheetCallback"
safe-area-inset-bottom
></u-action-sheet>
<u-icon
class=
"input-icon"
:name=
"show ? 'arrow-up' : 'arrow-down'"
></u-icon>
</view>
</view>
</
template
>
</
template
>
...
@@ -12,7 +15,16 @@
...
@@ -12,7 +15,16 @@
name
:
'XhSelect'
,
name
:
'XhSelect'
,
components
:
{},
components
:
{},
mixins
:
[
stringMixin
],
mixins
:
[
stringMixin
],
props
:
{},
props
:
{
placeholder
:
{
type
:
String
,
default
:
'请选择'
},
width
:
{
// 例如:454rpx
type
:
String
,
default
:
'100%'
}
},
data
()
{
data
()
{
return
{
return
{
show
:
false
show
:
false
...
@@ -32,7 +44,9 @@
...
@@ -32,7 +44,9 @@
result
=
settings
.
map
(
item
=>
{
result
=
settings
.
map
(
item
=>
{
return
{
return
{
text
:
item
.
label
,
text
:
item
.
label
,
id
:
item
.
key
id
:
item
.
key
,
color
:
'#333333'
,
fontSize
:
26
}
}
})
})
return
result
return
result
...
@@ -40,6 +54,21 @@
...
@@ -40,6 +54,21 @@
text
(){
text
(){
let
option
=
this
.
item
.
fieldsOptions
.
find
(
a
=>
{
return
a
.
key
===
this
.
dataValue
})
let
option
=
this
.
item
.
fieldsOptions
.
find
(
a
=>
{
return
a
.
key
===
this
.
dataValue
})
return
option
?
option
.
label
:
''
return
option
?
option
.
label
:
''
},
placeholderStyle
()
{
return
'color:#999999;font-size:26rpx'
},
customStyle
()
{
return
{
'background-color'
:
'#F4F5F7'
,
'border-radius'
:
'12rpx'
,
'color'
:
'#333333'
,
'padding-left'
:
'20rpx'
,
'padding-right'
:
'60rpx'
,
'width'
:
this
.
width
,
'font-size'
:
'26rpx'
,
'height'
:
'76rpx'
}
}
}
},
},
watch
:
{},
watch
:
{},
...
@@ -54,5 +83,15 @@
...
@@ -54,5 +83,15 @@
}
}
</
script
>
</
script
>
<
style
>
<
style
lang=
"scss"
scoped
>
.xh-select
{
position
:
relative
;
.input-icon
{
position
:
absolute
;
right
:
20rpx
;
top
:
26rpx
;
color
:
#2272FF
;
}
}
</
style
>
</
style
>
src/components/order/index.vue
View file @
99704795
...
@@ -125,8 +125,8 @@
...
@@ -125,8 +125,8 @@
}
}
},
},
showCountTime
()
{
showCountTime
()
{
return
[
1
,
2
,
3
].
indexOf
(
this
.
orderType
)
!=
-
1
||
(
this
.
orderType
==
0
&&
this
.
orderData
return
(
[
1
,
2
,
3
].
indexOf
(
this
.
orderType
)
!=
-
1
||
(
this
.
orderType
==
0
&&
this
.
orderData
.
orderBusinessType
!=
'R'
)
.
orderBusinessType
!=
'R'
)
)
&&
this
.
orderData
.
currentOverTime
},
},
showTime
()
{
showTime
()
{
return
[
4
,
5
,
6
].
indexOf
(
this
.
orderType
)
!=
-
1
return
[
4
,
5
,
6
].
indexOf
(
this
.
orderType
)
!=
-
1
...
@@ -309,7 +309,8 @@
...
@@ -309,7 +309,8 @@
color
:
#FFFFFF
;
color
:
#FFFFFF
;
border-radius
:
8rpx
;
border-radius
:
8rpx
;
background-image
:
linear-gradient
(
to
right
,
#FF930D
,
#FFC174
);
background-image
:
linear-gradient
(
to
right
,
#FF930D
,
#FFC174
);
font-size
:
22rpx
;
line-height
:
42rpx
;
&
.active
{
&
.active
{
background-image
:
linear-gradient
(
to
right
,
#2272FF
,
#47ABFF
);
background-image
:
linear-gradient
(
to
right
,
#2272FF
,
#47ABFF
);
}
}
...
...
src/components/order/noOrder.vue
View file @
99704795
...
@@ -36,7 +36,7 @@
...
@@ -36,7 +36,7 @@
.no-order-image
{
.no-order-image
{
width
:
374rpx
;
width
:
374rpx
;
height
:
218rpx
;
height
:
218rpx
;
margin-top
:
6
0rpx
;
margin-top
:
5
0rpx
;
margin-bottom
:
20rpx
;
margin-bottom
:
20rpx
;
}
}
}
}
...
...
src/components/photo/preview.vue
View file @
99704795
...
@@ -162,7 +162,6 @@
...
@@ -162,7 +162,6 @@
}
}
},
},
fail
(
e
)
{
fail
(
e
)
{
debugger
}
}
})
})
}
}
...
...
src/components/tabBarList/index.vue
View file @
99704795
...
@@ -32,10 +32,10 @@
...
@@ -32,10 +32,10 @@
<
style
lang=
"scss"
scoped
>
<
style
lang=
"scss"
scoped
>
.content
{
.content
{
height
:
100vh
;
//
height: 100vh;
background-color
:
#f4f5f7
;
background-color
:
#f4f5f7
;
padding
:
0rpx
30rpx
0
30rpx
;
padding
:
0rpx
30rpx
0
30rpx
;
overflow-y
:
auto
;
//
overflow-y: auto;
&
.fixed
{
&
.fixed
{
height
:
100vh
;
height
:
100vh
;
display
:
flex
;
display
:
flex
;
...
...
src/pages/index/index.vue
View file @
99704795
<
template
>
<
template
>
<scroll-view
scroll-y
style=
"margin-bottom: 20rpx;height: 100vh;"
@
scrolltolower=
"reachBottom"
scroll-anchoring
scroll-y=
"true"
refresher-enabled=
"true"
:refresher-triggered=
"triggered"
:refresher-threshold=
"100"
refresher-background=
"#F4F5F7"
@
refresherpulling=
"triggered = true"
@
refresherrefresh=
"onRefresh"
@
refresherrestore=
"onRestore"
@
refresherabort=
"onAbort"
>
<TabBarPage
title=
"充电桩自营平台"
>
<TabBarPage
title=
"充电桩自营平台"
>
<image
class=
"banner-image"
:src=
"bannerImage"
></image>
<image
class=
"banner-image"
:src=
"bannerImage"
></image>
...
@@ -63,6 +67,7 @@
...
@@ -63,6 +67,7 @@
<view
class=
"bottom-line-view"
></view>
<view
class=
"bottom-line-view"
></view>
</view>
</view>
</TabBarPage>
</TabBarPage>
</scroll-view>
</template>
</template>
<
script
>
<
script
>
...
@@ -96,6 +101,8 @@
...
@@ -96,6 +101,8 @@
pageNumber
:
0
,
pageNumber
:
0
,
pageSize
:
100
,
pageSize
:
100
,
},
},
triggered
:
false
,
_freshing
:
false
,
};
};
},
},
watch
:
{
watch
:
{
...
@@ -132,6 +139,7 @@
...
@@ -132,6 +139,7 @@
},
},
},
},
onLoad
()
{
onLoad
()
{
this
.
_freshing
=
false
;
this
.
getOrderCount
()
this
.
getOrderCount
()
},
},
onShow
()
{
onShow
()
{
...
@@ -140,17 +148,17 @@
...
@@ -140,17 +148,17 @@
this
.
initSettleInfo
();
this
.
initSettleInfo
();
}
}
},
},
onPullDownRefresh
()
{
//
onPullDownRefresh() {
console
.
log
(
'------下拉刷新------'
)
//
console.log('------下拉刷新------')
// 下拉刷洗
//
// 下拉刷洗
this
.
initSettleInfo
()
//
this.initSettleInfo()
},
//
},
onReachBottom
()
{
//
onReachBottom() {
console
.
log
(
'----------底部-------------'
,
this
.
currentLoadStatus
)
//
console.log('----------底部-------------', this.currentLoadStatus)
if
(
this
.
currentLoadStatus
!=
'loadmore'
)
return
//
if (this.currentLoadStatus != 'loadmore') return
this
.
currentLoadStatus
==
'loading'
//
this.currentLoadStatus == 'loading'
this
.
loadOrderList
()
//
this.loadOrderList()
},
//
},
// onPageScroll(obj) {
// onPageScroll(obj) {
// console.log('---------scroll---------', obj)
// console.log('---------scroll---------', obj)
// },
// },
...
@@ -212,6 +220,8 @@
...
@@ -212,6 +220,8 @@
self
.
$u
.
api
.
listByRecommendOrder
(
self
.
search
).
then
((
res
)
=>
{
self
.
$u
.
api
.
listByRecommendOrder
(
self
.
search
).
then
((
res
)
=>
{
uni
.
stopPullDownRefresh
()
// 结束下拉刷新
uni
.
stopPullDownRefresh
()
// 结束下拉刷新
self
.
loadedOrder
=
true
self
.
loadedOrder
=
true
self
.
triggered
=
false
;
self
.
_freshing
=
false
;
/*↓↓↓↓↓↓↓↓↓↓测试数据↓↓↓↓↓↓↓↓↓↓*/
/*↓↓↓↓↓↓↓↓↓↓测试数据↓↓↓↓↓↓↓↓↓↓*/
// if (res.data.list) {
// if (res.data.list) {
// if (res.data.list.length == 0 && res.data.total > 0) {
// if (res.data.list.length == 0 && res.data.total > 0) {
...
@@ -262,12 +272,27 @@
...
@@ -262,12 +272,27 @@
onRestore
()
{
onRestore
()
{
this
.
triggered
=
"restore"
;
this
.
triggered
=
"restore"
;
},
},
// reachBottom() {
reachBottom
()
{
// console.log(this.currentLoadStatus)
console
.
log
(
this
.
currentLoadStatus
)
// if (this.currentLoadStatus != 'loadmore') return
if
(
this
.
currentLoadStatus
!=
'loadmore'
)
return
// this.currentLoadStatus == 'loading'
this
.
currentLoadStatus
==
'loading'
// this.loadOrderList()
this
.
loadOrderList
()
// },
},
onPulling
(
e
)
{
console
.
log
(
"onpulling"
,
e
);
},
onRefresh
()
{
if
(
this
.
_freshing
)
return
;
this
.
_freshing
=
true
;
this
.
initSettleInfo
()
},
onRestore
()
{
this
.
triggered
=
'restore'
;
// 需要重置
console
.
log
(
"onRestore"
);
},
onAbort
()
{
console
.
log
(
"onAbort"
);
},
// clickSwiper(index) {},
// clickSwiper(index) {},
handleScroll
()
{
handleScroll
()
{
console
.
log
(
"-----scroll-------"
);
console
.
log
(
"-----scroll-------"
);
...
@@ -342,7 +367,7 @@
...
@@ -342,7 +367,7 @@
.banner-image
{
.banner-image
{
width
:
730rpx
;
width
:
730rpx
;
height
:
280rpx
;
height
:
280rpx
;
margin-left
:
-1
4
rpx
;
margin-left
:
-1
6
rpx
;
}
}
.msg-view
{
.msg-view
{
...
@@ -468,7 +493,6 @@
...
@@ -468,7 +493,6 @@
.order-item-view
{
.order-item-view
{
background-color
:
#F4F5F7
;
background-color
:
#F4F5F7
;
border-radius
:
12rpx
;
border-radius
:
12rpx
;
margin-bottom
:
20rpx
;
}
}
}
}
}
}
...
...
src/pages/learn/index.vue
View file @
99704795
...
@@ -9,13 +9,26 @@
...
@@ -9,13 +9,26 @@
:current=
"current"
@
change=
"tabsChange"
:is-scroll=
"false"
swiperWidth=
"750"
></u-tabs-swiper>
:current=
"current"
@
change=
"tabsChange"
:is-scroll=
"false"
swiperWidth=
"750"
></u-tabs-swiper>
</view>
</view>
<swiper
:current=
"swiperCurrent"
@
transition=
"transition"
@
animationfinish=
"animationfinish"
<swiper
:current=
"swiperCurrent"
@
transition=
"transition"
@
animationfinish=
"animationfinish"
style=
"height: 755rpx;"
>
style=
"height: 755rpx;
padding-top: 30rpx;
"
>
<swiper-item
class=
"swiper-item"
>
<swiper-item
class=
"swiper-item"
>
<scroll-view
scroll-y
style=
"height:796rpx;width:100%;"
@
scrolltolower=
"onreachBottom"
>
<scroll-view
scroll-y
style=
"height:796rpx;width:100%;"
@
scrolltolower=
"onreachBottom"
>
<view
class=
"standard"
@
click=
"goToPrint"
>
<view
class=
"currency-class"
:style=
"
{'background-image':'url(/static/photo/jianbian@3x.png)'}">
<text>
充电桩交付规范
</text>
<view
class=
"class1"
@
click=
ccc(courselist[0].id)
>
<text>
>
</text>
<image
class=
"img"
:src=
"rule.pic"
mode=
""
></image>
<view
class=
"right u-margin-left-30 u-padding-top-10 u-padding-bottom-14 width-360"
>
<view
class=
"u-font-32 font-bold"
>
充电桩交付规范
</view>
<view
class=
"u-font-24"
>
请点击学习
</view>
</view>
</view>
<view
class=
"line-percent"
>
<text
class=
"font-default-color"
>
去查看
</text>
</view>
</view>
</view>
</scroll-view>
</scroll-view>
</swiper-item>
</swiper-item>
<swiper-item
class=
"swiper-item"
>
<swiper-item
class=
"swiper-item"
>
...
@@ -199,6 +212,9 @@
...
@@ -199,6 +212,9 @@
start
:
0
,
start
:
0
,
},
},
list
:
[],
list
:
[],
rule
:
{
pic
:
process
.
uniEnv
.
qn_base_url
+
"guifan1@3x.png"
},
courselist
:
[{
courselist
:
[{
title
:
'服务规范'
,
title
:
'服务规范'
,
desc
:
'为用户提供更好服务,自己赚更多钱'
,
desc
:
'为用户提供更好服务,自己赚更多钱'
,
...
@@ -473,14 +489,12 @@
...
@@ -473,14 +489,12 @@
console
.
log
(
that
.
exam
);
console
.
log
(
that
.
exam
);
if
(
res
.
data
.
examStatus
==
2
)
{
if
(
res
.
data
.
examStatus
==
2
)
{
console
.
log
(
"examStatus "
+
i
+
" 2"
);
console
.
log
(
"examStatus "
+
i
+
" 2"
);
that
.
applyExam
();
return
;
return
;
}
}
if
(
res
.
data
.
examStatus
==
1
)
{
if
(
res
.
data
.
examStatus
==
1
)
{
console
.
log
(
"examStatus "
+
i
+
" 1"
);
console
.
log
(
"examStatus "
+
i
+
" 1"
);
that
.
examList
[
i
].
isComplete
=
true
;
that
.
examList
[
i
].
isComplete
=
true
;
that
.
examScore
=
res
.
data
.
examScore
;
that
.
examScore
=
res
.
data
.
examScore
;
that
.
postResult
();
return
;
return
;
}
}
if
(
res
.
data
.
examStatus
==
0
)
{
if
(
res
.
data
.
examStatus
==
0
)
{
...
@@ -532,12 +546,17 @@
...
@@ -532,12 +546,17 @@
/* //交付规范 */
/* //交付规范 */
.standard
{
.standard
{
width
:
656
rpx
;
width
:
690
rpx
;
height
:
180
rpx
;
display
:
flex
;
display
:
flex
;
justify-content
:
space-between
;
justify-content
:
space-between
;
border-bottom
:
1
rpx
solid
#82848a
;
/* border-bottom: 1rpx solid #82848a; */
padding
:
0
34
rpx
;
/* padding: 0 34rpx; */
margin
:
72
rpx
auto
;
/* margin: 72rpx auto; */
border-radius
:
12
rpx
;
padding
:
30
rpx
;
margin-top
:
30
rpx
;
background-color
:
#FFFFFF
;
}
}
/* //培训通知 */
/* //培训通知 */
...
@@ -549,18 +568,22 @@
...
@@ -549,18 +568,22 @@
overflow
:
hidden
;
overflow
:
hidden
;
background-color
:
#ffffff
;
background-color
:
#ffffff
;
border-radius
:
12
rpx
;
border-radius
:
12
rpx
;
padding
:
30
rpx
;
}
}
.n-head
{
.n-head
{
text-align
:
left
;
text-align
:
left
;
/* margin: 30rpx 30rpx 0 30rpx;
*/
margin-left
:
30
rpx
;
}
}
.news
{
.news
{
height
:
168
rpx
;
height
:
168
rpx
;
overflow
:
hidden
;
overflow
:
hidden
;
/* margin: 30rpx 30rpx 0 30rpx; */
margin-top
:
30
rpx
;
/* margin-top: 30rpx;
margin-left: 30rpx;
margin-right: 30rpx;
margin-bottom: 0; */
}
}
/* //在线学习 */
/* //在线学习 */
...
@@ -665,4 +688,47 @@
...
@@ -665,4 +688,47 @@
.content-line
{
.content-line
{
margin-top
:
30
rpx
;
margin-top
:
30
rpx
;
}
}
.standard
{
}
.standard-img
{
width
:
160
rpx
;
height
:
120
rpx
;
}
.standard-body
{
height
:
120
rpx
;
display
:
flex
;
}
.standard-body-title
{
font-size
:
32
rpx
;
font-weight
:
bold
;
}
.width-360
{
width
:
360
rpx
;
}
.rule-back
{
background-image
:
process
.
uniEnv
.
qn_base_url
+
"banner-xx@3x.png"
;
}
/*
<
view
class
=
"standard"
@click
=
"goToPrint"
>
<!
--
<
text
>
充电桩交付规范
</
text
>
<
text
>></
text
>
--
>
<
view
class
=
"standard-img"
></
view
>
<
view
class
=
"standard-body"
>
<
view
class
=
"standard-body-title"
>
充电桩交付规范
</
view
>
<
view
class
=
"standard-body-title"
>
请点击学习
</
view
>
</
view
>
<
view
cl
ass
=
"standard-go-look-look"
>
去查看
</
view
>*/
</
style
>
</
style
>
src/pages/login/index.vue
View file @
99704795
...
@@ -99,15 +99,15 @@ export default {
...
@@ -99,15 +99,15 @@ export default {
return
login
.
authorization
(
params
);
return
login
.
authorization
(
params
);
}).
then
(
res
=>
{
}).
then
(
res
=>
{
uni
.
hideLoading
();
uni
.
hideLoading
();
if
(
res
)
{
if
(
res
&&
res
.
code
==
200
&&
res
.
data
&&
res
.
data
.
token
)
{
that
.
setUserData
(
res
.
data
)
that
.
setUserData
(
res
.
data
)
that
.
goBackPage
()
that
.
goBackPage
()
}
else
{
}
else
{
th
is
.
setLoginStatus
()
th
at
.
setLoginStatus
()
}
}
}).
catch
(
res
=>
{
}).
catch
(
res
=>
{
uni
.
hideLoading
()
uni
.
hideLoading
()
th
is
.
setLoginStatus
()
th
at
.
setLoginStatus
()
})
})
},
},
...
...
src/pages/order/complete.vue
View file @
99704795
<
template
>
<
template
>
<view>
<view
class=
"com-content"
>
<complete-check
:show=
"completeCheckStatus"
:list-data=
"completeCheckResult"
@
close=
"closeCheckResult"
@
handle=
"handerProgrom"
@
change=
"confirm"
></complete-check>
<view
class=
"u-wrap"
v-if=
"!takeStatus"
>
<view
class=
"u-wrap"
v-if=
"!takeStatus"
>
<u-navbar
:background=
"
{background: '#2272FF'}" back-icon-color="#fff" :title-size="26" title-color="#fff" :border-bottom="false" title="完工信息">
</u-navbar>
<u-navbar
:background=
"
{background: '#2272FF'}" back-icon-color="#fff" :title-size="26" title-color="#fff" :border-bottom="false" title="完工信息">
</u-navbar>
<u-tabs-swiper
ref=
"tabs"
:current=
"tabIndex"
name=
"panelName"
:list=
"list"
@
change=
"tabsChange"
:is-scroll=
"false"
bg-color=
"#2272FF"
inactive-color=
"#a6c6ff"
active-color=
"#fff"
height=
"120"
></u-tabs-swiper>
<u-tabs-swiper
ref=
"tabs"
:current=
"tabIndex"
name=
"panelName"
:list=
"list"
@
change=
"tabsChange"
:is-scroll=
"false"
bg-color=
"#2272FF"
inactive-color=
"#a6c6ff"
active-color=
"#fff"
height=
"120"
></u-tabs-swiper>
...
@@ -76,14 +77,14 @@
...
@@ -76,14 +77,14 @@
</u-form>
</u-form>
</scroll-view>
</scroll-view>
</view>
</view>
<view
class=
"btn-wrap flex-xc"
>
<view
class=
"btn-wrap flex-xc
btn-bottom
"
>
<u-button
class=
"btn-submit"
@
click=
"saveComplete"
<u-button
class=
"btn-submit"
@
click=
"saveComplete"
type=
"primary"
shape=
"circle"
:hover-class=
"submitStatus ? '' : 'none'"
>
type=
"primary"
shape=
"circle"
:
custom-style=
"customStyle"
:
hover-class=
"submitStatus ? '' : 'none'"
>
暂存
暂存
</u-button>
</u-button>
<u-button
class=
"btn-submit"
@
click=
"
nextStep
"
v-if=
"tabIndex===list.length - 1"
<u-button
class=
"btn-submit"
@
click=
"
orderFinish
"
v-if=
"tabIndex===list.length - 1"
type=
"primary"
shape=
"circle"
:hover-class=
"submitStatus ? '' : 'none'"
>
type=
"primary"
shape=
"circle"
:
custom-style=
"buttonStyle"
:
hover-class=
"submitStatus ? '' : 'none'"
>
交付
完工
</u-button>
</u-button>
<u-button
class=
"btn-submit"
@
click=
"nextStep"
:custom-style=
"buttonStyle"
v-else
<u-button
class=
"btn-submit"
@
click=
"nextStep"
:custom-style=
"buttonStyle"
v-else
type=
"primary"
shape=
"circle"
:hover-class=
"submitStatus ? '' : 'none'"
>
type=
"primary"
shape=
"circle"
:hover-class=
"submitStatus ? '' : 'none'"
>
...
@@ -116,6 +117,7 @@
...
@@ -116,6 +117,7 @@
orderId
:
0
,
orderId
:
0
,
categoryId
:
0
,
categoryId
:
0
,
orderServiceType
:
''
,
orderServiceType
:
''
,
inGuaranteePeriod
:
''
,
list
:
[],
list
:
[],
tabIndex
:
0
,
tabIndex
:
0
,
scrollTop
:
0
,
//tab标题的滚动条位置
scrollTop
:
0
,
//tab标题的滚动条位置
...
@@ -160,7 +162,12 @@
...
@@ -160,7 +162,12 @@
submitBtnStatus
:
false
,
submitBtnStatus
:
false
,
takeStatus
:
false
,
takeStatus
:
false
,
fileIndex
:
null
,
fileIndex
:
null
,
files
:
[]
files
:
[],
completeCheckStatus
:
false
,
completeCheckResult
:
[],
waitHandlerPanelIndex
:
0
,
waitHandlerGroupIndex
:
0
,
waitHandlerEleIndex
:
0
,
}
}
},
},
components
:
{
components
:
{
...
@@ -186,10 +193,12 @@
...
@@ -186,10 +193,12 @@
this
.
orderId
=
option
.
orderId
this
.
orderId
=
option
.
orderId
this
.
categoryId
=
option
.
categoryId
this
.
categoryId
=
option
.
categoryId
this
.
orderServiceType
=
decodeURIComponent
(
option
.
orderServiceType
)
this
.
orderServiceType
=
decodeURIComponent
(
option
.
orderServiceType
)
this
.
inGuaranteePeriod
=
option
.
inGuaranteePeriod
}
else
{
}
else
{
this
.
orderId
=
9708719
this
.
orderId
=
9708719
this
.
categoryId
=
88
this
.
categoryId
=
88
this
.
orderServiceType
=
'安装'
this
.
orderServiceType
=
'安装'
this
.
inGuaranteePeriod
=
'Y'
}
}
this
.
getCompleteData
()
this
.
getCompleteData
()
},
},
...
@@ -209,20 +218,34 @@
...
@@ -209,20 +218,34 @@
return
this
.
submitBtnStatus
?
{
return
this
.
submitBtnStatus
?
{
'color'
:
'#FFFFFF'
,
'color'
:
'#FFFFFF'
,
'background-color'
:
'#2272FF;'
,
'background-color'
:
'#2272FF;'
,
'width'
:
'
6
00rpx'
,
'width'
:
'
3
00rpx'
,
'height'
:
'104rpx'
,
'height'
:
'104rpx'
,
'font-size'
:
'32rpx'
,
'font-size'
:
'32rpx'
,
'font-weight'
:
'bold'
'font-weight'
:
'bold'
,
'margin-left'
:
'50rpx'
}
:
{
}
:
{
'color'
:
'#FFFFFF'
,
'color'
:
'#FFFFFF'
,
'background-color'
:
'#D1D4D4;'
,
'background-color'
:
'#D1D4D4;'
,
'width'
:
'
6
00rpx'
,
'width'
:
'
3
00rpx'
,
'height'
:
'104rpx'
,
'height'
:
'104rpx'
,
'font-size'
:
'32rpx'
,
'font-size'
:
'32rpx'
,
'font-weight'
:
'bold'
'font-weight'
:
'bold'
,
'margin-left'
:
'50rpx'
}
}
},
customStyle
()
{
return
{
'background-color'
:
'#D1D4D4'
,
'width'
:
'300rpx'
,
'height'
:
'104rpx'
,
'background-color'
:
'transparent'
,
'border'
:
'1px solid #2272FF'
,
'color'
:
'#2272FF'
,
'font-weight'
:
'bold'
,
'font-size'
:
'32rpx'
,
}
}
},
},
},
methods
:
{
methods
:
{
getCompleteData
()
{
//获取工单配置的完工项目
getCompleteData
()
{
//获取工单配置的完工项目
let
self
=
this
let
self
=
this
...
@@ -269,6 +292,80 @@
...
@@ -269,6 +292,80 @@
}
}
})
})
},
},
checkCompleteItem
(){
let
self
=
this
let
checkResult
=
[]
let
pass
=
true
let
first
=
true
self
.
list
.
forEach
((
panel
,
panelIndex
)
=>
{
let
panelResult
=
{
label
:
panel
.
panelName
,
submitted
:
0
,
required
:
0
,
pass
:
true
}
panel
.
items
.
forEach
((
group
,
groupIndex
)
=>
{
group
.
items
.
forEach
((
ele
,
eleIndex
)
=>
{
if
(
ele
.
required
){
panelResult
.
required
++
let
value
=
self
.
form
[
ele
.
fieldsName
]
if
(
value
&&!
Array
.
isArray
(
value
)){
panelResult
.
submitted
++
}
else
if
(
value
&&
Array
.
isArray
(
value
)
&&
value
.
length
>
0
){
panelResult
.
submitted
++
}
else
if
(
first
){
// 记录第一个 为空 并且需要必填的项 用于定位
first
=
false
self
.
waitHandlerPanelIndex
=
panelIndex
self
.
waitHandlerGroupIndex
=
groupIndex
self
.
waitHandlerEleIndex
=
eleIndex
}
}
})
})
panelResult
.
pass
=
panelResult
.
required
<=
panelResult
.
submitted
pass
=
pass
&&
panelResult
.
pass
checkResult
.
push
(
panelResult
)
})
console
.
log
(
checkResult
)
self
.
completeCheckResult
=
checkResult
return
pass
},
confirm
(){
// 检查结果窗口 确认回调
uni
.
navigateTo
({
url
:
'pages/order/index'
})
},
closeCheckResult
(){
// 检查结果窗口取消回调
this
.
completeCheckStatus
=
false
},
handerProgrom
(){
// 检查结果窗口 去处理回调 定位到缺失的项
this
.
completeCheckStatus
=
false
this
.
locationCompleteItem
(
this
.
waitHandlerPanelIndex
,
this
.
waitHandlerGroupIndex
,
this
.
waitHandlerEleIndex
)
},
locationCompleteItem
(
panelIndex
,
groupIndex
,
eleIndex
){
// 页面定位到某一项
this
.
tabIndex
=
panelIndex
this
.
arr
=
[]
this
.
scrollRightTop
=
0
;
this
.
current
=
0
;
this
.
$nextTick
(
function
()
{
this
.
swichMenu
(
groupIndex
)
})
},
orderFinish
(){
let
self
=
this
let
pass
=
this
.
checkCompleteItem
()
if
(
!
pass
){
self
.
completeCheckStatus
=
true
}
else
{
console
.
log
(
"完工"
);
if
(
self
.
inGuaranteePeriod
===
'Y'
){
self
.
$u
.
api
.
inOrderFinish
(
self
.
orderId
).
then
((
res
)
=>
{
console
.
log
(
res
)
self
.
completeCheckStatus
=
true
})
}
else
{
self
.
$u
.
api
.
outOrderFinish
({
customerPayType
:
'CASH'
},
self
.
orderId
).
then
((
res
)
=>
{
console
.
log
(
res
)
self
.
completeCheckStatus
=
true
})
}
}
},
getTakeStatus
(
event
)
{
getTakeStatus
(
event
)
{
this
.
takeStatus
=
event
.
status
this
.
takeStatus
=
event
.
status
this
.
fileIndex
=
event
.
index
.
toString
()
this
.
fileIndex
=
event
.
index
.
toString
()
...
@@ -486,7 +583,9 @@
...
@@ -486,7 +583,9 @@
}
}
.class-item
{
.class-item
{
padding
:
50rpx
;
background-color
:
#fff
;
padding
:
28rpx
;
border-radius
:
8rpx
;
.title
{
.title
{
font-weight
:
bold
;
font-weight
:
bold
;
font-size
:
32rpx
;
font-size
:
32rpx
;
...
@@ -523,6 +622,10 @@
...
@@ -523,6 +622,10 @@
/* #endif */
/* #endif */
display
:
flex
;
display
:
flex
;
flex-direction
:
column
;
flex-direction
:
column
;
background-color
:
#FFFFFF
;
background-image
:
linear-gradient
(
to
top
,
#2272ff
0%
,
#2272ff
100%
);
background-size
:
750rpx
600rpx
;
background-repeat
:
no-repeat
;
}
}
.u-search-box
{
.u-search-box
{
...
@@ -533,6 +636,7 @@
...
@@ -533,6 +636,7 @@
flex
:
1
;
flex
:
1
;
display
:
flex
;
display
:
flex
;
overflow
:
hidden
;
overflow
:
hidden
;
border-radius
:
12rpx
12rpx
0
0
;
}
}
.u-search-inner
{
.u-search-inner
{
...
@@ -552,17 +656,18 @@
...
@@ -552,17 +656,18 @@
.u-tab-view
{
.u-tab-view
{
width
:
200rpx
;
width
:
200rpx
;
height
:
100%
;
height
:
100%
;
border
:
4rpx
solid
#F4F5F7
;
}
}
.u-tab-item
{
.u-tab-item
{
height
:
110rpx
;
height
:
110rpx
;
background
:
#f
6f6f6
;
background
:
#f
ff
;
box-sizing
:
border-box
;
box-sizing
:
border-box
;
display
:
flex
;
display
:
flex
;
align-items
:
center
;
align-items
:
center
;
justify-content
:
center
;
justify-content
:
center
;
font-size
:
26rpx
;
font-size
:
26rpx
;
color
:
#
444
;
color
:
#
333333
;
font-weight
:
400
;
font-weight
:
400
;
line-height
:
1
;
line-height
:
1
;
}
}
...
@@ -570,8 +675,6 @@
...
@@ -570,8 +675,6 @@
.u-tab-item-active
{
.u-tab-item-active
{
position
:
relative
;
position
:
relative
;
color
:
#2272FF
;
color
:
#2272FF
;
font-size
:
30rpx
;
font-weight
:
600
;
background
:
#fff
;
background
:
#fff
;
}
}
...
@@ -596,13 +699,6 @@
...
@@ -596,13 +699,6 @@
padding
:
16rpx
;
padding
:
16rpx
;
}
}
.class-item
{
margin-bottom
:
30rpx
;
background-color
:
#fff
;
padding
:
16rpx
;
border-radius
:
8rpx
;
}
.class-item
:last-child
{
.class-item
:last-child
{
min-height
:
100vh
;
min-height
:
100vh
;
}
}
...
@@ -639,9 +735,13 @@
...
@@ -639,9 +735,13 @@
}
}
/*提交按钮*/
/*提交按钮*/
.btn-bottom
{
border
:
2rpx
solid
#F4F5F7
;
}
.btn-wrap
{
.btn-wrap
{
width
:
100%
;
width
:
100%
;
padding
:
20rpx
0
4
0
rpx
0
;
padding
:
20rpx
0
4
4
rpx
0
;
display
:
flex
;
display
:
flex
;
justify-content
:
center
;
justify-content
:
center
;
align-items
:
center
;
align-items
:
center
;
...
...
src/pages/order/detail.vue
View file @
99704795
...
@@ -551,6 +551,7 @@
...
@@ -551,6 +551,7 @@
url
:
'pages/order/complete?orderId='
+
this
.
order
.
orderId
url
:
'pages/order/complete?orderId='
+
this
.
order
.
orderId
+
"&categoryId="
+
this
.
order
.
categoryId
+
"&categoryId="
+
this
.
order
.
categoryId
+
"&orderServiceType="
+
this
.
order
.
orderServiceType
+
"&orderServiceType="
+
this
.
order
.
orderServiceType
+
"&inGuaranteePeriod="
+
this
.
order
.
inGuaranteePeriod
})
})
},
},
rejectOrder
()
{
// 拒单
rejectOrder
()
{
// 拒单
...
...
src/pages/order/feedback.vue
View file @
99704795
...
@@ -45,7 +45,7 @@
...
@@ -45,7 +45,7 @@
<text
class=
"txt"
>
{{
txt
}}
</text>
<text
class=
"txt"
>
{{
txt
}}
</text>
</view>
</view>
</view>
</view>
<view
class=
"input-view"
v-show=
"showRemark"
>
<view
class=
"input-view"
>
<u-input
v-model=
"trace.remark"
class=
"textarea"
height=
"156"
type=
"textarea"
placeholder=
"请补充详细说明,以便于记录您的接单信用分"
></u-input>
<u-input
v-model=
"trace.remark"
class=
"textarea"
height=
"156"
type=
"textarea"
placeholder=
"请补充详细说明,以便于记录您的接单信用分"
></u-input>
</view>
</view>
</view>
</view>
...
@@ -160,8 +160,6 @@ export default {
...
@@ -160,8 +160,6 @@ export default {
}
}
},
},
async
onLoad
(
e
)
{
async
onLoad
(
e
)
{
this
.
orderId
=
1
;
this
.
categoryId
=
88
;
if
(
e
)
{
if
(
e
)
{
this
.
orderId
=
e
.
orderId
||
null
;
this
.
orderId
=
e
.
orderId
||
null
;
this
.
categoryId
=
e
.
categoryId
||
null
;
this
.
categoryId
=
e
.
categoryId
||
null
;
...
@@ -327,7 +325,6 @@ export default {
...
@@ -327,7 +325,6 @@ export default {
},
},
async
submitForm
()
{
async
submitForm
()
{
let
self
=
this
;
let
self
=
this
;
self
.
orderId
=
666
;
if
(
!
self
.
orderId
)
{
if
(
!
self
.
orderId
)
{
uni
.
showToast
({
uni
.
showToast
({
icon
:
error
,
icon
:
error
,
...
@@ -480,10 +477,6 @@ export default {
...
@@ -480,10 +477,6 @@ export default {
border
:
none
;
border
:
none
;
}
}
}
}
button
[
disabled
]
:not
([
type
])
{
background
:
#d1d4d4
;
color
:
#ffffff
;
}
.btn
{
.btn
{
padding
:
30rpx
;
padding
:
30rpx
;
border-radius
:
52rpx
;
border-radius
:
52rpx
;
...
...
src/pages/order/index.vue
View file @
99704795
...
@@ -184,7 +184,7 @@
...
@@ -184,7 +184,7 @@
// 页面数据
// 页面数据
getOrderList
(
index
)
{
getOrderList
(
index
)
{
// 状态处理
// 状态处理
//
this.pageNumber += 1
this
.
pageNumber
+=
1
this
.
loaded
=
false
this
.
loaded
=
false
var
param
=
{
var
param
=
{
pageNumber
:
this
.
pageNumber
,
pageNumber
:
this
.
pageNumber
,
...
@@ -250,23 +250,23 @@
...
@@ -250,23 +250,23 @@
// 获取订单数量
// 获取订单数量
getOrderCount
()
{
getOrderCount
()
{
var
self
=
this
;
// 加载订单列表
// 加载订单列表
self
.
$u
.
api
.
listOrderCount
().
then
((
res
)
=>
{
this
.
$u
.
api
.
listOrderCount
().
then
((
res
)
=>
{
if
(
res
.
code
==
200
)
{
if
(
res
.
code
==
200
)
{
console
.
log
(
"==="
,
res
.
data
)
console
.
log
(
"==="
,
res
.
data
)
if
(
res
.
data
)
{
if
(
res
.
data
)
{
var
count
=
0
var
count
=
0
self
.
list
.
forEach
(
item
=>
{
this
.
list
.
forEach
(
item
=>
{
if
(
item
.
name
===
'待预约'
)
{
if
(
item
.
name
===
'待预约'
)
{
item
.
count
=
res
.
data
.
toAppointmentCount
item
.
total
=
res
.
data
.
toAppointmentCount
}
else
if
(
item
.
name
===
'待签到'
)
{
}
else
if
(
item
.
name
===
'待签到'
)
{
item
.
count
=
res
.
data
.
toCheckinCount
item
.
total
=
res
.
data
.
toCheckinCount
}
else
if
(
item
.
name
===
'待完工'
)
{
}
else
if
(
item
.
name
===
'待完工'
)
{
item
.
count
=
res
.
data
.
toFinishCount
item
.
total
=
res
.
data
.
toFinishCount
}
else
if
(
item
.
name
===
'审核中'
)
{
}
else
if
(
item
.
name
===
'审核中'
)
{
item
.
count
=
res
.
data
.
reviewingCount
item
.
total
=
res
.
data
.
reviewingCount
}
else
if
(
item
.
name
===
'异常单'
)
{
}
else
if
(
item
.
name
===
'异常单'
)
{
item
.
count
=
res
.
data
.
exceptionCount
item
.
total
=
res
.
data
.
exceptionCount
}
}
})
})
var
count
=
0
var
count
=
0
...
...
src/static/photo/jianbian@3x.png
0 → 100644
View file @
99704795
21.9 KB
src/utils/login.js
View file @
99704795
const
app
=
getApp
();
// 小程序登录
// 小程序登录
function
appLogin
()
{
function
appLogin
()
{
return
new
Promise
(
function
(
resolve
,
reject
)
{
return
new
Promise
(
function
(
resolve
,
reject
)
{
...
@@ -28,13 +26,12 @@ function appLogin() {
...
@@ -28,13 +26,12 @@ function appLogin() {
// 小程序授权
// 小程序授权
function
authorization
(
data
)
{
function
authorization
(
data
)
{
const
app
=
getApp
();
return
new
Promise
(
async
function
(
resolve
,
reject
)
{
return
new
Promise
(
async
function
(
resolve
,
reject
)
{
data
.
wxAppNo
=
app
.
globalData
.
wxAppNo
data
.
wxAppNo
=
app
.
globalData
.
wxAppNo
const
res
=
await
app
.
$vm
.
$u
.
api
.
loginWechatAuth
(
data
)
const
res
=
await
app
.
$vm
.
$u
.
api
.
loginWechatAuth
(
data
)
if
(
res
)
{
if
(
res
)
{
if
(
res
.
code
==
200
&&
res
.
data
)
{
if
(
res
.
code
==
200
&&
res
.
data
)
{
// app.setUserData(res.data)
// app.getBaseInfo(app.$vm)
resolve
(
res
);
resolve
(
res
);
}
else
{
}
else
{
reject
(
res
);
reject
(
res
);
...
@@ -50,13 +47,12 @@ function authorization(data) {
...
@@ -50,13 +47,12 @@ function authorization(data) {
// 小程序注册
// 小程序注册
function
signup
(
data
)
{
function
signup
(
data
)
{
const
app
=
getApp
();
return
new
Promise
(
async
function
(
resolve
,
reject
)
{
return
new
Promise
(
async
function
(
resolve
,
reject
)
{
data
.
wxAppNo
=
app
.
globalData
.
wxAppNo
data
.
wxAppNo
=
app
.
globalData
.
wxAppNo
const
res
=
await
app
.
$vm
.
$u
.
api
.
loginWechatAuth
(
data
)
const
res
=
await
app
.
$vm
.
$u
.
api
.
loginWechatAuth
(
data
)
if
(
res
)
{
if
(
res
)
{
if
(
res
.
code
==
200
&&
res
.
data
)
{
if
(
res
.
code
==
200
&&
res
.
data
)
{
// app.setUserData(res.data)
// app.getBaseInfo(app.$vm)
resolve
(
res
);
resolve
(
res
);
}
else
{
}
else
{
uni
.
showModal
({
uni
.
showModal
({
...
...
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