From 2eec6a07392d230c7d58a1978ef2b7462fd98e88 Mon Sep 17 00:00:00 2001
From: Jruome <2559028966@qq.com>
Date: Mon, 29 May 2023 21:44:08 +0800
Subject: [PATCH 1/4] =?UTF-8?q?uniapp=20=E6=98=8E=E7=BB=86=E6=9D=83?=
 =?UTF-8?q?=E7=9B=8A=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/member_back/index.vue | 25 +++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/yudao-ui-app/pages/member_back/index.vue b/yudao-ui-app/pages/member_back/index.vue
index 14b925834..e731f1d4b 100644
--- a/yudao-ui-app/pages/member_back/index.vue
+++ b/yudao-ui-app/pages/member_back/index.vue
@@ -17,7 +17,7 @@
           <image src='../../static/images/memberLogo.png'></image>
           <text class="equity-member">我的会员权益</text>
         </view>
-        <text class="equity-look">查看权益></text>
+        <!-- <text class="equity-look">查看权益></text> -->
       </view>
       <view class="equity-item" v-for="(item,index) in equityData" :key="index">
         <view class="equity-grade">
@@ -38,7 +38,7 @@
           </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>
@@ -67,16 +67,19 @@
         			list: [
         				{
         					img:'../../static/images/member240.png',
-        					name:360
+        					name:"360",
+        			    frequency:30
         				},
-                {
-                	img:'../../static/images/member400.png',
-                	name:600
-                },
-                {
-                	img:'../../static/images/member960.png',
-                	name:900
-                },
+        			  {
+        			  	img:'../../static/images/member400.png',
+        			  	name:"600",
+        			    frequency:50
+        			  },
+        			  {
+        			  	img:'../../static/images/member640.png',
+        			  	name:"960",
+        			    frequency:80
+        			  },
         			],
               vipData:['普通会员','中级会员','高级会员'],
         			show: false,

From 95f8e31dacd031665fbe0a64af8da4c5acd8b068 Mon Sep 17 00:00:00 2001
From: Jruome <2559028966@qq.com>
Date: Mon, 29 May 2023 22:16:16 +0800
Subject: [PATCH 2/4] =?UTF-8?q?uniapp=20=E4=BC=9A=E5=91=98=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E6=8F=90=E7=A4=BA=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/member_others/index.vue | 29 ++++++++--------------
 yudao-ui-app/pages/member_renew/index.vue  | 11 ++++----
 2 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/yudao-ui-app/pages/member_others/index.vue b/yudao-ui-app/pages/member_others/index.vue
index d2a0dff89..c6172af90 100644
--- a/yudao-ui-app/pages/member_others/index.vue
+++ b/yudao-ui-app/pages/member_others/index.vue
@@ -1,7 +1,7 @@
 <template>
   <view class="box">
     <view class="box-phone">
-      <u--form :model="form" :rules="rules" ref="uForm" labelWidth="100">
+      <u--form :model="form" :rules="rules" ref="uForm" labelWidth="100" errorType="toast">
         <u-form-item label="姓名" prop="userName">
           <u--input v-model="form.userName" maxlength="11" placeholder="请输入您的姓名"></u--input>
         </u-form-item>
@@ -88,13 +88,13 @@
               required: true,
               message: '姓名不能为空',
               // 触发器可以同时用blur和change
-              trigger: ['change', 'blur']
+              trigger: ['blur']
             }],
           userPhone: [{
               required: true,
               message: '手机号不能为空',
               // 触发器可以同时用blur和change
-              trigger: ['change', 'blur']
+              trigger: ['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,
@@ -103,14 +103,14 @@
                 return String(value);
               },
               message: '手机号不正确（190.193号段不可充值）',
-              trigger: ['change', 'blur']
+              trigger: ['blur']
             },
           ],
           confirmPhone: [{
               required: true,
               message: '手机号确认不能为空',
               // 触发器可以同时用blur和change
-              trigger: ['change', 'blur']
+              trigger: ['blur']
             },
             {
               validator: (rule, value, callback) => {
@@ -118,7 +118,7 @@
                 return this.form.userPhone == this.form.confirmPhone
               },
               message: '手机号不一致',
-              trigger: ['change', 'blur'],
+              trigger: ['blur'],
             }
           ]
         }
