Merge remote-tracking branch 'origin/master'

jiangping

2024-06-28 43942a545271345ce26e40d82bb97138c5ea7611

 h5/pages/staff/visitorReport.vue

@@ -6,13 +6,14 @@
          <text>*</text>
          <text>被访人姓名</text>
        </view>
        <view class="list_item_content" @click="showName = true">
        <!-- <view class="list_item_content" @click="showName = true"> -->
        <view class="list_item_content">
          <text :style="{ color: form1.receptMemberName ? '#000000' : '' }">{{
            form1.receptMemberName
              ? form1.receptMemberName + " " + form1.receptCompanyName
              : "请选择"
          }}</text>
          <u-icon name="arrow-right" color="#CCCCCC" size="20"></u-icon>
          <!-- <u-icon name="arrow-right" color="#CCCCCC" size="20"></u-icon> -->
        </view>
      </view>
      <view class="list_item">
@@ -234,7 +235,7 @@
    const userInfo = uni.getStorageSync('userInfo') || {}
    this.$set(this.form1, 'receptMemberName', userInfo.realname)
    this.$set(this.form1, 'receptMemberId', userInfo.id || '')
    this.$set(this.form1, 'receptCompanyName', userInfo.company.companyName || '')
    this.$set(this.form1, 'receptCompanyName', userInfo.company.name || '')
    // this.getvisit()
    // this.getVisit1()
    // this.getUserValid()
@@ -292,6 +293,12 @@
        title: '手机号不能为空',
        icon: 'none'
      })
      var re = /^1[3,4,5,6,7,8,9][0-9]{9}$/;
        var result = re.test(this.form1.phone);
      if (!result) return uni.showToast({
        title: '手机号格式不正确',
        icon: 'none'
      }) 
      if (!this.form1.companyName) return uni.showToast({
        title: '来访单位不能为空',
        icon: 'none'
@@ -465,7 +472,7 @@
      line-height: 100rpx;
      text-align: center;
      font-size: 32rpx;
      font-weight: 500;
      font-weight: 600;
      color: #222222;
    }
    .list {
@@ -521,7 +528,7 @@
      text-align: center;
      font-size: 32rpx;
      font-family: PingFangSC, PingFang SC;
      font-weight: 500;
      font-weight: 600;
      color: #222222;
    }
    .addcar_ipt {