update

components/lx-calendar/lx-calendar.vue

@@ -14,31 +14,34 @@
 				
 				<view class="date_dl" v-show="!retract || index == to_prev_week_index" v-for="(item,index) in   week_list_prev_co" :key="index">
 					<view class="dd" @click="item_click(vo,index,key)" v-for="(vo,key) in item" :key="key">
-						<view class="num" :class="[vo.today ? 'today' : '',vo.type == 'month' ? 'month' : (retract ? '' : 'disabled')]">{{vo.day}}</view>
+						<!-- <view class="num" :class="[vo.today ? 'today' : '',vo.type == 'month' ? 'month' : (retract ? '' : 'disabled')]">{{vo.day}}</view> -->
+						<view class="num" :class="[vo.today ? 'today' : '', vo.dot ? '' : 'disabled']">{{vo.day}}</view>
 						<view v-show="vo.dot && (vo.type == 'month' || retract)" class="dot"></view>
 					</view>
 				</view>
-				<view @click="open" class="retract icon"><text class="iconfont next icon-fanhui" :class="[retract ? '' : 'retract_icon']" /></view>
+				<view @click="open" class="retract icon" v-show="false"><text class="iconfont next icon-fanhui" :class="[retract ? '' : 'retract_icon']" /></view>
 			</swiper-item>
 			<swiper-item>
 				
 				<view class="date_dl" v-show="!retract || index == to_week_index" v-for="(item,index) in week_list" :key="index">
 					<view class="dd" @click="item_click(vo,index,key)" v-for="(vo,key) in item" :key="key">
-						<view class="num" :class="[vo.today ? 'today' : '',vo.type == 'month' ? 'month' : (retract ? '' : 'disabled')]">{{vo.day}}</view>
+						<!-- <view class="num" :class="[vo.today ? 'today' : '',vo.type == 'month' ? 'month' : (retract ? '' : 'disabled')]">{{vo.day}}</view> -->
+						<view class="num" :class="[vo.today ? 'today' : '', vo.dot ? '' : 'disabled']">{{vo.day}}</view>
 						<view v-show="vo.dot && (vo.type == 'month' || retract)" class="dot"></view>
 					</view>
 				</view>
-				<view @click="open" class="retract icon"><text class="iconfont next icon-fanhui" :class="[retract ? '' : 'retract_icon']" /></view>
+				<view @click="open" class="retract icon" v-show="false"><text class="iconfont next icon-fanhui" :class="[retract ? '' : 'retract_icon']" /></view>
 			</swiper-item>
 			<swiper-item>
 				
 				<view class="date_dl" v-show="!retract || index == to_next_week_index" v-for="(item,index) in  week_list_next_co" :key="index">
 					<view class="dd" @click="item_click(vo,index,key)" v-for="(vo,key) in item" :key="key">
-						<view class="num" :class="[vo.today ? 'today' : '',vo.type == 'month' ? 'month' : (retract ? '' : 'disabled')]">{{vo.day}}</view>
+						<!-- <view class="num" :class="[vo.today ? 'today' : '',vo.type == 'month' ? 'month' : (retract ? '' : 'disabled')]">{{vo.day}}</view> -->
+						<view class="num" :class="[vo.today ? 'today' : '', vo.dot ? '' : 'disabled']">{{vo.day}}</view>
 						<view v-show="vo.dot && (vo.type == 'month' || retract)" class="dot"></view>
 					</view>
 				</view>
-				<view @click="open" class="retract icon"><text class="iconfont next icon-fanhui" :class="[retract ? '' : 'retract_icon']" /></view>
+				<view @click="open" class="retract icon" v-show="false"><text class="iconfont next icon-fanhui" :class="[retract ? '' : 'retract_icon']" /></view>
 			</swiper-item>
 		</swiper>
 	</view>
@@ -338,10 +341,14 @@ export default {
 			this[type] = list;
 		},
 		item_click(item,item_index = -1){
-			if(!this.retract && item.type !== 'month'){
+			// if(!this.retract && item.type !== 'month'){
+			// 	return false;
+			// }
+			if(!item.dot){
 				return false;
 			}
-			this.date = item.date;;
+			console.log(item.date)
+			this.date = item.date;
 			if(item.type == 'month'){
 				this.nowDay = item.day;
 				if(item_index >= 0) this.to_week_index = item_index;

pages/makeField/fieldForm.vue

@@ -43,7 +43,7 @@
         </view>
         <view class="approve-box">
 			<view class="approve-title">请下载格式审批单，填写信息并加盖企业公章后上传</view>
-			<view class="approve-content">格式审批单下载：<text @click="()=>openFile(areaObj.file_path)">{{areaObj.file_name}}</text></view>
+			<view class="approve-content"><view>格式审批单下载：</view><text @click="()=>openFile(areaObj.file_path)">{{areaObj.file_name}}</text></view>
 		</view>
 	  </view>
     </view>
@@ -363,6 +363,9 @@ export default {
   border-radius: 10rpx;
   padding-top: 15rpx;
   color: #000;
+  .txt {
+	  font-size: 24rpx;
+  }
   image {
     width: 60rpx !important;
     height: 60rpx !important;
@@ -493,6 +496,9 @@ export default {
 	  .approve-content {
 			display: flex;
 		    margin: 20rpx 0 30rpx 0;
+			    view{
+					width: 30%;
+				};
 				text{
 					color:#00a7f0;
 					cursor: pointer;

pages/makeField/selectTime.vue

@@ -1,6 +1,6 @@
 <template>
     <view>
-        <lxCalendar @change="changeTime" :dot_lists="list"></lxCalendar>
+        <lxCalendar @change="changeTime" :dot_lists="list" :value="dateValue"></lxCalendar>
 		<view class="hours-box">
 			<view class="hours-title">可选时间段</view>
 			<view class="hours-content">
@@ -33,6 +33,7 @@ export default {
 	  shareUrl:getApp().globalData.shareUrl,
 	  areaId:'',
 	  list: [],
+	  dateValue:'',
 	  hourList:[],
 	  hourListSelceted:[],
 	  selectDate:getApp().globalData.nowTime,
@@ -99,6 +100,9 @@ export default {
         success: (res) => {
           if (res.data.code === 200) {
 			let dayList = res.data.data;
+			if(dayList.length){
+				this.dateValue = dayList[0]
+			}
 			this.list = dayList;
 			this.getHoursTime(id,this.selectDate)
           }
@@ -162,6 +166,8 @@ export default {
 }
 .hours-box {
 	margin-top: 30rpx;
+	min-height: 500rpx;
+	overflow-x: scroll;
 	.hours-title {
 		padding-left: 20rpx;
 		font-weight: 600;

pages/makeField/viewDetail.vue

@@ -224,7 +224,7 @@ export default {
 		height: 46rpx;
 		line-height: 46rpx;
 		margin-top: 5%;
-		width: 18%;
+		width: 22%;
       }
 	  .close {
 		  background: #7f7f7f;