From 6c7de0bb9619d9044fe1d2cd26763dcb7e5ac3af Mon Sep 17 00:00:00 2001
From: unknown <331404948@qq.com>
Date: Tue, 27 Feb 2024 19:08:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BA=86=E5=A4=9A=E4=BD=99?=
=?UTF-8?q?=E7=9A=84=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
config/api.js | 2 +-
pages.json | 127 +-
.../carEntry/examineAppointment/comp/pickDate.vue | 376 ------
pages/carEntry/examineAppointment/comp/step1.vue | 92 --
pages/carEntry/examineAppointment/comp/step2.vue | 120 --
pages/carEntry/examineAppointment/comp/step3.vue | 195 ---
.../examineAppointment/examineAppointment.vue | 200 ----
.../carEntry/simulateAppointment/comp/pickDate.vue | 379 ------
pages/carEntry/simulateAppointment/comp/step1.vue | 85 --
pages/carEntry/simulateAppointment/comp/step2.vue | 204 ----
pages/carEntry/simulateAppointment/comp/step3.vue | 197 ---
.../simulateAppointment/simulateAppointment.vue | 150 ---
pages/indexEntry/credit/credit.vue | 59 -
.../examines/allExamines/allExamines.vue | 121 --
pages/indexEntry/examines/allNews/allNews.vue | 51 -
pages/indexEntry/examines/comp/examineItem.vue | 117 --
pages/indexEntry/examines/comp/newItem.vue | 32 -
pages/indexEntry/examines/detail/detail.vue | 201 ----
pages/indexEntry/examines/examines.vue | 98 --
.../indexEntry/examines/newsDetail/newsDetail.vue | 34 -
.../examines/warningEducation/warningEducation.vue | 121 --
.../findShcool/shcoolDetail/shcoolDetail.vue | 2 +-
pages/indexEntry/signIn/signAndOut/signAndOut.vue | 236 ++++
pages/indexEntry/signIn/signIn.vue | 2 +-
pages/mineEntry/myCollect/myCollect.vue | 94 --
pages/mineEntry/myCollect/videoItem.vue | 49 -
pages/mineEntry/uAvatarCropper/uAvatarCropper.vue | 284 -----
pages/mineEntry/uAvatarCropper/weCropper.js | 1265 --------------------
pages/tabbar/index/comp/schoolItem.vue | 16 +-
pages/tabbar/learnCar/index.vue | 10 +-
pages/userCenter/login/login - 副本.vue | 227 ----
pages/userCenter/login/loginByPhone.vue | 192 ---
static/images/carIcon/home_icon_buzhou@2x.png | Bin 0 -> 624 bytes
static/images/carIcon/home_icon_weidao@2x.png | Bin 0 -> 2834 bytes
static/images/carIcon/home_icon_zhuangtai@2x.png | Bin 0 -> 597 bytes
35 files changed, 261 insertions(+), 5077 deletions(-)
delete mode 100644 pages/carEntry/examineAppointment/comp/pickDate.vue
delete mode 100644 pages/carEntry/examineAppointment/comp/step1.vue
delete mode 100644 pages/carEntry/examineAppointment/comp/step2.vue
delete mode 100644 pages/carEntry/examineAppointment/comp/step3.vue
delete mode 100644 pages/carEntry/examineAppointment/examineAppointment.vue
delete mode 100644 pages/carEntry/simulateAppointment/comp/pickDate.vue
delete mode 100644 pages/carEntry/simulateAppointment/comp/step1.vue
delete mode 100644 pages/carEntry/simulateAppointment/comp/step2.vue
delete mode 100644 pages/carEntry/simulateAppointment/comp/step3.vue
delete mode 100644 pages/carEntry/simulateAppointment/simulateAppointment.vue
delete mode 100644 pages/indexEntry/credit/credit.vue
delete mode 100644 pages/indexEntry/examines/allExamines/allExamines.vue
delete mode 100644 pages/indexEntry/examines/allNews/allNews.vue
delete mode 100644 pages/indexEntry/examines/comp/examineItem.vue
delete mode 100644 pages/indexEntry/examines/comp/newItem.vue
delete mode 100644 pages/indexEntry/examines/detail/detail.vue
delete mode 100644 pages/indexEntry/examines/examines.vue
delete mode 100644 pages/indexEntry/examines/newsDetail/newsDetail.vue
delete mode 100644 pages/indexEntry/examines/warningEducation/warningEducation.vue
create mode 100644 pages/indexEntry/signIn/signAndOut/signAndOut.vue
delete mode 100644 pages/mineEntry/myCollect/myCollect.vue
delete mode 100644 pages/mineEntry/myCollect/videoItem.vue
delete mode 100644 pages/mineEntry/uAvatarCropper/uAvatarCropper.vue
delete mode 100644 pages/mineEntry/uAvatarCropper/weCropper.js
delete mode 100644 pages/userCenter/login/login - 副本.vue
delete mode 100644 pages/userCenter/login/loginByPhone.vue
create mode 100644 static/images/carIcon/home_icon_buzhou@2x.png
create mode 100644 static/images/carIcon/home_icon_weidao@2x.png
create mode 100644 static/images/carIcon/home_icon_zhuangtai@2x.png
diff --git a/config/api.js b/config/api.js
index 78a3617..4c60ae2 100644
--- a/config/api.js
+++ b/config/api.js
@@ -181,7 +181,7 @@ export const recommendSchoolList = (params={}) => http.get('business/school/reco
// 教练评价
export const getBycoachId = (params={}) => http.get('business/appcomplain/getBycoachId', {params})
// 人脸核身---获取certifyId
-export const getInitFaceVerify = (params={}) => http.get('app/student-record/getInitFaceVerify', {params})
+export const getInitFaceVerify = (data) => http.post('app/student-record/getInitFaceVerify', data)
diff --git a/pages.json b/pages.json
index 526cb06..5b01bf8 100644
--- a/pages.json
+++ b/pages.json
@@ -44,24 +44,14 @@
}
},
{
- "path": "NonPlatformStudentInfo/NonPlatformStudentInfo",
+ "path": "signIn/signAndOut/signAndOut",
"style": {
- "navigationBarTitleText": "非平台学员",
+ "navigationBarTitleText": "签到/签退确认",
"enablePullDownRefresh": false,
- "navigationStyle": "custom",
- "backgroundTextStyle": "dark" ,
- "navigationBarBackgroundColor": "#FFFFFF"
- }
- },
- {
- "path": "credit/credit",
- "style": {
- "navigationBarTitleText": "质量信誉排行",
- "enablePullDownRefresh": false,
- "backgroundTextStyle": "dark" ,
- "navigationBarBackgroundColor": "#FFFFFF"
+ "backgroundTextStyle": "dark"
}
},
+
{
"path": "parse/parse",
"style": {
@@ -200,7 +190,7 @@
{
"path": "findShcool/shcoolDetail/shcoolDetail",
"style": {
- "navigationBarTitleText": "找驾校",
+ "navigationBarTitleText": "驾校详情",
"navigationStyle": "custom",
"enablePullDownRefresh": false,
"backgroundTextStyle": "dark"
@@ -260,60 +250,6 @@
}
},
{
- "path": "examines/examines",
- "style": {
- "navigationBarTitleText": "找考场",
- "navigationStyle": "custom",
- "enablePullDownRefresh": false,
- "backgroundTextStyle": "dark"
- }
- },
- {
- "path": "examines/warningEducation/warningEducation",
- "style": {
- "navigationBarTitleText": "安全警示教育在线视频学习",
- "navigationStyle": "custom",
- "enablePullDownRefresh": false,
- "backgroundTextStyle": "dark"
- }
- },
- {
- "path": "examines/allExamines/allExamines",
- "style": {
- "navigationBarTitleText": "找考场",
- "navigationStyle": "custom",
- "enablePullDownRefresh": false,
- "backgroundTextStyle": "dark"
- }
- },
- {
- "path": "examines/detail/detail",
- "style": {
- "navigationBarTitleText": "考场详情",
- "navigationStyle": "custom",
- "enablePullDownRefresh": false,
- "backgroundTextStyle": "dark"
- }
- },
- {
- "path": "examines/allNews/allNews",
- "style": {
- "navigationBarTitleText": "考场信息资讯",
- "navigationStyle": "custom",
- "enablePullDownRefresh": true,
- "backgroundTextStyle": "dark"
- }
- },
- {
- "path": "examines/newsDetail/newsDetail",
- "style": {
- "navigationBarTitleText": "资讯详情",
- "navigationStyle": "custom",
- "enablePullDownRefresh": false,
- "backgroundTextStyle": "dark"
- }
- },
- {
"path": "theory/theory",
"style": {
"navigationBarTitleText": "理论学习",
@@ -382,15 +318,6 @@
"root": "pages/carEntry",
"pages": [
{
- "path": "simulateAppointment/simulateAppointment",
- "style": {
- "navigationBarTitleText": "模拟器训练预约",
- "navigationStyle": "custom",
- "enablePullDownRefresh": false,
- "backgroundTextStyle": "dark"
- }
- },
- {
"path": "operaAppointment/operaAppointment",
"style": {
"navigationBarTitleText": "实操训练预约",
@@ -400,15 +327,6 @@
}
},
{
- "path": "examineAppointment/examineAppointment",
- "style": {
- "navigationBarTitleText": "考场训练预约",
- "navigationStyle": "custom",
- "enablePullDownRefresh": false,
- "backgroundTextStyle": "dark"
- }
- },
- {
"path": "evaluate/evaluate",
"style": {
"navigationBarTitleText": "评价",
@@ -449,15 +367,6 @@
}
},
{
- "path": "uAvatarCropper/uAvatarCropper",
- "style": {
- "navigationBarTitleText": "图像裁剪",
- "navigationStyle": "custom",
- "enablePullDownRefresh": false,
- "backgroundTextStyle": "dark"
- }
- },
- {
"path": "myForecastName/myForecastName",
"style": {
"navigationBarTitleText": "我的报名",
@@ -537,15 +446,6 @@
}
},
{
- "path": "myCollect/myCollect",
- "style": {
- "navigationBarTitleText": "我的收藏",
- "navigationStyle": "custom",
- "enablePullDownRefresh": true,
- "backgroundTextStyle": "dark"
- }
- },
- {
"path": "myEvaluate/myEvaluate",
"style": {
"navigationBarTitleText": "我的评价",
@@ -601,23 +501,6 @@
"enablePullDownRefresh": false,
"backgroundTextStyle": "dark"
}
- },
- {
- "path": "login/loginByPhone",
- "style": {
- "navigationBarTitleText": "手机号登录",
- "navigationStyle": "custom",
- "enablePullDownRefresh": false,
- "backgroundTextStyle": "dark"
- }
- },
- {
- "path": "login/privacyAgreement/privacyAgreement",
- "style": {
- "navigationBarTitleText": "登录",
- "enablePullDownRefresh": false,
- "backgroundTextStyle": "dark"
- }
}
]
diff --git a/pages/carEntry/examineAppointment/comp/pickDate.vue b/pages/carEntry/examineAppointment/comp/pickDate.vue
deleted file mode 100644
index 44d6c68..0000000
--- a/pages/carEntry/examineAppointment/comp/pickDate.vue
+++ /dev/null
@@ -1,376 +0,0 @@
-
-
-
-
-
- {{ currentMonth }}
-
-
-
-
-
-
-
-
-
-
-
-
- {{ item.week }}
- {{ item.num }}
-
-
-
-
-
-
-
-
-
-
-
-
- 上午
-
-
- {{ statusTxt[item.status] }}
- {{ item.classTime }}
-
-
- 下午
-
-
- {{ statusTxt[item.status] }}
- {{ item.classTime }}
-
-
-
-
- 暂无预约排课
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages/carEntry/examineAppointment/comp/step1.vue b/pages/carEntry/examineAppointment/comp/step1.vue
deleted file mode 100644
index 48a94ce..0000000
--- a/pages/carEntry/examineAppointment/comp/step1.vue
+++ /dev/null
@@ -1,92 +0,0 @@
-
-
-
-
- {{ item.name}}
- {{ item.address }}
-
-
-
-
-
-
-
-
- 下一步
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages/carEntry/examineAppointment/comp/step2.vue b/pages/carEntry/examineAppointment/comp/step2.vue
deleted file mode 100644
index 9dffd5f..0000000
--- a/pages/carEntry/examineAppointment/comp/step2.vue
+++ /dev/null
@@ -1,120 +0,0 @@
-
-
-
-
-
-
- {{item.carNumber}}号车
- {{ item.licnum }}
-
-
-
-
-
-
-
- 返回上一步
- 下一步
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages/carEntry/examineAppointment/comp/step3.vue b/pages/carEntry/examineAppointment/comp/step3.vue
deleted file mode 100644
index dd86a3d..0000000
--- a/pages/carEntry/examineAppointment/comp/step3.vue
+++ /dev/null
@@ -1,195 +0,0 @@
-
-
-
-
-
-
- 返回上一步
- 确认预约
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages/carEntry/examineAppointment/examineAppointment.vue b/pages/carEntry/examineAppointment/examineAppointment.vue
deleted file mode 100644
index 9ad1676..0000000
--- a/pages/carEntry/examineAppointment/examineAppointment.vue
+++ /dev/null
@@ -1,200 +0,0 @@
-
-
-
-
-
-
-
- 1
-
-
-
- 2
-
-
-
- 3
-
-
-
-
-
-
- 选择考场
-
- 选择车辆
- 选择时间
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages/carEntry/simulateAppointment/comp/pickDate.vue b/pages/carEntry/simulateAppointment/comp/pickDate.vue
deleted file mode 100644
index ffb341a..0000000
--- a/pages/carEntry/simulateAppointment/comp/pickDate.vue
+++ /dev/null
@@ -1,379 +0,0 @@
-
-
-
-
-
- {{ currentMonth }}
-
-
-
-
-
-
-
-
-
-
-
-
- {{ item.week }}
- {{ item.num }}
-
-
-
-
-
-
-
-
-
-
-
-
- 上午
-
-
- {{ statusTxt[item.status] }}
- {{ item.classTime }}
-
-
- 下午
-
-
- {{ statusTxt[item.status] }}
- {{ item.classTime }}
-
-
-
-
- 暂无预约排课
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages/carEntry/simulateAppointment/comp/step1.vue b/pages/carEntry/simulateAppointment/comp/step1.vue
deleted file mode 100644
index 4748cdd..0000000
--- a/pages/carEntry/simulateAppointment/comp/step1.vue
+++ /dev/null
@@ -1,85 +0,0 @@
-
-
-
-
- {{ item.pointName }}
- {{item.pointAddress}}
-
-
-
-
-
-
-
-
-
- 下一步
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages/carEntry/simulateAppointment/comp/step2.vue b/pages/carEntry/simulateAppointment/comp/step2.vue
deleted file mode 100644
index 60b19f1..0000000
--- a/pages/carEntry/simulateAppointment/comp/step2.vue
+++ /dev/null
@@ -1,204 +0,0 @@
-
-
-
-
-
-
-
- 返回上一步
- 下一步
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages/carEntry/simulateAppointment/comp/step3.vue b/pages/carEntry/simulateAppointment/comp/step3.vue
deleted file mode 100644
index 13a30c1..0000000
--- a/pages/carEntry/simulateAppointment/comp/step3.vue
+++ /dev/null
@@ -1,197 +0,0 @@
-
-
-
-
-
- {{ item.seq }}
-
-
-
-
- 返回上一步
- 确认
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages/carEntry/simulateAppointment/simulateAppointment.vue b/pages/carEntry/simulateAppointment/simulateAppointment.vue
deleted file mode 100644
index ed70926..0000000
--- a/pages/carEntry/simulateAppointment/simulateAppointment.vue
+++ /dev/null
@@ -1,150 +0,0 @@
-
-
-
-
-
-
-
- 1
-
-
-
- 2
-
-
-
- 3
-
-
-
- 选择模拟驾驶馆
- 预约时间
- 选择模拟器
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages/indexEntry/credit/credit.vue b/pages/indexEntry/credit/credit.vue
deleted file mode 100644
index 3106456..0000000
--- a/pages/indexEntry/credit/credit.vue
+++ /dev/null
@@ -1,59 +0,0 @@
-
-
-
-
- 1
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages/indexEntry/examines/allExamines/allExamines.vue b/pages/indexEntry/examines/allExamines/allExamines.vue
deleted file mode 100644
index 4886afc..0000000
--- a/pages/indexEntry/examines/allExamines/allExamines.vue
+++ /dev/null
@@ -1,121 +0,0 @@
-
-
-
-
-
-
-
-
- {{ item.text }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages/indexEntry/examines/allNews/allNews.vue b/pages/indexEntry/examines/allNews/allNews.vue
deleted file mode 100644
index d1034e4..0000000
--- a/pages/indexEntry/examines/allNews/allNews.vue
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages/indexEntry/examines/comp/examineItem.vue b/pages/indexEntry/examines/comp/examineItem.vue
deleted file mode 100644
index 08bff87..0000000
--- a/pages/indexEntry/examines/comp/examineItem.vue
+++ /dev/null
@@ -1,117 +0,0 @@
-
-
-
-
-
-
-
- {{ item.name}}
-
- 准考车型：{{item.carType}}
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ item.notification }}
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages/indexEntry/examines/comp/newItem.vue b/pages/indexEntry/examines/comp/newItem.vue
deleted file mode 100644
index bec0d1f..0000000
--- a/pages/indexEntry/examines/comp/newItem.vue
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
- {{ item.title}}！
- {{ item.mainBody }}
- 发布时间：{{ $u.date(item.createTime, 'yyyy/mm/dd')}}
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages/indexEntry/examines/detail/detail.vue b/pages/indexEntry/examines/detail/detail.vue
deleted file mode 100644
index 415b685..0000000
--- a/pages/indexEntry/examines/detail/detail.vue
+++ /dev/null
@@ -1,201 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{detailInfo.name}}
- 准考车型：{{detailInfo.carType}}
-
-
-
-
-
-
-
-
-
- 考场位置
-
-
-
-
-
-
-
- 信息资讯
-
-
-
-
-
-
- 我要模拟
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages/indexEntry/examines/examines.vue b/pages/indexEntry/examines/examines.vue
deleted file mode 100644
index 5603457..0000000
--- a/pages/indexEntry/examines/examines.vue
+++ /dev/null
@@ -1,98 +0,0 @@
-
-
-
-
-
-
-
-
-
-
- {{ item.text }}
-
-
-
-
- 附近考场
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages/indexEntry/examines/newsDetail/newsDetail.vue b/pages/indexEntry/examines/newsDetail/newsDetail.vue
deleted file mode 100644
index 307e55a..0000000
--- a/pages/indexEntry/examines/newsDetail/newsDetail.vue
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-
-
- 最新免费开放日来啦！
-
- 内容
-
- 发布时间：2023/08/06
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages/indexEntry/examines/warningEducation/warningEducation.vue b/pages/indexEntry/examines/warningEducation/warningEducation.vue
deleted file mode 100644
index 601207c..0000000
--- a/pages/indexEntry/examines/warningEducation/warningEducation.vue
+++ /dev/null
@@ -1,121 +0,0 @@
-
-
-
-
-
-
-
-
-
- 第一章
-
-
- 未开始
-
-
-
-
-
-
-
-
- 公益短片之“车速决定命运”
- 3:22
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages/indexEntry/findShcool/shcoolDetail/shcoolDetail.vue b/pages/indexEntry/findShcool/shcoolDetail/shcoolDetail.vue
index d31db54..9cc2e60 100644
--- a/pages/indexEntry/findShcool/shcoolDetail/shcoolDetail.vue
+++ b/pages/indexEntry/findShcool/shcoolDetail/shcoolDetail.vue
@@ -12,7 +12,7 @@
-
+
diff --git a/pages/indexEntry/signIn/signAndOut/signAndOut.vue b/pages/indexEntry/signIn/signAndOut/signAndOut.vue
new file mode 100644
index 0000000..15b4fcb
--- /dev/null
+++ b/pages/indexEntry/signIn/signAndOut/signAndOut.vue
@@ -0,0 +1,236 @@
+
+
+
+
+
+
+
+
+ 步骤
+
+
+
+
+
+ 状态
+
+
+
+
+
+
+ 1
+
+
+
+ 信息认证
+ 失败原因：{{stepFailureReason}}
+
+ {{step1?'通过': '不通过'}}
+
+
+
+
+ 2
+
+
+
+ 人脸识别
+
+
+ 通过
+
+
+
+
+ 3
+
+
+ 信息同步
+
+
+ 通过
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/indexEntry/signIn/signIn.vue b/pages/indexEntry/signIn/signIn.vue
index ecbd116..a10d488 100644
--- a/pages/indexEntry/signIn/signIn.vue
+++ b/pages/indexEntry/signIn/signIn.vue
@@ -1,7 +1,7 @@
- 去签到/去签退
+ 去签到/去签退
签到记录
diff --git a/pages/mineEntry/myCollect/myCollect.vue b/pages/mineEntry/myCollect/myCollect.vue
deleted file mode 100644
index 51fc444..0000000
--- a/pages/mineEntry/myCollect/myCollect.vue
+++ /dev/null
@@ -1,94 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages/mineEntry/myCollect/videoItem.vue b/pages/mineEntry/myCollect/videoItem.vue
deleted file mode 100644
index 8f7f3be..0000000
--- a/pages/mineEntry/myCollect/videoItem.vue
+++ /dev/null
@@ -1,49 +0,0 @@
-
-
-
-
-
-
-
-
-
-
- {{ item.title }}
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages/mineEntry/uAvatarCropper/uAvatarCropper.vue b/pages/mineEntry/uAvatarCropper/uAvatarCropper.vue
deleted file mode 100644
index 1e8d473..0000000
--- a/pages/mineEntry/uAvatarCropper/uAvatarCropper.vue
+++ /dev/null
@@ -1,284 +0,0 @@
-
-
-
-
-
-
-
- 取消
- 完成
-
-
-
-
-
-
-
diff --git a/pages/mineEntry/uAvatarCropper/weCropper.js b/pages/mineEntry/uAvatarCropper/weCropper.js
deleted file mode 100644
index df02483..0000000
--- a/pages/mineEntry/uAvatarCropper/weCropper.js
+++ /dev/null
@@ -1,1265 +0,0 @@
-/**
- * we-cropper v1.3.9
- * (c) 2020 dlhandsome
- * @license MIT
- */
-(function(global, factory) {
- typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
- typeof define === 'function' && define.amd ? define(factory) :
- (global.WeCropper = factory());
-}(this, (function() {
- 'use strict';
-
- var device = void 0;
- var TOUCH_STATE = ['touchstarted', 'touchmoved', 'touchended'];
-
- function firstLetterUpper(str) {
- return str.charAt(0).toUpperCase() + str.slice(1)
- }
-
- function setTouchState(instance) {
- var arg = [],
- len = arguments.length - 1;
- while (len-- > 0) arg[len] = arguments[len + 1];
-
- TOUCH_STATE.forEach(function(key, i) {
- if (arg[i] !== undefined) {
- instance[key] = arg[i];
- }
- });
- }
-
- function validator(instance, o) {
- Object.defineProperties(instance, o);
- }
-
- function getDevice() {
- if (!device) {
- device = uni.getSystemInfoSync();
- }
- return device
- }
-
- var tmp = {};
-
- var ref = getDevice();
- var pixelRatio = ref.pixelRatio;
-
- var DEFAULT = {
- id: {
- default: 'cropper',
- get: function get() {
- return tmp.id
- },
- set: function set(value) {
- if (typeof(value) !== 'string') {
- console.error(("id：" + value + " is invalid"));
- }
- tmp.id = value;
- }
- },
- width: {
- default: 750,
- get: function get() {
- return tmp.width
- },
- set: function set(value) {
- if (typeof(value) !== 'number') {
- console.error(("width：" + value + " is invalid"));
- }
- tmp.width = value;
- }
- },
- height: {
- default: 750,
- get: function get() {
- return tmp.height
- },
- set: function set(value) {
- if (typeof(value) !== 'number') {
- console.error(("height：" + value + " is invalid"));
- }
- tmp.height = value;
- }
- },
- pixelRatio: {
- default: pixelRatio,
- get: function get() {
- return tmp.pixelRatio
- },
- set: function set(value) {
- if (typeof(value) !== 'number') {
- console.error(("pixelRatio：" + value + " is invalid"));
- }
- tmp.pixelRatio = value;
- }
- },
- scale: {
- default: 2.5,
- get: function get() {
- return tmp.scale
- },
- set: function set(value) {
- if (typeof(value) !== 'number') {
- console.error(("scale：" + value + " is invalid"));
- }
- tmp.scale = value;
- }
- },
- zoom: {
- default: 5,
- get: function get() {
- return tmp.zoom
- },
- set: function set(value) {
- if (typeof(value) !== 'number') {
- console.error(("zoom：" + value + " is invalid"));
- } else if (value < 0 || value > 10) {
- console.error("zoom should be ranged in 0 ~ 10");
- }
- tmp.zoom = value;
- }
- },
- src: {
- default: '',
- get: function get() {
- return tmp.src
- },
- set: function set(value) {
- if (typeof(value) !== 'string') {
- console.error(("src：" + value + " is invalid"));
- }
- tmp.src = value;
- }
- },
- cut: {
- default: {},
- get: function get() {
- return tmp.cut
- },
- set: function set(value) {
- if (typeof(value) !== 'object') {
- console.error(("cut：" + value + " is invalid"));
- }
- tmp.cut = value;
- }
- },
- boundStyle: {
- default: {},
- get: function get() {
- return tmp.boundStyle
- },
- set: function set(value) {
- if (typeof(value) !== 'object') {
- console.error(("boundStyle：" + value + " is invalid"));
- }
- tmp.boundStyle = value;
- }
- },
- onReady: {
- default: null,
- get: function get() {
- return tmp.ready
- },
- set: function set(value) {
- tmp.ready = value;
- }
- },
- onBeforeImageLoad: {
- default: null,
- get: function get() {
- return tmp.beforeImageLoad
- },
- set: function set(value) {
- tmp.beforeImageLoad = value;
- }
- },
- onImageLoad: {
- default: null,
- get: function get() {
- return tmp.imageLoad
- },
- set: function set(value) {
- tmp.imageLoad = value;
- }
- },
- onBeforeDraw: {
- default: null,
- get: function get() {
- return tmp.beforeDraw
- },
- set: function set(value) {
- tmp.beforeDraw = value;
- }
- }
- };
-
- var ref$1 = getDevice();
- var windowWidth = ref$1.windowWidth;
-
- function prepare() {
- var self = this;
-
- // v1.4.0 版本中将不再自动绑定we-cropper实例
- self.attachPage = function() {
- var pages = getCurrentPages();
- // 获取到当前page上下文
- var pageContext = pages[pages.length - 1];
- // 把this依附在Page上下文的wecropper属性上，便于在page钩子函数中访问
- Object.defineProperty(pageContext, 'wecropper', {
- get: function get() {
- console.warn(
- 'Instance will not be automatically bound to the page after v1.4.0\n\n' +
- 'Please use a custom instance name instead\n\n' +
- 'Example: \n' +
- 'this.mycropper = new WeCropper(options)\n\n' +
- '// ...\n' +
- 'this.mycropper.getCropperImage()'
- );
- return self
- },
- configurable: true
- });
- };
-
- self.createCtx = function() {
- var id = self.id;
- var targetId = self.targetId;
-
- if (id) {
- self.ctx = self.ctx || uni.createCanvasContext(id);
- self.targetCtx = self.targetCtx || uni.createCanvasContext(targetId);
- } else {
- console.error("constructor: create canvas context failed, 'id' must be valuable");
- }
- };
-
- self.deviceRadio = windowWidth / 750;
- }
-
- var commonjsGlobal = typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !==
- 'undefined' ? self : {};
-
-
-
-
-
- function createCommonjsModule(fn, module) {
- return module = {
- exports: {}
- }, fn(module, module.exports), module.exports;
- }
-
- var tools = createCommonjsModule(function(module, exports) {
- /**
- * String type check
- */
- exports.isStr = function(v) {
- return typeof v === 'string';
- };
- /**
- * Number type check
- */
- exports.isNum = function(v) {
- return typeof v === 'number';
- };
- /**
- * Array type check
- */
- exports.isArr = Array.isArray;
- /**
- * undefined type check
- */
- exports.isUndef = function(v) {
- return v === undefined;
- };
-
- exports.isTrue = function(v) {
- return v === true;
- };
-
- exports.isFalse = function(v) {
- return v === false;
- };
- /**
- * Function type check
- */
- exports.isFunc = function(v) {
- return typeof v === 'function';
- };
- /**
- * Quick object check - this is primarily used to tell
- * Objects from primitive values when we know the value
- * is a JSON-compliant type.
- */
- exports.isObj = exports.isObject = function(obj) {
- return obj !== null && typeof obj === 'object'
- };
-
- /**
- * Strict object type check. Only returns true
- * for plain JavaScript objects.
- */
- var _toString = Object.prototype.toString;
- exports.isPlainObject = function(obj) {
- return _toString.call(obj) === '[object Object]'
- };
-
- /**
- * Check whether the object has the property.
- */
- var hasOwnProperty = Object.prototype.hasOwnProperty;
- exports.hasOwn = function(obj, key) {
- return hasOwnProperty.call(obj, key)
- };
-
- /**
- * Perform no operation.
- * Stubbing args to make Flow happy without leaving useless transpiled code
- * with ...rest (https://flow.org/blog/2017/05/07/Strict-Function-Call-Arity/)
- */
- exports.noop = function(a, b, c) {};
-
- /**
- * Check if val is a valid array index.
- */
- exports.isValidArrayIndex = function(val) {
- var n = parseFloat(String(val));
- return n >= 0 && Math.floor(n) === n && isFinite(val)
- };
- });
-
- var tools_7 = tools.isFunc;
- var tools_10 = tools.isPlainObject;
-
- var EVENT_TYPE = ['ready', 'beforeImageLoad', 'beforeDraw', 'imageLoad'];
-
- function observer() {
- var self = this;
-
- self.on = function(event, fn) {
- if (EVENT_TYPE.indexOf(event) > -1) {
- if (tools_7(fn)) {
- event === 'ready' ?
- fn(self) :
- self[("on" + (firstLetterUpper(event)))] = fn;
- }
- } else {
- console.error(("event: " + event + " is invalid"));
- }
- return self
- };
- }
-
- function wxPromise(fn) {
- return function(obj) {
- var args = [],
- len = arguments.length - 1;
- while (len-- > 0) args[len] = arguments[len + 1];
-
- if (obj === void 0) obj = {};
- return new Promise(function(resolve, reject) {
- obj.success = function(res) {
- resolve(res);
- };
- obj.fail = function(err) {
- reject(err);
- };
- fn.apply(void 0, [obj].concat(args));
- })
- }
- }
-
- function draw(ctx, reserve) {
- if (reserve === void 0) reserve = false;
-
- return new Promise(function(resolve) {
- ctx.draw(reserve, resolve);
- })
- }
-
- var getImageInfo = wxPromise(uni.getImageInfo);
-
- var canvasToTempFilePath = wxPromise(uni.canvasToTempFilePath);
-
- var base64 = createCommonjsModule(function(module, exports) {
- /*! http://mths.be/base64 v0.1.0 by @mathias | MIT license */
- (function(root) {
-
- // Detect free variables `exports`.
- var freeExports = 'object' == 'object' && exports;
-
- // Detect free variable `module`.
- var freeModule = 'object' == 'object' && module &&
- module.exports == freeExports && module;
-
- // Detect free variable `global`, from Node.js or Browserified code, and use
- // it as `root`.
- var freeGlobal = typeof commonjsGlobal == 'object' && commonjsGlobal;
- if (freeGlobal.global === freeGlobal || freeGlobal.window === freeGlobal) {
- root = freeGlobal;
- }
-
- /*--------------------------------------------------------------------------*/
-
- var InvalidCharacterError = function(message) {
- this.message = message;
- };
- InvalidCharacterError.prototype = new Error;
- InvalidCharacterError.prototype.name = 'InvalidCharacterError';
-
- var error = function(message) {
- // Note: the error messages used throughout this file match those used by
- // the native `atob`/`btoa` implementation in Chromium.
- throw new InvalidCharacterError(message);
- };
-
- var TABLE = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
- // http://whatwg.org/html/common-microsyntaxes.html#space-character
- var REGEX_SPACE_CHARACTERS = /[\t\n\f\r ]/g;
-
- // `decode` is designed to be fully compatible with `atob` as described in the
- // HTML Standard. http://whatwg.org/html/webappapis.html#dom-windowbase64-atob
- // The optimized base64-decoding algorithm used is based on @atk’s excellent
- // implementation. https://gist.github.com/atk/1020396
- var decode = function(input) {
- input = String(input)
- .replace(REGEX_SPACE_CHARACTERS, '');
- var length = input.length;
- if (length % 4 == 0) {
- input = input.replace(/==?$/, '');
- length = input.length;
- }
- if (
- length % 4 == 1 ||
- // http://whatwg.org/C#alphanumeric-ascii-characters
- /[^+a-zA-Z0-9/]/.test(input)
- ) {
- error(
- 'Invalid character: the string to be decoded is not correctly encoded.'
- );
- }
- var bitCounter = 0;
- var bitStorage;
- var buffer;
- var output = '';
- var position = -1;
- while (++position < length) {
- buffer = TABLE.indexOf(input.charAt(position));
- bitStorage = bitCounter % 4 ? bitStorage * 64 + buffer : buffer;
- // Unless this is the first of a group of 4 characters…
- if (bitCounter++ % 4) {
- // …convert the first 8 bits to a single ASCII character.
- output += String.fromCharCode(
- 0xFF & bitStorage >> (-2 * bitCounter & 6)
- );
- }
- }
- return output;
- };
-
- // `encode` is designed to be fully compatible with `btoa` as described in the
- // HTML Standard: http://whatwg.org/html/webappapis.html#dom-windowbase64-btoa
- var encode = function(input) {
- input = String(input);
- if (/[^\0-\xFF]/.test(input)) {
- // Note: no need to special-case astral symbols here, as surrogates are
- // matched, and the input is supposed to only contain ASCII anyway.
- error(
- 'The string to be encoded contains characters outside of the ' +
- 'Latin1 range.'
- );
- }
- var padding = input.length % 3;
- var output = '';
- var position = -1;
- var a;
- var b;
- var c;
- var buffer;
- // Make sure any padding is handled outside of the loop.
- var length = input.length - padding;
-
- while (++position < length) {
- // Read three bytes, i.e. 24 bits.
- a = input.charCodeAt(position) << 16;
- b = input.charCodeAt(++position) << 8;
- c = input.charCodeAt(++position);
- buffer = a + b + c;
- // Turn the 24 bits into four chunks of 6 bits each, and append the
- // matching character for each of them to the output.
- output += (
- TABLE.charAt(buffer >> 18 & 0x3F) +
- TABLE.charAt(buffer >> 12 & 0x3F) +
- TABLE.charAt(buffer >> 6 & 0x3F) +
- TABLE.charAt(buffer & 0x3F)
- );
- }
-
- if (padding == 2) {
- a = input.charCodeAt(position) << 8;
- b = input.charCodeAt(++position);
- buffer = a + b;
- output += (
- TABLE.charAt(buffer >> 10) +
- TABLE.charAt((buffer >> 4) & 0x3F) +
- TABLE.charAt((buffer << 2) & 0x3F) +
- '='
- );
- } else if (padding == 1) {
- buffer = input.charCodeAt(position);
- output += (
- TABLE.charAt(buffer >> 2) +
- TABLE.charAt((buffer << 4) & 0x3F) +
- '=='
- );
- }
-
- return output;
- };
-
- var base64 = {
- 'encode': encode,
- 'decode': decode,
- 'version': '0.1.0'
- };
-
- // Some AMD build optimizers, like r.js, check for specific condition patterns
- // like the following:
- if (
- typeof undefined == 'function' &&
- typeof undefined.amd == 'object' &&
- undefined.amd
- ) {
- undefined(function() {
- return base64;
- });
- } else if (freeExports && !freeExports.nodeType) {
- if (freeModule) { // in Node.js or RingoJS v0.8.0+
- freeModule.exports = base64;
- } else { // in Narwhal or RingoJS v0.7.0-
- for (var key in base64) {
- base64.hasOwnProperty(key) && (freeExports[key] = base64[key]);
- }
- }
- } else { // in Rhino or a web browser
- root.base64 = base64;
- }
-
- }(commonjsGlobal));
- });
-
- function makeURI(strData, type) {
- return 'data:' + type + ';base64,' + strData
- }
-
- function fixType(type) {
- type = type.toLowerCase().replace(/jpg/i, 'jpeg');
- var r = type.match(/png|jpeg|bmp|gif/)[0];
- return 'image/' + r
- }
-
- function encodeData(data) {
- var str = '';
- if (typeof data === 'string') {
- str = data;
- } else {
- for (var i = 0; i < data.length; i++) {
- str += String.fromCharCode(data[i]);
- }
- }
- return base64.encode(str)
- }
-
- /**
- * 获取图像区域隐含的像素数据
- * @param canvasId canvas标识
- * @param x 将要被提取的图像数据矩形区域的左上角 x 坐标
- * @param y 将要被提取的图像数据矩形区域的左上角 y 坐标
- * @param width 将要被提取的图像数据矩形区域的宽度
- * @param height 将要被提取的图像数据矩形区域的高度
- * @param done 完成回调
- */
- function getImageData(canvasId, x, y, width, height, done) {
- uni.canvasGetImageData({
- canvasId: canvasId,
- x: x,
- y: y,
- width: width,
- height: height,
- success: function success(res) {
- done(res, null);
- },
- fail: function fail(res) {
- done(null, res);
- }
- });
- }
-
- /**
- * 生成bmp格式图片
- * 按照规则生成图片响应头和响应体
- * @param oData 用来描述 canvas 区域隐含的像素数据 { data, width, height } = oData
- * @returns {*} base64字符串
- */
- function genBitmapImage(oData) {
- //
- // BITMAPFILEHEADER: http://msdn.microsoft.com/en-us/library/windows/desktop/dd183374(v=vs.85).aspx
- // BITMAPINFOHEADER: http://msdn.microsoft.com/en-us/library/dd183376.aspx
- //
- var biWidth = oData.width;
- var biHeight = oData.height;
- var biSizeImage = biWidth * biHeight * 3;
- var bfSize = biSizeImage + 54; // total header size = 54 bytes
-
- //
- // typedef struct tagBITMAPFILEHEADER {
- // WORD bfType;
- // DWORD bfSize;
- // WORD bfReserved1;
- // WORD bfReserved2;
- // DWORD bfOffBits;
- // } BITMAPFILEHEADER;
- //
- var BITMAPFILEHEADER = [
- // WORD bfType -- The file type signature; must be "BM"
- 0x42, 0x4D,
- // DWORD bfSize -- The size, in bytes, of the bitmap file
- bfSize & 0xff, bfSize >> 8 & 0xff, bfSize >> 16 & 0xff, bfSize >> 24 & 0xff,
- // WORD bfReserved1 -- Reserved; must be zero
- 0, 0,
- // WORD bfReserved2 -- Reserved; must be zero
- 0, 0,
- // DWORD bfOffBits -- The offset, in bytes, from the beginning of the BITMAPFILEHEADER structure to the bitmap bits.
- 54, 0, 0, 0
- ];
-
- //
- // typedef struct tagBITMAPINFOHEADER {
- // DWORD biSize;
- // LONG biWidth;
- // LONG biHeight;
- // WORD biPlanes;
- // WORD biBitCount;
- // DWORD biCompression;
- // DWORD biSizeImage;
- // LONG biXPelsPerMeter;
- // LONG biYPelsPerMeter;
- // DWORD biClrUsed;
- // DWORD biClrImportant;
- // } BITMAPINFOHEADER, *PBITMAPINFOHEADER;
- //
- var BITMAPINFOHEADER = [
- // DWORD biSize -- The number of bytes required by the structure
- 40, 0, 0, 0,
- // LONG biWidth -- The width of the bitmap, in pixels
- biWidth & 0xff, biWidth >> 8 & 0xff, biWidth >> 16 & 0xff, biWidth >> 24 & 0xff,
- // LONG biHeight -- The height of the bitmap, in pixels
- biHeight & 0xff, biHeight >> 8 & 0xff, biHeight >> 16 & 0xff, biHeight >> 24 & 0xff,
- // WORD biPlanes -- The number of planes for the target device. This value must be set to 1
- 1, 0,
- // WORD biBitCount -- The number of bits-per-pixel, 24 bits-per-pixel -- the bitmap
- // has a maximum of 2^24 colors (16777216, Truecolor)
- 24, 0,
- // DWORD biCompression -- The type of compression, BI_RGB (code 0) -- uncompressed
- 0, 0, 0, 0,
- // DWORD biSizeImage -- The size, in bytes, of the image. This may be set to zero for BI_RGB bitmaps
- biSizeImage & 0xff, biSizeImage >> 8 & 0xff, biSizeImage >> 16 & 0xff, biSizeImage >> 24 & 0xff,
- // LONG biXPelsPerMeter, unused
- 0, 0, 0, 0,
- // LONG biYPelsPerMeter, unused
- 0, 0, 0, 0,
- // DWORD biClrUsed, the number of color indexes of palette, unused
- 0, 0, 0, 0,
- // DWORD biClrImportant, unused
- 0, 0, 0, 0
- ];
-
- var iPadding = (4 - ((biWidth * 3) % 4)) % 4;
-
- var aImgData = oData.data;
-
- var strPixelData = '';
- var biWidth4 = biWidth << 2;
- var y = biHeight;
- var fromCharCode = String.fromCharCode;
-
- do {
- var iOffsetY = biWidth4 * (y - 1);
- var strPixelRow = '';
- for (var x = 0; x < biWidth; x++) {
- var iOffsetX = x << 2;
- strPixelRow += fromCharCode(aImgData[iOffsetY + iOffsetX + 2]) +
- fromCharCode(aImgData[iOffsetY + iOffsetX + 1]) +
- fromCharCode(aImgData[iOffsetY + iOffsetX]);
- }
-
- for (var c = 0; c < iPadding; c++) {
- strPixelRow += String.fromCharCode(0);
- }
-
- strPixelData += strPixelRow;
- } while (--y)
-
- var strEncoded = encodeData(BITMAPFILEHEADER.concat(BITMAPINFOHEADER)) + encodeData(strPixelData);
-
- return strEncoded
- }
-
- /**
- * 转换为图片base64
- * @param canvasId canvas标识
- * @param x 将要被提取的图像数据矩形区域的左上角 x 坐标
- * @param y 将要被提取的图像数据矩形区域的左上角 y 坐标
- * @param width 将要被提取的图像数据矩形区域的宽度
- * @param height 将要被提取的图像数据矩形区域的高度
- * @param type 转换图片类型
- * @param done 完成回调
- */
- function convertToImage(canvasId, x, y, width, height, type, done) {
- if (done === void 0) done = function() {};
-
- if (type === undefined) {
- type = 'png';
- }
- type = fixType(type);
- if (/bmp/.test(type)) {
- getImageData(canvasId, x, y, width, height, function(data, err) {
- var strData = genBitmapImage(data);
- tools_7(done) && done(makeURI(strData, 'image/' + type), err);
- });
- } else {
- console.error('暂不支持生成\'' + type + '\'类型的base64图片');
- }
- }
-
- var CanvasToBase64 = {
- convertToImage: convertToImage,
- // convertToPNG: function (width, height, done) {
- // return convertToImage(width, height, 'png', done)
- // },
- // convertToJPEG: function (width, height, done) {
- // return convertToImage(width, height, 'jpeg', done)
- // },
- // convertToGIF: function (width, height, done) {
- // return convertToImage(width, height, 'gif', done)
- // },
- convertToBMP: function(ref, done) {
- if (ref === void 0) ref = {};
- var canvasId = ref.canvasId;
- var x = ref.x;
- var y = ref.y;
- var width = ref.width;
- var height = ref.height;
- if (done === void 0) done = function() {};
-
- return convertToImage(canvasId, x, y, width, height, 'bmp', done)
- }
- };
-
- function methods() {
- var self = this;
-
- var boundWidth = self.width; // 裁剪框默认宽度，即整个画布宽度
- var boundHeight = self.height; // 裁剪框默认高度，即整个画布高度
-
- var id = self.id;
- var targetId = self.targetId;
- var pixelRatio = self.pixelRatio;
-
- var ref = self.cut;
- var x = ref.x;
- if (x === void 0) x = 0;
- var y = ref.y;
- if (y === void 0) y = 0;
- var width = ref.width;
- if (width === void 0) width = boundWidth;
- var height = ref.height;
- if (height === void 0) height = boundHeight;
-
- self.updateCanvas = function(done) {
- if (self.croperTarget) {
- // 画布绘制图片
- self.ctx.drawImage(
- self.croperTarget,
- self.imgLeft,
- self.imgTop,
- self.scaleWidth,
- self.scaleHeight
- );
- }
- tools_7(self.onBeforeDraw) && self.onBeforeDraw(self.ctx, self);
-
- self.setBoundStyle(self.boundStyle); // 设置边界样式
-
- self.ctx.draw(false, done);
- return self
- };
-
- self.pushOrigin = self.pushOrign = function(src) {
- self.src = src;
-
- tools_7(self.onBeforeImageLoad) && self.onBeforeImageLoad(self.ctx, self);
-
- return getImageInfo({
- src: src
- })
- .then(function(res) {
- var innerAspectRadio = res.width / res.height;
- var customAspectRadio = width / height;
-
- self.croperTarget = res.path;
-
- if (innerAspectRadio < customAspectRadio) {
- self.rectX = x;
- self.baseWidth = width;
- self.baseHeight = width / innerAspectRadio;
- self.rectY = y - Math.abs((height - self.baseHeight) / 2);
- } else {
- self.rectY = y;
- self.baseWidth = height * innerAspectRadio;
- self.baseHeight = height;
- self.rectX = x - Math.abs((width - self.baseWidth) / 2);
- }
-
- self.imgLeft = self.rectX;
- self.imgTop = self.rectY;
- self.scaleWidth = self.baseWidth;
- self.scaleHeight = self.baseHeight;
-
- self.update();
-
- return new Promise(function(resolve) {
- self.updateCanvas(resolve);
- })
- })
- .then(function() {
- tools_7(self.onImageLoad) && self.onImageLoad(self.ctx, self);
- })
- };
-
- self.removeImage = function() {
- self.src = '';
- self.croperTarget = '';
- return draw(self.ctx)
- };
-
- self.getCropperBase64 = function(done) {
- if (done === void 0) done = function() {};
-
- CanvasToBase64.convertToBMP({
- canvasId: id,
- x: x,
- y: y,
- width: width,
- height: height
- }, done);
- };
-
- self.getCropperImage = function(opt, fn) {
- var customOptions = opt;
-
- var canvasOptions = {
- canvasId: id,
- x: x,
- y: y,
- width: width,
- height: height
- };
-
- var task = function() {
- return Promise.resolve();
- };
-
- if (
- tools_10(customOptions) &&
- customOptions.original
- ) {
- // original mode
- task = function() {
- self.targetCtx.drawImage(
- self.croperTarget,
- self.imgLeft * pixelRatio,
- self.imgTop * pixelRatio,
- self.scaleWidth * pixelRatio,
- self.scaleHeight * pixelRatio
- );
-
- canvasOptions = {
- canvasId: targetId,
- x: x * pixelRatio,
- y: y * pixelRatio,
- width: width * pixelRatio,
- height: height * pixelRatio
- };
-
- return draw(self.targetCtx)
- };
- }
-
- return task()
- .then(function() {
- if (tools_10(customOptions)) {
- canvasOptions = Object.assign({}, canvasOptions, customOptions);
- }
-
- if (tools_7(customOptions)) {
- fn = customOptions;
- }
-
- var arg = canvasOptions.componentContext ?
- [canvasOptions, canvasOptions.componentContext] :
- [canvasOptions];
-
- return canvasToTempFilePath.apply(null, arg)
- })
- .then(function(res) {
- var tempFilePath = res.tempFilePath;
-
- return tools_7(fn) ?
- fn.call(self, tempFilePath, null) :
- tempFilePath
- })
- .catch(function(err) {
- if (tools_7(fn)) {
- fn.call(self, null, err);
- } else {
- throw err
- }
- })
- };
- }
-
- /**
- * 获取最新缩放值
- * @param oldScale 上一次触摸结束后的缩放值
- * @param oldDistance 上一次触摸结束后的双指距离
- * @param zoom 缩放系数
- * @param touch0 第一指touch对象
- * @param touch1 第二指touch对象
- * @returns {*}
- */
- var getNewScale = function(oldScale, oldDistance, zoom, touch0, touch1) {
- var xMove, yMove, newDistance;
- // 计算二指最新距离
- xMove = Math.round(touch1.x - touch0.x);
- yMove = Math.round(touch1.y - touch0.y);
- newDistance = Math.round(Math.sqrt(xMove * xMove + yMove * yMove));
-
- return oldScale + 0.001 * zoom * (newDistance - oldDistance)
- };
-
- function update() {
- var self = this;
-
- if (!self.src) {
- return
- }
-
- self.__oneTouchStart = function(touch) {
- self.touchX0 = Math.round(touch.x);
- self.touchY0 = Math.round(touch.y);
- };
-
- self.__oneTouchMove = function(touch) {
- var xMove, yMove;
- // 计算单指移动的距离
- if (self.touchended) {
- return self.updateCanvas()
- }
- xMove = Math.round(touch.x - self.touchX0);
- yMove = Math.round(touch.y - self.touchY0);
-
- var imgLeft = Math.round(self.rectX + xMove);
- var imgTop = Math.round(self.rectY + yMove);
-
- self.outsideBound(imgLeft, imgTop);
-
- self.updateCanvas();
- };
-
- self.__twoTouchStart = function(touch0, touch1) {
- var xMove, yMove, oldDistance;
-
- self.touchX1 = Math.round(self.rectX + self.scaleWidth / 2);
- self.touchY1 = Math.round(self.rectY + self.scaleHeight / 2);
-
- // 计算两指距离
- xMove = Math.round(touch1.x - touch0.x);
- yMove = Math.round(touch1.y - touch0.y);
- oldDistance = Math.round(Math.sqrt(xMove * xMove + yMove * yMove));
-
- self.oldDistance = oldDistance;
- };
-
- self.__twoTouchMove = function(touch0, touch1) {
- var oldScale = self.oldScale;
- var oldDistance = self.oldDistance;
- var scale = self.scale;
- var zoom = self.zoom;
-
- self.newScale = getNewScale(oldScale, oldDistance, zoom, touch0, touch1);
-
- // 设定缩放范围
- self.newScale <= 1 && (self.newScale = 1);
- self.newScale >= scale && (self.newScale = scale);
-
- self.scaleWidth = Math.round(self.newScale * self.baseWidth);
- self.scaleHeight = Math.round(self.newScale * self.baseHeight);
- var imgLeft = Math.round(self.touchX1 - self.scaleWidth / 2);
- var imgTop = Math.round(self.touchY1 - self.scaleHeight / 2);
-
- self.outsideBound(imgLeft, imgTop);
-
- self.updateCanvas();
- };
-
- self.__xtouchEnd = function() {
- self.oldScale = self.newScale;
- self.rectX = self.imgLeft;
- self.rectY = self.imgTop;
- };
- }
-
- var handle = {
- // 图片手势初始监测
- touchStart: function touchStart(e) {
- var self = this;
- var ref = e.touches;
- var touch0 = ref[0];
- var touch1 = ref[1];
-
- if (!self.src) {
- return
- }
-
- setTouchState(self, true, null, null);
-
- // 计算第一个触摸点的位置，并参照改点进行缩放
- self.__oneTouchStart(touch0);
-
- // 两指手势触发
- if (e.touches.length >= 2) {
- self.__twoTouchStart(touch0, touch1);
- }
- },
-
- // 图片手势动态缩放
- touchMove: function touchMove(e) {
- var self = this;
- var ref = e.touches;
- var touch0 = ref[0];
- var touch1 = ref[1];
-
- if (!self.src) {
- return
- }
-
- setTouchState(self, null, true);
-
- // 单指手势时触发
- if (e.touches.length === 1) {
- self.__oneTouchMove(touch0);
- }
- // 两指手势触发
- if (e.touches.length >= 2) {
- self.__twoTouchMove(touch0, touch1);
- }
- },
-
- touchEnd: function touchEnd(e) {
- var self = this;
-
- if (!self.src) {
- return
- }
-
- setTouchState(self, false, false, true);
- self.__xtouchEnd();
- }
- };
-
- function cut() {
- var self = this;
- var boundWidth = self.width; // 裁剪框默认宽度，即整个画布宽度
- var boundHeight = self.height;
- // 裁剪框默认高度，即整个画布高度
- var ref = self.cut;
- var x = ref.x;
- if (x === void 0) x = 0;
- var y = ref.y;
- if (y === void 0) y = 0;
- var width = ref.width;
- if (width === void 0) width = boundWidth;
- var height = ref.height;
- if (height === void 0) height = boundHeight;
-
- /**
- * 设置边界
- * @param imgLeft 图片左上角横坐标值
- * @param imgTop 图片左上角纵坐标值
- */
- self.outsideBound = function(imgLeft, imgTop) {
- self.imgLeft = imgLeft >= x ?
- x :
- self.scaleWidth + imgLeft - x <= width ?
- x + width - self.scaleWidth :
- imgLeft;
-
- self.imgTop = imgTop >= y ?
- y :
- self.scaleHeight + imgTop - y <= height ?
- y + height - self.scaleHeight :
- imgTop;
- };
-
- /**
- * 设置边界样式
- * @param color 边界颜色
- */
- self.setBoundStyle = function(ref) {
- if (ref === void 0) ref = {};
- var color = ref.color;
- if (color === void 0) color = '#04b00f';
- var mask = ref.mask;
- if (mask === void 0) mask = 'rgba(0, 0, 0, 0.3)';
- var lineWidth = ref.lineWidth;
- if (lineWidth === void 0) lineWidth = 1;
-
- var half = lineWidth / 2;
- var boundOption = [{
- start: {
- x: x - half,
- y: y + 10 - half
- },
- step1: {
- x: x - half,
- y: y - half
- },
- step2: {
- x: x + 10 - half,
- y: y - half
- }
- },
- {
- start: {
- x: x - half,
- y: y + height - 10 + half
- },
- step1: {
- x: x - half,
- y: y + height + half
- },
- step2: {
- x: x + 10 - half,
- y: y + height + half
- }
- },
- {
- start: {
- x: x + width - 10 + half,
- y: y - half
- },
- step1: {
- x: x + width + half,
- y: y - half
- },
- step2: {
- x: x + width + half,
- y: y + 10 - half
- }
- },
- {
- start: {
- x: x + width + half,
- y: y + height - 10 + half
- },
- step1: {
- x: x + width + half,
- y: y + height + half
- },
- step2: {
- x: x + width - 10 + half,
- y: y + height + half
- }
- }
- ];
-
- // 绘制半透明层
- self.ctx.beginPath();
- self.ctx.setFillStyle(mask);
- self.ctx.fillRect(0, 0, x, boundHeight);
- self.ctx.fillRect(x, 0, width, y);
- self.ctx.fillRect(x, y + height, width, boundHeight - y - height);
- self.ctx.fillRect(x + width, 0, boundWidth - x - width, boundHeight);
- self.ctx.fill();
-
- boundOption.forEach(function(op) {
- self.ctx.beginPath();
- self.ctx.setStrokeStyle(color);
- self.ctx.setLineWidth(lineWidth);
- self.ctx.moveTo(op.start.x, op.start.y);
- self.ctx.lineTo(op.step1.x, op.step1.y);
- self.ctx.lineTo(op.step2.x, op.step2.y);
- self.ctx.stroke();
- });
- };
- }
-
- var version = "1.3.9";
-
- var WeCropper = function WeCropper(params) {
- var self = this;
- var _default = {};
-
- validator(self, DEFAULT);
-
- Object.keys(DEFAULT).forEach(function(key) {
- _default[key] = DEFAULT[key].default;
- });
- Object.assign(self, _default, params);
-
- self.prepare();
- self.attachPage();
- self.createCtx();
- self.observer();
- self.cutt();
- self.methods();
- self.init();
- self.update();
-
- return self
- };
-
- WeCropper.prototype.init = function init() {
- var self = this;
- var src = self.src;
-
- self.version = version;
-
- typeof self.onReady === 'function' && self.onReady(self.ctx, self);
-
- if (src) {
- self.pushOrign(src);
- } else {
- self.updateCanvas();
- }
- setTouchState(self, false, false, false);
-
- self.oldScale = 1;
- self.newScale = 1;
-
- return self
- };
-
- Object.assign(WeCropper.prototype, handle);
-
- WeCropper.prototype.prepare = prepare;
- WeCropper.prototype.observer = observer;
- WeCropper.prototype.methods = methods;
- WeCropper.prototype.cutt = cut;
- WeCropper.prototype.update = update;
-
- return WeCropper;
-
-})));
diff --git a/pages/tabbar/index/comp/schoolItem.vue b/pages/tabbar/index/comp/schoolItem.vue
index 6eab616..0e65374 100644
--- a/pages/tabbar/index/comp/schoolItem.vue
+++ b/pages/tabbar/index/comp/schoolItem.vue
@@ -6,10 +6,14 @@
{{item.name}}
-
- {{item.stars|| '无'}}
+
+
+ {{item.stars|| '无'}}
+
+
-
+
+
@@ -32,6 +36,10 @@
item: {
type: Object,
default: {}
+ },
+ showReviewTotal: {
+ type: Boolean,//是否展示显示多少条评论
+ default: false
}
},
methods: {
@@ -70,7 +78,7 @@
}
.starBox {
- margin: 10rpx 0;
+ margin: 10rpx 10rpx 10rpx 0;
}
diff --git a/pages/tabbar/learnCar/index.vue b/pages/tabbar/learnCar/index.vue
index 9433c80..e2affab 100644
--- a/pages/tabbar/learnCar/index.vue
+++ b/pages/tabbar/learnCar/index.vue
@@ -34,10 +34,7 @@
// #ifdef MP-WEIXIN
// initEid();
// #endif
- // const verifyPlugin = uni.requireNativePlugin('AP-FaceDetectModule');
- // var metaInfo = verifyPlugin.getMetaInfo();
- // console.log('插件在？')
- // console.log(verifyPlugin)
+
},
onShow() {
@@ -50,7 +47,10 @@
this.curObject = val
},
async getInitFaceVerifyFn() {
- const res = await getInitFaceVerify()
+ const verifyPlugin = uni.requireNativePlugin('AP-FaceDetectModule');
+ var metaInfo = verifyPlugin.getMetaInfo()
+ console.log(metaInfo)
+ const res = await getInitFaceVerify({metaInfo: metaInfo})
console.log('人脸token')
console.log(res)
},
diff --git a/pages/userCenter/login/login - 副本.vue b/pages/userCenter/login/login - 副本.vue
deleted file mode 100644
index ba39bc5..0000000
--- a/pages/userCenter/login/login - 副本.vue
+++ /dev/null
@@ -1,227 +0,0 @@
-
-
-
-
-
-
-
- 手机号快捷登录
-
- 手机号登录/注册
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages/userCenter/login/loginByPhone.vue b/pages/userCenter/login/loginByPhone.vue
deleted file mode 100644
index 21dc72f..0000000
--- a/pages/userCenter/login/loginByPhone.vue
+++ /dev/null
@@ -1,192 +0,0 @@
-
-
-
-
- 短信验证码登录
-
-
-
- +
- 86
-
-
-
-
-
-
-
-
-
-
-
-
- {{codeText}}
-
- 登 录
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/static/images/carIcon/home_icon_buzhou@2x.png b/static/images/carIcon/home_icon_buzhou@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..112c9b4e733f31a4965c7e9bcc1281fdbc7ed1a4
GIT binary patch
literal 624
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
literal 0
HcmV?d00001