diff --git a/app.js b/app.js
index c6003c6..76bd9bb 100644
--- a/app.js
+++ b/app.js
@@ -1,8 +1,8 @@
 App({
 	globalData: {
 		userInfo: null,
-		// ip: 'http://bl7.matripe.com.cn:8001',
-		ip: "https://daotian.matripe.com.cn",
+		ip: 'https://test.renminshitang.com.cn/daotian/api_dev',
+		// ip: "https://daotian.matripe.com.cn",
 		// ip: 'http://localhost:8001',
 		sessionId: "",
 		header: {
@@ -271,7 +271,8 @@ App({
 					// that.globalData.user.idauth = 0;
 					that.globalData.sessionId = res.data.data.sessionId;
 					that.globalData.headers.Cookie = "JSESSIONID=" + res.data.data.sessionId;
-					that.globalData.headers2.Cookie = "JSESSIONID=" + res.data.data.sessionId;
+          that.globalData.headers2.Cookie = "JSESSIONID=" + res.data.data.sessionId;
+          that.globalData.header.Authorization = "Bearer " + res.data.data.token;
 					that.globalData.headers.Authorization = "Bearer " + res.data.data.token;
 					that.globalData.headers2.Authorization = "Bearer " + res.data.data.token;
 
diff --git a/components/bottom-drawer/index.js b/components/bottom-drawer/index.js
index 4be5856..072ab4a 100644
--- a/components/bottom-drawer/index.js
+++ b/components/bottom-drawer/index.js
@@ -1,6 +1,15 @@
+const app = getApp();
+const mydate = new Date();
+var dateUtil = require("../../utils/dateUtil.js");
+var dateTimePicker = require("../../utils/dateTimePicker.js");
 Component({
   data: {
+    dateTime: "",
+    currentTime: dateUtil.formatDateYMD(mydate.toLocaleDateString()),
+    copyTime: dateUtil.formatDateYMD(mydate.toLocaleDateString()),
     sex: 1,
+    ageArray: [],
+    ageIndex: -1,
     morePeople: false,
     recordList: [
       {
@@ -73,9 +82,187 @@ Component({
       type: Boolean,
       value: true
     },
+    info: {
+      type: Object,
+      value: {},
+    }
+
+  },
+  ready () {
+    let that = this;
+    console.log(this.data.info);
+    for (let i = 16; i < 70; i++) {
+      that.data.ageArray.push(i);
+    }
+    this.setData({
+      ageArray: that.data.ageArray
+    })
+
+    let hour = new Date().getHours();
+    if (hour < 20 && hour >= 6) {
+      if (that.data.currentTime == that.data.copyTime) {
+        that.data.currentTime = that.data.currentTime + " " + (hour + 1) + ":00";
+      }
+    } else if (hour >= 20) {
+      if (that.data.currentTime == that.data.copyTime) {
+        that.data.currentTime = that.data.currentTime + " " + "19:30";
+      }
+    } else if (hour < 6) {
+      if (that.data.currentTime == that.data.copyTime) {
+        that.data.currentTime = that.data.currentTime + " " + "6:00";
+      }
+    }
+    this.setData({
+      currentTime: that.data.currentTime,
+    });
+    var obj = dateTimePicker.dateTimePicker(this.data.startYear, this.data.endYear, this.data.currentTime);
+    console.log(obj);
+    console.log(obj.dateTimeArray);
+    for (let index = 0; index < obj.dateTimeArray[0].length; index++) {
+      obj.dateTimeArray[0][index] = obj.dateTimeArray[0][index] + "年";
+    }
+    for (let index = 0; index < obj.dateTimeArray[1].length; index++) {
+      obj.dateTimeArray[1][index] = obj.dateTimeArray[1][index] + "月";
+    }
+    for (let index = 0; index < obj.dateTimeArray[2].length; index++) {
+      obj.dateTimeArray[2][index] = obj.dateTimeArray[2][index] + "日";
+    }
 
+    this.setData({
+      dateTimeArray: obj.dateTimeArray,
+      dateTime: obj.dateTime,
+    });
   },
   methods: {
+    changeDateTime (e) {
+      var dateTimeArray = this.data.dateTimeArray,
+        dateTime = e.detail.value;
+      this.setData({
+        // dateTime: e.detail.value,
+        currentTime: dateTimeArray[0][dateTime[0]].replace("年", "") + "-" + dateTimeArray[1][dateTime[1]].replace("月", "") + "-" + dateTimeArray[2][dateTime[2]].replace("日", "") + " " + dateTimeArray[3][dateTime[3]],
+      });
+    },
+  
+    changeDateTimeColumn (e) {
+      console.log(e);
+      console.log(e.detail.value);
+      console.log(e.detail.column);
+      var arr = this.data.dateTime,
+        dateArr = this.data.dateTimeArray;
+      console.log(arr);
+      console.log(dateArr);
+
+
+      arr[e.detail.column] = e.detail.value;
+      console.log(dateArr[0][arr[0]], dateArr[1][arr[1]]);
+  
+      dateArr[2] = dateTimePicker.getMonthDay(dateArr[0][arr[0]], dateArr[1][arr[1]]);
+      for (let index = 0; index < dateArr[2].length; index++) {
+        dateArr[2][index] = dateArr[2][index] + "日";
+      }
+      // .replace("年",'').replace("月",'').replace("日",'')
+      this.setData({
+        dateTimeArray: dateArr,
+        dateTime: arr,
+      });
+    },
+  
+    bindPickerChangeAge (e) {
+      this.setData({
+        ageIndex: e.detail.value,
+        ["userInfo.age"]: parseInt(e.detail.value) + 16,
+      });
+    },
+    formSubmit(e) {
+      let that = this;
+      console.log(e.detail.value);
+      if(e.detail.value.userName == ""){
+        wx.showToast({
+					icon: "none",
+					title: "请输入姓名",
+				});
+        return;
+      }
+      if(e.detail.value.tel == ""){
+        wx.showToast({
+					icon: "none",
+					title: "请输入手机号",
+				});
+        return;
+      }
+      var reg = /^1[3|4|5|6|9|7|8][0-9]\d{8}$/;
+      if(reg.test(e.detail.value.tel) == false){
+        wx.showToast({
+					icon: "none",
+					title: "请输入正确的手机号",
+				});
+        return;
+      }
+      if(that.data.info.agencyOperation == 2){
+        if(that.data.ageIndex == -1){
+          wx.showToast({
+            icon: "none",
+            title: "请选择年龄",
+          });
+          return;
+        }
+        e.detail.value.age = parseInt(that.data.ageIndex) + 16;
+        e.detail.value.sex = that.data.sex;
+      }else{
+        if(e.detail.value.idCard == ""){
+          wx.showToast({
+            icon: "none",
+            title: "请输入身份证号",
+          });
+          return;
+        }
+        var regIdCard = /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/;
+        if(regIdCard.test(e.detail.value.idCard) == false){
+          wx.showToast({
+            icon: "none",
+            title: "请输入正确的身份证号",
+          });
+          return;
+        }
+
+        e.detail.value.interviewTimeStr = that.data.currentTime;
+      }
+     
+
+
+
+
+
+   
+      e.detail.value.jobId = that.data.info.id
+      console.log('form发生了submit事件，携带数据为：', e.detail.value)
+      wx.request({
+        url: app.globalData.ip + '/yishoudan/common/order/add',
+        data: e.detail.value,
+        header: app.globalData.headers,
+        method: "POST",
+        success: function (res) {
+          console.log(res);
+          if (res.data.status == 200) {
+            wx.showToast({
+              icon: "none", 
+              title: "报名成功",
+            })
+            that.setData({
+              show: false,
+              ageIndex:-1
+            })
+  
+          } else {
+            wx.showToast({
+              icon: "none", 
+              title: res.data.msg,
+            })
+          }
+        }
+      })
+    },
+  
     /**
     * 阻止滑动穿透
     *
@@ -131,9 +318,9 @@ Component({
     },
     hideLeft () {
       // this.data.show = false
-      // this.setData({
-      //   show: false
-      // })
+      this.setData({
+        ageIndex: -1
+      })
       var eventDetail = {
         type: this.data.drawerType
       };
diff --git a/components/bottom-drawer/index.wxml b/components/bottom-drawer/index.wxml
index a7cb5f0..fde8ca2 100644
--- a/components/bottom-drawer/index.wxml
+++ b/components/bottom-drawer/index.wxml
@@ -1,10 +1,11 @@
 <!-- catchtouchmove="filterTouchMove"  -->
+<form bindsubmit="formSubmit" wx:if="{{show}}">
 <view class="leftBox" hover-class="none" hover-stop-propagation="false">
   <view class="mask" wx:if="{{show}}" catchtouchmove="modalMove" bindtap="hideLeft"></view>
-  <view class="hideBox {{show ? 'leftShow':''}}" wx:if="{{touchClose}}" style="height: {{height}};background-color:{{color}}" bindtouchstart="filterTouchStart">
+  <view class="hideBox {{show ? 'leftShow':''}}" wx:if="{{touchClose}}" style="height: {{info.agencyOperation == 2 ? '494px' : '560px'}};background-color:{{color}}" bindtouchstart="filterTouchStart">
     <view class="tac fw500 por">
-      <slot name="title"></slot>
-      <view class="iconfont icon-guanbi11 f14 c9 poa" wx:if="{{cancerShow}}" style="color:#333;right:8px;top:16px;width:32px;height:32px" catchtap="hideLeft"></view>
+      <!-- <slot name="title"></slot> -->
+      <view class="iconfont icon-guanbi11 f14 c9 poa" style="color:#333;right:8px;top:-46px;width:32px;height:32px" catchtap="hideLeft"></view>
     </view>
     <!-- <slot></slot> -->
     <view class="bgf container">
@@ -31,12 +32,44 @@
             </view>
             <view class="weui-cell__bd fsa">
               <input class="weui-input f17 flex-1" type="text" name="userName" bindinput="bothwayBind" data-type="name" value="{{userInfo.name}}" placeholder="请输入您的姓名" placeholder-class="input__placeholder cccc" />
-              <view class="sexBox fss">
+              <view class="sexBox fss" wx:if="{{info.agencyOperation == 2}}">
                 <view class="sub mr12 {{sex == 1 ? 'subActive':''}}" bindtap="changeSex" data-type="1">先生</view>
                 <view class="sub {{sex == 2 ? 'subActive':''}}" bindtap="changeSex" data-type="2">女士</view>
               </view>
             </view>
           </view>
+          <view class="weui-cell bb1 pb12 pt12" wx:if="{{info.agencyOperation == 2}}">
+            <view class="weui-cell__hd display-flex aic mb16" style="max-width:80px">
+              <label class="weui-label c9 f12">
+                您的年龄
+                <text class="cfred">*</text>
+              </label>
+            </view>
+            <view class="weui-cell__bd">
+              <picker bindchange="bindPickerChangeAge" style="width:100%" value="{{ageIndex}}" range="{{ageArray}}">
+                <view class="picker display-flex">
+                  <block wx:if="{{ageIndex == -1}}">
+                    <view class="ccc dib flex-1" style="color:#ccc">请选择年龄</view>
+                  </block>
+                  <block wx:else>
+                    <view class="c3 dib flex-1">{{ageArray[ageIndex]}}</view>
+                  </block>
+                  <i class="iconfont icon-gengduo11 f16 dib pr c9 mr12" style="line-height:1;top:4px;"></i>
+                </view>
+              </picker>
+            </view>
+          </view>
+          <view class="weui-cell bb1 pb12 pt12"  wx:if="{{info.agencyOperation == 1}}">
+            <view class="weui-cell__hd display-flex aic mb16" style="max-width:90px">
+              <label class="weui-label c9 f12">
+                您的身份证号
+                <text class="cfred">*</text>
+              </label>
+            </view>
+            <view class="weui-cell__bd">
+              <input class="weui-input f17" type="idCard" name="idCard" placeholder="请输入您的身份证号" placeholder-class="input__placeholder cccc" />
+            </view>
+          </view>
           <view class="weui-cell bb1 pb12 pt12">
             <view class="weui-cell__hd display-flex aic mb16" style="max-width:80px">
               <label class="weui-label c9 f12">
@@ -45,7 +78,21 @@
               </label>
             </view>
             <view class="weui-cell__bd">
-              <input class="weui-input f17" type="text" name="userName" bindinput="bothwayBind" data-type="name" value="{{userInfo.name}}" placeholder="请输入您的手机号" placeholder-class="input__placeholder cccc" />
+              <input class="weui-input f17" type="tel" maxlength="11" name="tel" placeholder="请输入您的手机号" placeholder-class="input__placeholder cccc" />
+            </view>
+          </view>
+          <view class="weui-cell bb1 pb12 pt12"  wx:if="{{info.agencyOperation == 1}}">
+            <view class="weui-cell__hd display-flex aic mb16" style="max-width:90px">
+              <label class="weui-label c9 f12">
+                预约面试时间
+                <text class="cfred">*</text>
+              </label>
+            </view>
+            <view class="weui-cell__bd">
+              <picker mode="multiSelector" range="{{dateTimeArray}}" value="{{dateTime}}" bindchange="changeDateTime" bindcolumnchange="changeDateTimeColumn" style="color:#333">
+                {{!!currentTime?currentTime:'----'}}
+                <i class="iconfont icon-rili f16 ml4 dib pr c9" style="line-height:1;"></i>
+              </picker>
             </view>
           </view>
           <view class="weui-cell bb1 pb12 pt12">
@@ -53,17 +100,17 @@
               <label class="weui-label c9 f12">备注</label>
             </view>
             <view class="weui-cell__bd">
-              <input class="weui-input f17" type="text" name="userName" bindinput="bothwayBind" data-type="name" value="{{userInfo.name}}" placeholder="请输入备注" placeholder-class="input__placeholder cccc" />
+              <input class="weui-input f17" type="text" name="desp" placeholder="请输入备注" placeholder-class="input__placeholder cccc" />
             </view>
           </view>
         </view>
         <view class="sticky">
-          <view class="f16 poa" style="top:-320px" bindtap="handlerMore">多人报名切换</view>
+          <!-- <view class="f16 poa" style="top:-320px" bindtap="handlerMore">多人报名切换</view>
           <button class="bgf pt12 pb12 mb16" style="width: 100%; color:#0DCC91" hover-class="thover" bindtap="addPersion">
             <i class="iconfont icon-tianjia3 mr8 fw400"></i>选择报名人
-          </button>
+          </button> -->
 
-          <button class="loginOut mt0" style="width: 100%; " hover-class="thover">立即报名</button>
+          <button class="loginOut mt0" style="width: 100%; " formType="submit" hover-class="thover">立即报名</button>
         </view>
       </view>
     </view>
@@ -76,3 +123,4 @@
     <slot></slot>
   </view>-->
 </view>
+</form>
diff --git a/pages/company/company/index.wxml b/pages/company/company/index.wxml
index 570cadb..d24df24 100644
--- a/pages/company/company/index.wxml
+++ b/pages/company/company/index.wxml
@@ -37,8 +37,6 @@
         <view class="servicenamebox">
           <view class="mb2 f20 fw500"> {{serviceInfo.contactUserName || '暂无联系人' }}</view>
           <view class="c3 f16">
-           
-            <i class="mr4"></i>
             <p class="f14">{{serviceInfo.contactTel || '暂无联系方式'}}</p>
           </view>
         </view>
diff --git a/pages/detail/index.js b/pages/detail/index.js
index 5d8da4a..91c2d23 100644
--- a/pages/detail/index.js
+++ b/pages/detail/index.js
@@ -6,6 +6,7 @@ var qqmapsdk;
 
 Page({
 	data: {
+    images:[],
     isLogin:false,
     statusBarHeight: wx.getStorageSync("statusBarHeight"), // 状态栏高度
 
@@ -1142,6 +1143,9 @@ Page({
 		//职位特色
 		if (app.isNotEmptyCheck(jobDetail.jobSpecialLabelNames)) {
 			jobDetail["jobSpecialLabelNames"] = that.getJobSpecialLabelNamesArray(jobDetail.jobSpecialLabelNames);
+    }
+    if (app.isNotEmptyCheck(jobDetail.jobRequestLabelNames)) {
+			jobDetail["jobRequestLabelNames"] = that.getJobRequestLabelNamesArray(jobDetail.jobRequestLabelNames);
 		}
 
 	},
diff --git a/pages/detail/index.wxml b/pages/detail/index.wxml
index d12b574..04a57fd 100644
--- a/pages/detail/index.wxml
+++ b/pages/detail/index.wxml
@@ -60,7 +60,7 @@
 </view>
 <view class="p016 mt12" wx:if="{{images.length > 0}}">
   <block wx:for="{{images}}" wx:for-item="item" wx:key="index">
-    <image src="{{item}}" bind:tap="showImage" data-src="{{item}}" class="img5" mode=""/>
+    <image src="{{item.url}}" bind:tap="showImage" data-src="{{item.url}}" class="img5" mode=""/>
   </block>
 </view>
 
diff --git a/pages/index/index.js b/pages/index/index.js
index 9c02904..bfe8aa0 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -3,6 +3,7 @@ const app = getApp();
 const commonUtil = require("../../utils/commonUtil.js");
 Page({
   data: {
+    currentInfo:{},
     swiperHeight: 0,
     toped: "1",
     chaShowed: false,
@@ -47,7 +48,7 @@ Page({
       cityName: "",
       brandIds: "",
       jobCategoryLabelIds: "",
-      ucj: 0,
+      ujc: 0,
     },
     loading: true,
     topJobList: [],
@@ -1254,9 +1255,9 @@ Page({
       scrollTo: "sticky",
     });
     if (this.data.choiceCollect == 0) {
-      this.data.storeJobListSearchForm.ucj = 0;
+      this.data.storeJobListSearchForm.ujc = 0;
     } else {
-      this.data.storeJobListSearchForm.ucj = 1;
+      this.data.storeJobListSearchForm.ujc = 1;
     }
     this.toList();
 
@@ -1335,9 +1336,9 @@ Page({
       ageRangeStr: that.data.minAge + "-" + that.data.maxAge,
     };
     if (this.data.choiceCollect == 0) {
-      that.data.storeJobListSearchForm.ucj = 0;
+      that.data.storeJobListSearchForm.ujc = 0;
     } else {
-      that.data.storeJobListSearchForm.ucj = 1;
+      that.data.storeJobListSearchForm.ujc = 1;
     }
     console.log(that.data.storeJobListSearchForm);
     that.setData({
@@ -1575,7 +1576,7 @@ Page({
     var that = this;
 
     wx.request({
-      url: app.globalData.ip + "/store/job/collected/list?ucj=1",
+      url: app.globalData.ip + "/store/job/collected/list?ujc=1",
       method: "GET",
       data: {},
       header: app.globalData.headers,
@@ -2370,7 +2371,7 @@ Page({
   },
   doCollected (collected, storeJobId) {
     var that = this;
-    var url = "/assistant/job/collect/" + storeJobId;
+    var url = "/yishoudan/custom/job/collect/" + storeJobId;
     // if (collected - 1 == 0) {
     //   url = "/user/collect/job/remove";
     // }
@@ -2525,7 +2526,7 @@ Page({
     if (that.data.isLogin || (!that.data.isLogin && e.currentTarget.dataset.id == 0)) {
       if (e.currentTarget.dataset.id) {
         that.data.choiceCollect = e.currentTarget.dataset.id;
-        that.data.storeJobListSearchForm.ucj = e.currentTarget.dataset.id;
+        that.data.storeJobListSearchForm.ujc = e.currentTarget.dataset.id;
         that.data.storeJobListSearchForm.pageNum = 1;
         that.setData({
           choiceCollect: that.data.choiceCollect,
@@ -2684,7 +2685,7 @@ Page({
       }
     });
     that.data.storeJobListSearchForm.jobSpecialLabelIds = "";
-    // that.data.storeJobListSearchForm.ucj =
+    // that.data.storeJobListSearchForm.ujc =
     // that.data.storeJobListSearchForm.brandIds = "";
     that.data.storeJobListSearchForm.jobCategoryLabelIds = "";
     that.data.storeJobListSearchForm.pageNum = 1;
@@ -2738,8 +2739,10 @@ Page({
    *
    */
   recordBill (e) {
+    console.log(e.currentTarget.dataset.job);
     this.setData({
-      recordShow: true
+      recordShow: true,
+      currentInfo: e.currentTarget.dataset.job,
     })
     console.log(this.data.recordShow);
     wx.hideTabBar({
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 9984c08..c21236a 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -423,4 +423,4 @@
     </view>
   </view>
 </view>
-<bottom-drawer show="{{recordShow}}" drawerType="recordShow" cancerShow="{{false}}" touchClose="{{true}}" bindhidedrawer="hidedrawershow" class="bottomDrawer" height="474px"></bottom-drawer>
+<bottom-drawer show="{{recordShow}}" info="{{currentInfo}}" drawerType="recordShow" cancerShow="{{false}}" touchClose="{{true}}" bindhidedrawer="hidedrawershow" class="bottomDrawer" height="494px"></bottom-drawer>
diff --git a/pages/mine/addressBook/index.wxml b/pages/mine/addressBook/index.wxml
index 552b77f..f70cf4a 100644
--- a/pages/mine/addressBook/index.wxml
+++ b/pages/mine/addressBook/index.wxml
@@ -2,7 +2,7 @@
   <block>
     <view class="tc" wx:if="{{!hasAddress}}">
       <i class="t-icon t-icon-zanwushouhuodizhi" style=" width: 92px;height: 92px;margin-top: 90px;"></i>
-      <view class="mt20 cccc">暂无收货地址</view>
+      <view class="mt20 cccc">暂无地址</view>
     </view>
   </block>
   <block wx:if="{{hasAddress}}">
diff --git a/pages/mine/myJob/index.wxml b/pages/mine/myJob/index.wxml
index 45ae0fb..770de8f 100644
--- a/pages/mine/myJob/index.wxml
+++ b/pages/mine/myJob/index.wxml
@@ -1,7 +1,5 @@
-
-
-<block  wx:if="{{recordList}}">
- <!-- <view class="weui-search-bar weui-search-bar_focusing bgf" id="searchBar" style="line-height: 1;padding-left:16px;padding-right:16px">
+<block wx:if="{{recordList.length > 0}}">
+  <!-- <view class="weui-search-bar weui-search-bar_focusing bgf" id="searchBar" style="line-height: 1;padding-left:16px;padding-right:16px">
     <view class="weui-search-bar__form flex-1 fsa g_bg_f_5">
       <view class="weui-search-bar__box flex-1 fsa" style="border-radius: 17px;">
         <i class="iconfont icon-sousuo"></i>
@@ -13,23 +11,23 @@
   </view> -->
   <view class="bt1">
 
-<view class="bgf display-flex p16 pb0" data-id="{{item.customJob.id}}" bindtap="goDetail" hover-class="g_bg_f_5" wx:for="{{recordList}}" wx:key="index" wx:item="item">
-  <view class="display-flex flex-1 pb16 bb1">
-    <view class="flex-1">
-      <view class="f16 fwb">{{item.customJob.jobName}}</view>
-      <view class="f14 c6 mt8">{{(item.citys && item.citys != '-') ? item.citys + ' | ' : ''}} {{item.age}}</view>
-    </view>
-    <view class="tr">
-      <view class="f14 c9">2023-08-31 18:02</view>
+    <view class="bgf display-flex p16 pb0" data-id="{{item.customJob.id}}" bindtap="goDetail" hover-class="g_bg_f_5" wx:for="{{recordList}}" wx:key="index" wx:item="item">
+      <view class="display-flex flex-1 pb16 bb1">
+        <view class="flex-1">
+          <view class="f16 fwb">{{item.customJob.jobName}}</view>
+          <view class="f14 c6 mt8">{{(item.citys && item.citys != '-') ? item.citys + ' | ' : ''}} {{item.age}}</view>
+        </view>
+        <view class="tr">
+          <view class="f14 c9">2023-08-31 18:02</view>
+        </view>
+      </view>
     </view>
   </view>
-</view>
-</view>
 
 </block>
-<view class="tc" wx:else="">
-  <view class="t-icon t-icon-zanwu" style="width: 80px; height: 80px; margin: 50% auto 20px"></view>
-      <view class="mt20 cccc">暂无记录</view>
-    </view>
-
-  
\ No newline at end of file
+<block wx:else>
+  <view class="tc">
+    <view class="t-icon t-icon-zanwu" style="width: 80px; height: 80px; margin: 50% auto 10px"></view>
+    <view class="cccc">暂无记录</view>
+  </view> 
+</block>