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
74762c68
Commit
74762c68
authored
May 17, 2021
by
Morson
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
https://git.banshouhui.com/lijundan/self-support
parents
02ff311a
b76391a4
Changes
21
Hide whitespace changes
Inline
Side-by-side
Showing
21 changed files
with
568 additions
and
786 deletions
+568
-786
.env.js
.env.js
+1
-1
App.vue
src/App.vue
+14
-14
cloud_rules.js
src/common/api/cloud_rules.js
+0
-58
index.js
src/common/api/index.js
+0
-5
http.api.js
src/common/http.api.js
+1
-7
preview.vue
src/components/photo/preview.vue
+34
-30
learn.vue
src/pages/index/learn.vue
+8
-16
order.vue
src/pages/index/order.vue
+1
-8
answer.vue
src/pages/learn/answer.vue
+1
-29
assessment.vue
src/pages/learn/assessment.vue
+0
-2
exam-pass.vue
src/pages/learn/exam-pass.vue
+0
-3
result.vue
src/pages/learn/result.vue
+0
-4
section.vue
src/pages/learn/section.vue
+0
-7
index.vue
src/pages/mine/deposit/index.vue
+5
-9
index.vue
src/pages/mine/wallet/index.vue
+7
-7
withdraw.vue
src/pages/mine/wallet/withdraw.vue
+43
-11
index.vue
src/pages/photo/index.vue
+221
-231
list.vue
src/pages/photo/list.vue
+0
-32
preview.vue
src/pages/photo/preview.vue
+214
-261
setting.vue
src/pages/photo/setting.vue
+0
-38
file.vue
src/pages/settle/file.vue
+18
-13
No files found.
.env.js
View file @
74762c68
;
(
function
()
{
let
NODE_ENV
=
'test'
;
// dev:开发环境 | test:测试环境
let
NODE_ENV
=
'test'
;
// dev:开发环境 | test:测试环境
| prod:生产环境
let
ENV_VAR
=
null
;
if
(
process
.
env
.
NODE_ENV
===
"development"
)
{
if
(
NODE_ENV
===
'dev'
)
{
...
...
src/App.vue
View file @
74762c68
...
...
@@ -76,10 +76,14 @@ export default {
// 系统自动登录::每次运行小程序重新获取用户信息
await
this
.
autoLogin
();
this
.
deleteTempImg
()
},
onShow
:
async
function
()
{
// 应用启动,或从后台进入前台显示
this
.
handleImageTask
()
if
(
this
.
uploadTask
.
length
>
0
)
{
upload
.
uploadImageTask
(
this
)
}
},
onHide
:
function
()
{
// 应用从前台进入后台
...
...
@@ -90,20 +94,16 @@ export default {
}
},
methods
:
{
// 处理上传图片队列数据
handleImageTask
()
{
if
(
this
.
uploadTask
.
length
>
0
)
{
upload
.
uploadImageTask
(
this
)
}
else
{
// 定时清理缓存在本地的文件
const
result
=
uni
.
getStorageSync
(
'delImg'
)
if
(
result
.
length
>
0
)
{
for
(
let
i
of
result
)
{
uni
.
removeSavedFile
({
filePath
:
i
})
}
uni
.
setStorageSync
(
'delImg'
,
[])
// 处理已上传完成的图片
deleteTempImg
()
{
const
result
=
uni
.
getStorageSync
(
'delImg'
)
if
(
result
.
length
>
0
)
{
for
(
let
i
of
result
)
{
uni
.
removeSavedFile
({
filePath
:
i
})
}
uni
.
setStorageSync
(
'delImg'
,
[])
}
},
getSystemInfo
()
{
...
...
src/common/api/cloud_rules.js
deleted
100644 → 0
View file @
02ff311a
const
db
=
uniCloud
.
database
({
spaceId
:
'tcb-nikbzhlwnpd5n913e1c5e-50f4bbo'
})
let
cloudRulesApiFun
=
function
(
vm
){
/* 查询所有产品 废弃*/
let
getAllProduct
=
async
()
=>
await
db
.
collection
(
"product"
).
get
();
/* 查询产品下的品牌 {product_code:"P0001"} 废弃*/
let
getBrand
=
async
(
params
=
{})
=>
await
db
.
collection
(
"brand"
).
where
(
params
).
get
();
/* 查询规范项目 {product_code:"P0001"} 废弃*/
let
getstandard
=
async
(
params
=
{})
=>
await
db
.
collection
(
"standard"
).
where
(
params
).
get
();
/* 查询分组规范项目 废弃*/
let
getGroupStandard
=
async
(
params
=
{})
=>
await
uniCloud
.
callFunction
({
name
:
'getGroupStandard'
,
data
:
params
});
/* 查询类别数据 */
let
getClassifyDictionary
=
async
()
=>
await
db
.
collection
(
"dictionary"
).
where
({
"type"
:
"classify"
}).
get
()
/* 查询有数据的系统 或者 品牌 数据 {"classify_id":"","system_id":"","field":"system_id|brand_id"}*/
let
getRelationDictionary
=
async
(
params
=
{})
=>
await
uniCloud
.
callFunction
({
name
:
'getRelationDictionary'
,
data
:
params
});
let
getRelationDictionaryV2
=
async
()
=>
await
uniCloud
.
callFunction
({
name
:
'getRelationDictionaryV2'
});
/* 查询规范 根据 分类、系统、品牌 {"token":"", "classify_id":"","system_id":"","brand_id":""} */
let
getGroupStandardV2
=
async
(
params
=
{})
=>
await
uniCloud
.
callFunction
({
name
:
'getGroupStandardV2'
,
data
:
params
});
/* 保存图片 {"token":"", "standardId":"", "url":""} */
let
saveImage
=
async
(
params
=
{})
=>
await
uniCloud
.
callFunction
({
name
:
'saveImage'
,
data
:
params
});
/* 获取用户水印,首次返回默认水印 {"token":"", "systemId":""} */
let
getUserWatermark
=
async
(
params
=
{})
=>
await
uniCloud
.
callFunction
({
name
:
'getUserWatermark'
,
data
:
params
});
/* 保存用户水印配置 {"token":"", "watermark": getUserWatemark返回的数据} */
let
saveUserWatermark
=
async
(
params
=
{})
=>
await
uniCloud
.
callFunction
({
name
:
'saveUserWatermark'
,
data
:
params
});
const
rulesApi
=
{
getAllProduct
,
getBrand
,
getstandard
,
getGroupStandard
,
// 新接口
getClassifyDictionary
,
getRelationDictionary
,
getRelationDictionaryV2
,
getGroupStandardV2
,
saveImage
,
getUserWatermark
,
saveUserWatermark
}
return
rulesApi
}
module
.
exports
=
{
cloudRulesApiFun
}
\ No newline at end of file
src/common/api/index.js
View file @
74762c68
import
{
cloudRulesApiFun
}
from
"@/common/api/cloud_rules.js"
import
{
commonApiFun
}
from
'@/common/api/common.js'
;
...
...
@@ -14,7 +11,6 @@ import {certApiFun} from"@/common/api/cert.js"
let
apiFun
=
function
(
vm
)
{
let
commonApi
=
commonApiFun
(
vm
);
let
settledApi
=
settledApiFun
(
vm
)
let
cloudApi
=
cloudRulesApiFun
(
vm
)
let
learnApi
=
learnApiFun
(
vm
)
let
assessmentApi
=
assessmentApiFun
(
vm
)
let
orderApi
=
orderApiFun
(
vm
)
...
...
@@ -22,7 +18,6 @@ let apiFun = function(vm) {
let
apiUrl
=
{
...
commonApi
,
...
settledApi
,
...
cloudApi
,
...
learnApi
,
...
orderApi
,
...
assessmentApi
,
...
...
src/common/http.api.js
View file @
74762c68
import
{
apiFun
}
from
'@/common/api/index.js'
;
import
{
cloudRulesApiFun
}
from
"@/common/api/cloud_rules.js"
const
install
=
(
Vue
,
vm
)
=>
{
let
apiUrls
=
apiFun
(
vm
)
...
...
@@ -9,10 +7,6 @@ const install = (Vue, vm) => {
vm
.
$u
.
api
=
{
...
apiUrls
,
};
let
cloudRules
=
cloudRulesApiFun
(
vm
)
vm
.
$u
.
cloudApi
=
{
...
cloudRules
}
}
export
default
{
...
...
src/components/photo/preview.vue
View file @
74762c68
...
...
@@ -64,36 +64,40 @@
methods
:
{
// 保存照片到本地
async
saveTempToLocal
(
tempImagePath
)
{
//has_origin //是否保存原图
let
that
=
this
const
photo
=
getApp
().
globalData
.
photo
if
(
!
photo
.
tempPath
){
return
}
let
path
=
''
if
(
photo
.
tempPath
.
origin
&&
photo
.
waterSetting
.
hasOrigin
){
// 保存原图到本地
path
=
photo
.
tempPath
.
origin
let
result
=
await
this
.
saveLocal
(
path
)
if
(
result
){
uni
.
showToast
({
icon
:
'none'
,
title
:
'已将照片原图保存到本地相册'
})
return
new
Promise
(
async
(
resolve
,
reject
)
=>
{
//has_origin //是否保存原图
let
that
=
this
const
photo
=
getApp
().
globalData
.
photo
if
(
!
photo
.
tempPath
){
return
}
}
if
(
photo
.
tempPath
.
mixWater
){
// 保存水印处理图片到本地
path
=
photo
.
tempPath
.
mixWater
let
result1
=
await
this
.
saveLocal
(
path
)
if
(
result1
)
{
uni
.
showToast
({
icon
:
'none'
,
title
:
'已将水印图片保存到本地相册'
}
)
let
path
=
''
if
(
photo
.
tempPath
.
origin
&&
photo
?.
waterSetting
?.
hasOrigin
){
// 保存原图到本地
path
=
photo
.
tempPath
.
origin
let
result
=
await
this
.
saveLocal
(
path
)
if
(
result
){
uni
.
showToast
(
{
icon
:
'none'
,
title
:
'已将照片原图保存到本地相册'
})
}
}
}
if
(
photo
.
tempPath
.
mixWater
){
// 保存水印处理图片到本地
path
=
photo
.
tempPath
.
mixWater
console
.
log
(
"path"
,
path
)
let
result1
=
await
this
.
saveLocal
(
path
)
if
(
result1
){
uni
.
showToast
({
icon
:
'none'
,
title
:
'已将水印图片保存到本地相册'
})
resolve
()
}
}
})
},
saveLocal
(
path
){
return
new
Promise
((
resolve
,
reject
)
=>
{
...
...
@@ -128,13 +132,13 @@
//this.$emit('finish')
},
// 确认图片
continuePhoto
()
{
async
continuePhoto
()
{
const
photo
=
getApp
().
globalData
.
photo
let
self
=
this
uni
.
showLoading
({
title
:
'图片保存中…'
})
self
.
saveTempToLocal
()
await
self
.
saveTempToLocal
()
if
(
this
.
upload
)
{
self
.
confirmUpload
(
true
)
...
...
src/pages/index/learn.vue
View file @
74762c68
...
...
@@ -213,6 +213,7 @@ var json = {
pic
:
process
.
uniEnv
.
qn_base_url
+
"fwgf-3x-v2.png"
,
percent
:
0
,
status
:
""
,
id
:
597
,
sectionId
:
""
,
},
{
...
...
@@ -221,6 +222,7 @@ var json = {
pic
:
process
.
uniEnv
.
qn_base_url
+
"jdgf-3x-v2.png"
,
percent
:
0
,
status
:
""
,
id
:
598
,
sectionId
:
""
,
},
{
...
...
@@ -229,6 +231,7 @@ var json = {
pic
:
process
.
uniEnv
.
qn_base_url
+
"cdz-3x-v2.png"
,
percent
:
0
,
status
:
""
,
id
:
599
,
sectionId
:
""
,
},
],
...
...
@@ -265,7 +268,7 @@ var examJson = {
{
title
:
"安装材料及工具准备"
,
desc
:
"通过本认证,是接单的必要条件"
,
condition
:
"随机
10题,及格10
题"
,
condition
:
"随机
4题,及格4
题"
,
status
:
""
,
pic
:
process
.
uniEnv
.
qn_base_url
+
"fwgf-e-3x.png"
,
id
:
3
,
...
...
@@ -275,7 +278,7 @@ var examJson = {
isComplete
:
false
,
},
{
title
:
"
交付
规范"
,
title
:
"
接单
规范"
,
desc
:
"快速认证,是否具备接单操作能力"
,
condition
:
"随机5题,及格5题"
,
status
:
""
,
...
...
@@ -291,7 +294,7 @@ var examJson = {
{
title
:
"安装材料及工具准备"
,
desc
:
"通过本认证,是接单的必要条件"
,
condition
:
"随机
20题,及格20
题"
,
condition
:
"随机
4题,及格4
题"
,
status
:
""
,
pic
:
process
.
uniEnv
.
qn_base_url
+
"fwgf-e-3x.png"
,
id
:
3
,
...
...
@@ -301,9 +304,9 @@ var examJson = {
questionTime
:
null
,
},
{
title
:
"接单
操作
"
,
title
:
"接单
规范
"
,
desc
:
"快速认证,是否具备接单操作能力"
,
condition
:
"随机
20题,及格16
题"
,
condition
:
"随机
5题,及格5
题"
,
status
:
""
,
pic
:
process
.
uniEnv
.
qn_base_url
+
"jdgf-e-3x.png"
,
id
:
4
,
...
...
@@ -446,7 +449,6 @@ export default {
},
onPulling
(
e
)
{
return
true
;
console
.
log
(
"onpulling"
,
e
);
},
onRefresh
()
{
if
(
this
.
_freshing
)
return
;
...
...
@@ -458,7 +460,6 @@ export default {
},
onRestore
()
{
this
.
triggered
=
"restore"
;
// 需要重置
console
.
log
(
"onRestore"
);
},
onAbort
()
{
console
.
log
(
"onAbort"
);
...
...
@@ -657,10 +658,6 @@ export default {
this
.
examList
[
i
].
examId
=
res
.
data
.
id
;
this
.
examList
[
i
].
examStatus
=
res
.
data
.
examStatus
;
//i;//
this
.
examList
[
i
].
questionTime
=
res
.
data
.
questionTime
;
console
.
log
(
this
.
examList
[
i
].
questionTime
,
"每题考试时间"
);
let
examResult
=
res
.
data
.
examLevelResult
;
this
.
examList
[
i
].
status
=
examResult
!=
""
?
examResult
:
"未通过"
;
...
...
@@ -675,25 +672,20 @@ export default {
// examStatus 用户考试状态 0考试中 1考试完成 2未参与
that
.
exam
=
res
.
data
;
console
.
log
(
that
.
exam
);
if
(
res
.
data
.
examStatus
==
2
)
{
console
.
log
(
"examStatus "
+
i
+
" 2"
);
return
;
}
if
(
res
.
data
.
examStatus
==
1
)
{
console
.
log
(
"examStatus "
+
i
+
" 1"
);
that
.
examList
[
i
].
isComplete
=
this
.
examList
[
i
].
status
==
"通过"
;
that
.
examScore
=
res
.
data
.
examScore
;
return
;
}
if
(
res
.
data
.
examStatus
==
0
)
{
console
.
log
(
"examStatus "
+
i
+
" 0"
);
that
.
userExamId
=
res
.
data
.
id
;
}
})
.
catch
((
err
)
=>
{
console
.
log
(
"getUserExamInfo err"
+
err
);
uni
.
hideLoading
();
uni
.
showToast
({
icon
:
"none"
,
...
...
src/pages/index/order.vue
View file @
74762c68
...
...
@@ -24,7 +24,7 @@
<scroll-view
scroll-y
style=
"height: 100%;width: 100%;"
@
scrolltolower=
"reachBottom"
scroll-anchoring
scroll-y=
"true"
refresher-enabled=
"true"
:refresher-triggered=
"triggered"
:refresher-threshold=
"100"
refresher-background=
"#F4F5F7"
@
refresherpulling=
"triggered = true"
@
refresherrefresh=
"onRefresh"
@
refresherrestore=
"onRestore"
@
refresherabort=
"onAbort"
>
@
refresherrestore=
"onRestore"
>
<NoOrder
v-if=
"noMore"
type=
"black"
:customStyle=
"noOrderCustomStyle"
/>
<template
v-else
>
<view
v-for=
"(item, index) in orderList"
:key=
"item.orderId"
>
...
...
@@ -315,9 +315,6 @@
url
:
'pages/order/search'
})
},
onPulling
(
e
)
{
console
.
log
(
"onpulling"
,
e
);
},
onRefresh
()
{
if
(
this
.
_freshing
)
return
;
this
.
_freshing
=
true
;
...
...
@@ -329,11 +326,7 @@
},
onRestore
()
{
this
.
triggered
=
'restore'
;
// 需要重置
console
.
log
(
"onRestore"
);
},
onAbort
()
{
console
.
log
(
"onAbort"
);
}
}
};
</
script
>
...
...
src/pages/learn/answer.vue
View file @
74762c68
...
...
@@ -217,7 +217,6 @@ export default {
return
;
}
if
(
res
.
data
.
data
.
examStatus
==
1
)
{
console
.
log
(
"111111111111111111111111111"
);
that
.
isComplete
=
true
;
that
.
examScore
=
res
.
data
.
data
.
examScore
;
return
;
...
...
@@ -285,11 +284,6 @@ export default {
// this.endTime = timestamp + time * 1000;
this
.
currentTime
=
parseInt
(
time
*
1000
);
//this.formatTimeToMini(timestamp);//endTime-currentTime再格式化时间显示
that
.
getNext
();
console
.
log
(
this
.
endTime
,
this
.
currentTime
,
"总时间"
);
}
}
else
{
uni
.
showToast
({
...
...
@@ -361,15 +355,12 @@ export default {
}
if
(
res
.
data
.
code
==
200
)
{
that
.
currentItem
=
res
.
data
.
data
;
console
.
log
(
that
.
currentItem
);
that
.
progress
=
res
.
data
.
data
.
progress
;
if
(
res
.
data
.
data
.
isQuestion
)
{
let
str
=
res
.
data
.
data
.
question
.
content
;
var
wz
=
str
.
indexOf
(
"."
);
let
str1
=
str
.
substring
(
wz
+
1
);
console
.
log
(
that
.
currentItem
);
that
.
currentItem
.
question
.
content
=
str1
.
replace
(
'*'
,
''
);
console
.
log
(
str1
,
"切割的字符串"
);
}
if
(
res
.
data
.
data
.
answerList
)
{
that
.
handleData
();
...
...
@@ -423,12 +414,6 @@ export default {
if
(
this
.
everyTime
>
0
)
{
this
.
timer
=
setTimeout
(
this
.
startCounting
,
1000
);
console
.
log
(
"endTime:"
+
this
.
endTime
,
"everyTime:"
+
this
.
everyTime
,
"currentTime:"
+
this
.
currentTime
,
"答案:"
+
this
.
userAnswerIds
);
}
else
{
clearTimeout
(
this
.
timer
);
this
.
everyTime
=
90
;
...
...
@@ -438,16 +423,7 @@ export default {
itemClick
:
function
(
currentItem
,
ikey
)
{
this
.
isSelect
=
true
;
// console.log('选点点击--处理前--this.currentItem:')
// console.log(this.currentItem)
// console.log('选点点击--处理前--ikey:')
// console.log(ikey)
// console.log('选点点击--处理前--题目类型,1单选,2多选,3简答:')
// console.log(this.currentItem.question.answerType)
//answerType 题目类型,1单选,2多选,3简答,
//answerType 题目类型,1单选,2多选,3简答
for
(
let
i
=
0
;
i
<
this
.
currentItem
.
answerList
.
length
;
i
++
)
{
var
item
=
this
.
currentItem
.
answerList
[
i
];
...
...
@@ -481,9 +457,6 @@ export default {
//有选答案
this
.
isSelect
=
isSelect
;
// console.log('选点点击--处理后--this.currentItem.answerList:')
// console.log(this.currentItem.answerList)
},
// 点击下一步
handleClick
()
{
...
...
@@ -531,7 +504,6 @@ export default {
// if(this.userAnswerIds.length == 1)
this
.
userAnswerIds
=
this
.
userAnswerIds
+
","
+
item
.
id
;
console
.
log
(
this
.
userAnswerIds
,
"答案答案"
);
}
//*/
}
else
{
...
...
src/pages/learn/assessment.vue
View file @
74762c68
...
...
@@ -127,12 +127,10 @@ export default {
},
success
:
(
res
)
=>
{
console
.
log
(
"标识符1"
,
res
.
data
);
uni
.
hideLoading
();
if
(
res
.
data
.
code
==
200
)
{
if
(
res
.
data
.
data
.
userExamId
)
{
this
.
userExamId
=
res
.
data
.
data
.
userExamId
;
console
.
log
(
"这个是个标识符"
,
this
.
userExamId
);
}
}
},
...
...
src/pages/learn/exam-pass.vue
View file @
74762c68
...
...
@@ -41,7 +41,6 @@ export default {
onLoad
(
a
)
{
this
.
examId
=
a
.
examId
;
this
.
userExamId
=
a
.
userExamId
;
console
.
log
(
"userExamId是"
,
this
.
userExamId
);
this
.
getCourseResult
();
},
onUnload
()
{
...
...
@@ -54,7 +53,6 @@ export default {
.
getExamResult
(
this
.
examId
)
.
then
((
res
)
=>
{
if
(
res
.
code
!=
200
)
{
console
.
log
(
"getUserExamInfo 200 err"
);
uni
.
showToast
({
icon
:
"none"
,
title
:
"获取考试结果失败"
,
...
...
@@ -65,7 +63,6 @@ export default {
this
.
score
=
this
.
result
.
examScore
;
})
.
catch
((
err
)
=>
{
console
.
log
(
"getUserExamInfo err"
+
err
);
uni
.
hideLoading
();
uni
.
showToast
({
icon
:
"none"
,
...
...
src/pages/learn/result.vue
View file @
74762c68
...
...
@@ -45,7 +45,6 @@ export default {
onLoad
(
a
)
{
this
.
userExamId
=
a
.
userExamId
;
this
.
examId
=
a
.
examId
;
console
.
log
(
"userExamId是"
,
this
.
userExamId
);
this
.
getCourseResult
();
},
onUnload
()
{
...
...
@@ -58,7 +57,6 @@ export default {
.
getExamResult
(
this
.
examId
)
.
then
((
res
)
=>
{
if
(
res
.
code
!=
200
)
{
console
.
log
(
"getUserExamInfo 200 err"
);
uni
.
showToast
({
icon
:
"none"
,
title
:
"获取考试结果失败"
,
...
...
@@ -69,7 +67,6 @@ export default {
this
.
score
=
this
.
result
.
examScore
;
})
.
catch
((
err
)
=>
{
console
.
log
(
"getUserExamInfo err"
+
err
);
uni
.
hideLoading
();
uni
.
showToast
({
icon
:
"none"
,
...
...
@@ -81,7 +78,6 @@ export default {
getAgain
:
function
()
{
let
examId
=
this
.
examId
;
let
routes
=
getCurrentPages
();
// 获取当前打开过的页面路由数组
console
.
log
(
routes
.
length
);
uni
.
navigateTo
({
url
:
"/pages/learn/assessment?examId="
+
examId
,
});
...
...
src/pages/learn/section.vue
View file @
74762c68
...
...
@@ -121,8 +121,6 @@
},
methods
:
{
scroll
:
function
(
e
)
{
console
.
log
(
'--scroll--'
)
console
.
log
(
e
)
this
.
old
.
scrollTop
=
e
.
detail
.
scrollTop
},
goNext
(
info
)
{
...
...
@@ -150,8 +148,6 @@
}
else
{
this
.
scrollValue
=
0
}
console
.
log
(
'--移动距离--'
)
console
.
log
(
this
.
scrollValue
)
},
onPlayerTimeupdate
(
player
)
{
let
intCurrentTime
=
parseInt
(
player
.
detail
.
currentTime
);
...
...
@@ -220,8 +216,6 @@
}
if
(
res
.
data
)
{
this
.
sectionInfo
=
res
.
data
console
.
log
(
"----节信息----"
)
console
.
log
(
this
.
sectionInfo
)
this
.
nextSectionId
=
this
.
sectionInfo
.
nextSectionId
let
wareVal
=
this
.
sectionInfo
.
ware
this
.
courseTitle
=
res
.
data
.
name
...
...
@@ -237,7 +231,6 @@
let
coureWareList
=
res
.
data
.
courseware
this
.
courseSrc
=
coureWareList
[
0
].
src
this
.
videoTotalTime
=
parseInt
(
JSON
.
parse
(
coureWareList
[
0
].
info
).
time
)
-
1
;
console
.
log
(
'视频时长信息:'
+
this
.
videoTotalTime
)
}
}
})
...
...
src/pages/mine/deposit/index.vue
View file @
74762c68
...
...
@@ -10,7 +10,7 @@
<view
class=
"amount"
><text
class=
"prefix"
>
¥
</text>
{{
amount
}}
</view>
</view>
<view
class=
"rules"
>
<view
class=
"title"
>
质保
金规则
</view>
<view
class=
"title"
>
配件押
金规则
</view>
<view
class=
"item"
v-for=
"(item, index) in rules"
:key=
"index"
>
<view
class=
"question"
>
<view
class=
"qa-icon danger-bg"
>
Q
</view>
...
...
@@ -33,15 +33,12 @@
return
{
rules
:
[
{
question
:
'为什么缴纳设备押金?'
,
answer
:
`设备押金是什么什么什么,应该巴拉巴拉巴拉,所以
要缴纳,巴拉巴拉巴拉。`
question
:
'为什么缴纳配件押金?'
,
answer
:
'充电桩为客户私人设备,由扳手会保管代发,为安装流程顺利进行,在接单至订单完工过程中由技工师傅保管,因此需缴纳一定额度配件押金,押金可退还。'
},
{
question
:
'退还设备押金说明'
,
answer
:
`设备押金的退还说明是什么什么样的,应该怎么怎么
样,先找客服,然后再怎么怎么样,然后再怎么怎么
样,这样就可以了。`
question
:
'退还配件押金说明'
,
answer
:
'技工师傅与扳手会结束合作关系后即可申请退还缴纳的配件押金。'
}
],
};
...
...
@@ -68,7 +65,6 @@
},
refund
()
{
this
.
$u
.
route
({
type
:
'redirect'
,
url
:
"pages/mine/customer/index"
})
},
...
...
src/pages/mine/wallet/index.vue
View file @
74762c68
...
...
@@ -126,13 +126,13 @@
return
[
'settlement'
,
'statement'
]
}
},
on
Load
()
{
// 未登录,先跳转登录
if
(
!
this
.
vuex_token
)
{
this
.
$u
.
route
({
url
:
'pages/login/index'
})
}
this
.
loadAssets
()
this
.
loadStatement
()
on
Show
()
{
// 未登录,先跳转登录
if
(
!
this
.
vuex_token
)
{
this
.
$u
.
route
({
url
:
'pages/login/index'
})
}
this
.
loadAssets
()
this
.
loadStatement
()
},
methods
:
{
// 提现
...
...
src/pages/mine/wallet/withdraw.vue
View file @
74762c68
...
...
@@ -3,15 +3,24 @@
<u-navbar
back-icon-color=
"#333333"
background=
"#F4F5F7"
title=
"提现"
titleColor=
"#333333"
:border-bottom=
"false"
title-bold
>
</u-navbar>
<view
class=
"withdraw-content"
>
<view
class=
"withdraw-content-main"
>
<view
class=
"amount-title"
>
可提现金额
</view>
<view
class=
"amount-text"
><text
class=
"amount-symbol"
>
¥
</text>
{{
amount
}}
</view>
<u-button
type=
"primary"
shape=
"circle"
:custom-style=
"buttonStyle"
@
click=
"handleClick"
>
提现
</u-button>
<view
v-if=
"!submit"
>
<view
class=
"withdraw-content-main"
>
<view
class=
"amount-title"
>
可提现金额
</view>
<view
class=
"amount-text"
><text
class=
"amount-symbol"
>
¥
</text>
{{
amount
}}
</view>
<u-button
type=
"primary"
shape=
"circle"
:custom-style=
"buttonStyle"
@
click=
"handleClick"
>
全部提现
</u-button>
</view>
<view
class=
"line-view"
></view>
<view
class=
"rule-title"
>
提现规则说明
</view>
<view
class=
"rule-content"
>
1.提现金额:提现金额是指已完工订单通过平台审核后且达到合同账期的订单费用之总和。
</view>
<view
class=
"rule-content"
>
2.提现到账时间具体以银行结果为准
</view>
</view>
<view
class=
"line-view"
></view>
<view
class=
"rule-title"
>
提现规则说明
</view>
<view
class=
"rule-content"
>
1.提现金额:提现金额是指已完工订单通过平台审核后且达到合同账期的订单费用之总和。
</view>
<view
class=
"rule-content"
>
2.提现到账时间为1-3个工作日,最终以银行结果为准
</view>
<view
v-else
class=
"submited-view"
>
<image
class=
"success-image"
:src=
"imageUrl"
></image>
<view>
您已提交提现申请
</view>
<view
class=
"submited-button"
>
<u-button
type=
"primary"
shape=
"circle"
:custom-style=
"buttonStyle"
@
click=
"handleClickSure"
>
我知道了
</u-button>
</view>
</view>
</view>
</view>
</
template
>
...
...
@@ -20,7 +29,8 @@
export
default
{
data
()
{
return
{
amount
:
0
,
amount
:
0
,
submit
:
false
}
},
computed
:
{
...
...
@@ -31,6 +41,9 @@
"font-size"
:
"32rpx"
,
"font-weight"
:
"bold"
,
};
},
imageUrl
()
{
return
process
.
uniEnv
.
qn_base_url
+
'chenggong.png'
},
},
onLoad
()
{
...
...
@@ -42,7 +55,7 @@
if
(
self
.
amount
)
{
let
res
=
await
self
.
$u
.
api
.
workerApplyPay
()
if
(
res
&&
res
.
code
==
200
)
{
self
.
$u
.
route
({
type
:
'redirect'
,
url
:
'pages/mine/wallet/index'
})
self
.
submit
=
true
}
else
{
self
.
$u
.
toast
(
res
.
message
||
'系统异常,提现失败!'
);
}
...
...
@@ -54,7 +67,10 @@
if
(
res
&&
res
.
code
==
200
)
{
self
.
amount
=
res
.
data
&&
res
.
data
.
canApplyAmount
}
},
},
handleClickSure
()
{
this
.
$u
.
route
({
type
:
'back'
})
}
}
}
</
script
>
...
...
@@ -110,6 +126,22 @@
color
:
#666666
;
margin-bottom
:
20rpx
;
line-height
:
40rpx
;
}
.submited-view
{
text-align
:
center
;
color
:
#2272FF
;
font-size
:
40rpx
;
font-weight
:
bold
;
.success-image
{
width
:
224rpx
;
height
:
224rpx
;
margin-top
:
80rpx
;
}
}
.submited-button
{
margin-top
:
100rpx
;
margin-bottom
:
100rpx
;
}
}
...
...
src/pages/photo/index.vue
View file @
74762c68
<
template
>
<view
class=
"backView"
>
<view
class=
"ph-pr-arr"
v-for=
"(dataItem, index) in list"
:key=
"index"
>
<template
v-if=
"dataItem.data.length > 0"
>
<view
class=
"topTitle"
><text>
{{
dataItem
.
title
}}
</text></view>
<view
class=
"ph-pr-content"
>
<view
v-for=
"(item,ikey) in dataItem.data"
:class=
"param[dataItem.type] === item.id ? 'select-item-view' : 'item-view'"
@
click=
"itemClick(dataItem.type, item, ikey)"
:key=
"item.id"
>
<text
class=
"itemTitle"
>
{{
item
.
name
}}
</text>
</view>
</view>
</
template
>
</view>
<u-button
class=
"ph-pr-button"
type=
"primary"
shape=
"circle"
@
click=
"handleClick"
:hover-class=
"selectedAll ? '' : 'none'"
:custom-style=
"buttonStyle"
>
下一步
</u-button>
</view>
</template>
<
script
>
export
default
{
data
()
{
return
{
classifyList
:
[],
systemList
:
[],
brandList
:
[],
param
:
{
classifyId
:
''
,
systemId
:
''
,
brandId
:
''
,
},
brandName
:
''
,
selectedAll
:
false
,
}
},
computed
:
{
list
()
{
return
[{
title
:
'请选择类别'
,
type
:
'classifyId'
,
data
:
this
.
classifyList
},
{
title
:
'请选择系统'
,
type
:
'systemId'
,
data
:
this
.
systemList
},
{
title
:
'请选择品牌'
,
type
:
'brandId'
,
data
:
this
.
brandList
}
]
},
buttonStyle
()
{
return
this
.
selectedAll
?
{
'color'
:
'#FFFFFF'
,
'background-color'
:
'#2272FF;'
,
'width'
:
'600rpx'
,
'height'
:
'104rpx'
}
:
{
'color'
:
'#FFFFFF'
,
'background-color'
:
'#D1D4D4;'
,
'width'
:
'600rpx'
,
'height'
:
'104rpx'
}
}
},
onLoad
(
e
)
{
getApp
().
trackPage
(
'选择产品页'
)
this
.
getRelationDictionaryV2
()
},
onShareAppMessage
(
res
)
{
let
shareObj
=
{
title
:
''
,
path
:
'/pages/photo/product'
,
imageUrl
:
''
,
success
()
{},
fail
()
{}
}
return
shareObj
},
methods
:
{
getRelationDictionaryV2
:
function
()
{
this
.
$u
.
cloudApi
.
getRelationDictionaryV2
().
then
(
res
=>
{
if
(
res
&&
res
.
result
)
{
this
.
classifyList
=
res
.
result
this
.
param
.
classifyId
=
res
.
result
[
0
].
id
this
.
systemList
=
res
.
result
[
0
].
child
}
})
},
//选择 点击
itemClick
:
function
(
type
,
item
,
ikey
)
{
switch
(
type
)
{
case
'classifyId'
:
this
.
param
=
{
classifyId
:
item
.
id
,
systemId
:
''
,
brandId
:
''
}
this
.
selectedAll
=
false
this
.
systemList
=
this
.
classifyList
[
ikey
].
child
this
.
brandList
=
[]
break
case
'systemId'
:
this
.
param
=
{
classifyId
:
this
.
param
.
classifyId
,
systemId
:
item
.
id
,
brandId
:
''
}
this
.
selectedAll
=
false
this
.
brandList
=
this
.
systemList
[
ikey
].
child
break
case
'brandId'
:
this
.
param
.
brandId
=
item
.
id
this
.
selectedAll
=
true
this
.
brandName
=
item
.
name
break
default
:
break
}
},
// 点击下一步
handleClick
()
{
// 点击下一步设置全局拍照品牌品类
if
(
!
this
.
selectedAll
)
{
return
}
const
globalData
=
getApp
().
globalData
// if (!globalData.token) {
// uni.navigateTo({
// url: '/pages/login/wxlogin'
// })
// return
// }
let
keys
=
[
'brandId'
,
'brandName'
,
'classifyId'
,
'systemId'
]
keys
.
map
(
key
=>
{
globalData
.
photo
.
product
[
key
]
=
this
[
key
]
||
this
.
param
[
key
]
<
template
>
<view
class=
"backView"
>
<view
class=
"ph-pr-arr"
v-for=
"(dataItem, index) in list"
:key=
"index"
>
<template
v-if=
"dataItem.data.length > 0"
>
<view
class=
"topTitle"
><text>
{{
dataItem
.
title
}}
</text></view>
<view
class=
"ph-pr-content"
>
<view
v-for=
"(item,ikey) in dataItem.data"
:class=
"param[dataItem.type] === item.id ? 'select-item-view' : 'item-view'"
@
click=
"itemClick(dataItem.type, item, ikey)"
:key=
"item.id"
>
<text
class=
"itemTitle"
>
{{
item
.
name
}}
</text>
</view>
</view>
</
template
>
</view>
<u-button
class=
"ph-pr-button"
type=
"primary"
shape=
"circle"
@
click=
"handleClick"
:hover-class=
"selectedAll ? '' : 'none'"
:custom-style=
"buttonStyle"
>
下一步
</u-button>
</view>
</template>
<
script
>
export
default
{
data
()
{
return
{
classifyList
:
[],
systemList
:
[],
brandList
:
[],
param
:
{
classifyId
:
''
,
systemId
:
''
,
brandId
:
''
,
},
brandName
:
''
,
selectedAll
:
false
,
}
},
computed
:
{
list
()
{
return
[{
title
:
'请选择类别'
,
type
:
'classifyId'
,
data
:
this
.
classifyList
},
{
title
:
'请选择系统'
,
type
:
'systemId'
,
data
:
this
.
systemList
},
{
title
:
'请选择品牌'
,
type
:
'brandId'
,
data
:
this
.
brandList
}
]
},
buttonStyle
()
{
return
this
.
selectedAll
?
{
'color'
:
'#FFFFFF'
,
'background-color'
:
'#2272FF;'
,
'width'
:
'600rpx'
,
'height'
:
'104rpx'
}
:
{
'color'
:
'#FFFFFF'
,
'background-color'
:
'#D1D4D4;'
,
'width'
:
'600rpx'
,
'height'
:
'104rpx'
}
}
},
onLoad
(
e
)
{
getApp
().
trackPage
(
'选择产品页'
)
this
.
getRelationDictionaryV2
()
},
onShareAppMessage
(
res
)
{
let
shareObj
=
{
title
:
''
,
path
:
'/pages/photo/product'
,
imageUrl
:
''
,
success
()
{},
fail
()
{}
}
return
shareObj
},
methods
:
{
//选择 点击
itemClick
:
function
(
type
,
item
,
ikey
)
{
switch
(
type
)
{
case
'classifyId'
:
this
.
param
=
{
classifyId
:
item
.
id
,
systemId
:
''
,
brandId
:
''
}
this
.
selectedAll
=
false
this
.
systemList
=
this
.
classifyList
[
ikey
].
child
this
.
brandList
=
[]
break
case
'systemId'
:
this
.
param
=
{
classifyId
:
this
.
param
.
classifyId
,
systemId
:
item
.
id
,
brandId
:
''
}
this
.
selectedAll
=
false
this
.
brandList
=
this
.
systemList
[
ikey
].
child
break
case
'brandId'
:
this
.
param
.
brandId
=
item
.
id
this
.
selectedAll
=
true
this
.
brandName
=
item
.
name
break
default
:
break
}
},
// 点击下一步
handleClick
()
{
// 点击下一步设置全局拍照品牌品类
if
(
!
this
.
selectedAll
)
{
return
}
const
globalData
=
getApp
().
globalData
// if (!globalData.token) {
// uni.navigateTo({
// url: '/pages/login/wxlogin'
// })
// return
// }
let
keys
=
[
'brandId'
,
'brandName'
,
'classifyId'
,
'systemId'
]
keys
.
map
(
key
=>
{
globalData
.
photo
.
product
[
key
]
=
this
[
key
]
||
this
.
param
[
key
]
})
uni
.
navigateTo
({
url
:
'/pages/photo/list'
+
'?brandId='
+
this
.
param
.
brandId
+
'&brand='
+
this
.
brandName
+
'&classifyId='
+
this
.
param
.
classifyId
+
'&systemId='
+
this
.
param
.
systemId
,
})
}
}
}
</
script
>
<
style
>
.backView
{
background-color
:
#F4f5f7
;
position
:
absolute
;
top
:
0
;
left
:
0
;
width
:
100%
;
display
:
flex
;
flex-direction
:
column
;
align-items
:
center
;
height
:
100%
;
}
.topTitle
{
margin-top
:
50
rpx
;
padding-left
:
30
rpx
;
font-size
:
36
rpx
;
font-weight
:
bold
;
color
:
#333333
;
}
.ph-pr-content
{
display
:
flex
;
flex-wrap
:
wrap
;
justify-content
:
flex-start
;
width
:
100%
;
padding
:
22
rpx
22
rpx
;
}
.ph-pr-arr
{
width
:
100%
;
}
.item-view
{
background-color
:
#FFFFFF
;
/* width: 548rpx; */
margin
:
0
rpx
8
rpx
24
rpx
8
rpx
;
/* flex: 1 1 0%;
max-width: 33%; */
width
:
222
rpx
;
height
:
76
rpx
;
display
:
flex
;
align-items
:
center
;
justify-content
:
center
;
border-style
:
solid
;
box-shadow
:
0px
2px
7px
0px
rgba
(
0
,
0
,
0
,
0.05
);
border-width
:
0
rpx
;
border-radius
:
12
rpx
;
font-size
:
26
rpx
;
color
:
#666666
;
}
.select-item-view
{
background-color
:
#2272FF
;
margin
:
0
rpx
8
rpx
24
rpx
8
rpx
;
/* flex: 1 1 0%;
max-width: 33%; */
width
:
222
rpx
;
height
:
76
rpx
;
display
:
flex
;
align-items
:
center
;
justify-content
:
center
;
border-style
:
solid
;
box-shadow
:
0px
2px
7px
0px
rgba
(
0
,
0
,
0
,
0.05
);
border-width
:
0
rpx
;
border-radius
:
12
rpx
;
font-size
:
26
rpx
;
color
:
#FFFFFF
;
}
.ph-pr-button
{
position
:
absolute
;
bottom
:
76
rpx
;
font-size
:
32
rpx
;
}
uni
.
navigateTo
({
url
:
'/pages/photo/list'
+
'?brandId='
+
this
.
param
.
brandId
+
'&brand='
+
this
.
brandName
+
'&classifyId='
+
this
.
param
.
classifyId
+
'&systemId='
+
this
.
param
.
systemId
,
})
}
}
}
</
script
>
<
style
>
.backView
{
background-color
:
#F4f5f7
;
position
:
absolute
;
top
:
0
;
left
:
0
;
width
:
100%
;
display
:
flex
;
flex-direction
:
column
;
align-items
:
center
;
height
:
100%
;
}
.topTitle
{
margin-top
:
50
rpx
;
padding-left
:
30
rpx
;
font-size
:
36
rpx
;
font-weight
:
bold
;
color
:
#333333
;
}
.ph-pr-content
{
display
:
flex
;
flex-wrap
:
wrap
;
justify-content
:
flex-start
;
width
:
100%
;
padding
:
22
rpx
22
rpx
;
}
.ph-pr-arr
{
width
:
100%
;
}
.item-view
{
background-color
:
#FFFFFF
;
/* width: 548rpx; */
margin
:
0
rpx
8
rpx
24
rpx
8
rpx
;
/* flex: 1 1 0%;
max-width: 33%; */
width
:
222
rpx
;
height
:
76
rpx
;
display
:
flex
;
align-items
:
center
;
justify-content
:
center
;
border-style
:
solid
;
box-shadow
:
0px
2px
7px
0px
rgba
(
0
,
0
,
0
,
0.05
);
border-width
:
0
rpx
;
border-radius
:
12
rpx
;
font-size
:
26
rpx
;
color
:
#666666
;
}
.select-item-view
{
background-color
:
#2272FF
;
margin
:
0
rpx
8
rpx
24
rpx
8
rpx
;
/* flex: 1 1 0%;
max-width: 33%; */
width
:
222
rpx
;
height
:
76
rpx
;
display
:
flex
;
align-items
:
center
;
justify-content
:
center
;
border-style
:
solid
;
box-shadow
:
0px
2px
7px
0px
rgba
(
0
,
0
,
0
,
0.05
);
border-width
:
0
rpx
;
border-radius
:
12
rpx
;
font-size
:
26
rpx
;
color
:
#FFFFFF
;
}
.ph-pr-button
{
position
:
absolute
;
bottom
:
76
rpx
;
font-size
:
32
rpx
;
}
</
style
>
src/pages/photo/list.vue
View file @
74762c68
...
...
@@ -144,27 +144,6 @@
}
},
methods
:
{
getListData
:
function
()
{
this
.
loading
=
true
let
that
=
this
this
.
$u
.
cloudApi
.
getGroupStandardV2
({
'token'
:
this
.
vuex_token
,
'classify_id'
:
this
.
classifyId
,
'system_id'
:
this
.
systemId
,
'brand_id'
:
this
.
brandId
}).
then
(
res
=>
{
this
.
loading
=
false
if
(
res
&&
res
.
result
)
{
if
(
res
.
result
.
error_code
)
{
uni
.
showToast
({
title
:
res
.
result
.
error_msg
})
}
else
{
that
.
handleData
(
res
.
result
)
}
}
})
},
getListDataNew
()
{
this
.
loading
=
true
let
self
=
this
...
...
@@ -251,17 +230,6 @@
url
:
'/pages/photo/take'
})
},
// 清除图片
handleClickSure
:
function
()
{
this
.
$u
.
cloudApi
.
cleanImage
({
'token'
:
this
.
vuex_token
,
}).
then
(
res
=>
{
this
.
isPopShow
=
false
if
(
res
&&
res
.
result
)
{
this
.
getListData
()
}
})
},
take
(
item
,
ikey
)
{
this
.
currentItemDate
=
item
...
...
src/pages/photo/preview.vue
View file @
74762c68
<
template
>
<view>
<view
class=
"contentView"
>
<u-image
class=
"pic"
:src=
"files[0]"
bg-color=
"transparent"
@
click=
"showPreviewFn"
></u-image>
<!--
<image
class=
"pic"
:src=
"files[0]"
v-lazy
mode=
"aspectFit"
></image>
-->
</view>
<view
class=
"bottomView"
>
<image
class=
"btn"
:src=
"btn_remake"
@
click=
"$u.throttle(remakePhoto, 3000)"
></image>
<image
class=
"btn"
:src=
"btn_continue"
@
click=
"$u.throttle(continuePhoto, 3000)"
></image>
</view>
<image
class=
"btn finish"
src=
"/static/photo/finish.png"
@
click=
"$u.throttle(finishPhoto, 3000)"
></image>
</view>
</
template
>
<
script
>
import
qiniup
from
'@/components/upload/qiniup'
;
const
app
=
getApp
()
export
default
{
mixins
:
[
qiniup
],
data
()
{
return
{
protocolContent
:
''
,
btn_remake
:
'https://qn-static.banshouhui.com/take_order/photo/remake.png'
,
btn_continue
:
'/static/photo/continue.png'
,
standardId
:
''
,
images
:
[],
files
:
[],
fileMaps
:
[],
keys
:
[],
token
:
''
,
product
:
''
,
}
},
onLoad
(
e
)
{
// 获取照片选项对象
const
product
=
app
.
globalData
.
photo
.
product
this
.
product
=
`?brandId=
${
product
.
brandId
}
&brand=
${
product
.
brandName
}
&classifyId=
${
product
.
classifyId
}
&systemId=
${
product
.
systemId
}
`
if
(
app
.
globalData
.
photo
.
currentItem
)
{
// 获取规格Id
this
.
standardId
=
app
.
globalData
.
photo
.
currentItem
.
_id
}
getApp
().
trackPage
(
'照片预览页'
)
const
globalTempPath
=
getApp
().
globalData
.
photo
.
tempPath
if
(
globalTempPath
&&
globalTempPath
.
mixWater
){
this
.
files
=
[
globalTempPath
.
mixWater
]
}
if
(
e
.
standardId
)
{
this
.
standardId
=
e
.
standardId
}
this
.
token
=
this
.
vuex_token
},
methods
:
{
// 保存照片到本地
async
saveTempToLocal
(
tempImagePath
)
{
//has_origin //是否保存原图
let
that
=
this
const
photo
=
getApp
().
globalData
.
photo
if
(
!
photo
.
tempPath
){
return
}
let
path
=
''
if
(
photo
.
tempPath
.
origin
&&
photo
.
waterSetting
&&
photo
.
waterSetting
.
has_origin
){
// 保存原图到本地
path
=
photo
.
tempPath
.
origin
let
result
=
await
this
.
saveLocal
(
path
)
if
(
result
){
uni
.
showToast
({
icon
:
'none'
,
title
:
'已将照片原图保存到本地相册'
})
}
}
if
(
photo
.
currentItem
){
photo
.
currentItem
.
imageList
.
unshift
(
photo
.
tempPath
.
mixWater
)
}
// if(photo.productList && photo.productList[photo.topIndex]){
// const topArr = photo.productList[photo.topIndex]
// if(topArr[photo.itemIndex]){
// topArr[photo.itemIndex].imageList.push(photo.tempPath.mixWater)
// }
// }
// photo.
if
(
photo
.
tempPath
.
mixWater
){
// 保存水印处理图片到本地
path
=
photo
.
tempPath
.
mixWater
let
result1
=
await
this
.
saveLocal
(
path
)
if
(
result1
){
uni
.
showToast
({
icon
:
'none'
,
title
:
'已将水印图片保存到本地相册'
})
}
}
},
saveLocal
(
path
){
return
new
Promise
((
resolve
,
reject
)
=>
{
uni
.
saveImageToPhotosAlbum
({
filePath
:
path
,
success
()
{
resolve
(
true
)
},
fail
()
{
reject
(
'保存失败'
)
}
})
})
},
showPreviewFn
(
img
)
{
uni
.
previewImage
({
current
:
0
,
urls
:
this
.
files
});
},
// 重拍图片
remakePhoto
()
{
uni
.
navigateBack
({
delta
:
1
})
},
finishPhoto
(){
const
photo
=
getApp
().
globalData
.
photo
photo
.
currentItemLength
=
10
this
.
continuePhoto
()
// 完成本项
// uni.navigateBack({
// delta:2
// })
},
// 确认图片
continuePhoto
()
{
let
self
=
this
uni
.
showLoading
({
title
:
'图片保存中…'
})
self
.
saveTempToLocal
()
self
.
confirmUpload
(
true
)
},
submitFile
()
{
let
self
=
this
if
(
self
.
keys
.
length
)
{
for
(
let
s
of
self
.
keys
)
{
self
.
$u
.
cloudApi
.
saveImage
({
"token"
:
self
.
token
,
"standardId"
:
self
.
standardId
,
"url"
:
s
,
}).
then
(
async
res
=>
{
console
.
log
(
res
,
"云服务保存图片"
);
if
(
res
.
result
.
code
)
{
// TODO 参数是否要来回传递
const
photo
=
getApp
().
globalData
.
photo
photo
.
currentItemLength
=
photo
.
currentItemLength
+
1
uni
.
hideLoading
()
// 当前项的图片显示
// 拍照项张数目增加 等于10张
if
(
photo
.
currentItemLength
<
10
){
uni
.
navigateBack
({
delta
:
1
})
}
else
{
uni
.
navigateBack
({
delta
:
2
})
}
// let timer = setTimeout(()=>{
// if(photo.currentItemLength
<
10
){
// uni.navigateBack({
// delta:1
// })
// }else{
// uni.navigateBack({
// delta:2
// })
// }
// },2000)
}
else
{
uni
.
showToast
({
title
:
'图片上传失败 '
+
res
.
result
.
msg
})
}
})
}
}
},
downloadImages
()
{
let
self
=
this
;
for
(
let
url
of
this
.
images
)
{
uni
.
downloadFile
({
url
:
url
,
//仅为示例,并非真实的资源
success
(
res
)
{
// 只要服务器有响应数据,就会把响应内容写入文件并进入 success 回调,业务需要自行判断是否下载到了想要的内容
if
(
res
.
statusCode
===
200
)
{
self
.
files
.
push
(
res
.
tempFilePath
)
}
},
fail
(
e
)
{
}
})
}
},
}
}
</
script
>
<
style
lang=
"scss"
>
.contentView
{
background-color
:
#333333
;
/* padding-top: 120rpx; */
padding-bottom
:
228rpx
;
height
:
100vh
;
display
:
flex
;
flex-direction
:
column
;
}
/
deep
/
.u-image
{
height
:
100vh
!
important
;
}
/
deep
/
.u-image__loading
{
background-color
:
transparent
!
important
;
}
/
deep
/
.u-image__error
{
background-color
:
transparent
!
important
;
}
.pic
{
flex
:
1
;
width
:
100%
;
/* height:auto */
/* height: 760rpx; */
}
.bottomView
{
box-shadow
:
0
0
1rpx
6rpx
rgba
(
255
,
255
,
255
,
0
.05
);
background-color
:
#333333
;
width
:
100%
;
padding
:
70rpx
0
;
position
:
fixed
;
bottom
:
0
;
display
:
flex
;
justify-content
:
space-around
;
align-items
:
center
;
.btn
{
display
:
block
;
width
:
200rpx
;
height
:
88rpx
;
}
}
.btn
{
display
:
block
;
width
:
232rpx
;
height
:
80rpx
;
&
.finish
{
position
:
fixed
;
top
:
30rpx
;
right
:
30rpx
;
}
}
</
style
>
<
template
>
<view>
<view
class=
"contentView"
>
<u-image
class=
"pic"
:src=
"files[0]"
bg-color=
"transparent"
@
click=
"showPreviewFn"
></u-image>
<!--
<image
class=
"pic"
:src=
"files[0]"
v-lazy
mode=
"aspectFit"
></image>
-->
</view>
<view
class=
"bottomView"
>
<image
class=
"btn"
:src=
"btn_remake"
@
click=
"$u.throttle(remakePhoto, 3000)"
></image>
<image
class=
"btn"
:src=
"btn_continue"
@
click=
"$u.throttle(continuePhoto, 3000)"
></image>
</view>
<image
class=
"btn finish"
src=
"/static/photo/finish.png"
@
click=
"$u.throttle(finishPhoto, 3000)"
></image>
</view>
</
template
>
<
script
>
import
qiniup
from
'@/components/upload/qiniup'
;
const
app
=
getApp
()
export
default
{
mixins
:
[
qiniup
],
data
()
{
return
{
protocolContent
:
''
,
btn_remake
:
'https://qn-static.banshouhui.com/take_order/photo/remake.png'
,
btn_continue
:
'/static/photo/continue.png'
,
standardId
:
''
,
images
:
[],
files
:
[],
fileMaps
:
[],
keys
:
[],
token
:
''
,
product
:
''
,
}
},
onLoad
(
e
)
{
// 获取照片选项对象
const
product
=
app
.
globalData
.
photo
.
product
this
.
product
=
`?brandId=
${
product
.
brandId
}
&brand=
${
product
.
brandName
}
&classifyId=
${
product
.
classifyId
}
&systemId=
${
product
.
systemId
}
`
if
(
app
.
globalData
.
photo
.
currentItem
)
{
// 获取规格Id
this
.
standardId
=
app
.
globalData
.
photo
.
currentItem
.
_id
}
getApp
().
trackPage
(
'照片预览页'
)
const
globalTempPath
=
getApp
().
globalData
.
photo
.
tempPath
if
(
globalTempPath
&&
globalTempPath
.
mixWater
){
this
.
files
=
[
globalTempPath
.
mixWater
]
}
if
(
e
.
standardId
)
{
this
.
standardId
=
e
.
standardId
}
this
.
token
=
this
.
vuex_token
},
methods
:
{
// 保存照片到本地
async
saveTempToLocal
(
tempImagePath
)
{
//has_origin //是否保存原图
let
that
=
this
const
photo
=
getApp
().
globalData
.
photo
if
(
!
photo
.
tempPath
){
return
}
let
path
=
''
if
(
photo
.
tempPath
.
origin
&&
photo
.
waterSetting
&&
photo
.
waterSetting
.
has_origin
){
// 保存原图到本地
path
=
photo
.
tempPath
.
origin
let
result
=
await
this
.
saveLocal
(
path
)
if
(
result
){
uni
.
showToast
({
icon
:
'none'
,
title
:
'已将照片原图保存到本地相册'
})
}
}
if
(
photo
.
currentItem
){
photo
.
currentItem
.
imageList
.
unshift
(
photo
.
tempPath
.
mixWater
)
}
// if(photo.productList && photo.productList[photo.topIndex]){
// const topArr = photo.productList[photo.topIndex]
// if(topArr[photo.itemIndex]){
// topArr[photo.itemIndex].imageList.push(photo.tempPath.mixWater)
// }
// }
// photo.
if
(
photo
.
tempPath
.
mixWater
){
// 保存水印处理图片到本地
path
=
photo
.
tempPath
.
mixWater
let
result1
=
await
this
.
saveLocal
(
path
)
if
(
result1
){
uni
.
showToast
({
icon
:
'none'
,
title
:
'已将水印图片保存到本地相册'
})
}
}
},
saveLocal
(
path
){
return
new
Promise
((
resolve
,
reject
)
=>
{
uni
.
saveImageToPhotosAlbum
({
filePath
:
path
,
success
()
{
resolve
(
true
)
},
fail
()
{
reject
(
'保存失败'
)
}
})
})
},
showPreviewFn
(
img
)
{
uni
.
previewImage
({
current
:
0
,
urls
:
this
.
files
});
},
// 重拍图片
remakePhoto
()
{
uni
.
navigateBack
({
delta
:
1
})
},
finishPhoto
(){
const
photo
=
getApp
().
globalData
.
photo
photo
.
currentItemLength
=
10
this
.
continuePhoto
()
// 完成本项
// uni.navigateBack({
// delta:2
// })
},
// 确认图片
continuePhoto
()
{
let
self
=
this
uni
.
showLoading
({
title
:
'图片保存中…'
})
self
.
saveTempToLocal
()
self
.
confirmUpload
(
true
)
},
downloadImages
()
{
let
self
=
this
;
for
(
let
url
of
this
.
images
)
{
uni
.
downloadFile
({
url
:
url
,
//仅为示例,并非真实的资源
success
(
res
)
{
// 只要服务器有响应数据,就会把响应内容写入文件并进入 success 回调,业务需要自行判断是否下载到了想要的内容
if
(
res
.
statusCode
===
200
)
{
self
.
files
.
push
(
res
.
tempFilePath
)
}
},
fail
(
e
)
{
}
})
}
},
}
}
</
script
>
<
style
lang=
"scss"
>
.contentView
{
background-color
:
#333333
;
/* padding-top: 120rpx; */
padding-bottom
:
228rpx
;
height
:
100vh
;
display
:
flex
;
flex-direction
:
column
;
}
/
deep
/
.u-image
{
height
:
100vh
!
important
;
}
/
deep
/
.u-image__loading
{
background-color
:
transparent
!
important
;
}
/
deep
/
.u-image__error
{
background-color
:
transparent
!
important
;
}
.pic
{
flex
:
1
;
width
:
100%
;
/* height:auto */
/* height: 760rpx; */
}
.bottomView
{
box-shadow
:
0
0
1rpx
6rpx
rgba
(
255
,
255
,
255
,
0
.05
);
background-color
:
#333333
;
width
:
100%
;
padding
:
70rpx
0
;
position
:
fixed
;
bottom
:
0
;
display
:
flex
;
justify-content
:
space-around
;
align-items
:
center
;
.btn
{
display
:
block
;
width
:
200rpx
;
height
:
88rpx
;
}
}
.btn
{
display
:
block
;
width
:
232rpx
;
height
:
80rpx
;
&
.finish
{
position
:
fixed
;
top
:
30rpx
;
right
:
30rpx
;
}
}
</
style
>
src/pages/photo/setting.vue
View file @
74762c68
...
...
@@ -122,46 +122,8 @@
const
globalData
=
getApp
().
globalData
this
.
icon_close_new
=
globalData
.
icon_close_new
this
.
systemId
=
globalData
.
photo
.
product
.
systemId
this
.
getItemList
()
},
methods
:
{
getItemList
:
function
()
{
// this.systemId = '79550af260555cc20afb34156c94b32c' // 测试数据
this
.
loading
=
true
this
.
$u
.
cloudApi
.
getUserWatermark
({
'token'
:
this
.
vuex_token
,
'system_id'
:
this
.
systemId
}).
then
(
res
=>
{
if
(
res
&&
res
.
result
)
{
if
(
res
.
result
.
error_code
){
uni
.
showToast
({
title
:
res
.
result
.
error_msg
})
}
else
{
this
.
result
=
res
.
result
}
}
else
{
uni
.
showToast
({
title
:
'网络异常'
})
}
this
.
loading
=
false
})
},
saveUserWatermark
:
function
()
{
this
.
loading
=
true
this
.
$u
.
cloudApi
.
saveUserWatermark
({
'token'
:
this
.
vuex_token
,
'watermark'
:
this
.
result
}).
then
(
res
=>
{
if
(
res
.
result
.
code
==
true
)
{
const
photo
=
getApp
().
globalData
.
photo
photo
.
waterSetting
=
this
.
result
}
else
{
uni
.
showToast
({
title
:
res
.
result
.
msg
})
}
this
.
loading
=
false
})
},
//保存原图 开关
handleOrigineChange
:
function
(
e
)
{
this
.
result
[
'hasOrigin'
]
=
!
this
.
result
[
'hasOrigin'
]
...
...
src/pages/settle/file.vue
View file @
74762c68
...
...
@@ -322,11 +322,16 @@ export default {
break
;
}
await
self
.
chooseImage
(
"qiniu"
,
{...
attr
,
options
:
{
count
:
1
}})
if
(
self
.
uploadType
===
'id_card_front'
||
self
.
uploadType
===
'id_card_back'
)
{
await
self
.
chooseImage
(
"qiniu"
,
{...
attr
,
options
:
{
count
:
1
}})
}
else
{
self
.
imgList
=
await
self
.
chooseImg
({
count
:
1
})
}
if
(
self
.
uploadType
&&
self
.
imgList
&&
self
.
imgList
.
length
>
0
)
{
// 设置图片对象
self
.
imgObj
[
self
.
uploadType
]
=
self
.
imgList
self
.
formShowList
[
index
].
imgs
[
key
]
=
self
.
imgList
[
0
].
src
self
.
formShowList
[
index
].
imgs
[
key
]
=
self
.
imgList
[
0
].
path
this
.
updateImgs
()
}
},
...
...
@@ -349,14 +354,14 @@ export default {
let
imgs
=
[]
otherImgs
.
map
(
item
=>
{
const
img
=
item
.
key
||
item
.
src
||
''
const
img
=
item
.
key
||
''
imgs
.
push
(
img
)
})
this
.
fileInfo
[
'other_photos'
][
photoType
][
'url'
]
=
imgs
.
join
(
','
)
return
}
this
.
fileInfo
[
uploadType
]
=
uploadImgs
[
0
].
key
||
uploadImgs
[
0
].
src
||
''
this
.
fileInfo
[
uploadType
]
=
uploadImgs
[
0
].
key
||
''
},
toUploadImg
(
item
,
index
)
{
this
.
uploadType
=
item
.
filedName
...
...
@@ -372,7 +377,7 @@ export default {
},
async
checkIdCard
(
type
)
{
uni
.
showLoading
({
title
:
'
加载
中'
title
:
'
识别
中'
})
let
request
=
{
front
:
this
.
$u
.
api
.
checkSettleIDCardFront
,
...
...
@@ -461,9 +466,9 @@ export default {
return
formFlag
;
},
async
submitFileInfo
()
{
if
(
!
this
.
submitBtnStatus
)
{
return
async
submitFileInfo
()
{
if
(
!
this
.
submitBtnStatus
)
{
return
}
if
(
!
this
.
checkFileInfo
())
{
return
;
...
...
@@ -472,7 +477,7 @@ export default {
fileInfo
.
other_photos
=
JSON
.
stringify
(
fileInfo
.
other_photos
)
let
submitInfoData
=
{
...
fileInfo
,
recommender
:
getApp
().
globalData
.
settleRecommend
recommender
:
getApp
().
globalData
.
settleRecommend
,
}
uni
.
showLoading
({
title
:
'加载中……'
...
...
@@ -529,7 +534,7 @@ export default {
width
:
100%
;
height
:
100%
;
display
:
flex
;
flex-direction
:
column
;
flex-direction
:
column
;
overflow-y
:auto
;
}
...
...
@@ -748,9 +753,9 @@ export default {
padding
:
38rpx
30rpx
30rpx
30rpx
;
margin-bottom
:
20rpx
;
font-size
:
32rpx
;
color
:
#333333
;
.title-left-view
{
font-weight
:
bold
;
color
:
#333333
;
.title-left-view
{
font-weight
:
bold
;
}
.title-image
{
...
...
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