司机端

js_sdk/chooseCarApi.js

@@ -71,4 +71,17 @@ export function submitReservation(data) {
         baseUri + dock + 'submitReservation',
         data, {}
     )
+}
+export function getHistoryContactPhoneByUserId(data) {
+    return $http.post(
+        baseUri + dock + 'getHistoryContactPhoneByUserId',
+        data, {}
+    )
+}
+// /wx/dock/updateReservation
+export function updateReservation(data) {
+    return $http.post(
+        baseUri + dock + 'updateReservation',
+        data, {}
+    )
 }

js_sdk/sjTools.js

@@ -0,0 +1,32 @@
+import $http from "./request/requestConfig"
+import {
+    BASE_URI
+} from "../pages/utils/constant.js";
+import qs from 'qs';
+
+const baseUri = ''
+const dict = '/wx/dict/'
+const dock = '/wx/dock/'
+// 
+// ​/wx​/dock​/reservationListPage
+export function reservationListPage(data) {
+    return $http.post(
+        baseUri + dock + 'reservationListPage',
+        data, {}
+    )
+}
+
+export function getReservationById(data) {
+    return $http.post(
+        baseUri + dock + 'getReservationById',
+        data, {}
+    )
+}
+export function getReservationVoById(data) {
+    return $http.post(
+        baseUri + dock + 'getReservationVoById',
+        data, {}
+    )
+}
+
+// ​/wx​/dock​/getReservationById

pages.json

@@ -241,6 +241,43 @@
                         }
                     }
                 },
+                {
+                    "path": "sj_history/edit",
+                    "style": {
+                        "navigationBarTitleText": "修改预约",
+                        "enablePullDownRefresh": true,
+                        "onReachBottomDistance": 100,
+                        "app-plus": {
+                            "bounce": "vertical",
+                            "titleNView": {
+                                "buttons": [
+                                    {
+                                        "text": "\ue534",
+                                        "fontSrc": "/static/uni.ttf",
+                                        "fontSize": "22px",
+                                        "color": "#FFFFFF"
+                                    }
+                                ]
+                            }
+                        },
+                        "component": true,
+                        "usingComponents": {
+                            "van-button": "/wxcomponents/weapp/dist/button/index",
+                            "van-toast": "/wxcomponents/weapp/dist/toast/index",
+                            "van-field": "/wxcomponents/weapp/dist/field/index",
+                            "van-popup": "/wxcomponents/weapp/dist/popup/index",
+                            "van-picker": "/wxcomponents/weapp/dist/picker/index",
+                            "van-dialog": "/wxcomponents/weapp/dist/dialog/index",
+                            "van-icon": "/wxcomponents/weapp/dist/icon/index",
+                            "van-tab": "/wxcomponents/weapp/dist/tab/index",
+                            "van-tabs": "/wxcomponents/weapp/dist/tabs/index",
+                            "van-datetime-picker": "/wxcomponents/weapp/dist/datetime-picker/index",
+                            "van-uploader": "/wxcomponents/weapp/dist/uploader/index",
+                            "van-checkbox": "/wxcomponents/weapp/dist/checkbox/index",
+                            "van-checkbox-group": "/wxcomponents/weapp/dist/checkbox-group/index"
+                        }
+                    }
+                },
                 {
                     "path": "yy_history/index",
                     "style": {
@@ -278,6 +315,43 @@
                         }
                     }
                 },
