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
8982de7c
Commit
8982de7c
authored
May 13, 2021
by
zhengzy
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
https://git.banshouhui.com/lijundan/self-support
parents
c75257bf
3f723232
Changes
41
Show whitespace changes
Inline
Side-by-side
Showing
41 changed files
with
3421 additions
and
2622 deletions
+3421
-2622
README.md
README.md
+23
-0
App.vue
src/App.vue
+0
-1
common.js
src/common/api/common.js
+0
-4
contract.js
src/common/api/contract.js
+0
-18
index.js
src/common/api/index.js
+0
-3
order.js
src/common/api/order.js
+62
-20
settled.js
src/common/api/settled.js
+4
-13
util.js
src/common/util.js
+1
-2
appoint-time.vue
src/components/appoint/appoint-time.vue
+5
-2
XhFiles.vue
src/components/createCom/XhFiles.vue
+103
-60
XhInput.vue
src/components/createCom/XhInput.vue
+37
-16
XhLabel.vue
src/components/createCom/XhLabel.vue
+77
-0
XhServiceMore.vue
src/components/createCom/XhServiceMore.vue
+106
-0
settlement.vue
src/components/mine/settlement.vue
+8
-2
statement.vue
src/components/mine/statement.vue
+6
-1
index.vue
src/components/order/index.vue
+23
-13
setting.vue
src/components/photo/setting.vue
+449
-449
index.vue
src/components/take/index.vue
+658
-637
pages.json
src/pages.json
+24
-46
index.vue
src/pages/index/index.vue
+26
-49
learn.vue
src/pages/index/learn.vue
+0
-1
mine.vue
src/pages/index/mine.vue
+29
-49
order.vue
src/pages/index/order.vue
+3
-3
index.vue
src/pages/login/index.vue
+68
-29
index.vue
src/pages/mine/cert/index.vue
+2
-2
index.vue
src/pages/mine/customer/index.vue
+1
-1
index.vue
src/pages/mine/wallet/index.vue
+287
-181
settlement.vue
src/pages/mine/wallet/settlement.vue
+7
-2
statement.vue
src/pages/mine/wallet/statement.vue
+7
-2
withdraw.vue
src/pages/mine/wallet/withdraw.vue
+2
-1
index.vue
src/pages/mine/warehouse/index.vue
+211
-0
complete.vue
src/pages/order/complete.vue
+226
-141
detail.vue
src/pages/order/detail.vue
+128
-99
feedback.vue
src/pages/order/feedback.vue
+17
-12
material.vue
src/pages/order/material.vue
+276
-221
list.vue
src/pages/photo/list.vue
+505
-504
preview.vue
src/pages/photo/preview.vue
+1
-1
setting.vue
src/pages/photo/setting.vue
+29
-29
file.vue
src/pages/settle/file.vue
+2
-2
pay-ensure.vue
src/pages/settle/pay-ensure.vue
+4
-3
sign-contract.vue
src/pages/settle/sign-contract.vue
+4
-3
No files found.
README.md
View file @
8982de7c
...
@@ -36,6 +36,28 @@ npm run build:mp-weixin // 运行生产环境
...
@@ -36,6 +36,28 @@ npm run build:mp-weixin // 运行生产环境
查看
[
配置参考
](
https://cli.vuejs.org/config/
)
查看
[
配置参考
](
https://cli.vuejs.org/config/
)
#### pages配置说明
##### 启动页配置,只作用于开发环境
current--当前启动页
list--可选启动页列表
name--启动页标题
path--启动页路径
query--启动页参数,页面onLoad中获取
```
json
{
"condition"
:
{
"current"
:
0
,
"list"
:
[
{
"name"
:
"拍照小工具"
,
"path"
:
"pages/photo/index"
,
"query"
:
{}
}
]
}
}
```
### Easycom [组件模式](https://uniapp.dcloud.io/collocation/pages?id=easycom)
### Easycom [组件模式](https://uniapp.dcloud.io/collocation/pages?id=easycom)
...
@@ -86,3 +108,4 @@ npm run build:mp-weixin // 运行生产环境
...
@@ -86,3 +108,4 @@ npm run build:mp-weixin // 运行生产环境
PS: 当前项目使用了:方式一,具体情况可以参考state目录下代码
PS: 当前项目使用了:方式一,具体情况可以参考state目录下代码
vm.vuex_token
vm.vuex_token
src/App.vue
View file @
8982de7c
...
@@ -5,7 +5,6 @@ import util from "@/utils/util.js";
...
@@ -5,7 +5,6 @@ import util from "@/utils/util.js";
import
login
from
"@/utils/login.js"
;
import
login
from
"@/utils/login.js"
;
export
default
{
export
default
{
globalData
:
{
globalData
:
{
jumpLoginStatus
:
true
,
// 开发环境
// 开发环境
uniEnv
:
process
.
uniEnv
,
uniEnv
:
process
.
uniEnv
,
// 微信小程序平台编号,空--家维广场,1--自营平台
// 微信小程序平台编号,空--家维广场,1--自营平台
...
...
src/common/api/common.js
View file @
8982de7c
let
commonApiFun
=
function
(
vm
){
let
commonApiFun
=
function
(
vm
){
let
loginWxByUser
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
'/wxh-support-rest/rest/ssoinfo/v3/getUsersByCode'
,
params
);
let
loginWxByPhone
=
async
(
params
=
{})
=>
await
vm
.
$u
.
post
(
'/wxh-support-rest/rest/ssoinfo/v3/findByMobile'
,
params
,{
'content-type'
:
'application/x-www-form-urlencoded'
});
let
loginWechatAuth
=
async
(
params
=
{})
=>
await
vm
.
$u
.
post
(
'/wxh-support-rest/rest/ssoinfo/wxapp/unify/authorization'
,
params
,
{
'content-type'
:
'application/x-www-form-urlencoded'
});
let
loginWechatAuth
=
async
(
params
=
{})
=>
await
vm
.
$u
.
post
(
'/wxh-support-rest/rest/ssoinfo/wxapp/unify/authorization'
,
params
,
{
'content-type'
:
'application/x-www-form-urlencoded'
});
// 水印-查询用户自定义设置
// 水印-查询用户自定义设置
let
getUserWatermark
=
async
(
params
=
{})
=>
await
vm
.
$u
.
post
(
'http://apidoc.banshouhui.com:3000/mock/89/getUserWatermark'
,
params
);
let
getUserWatermark
=
async
(
params
=
{})
=>
await
vm
.
$u
.
post
(
'http://apidoc.banshouhui.com:3000/mock/89/getUserWatermark'
,
params
);
...
@@ -10,8 +8,6 @@ let commonApiFun = function(vm){
...
@@ -10,8 +8,6 @@ let commonApiFun = function(vm){
let
saveImage
=
async
(
params
=
{})
=>
await
vm
.
$u
.
post
(
'http://apidoc.banshouhui.com:3000/mock/89/saveImage'
,
params
);
let
saveImage
=
async
(
params
=
{})
=>
await
vm
.
$u
.
post
(
'http://apidoc.banshouhui.com:3000/mock/89/saveImage'
,
params
);
const
commonApi
=
{
const
commonApi
=
{
loginWxByUser
,
loginWxByPhone
,
loginWechatAuth
,
loginWechatAuth
,
getUserWatermark
,
getUserWatermark
,
saveUserWatermark
,
saveUserWatermark
,
...
...
src/common/api/contract.js
deleted
100644 → 0
View file @
c75257bf
const
globalUrl
=
process
.
uniEnv
||
{}
const
ucenterApiUrl
=
globalUrl
.
ucenterUrl
.
apiUrl
const
collegeApiUrl
=
globalUrl
.
ucenterUrl
.
xueUrl
const
testApiUrl
=
globalUrl
.
systemUrl
.
apiUrl
let
contractApiFun
=
function
(
vm
){
//我的合同//
Mycontract
=
async
(
params
)
=>
await
vm
.
$u
.
get
(
ucenterApiUrl
+
'/v1/settled-contract/info'
+
'?Authorization='
+
vm
.
vuex_token
+
params
)
const
contract
=
{
Mycontract
}
return
contract
}
module
.
exports
=
{
contractApiFun
}
src/common/api/index.js
View file @
8982de7c
...
@@ -11,7 +11,6 @@ import {learnApiFun} from "@/common/api/learn.js";
...
@@ -11,7 +11,6 @@ import {learnApiFun} from "@/common/api/learn.js";
import
{
orderApiFun
}
from
"@/common/api/order.js"
;
import
{
orderApiFun
}
from
"@/common/api/order.js"
;
import
{
assessmentApiFun
}
from
"@/common/api/assessment.js"
import
{
assessmentApiFun
}
from
"@/common/api/assessment.js"
import
{
certApiFun
}
from
"@/common/api/cert.js"
import
{
certApiFun
}
from
"@/common/api/cert.js"
import
{
contractApiFun
}
from
"@/common/api/contract.js"
let
apiFun
=
function
(
vm
)
{
let
apiFun
=
function
(
vm
)
{
let
commonApi
=
commonApiFun
(
vm
);
let
commonApi
=
commonApiFun
(
vm
);
let
settledApi
=
settledApiFun
(
vm
)
let
settledApi
=
settledApiFun
(
vm
)
...
@@ -20,7 +19,6 @@ let apiFun = function(vm) {
...
@@ -20,7 +19,6 @@ let apiFun = function(vm) {
let
assessmentApi
=
assessmentApiFun
(
vm
)
let
assessmentApi
=
assessmentApiFun
(
vm
)
let
orderApi
=
orderApiFun
(
vm
)
let
orderApi
=
orderApiFun
(
vm
)
let
certApi
=
certApiFun
(
vm
)
let
certApi
=
certApiFun
(
vm
)
let
contractApi
=
contractApiFun
(
vm
)
let
apiUrl
=
{
let
apiUrl
=
{
...
commonApi
,
...
commonApi
,
...
settledApi
,
...
settledApi
,
...
@@ -29,7 +27,6 @@ let apiFun = function(vm) {
...
@@ -29,7 +27,6 @@ let apiFun = function(vm) {
...
orderApi
,
...
orderApi
,
...
assessmentApi
,
...
assessmentApi
,
...
certApi
,
...
certApi
,
...
contractApi
}
}
return
apiUrl
return
apiUrl
}
}
...
...
src/common/api/order.js
View file @
8982de7c
import
util
from
'@/utils/util.js'
import
util
from
'@/utils/util.js'
// 接口公共前缀
const
jsonType
=
{
'content-type'
:
'application/json'
}
const
prefix
=
'/wxh-worker-rest/rest/'
const
formType
=
{
'content-type'
:
'application/x-www-form-urlencoded'
}
let
orderApiFun
=
function
(
vm
){
let
orderApiFun
=
function
(
vm
){
// 接口公共前缀
const
prefix
=
'/wxh-worker-rest/rest/'
let
prefix2
=
'/wxh-worker-rest/rest/'
+
vm
.
vuex_token
let
order
=
'/wxh-worker-rest/rest/order/'
let
settle
=
'/wxh-worker-rest/rest/settle/'
+
vm
.
vuex_token
let
token
=
vm
.
vuex_token
let
listByRecommendOrder
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
'/wxh-worker-rest/rest/recommend/order'
,
params
);
let
listByRecommendOrder
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
'/wxh-worker-rest/rest/recommend/order'
,
params
);
/**
/**
* 工单数量查询接口
* 工单数量查询接口
*/
*/
let
listOrderCount
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
prefix
+
vm
.
vuex_token
+
'/wokerOrder/queryOrdersCount/V2'
,
params
);
let
listOrderCount
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
prefix
2
+
'/wokerOrder/queryOrdersCount/V2'
,
params
);
/**
/**
* 工单列表接口
* 工单列表接口
...
@@ -17,7 +25,7 @@ let orderApiFun = function(vm){
...
@@ -17,7 +25,7 @@ let orderApiFun = function(vm){
/**
/**
* 获取师傅的预约日历
* 获取师傅的预约日历
*/
*/
let
workerCalendar
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
prefix
+
vm
.
vuex_token
+
'/wokerOrder/appointment/calendar'
,
params
);
let
workerCalendar
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
prefix
2
+
'/wokerOrder/appointment/calendar'
,
params
);
/**
/**
* 师傅预约
* 师傅预约
...
@@ -29,7 +37,7 @@ let orderApiFun = function(vm){
...
@@ -29,7 +37,7 @@ let orderApiFun = function(vm){
/**
/**
* 师傅签到接口
* 师傅签到接口
*/
*/
let
maintainWorkerCheckin
=
async
(
params
=
{},
orderId
)
=>
await
vm
.
$u
.
post
(
prefix
+
vm
.
vuex_token
+
'/order/'
+
orderId
+
'/maintainWorkerCheckin'
,
params
,{
'content-type'
:
'application/x-www-form-urlencoded'
}
);
let
maintainWorkerCheckin
=
async
(
params
=
{},
orderId
)
=>
await
vm
.
$u
.
post
(
prefix
2
+
'/order/'
+
orderId
+
'/maintainWorkerCheckin'
,
params
,
formType
);
/**
/**
* 订单详情查询
* 订单详情查询
*/
*/
...
@@ -42,7 +50,7 @@ let orderApiFun = function(vm){
...
@@ -42,7 +50,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
.
get
(
prefix
2
+
`/order/
${
orderId
}
/workerReject/V2`
,
params
)
/**
/**
...
@@ -53,37 +61,41 @@ let orderApiFun = function(vm){
...
@@ -53,37 +61,41 @@ let orderApiFun = function(vm){
/**
/**
* 接单
* 接单
*/
*/
let
orderAccept
=
async
(
params
=
{},
orderId
)
=>
await
vm
.
$u
.
post
(
prefix
+
vm
.
vuex_token
+
'/order/'
+
orderId
+
'/accept'
,
params
,
{
'content-type'
:
'application/x-www-form-urlencoded'
}
);
let
orderAccept
=
async
(
params
=
{},
orderId
)
=>
await
vm
.
$u
.
post
(
prefix
2
+
'/order/'
+
orderId
+
'/accept'
,
params
,
formType
);
/**
/**
* 抢单
* 抢单
*/
*/
let
orderGan
=
async
(
params
=
{},
orderId
)
=>
await
vm
.
$u
.
post
(
'/wxh-worker-rest/rest/order/revision/applets/'
+
vm
.
vuex_token
+
'/order/acceptAppletsOrder'
,
params
,
{
'content-type'
:
'application/x-www-form-urlencoded'
}
);
let
orderGan
=
async
(
params
=
{},
orderId
)
=>
await
vm
.
$u
.
post
(
'/wxh-worker-rest/rest/order/revision/applets/'
+
vm
.
vuex_token
+
'/order/acceptAppletsOrder'
,
params
,
formType
);
/**
/**
* 获取拍照标准
* 获取拍照标准
*/
*/
let
orderStandard
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
prefix
+
vm
.
vuex_token
+
'/photo/standard'
,
params
);
let
orderStandard
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
prefix2
+
'/photo/standard'
,
params
);
/**
* 获取拍照标准单独项目
*/
let
orderStandardItem
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
prefix2
+
'/photo/standard/only'
,
params
);
/**
/**
* 保存图片信息
* 保存图片信息
*/
*/
let
saveImage
=
async
(
params
=
{},
orderId
)
=>
await
vm
.
$u
.
post
(
prefix
+
vm
.
vuex_token
+
'/order/'
+
orderId
+
'/maintain/saveImage'
,
params
);
let
saveImage
=
async
(
params
=
{},
orderId
)
=>
await
vm
.
$u
.
post
(
prefix
2
+
'/order/'
+
orderId
+
'/maintain/saveImage'
,
params
);
/**
/**
* 获取师傅水印 or 默认水印
* 获取师傅水印 or 默认水印
*/
*/
let
getWatermark
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
prefix
+
vm
.
vuex_token
+
'/photo/watermark'
,
params
);
let
getWatermark
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
prefix
2
+
'/photo/watermark'
,
params
);
/**
/**
* 保存师傅水印
* 保存师傅水印
*/
*/
let
saveWatermark
=
async
(
params
=
{})
=>
await
vm
.
$u
.
post
(
prefix
+
vm
.
vuex_token
+
'/photo/watermark'
,
params
);
let
saveWatermark
=
async
(
params
=
{})
=>
await
vm
.
$u
.
post
(
prefix
2
+
'/photo/watermark'
,
params
);
/**
/**
* 获取师傅开放可选时间段
* 获取师傅开放可选时间段
*/
*/
let
openTimerange
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
prefix
+
vm
.
vuex_token
+
'/wokerOrder/appointment/timerange'
,
params
);
let
openTimerange
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
prefix
2
+
'/wokerOrder/appointment/timerange'
,
params
);
/**
/**
* 联系时间接口
* 联系时间接口
...
@@ -104,26 +116,31 @@ let orderApiFun = function(vm){
...
@@ -104,26 +116,31 @@ let orderApiFun = function(vm){
/**
/**
* 获取订单的完工项目(配置+数据)
* 获取订单的完工项目(配置+数据)
*/
*/
let
getCompleteConfigAndData
=
async
(
orderId
)
=>
await
vm
.
$u
.
get
(
prefix
+
vm
.
vuex_token
+
'/order/'
+
orderId
+
'/maintain/info'
);
let
getCompleteConfigAndData
=
async
(
orderId
)
=>
await
vm
.
$u
.
get
(
prefix
2
+
'/order/'
+
orderId
+
'/maintain/info'
);
/**
/**
* 查询措施
* 查询措施
*/
*/
let
getMeasure
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
'wxh-worker-rest/rest/service/'
+
vm
.
vuex_token
+
'/measure/queryMeasureItems'
,
params
);
let
getMeasure
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
'wxh-worker-rest/rest/service/'
+
vm
.
vuex_token
+
'/measure/queryMeasureItems'
,
params
);
/**
* 查询工单材信息
*/
let
getOrderMaterial
=
async
(
orderId
)
=>
await
vm
.
$u
.
get
(
'/wxh-cloud-rest/rest/thirdparty/shzhida/material/'
+
orderId
);
/**
/**
* 保存售后记录
* 保存售后记录
*/
*/
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
2
+
'/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
inOrderFinish
=
async
(
orderId
)
=>
await
vm
.
$u
.
post
(
prefix
2
+
'/order/'
+
orderId
+
'/finishedAndConfirm'
,{},
formType
);
/**
/**
* 保外工单完工
* 保外工单完工
*/
*/
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'
}
);
let
outOrderFinish
=
async
(
params
=
{},
orderId
)
=>
await
vm
.
$u
.
post
(
prefix
2
+
'/order/'
+
orderId
+
'/v1/finishedAndConfirmOutGuaranteePeriod'
,
params
,
formType
);
/**
/**
...
@@ -131,6 +148,23 @@ let orderApiFun = function(vm){
...
@@ -131,6 +148,23 @@ let orderApiFun = function(vm){
*/
*/
let
addressToCoordinate
=
async
(
orderId
)
=>
await
vm
.
$u
.
get
(
prefix
+
'order/specialfee/'
+
vm
.
vuex_token
+
'/address/coordinate/'
+
orderId
);
let
addressToCoordinate
=
async
(
orderId
)
=>
await
vm
.
$u
.
get
(
prefix
+
'order/specialfee/'
+
vm
.
vuex_token
+
'/address/coordinate/'
+
orderId
);
/**
* 我的库存明细(物料)
*/
let
listBystock
=
async
()
=>
await
vm
.
$u
.
get
(
prefix2
+
'/myinfo/stock'
,
{},
jsonType
);
/**
* 我的出入库流水
*/
let
listAccessHistory
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
prefix2
+
'/myinfo/access/history'
,
params
,
jsonType
);
// 获取我的钱包-资产信息
let
getAssets
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
settle
+
'/v2/total'
,
params
);
// 获取我的钱包-结算明细
let
listStatement
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
settle
+
'/v2/statement'
,
params
);
// 获取我的钱包-支付单一览
let
payableRecord
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
settle
+
'/payable/v2/queryPayableRecord'
,
params
);
// 获取我的钱包-师傅提现
let
workerApplyPay
=
async
(
params
=
{},
payableRecordId
)
=>
await
vm
.
$u
.
post
(
`/wxh-worker-rest/rest/
${
token
}
/applypay/
${
payableRecordId
}
/workerApplyPay`
,
params
);
const
orderApi
=
{
const
orderApi
=
{
listByRecommendOrder
,
listByRecommendOrder
,
...
@@ -147,6 +181,7 @@ let orderApiFun = function(vm){
...
@@ -147,6 +181,7 @@ let orderApiFun = function(vm){
traceAndAppointment
,
traceAndAppointment
,
rejectOrder
,
rejectOrder
,
orderStandard
,
orderStandard
,
orderStandardItem
,
saveImage
,
saveImage
,
getWatermark
,
getWatermark
,
saveWatermark
,
saveWatermark
,
...
@@ -156,10 +191,17 @@ let orderApiFun = function(vm){
...
@@ -156,10 +191,17 @@ let orderApiFun = function(vm){
getSignDistance
,
getSignDistance
,
getCompleteConfigAndData
,
getCompleteConfigAndData
,
getMeasure
,
getMeasure
,
getOrderMaterial
,
saveCompleteData
,
saveCompleteData
,
inOrderFinish
,
inOrderFinish
,
outOrderFinish
,
outOrderFinish
,
addressToCoordinate
addressToCoordinate
,
listBystock
,
listAccessHistory
,
getAssets
,
listStatement
,
payableRecord
,
workerApplyPay
,
}
}
return
orderApi
return
orderApi
}
}
...
...
src/common/api/settled.js
View file @
8982de7c
...
@@ -8,43 +8,33 @@ let settledApiFun = function(vm){
...
@@ -8,43 +8,33 @@ let settledApiFun = function(vm){
let
getSettleArea
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
ucenterApiUrl
+
'/v1/settled/area'
,
params
);
let
getSettleArea
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
ucenterApiUrl
+
'/v1/settled/area'
,
params
);
/* 提交用户基本信息 */
/* 提交用户基本信息 */
let
submitSettleBaseInfo
=
async
(
params
=
{})
=>
await
vm
.
$u
.
post
(
ucenterApiUrl
+
'/v1/settled/save-info'
,
params
);
let
submitSettleBaseInfo
=
async
(
params
=
{})
=>
await
vm
.
$u
.
post
(
ucenterApiUrl
+
'/v1/settled/save-info'
,
params
);
/* 校验身份证正面 */
/* 校验身份证正面 */
let
checkSettleIDCardFront
=
async
(
params
=
{})
=>
await
vm
.
$u
.
post
(
ucenterApiUrl
+
'/v1/settled/card-front'
,
params
);
let
checkSettleIDCardFront
=
async
(
params
=
{})
=>
await
vm
.
$u
.
post
(
ucenterApiUrl
+
'/v1/settled/card-front'
,
params
);
/* 校验身份证反面 */
/* 校验身份证反面 */
let
checkSettleIDCardBack
=
async
(
params
=
{})
=>
await
vm
.
$u
.
post
(
ucenterApiUrl
+
'/v1/settled/card-back'
,
params
);
let
checkSettleIDCardBack
=
async
(
params
=
{})
=>
await
vm
.
$u
.
post
(
ucenterApiUrl
+
'/v1/settled/card-back'
,
params
);
/* 提交用户资料 */
/* 提交用户资料 */
let
submitSettleFileInfo
=
async
(
params
=
{})
=>
await
vm
.
$u
.
post
(
ucenterApiUrl
+
'/v1/settled/submit-info'
,
params
);
let
submitSettleFileInfo
=
async
(
params
=
{})
=>
await
vm
.
$u
.
post
(
ucenterApiUrl
+
'/v1/settled/submit-info'
,
params
);
/* 缴纳保证金 */
/* 缴纳保证金 */
let
paySettleDeposit
=
async
(
params
=
{})
=>
await
vm
.
$u
.
post
(
ucenterApiUrl
+
'/v2/settled/pay-deposit'
,
params
,{
'content-type'
:
'application/x-www-form-urlencoded'
});
let
paySettleDeposit
=
async
(
params
=
{})
=>
await
vm
.
$u
.
post
(
ucenterApiUrl
+
'/v2/settled/pay-deposit'
,
params
,{
'content-type'
:
'application/x-www-form-urlencoded'
});
let
getSettleDepositResult
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
ucenterApiUrl
+
'/v1/settled/check-oid'
,
params
,{
'content-type'
:
'application/x-www-form-urlencoded'
});
let
getSettleDepositResult
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
ucenterApiUrl
+
'/v1/settled/check-oid'
,
params
,{
'content-type'
:
'application/x-www-form-urlencoded'
});
/* 校验银行卡 */
/* 校验银行卡 */
// let checkSettleBank = async (params = {}) => await vm.$u.get('/wxh-site-rest/rest/register/verifyBankCard', params);
// let checkSettleBank = async (params = {}) => await vm.$u.get('/wxh-site-rest/rest/register/verifyBankCard', params);
/* 校验支付宝 */
/* 校验支付宝 */
// let checkSettleAlipay = async (params = {}) => await vm.$u.get('/wxh-site-rest/rest/register/verifyAlipayAccount', params);
// let checkSettleAlipay = async (params = {}) => await vm.$u.get('/wxh-site-rest/rest/register/verifyAlipayAccount', params);
/* 提交认证资料 */
/* 提交认证资料 */
let
checkSettleSignInfo
=
async
(
params
=
{})
=>
await
vm
.
$u
.
post
(
ucenterApiUrl
+
'/v1/settled/check-sign-info'
,
params
,{
'content-type'
:
'application/x-www-form-urlencoded'
});
let
checkSettleSignInfo
=
async
(
params
=
{})
=>
await
vm
.
$u
.
post
(
ucenterApiUrl
+
'/v1/settled/check-sign-info'
,
params
,{
'content-type'
:
'application/x-www-form-urlencoded'
});
/* 获取接单教程列表 */
/* 获取接单教程列表 */
let
listOrderingTutorials
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
ucenterApiUrl
+
'/v1/settled/get-course-rate'
,
params
);
let
listOrderingTutorials
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
ucenterApiUrl
+
'/v1/settled/get-course-rate'
,
params
);
/* 更新接单教程状态 */
/* 更新接单教程状态 */
let
saveCourseRate
=
async
(
params
=
{})
=>
await
vm
.
$u
.
post
(
ucenterApiUrl
+
'/v1/settled/save-course-rate'
,
params
);
let
saveCourseRate
=
async
(
params
=
{})
=>
await
vm
.
$u
.
post
(
ucenterApiUrl
+
'/v1/settled/save-course-rate'
,
params
);
/* 获取消息内容列表 */
/* 获取消息内容列表 */
let
listByNotice
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
ucenterApiUrl
+
'/v1/notice/home-list'
,
params
);
let
listByNotice
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
ucenterApiUrl
+
'/v1/notice/home-list'
,
params
);
/** 我的-更新收货地址 */
/**
* 我的-更新收货地址
*/
let
syncAddress
=
async
(
params
=
{})
=>
await
vm
.
$u
.
post
(
ucenterApiUrl
+
'/v1/settled/sync-address'
,
params
);
let
syncAddress
=
async
(
params
=
{})
=>
await
vm
.
$u
.
post
(
ucenterApiUrl
+
'/v1/settled/sync-address'
,
params
);
//我的合同//
let
Mycontract
=
async
(
params
)
=>
await
vm
.
$u
.
get
(
ucenterApiUrl
+
'/v1/settled-contract/info'
+
'?Authorization='
+
vm
.
vuex_token
+
params
)
const
settledApi
=
{
const
settledApi
=
{
getSettleBaseInfo
,
getSettleBaseInfo
,
...
@@ -62,6 +52,7 @@ let settledApiFun = function(vm){
...
@@ -62,6 +52,7 @@ let settledApiFun = function(vm){
saveCourseRate
,
saveCourseRate
,
listByNotice
,
listByNotice
,
syncAddress
,
syncAddress
,
Mycontract
,
}
}
return
settledApi
return
settledApi
}
}
...
...
src/common/util.js
View file @
8982de7c
function
strlen
(
value
)
{
function
strlen
(
value
)
{
//中文、中文标点、全角字符按1长度,英文、英文符号、数字按0.5长度计算
//中文、中文标点、全角字符按1长度,英文、英文符号、数字按0.5长度计算
let
cnReg
=
/
([\u
4e00-
\u
9fa5
]
|
[\u
3000-
\u
303F
]
|
[\u
FF00-
\u
FF60
])
/g
;
let
cnReg
=
/
([\u
4e00-
\u
9fa5
]
|
[\u
3000-
\u
303F
]
|
[\u
FF00-
\u
FF60
])
/g
;
...
@@ -184,5 +183,5 @@ export {
...
@@ -184,5 +183,5 @@ export {
setDb
,
setDb
,
getDb
,
getDb
,
getDateTime
,
getDateTime
,
randStr
randStr
,
}
}
src/components/appoint/appoint-time.vue
View file @
8982de7c
...
@@ -36,7 +36,7 @@
...
@@ -36,7 +36,7 @@
:class=
"
{'time-item':true,'active': item.pkey===appointRange}" v-for="(item,index) in timeList"
:class=
"
{'time-item':true,'active': item.pkey===appointRange}" v-for="(item,index) in timeList"
:key="item.pkey">
:key="item.pkey">
<button
class=
"time"
:plain=
"true"
<button
class=
"time"
:plain=
"true"
:disabled=
"item.disabled"
:hair-line=
"false"
:disabled=
"item.disabled
|| (currentDayIndex == 0 && item.pkey
<
=
currentPkey
)
"
:hair-line=
"false"
@
click=
"timeChange(item,index,timeList)"
>
@
click=
"timeChange(item,index,timeList)"
>
{{
item
.
name
}}
{{
item
.
name
}}
</button>
</button>
...
@@ -101,7 +101,9 @@
...
@@ -101,7 +101,9 @@
appointRange
:
null
,
appointRange
:
null
,
appointRangeText
:
''
,
appointRangeText
:
''
,
num
:
0
,
num
:
0
,
hasLast
:
false
hasLast
:
false
,
currentPkey
:
'appointment_range_'
+
new
Date
().
getHours
(),
currentDayIndex
:
-
1
,
}
}
},
},
watch
:
{
watch
:
{
...
@@ -125,6 +127,7 @@
...
@@ -125,6 +127,7 @@
this
.
appointTime
=
item
.
day
this
.
appointTime
=
item
.
day
this
.
appointRange
=
null
this
.
appointRange
=
null
this
.
appointRangeText
=
''
this
.
appointRangeText
=
''
this
.
currentDayIndex
=
index
this
.
$emit
(
'date-change'
,
data
)
this
.
$emit
(
'date-change'
,
data
)
},
},
timeChange
(
item
,
index
,
list
)
{
timeChange
(
item
,
index
,
list
)
{
...
...
src/components/createCom/XhFiles.vue
View file @
8982de7c
<!-- ******************* 文件上传 ******************* -->
<!-- ******************* 文件上传 ******************* -->
<
template
>
<
template
>
<view>
<view>
<view
class=
"file-box"
v-if=
"!takeStatus"
>
<view
class=
"file-box"
>
<!--
<view
class=
"u-flex"
>
<!--
<view
class=
"u-flex"
>
<view
class=
"txt u-flex-1"
>
{{
item
.
fieldsTitle
}}
</view>
<view
class=
"txt u-flex-1"
>
{{
item
.
fieldsTitle
}}
</view>
<u-icon
name=
"arrow-right"
color=
"#666"
size=
"28"
></u-icon>
<u-icon
name=
"arrow-right"
color=
"#666"
size=
"28"
></u-icon>
...
@@ -21,7 +21,7 @@
...
@@ -21,7 +21,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-
else
@
close=
"closeTake"
></take-photo>
<take-photo
v-
if=
"takeStatus"
@
close=
"closeTake"
:currentItem=
"currentItemDate"
></take-photo>
</view>
</view>
</
template
>
</
template
>
...
@@ -38,7 +38,19 @@
...
@@ -38,7 +38,19 @@
props
:
{
props
:
{
files
:
{
files
:
{
type
:
Array
,
type
:
Array
,
}
},
partnerCompanyId
:
{
type
:
String
,
default
:
''
},
categoryId
:
{
type
:
String
,
default
:
''
},
brandId
:
{
type
:
String
,
default
:
''
},
},
},
filters
:{},
filters
:{},
data
()
{
data
()
{
...
@@ -53,6 +65,7 @@
...
@@ -53,6 +65,7 @@
}
}
],
],
takeStatus
:
false
,
takeStatus
:
false
,
currentItemDate
:{},
}
}
},
},
computed
:
{
computed
:
{
...
@@ -106,11 +119,13 @@
...
@@ -106,11 +119,13 @@
}
}
// 使用拍照工具拍摄
// 使用拍照工具拍摄
this
.
takeStatus
=
true
this
.
takeStatus
=
true
this
.
getWatermark
()
this
.
getPhotoStander
()
},
},
setValue
()
{
setValue
()
{
const
dataValue
=
[]
const
dataValue
=
[]
this
.
imgList
.
map
(
item
=>
{
this
.
imgList
.
map
(
item
=>
{
dataValue
.
push
(
item
.
path
)
dataValue
.
push
(
item
.
src
)
})
})
this
.
valueChange
(
dataValue
)
this
.
valueChange
(
dataValue
)
},
},
...
@@ -118,6 +133,7 @@
...
@@ -118,6 +133,7 @@
if
(
val
&&
val
.
length
>
0
){
if
(
val
&&
val
.
length
>
0
){
val
.
forEach
((
item
,
index
,
array
)
=>
{
val
.
forEach
((
item
,
index
,
array
)
=>
{
item
.
path
=
item
.
key
item
.
path
=
item
.
key
item
.
src
=
item
.
key
this
.
imgList
.
push
(
item
)
this
.
imgList
.
push
(
item
)
})
})
this
.
setValue
()
this
.
setValue
()
...
@@ -133,6 +149,33 @@
...
@@ -133,6 +149,33 @@
delFile
(
index
)
{
delFile
(
index
)
{
this
.
imgList
.
splice
(
index
,
1
)
this
.
imgList
.
splice
(
index
,
1
)
this
.
setValue
()
this
.
setValue
()
},
getPhotoStander
(){
// 获取拍照规范接口
let
self
=
this
let
param
=
{
"partnerCompanyId"
:
self
.
partnerCompanyId
,
"categoryId"
:
self
.
categoryId
,
"brandId"
:
self
.
brandId
,
"fieldName"
:
self
.
item
.
fieldsName
}
this
.
$u
.
api
.
orderStandardItem
(
param
).
then
((
res
)
=>
{
if
(
res
.
code
==
200
&&
res
.
data
.
length
>
0
)
{
self
.
currentItemDate
=
res
.
data
[
0
]
}
else
{
console
.
log
(
"获取完工项的拍照标准异常"
,
res
.
data
.
message
)
}
})
},
getWatermark
(){
if
(
getApp
().
globalData
.
photo
.
waterSetting
){
return
}
var
data
=
{
partnerCompanyId
:
this
.
partnerCompanyId
}
this
.
$u
.
api
.
getWatermark
(
data
).
then
((
res
)
=>
{
if
(
res
.
code
==
200
)
{
getApp
().
globalData
.
photo
.
waterSetting
=
res
.
data
}
else
{
console
.
log
(
"获取水印备注异常"
,
res
.
data
.
message
)
}
});
}
}
}
}
}
}
...
...
src/components/createCom/XhInput.vue
View file @
8982de7c
...
@@ -17,6 +17,16 @@
...
@@ -17,6 +17,16 @@
type
:
String
,
type
:
String
,
default
:
'请输入'
default
:
'请输入'
},
},
item
:
{
type
:
Object
,
default
()
{
return
{}
}
},
type
:
{
type
:
String
,
default
:
'text'
}
// width: { // 例如:454rpx
// width: { // 例如:454rpx
// type: String,
// type: String,
// default: '100%'
// default: '100%'
...
@@ -24,25 +34,36 @@
...
@@ -24,25 +34,36 @@
},
},
data
()
{
data
()
{
return
{
return
{
maxlength
:
140
,
inputType
:
'text'
,
// type: 'text'
}
}
},
},
computed
:
{
computed
:
{
type
()
{
// type() {
let
ty
=
this
.
item
.
fieldsType
.
toLocaleLowerCase
()
// if (this.item) {
if
(
this
.
item
.
fieldsId
==
200
)
{
// let ty = this.item.fieldsType.toLocaleLowerCase()
this
.
maxlength
=
9
// switch (ty) {
return
'digit'
// case 'text':
}
else
{
// return 'textarea'
if
(
this
.
item
&&
ty
==
'password'
)
{
// case 'password':
return
this
.
item
.
fieldsType
// return this.item.fieldsType
}
else
if
(
this
.
item
&&
ty
==
'text'
)
{
// case 'decimal':
return
'textarea'
// case 'number':
}
else
{
// case 'double':
return
'text'
// case 'integer':
}
// this.maxlength = 9
}
// return 'digit'
// case 'textarea':
// default:
// return 'text'
// }
// } else {
// return 'text'
// }
// },
maxlength
()
{
return
this
.
type
==
'digit'
?
9
:
140
},
},
fieldsWidth
()
{
fieldsWidth
()
{
return
this
.
item
.
fieldsWidth
?
(
this
.
item
.
fieldsWidth
+
'rpx'
)
:
'100%'
return
this
.
item
.
fieldsWidth
?
(
this
.
item
.
fieldsWidth
+
'rpx'
)
:
'100%'
...
@@ -64,7 +85,7 @@
...
@@ -64,7 +85,7 @@
return
this
.
textarea
return
this
.
textarea
},
},
textarea
()
{
textarea
()
{
return
this
.
t
ype
==
'textarea'
return
this
.
inputT
ype
==
'textarea'
},
},
backgroundColor
()
{
backgroundColor
()
{
return
this
.
textarea
?
'transparent'
:
'#F4F5F7'
return
this
.
textarea
?
'transparent'
:
'#F4F5F7'
...
...
src/components/createCom/XhLabel.vue
0 → 100644
View file @
8982de7c
<!-- ******************* 输入框 ******************* -->
<
template
>
<view>
<view
class=
"list u-flex u-row-between"
>
<image
class=
"item-image"
:src=
"mixingImage"
v-if=
"item.required"
></image>
<view
class=
"u-m-r-20 title-text"
>
{{
item
.
fieldsTitle
}}
</view>
<view
class=
"u-flex-1 location-name"
>
{{
valueTxt
}}
</view>
</view>
</view>
</
template
>
<
script
>
import
stringMixin
from
'./stringMixin'
export
default
{
name
:
'XhInput'
,
// 新建 input
components
:
{},
mixins
:
[
stringMixin
],
props
:
{
placeholder
:
{
type
:
String
,
default
:
'请输入'
},
},
data
()
{
return
{
maxlength
:
140
,
}
},
computed
:
{
valueTxt
()
{
let
str
=
'元'
const
dataValue
=
this
.
dataValue
if
(
dataValue
>
0
){
str
=
dataValue
+
str
}
return
str
},
mixingImage
()
{
return
process
.
uniEnv
.
qn_base_url
+
'mixing.png'
}
},
watch
:
{},
mounted
()
{
},
methods
:
{
}
}
</
script
>
<
style
scoped
>
.required
{
padding-right
:
10
rpx
;
font-size
:
28
rpx
;
line-height
:
40
rpx
;
color
:
#fa3534
;
}
.title-text
{
font-size
:
26
rpx
;
color
:
#333333
;
}
.item-image
{
width
:
24
rpx
;
height
:
24
rpx
;
margin-right
:
10
rpx
;
}
.location-name
{
color
:
#333333
;
font-size
:
26
rpx
;
text-align
:
right
;
}
.location
{
background
:
#F4F5F7
;
padding
:
10
rpx
20
rpx
;
border-radius
:
12
rpx
;
}
</
style
>
src/components/createCom/XhServiceMore.vue
0 → 100644
View file @
8982de7c
<!-- ******************* 输入框 ******************* -->
<
template
>
<view>
<view
class=
"list u-flex item-row-between"
>
<view
class=
"item-title"
>
<image
class=
"item-image"
:src=
"mixingImage"
v-if=
"item.required"
></image>
<view
class=
"u-m-r-20"
>
{{
item
.
fieldsTitle
}}
</view>
</view>
<view
class=
"location-name"
@
click=
"toMaterialPage"
>
<text
class=
"arrow-text"
>
{{
arrowText
}}
</text>
<u-icon
name=
"arrow-right"
color=
"#2979ff"
size=
"30"
></u-icon>
</view>
</view>
<!--
<view
class=
"u-flex-1 location"
>
{{
valueTxt
||
'正在获取中...'
}}
</view>
-->
</view>
</
template
>
<
script
>
import
arrMixin
from
'./arrMixin'
export
default
{
name
:
'XhInput'
,
// 新建 input
components
:
{},
mixins
:
[
arrMixin
],
props
:
{
placeholder
:
{
type
:
String
,
default
:
'请输入'
},
orderId
:
{
type
:
String
,
default
:
'请输入'
},
},
data
()
{
return
{
maxlength
:
140
,
}
},
computed
:
{
mixingImage
()
{
return
process
.
uniEnv
.
qn_base_url
+
'mixing.png'
},
arrowText
()
{
return
false
?
'已选择'
:
'请选择'
}
},
watch
:
{},
mounted
()
{},
methods
:
{
toMaterialPage
(){
let
self
=
this
uni
.
navigateTo
({
url
:
'pages/order/material?orderId='
+
this
.
orderId
+
'&fieldName='
+
this
.
item
.
fieldsName
,
// 接口调用成功的回调函数,即跳转到B页面 test.vue 后的回调函数
success
:
function
(
res
)
{
// 通过eventChannel向被打开页面传送数据
res
.
eventChannel
.
emit
(
'showMaterialData'
,
self
.
dataValue
);
}
})
},
}
}
</
script
>
<
style
lang=
"scss"
scoped
>
.required
{
padding-right
:
10rpx
;
font-size
:
28rpx
;
line-height
:
40rpx
;
color
:
#fa3534
;
}
.item-image
{
width
:
24rpx
;
height
:
24rpx
;
margin-right
:
10rpx
;
}
.item-row-between
{
display
:
flex
;
align-items
:
center
;
justify-content
:
space-between
;
.item-title
{
display
:
flex
;
font-size
:
26rpx
;
color
:
#333333
;
align-items
:
center
;
}
.location-name
{
color
:
#2272FF
;
text-align
:
right
;
font-size
:
26rpx
;
display
:
flex
;
align-items
:
center
;
.arrow-text
{
margin-right
:
6rpx
;
}
}
}
.location
{
background
:
#F4F5F7
;
padding
:
10rpx
20rpx
;
border-radius
:
12rpx
;
}
</
style
>
src/components/mine/settlement.vue
View file @
8982de7c
<
template
>
<
template
>
<view
class=
"settlement-view"
>
<view
class=
"settlement-view"
>
<view
class=
"settlement-com-view"
>
<view
class=
"settlement-com-view"
@
click=
"$u.throttle(handleClick, 500)"
>
<view
class=
"left-view"
>
<view
class=
"left-view"
>
<view
class=
"time-view"
>
{{
timeText
}}
</view>
<view
class=
"time-view"
>
{{
timeText
}}
</view>
<view
class=
"order-view"
>
<view
class=
"order-view"
>
...
@@ -55,6 +55,11 @@
...
@@ -55,6 +55,11 @@
timeText
()
{
timeText
()
{
return
this
.
$u
.
timeFormat
(
this
.
data
.
paymentTime
,
'mm.dd'
)
return
this
.
$u
.
timeFormat
(
this
.
data
.
paymentTime
,
'mm.dd'
)
}
}
},
methods
:
{
handleClick
()
{
this
.
$emit
(
'click'
,
this
.
data
.
orderId
)
}
}
}
}
}
</
script
>
</
script
>
...
@@ -62,6 +67,7 @@
...
@@ -62,6 +67,7 @@
<
style
lang=
"scss"
scoped
>
<
style
lang=
"scss"
scoped
>
.settlement-view
{
.settlement-view
{
height
:
212rpx
;
height
:
212rpx
;
.settlement-com-view
{
.settlement-com-view
{
display
:
flex
;
display
:
flex
;
justify-content
:
space-between
;
justify-content
:
space-between
;
...
...
src/components/mine/statement.vue
View file @
8982de7c
<
template
>
<
template
>
<view
class=
"statement-view"
>
<view
class=
"statement-view"
>
<view
class=
"statement-com-view"
>
<view
class=
"statement-com-view"
@
click=
"$u.throttle(handleClick, 500)"
>
<view
class=
"left-view"
>
<view
class=
"left-view"
>
<view
class=
"time-view"
>
{{
timeText
}}
</view>
<view
class=
"time-view"
>
{{
timeText
}}
</view>
<view
class=
"order-view"
>
<view
class=
"order-view"
>
...
@@ -58,6 +58,11 @@
...
@@ -58,6 +58,11 @@
timeText
()
{
timeText
()
{
return
this
.
$u
.
timeFormat
(
this
.
data
.
paymentTime
,
'mm.dd'
)
return
this
.
$u
.
timeFormat
(
this
.
data
.
paymentTime
,
'mm.dd'
)
}
}
},
methods
:{
handleClick
()
{
this
.
$emit
(
'click'
,
this
.
data
.
orderId
)
}
}
}
}
}
</
script
>
</
script
>
...
...
src/components/order/index.vue
View file @
8982de7c
...
@@ -19,15 +19,16 @@
...
@@ -19,15 +19,16 @@
<image
class=
"address-image"
:src=
"dizhiImage"
mode=
"widthFix"
></image>
<image
class=
"address-image"
:src=
"dizhiImage"
mode=
"widthFix"
></image>
<text>
{{
formatAddress
(
orderData
)
}}
</text>
<text>
{{
formatAddress
(
orderData
)
}}
</text>
</view>
</view>
<view
v-if=
"showDistance"
>
<view
v-if=
"showDistance"
class=
"address-right-view"
>
{{
orderDistance
}}
km
{{
orderDistance
}}
km
</view>
</view>
</view>
</view>
</view>
</view>
<view
class=
"line-view"
></view>
<view
class=
"line-view"
></view>
<view
class=
"reason-view"
v-if=
"showReason"
><text
class=
"reason-text"
>
未通过原因:
</text>
<view
class=
"reason-view"
v-if=
"showReason"
>
<text
v-for=
"(item, index) in orderData.auditResults"
:key=
"index"
>
{{
item
}}
</text>
<view><text
class=
"reason-title"
>
未通过原因:
</text></view>
<view
class=
"reason-text"
><text
v-for=
"(item, index) in orderData.auditResults"
:key=
"index"
>
{{
item
}}
</text></view>
</view>
</view>
<view
class=
"bottom-view"
>
<view
class=
"bottom-view"
>
<view>
<view>
...
@@ -188,7 +189,7 @@
...
@@ -188,7 +189,7 @@
},
},
timeText
()
{
timeText
()
{
let
time
=
this
.
orderType
==
4
?
this
.
orderData
.
orderFinishDatetime
:
this
.
orderData
.
auditDatetime
let
time
=
this
.
orderType
==
4
?
this
.
orderData
.
orderFinishDatetime
:
this
.
orderData
.
auditDatetime
return
t
his
.
$u
.
timeFormat
(
time
,
'yyyy.mm.dd hh:MM:ss'
)
return
t
ime
?
this
.
$u
.
timeFormat
(
time
,
'yyyy.mm.dd hh:MM:ss'
)
:
''
},
},
timeTitle
()
{
timeTitle
()
{
return
this
.
orderType
==
4
?
'提交时间:'
:
'审核时间:'
return
this
.
orderType
==
4
?
'提交时间:'
:
'审核时间:'
...
@@ -215,6 +216,7 @@
...
@@ -215,6 +216,7 @@
}
}
},
},
created
()
{
created
()
{
console
.
log
(
'+++++++++++'
)
/*
/*
orderStatus:
orderStatus:
待接单 orderStatus<31 工单状态小于31
待接单 orderStatus<31 工单状态小于31
...
@@ -230,11 +232,11 @@
...
@@ -230,11 +232,11 @@
this
.
orderType
=
0
this
.
orderType
=
0
}
else
if
(
this
.
orderData
.
orderStatus
==
31
)
{
}
else
if
(
this
.
orderData
.
orderStatus
==
31
)
{
if
(
this
.
orderData
.
appointmentDatetime
)
{
if
(
this
.
orderData
.
appointmentDatetime
)
{
return
this
.
orderType
=
2
this
.
orderType
=
2
}
else
{
}
else
{
this
.
orderType
=
1
this
.
orderType
=
1
}
}
}
else
if
(
this
.
orderData
.
orderStatus
>
31
||
this
.
orderData
.
orderStatus
<
80
)
{
}
else
if
(
this
.
orderData
.
orderStatus
>
31
&&
this
.
orderData
.
orderStatus
<
80
)
{
this
.
orderType
=
3
this
.
orderType
=
3
}
else
if
(
this
.
orderData
.
orderStatus
==
85
||
this
.
orderData
.
orderStatus
==
87
)
{
}
else
if
(
this
.
orderData
.
orderStatus
==
85
||
this
.
orderData
.
orderStatus
==
87
)
{
this
.
orderType
=
4
this
.
orderType
=
4
...
@@ -248,9 +250,9 @@
...
@@ -248,9 +250,9 @@
}
else
{
}
else
{
this
.
orderType
=
this
.
types
[
this
.
type
]
this
.
orderType
=
this
.
types
[
this
.
type
]
}
}
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
()
{
...
@@ -381,6 +383,7 @@
...
@@ -381,6 +383,7 @@
align-items
:
center
;
align-items
:
center
;
align-items
:
flex-start
;
align-items
:
flex-start
;
text-align
:
left
;
text-align
:
left
;
.address-image
{
.address-image
{
width
:
26rpx
;
width
:
26rpx
;
height
:
28rpx
;
height
:
28rpx
;
...
@@ -390,7 +393,9 @@
...
@@ -390,7 +393,9 @@
}
}
}
}
.address-right-view
{}
.address-right-view
{
margin-left
:
30rpx
;
}
}
}
}
}
...
@@ -408,10 +413,15 @@
...
@@ -408,10 +413,15 @@
color
:
#FA5A49
;
color
:
#FA5A49
;
display
:
flex
;
display
:
flex
;
align-items
:
flex-start
;
align-items
:
flex-start
;
.reason-text
{
display
:
flex
;
.reason-title
{
flex-shrink
:
0
;
flex-shrink
:
0
;
color
:
#666666
;
color
:
#666666
;
}
}
.reason-text
{
display
:
flex
;
flex-direction
:
column
;
}
}
}
.bottom-view
{
.bottom-view
{
...
...
src/components/photo/setting.vue
View file @
8982de7c
...
@@ -101,7 +101,7 @@
...
@@ -101,7 +101,7 @@
},
},
showTitleSwitch
()
{
showTitleSwitch
()
{
return
this
.
result
[
'lowerLeft'
].
hasOwnProperty
(
'title'
)
return
this
.
result
[
'lowerLeft'
].
hasOwnProperty
(
'title'
)
&&
this
.
result
[
'lowerLeft'
][
'title'
]
},
},
customStyleCancel
()
{
customStyleCancel
()
{
return
{
return
{
...
...
src/components/take/index.vue
View file @
8982de7c
...
@@ -113,12 +113,22 @@
...
@@ -113,12 +113,22 @@
photo
.
currentItemLength
=
0
photo
.
currentItemLength
=
0
// this.ctx = uni.createCameraContext();
// this.ctx = uni.createCameraContext();
this
.
updateTime
()
this
.
updateTime
()
const
locationData
=
uni
.
getStorageSync
(
'locationData'
)
const
validityTime
=
60000
if
(
Date
.
now
()
-
locationData
.
locationTime
<
validityTime
)
{
// 1分钟内不重复请求位置信息
this
.
waterInfo
.
latitude
=
locationData
.
waterInfo
.
latitude
this
.
waterInfo
.
longitude
=
locationData
.
waterInfo
.
longitude
this
.
baiduLocation
()
}
else
{
this
.
getLocation
()
this
.
getLocation
()
}
this
.
getMarkPath
()
this
.
getMarkPath
()
this
.
initData
()
this
.
initData
()
photo
.
currentItem
=
this
.
currentItem
photo
.
currentItem
=
this
.
currentItem
if
(
this
.
currentItem
.
images
.
length
>
0
)
{
if
(
this
.
currentItem
.
images
&&
this
.
currentItem
.
images
.
length
>
0
)
{
this
.
shadowInitShow
=
true
this
.
shadowInitShow
=
true
this
.
standardShow
=
true
this
.
standardShow
=
true
this
.
standardStatus
=
true
this
.
standardStatus
=
true
...
@@ -266,6 +276,17 @@
...
@@ -266,6 +276,17 @@
success
:
function
(
res
)
{
success
:
function
(
res
)
{
waterInfo
.
longitude
=
parseFloat
(
res
.
longitude
).
toFixed
(
4
)
waterInfo
.
longitude
=
parseFloat
(
res
.
longitude
).
toFixed
(
4
)
waterInfo
.
latitude
=
parseFloat
(
res
.
latitude
).
toFixed
(
3
)
waterInfo
.
latitude
=
parseFloat
(
res
.
latitude
).
toFixed
(
3
)
const
data
=
{
waterInfo
:
{
latitude
:
waterInfo
.
latitude
,
longitude
:
waterInfo
.
longitude
},
locationTime
:
Date
.
now
()
}
uni
.
setStorage
({
key
:
'locationData'
,
data
:
data
,
})
that
.
baiduLocation
()
that
.
baiduLocation
()
},
},
fail
(
err
)
{
fail
(
err
)
{
...
...
src/pages.json
View file @
8982de7c
...
@@ -41,7 +41,9 @@
...
@@ -41,7 +41,9 @@
{
{
"path"
:
"pages/login/index"
,
"path"
:
"pages/login/index"
,
"style"
:
{
"style"
:
{
"navigationBarTitleText"
:
"授权登录"
"navigationBarTitleText"
:
"授权登录"
,
"navigationStyle"
:
"custom"
,
"disableScroll"
:
true
}
}
}
}
],
],
...
@@ -240,6 +242,14 @@
...
@@ -240,6 +242,14 @@
"navigationBarTitleText"
:
"配件押金"
,
"navigationBarTitleText"
:
"配件押金"
,
"enablePullDownRefresh"
:
false
"enablePullDownRefresh"
:
false
}
}
},
{
"path"
:
"warehouse/index"
,
"style"
:
{
"navigationStyle"
:
"custom"
,
"navigationBarTitleText"
:
"我的仓库"
,
"enablePullDownRefresh"
:
false
}
}
}
...
@@ -252,7 +262,7 @@
...
@@ -252,7 +262,7 @@
{
{
"path"
:
"complete"
,
"path"
:
"complete"
,
"style"
:
{
"style"
:
{
"navigationBarTitleText"
:
"
订单-完工配置
"
,
"navigationBarTitleText"
:
""
,
"navigationStyle"
:
"custom"
,
"navigationStyle"
:
"custom"
,
"disableScroll"
:
true
"disableScroll"
:
true
}
}
...
@@ -260,7 +270,7 @@
...
@@ -260,7 +270,7 @@
{
{
"path"
:
"feedback"
,
"path"
:
"feedback"
,
"style"
:
{
"style"
:
{
"navigationBarTitleText"
:
"
订单-过程反馈
"
,
"navigationBarTitleText"
:
""
,
"enablePullDownRefresh"
:
false
,
"enablePullDownRefresh"
:
false
,
"navigationStyle"
:
"custom"
,
//
隐藏系统导航栏
"navigationStyle"
:
"custom"
,
//
隐藏系统导航栏
"disableScroll"
:
true
"disableScroll"
:
true
...
@@ -269,27 +279,26 @@
...
@@ -269,27 +279,26 @@
{
{
"path"
:
"refuse"
,
"path"
:
"refuse"
,
"style"
:
{
"style"
:
{
"navigationBarTitleText"
:
"
订单-拒单
"
,
"navigationBarTitleText"
:
""
,
"enablePullDownRefresh"
:
false
,
"enablePullDownRefresh"
:
false
,
"navigationStyle"
:
"custom"
,
//
隐藏系统导航栏
"navigationStyle"
:
"custom"
,
//
隐藏系统导航栏
"disableScroll"
:
true
"disableScroll"
:
true
}
}
},
},
{
{
//
订单详情页
"path"
:
"detail"
,
"path"
:
"detail"
,
"style"
:
"style"
:
{
{
"navigationStyle"
:
"custom"
//
隐藏系统导航栏
"navigationBarTitleText"
:
"订单详情"
,
"navigationStyle"
:
"custom"
}
}
},
},
{
{
//
订单搜索页
"path"
:
"search"
,
"path"
:
"search"
,
"style"
:
"style"
:
{
{
"navigationBarTitleText"
:
""
,
"navigationBarTitleText"
:
"
订单搜索
"
,
"enablePullDownRefresh"
:
false
,
"enablePullDownRefresh"
:
false
,
"navigationBarBackgroundColor"
:
"#F4F5F7"
"navigationBarBackgroundColor"
:
"#F4F5F7"
}
}
...
@@ -323,9 +332,6 @@
...
@@ -323,9 +332,6 @@
"navigationBarTitleText"
:
"水印设置"
,
"navigationBarTitleText"
:
"水印设置"
,
"navigationBarBackgroundColor"
:
"#FFFFFF"
,
"navigationBarBackgroundColor"
:
"#FFFFFF"
,
"backgroundColor"
:
"#F4F5F7"
"backgroundColor"
:
"#F4F5F7"
//
"navigationBarBackgroundColor"
:
"#333333"
,
//
"navigationBarTextStyle"
:
"#FFFFFF"
,
//
"disableScroll"
:
true
}
}
},
},
{
{
...
@@ -435,7 +441,7 @@
...
@@ -435,7 +441,7 @@
},
},
"globalStyle"
:
{
"globalStyle"
:
{
"navigationBarTextStyle"
:
"black"
,
"navigationBarTextStyle"
:
"black"
,
"navigationBarTitleText"
:
"
uni-app
"
,
"navigationBarTitleText"
:
""
,
"navigationBarBackgroundColor"
:
"#F8F8F8"
,
"navigationBarBackgroundColor"
:
"#F8F8F8"
,
"backgroundColor"
:
"#F4F5F7"
"backgroundColor"
:
"#F4F5F7"
},
},
...
@@ -471,46 +477,18 @@
...
@@ -471,46 +477,18 @@
}
}
]
]
},
},
"condition"
:
{
//模式配置,仅开发期间生效
"condition"
:
{
"current"
:
0
,
//当前激活的模式(list
的索引项)
"current"
:
0
,
"list"
:
[
"list"
:
[
{
{
"name"
:
"拍照小工具"
,
//模式名称
"name"
:
"拍照小工具"
,
"path"
:
"pages/photo/index"
,
//启动页面,必选
"path"
:
"pages/photo/index"
,
"query"
:
""
//启动参数,在页面的onLoad函数里面得到
"query"
:
{}
},
},
{
{
//
gaomingbo
"name"
:
"工单-过程反馈"
,
"name"
:
"工单-过程反馈"
,
"path"
:
"pages/order/feedback"
,
"path"
:
"pages/order/feedback"
,
"query"
:
""
"query"
:
""
},
{
"name"
:
"在线考试"
,
//模式名称
"path"
:
"pages/learn/exam"
,
//启动页面,必选
"query"
:
""
//启动参数,在页面的onLoad函数里面得到
},
{
"name"
:
"入驻考试"
,
//模式名称
"path"
:
"pages/exam/index"
,
//启动页面,必选
"query"
:
""
//启动参数,在页面的onLoad函数里面得到
},
{
"name"
:
"完工配置"
,
//模式名称
"path"
:
"pages/order/complete"
,
//启动页面,必选
"query"
:
{
"id"
:
11880091
}
//启动参数,在页面的onLoad函数里面得到
},
{
"name"
:
"学习 - 首页"
,
//模式名称
"path"
:
"pages/index/learn"
,
//启动页面,必选
"query"
:
""
//启动参数,在页面的onLoad函数里面得到
},
{
"name"
:
"我的 - 我的证件 - 列表"
,
//模式名称
"path"
:
"pages/mine/cert/index"
,
//启动页面,必选
"query"
:
""
//启动参数,在页面的onLoad函数里面得到
}
}
]
]
}
}
...
...
src/pages/index/index.vue
View file @
8982de7c
...
@@ -33,7 +33,7 @@
...
@@ -33,7 +33,7 @@
<!-- 入驻前-->
<!-- 入驻前-->
<view
v-if=
"needSettled"
class=
"tip-view"
>
<view
v-if=
"needSettled"
class=
"tip-view"
>
<image
:src=
"weiruzhuImage"
class=
"tip-view-image"
></image>
<image
:src=
"weiruzhuImage"
class=
"tip-view-image"
></image>
<view
class=
"tip-other"
>
入驻
通过后平台将向您
推荐订单
</view>
<view
class=
"tip-other"
>
入驻
后平台将向您分配或
推荐订单
</view>
<u-button
class=
"settle-button"
type=
"primary"
shape=
"circle"
@
click=
"immediatelyIn"
<u-button
class=
"settle-button"
type=
"primary"
shape=
"circle"
@
click=
"immediatelyIn"
:custom-style=
"buttonStyle"
>
:custom-style=
"buttonStyle"
>
立即入驻
立即入驻
...
@@ -101,15 +101,16 @@
...
@@ -101,15 +101,16 @@
pageNumber
:
0
,
pageNumber
:
0
,
pageSize
:
100
,
pageSize
:
100
,
},
},
waitInit
:
false
,
// 当token为空时,等待自动登录结束
triggered
:
false
,
triggered
:
false
,
_freshing
:
false
,
_freshing
:
false
,
};
};
},
},
watch
:
{
watch
:
{
//
vuex_token(val, oldVal) {
vuex_token
(
val
,
oldVal
)
{
//
// 监听token变化,如果更新则重新加载页面数据
// 监听token变化,如果更新则重新加载页面数据
// val && this.initSettleInfo
()
val
&&
this
.
waitInit
&&
this
.
getData
()
//
}
}
},
},
computed
:
{
computed
:
{
buttonStyle
()
{
buttonStyle
()
{
...
@@ -139,7 +140,11 @@
...
@@ -139,7 +140,11 @@
},
},
onLoad
()
{
onLoad
()
{
this
.
_freshing
=
false
;
this
.
_freshing
=
false
;
if
(
this
.
vuex_token
)
{
this
.
getOrderCount
()
this
.
getOrderCount
()
}
else
{
this
.
waitInit
=
true
}
},
},
onShow
()
{
onShow
()
{
// 每次进入页面都刷新入驻状态
// 每次进入页面都刷新入驻状态
...
@@ -164,6 +169,10 @@
...
@@ -164,6 +169,10 @@
// console.log('---------scroll---------', obj)
// console.log('---------scroll---------', obj)
// },
// },
methods
:
{
methods
:
{
getData
()
{
this
.
getOrderCount
()
this
.
initSettleInfo
();
},
handleClick
(
orderId
)
{
// 点击了cell
handleClick
(
orderId
)
{
// 点击了cell
console
.
log
(
'点击了cell'
)
console
.
log
(
'点击了cell'
)
this
.
viewOderItem
(
orderId
)
this
.
viewOderItem
(
orderId
)
...
@@ -222,48 +231,16 @@
...
@@ -222,48 +231,16 @@
self
.
loadedOrder
=
true
self
.
loadedOrder
=
true
self
.
triggered
=
false
;
self
.
triggered
=
false
;
self
.
_freshing
=
false
;
self
.
_freshing
=
false
;
/*↓↓↓↓↓↓↓↓↓↓测试数据↓↓↓↓↓↓↓↓↓↓*/
if
(
res
.
code
==
200
&&
res
.
data
)
{
// 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
// ]
// }
// }
/*↑↑↑↑↑↑↑↑↑↑测试数据↑↑↑↑↑↑↑↑↑↑↑↑↑*/
if
(
res
.
code
==
200
)
{
if
(
res
.
data
&&
res
.
data
.
list
&&
res
.
data
.
list
.
length
>
0
)
{
if
(
self
.
search
.
pageNumber
==
1
)
{
if
(
self
.
search
.
pageNumber
==
1
)
{
self
.
orderList
=
[]
self
.
orderList
=
[]
}
}
if
(
res
.
data
.
list
)
{
self
.
orderList
.
push
(...
res
.
data
.
list
);
self
.
orderList
.
push
(...
res
.
data
.
list
);
self
.
currentLoadStatus
=
res
.
data
.
total
>
self
.
orderList
.
length
&&
res
.
data
.
list
.
length
==
self
.
search
.
pageSize
?
'loadmore'
:
'nomore'
}
}
console
.
log
(
'this.orderlist;'
,
this
.
orderList
)
self
.
currentLoadStatus
=
res
.
data
.
total
>
self
.
orderList
.
length
&&
(
res
.
data
.
list
||
[]).
length
==
self
.
search
.
pageSize
?
'loadmore'
:
'nomore'
}
else
{
}
else
{
console
.
log
(
res
.
message
,
"初始化订单列表异常"
);
console
.
log
(
res
.
message
,
"初始化订单列表异常"
);
}
}
...
...
src/pages/index/learn.vue
View file @
8982de7c
...
@@ -667,7 +667,6 @@
...
@@ -667,7 +667,6 @@
url
:
"/pages/learn/answer?examId="
+
examInfo
.
id
,
url
:
"/pages/learn/answer?examId="
+
examInfo
.
id
,
});
});
}
else
if
(
examInfo
.
examStatus
==
1
)
{
}
else
if
(
examInfo
.
examStatus
==
1
)
{
// debugger;return;
// examInfo.status = '通过';
// examInfo.status = '通过';
if
(
examInfo
.
status
==
'通过'
)
{
if
(
examInfo
.
status
==
'通过'
)
{
wx
.
navigateTo
({
wx
.
navigateTo
({
...
...
src/pages/index/mine.vue
View file @
8982de7c
...
@@ -6,12 +6,12 @@
...
@@ -6,12 +6,12 @@
</u-navbar>
</u-navbar>
<view
class=
"mine-content"
>
<view
class=
"mine-content"
>
<view
class=
"header-view"
>
<view
class=
"header-view"
>
<view
:class=
"['head-image',
{'has-image':
info.headImage
}]">
<view
:class=
"['head-image',
{'has-image':
avatar
}]">
<u-avatar
:src=
"headImageUrl"
:size=
"headSize"
mode=
"circle"
></u-avatar>
<u-avatar
:src=
"headImageUrl"
:size=
"headSize"
mode=
"circle"
></u-avatar>
</view>
</view>
<view
class=
"header-content"
>
<view
class=
"header-content"
>
<view
class=
"name-view"
@
click=
"handleClickName"
>
{{
name
}}
</view>
<view
class=
"name-view"
@
click=
"handleClickName"
>
{{
name
||
"点击登录"
}}
</view>
<view
:class=
"['tel-view',
{'active':
info.tel
}]" @click="handleClickTel">
<view
:class=
"['tel-view',
{'active':
mobile
}]" @click="handleClickTel">
<text>
{{
telTip
}}
</text>
<text>
{{
telTip
}}
</text>
<u-icon
class=
"tel-arrow-icon"
name=
"arrow-up-fill"
></u-icon>
<u-icon
class=
"tel-arrow-icon"
name=
"arrow-up-fill"
></u-icon>
</view>
</view>
...
@@ -22,7 +22,7 @@
...
@@ -22,7 +22,7 @@
<u-cell-group
:border=
"false"
>
<u-cell-group
:border=
"false"
>
<view
v-for=
"(item, index) in items"
:key=
"index"
>
<view
v-for=
"(item, index) in items"
:key=
"index"
>
<u-cell-item
:value=
"item.value"
:border-bottom=
"false"
@
click=
"handleClick(index)"
>
<u-cell-item
:value=
"item.value"
:border-bottom=
"false"
@
click=
"handleClick(index)"
>
<image
slot=
"icon"
:src=
"
imageUrl
+ item.icon"
:style=
"item.imageStyle"
></image>
<image
slot=
"icon"
:src=
"
qnPath
+ item.icon"
:style=
"item.imageStyle"
></image>
<view
slot=
"title"
class=
"item-title"
>
{{
item
.
title
}}
</view>
<view
slot=
"title"
class=
"item-title"
>
{{
item
.
title
}}
</view>
<view
slot=
"value"
class=
"item-value"
>
{{
value
}}
</view>
<view
slot=
"value"
class=
"item-value"
>
{{
value
}}
</view>
</u-cell-item>
</u-cell-item>
...
@@ -30,13 +30,7 @@
...
@@ -30,13 +30,7 @@
</view>
</view>
</u-cell-group>
</u-cell-group>
</view>
</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>
</view>
<!--
<take-photo
v-if=
"takeStatus"
:currentItem=
"testData"
@
close=
"closeTake"
></take-photo>
-->
</view>
</view>
</
template
>
</
template
>
...
@@ -48,26 +42,21 @@
...
@@ -48,26 +42,21 @@
},
},
data
()
{
data
()
{
return
{
return
{
qnPath
:
process
.
uniEnv
.
qn_base_url
,
serviceTel
:
'0755-81773817'
,
serviceTel
:
'0755-81773817'
,
info
:
{},
// 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
:
{
computed
:
{
avatar
()
{
return
this
.
vuex_settled
&&
this
.
vuex_settled
.
avatar
||
''
},
name
()
{
return
this
.
vuex_settled
&&
this
.
vuex_settled
.
id_card_name
||
this
.
vuex_settled
.
nickname
||
this
.
vuex_settled
.
name
||
''
},
mobile
()
{
return
this
.
vuex_settled
&&
this
.
vuex_settled
.
mobile
||
''
},
items
()
{
items
()
{
return
[{
return
[{
title
:
'我的钱包'
,
title
:
'我的钱包'
,
...
@@ -113,29 +102,23 @@
...
@@ -113,29 +102,23 @@
}
}
]
]
},
},
name
()
{
return
this
.
info
.
name
||
'点击登录'
},
telTip
()
{
telTip
()
{
return
this
.
info
.
tel
?
'已绑定手机号'
:
'绑定手机号'
return
this
.
mobile
&&
'已绑定手机'
||
'绑定手机号'
},
imageUrl
()
{
return
process
.
uniEnv
.
qn_base_url
},
},
pages
()
{
pages
()
{
return
[
'wallet'
,
'deposit'
,
'contract'
,
'cert'
,
'address'
,
''
,
'customer'
]
return
[
'wallet'
,
'deposit'
,
'contract'
,
'cert'
,
'address'
,
'
warehouse
'
,
'customer'
]
},
},
headImageUrl
()
{
headImageUrl
()
{
return
this
.
info
.
headImage
||
this
.
placeholderImage
return
this
.
avatar
||
this
.
placeholderImage
},
},
wodebeijingImage
()
{
wodebeijingImage
()
{
return
this
.
imageUrl
+
'wodebeijing.png'
return
this
.
qnPath
+
'wodebeijing.png'
},
},
placeholderImage
()
{
placeholderImage
()
{
return
this
.
imageUrl
+
'touxiang.png'
return
this
.
qnPath
+
'touxiang.png'
},
},
headSize
()
{
headSize
()
{
return
this
.
info
.
headImage
?
136
:
144
return
this
.
avatar
?
136
:
144
}
}
},
},
onLoad
()
{
onLoad
()
{
...
@@ -143,25 +126,22 @@
...
@@ -143,25 +126,22 @@
},
},
methods
:
{
methods
:
{
handleClick
(
index
)
{
handleClick
(
index
)
{
console
.
log
(
'clicked:'
,
index
)
uni
.
navigateTo
({
uni
.
navigateTo
({
url
:
'pages/mine/'
+
this
.
pages
[
index
]
+
'/index'
url
:
'pages/mine/'
+
this
.
pages
[
index
]
+
'/index'
})
})
},
},
handleClickName
()
{
handleClickName
()
{
console
.
log
(
'click name'
)
if
(
this
.
vuex_token
&&
this
.
vuex_settled
)
{
return
false
}
this
.
$u
.
route
({
url
:
"pages/login/index"
})
},
},
handleClickTel
()
{
handleClickTel
()
{
console
.
log
(
'click tel'
)
if
(
this
.
vuex_token
&&
this
.
vuex_settled
&&
this
.
mobile
)
{
return
false
}
this
.
$u
.
route
({
url
:
"pages/login/index"
})
},
},
// take() {
// uni.hideTabBar()
// this.takeStatus = true
// },
// closeTake(img) {
// console.log(img)
// this.takeStatus = false
// }
}
}
}
}
</
script
>
</
script
>
...
...
src/pages/index/order.vue
View file @
8982de7c
...
@@ -335,7 +335,7 @@
...
@@ -335,7 +335,7 @@
+
"&categoryId="
+
item
.
categoryId
+
"&categoryId="
+
item
.
categoryId
+
"&orderServiceType="
+
item
.
orderServiceType
+
"&orderServiceType="
+
item
.
orderServiceType
+
"&inGuaranteePeriod="
+
item
.
inGuaranteePeriod
+
"&inGuaranteePeriod="
+
item
.
inGuaranteePeriod
+
"&auditResultsId="
+
Object
.
keys
(
item
.
auditResults
)[
0
]
+
"&auditResultsId="
+
(
item
.
auditResults
?
Object
.
keys
(
item
.
auditResults
)[
Object
.
keys
(
item
.
auditResults
).
length
-
1
]:
''
)
})
})
},
},
handleAction
(
item
)
{
handleAction
(
item
)
{
...
...
src/pages/login/index.vue
View file @
8982de7c
<
template
>
<
template
>
<view
class=
""
>
<view
class=
""
>
<view
class=
"backView"
>
<view
class=
"backView"
>
<view
class=
"noticeView"
>
<view
class=
"login-block"
v-if=
"needAuth"
>
<image
class=
"noticeImage"
:src=
"icon_auth_notice_new"
mode=
""
></image>
<u-image
class=
"u-flex u-row-center logo"
:src=
"logo"
width=
"200"
height=
"200"
>
<u-loading
slot=
"loading"
></u-loading>
<view
slot=
"error"
style=
"font-size: 24rpx;"
>
加载失败
</view>
</u-image>
<u-image
class=
"u-flex u-row-center logo2"
:src=
"logo2"
width=
"214"
height=
"60"
>
<u-loading
slot=
"loading"
></u-loading>
<view
slot=
"error"
style=
"font-size: 24rpx;"
>
加载失败
</view>
</u-image>
</view>
</view>
<view
class=
"noticeTitleView"
>
<view
class=
"bind-block"
v-else
>
<text
class=
"noticeTitle"
v-if=
"needAuth"
>
{{
authNoticeTitle
}}
</text>
<u-image
class=
"u-flex u-row-between logo"
:src=
"logo"
width=
"148"
height=
"148"
>
<text
class=
"noticeTitle"
v-else
>
{{
suginNoticeTitle
}}
</text>
<u-loading
slot=
"loading"
></u-loading>
<view
slot=
"error"
style=
"font-size: 24rpx;"
>
加载失败
</view>
</u-image>
<view
class=
"bind-phone"
>
{{
bindPhone
}}
</view>
<view
class=
"bind-tips"
>
{{
bindTips
}}
</view>
</view>
</view>
<u-gap
height=
"570"
></u-gap>
<button
class=
"loginBtn"
v-if=
"needAuth"
lang=
"zh_CN"
@
tap=
"getUserProfile"
>
<button
class=
"loginBtn"
v-if=
"needAuth"
lang=
"zh_CN"
@
tap=
"getUserProfile"
>
<text
class=
"u-font-32 white"
>
立即登录
</text>
<text
class=
"u-font-32 white"
>
{{
loginTitle
}}
</text>
</button>
</button>
<button
class=
"loginBtn"
v-else
open-type=
"getPhoneNumber"
throttle-time=
"1000"
<button
class=
"loginBtn"
v-else
open-type=
"getPhoneNumber"
throttle-time=
"1000"
@
getphonenumber=
"signupLogin"
>
@
getphonenumber=
"signupLogin"
>
<text
class=
"u-font-32 white"
>
授权登录
</text>
<text
class=
"u-font-32 white"
>
{{
bindTitle
}}
</text>
</button>
</button>
<view
class=
"cancelView"
>
<text
class=
"cancelText"
@
click=
"cancelClick()"
>
取消
</text>
</view>
</view>
</view>
</view>
</view>
</
template
>
</
template
>
...
@@ -29,24 +38,27 @@ const app = getApp()
...
@@ -29,24 +38,27 @@ const app = getApp()
export
default
{
export
default
{
data
()
{
data
()
{
return
{
return
{
isNewUser
:
false
,
qnPath
:
process
.
uniEnv
.
qn_base_url
,
needAuth
:
true
,
needAuth
:
true
,
unionID
:
''
,
openID
:
''
,
icon_notice
:
''
,
TimeID
:
-
1
,
TimeID
:
-
1
,
icon_auth_notice_new
:
''
,
loginTitle
:
'用户登录'
,
authNoticeTitle
:
'申请获得您的公开信息(昵称,头像等)以便于为您提供更好的服务'
,
bindTitle
:
'立即绑定'
,
suginNoticeTitle
:
'申请获得您的公开信息(昵称,头像等)以便于为您提供更好的服务'
,
bindPhone
:
'绑定手机'
,
bindTips
:
'首次登录的用户需绑定手机才可接单'
,
}
}
},
},
onLoad
()
{
computed
:
{
logo
()
{
return
this
.
qnPath
+
'logo.png'
},
logo2
()
{
return
this
.
qnPath
+
'logo-2.png'
},
},
onLoad
(
e
)
{
app
.
trackPage
(
'授权登录页'
)
app
.
trackPage
(
'授权登录页'
)
this
.
icon_notice
=
app
.
globalData
.
icon_auth_notice
this
.
icon_auth_notice_new
=
app
.
globalData
.
icon_auth_notice_new
},
},
onShow
()
{
onShow
()
{
app
.
globalData
.
jumpLoginStatus
=
true
// 微信授权过用户信息,则无需重复授权
// 微信授权过用户信息,则无需重复授权
if
(
app
.
globalData
.
authUserInfo
)
{
if
(
app
.
globalData
.
authUserInfo
)
{
this
.
needAuth
=
false
this
.
needAuth
=
false
...
@@ -154,7 +166,6 @@ export default {
...
@@ -154,7 +166,6 @@ export default {
goBackPage
()
{
goBackPage
()
{
let
pages
=
getCurrentPages
();
let
pages
=
getCurrentPages
();
debugger
if
(
pages
.
length
)
{
if
(
pages
.
length
)
{
let
index
=
pages
.
length
-
1
;
let
index
=
pages
.
length
-
1
;
if
(
index
)
{
if
(
index
)
{
...
@@ -212,7 +223,7 @@ export default {
...
@@ -212,7 +223,7 @@ export default {
}
}
</
script
>
</
script
>
<
style
>
<
style
lang=
"scss"
scoped
>
.backView
{
.backView
{
background-color
:
#FFFFFF
;
background-color
:
#FFFFFF
;
position
:
absolute
;
position
:
absolute
;
...
@@ -220,8 +231,32 @@ export default {
...
@@ -220,8 +231,32 @@ export default {
left
:
0
;
left
:
0
;
width
:
100%
;
width
:
100%
;
height
:
100%
;
height
:
100%
;
display
:
flex
;
flex-direction
:
column
;
.login-block
{
margin-top
:
240rpx
;
}
.bind-block
{
margin-top
:
202rpx
;
margin-left
:
50rpx
;
.bind-phone
{
font-size
:
52rpx
;
margin-top
:
48rpx
;
font-weight
:
bold
;
color
:
#333333
;
line-height
:
52rpx
;
margin-left
:
10rpx
;
}
.bind-tips
{
margin
:
24rpx
60rpx
14rpx
10rpx
;
font-size
:
28rpx
;
font-weight
:
400
;
color
:
#999999
;
line-height
:
40rpx
;
}
}
}
.logo2
{
margin-top
:
28rpx
;
}
}
.noticeView
{
.noticeView
{
...
@@ -258,10 +293,13 @@ export default {
...
@@ -258,10 +293,13 @@ export default {
.loginBtn
{
.loginBtn
{
background-color
:
#2272FF
;
background-color
:
#2272FF
;
width
:
390
rpx
;
font-size
:
32rpx
;
height
:
80
rpx
;
font-weight
:
600
;
border-radius
:
40
rpx
;
color
:
#FFFFFF
;
margin-top
:
334
rpx
;
line-height
:
104px
;
width
:
600rpx
;
height
:
104rpx
;
border-radius
:
52rpx
;
display
:
flex
;
display
:
flex
;
align-items
:
center
;
align-items
:
center
;
justify-content
:
center
;
justify-content
:
center
;
...
@@ -283,4 +321,5 @@ export default {
...
@@ -283,4 +321,5 @@ export default {
.white
{
.white
{
color
:
#FFFFFF
;
color
:
#FFFFFF
;
}
}
</
style
>
</
style
>
src/pages/mine/cert/index.vue
View file @
8982de7c
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
></u-navbar>
></u-navbar>
<view
class=
"content-cody"
>
<view
class=
"content-cody"
>
<u-cell-group
:border=
"false"
>
<u-cell-group
:border=
"false"
>
<u-cell-item
v-for=
"
item in list"
:title=
"item.name"
:value=
"item.isUploadName"
:arrow=
"true
"
<u-cell-item
v-for=
"
(item, index) in list"
:title=
"item.name"
:value=
"item.isUploadName"
:arrow=
"true"
:key=
"index
"
:value-style=
"
{'color': item.color}" @click="toDetail(item.keyName)" :title-style="{'padding-left':'20rpx'}">
:value-style=
"
{'color': item.color}" @click="toDetail(item.keyName)" :title-style="{'padding-left':'20rpx'}">
<u-icon
slot=
"icon"
size=
"32"
name=
"checkmark-circle"
:color=
"item.iconColor"
></u-icon>
<u-icon
slot=
"icon"
size=
"32"
name=
"checkmark-circle"
:color=
"item.iconColor"
></u-icon>
</u-cell-item>
</u-cell-item>
...
@@ -112,7 +112,7 @@
...
@@ -112,7 +112,7 @@
},
},
toDetail
(
key
)
{
toDetail
(
key
)
{
let
data
=
this
.
list
[
key
].
data
;
let
data
=
this
.
list
[
key
].
data
;
if
(
data
.
status
!=
1
){
if
(
!
data
.
isUpload
){
return
;
return
;
}
}
wx
.
navigateTo
({
wx
.
navigateTo
({
...
...
src/pages/mine/customer/index.vue
View file @
8982de7c
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
<view
class=
"cus-wrap"
>
<view
class=
"cus-wrap"
>
<w-navbar
title=
"联系客服"
></w-navbar>
<w-navbar
title=
"联系客服"
></w-navbar>
<view
class=
"content"
>
<view
class=
"content"
>
<u-image
class=
"qrcode"
:src=
"cusQrcode"
width=
"400"
mode=
"widthFix"
@
longtap=
"download
"
>
<u-image
class=
"qrcode"
:src=
"cusQrcode"
width=
"400"
height=
"400"
mode=
"widthFix"
@
longtap=
"download"
:fade=
"true"
duration=
"450
"
>
<u-loading
slot=
"loading"
></u-loading>
<u-loading
slot=
"loading"
></u-loading>
<view
slot=
"error"
style=
"font-size: 24rpx;"
>
加载失败
</view>
<view
slot=
"error"
style=
"font-size: 24rpx;"
>
加载失败
</view>
</u-image>
</u-image>
...
...
src/pages/mine/wallet/index.vue
View file @
8982de7c
<
template
>
<
template
>
<view
class=
"wallet-view"
>
<view
class=
"wallet-view"
>
<u-navbar
<u-navbar
back-icon-color=
"#333333"
background=
"#F4F5F7"
title=
"我的钱包"
titleColor=
"#333333"
back-icon-color=
"#333333"
:border-bottom=
"false"
></u-navbar>
background=
"#F4F5F7"
<view
class=
"wallet-content-view"
>
title=
"我的钱包"
<image
class=
"header-image"
mode=
"widthFix"
:src=
"qianbaobeijing"
></image>
titleColor=
"#333333"
:border-bottom=
"false"
></u-navbar>
<image
class=
"header-image"
mode=
"widthFix"
:src=
"qianbaobeijing"
></image>
<view
class=
"survey-view"
>
<view
class=
"survey-view"
>
<view
class=
"survey-top-view"
>
<view
class=
"survey-top-view"
>
<view
class=
"survey-top-left"
>
<view
class=
"survey-top-left"
>
<view>
账户总资产(元)
</view>
<view>
账户总资产(元)
</view>
<view>
{{
info
.
totalPayAmount
}}
</view>
<view
class=
"survey-top-account"
>
{{
info
.
totalPayAmount
}}
</view>
</view>
</view>
<view
class=
"survey-top-right"
>
<view
class=
"survey-top-right"
>
<u-button>
提现
</u-button>
<u-button
type=
"primary"
shape=
"circle"
:custom-style=
"buttonStyle"
@
click=
"handleClickWithdraw"
>
提现
</u-button>
</view>
</view>
</view>
</view>
<view
class=
"survey-bottom-view"
>
<view
class=
"survey-bottom-view"
>
<view
v-for=
"(value, key) in items"
:key=
"key"
>
<view
v-for=
"(value, key) in items"
:key=
"key"
>
<view>
{{
value
}}
</view>
<view>
{{
value
}}
</view>
<view>
{{
info
[
key
]
}}
</view>
<view
class=
"survey-bottom-account"
>
{{
info
[
key
]
}}
</view>
</view>
</view>
</view>
</view>
</view>
</view>
<view
class=
"content-view"
>
<view
class=
"content-view"
>
<view
<view
v-for=
"(item, index) in lists"
:class=
"['content-list',
{'first': index==0}]" :key="index"
v-for=
"(item, index) in lists"
@click="handleClick(index)">
:class=
"['content-list',
{ first: index == 0 }]"
:key="index"
>
<view
class=
"content-list-left"
>
<view
class=
"content-list-left"
>
<image
class=
"content-list-image"
:src=
"item.icon"
></image>
<image
class=
"content-list-image"
:src=
"item.icon"
></image>
<view
class=
"content-list-text"
>
<view
class=
"content-list-text"
>
<view
class=
"content-list-text-title"
>
{{
<view
class=
"content-list-text-title"
>
{{
item
.
title
}}
</view>
item
.
title
<view>
{{
item
.
content
}}
</view>
}}
</view>
<view>
{{
item
.
content
}}
</view>
</view>
</view>
</view>
</view>
<view
class=
"content-list-right"
>
<view
class=
"content-list-right"
>
...
@@ -50,124 +38,231 @@
...
@@ -50,124 +38,231 @@
</view>
</view>
</view>
</view>
</view>
</view>
<view
class=
"list-view"
>
</view>
<view
class=
"line-view"
></view>
<view
class=
"list-view"
>
<view
v-for=
"(item, index) in statementList"
:key=
"index"
>
<Statement
:data=
"item"
@
click=
"handleClickCell"
></Statement>
</view>
</view>
</view>
</view>
</view>
</
template
>
</
template
>
<
script
>
<
script
>
export
default
{
import
Statement
from
"@/components/mine/statement.vue"
export
default
{
components
:
{
Statement
},
data
()
{
data
()
{
return
{
return
{
info
:
{
info
:
{
canApplyAmount
:
0
,
// 可提现金额
canApplyAmount
:
0
,
// 可提现金额
saveApplyCount
:
0
,
// 已申请提现的支付单数
saveApplyCount
:
0
,
// 已申请提现的支付单数
canApplyCount
:
0
,
// 可申请提现的支付单数
canApplyCount
:
0
,
// 可申请提现的支付单数
saveAndApplyAmount
:
0
,
// 已申请提现金额
totalPayAmount
:
0
,
// 总共收入
totalPayAmount
:
0
,
// 总共收入
/* 还没对字段名 */
saveAndApplyAmount
:
0
,
// 预计待入账
dairuzhang
:
0
,
// 预计待入账
},
},
};
statementList
:
[]
}
},
},
computed
:
{
computed
:
{
lists
()
{
lists
()
{
return
[
return
[{
{
title
:
'结算账单'
,
title
:
"结算账单"
,
content
:
'展示您已提现的账单信息'
,
content
:
"展示您已提现的账单信息"
,
icon
:
this
.
imageUrl
+
'jiesuan.png'
icon
:
this
.
imageUrl
+
"jiesuan.png"
,
},
{
},
title
:
'收入流水'
,
{
content
:
'当前展示最近5条,点击查看全部'
,
title
:
"收入流水"
,
icon
:
this
.
imageUrl
+
'liushui.png'
content
:
"当前展示最近5条,点击查看全部"
,
}]
icon
:
this
.
imageUrl
+
"liushui.png"
,
},
];
},
},
items
()
{
items
()
{
return
{
return
{
canApplyAmount
:
"可提现(元)"
,
canApplyAmount
:
'可提现(元)'
,
dairuzhang
:
"预计待入账(元)"
,
saveAndApplyAmount
:
'预计待入账(元)'
};
}
},
},
imageUrl
()
{
imageUrl
()
{
return
process
.
uniEnv
.
qn_base_url
;
return
process
.
uniEnv
.
qn_base_url
},
},
qianbaobeijing
()
{
qianbaobeijing
()
{
return
this
.
imageUrl
+
"qianbaobeijing.png"
;
return
this
.
imageUrl
+
'qianbaobeijing.png'
},
},
buttonStyle
()
{
return
{
width
:
"200rpx"
,
height
:
"80rpx"
,
"font-size"
:
"32rpx"
,
"font-weight"
:
"bold"
,
'background-color'
:
'#FFFFFF'
,
'color'
:
'#2272FF'
,
'margin-bottom'
:
'20rpx'
};
},
pages
()
{
return
[
'settlement'
,
'statement'
]
}
},
},
methods
:
{},
created
()
{
};
// var item = {
// paymentTime: new Date().getTime(),
// payableRecordStatusText: '预结',
// orderNumber: 'EE999777',
// orderServiceType: '安装',
// inGuaranteePeriod: false, // true 保内;false 保外
// payableAmount: 9899,
// orderId: 12313,
// }
// this.statementList = [item, item, item, item, item]
},
onLoad
()
{
if
(
!
this
.
vuex_token
)
{
this
.
$u
.
route
({
url
:
'pages/login/index'
})
}
this
.
loadAssets
()
this
.
loadStatement
()
},
methods
:
{
// 提现
handleClickWithdraw
()
{
uni
.
navigateTo
({
url
:
'pages/mine/wallet/'
+
'withdraw'
})
},
handleClick
(
index
)
{
uni
.
navigateTo
({
url
:
'pages/mine/wallet/'
+
this
.
pages
[
index
]
})
},
handleClickCell
(
orderId
)
{
uni
.
navigateTo
({
url
:
'pages/order/detail?id='
+
orderId
})
},
async
loadAssets
()
{
let
self
=
this
let
res
=
await
self
.
$u
.
api
.
getAssets
()
if
(
res
&&
res
.
code
==
200
)
{
self
.
info
=
res
.
data
||
self
.
info
}
},
async
loadStatement
()
{
let
self
=
this
let
res
=
await
self
.
$u
.
api
.
listStatement
()
if
(
res
&&
res
.
code
==
200
)
{
self
.
statementList
=
res
.
data
&&
res
.
data
.
orderList
||
[]
}
},
async
loadPayRecord
()
{
let
self
=
this
let
res
=
await
self
.
$u
.
api
.
payableRecord
()
// if(res && res.code == 200) {
// self.info = res.data || self.info
// }
},
}
}
</
script
>
</
script
>
<
style
lang=
"scss"
scoped
>
<
style
lang=
"scss"
scoped
>
.wallet-view
{
.wallet-view
{
position
:
relative
;
display
:
flex
;
flex-direction
:
column
;
height
:
100vh
;
height
:
100vh
;
.wallet-content-view
{
position
:
relative
;
overflow
:
auto
;
overflow
:
auto
;
background-color
:
#f4f5f7
;
background-color
:
#F4F5F7
;
.header-image
{
.header-image
{
position
:
absolute
;
position
:
absolute
;
width
:
100%
;
width
:
100%
;
margin-left
:
4rpx
;
margin-left
:
4rpx
;
margin-top
:
10rpx
;
margin-top
:
10rpx
;
}
}
.survey-view
{
.survey-view
{
position
:
relative
;
position
:
relative
;
height
:
400rpx
;
height
:
400rpx
;
margin
:
30rpx
30rpx
10rpx
30rpx
;
margin
:
30rpx
30rpx
10rpx
30rpx
;
color
:
#ffffff
;
color
:
#FFFFFF
;
padding
:
30rpx
;
padding
:
30rpx
;
.survey-top-view
{
.survey-top-view
{
display
:
flex
;
display
:
flex
;
justify-content
:
space-between
;
justify-content
:
space-between
;
align-items
:
flex-end
;
align-items
:
flex-end
;
margin-top
:
10rpx
;
.survey-top-left
{
.survey-top-left
{
font-size
:
28rpx
;
.survey-top-account
{
font-size
:
72rpx
;
font-weight
:
bold
;
margin-top
:
6rpx
;
}
}
.survey-top-right
{
}
}
.survey-top-right
{}
}
}
.survey-bottom-view
{
.survey-bottom-view
{
display
:
flex
;
display
:
flex
;
justify-content
:
space-between
;
justify-content
:
space-between
;
font-size
:
24rpx
;
margin-top
:
50rpx
;
.survey-bottom-account
{
margin-top
:
6rpx
;
font-size
:
40rpx
;
font-weight
:
bold
;
}
}
}
}
}
.content-view
{
.content-view
{
position
:
relative
;
position
:
relative
;
padding
:
0
30rpx
;
padding
:
0
30rpx
;
.content-list
{
.content-list
{
height
:
140rpx
;
height
:
140rpx
;
border-radius
:
12rpx
;
border-radius
:
12rpx
12rpx
0
0
;
display
:
flex
;
display
:
flex
;
justify-content
:
space-between
;
justify-content
:
space-between
;
padding
:
30rpx
;
padding
:
30rpx
;
background-color
:
#ffffff
;
background-color
:
#FFFFFF
;
&
.first
{
&
.first
{
margin-bottom
:
20rpx
;
margin-bottom
:
20rpx
;
border-radius
:
12rpx
;
}
}
.content-list-left
{
.content-list-left
{
display
:
flex
;
display
:
flex
;
.content-list-image
{
.content-list-image
{
width
:
56rpx
;
width
:
56rpx
;
height
:
56rpx
;
height
:
56rpx
;
margin-top
:
2rpx
;
margin-top
:
2rpx
;
}
}
.content-list-text
{
.content-list-text
{
font-size
:
24rpx
;
font-size
:
24rpx
;
color
:
#666666
;
color
:
#666666
;
margin-left
:
20rpx
;
margin-left
:
20rpx
;
.content-list-text-title
{
.content-list-text-title
{
font-size
:
32rpx
;
font-size
:
32rpx
;
color
:
#333333
;
color
:
#333333
;
}
}
}
}
}
}
.content-list-right
{
.content-list-right
{
color
:
#2272ff
;
color
:
#2272FF
;
font-size
:
26rpx
;
font-size
:
26rpx
;
.content-list-right-text
{
.content-list-right-text
{
margin-right
:
4rpx
;
margin-right
:
4rpx
;
}
}
...
@@ -175,8 +270,19 @@ export default {
...
@@ -175,8 +270,19 @@ export default {
}
}
}
}
.line-view
{
background-color
:
#F4F5F7
;
height
:
2rpx
;
margin
:
0
30rpx
;
}
.list-view
{
.list-view
{
position
:
relative
;
position
:
relative
;
background-color
:
#FFFFFF
;
margin
:
0rpx
30rpx
30rpx
30rpx
;
padding-bottom
:
30rpx
;
border-radius
:
0
0
12rpx
12rpx
;
}
}
}
}
}
</
style
>
</
style
>
src/pages/mine/wallet/settlement.vue
View file @
8982de7c
...
@@ -23,7 +23,7 @@
...
@@ -23,7 +23,7 @@
<image
:src=
"liushuibeijingImage"
class=
"head-back-image"
mode=
"widthFix"
></image>
<image
:src=
"liushuibeijingImage"
class=
"head-back-image"
mode=
"widthFix"
></image>
<view
class=
"list-view"
>
<view
class=
"list-view"
>
<view
v-for=
"(item, index) in info.payableRecordExtendDtos"
:key=
"index"
>
<view
v-for=
"(item, index) in info.payableRecordExtendDtos"
:key=
"index"
>
<Settlement
:data=
"item"
></Settlement>
<Settlement
:data=
"item"
@
click=
"handleClickCell"
></Settlement>
</view>
</view>
</view>
</view>
</view>
</view>
...
@@ -68,6 +68,11 @@
...
@@ -68,6 +68,11 @@
bindDateChange
:
function
(
e
)
{
bindDateChange
:
function
(
e
)
{
this
.
date
=
e
.
target
.
value
this
.
date
=
e
.
target
.
value
},
},
handleClickCell
(
orderId
)
{
uni
.
navigateTo
({
url
:
'pages/order/detail?id='
+
orderId
})
}
}
}
}
}
</
script
>
</
script
>
...
...
src/pages/mine/wallet/statement.vue
View file @
8982de7c
...
@@ -23,7 +23,7 @@
...
@@ -23,7 +23,7 @@
<image
:src=
"liushuibeijingImage"
class=
"head-back-image"
mode=
"widthFix"
></image>
<image
:src=
"liushuibeijingImage"
class=
"head-back-image"
mode=
"widthFix"
></image>
<view
class=
"list-view"
>
<view
class=
"list-view"
>
<view
v-for=
"(item, index) in data.statementList"
:key=
"index"
>
<view
v-for=
"(item, index) in data.statementList"
:key=
"index"
>
<Statement
:data=
"item"
></Statement>
<Statement
:data=
"item"
@
click=
"handleClickCell"
></Statement>
</view>
</view>
</view>
</view>
</view>
</view>
...
@@ -84,6 +84,11 @@
...
@@ -84,6 +84,11 @@
bindDateChange
:
function
(
e
)
{
bindDateChange
:
function
(
e
)
{
this
.
date
=
e
.
target
.
value
this
.
date
=
e
.
target
.
value
},
},
handleClickCell
(
orderId
)
{
uni
.
navigateTo
({
url
:
'pages/order/detail?id='
+
orderId
})
}
}
}
}
}
</
script
>
</
script
>
...
...
src/pages/mine/wallet/withdraw.vue
View file @
8982de7c
...
@@ -36,7 +36,8 @@
...
@@ -36,7 +36,8 @@
},
},
methods
:
{
methods
:
{
handleClick
()
{
handleClick
()
{
let
self
=
this
self
.
$u
.
api
.
workerApplyPay
()
}
}
}
}
}
}
...
...
src/pages/mine/warehouse/index.vue
0 → 100644
View file @
8982de7c
<
template
>
<view
class=
"ware-wrap"
>
<w-navbar
title=
"我的仓库"
:background=
"
{backgroundColor: '#F4F5F7'}">
</w-navbar>
<view
class=
"content"
>
<view
class=
"panel"
>
<view
class=
"title"
>
物料明细
</view>
<view
class=
"item-table"
>
<view
class=
"item-header"
>
<view>
物料名称
</view>
<view>
库存数量
</view>
</view>
<u-divider
half-width=
"315"
border-color=
"#F4F5F7"
height=
"2"
></u-divider>
<view
class=
"item-row"
v-for=
"(item, index) in details"
:key=
"index"
>
<view
class=
"width-504 break"
>
{{
item
.
skuName
}}
</view>
<view
class=
"width-106 center"
>
{{
item
.
systemStock
}}
</view>
</view>
</view>
</view>
<view
class=
"panel"
>
<view
class=
"title"
>
操作记录
</view>
<view
class=
"item-table"
>
<view
class=
"item-header"
>
<view
class=
"width-132"
>
订单编号
</view>
<view
class=
"width-210"
>
物料名称
</view>
<view
class=
"width-80"
>
出库量
</view>
<view
class=
"width-140 right"
>
操作时间
</view>
</view>
<u-divider
half-width=
"315"
border-color=
"#F4F5F7"
height=
"2"
></u-divider>
<view
class=
"item-row"
v-for=
"(item, index) in record"
:key=
"index"
>
<view
class=
"width-132 break"
>
{{
item
.
businessNumber
}}
</view>
<view
class=
"width-210 break"
>
{{
item
.
skuName
}}
</view>
<view
class=
"width-80 center"
>
{{
item
.
outAmount
}}
</view>
<view
class=
"width-140 break"
>
{{
item
.
createTime
|
datefmt
(
'YYYY.MM.DD HH:mm:ss'
)
}}
</view>
</view>
<u-loadmore
:status=
"status"
@
loadmore=
"loadRecord"
/>
</view>
</view>
</view>
</view>
</
template
>
<
script
>
export
default
{
data
()
{
return
{
status
:
'loadmore'
,
details
:
[],
record
:
[],
total
:
100
,
search
:
{
pageNumber
:
0
,
pageSize
:
20
,
},
};
},
onReachBottom
()
{
if
(
this
.
status
==
'nomore'
)
return
;
this
.
status
=
'loading'
;
this
.
search
.
pageNumber
=
++
this
.
search
.
pageNumber
;
this
.
loadAccess
()
},
computed
:
{},
onLoad
()
{
this
.
getData
();
},
methods
:
{
getData
()
{
let
self
=
this
self
.
initDetails
()
self
.
search
.
pageNumber
=
++
self
.
search
.
pageNumber
;
self
.
loadAccess
()
},
async
initDetails
()
{
let
self
=
this
let
res
=
await
self
.
$u
.
api
.
listBystock
()
if
(
res
&&
res
.
code
==
200
)
{
self
.
details
=
res
.
data
.
list
}
// 测试数据
self
.
details
=
[
{
skuName
:
'广汽新能源立柱-特来电'
,
systemStock
:
1
},
{
skuName
:
'广汽新能源-星星'
,
systemStock
:
14
}
]
},
loadRecord
()
{
if
(
this
.
status
==
'nomore'
)
return
;
this
.
status
=
'loading'
;
this
.
search
.
pageNumber
=
++
this
.
search
.
pageNumber
;
this
.
loadAccess
()
},
async
loadAccess
()
{
let
self
=
this
/*
/wxh-worker-rest/rest/{token}/myinfo/access/history
路径参数:
token=xxxx
Headers:
Content-Type: application/json
Query:
pageNumber=0
pageSize=10
*/
let
res
=
await
self
.
$u
.
api
.
listAccessHistory
(
self
.
search
)
if
(
res
&&
res
.
code
==
200
)
{
self
.
total
=
res
.
data
&&
res
.
data
.
total
||
self
.
total
let
list
=
res
.
data
&&
res
.
data
.
list
&&
self
.
$u
.
deepClone
(
res
.
data
.
list
)
||
[];
// 测试数据
list
=
[
{
businessNumber
:
'OR20210507332669'
,
skuName
:
'广汽新能源立柱红红火火恍恍惚惚'
,
outAmount
:
1
,
createTime
:
Date
.
now
()},
{
businessNumber
:
'OR20210507332775'
,
skuName
:
'广汽新能源星星点灯'
,
outAmount
:
1
,
createTime
:
Date
.
now
()},
{
businessNumber
:
'OR20210507332020'
,
skuName
:
'广汽新能源星星点灯'
,
outAmount
:
6
,
createTime
:
Date
.
now
()},
{
businessNumber
:
'OR20210507332333'
,
skuName
:
'广汽新能源立柱啦啦啦啦啦啦啦'
,
outAmount
:
1
,
createTime
:
Date
.
now
()},
{
businessNumber
:
'OR20210507334689'
,
skuName
:
'广汽新能源立柱'
,
outAmount
:
12
,
createTime
:
Date
.
now
()},
{
businessNumber
:
'OR20210507339991'
,
skuName
:
'广汽新能源立柱啦啦啦啦啦啦啦'
,
outAmount
:
12
,
createTime
:
Date
.
now
()},
{
businessNumber
:
'OR20210507332660'
,
skuName
:
'广汽新能源立柱'
,
outAmount
:
12
,
createTime
:
Date
.
now
()},
{
businessNumber
:
'OR20210507332669'
,
skuName
:
'广汽新能源立柱红红火火恍恍惚惚'
,
outAmount
:
1
,
createTime
:
Date
.
now
()},
{
businessNumber
:
'OR20210507332775'
,
skuName
:
'广汽新能源星星点灯'
,
outAmount
:
1
,
createTime
:
Date
.
now
()},
{
businessNumber
:
'OR20210507332333'
,
skuName
:
'广汽新能源立柱啦啦啦啦啦啦啦'
,
outAmount
:
1
,
createTime
:
Date
.
now
()},
]
if
(
list
&&
list
.
length
)
{
self
.
record
.
push
(...
list
)
if
(
self
.
total
>
self
.
record
.
length
)
{
self
.
status
=
"loadmore"
}
else
{
self
.
status
=
"nomore"
}
}
else
{
self
.
status
=
"nomore"
}
}
else
{
}
},
}
}
</
script
>
<
style
lang=
"scss"
scoped
>
.ware-wrap
{
background-color
:
#F4F5F7
;
.content
{
padding
:
34rpx
30rpx
;
display
:
flex
;
flex-direction
:
column
;
align-items
:
center
;
.panel
{
.title
{
margin-bottom
:
30rpx
;
font-size
:
32rpx
;
font-weight
:
bold
;
color
:
#333333
;
line-height
:
44rpx
;
}
.item-table
{
margin-bottom
:
46rpx
;
padding
:
34rpx
30rpx
;
width
:
690rpx
;
background
:
#FFFFFF
;
border-radius
:
12rpx
;
.item-header
{
margin-bottom
:
24rpx
;
font-size
:
26rpx
;
font-weight
:
bold
;
color
:
#333333
;
line-height
:
38rpx
;
display
:
flex
;
justify-content
:
space-between
;
}
.item-row
{
margin
:
24rpx
0
;
font-size
:
26rpx
;
font-weight
:
400
;
color
:
#333333
;
line-height
:
38rpx
;
display
:
flex
;
justify-content
:
space-between
;
}
}
}
}
}
.width-504
{
width
:
504rpx
;
}
.width-106
{
width
:
106rpx
;
}
.width-132
{
width
:
132rpx
;
}
.width-210
{
width
:
210rpx
;
}
.width-80
{
width
:
80rpx
;
}
.width-140
{
width
:
140rpx
;
}
.center
{
text-align
:
center
;
}
.right
{
text-align
:
right
;
}
.break
{
word-break
:break-all
;
}
</
style
>
src/pages/order/complete.vue
View file @
8982de7c
...
@@ -24,12 +24,12 @@
...
@@ -24,12 +24,12 @@
<view
class=
"class-bd"
>
<view
class=
"class-bd"
>
<u-form-item
v-for=
"(item,itemIndex) in groupItem.items"
:key=
"itemIndex"
label-position=
"top"
<u-form-item
v-for=
"(item,itemIndex) in groupItem.items"
:key=
"itemIndex"
label-position=
"top"
:prop=
"item.fieldsName"
:border-bottom=
"false"
v-show=
"item.fieldsId != 200 || show200"
>
:prop=
"item.fieldsName"
:border-bottom=
"false"
v-show=
"item.fieldsId != 200 || show200"
>
<view
:class=
"[
{'label-bold': groupItem.name === '基本信息'}, 'label']" v-if="typeToComponentType(item.fieldsType)!=='location'
">
<view
:class=
"[
{'label-bold': groupItem.name === '基本信息'}, 'label']" v-if="typeToComponentType(item.fieldsType)!=='location'
&&
typeToComponentType(item.fieldsType)!=='form'
&&
typeToComponentType(item.fieldsType)!=='label'">
<image
class=
"item-image"
:src=
"mixingImage"
v-if=
"item.required"
></image>
<image
class=
"item-image"
:src=
"mixingImage"
v-if=
"item.required"
></image>
{{
item
.
fieldsTitle
}}
{{
item
.
fieldsTitle
}}
</view>
</view>
<template
v-if=
"item.fieldsType"
>
<template
v-if=
"item.fieldsType"
>
<xh-input
v-if=
"typeToComponentType(item.fieldsType)==='input'"
:groupIndex=
"groupIndex"
<xh-input
v-if=
"typeToComponentType(item.fieldsType)==='input'"
:groupIndex=
"groupIndex"
:type=
"inputType(item.fieldsType)"
:itemIndex=
"itemIndex"
:item=
"item"
:value=
'form[item.fieldsName] || ""'
@
value-change=
"fieldValueChange"
>
:itemIndex=
"itemIndex"
:item=
"item"
:value=
'form[item.fieldsName] || ""'
@
value-change=
"fieldValueChange"
>
</xh-input>
</xh-input>
<xh-multi-input
v-else-if=
"typeToComponentType(item.fieldsType)==='multiinput'"
<xh-multi-input
v-else-if=
"typeToComponentType(item.fieldsType)==='multiinput'"
...
@@ -49,7 +49,7 @@
...
@@ -49,7 +49,7 @@
@
value-change=
"fieldValueChange"
>
@
value-change=
"fieldValueChange"
>
</xh-select>
</xh-select>
<xh-files
v-else-if=
"typeToComponentType(item.fieldsType)==='file'"
<xh-files
v-else-if=
"typeToComponentType(item.fieldsType)==='file'"
:groupIndex=
"groupIndex"
:itemIndex=
"itemIndex"
:item=
"item"
:value=
'form[item.fieldsName] || []'
:groupIndex=
"groupIndex"
:itemIndex=
"itemIndex"
:item=
"item"
:partnerCompanyId=
"partnerCompanyId"
:categoryId=
"categoryId"
:value=
'form[item.fieldsName] || []'
@
value-change=
"fieldValueChange"
>
@
value-change=
"fieldValueChange"
>
</xh-files>
</xh-files>
<xh-location
v-else-if=
"typeToComponentType(item.fieldsType)==='location'"
<xh-location
v-else-if=
"typeToComponentType(item.fieldsType)==='location'"
...
@@ -73,6 +73,13 @@
...
@@ -73,6 +73,13 @@
:groupIndex=
"groupIndex"
:itemIndex=
"itemIndex"
:item=
"item"
:value=
'form[item.fieldsName] || ""'
:groupIndex=
"groupIndex"
:itemIndex=
"itemIndex"
:item=
"item"
:value=
'form[item.fieldsName] || ""'
@
value-change=
"fieldValueChange"
>
@
value-change=
"fieldValueChange"
>
</xh-time>
</xh-time>
<xh-service-more
v-else-if=
"typeToComponentType(item.fieldsType)==='form'"
:groupIndex=
"groupIndex"
:itemIndex=
"itemIndex"
:item=
"item"
:order-id=
"orderId"
:value=
'form[item.fieldsName] || ""'
@
value-change=
"fieldValueChange"
>
</xh-service-more>
<xh-label
v-else-if=
"typeToComponentType(item.fieldsType)==='label'"
:groupIndex=
"groupIndex"
:itemIndex=
"itemIndex"
:item=
"item"
:value=
'form[item.fieldsName] || ""'
>
</xh-label>
</
template
>
</
template
>
</u-form-item>
</u-form-item>
</view>
</view>
...
@@ -114,6 +121,8 @@
...
@@ -114,6 +121,8 @@
import
XhPicker
from
'@/components/createCom/XhPicker.vue'
import
XhPicker
from
'@/components/createCom/XhPicker.vue'
import
XhTime
from
'@/components/createCom/XhTime.vue'
import
XhTime
from
'@/components/createCom/XhTime.vue'
import
XhServiceMeasure
from
'@/components/createCom/XhServiceMeasure.vue'
import
XhServiceMeasure
from
'@/components/createCom/XhServiceMeasure.vue'
import
XhServiceMore
from
"../../components/createCom/XhServiceMore"
;
import
XhLabel
from
"../../components/createCom/XhLabel"
;
// import XhRadio from '@/components/createCom/XhRadio.vue'
// import XhRadio from '@/components/createCom/XhRadio.vue'
export
default
{
export
default
{
data
()
{
data
()
{
...
@@ -122,6 +131,7 @@
...
@@ -122,6 +131,7 @@
categoryId
:
0
,
categoryId
:
0
,
orderServiceType
:
''
,
orderServiceType
:
''
,
inGuaranteePeriod
:
''
,
inGuaranteePeriod
:
''
,
partnerCompanyId
:
''
,
auditResultsId
:
''
,
auditResultsId
:
''
,
list
:
[],
list
:
[],
tabIndex
:
0
,
tabIndex
:
0
,
...
@@ -184,18 +194,20 @@
...
@@ -184,18 +194,20 @@
XhScan
,
XhScan
,
XhPicker
,
XhPicker
,
XhTime
,
XhTime
,
XhServiceMeasure
XhServiceMeasure
,
XhServiceMore
,
XhLabel
},
},
created
()
{
created
()
{
// console.log(allComponents,'allComponents')
// console.log(allComponents,'allComponents')
},
},
onLoad
(
option
)
{
onLoad
(
option
)
{
console
.
log
(
option
)
if
(
option
)
{
if
(
option
)
{
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
this
.
inGuaranteePeriod
=
option
.
inGuaranteePeriod
this
.
partnerCompanyId
=
option
.
partnerCompanyId
this
.
auditResultsId
=
option
.
auditResultsId
this
.
auditResultsId
=
option
.
auditResultsId
}
else
{
}
else
{
this
.
orderId
=
11880091
this
.
orderId
=
11880091
...
@@ -241,7 +253,7 @@
...
@@ -241,7 +253,7 @@
}
}
},
},
show200
()
{
show200
()
{
return
this
.
form
.
paymentMethodsType
!=
'03'
return
this
.
form
.
paymentMethodsType
&&
this
.
form
.
paymentMethodsType
!=
'03'
}
}
},
},
methods
:
{
methods
:
{
...
@@ -252,6 +264,12 @@
...
@@ -252,6 +264,12 @@
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
{
...
@@ -275,26 +293,29 @@
...
@@ -275,26 +293,29 @@
})
})
this
.
locationCompleteItem
(
self
.
waitHandlerPanelIndex
,
self
.
waitHandlerGroupIndex
,
self
.
waitHandlerEleIndex
)
this
.
locationCompleteItem
(
self
.
waitHandlerPanelIndex
,
self
.
waitHandlerGroupIndex
,
self
.
waitHandlerEleIndex
)
},
},
saveComplete
(){
// 保存完工信息
let
self
=
this
let
param
=
{}
self
.
list
.
forEach
((
panel
)
=>
{
handleSaveData
(){
let
param
=
{}
this
.
list
.
forEach
((
panel
)
=>
{
param
[
panel
.
panelFieldsName
]
=
[]
param
[
panel
.
panelFieldsName
]
=
[]
panel
.
items
.
forEach
((
group
)
=>
{
panel
.
items
.
forEach
((
group
)
=>
{
group
.
items
.
forEach
((
ele
)
=>
{
group
.
items
.
forEach
((
ele
)
=>
{
if
(
self
.
form
[
ele
.
fieldsName
]){
if
(
this
.
form
[
ele
.
fieldsName
]){
param
[
panel
.
panelFieldsName
].
push
({
param
[
panel
.
panelFieldsName
].
push
({
"fieldsName"
:
ele
.
fieldsName
,
"fieldsName"
:
ele
.
fieldsName
,
"fieldsType"
:
ele
.
fieldsType
,
"fieldsType"
:
ele
.
fieldsType
,
"fieldsValue"
:
self
.
form
[
ele
.
fieldsName
],
"fieldsValue"
:
this
.
form
[
ele
.
fieldsName
],
"required"
:
ele
.
required
,
"required"
:
ele
.
required
,
})
})
}
}
})
})
})
})
})
})
return
param
},
saveComplete
(){
// 保存完工信息
let
self
=
this
let
param
=
self
.
handleSaveData
()
self
.
$u
.
api
.
saveCompleteData
(
param
,
self
.
orderId
).
then
((
res
)
=>
{
self
.
$u
.
api
.
saveCompleteData
(
param
,
self
.
orderId
).
then
((
res
)
=>
{
if
(
res
.
code
==
200
)
{
if
(
res
.
code
==
200
)
{
this
.
$refs
.
uToast
.
show
({
this
.
$refs
.
uToast
.
show
({
...
@@ -303,7 +324,7 @@
...
@@ -303,7 +324,7 @@
})
})
}
else
{
}
else
{
this
.
$refs
.
uToast
.
show
({
this
.
$refs
.
uToast
.
show
({
title
:
res
.
data
,
title
:
res
.
message
,
type
:
'error'
,
type
:
'error'
,
})
})
}
}
...
@@ -368,7 +389,10 @@
...
@@ -368,7 +389,10 @@
let
pass
=
this
.
checkCompleteItem
()
let
pass
=
this
.
checkCompleteItem
()
if
(
!
pass
){
if
(
!
pass
){
self
.
completeCheckStatus
=
true
self
.
completeCheckStatus
=
true
}
else
{
}
else
{
// 先保存完工项
let
param
=
self
.
handleSaveData
()
self
.
$u
.
api
.
saveCompleteData
(
param
,
self
.
orderId
).
then
((
res
)
=>
{
if
(
res
.
code
==
200
)
{
//完工项信息保存成功再次完工工单
console
.
log
(
"完工"
);
console
.
log
(
"完工"
);
this
.
pass
=
pass
this
.
pass
=
pass
if
(
self
.
inGuaranteePeriod
===
'Y'
){
if
(
self
.
inGuaranteePeriod
===
'Y'
){
...
@@ -382,6 +406,13 @@
...
@@ -382,6 +406,13 @@
self
.
completeCheckStatus
=
true
self
.
completeCheckStatus
=
true
})
})
}
}
}
else
{
this
.
$refs
.
uToast
.
show
({
title
:
res
.
message
,
type
:
'error'
,
})
}
})
}
}
},
},
tabsChange
(
index
){
tabsChange
(
index
){
...
@@ -394,6 +425,30 @@
...
@@ -394,6 +425,30 @@
this
.
getMenuItemTop
()
this
.
getMenuItemTop
()
})
})
},
},
calMaterialCraftListAmount
(
arr
){
let
amount
=
0
if
(
arr
){
arr
.
forEach
(
item
=>
{
if
(
Number
(
item
.
useLength
)
&&
Number
(
item
.
freeLength
)
&&
Number
(
item
.
unitAmt
))
{
amount
+=
Math
.
max
(
Number
(
item
.
useLength
)
-
Number
(
item
.
freeLength
),
0
)
*
Number
(
item
.
unitAmt
)
}
if
(
Number
(
item
.
extraAmt
)){
amount
+=
Number
(
item
.
extraAmt
)
}
})
}
return
amount
},
setData
(
data
){
// 通过页面设置数据
Object
.
keys
(
data
).
forEach
(
key
=>
{
this
.
$set
(
this
.
form
,
key
,
data
[
key
])
})
// 更新预计超出金额
let
amount
=
this
.
calMaterialCraftListAmount
(
this
.
form
.
materialList
)
amount
+=
this
.
calMaterialCraftListAmount
(
this
.
form
.
craftList
)
this
.
$set
(
this
.
form
,
'overAmount'
,
amount
)
},
// 字段的值更新
// 字段的值更新
fieldValueChange
(
data
)
{
fieldValueChange
(
data
)
{
const
groupItem
=
this
.
list
[
this
.
tabIndex
].
items
[
data
.
groupIndex
]
const
groupItem
=
this
.
list
[
this
.
tabIndex
].
items
[
data
.
groupIndex
]
...
@@ -410,7 +465,8 @@
...
@@ -410,7 +465,8 @@
this
.
$set
(
this
.
form
,
innerItem
.
fieldsName
,
data
.
value
)
this
.
$set
(
this
.
form
,
innerItem
.
fieldsName
,
data
.
value
)
}
}
if
(
innerItem
.
fieldsId
==
199
)
{
// 选不需要收款的时候,收款金额修改为非必选
if
(
innerItem
.
fieldsId
==
199
)
{
// 选不需要收款的时候,收款金额修改为非必选
for
(
var
item
of
this
.
list
[
0
].
items
)
{
for
(
var
list
of
this
.
list
)
{
// 同时修改基本信息和完工信息
for
(
var
item
of
list
.
items
)
{
for
(
var
i
of
item
.
items
)
{
for
(
var
i
of
item
.
items
)
{
if
(
i
.
fieldsId
==
200
)
{
if
(
i
.
fieldsId
==
200
)
{
i
.
required
=
data
.
value
!=
'03'
i
.
required
=
data
.
value
!=
'03'
...
@@ -418,8 +474,7 @@
...
@@ -418,8 +474,7 @@
}
}
}
}
}
}
}
console
.
log
(
this
.
form
)
},
},
nextStep
()
{
nextStep
()
{
if
(
this
.
tabIndex
<
this
.
list
.
length
-
1
)
{
if
(
this
.
tabIndex
<
this
.
list
.
length
-
1
)
{
...
@@ -432,6 +487,30 @@
...
@@ -432,6 +487,30 @@
})
})
}
}
},
},
inputType
(
type
)
{
var
inputType
=
''
let
ty
=
type
.
toLocaleLowerCase
()
switch
(
ty
)
{
case
'text'
:
inputType
=
'textarea'
break
case
'password'
:
inputType
=
ty
break
case
'decimal'
:
case
'number'
:
case
'double'
:
case
'integer'
:
inputType
=
'digit'
break
case
'textarea'
:
default
:
inputType
=
'text'
break
}
return
inputType
},
typeToComponentType
(
type
)
{
typeToComponentType
(
type
)
{
// 将fieldType类型统一转换为公共组件判定类型
// 将fieldType类型统一转换为公共组件判定类型
let
formType
=
''
let
formType
=
''
...
@@ -481,6 +560,12 @@
...
@@ -481,6 +560,12 @@
case
'date'
:
case
'date'
:
formType
=
'time'
formType
=
'time'
break
break
case
'form'
:
formType
=
'form'
break
case
'label'
:
formType
=
'label'
break
}
}
return
formType
return
formType
},
},
...
...
src/pages/order/detail.vue
View file @
8982de7c
...
@@ -30,7 +30,7 @@
...
@@ -30,7 +30,7 @@
<text>
{{
order
.
contactPhone
}}
</text>
<text>
{{
order
.
contactPhone
}}
</text>
</view>
</view>
<view
class=
"between-cell address-cell"
>
<view
class=
"between-cell address-cell"
>
<view
class=
"left"
>
<view
class=
"left
-address
"
>
<u-icon
name=
"map"
size=
"28"
></u-icon>
<u-icon
name=
"map"
size=
"28"
></u-icon>
<text
class=
"address-txt"
>
{{
formatAddress
}}
</text>
<text
class=
"address-txt"
>
{{
formatAddress
}}
</text>
</view>
</view>
...
@@ -85,11 +85,12 @@
...
@@ -85,11 +85,12 @@
</view>
</view>
<view
class=
"line-view-right"
>
<view
class=
"line-view-right"
>
<view>
<view>
<text>
{{
record
.
operationType
}}
</text>
<text>
{{
record
.
operationType
Text
}}
</text>
<text
style=
"color: red;"
>
{{
record
.
overTime
?
'(超时)'
:
''
}}{{
record
.
exception
?
'(异常)'
:
''
}}
</text>
<text
style=
"color: red;"
>
{{
record
.
overTime
?
'(超时)'
:
''
}}{{
record
.
exception
?
'(异常)'
:
''
}}
</text>
<text
style=
"color: #2272FF;"
v-show=
"record.operationType==='报备'"
>
(跟进)
</text>
</view>
</view>
<view
v-show=
"record.operationType==='报备' || record.operationType==='改约'"
>
<view
v-show=
"record.operationType==='报备' || record.operationType==='
预约'|| record.operationType==='
改约'"
>
<text>
{{
record
.
operationType
===
'报备'
?
'下次联系时间:'
:
'改约时间:
'
}}
</text>
<text>
{{
record
.
operationType
===
'报备'
?
'下次联系时间:'
:
record
.
operationType
===
'改约'
?
'改约时间:'
:
'
'
}}
</text>
<text
style=
"color: #2272FF;"
>
{{
<text
style=
"color: #2272FF;"
>
{{
record
.
operationType
===
'报备'
&&
record
.
orderRecordRemark
&&
record
.
orderRecordRemark
.
length
>
1
?
record
.
operationType
===
'报备'
&&
record
.
orderRecordRemark
&&
record
.
orderRecordRemark
.
length
>
1
?
record
.
orderRecordRemark
.
substring
(
record
.
orderRecordRemark
.
indexOf
(
':'
)
+
1
,
record
.
orderRecordRemark
.
length
)
record
.
orderRecordRemark
.
substring
(
record
.
orderRecordRemark
.
indexOf
(
':'
)
+
1
,
record
.
orderRecordRemark
.
length
)
...
@@ -125,7 +126,7 @@
...
@@ -125,7 +126,7 @@
<view>
<view>
<u-toast
ref=
"uToast"
/>
<u-toast
ref=
"uToast"
/>
</view>
</view>
<view
v-if=
"showCenterBtn"
@
click=
"
handleBtn
"
class=
"button"
:class=
"['center-button-view', btnClass]"
>
<view
v-if=
"showCenterBtn"
@
click=
"
$u.throttle(handleBtn, 500)
"
class=
"button"
:class=
"['center-button-view', btnClass]"
>
<text>
{{
centerButtonText
}}
</text>
<text>
{{
centerButtonText
}}
</text>
<view
v-if=
"order.currentOverTime && showTimeOut"
class=
"time-view"
>
<view
v-if=
"order.currentOverTime && showTimeOut"
class=
"time-view"
>
<text
style=
"padding-right: 8rpx;"
>
{{
order
.
currentOverTime
>
new
Date
().
getTime
()?
'剩'
:
'超'
}}
</text>
<text
style=
"padding-right: 8rpx;"
>
{{
order
.
currentOverTime
>
new
Date
().
getTime
()?
'剩'
:
'超'
}}
</text>
...
@@ -150,7 +151,7 @@
...
@@ -150,7 +151,7 @@
</view>
</view>
<!-- 异常预约 ,现场拍照 这里是调用拍照的两个组件-->
<!-- 异常预约 ,现场拍照 这里是调用拍照的两个组件-->
<view
class=
"right"
>
<view
class=
"right"
>
<view
v-if=
"errorSignIn || scenePhoto"
@
click=
"$u.
debounc
e(handleClickRight, 500)"
:class=
"['button',
{'active': scenePhoto}]">
<view
v-if=
"errorSignIn || scenePhoto"
@
click=
"$u.
throttl
e(handleClickRight, 500)"
:class=
"['button',
{'active': scenePhoto}]">
<text>
{{
errorSignIn
?
'异常'
:
'拍照'
}}
</text>
<text>
{{
errorSignIn
?
'异常'
:
'拍照'
}}
</text>
</view>
</view>
...
@@ -232,7 +233,8 @@
...
@@ -232,7 +233,8 @@
contactAddressLongitud
:
0
,
contactAddressLongitud
:
0
,
contactAddressLatitud
:
0
,
contactAddressLatitud
:
0
,
num
:
0
,
num
:
0
,
showTimeOut
:
true
showTimeOut
:
true
,
clicking
:
false
,
}
}
},
},
onLoad
(
option
)
{
onLoad
(
option
)
{
...
@@ -291,48 +293,48 @@
...
@@ -291,48 +293,48 @@
methods
:
{
methods
:
{
openLocation
(
address
){
openLocation
(
address
){
if
(
this
.
isAllowDianhuaAndDaohang
){
if
(
this
.
isAllowDianhuaAndDaohang
){
uni
.
getLocation
({
// uni.getLocation({
type
:
'gcj02'
,
//返回可以用于uni.openLocation的经纬度
// type: 'gcj02', //返回可以用于uni.openLocation的经纬度
success
:
function
(
res
)
{
// success: function (res) {
const
latitude
=
res
.
latitude
;
debugger
const
longitude
=
res
.
longitude
;
const
latitude
=
this
.
contactAddressLatitud
//res.latitude;
const
longitude
=
this
.
contactAddressLongitud
//res.longitude;
uni
.
openLocation
({
uni
.
openLocation
({
latitude
:
latitude
,
latitude
:
Number
(
this
.
contactAddressLatitud
)
,
longitude
:
longitude
,
longitude
:
Number
(
this
.
contactAddressLongitud
)
,
success
:
function
()
{
success
:
function
()
{
console
.
log
(
'success'
);
console
.
log
(
'success'
);
}
}
});
},
complete
:
function
(
res
)
{
console
.
log
(
'-------complete-----'
,
res
)
if
(
res
.
errMsg
.
indexOf
(
'auth'
)
!=
-
1
)
{
uni
.
showModal
({
title
:
'提示'
,
content
:
'获取权限失败,请到设置页面开启权限'
,
confirmText
:
'好的'
,
success
(
res
)
{
if
(
res
.
confirm
)
{
uni
.
openSetting
({
success
(
res
)
{
console
.
log
(
res
.
authSetting
)
}
});
});
}
// }
// ,
// complete: function(res) {
// console.log('-------complete-----', res)
// if (res.errMsg.indexOf('auth') != -1) {
// uni.showModal({
// title: '提示',
// content: '获取权限失败,请到设置页面开启权限',
// confirmText: '好的',
// success(res) {
// if (res.confirm) {
// uni.openSetting({
// success(res) {
// console.log(res.authSetting)
// }
// });
// }
}
// }
})
// })
}
else
{
// } else if (res.errMsg) {
uni
.
setClipboardData
({
// // uni.setClipboardData({
data
:
address
,
// // data: address,
success
:
function
()
{
// // success: function () {
console
.
log
(
'success'
);
// // console.log('success');
}
// // }
});
// // });
}
// }
}
// }
});
}
}
},
},
phoneToCustomer
(
phone
){
// 联系客户
phoneToCustomer
(
phone
){
// 联系客户
...
@@ -424,6 +426,16 @@
...
@@ -424,6 +426,16 @@
};
};
self
.
$u
.
api
.
listOrderRecord
(
param
).
then
((
res
)
=>
{
self
.
$u
.
api
.
listOrderRecord
(
param
).
then
((
res
)
=>
{
if
(
res
.
code
==
200
)
{
if
(
res
.
code
==
200
)
{
res
.
data
.
forEach
(
item
=>
{
if
(
item
.
operationType
===
'预约'
){
item
.
operationTypeText
=
'上门时间'
}
else
if
(
item
.
operationType
===
'报备'
){
let
arr
=
item
.
orderRecordRemark
.
split
(
','
)
item
.
operationTypeText
=
arr
[
0
]
}
else
{
item
.
operationTypeText
=
item
.
operationType
+
'时间'
}
})
self
.
orderRecords
=
res
.
data
self
.
orderRecords
=
res
.
data
}
else
{
}
else
{
console
.
log
(
res
.
message
,
"获取订单详情失败!"
);
console
.
log
(
res
.
message
,
"获取订单详情失败!"
);
...
@@ -549,9 +561,12 @@
...
@@ -549,9 +561,12 @@
this
.
scenePhoto
=
true
this
.
scenePhoto
=
true
this
.
readMore
=
true
this
.
readMore
=
true
this
.
isAllowDianhuaAndDaohang
=
true
this
.
isAllowDianhuaAndDaohang
=
true
}
else
{}
}
else
{
this
.
isAllowDianhuaAndDaohang
=
true
}
},
},
handleBtn
()
{
handleBtn
()
{
console
.
log
(
'click button'
)
if
(
!
this
.
submitType
){
if
(
!
this
.
submitType
){
return
;
return
;
}
}
...
@@ -597,8 +612,13 @@
...
@@ -597,8 +612,13 @@
}
}
return
return
}
}
if
(
this
.
clicking
)
{
return
}
this
.
clicking
=
true
this
.
$u
.
api
[
this
.
submitType
](
data
,
this
.
order
.
orderId
).
then
(
res
=>
{
this
.
$u
.
api
[
this
.
submitType
](
data
,
this
.
order
.
orderId
).
then
(
res
=>
{
let
self
=
this
let
self
=
this
if
((
res
.
data
.
code
!==
undefined
&&
res
.
data
.
code
===
200
)
if
((
res
.
data
.
code
!==
undefined
&&
res
.
data
.
code
===
200
)
||
(
res
.
code
!==
undefined
&&
res
.
code
===
200
)
)
{
||
(
res
.
code
!==
undefined
&&
res
.
code
===
200
)
)
{
this
.
$refs
.
uToast
.
show
({
this
.
$refs
.
uToast
.
show
({
...
@@ -610,6 +630,7 @@
...
@@ -610,6 +630,7 @@
// id: this.order.orderId
// id: this.order.orderId
// }
// }
callback
:
function
(){
callback
:
function
(){
this
.
clicking
=
false
uni
.
redirectTo
({
uni
.
redirectTo
({
url
:
'pages/order/detail?id='
+
self
.
order
.
orderId
url
:
'pages/order/detail?id='
+
self
.
order
.
orderId
});
});
...
@@ -620,7 +641,10 @@
...
@@ -620,7 +641,10 @@
title
:
res
.
data
.
message
!==
undefined
?
res
.
data
.
message
:
res
.
message
,
title
:
res
.
data
.
message
!==
undefined
?
res
.
data
.
message
:
res
.
message
,
// 如果不传此type参数,默认为default,也可以手动写上 type: 'default'
// 如果不传此type参数,默认为default,也可以手动写上 type: 'default'
type
:
'warning'
,
type
:
'warning'
,
callback
:
res
.
data
.
message
===
'抱歉,手快的师傅已经抢到此单!'
?
this
.
isGan
():
''
callback
:
function
()
{
this
.
clicking
=
false
res
.
data
.
message
===
'抱歉,手快的师傅已经抢到此单!'
?
this
.
isGan
():
''
}
})
})
}
}
})
})
...
@@ -651,6 +675,7 @@
...
@@ -651,6 +675,7 @@
+
"&categoryId="
+
this
.
order
.
categoryId
+
"&categoryId="
+
this
.
order
.
categoryId
+
"&orderServiceType="
+
this
.
order
.
orderServiceType
+
"&orderServiceType="
+
this
.
order
.
orderServiceType
+
"&inGuaranteePeriod="
+
this
.
order
.
inGuaranteePeriod
+
"&inGuaranteePeriod="
+
this
.
order
.
inGuaranteePeriod
+
"&partnerCompanyId="
+
this
.
order
.
partnerCompanyId
})
})
},
},
rejectOrder
()
{
// 拒单
rejectOrder
()
{
// 拒单
...
@@ -718,6 +743,7 @@
...
@@ -718,6 +743,7 @@
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
){
...
@@ -844,7 +870,6 @@
...
@@ -844,7 +870,6 @@
}
}
.address-cell
{
.address-cell
{
height
:
24rpx
;
font-size
:
24rpx
;
font-size
:
24rpx
;
font-weight
:
400
;
font-weight
:
400
;
color
:
#333333
;
color
:
#333333
;
...
@@ -854,9 +879,13 @@
...
@@ -854,9 +879,13 @@
display
:
flex
;
display
:
flex
;
justify-content
:
space-between
;
justify-content
:
space-between
;
align-items
:
center
;
align-items
:
center
;
.left
{
.left-address
{
display
:
flex
;
align-items
:
flex-start
;
.address-txt
{
.address-txt
{
line-height
:
30rpx
;
margin-left
:
8rpx
;
margin-left
:
8rpx
;
margin-right
:
30rpx
;
}
}
}
}
}
}
...
@@ -946,19 +975,19 @@
...
@@ -946,19 +975,19 @@
z-index
:
1
;
z-index
:
1
;
}
}
.address-cell
{
//
.address-cell {
height
:
24rpx
;
//
height: 24rpx;
font-size
:
24rpx
;
//
font-size: 24rpx;
font-weight
:
400
;
//
font-weight: 400;
color
:
#333333
;
//
color: #333333;
line-height
:
24rpx
;
//
line-height: 24rpx;
.left
{
//
.left {
.address-txt
{
//
.address-txt {
margin-left
:
8rpx
;
//
margin-left: 8rpx;
}
//
}
}
//
}
}
//
}
}
}
.record-item
{
.record-item
{
...
...
src/pages/order/feedback.vue
View file @
8982de7c
...
@@ -173,18 +173,7 @@ export default {
...
@@ -173,18 +173,7 @@ export default {
let
params
=
{
categoryId
:
self
.
categoryId
};
let
params
=
{
categoryId
:
self
.
categoryId
};
let
res
=
await
self
.
$u
.
api
.
feedbackConfig
(
params
);
let
res
=
await
self
.
$u
.
api
.
feedbackConfig
(
params
);
if
(
res
&&
res
.
code
==
200
)
{
if
(
res
&&
res
.
code
==
200
)
{
self
.
feedback
=
res
.
data
||
{};
if
(
!
self
.
showGY
)
{
delete
res
.
code
[
'改约'
]
}
var
data
=
{}
for
(
var
item
in
res
.
data
)
{
if
(
item
!=
'改约'
||
self
.
showGY
)
{
data
[
item
]
=
res
.
data
[
item
]
}
}
self
.
feedback
=
data
;
self
.
buildConfig
();
self
.
buildConfig
();
}
}
uni
.
hideLoading
();
uni
.
hideLoading
();
...
@@ -211,6 +200,22 @@ export default {
...
@@ -211,6 +200,22 @@ export default {
});
});
});
});
configs
.
map
((
item
,
key
)
=>
{
if
(
item
.
name
==
'报备'
)
{
configs
.
splice
(
key
,
1
);
configs
.
unshift
(
item
);
// 更新时间标题
let
title
=
self
.
appoint
[
key
]
self
.
appoint
.
splice
(
key
,
1
);
self
.
appoint
.
unshift
(
title
);
}
else
if
(
item
.
name
==
'改约'
&&
!
self
.
showGY
)
{
configs
.
splice
(
key
,
1
);
// 更新时间标题
self
.
appoint
.
splice
(
key
,
1
);
}
})
// 数组改写需要刷新绑定数据
// 数组改写需要刷新绑定数据
self
.
options
=
configs
;
self
.
options
=
configs
;
this
.
initParams
()
this
.
initParams
()
...
...
src/pages/order/material.vue
View file @
8982de7c
...
@@ -31,13 +31,13 @@
...
@@ -31,13 +31,13 @@
<view
class=
"other-space"
>
<view
class=
"other-space"
>
<text
class=
"input-title"
>
说明:
</text>
<text
class=
"input-title"
>
说明:
</text>
<view
class=
"input-content"
>
<view
class=
"input-content"
>
<u-input
v-model=
"item.
title"
:clearable=
"false"
placeholder-style=
"color:#999999;font-size:26rpx"
/>
<u-input
v-model=
"item.
otherExplain"
:clearable=
"false"
placeholder-style=
"color:#999999;font-size:26rpx"
/>
</view>
</view>
</view>
</view>
<view
class=
"other-space"
>
<view
class=
"other-space"
>
<text
class=
"input-title"
>
金额:
</text>
<text
class=
"input-title"
>
金额:
</text>
<view
class=
"input-content"
>
<view
class=
"input-content"
>
<u-input
v-model=
"item.
value"
type=
"number"
:clearable=
"false"
placeholder-style=
"color:#999999;font-size:26rpx"
/>
<u-input
v-model=
"item.
extraAmt"
type=
"number"
:clearable=
"false"
placeholder-style=
"color:#999999;font-size:26rpx"
/>
</view>
</view>
</view>
</view>
</view>
</view>
...
@@ -64,6 +64,8 @@
...
@@ -64,6 +64,8 @@
export
default
{
export
default
{
data
()
{
data
()
{
return
{
return
{
orderId
:
''
,
fieldName
:
'materialList'
,
list
:
[],
// 材料列表
list
:
[],
// 材料列表
other
:
[],
// 其他列表
other
:
[],
// 其他列表
};
};
...
@@ -78,12 +80,22 @@
...
@@ -78,12 +80,22 @@
};
};
},
},
titles
()
{
titles
()
{
if
(
this
.
isMaterial
){
return
{
return
{
name
:
'材料名称'
,
matName
:
'材料名称'
,
unit
:
'单位'
,
matUnit
:
'单位'
,
freeAmount
:
'免费量'
,
freeLength
:
'免费量'
,
price
:
'单价/元'
,
unitAmt
:
'单价/元'
,
consumption
:
'预计用量'
useLength
:
'用量'
}
}
else
{
return
{
matName
:
'工艺名称'
,
matUnit
:
'单位'
,
freeLength
:
'免费量'
,
unitAmt
:
'单价/元'
,
useLength
:
'用量'
}
}
}
},
},
thStyle
()
{
thStyle
()
{
...
@@ -103,38 +115,76 @@
...
@@ -103,38 +115,76 @@
money
()
{
// 总额
money
()
{
// 总额
var
amount
=
0
var
amount
=
0
for
(
var
item
of
this
.
list
)
{
for
(
var
item
of
this
.
list
)
{
if
(
Number
(
item
.
consumption
)
&&
Number
(
item
.
freeAmount
)
&&
Number
(
item
.
price
))
{
if
(
Number
(
item
.
useLength
)
&&
Number
(
item
.
freeLength
)
&&
Number
(
item
.
unitAmt
))
{
amount
+=
Math
.
max
(
Number
(
item
.
consumption
)
-
Number
(
item
.
freeAmount
),
0
)
*
Number
(
item
.
price
)
amount
+=
Math
.
max
(
Number
(
item
.
useLength
)
-
Number
(
item
.
freeLength
),
0
)
*
Number
(
item
.
unitAmt
)
}
}
}
}
for
(
var
item
of
this
.
other
)
{
for
(
var
item
of
this
.
other
)
{
if
(
item
.
value
&&
Number
(
item
.
value
))
{
if
(
item
.
extraAmt
&&
Number
(
item
.
extraAmt
))
{
amount
+=
Number
(
item
.
value
)
amount
+=
Number
(
item
.
extraAmt
)
}
}
}
}
return
amount
return
amount
},
isMaterial
(){
return
this
.
fieldName
===
'materialList'
},
isCraft
(){
return
this
.
fieldName
===
'craftList'
},
priceType
(){
return
this
.
isMaterial
?
"01"
:
"02"
},
},
onLoad
(
option
)
{
this
.
orderId
=
option
.
orderId
this
.
fieldName
=
option
.
fieldName
const
eventChannel
=
this
.
getOpenerEventChannel
();
let
self
=
this
eventChannel
.
on
(
'showMaterialData'
,
function
(
data
)
{
if
(
!
data
||
data
.
length
===
0
){
self
.
getMaterialData
()
}
else
{
self
.
formatServiceMoreList
(
data
)
}
}
});
},
},
created
()
{
created
()
{
// 测试数据
},
console
.
log
(
'0000'
)
mounted
()
{
for
(
var
i
=
0
;
i
<
20
;
i
++
)
{
},
this
.
list
.
push
({
methods
:
{
name
:
'开关发大法师放大范德萨发大水'
,
getMaterialData
(){
unit
:
'个'
,
let
self
=
this
freeAmount
:
'1'
,
self
.
$u
.
api
.
getOrderMaterial
(
self
.
orderId
).
then
((
res
)
=>
{
price
:
'45.0'
,
if
(
res
.
code
!==
200
)
{
consumption
:
'4'
,
console
.
log
(
res
.
data
.
message
)
return
}
self
.
formatServiceMoreList
(
res
.
data
)
})
})
// let testData = [{"freeLength":30,"priceTypeName":"","priceType":"01","lastModifiedWhen":"2021-05-11 11:10:27","matNo":"MAT1594085500303","createdWhen":"2021-05-11 11:10:27","extraAmt":0,"matName":"φ32镀锌管","studErp":"","isDel":"N","orderNo":"D20210424296591GQF","createdByName":"李小平","matUnit":"米","useLength":0,"orderMaterialId":"32BDDH67P5BBJGBKQBVXYCoJAA","lastModifiedByName":"李小平","unitAmt":0,"otherExplain":"","matType":"01"},{"freeLength":1,"priceTypeName":"","priceType":"01","lastModifiedWhen":"2021-05-11 11:10:27","matNo":"MAT1594714122500","createdWhen":"2021-05-11 11:10:27","extraAmt":0,"matName":"无标准电表箱","studErp":"","isDel":"N","orderNo":"D20210424296591GQF","createdByName":"李小平","matUnit":"个","useLength":0,"orderMaterialId":"6GXHJEJIZ5FZ7oFESHB26EAYWY","lastModifiedByName":"李小平","unitAmt":0,"otherExplain":"","matType":"01"}]
// self.formatServiceMoreList(testData)
},
formatServiceMoreList
(
materialCraftsData
){
let
self
=
this
materialCraftsData
.
map
(
item
=>
{
if
(
item
.
priceType
===
self
.
priceType
)
{
item
.
matType
===
'04'
?
self
.
other
.
push
(
item
)
:
self
.
list
.
push
(
item
)
}
}
})
},
},
methods
:
{
/* 其他添加新的 */
/* 其他添加新的 */
handleAdd
()
{
handleAdd
()
{
this
.
other
.
push
({
this
.
other
.
push
({
title
:
''
,
//orderNo:this.formInfo.orderNo,
value
:
''
isDel
:
'N'
,
isWebAdd
:
true
,
matName
:
'其他'
,
extraAmt
:
0
,
priceType
:
this
.
priceType
,
matType
:
'04'
,
otherExplain
:
''
})
})
},
},
/* 其他删除某个 */
/* 其他删除某个 */
...
@@ -142,7 +192,12 @@
...
@@ -142,7 +192,12 @@
this
.
other
.
splice
(
index
,
1
)
this
.
other
.
splice
(
index
,
1
)
},
},
handleSure
()
{
handleSure
()
{
// 返回总额money
let
pages
=
getCurrentPages
();
let
prevPage
=
pages
[
pages
.
length
-
2
];
//上一个页面
let
data
=
{}
data
[
this
.
fieldName
]
=
this
.
list
.
concat
(
this
.
other
)
// 将list合并给上以页面
prevPage
.
$vm
.
setData
(
data
)
//直接调用上一个页面的setData()方法,把数据存到上一个页面中去
uni
.
navigateBack
();
}
}
}
}
}
}
...
...
src/pages/photo/list.vue
View file @
8982de7c
...
@@ -78,7 +78,7 @@
...
@@ -78,7 +78,7 @@
loading
:
true
,
loading
:
true
,
isPopShow
:
false
,
isPopShow
:
false
,
userWatermark
:{},
userWatermark
:{},
title
:
'
规范展示'
title
:
'
全部'
}
}
},
},
onLoad
(
e
)
{
onLoad
(
e
)
{
...
@@ -88,7 +88,7 @@
...
@@ -88,7 +88,7 @@
}
}
if
(
e
&&
e
.
brand
)
{
if
(
e
&&
e
.
brand
)
{
this
.
brand
=
decodeURIComponent
(
e
.
brand
)
this
.
brand
=
decodeURIComponent
(
e
.
brand
)
this
.
title
=
this
.
brand
// this.title = this.brand
}
}
if
(
e
&&
e
.
orderId
)
{
if
(
e
&&
e
.
orderId
)
{
...
@@ -303,6 +303,7 @@
...
@@ -303,6 +303,7 @@
if
(
res
.
code
==
200
)
{
if
(
res
.
code
==
200
)
{
console
.
log
(
"==="
,
res
.
data
)
console
.
log
(
"==="
,
res
.
data
)
this
.
userWatermark
=
res
.
data
this
.
userWatermark
=
res
.
data
getApp
().
globalData
.
photo
.
waterSetting
=
this
.
userWatermark
}
else
{
}
else
{
console
.
log
(
"获取水印备注异常"
,
res
.
data
.
message
)
console
.
log
(
"获取水印备注异常"
,
res
.
data
.
message
)
}
}
...
...
src/pages/photo/preview.vue
View file @
8982de7c
...
@@ -216,7 +216,7 @@
...
@@ -216,7 +216,7 @@
flex-direction
:
column
;
flex-direction
:
column
;
}
}
/
deep
/
.u-image
{
/
deep
/
.u-image
{
height
:
100
%
!
important
;
height
:
100
vh
!
important
;
}
}
/
deep
/
.u-image__loading
{
/
deep
/
.u-image__loading
{
background-color
:
transparent
!
important
;
background-color
:
transparent
!
important
;
...
...
src/pages/photo/setting.vue
View file @
8982de7c
...
@@ -8,20 +8,20 @@
...
@@ -8,20 +8,20 @@
<text
class=
"itemTitle"
>
保存原图
</text>
<text
class=
"itemTitle"
>
保存原图
</text>
<text
class=
"itemNotice"
>
拍照后另保存一张无水印的图片
</text>
<text
class=
"itemNotice"
>
拍照后另保存一张无水印的图片
</text>
</view>
</view>
<switch
class=
"itemSwitch"
:checked=
"result['has
_o
rigin']"
@
change=
"handleOrigineChange"
color=
"#007AFF"
/>
<switch
class=
"itemSwitch"
:checked=
"result['has
O
rigin']"
@
change=
"handleOrigineChange"
color=
"#007AFF"
/>
</view>
</view>
<view
class=
"itemView"
v-if=
"showTitleSwitch"
>
<view
class=
"itemView"
v-if=
"showTitleSwitch"
>
<view
class=
"itemTitleView"
@
click=
"itemClick(
{},-1)">
<view
class=
"itemTitleView"
@
click=
"itemClick(
{},-1)">
<text
class=
"itemTitle"
>
水印标题
</text>
<text
class=
"itemTitle"
>
水印标题
</text>
<text
class=
"itemNotice"
>
{{
result
[
'lower
_right'
][
'title_text
'
]
||
'点击可编辑更改'
}}
</text>
<text
class=
"itemNotice"
>
{{
result
[
'lower
Left'
][
'title
'
]
||
'点击可编辑更改'
}}
</text>
</view>
</view>
<switch
class=
"itemSwitch"
disabled
:checked=
"result['lower
_right']['title_text
'] != ''"
<switch
class=
"itemSwitch"
disabled
:checked=
"result['lower
Left']['title
'] != ''"
@
click=
"handleClickTitleSwitch"
color=
"#007AFF"
/>
@
click=
"handleClickTitleSwitch"
color=
"#007AFF"
/>
</view>
</view>
<view
class=
"itemView"
v-for=
"(item,ikey) in itemList"
:key=
"ikey"
>
<view
class=
"itemView"
v-for=
"(item,ikey) in itemList"
:key=
"ikey"
>
<view
class=
"itemTitleView"
@
click=
"itemClick(item,ikey)"
>
<view
class=
"itemTitleView"
@
click=
"itemClick(item,ikey)"
>
<text
class=
"itemTitle"
>
{{
item
[
'watemark
_t
ext'
]
||
'自定义'
+
(
ikey
+
1
)
}}
</text>
<text
class=
"itemTitle"
>
{{
item
[
'watemark
T
ext'
]
||
'自定义'
+
(
ikey
+
1
)
}}
</text>
<text
class=
"itemNotice"
>
{{
item
[
'watemark
_v
alue'
]
||
'点击可编辑更改'
}}
</text>
<text
class=
"itemNotice"
>
{{
item
[
'watemark
V
alue'
]
||
'点击可编辑更改'
}}
</text>
</view>
</view>
<switch
class=
"itemSwitch"
:checked=
"item['enable']"
@
change=
"itemChange(item, ikey)"
color=
"#007AFF"
/>
<switch
class=
"itemSwitch"
:checked=
"item['enable']"
@
change=
"itemChange(item, ikey)"
color=
"#007AFF"
/>
</view>
</view>
...
@@ -32,7 +32,7 @@
...
@@ -32,7 +32,7 @@
<view
class=
"inputBackView"
>
<view
class=
"inputBackView"
>
<view
class=
"ph-pop-left-view"
>
<view
class=
"ph-pop-left-view"
>
<view
class=
"leftInputView"
>
<view
class=
"leftInputView"
>
<input
class=
"leftInput"
type=
"text"
v-model=
"currenItem['watemark
_t
ext']"
<input
class=
"leftInput"
type=
"text"
v-model=
"currenItem['watemark
T
ext']"
@
input=
"leftInput()"
:disabled=
"currenItem.type === 'title_text'"
placeholder=
"请输入"
@
input=
"leftInput()"
:disabled=
"currenItem.type === 'title_text'"
placeholder=
"请输入"
maxlength=
"10"
/>
maxlength=
"10"
/>
</view>
</view>
...
@@ -41,7 +41,7 @@
...
@@ -41,7 +41,7 @@
<view
class=
"ph-pop-mid-view"
>
:
</view>
<view
class=
"ph-pop-mid-view"
>
:
</view>
<view>
<view>
<view
class=
"rightInputView"
>
<view
class=
"rightInputView"
>
<input
class=
"rightInput"
type=
"text"
v-model=
"currenItem['watemark
_v
alue']"
<input
class=
"rightInput"
type=
"text"
v-model=
"currenItem['watemark
V
alue']"
@
input=
"rightInput()"
placeholder=
"请输入内容"
maxlength=
"30"
/>
@
input=
"rightInput()"
placeholder=
"请输入内容"
maxlength=
"30"
/>
</view>
</view>
<view
class=
"ph-pop-tip-view"
v-if=
"showTipRight"
>
*必填项
</view>
<view
class=
"ph-pop-tip-view"
v-if=
"showTipRight"
>
*必填项
</view>
...
@@ -71,14 +71,14 @@
...
@@ -71,14 +71,14 @@
isPopShow
:
false
,
isPopShow
:
false
,
icon_close_new
:
''
,
icon_close_new
:
''
,
result
:
{
result
:
{
has
_o
rigin
:
true
,
has
O
rigin
:
true
,
lower
_righ
t
:
{
lower
Lef
t
:
{
body
:
[]
body
:
[]
}
}
},
},
currenItem
:
{
currenItem
:
{
'watemark
_t
ext'
:
''
,
'watemark
T
ext'
:
''
,
'watemark
_v
alue'
:
''
'watemark
V
alue'
:
''
},
},
editingItem
:
{},
editingItem
:
{},
showTipLeft
:
false
,
showTipLeft
:
false
,
...
@@ -88,8 +88,8 @@
...
@@ -88,8 +88,8 @@
},
},
computed
:
{
computed
:
{
itemList
()
{
itemList
()
{
if
(
this
.
result
[
'lower
_righ
t'
])
{
if
(
this
.
result
[
'lower
Lef
t'
])
{
var
arr
=
this
.
result
[
'lower
_righ
t'
][
'body'
]
var
arr
=
this
.
result
[
'lower
Lef
t'
][
'body'
]
return
arr
.
filter
((
item
)
=>
{
return
arr
.
filter
((
item
)
=>
{
return
item
.
watemark_type
===
'备注'
return
item
.
watemark_type
===
'备注'
})
})
...
@@ -99,7 +99,7 @@
...
@@ -99,7 +99,7 @@
},
},
showTitleSwitch
()
{
showTitleSwitch
()
{
return
this
.
result
[
'lower
_right'
].
hasOwnProperty
(
'title_text
'
)
return
this
.
result
[
'lower
Left'
].
hasOwnProperty
(
'title
'
)
},
},
customStyleCancel
()
{
customStyleCancel
()
{
return
{
return
{
...
@@ -164,12 +164,12 @@
...
@@ -164,12 +164,12 @@
//保存原图 开关
//保存原图 开关
handleOrigineChange
:
function
(
e
)
{
handleOrigineChange
:
function
(
e
)
{
this
.
result
[
'has
_origin'
]
=
!
this
.
result
[
'has_o
rigin'
]
this
.
result
[
'has
Origin'
]
=
!
this
.
result
[
'hasO
rigin'
]
this
.
saveUserWatermark
()
this
.
saveUserWatermark
()
},
},
handleClickTitleSwitch
:
function
(
e
)
{
handleClickTitleSwitch
:
function
(
e
)
{
var
string
=
this
.
result
[
'lower
_right'
][
'title_text
'
]
?
'水印标题不可关闭'
:
'请先编辑该自定义项'
var
string
=
this
.
result
[
'lower
Left'
][
'title
'
]
?
'水印标题不可关闭'
:
'请先编辑该自定义项'
uni
.
showToast
({
uni
.
showToast
({
icon
:
'none'
,
icon
:
'none'
,
title
:
string
title
:
string
...
@@ -178,7 +178,7 @@
...
@@ -178,7 +178,7 @@
//自定义 开关
//自定义 开关
itemChange
:
function
(
item
,
ikey
)
{
itemChange
:
function
(
item
,
ikey
)
{
if
(
item
[
'watemark
_v
alue'
])
{
if
(
item
[
'watemark
V
alue'
])
{
// 修改
// 修改
item
[
'enable'
]
=
!
item
[
'enable'
]
item
[
'enable'
]
=
!
item
[
'enable'
]
this
.
saveUserWatermark
()
this
.
saveUserWatermark
()
...
@@ -194,8 +194,8 @@
...
@@ -194,8 +194,8 @@
itemClick
:
function
(
item
,
ikey
)
{
itemClick
:
function
(
item
,
ikey
)
{
if
(
ikey
===
-
1
)
{
if
(
ikey
===
-
1
)
{
this
.
currenItem
=
{
this
.
currenItem
=
{
'watemark
_t
ext'
:
'水印标题'
,
'watemark
T
ext'
:
'水印标题'
,
'watemark
_value'
:
this
.
result
[
'lower_right'
][
'title_text
'
],
'watemark
Value'
:
this
.
result
[
'lowerLeft'
][
'title
'
],
'type'
:
'title_text'
'type'
:
'title_text'
}
}
}
else
{
}
else
{
...
@@ -210,7 +210,7 @@
...
@@ -210,7 +210,7 @@
//左侧输入框
//左侧输入框
leftInput
:
function
(
e
)
{
leftInput
:
function
(
e
)
{
if
(
this
.
currenItem
[
'watemark
_t
ext'
])
{
if
(
this
.
currenItem
[
'watemark
T
ext'
])
{
this
.
showTipLeft
=
false
this
.
showTipLeft
=
false
}
}
...
@@ -218,7 +218,7 @@
...
@@ -218,7 +218,7 @@
//右侧输入框
//右侧输入框
rightInput
:
function
(
e
)
{
rightInput
:
function
(
e
)
{
if
(
this
.
currenItem
[
'watemark
_v
alue'
])
{
if
(
this
.
currenItem
[
'watemark
V
alue'
])
{
this
.
showTipRight
=
false
this
.
showTipRight
=
false
}
}
},
},
...
@@ -227,8 +227,8 @@
...
@@ -227,8 +227,8 @@
popCancelClick
:
function
()
{
popCancelClick
:
function
()
{
this
.
isPopShow
=
false
this
.
isPopShow
=
false
this
.
currenItem
=
{
this
.
currenItem
=
{
'watemark
_t
ext'
:
''
,
'watemark
T
ext'
:
''
,
'watemark
_v
alue'
:
''
'watemark
V
alue'
:
''
}
}
},
},
...
@@ -239,22 +239,22 @@
...
@@ -239,22 +239,22 @@
//自定义弹窗 保存
//自定义弹窗 保存
popSaveClick
:
function
()
{
popSaveClick
:
function
()
{
if
(
this
.
currenItem
[
'watemark
_text'
]
&&
this
.
currenItem
[
'watemark_v
alue'
])
{
if
(
this
.
currenItem
[
'watemark
Text'
]
&&
this
.
currenItem
[
'watemarkV
alue'
])
{
this
.
isPopShow
=
false
this
.
isPopShow
=
false
if
(
this
.
currenItem
.
type
===
'title_text'
)
{
if
(
this
.
currenItem
.
type
===
'title_text'
)
{
this
.
result
[
'lower
_right'
][
'title_text'
]
=
this
.
currenItem
[
'watemark_v
alue'
]
this
.
result
[
'lower
Left'
][
'title'
]
=
this
.
currenItem
[
'watemarkV
alue'
]
}
else
{
}
else
{
this
.
editingItem
[
'watemark
_text'
]
=
this
.
currenItem
[
'watemark_t
ext'
]
this
.
editingItem
[
'watemark
Text'
]
=
this
.
currenItem
[
'watemarkT
ext'
]
this
.
editingItem
[
'watemark
_value'
]
=
this
.
currenItem
[
'watemark_v
alue'
]
this
.
editingItem
[
'watemark
Value'
]
=
this
.
currenItem
[
'watemarkV
alue'
]
this
.
editingItem
[
'enable'
]
=
true
this
.
editingItem
[
'enable'
]
=
true
}
}
this
.
saveUserWatermark
()
this
.
saveUserWatermark
()
}
else
{
}
else
{
// 提示
// 提示
if
(
!
this
.
currenItem
[
'watemark
_t
ext'
])
{
if
(
!
this
.
currenItem
[
'watemark
T
ext'
])
{
this
.
showTipLeft
=
true
this
.
showTipLeft
=
true
}
}
if
(
!
this
.
currenItem
[
'watemark
_v
alue'
])
{
if
(
!
this
.
currenItem
[
'watemark
V
alue'
])
{
this
.
showTipRight
=
true
this
.
showTipRight
=
true
}
}
}
}
...
...
src/pages/settle/file.vue
View file @
8982de7c
...
@@ -258,7 +258,7 @@ export default {
...
@@ -258,7 +258,7 @@ export default {
// 初始化入驻信息
// 初始化入驻信息
async
initSettledInfo
()
{
async
initSettledInfo
()
{
let
self
=
this
let
self
=
this
let
settledInfo
=
app
.
globalData
.
settledInfo
let
settledInfo
=
self
.
vuex_settled
if
(
settledInfo
&&
settledInfo
.
length
)
{
if
(
settledInfo
&&
settledInfo
.
length
)
{
self
.
fileInfo
.
id
=
settledInfo
.
id
self
.
fileInfo
.
id
=
settledInfo
.
id
}
else
{
}
else
{
...
@@ -267,7 +267,7 @@ export default {
...
@@ -267,7 +267,7 @@ export default {
vm
.
settledInfo
=
result
.
record
vm
.
settledInfo
=
result
.
record
vm
.
fileInfo
.
id
=
result
.
record
.
id
vm
.
fileInfo
.
id
=
result
.
record
.
id
}
}
settledInfo
=
await
app
.
getBaseInfo
(
this
,
callBack
)
settledInfo
=
await
app
.
getBaseInfo
(
self
,
callBack
)
uni
.
hideLoading
()
uni
.
hideLoading
()
}
}
},
},
...
...
src/pages/settle/pay-ensure.vue
View file @
8982de7c
...
@@ -83,16 +83,17 @@
...
@@ -83,16 +83,17 @@
})
})
},
},
async
getBaseInfo
()
{
async
getBaseInfo
()
{
let
self
=
this
const
app
=
getApp
()
const
app
=
getApp
()
const
callBack
=
(
vm
,
result
)
=>
{
const
callBack
=
(
vm
,
result
)
=>
{
vm
.
settledInfo
=
result
vm
.
settledInfo
=
result
}
}
let
settledInfo
=
app
.
globalData
.
settledInfo
let
settledInfo
=
self
.
vuex_settled
if
(
settledInfo
)
{
if
(
settledInfo
)
{
callBack
(
this
,
settledInfo
)
callBack
(
self
,
settledInfo
)
return
return
}
}
await
app
.
getBaseInfo
(
this
,
callBack
)
await
app
.
getBaseInfo
(
self
,
callBack
)
},
},
async
pending
()
{
async
pending
()
{
...
...
src/pages/settle/sign-contract.vue
View file @
8982de7c
...
@@ -291,6 +291,7 @@
...
@@ -291,6 +291,7 @@
this
.
baseInfo
.
bank_site
=
''
this
.
baseInfo
.
bank_site
=
''
},
},
async
getBaseInfo
()
{
async
getBaseInfo
()
{
let
self
=
this
const
app
=
getApp
()
const
app
=
getApp
()
const
callBack
=
(
vm
,
result
)
=>
{
const
callBack
=
(
vm
,
result
)
=>
{
vm
.
settledInfo
=
result
vm
.
settledInfo
=
result
...
@@ -298,12 +299,12 @@
...
@@ -298,12 +299,12 @@
vm
.
baseInfo
.
name
=
record
.
id_card_name
vm
.
baseInfo
.
name
=
record
.
id_card_name
vm
.
baseInfo
.
id
=
record
.
id
vm
.
baseInfo
.
id
=
record
.
id
}
}
let
settledInfo
=
app
.
globalData
.
settledInfo
let
settledInfo
=
self
.
vuex_settled
if
(
settledInfo
)
{
if
(
settledInfo
)
{
callBack
(
this
,
settledInfo
)
callBack
(
self
,
settledInfo
)
return
return
}
}
await
app
.
getBaseInfo
(
this
,
callBack
)
await
app
.
getBaseInfo
(
self
,
callBack
)
},
},
async
submitInfo
()
{
async
submitInfo
()
{
// checkSettleSignInfo
// checkSettleSignInfo
...
...
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