From 7631ccedcd193f21784d6b171aeb594699793576 Mon Sep 17 00:00:00 2001
From: SelfRidicule <selfridicule@gmail.com>
Date: Fri, 8 Mar 2024 15:56:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=8F=E8=BF=B0:=E9=A2=84=E7=BA=A6=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../visitorIinvitation/detail/detail.js       |   3 +-
 .../visitorIinvitation/detail/detail.wxml     | 124 +++++++++++-------
 .../visitorIinvitation/detail/detail.wxss     | 102 ++++++++++----
 3 files changed, 155 insertions(+), 74 deletions(-)

diff --git a/miniprogram/pages/meeting/visitorIinvitation/detail/detail.js b/miniprogram/pages/meeting/visitorIinvitation/detail/detail.js
index 64c0cdd..b17ffca 100644
--- a/miniprogram/pages/meeting/visitorIinvitation/detail/detail.js
+++ b/miniprogram/pages/meeting/visitorIinvitation/detail/detail.js
@@ -10,6 +10,7 @@ Page({
      */
     data: {
         IMG_NAME: app.IMG_NAME,
+        detail: {},
         value: '',
         companyShow: false,
         usernameShow: false,
@@ -125,7 +126,7 @@ Page({
         wx.setNavigationBarTitle({
             title: options.title
         })
-        console.log('options.goods_id', options.title)
+        console.log('options.goods_id', options)
         companyRq({}).then(res => {
             console.log('res', res)
             if (res.code == 0) {
diff --git a/miniprogram/pages/meeting/visitorIinvitation/detail/detail.wxml b/miniprogram/pages/meeting/visitorIinvitation/detail/detail.wxml
index fb2201c..ded4df0 100644
--- a/miniprogram/pages/meeting/visitorIinvitation/detail/detail.wxml
+++ b/miniprogram/pages/meeting/visitorIinvitation/detail/detail.wxml
@@ -1,34 +1,71 @@
-<view class="container">
-    <view class="titleView">
-        <view class="title">请填写访客信息</view>
+<view class="containerView public">
+    <view class="headView">
+        <view class="leftLineTitle">预约信息</view>
     </view>
-    <view class="inputView">
-        <van-cell-group>
-            <van-field label="被访单位" model:value="{{ value }}" is-link required readonly placeholder="请选择" border="{{ true }}" arrow-direction="down" input-align="right" bind:tap="getCompanyHandle" />
-            <van-field label="被访人姓名" model:value="{{ value }}" is-link required readonly placeholder="请选择" placeholder="请输入" arrow-direction="down" border="{{ true }}" input-align="right" bind:tap="getUsernameHandle" />
-            <van-field label="被访人电话" model:value="{{ value }}" placeholder="请输入" border="{{ true }}" input-align="right" />
-            <van-field label="访客姓名" model:value="{{ value }}" required placeholder="请输入" border="{{ true }}" input-align="right" />
-            <van-field label="手机号码" model:value="{{ value }}" required placeholder="请输入" border="{{ true }}" input-align="right" />
-            <van-field label="身份证类型" model:value="{{ value}}" is-link required readonly placeholder="请选择" arrow-direction="down" input-align="right" bind:tap="getCardTypeHandle" />
-            <van-field label="身份证号" model:value="{{ value }}" required placeholder="请输入" border="{{ true }}" input-align="right" />
-            <van-field label="到访时间" model:value="{{ value }}" is-link required readonly placeholder="请选择" border="{{ true }}" arrow-direction="down" input-align="right" bind:tap="getArriveHandle" />
-            <van-field label="离开时间" model:value="{{ value }}" is-link required readonly placeholder="请选择" border="{{ true }}" arrow-direction="down" input-align="right" bind:tap="getLeaveHandle" />
-            <van-field label="来访事由" required model:value="{{ value }}" placeholder="请输入" border="{{ true }}" input-align="right" />
-            <view class="uploadImgView">
-                <view style="margin-bottom: 20rpx;">访客照片</view>
-                <van-uploader file-list="{{ fileList }}" upload-text="点击上传照片" bind:after-read="afterRead" />
-                <view class="tipsView">提示:请保持五官清晰，以方便系统精准识</view>
-            </view>
-        </van-cell-group>
-        <view class="submitBtnView">
-            <van-button block type="info" bind:click="submitFormFn">提交</van-button>
+    <view class="contentView">
+        <view class="rowView">
+            <view class="label must">被访单位</view>
+            <van-field model:value="{{  }}" input-class="input" is-link readonly placeholder="请选择" arrow-direction="down" input-align="right" border="{{ false }}" bind:tap="getCompanyHandle" />
         </view>
-        <!-- 被访单位弹框 -->
-        <van-popup show="{{ companyShow }}" round position="bottom">
-            <van-picker show-toolbar title="被访单位" columns="{{ companyColumns }}" bind:confirm="confirmHandle" bind:cancel="cancelHandle" bind:change="changeHandler" />
-        </van-popup>
-        <!-- 被访人姓名弹框 -->
-        <!-- <van-popup show="{{ usernameShow }}" round position="bottom" closeable custom-style="height: 100%;position:absolute" bind:close="onClose">
+        <view class="rowView">
+            <view class="label must">被访人姓名</view>
+            <van-field model:value="{{ value }}" input-class="input" is-link readonly placeholder="请选择" arrow-direction="down" border="{{ false }}" input-align="right" bind:tap="getUsernameHandle" />
+        </view>
+        <view class="rowView">
+            <view class="label must">被访人电话</view>
+            <van-field model:value="{{ value }}" input-class="input" placeholder="请输入" border="{{ false }}" input-align="right" />
+        </view>
+        <view class="rowView">
+            <view class="label must">访客姓名</view>
+            <van-field model:value="{{ value }}" input-class="input" placeholder="请输入" border="{{ false }}" input-align="right" />
+        </view>
+        <view class="rowView">
+            <view class="label must">手机号码</view>
+            <van-field model:value="{{ value }}" input-class="input" placeholder="请输入" border="{{ false }}" input-align="right" />
+        </view>
+        <view class="rowView">
+            <view class="label must">身份证类型</view>
+            <van-field model:value="{{ value}}" input-class="input" is-link readonly placeholder="请选择" arrow-direction="down" input-align="right" bind:tap="getCardTypeHandle" />
+        </view>
+        <view class="rowView">
+            <view class="label must">身份证号</view>
+            <van-field model:value="{{ value }}" input-class="input" placeholder="请输入" border="{{ false }}" input-align="right" />
+        </view>
+        <view class="rowView">
+            <view class="label must">到访时间</view>
+            <van-field model:value="{{ value }}" input-class="input" is-link readonly placeholder="请选择" border="{{ false }}" arrow-direction="down" input-align="right" bind:tap="getArriveHandle" />
+        </view>
+        <view class="rowView">
+            <view class="label must">离开时间</view>
+            <van-field model:value="{{ value }}" input-class="input" is-link readonly placeholder="请选择" border="{{ false }}" arrow-direction="down" input-align="right" bind:tap="getLeaveHandle" />
+        </view>
+
+        <view class="rowView">
+            <view class="label must">来访事由</view>
+            <van-field model:value="{{ value }}" input-class="input" placeholder="请输入" border="{{ false }}" input-align="right" />
+        </view>
+
+        <view class="rowView">
+            <view class="label must">访客照片</view>
+            <van-field style="visibility: hidden;" />
+        </view>
+    </view>
+
+    <!-- 上传图片 -->
+    <view class="uploadImgView">
+        <van-uploader file-list="{{ fileList }}" upload-text="点击上传照片" bind:after-read="afterRead" />
+        <view class="tipsView">提示:请保持五官清晰，以方便系统精准识</view>
+    </view>
+
+    <!-- 提交 -->
+    <view class="submitBtnView" bind:click="submitFormFn">提交</view>
+
+    <!-- 被访单位弹框 -->
+    <van-popup show="{{ companyShow }}" round position="bottom">
+        <van-picker show-toolbar title="被访单位" columns="{{ companyColumns }}" bind:confirm="confirmHandle" bind:cancel="cancelHandle" bind:change="changeHandler" />
+    </van-popup>
+    <!-- 被访人姓名弹框 -->
+    <!-- <van-popup show="{{ usernameShow }}" round position="bottom" closeable custom-style="height: 100%;position:absolute" bind:close="onClose">
       <van-index-bar index-list="{{ indexList }}" scroll-top="{{ scrollTop }}" z-index="2">
         <van-index-anchor wx:for="{{customerList}}" wx:key="index" index="{{item.firstLetter}}" use-slot="{{true}}">
           {{item.firstLetter}}
@@ -36,19 +73,18 @@
         </van-index-anchor>
       </van-index-bar>
     </van-popup> -->
-        <!-- 身份证类型弹框 -->
-        <van-popup show="{{ cardTypeShow }}" round position="bottom">
-            <van-picker show-toolbar title="身份证类型" columns="{{ columns }}" bind:confirm="confirmHandle" bind:cancel="cancelHandle" />
-        </van-popup>
-        <!-- 到访时间选择弹框 -->
-        <van-popup show="{{ arriveShow }}" round position="bottom">
-            <van-datetime-picker type="datetime" value="{{ currentDate }}" bind:input="onInput" bind:confirm="confirmHandle" bind:cancel="cancelHandle" />
-        </van-popup>
-        <!-- 离开时间弹框 -->
-        <van-popup show="{{ arriveShow }}" round position="bottom">
-            <van-datetime-picker type="datetime" value="{{ currentDate }}" bind:input="onInput" bind:confirm="confirmHandle" bind:cancel="cancelHandle" />
-        </van-popup>
-        <!-- 提交成功弹框 -->
-        <van-dialog title="提交成功" show="{{ submitSuccesShow }}" confirm-button-color="#4187f2" bind:confirm="submitDialogFn" />
-    </view>
+    <!-- 身份证类型弹框 -->
+    <van-popup show="{{ cardTypeShow }}" round position="bottom">
+        <van-picker show-toolbar title="身份证类型" columns="{{ columns }}" bind:confirm="confirmHandle" bind:cancel="cancelHandle" />
+    </van-popup>
+    <!-- 到访时间选择弹框 -->
+    <van-popup show="{{ arriveShow }}" round position="bottom">
+        <van-datetime-picker type="datetime" value="{{ currentDate }}" bind:input="onInput" bind:confirm="confirmHandle" bind:cancel="cancelHandle" />
+    </van-popup>
+    <!-- 离开时间弹框 -->
+    <van-popup show="{{ arriveShow }}" round position="bottom">
+        <van-datetime-picker type="datetime" value="{{ currentDate }}" bind:input="onInput" bind:confirm="confirmHandle" bind:cancel="cancelHandle" />
+    </van-popup>
+    <!-- 提交成功弹框 -->
+    <van-dialog title="提交成功" show="{{ submitSuccesShow }}" confirm-button-color="#4187f2" bind:confirm="submitDialogFn" />
 </view>
\ No newline at end of file
diff --git a/miniprogram/pages/meeting/visitorIinvitation/detail/detail.wxss b/miniprogram/pages/meeting/visitorIinvitation/detail/detail.wxss
index 34d5f9e..c375b1c 100644
--- a/miniprogram/pages/meeting/visitorIinvitation/detail/detail.wxss
+++ b/miniprogram/pages/meeting/visitorIinvitation/detail/detail.wxss
@@ -1,38 +1,82 @@
-/* pages/meeting/visitorIinvitation/visitorIinvitation.wxss */
-.container{
-	width: 100%;
-	position: absolute;
-	height: 100vh;
-	background-color: #f6f6f6;
+.containerView.public {
+    height: auto;
 }
-.titleView {
-    border-left: 8rpx solid #2A6FFF;
+
+.headView {
+    padding: 30rpx 20rpx;
+    background: #f6f6f6;
+}
+
+.contentView {}
+
+.contentView .rowView {
     display: flex;
+    justify-content: space-between;
     align-items: center;
-    margin: 40rpx 30rpx 0;
+    padding: 2rpx 0 2rpx 30rpx;
+    border-bottom: 1px solid rgb(126, 126, 126, 0.2);
 }
-.titleView .title{
-	margin-left: 10rpx;
-	font-size: 26rpx;
-	font-weight: 400;
-	color: #666666;
+
+.contentView .rowView:last-of-type {
+    border-bottom: none;
 }
-.inputView{
-	margin-top: 20rpx;
+
+
+.contentView .rowView .label {
+    position: relative;
+    font-size: 30rpx;
+    color: #000000;
 }
-.uploadImgView{
-  padding: 16px;
-  background-color: #ffffff;
-  color: #646566;
-  font-size: 28rpx;
+
+.contentView .rowView .label.must::after {
+    content: '*';
+    display: block;
+    position: absolute;
+    left: 100%;
+    top: 6rpx;
+    margin-left: 10rpx;
+    color: red;
 }
-.tipsView{
-  text-align: center;
-  padding-top: 60rpx;
-  margin-bottom: 100rpx;
+
+.input {
+    font-size: 30rpx;
 }
-.submitBtnView{
-  width: 96%;
-  margin:0 auto ;
-  padding-bottom: 100rpx;
+
+
+.uploadImgView {
+    padding: 0 40rpx;
+    background-color: #ffffff;
+    font-size: 28rpx;
+    color: #646566;
+}
+
+.uploadImgView .tipsView {
+    text-align: center;
+}
+
+.submitBtnView {
+    width: 600rpx;
+    padding: 20rpx;
+    background: #4e96f8;
+    color: white;
+    font-size: 30rpx;
+    text-align: center;
+    border-radius: 10rpx;
+    margin: 60rpx auto;
+}
+
+.submitBtn {
+    box-sizing: border-box;
+    position: fixed;
+    z-index: 10;
+    width: 600rpx;
+    left: 50%;
+    transform: translateX(-50%);
+    bottom: 120rpx;
+    border-radius: 10rpx;
+    padding: 20rpx;
+    background: #4e96f8;
+    color: white;
+    font-size: 30rpx;
+    text-align: center;
 }
\ No newline at end of file