From 8e45550662da171d0e6e3e8ef6e54f4ba7eee129 Mon Sep 17 00:00:00 2001
From: Fox-33 <1466778434@qq.com>
Date: Fri, 11 Apr 2025 21:30:14 +0800
Subject: [PATCH 1/3] =?UTF-8?q?feat:=20bug=E4=BF=AE=E5=A4=8D;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/config/loginPopup.vue | 124 ---------------------------------
pages_order/auth/wxLogin.vue | 22 ++++++
pages_order/record/articleSharing.vue | 10 +--
pages_order/record/groupSharing.vue | 28 ++++++--
pages_order/record/personalSharing.vue | 8 +--
pages_order/record/videoSharing.vue | 4 +-
pages_order/sharing/article.vue | 8 +--
pages_order/sharing/group.vue | 8 +--
pages_order/sharing/personal.vue | 4 ++
pages_order/sharing/video.vue | 19 ++---
static/image/home/bg.png | Bin 193382 -> 478719 bytes
store/store.js | 10 +--
12 files changed, 81 insertions(+), 164 deletions(-)
delete mode 100644 components/config/loginPopup.vue
diff --git a/components/config/loginPopup.vue b/components/config/loginPopup.vue
deleted file mode 100644
index 984e97a..0000000
--- a/components/config/loginPopup.vue
+++ /dev/null
@@ -1,124 +0,0 @@
-
-
-
- 登录后即可查看分享内容
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages_order/auth/wxLogin.vue b/pages_order/auth/wxLogin.vue
index d953295..3dc2e1d 100644
--- a/pages_order/auth/wxLogin.vue
+++ b/pages_order/auth/wxLogin.vue
@@ -20,6 +20,10 @@
微信登录
+
+
{
+ uni.reLaunch({
+ url: '/pages/index/index'
+ })
+ }
+ });
+ },
}
}
@@ -134,6 +148,13 @@
font-size: 28rpx;
line-height: 1;
margin: 0;
+
+ &-cancel {
+ color: #c7c7c7;
+ background-color: transparent;
+ border: 1rpx solid #c7c7c7;
+ margin-top: 60rpx;
+ }
}
.agreement {
@@ -147,4 +168,5 @@
color: #05D9A2;
}
}
+
diff --git a/pages_order/record/articleSharing.vue b/pages_order/record/articleSharing.vue
index dbb10fa..5c09b5a 100644
--- a/pages_order/record/articleSharing.vue
+++ b/pages_order/record/articleSharing.vue
@@ -248,26 +248,26 @@
return
}
- callback(new Error('请输入你的文案'))
+ callback(new Error('请输入文章内容'))
}
return {
'headImage': {
type: 'string',
required: true,
- message: '请选择头像',
+ message: '请选择封面图',
},
'headTitle': {
type: 'string',
required: true,
- message: '请输入你的昵称',
+ message: '请输入你的文章标题',
},
'num': {
type: 'number',
required: true,
- message: '请设置转发次数（大于1）',
+ message: '请设置转发次数（大于0）',
validator: (rule, value, callback) => {
- if (value > 1) {
+ if (value > 0) {
return true
}
diff --git a/pages_order/record/groupSharing.vue b/pages_order/record/groupSharing.vue
index ffca964..c5f2559 100644
--- a/pages_order/record/groupSharing.vue
+++ b/pages_order/record/groupSharing.vue
@@ -106,6 +106,16 @@
+
+
+
+
+
+
+
@@ -147,6 +157,7 @@
memberNum: 50,
num: 0,
wxCodeImage: null,
+ textDetails: null,
},
rules: {
'headImage': {
@@ -172,9 +183,9 @@
'num': {
type: 'number',
required: true,
- message: '请设置转发次数（大于1）',
+ message: '请设置转发次数（大于0）',
validator: (rule, value, callback) => {
- if (value > 1) {
+ if (value > 0) {
return true
}
@@ -186,6 +197,11 @@
required: true,
message: '请选择二维码',
},
+ 'textDetails': {
+ type: 'string',
+ required: true,
+ message: '请输入你的文案',
+ },
},
}
},
@@ -212,12 +228,12 @@
},
onShareAppMessage(res) {
const {
- headTitle,
+ textDetails,
indexImage,
} = this.form
let o = {
- title : headTitle,
+ title : textDetails,
imageUrl: indexImage,
path: `/pages_order/sharing/group?id=${this.id}&state=2&shareId=${this.userInfo.id}`
}
@@ -241,6 +257,7 @@
memberNum,
num,
wxCodeImage,
+ textDetails,
status,
} = result || {}
@@ -252,6 +269,7 @@
memberNum,
num,
wxCodeImage,
+ textDetails,
}
this.status = status
} catch (err) {
@@ -270,6 +288,7 @@
memberNum,
num,
wxCodeImage,
+ textDetails,
} = this.form
const params = {
@@ -280,6 +299,7 @@
memberNum,
num,
wxCodeImage,
+ textDetails,
}
if (this.id) {
diff --git a/pages_order/record/personalSharing.vue b/pages_order/record/personalSharing.vue
index 36f2c08..efcb472 100644
--- a/pages_order/record/personalSharing.vue
+++ b/pages_order/record/personalSharing.vue
@@ -170,9 +170,9 @@
'num': {
type: 'number',
required: true,
- message: '请设置转发次数（大于1）',
+ message: '请设置转发次数（大于0）',
validator: (rule, value, callback) => {
- if (value > 1) {
+ if (value > 0) {
return true
}
@@ -218,12 +218,12 @@
},
onShareAppMessage(res) {
const {
- headTitle,
+ textDetails,
indexImage,
} = this.form
let o = {
- title : headTitle,
+ title : textDetails,
imageUrl: indexImage,
path: `/pages_order/sharing/personal?id=${this.id}&state=0&shareId=${this.userInfo.id}`
}
diff --git a/pages_order/record/videoSharing.vue b/pages_order/record/videoSharing.vue
index ac514cd..ea73797 100644
--- a/pages_order/record/videoSharing.vue
+++ b/pages_order/record/videoSharing.vue
@@ -177,9 +177,9 @@
'num': {
type: 'number',
required: true,
- message: '请设置转发次数（大于1）',
+ message: '请设置转发次数（大于0）',
validator: (rule, value, callback) => {
- if (value > 1) {
+ if (value > 0) {
return true
}
diff --git a/pages_order/sharing/article.vue b/pages_order/sharing/article.vue
index 065b9b7..31c75ea 100644
--- a/pages_order/sharing/article.vue
+++ b/pages_order/sharing/article.vue
@@ -20,8 +20,6 @@
-
-
@@ -29,7 +27,6 @@