Merge remote-tracking branch 'origin/master'

jiangping

2024-05-15 ccf69ee82f77a2e67a565cec02f95e64324a283f

 h5/pages/visitorApplication/visitorApplication.vue

@@ -2,7 +2,7 @@
   <view class="visit">
      <view class="head">拜访信息</view>
      <view class="list">
         <view class="list_item">
         <!-- <view class="list_item">
            <view class="list_item_label">
               <text>被访人手机</text>
               <text>*</text>
@@ -18,6 +18,16 @@
            </view>
            <view class="list_item_content">
               <input type="text" placeholder="请输入姓名" v-model="form1.receptMemberName" @blur="getUser" placeholder-style="color: #999999;" />
            </view>
         </view> -->
         <view class="list_item">
            <view class="list_item_label">
               <text>被访人</text>
               <text>*</text>
            </view>
            <view class="list_item_content" @click="showName = true">
               <text :style="{color: form1.name ? '#000000' : ''}">{{form1.name ? form1.name : '请选择'}}</text>
               <u-icon name="arrow-right" color="#CCCCCC" size="20"></u-icon>
            </view>
         </view>
         <view class="list_item">
@@ -51,6 +61,7 @@
               <u-icon name="arrow-right" color="#CCCCCC" size="20"></u-icon>
            </view>
         </view>
         <div class="empty"></div>
         <view class="list_item">
            <view class="list_item_label">
               <text>拜访事由</text>
@@ -58,6 +69,24 @@
            </view>
            <view class="list_item_content">
               <input type="text" v-model="form1.reason" placeholder="请输入来访事由" placeholder-style="color: #999999;" />
            </view>
         </view>
         <view class="list_item">
            <view class="list_item_label">
               <text>是否施工作业</text>
               <text>*</text>
            </view>
            <view class="list_item_content">
               <switch color="#4e99a9" style="transform:scale(0.8)" @change="constructionChange" />
            </view>
         </view>
         <view class="list_item">
            <view class="list_item_label">
               <text>施工内容</text>
               <text>*</text>
            </view>
            <view class="list_item_content">
               <input type="text" v-model="form1.ss" placeholder="请输入施工内容" placeholder-style="color: #999999;" />
            </view>
         </view>
         <view class="list_item">
@@ -282,6 +311,7 @@
         </view>
      </u-popup>
      <u-picker keyName="name" :show="show6" :columns="columns1" @confirm="seleIdcard" @cancel="show6 = false"></u-picker>
      <u-picker keyName="name" :show="showName" :columns="columnsNames" @confirm="selectedName" @cancel="showName = false"></u-picker>
      <!-- <tly-picture-cut ref="tlyPictureCut" :pictureSrc="photoSrc" @createImg="uploadImg"></tly-picture-cut> -->
      <keyboardInput ref="keyboard" @export="setPlate" @close="closeInput" />
      <qf-image-cropper ref="cropper" :width="280" :height="280" :radius="30" @crop="uploadImg"></qf-image-cropper>
@@ -299,6 +329,7 @@
            photoSrc: '',
            type: '',
            inputType: '',
            showName: false,
            show: false,
            show1: false,
            show2: false,
@@ -310,6 +341,9 @@
            fileList: [],
            columns1: [
               [{name: '身份证', id: 0}, {name: '港澳证件', id: 1},{name: '护照', id: 2}],
            ],
            columnsNames: [
               [{name: '张三', id: 0},{name: '张三', id: 1},{name: '张三', id: 2},]
            ],
            columns: [],
            cars: [],
@@ -372,6 +406,9 @@
         },
         closeInput() {
            this.$refs.keyboard.close()
         },
         constructionChange(e) {
            console.log(e.detail.value);
         },
         uploadImg(file) {
            this.$refs.cropper.close()
@@ -527,11 +564,6 @@
            }
            uni.chooseImage({
               success: (chooseImageRes) => {
                  // if (type === 'faceImg') {
                  //    this.photoSrc = chooseImageRes.tempFilePaths[0];
                  //    this.$refs.tlyPictureCut.showPop();
                  //    return
                  // }
                  uni.showLoading({ title: '上传中', mask: true });
                  for (let i = 0; i < chooseImageRes.tempFilePaths.length; i++) {
                     uni.uploadFile({
@@ -564,8 +596,12 @@
         seleIdcard(e) {
            this.withUserList.idcardType = e.value[0].id
            this.withUserList.idcardTypeName = e.value[0].name
            console.log(e);
            this.show6 = false
         },
         selectedName(e) {
            this.form1.name = e.value[0].name
            this.form1.id = e.value[0].id
            this.showName = false
         },
         submitCart() {
            if (!this.carName) return uni.showToast({
@@ -865,7 +901,7 @@
            align-items: center;
            justify-content: space-between;
            .t {
               background: #025EEF !important;
               background: #4d99a9 !important;
               color: #ffffff !important;
            }
            .adduser_footer_item {
@@ -874,11 +910,11 @@
               line-height: 88rpx;
               text-align: center;
               border-radius: 44rpx;
               border: 1rpx solid #025EEF;
               border: 1rpx solid #4d99a9;
               font-size: 32rpx;
               font-family: PingFangSC, PingFang SC;
               font-weight: 400;
               color: #025EEF;
               color: #4d99a9;
               margin-right: 18rpx;
               &:last-child {
                  margin: 0 !important;
@@ -922,7 +958,7 @@
            justify-content: space-between;
            margin-top: 60rpx;
            .t {
               background: #025EEF !important;
               background: #4d99a9 !important;
               color: #ffffff !important;
            }
            .addcar_footer_item {
@@ -1116,7 +1152,12 @@
         padding: 0 30rpx;
         box-sizing: border-box;
         background-color: #ffffff;

         .empty{
            width: 750rpx;
            height: 20rpx;
            background-color: #f7f7f7;
            margin: 0 -30rpx;
         }
         .list_item {
            width: 100%;
            // min-height: 98rpx;
@@ -1179,8 +1220,6 @@
         padding: 30rpx;
         box-sizing: border-box;
         background-color: #ffffff;
         margin-top: 20rpx;

         .cate_head {
            font-size: 32rpx;
            font-family: PingFangSC, PingFang SC;
@@ -1228,12 +1267,12 @@
            justify-content: center;
            background: rgba(2, 94, 239, 0);
            border-radius: 25rpx;
            border: 1rpx solid #025EEF;
            border: 1rpx solid #4c99a8;
            font-size: 22rpx;
            font-family: PingFangSC, PingFang SC;
            font-weight: 400;
            margin-top: 20rpx;
            color: #025EEF;
            color: #4c99a8;
            margin: 0 auto;
         }
      }
@@ -1257,7 +1296,7 @@
            height: 88rpx;
            line-height: 88rpx;
            text-align: center;
            background: #025EEF;
            background: #4c99a8;
            border-radius: 44rpx;
            font-size: 32rpx;
            font-weight: 500;