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;