Merge remote-tracking branch 'origin/master'

rk

5 天以前 fa4c7baec36d58b4bdca66159ece743b5a45a9c8

 small-program/pages/store-apply/store-apply.vue

@@ -32,7 +32,7 @@

         <view class="form-group select-group">
            <view class="label-row"><text class="label">所在城市</text><text class="required">*</text></view>
            <view class="select-row" @click="showAreaPicker = true">
            <view class="select-row" :class="{ disabled: isShopRejected }" @click="!isShopRejected && (showAreaPicker = true)">
               <text class="select-text" :class="{ placeholder: !fullAreaName }">{{ fullAreaName || '请选择省市区' }}</text>
               <u-icon name="arrow-right" size="18" color="#9FA6B2"></u-icon>
            </view>
@@ -67,14 +67,14 @@
         <view class="form-group phone-group">
            <view class="label-row"><text class="label">联系人电话</text><text class="required">*</text></view>
            <view class="input-with-icon">
               <input class="text-input" type="number" maxlength="11" :value="form.linkPhone" @input="handleLinkPhoneInput" placeholder="请输入联系人电话" placeholder-style="color: #c1c7d0;" />
               <input class="text-input" type="number" :value="form.linkPhone" @input="handleLinkPhoneInput" placeholder="请输入联系人电话" placeholder-style="color: #c1c7d0;" />
            </view>
         </view>
         <view class="divider"></view>

         <view class="form-group">
            <view class="label-row"><text class="label">联系人身份证号</text><text class="required">*</text></view>
            <input class="text-input" type="idcard" maxlength="18" :value="form.idcard" @input="handleIdcardInput" placeholder="请输入联系人身份证号" placeholder-style="color: #c1c7d0;" />
            <input class="text-input" type="idcard" :value="form.idcard" @input="handleIdcardInput" placeholder="请输入联系人身份证号" placeholder-style="color: #c1c7d0;" />
         </view>
         <view class="divider"></view>

@@ -132,9 +132,9 @@

         <view class="form-group subject-first-group">
            <view class="label-row"><text class="label">门店类型</text><text class="required">*</text></view>
            <view class="switch-row type-switch-row">
               <view class="switch-pill" :class="{ active: form.companyType ===0 }" @tap="form.companyType =0">个人</view>
               <view class="switch-pill" :class="{ active: form.companyType ===1}" @tap="form.companyType =1">企业</view>
            <view class="switch-row type-switch-row" :class="{ disabled: isShopRejected }">
               <view class="switch-pill" :class="{ active: form.companyType ===0 }" @tap="!isShopRejected && (form.companyType =0)">个人</view>
               <view class="switch-pill" :class="{ active: form.companyType ===1}" @tap="!isShopRejected && (form.companyType =1)">企业</view>
            </view>
         </view>

@@ -266,11 +266,11 @@
            <image class="agree-icon" :src="agreed ? '/static/icon/ic_accept_sel@2x.png' : '/static/icon/ic_accept@2x.png'" mode="aspectFit" @tap="agreed = !agreed"></image>
            <view class="agreement-text-wrap">
               <text class="agreement-text">我已阅读并同意</text>
               <text class="agreement-link" @click="goToService(5)">《风险承诺》</text>
               <text class="agreement-link" @click="goToService(6)">《风险承诺》</text>
               <text class="agreement-text">、</text>
               <text class="agreement-link" @click="goToService(6)">《行李寄存须知》</text>
               <text class="agreement-link" @click="goToService(7)">《行李寄存须知》</text>
               <text class="agreement-text">及</text>
               <text class="agreement-link" @click="goToService(7)">《代理点合作协议》</text>
               <text class="agreement-link" @click="goToService(8)">《代理点合作协议》</text>
            </view>
         </view>
      </view>
@@ -295,6 +295,9 @@
         fullAreaName() {
            const arr = [this.form.provinceName, this.form.cityName, this.form.areaName].filter(Boolean)
            return arr.join('/')
         },
         isShopRejected() {
            return this.userInfo && this.userInfo.shopAuditStatus === 5
         }
      },
      data() {
@@ -455,9 +458,8 @@
                  return
               }
               const mobileRegex = /^1\d{10}$/
               const landlineRegex = /^\d{3,4}-?\d{7,8}$/
               if (!mobileRegex.test(this.form.legalPersonPhone) && !landlineRegex.test(this.form.legalPersonPhone)) {
                  uni.showToast({ title: '请输入正确的手机号或固定电话', icon: 'none' })
               if (!mobileRegex.test(this.form.legalPersonPhone)) {
                  uni.showToast({ title: '请输入1开头的11位法人手机号', icon: 'none' })
                  return
               }
               if (!this.form.aliAccount) {
@@ -503,7 +505,7 @@
                     uni.navigateBack()
                  }, 1500)
               }else {
                  uni.showToast({ title: res.msg || '提交失败', icon: 'none' })
                  uni.showToast({ title: res.message || '提交失败', icon: 'none' })
               }
            } catch (error) {
               uni.hideLoading()
@@ -1267,6 +1269,12 @@
   .type-switch-row {
      margin-top: 32rpx;
   }
	
   .type-switch-row.disabled,
   .select-row.disabled {
      opacity: 0.5;
      pointer-events: none;
   }

   .switch-pill {
      width: 208rpx;