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
45da3ae0
Commit
45da3ae0
authored
May 18, 2021
by
zhengzy
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
https://git.banshouhui.com/lijundan/self-support
parents
155b62bc
2432a8f1
Changes
63
Show whitespace changes
Inline
Side-by-side
Showing
63 changed files
with
1150 additions
and
1403 deletions
+1150
-1403
.env.js
.env.js
+4
-2
App.vue
src/App.vue
+23
-20
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
http.interceptor.js
src/common/http.interceptor.js
+1
-0
appoint-time.vue
src/components/appoint/appoint-time.vue
+3
-2
XhCheckbox.vue
src/components/createCom/XhCheckbox.vue
+0
-1
XhFiles.vue
src/components/createCom/XhFiles.vue
+267
-269
XhPicker.vue
src/components/createCom/XhPicker.vue
+0
-3
XhScan.vue
src/components/createCom/XhScan.vue
+0
-2
XhServiceMeasure.vue
src/components/createCom/XhServiceMeasure.vue
+0
-2
preview.vue
src/components/photo/preview.vue
+33
-30
setting.vue
src/components/photo/setting.vue
+0
-1
standard - 副本.vue
src/components/photo/standard - 副本.vue
+0
-5
index.vue
src/components/tabBarList/index.vue
+9
-5
index.vue
src/components/take/index.vue
+8
-9
readme.md
src/components/take/readme.md
+0
-1
qiniup.js
src/components/upload - 副本/qiniup.js
+0
-1
upload.js
src/components/upload - 副本/upload.js
+0
-2
index.js
src/components/upload/index.js
+180
-180
qiniup.js
src/components/upload/qiniup.js
+0
-1
task.js
src/components/upload/task.js
+18
-5
pages.json
src/pages.json
+2
-1
index.vue
src/pages/exam/index.vue
+0
-15
index.vue
src/pages/index/index.vue
+17
-32
learn.vue
src/pages/index/learn.vue
+15
-21
mine.vue
src/pages/index/mine.vue
+26
-21
order.vue
src/pages/index/order.vue
+1
-8
answer.vue
src/pages/learn/answer.vue
+1
-29
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
+3
-10
index.vue
src/pages/login/index.vue
+1
-0
index.vue
src/pages/mine/cert/index.vue
+5
-2
index.vue
src/pages/mine/contract/index.vue
+0
-1
index.vue
src/pages/mine/deposit/index.vue
+5
-9
index.vue
src/pages/mine/wallet/index.vue
+16
-13
settlement.vue
src/pages/mine/wallet/settlement.vue
+1
-1
statement.vue
src/pages/mine/wallet/statement.vue
+3
-3
withdraw.vue
src/pages/mine/wallet/withdraw.vue
+43
-11
index.vue
src/pages/mine/warehouse/index.vue
+4
-1
detail.vue
src/pages/order/detail.vue
+6
-2
search.vue
src/pages/order/search.vue
+1
-1
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
age.vue
src/pages/settle/age.vue
+0
-2
base.vue
src/pages/settle/base.vue
+0
-1
file.vue
src/pages/settle/file.vue
+18
-13
pay-ensure.vue
src/pages/settle/pay-ensure.vue
+0
-4
prompt.vue
src/pages/settle/prompt.vue
+0
-2
index.js
src/plugins/uploader/index.js
+0
-9
request.js
src/plugins/uploader/request/core/request.js
+0
-1
utils.js
src/plugins/uploader/request/core/utils.js
+0
-1
utils.js
src/plugins/uploader/request/upload/utils.js
+0
-4
index.js
src/router/index.js
+0
-1
icon-flash-off.png
src/static/photo/icon-flash-off.png
+0
-0
icon-flash-torch.png
src/static/photo/icon-flash-torch.png
+0
-0
$u.mixin.js
src/store/$u.mixin.js
+0
-1
index.js
src/store/index.js
+0
-1
login.js
src/utils/login.js
+0
-2
No files found.
.env.js
View file @
45da3ae0
;
;
(
function
()
{
(
function
()
{
let
NODE_ENV
=
'
test'
;
// dev:开发环境 | test:测试环境
let
NODE_ENV
=
'
prod'
;
// dev:开发环境 | test:测试环境 | prod:生产环境
let
ENV_VAR
=
null
;
let
ENV_VAR
=
null
;
if
(
process
.
env
.
NODE_ENV
===
"development"
)
{
if
(
process
.
env
.
NODE_ENV
===
"development"
)
{
if
(
NODE_ENV
===
'dev'
)
{
if
(
NODE_ENV
===
'dev'
)
{
ENV_VAR
=
require
(
'./.env.dev.js'
);
ENV_VAR
=
require
(
'./.env.dev.js'
);
}
else
if
(
NODE_ENV
===
'test'
)
{
}
else
if
(
NODE_ENV
===
'test'
)
{
ENV_VAR
=
require
(
'./.env.test.js'
);
ENV_VAR
=
require
(
'./.env.test.js'
);
}
else
if
(
NODE_ENV
===
'prod'
)
{
ENV_VAR
=
require
(
'./.env.prod.js'
);
}
}
}
else
if
(
process
.
env
.
NODE_ENV
===
"production"
)
{
}
else
if
(
process
.
env
.
NODE_ENV
===
"production"
)
{
...
...
src/App.vue
View file @
45da3ae0
...
@@ -11,11 +11,6 @@ export default {
...
@@ -11,11 +11,6 @@ export default {
// 微信小程序平台编号,空--家维广场,1--自营平台
// 微信小程序平台编号,空--家维广场,1--自营平台
wxAppNo
:
1
,
wxAppNo
:
1
,
//授权提示 图标
icon_auth_notice
:
"https://qn-static.banshouhui.com/auth_notice.png"
,
//授权提示新 图标
icon_auth_notice_new
:
"https://qn-static.banshouhui.com/auth_notice_new.png"
,
// 服务规范教程视频
// 服务规范教程视频
service_standard
:
{
service_standard
:
{
course1
:
{
course1
:
{
...
@@ -47,8 +42,6 @@ export default {
...
@@ -47,8 +42,6 @@ export default {
// 授权用户信息
// 授权用户信息
authUserInfo
:
""
,
authUserInfo
:
""
,
// 用户入驻信息
settledInfo
:
{},
navHeight
:
0
,
//导航栏高度
navHeight
:
0
,
//导航栏高度
rpxScreenHeight
:
0
,
// 照相视框高度
rpxScreenHeight
:
0
,
// 照相视框高度
safeHeight
:
0
,
// 安全高度
safeHeight
:
0
,
// 安全高度
...
@@ -81,30 +74,41 @@ export default {
...
@@ -81,30 +74,41 @@ export default {
// 版本更新
// 版本更新
await
this
.
updateApp
();
await
this
.
updateApp
();
// 系统自动登录
// 系统自动登录
::每次运行小程序重新获取用户信息
await
this
.
autoLogin
();
await
this
.
autoLogin
();
//this.deleteTempImg()
},
},
onShow
:
async
function
()
{
onShow
:
async
function
()
{
// 应用启动,或从后台进入前台显示
// 应用启动,或从后台进入前台显示
if
(
this
.
uploadTask
.
length
>
0
)
{
upload
.
uploadImageTask
(
this
)
}
},
},
onHide
:
function
()
{
onHide
:
function
()
{
// 应用从前台进入后台
// 应用从前台进入后台
},
},
watch
:
{
watch
:
{
uploadTask
:
function
(
newValue
,
oldValue
)
{
uploadTask
:
function
(
newValue
,
oldValue
)
{
console
.
log
(
"oldValue, newValue"
,
oldValue
,
newValue
)
if
(
newValue
.
length
>
0
)
upload
.
uploadImageTask
(
this
)
if
(
newValue
.
length
>
0
)
upload
.
uploadImageTask
(
this
)
}
}
},
},
methods
:
{
methods
:
{
// 处理已上传完成的图片
deleteTempImg
()
{
const
result
=
uni
.
getStorageSync
(
'delImg'
)
if
(
result
.
length
>
0
)
{
for
(
let
i
of
result
)
{
uni
.
removeSavedFile
({
filePath
:
i
})
}
uni
.
setStorageSync
(
'delImg'
,
[])
}
},
getSystemInfo
()
{
getSystemInfo
()
{
try
{
try
{
let
a
=
wx
.
getSystemInfoSync
();
let
a
=
wx
.
getSystemInfoSync
();
// this.globalData.platform = systemInfo.platform, this.globalData.pixelRatio = a.pixelRatio,
// this.globalData.statusBarHeight = a.statusBarHeight, this.globalData.navHeight = a.statusBarHeight / a.screenWidth * 750 + 90,
// this.globalData.rpxScreenHeight = a.screenHeight / a.screenWidth * 750, this.globalData.screenWidth = a.screenWidth,
// this.globalData.screenHeight = a.screenHeight;
this
.
globalData
.
navHeight
=
this
.
globalData
.
navHeight
=
(
a
.
statusBarHeight
/
a
.
screenWidth
)
*
750
+
90
;
(
a
.
statusBarHeight
/
a
.
screenWidth
)
*
750
+
90
;
this
.
globalData
.
rpxScreenHeight
=
this
.
globalData
.
rpxScreenHeight
=
...
@@ -139,8 +143,8 @@ export default {
...
@@ -139,8 +143,8 @@ export default {
async
autoLogin
()
{
async
autoLogin
()
{
let
that
=
this
;
let
that
=
this
;
// 如果token不为空,则跳过自动登录
// 如果token不为空,则跳过自动登录
if
(
that
.
vuex_token
)
{
if
(
that
.
vuex_token
)
{
return
;
return
false
}
}
await
login
.
oauth
().
then
(
async
(
res
)
=>
{
await
login
.
oauth
().
then
(
async
(
res
)
=>
{
if
(
res
.
code
)
{
if
(
res
.
code
)
{
...
@@ -180,6 +184,7 @@ export default {
...
@@ -180,6 +184,7 @@ export default {
this
.
$u
.
vuex
(
"vuex_user"
,
null
);
this
.
$u
.
vuex
(
"vuex_user"
,
null
);
this
.
$u
.
vuex
(
"vuex_wx_uid"
,
""
);
this
.
$u
.
vuex
(
"vuex_wx_uid"
,
""
);
}
}
this
.
$u
.
vuex
(
"vuex_settled"
,
null
);
},
},
/* 版本更新 */
/* 版本更新 */
...
@@ -189,7 +194,6 @@ export default {
...
@@ -189,7 +194,6 @@ export default {
updateManager
.
onCheckForUpdate
(
function
(
res
)
{
updateManager
.
onCheckForUpdate
(
function
(
res
)
{
// 请求完新版本信息的回调
// 请求完新版本信息的回调
console
.
log
(
res
.
hasUpdate
);
});
});
updateManager
.
onUpdateReady
(
function
(
res
)
{
updateManager
.
onUpdateReady
(
function
(
res
)
{
...
@@ -268,7 +272,6 @@ export default {
...
@@ -268,7 +272,6 @@ export default {
}
}
},
},
initShare
(
option
)
{
initShare
(
option
)
{
console
.
log
(
option
,
"option-initShare"
);
option
=
option
||
{};
option
=
option
||
{};
if
(
AnalysysAgent
&&
option
.
user_id
)
{
if
(
AnalysysAgent
&&
option
.
user_id
)
{
let
shareUserInfo
=
{
let
shareUserInfo
=
{
...
...
src/common/api/cloud_rules.js
deleted
100644 → 0
View file @
155b62bc
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 @
45da3ae0
import
{
cloudRulesApiFun
}
from
"@/common/api/cloud_rules.js"
import
{
import
{
commonApiFun
commonApiFun
}
from
'@/common/api/common.js'
;
}
from
'@/common/api/common.js'
;
...
@@ -14,7 +11,6 @@ import {certApiFun} from"@/common/api/cert.js"
...
@@ -14,7 +11,6 @@ import {certApiFun} from"@/common/api/cert.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
)
let
cloudApi
=
cloudRulesApiFun
(
vm
)
let
learnApi
=
learnApiFun
(
vm
)
let
learnApi
=
learnApiFun
(
vm
)
let
assessmentApi
=
assessmentApiFun
(
vm
)
let
assessmentApi
=
assessmentApiFun
(
vm
)
let
orderApi
=
orderApiFun
(
vm
)
let
orderApi
=
orderApiFun
(
vm
)
...
@@ -22,7 +18,6 @@ let apiFun = function(vm) {
...
@@ -22,7 +18,6 @@ let apiFun = function(vm) {
let
apiUrl
=
{
let
apiUrl
=
{
...
commonApi
,
...
commonApi
,
...
settledApi
,
...
settledApi
,
...
cloudApi
,
...
learnApi
,
...
learnApi
,
...
orderApi
,
...
orderApi
,
...
assessmentApi
,
...
assessmentApi
,
...
...
src/common/http.api.js
View file @
45da3ae0
import
{
apiFun
}
from
'@/common/api/index.js'
;
import
{
apiFun
}
from
'@/common/api/index.js'
;
import
{
cloudRulesApiFun
}
from
"@/common/api/cloud_rules.js"
const
install
=
(
Vue
,
vm
)
=>
{
const
install
=
(
Vue
,
vm
)
=>
{
let
apiUrls
=
apiFun
(
vm
)
let
apiUrls
=
apiFun
(
vm
)
...
@@ -9,10 +7,6 @@ const install = (Vue, vm) => {
...
@@ -9,10 +7,6 @@ const install = (Vue, vm) => {
vm
.
$u
.
api
=
{
vm
.
$u
.
api
=
{
...
apiUrls
,
...
apiUrls
,
};
};
let
cloudRules
=
cloudRulesApiFun
(
vm
)
vm
.
$u
.
cloudApi
=
{
...
cloudRules
}
}
}
export
default
{
export
default
{
...
...
src/common/http.interceptor.js
View file @
45da3ae0
...
@@ -97,6 +97,7 @@ const install = (Vue, vm) => {
...
@@ -97,6 +97,7 @@ const install = (Vue, vm) => {
vm
.
$u
.
vuex
(
'vuex_token'
,
''
);
vm
.
$u
.
vuex
(
'vuex_token'
,
''
);
vm
.
$u
.
vuex
(
'vuex_user'
,
null
);
vm
.
$u
.
vuex
(
'vuex_user'
,
null
);
vm
.
$u
.
vuex
(
'vuex_wx_uid'
,
''
);
vm
.
$u
.
vuex
(
'vuex_wx_uid'
,
''
);
vm
.
$u
.
vuex
(
"vuex_settled"
,
null
);
toLoginPage
()
toLoginPage
()
case
403
:
//没有权限访问
case
403
:
//没有权限访问
case
500
:
case
500
:
...
...
src/components/appoint/appoint-time.vue
View file @
45da3ae0
...
@@ -318,8 +318,9 @@
...
@@ -318,8 +318,9 @@
border
:
none
;
border
:
none
;
}
}
button
[
disabled
]
:not
([
type
])
{
button
[
disabled
]
:not
([
type
])
{
background
:
#d1d4d4
;
background
:
#FFFFFF
;
color
:
#ffffff
;
color
:
#CCCCCC
;
border
:
2rpx
solid
#F4F5F7
;
}
}
}
}
}
}
...
...
src/components/createCom/XhCheckbox.vue
View file @
45da3ae0
...
@@ -32,7 +32,6 @@
...
@@ -32,7 +32,6 @@
}
}
const
dataValue
=
this
.
dataValue
const
dataValue
=
this
.
dataValue
let
flag
=
Array
.
isArray
(
dataValue
)
&&
dataValue
.
indexOf
(
item
)
>-
1
let
flag
=
Array
.
isArray
(
dataValue
)
&&
dataValue
.
indexOf
(
item
)
>-
1
console
.
log
(
flag
,
'flag'
)
return
flag
return
flag
},
},
setValue
(
txt
)
{
setValue
(
txt
)
{
...
...
src/components/createCom/XhFiles.vue
View file @
45da3ae0
...
@@ -28,7 +28,7 @@
...
@@ -28,7 +28,7 @@
import
arrMixin
from
'./arrMixin'
import
arrMixin
from
'./arrMixin'
import
baseFile
from
'@/components/upload/index'
;
import
baseFile
from
'@/components/upload/index'
;
import
takePhoto
from
'@/components/take/index.vue'
import
takePhoto
from
'@/components/take/index.vue'
import
uploader
from
'@/plugins/uploader/index.js'
// import uploader from '@/plugins/uploader/index.js'
export
default
{
export
default
{
name
:
'XhFiles'
,
name
:
'XhFiles'
,
...
@@ -156,12 +156,10 @@
...
@@ -156,12 +156,10 @@
// load: false, //(默认 true 说明:本接口是否提示加载动画)
// load: false, //(默认 true 说明:本接口是否提示加载动画)
// maxSize: 300000, //(默认 无 说明:上传的文件最大字节数限制,默认不限制)
// maxSize: 300000, //(默认 无 说明:上传的文件最大字节数限制,默认不限制)
// onEachUpdate: res => {
// onEachUpdate: res => {
// console.log("上传成功返回:",res);
// const value = [uploader.qiniuTokenObj.visitPrefix + res.url]
// const value = [uploader.qiniuTokenObj.visitPrefix + res.url]
// this.valueChange(value)
// this.valueChange(value)
// },
// },
// Update: res => {
// Update: res => {
// console.log("上传进度返回:",res);
// }
// }
// }
// }
// uploader.qnFileUpload(options)
// uploader.qnFileUpload(options)
...
...
src/components/createCom/XhPicker.vue
View file @
45da3ae0
...
@@ -64,15 +64,12 @@
...
@@ -64,15 +64,12 @@
})
})
this
.
dataValue
=
result
this
.
dataValue
=
result
this
.
valueChange
(
result
)
this
.
valueChange
(
result
)
console
.
log
(
result
,
'result'
)
},
},
columnchange
(
data
){
columnchange
(
data
){
console
.
log
(
data
,
'data'
)
// 树列改变时进行联动操作
// 树列改变时进行联动操作
const
{
column
,
index
}
=
data
const
{
column
,
index
}
=
data
let
arr
=
[
9
,
10
,
50
]
let
arr
=
[
9
,
10
,
50
]
this
.
settings
.
splice
(
column
+
1
,
1
,
arr
)
this
.
settings
.
splice
(
column
+
1
,
1
,
arr
)
console
.
log
(
this
.
settings
,
'this.settings'
)
},
},
}
}
}
}
...
...
src/components/createCom/XhScan.vue
View file @
45da3ae0
...
@@ -44,8 +44,6 @@
...
@@ -44,8 +44,6 @@
success
:
function
(
res
)
{
success
:
function
(
res
)
{
self
.
dataValue
=
res
.
result
self
.
dataValue
=
res
.
result
self
.
valueChange
(
res
.
result
)
self
.
valueChange
(
res
.
result
)
// console.log('条码类型:' + res.scanType);
// console.log('条码内容:' + res.result);
}
}
});
});
},
},
...
...
src/components/createCom/XhServiceMeasure.vue
View file @
45da3ae0
...
@@ -146,12 +146,10 @@
...
@@ -146,12 +146,10 @@
this
.
valueChange
(
JSON
.
stringify
(
result
))
this
.
valueChange
(
JSON
.
stringify
(
result
))
},
},
columnchange
(
data
){
columnchange
(
data
){
// console.log(data,'data')
// // 树列改变时进行联动操作
// // 树列改变时进行联动操作
// const {column ,index} = data
// const {column ,index} = data
// let arr = [9,10,50]
// let arr = [9,10,50]
// this.settings.splice(column+1,1,arr)
// this.settings.splice(column+1,1,arr)
// console.log(this.settings,'this.settings')
},
},
}
}
}
}
...
...
src/components/photo/preview.vue
View file @
45da3ae0
...
@@ -64,6 +64,7 @@
...
@@ -64,6 +64,7 @@
methods
:
{
methods
:
{
// 保存照片到本地
// 保存照片到本地
async
saveTempToLocal
(
tempImagePath
)
{
async
saveTempToLocal
(
tempImagePath
)
{
return
new
Promise
(
async
(
resolve
,
reject
)
=>
{
//has_origin //是否保存原图
//has_origin //是否保存原图
let
that
=
this
let
that
=
this
const
photo
=
getApp
().
globalData
.
photo
const
photo
=
getApp
().
globalData
.
photo
...
@@ -71,7 +72,7 @@
...
@@ -71,7 +72,7 @@
return
return
}
}
let
path
=
''
let
path
=
''
if
(
photo
.
tempPath
.
origin
&&
photo
.
waterSetting
.
hasOrigin
){
if
(
photo
.
tempPath
.
origin
&&
photo
?.
waterSetting
?
.
hasOrigin
){
// 保存原图到本地
// 保存原图到本地
path
=
photo
.
tempPath
.
origin
path
=
photo
.
tempPath
.
origin
let
result
=
await
this
.
saveLocal
(
path
)
let
result
=
await
this
.
saveLocal
(
path
)
...
@@ -92,8 +93,10 @@
...
@@ -92,8 +93,10 @@
icon
:
'none'
,
icon
:
'none'
,
title
:
'已将水印图片保存到本地相册'
title
:
'已将水印图片保存到本地相册'
})
})
resolve
()
}
}
}
}
})
},
},
saveLocal
(
path
){
saveLocal
(
path
){
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
...
@@ -128,13 +131,13 @@
...
@@ -128,13 +131,13 @@
//this.$emit('finish')
//this.$emit('finish')
},
},
// 确认图片
// 确认图片
continuePhoto
()
{
async
continuePhoto
()
{
const
photo
=
getApp
().
globalData
.
photo
const
photo
=
getApp
().
globalData
.
photo
let
self
=
this
let
self
=
this
uni
.
showLoading
({
uni
.
showLoading
({
title
:
'图片保存中…'
title
:
'图片保存中…'
})
})
self
.
saveTempToLocal
()
await
self
.
saveTempToLocal
()
if
(
this
.
upload
)
{
if
(
this
.
upload
)
{
self
.
confirmUpload
(
true
)
self
.
confirmUpload
(
true
)
...
...
src/components/photo/setting.vue
View file @
45da3ae0
...
@@ -89,7 +89,6 @@
...
@@ -89,7 +89,6 @@
},
},
computed
:
{
computed
:
{
itemList
()
{
itemList
()
{
console
.
log
(
this
.
result
)
if
(
this
.
result
[
'lowerLeft'
])
{
if
(
this
.
result
[
'lowerLeft'
])
{
var
arr
=
this
.
result
[
'lowerLeft'
][
'body'
]
var
arr
=
this
.
result
[
'lowerLeft'
][
'body'
]
return
arr
.
filter
((
item
)
=>
{
return
arr
.
filter
((
item
)
=>
{
...
...
src/components/photo/standard - 副本.vue
View file @
45da3ae0
...
@@ -64,17 +64,14 @@
...
@@ -64,17 +64,14 @@
// let swiperList = JSON.parse(JSON.stringify(val))
// let swiperList = JSON.parse(JSON.stringify(val))
// let len = tabs.length
// let len = tabs.length
// let tabList = [{name:'拍照要求'}].concat(Array.from({name:'示意图'},len))
// let tabList = [{name:'拍照要求'}].concat(Array.from({name:'示意图'},len))
// console.log(tabList,'tabList')
}
}
},
},
},
},
created
()
{
created
()
{
// getApp().trackPage('照片预览页')
// getApp().trackPage('照片预览页')
// console.log(e, 'e')
// if (e.img) {
// if (e.img) {
// this.images = [e.img]
// this.images = [e.img]
// }
// }
// console.log(this.images, 'this.images')
},
},
mounted
(){
mounted
(){
this
.
changeList
(
this
.
currentItem
.
images
)
this
.
changeList
(
this
.
currentItem
.
images
)
...
@@ -112,7 +109,6 @@
...
@@ -112,7 +109,6 @@
},
},
// swiper-item左右移动,通知tabs的滑块跟随移动
// swiper-item左右移动,通知tabs的滑块跟随移动
transition
(
e
)
{
transition
(
e
)
{
// console.log(e.detail,'e.detail-transition')
// let dx = e.detail.dx;
// let dx = e.detail.dx;
// this.$refs.uTabs.setDx(dx);
// this.$refs.uTabs.setDx(dx);
},
},
...
@@ -122,7 +118,6 @@
...
@@ -122,7 +118,6 @@
// 由于swiper的内部机制问题,快速切换swiper不会触发dx的连续变化,需要在结束时重置状态
// 由于swiper的内部机制问题,快速切换swiper不会触发dx的连续变化,需要在结束时重置状态
// swiper滑动结束,分别设置tabs和swiper的状态
// swiper滑动结束,分别设置tabs和swiper的状态
animationfinish
(
e
)
{
animationfinish
(
e
)
{
// console.log(e.detail,'e.detail-animationfinish')
// let current = e.detail.current;
// let current = e.detail.current;
// this.$refs.uTabs.setFinishCurrent(current);
// this.$refs.uTabs.setFinishCurrent(current);
// this.swiperCurrent = current;
// this.swiperCurrent = current;
...
...
src/components/tabBarList/index.vue
View file @
45da3ae0
<
template
>
<
template
>
<view
:class=
"['content',
{'fixed': fixed}]">
<view
:class=
"['content',
{'fixed': fixed}]">
<view
@
click=
"handleClick"
>
<u-navbar
:is-back=
"false"
:is-fixed=
"false"
:background=
"
{ background: 'transparent' }" :border-bottom="false">
<u-navbar
:is-back=
"false"
:is-fixed=
"false"
:background=
"
{ background: 'transparent' }" :border-bottom="false">
<text
class=
"title-view"
>
{{
title
}}
</text>
<text
class=
"title-view"
>
{{
title
}}
</text>
</u-navbar>
</u-navbar>
</view>
<slot></slot>
<slot></slot>
</view>
</view>
</
template
>
</
template
>
...
@@ -25,7 +27,9 @@
...
@@ -25,7 +27,9 @@
}
}
},
},
methods
:
{
methods
:
{
handleClick
()
{
this
.
$emit
(
'click'
)
}
}
}
}
}
</
script
>
</
script
>
...
...
src/components/take/index.vue
View file @
45da3ae0
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
<cover-image
@
click=
"setCameraInfo('devicePosition')"
class=
"icon"
mode=
"aspectFit"
<cover-image
@
click=
"setCameraInfo('devicePosition')"
class=
"icon"
mode=
"aspectFit"
src=
"/static/photo/icon-switch.png"
></cover-image>
src=
"/static/photo/icon-switch.png"
></cover-image>
<cover-image
@
click=
"setCameraInfo('flash')"
class=
"icon"
mode=
"aspectFit"
<cover-image
@
click=
"setCameraInfo('flash')"
class=
"icon"
mode=
"aspectFit"
:src=
"'/static/photo/icon-
light
-' + cameraInfo.flash +'.png'"
></cover-image>
:src=
"'/static/photo/icon-
flash
-' + cameraInfo.flash +'.png'"
></cover-image>
<cover-image
v-if=
"currentItem.partnerCompanyId"
@
click=
"changeType(3)"
class=
"icon"
mode=
"aspectFit"
<cover-image
v-if=
"currentItem.partnerCompanyId"
@
click=
"changeType(3)"
class=
"icon"
mode=
"aspectFit"
src=
"/static/photo/icon-setting.png"
></cover-image>
src=
"/static/photo/icon-setting.png"
></cover-image>
</cover-view>
</cover-view>
...
@@ -84,7 +84,7 @@
...
@@ -84,7 +84,7 @@
standardShow
:
false
,
standardShow
:
false
,
cameraInfo
:
{
cameraInfo
:
{
devicePosition
:
'back'
,
devicePosition
:
'back'
,
flash
:
'
auto
'
flash
:
'
off
'
},
},
waterInfo
:
{
waterInfo
:
{
longitude
:
''
,
// 经度
longitude
:
''
,
// 经度
...
@@ -135,7 +135,7 @@
...
@@ -135,7 +135,7 @@
this
.
initData
()
this
.
initData
()
photo
.
currentItem
=
this
.
currentItem
photo
.
currentItem
=
this
.
currentItem
if
(
this
.
currentItem
.
images
&&
this
.
currentItem
.
images
.
length
>
0
)
{
if
(
this
.
currentItem
.
images
&&
this
.
currentItem
.
images
.
length
>
0
)
{
this
.
shadowInitShow
=
tru
e
this
.
shadowInitShow
=
fals
e
this
.
standardShow
=
true
this
.
standardShow
=
true
this
.
standardStatus
=
true
this
.
standardStatus
=
true
}
}
...
@@ -222,7 +222,7 @@
...
@@ -222,7 +222,7 @@
val
=
val
===
'back'
?
'front'
:
'back'
val
=
val
===
'back'
?
'front'
:
'back'
break
;
break
;
case
'flash'
:
case
'flash'
:
val
=
val
===
'
auto'
?
'on'
:
(
val
===
'on'
?
'off'
:
'auto'
)
val
=
val
===
'
off'
?
'torch'
:
'off'
break
;
break
;
defalut
:
defalut
:
...
@@ -248,7 +248,7 @@
...
@@ -248,7 +248,7 @@
waterInfo
.
address
=
i
waterInfo
.
address
=
i
},
},
fail
:
function
(
err
)
{
fail
:
function
(
err
)
{
//
console.log(err, 'err')
console
.
log
(
err
,
'err'
)
}
}
};
};
if
(
waterInfo
.
latitude
&&
waterInfo
.
longitude
)
{
if
(
waterInfo
.
latitude
&&
waterInfo
.
longitude
)
{
...
@@ -383,7 +383,6 @@
...
@@ -383,7 +383,6 @@
const
waterSetting
=
this
.
waterSetting
const
waterSetting
=
this
.
waterSetting
const
globalTempPath
=
getApp
().
globalData
.
photo
.
tempPath
const
globalTempPath
=
getApp
().
globalData
.
photo
.
tempPath
const
ratio
=
this
.
ratio
const
ratio
=
this
.
ratio
console
.
log
(
this
.
ratio
,
'this.ratio'
)
// const ratio = 0.5
// const ratio = 0.5
let
canvasWidth
=
this
.
cameraWidth
*
ratio
let
canvasWidth
=
this
.
cameraWidth
*
ratio
let
canvasHeight
=
this
.
cameraHeight
*
ratio
let
canvasHeight
=
this
.
cameraHeight
*
ratio
...
...
src/components/take/readme.md
View file @
45da3ae0
...
@@ -84,7 +84,6 @@ export default {
...
@@ -84,7 +84,6 @@ export default {
},
},
// 拍照完成或关闭相机
// 拍照完成或关闭相机
closeTake
(
images
)
{
closeTake
(
images
)
{
console
.
log
(
images
)
this
.
takeStatus
=
false
this
.
takeStatus
=
false
}
}
}
}
...
...
src/components/upload - 副本/qiniup.js
View file @
45da3ae0
...
@@ -91,7 +91,6 @@ export default {
...
@@ -91,7 +91,6 @@ export default {
}
}
qiniuUploader
.
upload
(
params
,
(
res
)
=>
{
qiniuUploader
.
upload
(
params
,
(
res
)
=>
{
console
.
log
(
res
,
'res'
)
let
inLen
=
self
.
maximum
-
fileList
.
length
let
inLen
=
self
.
maximum
-
fileList
.
length
if
(
inLen
>
0
)
{
if
(
inLen
>
0
)
{
item
.
src
=
file
item
.
src
=
file
...
...
src/components/upload - 副本/upload.js
View file @
45da3ae0
...
@@ -61,7 +61,6 @@ export default {
...
@@ -61,7 +61,6 @@ export default {
uni
.
chooseImage
({
uni
.
chooseImage
({
count
:
this
.
selectNum
,
//默认9 this.selectNum
count
:
this
.
selectNum
,
//默认9 this.selectNum
success
:
(
chooseImageRes
)
=>
{
success
:
(
chooseImageRes
)
=>
{
console
.
log
(
chooseImageRes
,
'chooseImageRes'
)
for
(
var
i
=
0
;
i
<
chooseImageRes
.
tempFilePaths
.
length
;
i
++
)
{
for
(
var
i
=
0
;
i
<
chooseImageRes
.
tempFilePaths
.
length
;
i
++
)
{
let
file
=
chooseImageRes
.
tempFilePaths
[
i
];
let
file
=
chooseImageRes
.
tempFilePaths
[
i
];
let
index
=
file
.
lastIndexOf
(
'/'
);
let
index
=
file
.
lastIndexOf
(
'/'
);
...
@@ -82,7 +81,6 @@ export default {
...
@@ -82,7 +81,6 @@ export default {
}
}
if
(
newLen
>
0
)
{
if
(
newLen
>
0
)
{
qiniuUploader
.
upload
(
params
,
(
res
)
=>
{
qiniuUploader
.
upload
(
params
,
(
res
)
=>
{
console
.
log
(
res
,
'res'
)
let
inLen
=
this
.
selectNum
-
this
.
imgList
.
length
let
inLen
=
this
.
selectNum
-
this
.
imgList
.
length
if
(
inLen
>
0
)
{
if
(
inLen
>
0
)
{
item
.
src
=
file
item
.
src
=
file
...
...
src/components/upload/index.js
View file @
45da3ae0
...
@@ -25,7 +25,6 @@ export default {
...
@@ -25,7 +25,6 @@ export default {
};
};
},
},
created
()
{
created
()
{
// console.log(uploader,'uploader')
// this.initQiniu()
// this.initQiniu()
},
},
methods
:
{
methods
:
{
...
@@ -48,13 +47,18 @@ export default {
...
@@ -48,13 +47,18 @@ export default {
*/
*/
async
saveToTask
(
files
)
{
async
saveToTask
(
files
)
{
// 生成key返回,然后把key放到异步上传的任务队列
// 生成key返回,然后把key放到异步上传的任务队列
let
lists
=
[]
let
lists
=
files
.
map
(
v
=>
{
for
(
let
i
=
0
;
i
<
files
.
length
;
i
++
)
{
return
{
const
path
=
files
[
i
]
key
:
randomChar
(
10
),
const
row
=
await
this
.
saveFiles
(
path
)
path
:
v
,
lists
.
push
(
row
)
src
:
''
}
}
})
// for (let i = 0; i < files.length; i++) {
// const path = files[i]
// const row = await this.saveFiles(path)
// lists.push(row)
// }
const
data
=
this
.
uploadTask
const
data
=
this
.
uploadTask
const
saveLists
=
data
.
concat
(
lists
)
const
saveLists
=
data
.
concat
(
lists
)
this
.
$u
.
vuex
(
'uploadTask'
,
saveLists
)
this
.
$u
.
vuex
(
'uploadTask'
,
saveLists
)
...
@@ -129,7 +133,6 @@ export default {
...
@@ -129,7 +133,6 @@ export default {
imgList
[
res
.
fileIndex
]
imgList
[
res
.
fileIndex
]
self
.
imgList
=
imgList
self
.
imgList
=
imgList
// 多文件上传每个文件进度条
// 多文件上传每个文件进度条
//console.log(res,'res---onProgressUpdate')
},
},
onEachUpdate
(
res
){
onEachUpdate
(
res
){
// 多文件上传每个文件上传成功触发
// 多文件上传每个文件上传成功触发
...
@@ -138,7 +141,6 @@ export default {
...
@@ -138,7 +141,6 @@ export default {
imgList
[
res
.
fileIndex
].
src
=
uploader
.
qiniuTokenObj
.
visitPrefix
+
res
.
url
imgList
[
res
.
fileIndex
].
src
=
uploader
.
qiniuTokenObj
.
visitPrefix
+
res
.
url
}
}
self
.
imgList
=
imgList
self
.
imgList
=
imgList
//console.log(res,'res---onEachUpdate')
},
},
cardType
:
category
,
cardType
:
category
,
...
config
...
config
...
@@ -146,8 +148,6 @@ export default {
...
@@ -146,8 +148,6 @@ export default {
// 不需要进度条等可直接获取
// 不需要进度条等可直接获取
let
res
=
await
uploader
.
qnImgUpload
(
options
)
let
res
=
await
uploader
.
qnImgUpload
(
options
)
// console.log(self.imgList,'self.imgList')
// console.log(uploader,uploader.qiniuTokenObj,'qiniuTokenObj')
// let imgList = res.map(item=>{
// let imgList = res.map(item=>{
// return {
// return {
// key:item,
// key:item,
...
...
src/components/upload/qiniup.js
View file @
45da3ae0
...
@@ -91,7 +91,6 @@ export default {
...
@@ -91,7 +91,6 @@ export default {
}
}
qiniuUploader
.
upload
(
params
,
(
res
)
=>
{
qiniuUploader
.
upload
(
params
,
(
res
)
=>
{
console
.
log
(
res
,
'res111'
)
let
inLen
=
self
.
maximum
-
fileList
.
length
let
inLen
=
self
.
maximum
-
fileList
.
length
if
(
inLen
>
0
)
{
if
(
inLen
>
0
)
{
item
.
src
=
file
item
.
src
=
file
...
...
src/components/upload/task.js
View file @
45da3ae0
...
@@ -7,7 +7,6 @@ export default {
...
@@ -7,7 +7,6 @@ export default {
*/
*/
async
uploadImageTask
(
that
)
{
async
uploadImageTask
(
that
)
{
const
uploadTask
=
that
.
uploadTask
const
uploadTask
=
that
.
uploadTask
console
.
log
(
"uploadTask"
,
uploadTask
)
const
options
=
{
const
options
=
{
files
:
uploadTask
,
// 必填 临时文件路径 格式: [{path: "图片地址"}]
files
:
uploadTask
,
// 必填 临时文件路径 格式: [{path: "图片地址"}]
...
@@ -15,13 +14,27 @@ export default {
...
@@ -15,13 +14,27 @@ export default {
maxSize
:
300000
,
//(默认 无 说明:上传的文件最大字节数限制,默认不限制)
maxSize
:
300000
,
//(默认 无 说明:上传的文件最大字节数限制,默认不限制)
onEachUpdate
:
res
=>
{
onEachUpdate
:
res
=>
{
console
.
log
(
"上传成功返回:"
,
res
);
console
.
log
(
"上传成功返回:"
,
res
);
const
newTask
=
uploadTask
.
filter
(
v
=>
v
.
key
!==
res
.
key
)
// that.$u.vuex('uploadTask', newTask)
},
},
Update
:
res
=>
{
Update
:
res
=>
{
console
.
log
(
"上传进度返回:"
,
res
);
console
.
log
(
"上传进度返回:"
,
res
);
}
}
}
}
uploader
.
qnFileUpload
(
options
)
const
result
=
await
uploader
.
qnFileUpload
(
options
)
},
if
(
result
&&
!
result
.
statusCode
)
{
// 匹配已上传完成的图片,更新缓存数据
let
newTask
=
[]
let
delImg
=
[]
uploadTask
.
forEach
(
v
=>
{
if
(
result
.
includes
(
`/
${
v
.
key
}
`
))
{
// 删除已上传的图片
delImg
.
push
(
v
.
path
)
}
else
{
// 未上传的重新存储
newTask
.
push
(
v
)
}
})
// uni.setStorageSync('delImg', delImg) // 已上传完的图片,会在启动系统的时候做一次清理
that
.
$u
.
vuex
(
'uploadTask'
,
newTask
)
}
}
}
}
\ No newline at end of file
src/pages.json
View file @
45da3ae0
...
@@ -204,7 +204,8 @@
...
@@ -204,7 +204,8 @@
"path"
:
"cert/index"
,
"path"
:
"cert/index"
,
"style"
:
{
"style"
:
{
"navigationBarTitleText"
:
"我的证件"
,
"navigationBarTitleText"
:
"我的证件"
,
"navigationStyle"
:
"custom"
"navigationStyle"
:
"custom"
,
"disableScroll"
:
true
}
}
},
},
{
{
...
...
src/pages/exam/index.vue
View file @
45da3ae0
...
@@ -392,15 +392,6 @@
...
@@ -392,15 +392,6 @@
itemClick
:
function
(
currentItem
,
ikey
)
{
itemClick
:
function
(
currentItem
,
ikey
)
{
this
.
isSelect
=
true
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
++
)
{
for
(
let
i
=
0
;
i
<
this
.
currentItem
.
answerList
.
length
;
i
++
)
{
...
@@ -434,12 +425,6 @@
...
@@ -434,12 +425,6 @@
//有选答案
//有选答案
this
.
isSelect
=
isSelect
this
.
isSelect
=
isSelect
// console.log('选点点击--处理后--this.currentItem.answerList:')
// console.log(this.currentItem.answerList)
},
},
// 点击下一步
// 点击下一步
handleClick
()
{
handleClick
()
{
...
...
src/pages/index/index.vue
View file @
45da3ae0
<
template
>
<
template
>
<TabBarPage
title=
"扳手会"
:fixed=
"true"
>
<TabBarPage
title=
"扳手会"
:fixed=
"true"
@
click=
"goTop"
>
<view
class=
"content-view"
>
<view
class=
"content-view"
>
<scroll-view
s
croll-y
@
scrolltolower=
"reachBottom
"
<scroll-view
s
tyle=
"height: 100%;"
scroll-y
@
scrolltolower=
"reachBottom"
:scroll-top=
"scrollTop"
@
scroll=
"scroll
"
scroll-anchoring
scroll-y=
"true"
refresher-enabled=
"true"
:refresher-triggered=
"triggered"
:refresher-threshold=
"100"
scroll-anchoring
scroll-y=
"true"
refresher-enabled=
"true"
:refresher-triggered=
"triggered"
:refresher-threshold=
"100"
refresher-background=
"#F4F5F7"
@
refresherpulling=
"triggered = true"
@
refresherrefresh=
"onRefresh"
refresher-background=
"#F4F5F7"
@
refresherpulling=
"triggered = true"
@
refresherrefresh=
"onRefresh"
@
refresherrestore=
"onRestore"
@
refresherabort=
"onAbort"
enable-back-to-top
>
@
refresherrestore=
"onRestore"
@
refresherabort=
"onAbort"
enable-back-to-top
>
...
@@ -117,6 +117,10 @@
...
@@ -117,6 +117,10 @@
triggered
:
false
,
triggered
:
false
,
_freshing
:
false
,
_freshing
:
false
,
visible
:
false
,
visible
:
false
,
scrollTop
:
0
,
old
:
{
scrollTop
:
0
}
};
};
},
},
watch
:
{
watch
:
{
...
@@ -172,20 +176,6 @@
...
@@ -172,20 +176,6 @@
this
.
getLocation
()
this
.
getLocation
()
}
}
},
},
// onPullDownRefresh() {
// console.log('------下拉刷新------')
// // 下拉刷洗
// this.initSettleInfo()
// },
// onReachBottom() {
// console.log('----------底部-------------', this.currentLoadStatus)
// if (this.currentLoadStatus != 'loadmore') return
// this.currentLoadStatus == 'loading'
// this.loadOrderList()
// },
// onPageScroll(obj) {
// console.log('---------scroll---------', obj)
// },
methods
:
{
methods
:
{
getData
()
{
getData
()
{
this
.
getOrderCount
()
this
.
getOrderCount
()
...
@@ -274,9 +264,6 @@
...
@@ -274,9 +264,6 @@
}
}
});
});
},
},
onRestore
()
{
this
.
triggered
=
"restore"
;
},
reachBottom
()
{
reachBottom
()
{
if
(
this
.
vuex_token
)
{
if
(
this
.
vuex_token
)
{
if
(
this
.
currentLoadStatus
!=
'loadmore'
)
return
if
(
this
.
currentLoadStatus
!=
'loadmore'
)
return
...
@@ -284,9 +271,6 @@
...
@@ -284,9 +271,6 @@
this
.
loadOrderList
()
this
.
loadOrderList
()
}
}
},
},
onPulling
(
e
)
{
console
.
log
(
"onpulling"
,
e
);
},
onRefresh
()
{
onRefresh
()
{
if
(
this
.
_freshing
)
return
;
if
(
this
.
_freshing
)
return
;
this
.
_freshing
=
true
;
this
.
_freshing
=
true
;
...
@@ -294,14 +278,15 @@
...
@@ -294,14 +278,15 @@
},
},
onRestore
()
{
onRestore
()
{
this
.
triggered
=
'restore'
;
// 需要重置
this
.
triggered
=
'restore'
;
// 需要重置
console
.
log
(
"onRestore"
);
},
},
onAbort
(
)
{
scroll
(
e
)
{
console
.
log
(
"onAbort"
);
this
.
old
.
scrollTop
=
e
.
detail
.
scrollTop
},
},
// clickSwiper(index) {},
goTop
(
e
)
{
handleScroll
()
{
this
.
scrollTop
=
this
.
old
.
scrollTop
console
.
log
(
"-----scroll-------"
);
this
.
$nextTick
(
function
()
{
this
.
scrollTop
=
0
});
},
},
/* 立即入驻 */
/* 立即入驻 */
immediatelyIn
()
{
immediatelyIn
()
{
...
...
src/pages/index/learn.vue
View file @
45da3ae0
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
<image
:src=
"bannerImage"
mode=
""
class=
"banner"
></image>
<image
:src=
"bannerImage"
mode=
""
class=
"banner"
></image>
<u-tabs-swiper
bg-color=
"#F4F5F7"
inactive-color=
"#999999"
font-size=
"28"
ref=
"uTabs"
:list=
"tabs"
:current=
"current"
@
change=
"tabsChange"
:is-scroll=
"false"
:bar-width=
"52"
swiperWidth=
"750"
></u-tabs-swiper>
<u-tabs-swiper
bg-color=
"#F4F5F7"
inactive-color=
"#999999"
font-size=
"28"
ref=
"uTabs"
:list=
"tabs"
:current=
"current"
@
change=
"tabsChange"
:is-scroll=
"false"
:bar-width=
"52"
swiperWidth=
"750"
></u-tabs-swiper>
<swiper
class=
"swiper_group"
:current=
"swiperCurrent"
@
transition=
"transition"
@
animationfinish=
"animationfinish"
>
<swiper
class=
"swiper_group"
:current=
"swiperCurrent"
@
transition=
"transition"
@
animationfinish=
"animationfinish"
>
<swiper-item
@
touchmove
.
stop
.
prevent=
"stopTouchMove"
v-show=
"current == 0"
>
<swiper-item
@
touchmove
.
stop
.
prevent=
"stopTouchMove"
>
<scroll-view
scroll-y
style=
"height:100%;width:100%;"
>
<scroll-view
scroll-y
style=
"height:100%;width:100%;"
>
<view
class=
"jf-currency-class"
>
<view
class=
"jf-currency-class"
>
<image
:src=
"jianBianImg"
mode=
""
class=
"current-img"
></image>
<image
:src=
"jianBianImg"
mode=
""
class=
"current-img"
></image>
...
@@ -21,7 +21,7 @@
...
@@ -21,7 +21,7 @@
</view>
</view>
</scroll-view>
</scroll-view>
</swiper-item>
</swiper-item>
<swiper-item
@
touchmove
.
stop
.
prevent=
"stopTouchMove"
v-show=
"current == 1"
>
<swiper-item
@
touchmove
.
stop
.
prevent=
"stopTouchMove"
>
<scroll-view
scroll-y
style=
"height:100%;width:100%;"
@
scrolltolower=
"onreachBottom"
scroll-y=
"true"
refresher-enabled=
"true"
:refresher-triggered=
"triggered"
:refresher-threshold=
"100"
@
refresherpulling=
"onPulling"
@
refresherrefresh=
"onRefresh"
@
refresherrestore=
"onRestore"
@
refresherabort=
"onAbort"
>
<scroll-view
scroll-y
style=
"height:100%;width:100%;"
@
scrolltolower=
"onreachBottom"
scroll-y=
"true"
refresher-enabled=
"true"
:refresher-triggered=
"triggered"
:refresher-threshold=
"100"
@
refresherpulling=
"onPulling"
@
refresherrefresh=
"onRefresh"
@
refresherrestore=
"onRestore"
@
refresherabort=
"onAbort"
>
<view
v-for=
"item in list"
:key=
"item.id"
class=
"notice"
@
click=
"bbb(item)"
>
<view
v-for=
"item in list"
:key=
"item.id"
class=
"notice"
@
click=
"bbb(item)"
>
<view
class=
"n-head"
>
<view
class=
"n-head"
>
...
@@ -41,7 +41,7 @@
...
@@ -41,7 +41,7 @@
</view>
</view>
</scroll-view>
</scroll-view>
</swiper-item>
</swiper-item>
<swiper-item
@
touchmove
.
stop
.
prevent=
"stopTouchMove"
v-show=
"current == 2"
>
<swiper-item
@
touchmove
.
stop
.
prevent=
"stopTouchMove"
>
<scroll-view
scroll-y
style=
"height:100%;width:100%;"
>
<scroll-view
scroll-y
style=
"height:100%;width:100%;"
>
<view
class=
"title u-margin-top-10 u-margin-bottom-30"
>
通用课程
</view>
<view
class=
"title u-margin-top-10 u-margin-bottom-30"
>
通用课程
</view>
<view
class=
"learn-currency-class"
>
<view
class=
"learn-currency-class"
>
...
@@ -101,7 +101,7 @@
...
@@ -101,7 +101,7 @@
</view>
</view>
</scroll-view>
</scroll-view>
</swiper-item>
</swiper-item>
<swiper-item
@
touchmove
.
stop
.
prevent=
"stopTouchMove"
v-show=
"current == 3"
>
<swiper-item
@
touchmove
.
stop
.
prevent=
"stopTouchMove"
>
<scroll-view
scroll-y
style=
"height:100%;width:100%;"
>
<scroll-view
scroll-y
style=
"height:100%;width:100%;"
>
<view
class=
"title u-margin-top-10 u-margin-bottom-30"
>
通用认证
</view>
<view
class=
"title u-margin-top-10 u-margin-bottom-30"
>
通用认证
</view>
<view
class=
"currency-class"
>
<view
class=
"currency-class"
>
...
@@ -212,6 +212,7 @@ var json = {
...
@@ -212,6 +212,7 @@ var json = {
pic
:
process
.
uniEnv
.
qn_base_url
+
"fwgf-3x-v2.png"
,
pic
:
process
.
uniEnv
.
qn_base_url
+
"fwgf-3x-v2.png"
,
percent
:
0
,
percent
:
0
,
status
:
""
,
status
:
""
,
id
:
597
,
sectionId
:
""
,
sectionId
:
""
,
},
},
{
{
...
@@ -220,6 +221,7 @@ var json = {
...
@@ -220,6 +221,7 @@ var json = {
pic
:
process
.
uniEnv
.
qn_base_url
+
"jdgf-3x-v2.png"
,
pic
:
process
.
uniEnv
.
qn_base_url
+
"jdgf-3x-v2.png"
,
percent
:
0
,
percent
:
0
,
status
:
""
,
status
:
""
,
id
:
598
,
sectionId
:
""
,
sectionId
:
""
,
},
},
{
{
...
@@ -228,6 +230,7 @@ var json = {
...
@@ -228,6 +230,7 @@ var json = {
pic
:
process
.
uniEnv
.
qn_base_url
+
"cdz-3x-v2.png"
,
pic
:
process
.
uniEnv
.
qn_base_url
+
"cdz-3x-v2.png"
,
percent
:
0
,
percent
:
0
,
status
:
""
,
status
:
""
,
id
:
599
,
sectionId
:
""
,
sectionId
:
""
,
},
},
],
],
...
@@ -264,7 +267,7 @@ var examJson = {
...
@@ -264,7 +267,7 @@ var examJson = {
{
{
title
:
"安装材料及工具准备"
,
title
:
"安装材料及工具准备"
,
desc
:
"通过本认证,是接单的必要条件"
,
desc
:
"通过本认证,是接单的必要条件"
,
condition
:
"随机
10题,及格10
题"
,
condition
:
"随机
4题,及格4
题"
,
status
:
""
,
status
:
""
,
pic
:
process
.
uniEnv
.
qn_base_url
+
"fwgf-e-3x.png"
,
pic
:
process
.
uniEnv
.
qn_base_url
+
"fwgf-e-3x.png"
,
id
:
3
,
id
:
3
,
...
@@ -274,7 +277,7 @@ var examJson = {
...
@@ -274,7 +277,7 @@ var examJson = {
isComplete
:
false
,
isComplete
:
false
,
},
},
{
{
title
:
"
交付
规范"
,
title
:
"
接单
规范"
,
desc
:
"快速认证,是否具备接单操作能力"
,
desc
:
"快速认证,是否具备接单操作能力"
,
condition
:
"随机5题,及格5题"
,
condition
:
"随机5题,及格5题"
,
status
:
""
,
status
:
""
,
...
@@ -290,7 +293,7 @@ var examJson = {
...
@@ -290,7 +293,7 @@ var examJson = {
{
{
title
:
"安装材料及工具准备"
,
title
:
"安装材料及工具准备"
,
desc
:
"通过本认证,是接单的必要条件"
,
desc
:
"通过本认证,是接单的必要条件"
,
condition
:
"随机
20题,及格20
题"
,
condition
:
"随机
4题,及格4
题"
,
status
:
""
,
status
:
""
,
pic
:
process
.
uniEnv
.
qn_base_url
+
"fwgf-e-3x.png"
,
pic
:
process
.
uniEnv
.
qn_base_url
+
"fwgf-e-3x.png"
,
id
:
3
,
id
:
3
,
...
@@ -300,9 +303,9 @@ var examJson = {
...
@@ -300,9 +303,9 @@ var examJson = {
questionTime
:
null
,
questionTime
:
null
,
},
},
{
{
title
:
"接单
操作
"
,
title
:
"接单
规范
"
,
desc
:
"快速认证,是否具备接单操作能力"
,
desc
:
"快速认证,是否具备接单操作能力"
,
condition
:
"随机
20题,及格16
题"
,
condition
:
"随机
5题,及格5
题"
,
status
:
""
,
status
:
""
,
pic
:
process
.
uniEnv
.
qn_base_url
+
"jdgf-e-3x.png"
,
pic
:
process
.
uniEnv
.
qn_base_url
+
"jdgf-e-3x.png"
,
id
:
4
,
id
:
4
,
...
@@ -406,6 +409,7 @@ export default {
...
@@ -406,6 +409,7 @@ export default {
isReflesh
:
true
,
isReflesh
:
true
,
triggered
:
false
,
triggered
:
false
,
_freshing
:
false
,
_freshing
:
false
,
isOnLoad
:
0
};
};
},
},
onLoad
(
param
)
{
onLoad
(
param
)
{
...
@@ -423,13 +427,14 @@ export default {
...
@@ -423,13 +427,14 @@ export default {
},
},
},
},
onShow
:
function
(
param
)
{
onShow
:
function
(
param
)
{
this
.
isOnLoad
=
1
;
try
{
try
{
if
(
param
.
tabs
)
{
if
(
param
.
tabs
)
{
this
.
current
=
param
.
tabs
;
this
.
current
=
param
.
tabs
;
this
.
swiperCurrent
=
param
.
tabs
;
this
.
swiperCurrent
=
param
.
tabs
;
}
}
}
catch
(
e
)
{}
}
catch
(
e
)
{}
if
(
this
.
current
==
2
||
this
.
current
==
3
)
{
if
(
this
.
current
==
1
||
this
.
current
==
2
||
this
.
current
==
3
)
{
this
.
tabsChange
(
this
.
current
);
this
.
tabsChange
(
this
.
current
);
}
}
},
},
...
@@ -443,7 +448,6 @@ export default {
...
@@ -443,7 +448,6 @@ export default {
},
},
onPulling
(
e
)
{
onPulling
(
e
)
{
return
true
;
return
true
;
console
.
log
(
"onpulling"
,
e
);
},
},
onRefresh
()
{
onRefresh
()
{
if
(
this
.
_freshing
)
return
;
if
(
this
.
_freshing
)
return
;
...
@@ -455,7 +459,6 @@ export default {
...
@@ -455,7 +459,6 @@ export default {
},
},
onRestore
()
{
onRestore
()
{
this
.
triggered
=
"restore"
;
// 需要重置
this
.
triggered
=
"restore"
;
// 需要重置
console
.
log
(
"onRestore"
);
},
},
onAbort
()
{
onAbort
()
{
console
.
log
(
"onAbort"
);
console
.
log
(
"onAbort"
);
...
@@ -652,10 +655,6 @@ export default {
...
@@ -652,10 +655,6 @@ export default {
this
.
examList
[
i
].
examId
=
res
.
data
.
id
;
this
.
examList
[
i
].
examId
=
res
.
data
.
id
;
this
.
examList
[
i
].
examStatus
=
res
.
data
.
examStatus
;
//i;//
this
.
examList
[
i
].
examStatus
=
res
.
data
.
examStatus
;
//i;//
this
.
examList
[
i
].
questionTime
=
res
.
data
.
questionTime
;
this
.
examList
[
i
].
questionTime
=
res
.
data
.
questionTime
;
console
.
log
(
this
.
examList
[
i
].
questionTime
,
"每题考试时间"
);
let
examResult
=
res
.
data
.
examLevelResult
;
let
examResult
=
res
.
data
.
examLevelResult
;
this
.
examList
[
i
].
status
=
this
.
examList
[
i
].
status
=
examResult
!=
""
?
examResult
:
"未通过"
;
examResult
!=
""
?
examResult
:
"未通过"
;
...
@@ -672,25 +671,20 @@ export default {
...
@@ -672,25 +671,20 @@ export default {
// examStatus 用户考试状态 0考试中 1考试完成 2未参与
// examStatus 用户考试状态 0考试中 1考试完成 2未参与
that
.
exam
=
res
.
data
;
that
.
exam
=
res
.
data
;
console
.
log
(
that
.
exam
);
if
(
res
.
data
.
examStatus
==
2
)
{
if
(
res
.
data
.
examStatus
==
2
)
{
console
.
log
(
"examStatus "
+
i
+
" 2"
);
return
;
return
;
}
}
if
(
res
.
data
.
examStatus
==
1
)
{
if
(
res
.
data
.
examStatus
==
1
)
{
console
.
log
(
"examStatus "
+
i
+
" 1"
);
that
.
examList
[
i
].
isComplete
=
that
.
examList
[
i
].
isComplete
=
this
.
examList
[
i
].
status
==
"通过"
;
this
.
examList
[
i
].
status
==
"通过"
;
that
.
examScore
=
res
.
data
.
examScore
;
that
.
examScore
=
res
.
data
.
examScore
;
return
;
return
;
}
}
if
(
res
.
data
.
examStatus
==
0
)
{
if
(
res
.
data
.
examStatus
==
0
)
{
console
.
log
(
"examStatus "
+
i
+
" 0"
);
that
.
userExamId
=
res
.
data
.
id
;
that
.
userExamId
=
res
.
data
.
id
;
}
}
})
})
.
catch
((
err
)
=>
{
.
catch
((
err
)
=>
{
console
.
log
(
"getUserExamInfo err"
+
err
);
uni
.
hideLoading
();
uni
.
hideLoading
();
uni
.
showToast
({
uni
.
showToast
({
icon
:
"none"
,
icon
:
"none"
,
...
...
src/pages/index/mine.vue
View file @
45da3ae0
...
@@ -21,7 +21,7 @@
...
@@ -21,7 +21,7 @@
<view
class=
"list-view"
>
<view
class=
"list-view"
>
<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(i
ndex
)"
>
<u-cell-item
:value=
"item.value"
:border-bottom=
"false"
@
click=
"handleClick(i
tem.pathName
)"
>
<image
slot=
"icon"
:src=
"qnPath + 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>
...
@@ -49,56 +49,63 @@
...
@@ -49,56 +49,63 @@
},
},
computed
:
{
computed
:
{
settled
()
{
settled
()
{
return
this
.
vuex_settled
&&
this
.
vuex_settled
.
record
||
null
return
this
.
vuex_
token
&&
this
.
vuex_
settled
&&
this
.
vuex_settled
.
record
||
null
},
},
avatar
()
{
avatar
()
{
return
this
.
vuex_settled
&&
this
.
vuex_settled
.
avatar
||
''
return
this
.
vuex_settled
&&
this
.
vuex_settled
.
avatar
},
},
name
()
{
name
()
{
return
this
.
settled
&&
(
this
.
settled
.
id_card_name
return
(
this
.
settled
&&
(
this
.
settled
.
id_card_name
||
this
.
settled
.
name
))
||
(
this
.
vuex_user
&&
(
this
.
vuex_user
.
name
||
this
.
vuex_user
.
loginName
))
||
this
.
settled
.
nickname
||
this
.
settled
.
name
)
||
''
},
},
mobile
()
{
mobile
()
{
return
this
.
settled
&&
this
.
settled
.
mobile
||
''
return
(
this
.
settled
&&
this
.
settled
.
mobile
)
||
(
this
.
vuex_user
&&
this
.
vuex_user
.
mobile
)
},
},
items
()
{
items
()
{
return
[{
return
[
{
pathName
:
'wallet'
,
title
:
'我的钱包'
,
title
:
'我的钱包'
,
value
:
''
,
value
:
''
,
icon
:
'qianbao.png'
,
icon
:
'qianbao.png'
,
imageStyle
:
'width:34rpx;height:32rpx'
imageStyle
:
'width:34rpx;height:32rpx'
},
},
{
{
pathName
:
'deposit'
,
title
:
'配件押金'
,
title
:
'配件押金'
,
value
:
''
,
value
:
''
,
icon
:
'yajin.png'
,
icon
:
'yajin.png'
,
imageStyle
:
'width:32rpx;height:32rpx'
imageStyle
:
'width:32rpx;height:32rpx'
},
},
{
{
pathName
:
'contract'
,
title
:
'我的合同'
,
title
:
'我的合同'
,
value
:
''
,
value
:
''
,
icon
:
'hetong.png'
,
icon
:
'hetong.png'
,
imageStyle
:
'width:34rpx;height:32rpx'
imageStyle
:
'width:34rpx;height:32rpx'
},
},
{
{
pathName
:
'cert'
,
title
:
'我的证件'
,
title
:
'我的证件'
,
value
:
''
,
value
:
''
,
icon
:
'zhengjian.png'
,
icon
:
'zhengjian.png'
,
imageStyle
:
'width:36rpx;height:28rpx'
imageStyle
:
'width:36rpx;height:28rpx'
},
},
{
{
pathName
:
'address'
,
title
:
'收货地址'
,
title
:
'收货地址'
,
value
:
''
,
value
:
''
,
icon
:
'wddizhi.png'
,
icon
:
'wddizhi.png'
,
imageStyle
:
'width:32rpx;height:32rpx'
imageStyle
:
'width:32rpx;height:32rpx'
},
},
{
{
pathName
:
'warehouse'
,
title
:
'我的仓库'
,
title
:
'我的仓库'
,
value
:
''
,
value
:
''
,
icon
:
'cangku.png'
,
icon
:
'cangku.png'
,
imageStyle
:
'width:36rpx;height:32rpx'
imageStyle
:
'width:36rpx;height:32rpx'
},
},
{
{
pathName
:
'customer'
,
title
:
'联系客服'
,
title
:
'联系客服'
,
value
:
this
.
serviceTel
,
value
:
this
.
serviceTel
,
icon
:
'lxkefu.png'
,
icon
:
'lxkefu.png'
,
...
@@ -109,9 +116,6 @@
...
@@ -109,9 +116,6 @@
telTip
()
{
telTip
()
{
return
this
.
mobile
&&
'已绑定手机'
||
'绑定手机号'
return
this
.
mobile
&&
'已绑定手机'
||
'绑定手机号'
},
},
pages
()
{
return
[
'wallet'
,
'deposit'
,
'contract'
,
'cert'
,
'address'
,
'warehouse'
,
'customer'
]
},
headImageUrl
()
{
headImageUrl
()
{
return
this
.
avatar
||
this
.
placeholderImage
return
this
.
avatar
||
this
.
placeholderImage
},
},
...
@@ -138,10 +142,10 @@
...
@@ -138,10 +142,10 @@
let
self
=
this
let
self
=
this
app
.
getBaseInfo
(
self
);
app
.
getBaseInfo
(
self
);
},
},
handleClick
(
index
)
{
handleClick
(
path
)
{
if
(
this
.
vuex_token
)
{
if
(
this
.
vuex_token
)
{
this
.
$u
.
route
({
this
.
$u
.
route
({
url
:
'pages/mine/'
+
this
.
pages
[
index
]
+
'/index'
url
:
'pages/mine/'
+
path
+
'/index'
})
})
}
else
{
}
else
{
this
.
$u
.
route
({
url
:
"pages/login/index"
})
this
.
$u
.
route
({
url
:
"pages/login/index"
})
...
@@ -239,8 +243,9 @@
...
@@ -239,8 +243,9 @@
.list-view
{
.list-view
{
background-color
:
#FFFFFF
;
background-color
:
#FFFFFF
;
border-radius
:
16rpx
16
rpx
0
0
;
border-radius
:
32rpx
32
rpx
0
0
;
overflow
:
hidden
;
overflow
:
hidden
;
padding-top
:
16rpx
;
.item-title
{
.item-title
{
font-size
:
32rpx
;
font-size
:
32rpx
;
...
...
src/pages/index/order.vue
View file @
45da3ae0
...
@@ -24,7 +24,7 @@
...
@@ -24,7 +24,7 @@
<scroll-view
scroll-y
style=
"height: 100%;width: 100%;"
@
scrolltolower=
"reachBottom"
scroll-anchoring
<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"
scroll-y=
"true"
refresher-enabled=
"true"
:refresher-triggered=
"triggered"
:refresher-threshold=
"100"
refresher-background=
"#F4F5F7"
@
refresherpulling=
"triggered = true"
@
refresherrefresh=
"onRefresh"
refresher-background=
"#F4F5F7"
@
refresherpulling=
"triggered = true"
@
refresherrefresh=
"onRefresh"
@
refresherrestore=
"onRestore"
@
refresherabort=
"onAbort"
>
@
refresherrestore=
"onRestore"
>
<NoOrder
v-if=
"noMore"
type=
"black"
:customStyle=
"noOrderCustomStyle"
/>
<NoOrder
v-if=
"noMore"
type=
"black"
:customStyle=
"noOrderCustomStyle"
/>
<template
v-else
>
<template
v-else
>
<view
v-for=
"(item, index) in orderList"
:key=
"item.orderId"
>
<view
v-for=
"(item, index) in orderList"
:key=
"item.orderId"
>
...
@@ -315,9 +315,6 @@
...
@@ -315,9 +315,6 @@
url
:
'pages/order/search'
url
:
'pages/order/search'
})
})
},
},
onPulling
(
e
)
{
console
.
log
(
"onpulling"
,
e
);
},
onRefresh
()
{
onRefresh
()
{
if
(
this
.
_freshing
)
return
;
if
(
this
.
_freshing
)
return
;
this
.
_freshing
=
true
;
this
.
_freshing
=
true
;
...
@@ -329,11 +326,7 @@
...
@@ -329,11 +326,7 @@
},
},
onRestore
()
{
onRestore
()
{
this
.
triggered
=
'restore'
;
// 需要重置
this
.
triggered
=
'restore'
;
// 需要重置
console
.
log
(
"onRestore"
);
},
},
onAbort
()
{
console
.
log
(
"onAbort"
);
}
}
}
};
};
</
script
>
</
script
>
...
...
src/pages/learn/answer.vue
View file @
45da3ae0
...
@@ -217,7 +217,6 @@ export default {
...
@@ -217,7 +217,6 @@ export default {
return
;
return
;
}
}
if
(
res
.
data
.
data
.
examStatus
==
1
)
{
if
(
res
.
data
.
data
.
examStatus
==
1
)
{
console
.
log
(
"111111111111111111111111111"
);
that
.
isComplete
=
true
;
that
.
isComplete
=
true
;
that
.
examScore
=
res
.
data
.
data
.
examScore
;
that
.
examScore
=
res
.
data
.
data
.
examScore
;
return
;
return
;
...
@@ -285,11 +284,6 @@ export default {
...
@@ -285,11 +284,6 @@ export default {
// this.endTime = timestamp + time * 1000;
// this.endTime = timestamp + time * 1000;
this
.
currentTime
=
parseInt
(
time
*
1000
);
//this.formatTimeToMini(timestamp);//endTime-currentTime再格式化时间显示
this
.
currentTime
=
parseInt
(
time
*
1000
);
//this.formatTimeToMini(timestamp);//endTime-currentTime再格式化时间显示
that
.
getNext
();
that
.
getNext
();
console
.
log
(
this
.
endTime
,
this
.
currentTime
,
"总时间"
);
}
}
}
else
{
}
else
{
uni
.
showToast
({
uni
.
showToast
({
...
@@ -361,15 +355,12 @@ export default {
...
@@ -361,15 +355,12 @@ export default {
}
}
if
(
res
.
data
.
code
==
200
)
{
if
(
res
.
data
.
code
==
200
)
{
that
.
currentItem
=
res
.
data
.
data
;
that
.
currentItem
=
res
.
data
.
data
;
console
.
log
(
that
.
currentItem
);
that
.
progress
=
res
.
data
.
data
.
progress
;
that
.
progress
=
res
.
data
.
data
.
progress
;
if
(
res
.
data
.
data
.
isQuestion
)
{
if
(
res
.
data
.
data
.
isQuestion
)
{
let
str
=
res
.
data
.
data
.
question
.
content
;
let
str
=
res
.
data
.
data
.
question
.
content
;
var
wz
=
str
.
indexOf
(
"."
);
var
wz
=
str
.
indexOf
(
"."
);
let
str1
=
str
.
substring
(
wz
+
1
);
let
str1
=
str
.
substring
(
wz
+
1
);
console
.
log
(
that
.
currentItem
);
that
.
currentItem
.
question
.
content
=
str1
.
replace
(
'*'
,
''
);
that
.
currentItem
.
question
.
content
=
str1
.
replace
(
'*'
,
''
);
console
.
log
(
str1
,
"切割的字符串"
);
}
}
if
(
res
.
data
.
data
.
answerList
)
{
if
(
res
.
data
.
data
.
answerList
)
{
that
.
handleData
();
that
.
handleData
();
...
@@ -423,12 +414,6 @@ export default {
...
@@ -423,12 +414,6 @@ export default {
if
(
this
.
everyTime
>
0
)
{
if
(
this
.
everyTime
>
0
)
{
this
.
timer
=
setTimeout
(
this
.
startCounting
,
1000
);
this
.
timer
=
setTimeout
(
this
.
startCounting
,
1000
);
console
.
log
(
"endTime:"
+
this
.
endTime
,
"everyTime:"
+
this
.
everyTime
,
"currentTime:"
+
this
.
currentTime
,
"答案:"
+
this
.
userAnswerIds
);
}
else
{
}
else
{
clearTimeout
(
this
.
timer
);
clearTimeout
(
this
.
timer
);
this
.
everyTime
=
90
;
this
.
everyTime
=
90
;
...
@@ -438,16 +423,7 @@ export default {
...
@@ -438,16 +423,7 @@ export default {
itemClick
:
function
(
currentItem
,
ikey
)
{
itemClick
:
function
(
currentItem
,
ikey
)
{
this
.
isSelect
=
true
;
this
.
isSelect
=
true
;
//answerType 题目类型,1单选,2多选,3简答
// 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简答,
for
(
let
i
=
0
;
i
<
this
.
currentItem
.
answerList
.
length
;
i
++
)
{
for
(
let
i
=
0
;
i
<
this
.
currentItem
.
answerList
.
length
;
i
++
)
{
var
item
=
this
.
currentItem
.
answerList
[
i
];
var
item
=
this
.
currentItem
.
answerList
[
i
];
...
@@ -481,9 +457,6 @@ export default {
...
@@ -481,9 +457,6 @@ export default {
//有选答案
//有选答案
this
.
isSelect
=
isSelect
;
this
.
isSelect
=
isSelect
;
// console.log('选点点击--处理后--this.currentItem.answerList:')
// console.log(this.currentItem.answerList)
},
},
// 点击下一步
// 点击下一步
handleClick
()
{
handleClick
()
{
...
@@ -531,7 +504,6 @@ export default {
...
@@ -531,7 +504,6 @@ export default {
// if(this.userAnswerIds.length == 1)
// if(this.userAnswerIds.length == 1)
this
.
userAnswerIds
=
this
.
userAnswerIds
=
this
.
userAnswerIds
+
","
+
item
.
id
;
this
.
userAnswerIds
+
","
+
item
.
id
;
console
.
log
(
this
.
userAnswerIds
,
"答案答案"
);
}
}
//*/
//*/
}
else
{
}
else
{
...
...
src/pages/learn/exam-pass.vue
View file @
45da3ae0
...
@@ -41,7 +41,6 @@ export default {
...
@@ -41,7 +41,6 @@ export default {
onLoad
(
a
)
{
onLoad
(
a
)
{
this
.
examId
=
a
.
examId
;
this
.
examId
=
a
.
examId
;
this
.
userExamId
=
a
.
userExamId
;
this
.
userExamId
=
a
.
userExamId
;
console
.
log
(
"userExamId是"
,
this
.
userExamId
);
this
.
getCourseResult
();
this
.
getCourseResult
();
},
},
onUnload
()
{
onUnload
()
{
...
@@ -54,7 +53,6 @@ export default {
...
@@ -54,7 +53,6 @@ export default {
.
getExamResult
(
this
.
examId
)
.
getExamResult
(
this
.
examId
)
.
then
((
res
)
=>
{
.
then
((
res
)
=>
{
if
(
res
.
code
!=
200
)
{
if
(
res
.
code
!=
200
)
{
console
.
log
(
"getUserExamInfo 200 err"
);
uni
.
showToast
({
uni
.
showToast
({
icon
:
"none"
,
icon
:
"none"
,
title
:
"获取考试结果失败"
,
title
:
"获取考试结果失败"
,
...
@@ -65,7 +63,6 @@ export default {
...
@@ -65,7 +63,6 @@ export default {
this
.
score
=
this
.
result
.
examScore
;
this
.
score
=
this
.
result
.
examScore
;
})
})
.
catch
((
err
)
=>
{
.
catch
((
err
)
=>
{
console
.
log
(
"getUserExamInfo err"
+
err
);
uni
.
hideLoading
();
uni
.
hideLoading
();
uni
.
showToast
({
uni
.
showToast
({
icon
:
"none"
,
icon
:
"none"
,
...
...
src/pages/learn/result.vue
View file @
45da3ae0
...
@@ -45,7 +45,6 @@ export default {
...
@@ -45,7 +45,6 @@ export default {
onLoad
(
a
)
{
onLoad
(
a
)
{
this
.
userExamId
=
a
.
userExamId
;
this
.
userExamId
=
a
.
userExamId
;
this
.
examId
=
a
.
examId
;
this
.
examId
=
a
.
examId
;
console
.
log
(
"userExamId是"
,
this
.
userExamId
);
this
.
getCourseResult
();
this
.
getCourseResult
();
},
},
onUnload
()
{
onUnload
()
{
...
@@ -58,7 +57,6 @@ export default {
...
@@ -58,7 +57,6 @@ export default {
.
getExamResult
(
this
.
examId
)
.
getExamResult
(
this
.
examId
)
.
then
((
res
)
=>
{
.
then
((
res
)
=>
{
if
(
res
.
code
!=
200
)
{
if
(
res
.
code
!=
200
)
{
console
.
log
(
"getUserExamInfo 200 err"
);
uni
.
showToast
({
uni
.
showToast
({
icon
:
"none"
,
icon
:
"none"
,
title
:
"获取考试结果失败"
,
title
:
"获取考试结果失败"
,
...
@@ -69,7 +67,6 @@ export default {
...
@@ -69,7 +67,6 @@ export default {
this
.
score
=
this
.
result
.
examScore
;
this
.
score
=
this
.
result
.
examScore
;
})
})
.
catch
((
err
)
=>
{
.
catch
((
err
)
=>
{
console
.
log
(
"getUserExamInfo err"
+
err
);
uni
.
hideLoading
();
uni
.
hideLoading
();
uni
.
showToast
({
uni
.
showToast
({
icon
:
"none"
,
icon
:
"none"
,
...
@@ -81,7 +78,6 @@ export default {
...
@@ -81,7 +78,6 @@ export default {
getAgain
:
function
()
{
getAgain
:
function
()
{
let
examId
=
this
.
examId
;
let
examId
=
this
.
examId
;
let
routes
=
getCurrentPages
();
// 获取当前打开过的页面路由数组
let
routes
=
getCurrentPages
();
// 获取当前打开过的页面路由数组
console
.
log
(
routes
.
length
);
uni
.
navigateTo
({
uni
.
navigateTo
({
url
:
"/pages/learn/assessment?examId="
+
examId
,
url
:
"/pages/learn/assessment?examId="
+
examId
,
});
});
...
...
src/pages/learn/section.vue
View file @
45da3ae0
...
@@ -32,6 +32,7 @@
...
@@ -32,6 +32,7 @@
<view
class=
"teacher-intro"
>
{{
teacherIntro
}}
</view>
<view
class=
"teacher-intro"
>
{{
teacherIntro
}}
</view>
</view>
</view>
</view>
</view>
<u-line
color=
"#F4F5F7"
margin=
"30rpx 0 0 0"
/>
<view
class=
"learn-view-title"
>
目录
</view>
<view
class=
"learn-view-title"
>
目录
</view>
<view
class=
"scroll_box"
>
<view
class=
"scroll_box"
>
<scroll-view
scroll-x
@
scroll=
"scroll"
:scroll-left=
"scrollValue"
>
<scroll-view
scroll-x
@
scroll=
"scroll"
:scroll-left=
"scrollValue"
>
...
@@ -120,8 +121,6 @@
...
@@ -120,8 +121,6 @@
},
},
methods
:
{
methods
:
{
scroll
:
function
(
e
)
{
scroll
:
function
(
e
)
{
console
.
log
(
'--scroll--'
)
console
.
log
(
e
)
this
.
old
.
scrollTop
=
e
.
detail
.
scrollTop
this
.
old
.
scrollTop
=
e
.
detail
.
scrollTop
},
},
goNext
(
info
)
{
goNext
(
info
)
{
...
@@ -149,8 +148,6 @@
...
@@ -149,8 +148,6 @@
}
else
{
}
else
{
this
.
scrollValue
=
0
this
.
scrollValue
=
0
}
}
console
.
log
(
'--移动距离--'
)
console
.
log
(
this
.
scrollValue
)
},
},
onPlayerTimeupdate
(
player
)
{
onPlayerTimeupdate
(
player
)
{
let
intCurrentTime
=
parseInt
(
player
.
detail
.
currentTime
);
let
intCurrentTime
=
parseInt
(
player
.
detail
.
currentTime
);
...
@@ -219,8 +216,6 @@
...
@@ -219,8 +216,6 @@
}
}
if
(
res
.
data
)
{
if
(
res
.
data
)
{
this
.
sectionInfo
=
res
.
data
this
.
sectionInfo
=
res
.
data
console
.
log
(
"----节信息----"
)
console
.
log
(
this
.
sectionInfo
)
this
.
nextSectionId
=
this
.
sectionInfo
.
nextSectionId
this
.
nextSectionId
=
this
.
sectionInfo
.
nextSectionId
let
wareVal
=
this
.
sectionInfo
.
ware
let
wareVal
=
this
.
sectionInfo
.
ware
this
.
courseTitle
=
res
.
data
.
name
this
.
courseTitle
=
res
.
data
.
name
...
@@ -236,7 +231,6 @@
...
@@ -236,7 +231,6 @@
let
coureWareList
=
res
.
data
.
courseware
let
coureWareList
=
res
.
data
.
courseware
this
.
courseSrc
=
coureWareList
[
0
].
src
this
.
courseSrc
=
coureWareList
[
0
].
src
this
.
videoTotalTime
=
parseInt
(
JSON
.
parse
(
coureWareList
[
0
].
info
).
time
)
-
1
;
this
.
videoTotalTime
=
parseInt
(
JSON
.
parse
(
coureWareList
[
0
].
info
).
time
)
-
1
;
console
.
log
(
'视频时长信息:'
+
this
.
videoTotalTime
)
}
}
}
}
})
})
...
@@ -372,13 +366,13 @@
...
@@ -372,13 +366,13 @@
font-size
:
32rpx
;
font-size
:
32rpx
;
color
:
#333333
;
color
:
#333333
;
height
:
820rpx
;
height
:
820rpx
;
padding
:
0
30rpx
;
.learn-view-title
{
.learn-view-title
{
font-size
:
32rpx
;
font-size
:
32rpx
;
font-weight
:
bold
;
font-weight
:
bold
;
margin-bottom
:
10rpx
;
margin-bottom
:
10rpx
;
padding-top
:
30rpx
;
padding-top
:
30rpx
;
margin-left
:
30rpx
;
}
}
.learn-list
{
.learn-list
{
...
@@ -455,7 +449,6 @@
...
@@ -455,7 +449,6 @@
width
:
100%
;
width
:
100%
;
height
:
150rpx
;
height
:
150rpx
;
overflow
:
hidden
;
overflow
:
hidden
;
padding-left
:
20rpx
;
background
:
#fff
;
background
:
#fff
;
margin-top
:
30rpx
;
margin-top
:
30rpx
;
}
}
...
@@ -490,9 +483,9 @@
...
@@ -490,9 +483,9 @@
.teacher-disc
{
.teacher-disc
{
font-size
:
24rpx
;
font-size
:
24rpx
;
margin-left
:
30rpx
;
margin-top
:
6rpx
;
margin-top
:
6rpx
;
color
:
#999999
;
color
:
#999999
;
padding-left
:
30rpx
;
}
}
.kc-image
{
.kc-image
{
...
...
src/pages/login/index.vue
View file @
45da3ae0
...
@@ -209,6 +209,7 @@ export default {
...
@@ -209,6 +209,7 @@ export default {
this
.
$u
.
vuex
(
'vuex_user'
,
null
);
this
.
$u
.
vuex
(
'vuex_user'
,
null
);
this
.
$u
.
vuex
(
'vuex_wx_uid'
,
''
);
this
.
$u
.
vuex
(
'vuex_wx_uid'
,
''
);
}
}
this
.
$u
.
vuex
(
'vuex_settled'
,
null
);
},
},
setLoginStatus
(
authed
=
true
)
{
setLoginStatus
(
authed
=
true
)
{
...
...
src/pages/mine/cert/index.vue
View file @
45da3ae0
...
@@ -12,7 +12,8 @@
...
@@ -12,7 +12,8 @@
<view
class=
"content-cody"
>
<view
class=
"content-cody"
>
<u-cell-group
:border=
"false"
>
<u-cell-group
:border=
"false"
>
<u-cell-item
v-for=
"(item, index) in list"
:title=
"item.name"
:value=
"item.isUploadName"
:arrow=
"true"
:key=
"index"
<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,'padding-left':'30rpx','padding-right':'30rpx'}" @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>
</u-cell-group>
</u-cell-group>
...
@@ -144,5 +145,7 @@
...
@@ -144,5 +145,7 @@
color
:
#007AFF
;
color
:
#007AFF
;
}
}
.u-cell
{
padding
:
26
rpx
0
!important
;
}
</
style
>
</
style
>
src/pages/mine/contract/index.vue
View file @
45da3ae0
...
@@ -55,7 +55,6 @@ export default {
...
@@ -55,7 +55,6 @@ export default {
res
.
data
[
i
].
name
=
res
.
data
[
i
].
name
.
replace
(
re
,
""
);
res
.
data
[
i
].
name
=
res
.
data
[
i
].
name
.
replace
(
re
,
""
);
}
}
this
.
res
=
this
.
res
.
concat
(
res
.
data
);
this
.
res
=
this
.
res
.
concat
(
res
.
data
);
console
.
log
(
this
.
res
);
}
}
}
else
{
}
else
{
//接口请求失败的处理
//接口请求失败的处理
...
...
src/pages/mine/deposit/index.vue
View file @
45da3ae0
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
<view
class=
"amount"
><text
class=
"prefix"
>
¥
</text>
{{
amount
}}
</view>
<view
class=
"amount"
><text
class=
"prefix"
>
¥
</text>
{{
amount
}}
</view>
</view>
</view>
<view
class=
"rules"
>
<view
class=
"rules"
>
<view
class=
"title"
>
质保
金规则
</view>
<view
class=
"title"
>
配件押
金规则
</view>
<view
class=
"item"
v-for=
"(item, index) in rules"
:key=
"index"
>
<view
class=
"item"
v-for=
"(item, index) in rules"
:key=
"index"
>
<view
class=
"question"
>
<view
class=
"question"
>
<view
class=
"qa-icon danger-bg"
>
Q
</view>
<view
class=
"qa-icon danger-bg"
>
Q
</view>
...
@@ -33,15 +33,12 @@
...
@@ -33,15 +33,12 @@
return
{
return
{
rules
:
[
rules
:
[
{
{
question
:
'为什么缴纳设备押金?'
,
question
:
'为什么缴纳配件押金?'
,
answer
:
`设备押金是什么什么什么,应该巴拉巴拉巴拉,所以
answer
:
'充电桩为客户私人设备,由扳手会保管代发,为安装流程顺利进行,在接单至订单完工过程中由技工师傅保管,因此需缴纳一定额度配件押金,押金可退还。'
要缴纳,巴拉巴拉巴拉。`
},
},
{
{
question
:
'退还设备押金说明'
,
question
:
'退还配件押金说明'
,
answer
:
`设备押金的退还说明是什么什么样的,应该怎么怎么
answer
:
'技工师傅与扳手会结束合作关系后即可申请退还缴纳的配件押金。'
样,先找客服,然后再怎么怎么样,然后再怎么怎么
样,这样就可以了。`
}
}
],
],
};
};
...
@@ -68,7 +65,6 @@
...
@@ -68,7 +65,6 @@
},
},
refund
()
{
refund
()
{
this
.
$u
.
route
({
this
.
$u
.
route
({
type
:
'redirect'
,
url
:
"pages/mine/customer/index"
url
:
"pages/mine/customer/index"
})
})
},
},
...
...
src/pages/mine/wallet/index.vue
View file @
45da3ae0
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
:border-bottom=
"false"
title-bold
></u-navbar>
:border-bottom=
"false"
title-bold
></u-navbar>
<view
class=
"wallet-content-view"
>
<view
class=
"wallet-content-view"
>
<view
class=
"header-view"
>
<view
class=
"header-view"
>
<image
class=
"header-image"
mode=
"widthFix"
:src=
"qianbaobeijing"
></image>
<image
class=
"header-image"
:src=
"qianbaobeijing"
></image>
</view>
</view>
<view
class=
"survey-view"
>
<view
class=
"survey-view"
>
<view
class=
"survey-top-view"
>
<view
class=
"survey-top-view"
>
...
@@ -35,7 +35,7 @@
...
@@ -35,7 +35,7 @@
</view>
</view>
</view>
</view>
<view
class=
"content-list-right"
>
<view
class=
"content-list-right"
>
<text
class=
"content-list-right-text"
>
点击查看
</text>
<text
class=
"content-list-right-text"
>
{{
item
.
value
}}
</text>
<u-icon
name=
"arrow-right"
></u-icon>
<u-icon
name=
"arrow-right"
></u-icon>
</view>
</view>
</view>
</view>
...
@@ -90,11 +90,13 @@
...
@@ -90,11 +90,13 @@
return
[{
return
[{
title
:
'结算账单'
,
title
:
'结算账单'
,
content
:
'展示您已提现的账单信息'
,
content
:
'展示您已提现的账单信息'
,
icon
:
this
.
imageUrl
+
'jiesuan.png'
icon
:
this
.
imageUrl
+
'jiesuan.png'
,
value
:
'点击查看'
},
{
},
{
title
:
'收入流水'
,
title
:
'收入流水'
,
content
:
this
.
statementContent
,
content
:
this
.
statementContent
,
icon
:
this
.
imageUrl
+
'liushui.png'
icon
:
this
.
imageUrl
+
'liushui.png'
,
value
:
'查看全部'
}]
}]
},
},
items
()
{
items
()
{
...
@@ -124,7 +126,7 @@
...
@@ -124,7 +126,7 @@
return
[
'settlement'
,
'statement'
]
return
[
'settlement'
,
'statement'
]
}
}
},
},
on
Load
()
{
on
Show
()
{
// 未登录,先跳转登录
// 未登录,先跳转登录
if
(
!
this
.
vuex_token
)
{
if
(
!
this
.
vuex_token
)
{
this
.
$u
.
route
({
url
:
'pages/login/index'
})
this
.
$u
.
route
({
url
:
'pages/login/index'
})
...
@@ -191,9 +193,10 @@
...
@@ -191,9 +193,10 @@
position
:
absolute
;
position
:
absolute
;
width
:
100%
;
width
:
100%
;
padding-top
:
10rpx
;
padding-top
:
10rpx
;
padding-left
:
6
rpx
;
padding-left
:
14
rpx
;
.header-image
{
.header-image
{
width
:
100%
;
width
:
730rpx
;
height
:
420rpx
;
}
}
}
}
...
...
src/pages/mine/wallet/settlement.vue
View file @
45da3ae0
...
@@ -73,7 +73,7 @@
...
@@ -73,7 +73,7 @@
return
this
.
loading
||
this
.
info
.
payableRecordExtendDtos
&&
this
.
info
.
payableRecordExtendDtos
.
length
return
this
.
loading
||
this
.
info
.
payableRecordExtendDtos
&&
this
.
info
.
payableRecordExtendDtos
.
length
},
},
banner
()
{
banner
()
{
return
this
.
imageUrl
+
'
Bill
.png'
return
this
.
imageUrl
+
'
receipt
.png'
},
},
},
},
onLoad
()
{
onLoad
()
{
...
...
src/pages/mine/wallet/statement.vue
View file @
45da3ae0
...
@@ -73,7 +73,7 @@
...
@@ -73,7 +73,7 @@
}
}
},
},
endTime
()
{
endTime
()
{
this
.
$u
.
DateTimeFormat
(
new
Date
().
getTime
(),
'YYYY-MM-DD'
)
this
.
moment
().
format
(
'YYYY-MM-DD'
)
},
},
items
()
{
items
()
{
return
{
return
{
...
@@ -90,7 +90,7 @@
...
@@ -90,7 +90,7 @@
return
process
.
uniEnv
.
qn_base_url
return
process
.
uniEnv
.
qn_base_url
},
},
banner
()
{
banner
()
{
return
this
.
imageUrl
+
'
Bill
.png'
return
this
.
imageUrl
+
'
receipt
.png'
},
},
hasInfo
()
{
hasInfo
()
{
return
this
.
loading
||
this
.
data
.
statementList
&&
this
.
data
.
statementList
.
length
return
this
.
loading
||
this
.
data
.
statementList
&&
this
.
data
.
statementList
.
length
...
...
src/pages/mine/wallet/withdraw.vue
View file @
45da3ae0
...
@@ -3,15 +3,24 @@
...
@@ -3,15 +3,24 @@
<u-navbar
back-icon-color=
"#333333"
background=
"#F4F5F7"
title=
"提现"
titleColor=
"#333333"
:border-bottom=
"false"
title-bold
>
<u-navbar
back-icon-color=
"#333333"
background=
"#F4F5F7"
title=
"提现"
titleColor=
"#333333"
:border-bottom=
"false"
title-bold
>
</u-navbar>
</u-navbar>
<view
class=
"withdraw-content"
>
<view
class=
"withdraw-content"
>
<view
v-if=
"!submit"
>
<view
class=
"withdraw-content-main"
>
<view
class=
"withdraw-content-main"
>
<view
class=
"amount-title"
>
可提现金额
</view>
<view
class=
"amount-title"
>
可提现金额
</view>
<view
class=
"amount-text"
><text
class=
"amount-symbol"
>
¥
</text>
{{
amount
}}
</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>
<u-button
type=
"primary"
shape=
"circle"
:custom-style=
"buttonStyle"
@
click=
"handleClick"
>
全部
提现
</u-button>
</view>
</view>
<view
class=
"line-view"
></view>
<view
class=
"line-view"
></view>
<view
class=
"rule-title"
>
提现规则说明
</view>
<view
class=
"rule-title"
>
提现规则说明
</view>
<view
class=
"rule-content"
>
1.提现金额:提现金额是指已完工订单通过平台审核后且达到合同账期的订单费用之总和。
</view>
<view
class=
"rule-content"
>
1.提现金额:提现金额是指已完工订单通过平台审核后且达到合同账期的订单费用之总和。
</view>
<view
class=
"rule-content"
>
2.提现到账时间为1-3个工作日,最终以银行结果为准
</view>
<view
class=
"rule-content"
>
2.提现到账时间具体以银行结果为准
</view>
</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>
</view>
</view>
</
template
>
</
template
>
...
@@ -21,6 +30,7 @@
...
@@ -21,6 +30,7 @@
data
()
{
data
()
{
return
{
return
{
amount
:
0
,
amount
:
0
,
submit
:
false
}
}
},
},
computed
:
{
computed
:
{
...
@@ -32,6 +42,9 @@
...
@@ -32,6 +42,9 @@
"font-weight"
:
"bold"
,
"font-weight"
:
"bold"
,
};
};
},
},
imageUrl
()
{
return
process
.
uniEnv
.
qn_base_url
+
'chenggong.png'
},
},
},
onLoad
()
{
onLoad
()
{
this
.
loadAssets
()
this
.
loadAssets
()
...
@@ -42,7 +55,7 @@
...
@@ -42,7 +55,7 @@
if
(
self
.
amount
)
{
if
(
self
.
amount
)
{
let
res
=
await
self
.
$u
.
api
.
workerApplyPay
()
let
res
=
await
self
.
$u
.
api
.
workerApplyPay
()
if
(
res
&&
res
.
code
==
200
)
{
if
(
res
&&
res
.
code
==
200
)
{
self
.
$u
.
route
({
type
:
'redirect'
,
url
:
'pages/mine/wallet/index'
})
self
.
submit
=
true
}
else
{
}
else
{
self
.
$u
.
toast
(
res
.
message
||
'系统异常,提现失败!'
);
self
.
$u
.
toast
(
res
.
message
||
'系统异常,提现失败!'
);
}
}
...
@@ -55,6 +68,9 @@
...
@@ -55,6 +68,9 @@
self
.
amount
=
res
.
data
&&
res
.
data
.
canApplyAmount
self
.
amount
=
res
.
data
&&
res
.
data
.
canApplyAmount
}
}
},
},
handleClickSure
()
{
this
.
$u
.
route
({
type
:
'back'
})
}
}
}
}
}
</
script
>
</
script
>
...
@@ -111,6 +127,22 @@
...
@@ -111,6 +127,22 @@
margin-bottom
:
20rpx
;
margin-bottom
:
20rpx
;
line-height
:
40rpx
;
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/mine/warehouse/index.vue
View file @
45da3ae0
...
@@ -32,7 +32,7 @@
...
@@ -32,7 +32,7 @@
<view
class=
"width-80 center"
>
{{
item
.
outAmount
}}
</view>
<view
class=
"width-80 center"
>
{{
item
.
outAmount
}}
</view>
<view
class=
"width-140 create-time"
>
{{
(
item
.
updateTime
||
item
.
createTime
)
|
datefmt
(
'YYYY.MM.DD HH:mm:ss'
)
}}
</view>
<view
class=
"width-140 create-time"
>
{{
(
item
.
updateTime
||
item
.
createTime
)
|
datefmt
(
'YYYY.MM.DD HH:mm:ss'
)
}}
</view>
</view>
</view>
<u-loadmore
:status=
"status"
@
loadmore=
"loadRecord"
/>
<u-loadmore
class=
"load-more"
:status=
"status"
@
loadmore=
"loadRecord"
/>
</view>
</view>
</view>
</view>
</view>
</view>
...
@@ -180,4 +180,7 @@
...
@@ -180,4 +180,7 @@
.break
{
.break
{
word-break
:break-all
;
word-break
:break-all
;
}
}
.load-more
{
margin-top
:
20rpx
;
}
</
style
>
</
style
>
src/pages/order/detail.vue
View file @
45da3ae0
...
@@ -247,7 +247,7 @@
...
@@ -247,7 +247,7 @@
}
}
this
.
loadOrderDetail
()
this
.
loadOrderDetail
()
this
.
loadOrderRecord
()
this
.
loadOrderRecord
()
//
this.getLocation()
this
.
getLocation
()
this
.
getSignDistance
()
this
.
getSignDistance
()
},
},
onHide
()
{
onHide
()
{
...
@@ -769,7 +769,11 @@
...
@@ -769,7 +769,11 @@
let
self
=
this
let
self
=
this
var
nowTime
=
new
Date
();
// 当前时间
var
nowTime
=
new
Date
();
// 当前时间
if
(
currentOverTime
&&
nowTime
.
getTime
()
>
currentOverTime
){
if
(
currentOverTime
&&
nowTime
.
getTime
()
>
currentOverTime
){
if
(
this
.
centerBtnDisabled
===
false
&&
this
.
submitType
===
'maintainWorkerCheckin'
){
this
.
btnClass
=
"isGan-btn"
}
else
{
this
.
btnClass
=
'timeOut-btn'
this
.
btnClass
=
'timeOut-btn'
}
this
.
$refs
[
'uCountDown'
].
seconds
+=
2
this
.
$refs
[
'uCountDown'
].
seconds
+=
2
}
}
},
},
...
...
src/pages/order/search.vue
View file @
45da3ae0
...
@@ -108,7 +108,7 @@
...
@@ -108,7 +108,7 @@
self
.
loadStatus
=
res
.
data
.
total
>
self
.
orderList
.
length
?
'loadmore'
:
'nomore'
self
.
loadStatus
=
res
.
data
.
total
>
self
.
orderList
.
length
?
'loadmore'
:
'nomore'
}
}
}
else
{
}
else
{
self
.
$u
.
toast
(
res
.
message
);
self
.
$u
.
toast
(
'请求失败'
);
}
}
self
.
loaded
=
true
self
.
loaded
=
true
});
});
...
...
src/pages/photo/index.vue
View file @
45da3ae0
...
@@ -81,16 +81,6 @@
...
@@ -81,16 +81,6 @@
return
shareObj
return
shareObj
},
},
methods
:
{
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
)
{
itemClick
:
function
(
type
,
item
,
ikey
)
{
...
...
src/pages/photo/list.vue
View file @
45da3ae0
...
@@ -144,27 +144,6 @@
...
@@ -144,27 +144,6 @@
}
}
},
},
methods
:
{
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
()
{
getListDataNew
()
{
this
.
loading
=
true
this
.
loading
=
true
let
self
=
this
let
self
=
this
...
@@ -251,17 +230,6 @@
...
@@ -251,17 +230,6 @@
url
:
'/pages/photo/take'
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
)
{
take
(
item
,
ikey
)
{
this
.
currentItemDate
=
item
this
.
currentItemDate
=
item
...
...
src/pages/photo/preview.vue
View file @
45da3ae0
...
@@ -138,53 +138,6 @@
...
@@ -138,53 +138,6 @@
self
.
saveTempToLocal
()
self
.
saveTempToLocal
()
self
.
confirmUpload
(
true
)
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
()
{
downloadImages
()
{
let
self
=
this
;
let
self
=
this
;
for
(
let
url
of
this
.
images
)
{
for
(
let
url
of
this
.
images
)
{
...
...
src/pages/photo/setting.vue
View file @
45da3ae0
...
@@ -122,46 +122,8 @@
...
@@ -122,46 +122,8 @@
const
globalData
=
getApp
().
globalData
const
globalData
=
getApp
().
globalData
this
.
icon_close_new
=
globalData
.
icon_close_new
this
.
icon_close_new
=
globalData
.
icon_close_new
this
.
systemId
=
globalData
.
photo
.
product
.
systemId
this
.
systemId
=
globalData
.
photo
.
product
.
systemId
this
.
getItemList
()
},
},
methods
:
{
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
)
{
handleOrigineChange
:
function
(
e
)
{
this
.
result
[
'hasOrigin'
]
=
!
this
.
result
[
'hasOrigin'
]
this
.
result
[
'hasOrigin'
]
=
!
this
.
result
[
'hasOrigin'
]
...
...
src/pages/settle/age.vue
View file @
45da3ae0
...
@@ -45,8 +45,6 @@
...
@@ -45,8 +45,6 @@
itemClick
:
function
(
item
,
ikey
)
{
itemClick
:
function
(
item
,
ikey
)
{
this
.
selected_age
=
item
.
title
this
.
selected_age
=
item
.
title
this
.
selected_index
=
ikey
this
.
selected_index
=
ikey
console
.
log
(
item
.
title
)
console
.
log
(
ikey
)
},
},
confirmClick
:
function
()
{
confirmClick
:
function
()
{
...
...
src/pages/settle/base.vue
View file @
45da3ae0
...
@@ -344,7 +344,6 @@
...
@@ -344,7 +344,6 @@
...
baseInfo
,
...
baseInfo
,
recommender
:
getApp
().
globalData
.
settleRecommend
recommender
:
getApp
().
globalData
.
settleRecommend
}
}
console
.
log
(
params
,
'params'
)
params
.
service_area
=
baseInfo
.
service_area
.
join
(
','
)
params
.
service_area
=
baseInfo
.
service_area
.
join
(
','
)
const
res
=
await
this
.
$u
.
api
.
submitSettleBaseInfo
(
params
)
const
res
=
await
this
.
$u
.
api
.
submitSettleBaseInfo
(
params
)
this
.
saving
=
false
;
this
.
saving
=
false
;
...
...
src/pages/settle/file.vue
View file @
45da3ae0
...
@@ -322,11 +322,16 @@ export default {
...
@@ -322,11 +322,16 @@ export default {
break
;
break
;
}
}
if
(
self
.
uploadType
===
'id_card_front'
||
self
.
uploadType
===
'id_card_back'
)
{
await
self
.
chooseImage
(
"qiniu"
,
{...
attr
,
options
:
{
count
:
1
}})
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
)
{
if
(
self
.
uploadType
&&
self
.
imgList
&&
self
.
imgList
.
length
>
0
)
{
// 设置图片对象
// 设置图片对象
self
.
imgObj
[
self
.
uploadType
]
=
self
.
imgList
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
()
this
.
updateImgs
()
}
}
},
},
...
@@ -349,14 +354,14 @@ export default {
...
@@ -349,14 +354,14 @@ export default {
let
imgs
=
[]
let
imgs
=
[]
otherImgs
.
map
(
item
=>
{
otherImgs
.
map
(
item
=>
{
const
img
=
item
.
key
||
item
.
src
||
''
const
img
=
item
.
key
||
''
imgs
.
push
(
img
)
imgs
.
push
(
img
)
})
})
this
.
fileInfo
[
'other_photos'
][
photoType
][
'url'
]
=
imgs
.
join
(
','
)
this
.
fileInfo
[
'other_photos'
][
photoType
][
'url'
]
=
imgs
.
join
(
','
)
return
return
}
}
this
.
fileInfo
[
uploadType
]
=
uploadImgs
[
0
].
key
||
uploadImgs
[
0
].
src
||
''
this
.
fileInfo
[
uploadType
]
=
uploadImgs
[
0
].
key
||
''
//(uploadType === 'id_card_front' || uploadType === 'id_card_back') ? uploadImgs[0].src : (uploadImgs[0].key || '')
},
},
toUploadImg
(
item
,
index
)
{
toUploadImg
(
item
,
index
)
{
this
.
uploadType
=
item
.
filedName
this
.
uploadType
=
item
.
filedName
...
@@ -372,7 +377,7 @@ export default {
...
@@ -372,7 +377,7 @@ export default {
},
},
async
checkIdCard
(
type
)
{
async
checkIdCard
(
type
)
{
uni
.
showLoading
({
uni
.
showLoading
({
title
:
'
加载
中'
title
:
'
识别
中'
})
})
let
request
=
{
let
request
=
{
front
:
this
.
$u
.
api
.
checkSettleIDCardFront
,
front
:
this
.
$u
.
api
.
checkSettleIDCardFront
,
...
@@ -472,7 +477,7 @@ export default {
...
@@ -472,7 +477,7 @@ export default {
fileInfo
.
other_photos
=
JSON
.
stringify
(
fileInfo
.
other_photos
)
fileInfo
.
other_photos
=
JSON
.
stringify
(
fileInfo
.
other_photos
)
let
submitInfoData
=
{
let
submitInfoData
=
{
...
fileInfo
,
...
fileInfo
,
recommender
:
getApp
().
globalData
.
settleRecommend
recommender
:
getApp
().
globalData
.
settleRecommend
,
}
}
uni
.
showLoading
({
uni
.
showLoading
({
title
:
'加载中……'
title
:
'加载中……'
...
...
src/pages/settle/pay-ensure.vue
View file @
45da3ae0
...
@@ -161,7 +161,6 @@
...
@@ -161,7 +161,6 @@
// appid:'wxd1d6eede324b0465'
// appid:'wxd1d6eede324b0465'
}
}
const
response
=
await
this
.
$u
.
api
.
paySettleDeposit
(
params
)
const
response
=
await
this
.
$u
.
api
.
paySettleDeposit
(
params
)
console
.
log
(
response
)
if
(
response
.
code
!==
200
)
{
if
(
response
.
code
!==
200
)
{
this
.
saving
=
false
this
.
saving
=
false
uni
.
showToast
({
uni
.
showToast
({
...
@@ -188,7 +187,6 @@
...
@@ -188,7 +187,6 @@
})
})
}
else
if
(
result
==
"fail"
)
{
}
else
if
(
result
==
"fail"
)
{
// charge 不正确或者微信公众账号/QQ 公众号/支付宝口碑支付失败时会在此处返回
// charge 不正确或者微信公众账号/QQ 公众号/支付宝口碑支付失败时会在此处返回
// console.log(err.msg)
this
.
showPopView
()
this
.
showPopView
()
}
else
if
(
result
==
"cancel"
)
{
}
else
if
(
result
==
"cancel"
)
{
// 微信公众账号、QQ 公众号、支付宝口碑支付取消支付
// 微信公众账号、QQ 公众号、支付宝口碑支付取消支付
...
@@ -210,11 +208,9 @@
...
@@ -210,11 +208,9 @@
cancelText
:
'失败'
,
cancelText
:
'失败'
,
success
:
((
res
)
=>
{
success
:
((
res
)
=>
{
if
(
res
.
confirm
)
{
if
(
res
.
confirm
)
{
// console.log(res.confirm,'res.confirm')
this
.
pending
()
this
.
pending
()
}
else
if
(
res
.
cancel
)
{
}
else
if
(
res
.
cancel
)
{
this
.
pending
()
this
.
pending
()
console
.
log
(
'用户点击取消'
);
}
}
})
})
});
});
...
...
src/pages/settle/prompt.vue
View file @
45da3ae0
...
@@ -169,7 +169,6 @@
...
@@ -169,7 +169,6 @@
// const status = 7
// const status = 7
const
infoArr
=
this
.
promptList
.
filter
(
item
=>
{
const
infoArr
=
this
.
promptList
.
filter
(
item
=>
{
const
itemStatus
=
item
.
status
const
itemStatus
=
item
.
status
// console.log(itemStatus,'itemStatus')
let
idx
=
-
2
let
idx
=
-
2
if
(
Array
.
isArray
(
itemStatus
))
{
if
(
Array
.
isArray
(
itemStatus
))
{
idx
=
itemStatus
.
indexOf
(
status
)
idx
=
itemStatus
.
indexOf
(
status
)
...
@@ -229,7 +228,6 @@
...
@@ -229,7 +228,6 @@
// if (res.confirm) {
// if (res.confirm) {
// uni.openSetting({
// uni.openSetting({
// success(res) {
// success(res) {
// console.log(res.authSetting)
// }
// }
// });
// });
// }
// }
...
...
src/plugins/uploader/index.js
View file @
45da3ae0
...
@@ -28,7 +28,6 @@ let uploader = new request(baseOptions);
...
@@ -28,7 +28,6 @@ let uploader = new request(baseOptions);
// 添加获取七牛云token的方法
// 添加获取七牛云token的方法
uploader
.
getQnToken
=
function
(
params
)
{
uploader
.
getQnToken
=
function
(
params
)
{
//该地址需要开发者自行配置(每个后台的接口风格都不一样)
//该地址需要开发者自行配置(每个后台的接口风格都不一样)
// console.log(uploader.get,'uploader.get')
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
uploader
.
post
(
baseOptions
.
qiniuUploadUrl
,
params
).
then
(
data
=>
{
uploader
.
post
(
baseOptions
.
qiniuUploadUrl
,
params
).
then
(
data
=>
{
/*
/*
...
@@ -118,13 +117,6 @@ let loginPopupNum = 0;
...
@@ -118,13 +117,6 @@ let loginPopupNum = 0;
//所有接口数据处理(可在接口里设置不调用此方法)
//所有接口数据处理(可在接口里设置不调用此方法)
//此方法需要开发者根据各自的接口返回类型修改,以下只是模板
//此方法需要开发者根据各自的接口返回类型修改,以下只是模板
uploader
.
dataFactory
=
async
function
(
res
)
{
uploader
.
dataFactory
=
async
function
(
res
)
{
console
.
log
(
"接口请求数据"
,
{
url
:
res
.
url
,
resolve
:
res
.
response
,
header
:
res
.
header
,
data
:
res
.
data
,
method
:
res
.
method
,
});
if
(
res
.
response
.
statusCode
&&
res
.
response
.
statusCode
==
200
)
{
if
(
res
.
response
.
statusCode
&&
res
.
response
.
statusCode
==
200
)
{
// let httpData = res.response.data;
// let httpData = res.response.data;
let
httpData
=
res
.
response
;
let
httpData
=
res
.
response
;
...
@@ -132,7 +124,6 @@ uploader.dataFactory = async function(res) {
...
@@ -132,7 +124,6 @@ uploader.dataFactory = async function(res) {
httpData
=
JSON
.
parse
(
httpData
);
httpData
=
JSON
.
parse
(
httpData
);
}
}
/*********以下只是模板(及共参考),需要开发者根据各自的接口返回类型修改*********/
/*********以下只是模板(及共参考),需要开发者根据各自的接口返回类型修改*********/
console
.
log
(
httpData
,
'httpData'
)
//判断数据是否请求成功
//判断数据是否请求成功
if
(
httpData
.
statusCode
===
200
)
{
if
(
httpData
.
statusCode
===
200
)
{
// 返回正确的结果(then接受数据)
// 返回正确的结果(then接受数据)
...
...
src/plugins/uploader/request/core/request.js
View file @
45da3ae0
...
@@ -31,7 +31,6 @@ export default class request {
...
@@ -31,7 +31,6 @@ export default class request {
//get请求
//get请求
get
(
url
=
''
,
data
=
{},
options
=
{})
{
get
(
url
=
''
,
data
=
{},
options
=
{})
{
console
.
log
(
this
.
request
,
'this.request'
)
return
this
.
request
({
return
this
.
request
({
method
:
"GET"
,
method
:
"GET"
,
data
:
data
,
data
:
data
,
...
...
src/plugins/uploader/request/core/utils.js
View file @
45da3ae0
...
@@ -67,7 +67,6 @@ export const dispatchRequest = function(requestInfo) {
...
@@ -67,7 +67,6 @@ export const dispatchRequest = function(requestInfo) {
}
}
// #endif
// #endif
let
requestTask
=
uni
.
request
(
requestData
);
let
requestTask
=
uni
.
request
(
requestData
);
console
.
log
(
requestTask
,
requestData
,
'requestTask'
)
setTimeout
(()
=>
{
setTimeout
(()
=>
{
if
(
requestAbort
){
if
(
requestAbort
){
requestTask
.
abort
();
requestTask
.
abort
();
...
...
src/plugins/uploader/request/upload/utils.js
View file @
45da3ae0
...
@@ -16,7 +16,6 @@ export const randomChar = function(l, url = "") {
...
@@ -16,7 +16,6 @@ export const randomChar = function(l, url = "") {
}
}
//图片选择
//图片选择
export
const
chooseImage
=
function
(
data
)
{
export
const
chooseImage
=
function
(
data
)
{
console
.
log
(
data
,
'data-chooseImage'
)
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
uni
.
chooseImage
({
uni
.
chooseImage
({
count
:
data
.
count
||
9
,
//默认9
count
:
data
.
count
||
9
,
//默认9
...
@@ -125,9 +124,6 @@ export const qiniuUpload = function(requestInfo, qnRes) {
...
@@ -125,9 +124,6 @@ export const qiniuUpload = function(requestInfo, qnRes) {
uptokenURL
:
'UpTokenURL.com/uptoken'
// 上传地址
uptokenURL
:
'UpTokenURL.com/uptoken'
// 上传地址
},
(
res
)
=>
{
},
(
res
)
=>
{
requestInfo
.
onProgressUpdate
&&
requestInfo
.
onProgressUpdate
(
Object
.
assign
({},
fileData
,
res
));
requestInfo
.
onProgressUpdate
&&
requestInfo
.
onProgressUpdate
(
Object
.
assign
({},
fileData
,
res
));
// console.log('上传进度', res.progress)
// console.log('已经上传的数据长度', res.totalBytesSent)
// console.log('预期需要上传的数据总长度', res.totalBytesExpectedToSend)
});
});
}
}
// });
// });
...
...
src/router/index.js
View file @
45da3ae0
...
@@ -15,7 +15,6 @@ router.beforeEach((to, from, next) => {
...
@@ -15,7 +15,6 @@ router.beforeEach((to, from, next) => {
});
});
// 全局路由后置守卫
// 全局路由后置守卫
router
.
afterEach
((
to
,
from
)
=>
{
router
.
afterEach
((
to
,
from
)
=>
{
console
.
log
(
'跳转结束'
)
})
})
export
{
export
{
...
...
src/static/photo/icon-flash-off.png
0 → 100644
View file @
45da3ae0
1.36 KB
src/static/photo/icon-flash-torch.png
0 → 100644
View file @
45da3ae0
1 KB
src/store/$u.mixin.js
View file @
45da3ae0
...
@@ -2,7 +2,6 @@ import {
...
@@ -2,7 +2,6 @@ import {
mapState
mapState
}
from
'vuex'
}
from
'vuex'
import
store
from
"@/store/index"
import
store
from
"@/store/index"
console
.
log
(
store
,
store
.
state
,
'store'
)
// 尝试将用户在根目录中的store/index.js的vuex的state变量,全部加载到全局变量中
// 尝试将用户在根目录中的store/index.js的vuex的state变量,全部加载到全局变量中
let
$uStoreKey
=
[];
let
$uStoreKey
=
[];
...
...
src/store/index.js
View file @
45da3ae0
...
@@ -63,6 +63,5 @@ const store = new Vuex.Store({
...
@@ -63,6 +63,5 @@ const store = new Vuex.Store({
}
}
}
}
})
})
console
.
log
(
store
,
'store----------------'
)
export
default
store
export
default
store
src/utils/login.js
View file @
45da3ae0
...
@@ -77,7 +77,6 @@ function oauth() {
...
@@ -77,7 +77,6 @@ function oauth() {
uni
.
getProvider
({
uni
.
getProvider
({
service
:
'oauth'
,
service
:
'oauth'
,
success
:
function
(
res
)
{
success
:
function
(
res
)
{
console
.
log
(
res
.
provider
)
if
(
~
res
.
provider
.
indexOf
(
'weixin'
))
{
if
(
~
res
.
provider
.
indexOf
(
'weixin'
))
{
// weixin 微信登录
// weixin 微信登录
login
(
'weixin'
).
then
(
res
=>
{
resolve
(
res
)}).
catch
(
err
=>
{
reject
(
err
)})
login
(
'weixin'
).
then
(
res
=>
{
resolve
(
res
)}).
catch
(
err
=>
{
reject
(
err
)})
...
@@ -107,7 +106,6 @@ function login(provider) {
...
@@ -107,7 +106,6 @@ function login(provider) {
uni
.
login
({
uni
.
login
({
provider
:
provider
,
provider
:
provider
,
success
(
res
)
{
success
(
res
)
{
console
.
log
(
JSON
.
stringify
(
res
));
resolve
(
res
);
resolve
(
res
);
},
},
fail
(
err
)
{
fail
(
err
)
{
...
...
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