+                {
+                    "path": "sj_history/index",
+                    "style": {
+                        "navigationBarTitleText": "预约历史",
+                        "enablePullDownRefresh": true,
+                        "onReachBottomDistance": 100,
+                        "app-plus": {
+                            "bounce": "vertical",
+                            "titleNView": {
+                                "buttons": [
+                                    {
+                                        "text": "\ue534",
+                                        "fontSrc": "/static/uni.ttf",
+                                        "fontSize": "22px",
+                                        "color": "#FFFFFF"
+                                    }
+                                ]
+                            }
+                        },
+                        "component": true,
+                        "usingComponents": {
+                            "van-button": "/wxcomponents/weapp/dist/button/index",
+                            "van-toast": "/wxcomponents/weapp/dist/toast/index",
+                            "van-field": "/wxcomponents/weapp/dist/field/index",
+                            "van-popup": "/wxcomponents/weapp/dist/popup/index",
+                            "van-picker": "/wxcomponents/weapp/dist/picker/index",
+                            "van-dialog": "/wxcomponents/weapp/dist/dialog/index",
+                            "van-icon": "/wxcomponents/weapp/dist/icon/index",
+                            "van-tab": "/wxcomponents/weapp/dist/tab/index",
+                            "van-tabs": "/wxcomponents/weapp/dist/tabs/index",
+                            "van-datetime-picker": "/wxcomponents/weapp/dist/datetime-picker/index",
+                            "van-uploader": "/wxcomponents/weapp/dist/uploader/index",
+                            "van-checkbox": "/wxcomponents/weapp/dist/checkbox/index",
+                            "van-checkbox-group": "/wxcomponents/weapp/dist/checkbox-group/index"
+                        }
+                    }
+                },
                 {
                     "path": "sj_yy/index",
                     "style": {

pages/index/index.vue

@@ -67,7 +67,7 @@
         </div>
       </div>
     </div>
-    <div class="menu-list">
+    <div class="menu-list" v-if="userType == 'USER'">
       <div
         class="menu-row"
         @click="jumpPage('/pages/subPackages/choosecar/index?zxtype=送货预约')"
@@ -86,7 +86,7 @@
       </div>
       <div
         class="menu-row"
-        @click="jumpPage('/pages/subPackages/choosecar/index')"
+        @click="jumpPage('/pages/subPackages/choosecar/index?zxtype=取货预约')"
       >
         <div class="text">取货预约</div>
         <img
@@ -100,7 +100,11 @@
           alt=""
         />
       </div>
-      <div class="menu-row">
+      <!-- sj_yy/index -->
+      <div
+        class="menu-row"
+        @click="jumpPage('/pages/subPackages/sj_history/index')"
+      >
         <div class="text">预约历史</div>
         <img
           src="https://www.idea-co-sf.com/dockPic/9.png"
@@ -114,14 +118,12 @@
         />
       </div>
     </div>
-    <div class="menu-list">
-      <div class="menu-row">
-        <div
-          class="text"
-          @click="jumpPage('/pages/subPackages/choosecar/index')"
-        >
-          装货预约
-        </div>
+    <div class="menu-list" v-else>
+      <div
+        class="menu-row"
+        @click="jumpPage('/pages/subPackages/choosecar/index?zxtype=取货预约')"
+      >
+        <div class="text">装货预约</div>
         <img
           src="https://www.idea-co-sf.com/dockPic/7.png"
           class="back"
@@ -133,7 +135,10 @@
           alt=""
         />
       </div>
-      <div class="menu-row">
+      <div
+        class="menu-row"
+        @click="jumpPage('/pages/subPackages/choosecar/index?zxtype=卸货预约')"
+      >
         <div class="text">卸货预约</div>
         <img
           src="https://www.idea-co-sf.com/dockPic/8.png"
@@ -185,23 +190,27 @@
 // import {demo} from "@/js_sdk/http"
 import {
   getUserPower,
-  getUserLocalStorageInfo,
   getVenueAppointListAppCount,
   getMeetingAppointListAppCount,
 } from "@/js_sdk/http";
+import { getUserLocalStorageInfo } from "@/js_sdk/localUserInfo.js";
 export default {
   data() {
     return {
       mapList: [],
       MeetingNum: 0,
       VenueNum: 0,
+      userType: "",
     };
   },
   onShareAppMessage() {},
   mounted() {
     // demo();
   },
-  onLoad() {},
+  onLoad() {
+    console.log(getUserLocalStorageInfo().userType);
+    this.userType = getUserLocalStorageInfo().userType;
+  },
   onShow() {},
   methods: {
     jumpPage(path) {

pages/login/login.vue

@@ -9,28 +9,53 @@
         </div>
         <div class="inputBox">
           <img src="../../common/assets/image/comicon.png" alt="" />
-          <input type="text" placeholder="请输入账号" v-model="loginForm.userName" />
+          <input
+            type="text"
+            placeholder="请输入账号"
+            v-model="loginForm.userName"
+          />
         </div>
         <div class="inputBox">
           <img src="../../common/assets/image/pswicon.svg" alt="" />
-          <input type="password" placeholder="请输入密码" v-model="loginForm.password" />
+          <input
+            type="password"
+            placeholder="请输入密码"
+            v-model="loginForm.password"
+          />
         </div>
         <div class="inputBox">
           <img src="../../common/assets/image/yzmicon.svg" alt="" />
-          <input type="text" placeholder="验证码" class="yanzhengma" v-model="loginForm.code" />
-          <img :src="loginForm.captchaImage" @click="captchaImageRefresh(loginForm)" class="yanzhengImg" />
+          <input
+            type="text"
+            placeholder="验证码"
+            class="yanzhengma"
+            v-model="loginForm.code"
+          />
+          <img
+            :src="loginForm.captchaImage"
+            @click="captchaImageRefresh(loginForm)"
+            class="yanzhengImg"
+          />
         </div>
 
         <div style="margin-top: 80rpx">
-          <van-button type="default" class="loginbtn" size="large" color="rgba(138, 5, 84, 1)" @click="login">登
-            录</van-button>
+          <van-button
+            type="default"
+            class="loginbtn"
+            size="large"
+            color="rgba(138, 5, 84, 1)"
+            @click="login"
+            >登 录</van-button
+          >
         </div>
       </div>
     </div>
     <div class="bottomTips">
       <label class="radio">
         <radio value="r1" checked="true" color="#8a0554" />
-        已阅读并同意<span style="color: #8a0554">《服务协议条款及隐私政策》</span>
+        已阅读并同意<span style="color: #8a0554"
+          >《服务协议条款及隐私政策》</span
+        >
       </label>
     </div>
     <van-dialog id="van-toast" />
@@ -39,7 +64,7 @@
 <script>
 import Dialog from "../../wxcomponents/weapp/dist/dialog/dialog.js";
 import { login } from "@/js_sdk/http.js";
-import w_md5 from "@/js_sdk/zww-md5/w_md5.js"
+import w_md5 from "@/js_sdk/zww-md5/w_md5.js";
 
 export default {
   data() {
@@ -56,11 +81,11 @@ export default {
     };
   },
   onLoad(e) {
-    console.log(e)
+    console.log(e);
     // login()
 
     this.captchaImageRefresh(this.loginForm);
-    this.loginForm.type = e.type ? e.type : "USER"
+    this.loginForm.type = e.type ? e.type : "USER";
   },
   methods: {
     async wxlogin() {
@@ -110,8 +135,8 @@ export default {
           if (res.confirm) {
             uni.makePhoneCall({
               phoneNumber: "15061150110", //电话号码
-              success: function (e) { },
-              fail: function (e) { },
+              success: function (e) {},
+              fail: function (e) {},
             });
           }
         },
@@ -131,9 +156,8 @@ export default {
       let loginForm = {
         ...this.loginForm,
 
-        password: w_md5.hex_md5_32(this.loginForm.password)
-
-      }
+        password: w_md5.hex_md5_32(this.loginForm.password),
+      };
       login(loginForm).then((res) => {
         if (res.errmsg == "成功") {
           uni.showToast({
@@ -143,7 +167,10 @@ export default {
             duration: 2000,
           });
           this.$auth.setUser(res.data.token);
-          this.$auth.setUserInfo(res.data);
+          this.$auth.setUserInfo({
+            ...res.data,
+            userType: this.loginForm.type,
+          });
           uni.switchTab({
             url: "/pages/index/index",
           });
@@ -154,7 +181,7 @@ export default {
 
       // this.$auth.setUserType(this.$auth.TYPE_FRAME);
     },
-    onShareAppMessage: function () { },
+    onShareAppMessage: function () {},
   },
 };
 </script>

pages/subPackages/choosecar/index.vue

@@ -74,7 +74,7 @@ export default {
   onLoad(e) {
     console.log(e);
     this.getDockCarType();
-
+    this.zxtype = e.zxtype;
     // getDockCarType({})
   },
   methods: {

pages/subPackages/sj_history/code.vue

@@ -0,0 +1,174 @@
+<template>
+  <div class="yycode">
+    <div class="form">
+      <div class="title-box">
+        <div class="status" style="color: white">已预约</div>
+        <div class="title">预约码</div>
+        <div class="status">已预约</div>
+      </div>
+      <div class="form-data">
+        <div class="code"></div>
+        <div class="form-item">
+          <div class="item-label">对应码头</div>
+          <div class="item-value">4号码头</div>
+        </div>
+        <div class="form-item">
+          <div class="item-label">预约目的</div>
+          <div class="item-value">4号码头</div>
+        </div>
+        <div class="form-item">
+          <div class="item-label">集装箱车辆</div>
+          <div class="item-value">4号码头</div>
+        </div>
+        <div class="form-item">
+          <div class="item-label">预约日期</div>
+          <div class="item-value">4号码头</div>
+        </div>
+        <div class="form-item">
+          <div class="item-label">所属企业</div>
+          <div class="item-value">4号码头</div>
+        </div>
+        <div class="form-item">
+          <div class="item-label">司机姓名</div>
+          <div class="item-value">4号码头</div>
+        </div>
+        <div class="form-item">
+          <div class="item-label">车牌号</div>
+          <div class="item-value">4号码头</div>
+        </div>
+        <div class="form-item">
+          <div class="item-label">件数/托盘数</div>
+          <div class="item-value">4号码头</div>
+        </div>
+      </div>
+    </div>
+    <div class="form" style="margin-top: 24rpx; padding-top: 32rpx">
+      <div class="form-data" style="padding-bottom: 32rpx; padding-top: 32rpx">
+        <div class="form-item">
+          <div class="item-label">合约日期</div>
+          <div class="item-value">4号码头</div>
+        </div>
+        <div class="form-item">
+          <div class="item-label">签到日期</div>
+          <div class="item-value">4号码头</div>
+        </div>
+        <div class="form-item">
+          <div class="item-label">卸货日期</div>
+          <div class="item-value">4号码头</div>
+        </div>
+        <div class="form-item">
+          <div class="item-label">完成日期</div>
+          <div class="item-value">4号码头</div>
+        </div>
+      </div>
+    </div>
+    <div class="form share" style="margin-top: 24rpx">
+      <button open-type="share" class="sharbtn" @click="wxShare">
+        <img src="./Frame.png" class="wxicon" height="112" width="112" />
+      </button>
+      <div class="tips">厂区预约码，分享好友需谨慎</div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  created() {
+    wx.showShareMenu({
+      withShareTicket: true,
+      menus: ["shareAppMessage", "shareTimeline"],
+    });
+  },
+  methods: {
+    wxShare(e) {
+      console.log(e);
+    },
+    onShareAppMessage(res) {
+      //发送给朋友
+      console.log(`分享到朋友圈`, res);
+    },
+    onShareTimeline(res) {
+      //分享到朋友圈
+      console.log(`分享到朋友圈`, res);
+      return {};
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+.yycode {
+  margin-top: 24rpx;
+  .form {
+    background: white;
+    padding: 32rpx;
+  }
+  .sharbtn {
+    margin: auto;
+    // display: block;
+    padding: 0;
+    border: none;
+    height: 112rpx;
+    width: 112rpx;
+    background: rgba(0, 0, 0, 0);
+    &:after {
+      border: none;
+    }
+  }
+  .tips {
+    color: rgba(102, 102, 102, 1);
+    margin-top: 32rpx;
+    text-align: center;
+  }
+  .wxicon {
+    height: 112rpx;
+    width: 112rpx;
+  }
+  .form-data {
+    box-sizing: border-box;
+    padding: 0 80rpx;
+    .code {
+      margin-top: 16rpx;
+      width: 320rpx;
+      height: 320rpx;
+      background: #5c5c5c;
+      margin: 16rpx auto;
+    }
+    .form-item {
+      display: flex;
+      margin-top: 15rpx;
+      align-items: center;
+    }
+    .item-label {
+      font-weight: 400;
+      font-size: 32rpx;
+      color: #333333;
+      width: 175rpx;
+    }
+    .item-value {
+      font-weight: 400;
+      margin-left: 48rpx;
+      font-size: 32rpx;
+      color: #666666;
+    }
+  }
+  .title-box {
+    display: flex;
+    box-sizing: border-box;
+    justify-content: space-between;
+    align-items: center;
+    width: 100%;
+    margin-left: auto;
+
+    .title {
+      font-weight: bold;
+      font-size: 36rpx;
+      color: #333333;
+    }
+    .status {
+      //   margin-left: auto;
+      color: rgba(138, 5, 84, 1);
+    }
+  }
+}
+</style>

pages/subPackages/sj_history/edit.vue

@@ -0,0 +1,799 @@
+<template>
+  <div class="edityy">
+    <div
+      style="width: 100%; height: 0rpx; position: relative; background: white"
+    >
+      <div class="status qd">待签到</div>
+      <!-- <div class="status rz">待入厂</div>
+        <div class="status zx">装卸中</div>
+        <div class="status wc">已完成</div>
+        <div class="status gq">已过期</div>
+        <div class="status qx">已取消</div> -->
+    </div>
+    <div class="form bd_bottom">
+      <div class="form-label">
+        <span class="form-requird">*</span>
+        <span>供应商</span>
+      </div>
+      <div @click="oepnGysPopup()">
+        {{ form.gysName ? form.gysName : "请选择" }}
+      </div>
+    </div>
+    <div class="form bd_bottom pdt32 pdb32" style="display: block">
+      <div class="form-label">
+        <span class="form-requird">*</span>
+        <span>车牌号</span>
+      </div>
+      <div>
+        <car-number ref="carNum" v-model="carNumber"></car-number>
+      </div>
+      <div class="historyList">
+        <div
+          class="historyList-item mt32"
+          v-for="item in carNumberList"
+          :key="item"
+          @click="selectCarNumber(item)"
+        >
+          <div>{{ item }}</div>
+          <div class="btn">
+            <van-icon name="clear" color="rgba(138, 5, 84, 1)" />
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="form bd_bottom">
+      <div class="form-label">
+        <span class="form-requird">*</span>
+        <span>车辆类型</span>
+      </div>
+      <div class="form-value">
+        <picker
+          @change="selectCarType"
+          :value="index"
+          :range="dockCarTypeList"
+          range-key="label"
+        >
+          <!-- <view class="uni-input">{{ array[index] }}</view> -->
+          {{ form.carType ? form.carType : "请选择" }}
+        </picker>
+      </div>
+      <van-icon name="arrow" />
+    </div>
+    <div class="form bd_bottom" style="display: block">
+      <div style="display: flex">
+        <div class="form-label">
+          <span class="form-requird">*</span>
+          <span>司机姓名</span>
+        </div>
+        <div class="form-value">
+          <input
+            type="text"
+            readonly
+            placeholder="请选择"
+            v-model="form.driverName"
+          />
+        </div>
+      </div>
+      <div class="historyList">
+        <div
+          class="historyList-item mt32"
+          v-for="item in nameList"
+          @click="selectName(item)"
+        >
+          <div>{{ item }}</div>
+          <div class="btn">
+            <van-icon name="clear" color="rgba(138, 5, 84, 1)" />
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="form bd_bottom" style="display: block">
+      <div style="display: flex; align-items: center">
+        <div class="form-label">
+          <span class="form-requird">*</span>
+          <span>手机号/账号</span>
+        </div>
+        <div class="form-value">
+          <input
+            type="text"
+            readonly
+            placeholder="请选择"
+            v-model="form.driverUsername"
+          />
+        </div>
+      </div>
+      <!-- <div class="historyList">
+        <div class="historyList-item mt32">
+          <div>13921516068</div>
+          <div class="btn">
+            <van-icon name="clear" color="rgba(138, 5, 84, 1)" />
+          </div>
+        </div>
+        <div class="historyList-item mt32">
+          <div>13921516068</div>
+          <div class="btn">
+            <van-icon name="clear" color="rgba(138, 5, 84, 1)" />
+          </div>
+        </div>
+        <div class="historyList-item mt32">
+          <div>13921516068</div>
+          <div class="btn">
+            <van-icon name="clear" color="rgba(138, 5, 84, 1)" />
+          </div>
+        </div>
+        <div class="historyList-item mt32">
+          <div>13921516068</div>
+          <div class="btn">
+            <van-icon name="clear" color="rgba(138, 5, 84, 1)" />
+          </div>
+        </div>
+      </div> -->
+    </div>
+    <div class="form bd_bottom" style="display: block">
+      <div style="display: flex">
+        <div class="form-label">
+          <span class="form-requird">*</span>
+          <span>联系电话</span>
+        </div>
+        <div class="form-value">
+          <input
+            type="text"
+            readonly
+            placeholder="请选择"
+            v-model="form.driverContactPhone"
+          />
+        </div>
+      </div>
+      <div class="historyList">
+        <div
+          @click="selectDriverContactPhone(item)"
+          class="historyList-item mt32"
+          v-for="item in telList"
+        >
+          <div>{{ item }}</div>
+          <div class="btn">
+            <van-icon name="clear" color="rgba(138, 5, 84, 1)" />
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="form bd_bottom mt32">
+      <div class="form-label">
+        <span class="form-requird">*</span>
+        <span>装卸类型：</span>
+      </div>
+      <div>
+        {{ form.loadType }}
+      </div>
+    </div>
+    <div class="form bd_bottom">
+      <div class="form-label">
+        <span class="form-requird">*</span>
+        <span>件数/托盘数：</span>
+      </div>
+      <div>
+        <input type="text" placeholder="请输入" v-model="form.loadNum" />
+      </div>
+    </div>
+    <div class="form bd_bottom" v-if="mtId">
+      <div class="form-label">
+        <span class="form-requird">*</span>
+        <span>预约日期：</span>
+      </div>
+      <div class="uni-input">
+        <picker @change="selectYYDate" :value="index" :range="yydateList">
+          <!-- <view class="uni-input">{{ array[index] }}</view> -->
+          {{ form.reservationDate ? form.reservationDate : "请选择" }}
+        </picker>
+        <!--           {{form.reservationDate?form.reservationDate:''}} -->
+      </div>
+      <van-icon name="arrow" />
+    </div>
+
+    <div class="bottom-form mt32">
+      <div class="mt-select">
+        <div
+          class="select-item"
+          :style="{
+            background: item.value == mtId ? '#8A0554' : '#f5f7fa',
+            color: item.value == mtId ? 'white' : 'black',
+          }"
+          v-for="item in mtList"
+          @click="getMtId(item)"
+          :key="item.value"
+        >
+          {{ item.label }}
+        </div>
+      </div>
+      <div class="sj-select-title">
+        <div class="sj-label">
+          <span style="color: red">*</span>
+          可选时间
+        </div>
+        <div class="legend">
+          <div class="white-legend"></div>
+          <div>可选</div>
+        </div>
+        <div class="legend">
+          <div class="purple-legend"></div>
+          <div>已占用</div>
+        </div>
+      </div>
+      <div class="sj-select">
+        <div
+          :class="
+            item.statusStr == '已预约'
+              ? 'select-item yyyStatus'
+              : 'select-item '
+          "
+          :key="item.timeEnd"
+          @click="timeSelect(item)"
+          v-for="item in kxTimeList"
+        >
+          {{ item.timeStart }}~{{ item.timeEnd }}
+          <van-icon
+            name="success"
+            v-if="
+              form.dockSettingDetailId == item.dockSettingDetailId &&
+              form.dockSettingId == item.dockSettingId &&
+              form.timeEnd == item.timeEnd &&
+              form.timeStart == item.timeStart
+            "
+          />
+        </div>
+      </div>
+
+      <div class="foot-btn">
+        <van-button color="rgba(0, 0, 0, 0.05)" type="default" class="cancel">
+          取消
+        </van-button>
+        <van-button
+          color="rgba(138, 5, 84, 1)"
+          type="primary"
+          @click="updateReservation()"
+        >
+          提交
+        </van-button>
+      </div>
+      <van-popup :show="gysPopupStatus" position="bottom" bind:close="onClose">
+        <div style="text-align: right">
+          <van-icon @click="closeGysPopup(null)" name="cross" />
+        </div>
+        <div class="popupListBox">
+          <div v-for="item in gysList" class="popupListBox-row">
+            <div>{{ item.label }}</div>
+            <van-button size="mini" type="primary" @click="closeGysPopup(item)">
+              选择
+            </van-button>
+          </div>
+        </div>
+      </van-popup>
+    </div>
+  </div>
+</template>
+  
+  <script>
+import CarNumber from "@/components/codecook-carnumber/codecook-carnumber.vue";
+import {
+  getDockCarType,
+  getCarNoByBizAndUser,
+  getBizByUsername,
+  getHistoryDriverNameByUserId,
+  getDockSelectList,
+  getDockLoadType,
+  getAvailableDateList,
+  getDockTimeList,
+  updateReservation,
+  getHistoryContactPhoneByUserId,
+} from "@/js_sdk/chooseCarApi.js";
+import { getReservationVoById } from "@/js_sdk/sjTools.js";
+
+import { getUserLocalStorageInfo } from "@/js_sdk/localUserInfo.js";
+export default {
+  data() {
+    return {
+      gysPopupStatus: false,
+      formData: {},
+      carNumber: "",
+      gysList: [],
+      form: {},
+      carNumberList: [],
+      dockCarTypeList: [],
+      mtList: [],
+      yydateList: [],
+      mtId: "",
+      kxTimeList: [],
+      nameList: [],
+      telList: [],
+      checkTimeData: {},
+    };
+  },
+  components: {
+    CarNumber,
+  },
+  onLoad(e) {
+    console.log(e);
+    this.getReservationVoById(e.id);
+    this.getHistoryDriverNameByUserId();
+    this.getBizByUsername();
+    this.getDockCarType();
+    this.getHistoryContactPhoneByUserId();
+  },
+  methods: {
+    timeSelect(item) {
+      console.log(item);
+      console.log(item.dockId);
+      console.log(this.checkTimeData.dockId);
+      console.log(
+        item.statusStr == "已预约" &&
+          item.dockSettingDetailId != this.checkTimeData.dockSettingDetailId &&
+          item.dockSettingId != this.checkTimeData.dockSettingId &&
+          item.timeEnd != this.checkTimeData.timeEnd &&
+          item.timeStart != this.checkTimeData.timeStart &&
+          item.dockId != this.checkTimeData.dockId
+      );
+      if (item.statusStr == "已预约") {
+        if (
+          item.dockSettingDetailId == this.checkTimeData.dockSettingDetailId &&
+          item.dockSettingId == this.checkTimeData.dockSettingId &&
+          item.timeEnd == this.checkTimeData.timeEnd &&
+          item.timeStart == this.checkTimeData.timeStart &&
+          item.dockId == this.checkTimeData.dockId
+        ) {
+        } else {
+          this.$showToast("该时段已被预约，请重新选择");
+          return;
+        }
+      }
+      console.log(item);
+      this.form.dockSettingDetailId = item.dockSettingDetailId;
+      this.form.dockSettingId = item.dockSettingId;
+      this.form.timeEnd = item.timeEnd;
+      this.form.dockId = item.dockId;
+      this.form.timeStart = item.timeStart;
+      let form = { ...this.form };
+      this.form = {};
+      this.form = form;
+    },
+    async getAvailableDateList() {
+      let { data } = await getAvailableDateList({ dockId: this.dockId });
+      this.yydateList = data;
+    },
+    async getHistoryContactPhoneByUserId() {
+      let { data } = await getHistoryContactPhoneByUserId({
+        userId: getUserLocalStorageInfo().user.id,
+      });
+      this.telList = data;
+      console.log(data);
+    },
+    selectDriverContactPhone(e) {
+      this.form.driverContactPhone = e;
+      let form = { ...this.form };
+      this.form = {};
+      this.form = form;
+    },
+    async updateReservation() {
+      if (!this.form.bizId) {
+        this.$showToast("请选择供应商");
+        return;
+      }
+      if (!this.carNumber) {
+        this.$showToast("请输入车牌号");
+        return;
+      }
+      if (!this.form.carType) {
+        this.$showToast("请选择车辆类型");
+        return;
+      }
+      if (!this.form.driverName) {
+        this.$showToast("请输入司机姓名");
+        return;
+      }
+      if (!this.form.driverName) {
+        this.$showToast("请输入司机姓名");
+        return;
+      }
+      if (!this.form.driverUsername) {
+        this.$showToast("请输入手机号/账号");
+        return;
+      }
+      if (!this.form.driverContactPhone) {
+        this.$showToast("联系电话");
+        return;
+      }
+
+      let res = await updateReservation({
+        ...this.form,
+        userId: getUserLocalStorageInfo().user.id,
+        driverId: getUserLocalStorageInfo().user.id,
+        carNo: this.carNumber,
+      });
+      if (res.errmsg == "成功") {
+        this.$showToast("预约成功");
+        uni.navigateBack({ delta: 2 });
+      }
+      console.log(res);
+    },
+    async getReservationVoById(id) {
+      let { data } = await getReservationVoById({ id: id });
+      console.log(data);
+      // this.carNumber = data.carNo;
+      this.form.carType = data.carType;
+      this.form.driverName = data.driverName;
+      this.form.bizId = data.bizId;
+      this.form.carType = data.carType;
+      this.form.loadType = data.loadType;
+      this.form.reservationDate = data.reservationDate;
+      this.dockId = data.dockId;
+      this.mtId = data.dockId;
+      this.form.loadType = data.loadType;
+      this.form.driverUsername = data.driverUsername;
+      this.form.loadNum = data.loadNum;
+      this.form.driverContactPhone = data.driverContactPhone;
+      this.form.gysName = data.businessName;
+      this.checkTimeData = {
+        ...{
+          dockSettingDetailId: data.dockSettingDetailId,
+          dockSettingId: data.dockSettingId,
+          timeEnd: data.timeEnd,
+          timeStart: data.timeStart,
+          dockId: data.dockId,
+        },
+      };
+      this.form.dockSettingDetailId = data.dockSettingDetailId;
+      this.form.dockSettingId = data.dockSettingId;
+      this.form.timeEnd = data.timeEnd;
+      this.form.timeStart = data.timeStart;
+      this.$refs.carNum.setCarNumValue(data.carNo);
+      this.getDockSelectList();
+      this.getAvailableDateList();
+      this.getCarNoByBizAndUser();
+      this.getDockTimeList();
+    },
+    async getDockTimeList() {
+      let { data } = await getDockTimeList({
+        dateStr: this.form.reservationDate,
+        dockId: this.mtId,
+        bizId: this.form.bizId,
+      });
+      this.kxTimeList = data;
+    },
+    selectName(item) {
+      this.form.driverName = item;
+      let form = { ...this.form };
+      this.form = {};
+      this.form = form;
+    },
+    async getHistoryDriverNameByUserId() {
+      let { data } = await getHistoryDriverNameByUserId({
+        userId: getUserLocalStorageInfo().user.id,
+      });
+      this.nameList = data;
+    },
+    async selectYYDate({ detail }) {
+      console.log(this.yydateList[detail.value]);
+      this.form.reservationDate = this.yydateList[detail.value];
+      let form = { ...this.form };
+      this.form = {};
+      this.form = form;
+      let { data } = await getDockTimeList({
+        dateStr: this.form.reservationDate,
+        dockId: this.mtId,
+        bizId: this.form.bizId,
+      });
+      this.kxTimeList = data;
+      this.form.dockSettingDetailId = "";
+      this.form.dockSettingId = "";
+      this.form.timeEnd = "";
+      this.form.dockId = "";
+      this.form.timeStart = "";
+    },
+    async getMtId(item) {
+      this.kxTimeList = [];
+      this.form.reservationDate = "";
+      console.log(item);
+      let { data } = await getAvailableDateList({ dockId: item.value });
+      this.mtId = item.value;
+      // this.form.dockId = item.value;
+      this.yydateList = data;
+    },
+    async getDockSelectList() {
+      let { data } = await getDockSelectList({
+        carType: this.form.carType,
+        loadType: this.form.loadType.replace("预约", ""),
+      });
+      this.mtList = data;
+    },
+    selectCarType({ detail }) {
+      console.log(detail);
+      this.form.carType = this.dockCarTypeList[detail.value].label;
+      console.log(this.dockCarTypeList[detail.value]);
+      let form = { ...this.form };
+      this.form = {};
+      this.form = form;
+      this.getDockSelectList();
+    },
+    async getDockCarType() {
+      let { data } = await getDockCarType();
+      this.dockCarTypeList = data;
+      console.log(data);
+    },
+    selectCarNumber(e) {
+      console.log(e);
+      // this.carNumber = "苏B51WK7";
+      // this.$forceUpdate();
+      this.$refs.carNum.setCarNumValue(e);
+      // this.carNumber = e;
+    },
+    oepnGysPopup() {
+      this.gysPopupStatus = true;
+    },
+    async closeGysPopup(item) {
+      console.log(item);
+      this.gysPopupStatus = false;
+      if (item) {
+        console.log(item);
+        this.form.gysName = item.label;
+        this.form.bizId = item.value;
+        let { data } = await getCarNoByBizAndUser({
+          bizId: item.value,
+          userId: getUserLocalStorageInfo().user.id,
+        });
+        console.log(data);
+        this.carNumberList = data;
+      }
+    },
+    async getCarNoByBizAndUser() {
+      let { data } = await getCarNoByBizAndUser({
+        bizId: this.form.bizId,
+        userId: getUserLocalStorageInfo().user.id,
+      });
+      console.log(data);
+      this.carNumberList = data;
+    },
+    async getBizByUsername() {
+      let { data } = await getBizByUsername({
+        username: getUserLocalStorageInfo().user.username,
+      });
+      console.log(data);
+      this.gysList = data;
+    },
+  },
+};
+</script>
+  
+  <style lang="scss">
+.edityy {
+  .yyyStatus {
+    background: #8e8be4 !important;
+    color: white;
+  }
+  .popupListBox {
+    height: 800rpx;
+    padding: 20rpx;
+    box-sizing: border-box;
+    .popupListBox-row {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+    }
+  }
+  .status {
+    width: 144rpx;
+    height: 56rpx;
+    text-align: center;
+    line-height: 56rpx;
+    border-top-right-radius: 5%;
+    border-bottom-left-radius: 50%;
+    position: absolute;
+    top: -1rpx;
+    right: 0;
+    font-weight: 400;
+    font-size: 28rpx;
+  }
+  .sj-select {
+    display: flex;
+    flex-wrap: wrap;
+    margin-top: 32rpx;
+    .select-item {
+      text-align: center;
+      line-height: 80rpx;
+      width: 225rpx;
+      height: 80rpx;
+      background: rgba(255, 255, 255, 1);
+      border-radius: 0rpx 0rpx 0rpx 0rpx;
+      border: 2rpx solid #eaeff6;
+    }
+    .iselected {
+      background: #ededed;
+    }
+    .isuse {
+      background: rgba(142, 139, 228, 1);
+    }
+  }
+  .sj-select-title {
+    display: flex;
+    align-items: center;
+    .legend {
+      display: flex;
+      align-items: center;
+      margin-right: 32rpx;
+    }
+    .sj-label {
+      margin-right: 64rpx;
+    }
+    .white-legend {
+      margin-right: 16rpx;
+      width: 28rpx;
+      height: 28rpx;
+      background: #ffffff;
+      border-radius: 0rpx 0rpx 0rpx 0rpx;
+      border: 2rpx solid #e9e9e9;
+    }
+    .purple-legend {
+      margin-right: 16rpx;
+      width: 28rpx;
+      height: 28rpx;
+      background: #8e8be4;
+      border-radius: 0rpx 0rpx 0rpx 0rpx;
+    }
+  }
+  .qd {
+    background: rgba(3, 101, 249, 0.2);
+    color: #0365f9;
+  }
+  .rc {
+    background: rgba(255, 184, 0, 0.3);
+    color: #d99f00;
+  }
+  .zx {
+    background: rgba(138, 5, 84, 0.2);
+    color: #8a0554;
+  }
+  .wc {
+    background: rgba(34, 181, 101, 0.2);
+    color: #22b565;
+  }
+  .gq {
+    color: #c7191f;
+    background: rgba(199, 25, 31, 0.2);
+  }
+  .qx {
+    color: #888888;
+    background: rgba(136, 136, 136, 0.3);
+  }
+  .foot-btn {
+    margin-top: 32rpx;
+    margin-bottom: 32rpx;
+    display: flex;
+    justify-content: space-around;
+    .cancel {
+      button {
+        color: rgba(138, 5, 84, 1) !important;
+      }
+    }
+  }
+  .form-value {
+    width: 435rpx;
+    input {
+      width: 100%;
+    }
+  }
+  .sj-select {
+    display: flex;
+    flex-wrap: wrap;
+    margin-top: 32rpx;
+    .select-item {
+      text-align: center;
+      line-height: 80rpx;
+      width: 225rpx;
+      height: 80rpx;
+      background: rgba(255, 255, 255, 1);
+      border-radius: 0rpx 0rpx 0rpx 0rpx;
+      border: 2rpx solid #eaeff6;
+    }
+    .iselected {
+      background: #ededed;
+    }
+    .isuse {
+      background: rgba(142, 139, 228, 1);
+    }
+  }
+  .sj-select-title {
+    display: flex;
+    align-items: center;
+    .legend {
+      display: flex;
+      align-items: center;
+      margin-right: 32rpx;
+    }
+    .sj-label {
+      margin-right: 64rpx;
+    }
+    .white-legend {
+      margin-right: 16rpx;
+      width: 28rpx;
+      height: 28rpx;
+      background: #ffffff;
+      border-radius: 0rpx 0rpx 0rpx 0rpx;
+      border: 2rpx solid #e9e9e9;
+    }
+    .purple-legend {
+      margin-right: 16rpx;
+      width: 28rpx;
+      height: 28rpx;
+      background: #8e8be4;
+      border-radius: 0rpx 0rpx 0rpx 0rpx;
+    }
+  }
+  .bottom-form {
+    background: #ffffff;
+    padding: 32rpx;
+    box-sizing: border-box;
+    .mt-select {
+      display: flex;
+      flex-wrap: wrap;
+      .select-item {
+        border-radius: 8rpx 8rpx 8rpx 8rpx;
+        padding: 12rpx 30rpx;
+        margin-left: 5rpx;
+        margin-right: 5rpx;
+        margin-bottom: 32rpx;
+        background: rgba(245, 247, 250, 1);
+      }
+    }
+  }
+  .historyList {
+    display: flex;
+    justify-content: flex-start;
+    flex-wrap: wrap;
+    .historyList-item {
+      padding: 10rpx 15rpx;
+      display: flex;
+      text-align: center;
+      font-weight: 400;
+      color: #666666;
+      background: #f5f7fa;
+      border-radius: 8rpx 8rpx 8rpx 8rpx;
+      margin-left: 5rpx;
+      margin-right: 5rpx;
+      .btn {
+        margin-left: 15rpx;
+      }
+    }
+  }
+
+  .form {
+    padding: 32rpx 32rpx;
+    display: flex;
+    background: #ffffff;
+    min-height: 112rpx;
+    align-items: center;
+    box-sizing: border-box;
+    .form-label {
+      font-weight: 400;
+      font-size: 32rpx;
+      color: #333333;
+      margin-right: 64rpx;
+      .form-requird {
+        color: red;
+      }
+    }
+  }
+  .pdt32 {
+    padding-top: 32rpx;
+  }
+  .pdb32 {
+    padding-bottom: 32rpx;
+  }
+  .mb32 {
+    margin-bottom: 32rpx;
+  }
+  .mt32 {
+    margin-top: 32rpx;
+  }
+  .bd_bottom {
+    border-bottom: 2rpx #e6e6e6 solid;
+  }
+}
+</style>

pages/subPackages/sj_history/index.vue

@@ -0,0 +1,205 @@
+<template>
+  <div class="sj_history">
+    <van-tabs :active="active" color="rgba(138, 5, 84, 1)" @change="onChange">
+      <van-tab title="待签到"></van-tab>
+      <van-tab title="待入场"></van-tab>
+      <van-tab title="装卸中"></van-tab>
+      <van-tab title="已完成"></van-tab>
+      <van-tab title="已过期"></van-tab>
+      <van-tab title="已取消"></van-tab>
+      <van-tab title="全部"></van-tab>
+    </van-tabs>
+    <div class="list">
+      <div class="list-item" v-for="item in list" :key="item.id">
+        <div class="status qd" v-if="item.status == 0">待签到</div>
+        <div class="status rz" v-if="item.status == 1">待入厂</div>
+        <div class="status zx" v-if="item.status == 2">装卸中</div>
+        <div class="status wc" v-if="item.status == 3">已完成</div>
+        <div class="status gq" v-if="item.status == 4">已过期</div>
+        <div class="status qx" v-if="item.status == 5">已取消</div>
+
+        <div
+          class="time"
+          @click="jumpPage('/pages/subPackages/sj_history/edit?id=' + item.id)"
+        >
+          {{ item.reservationDate }}
+          {{ item.timeStart + "~" + item.timeEnd }} 装货
+        </div>
+        <div class="info">{{ item.loadNum }}个托盘</div>
+        <div class="info1">车辆：{{ item.carNo }}/{{ item.carType }}</div>
+        <div class="info1">司机：{{ item.driverName }}</div>
+        <div v-if="item.status == 5" class="info1 qxrq">
+          取消日期：2024-07-31 15：00
+        </div>
+
+        <div class="bottborder"></div>
+        <div class="foot-btn">
+          <van-button
+            color="rgba(138, 5, 84, 1)"
+            plain
+            type="default"
+            size="small"
+            @click="cancelRow(item)"
+            >取消</van-button
+          >
+          <van-button
+            style="margin-left: 24rpx"
+            color="rgba(138, 5, 84, 1)"
+            type="default"
+            size="small"
+            @click="
+              jumpPage('/pages/subPackages/sj_history/edit?id=' + item.id)
+            "
+            >修改</van-button
+          >
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { reservationListPage } from "@/js_sdk/sjTools.js";
+import { getUserLocalStorageInfo } from "@/js_sdk/localUserInfo.js";
+
+export default {
+  data() {
+    return {
+      searchData: {
+        pageNum: 1,
+        pageSize: 10,
+        status: 0,
+      },
+      total: 0,
+      list: [],
+    };
+  },
+  onLoad() {
+    console.log(getUserLocalStorageInfo().user.id);
+    this.searchData.userId = getUserLocalStorageInfo().user.id;
+
+    this.reservationListPage();
+  },
+  onReachBottom() {
+    // 触底加载更多
+    this.searchData.pageNum += 1;
+    this.reservationListPage();
+  },
+  methods: {
+    cancelRow(e) {
+      console.log(e);
+    },
+    onChange(e) {
+      console.log(e);
+      this.list = [];
+      let statusList = {
+        0: 0,
+        1: 1,
+        2: 2,
+        3: 3,
+        4: 4,
+        5: 5,
+        6: null,
+      };
+      this.searchData.status = statusList[e.detail.index];
+      this.reservationListPage();
+    },
+    async reservationListPage() {
+      let { data } = await reservationListPage(this.searchData);
+      console.log(data);
+      if (this.list.length != data.total) {
+        this.list.push(...data.list);
+      }
+    },
+    jumpPage(path) {
+      console.log(path);
+      uni.navigateTo({
+        url: path,
+        fail: (fail) => {},
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+.sj_history {
+  .list {
+    .list-item {
+      padding: 24rpx 32rpx;
+      background: #ffffff;
+      position: relative;
+      margin-top: 24rpx;
+      .foot-btn {
+        display: flex;
+        justify-content: flex-end;
+        padding-top: 16rpx;
+        .van-button {
+          border-radius: 30rpx 30rpx 30rpx 30rpx;
+        }
+      }
+      .bottborder {
+        padding-bottom: 24rpx;
+        border-bottom: 2rpx solid #e8edf5;
+      }
+      .info {
+        font-weight: 400;
+        font-size: 28rpx;
+        color: #333333;
+      }
+      .info1 {
+        margin-top: 8rpx;
+        font-weight: 400;
+        font-size: 28rpx;
+        color: #666666;
+      }
+      .qxrq {
+        color: rgba(142, 139, 228, 1);
+      }
+      .time {
+        font-weight: 400;
+        font-size: 32rpx;
+        color: #333333;
+        margin-bottom: 8rpx;
+      }
+      .status {
+        width: 144rpx;
+        height: 56rpx;
+        text-align: center;
+        line-height: 56rpx;
+        border-top-right-radius: 5%;
+        border-bottom-left-radius: 50%;
+        position: absolute;
+        top: -1rpx;
+        right: 0;
+        font-weight: 400;
+        font-size: 28rpx;
+      }
+      .qd {
+        background: rgba(3, 101, 249, 0.2);
+        color: #0365f9;
+      }
+      .rc {
+        background: rgba(255, 184, 0, 0.3);
+        color: #d99f00;
+      }
+      .zx {
+        background: rgba(138, 5, 84, 0.2);
+        color: #8a0554;
+      }
+      .wc {
+        background: rgba(34, 181, 101, 0.2);
+        color: #22b565;
+      }
+      .gq {
+        color: #c7191f;
+        background: rgba(199, 25, 31, 0.2);
+      }
+      .qx {
+        color: #888888;
+        background: rgba(136, 136, 136, 0.3);
+      }
+    }
+  }
+}
+</style>

pages/subPackages/sj_yy/index.vue

@@ -93,7 +93,7 @@
         </div>
       </div>
       <div class="historyList">
-        <!-- <div class="historyList-item mt32">
+        <!-- <div  class="historyList-item mt32">
           <div>13921516068</div>
           <div class="btn">
             <van-icon name="clear" color="rgba(138, 5, 84, 1)" />
@@ -117,12 +117,16 @@
         </div>
       </div>
       <div class="historyList">
-        <!-- <div class="historyList-item mt32">
-          <div>13921516068</div>
+        <div
+          @click="selectDriverContactPhone(item)"
+          class="historyList-item mt32"
+          v-for="item in telList"
+        >
+          <div>{{ item }}</div>
           <div class="btn">
             <van-icon name="clear" color="rgba(138, 5, 84, 1)" />
           </div>
-        </div> -->
+        </div>
       </div>
     </div>
     <div class="form bd_bottom mt32">
@@ -251,6 +255,7 @@ import {
   getAvailableDateList,
   getDockTimeList,
   submitReservation,
+  getHistoryContactPhoneByUserId,
 } from "@/js_sdk/chooseCarApi.js";
 import { getUserLocalStorageInfo } from "@/js_sdk/localUserInfo.js";
 
@@ -260,6 +265,7 @@ export default {
       gysPopupStatus: false,
       formData: {},
       carNumber: "",
+      telList: [],
       gysList: [],
       form: {},
       carNumberList: [],
@@ -278,47 +284,73 @@ export default {
     console.log(e);
     // demo();
     let data = { ...e };
-    this.getDockCarType();
-    this.getBizByUsername();
+
+    console.log(data.zxtype.replace("预约", ""));
     this.form.loadType = data.zxtype.replace("预约", "");
     this.form.carType = data.carTypeLabel;
     this.form.driverUsername = getUserLocalStorageInfo().user.username;
+    this.getDockCarType();
+    this.getBizByUsername();
+
     this.getDockSelectList();
     this.getHistoryDriverNameByUserId();
     this.getDockLoadType();
+    this.getHistoryContactPhoneByUserId();
   },
   methods: {
+    selectDriverContactPhone(e) {
+      this.form.driverContactPhone = e;
+      let form = { ...this.form };
+      this.form = {};
+      this.form = form;
+    },
+    async getHistoryContactPhoneByUserId() {
+      let { data } = await getHistoryContactPhoneByUserId({
+        userId: getUserLocalStorageInfo().user.id,
+      });
+      this.telList = data;
+      console.log(data);
+    },
     async submitReservation() {
       if (!this.form.bizId) {
         this.$showToast("请选择供应商");
+        return;
       }
       if (!this.carNumber) {
         this.$showToast("请输入车牌号");
+        return;
       }
       if (!this.form.carType) {
         this.$showToast("请选择车辆类型");
+        return;
       }
       if (!this.form.driverName) {
         this.$showToast("请输入司机姓名");
+        return;
       }
       if (!this.form.driverName) {
         this.$showToast("请输入司机姓名");
+        return;
       }
       if (!this.form.driverUsername) {
         this.$showToast("请输入手机号/账号");
+        return;
       }
       if (!this.form.driverContactPhone) {
         this.$showToast("联系电话");
+        return;
       }
 
       let res = await submitReservation({
         ...this.form,
         userId: getUserLocalStorageInfo().user.id,
-        driverUsername: getUserLocalStorageInfo().user.trueName,
         driverId: getUserLocalStorageInfo().user.id,
         carNo: this.carNumber,
       });
-
+      if (res.errmsg == "成功") {
+        this.$showToast("预约成功");
+        uni.navigateBack({ delta: 2 });
+      }
       console.log(res);
     },
     timeSelect(item) {

unpackage/dist/build/mp-weixin/app.json

@@ -1,7 +1,6 @@
 {
   "pages": [
-    "pages/gocompnay/index",
-    "pages/downloadfile/index",
+    "pages/chooseIdentity/index",
     "pages/login/login",
     "pages/index/index",
     "pages/mine/mine"
@@ -10,57 +9,18 @@
     {
       "root": "pages/subPackages",
       "pages": [
-        "bigscreen/bigscreen",
-        "meetingroom/meetingroom",
-        "venueRoom/meetingroom",
-        "parkActivities/index",
-        "parkActivities/style",
-        "announcement/index",
-        "announcement/detail",
-        "parkActivities/detail",
-        "addZaiti/index",
-        "activity/index",
-        "activity/code",
-        "password/index",
-        "buildmap/index",
-        "secureselfplan/addplan",
-        "secureselfplan/index",
-        "repairDispatch-app/detail",
-        "repairDispatch-app/index",
-        "repairDispatch-serve/detail",
-        "repairDispatch-serve/index",
-        "repairDispatch-app/add",
-        "repairprocessing-app/detail",
-        "repairprocessing-app/index",
-        "modifySend/index",
-        "modifyReport/index",
-        "modifyReport/detail",
-        "modifyHandle/handle",
-        "modifySend/confirm",
-        "modifyHandle/index",
-        "modifyReport/add",
-        "secureselftest/report",
-        "toread/index",
-        "todo/index",
-        "secureselftest/index",
-        "secureselftest2/index",
-        "venueRoom/confirm",
-        "meetingroom/confirm",
-        "venueRoom/audit",
-        "meetingroom/audit",
-        "merchants/merchants",
-        "merchants/components/mymechantsdetails",
-        "chooseCompanyTags/index",
-        "companyTagsDelete/index",
-        "housedetails/housedetails",
-        "addintention/addintention",
-        "chosseHouse/chosseHouse",
-        "companyreport/components/reportDetails",
-        "companyreport/companyreport",
-        "companyHouse/companyHouse",
-        "companyDetails/companyDetails",
-        "addCompany/addCompany",
-        "companyDetailsEdit/companyDetailsEdit"
+        "carmange/add",
+        "carmange/index",
+        "yy_history/code",
+        "yy_history/edit",
+        "sj_history/edit",
+        "yy_history/index",
+        "sj_history/index",
+        "sj_yy/index",
+        "qy_yy/index",
+        "choosecar/index",
+        "phoneRegister/index",
+        "password/index"
       ],
       "network": "all"
     }

unpackage/dist/build/mp-weixin/components/codecook-carnumber/codecook-carnumber.json

@@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+    "key-board": "/components/codecook-keyboard/codecook-keyboard"
+  }
+}

unpackage/dist/build/mp-weixin/components/zaiti-tree/index.json

@@ -1,4 +0,0 @@
-{
-  "component": true,
-  "usingComponents": {}
-}

unpackage/dist/build/mp-weixin/pages/chooseIdentity/index.json

@@ -0,0 +1,12 @@
+{
+  "navigationStyle": "custom",
+  "navigationBarTitleText": "选择身份",
+  "usingComponents": {
+    "van-button": "/wxcomponents/weapp/dist/button/index",
+    "van-toast": "/wxcomponents/weapp/dist/toast/index",
+    "van-field": "/wxcomponents/weapp/dist/field/index",
+    "van-popup": "/wxcomponents/weapp/dist/popup/index",
+    "van-picker": "/wxcomponents/weapp/dist/picker/index",
+    "van-dialog": "/wxcomponents/weapp/dist/dialog/index"
+  }
+}

unpackage/dist/build/mp-weixin/pages/downloadfile/index.json

@@ -1,7 +0,0 @@
-{
-  "navigationBarTitleText": "企业端",
-  "enablePullDownRefresh": true,
-  "onReachBottomDistance": 100,
-  "component": true,
-  "usingComponents": {}
-}

unpackage/dist/build/mp-weixin/pages/downloadfile/index.wxml

@@ -1 +0,0 @@
-<view class="_div"></view>

unpackage/dist/build/mp-weixin/pages/gocompnay/index.json

@@ -1,7 +0,0 @@
-{
-  "navigationBarTitleText": "企业端",
-  "enablePullDownRefresh": true,
-  "onReachBottomDistance": 100,
-  "component": true,
-  "usingComponents": {}
-}

unpackage/dist/build/mp-weixin/pages/gocompnay/index.wxml

@@ -1 +0,0 @@
-<web-view src="https://hswkxc.idea-sf.com/mnpH5#/"></web-view>

unpackage/dist/build/mp-weixin/pages/mine/mine.json

@@ -1,4 +1,5 @@
 {
+  "navigationStyle": "custom",
   "navigationBarTitleText": "我的",
   "usingComponents": {
     "van-button": "/wxcomponents/weapp/dist/button/index",

unpackage/dist/build/mp-weixin/pages/subPackages/activity/apply-popup.json

@@ -1,7 +0,0 @@
-{
-  "component": true,
-  "usingComponents": {
-    "van-popup": "/wxcomponents/weapp/dist/popup/index",
-    "van-field": "/wxcomponents/weapp/dist/field/index"
-  }
-}

unpackage/dist/build/mp-weixin/pages/subPackages/activity/code.json

@@ -1,20 +0,0 @@
-{
-  "navigationBarTitleText": "活动核销扫码确认签到",
-  "enablePullDownRefresh": true,
-  "onReachBottomDistance": 100,
-  "component": true,
-  "usingComponents": {
-    "van-radio": "/wxcomponents/weapp/dist/radio/index",
-    "van-radio-group": "/wxcomponents/weapp/dist/radio-group/index",
-    "van-empty": "/wxcomponents/weapp/dist/empty/index",
-    "van-button": "/wxcomponents/weapp/dist/button/index",
-    "van-toast": "/wxcomponents/weapp/dist/toast/index",
-    "van-field": "/wxcomponents/weapp/dist/field/index",
-    "van-popup": "/wxcomponents/weapp/dist/popup/index",
-    "van-picker": "/wxcomponents/weapp/dist/picker/index",
-    "van-dialog": "/wxcomponents/weapp/dist/dialog/index",
-    "van-icon": "/wxcomponents/weapp/dist/icon/index",
-    "van-tab": "/wxcomponents/weapp/dist/tab/index",
-    "van-tabs": "/wxcomponents/weapp/dist/tabs/index"
-  }
-}

unpackage/dist/build/mp-weixin/pages/subPackages/activity/code.wxml

@@ -1 +0,0 @@
-<view class="_div"></view>

unpackage/dist/build/mp-weixin/pages/subPackages/activity/index.json

@@ -1,22 +0,0 @@
-{
-  "navigationBarTitleText": "活动核销签到",
-  "enablePullDownRefresh": true,
-  "onReachBottomDistance": 100,
-  "component": true,
-  "usingComponents": {
-    "van-radio": "/wxcomponents/weapp/dist/radio/index",
-    "van-radio-group": "/wxcomponents/weapp/dist/radio-group/index",
-    "van-empty": "/wxcomponents/weapp/dist/empty/index",
-    "van-button": "/wxcomponents/weapp/dist/button/index",
-    "van-toast": "/wxcomponents/weapp/dist/toast/index",
-    "van-field": "/wxcomponents/weapp/dist/field/index",
-    "van-popup": "/wxcomponents/weapp/dist/popup/index",
-    "van-picker": "/wxcomponents/weapp/dist/picker/index",
-    "van-dialog": "/wxcomponents/weapp/dist/dialog/index",
-    "van-icon": "/wxcomponents/weapp/dist/icon/index",
-    "van-tab": "/wxcomponents/weapp/dist/tab/index",
-    "van-tabs": "/wxcomponents/weapp/dist/tabs/index",
-    "tel-num": "/pages/subPackages/components/tel-number/index",
-    "apply-popup": "/pages/subPackages/activity/apply-popup"
-  }
-}

unpackage/dist/build/mp-weixin/pages/subPackages/addCompany/addCompany.json

@@ -1,25 +0,0 @@
-{
-  "navigationBarTitleText": "添加企业",
-  "enablePullDownRefresh": true,
-  "onReachBottomDistance": 100,
-  "component": true,
-  "usingComponents": {
-    "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons",
-    "uni-file-picker": "/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker",
-    "van-button": "/wxcomponents/weapp/dist/button/index",
-    "van-toast": "/wxcomponents/weapp/dist/toast/index",
-    "van-field": "/wxcomponents/weapp/dist/field/index",
-    "van-popup": "/wxcomponents/weapp/dist/popup/index",
-    "van-picker": "/wxcomponents/weapp/dist/picker/index",
-    "van-dialog": "/wxcomponents/weapp/dist/dialog/index",
-    "van-icon": "/wxcomponents/weapp/dist/icon/index",
-    "van-tab": "/wxcomponents/weapp/dist/tab/index",
-    "van-tabs": "/wxcomponents/weapp/dist/tabs/index",
-    "van-datetime-picker": "/wxcomponents/weapp/dist/datetime-picker/index",
-    "van-uploader": "/wxcomponents/weapp/dist/uploader/index",
-    "van-checkbox": "/wxcomponents/weapp/dist/checkbox/index",
-    "van-checkbox-group": "/wxcomponents/weapp/dist/checkbox-group/index",
-    "multiple-select": "/pages/subPackages/addCompany/momo-multipleSelect",
-    "tki-tree": "/pages/subPackages/components/tkitree/tkitree"
-  }
-}

unpackage/dist/build/mp-weixin/pages/subPackages/addCompany/isSelectedTags.json

@@ -1,7 +0,0 @@
-{
-  "component": true,
-  "usingComponents": {
-    "van-popup": "/wxcomponents/weapp/dist/popup/index",
-    "van-datetime-picker": "/wxcomponents/weapp/dist/datetime-picker/index"
-  }
-}

unpackage/dist/build/mp-weixin/pages/subPackages/addCompany/momo-multipleSelect.json

@@ -1,8 +0,0 @@
-{
-  "component": true,
-  "usingComponents": {
-    "uni-easyinput": "/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput",
-    "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons",
-    "is-selected-tags": "/pages/subPackages/addCompany/isSelectedTags"
-  }
-}

unpackage/dist/build/mp-weixin/pages/subPackages/addintention/addintention.json

@@ -1,25 +0,0 @@
-{
-  "navigationBarTitleText": "新增意向",
-  "enablePullDownRefresh": true,
-  "onReachBottomDistance": 100,
-  "component": true,
-  "usingComponents": {
-    "uni-forms": "/uni_modules/uni-forms/components/uni-forms/uni-forms",
-    "uni-forms-item": "/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item",
-    "uni-easyinput": "/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput",
-    "uni-data-checkbox": "/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox",
-    "van-button": "/wxcomponents/weapp/dist/button/index",
-    "van-toast": "/wxcomponents/weapp/dist/toast/index",
-    "van-field": "/wxcomponents/weapp/dist/field/index",
-    "van-popup": "/wxcomponents/weapp/dist/popup/index",
-    "van-picker": "/wxcomponents/weapp/dist/picker/index",
-    "van-dialog": "/wxcomponents/weapp/dist/dialog/index",
-    "van-icon": "/wxcomponents/weapp/dist/icon/index",
-    "van-tab": "/wxcomponents/weapp/dist/tab/index",
-    "van-tabs": "/wxcomponents/weapp/dist/tabs/index",
-    "van-datetime-picker": "/wxcomponents/weapp/dist/datetime-picker/index",
-    "van-uploader": "/wxcomponents/weapp/dist/uploader/index",
-    "choose-time": "/pages/subPackages/addintention/chooseTime",
-    "vant-uploader": "/wxcomponents/weapp/dist/uploader/index"
-  }
-}

unpackage/dist/build/mp-weixin/pages/subPackages/addintention/chooseTime.json

@@ -1,7 +0,0 @@
-{
-  "component": true,
-  "usingComponents": {
-    "van-popup": "/wxcomponents/weapp/dist/popup/index",
-    "van-datetime-picker": "/wxcomponents/weapp/dist/datetime-picker/index"
-  }
-}

unpackage/dist/build/mp-weixin/pages/subPackages/announcement/detail.json

@@ -1,20 +0,0 @@
-{
-  "navigationBarTitleText": "通知公告详情",
-  "enablePullDownRefresh": true,
-  "onReachBottomDistance": 100,
-  "component": true,
-  "usingComponents": {
-    "van-radio": "/wxcomponents/weapp/dist/radio/index",
-    "van-radio-group": "/wxcomponents/weapp/dist/radio-group/index",
-    "van-empty": "/wxcomponents/weapp/dist/empty/index",
-    "van-button": "/wxcomponents/weapp/dist/button/index",
-    "van-toast": "/wxcomponents/weapp/dist/toast/index",
-    "van-field": "/wxcomponents/weapp/dist/field/index",
-    "van-popup": "/wxcomponents/weapp/dist/popup/index",
-    "van-picker": "/wxcomponents/weapp/dist/picker/index",
-    "van-dialog": "/wxcomponents/weapp/dist/dialog/index",
-    "van-icon": "/wxcomponents/weapp/dist/icon/index",
-    "van-tab": "/wxcomponents/weapp/dist/tab/index",
-    "van-tabs": "/wxcomponents/weapp/dist/tabs/index"
-  }
-}

unpackage/dist/build/mp-weixin/pages/subPackages/announcement/index.json

@@ -1,20 +0,0 @@
-{
-  "navigationBarTitleText": "通知公告",
-  "enablePullDownRefresh": true,
-  "onReachBottomDistance": 100,
-  "component": true,
-  "usingComponents": {
-    "van-radio": "/wxcomponents/weapp/dist/radio/index",
-    "van-radio-group": "/wxcomponents/weapp/dist/radio-group/index",
-    "van-empty": "/wxcomponents/weapp/dist/empty/index",
-    "van-button": "/wxcomponents/weapp/dist/button/index",
-    "van-toast": "/wxcomponents/weapp/dist/toast/index",
-    "van-field": "/wxcomponents/weapp/dist/field/index",
-    "van-popup": "/wxcomponents/weapp/dist/popup/index",
-    "van-picker": "/wxcomponents/weapp/dist/picker/index",
-    "van-dialog": "/wxcomponents/weapp/dist/dialog/index",
-    "van-icon": "/wxcomponents/weapp/dist/icon/index",
-    "van-tab": "/wxcomponents/weapp/dist/tab/index",
-    "van-tabs": "/wxcomponents/weapp/dist/tabs/index"
-  }
-}

unpackage/dist/build/mp-weixin/pages/subPackages/bigscreen/bigscreen.json

@@ -1,7 +0,0 @@
-{
-  "navigationBarTitleText": "可视化大屏",
-  "enablePullDownRefresh": true,
-  "onReachBottomDistance": 100,
-  "component": true,
-  "usingComponents": {}
-}

unpackage/dist/build/mp-weixin/pages/subPackages/bigscreen/bigscreen.wxml

@@ -1 +0,0 @@
-<web-view src="https://www.wxsscsmartpark.com/webclient/?appliId=1250511444412203008&codeRate=10000&frameRate=60&language=zh-CN"></web-view>

unpackage/dist/build/mp-weixin/pages/subPackages/buildmap/index.json

@@ -1,23 +0,0 @@
-{
-  "navigationBarTitleText": "党建地图",
-  "enablePullDownRefresh": true,
-  "onReachBottomDistance": 100,
-  "component": true,
-  "usingComponents": {
-    "uni-search-bar": "/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar",
-    "liu-easy-map": "/uni_modules/liu-easy-map/components/liu-easy-map/liu-easy-map",
-    "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons",
-    "lys-date": "/uni_modules/lys-date/components/lys-date/lys-date",
-    "van-empty": "/wxcomponents/weapp/dist/empty/index",
-    "van-button": "/wxcomponents/weapp/dist/button/index",
-    "van-toast": "/wxcomponents/weapp/dist/toast/index",
-    "van-field": "/wxcomponents/weapp/dist/field/index",
-    "van-popup": "/wxcomponents/weapp/dist/popup/index",
-    "van-picker": "/wxcomponents/weapp/dist/picker/index",
-    "van-dialog": "/wxcomponents/weapp/dist/dialog/index",
-    "van-icon": "/wxcomponents/weapp/dist/icon/index",
-    "van-tab": "/wxcomponents/weapp/dist/tab/index",
-    "van-tabs": "/wxcomponents/weapp/dist/tabs/index",
-    "van-uploader": "/wxcomponents/weapp/dist/uploader/index"
-  }
-}