From f98f1d508326c817c110f88e157e58a7445e0c9c Mon Sep 17 00:00:00 2001
From: Jruome <2559028966@qq.com>
Date: Mon, 29 May 2023 21:08:28 +0800
Subject: [PATCH 1/2] =?UTF-8?q?uniapp=20=E8=B4=AD=E4=B9=B0=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-ui-app/pages/index/index.vue         | 32 ++++++++++++++--------
 yudao-ui-app/pages/member_equity/index.vue | 15 ++++++----
 2 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/yudao-ui-app/pages/index/index.vue b/yudao-ui-app/pages/index/index.vue
index b0ea2ae03..8a907d1f1 100644
--- a/yudao-ui-app/pages/index/index.vue
+++ b/yudao-ui-app/pages/index/index.vue
@@ -48,11 +48,13 @@
 		<view class="notice" @tap="goNoticeDetail">
 			<u-notice-bar :text="text" fontSize="26rpx" color="#000" bgColor="transparent"></u-notice-bar>
 		</view>
-    <view class="customer" @click="handleCustomer('电话客服')">
-      <image src="@/static/images/phone.png" ></image>
-    </view>
-    <view class="customer" @click="handleCustomer('微信客服')">
-      <image src="@/static/images/wecheat.png" ></image>
+    <view class="box_customer">
+      <view class="customer" @click="handleCustomer('电话客服')">
+        <image src="@/static/images/phone.png" ></image>
+      </view>
+      <view class="customer" @click="handleCustomer('微信客服')">
+        <image src="@/static/images/wecheat.png" ></image>
+      </view>
     </view>
 <!-- 		<view class="hot">
 			<view class="contain"></view>
@@ -863,16 +865,22 @@
 			align-items: center;
 
 		}
-    .customer{
-      width: 663rpx;
-      margin: 4% 44rpx;
-      height: 310rpx;
-      image{
-        width: 100%;
-        height: 100%;
+    .box_customer{
+      padding:0 0 10rpx 0;
+      // background: linear-gradient(111.4deg, rgb(238, 113, 113) 1%, rgb(246, 215, 148) 58%);
+      // border-radius: 20rpx;
+      .customer{
+        width: 663rpx;
+        margin: 3% 44rpx;
+        height: 310rpx;
+        image{
+          width: 100%;
+          height: 100%;
+        }
       }
     }
 
+
 		.hot {
 			width: 663rpx;
 			height: 322rpx;
diff --git a/yudao-ui-app/pages/member_equity/index.vue b/yudao-ui-app/pages/member_equity/index.vue
index 85f5d0925..7d889061b 100644
--- a/yudao-ui-app/pages/member_equity/index.vue
+++ b/yudao-ui-app/pages/member_equity/index.vue
@@ -40,19 +40,19 @@
         </view>
         <view class="equity-money">
           <view class="money-box money-completed">
-            <text>已返回金额（元）</text>
+            <text>已返回金额(元)</text>
             <view>
               <text class="money-text">{{item.totalMoney}}</text>
               <text class="money-detailed" @click="handleDetailed(item.reportId)">查看明细></text>
             </view>
           </view>
           <view class="money-box money-treat">
-            <text>待返还金额 (元) </text>
+            <text>待返还金额(元)</text>
             <text class="money-text">{{list[list.findIndex((i) => item.gear == i.name)].name-item.totalMoney}}</text>
           </view>
           <view class="money-box money-term">
             <text>待返还期额</text>
-            <text class="money-text">{{item.frequency}}x12</text>
+            <text class="money-text">{{list[list.findIndex((i) => item.gear == i.name)].frequency}}x12</text>
           </view>
           <view class="money-box money-time">
             <text>返费结束时间</text>
@@ -81,15 +81,18 @@
         			list: [
         				{
         					img:'../../static/images/member240.png',
-        					name:"360"
+        					name:"360",
+                  frequency:30
         				},
                 {
                 	img:'../../static/images/member400.png',
-                	name:"600"
+                	name:"600",
+                  frequency:50
                 },
                 {
                 	img:'../../static/images/member640.png',
-                	name:"960"
+                	name:"960",
+                  frequency:80
                 },
         			],
               vipData:['普通会员','中级会员','高级会员'],

From 9531301224ecee2a1c47c0f27bbfb1e1f9f86a81 Mon Sep 17 00:00:00 2001
From: Jruome <2559028966@qq.com>
Date: Mon, 29 May 2023 21:16:34 +0800
Subject: [PATCH 2/2] =?UTF-8?q?uniapp=20=E8=B4=AD=E4=B9=B0=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-ui-app/pages/member_renew/index.vue | 43 ++++++++++++-----------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git a/yudao-ui-app/pages/member_renew/index.vue b/yudao-ui-app/pages/member_renew/index.vue
index 00b61550a..08721485f 100644
--- a/yudao-ui-app/pages/member_renew/index.vue
+++ b/yudao-ui-app/pages/member_renew/index.vue
@@ -113,7 +113,6 @@ import store from '@/store/index';
     const res = await memberGradeInfo()
     this.memberData = res.data
     this.form.userPhone = store.state.app.userInfo.mobile
-    this.form.userName = store.state.app.userInfo.nickName
     } finally{
        uni.hideLoading();
      }
@@ -132,24 +131,28 @@ import store from '@/store/index';
       *
       */
      goPay() {
-    if(this.activeIndex.length){
-      this.$set(this, 'pay_close', true);
-      const orderInfos = this.activeIndex.map((item) => {
-        return {
-          ...this.memberData[item],
-          gearId:this.memberData[item].id
-        }
-      })
-      this.payInfo = {
-        userPhone: store.state.app.userInfo.mobile,
-        userName: this.form.userName,
-        orderInfos
-      }
-    }else{
-          this.$util.Tips({
-          	title: '请选择档次套餐'
-          })
-        }
+       this.$refs.uForm.validate().then(res => {
+         if (this.activeIndex.length) {
+           this.$set(this, 'pay_close', true);
+           const orderInfos = this.activeIndex.map((item) => {
+             return {
+               ...this.memberData[item],
+               gearId: this.memberData[item].id,
+             }
+           })
+           this.payInfo = {
+            userPhone: store.state.app.userInfo.mobile,
+            userName: this.form.userName,
+            orderInfos
+           }
+         }else{
+         this.$util.Tips({
+         	title: '请选择档次套餐'
+         })
+       }
+       }).catch(errors => {
+         // uni.$u.toast('请检查手机号输入')
+       })
      },
      /**
       * 事件回调
@@ -217,7 +220,7 @@ import store from '@/store/index';
        padding: 0 30rpx;
        background: #fff !important;
      }
-     
+
      ::v-deep .u-form-item__body__right__message{
        margin-top: 10rpx;
        color: #fff;