Merge branch 'bd-test' of 47.94.45.65:angelo/web-base-h5 into bd-online

components/RankingPopup.vue

@@ -23,9 +23,9 @@
                 <view class="rank-number">
                   <img src="@/static/images/rank-2.svg" alt="" />
                 </view>
-                <view class="member-code">{{
+                <!-- <view class="member-code">{{
                   peopleTopThree[1].memberCode
-                }}</view>
+                }}</view> -->
                 <view
                   class="member-name"
                   :class="{ highlight: peopleTopThree[1].isLoginMember == 1 }"
@@ -44,9 +44,9 @@
                   <img src="@/static/images/rank-1.svg" alt="" />
                 </view>
 
-                <view class="member-code">
+                <!-- <view class="member-code">
                   {{ peopleTopThree[0].memberCode }}
-                </view>
+                </view> -->
                 <view
                   class="member-name"
                   :class="{ highlight: peopleTopThree[0].isLoginMember == 1 }"
@@ -63,9 +63,9 @@
                 <view class="rank-number">
                   <img src="@/static/images/rank-3.svg" alt="" />
                 </view>
-                <view class="member-code">{{
+                <!-- <view class="member-code">{{
                   peopleTopThree[2].memberCode
-                }}</view>
+                }}</view> -->
                 <view
                   class="member-name"
                   :class="{ highlight: peopleTopThree[2].isLoginMember == 1 }"
@@ -93,7 +93,7 @@
             >
               <view class="item-rank">{{ index + 4 }}</view>
               <view class="item-info">
-                <view class="item-code">{{ item.memberCode }}</view>
+                <!-- <view class="item-code">{{ item.memberCode }}</view> -->
                 <view
                   class="item-name"
                   :class="{ highlight: item.isLoginMember == 1 }"
@@ -152,9 +152,9 @@
                 >
                   {{ amountTopThree[1].memberName | formatMemberName }}
                 </view>
-                <view class="member-code">{{
+                <!-- <view class="member-code">{{
                   amountTopThree[1].memberCode
-                }}</view>
+                }}</view> -->
                 <view class="score">{{
                   formatAmount(amountTopThree[1].amount)
                 }}</view>
@@ -173,9 +173,9 @@
                 >
                   {{ amountTopThree[0].memberName | formatMemberName }}
                 </view>
-                <view class="member-code">{{
+                <!-- <view class="member-code">{{
                   amountTopThree[0].memberCode
-                }}</view>
+                }}</view> -->
                 <view class="score">{{
                   formatAmount(amountTopThree[0].amount)
                 }}</view>
@@ -194,9 +194,9 @@
                 >
                   {{ amountTopThree[2].memberName | formatMemberName }}
                 </view>
-                <view class="member-code">{{
+                <!-- <view class="member-code">{{
                   amountTopThree[2].memberCode
-                }}</view>
+                }}</view> -->
                 <view class="score">{{
                   formatAmount(amountTopThree[2].amount)
                 }}</view>
@@ -222,7 +222,7 @@
             >
               <view class="item-rank">{{ index + 4 }}</view>
               <view class="item-info">
-                <view class="item-code">{{ item.memberCode }}</view>
+                <!-- <view class="item-code">{{ item.memberCode }}</view> -->
                 <view
                   class="item-name"
                   :class="{ highlight: item.isLoginMember == 1 }"

pages/other/index.vue

@@ -1075,12 +1075,14 @@ export default {
           }
         }
         this.isLoading = true
