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

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

@@ -7,7 +7,7 @@
           <text>{{userInfo.mobile}}</text>
           <text>会员积分：{{memberDetail.integral}}</text>
         </view>
-        <text>再升1级即可获得【XX】等6项权益</text>
+        <!-- <text>再升1级即可获得【XX】等6项权益</text> -->
       <view class="left-button">
           <view class="left-shopping" @click="handleRouter('购买记录')">
             <text>购买记录</text>
@@ -31,7 +31,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">
@@ -165,10 +165,9 @@
 
 <style lang="scss" scoped>
   .box {
-    margin-bottom: 30%;
+    padding-bottom: 20%;
     margin-top: 10%;
     background: #fff;
-    height: 100vh;
     background: url(../../static/images/memberBg.png);
     background-size: cover;
     background-repeat: no-repeat;

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

@@ -10,7 +10,7 @@
           <text>充值号码：{{item.userPhone}}</text>
         </view>
         <button v-show="item.bool && item.refundStatus == 0" @click.stop="handleService(item)">申请退款</button>
-        <view v-show="item.refundStatus == 1">申请退款中</view>
+        <view v-show="item.refundStatus != 0">{{list[item.refundStatus]}}</view>
       </view>
         <view class="item-text">
         <text>充值档次：{{item.grade}}</text>
@@ -32,7 +32,8 @@
     data() {
       return {
         keyword:'',
-        memberData:[]
+        memberData:[],
+        list:['未退款','退款申请中','已退款','退款中']
       };
     },
     async onLoad() {

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

@@ -90,9 +90,9 @@
           <view class="user-menus" style="margin-top: 20rpx;">
             <!-- <view class="menu-title">我的服务</view> -->
             <u-cell-group>
-              <u-cell title="收货地址" isLink @click="jumpPage('/pages/users/user_address_list/index')">
+<!--              <u-cell title="收货地址" isLink @click="jumpPage('/pages/users/user_address_list/index')">
                 <u-icon slot="icon" size="45" name="/static/images/user_icon1.png"></u-icon>
-              </u-cell>
+              </u-cell> -->
               <u-cell title="分销中心" v-if="userInfo.userType === 'PROMOTER'" isLink
                 @click="jumpPage('/pages/users/user_spread_code/index')">
                 <u-icon slot="icon" size="45" name="/static/images/user_icon2.png"></u-icon>

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

@@ -27,7 +27,7 @@
           <div class="item" v-else>
             <div class="acea-row row-middle">
               <image src="/static/images/code_4.png" style="width: 40rpx; height: 40rpx;"></image>
-              <input type="text" placeholder="请输入您的验证码" class="texts" v-model="captcha" />
+              <input type="text" maxlength="6" placeholder="请输入您的验证码" class="texts" v-model="captcha" />
             </div>
             <button class="code" :disabled="disabled" :class="disabled === true ? 'on' : ''" @click="code">
               {{ text }}