From 5b459c4c7fe8ff241857429a430d3629f9edffc2 Mon Sep 17 00:00:00 2001
From: SelfRidicule <selfridicule@gmail.com>
Date: Fri, 8 Mar 2024 14:11:33 +0800
Subject: [PATCH] 1

---
 miniprogram/app.json                          |  2 +-
 .../visitorIinvitation/detail/detail.js       |  6 +-
 .../visitorIinvitation/detail/detail.json     | 27 +++---
 .../visitorIinvitation/detail/detail.wxml     | 88 +++++++++----------
 .../visitorIinvitation/detail/detali.js       | 66 --------------
 .../visitorIinvitation/detail/detali.json     |  3 -
 .../visitorIinvitation/detail/detali.wxml     |  2 -
 .../visitorIinvitation/detail/detali.wxss     |  1 -
 .../meeting/visitorIinvitation/list/list.js   |  7 ++
 .../meeting/visitorIinvitation/list/list.wxml |  3 +-
 10 files changed, 71 insertions(+), 134 deletions(-)
 delete mode 100644 miniprogram/pages/meeting/visitorIinvitation/detail/detali.js
 delete mode 100644 miniprogram/pages/meeting/visitorIinvitation/detail/detali.json
 delete mode 100644 miniprogram/pages/meeting/visitorIinvitation/detail/detali.wxml
 delete mode 100644 miniprogram/pages/meeting/visitorIinvitation/detail/detali.wxss

diff --git a/miniprogram/app.json b/miniprogram/app.json
index 3c53e83..8cec87b 100644
--- a/miniprogram/app.json
+++ b/miniprogram/app.json
@@ -63,7 +63,7 @@
         "pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail",
         "pages/meeting/invite/invite",
         "pages/meeting/visitorIinvitation/list/list",