-        try {
+        if (this.specialArea === 2) {
-          await this.getMemberName()
+          try {
-          await this.getMember()
+            await this.getMemberName()
-        } catch (err) {
+            await this.getMember()
-          this.isLoading = false
+          } catch (err) {
-          return
+            this.isLoading = false
+            return
+          }
         }
 
         let deleteList = []

pages/shareRegist/index.vue

@@ -7,20 +7,28 @@
 <template>
   <view>
     <view v-if="!pkCountry" class="content1">
-      <view class="title">欢迎注册</view>
+      <!-- <view class="title">欢迎注册</view> -->
       <view class="formed1">
-        <u-form :model="form" labelWidth="90px" ref="uForm" :rules="rules">
+        <u-form
+          :model="form"
+          labelWidth="90px"
+          ref="uForm"
+          labelPosition="top"
+          :rules="rules"
+        >
           <!-- <u-form-item label="推荐编号" prop="parentCode">
             <u-input v-model="form.parentCode" disabled> </u-input>
           </u-form-item> -->
           <u-form-item label="会员姓名" prop="memberName">
             <u-input
+              class="custom-input"
               v-model="form.memberName"
               :placeholder="'请输入会员姓名'"
             />
           </u-form-item>
           <u-form-item label="联系方式" prop="phone">
             <u-input
+              class="custom-input"
               v-model="form.phone"
               :placeholder="'请输入联系方式'"
               type="number"
@@ -74,105 +82,10 @@
           :loading="isLoading"
           :loadingText="'注册中'"
           @click="toLogin"
-          >{{ '立即注册' }}</u-button
+          >{{ '欢迎注册' }}</u-button
         >
       </view>
     </view>
-    <view v-else class="content">
-      <!-- <view class="tit" >{{ '海粉扫天下' }}</view>
-    <view class="formed"
-         >
-      <u-form :model="form"
-              ref="uForm1"
-              :rules="rules1"
-              labelWidth="80px">
-        <u-form-item label=""
-                     prop="memberName">
-          <u-input v-model="form.memberName"
-                   :placeholder="'请输入真实姓名'" />
-        </u-form-item>
-        <u-form-item label=""
-                     prop="phone">
-          <u-input v-model="form.phone"
-          :placeholder="'请输入联系方式'" />
-        </u-form-item>
-        <u-form-item label=""
-                     prop="code">
-          <u-input v-model="form.code"
-                   :placeholder="'请输入验证码'">
-            <template slot="suffix">
-              <view class="getCode"
-                    @tap="getVilCode">{{ getCode }}</view>
-            </template>
-          </u-input>
-        </u-form-item>
-        <u-form-item label=""
-                     @click="selCountry">
-          <view class="picker">
-            <u-input v-model="form.pkCountryName"
-                     disabled
-                     disabledColor="#ffffff"
-                     :placeholder="'请选择自然国'"
-                     border="none"></u-input>
-            <u-icon name="arrow-right"></u-icon>
-          </view>
-        </u-form-item>
-        <u-form-item label="">
-          <view class="picker">
-            <u-input v-model="form.jsName"
-                     disabled
-                     disabledColor="#ffffff"
-                     :placeholder="'请选择结算国'"
-                     border="none"></u-input>
-          </view>
-        </u-form-item>
-        <u-form-item label=""
-                     prop="loginPwd">
-          <u-input :password="isPwd1"
-                   :placeholder="'请输入登录密码'"
-                   v-model="form.loginPwd">
-            <template slot="suffix">
-              <u-icon name="eye"
-                      @tap="isPwd1=!isPwd1"
-                      v-if="!isPwd1"></u-icon>
-              <u-icon name="eye-off"
-                      @tap="isPwd1=!isPwd1"
-                      v-else></u-icon>
-            </template>
-          </u-input>
-        </u-form-item>
-        <u-form-item label=""
-                     prop="payPwd">
-          <u-input :password="isPwd2"
-          :placeholder="'请输入支付密码'"
-                   v-model="form.payPwd">
-            <template slot="suffix">
-              <u-icon name="eye"
-                      @tap="isPwd2=!isPwd2"
-                      v-if="!isPwd2"></u-icon>
-              <u-icon name="eye-off"
-                      @tap="isPwd2=!isPwd2"
-                      v-else></u-icon>
-            </template>
-          </u-input>
-        </u-form-item>
-      </u-form>
-      <u-button type="success"
-                class="uBtn"
-                shape="circle"
-                color="linear-gradient(to right, #005BAC, #005BAC )"
-                :loading="isLoading"
-                :loadingText="'注册中'"
-                @click="hiLogin">{{ '立即注册' }}</u-button>
-      <u-picker :show="isCountry"
-                keyName="label"
-                immediateChange
-                @confirm="confirmPopup"
-                @cancel="isCountry = false"
-                :columns="countryList"></u-picker>
-
-    </view> -->
-    </view>
     <u-modal
       :show="showSuccessModal"
       title="注册成功"
@@ -574,11 +487,15 @@ export default {
 
 <style lang="scss" scoped>
 .content1 {
-  background: linear-gradient(-45deg, #005bac, #0077c2, #0099e0, #00bfff);
-  background-size: 400% 400%;
-  animation: gradient 15s ease infinite;
   height: 100vh;
   overflow: auto;
+  background-image: url('@/static/images/regist-bg.jpg');
+  background-size: cover;
+  background-repeat: no-repeat;
+  background-position: center;
+  display: flex;
+  justify-content: center;
+  // padding-top: 35vh;
 }
 .content {
   background-image: url('@/static/images/huan.jpg');
@@ -613,10 +530,11 @@ export default {
   padding: 0 120rpx;
 }
 .formed1 {
-  margin: 0 40rpx;
+  width: 70%;
-  padding: 40rpx 30rpx;
+  margin-top: 37vh;
-  background-color: rgba(255, 255, 255, 0.85);
+  .custom-input {
-  border-radius: 16rpx;
+    border-radius: 60rpx;
+  }
 }
 .getCode {
   font-size: 10px;
@@ -641,7 +559,7 @@ export default {
   background: #fff;
 }
 ::v-deep .u-input {
-  background: #fff;
+  background: rgb(233, 233, 233);
 }
 .mask {
   position: fixed;