@@ -145,19 +145,9 @@
       }
     },
     methods: {
-      verify(){
-        this.$refs.uForm.validate().then(async res => {
-              uni.showLoading({
-              	title: '加载中',
-              	mask: true
-              });
-              try{
-              const res = await memberByHomeGradeInfo(this.form.confirmPhone)
-               this.memberData = res.data
-              } finally{
-                 uni.hideLoading();
-               }
-        })
+     async verify(){
+       const res = await memberByHomeGradeInfo(this.form.confirmPhone)
+        this.memberData = res.data
       },
       handleMember(value, index) {
         if (!!parseInt(value.isExist)) return
@@ -267,6 +257,7 @@
     ::v-deep .u-form-item__body__right__message{
       margin-top: 10rpx;
       color: #fff;
+      font-size: 26rpx;
     }
 
     .phone-money {
diff --git a/yudao-ui-app/pages/member_renew/index.vue b/yudao-ui-app/pages/member_renew/index.vue
index 08721485f..492e8720a 100644
--- a/yudao-ui-app/pages/member_renew/index.vue
+++ b/yudao-ui-app/pages/member_renew/index.vue
@@ -1,8 +1,8 @@
 <template>
   <view class="box">
     <view class="box-phone">
-      <u--form :model="form" :rules="rules" ref="uForm" labelWidth="100">
-        <u-form-item label="姓名" prop="userName" >
+      <u--form :model="form" :rules="rules" ref="uForm" labelWidth="100" errorType="toast">
+        <u-form-item label="姓名" prop="userName">
           <u--input v-model="form.userName" maxlength="11" placeholder="请输入您的姓名"></u--input>
         </u-form-item>
         <u-form-item label="手机号" prop="phone" >
@@ -82,14 +82,14 @@ import store from '@/store/index';
               required: true,
               message: '姓名不能为空',
               // 触发器可以同时用blur和change
-              trigger: ['change', 'blur']
+              trigger: ['blur']
             }],
           userPhone: [
             {
               required: true,
               message: '手机号不能为空',
               // 触发器可以同时用blur和change
-              trigger: ['change', 'blur']
+              trigger: [ '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,
@@ -98,7 +98,7 @@ import store from '@/store/index';
            				return String(value);
            			},
            			message: '手机号不正确（190.193号段不可充值）',
-                trigger: ['change', 'blur']
+                trigger: ['blur']
            		},
           ]
         }
@@ -224,6 +224,7 @@ import store from '@/store/index';
      ::v-deep .u-form-item__body__right__message{
        margin-top: 10rpx;
        color: #fff;
+       font-size: 26rpx;
      }
    }
 

From fc5a55141e4e054994e6bd972fa750bc436e4ff3 Mon Sep 17 00:00:00 2001
From: Jruome <2559028966@qq.com>
Date: Tue, 30 May 2023 10:20:14 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=AB=AF=20=E6=96=87?=
 =?UTF-8?q?=E6=A1=88=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/mall/market/banner/index.vue       |  7 +++++--
 yudao-ui-admin/src/views/system/tenant/index.vue | 10 +++++++---
 yudao-ui-app/pages/member_others/index.vue       | 16 +++++++++-------
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/yudao-ui-admin/src/views/mall/market/banner/index.vue b/yudao-ui-admin/src/views/mall/market/banner/index.vue
index 2a53cbe32..7e609e527 100644
--- a/yudao-ui-admin/src/views/mall/market/banner/index.vue
+++ b/yudao-ui-admin/src/views/mall/market/banner/index.vue
@@ -58,7 +58,7 @@
           <el-input v-model="form.title" placeholder="请输入标题"/>
         </el-form-item>
         <el-form-item label="缩略图" prop="picUrl">
