Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product

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('电话客服')">
+    <view class="box_customer">
-      <image src="@/static/images/phone.png" ></image>
+      <view class="customer" @click="handleCustomer('电话客服')">
-    </view>
+        <image src="@/static/images/phone.png" ></image>
-    <view class="customer" @click="handleCustomer('微信客服')">
+      </view>
-      <image src="@/static/images/wecheat.png" ></image>
+      <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{
+    .box_customer{
-      width: 663rpx;
+      padding:0 0 10rpx 0;
-      margin: 4% 44rpx;
+      // background: linear-gradient(111.4deg, rgb(238, 113, 113) 1%, rgb(246, 215, 148) 58%);
-      height: 310rpx;
+      // border-radius: 20rpx;
-      image{
+      .customer{
-        width: 100%;
+        width: 663rpx;
-        height: 100%;
+        margin: 3% 44rpx;
+        height: 310rpx;
+        image{
+          width: 100%;
+          height: 100%;
+        }
       }
     }
 
+
 		.hot {
 			width: 663rpx;
 			height: 322rpx;

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:['普通会员','中级会员','高级会员'],

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.$refs.uForm.validate().then(res => {
-      this.$set(this, 'pay_close', true);
+         if (this.activeIndex.length) {
-      const orderInfos = this.activeIndex.map((item) => {
+           this.$set(this, 'pay_close', true);
-        return {
+           const orderInfos = this.activeIndex.map((item) => {
-          ...this.memberData[item],
+             return {
-          gearId:this.memberData[item].id
+               ...this.memberData[item],
-        }
+               gearId: this.memberData[item].id,
-      })
+             }
-      this.payInfo = {
+           })
-        userPhone: store.state.app.userInfo.mobile,
+           this.payInfo = {
-        userName: this.form.userName,
+            userPhone: store.state.app.userInfo.mobile,
-        orderInfos
+            userName: this.form.userName,
-      }
+            orderInfos
-    }else{
+           }
-          this.$util.Tips({
+         }else{
-          	title: '请选择档次套餐'
+         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;