From d661d1fb41923dc20f54749d87c29c4ab7281733 Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Thu, 29 Aug 2024 13:26:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
api/api.js | 9 +-
api/http.js | 6 +-
components/config/showLogin.vue | 85 +++++++
components/config/showPrivacyAgreement.vue | 118 +++++++++
components/content/submit.vue | 9 +-
components/post/actorList.vue | 5 +-
components/post/postList.vue | 4 +-
components/toast/confirmationPopup.vue | 94 +++++++
config.js | 2 +-
pages.json | 29 ++-
pages/auth/login.vue | 19 --
pages/auth/wxUserInfo.vue | 141 +++++++++++
pages/index/center.vue | 279 +++++++++++----------
pages/index/index.vue | 96 ++++++-
pages/index/publish.vue | 12 +-
pages/order/payOrder.vue | 92 +++++++
pages/publish/actorDetail.vue | 152 +++++++++++
pages/publish/actorRelease.vue | 38 ++-
pages/publish/postDetail.vue | 8 +-
pages/publish/publishPost.vue | 70 +++++-
static/image/index/123123.png | Bin 73036 -> 0 bytes
static/image/index/a1.png | Bin 31135 -> 0 bytes
static/image/index/a2.png | Bin 32219 -> 0 bytes
static/image/index/a3.png | Bin 27367 -> 0 bytes
static/image/index/p1.png | Bin 46325 -> 0 bytes
static/image/index/p2.png | Bin 31555 -> 0 bytes
static/image/index/p3.png | Bin 91708 -> 0 bytes
static/image/publish/pay.png | Bin 0 -> 1626 bytes
static/image/publish/upload.png | Bin 0 -> 1314 bytes
static/image/素材8.21/icon/画板 1 (2).png | Bin 760 -> 0 bytes
static/image/素材8.21/icon/画板 1.png | Bin 423 -> 0 bytes
static/image/素材8.21/icon/画板 1@2x (2).png | Bin 1662 -> 0 bytes
static/image/素材8.21/icon/画板 1@2x.png | Bin 929 -> 0 bytes
.../image/素材8.21/icon/画板 1@2x(1).png | Bin 748 -> 0 bytes
static/image/素材8.21/icon/画板 1(1).png | Bin 390 -> 0 bytes
static/image/素材8.21/icon/画板 3.png | Bin 597 -> 0 bytes
static/image/素材8.21/icon/画板 3@2x.png | Bin 1140 -> 0 bytes
static/image/素材8.21/icon/首页 (2).png | Bin 393 -> 0 bytes
static/image/素材8.21/icon/首页.png | Bin 640 -> 0 bytes
static/image/素材8.21/icon/首页@2x (2).png | Bin 611 -> 0 bytes
static/image/素材8.21/icon/首页@2x.png | Bin 1079 -> 0 bytes
static/image/素材8.21/分组 2.png | Bin 13234 -> 0 bytes
static/image/素材8.21/分组 2@2x.png | Bin 31135 -> 0 bytes
static/image/素材8.21/分组 4.png | Bin 13284 -> 0 bytes
static/image/素材8.21/分组 4@2x.png | Bin 32219 -> 0 bytes
static/image/素材8.21/分组 5.png | Bin 11640 -> 0 bytes
static/image/素材8.21/分组 5@2x.png | Bin 27367 -> 0 bytes
static/image/素材8.21/画板 .png | Bin 13448 -> 0 bytes
static/image/素材8.21/画板 1.png | Bin 30520 -> 0 bytes
static/image/素材8.21/画板 3.png | Bin 16022 -> 0 bytes
static/image/素材8.21/矩形 2938.png | Bin 28174 -> 0 bytes
static/image/素材8.21/矩形 2938@2x.png | Bin 72998 -> 0 bytes
static/image/素材8.21/蒙版组 7.png | Bin 2263 -> 0 bytes
static/image/素材8.21/蒙版组 7@2x.png | Bin 5699 -> 0 bytes
static/image/素材8.21/蒙版组 8.png | Bin 2502 -> 0 bytes
static/image/素材8.21/蒙版组 8@2x.png | Bin 6865 -> 0 bytes
store/store.js | 34 +++
utils/upload.js | 39 ---
utils/utils.js | 22 +-
59 files changed, 1133 insertions(+), 230 deletions(-)
create mode 100644 components/config/showLogin.vue
create mode 100644 components/config/showPrivacyAgreement.vue
create mode 100644 components/toast/confirmationPopup.vue
delete mode 100644 pages/auth/login.vue
create mode 100644 pages/auth/wxUserInfo.vue
create mode 100644 pages/order/payOrder.vue
create mode 100644 pages/publish/actorDetail.vue
delete mode 100644 static/image/index/123123.png
delete mode 100644 static/image/index/a1.png
delete mode 100644 static/image/index/a2.png
delete mode 100644 static/image/index/a3.png
delete mode 100644 static/image/index/p1.png
delete mode 100644 static/image/index/p2.png
delete mode 100644 static/image/index/p3.png
create mode 100644 static/image/publish/pay.png
create mode 100644 static/image/publish/upload.png
delete mode 100644 static/image/素材8.21/icon/画板 1 (2).png
delete mode 100644 static/image/素材8.21/icon/画板 1.png
delete mode 100644 static/image/素材8.21/icon/画板 1@2x (2).png
delete mode 100644 static/image/素材8.21/icon/画板 1@2x.png
delete mode 100644 static/image/素材8.21/icon/画板 1@2x(1).png
delete mode 100644 static/image/素材8.21/icon/画板 1(1).png
delete mode 100644 static/image/素材8.21/icon/画板 3.png
delete mode 100644 static/image/素材8.21/icon/画板 3@2x.png
delete mode 100644 static/image/素材8.21/icon/首页 (2).png
delete mode 100644 static/image/素材8.21/icon/首页.png
delete mode 100644 static/image/素材8.21/icon/首页@2x (2).png
delete mode 100644 static/image/素材8.21/icon/首页@2x.png
delete mode 100644 static/image/素材8.21/分组 2.png
delete mode 100644 static/image/素材8.21/分组 2@2x.png
delete mode 100644 static/image/素材8.21/分组 4.png
delete mode 100644 static/image/素材8.21/分组 4@2x.png
delete mode 100644 static/image/素材8.21/分组 5.png
delete mode 100644 static/image/素材8.21/分组 5@2x.png
delete mode 100644 static/image/素材8.21/画板 .png
delete mode 100644 static/image/素材8.21/画板 1.png
delete mode 100644 static/image/素材8.21/画板 3.png
delete mode 100644 static/image/素材8.21/矩形 2938.png
delete mode 100644 static/image/素材8.21/矩形 2938@2x.png
delete mode 100644 static/image/素材8.21/蒙版组 7.png
delete mode 100644 static/image/素材8.21/蒙版组 7@2x.png
delete mode 100644 static/image/素材8.21/蒙版组 8.png
delete mode 100644 static/image/素材8.21/蒙版组 8@2x.png
delete mode 100644 utils/upload.js
diff --git a/api/api.js b/api/api.js
index e5c9851..1cde47d 100644
--- a/api/api.js
+++ b/api/api.js
@@ -157,7 +157,6 @@ const config = {
loginLogin: {
url: '/api/login/login',
method: 'GET',
- auth: true
},
// 退出接口
loginLogout: {
@@ -169,13 +168,11 @@ const config = {
loginRegister: {
url: '/api/login/register',
method: 'GET',
- auth: true
},
// 发送验证码接口
loginSendcode: {
url: '/api/login/sendCode',
method: 'GET',
- auth: true
},
}
@@ -209,9 +206,9 @@ export function api(key, data, callback, loadingTitle) {
//必须登录
if (req.auth) {
if (!uni.getStorageSync('token')) {
- uni.navigateTo({
- url: '/pages/auth/login'
- })
+ // uni.navigateTo({
+ // url: '/pages/auth/login'
+ // })
console.error('需要登录')
return
}
diff --git a/api/http.js b/api/http.js
index 92037cf..ceacc7b 100644
--- a/api/http.js
+++ b/api/http.js
@@ -29,15 +29,17 @@ function http(uri, data, callback, method = 'GET', showLoading, title) {
uni.removeStorageSync('token')
console.error('登录过期');
uni.navigateTo({
- url: '/pages/auth/login'
+ url: '/pages/index/index'
})
}
- if(res.statusCode == 200 && res.data.code != 200){
+ if(res.statusCode == 200 &&
+ res.data.code != 200){
uni.showToast({
mask: true,
duration: 1000,
title: res.data.message,
+ icon:'none'
});
}
diff --git a/components/config/showLogin.vue b/components/config/showLogin.vue
new file mode 100644
index 0000000..754c2a2
--- /dev/null
+++ b/components/config/showLogin.vue
@@ -0,0 +1,85 @@
+
+
+
+
+ 提示
+
+
+ 本小程序需要登录之后才可以正常使用
+
+
+
+ 取消
+
+
+ 登录
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/components/config/showPrivacyAgreement.vue b/components/config/showPrivacyAgreement.vue
new file mode 100644
index 0000000..99b6bb4
--- /dev/null
+++ b/components/config/showPrivacyAgreement.vue
@@ -0,0 +1,118 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/components/content/submit.vue b/components/content/submit.vue
index 8131352..75ca08c 100644
--- a/components/content/submit.vue
+++ b/components/content/submit.vue
@@ -1,6 +1,7 @@
-
+
@@ -8,7 +9,8 @@
存草稿
-
+
@@ -16,7 +18,8 @@
预览
-
+
{{ submiitTitle }}
diff --git a/components/post/actorList.vue b/components/post/actorList.vue
index 08fea27..bfdd00f 100644
--- a/components/post/actorList.vue
+++ b/components/post/actorList.vue
@@ -3,7 +3,10 @@
-
+
diff --git a/components/post/postList.vue b/components/post/postList.vue
index 6b6979d..e747623 100644
--- a/components/post/postList.vue
+++ b/components/post/postList.vue
@@ -3,7 +3,9 @@
-
+
{{ item.title }}
diff --git a/components/toast/confirmationPopup.vue b/components/toast/confirmationPopup.vue
new file mode 100644
index 0000000..9987e80
--- /dev/null
+++ b/components/toast/confirmationPopup.vue
@@ -0,0 +1,94 @@
+
+
+
+
+ {{ title }}
+
+
+
+
+
+
+ {{ confirmText }}
+
+
+
+
+ 取消
+
+
+ {{ confirmText }}
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/config.js b/config.js
index 2019e86..d34ffee 100644
--- a/config.js
+++ b/config.js
@@ -11,7 +11,7 @@ const type = 'dev'
// 环境配置
const config = {
dev : {
- baseUrl : 'http://admin.anqi.shop/a-notice-api',
+ baseUrl : 'http://h5.xzaiyp.top/a-notice-api',
},
prod : {
baseUrl : 'http://admin.anqi.shop/a-notice-api',
diff --git a/pages.json b/pages.json
index 2218675..86990d7 100644
--- a/pages.json
+++ b/pages.json
@@ -6,6 +6,27 @@
"navigationBarTitleText": ""
}
},
+ {
+ "path" : "pages/publish/actorDetail",
+ "style" :
+ {
+ "navigationBarTitleText" : ""
+ }
+ },
+ {
+ "path" : "pages/order/payOrder",
+ "style" :
+ {
+ "navigationBarTitleText" : ""
+ }
+ },
+ {
+ "path" : "pages/auth/wxUserInfo",
+ "style" :
+ {
+ "navigationBarTitleText" : ""
+ }
+ },
{
"path" : "pages/publish/actorRelease",
"style" :
@@ -118,13 +139,6 @@
"navigationBarTitleText" : ""
}
},
- {
- "path" : "pages/auth/login",
- "style" :
- {
- "navigationBarTitleText" : ""
- }
- },
{
"path" : "pages/mine/sonPage/promotion/promotionDetail",
"style" :
@@ -153,7 +167,6 @@
"navigationBarTitleText": "",
"enablePullDownRefresh": false
}
-
}
],
"globalStyle": {
diff --git a/pages/auth/login.vue b/pages/auth/login.vue
deleted file mode 100644
index 8c3b35f..0000000
--- a/pages/auth/login.vue
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/pages/auth/wxUserInfo.vue b/pages/auth/wxUserInfo.vue
new file mode 100644
index 0000000..50ff5be
--- /dev/null
+++ b/pages/auth/wxUserInfo.vue
@@ -0,0 +1,141 @@
+
+
+
+ 帧视界
+
+
+ 申请获取你的头像、昵称
+
+
+
+
+
+ 昵称
+
+
+
+
+
+
+ 确认
+
+
+
+
+
+
+
+
+
diff --git a/pages/index/center.vue b/pages/index/center.vue
index 0f9933b..7c6c688 100644
--- a/pages/index/center.vue
+++ b/pages/index/center.vue
@@ -1,145 +1,166 @@
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 去认证
-
-
-
-
- 海绵宝贝
- 15012142563
-
-
-
-
-
-
-
- 点赞量
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 去认证
+
+
+
+
+ {{ userInfo.nickName }}
+ {{ userInfo.phone }}
+
+
+
+
+
+
+
+ 点赞量
+
+
-
-
-
-
-
-
-
-
- {{ item.title }}
-
-
-
-
+
+
+
+
+
+
+
+
+ {{ item.title }}
+
+
+
+
-
- 其他
+
+ 其他
-
-
-
-
-
- {{ item.title }}
-
-
-
-
-
-
-
+
+
+
+
+
+ {{ item.title }}
+
+
+
+
+
+
+
+ * {
+ box-sizing: border-box;
+ margin: 0;
+ padding: 0;
+ }
+ .textColor {
+ background: $uni-linear-gradient-color;
+ -webkit-background-clip: text;
+ /*将设置的背景颜色限制在文字中*/
+ -webkit-text-fill-color: transparent;
+ /*给文字设置成透明*/
+ }
+
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 7eac43f..c4899ed 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -48,10 +48,34 @@
-
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+ {{ item.userId }}
+ {{ item.createTime }}
+
+
+
+ 查看
+
+
+
+
+
+
@@ -73,16 +97,26 @@
+
+
+
+
+
+
+
diff --git a/pages/publish/actorDetail.vue b/pages/publish/actorDetail.vue
new file mode 100644
index 0000000..141c609
--- /dev/null
+++ b/pages/publish/actorDetail.vue
@@ -0,0 +1,152 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.title }}
+
+
+
+
+
+ 发布人:{{ item.userId }}
+
+
+ 发布时间:{{ item.createTime }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 代表作品夏
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/publish/actorRelease.vue b/pages/publish/actorRelease.vue
index 6b300f8..9bbaaa7 100644
--- a/pages/publish/actorRelease.vue
+++ b/pages/publish/actorRelease.vue
@@ -68,7 +68,7 @@
labelSize="28rpx"
name="0">
-
+
@@ -91,7 +91,7 @@
labelSize="28rpx"
name="0">
-
+
@@ -114,7 +114,7 @@
labelSize="28rpx"
name="0">
-
+
@@ -141,14 +141,30 @@
@preview="preview"
@draft="draft"
/>
+
+
+
+