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
2287d568
Commit
2287d568
authored
May 07, 2021
by
Morson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
开启分包优化
登录页面重复授权问题修复 预约时间问题修复 微信小程序用户接口提示问题修改
parent
eea3f433
Changes
10
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
299 additions
and
983 deletions
+299
-983
manifest.json
src/manifest.json
+4
-0
pages.json
src/pages.json
+256
-220
index.vue
src/pages/login/index.vue
+13
-7
index.vue
src/pages/mine/index.vue
+0
-94
complete.vue
src/pages/order/complete.vue
+1
-1
detail.vue
src/pages/order/detail.vue
+5
-4
feedback.vue
src/pages/order/feedback.vue
+17
-30
index.vue
src/pages/order/index.vue
+0
-615
index.vue
src/pages/study/index.vue
+0
-8
u-button.vue
src/uview-ui/components/u-button/u-button.vue
+3
-4
No files found.
src/manifest.json
View file @
2287d568
...
@@ -6,6 +6,10 @@
...
@@ -6,6 +6,10 @@
"versionCode"
:
"100"
,
"versionCode"
:
"100"
,
"transformPx"
:
false
,
"transformPx"
:
false
,
"app-plus"
:
{
"app-plus"
:
{
"optimization"
:
{
"subPackages"
:
true
},
"runmode"
:
"liberate"
,
//
开启分包优化后,必须配置资源释放模式
/*
5
+App特有相关
*/
/*
5
+App特有相关
*/
"usingComponents"
:
true
,
"usingComponents"
:
true
,
"splashscreen"
:
{
"splashscreen"
:
{
...
...
src/pages.json
View file @
2287d568
This diff is collapsed.
Click to expand it.
src/pages/login/index.vue
View file @
2287d568
...
@@ -160,13 +160,19 @@ export default {
...
@@ -160,13 +160,19 @@ export default {
if
(
pages
.
length
)
{
if
(
pages
.
length
)
{
let
index
=
pages
.
length
-
1
;
let
index
=
pages
.
length
-
1
;
if
(
index
)
{
if
(
index
)
{
let
prevPage
=
pages
[
pages
.
length
-
1
];
//上一个页面
let
prevPage
=
pages
[
index
];
//上一个页面
if
(
prevPage
&&
prevPage
.
$vm
)
{
if
(
prevPage
.
route
==
"pages/login/index"
)
{
prevPage
.
$vm
.
isRefresh
=
true
;
uni
.
navigateTo
({
url
:
'pages/index/index'
})
}
else
{
if
(
prevPage
&&
prevPage
.
$vm
)
{
prevPage
.
$vm
.
isRefresh
=
true
;
}
uni
.
navigateBack
({
delta
:
1
})
}
}
uni
.
navigateBack
({
delta
:
1
})
}
else
{
}
else
{
uni
.
navigateTo
({
uni
.
navigateTo
({
url
:
'pages/index/index'
url
:
'pages/index/index'
...
@@ -174,7 +180,7 @@ export default {
...
@@ -174,7 +180,7 @@ export default {
}
}
}
else
{
}
else
{
uni
.
navigateTo
({
uni
.
navigateTo
({
url
:
"pages/
mine/index
"
url
:
"pages/
index/mine
"
})
})
}
}
...
...
src/pages/mine/index.vue
deleted
100644 → 0
View file @
eea3f433
<
template
>
<view>
<u-navbar
v-if=
"!takeStatus"
:is-back=
"false"
:title-size=
"26"
title-color=
"#000"
title=
"我的"
></u-navbar>
<view
v-if=
"!takeStatus"
>
<view
class=
"u-flex user-box u-p-l-30 u-p-r-20 u-p-b-30"
>
<view
class=
"u-m-r-10"
>
<u-avatar
:src=
"pic"
size=
"140"
></u-avatar>
</view>
<view
class=
"u-flex-1"
>
<view
class=
"u-font-18 u-p-b-20"
>
uView ui
</view>
<view
class=
"u-font-14 u-tips-color"
>
微信号:helang_uView
</view>
</view>
</view>
<view
class=
"u-m-t-20"
>
<u-cell-group>
<u-cell-item
v-for=
"(item, index) in items"
:title=
"item.title"
:value=
"item.value"
:key=
"index"
>
<u-icon
slot=
"icon"
size=
"32"
name=
"search"
></u-icon>
</u-cell-item>
</u-cell-group>
</view>
<view
class=
"u-m-t-20"
>
<u-cell-group>
<u-cell-item
icon=
"setting"
title=
"设置"
></u-cell-item>
</u-cell-group>
</view>
<view
class=
"u-m-t-20"
@
click=
"take"
>
<u-cell-group>
<u-cell-item
icon=
"setting"
title=
"相机组件测试"
></u-cell-item>
</u-cell-group>
</view>
</view>
<take-photo
v-if=
"takeStatus"
:currentItem=
"testData"
@
close=
"closeTake"
></take-photo>
</view>
</
template
>
<
script
>
import
takePhoto
from
'@/components/take/index.vue'
export
default
{
components
:
{
'take-photo'
:
takePhoto
},
data
()
{
return
{
pic
:
'https://uviewui.com/common/logo.png'
,
show
:
true
,
takeStatus
:
false
,
testData
:
{
_id
:
'1'
,
// 规格ID
system_id
:
'2'
,
// 系统ID
brand_id
:
'3'
,
// 品牌ID
classify_id
:
'4'
,
// 分类ID
images
:
[
// 拍照要求示意图
'https://qn-static.banshouhui.com/live_mark.png'
,
'https://qn-static.banshouhui.com/live_mark.png'
,
'https://qn-static.banshouhui.com/live_mark.png'
],
main_point
:
[]
// 要点
}
}
},
computed
:
{
items
()
{
return
[
{
title
:
'我的钱包'
,
value
:
''
,
icon
:
''
},
{
title
:
'我的质保金'
,
value
:
''
,
icon
:
''
},
{
title
:
'我的合同'
,
value
:
''
,
icon
:
''
},
{
title
:
'我的证件'
,
value
:
''
,
icon
:
''
},
{
title
:
'我的收货地址'
,
value
:
''
,
icon
:
''
},
{
title
:
'我的仓库'
,
value
:
''
,
icon
:
''
},
{
title
:
'联系客服'
,
value
:
'6666666'
,
icon
:
''
}]
}
},
onLoad
()
{
},
methods
:
{
take
()
{
uni
.
hideTabBar
()
this
.
takeStatus
=
true
},
closeTake
(
img
)
{
console
.
log
(
img
)
this
.
takeStatus
=
false
}
}
}
</
script
>
<
style
lang=
"scss"
scoped
>
</
style
>
src/pages/order/complete.vue
View file @
2287d568
...
@@ -319,7 +319,7 @@
...
@@ -319,7 +319,7 @@
},
},
confirm
(){
// 检查结果窗口 确认回调
confirm
(){
// 检查结果窗口 确认回调
uni
.
navigateTo
({
uni
.
navigateTo
({
url
:
'pages/
order/index
'
url
:
'pages/
index/order
'
})
})
},
},
closeCheckResult
(){
// 检查结果窗口取消回调
closeCheckResult
(){
// 检查结果窗口取消回调
...
...
src/pages/order/detail.vue
View file @
2287d568
...
@@ -156,7 +156,7 @@
...
@@ -156,7 +156,7 @@
import
appointTime
from
'@/components/appoint/appoint-time.vue'
import
appointTime
from
'@/components/appoint/appoint-time.vue'
import
takePhoto
from
'@/components/take/index.vue'
import
takePhoto
from
'@/components/take/index.vue'
import
PopView
from
"@/components/popView/index.vue"
import
PopView
from
"@/components/popView/index.vue"
let
now
=
Date
.
now
()
let
now
=
new
Date
(
new
Date
().
toLocaleDateString
()).
getTime
();
let
r
=
require
(
"../../libs/bmap-wx.min.js"
);
let
r
=
require
(
"../../libs/bmap-wx.min.js"
);
let
h
=
new
r
.
BMapWX
({
let
h
=
new
r
.
BMapWX
({
// ak: "rpVq5d3yxaRCoKzVwmFMo0o4iC524CAG",
// ak: "rpVq5d3yxaRCoKzVwmFMo0o4iC524CAG",
...
@@ -458,6 +458,7 @@
...
@@ -458,6 +458,7 @@
console
.
log
(
data
,
'dateChange'
)
console
.
log
(
data
,
'dateChange'
)
let
self
=
this
let
self
=
this
self
.
appointmentDatetime
=
data
.
item
.
day
self
.
appointmentDatetime
=
data
.
item
.
day
self
.
appointmentDatetimeRange
=
null
self
.
timeList
.
map
((
item
,
index
)
=>
{
self
.
timeList
.
map
((
item
,
index
)
=>
{
if
(
data
.
item
.
timeRange
.
indexOf
(
item
.
pkey
)
>
-
1
)
{
if
(
data
.
item
.
timeRange
.
indexOf
(
item
.
pkey
)
>
-
1
)
{
item
.
disabled
=
true
item
.
disabled
=
true
...
@@ -546,15 +547,15 @@
...
@@ -546,15 +547,15 @@
data
.
orderId
=
this
.
order
.
orderId
data
.
orderId
=
this
.
order
.
orderId
}
else
if
(
this
.
submitType
===
'workerAppointment'
){
// 预约
}
else
if
(
this
.
submitType
===
'workerAppointment'
){
// 预约
data
.
appointmentDatetime
=
this
.
appointmentDatetime
data
.
appointmentDatetime
=
this
.
appointmentDatetime
data
.
appointmentDatetimeRange
=
this
.
appointmentDatetimeRange
.
pkey
if
(
!
data
.
appointmentDatetime
){
if
(
!
data
.
appointmentDatetime
){
this
.
commonToast
(
'请选择预约日期'
,
'waring'
)
this
.
commonToast
(
'请选择预约日期'
,
'waring'
)
return
return
}
}
if
(
!
data
.
appointmentDatetimeRange
){
if
(
!
this
.
appointmentDatetimeRange
||
!
this
.
appointmentDatetimeRange
.
pkey
){
this
.
commonToast
(
'请选择预约时间段'
,
'waring'
)
this
.
commonToast
(
'请选择预约时间段'
,
'waring'
)
return
return
}
}
data
.
appointmentDatetimeRange
=
this
.
appointmentDatetimeRange
.
pkey
}
else
if
(
this
.
submitType
===
'maintainWorkerCheckin'
)
{
// 签到
}
else
if
(
this
.
submitType
===
'maintainWorkerCheckin'
)
{
// 签到
// 检查见到距离是否符合
// 检查见到距离是否符合
if
(
!
this
.
isErrorSign
){
if
(
!
this
.
isErrorSign
){
...
@@ -708,7 +709,7 @@
...
@@ -708,7 +709,7 @@
this
.
visibale
=
false
this
.
visibale
=
false
// 交互规范
// 交互规范
uni
.
switchTab
({
uni
.
switchTab
({
url
:
'pages/
learn/index
'
url
:
'pages/
index/learn
'
})
})
},
},
threeDays
()
{
threeDays
()
{
...
...
src/pages/order/feedback.vue
View file @
2287d568
...
@@ -121,11 +121,10 @@ export default {
...
@@ -121,11 +121,10 @@ export default {
reasonType
:
'报备'
,
// 反馈类型
reasonType
:
'报备'
,
// 反馈类型
reasonRelegation
:
'客户'
,
// 反馈归属
reasonRelegation
:
'客户'
,
// 反馈归属
reason
:
''
,
// 反馈原因
reason
:
''
,
// 反馈原因
appointmentDatetime
:
null
,
// 预约时间
appointmentDatetimeRange
:
''
,
// 预约时间段类型
nextTraceDatetime
:
''
,
// 下次跟踪时间
remark
:
''
// 备注
remark
:
''
// 备注
},
},
traceDate
:
null
,
// 反馈时间
timeRange
:
null
,
// 反馈时间段
dateItem
:
null
,
dateItem
:
null
,
timeItem
:
null
,
timeItem
:
null
,
showRemark
:
false
,
showRemark
:
false
,
...
@@ -139,23 +138,15 @@ export default {
...
@@ -139,23 +138,15 @@ export default {
appointTime
appointTime
},
},
watch
:
{
watch
:
{
vuex_token
(
val
)
{
//
vuex_token(val) {
this
.
initPageData
();
//
this.initPageData();
}
//
}
},
},
computed
:
{
computed
:
{
disabledSubmit
()
{
disabledSubmit
()
{
let
self
=
this
;
let
self
=
this
;
if
(
self
.
trace
.
reasonRelegation
&&
self
.
trace
.
reason
)
{
if
(
self
.
trace
.
reasonRelegation
&&
self
.
trace
.
reason
&&
self
.
traceDate
&&
self
.
timeRange
)
{
if
(
self
.
trace
.
reasonType
==
'改约'
)
{
return
false
;
if
(
self
.
trace
.
appointmentDatetime
&&
self
.
trace
.
appointmentDatetimeRange
)
{
return
false
;
}
}
else
{
if
(
self
.
trace
.
nextTraceDatetime
&&
self
.
trace
.
appointmentDatetimeRange
)
{
return
false
;
}
}
}
}
return
true
;
return
true
;
...
@@ -222,9 +213,8 @@ export default {
...
@@ -222,9 +213,8 @@ export default {
self
.
trace
.
reason
=
tabList
[
'owns'
][
self
.
curOwn
][
'types'
][
0
];
self
.
trace
.
reason
=
tabList
[
'owns'
][
self
.
curOwn
][
'types'
][
0
];
self
.
appointTitle
=
self
.
appoint
[
self
.
curTab
]
self
.
appointTitle
=
self
.
appoint
[
self
.
curTab
]
self
.
trace
.
remark
=
''
;
self
.
trace
.
remark
=
''
;
self
.
trace
.
appointmentDatetime
=
null
;
self
.
traceDate
=
null
;
self
.
trace
.
appointmentDatetimeRange
=
null
;
self
.
timeRange
=
null
;
self
.
trace
.
nextTraceDatetime
=
null
;
if
(
self
.
trace
.
reasonType
==
'改约'
)
{
if
(
self
.
trace
.
reasonType
==
'改约'
)
{
self
.
showRemark
=
true
;
self
.
showRemark
=
true
;
if
(
self
.
dateList
&&
self
.
timeList
)
{
if
(
self
.
dateList
&&
self
.
timeList
)
{
...
@@ -300,12 +290,9 @@ export default {
...
@@ -300,12 +290,9 @@ export default {
},
},
dateChange
(
data
)
{
dateChange
(
data
)
{
// 点击日期选择
// 点击日期选择
console
.
log
(
data
,
'week-data'
);
let
self
=
this
;
let
self
=
this
;
self
.
dateItem
=
data
.
item
self
.
dateItem
=
data
.
item
if
(
self
.
trace
.
reasonType
==
'改约'
)
{
if
(
self
.
trace
.
reasonType
==
'改约'
)
{
self
.
trace
.
appointmentDatetime
=
data
.
item
.
day
;
self
.
trace
.
nextTraceDatetime
=
null
;
self
.
timeList
.
map
((
item
,
index
)
=>
{
self
.
timeList
.
map
((
item
,
index
)
=>
{
if
(
data
.
item
.
timeRange
.
indexOf
(
item
.
pkey
)
>
-
1
)
{
if
(
data
.
item
.
timeRange
.
indexOf
(
item
.
pkey
)
>
-
1
)
{
item
.
disabled
=
true
;
item
.
disabled
=
true
;
...
@@ -314,18 +301,17 @@ export default {
...
@@ -314,18 +301,17 @@ export default {
}
}
});
});
}
else
{
}
else
{
self
.
trace
.
appointmentDatetime
=
null
;
self
.
trace
.
nextTraceDatetime
=
data
.
item
.
day
;
self
.
timeList
.
map
((
item
,
index
)
=>
{
self
.
timeList
.
map
((
item
,
index
)
=>
{
item
.
disabled
=
false
;
item
.
disabled
=
false
;
});
});
}
}
self
.
trace
.
appointmentDatetimeRange
=
''
;
self
.
traceDate
=
data
.
item
.
day
;
self
.
timeRange
=
null
;
},
},
timeChange
(
data
)
{
timeChange
(
data
)
{
// 时间段选择变化
// 时间段选择变化
console
.
log
(
data
,
'week-data'
);
console
.
log
(
data
,
'week-data'
);
this
.
t
race
.
appointmentDatet
imeRange
=
data
.
item
.
pkey
;
this
.
timeRange
=
data
.
item
.
pkey
;
this
.
timeItem
=
data
.
item
this
.
timeItem
=
data
.
item
},
},
async
submitForm
()
{
async
submitForm
()
{
...
@@ -341,15 +327,16 @@ export default {
...
@@ -341,15 +327,16 @@ export default {
self
.
submiting
=
true
;
self
.
submiting
=
true
;
let
params
=
this
.
$u
.
deepClone
(
self
.
trace
);
let
params
=
this
.
$u
.
deepClone
(
self
.
trace
);
if
(
self
.
trace
.
reasonType
!=
'改约'
)
{
if
(
self
.
trace
.
reasonType
!=
'改约'
)
{
params
.
appointmentDatetimeRange
=
null
if
(
self
.
timeItem
&&
self
.
timeItem
.
pkey
&&
self
.
traceDate
){
params
.
appointmentDatetime
=
null
let
traceDate
=
self
.
moment
(
self
.
traceDate
);
if
(
self
.
timeItem
&&
self
.
timeItem
.
pkey
&&
params
.
nextTraceDatetime
){
let
traceDate
=
self
.
moment
(
params
.
nextTraceDatetime
);
let
timeArr
=
self
.
timeItem
.
pkey
.
split
(
"_"
)
let
timeArr
=
self
.
timeItem
.
pkey
.
split
(
"_"
)
let
hours
=
timeArr
&&
timeArr
.
length
&&
timeArr
.
pop
()
let
hours
=
timeArr
&&
timeArr
.
length
&&
timeArr
.
pop
()
let
traceDateTime
=
traceDate
.
clone
().
add
(
Number
(
hours
),
'hours'
);
let
traceDateTime
=
traceDate
.
clone
().
add
(
Number
(
hours
),
'hours'
);
params
.
nextTraceDatetime
=
traceDateTime
.
unix
()
*
1000
params
.
nextTraceDatetime
=
traceDateTime
.
unix
()
*
1000
}
}
}
else
{
params
.
appointmentDatetime
=
self
.
traceDate
params
.
appointmentDatetimeRange
=
self
.
timeRange
}
}
let
res
=
await
self
.
$u
.
api
.
traceAndAppointment
(
params
,
self
.
orderId
);
let
res
=
await
self
.
$u
.
api
.
traceAndAppointment
(
params
,
self
.
orderId
);
self
.
submiting
=
false
;
self
.
submiting
=
false
;
...
...
src/pages/order/index.vue
deleted
100644 → 0
View file @
eea3f433
This diff is collapsed.
Click to expand it.
src/pages/study/index.vue
deleted
100644 → 0
View file @
eea3f433
<
template
>
</
template
>
<
script
>
</
script
>
<
style
>
</
style
>
src/uview-ui/components/u-button/u-button.vue
View file @
2287d568
...
@@ -26,7 +26,6 @@
...
@@ -26,7 +26,6 @@
:send-message-img="sendMessageImg"
:send-message-img="sendMessageImg"
:show-message-card="showMessageCard"
:show-message-card="showMessageCard"
@getphonenumber="getphonenumber"
@getphonenumber="getphonenumber"
@getuserinfo="getuserinfo"
@error="error"
@error="error"
@opensetting="opensetting"
@opensetting="opensetting"
@launchapp="launchapp"
@launchapp="launchapp"
...
@@ -325,9 +324,9 @@ export default {
...
@@ -325,9 +324,9 @@ export default {
getphonenumber
(
res
)
{
getphonenumber
(
res
)
{
this
.
$emit
(
'getphonenumber'
,
res
);
this
.
$emit
(
'getphonenumber'
,
res
);
},
},
getuserinfo
(
res
)
{
//
getuserinfo(res) {
this
.
$emit
(
'getuserinfo'
,
res
);
//
this.$emit('getuserinfo', res);
},
//
},
error
(
res
)
{
error
(
res
)
{
this
.
$emit
(
'error'
,
res
);
this
.
$emit
(
'error'
,
res
);
},
},
...
...
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