From 5b89459951931423a94ec50c876bc35a46d91a6e Mon Sep 17 00:00:00 2001
From: Jruome <2559028966@qq.com>
Date: Thu, 18 May 2023 18:03:06 +0800
Subject: [PATCH] =?UTF-8?q?uniapp=20=E8=B4=AD=E4=B9=B0=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-ui-app/api/member.js                    |   4 +-
 yudao-ui-app/pages.json                       |   8 +-
 .../pages/member_application/index.vue        | 245 +++++------
 yudao-ui-app/pages/member_equity/index.vue    | 156 +++++--
 yudao-ui-app/pages/member_others/index.vue    | 387 ++++++++++++------
 yudao-ui-app/pages/member_record/index.vue    |  77 ++--
 yudao-ui-app/pages/member_renew/index.vue     | 302 +++++++++-----
 yudao-ui-app/pages/users/login/index.vue      |   2 +
 8 files changed, 784 insertions(+), 397 deletions(-)

diff --git a/yudao-ui-app/api/member.js b/yudao-ui-app/api/member.js
index 182262073..8e1f99336 100644
--- a/yudao-ui-app/api/member.js
+++ b/yudao-ui-app/api/member.js
@@ -11,8 +11,8 @@ export function memberGradeInfo(){
 /**
  * 获取当前登录账号的充值记录
  */
-export function memberHeadInfo(){
-  return request.get('api/order/member/memberHeadInfo', {},{noAuth:true})
+export function memberOrderInfo(){
+  return request.get('api/order/member/memberOrderInfo', {},{noAuth:true})
 }
 
 /**
diff --git a/yudao-ui-app/pages.json b/yudao-ui-app/pages.json
index 911bdef5f..25c9a715e 100644
--- a/yudao-ui-app/pages.json
+++ b/yudao-ui-app/pages.json
@@ -573,11 +573,17 @@
 				"text": "分类"
 			},
       {
-      	"pagePath": "pages/member_application/index",
+      	"pagePath": "pages/member_record/index",
       	"iconPath": "static/images/2-001.png",
       	"selectedIconPath": "static/images/2-002.png",
       	"text": "会员申请"
       },
+      // {
+      // 	"pagePath": "pages/member_application/index",
+      // 	"iconPath": "static/images/2-001.png",
+      // 	"selectedIconPath": "static/images/2-002.png",
+      // 	"text": "会员申请"
+      // },
 			{
 				"pagePath": "pages/order_addcart/order_addcart",
 				"iconPath": "static/images/3-001.png",
diff --git a/yudao-ui-app/pages/member_application/index.vue b/yudao-ui-app/pages/member_application/index.vue
index faa53b235..e26a09936 100644
--- a/yudao-ui-app/pages/member_application/index.vue
+++ b/yudao-ui-app/pages/member_application/index.vue
@@ -1,23 +1,16 @@
 <template>
   <view class="box">
-    <view class="box-phone">
-      <u--form :model="form" :rules="rules" ref="uForm" labelWidth="100">
-        <u-form-item label="手机号" prop="phone">
-          <u--input v-model="form.phone" maxlength="11" placeholder="请输入您的手机号"></u--input>
-        </u-form-item>
-        <u-form-item label="手机号" prop="phone">
-          <u--input v-model="form.phone" maxlength="11" placeholder="请再次确认您的手机号"></u--input>
-        </u-form-item>
-      </u--form>
-    </view>
     <view class="box-member">
-      <view class="member-item" v-for="(item,index) in 3" :key="index">
+      <view :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)">
         <view class="member-image">
           <image src='../../static/images/f.png'></image>
         </view>
         <view class="member-text">
-          <text class="text-title">办理240得<text style="color: red;">360元</text></text>
-          <text class="text-content">办理档次【240】元，可享连续12个月每个月返利30元</text>
+          <view class="text-title">
+            <text>{{item.name.split('得')[0]}}<text>得{{item.name.split('得')[1]}}</text></text>
+            <view></view>
+          </view>
+          <text class="text-content">{{item.gearRemarks}}</text>
         </view>
       </view>
     </view>
@@ -39,6 +32,7 @@
   	memberGradeInfo
   } from '@/api/member.js';
   import paymentMember from '@/components/paymentMember';
+import store from '@/store/index';
   export default {
     name: "member_application",
     components: {
@@ -46,18 +40,7 @@
     },
     data() {
       return {
-        total_fee: 1, // 支付金额，单位分 100 = 1元
-        				order_no: "", // 业务系统订单号（即你自己业务系统的订单表的订单号）
-        				out_trade_no: "", // 插件支付单号
-        				description: "测试订单", // 支付描述
-        				type: "test", // 支付回调类型 如 recharge 代表余额充值 goods 代表商品订单（可自定义，任意英文单词都可以，只要你在 uni-pay-co/notify/目录下创建对应的 xxx.js文件进行编写对应的回调逻辑即可）
-        				custom:{
-        					a: "a",
-        					b: 1
-        				},
-        form: {
-          phone:''
-        },
+        memberData:[],
         payInfo:{
           userPhone: '',
           confirmPhone: '',
@@ -77,50 +60,44 @@
         	}
         ],
         pay_close: false,
-        rules: {
-          phone: [
-            {
-              required: true,
-              message: '手机号不能为空',
-              // 触发器可以同时用blur和change
-              trigger: ['change', 'blur']
-            },
-           {
-           			pattern: /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[1-25-9])\d{8}$/g,
-           			// 正则检验前先将值转为字符串
-           			transform(value) {
-           				return String(value);
-           			},
-           			message: '手机号不正确（190.193号段不可充值）',
-                trigger: ['change', 'blur']
-           		},
-          ]
-        }
-      };
-    },
-    mounted() {
+        activeIndex:[],
+        form: {
+          phone:''
+        },
 
+      };
     },
     async onLoad() {
     const res = await memberGradeInfo()
+    this.memberData = res.data
     },
     methods: {
+      handleMember(value,index){
+        if(!!parseInt(value.isExist))  return
+        if(this.activeIndex.includes(index)){
+          this.activeIndex = this.activeIndex.filter(item =>  item !== index)
+        }else{
+          this.activeIndex.push(index)
+        }
+      },
      /**
       * 打开支付组件
       *
       */
      goPay() {
-     	this.$set(this, 'pay_close', true);
+    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: '15760696662',
-        confirmPhone: '15760696662',
-        orderInfos: [{
-          gearId: '1',
-          name: '套餐1',
-          gearRemarks: '备注1',
-          gearAmount: 0.01
-        }]
+        userPhone: store.state.app.userInfo.mobile,
+        orderInfos
       }
+    }
      },
      /**
       * 事件回调
@@ -163,70 +140,34 @@
       	let value = opt.value != undefined ? opt.value : null;
       	(action && this[action]) && this[action](value);
       },
-      submit() {
-        this.order_no = `test`+Date.now(); // 模拟生成订单号
-        				this.out_trade_no = `${this.order_no}-1`; // 模拟生成插件支付单号
-        				// 打开支付收银台
-        				this.$refs.uniPay.open({
-        					total_fee: this.total_fee, // 支付金额，单位分 100 = 1元
-        					order_no: this.order_no, // 业务系统订单号（即你自己业务系统的订单表的订单号）
-        					out_trade_no: this.out_trade_no, // 插件支付单号
-        					description: this.description, // 支付描述
-        					type: this.type, // 支付回调类型
-        					custom: this.custom, // 自定义数据
-        				});
-
-        // this.$refs.uForm.validate().then(res => {
-        //   uni.$u.toast('校验通过')
-        // }).catch(errors => {
-        //   uni.$u.toast('校验失败')
-        // })
-      }
     }
   };
 </script>
 
 <style lang="scss" scoped>
   .box {
-    // position: relative;
-    padding: 0 24rpx;
-
-    .box-phone {
-      .u-form-item{
-        margin-bottom: 20rpx;
-      }
-     ::v-deep .u-form-item__body {
-        height: 100rpx;
-        border-radius: 20rpx;
-        padding: 0 30rpx;
-        background: #fff;
-        margin-bottom: 10rpx;
-      }
-    }
+    padding: 0 40rpx;
 
     .box-member {
       border-radius: 20rpx;
       width: 100%;
-      margin-top: 40%;
-      padding: 100rpx 20rpx 30rpx 20rpx;
-      // position: absolute;
-      // top: 20%;
-      // left: 0;
-      background: rgb(255, 210, 91);
+      margin-top: 207rpx;
+      padding: 83rpx 30rpx 30rpx 30rpx;
+      background: linear-gradient(#FFD55D,#FD752F);
 
       .member-item {
         display: flex;
         justify-content: space-between;
         background: #fff;
         margin-bottom: 20rpx;
-        padding: 30rpx;
+        padding: 30rpx 20rpx 27rpx 20rpx;
         border-radius: 20rpx;
 
         .member-image {
-          width: 120rpx;
-          height: 120rpx;
-          border-radius: 34rpx;
-          background: red;
+          width: 104rpx;
+          height: 104rpx;
+          border-radius: 35rpx;
+          background: linear-gradient(#FFEBB2,#FDCB3B);
           padding: 20rpx;
 
           image {
@@ -242,26 +183,90 @@
           flex: .9;
 
           .text-title {
-            margin-top: -16rpx;
-            font-size: 40rpx;
+            margin-top: -14rpx;
+            font-size: 32rpx;
             font-weight: bolder;
             transform: skew(-6deg, 0);
+            display: flex;
+            justify-content: space-between;
+            text{
+              text{
+                color: #C80D00;
+              }
+            }
+            view{
+              width: 18rpx;
+              height: 6rpx;
+              background: #FEAC49;
+              border-radius: 3rpx;
+            }
           }
 
           .text-content {
             font-size: 24rpx;
-            color: #aaa;
+            color: #747474;
+          }
+        }
+      }
+      .member-active{
+        transition: .3s;
+        background: linear-gradient(#FF995F,#DA0E00);
+
+        .member-image {
+          background: linear-gradient(#FF995F,#DA0E00);
+        }
+
+        .member-text {
+          .text-title {
+            text{
+              color: #fff;
+                text{
+                  color: rgb(223,208,42);
+                }
+            }
+            view{
+              background: #fff;
+              }
+          }
+          .text-content {
+            color: #fff;
+          }
+        }
+      }
+
+      .member-disbled{
+        transition: .3s;
+        background: linear-gradient(#EFEFEF,#BCBCBC);
+
+        .member-image {
+          background: linear-gradient(#AAAAAA,#989898);
+        }
+
+        .member-text {
+          .text-title {
+            text{
+              color: #868585;
+                text{
+                  color: #868585;
+                }
+            }
+            view{
+              background: #fff;
+              }
+          }
+          .text-content {
+            color: #5C5C5C;
           }
         }
       }
     }
 
     .box-privilege {
-      border-radius: 20rpx;
+      border-radius: 36rpx;
       width: 100%;
-      margin-top: 10%;
-      padding: 100rpx 10rpx 30rpx 10rpx;
-      background: rgb(255, 210, 91);
+      margin-top: 44rpx;
+      padding: 84rpx 10rpx 40rpx 10rpx;
+      background: linear-gradient(#FFD55D,#FD7630);
       display: flex;
       flex: 1;
 
@@ -271,35 +276,37 @@
         align-items: center;
         justify-content: space-between;
         background: #fff;
-        padding: 30rpx 20rpx;
+        padding: 16rpx 16rpx;
         border-radius: 20rpx;
-        margin: 10rpx;
+        margin: 0 10rpx;
 
         image {
-          width: 100rpx;
-          height: 100rpx;
+          width: 87rpx;
+          height: 87rpx;
           border-radius: 50%;
-          margin-bottom: 10rpx;
+          margin-bottom: 15rpx;
         }
 
         .privilege-text {
+          color: #000000;
           line-height: 36rpx;
           text-align: center;
-          font-size: 24rpx;
+          font-size: 26rpx;
         }
       }
     }
 
     .box-submit {
-      margin-top: 10%;
-      margin-bottom: 6%;
+      background: linear-gradient(#FFC82B,#FD7A32);
+      margin-top: 127rpx;
+      margin-bottom: 75rpx;
       display: flex;
       justify-content: center;
       align-items: center;
-      height: 90rpx;
-      border-radius: 60rpx;
-      background: royalblue;
+      height: 87rpx;
+      border-radius: 44rpx;
       color: #fff;
+      font-size: 32rpx;
     }
   }
 </style>
diff --git a/yudao-ui-app/pages/member_equity/index.vue b/yudao-ui-app/pages/member_equity/index.vue
index cd3629055..7564d02e2 100644
--- a/yudao-ui-app/pages/member_equity/index.vue
+++ b/yudao-ui-app/pages/member_equity/index.vue
@@ -11,45 +11,44 @@
       </view>
       <view class="member-right">
    <image src='../../static/images/f.png'></image>
-   <text >
-     立即续费
-   </text>
+    <text >会员等级3级</text>
+      <button>立即续费</button>
       </view>
     </view>
     <view class="box-equity">
       <view class="equity-text">
         <view class="equity-title">
-          <text>我的会员权益</text>
         </view>
+        <text class="equity-member">我的会员权益</text>
         <text class="equity-look">查看权益></text>
       </view>
-   <!--   <view class="equity-item" v-for="(item,index) in 2" :key="index">
+     <view class="equity-item" v-for="(item,index) in 2" :key="index">
         <view class="equity-grade">
           <text>办理档次【640元】档</text>
           <text>办理日期：2021.12.30</text>
         </view>
         <view class="equity-money">
-          <view class="money-text">
+          <view class="money-box money-completed">
             <text>已返回金额（元）</text>
             <view>
-              <text>80</text>
+              <text class="money-text">80</text>
               <text class="money-detailed">查看明细></text>
             </view>
           </view>
-          <view class="money-text">
+          <view class="money-box money-treat">
             <text>已返回金额（元）</text>
-            <text>80</text>
+            <text class="money-text">80</text>
           </view>
-          <view class="money-text">
+          <view class="money-box money-term">
             <text>已返回金额（元）</text>
-            <text>80</text>
+            <text class="money-text">80</text>
           </view>
-          <view class="money-text">
+          <view class="money-box money-time">
             <text>已返回金额（元）</text>
-            <text>80</text>
+            <text class="money-text">80</text>
           </view>
         </view>
-      </view> -->
+      </view>
     </view>
   </view>
 </template>
@@ -102,20 +101,30 @@
 
 <style lang="scss" scoped>
   .box {
-    padding: 10rpx 24rpx;
-
+    padding: 36rpx 40rpx;
+    background: #fff;
+    height: 100vh;
     .box-member {
       border-radius: 20rpx;
       width: 100%;
-      padding: 20rpx 20rpx 30rpx 20rpx;
-      background: rgb(255, 210, 91);
+      // padding: 20rpx 20rpx 30rpx 20rpx;
       display: flex;
       justify-content: space-between;
       .member-left{
         display: flex;
         flex-direction: column;
         justify-content: space-between;
-        flex: .7;
+        width: 69%;
+        font-size: 28rpx;
+        font-family: PingFang SC;
+        font-weight: 400;
+        color: #000000;
+        .left-title{
+          font-size: 35rpx;
+          font-family: PingFang SC;
+          font-weight: 600;
+          color: #000000;
+        }
         .left-info{
           display: flex;
           justify-content: space-between;
@@ -126,13 +135,29 @@
         flex-direction: column;
         justify-content: space-between;
         align-items: center;
-        flex: .2;
+        width: 22%;
+        font-size: 22rpx;
+        font-family: PingFang SC;
+        font-weight: 400;
+        color: #000000;
         image {
           width: 100rpx;
           height: 100rpx;
           border-radius: 50%;
           margin-bottom: 10rpx;
         }
+
+        button{
+          margin-top: 10rpx;
+          padding: 7rpx 16rpx;
+          background: #F22E60;
+          border-image: linear-gradient(0deg, #A8052E, #FFFFFF) 10 10;
+          border-radius: 18rpx;
+          font-size: 22rpx;
+          font-family: PingFang SC;
+          font-weight: 400;
+          color: #FFFFFF;
+        }
       }
     }
 
@@ -147,27 +172,34 @@
       .equity-text{
         display: flex;
         align-items: center;
+        position: relative;
         .equity-title{
           display: flex;
           justify-content: center;
           align-items: center;
-          width: 240rpx;
-          height: 140rpx;
-          // background: #fff;
-          // border-radius: 8px;/* 设置圆角 */
+          width: 200rpx;
+          height: 90rpx;
+          background: #fff;
+          border-radius: 8px;/* 设置圆角 */
+          transform: perspective(8px)scale(1.1, 1.3) rotateX(5deg);
+          		/* 镜头距离元素表面的位置为8px，x轴为1.1倍y轴为1.3倍，绕x轴旋转5度 */
+          transform-origin: bottom left;
+          margin-right: 20rpx;
+         }
+         .equity-member{
+           position: absolute;
          }
         .equity-look{
-          z-index: 99;
         }
       }
       .equity-item {
-        background: #eee;
+        background: #fff;
         display: flex;
         flex-direction: column;
         justify-content: space-between;
         border-radius: 20rpx;
-        margin: 10rpx;
-
+        margin: 15rpx;
+        padding: 30rpx 24rpx;
         .equity-grade{
           background: greenyellow;
           border-radius: 10rpx 10rpx;
@@ -176,12 +208,68 @@
           justify-content: space-between;
         }
         .equity-money {
-          // background: #fff;
-          // line-height: 36rpx;
-          // text-align: center;
-          // font-size: 24rpx;
-          .equity-money{
-            background: #fff;
+          display: flex;
+          justify-content: space-between;
+          flex-wrap: wrap;
+          .money-box{
+            padding: 24rpx 25rpx;
+            border-radius: 10px;
+            display: flex;
+            flex-direction: column;
+            justify-content: space-between;
+            font-size: 28rpx;
+            font-family: PingFang SC;
+            font-weight: 400;
+            color: #000000;
+            margin-bottom: 18rpx;
+            .money-text{
+            font-size: 30rpx;
+            font-family: PingFang SC;
+            font-weight: 400;
+
+            }
+          }
+          .money-completed{
+            background: #FFF2F2;
+            border: 1px solid #F22E60;
+           .money-text{
+              color: #F91F57;
+           }
+            view{
+              margin-top:26rpx;
+              display: flex;
+              justify-content: space-between;
+              align-items: center;
+              font-size: 24rpx;
+              font-family: PingFang SC;
+              font-weight: 400;
+              color: #000000;
+            }
+          }
+
+          .money-treat{
+            background: #FFFDF1;
+            border: 1px solid #FF962F;
+            .money-text{
+              margin-top: 26rpx;
+               color: #EBAF00;
+            }
+          }
+          .money-term{
+            background: #F8FFF8;
+            border: 1px solid #38A74F;
+            .money-text{
+              margin-top: 26rpx;
+               color: #2C9E2C;
+            }
+          }
+          .money-time{
+            background: #F0FDFC;
+            border: 1px solid #5CA4E8;
+            .money-text{
+              margin-top: 26rpx;
+               color: #2D7AC9;
+            }
           }
         }
       }
diff --git a/yudao-ui-app/pages/member_others/index.vue b/yudao-ui-app/pages/member_others/index.vue
index b380c3846..43fb76811 100644
--- a/yudao-ui-app/pages/member_others/index.vue
+++ b/yudao-ui-app/pages/member_others/index.vue
@@ -2,47 +2,76 @@
   <view class="box">
     <view class="box-phone">
       <u--form :model="form" :rules="rules" ref="uForm" labelWidth="100">
-        <u-form-item label="手机号" prop="phone">
-          <u--input v-model="form.phone" maxlength="11" placeholder="请输入您的手机号"></u--input>
+        <u-form-item label="手机号" prop="userPhone">
+          <u--input v-model="form.userPhone" maxlength="11" placeholder="请输入您的手机号"></u--input>
         </u-form-item>
-        <u-form-item label="手机号" prop="phone">
-          <u--input v-model="form.phone" maxlength="11" placeholder="请再次确认您的手机号"></u--input>
+        <u-form-item label="手机号" prop="confirmPhone">
+          <u--input v-model="form.confirmPhone" maxlength="11" placeholder="请再次确认您的手机号"></u--input>
         </u-form-item>
       </u--form>
     </view>
     <view class="box-member">
-      <view class="member-item" v-for="(item,index) in 3" :key="index">
+      <view :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)">
         <view class="member-image">
           <image src='../../static/images/f.png'></image>
         </view>