-          <imageUpload v-model="form.picUrl" :limit="1" :format="'163*163'"/>
+          <imageUpload v-model="form.picUrl" :limit="1" :format="'664*238'" />
         </el-form-item>
         <el-form-item label="跳转链接" prop="url">
           <el-input v-model="form.url" placeholder="请输入跳转链接"/>
@@ -213,7 +213,10 @@ export default {
 </script>
 
 <style scoped lang="scss">
-//
+:deep(.el-upload-list__item){
+  width: 332px;
+  height: 119px;
+}
 .img-height {
   height: 150px;
 }
diff --git a/yudao-ui-admin/src/views/system/tenant/index.vue b/yudao-ui-admin/src/views/system/tenant/index.vue
index c0a16c341..0702962a3 100755
--- a/yudao-ui-admin/src/views/system/tenant/index.vue
+++ b/yudao-ui-admin/src/views/system/tenant/index.vue
@@ -119,7 +119,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="微信客户地址" prop="wxKfUrl">
+            <el-form-item label="微信客服地址" prop="wxKfUrl">
               <el-input v-model="form.wxKfUrl" placeholder="请输入"/>
             </el-form-item>
           </el-col>
@@ -131,7 +131,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="销售对接号码" prop="saleContactMobile">
+            <el-form-item label="销售对接人号码" prop="saleContactMobile">
               <el-input v-model="form.saleContactMobile" placeholder="请输入"/>
             </el-form-item>
           </el-col>
@@ -156,7 +156,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="店铺状态" prop="status">
+            <el-form-item label="启用状态" prop="status">
               <el-radio-group v-model="form.status">
                 <el-radio v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)"
                           :key="dict.value" :label="parseInt(dict.value)">{{ dict.label }}
@@ -459,6 +459,10 @@ export default {
 };
 </script>
 <style lang="scss">
+:deep(.el-upload-list__item){
+  width: 82px;
+  height: 82px;
+}
 .qrcode-wrap {
   text-align: center;
 }
diff --git a/yudao-ui-app/pages/member_others/index.vue b/yudao-ui-app/pages/member_others/index.vue
index c6172af90..6e1e78b9f 100644
--- a/yudao-ui-app/pages/member_others/index.vue
+++ b/yudao-ui-app/pages/member_others/index.vue
@@ -137,17 +137,19 @@
       }
     },
     watch:{
-      'form.userPhone' (){
-         this.verify()
+      'form.userPhone' (val){
+         this.verify(val)
       },
-       'form.confirmPhone' (){
-         this.verify()
+       'form.confirmPhone' (val){
+         this.verify(val)
       }
     },
     methods: {
-     async verify(){
-       const res = await memberByHomeGradeInfo(this.form.confirmPhone)
-        this.memberData = res.data
+     async verify(phone){
+        if(this.form.userPhone == this.form.confirmPhone){
+          const res = await memberByHomeGradeInfo(phone)
+           this.memberData = res.data
+        }
       },
       handleMember(value, index) {
         if (!!parseInt(value.isExist)) return

From ff84ef642c887811871493945204662ce451b23f Mon Sep 17 00:00:00 2001
From: Jruome <2559028966@qq.com>
Date: Tue, 30 May 2023 10:20:32 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=AB=AF=20=E6=96=87?=
 =?UTF-8?q?=E6=A1=88=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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yudao-ui-app/pages.json b/yudao-ui-app/pages.json
index d68b3dca4..e5f6ffa06 100644
--- a/yudao-ui-app/pages.json
+++ b/yudao-ui-app/pages.json
@@ -48,7 +48,7 @@
     {
     	"path": "pages/member_others/index",
     	"style": {
-    		"navigationBarTitleText": "代他人续费"
+    		"navigationBarTitleText": "代他人充值"
     	}
     },
     {