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
50074060
Commit
50074060
authored
May 15, 2021
by
zhengzy
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
https://git.banshouhui.com/lijundan/self-support
parents
ed2232e6
af0b718a
Changes
20
Show whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
202 additions
and
252 deletions
+202
-252
App.vue
src/App.vue
+4
-4
order.js
src/common/api/order.js
+3
-2
http.api.js
src/common/http.api.js
+0
-44
XhFiles.vue
src/components/createCom/XhFiles.vue
+24
-2
XhInput.vue
src/components/createCom/XhInput.vue
+1
-5
index.vue
src/components/order/index.vue
+0
-2
preview.vue
src/components/photo/preview.vue
+18
-4
index.vue
src/components/take/index.vue
+8
-2
readme.md
src/components/take/readme.md
+37
-36
pages.json
src/pages.json
+2
-1
index.vue
src/pages/index/index.vue
+30
-29
learn.vue
src/pages/index/learn.vue
+10
-4
order.vue
src/pages/index/order.vue
+1
-41
section.vue
src/pages/learn/section.vue
+1
-1
index.vue
src/pages/login/index.vue
+41
-32
index.vue
src/pages/mine/customer/index.vue
+2
-0
statement.vue
src/pages/mine/wallet/statement.vue
+4
-1
complete.vue
src/pages/order/complete.vue
+1
-7
detail.vue
src/pages/order/detail.vue
+4
-15
refuse.vue
src/pages/order/refuse.vue
+11
-20
No files found.
src/App.vue
View file @
50074060
...
@@ -106,9 +106,9 @@ export default {
...
@@ -106,9 +106,9 @@ export default {
}
}
},
},
async
getBaseInfo
(
vm
,
callBack
)
{
async
getBaseInfo
(
vm
,
callBack
)
{
uni
.
showLoading
({
//
uni.showLoading({
title
:
"加载中……"
,
//
title: "加载中……",
});
//
});
const
res
=
await
vm
.
$u
.
api
.
getSettleBaseInfo
();
const
res
=
await
vm
.
$u
.
api
.
getSettleBaseInfo
();
if
(
res
.
code
!==
200
)
{
if
(
res
.
code
!==
200
)
{
uni
.
showToast
({
uni
.
showToast
({
...
@@ -125,7 +125,7 @@ export default {
...
@@ -125,7 +125,7 @@ export default {
if
(
typeof
callBack
==
"function"
)
{
if
(
typeof
callBack
==
"function"
)
{
callBack
(
vm
,
res
.
data
);
callBack
(
vm
,
res
.
data
);
}
}
uni
.
hideLoading
();
//
uni.hideLoading();
return
res
.
data
;
return
res
.
data
;
},
},
...
...
src/common/api/order.js
View file @
50074060
import
util
from
'@/utils/util.js'
import
util
from
'@/utils/util.js'
const
jsonType
=
{
'content-type'
:
'application/json'
}
const
jsonType
=
{
'content-type'
:
'application/json'
}
const
formType
=
{
'content-type'
:
'application/x-www-form-urlencoded'
}
const
formType
=
{
'content-type'
:
'application/x-www-form-urlencoded'
}
const
dataType
=
{
'content-type'
:
'multipart/form-data'
}
let
orderApiFun
=
function
(
vm
){
let
orderApiFun
=
function
(
vm
){
// 接口公共前缀
// 接口公共前缀
...
@@ -47,7 +48,7 @@ let orderApiFun = function(vm){
...
@@ -47,7 +48,7 @@ let orderApiFun = function(vm){
let
traceAndAppointment
=
async
(
params
=
{},
orderId
)
=>
await
vm
.
$u
.
post
(
'/wxh-worker-rest/rest/order/traceAndAppointment/trace/V2/'
+
vm
.
vuex_token
+
`/`
+
orderId
,
params
)
let
traceAndAppointment
=
async
(
params
=
{},
orderId
)
=>
await
vm
.
$u
.
post
(
'/wxh-worker-rest/rest/order/traceAndAppointment/trace/V2/'
+
vm
.
vuex_token
+
`/`
+
orderId
,
params
)
/* 师傅拒单 */
/* 师傅拒单 */
let
rejectOrder
=
async
(
params
=
{},
orderId
)
=>
await
vm
.
$u
.
get
(
prefix
+
vm
.
vuex_token
+
`/order/
${
orderId
}
/workerReject/V2`
,
params
)
let
rejectOrder
=
async
(
params
=
{},
orderId
)
=>
await
vm
.
$u
.
post
(
prefix
+
vm
.
vuex_token
+
`/order/
${
orderId
}
/workerReject/V2`
,
params
,
formType
)
/**
/**
...
@@ -161,7 +162,7 @@ let orderApiFun = function(vm){
...
@@ -161,7 +162,7 @@ let orderApiFun = function(vm){
// 获取我的钱包-支付单一览
// 获取我的钱包-支付单一览
let
payableRecord
=
async
(
params
=
{})
=>
await
vm
.
$u
.
post
(
settle
+
vm
.
vuex_token
+
'/payable/v2/queryPayableRecord'
,
params
,
formType
);
let
payableRecord
=
async
(
params
=
{})
=>
await
vm
.
$u
.
post
(
settle
+
vm
.
vuex_token
+
'/payable/v2/queryPayableRecord'
,
params
,
formType
);
// 获取我的钱包-师傅提现
// 获取我的钱包-师傅提现
let
workerApplyPay
=
async
(
payableId
)
=>
await
vm
.
$u
.
post
(
`/wxh-worker-rest/rest/
${
vm
.
vuex_token
}
/applypay/
${
payableId
}
/workerApplyPay`
);
let
workerApplyPay
=
async
(
payableId
)
=>
await
vm
.
$u
.
post
(
`/wxh-worker-rest/rest/
${
vm
.
vuex_token
}
/applypay/
${
payableId
}
/workerApplyPay`
,
{},
dataType
);
const
orderApi
=
{
const
orderApi
=
{
listByRecommendOrder
,
listByRecommendOrder
,
...
...
src/common/http.api.js
View file @
50074060
...
@@ -2,50 +2,6 @@ import {apiFun} from '@/common/api/index.js';
...
@@ -2,50 +2,6 @@ import {apiFun} from '@/common/api/index.js';
import
{
import
{
cloudRulesApiFun
cloudRulesApiFun
}
from
"@/common/api/cloud_rules.js"
}
from
"@/common/api/cloud_rules.js"
// const upload = async function(path, params = {}, vm) {
// return new Promise((resolve, reject) => {
// uni.showLoading({
// mask: true,
// title: '上传中'
// });
// let data = {
// url: vm.vuex_config.upload.uploadurl,
// filePath: path,
// header: {
// token: vm.vuex_token || '',
// uid: vm.vuex_user.id || 0
// },
// name: 'file',
// fileType:'image',
// complete: function() {
// uni.hideLoading();
// },
// success: uploadFileRes => {
// try {
// var res = uploadFileRes.data;
// if (vm.$u.test.jsonString(res)) {
// resolve(JSON.parse(res).data)
// }
// if (vm.$u.test.object(res)) {
// resolve(res.data)
// }
// } catch (e) {
// reject(uploadFileRes.data);
// }
// },
// fail: (e) => {
// reject(e);
// }
// };
// let isObj = vm.$u.test.object(vm.vuex_config.upload.multipart);
// if (isObj) {
// data.formData = vm.vuex_config.upload.multipart;
// }
// uni.uploadFile(data);
// })
// }
const
install
=
(
Vue
,
vm
)
=>
{
const
install
=
(
Vue
,
vm
)
=>
{
let
apiUrls
=
apiFun
(
vm
)
let
apiUrls
=
apiFun
(
vm
)
...
...
src/components/createCom/XhFiles.vue
View file @
50074060
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
</view>
</view>
<u-action-sheet
:list=
"list"
v-model=
"maskShow"
:cancel-btn=
"true"
@
click=
"uploadSelect"
></u-action-sheet>
<u-action-sheet
:list=
"list"
v-model=
"maskShow"
:cancel-btn=
"true"
@
click=
"uploadSelect"
></u-action-sheet>
</view>
</view>
<take-photo
v-if=
"takeStatus"
@
close=
"closeTake"
:currentItem=
"currentItemDate"
></take-photo>
<take-photo
v-if=
"takeStatus"
@
close=
"closeTake"
:
upload=
"false"
:
currentItem=
"currentItemDate"
></take-photo>
</view>
</view>
</
template
>
</
template
>
...
@@ -28,6 +28,8 @@
...
@@ -28,6 +28,8 @@
import
arrMixin
from
'./arrMixin'
import
arrMixin
from
'./arrMixin'
import
baseFile
from
'@/components/upload/index'
;
import
baseFile
from
'@/components/upload/index'
;
import
takePhoto
from
'@/components/take/index.vue'
import
takePhoto
from
'@/components/take/index.vue'
import
uploader
from
'@/plugins/uploader/index.js'
export
default
{
export
default
{
name
:
'XhFiles'
,
name
:
'XhFiles'
,
components
:
{
components
:
{
...
@@ -132,10 +134,30 @@
...
@@ -132,10 +134,30 @@
val
.
forEach
(
item
=>
{
val
.
forEach
(
item
=>
{
this
.
imgList
.
push
(
item
)
this
.
imgList
.
push
(
item
)
})
})
this
.
setValue
()
const
files
=
val
.
map
(
v
=>
{
return
{
path
:
v
.
path
}
})
this
.
uploadTakeImg
(
files
)
// this.setValue()
}
}
this
.
takeStatus
=
false
this
.
takeStatus
=
false
},
},
uploadTakeImg
(
files
)
{
const
options
=
{
files
:
files
,
// 必填 临时文件路径 格式: [{path: "图片地址"}]
load
:
false
,
//(默认 true 说明:本接口是否提示加载动画)
maxSize
:
300000
,
//(默认 无 说明:上传的文件最大字节数限制,默认不限制)
onEachUpdate
:
res
=>
{
console
.
log
(
"上传成功返回:"
,
res
);
const
value
=
[
uploader
.
qiniuTokenObj
.
visitPrefix
+
res
.
url
]
this
.
valueChange
(
value
)
},
Update
:
res
=>
{
console
.
log
(
"上传进度返回:"
,
res
);
}
}
uploader
.
qnFileUpload
(
options
)
},
prviewImage
(
item
,
index
)
{
prviewImage
(
item
,
index
)
{
uni
.
previewImage
({
uni
.
previewImage
({
urls
:
[
item
.
path
?
item
.
path
:
item
.
src
],
urls
:
[
item
.
path
?
item
.
path
:
item
.
src
],
...
...
src/components/createCom/XhInput.vue
View file @
50074060
...
@@ -93,11 +93,7 @@
...
@@ -93,11 +93,7 @@
},
},
watch
:
{},
watch
:
{},
mounted
()
{},
mounted
()
{},
methods
:
{
methods
:
{}
handleFocus
()
{
console
.
log
(
'handle focus'
)
}
}
}
}
</
script
>
</
script
>
...
...
src/components/order/index.vue
View file @
50074060
...
@@ -216,7 +216,6 @@
...
@@ -216,7 +216,6 @@
}
}
},
},
created
()
{
created
()
{
console
.
log
(
'+++++++++++'
)
/*
/*
orderStatus:
orderStatus:
待接单 orderStatus<31 工单状态小于31
待接单 orderStatus<31 工单状态小于31
...
@@ -252,7 +251,6 @@
...
@@ -252,7 +251,6 @@
}
}
this
.
timeout
=
this
.
orderData
.
currentOverTime
<
new
Date
().
getTime
()
this
.
timeout
=
this
.
orderData
.
currentOverTime
<
new
Date
().
getTime
()
this
.
timestamp
=
Math
.
round
(
Math
.
abs
(
this
.
orderData
.
currentOverTime
-
new
Date
().
getTime
())
/
1000
)
this
.
timestamp
=
Math
.
round
(
Math
.
abs
(
this
.
orderData
.
currentOverTime
-
new
Date
().
getTime
())
/
1000
)
console
.
log
(
'++++++'
,
this
.
timestamp
)
},
},
methods
:
{
methods
:
{
handleClick
()
{
handleClick
()
{
...
...
src/components/photo/preview.vue
View file @
50074060
...
@@ -17,7 +17,14 @@
...
@@ -17,7 +17,14 @@
import
qiniup
from
'@/components/upload/qiniup'
;
import
qiniup
from
'@/components/upload/qiniup'
;
const
app
=
getApp
()
const
app
=
getApp
()
export
default
{
export
default
{
props
:
{},
props
:
{
upload
:
{
// 是否默认上传 true:会自动上传好图片并返回绝对路径 false: 只返回临时路径,需要在父组件做上传动作
type
:
Boolean
,
default
()
{
return
true
}
}
},
mixins
:
[
qiniup
],
mixins
:
[
qiniup
],
data
()
{
data
()
{
return
{
return
{
...
@@ -128,7 +135,13 @@
...
@@ -128,7 +135,13 @@
title
:
'图片保存中…'
title
:
'图片保存中…'
})
})
self
.
saveTempToLocal
()
self
.
saveTempToLocal
()
if
(
this
.
upload
)
{
self
.
confirmUpload
(
true
)
self
.
confirmUpload
(
true
)
}
else
{
this
.
submitFile
()
}
},
},
submitFile
()
{
submitFile
()
{
const
photo
=
getApp
().
globalData
.
photo
const
photo
=
getApp
().
globalData
.
photo
...
@@ -138,8 +151,9 @@
...
@@ -138,8 +151,9 @@
// 拍照项张数目增加 等于10张
// 拍照项张数目增加 等于10张
photo
.
allImages
.
unshift
(
photo
.
allImages
.
unshift
(
{
{
key
:
photo
.
tempPath
.
mixWater
,
path
:
photo
.
tempPath
.
mixWater
,
src
:
this
.
fileMaps
[
0
].
key
src
:
photo
.
tempPath
.
mixWater
,
key
:
this
.
fileMaps
[
0
]
?
this
.
fileMaps
[
0
].
key
:
''
,
}
}
)
)
if
(
photo
.
currentItemLength
<
10
){
if
(
photo
.
currentItemLength
<
10
){
...
...
src/components/take/index.vue
View file @
50074060
...
@@ -38,7 +38,7 @@
...
@@ -38,7 +38,7 @@
</view>
</view>
</view>
</view>
</view>
</view>
<photo-preview
v-if=
"showType === 2"
@
changeType=
"changeType"
@
finish=
"finish"
/>
<photo-preview
v-if=
"showType === 2"
@
changeType=
"changeType"
@
finish=
"finish"
:upload=
"upload"
/>
<photo-setting
v-if=
"showType === 3"
@
changeType=
"changeType"
@
changeWatermark=
"changeWatermark"
/>
<photo-setting
v-if=
"showType === 3"
@
changeType=
"changeType"
@
changeWatermark=
"changeWatermark"
/>
</view>
</view>
</
template
>
</
template
>
...
@@ -65,6 +65,12 @@
...
@@ -65,6 +65,12 @@
main_point
:
[]
// 要点
main_point
:
[]
// 要点
}
}
}
}
},
upload
:
{
// 是否默认上传 true:会自动上传好图片并返回绝对路径 false: 只返回临时路径,需要在父组件做上传动作
type
:
Boolean
,
default
()
{
return
true
}
}
}
},
},
components
:
{
components
:
{
...
@@ -103,7 +109,7 @@
...
@@ -103,7 +109,7 @@
cameraChange
:
false
,
cameraChange
:
false
,
waterSetting
:
null
,
waterSetting
:
null
,
shadowInitShow
:
false
,
// 第一次进入页面需显示弹窗
shadowInitShow
:
false
,
// 第一次进入页面需显示弹窗
standardStatus
:
false
// 是否显示拍照要求
standardStatus
:
false
,
// 是否显示拍照要求
}
}
},
},
created
(
e
)
{
created
(
e
)
{
...
...
src/components/take/readme.md
View file @
50074060
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
该组件仅用于拍照后返回图片,与业务不关联,目前最多一次可以拍10张图片
该组件仅用于拍照后返回图片,与业务不关联,目前最多一次可以拍10张图片
```
```
### 因为相机组件需要全屏展示,所以加载该组件需要在当前页面隐藏顶部导航栏,底部的TabBar
以及其他页面元素
### 因为相机组件需要全屏展示,所以加载该组件需要在当前页面隐藏顶部导航栏,底部的TabBar
```
```
uni.hideTabBar()
uni.hideTabBar()
```
```
...
@@ -17,6 +17,7 @@ uni.hideTabBar()
...
@@ -17,6 +17,7 @@ uni.hideTabBar()
### Props
### Props
| 属性名 | 类型 | 默认值 | 可选值 | 说明 |
| 属性名 | 类型 | 默认值 | 可选值 | 说明 |
| :-: | :-: | :-: | :-: | :-: |
| :-: | :-: | :-: | :-: | :-: |
| update | Boolean | true | true/false | 是否默认上传 true:会自动上传好图片并返回绝对路径 false: 只返回临时路径,需要在父组件做上传动作 |
| currentItem | Object | - | - | 对应的规范数据,用于获取示意图和水印,以及保存图片所需的ID
**格式见下文**
|
| currentItem | Object | - | - | 对应的规范数据,用于获取示意图和水印,以及保存图片所需的ID
**格式见下文**
|
### currentItem 格式
### currentItem 格式
...
...
src/pages.json
View file @
50074060
...
@@ -232,7 +232,8 @@
...
@@ -232,7 +232,8 @@
"style"
:
{
"style"
:
{
"navigationStyle"
:
"custom"
,
"navigationStyle"
:
"custom"
,
"navigationBarTitleText"
:
"联系客服"
,
"navigationBarTitleText"
:
"联系客服"
,
"enablePullDownRefresh"
:
false
"enablePullDownRefresh"
:
false
,
"disableScroll"
:
true
}
}
},
},
{
{
...
...
src/pages/index/index.vue
View file @
50074060
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
scroll-anchoring
scroll-y=
"true"
refresher-enabled=
"true"
:refresher-triggered=
"triggered"
:refresher-threshold=
"100"
scroll-anchoring
scroll-y=
"true"
refresher-enabled=
"true"
:refresher-triggered=
"triggered"
:refresher-threshold=
"100"
refresher-background=
"#F4F5F7"
@
refresherpulling=
"triggered = true"
@
refresherrefresh=
"onRefresh"
refresher-background=
"#F4F5F7"
@
refresherpulling=
"triggered = true"
@
refresherrefresh=
"onRefresh"
@
refresherrestore=
"onRestore"
@
refresherabort=
"onAbort"
enable-back-to-top
>
@
refresherrestore=
"onRestore"
@
refresherabort=
"onAbort"
enable-back-to-top
>
<TabBarPage
title=
"
充电桩自营平台
"
>
<TabBarPage
title=
"
扳手会
"
>
<image
class=
"banner-image"
:src=
"bannerImage"
@
click=
"handleClickBanner"
></image>
<image
class=
"banner-image"
:src=
"bannerImage"
@
click=
"handleClickBanner"
></image>
<view
class=
"msg-view"
>
<view
class=
"msg-view"
>
...
@@ -52,7 +52,7 @@
...
@@ -52,7 +52,7 @@
@
click=
"handleClick(item.orderId)"
@
action=
"handleAction(item.orderId)"
>
@
click=
"handleClick(item.orderId)"
@
action=
"handleAction(item.orderId)"
>
</OrderCell>
</OrderCell>
</view>
</view>
<u-loadmore
:status=
"currentLoadStatus"
bgColor=
"#F4F5F7"
></u-loadmore>
<u-loadmore
v-show=
"(search.pageNumber == 1 && loadedOrder) || search.pageNumber > 2"
:status=
"currentLoadStatus"
bgColor=
"#F4F5F7"
></u-loadmore>
<!--
</scroll-view>
-->
<!--
</scroll-view>
-->
</view>
</view>
...
@@ -161,9 +161,8 @@
...
@@ -161,9 +161,8 @@
onShow
()
{
onShow
()
{
// 每次进入页面都刷新入驻状态
// 每次进入页面都刷新入驻状态
this
.
pageNumber
=
0
this
.
pageNumber
=
0
if
(
this
.
vuex_token
)
{
this
.
initSettleInfo
();
this
.
initSettleInfo
();
}
this
.
getLocation
()
this
.
getLocation
()
},
},
// onPullDownRefresh() {
// onPullDownRefresh() {
...
@@ -186,11 +185,9 @@
...
@@ -186,11 +185,9 @@
this
.
initSettleInfo
();
this
.
initSettleInfo
();
},
},
handleClick
(
orderId
)
{
// 点击了cell
handleClick
(
orderId
)
{
// 点击了cell
console
.
log
(
'点击了cell'
)
this
.
viewOderItem
(
orderId
)
this
.
viewOderItem
(
orderId
)
},
},
handleAction
(
orderId
)
{
// 点击了按钮
handleAction
(
orderId
)
{
// 点击了按钮
console
.
log
(
'点击了按钮'
)
this
.
viewOderItem
(
orderId
)
this
.
viewOderItem
(
orderId
)
},
},
viewOderItem
(
orderId
)
{
// 跳转工单详情页面
viewOderItem
(
orderId
)
{
// 跳转工单详情页面
...
@@ -200,22 +197,28 @@
...
@@ -200,22 +197,28 @@
},
},
async
initSettleInfo
()
{
async
initSettleInfo
()
{
let
self
=
this
;
let
self
=
this
;
// 加载消息列表
this
.
loadMessageList
();
if
(
this
.
vuex_token
)
{
const
callBack
=
(
vm
,
result
)
=>
{
const
callBack
=
(
vm
,
result
)
=>
{
// 后台自动判断入驻流程是否完成,前台通过status确定状态
// 后台自动判断入驻流程是否完成,前台通过status确定状态
if
(
result
&&
result
.
record
)
{
if
(
result
&&
result
.
record
)
{
vm
.
loaded
=
true
;
vm
.
needSettled
=
result
.
needSettled
;
vm
.
needSettled
=
result
.
needSettled
;
vm
.
status
=
Number
(
result
.
record
.
status
||
'0'
);
vm
.
status
=
Number
(
result
.
record
.
status
||
'0'
);
// vm.status = 8
// vm.status = 8
}
}
};
};
await
app
.
getBaseInfo
(
self
,
callBack
);
// 加载消息列表
self
.
loadMessageList
();
self
.
search
.
pageNumber
=
0
self
.
search
.
pageNumber
=
0
self
.
loadedOrder
=
false
self
.
loadedOrder
=
false
self
.
loadOrderList
();
self
.
loadOrderList
();
await
app
.
getBaseInfo
(
self
,
callBack
);
this
.
loaded
=
true
;
}
else
{
this
.
loaded
=
true
}
},
},
loadMessageList
()
{
loadMessageList
()
{
let
self
=
this
;
let
self
=
this
;
...
@@ -233,7 +236,6 @@
...
@@ -233,7 +236,6 @@
});
});
},
},
loadOrderList
()
{
loadOrderList
()
{
console
.
log
(
'-----------准备加载推荐列表-----------'
)
this
.
search
.
pageNumber
+=
1
this
.
search
.
pageNumber
+=
1
let
self
=
this
;
let
self
=
this
;
// 加载订单列表
// 加载订单列表
...
@@ -247,10 +249,10 @@
...
@@ -247,10 +249,10 @@
if
(
self
.
search
.
pageNumber
==
1
)
{
if
(
self
.
search
.
pageNumber
==
1
)
{
self
.
orderList
=
[]
self
.
orderList
=
[]
}
}
if
(
res
.
data
.
list
)
{
if
(
res
.
data
.
list
)
{
self
.
orderList
.
push
(...
res
.
data
.
list
);
self
.
orderList
.
push
(...
res
.
data
.
list
);
}
}
console
.
log
(
'this.orderlist;'
,
this
.
orderList
)
self
.
currentLoadStatus
=
res
.
data
.
total
>
self
.
orderList
.
length
&&
(
res
.
data
.
list
||
[]).
length
==
self
.
search
.
pageSize
?
'loadmore'
:
'nomore'
self
.
currentLoadStatus
=
res
.
data
.
total
>
self
.
orderList
.
length
&&
(
res
.
data
.
list
||
[]).
length
==
self
.
search
.
pageSize
?
'loadmore'
:
'nomore'
}
else
{
}
else
{
...
@@ -331,7 +333,6 @@
...
@@ -331,7 +333,6 @@
var
self
=
this
;
// 加载订单列表
var
self
=
this
;
// 加载订单列表
self
.
$u
.
api
.
listOrderCount
().
then
((
res
)
=>
{
self
.
$u
.
api
.
listOrderCount
().
then
((
res
)
=>
{
if
(
res
.
code
==
200
)
{
if
(
res
.
code
==
200
)
{
console
.
log
(
"==="
,
res
.
data
)
if
(
res
.
data
)
{
if
(
res
.
data
)
{
var
count
=
0
var
count
=
0
for
(
var
i
in
res
.
data
)
{
for
(
var
i
in
res
.
data
)
{
...
...
src/pages/index/learn.vue
View file @
50074060
...
@@ -4,8 +4,9 @@
...
@@ -4,8 +4,9 @@
<text
class=
"title-view"
>
学习
</text>
<text
class=
"title-view"
>
学习
</text>
</u-navbar>
</u-navbar>
<image
:src=
"bannerImage"
mode=
""
class=
"banner"
></image>
<image
:src=
"bannerImage"
mode=
""
class=
"banner"
></image>
<u-tabs-swiper
bg-color=
"#F4F5F7"
inactive-color=
"#999999"
font-size=
"28"
ref=
"uTabs"
:list=
"tabs"
:current=
"current"
@
change=
"tabsChange"
:is-scroll=
"false"
:bar-width=
"52"
swiperWidth=
"750"
></u-tabs-swiper>
<u-tabs-swiper
bg-color=
"#F4F5F7"
inactive-color=
"#999999"
font-size=
"28"
ref=
"uTabs"
:list=
"tabs"
<swiper
class=
"swiper_group"
:current=
"swiperCurrent"
@
animationfinish=
"animationfinish"
>
:current=
"current"
@
change=
"tabsChange"
:is-scroll=
"false"
:bar-width=
"52"
swiperWidth=
"750"
></u-tabs-swiper>
<swiper
class=
"swiper_group"
:current=
"swiperCurrent"
@
transition=
"transition"
@
animationfinish=
"animationfinish"
>
<swiper-item
@
touchmove
.
stop
.
prevent=
"stopTouchMove"
v-show=
"current == 0"
>
<swiper-item
@
touchmove
.
stop
.
prevent=
"stopTouchMove"
v-show=
"current == 0"
>
<scroll-view
scroll-y
style=
"height:100%;width:100%;"
>
<scroll-view
scroll-y
style=
"height:100%;width:100%;"
>
<view
class=
"jf-currency-class"
>
<view
class=
"jf-currency-class"
>
...
@@ -22,7 +23,7 @@
...
@@ -22,7 +23,7 @@
</scroll-view>
</scroll-view>
</swiper-item>
</swiper-item>
<swiper-item
@
touchmove
.
stop
.
prevent=
"stopTouchMove"
v-show=
"current == 1"
>
<swiper-item
@
touchmove
.
stop
.
prevent=
"stopTouchMove"
v-show=
"current == 1"
>
<scroll-view
scroll-y
style=
"height:100%;width:100%;"
@
scrolltolower=
"on
R
eachBottom"
scroll-y=
"true"
refresher-enabled=
"true"
:refresher-triggered=
"triggered"
:refresher-threshold=
"100"
@
refresherpulling=
"onPulling"
@
refresherrefresh=
"onRefresh"
@
refresherrestore=
"onRestore"
@
refresherabort=
"onAbort"
>
<scroll-view
scroll-y
style=
"height:100%;width:100%;"
@
scrolltolower=
"on
r
eachBottom"
scroll-y=
"true"
refresher-enabled=
"true"
:refresher-triggered=
"triggered"
:refresher-threshold=
"100"
@
refresherpulling=
"onPulling"
@
refresherrefresh=
"onRefresh"
@
refresherrestore=
"onRestore"
@
refresherabort=
"onAbort"
>
<view
v-for=
"item in list"
:key=
"item.id"
class=
"notice"
@
click=
"bbb(item)"
>
<view
v-for=
"item in list"
:key=
"item.id"
class=
"notice"
@
click=
"bbb(item)"
>
<view
class=
"n-head"
>
<view
class=
"n-head"
>
{{
item
.
title
}}
{{
item
.
title
}}
...
@@ -455,8 +456,13 @@ export default {
...
@@ -455,8 +456,13 @@ export default {
onAbort
()
{
onAbort
()
{
console
.
log
(
"onAbort"
);
console
.
log
(
"onAbort"
);
},
},
transition
(
e
)
{
// swiper-item左右移动,通知tabs的滑块跟随移动
let
dx
=
e
.
detail
.
dx
;
this
.
$refs
.
uTabs
.
setDx
(
dx
);
},
//scroll-view到底部加载更多
//scroll-view到底部加载更多
on
R
eachBottom
()
{
on
r
eachBottom
()
{
//上拉触底函数
//上拉触底函数
if
(
!
this
.
isLoadMore
)
{
if
(
!
this
.
isLoadMore
)
{
this
.
isLoadMore
=
true
;
this
.
isLoadMore
=
true
;
...
...
src/pages/index/order.vue
View file @
50074060
...
@@ -31,7 +31,7 @@
...
@@ -31,7 +31,7 @@
<OrderCell
:orderData=
"item"
:type=
"orderType"
:location=
"dataValue"
@
click=
"handleClick(item)"
<OrderCell
:orderData=
"item"
:type=
"orderType"
:location=
"dataValue"
@
click=
"handleClick(item)"
@
action=
"handleAction(item)"
>
</OrderCell>
@
action=
"handleAction(item)"
>
</OrderCell>
</view>
</view>
<u-loadmore
:status=
"loadStatus"
bgColor=
"#F4F5F7"
></u-loadmore>
<u-loadmore
v-show=
"(pageNumber == 1 && loaded) || pageNumber > 2"
:status=
"loadStatus"
bgColor=
"#F4F5F7"
></u-loadmore>
</
template
>
</
template
>
</scroll-view>
</scroll-view>
<!-- </swiper-item> -->
<!-- </swiper-item> -->
...
@@ -140,7 +140,6 @@
...
@@ -140,7 +140,6 @@
}
}
},
},
noMore
()
{
noMore
()
{
console
.
log
(
'nomore:'
,
this
.
orderList
.
length
==
0
&&
this
.
pageNumber
!=
0
)
return
this
.
orderList
.
length
==
0
&&
this
.
loaded
return
this
.
orderList
.
length
==
0
&&
this
.
loaded
},
},
noOrderCustomStyle
()
{
noOrderCustomStyle
()
{
...
@@ -203,7 +202,6 @@
...
@@ -203,7 +202,6 @@
},
},
reachBottom
(
e
)
{
reachBottom
(
e
)
{
console
.
log
(
'-------底部-------'
,
this
.
loadStatus
)
if
(
this
.
loadStatus
!=
'loadmore'
)
return
if
(
this
.
loadStatus
!=
'loadmore'
)
return
this
.
loadStatus
==
'loading'
this
.
loadStatus
==
'loading'
this
.
getOrderList
(
this
.
currentIndex
)
this
.
getOrderList
(
this
.
currentIndex
)
...
@@ -222,41 +220,6 @@
...
@@ -222,41 +220,6 @@
var
self
=
this
;
var
self
=
this
;
self
.
$u
.
api
.
listOrder
(
param
).
then
((
res
)
=>
{
self
.
$u
.
api
.
listOrder
(
param
).
then
((
res
)
=>
{
if
(
res
.
code
==
200
)
{
if
(
res
.
code
==
200
)
{
/*↓↓↓↓↓↓↓↓↓↓测试数据↓↓↓↓↓↓↓↓↓↓*/
// res.data.type = self.orderType
// if (res.data.list) {
// if (res.data.list.length == 0 && res.data.total > 0) {
// res.data.total = 15
// res.data.list = [{
// orderServiceType: '安装', // 服务类型:安装、维修
// categoryName: '充电桩', // 品类:充电桩
// orderBusinessTypeText: '分配单', // 业务类型:分配单、订单池
// orderNumber: 'OR2021041809827', // 工单编号
// contactName: '郭小清', // 客户信息
// contactPhone: '13631612077', // 联系方式
// contactAddress: '湾街道荔枝花园D座125号', // 详细地址
// contactAddressLatitud: '116.3896', // 联系人地址经度
// contactAddressLongitud: '39.91917', // 联系人地址纬度
// orderStatus: 0, // 工单状态
// appointmentDatetime: '', // 预约时间
// currentWillOverTime: 10000, // 剩余时间
// currentOverTime: new Date().getTime() + 10000, // 超过时间点
// auditDatetime: '2021.04.19 12:45:09', // 审核时间
// submissionTime: '2021.04.19 16:24:48', // 提交时间
// auditResults: {}, // 审核结果
// orderBusinessType: 'R', // 业务类型 R 为抢单
// orderId: '1100000216'
// }]
// res.data.list = [...res.data.list, ...res.data.list, ...res.data.list, ...res.data
// .list,
// ...res.data.list, ...res.data.list, ...res.data.list, ...res.data.list, ...
// res
// .data.list, ...res.data.list
// ]
// }
// }
/*↑↑↑↑↑↑↑↑↑↑测试数据↑↑↑↑↑↑↑↑↑↑↑↑↑*/
// 后台需要返回type,防止数据返回延迟期间点击了其他的tab
if
(
res
.
data
.
type
!=
self
.
orderType
)
return
if
(
res
.
data
.
type
!=
self
.
orderType
)
return
self
.
triggered
=
false
;
self
.
triggered
=
false
;
self
.
_freshing
=
false
;
self
.
_freshing
=
false
;
...
@@ -283,7 +246,6 @@
...
@@ -283,7 +246,6 @@
var
self
=
this
;
// 加载订单列表
var
self
=
this
;
// 加载订单列表
self
.
$u
.
api
.
listOrderCount
().
then
((
res
)
=>
{
self
.
$u
.
api
.
listOrderCount
().
then
((
res
)
=>
{
if
(
res
.
code
==
200
)
{
if
(
res
.
code
==
200
)
{
console
.
log
(
"==="
,
res
.
data
)
if
(
res
.
data
)
{
if
(
res
.
data
)
{
self
.
list
.
forEach
(
item
=>
{
self
.
list
.
forEach
(
item
=>
{
if
(
item
.
name
===
'待预约'
)
{
if
(
item
.
name
===
'待预约'
)
{
...
@@ -329,7 +291,6 @@
...
@@ -329,7 +291,6 @@
this
.
filish
(
item
)
this
.
filish
(
item
)
return
return
}
}
console
.
log
(
'click cell'
)
this
.
viewOderItem
(
item
.
orderId
)
this
.
viewOderItem
(
item
.
orderId
)
},
},
filish
(
item
){
filish
(
item
){
...
@@ -343,7 +304,6 @@
...
@@ -343,7 +304,6 @@
})
})
},
},
handleAction
(
item
)
{
handleAction
(
item
)
{
console
.
log
(
'click button'
)
if
(
item
.
orderStatus
===
86
||
item
.
orderStatus
===
88
){
if
(
item
.
orderStatus
===
86
||
item
.
orderStatus
===
88
){
this
.
filish
(
item
)
this
.
filish
(
item
)
return
return
...
...
src/pages/learn/section.vue
View file @
50074060
...
@@ -228,6 +228,7 @@
...
@@ -228,6 +228,7 @@
this
.
courseDesc
=
res
.
data
.
content
.
replace
(
/<p.*
?
>|<
\/
p>/ig
,
""
)
this
.
courseDesc
=
res
.
data
.
content
.
replace
(
/<p.*
?
>|<
\/
p>/ig
,
""
)
this
.
section_id
=
res
.
data
.
id
this
.
section_id
=
res
.
data
.
id
this
.
section_content
=
res
.
data
.
content
this
.
section_content
=
res
.
data
.
content
this
.
status
=
res
.
data
.
isLearned
?
1
:
0
this
.
teacher
.
name
=
res
.
data
.
teachers
[
0
].
name
this
.
teacher
.
name
=
res
.
data
.
teachers
[
0
].
name
this
.
teacherImage
=
res
.
data
.
teachers
[
0
].
avatar
this
.
teacherImage
=
res
.
data
.
teachers
[
0
].
avatar
this
.
teacherIntro
=
res
.
data
.
teachers
[
0
].
intro
.
replace
(
/<.*
?
>|<
\/
.*
?
>/ig
,
""
)
this
.
teacherIntro
=
res
.
data
.
teachers
[
0
].
intro
.
replace
(
/<.*
?
>|<
\/
.*
?
>/ig
,
""
)
...
@@ -456,7 +457,6 @@
...
@@ -456,7 +457,6 @@
// padding: 20rpx;
// padding: 20rpx;
padding-left
:
20rpx
;
padding-left
:
20rpx
;
background
:
#fff
;
background
:
#fff
;
white-space
:
nowrap
;
// border: 1px solid red;
// border: 1px solid red;
}
}
...
...
src/pages/login/index.vue
View file @
50074060
...
@@ -67,6 +67,7 @@ export default {
...
@@ -67,6 +67,7 @@ export default {
methods
:
{
methods
:
{
// 微信授权用户信息
// 微信授权用户信息
getUserProfile
()
{
getUserProfile
()
{
debugger
var
that
=
this
var
that
=
this
if
(
uni
.
getUserProfile
)
{
if
(
uni
.
getUserProfile
)
{
// 每次触发 uni.getUserProfile 均会弹出授权窗口,用户授权后可成功获取用户信息
// 每次触发 uni.getUserProfile 均会弹出授权窗口,用户授权后可成功获取用户信息
...
@@ -125,13 +126,14 @@ export default {
...
@@ -125,13 +126,14 @@ export default {
signupLogin
(
e
)
{
signupLogin
(
e
)
{
var
that
=
this
var
that
=
this
if
(
!
e
||
!
e
.
detail
||
e
.
detail
.
errMsg
.
indexOf
(
'user deny'
)
>
-
1
)
{
if
(
e
&&
e
.
detail
)
{
if
(
e
.
detail
.
errMsg
.
indexOf
(
'user deny'
)
>
-
1
)
{
uni
.
showModal
({
uni
.
showModal
({
title
:
'提示'
,
title
:
'提示'
,
showCancel
:
false
,
showCancel
:
false
,
content
:
'用户未授权不能完成注册'
content
:
'用户未授权不能完成注册'
});
});
}
else
if
(
!
e
.
detail
.
errMsg
&&
e
.
detail
.
encryptedData
&&
e
.
detail
.
iv
)
{
}
else
if
(
e
.
detail
.
encryptedData
&&
e
.
detail
.
iv
)
{
let
params
=
{
let
params
=
{
nickname
:
app
.
globalData
.
authUserInfo
.
nickName
,
nickname
:
app
.
globalData
.
authUserInfo
.
nickName
,
avatar
:
app
.
globalData
.
authUserInfo
.
avatarUrl
,
avatar
:
app
.
globalData
.
authUserInfo
.
avatarUrl
,
...
@@ -161,7 +163,14 @@ export default {
...
@@ -161,7 +163,14 @@ export default {
uni
.
showModal
({
uni
.
showModal
({
title
:
'提示'
,
title
:
'提示'
,
showCancel
:
false
,
showCancel
:
false
,
content
:
e
.
detail
.
errMsg
||
'授权失败,请重新授权'
content
:
e
.
detail
.
errMsg
});
}
}
else
{
uni
.
showModal
({
title
:
'提示'
,
showCancel
:
false
,
content
:
'授权失败,请重新授权'
});
});
}
}
},
},
...
...
src/pages/mine/customer/index.vue
View file @
50074060
...
@@ -31,6 +31,8 @@
...
@@ -31,6 +31,8 @@
background-color
:
#F4F5F7
;
background-color
:
#F4F5F7
;
padding
:
20rpx
30rpx
;
padding
:
20rpx
30rpx
;
height
:
100vh
;
height
:
100vh
;
display
:
flex
;
flex-direction
:
column
;
.cus-wrap-content
{
.cus-wrap-content
{
overflow
:
auto
;
overflow
:
auto
;
}
}
...
...
src/pages/mine/wallet/statement.vue
View file @
50074060
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
<view
class=
"statement-content-view"
>
<view
class=
"statement-content-view"
>
<view
class=
"head-view"
>
<view
class=
"head-view"
>
<view
class=
"head-top-view"
>
<view
class=
"head-top-view"
>
<picker
mode=
"date"
:value=
"date"
fields=
"month"
@
change=
"bindDateChange"
>
<picker
mode=
"date"
:value=
"date"
fields=
"month"
@
change=
"bindDateChange"
:end=
"endTime"
>
<view
class=
"date-input"
>
<view
class=
"date-input"
>
<text
class=
"date-text"
>
{{
date
}}
</text>
<text
class=
"date-text"
>
{{
date
}}
</text>
<u-icon
name=
"arrow-down"
></u-icon>
<u-icon
name=
"arrow-down"
></u-icon>
...
@@ -72,6 +72,9 @@
...
@@ -72,6 +72,9 @@
number
:
this
.
data
.
statementList
.
length
number
:
this
.
data
.
statementList
.
length
}
}
},
},
endTime
()
{
this
.
$u
.
DateTimeFormat
(
new
Date
().
getTime
(),
'YYYY-MM-DD'
)
},
items
()
{
items
()
{
return
{
return
{
expectedAmount
:
'预结(元)'
,
expectedAmount
:
'预结(元)'
,
...
...
src/pages/order/complete.vue
View file @
50074060
...
@@ -264,12 +264,6 @@
...
@@ -264,12 +264,6 @@
if
(
res
.
code
==
200
)
{
if
(
res
.
code
==
200
)
{
self
.
list
=
res
.
data
.
config
self
.
list
=
res
.
data
.
config
self
.
form
=
res
.
data
.
value
||
{}
self
.
form
=
res
.
data
.
value
||
{}
uni
.
showLoading
({
title
:
'加载中'
})
setTimeout
(()
=>
{
uni
.
hideLoading
()
},
1000
)
// 异常单处理
// 异常单处理
if
(
self
.
auditResultsId
)
self
.
checkCompleteError
()
if
(
self
.
auditResultsId
)
self
.
checkCompleteError
()
}
else
{
}
else
{
...
@@ -675,7 +669,7 @@
...
@@ -675,7 +669,7 @@
}
}
},
10
)
},
10
)
},
},
handleTouchstart
()
{
handleTouchstart
()
{
// 防止输入光标滚动出现错乱
uni
.
hideKeyboard
()
uni
.
hideKeyboard
()
}
}
}
}
...
...
src/pages/order/detail.vue
View file @
50074060
...
@@ -149,7 +149,7 @@
...
@@ -149,7 +149,7 @@
<!-- 异常预约 ,现场拍照 这里是调用拍照的两个组件-->
<!-- 异常预约 ,现场拍照 这里是调用拍照的两个组件-->
<view
class=
"right"
>
<view
class=
"right"
>
<view
v-if=
"errorSignIn || scenePhoto"
@
click=
"$u.throttle(handleClickRight, 500)"
:class=
"['button',
{'active': scenePhoto}]">
<view
v-if=
"errorSignIn || scenePhoto"
@
click=
"$u.throttle(handleClickRight, 500)"
:class=
"['button',
{'active': scenePhoto}]">
<text>
{{
errorSignIn
?
'异常'
:
'拍照'
}}
</text>
<text>
{{
errorSignIn
?
'异常
签到
'
:
'拍照'
}}
</text>
</view>
</view>
</view>
</view>
...
@@ -237,7 +237,6 @@
...
@@ -237,7 +237,6 @@
},
},
onLoad
(
option
)
{
onLoad
(
option
)
{
// 生命周期函数--监听页面加载
// 生命周期函数--监听页面加载
console
.
log
(
"option"
,
option
)
if
(
option
&&
option
.
id
)
{
if
(
option
&&
option
.
id
)
{
this
.
orderId
=
option
.
id
this
.
orderId
=
option
.
id
}
}
...
@@ -306,7 +305,6 @@
...
@@ -306,7 +305,6 @@
// }
// }
// ,
// ,
// complete: function(res) {
// complete: function(res) {
// console.log('-------complete-----', res)
// if (res.errMsg.indexOf('auth') != -1) {
// if (res.errMsg.indexOf('auth') != -1) {
// uni.showModal({
// uni.showModal({
// title: '提示',
// title: '提示',
...
@@ -348,13 +346,7 @@
...
@@ -348,13 +346,7 @@
let
self
=
this
let
self
=
this
var
data
=
{}
var
data
=
{}
if
(
this
.
submitType
===
"workerAppointment"
){
if
(
this
.
submitType
===
"workerAppointment"
){
self
.
$u
.
api
.
contactTime
(
data
,
this
.
order
.
orderId
).
then
((
res
)
=>
{
self
.
$u
.
api
.
contactTime
(
data
,
this
.
order
.
orderId
)
if
(
res
.
code
==
200
)
{
console
.
log
(
"==="
,
res
.
data
)
}
else
{
console
.
log
(
res
.
message
);
}
})
}
}
},
},
handleClickRight
(
active
)
{
handleClickRight
(
active
)
{
...
@@ -371,7 +363,6 @@
...
@@ -371,7 +363,6 @@
this
.
takeStatus
=
true
this
.
takeStatus
=
true
},
},
closeTake
(
img
)
{
closeTake
(
img
)
{
console
.
log
(
"image"
,
img
)
this
.
takeStatus
=
false
this
.
takeStatus
=
false
// 获取返回的图片 ,如果返回的图片存在则直接异常签约,成功后跳转到去完工页面,
// 获取返回的图片 ,如果返回的图片存在则直接异常签约,成功后跳转到去完工页面,
if
(
img
){
// 拍照完成
if
(
img
){
// 拍照完成
...
@@ -444,7 +435,6 @@
...
@@ -444,7 +435,6 @@
},
},
weekChange
(
data
){
weekChange
(
data
){
// 点击下一周
// 点击下一周
console
.
log
(
data
,
'week-data'
)
if
(
data
&&
data
.
time
)
{
if
(
data
&&
data
.
time
)
{
let
num
=
data
.
num
let
num
=
data
.
num
let
time
=
data
.
time
let
time
=
data
.
time
...
@@ -486,7 +476,6 @@
...
@@ -486,7 +476,6 @@
},
},
dateChange
(
data
){
dateChange
(
data
){
// 点击日期选择
// 点击日期选择
console
.
log
(
data
,
'dateChange'
)
let
self
=
this
let
self
=
this
self
.
appointmentDatetime
=
data
.
item
.
day
self
.
appointmentDatetime
=
data
.
item
.
day
self
.
dateItem
=
data
.
item
self
.
dateItem
=
data
.
item
...
@@ -501,7 +490,6 @@
...
@@ -501,7 +490,6 @@
},
},
timeChange
(
data
){
timeChange
(
data
){
// 时间段选择变化
// 时间段选择变化
console
.
log
(
data
,
'timeChange'
)
this
.
appointmentDatetimeRange
=
data
.
item
this
.
appointmentDatetimeRange
=
data
.
item
},
},
addressToCoordinate
(){
addressToCoordinate
(){
...
@@ -528,6 +516,7 @@
...
@@ -528,6 +516,7 @@
this
.
allowRejection
=
true
this
.
allowRejection
=
true
this
.
submitType
=
"orderAccept"
this
.
submitType
=
"orderAccept"
this
.
readMore
=
false
this
.
readMore
=
false
this
.
isAllowDianhuaAndDaohang
=
false
}
else
if
(
orderStatus
<
31
&&
orderBusinessType
===
'订单池'
)
{
}
else
if
(
orderStatus
<
31
&&
orderBusinessType
===
'订单池'
)
{
// 抢单
// 抢单
this
.
centerButton
=
"appoint1"
this
.
centerButton
=
"appoint1"
...
@@ -536,6 +525,7 @@
...
@@ -536,6 +525,7 @@
this
.
submitType
=
"orderGan"
this
.
submitType
=
"orderGan"
this
.
showTimeOut
=
false
this
.
showTimeOut
=
false
this
.
readMore
=
false
this
.
readMore
=
false
this
.
isAllowDianhuaAndDaohang
=
false
}
else
if
(
orderStatus
===
31
&&
!
this
.
order
.
appointmentDatetime
)
{
}
else
if
(
orderStatus
===
31
&&
!
this
.
order
.
appointmentDatetime
)
{
// 预约
// 预约
this
.
centerButton
=
"appoint2"
this
.
centerButton
=
"appoint2"
...
@@ -754,7 +744,6 @@
...
@@ -754,7 +744,6 @@
if
(
!
currentOverTime
){
if
(
!
currentOverTime
){
return
0
return
0
}
}
console
.
log
(
'--------'
,
Math
.
round
(
Math
.
abs
(
this
.
order
.
currentOverTime
-
new
Date
().
getTime
())
/
1000
))
return
Math
.
round
(
Math
.
abs
(
this
.
order
.
currentOverTime
-
new
Date
().
getTime
())
/
1000
);
return
Math
.
round
(
Math
.
abs
(
this
.
order
.
currentOverTime
-
new
Date
().
getTime
())
/
1000
);
},
},
timeOutChange
(
currentOverTime
){
timeOutChange
(
currentOverTime
){
...
...
src/pages/order/refuse.vue
View file @
50074060
...
@@ -50,7 +50,7 @@
...
@@ -50,7 +50,7 @@
rejectReason
:
''
,
rejectReason
:
''
,
remark
:
''
remark
:
''
},
},
count
:
3
,
// 剩余次数
count
:
0
,
// 剩余次数
};
};
},
},
computed
:
{
computed
:
{
...
@@ -62,16 +62,16 @@
...
@@ -62,16 +62,16 @@
PopView
PopView
},
},
onLoad
(
e
)
{
onLoad
(
e
)
{
if
(
e
)
{
if
(
e
&&
e
.
orderId
)
{
if
(
e
.
orderId
)
{
this
.
orderId
=
e
.
orderId
this
.
orderId
=
e
.
orderId
}
else
if
(
e
.
count
)
{
if
(
e
.
count
)
{
this
.
count
=
e
.
count
this
.
count
=
e
.
count
}
}
else
{
}
if
(
!
this
.
count
)
{
this
.
getRejectCount
()
this
.
getRejectCount
()
}
}
}
else
{
this
.
$u
.
toast
(
"本月无拒单机会,请联系客服"
)
}
},
},
methods
:
{
methods
:
{
changeReason
(
reason
)
{
changeReason
(
reason
)
{
...
@@ -116,18 +116,9 @@
...
@@ -116,18 +116,9 @@
let
res
=
await
self
.
$u
.
api
.
rejectOrder
(
self
.
formData
,
self
.
orderId
)
let
res
=
await
self
.
$u
.
api
.
rejectOrder
(
self
.
formData
,
self
.
orderId
)
self
.
submiting
=
false
self
.
submiting
=
false
if
(
res
&&
res
.
code
==
200
)
{
if
(
res
&&
res
.
code
==
200
)
{
let
data
=
res
.
data
if
(
data
.
code
==
200
)
{
uni
.
showToast
({
uni
.
showToast
({
title
:
"拒单成功"
,
title
:
res
.
message
||
res
.
data
||
'拒单成功'
,
})
})
}
else
{
let
message
=
'本月无拒单机会,请联系客服'
uni
.
showToast
({
icon
:
'none'
,
title
:
message
,
})
}
}
}
},
},
}
}
...
...
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