-        <view class="member-text">
-          <text class="text-title">办理240得<text style="color: red;">360元</text></text>
-          <text class="text-content">办理档次【240】元，可享连续12个月每个月返利30元</text>
-        </view>
+       <view class="member-text">
+         <view class="text-title">
+           <text>{{item.name.split('得')[0]}}<text>得{{item.name.split('得')[1]}}</text></text>
+           <view></view>
+         </view>
+         <text class="text-content">{{item.gearRemarks}}</text>
+       </view>
+      </view>
+      <view class="member-prompt">
+        * 办理三个项目即可升级会员2，会员2享XX权益。
       </view>
     </view>
-    <view class="box-privilege">
-      <view class="privilege-item" v-for="(item,index) in 4" :key="index">
-        <image src='../../static/images/f.png'></image>
-        <text class="privilege-text">
-          开通立享大额话费返送。
-        </text>
-      </view>
-    </view>
-    <button class="box-submit" @click="submit">立即充值</button>
+    <paymentMember :payMode='payMode' :pay_close="pay_close" @onChangeFun='onChangeFun' :payInfo="payInfo"></paymentMember>
+    <button class="box-submit" @click="goPay">立即充值</button>
   </view>
 </template>
 
 <script>
+  import {
+  	memberGradeInfo
+  } from '@/api/member.js';
+  import paymentMember from '@/components/paymentMember';
+import store from '@/store/index';
   export default {
     name: "member_application",
+    components: {
+    	paymentMember
+    },
     data() {
       return {
+        memberData:[],
+        payInfo:{
+          userPhone: '',
+          confirmPhone: '',
+          orderInfos: []
+        },
+        payMode: [{
+        		name: "微信支付",
+        		icon: "icon-weixinzhifu",
+        		value: 'WXPAY',
+        		title: '微信快捷支付'
+        	},
+        	{
+        		name: "支付宝",
+        		icon: "icon-zhifubao",
+        		value: 'ALIPAY',
+        		title: '支付宝快捷支付'
+        	}
+        ],
+        pay_close: false,
+        activeIndex:[],
         form: {
-          phone:''
+          userPhone:'',
+          confirmPhone:''
         },
         rules: {
-          phone: [
+          userPhone: [
             {
               required: true,
               message: '手机号不能为空',
@@ -58,143 +87,251 @@
            			message: '手机号不正确（190.193号段不可充值）',
                 trigger: ['change', 'blur']
            		},
+          ],
+          confirmPhone:[
+            {
+              required: true,
+              message: '手机号确认不能为空',
+              // 触发器可以同时用blur和change
+              trigger: ['change', 'blur']
+            },
+            {
+            			validator: (rule, value, callback) => {
+            				return this.form.userPhone == this.form.confirmPhone
+            			},
+            			message: '手机号不一致',
+            			trigger: ['change','blur'],
+            		}
           ]
         }
       };
     },
-    mounted() {
-
-    },
-    onLoad() {
-
+    async onLoad() {
+    const res = await memberGradeInfo()
+    this.memberData = res.data
     },
     methods: {
-      submit() {
-
-        this.$refs.uForm.validate().then(res => {
-          uni.$u.toast('校验通过')
-        }).catch(errors => {
-          uni.$u.toast('校验失败')
-        })
-      }
+      handleMember(value,index){
+        if(!!parseInt(value.isExist))  return
+        if(this.activeIndex.includes(index)){
+          this.activeIndex = this.activeIndex.filter(item =>  item !== index)
+        }else{
+          this.activeIndex.push(index)
+        }
+      },
+     /**
+      * 打开支付组件
+      *
+      */
+     goPay() {
+       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: this.form.userPhone,
+                  confirmPhone: this.form.confirmPhone,
+       				    orderInfos
+       				  }
+       				}
+       			}).catch(errors => {
+       				uni.$u.toast('校验失败')
+       			})
+     },
+     /**
+      * 事件回调
+      *
+      */
+     onChangeFun: function(e) {
+     	let opt = e;
+     	let action = opt.action || null;
+     	let value = opt.value != undefined ? opt.value : null;
+     	(action && this[action]) && this[action](value);
+     },
+     /**
+      * 关闭支付组件
+      *
+      */
+     payClose: function() {
+     	this.pay_close = false;
+     },
+     /**
+      * 支付成功回调
+      *
+      */
+     pay_complete: function() {
+     	this.status = false;
+     	this.page = 1;
+     	this.$set(this, 'bargain', []);
+     	this.$set(this, 'pay_close', false);
+     	this.getBargainUserList();
+     },
+     /**
+      * 支付失败回调
+      *
+      */
+     pay_fail: function() {
+     	this.pay_close = false;
+     },
+      onChangeFun: function(e) {
+      	let opt = e;
+      	let action = opt.action || null;
+      	let value = opt.value != undefined ? opt.value : null;
+      	(action && this[action]) && this[action](value);
+      },
     }
   };
 </script>
 
 <style lang="scss" scoped>
   .box {
-    // position: relative;
-    padding: 0 24rpx;
-
-    .box-phone {
+    padding: 63rpx 40rpx;
+  .box-phone {
       .u-form-item{
-        margin-bottom: 20rpx;
+        margin-bottom: 32rpx;
       }
      ::v-deep .u-form-item__body {
         height: 100rpx;
         border-radius: 20rpx;
         padding: 0 30rpx;
         background: #fff;
-        margin-bottom: 10rpx;
       }
     }
+   .box-member {
+     border-radius: 20rpx;
+     width: 100%;
+     margin-top: 60rpx;
+     padding: 83rpx 30rpx 30rpx 30rpx;
+     background: linear-gradient(#FFD55D,#FD752F);
 
-    .box-member {
-      border-radius: 20rpx;
-      width: 100%;
-      margin-top: 40%;
-      padding: 100rpx 20rpx 30rpx 20rpx;
-      // position: absolute;
-      // top: 20%;
-      // left: 0;
-      background: rgb(255, 210, 91);
+     .member-item {
+       display: flex;
+       justify-content: space-between;
+       background: #fff;
+       margin-bottom: 20rpx;
+       padding: 30rpx 20rpx 27rpx 20rpx;
+       border-radius: 20rpx;
 
-      .member-item {
-        display: flex;
-        justify-content: space-between;
-        background: #fff;
-        margin-bottom: 20rpx;
-        padding: 30rpx;
-        border-radius: 20rpx;
+       .member-image {
+         width: 104rpx;
+         height: 104rpx;
+         border-radius: 35rpx;
+         background: linear-gradient(#FFEBB2,#FDCB3B);
+         padding: 20rpx;
 
-        .member-image {
-          width: 120rpx;
-          height: 120rpx;
-          border-radius: 34rpx;
-          background: red;
-          padding: 20rpx;
+         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{
+             text{
+               color: #C80D00;
+             }
+           }
+           view{
+             width: 18rpx;
+             height: 6rpx;
+             background: #FEAC49;
+             border-radius: 3rpx;
+           }
+         }
 
-          .text-title {
-            margin-top: -16rpx;
-            font-size: 40rpx;
-            font-weight: bolder;
-            transform: skew(-6deg, 0);
-          }
+         .text-content {
+           font-size: 24rpx;
+           color: #747474;
+         }
+       }
+     }
+     .member-active{
+       transition: .3s;
+       background: linear-gradient(#FF995F,#DA0E00);
 
-          .text-content {
-            font-size: 24rpx;
-            color: #aaa;
-          }
-        }
-      }
-    }
+       .member-image {
+         background: linear-gradient(#FF995F,#DA0E00);
+       }
 
-    .box-privilege {
-      border-radius: 20rpx;
-      width: 100%;
-      margin-top: 10%;
-      padding: 100rpx 10rpx 30rpx 10rpx;
-      background: rgb(255, 210, 91);
-      display: flex;
-      flex: 1;
+       .member-text {
+         .text-title {
+           text{
+             color: #fff;
+               text{
+                 color: rgb(223,208,42);
+               }
+           }
+           view{
+             background: #fff;
+             }
+         }
+         .text-content {
+           color: #fff;
+         }
+       }
+     }
 
-      .privilege-item {
-        display: flex;
-        flex-direction: column;
-        align-items: center;
-        justify-content: space-between;
-        background: #fff;
-        padding: 30rpx 20rpx;
-        border-radius: 20rpx;
-        margin: 10rpx;
+     .member-disbled{
+       transition: .3s;
+       background: linear-gradient(#EFEFEF,#BCBCBC);
 
-        image {
-          width: 100rpx;
-          height: 100rpx;
-          border-radius: 50%;
-          margin-bottom: 10rpx;
-        }
+       .member-image {
+         background: linear-gradient(#AAAAAA,#989898);
+       }
 
-        .privilege-text {
-          line-height: 36rpx;
-          text-align: center;
-          font-size: 24rpx;
-        }
-      }
-    }
+       .member-text {
+         .text-title {
+           text{
+             color: #868585;
+               text{
+                 color: #868585;
+               }
+           }
+           view{
+             background: #fff;
+             }
+         }
+         .text-content {
+           color: #5C5C5C;
+         }
+       }
+     }
+     .member-prompt{
+       display: flex;
+       justify-content: center;
+       font-size: 24rpx;
+       color: #fff;
+     }
+   }
 
-    .box-submit {
-      margin-top: 10%;
-      margin-bottom: 6%;
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      height: 90rpx;
-      border-radius: 60rpx;
-      background: royalblue;
-      color: #fff;
-    }
+   .box-submit {
+     background: linear-gradient(#FFC82B,#FD7A32);
+     margin-top: 127rpx;
+     margin-bottom: 75rpx;
+     display: flex;
+     justify-content: center;
+     align-items: center;
+     height: 87rpx;
+     border-radius: 44rpx;
+     color: #fff;
+     font-size: 32rpx;
+   }
   }
 </style>
diff --git a/yudao-ui-app/pages/member_record/index.vue b/yudao-ui-app/pages/member_record/index.vue
index 713dd712f..c239bddd2 100644
--- a/yudao-ui-app/pages/member_record/index.vue
+++ b/yudao-ui-app/pages/member_record/index.vue
@@ -1,30 +1,54 @@
 <template>
   <view class="box">
-  <u-search placeholder="请输入关键字" v-model="keyword" :show-action="false"></u-search>
-    <view class="list-item" v-for="(item,index) in 5" :key="index">
-      <text class="item-phone">充值号码：13627451300</text>
+  <u-search placeholder="按手机号搜索查询" v-model="keyword" border-color="#F94B78" height="70" margin="0 0 35rpx 0" placeholder-color="#9C9C9C" bg-color="#fff" :show-action="false"></u-search>
+    <view class="list-item" v-for="(item,index) in memberData" :key="index">
+      <view class="item-phone">
+        <view></view>
+        <text>充值号码：{{item.userPhone}}</text>
+      </view>
         <view class="item-text">
-        <text>充值档次：套餐1</text>
-        <text>日期：2023-05-12</text>
+        <text>充值档次：{{item.grade}}</text>
+        <text>日期：{{item.createTime}}</text>
         </view>
   </view>
   </view>
 </template>
 
 <script>
+  import {
+  	memberOrderInfo
+  } from '@/api/member.js';
+  import { Debounce } from '@/utils/validate.js'
   export default {
-    name: "member_application",
+    name: "member_record",
     data() {
       return {
         keyword:'',
+        memberData:[]
       };
     },
-    mounted() {
-
-    },
-    onLoad() {
-
+    async onLoad() {
+      const res = await memberOrderInfo()
+      this.memberData = res.data
     },
+    watch:{
+      keyword :Debounce (function (){
+        this.memberData.sort((a,b) =>{
+            let aIndex = this.keyword.indexOf(a.userPhone)
+            let bIndex = this.keyword.indexOf(b.userPhone)
+             if(aIndex > bIndex) return -1
+              if(aIndex < bIndex) return 1
+          if(a.userPhone == b.userPhone){
+              return a.createTime - b.createTime
+          }else{
+            if(a.createTime<b.createTime) return -1
+            if(a.createTime>b.createTime) return 1
+            return 0
+          }
+        })
+        console.log(this.memberData)
+      },1000)
+      },
     methods: {
 
     }
@@ -33,30 +57,35 @@
 
 <style lang="scss" scoped>
   .box {
-      padding: 20rpx;
-      ::v-deep .u-search__content{
-        background: #fff !important;
-        height: 70rpx;
-        .uni-input-form{
-          background: #fff !important;
-        }
-      }
+      padding: 45rpx 40rpx;
       .list-item{
-        padding: 20rpx;
-        background: #fff;
+        margin-bottom: 26rpx;
+        padding: 30rpx 16rpx 25rpx 16rpx;
+        background: #FDF0F1;
         border-radius: 20rpx;
         display: flex;
         flex-direction: column;
         justify-content: space-between;
-        margin: 20rpx;
         .item-phone{
-          font-size: 36rpx;
-          font-weight: bolder;
+          display: flex;
+          align-items: center;
+          font-size: 30rpx;
+          color: #E91D51;
+          view{
+            border-radius: 3rpx;
+            margin-right: 10rpx;
+            width: 5rpx;
+            height: 12rpx;
+            background: #E91D51;
+          }
         }
         .item-text{
+          padding: 34rpx 12rpx;
+          background: #fff;
           margin-top: 20rpx;
           display: flex;
           justify-content: space-between;
+          font-size: 30rpx;
         }
       }
   }
diff --git a/yudao-ui-app/pages/member_renew/index.vue b/yudao-ui-app/pages/member_renew/index.vue
index b380c3846..2c2c3cfd3 100644
--- a/yudao-ui-app/pages/member_renew/index.vue
+++ b/yudao-ui-app/pages/member_renew/index.vue
@@ -2,47 +2,72 @@
   <view class="box">
     <view class="box-phone">
       <u--form :model="form" :rules="rules" ref="uForm" labelWidth="100">
-        <u-form-item label="手机号" prop="phone">
-          <u--input v-model="form.phone" maxlength="11" placeholder="请输入您的手机号"></u--input>
-        </u-form-item>
-        <u-form-item label="手机号" prop="phone">
-          <u--input v-model="form.phone" maxlength="11" placeholder="请再次确认您的手机号"></u--input>
+        <u-form-item label="手机号" prop="phone" >
+          <u--input v-model="form.userPhone" maxlength="11" disabled placeholder="请输入您的手机号"></u--input>
         </u-form-item>
       </u--form>
     </view>
     <view class="box-member">
-      <view class="member-item" v-for="(item,index) in 3" :key="index">
+      <view :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)">
         <view class="member-image">
           <image src='../../static/images/f.png'></image>
         </view>
-        <view class="member-text">
-          <text class="text-title">办理240得<text style="color: red;">360元</text></text>
-          <text class="text-content">办理档次【240】元，可享连续12个月每个月返利30元</text>
-        </view>
+     <view class="member-text">
+       <view class="text-title">
+         <text>{{item.name.split('得')[0]}}<text>得{{item.name.split('得')[1]}}</text></text>
+         <view></view>
+       </view>
+       <text class="text-content">{{item.gearRemarks}}</text>
+     </view>
+      </view>
+      <view class="member-prompt">
+        * 办理三个项目即可升级会员2，会员2享XX权益。
       </view>
     </view>
-    <view class="box-privilege">
-      <view class="privilege-item" v-for="(item,index) in 4" :key="index">
-        <image src='../../static/images/f.png'></image>
-        <text class="privilege-text">
-          开通立享大额话费返送。
-        </text>
-      </view>
-    </view>
-    <button class="box-submit" @click="submit">立即充值</button>
+    <paymentMember :payMode='payMode' :pay_close="pay_close" @onChangeFun='onChangeFun' :payInfo="payInfo"></paymentMember>
+    <button class="box-submit" @click="goPay">立即充值</button>
   </view>
 </template>
 
 <script>
+  import {
+  	memberGradeInfo
+  } from '@/api/member.js';
+  import paymentMember from '@/components/paymentMember';
+import store from '@/store/index';
   export default {
     name: "member_application",
+    components: {
+    	paymentMember
+    },
     data() {
       return {
+        memberData:[],
+        payInfo:{
+          userPhone: '',
+          confirmPhone: '',
+          orderInfos: []
+        },
+        payMode: [{
+        		name: "微信支付",
+        		icon: "icon-weixinzhifu",
+        		value: 'WXPAY',
+        		title: '微信快捷支付'
+        	},
+        	{
+        		name: "支付宝",
+        		icon: "icon-zhifubao",
+        		value: 'ALIPAY',
+        		title: '支付宝快捷支付'
+        	}
+        ],
+        pay_close: false,
+        activeIndex:[],
         form: {
-          phone:''
+          userPhone:''
         },
         rules: {
-          phone: [
+          userPhone: [
             {
               required: true,
               message: '手机号不能为空',
@@ -62,66 +87,121 @@
         }
       };
     },
-    mounted() {
-
-    },
-    onLoad() {
-
+    async onLoad() {
+    const res = await memberGradeInfo()
+    this.memberData = res.data
+    this.form.userPhone = store.state.app.userInfo.mobile
     },
     methods: {
-      submit() {
-
-        this.$refs.uForm.validate().then(res => {
-          uni.$u.toast('校验通过')
-        }).catch(errors => {
-          uni.$u.toast('校验失败')
-        })
+      handleMember(value,index){
+        if(!!parseInt(value.isExist))  return
+        if(this.activeIndex.includes(index)){
+          this.activeIndex = this.activeIndex.filter(item =>  item !== index)
+        }else{
+          this.activeIndex.push(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,
+        orderInfos
       }
     }
+     },
+     /**
+      * 事件回调
+      *
+      */
+     onChangeFun: function(e) {
+     	let opt = e;
+     	let action = opt.action || null;
+     	let value = opt.value != undefined ? opt.value : null;
+     	(action && this[action]) && this[action](value);
+     },
+     /**
+      * 关闭支付组件
+      *
+      */
+     payClose: function() {
+     	this.pay_close = false;
+     },
+     /**
+      * 支付成功回调
+      *
+      */
+     pay_complete: function() {
+     	this.status = false;
+     	this.page = 1;
+     	this.$set(this, 'bargain', []);
+     	this.$set(this, 'pay_close', false);
+     	this.getBargainUserList();
+     },
+     /**
+      * 支付失败回调
+      *
+      */
+     pay_fail: function() {
+     	this.pay_close = false;
+     },
+      onChangeFun: function(e) {
+      	let opt = e;
+      	let action = opt.action || null;
+      	let value = opt.value != undefined ? opt.value : null;
+      	(action && this[action]) && this[action](value);
+      },
+    }
   };
 </script>
 
 <style lang="scss" scoped>
   .box {
-    // position: relative;
-    padding: 0 24rpx;
-
-    .box-phone {
+    padding: 63rpx 40rpx;
+    .u-input{
+      background: #fff !important;
+    }
+  .box-phone {
       .u-form-item{
-        margin-bottom: 20rpx;
+        margin-bottom: 32rpx;
       }
      ::v-deep .u-form-item__body {
         height: 100rpx;
         border-radius: 20rpx;
         padding: 0 30rpx;
         background: #fff;
-        margin-bottom: 10rpx;
       }
     }
-
-    .box-member {
-      border-radius: 20rpx;
-      width: 100%;
-      margin-top: 40%;
-      padding: 100rpx 20rpx 30rpx 20rpx;
-      // position: absolute;
-      // top: 20%;
-      // left: 0;
-      background: rgb(255, 210, 91);
+   .box-member {
+     border-radius: 20rpx;
+     width: 100%;
+     margin-top: 60rpx;
+     padding: 83rpx 30rpx 30rpx 30rpx;
+     background: linear-gradient(#FFD55D,#FD752F);
 
       .member-item {
         display: flex;
         justify-content: space-between;
         background: #fff;
         margin-bottom: 20rpx;
-        padding: 30rpx;
+        padding: 30rpx 20rpx 27rpx 20rpx;
         border-radius: 20rpx;
 
         .member-image {
-          width: 120rpx;
-          height: 120rpx;
-          border-radius: 34rpx;
-          background: red;
+          width: 104rpx;
+          height: 104rpx;
+          border-radius: 35rpx;
+          background: linear-gradient(#FFEBB2,#FDCB3B);
           padding: 20rpx;
 
           image {
@@ -137,64 +217,102 @@
           flex: .9;
 
           .text-title {
-            margin-top: -16rpx;
-            font-size: 40rpx;
+            margin-top: -14rpx;
+            font-size: 32rpx;
             font-weight: bolder;
             transform: skew(-6deg, 0);
+            display: flex;
+            justify-content: space-between;
+            text{
+              text{
+                color: #C80D00;
+              }
+            }
+            view{
+              width: 18rpx;
+              height: 6rpx;
+              background: #FEAC49;
+              border-radius: 3rpx;
+            }
           }
 
           .text-content {
             font-size: 24rpx;
-            color: #aaa;
+            color: #747474;
           }
         }
       }
-    }
+      .member-active{
+        transition: .3s;
+        background: linear-gradient(#FF995F,#DA0E00);
 
-    .box-privilege {
-      border-radius: 20rpx;
-      width: 100%;
-      margin-top: 10%;
-      padding: 100rpx 10rpx 30rpx 10rpx;
-      background: rgb(255, 210, 91);
-      display: flex;
-      flex: 1;
+        .member-image {
+          background: linear-gradient(#FF995F,#DA0E00);
+        }
 
-      .privilege-item {
+        .member-text {
+          .text-title {
+            text{
+              color: #fff;
+                text{
+                  color: rgb(223,208,42);
+                }
+            }
+            view{
+              background: #fff;
+              }
+          }
+          .text-content {
+            color: #fff;
+          }
+        }
+      }
+
+      .member-disbled{
+        transition: .3s;
+        background: linear-gradient(#EFEFEF,#BCBCBC);
+
+        .member-image {
+          background: linear-gradient(#AAAAAA,#989898);
+        }
+
+        .member-text {
+          .text-title {
+            text{
+              color: #868585;
+                text{
+                  color: #868585;
+                }
+            }
+            view{
+              background: #fff;
+              }
+          }
+          .text-content {
+            color: #5C5C5C;
+          }
+        }
+      }
+      .member-prompt{
         display: flex;
-        flex-direction: column;
-        align-items: center;
-        justify-content: space-between;
-        background: #fff;
-        padding: 30rpx 20rpx;
-        border-radius: 20rpx;
-        margin: 10rpx;
-
-        image {
-          width: 100rpx;
-          height: 100rpx;
-          border-radius: 50%;
-          margin-bottom: 10rpx;
-        }
-
-        .privilege-text {
-          line-height: 36rpx;
-          text-align: center;
-          font-size: 24rpx;
-        }
+        justify-content: center;
+        font-size: 24rpx;
+        color: #fff;
       }
     }
 
+
     .box-submit {
-      margin-top: 10%;
-      margin-bottom: 6%;
+      background: linear-gradient(#FFC82B,#FD7A32);
+      margin-top: 127rpx;
+      margin-bottom: 75rpx;
       display: flex;
       justify-content: center;
       align-items: center;
-      height: 90rpx;
-      border-radius: 60rpx;
-      background: royalblue;
+      height: 87rpx;
+      border-radius: 44rpx;
       color: #fff;
+      font-size: 32rpx;
     }
   }
 </style>
diff --git a/yudao-ui-app/pages/users/login/index.vue b/yudao-ui-app/pages/users/login/index.vue
index e6894e397..a16212ec7 100644
--- a/yudao-ui-app/pages/users/login/index.vue
+++ b/yudao-ui-app/pages/users/login/index.vue
@@ -129,6 +129,7 @@
 						let data = res.data;
 						let newTime = Math.round(new Date() / 1000);
 						this.$store.commit("LOGIN", {
+							'userId':data.userId,
 							'token': res.data.accessToken,
               'refreshToken': res.data.refreshToken
 						});
@@ -231,6 +232,7 @@
 						data
 					}) => {
 						this.$store.commit("LOGIN", {
+              'userId':data.userId,
 							'token': data.accessToken,
               'refreshToken': data.refreshToken
 						});