-        "pages/meeting/visitorIinvitation/detail/detali",
+        "pages/meeting/visitorIinvitation/detail/detail",
         "pages/meeting/visitorIinvitation/indexBar/indexBar"
     ],
     "window": {
diff --git a/miniprogram/pages/meeting/visitorIinvitation/detail/detail.js b/miniprogram/pages/meeting/visitorIinvitation/detail/detail.js
index c527655..64c0cdd 100644
--- a/miniprogram/pages/meeting/visitorIinvitation/detail/detail.js
+++ b/miniprogram/pages/meeting/visitorIinvitation/detail/detail.js
@@ -1,7 +1,7 @@
 let app = getApp();
 import {
     companyRq
-} from "../../../api/meeting/visitorIinvitation.js"
+} from "../../../../api/meeting/visitorIinvitation.js"
 
 Page({
 
@@ -123,9 +123,9 @@ Page({
     onLoad(options) {
         // 页面初始化 options为页面跳转所带来的参数
         wx.setNavigationBarTitle({
-            title: options.name
+            title: options.title
         })
-        console.log('options.goods_id', options.name)
+        console.log('options.goods_id', options.title)
         companyRq({}).then(res => {
             console.log('res', res)
             if (res.code == 0) {
diff --git a/miniprogram/pages/meeting/visitorIinvitation/detail/detail.json b/miniprogram/pages/meeting/visitorIinvitation/detail/detail.json
index 0d17ab2..fa802eb 100644
--- a/miniprogram/pages/meeting/visitorIinvitation/detail/detail.json
+++ b/miniprogram/pages/meeting/visitorIinvitation/detail/detail.json
@@ -1,15 +1,16 @@
 {
-  "usingComponents": {
-    "van-field": "@vant/weapp/field/index",
-    "van-picker": "@vant/weapp/picker/index",
-    "van-popup": "@vant/weapp/popup/index",
-    "van-uploader": "@vant/weapp/uploader/index",
-    "van-button": "@vant/weapp/button/index",
-    "van-datetime-picker": "@vant/weapp/datetime-picker/index",
-    "van-dialog": "@vant/weapp/dialog/index",
-    "van-cell": "@vant/weapp/cell/index",
-	  "van-index-bar": "@vant/weapp/index-bar/index",
-    "van-index-anchor": "@vant/weapp/index-anchor/index"
-  }
+    "navigationBarTitleText": "详情",
+    "usingComponents": {
+        "van-field": "@vant/weapp/field/index",
+        "van-picker": "@vant/weapp/picker/index",
+        "van-popup": "@vant/weapp/popup/index",
+        "van-uploader": "@vant/weapp/uploader/index",
+        "van-button": "@vant/weapp/button/index",
+        "van-datetime-picker": "@vant/weapp/datetime-picker/index",
+        "van-dialog": "@vant/weapp/dialog/index",
+        "van-cell": "@vant/weapp/cell/index",
+        "van-index-bar": "@vant/weapp/index-bar/index",
+        "van-index-anchor": "@vant/weapp/index-anchor/index"
+    }
 
-}
+}
\ No newline at end of file
diff --git a/miniprogram/pages/meeting/visitorIinvitation/detail/detail.wxml b/miniprogram/pages/meeting/visitorIinvitation/detail/detail.wxml
index 57eaaf9..fb2201c 100644
--- a/miniprogram/pages/meeting/visitorIinvitation/detail/detail.wxml
+++ b/miniprogram/pages/meeting/visitorIinvitation/detail/detail.wxml
@@ -1,34 +1,34 @@
 <view class="container">
-  <view class="titleView">
-    <view class="title">请填写访客信息</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="titleView">
+        <view class="title">请填写访客信息</view>
     </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="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>
+        <!-- 被访单位弹框 -->
+        <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 +36,19 @@
         </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>
 </view>
\ No newline at end of file
diff --git a/miniprogram/pages/meeting/visitorIinvitation/detail/detali.js b/miniprogram/pages/meeting/visitorIinvitation/detail/detali.js
deleted file mode 100644
index c12c89a..0000000
--- a/miniprogram/pages/meeting/visitorIinvitation/detail/detali.js
+++ /dev/null
@@ -1,66 +0,0 @@
-// pages/meeting/visitorIinvitation/detail/detali.js
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad(options) {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload() {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh() {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom() {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage() {
-
-  }
-})
\ No newline at end of file
diff --git a/miniprogram/pages/meeting/visitorIinvitation/detail/detali.json b/miniprogram/pages/meeting/visitorIinvitation/detail/detali.json
deleted file mode 100644
index 8835af0..0000000
--- a/miniprogram/pages/meeting/visitorIinvitation/detail/detali.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "usingComponents": {}
-}
\ No newline at end of file
diff --git a/miniprogram/pages/meeting/visitorIinvitation/detail/detali.wxml b/miniprogram/pages/meeting/visitorIinvitation/detail/detali.wxml
deleted file mode 100644
index 13d709e..0000000
--- a/miniprogram/pages/meeting/visitorIinvitation/detail/detali.wxml
+++ /dev/null
@@ -1,2 +0,0 @@
-<!--pages/meeting/visitorIinvitation/detail/detali.wxml-->
-<text>pages/meeting/visitorIinvitation/detail/detali.wxml</text>
\ No newline at end of file
diff --git a/miniprogram/pages/meeting/visitorIinvitation/detail/detali.wxss b/miniprogram/pages/meeting/visitorIinvitation/detail/detali.wxss
deleted file mode 100644
index 712572b..0000000
--- a/miniprogram/pages/meeting/visitorIinvitation/detail/detali.wxss
+++ /dev/null
@@ -1 +0,0 @@
-/* pages/meeting/visitorIinvitation/detail/detali.wxss */
\ No newline at end of file
diff --git a/miniprogram/pages/meeting/visitorIinvitation/list/list.js b/miniprogram/pages/meeting/visitorIinvitation/list/list.js
index 197bdb1..8ad5849 100644
--- a/miniprogram/pages/meeting/visitorIinvitation/list/list.js
+++ b/miniprogram/pages/meeting/visitorIinvitation/list/list.js
@@ -61,6 +61,13 @@ Page({
         })
     },
 
+    // 跳转-预约
+    goReservation() {
+        wx.navigateTo({
+            url: '/pages/meeting/visitorIinvitation/detail/detail?title=预约',
+        })
+    },
+
     /**
      * 生命周期函数--监听页面初次渲染完成
      */
diff --git a/miniprogram/pages/meeting/visitorIinvitation/list/list.wxml b/miniprogram/pages/meeting/visitorIinvitation/list/list.wxml
index cee058e..f8f34aa 100644
--- a/miniprogram/pages/meeting/visitorIinvitation/list/list.wxml
+++ b/miniprogram/pages/meeting/visitorIinvitation/list/list.wxml
@@ -27,8 +27,9 @@
         </van-tab>
     </van-tabs>
 
-    <view class="submitBtn">立即预约</view>
+    <view class="submitBtn" bind:tap="goReservation">立即预约</view>
 
+    <!-- 审核弹出框 -->
     <van-dialog use-slot title="审核" show="{{ dialogShow }}" show-confirm-button="{{false}}" show-cancel-button="{{false}}" close-on-click-overlay>
         <van-field input-class="textarea" bind:input="dialogInput" value="{{ dialogContent }}" type="textarea" placeholder="请输入描述信息" />
         <view class="dialogBtnView">