From 5b193409748026b7769671de2a462b6c887440b8 Mon Sep 17 00:00:00 2001
From: GaoHao <1210693421@qq.com>
Date: Tue, 7 Jan 2025 09:54:54 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
App.vue | 2 +-
api/login/login.js | 32 +++
api/user/user.js | 11 +
commons/config.js | 2 +-
http/http.js | 4 +-
pages/login/forgetPwd.vue | 293 +++++++++++------------
pages/login/login.vue | 250 +++++++++----------
pages/login/register.vue | 466 ++++++++++++++++++------------------
pages/login/registerApp.vue | 440 +++++++++++++++++-----------------
pages/me/userInfo.vue | 267 ++++++++++-----------
10 files changed, 882 insertions(+), 885 deletions(-)
create mode 100644 api/login/login.js
create mode 100644 api/user/user.js
diff --git a/App.vue b/App.vue
index fc89215..ed4cba3 100644
--- a/App.vue
+++ b/App.vue
@@ -15,7 +15,7 @@
onShow: function() {
// ios是否在审核
http.request({
- url: 'app/common/type/919',
+ url: 'common/type/919',
}).then(res => {
if (res.code == 0) {
uni.setStorageSync('isExamine', res.data.value)
diff --git a/api/login/login.js b/api/login/login.js
new file mode 100644
index 0000000..cf0d455
--- /dev/null
+++ b/api/login/login.js
@@ -0,0 +1,32 @@
+import http from '@/http/http.js'
+
+/**
+ * 登录
+ */
+export const login = (data) => {
+ return http.request({
+ url: '/Login/registerCode',
+ method: 'POST',
+ data: data
+ })
+}
+
+/**
+ * 发送验证码
+ */
+export const setSendMsg = (mobile,type) => {
+ return http.request({
+ url: '/Login/sendMsg/' + mobile + '/'+type
+ })
+}
+
+/**
+ * 注册
+ */
+export const registerCode = (params) => {
+ return http.request({
+ url: '/Login/registerCode',
+ params: params
+ })
+}
+
diff --git a/api/user/user.js b/api/user/user.js
new file mode 100644
index 0000000..0f89981
--- /dev/null
+++ b/api/user/user.js
@@ -0,0 +1,11 @@
+import http from '@/http/http.js'
+
+/**
+ * 获取用户信息
+ */
+export const selectUserById = (data) => {
+ return http.request({
+ url: '/user/selectUserById',
+ data: data
+ })
+}
\ No newline at end of file
diff --git a/commons/config.js b/commons/config.js
index 0634ca3..47bdde5 100644
--- a/commons/config.js
+++ b/commons/config.js
@@ -4,7 +4,7 @@ const env='test' //test , production,local
export const encryptKey='1234567890123456' // http数据加解密的key
-export const apiUrl='/czg/'
+export const apiUrl='/czg/app'
export const h5Config = {
production: 'https://dj-h5.hnsiyao.cn',
test: 'https://web-api.hnsiyao.cn',
diff --git a/http/http.js b/http/http.js
index 688facf..09827c2 100644
--- a/http/http.js
+++ b/http/http.js
@@ -13,8 +13,8 @@ const loadingShowTime = 200
function getHeader() {
const headerObject = {}
- headerObject["token"] = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJzdWIiOiIyNjkyNSIsImlhdCI6MTczNTg4OTk5NCwiZXhwIjoxNzM2NDk0Nzk0fQ.j-KFEE1FHckmFCO8UA884RBWvpMv8MfEGj7GPGf3kVo6sHeORl043Yle_w7HdTZKPpQqSr2LQLCq_rUxG4qqwA'
- // headerObject["token"] = uni.getStorageSync('token')
+ // headerObject["token"] = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJzdWIiOiIyNjkyNSIsImlhdCI6MTczNTg4OTk5NCwiZXhwIjoxNzM2NDk0Nzk0fQ.j-KFEE1FHckmFCO8UA884RBWvpMv8MfEGj7GPGf3kVo6sHeORl043Yle_w7HdTZKPpQqSr2LQLCq_rUxG4qqwA'
+ headerObject["token"] = uni.getStorageSync('token')
return headerObject
}
diff --git a/pages/login/forgetPwd.vue b/pages/login/forgetPwd.vue
index 2652676..4166e56 100644
--- a/pages/login/forgetPwd.vue
+++ b/pages/login/forgetPwd.vue
@@ -8,21 +8,21 @@
重置密码
手机号
-
验证码
-
-
+
设置密码
-
@@ -32,169 +32,148 @@
-
\ No newline at end of file
diff --git a/pages/me/xieyi.vue b/pages/me/xieyi.vue
new file mode 100644
index 0000000..471ff98
--- /dev/null
+++ b/pages/me/xieyi.vue
@@ -0,0 +1,71 @@
+
+
+
+
+ 拒绝
+ 同意
+
+
+
+
+
+
+
From 75088f78c898ec53683d59eb7ce7676a4113d960 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Tue, 7 Jan 2025 10:53:49 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=A7=86=E9=A2=91?=
=?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=EF=BC=8C=E5=A4=84=E7=90=86?=
=?UTF-8?q?=E7=99=BB=E5=BD=95=E6=B3=A8=E5=86=8C=E6=8E=A5=E5=8F=A3=E6=95=B0?=
=?UTF-8?q?=E6=8D=AE=E4=B8=8D=E4=B8=80=E8=87=B4=E5=85=BC=E5=AE=B9=E9=97=AE?=
=?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/my-video-list/my-video-list.vue | 20 +++++++++++++++++++
http/http.js | 2 +-
pages.json | 10 +++++++++-
pages/video/detail.nvue | 23 ++++++++++++++++++++++
pages/video/index.vue | 8 ++++++--
5 files changed, 59 insertions(+), 4 deletions(-)
create mode 100644 components/my-video-list/my-video-list.vue
create mode 100644 pages/video/detail.nvue
diff --git a/components/my-video-list/my-video-list.vue b/components/my-video-list/my-video-list.vue
new file mode 100644
index 0000000..96a79a3
--- /dev/null
+++ b/components/my-video-list/my-video-list.vue
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/http/http.js b/http/http.js
index bc0a20e..c6e450a 100644
--- a/http/http.js
+++ b/http/http.js
@@ -82,7 +82,7 @@ function commonsProcess(showLoading, httpReqCallback) {
});
}
// 构造请求成功的响应数据
- return Promise.resolve(bodyData.data || bodyData.page);
+ return Promise.resolve(bodyData.data || bodyData.page|| bodyData);
})
.catch((res) => {
console.log(res);
diff --git a/pages.json b/pages.json
index 14a959e..7592e8f 100644
--- a/pages.json
+++ b/pages.json
@@ -21,7 +21,15 @@
"navigationBarTitleText": "",
"navigationStyle": "custom"
}
- }, {
+ },
+ {
+ "path": "pages/video/detail",
+ "style": {
+ "navigationBarTitleText": "",
+ "navigationStyle": "custom"
+ }
+ },
+ {
"path": "pages/task/index",
"style": {
"navigationBarTitleText": "",
diff --git a/pages/video/detail.nvue b/pages/video/detail.nvue
new file mode 100644
index 0000000..cdd2158
--- /dev/null
+++ b/pages/video/detail.nvue
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/video/index.vue b/pages/video/index.vue
index 10d2b9e..a908416 100644
--- a/pages/video/index.vue
+++ b/pages/video/index.vue
@@ -1,11 +1,15 @@
-
+ toDetail