Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product

yudao-ui-app/components/paymentMember/index.vue

@@ -198,12 +198,12 @@
 <style scoped lang="scss">
   .payment {
     position: fixed;
-    bottom: 4%;
+    bottom: 0;
     left: 0;
     width: 100%;
     border-radius: 16rpx 16rpx 0 0;
     background-color: #fff;
-    padding-bottom: 100rpx;
+    padding-bottom: 4%;
     z-index: 99;
     transition: all 0.3s cubic-bezier(0.25, 0.5, 0.5, 0.9);
     transform: translate3d(0, 100%, 0);

yudao-ui-app/pages/member_application/index.vue

@@ -101,17 +101,26 @@
     },
 
     async onLoad() {
-      const res = await memberGradeInfo()
-      if(res.data.some((item) => !!parseInt(item.isExist))){
-        uni.setTabBarItem({
-          index: 2,
-          pagePath: '/pages/member_equity/index'
-        })
-        uni.switchTab({
-          url:'/pages/member_equity/index'
-        })
+      uni.showLoading({
+      	title: '加载中',
+      	mask: true
+      });
+      try{
+        const res = await memberGradeInfo()
+        if(res.data.some((item) => !!!parseInt(item.isExist))){
+          console.log(123123)
+          uni.setTabBarItem({
+            index: 0,
+            pagePath: '/pages/member_equity/index'
+          })
+          uni.switchTab({
+            url:'/pages/member_equity/index'
+          })
+        }
+        this.memberData = res.data
+      } finally{
+        uni.hideLoading();
       }
-      this.memberData = res.data
     },
     methods: {
 
@@ -217,14 +226,14 @@
     background-size: cover;
     background-repeat: no-repeat;
     background-attachment: fixed;
-    
+
     .u-nav-slot{
       ::v-deep .u-popup__content{
         padding-bottom: 20% !important;
-      
+
       }
     }
-    
+
 
     .phone-money {
       width: 604rpx;

yudao-ui-app/pages/member_equity/index.vue

@@ -11,8 +11,8 @@
       </view>
       <view class="member-right">
         <image src='../../static/images/vipStar.png'></image>
-        <text>会员等级3级</text>
-        <button>立即续费</button>
+        <text>会员等级{{vipData.findIndex((item) => item == memberDetail.grade) +1}}级</text>
+        <button @click="handleRenew">立即续费</button>
       </view>
     </view>
     <view class="box-equity">
@@ -20,7 +20,7 @@
         <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 3" :key="index">
         <view class="equity-grade">
           <image src='../../static/images/member240.png'></image>
           <text>办理日期：2021.12.30</text>
@@ -79,6 +79,7 @@
                 	fontSize:'28'
                 },
         			],
+              vipData:['普通会员','中级会员','高级会员'],
         			show: false,
               memberDetail:{}
       };
@@ -89,6 +90,11 @@
      this.memberDetail = res.data
     },
     methods: {
+      handleRenew(){
+        uni.navigateTo({
+            url:'/pages/member_renew/index'
+          })
+      },
       handleSelect(value){
         switch (value.name){
           case "购买记录":
@@ -97,7 +103,6 @@
           })
           break;
           case "为他人充值":
-          console.log(123)
           uni.navigateTo({
             url:'/pages/member_others/index'
           })
@@ -106,20 +111,13 @@
           break;
         }
       },
-      submit() {
-
-        this.$refs.uForm.validate().then(res => {
-          uni.$u.toast('校验通过')
-        }).catch(errors => {
-          uni.$u.toast('校验失败')
-        })
-      }
     }
   };
 </script>
 
 <style lang="scss" scoped>
   .box {
+    margin-bottom: 30%;
     margin-top: 10%;
     background: #fff;
     height: 100vh;

yudao-ui-app/pages/member_others/index.vue

@@ -114,8 +114,16 @@
       };
     },
     async onLoad() {
-      const res = await memberGradeInfo()
-      this.memberData = res.data
+     uni.showLoading({
+     	title: '加载中',
+     	mask: true
+     });
+     try{
+       const res = await memberGradeInfo()
+       this.memberData = res.data
+     } finally{
+       uni.hideLoading();
+     }
     },
     methods: {
       handleMember(value, index) {
@@ -151,7 +159,7 @@
           })
         }
         }).catch(errors => {
-          uni.$u.toast('校验失败')
+          uni.$u.toast('请检查手机号输入')
         })
       },
       /**
@@ -222,6 +230,10 @@
         background: #fff;
       }
     }
+    ::v-deep .u-form-item__body__right__message{
+      margin-top: 10rpx;
+      color: #fff;
+    }
 
     .phone-money {
       width: 604rpx;

yudao-ui-app/pages/member_renew/index.vue

@@ -95,9 +95,16 @@ import store from '@/store/index';
       };
     },
     async onLoad() {
+     uni.showLoading({
+     	title: '加载中',
+     	mask: true
+     });
+     try{
     const res = await memberGradeInfo()
     this.memberData = res.data
-    this.form.userPhone = store.state.app.userInfo.mobile
+    this.form.userPhone = store.state.app.userInfo.mobile     } finally{
+       uni.hideLoading();
+     }
     },
     methods: {
       handleMember(value,index){

yudao-ui-app/pages/users/user_spread_code/index.vue

@@ -205,7 +205,7 @@
         // href = window.location.href.split('/pages')[0];
         console.log('uid', that.uid)
         const baseUrl = 'http://yuxy.perrymake.com';
-        const url =`${baseUrl}/pages/index/index?redirectUrl=${baseUrl}&tenantId=${that.tenantId}&spreadId=${that.uid}`
+        const url =`${baseUrl}/pages/member_application/index?redirectUrl=${baseUrl}&tenantId=${that.tenantId}&spreadId=${that.uid}`
         console.log('url', url)
         uQRCode.make({
           canvasId: 'qrcode',