From 712c0b1580f7f338c27280082d813327ce4f52da Mon Sep 17 00:00:00 2001
From: js199000126 <528892601@qq.com>
Date: Thu, 25 May 2023 17:22:39 +0800
Subject: [PATCH 1/6] index
---
yudao-ui-app/config/app.js | 4 +++-
yudao-ui-app/pages/index/index.vue | 15 ++++++++++-----
yudao-ui-app/pages/users/order_list/index.vue | 2 +-
yudao-ui-app/static/images/shop/vip_oneStar.png | Bin 0 -> 34995 bytes
4 files changed, 14 insertions(+), 7 deletions(-)
create mode 100644 yudao-ui-app/static/images/shop/vip_oneStar.png
diff --git a/yudao-ui-app/config/app.js b/yudao-ui-app/config/app.js
index 2932f77a1..f50b0d09a 100644
--- a/yudao-ui-app/config/app.js
+++ b/yudao-ui-app/config/app.js
@@ -1,5 +1,7 @@
-let domain = process.env.APP_BASE_URL
+// let domain = process.env.APP_BASE_URL
+// let domain = 'http://192.168.1.188:48080'
+let domain = 'http://api.cyywl.top'
module.exports = {
// 请求域名 格式： https://您的域名
diff --git a/yudao-ui-app/pages/index/index.vue b/yudao-ui-app/pages/index/index.vue
index 16229b2fd..824f6ece6 100644
--- a/yudao-ui-app/pages/index/index.vue
+++ b/yudao-ui-app/pages/index/index.vue
@@ -15,8 +15,10 @@
-
- 会员等级3级
+
+
+
+ 会员等级1级
查看权益
@@ -753,9 +755,12 @@
flex-wrap: wrap;
align-items: center;
.up {
- width: 90rpx;
- height: 100rpx;
- background: #EE5423;
+ width: 110rpx;
+ height: 110rpx;
+ image {
+ width: 101rpx;
+ height: 110rpx;
+ }
}
text {
font-size: 22rpx;
diff --git a/yudao-ui-app/pages/users/order_list/index.vue b/yudao-ui-app/pages/users/order_list/index.vue
index 2c4024c99..88a6bf9a2 100644
--- a/yudao-ui-app/pages/users/order_list/index.vue
+++ b/yudao-ui-app/pages/users/order_list/index.vue
@@ -112,7 +112,7 @@
page: 1,
list1: [{
name: '全部',
- value: ''
+ value: '99'
}, {
name: '待付款',
value: '0'
diff --git a/yudao-ui-app/static/images/shop/vip_oneStar.png b/yudao-ui-app/static/images/shop/vip_oneStar.png
new file mode 100644
index 0000000000000000000000000000000000000000..21c03aca23fbb221633460287599d4a80d3df6fd
GIT binary patch
literal 34995
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%0DQ-kF4`F5OpB}
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
Tz8w!_00000NkvXXu0mjfF$EN=
literal 0
HcmV?d00001
From debd84a7e03c28d16dc1f176f35d9bc26dbec613 Mon Sep 17 00:00:00 2001
From: Jruome <2559028966@qq.com>
Date: Thu, 25 May 2023 17:25:16 +0800
Subject: [PATCH 2/6] =?UTF-8?q?uniapp=20ui=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
yudao-ui-app/pages.json | 6 +-
.../pages/member_application/index.vue | 13 +-
yudao-ui-app/pages/member_back/index.vue | 2 +-
yudao-ui-app/pages/member_equity/index.vue | 4 +-
yudao-ui-app/pages/member_others/index.vue | 217 ++++++++---------
yudao-ui-app/pages/member_record/index.vue | 11 +
yudao-ui-app/pages/member_renew/index.vue | 218 +++++++++---------
7 files changed, 243 insertions(+), 228 deletions(-)
diff --git a/yudao-ui-app/pages.json b/yudao-ui-app/pages.json
index 310088462..1c1429f56 100644
--- a/yudao-ui-app/pages.json
+++ b/yudao-ui-app/pages.json
@@ -31,7 +31,7 @@
{
"path": "pages/member_equity/index",
"style": {
- "navigationBarTitleText": "会员申请"
+ "navigationBarTitleText": "会员权益"
}
},
{
@@ -43,7 +43,7 @@
{
"path": "pages/member_others/index",
"style": {
- "navigationBarTitleText": "给他人续费"
+ "navigationBarTitleText": "代他人续费"
}
},
{
@@ -614,7 +614,7 @@
"pagePath": "pages/member_equity/index",
"iconPath": "static/images/tabbar/nav_icon_member.png",
"selectedIconPath": "static/images/tabbar/nav_icon_member_active.png",
- "text": "会员申请",
+ "text": "会员权益",
"visible":false
},
{
diff --git a/yudao-ui-app/pages/member_application/index.vue b/yudao-ui-app/pages/member_application/index.vue
index 246760382..c26832443 100644
--- a/yudao-ui-app/pages/member_application/index.vue
+++ b/yudao-ui-app/pages/member_application/index.vue
@@ -10,11 +10,12 @@
:class="[activeIndex.includes(index) && 'member-active',!!parseInt(item.isExist) && 'member-disbled', 'member-item']"
v-for="(item,index) in memberData" :key="index" @click="handleMember(item,index)">
-
+
+
- {{item.name.split('得')[0]}}得{{item.name.split('得')[1]}}
+ {{item.name.split('得')[0]}}得{{item.name.split('得')[1]}}
{{item.gearRemarks}}
@@ -126,7 +127,7 @@
url:'/pages/member_record/index'
})
break;
- case "为他人充值":
+ case "代他人充值":
uni.navigateTo({
url:'/pages/member_others/index'
})
@@ -292,7 +293,7 @@
height: 100rpx;
border-radius: 35rpx;
background: linear-gradient(#FFEBB2, #FDCB3B);
- padding: 16rpx;
+ padding: 6rpx 13rpx;
image {
width: 100%;
@@ -340,7 +341,7 @@
background: linear-gradient(#FF995F, #DA0E00);
.member-image {
- background: linear-gradient(#FF995F, #FDCB3B);
+ background: linear-gradient(#FF995F, #DA0E00);
}
.member-text {
@@ -369,7 +370,7 @@
background: linear-gradient(#EFEFEF, #BCBCBC);
.member-image {
- background: linear-gradient(#AAAAAA, #989898);
+ background: linear-gradient(#EFEFEF, #AAAAAA);
}
.member-text {
diff --git a/yudao-ui-app/pages/member_back/index.vue b/yudao-ui-app/pages/member_back/index.vue
index 5e86d3abf..14b925834 100644
--- a/yudao-ui-app/pages/member_back/index.vue
+++ b/yudao-ui-app/pages/member_back/index.vue
@@ -108,7 +108,7 @@
url:'/pages/member_record/index'
})
break;
- case "为他人充值":
+ case "代他人充值":
uni.navigateTo({
url:'/pages/member_others/index'
})
diff --git a/yudao-ui-app/pages/member_equity/index.vue b/yudao-ui-app/pages/member_equity/index.vue
index 48ba82993..1d94bb1f6 100644
--- a/yudao-ui-app/pages/member_equity/index.vue
+++ b/yudao-ui-app/pages/member_equity/index.vue
@@ -13,7 +13,7 @@
购买记录
-
+
代他人充值
@@ -138,7 +138,7 @@
url:'/pages/member_record/index'
})
break;
- case "为他人充值":
+ case "代他人充值":
uni.navigateTo({
url:'/pages/member_others/index'
})
diff --git a/yudao-ui-app/pages/member_others/index.vue b/yudao-ui-app/pages/member_others/index.vue
index 76c3d5af7..f0a8ce744 100644
--- a/yudao-ui-app/pages/member_others/index.vue
+++ b/yudao-ui-app/pages/member_others/index.vue
@@ -19,11 +19,12 @@
:class="[activeIndex.includes(index) && 'member-active',!!parseInt(item.isExist) && 'member-disbled', 'member-item']"
v-for="(item,index) in memberData" :key="index" @click="handleMember(item,index)">
-
+
+
- {{item.name.split('得')[0]}}得{{item.name.split('得')[1]}}
+ {{item.name.split('得')[0]}}得{{item.name.split('得')[1]}}
{{item.gearRemarks}}
@@ -37,7 +38,7 @@
-
+
@@ -301,131 +302,131 @@
}
- .member-list {
- margin: 83rpx 30rpx 30rpx 30rpx;
- position: relative;
+ .member-list {
+ margin: 53rpx 30rpx 20rpx 30rpx;
+ position: relative;
- .member-item {
- padding: 30rpx 20rpx 27rpx 20rpx;
- display: flex;
- justify-content: space-between;
- background: #fff;
- margin-bottom: 20rpx;
- border-radius: 20rpx;
+ .member-item {
+ padding: 30rpx 20rpx 27rpx 20rpx;
+ display: flex;
+ justify-content: space-between;
+ background: #fff;
+ margin-bottom: 20rpx;
+ border-radius: 20rpx;
- .member-image {
- width: 104rpx;
- height: 104rpx;
- border-radius: 35rpx;
- background: linear-gradient(#FFEBB2, #FDCB3B);
- padding: 20rpx;
+ .member-image {
+ width: 100rpx;
+ height: 100rpx;
+ border-radius: 35rpx;
+ background: linear-gradient(#FFEBB2, #FDCB3B);
+ padding: 6rpx 13rpx;
- image {
- width: 100%;
- height: 100%;
- }
- }
+ image {
+ width: 100%;
+ height: 100%;
+ }
+ }
- .member-text {
- display: flex;
- flex-direction: column;
- justify-content: space-between;
- flex: .9;
+ .member-text {
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+ flex: .9;
- .text-title {
- margin-top: -14rpx;
- font-size: 32rpx;
- font-weight: bolder;
- transform: skew(-6deg, 0);
- display: flex;
- justify-content: space-between;
+ .text-title {
+ margin-top: -14rpx;
+ font-size: 32rpx;
+ font-weight: bolder;
+ transform: skew(-6deg, 0);
+ display: flex;
+ justify-content: space-between;
- text {
- text {
- color: #C80D00;
- }
- }
+ text {
+ text {
+ color: #C80D00;
+ }
+ }
- view {
- width: 18rpx;
- height: 6rpx;
- background: #FEAC49;
- border-radius: 3rpx;
- }
- }
+ view {
+ width: 18rpx;
+ height: 6rpx;
+ background: #FEAC49;
+ border-radius: 3rpx;
+ }
+ }
- .text-content {
- font-size: 24rpx;
- color: #747474;
- }
- }
- }
+ .text-content {
+ font-size: 24rpx;
+ color: #747474;
+ }
+ }
+ }
- .member-active {
- transition: .3s;
- background: linear-gradient(#FF995F, #DA0E00);
+ .member-active {
+ transition: .3s;
+ background: linear-gradient(#FF995F, #DA0E00);
- .member-image {
- background: linear-gradient(#FF995F, #FDCB3B);
- }
+ .member-image {
+ background: linear-gradient(#FF995F, #DA0E00);
+ }
- .member-text {
- .text-title {
- text {
- color: #fff;
+ .member-text {
+ .text-title {
+ text {
+ color: #fff;
- text {
- color: rgb(223, 208, 42);
- }
- }
+ text {
+ color: rgb(223, 208, 42);
+ }
+ }
- view {
- background: #fff;
- }
- }
+ view {
+ background: #fff;
+ }
+ }
- .text-content {
- color: #fff;
- }
- }
- }
+ .text-content {
+ color: #fff;
+ }
+ }
+ }
- .member-disbled {
- transition: .3s;
- background: linear-gradient(#EFEFEF, #BCBCBC);
+ .member-disbled {
+ transition: .3s;
+ background: linear-gradient(#EFEFEF, #BCBCBC);
- .member-image {
- background: linear-gradient(#AAAAAA, #989898);
- }
+ .member-image {
+ background: linear-gradient(#EFEFEF, #AAAAAA);
+ }
- .member-text {
- .text-title {
- text {
- color: #868585;
+ .member-text {
+ .text-title {
+ text {
+ color: #868585;
- text {
- color: #868585;
- }
- }
+ text {
+ color: #868585;
+ }
+ }
- view {
- background: #fff;
- }
- }
+ view {
+ background: #fff;
+ }
+ }
- .text-content {
- color: #5C5C5C;
- }
- }
- }
-
- .member-prompt {
- display: flex;
- justify-content: center;
- font-size: 24rpx;
- color: #fff;
- }
- }
+ .text-content {
+ color: #5C5C5C;
+ }
+ }
+
+ }
+ .member-prompt {
+ display: flex;
+ justify-content: center;
+ font-size: 24rpx;
+ color: #fff;
+ }
+ }
}
.box-privilege {
diff --git a/yudao-ui-app/pages/member_record/index.vue b/yudao-ui-app/pages/member_record/index.vue
index 3e984fb51..40af29c38 100644
--- a/yudao-ui-app/pages/member_record/index.vue
+++ b/yudao-ui-app/pages/member_record/index.vue
@@ -17,6 +17,7 @@
日期：{{item.stringCreateTime}}
+
@@ -104,6 +105,16 @@
background-size: cover;
background-repeat: no-repeat;
background-attachment: fixed;
+ .u-empty{
+ margin-top: 20% !important;
+ ::v-deep .u-icon__icon{
+ font-size: 140rpx !important;
+ }
+ ::v-deep .u-empty__text{
+ font-size: 30rpx !important;
+ }
+ }
+
.box-seach{
z-index: 999;
padding: 0 40rpx;
diff --git a/yudao-ui-app/pages/member_renew/index.vue b/yudao-ui-app/pages/member_renew/index.vue
index 2e8a02e02..8c99736c8 100644
--- a/yudao-ui-app/pages/member_renew/index.vue
+++ b/yudao-ui-app/pages/member_renew/index.vue
@@ -15,12 +15,13 @@
-
-
-
+
+
+
+
- {{item.name.split('得')[0]}}得{{item.name.split('得')[1]}}
+ {{item.name.split('得')[0]}}得{{item.name.split('得')[1]}}
{{item.gearRemarks}}
@@ -120,6 +121,7 @@ import store from '@/store/index';
*
*/
goPay() {
+ console.log(this.activeIndex)
if(this.activeIndex.length){
this.$set(this, 'pay_close', true);
const orderInfos = this.activeIndex.map((item) => {
@@ -255,132 +257,132 @@ import store from '@/store/index';
}
- .member-list {
- margin: 83rpx 30rpx 30rpx 30rpx;
- position: relative;
+ .member-list {
+ margin: 53rpx 30rpx 20rpx 30rpx;
+ position: relative;
- .member-item {
- padding: 30rpx 20rpx 27rpx 20rpx;
- display: flex;
- justify-content: space-between;
- background: #fff;
- margin-bottom: 20rpx;
- border-radius: 20rpx;
+ .member-item {
+ padding: 30rpx 20rpx 27rpx 20rpx;
+ display: flex;
+ justify-content: space-between;
+ background: #fff;
+ margin-bottom: 20rpx;
+ border-radius: 20rpx;
- .member-image {
- width: 104rpx;
- height: 104rpx;
- border-radius: 35rpx;
- background: linear-gradient(#FFEBB2, #FDCB3B);
- padding: 20rpx;
+ .member-image {
+ width: 100rpx;
+ height: 100rpx;
+ border-radius: 35rpx;
+ background: linear-gradient(#FFEBB2, #FDCB3B);
+ padding: 6rpx 13rpx;
- image {
- width: 100%;
- height: 100%;
- }
- }
+ image {
+ width: 100%;
+ height: 100%;
+ }
+ }
- .member-text {
- display: flex;
- flex-direction: column;
- justify-content: space-between;
- flex: .9;
+ .member-text {
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+ flex: .9;
- .text-title {
- margin-top: -14rpx;
- font-size: 32rpx;
- font-weight: bolder;
- transform: skew(-6deg, 0);
- display: flex;
- justify-content: space-between;
+ .text-title {
+ margin-top: -14rpx;
+ font-size: 32rpx;
+ font-weight: bolder;
+ transform: skew(-6deg, 0);
+ display: flex;
+ justify-content: space-between;
- text {
- text {
- color: #C80D00;
- }
- }
+ text {
+ text {
+ color: #C80D00;
+ }
+ }
- view {
- width: 18rpx;
- height: 6rpx;
- background: #FEAC49;
- border-radius: 3rpx;
- }
- }
+ view {
+ width: 18rpx;
+ height: 6rpx;
+ background: #FEAC49;
+ border-radius: 3rpx;
+ }
+ }
- .text-content {
- font-size: 24rpx;
- color: #747474;
- }
- }
- }
+ .text-content {
+ font-size: 24rpx;
+ color: #747474;
+ }
+ }
+ }
- .member-active {
- transition: .3s;
- background: linear-gradient(#FF995F, #DA0E00);
+ .member-active {
+ transition: .3s;
+ background: linear-gradient(#FF995F, #DA0E00);
- .member-image {
- background: linear-gradient(#FF995F, #FDCB3B);
- }
+ .member-image {
+ background: linear-gradient(#FF995F, #DA0E00);
+ }
- .member-text {
- .text-title {
- text {
- color: #fff;
+ .member-text {
+ .text-title {
+ text {
+ color: #fff;
- text {
- color: rgb(223, 208, 42);
- }
- }
+ text {
+ color: rgb(223, 208, 42);
+ }
+ }
- view {
- background: #fff;
- }
- }
+ view {
+ background: #fff;
+ }
+ }
- .text-content {
- color: #fff;
- }
- }
- }
+ .text-content {
+ color: #fff;
+ }
+ }
+ }
- .member-disbled {
- transition: .3s;
- background: linear-gradient(#EFEFEF, #BCBCBC);
+ .member-disbled {
+ transition: .3s;
+ background: linear-gradient(#EFEFEF, #BCBCBC);
- .member-image {
- background: linear-gradient(#AAAAAA, #989898);
- }
+ .member-image {
+ background: linear-gradient(#EFEFEF, #AAAAAA);
+ }
- .member-text {
- .text-title {
- text {
- color: #868585;
+ .member-text {
+ .text-title {
+ text {
+ color: #868585;
- text {
- color: #868585;
- }
- }
+ text {
+ color: #868585;
+ }
+ }
- view {
- background: #fff;
- }
- }
+ view {
+ background: #fff;
+ }
+ }
- .text-content {
- color: #5C5C5C;
- }
- }
- }
+ .text-content {
+ color: #5C5C5C;
+ }
+ }
- .member-prompt {
- display: flex;
- justify-content: center;
- font-size: 24rpx;
- color: #fff;
- }
+ }
+ .member-prompt {
+ display: flex;
+ justify-content: center;
+ font-size: 24rpx;
+ color: #fff;
+ }
+ }
}
- }
.box-privilege {
box-shadow: 0px 0px 15px -5px #000;
From 89c5a86b21a1f3545081a2b59eafcb2f4565f80e Mon Sep 17 00:00:00 2001
From: js199000126 <528892601@qq.com>
Date: Thu, 25 May 2023 17:25:52 +0800
Subject: [PATCH 3/6] index1
---
yudao-ui-app/config/app.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/yudao-ui-app/config/app.js b/yudao-ui-app/config/app.js
index f50b0d09a..605d8d33c 100644
--- a/yudao-ui-app/config/app.js
+++ b/yudao-ui-app/config/app.js
@@ -1,7 +1,7 @@
-// let domain = process.env.APP_BASE_URL
+let domain = process.env.APP_BASE_URL
// let domain = 'http://192.168.1.188:48080'
-let domain = 'http://api.cyywl.top'
+// let domain = 'http://api.cyywl.top'
module.exports = {
// 请求域名 格式： https://您的域名
From 911a5ce4c3771af9d16e09557b1625a201ea6c63 Mon Sep 17 00:00:00 2001
From: Jruome <2559028966@qq.com>
Date: Thu, 25 May 2023 17:26:00 +0800
Subject: [PATCH 4/6] =?UTF-8?q?uniapp=20ui=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
yudao-ui-app/static/images/disbled.png | Bin 0 -> 21997 bytes
yudao-ui-app/static/images/success.png | Bin 0 -> 21826 bytes
2 files changed, 0 insertions(+), 0 deletions(-)
create mode 100644 yudao-ui-app/static/images/disbled.png
create mode 100644 yudao-ui-app/static/images/success.png
diff --git a/yudao-ui-app/static/images/disbled.png b/yudao-ui-app/static/images/disbled.png
new file mode 100644
index 0000000000000000000000000000000000000000..d863cd27cfc7e9ac8a266c1990f9853cd09854a9
GIT binary patch
literal 21997
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