Explorar el Código

获取手机号, 加日期选择

15954854818 hace 3 años
padre
commit
e2c40e4508
Se han modificado 71 ficheros con 54 adiciones y 13 borrados
  1. BIN
      __MACOSX/.hbuilderx/._launch.json
  2. BIN
      __MACOSX/common/cryptojs-master/._README.md
  3. BIN
      __MACOSX/common/cryptojs-master/._cryptojs.js
  4. BIN
      __MACOSX/common/cryptojs-master/._package.json
  5. BIN
      __MACOSX/common/cryptojs-master/lib/._AES.js
  6. BIN
      __MACOSX/common/cryptojs-master/lib/._BlockModes.js
  7. BIN
      __MACOSX/common/cryptojs-master/lib/._Crypto.js
  8. BIN
      __MACOSX/common/cryptojs-master/lib/._CryptoMath.js
  9. BIN
      __MACOSX/common/cryptojs-master/lib/._DES.js
  10. BIN
      __MACOSX/common/cryptojs-master/lib/._HMAC.js
  11. BIN
      __MACOSX/common/cryptojs-master/lib/._MARC4.js
  12. BIN
      __MACOSX/common/cryptojs-master/lib/._MD5.js
  13. BIN
      __MACOSX/common/cryptojs-master/lib/._PBKDF2.js
  14. BIN
      __MACOSX/common/cryptojs-master/lib/._PBKDF2Async.js
  15. BIN
      __MACOSX/common/cryptojs-master/lib/._Rabbit.js
  16. BIN
      __MACOSX/common/cryptojs-master/lib/._SHA1.js
  17. BIN
      __MACOSX/common/cryptojs-master/lib/._SHA256.js
  18. BIN
      __MACOSX/common/cryptojs-master/test/._PBKDF2-test.js
  19. BIN
      __MACOSX/common/cryptojs-master/test/._test.coffee
  20. BIN
      __MACOSX/common/fontFamily/._fontCss.css
  21. BIN
      __MACOSX/static/._.DS_Store
  22. BIN
      __MACOSX/static/app/._.DS_Store
  23. BIN
      __MACOSX/static/app/._close.png
  24. BIN
      __MACOSX/static/app/._data_empty.png
  25. BIN
      __MACOSX/static/app/._service.png
  26. BIN
      __MACOSX/static/app/page1/._.DS_Store
  27. BIN
      __MACOSX/static/app/page1/._btn.png
  28. BIN
      __MACOSX/static/app/page1/._head_top.png
  29. BIN
      __MACOSX/static/app/page1/._home_bg.png
  30. BIN
      __MACOSX/static/app/page2/._head_bg.png
  31. BIN
      __MACOSX/static/app/page3/._arrow-down.png
  32. BIN
      __MACOSX/static/app/page3/._mark.png
  33. BIN
      __MACOSX/static/app/tabs/._tab1.png
  34. BIN
      __MACOSX/static/app/tabs/._tab1_on.png
  35. BIN
      __MACOSX/static/app/tabs/._tab2.png
  36. BIN
      __MACOSX/static/app/tabs/._tab2_on.png
  37. BIN
      __MACOSX/static/c-datepicker/._left_btn.png
  38. BIN
      __MACOSX/static/c-datepicker/._right_btn.png
  39. BIN
      __MACOSX/unpackage/._.DS_Store
  40. BIN
      __MACOSX/unpackage/dist/._.DS_Store
  41. BIN
      __MACOSX/unpackage/dist/build/._.DS_Store
  42. BIN
      __MACOSX/unpackage/dist/dev/._.DS_Store
  43. BIN
      __MACOSX/unpackage/dist/dev/mp-weixin/._.DS_Store
  44. 4 0
      components/c-datepicker/c-datepicker.vue
  45. 1 1
      config.js
  46. 4 1
      pages/signs/subscribe/index.scss
  47. 45 11
      pages/signs/subscribe/subscribe.vue
  48. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  49. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
  50. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/c-datepicker/c-datepicker.js.map
  51. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/c-form-type-action-sheet/c-form-type-action-sheet.js.map
  52. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/c-pop-auth/c-pop-auth.js.map
  53. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/c-pop-phone/c-pop-phone.js.map
  54. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/c-radio/c-radio.js.map
  55. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/loading/loading.js.map
  56. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/signs/address/address.js.map
  57. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/signs/contract/contract.js.map
  58. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/signs/invitation/invitation.js.map
  59. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/signs/main/main.js.map
  60. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/signs/me/me.js.map
  61. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/signs/me/nav-bar/nav-bar.js.map
  62. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/signs/subscribe/subscribe.js.map
  63. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/signs/userCenter/userCenter.js.map
  64. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-button/u-button.js.map
  65. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-code/u-code.js.map
  66. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-gap/u-gap.js.map
  67. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-icon/u-icon.js.map
  68. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-loading-icon/u-loading-icon.js.map
  69. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-overlay/u-overlay.js.map
  70. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-toast/u-toast.js.map
  71. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-transition/u-transition.js.map

BIN
__MACOSX/.hbuilderx/._launch.json


BIN
__MACOSX/common/cryptojs-master/._README.md


BIN
__MACOSX/common/cryptojs-master/._cryptojs.js


BIN
__MACOSX/common/cryptojs-master/._package.json


BIN
__MACOSX/common/cryptojs-master/lib/._AES.js


BIN
__MACOSX/common/cryptojs-master/lib/._BlockModes.js


BIN
__MACOSX/common/cryptojs-master/lib/._Crypto.js


BIN
__MACOSX/common/cryptojs-master/lib/._CryptoMath.js


BIN
__MACOSX/common/cryptojs-master/lib/._DES.js


BIN
__MACOSX/common/cryptojs-master/lib/._HMAC.js


BIN
__MACOSX/common/cryptojs-master/lib/._MARC4.js


BIN
__MACOSX/common/cryptojs-master/lib/._MD5.js


BIN
__MACOSX/common/cryptojs-master/lib/._PBKDF2.js


BIN
__MACOSX/common/cryptojs-master/lib/._PBKDF2Async.js


BIN
__MACOSX/common/cryptojs-master/lib/._Rabbit.js


BIN
__MACOSX/common/cryptojs-master/lib/._SHA1.js


BIN
__MACOSX/common/cryptojs-master/lib/._SHA256.js


BIN
__MACOSX/common/cryptojs-master/test/._PBKDF2-test.js


BIN
__MACOSX/common/cryptojs-master/test/._test.coffee


BIN
__MACOSX/common/fontFamily/._fontCss.css


BIN
__MACOSX/static/._.DS_Store


BIN
__MACOSX/static/app/._.DS_Store


BIN
__MACOSX/static/app/._close.png


BIN
__MACOSX/static/app/._data_empty.png


BIN
__MACOSX/static/app/._service.png


BIN
__MACOSX/static/app/page1/._.DS_Store


BIN
__MACOSX/static/app/page1/._btn.png


BIN
__MACOSX/static/app/page1/._head_top.png


BIN
__MACOSX/static/app/page1/._home_bg.png


BIN
__MACOSX/static/app/page2/._head_bg.png


BIN
__MACOSX/static/app/page3/._arrow-down.png


BIN
__MACOSX/static/app/page3/._mark.png


BIN
__MACOSX/static/app/tabs/._tab1.png


BIN
__MACOSX/static/app/tabs/._tab1_on.png


BIN
__MACOSX/static/app/tabs/._tab2.png


BIN
__MACOSX/static/app/tabs/._tab2_on.png


BIN
__MACOSX/static/c-datepicker/._left_btn.png


BIN
__MACOSX/static/c-datepicker/._right_btn.png


BIN
__MACOSX/unpackage/._.DS_Store


BIN
__MACOSX/unpackage/dist/._.DS_Store


BIN
__MACOSX/unpackage/dist/build/._.DS_Store


BIN
__MACOSX/unpackage/dist/dev/._.DS_Store


BIN
__MACOSX/unpackage/dist/dev/mp-weixin/._.DS_Store


+ 4 - 0
components/c-datepicker/c-datepicker.vue

@@ -357,9 +357,11 @@
 						isChoice = true;
 					}
 				}else if(this.beginDate){
+					
 					if(DateTools.isBigDay(item.dateObj,new Date(this.beginDate)) && !item.isOtherMonth){
 						color = '#000';
 					}
+					
 					if(DateTools.isBigDay(item.dateObj,new Date(this.beginDate))){
 						isChoice = true;
 					}
@@ -378,6 +380,7 @@
 				}
 				
 				item.isChoice = isChoice;
+			
 				//定义初始样式
 				item.statusStyle = {
 					opacity: 1,
@@ -393,6 +396,7 @@
 					background: 'transparent'
 				};
 				item.tips = "";
+				
 				//标记今天的日期
 				if (DateTools.isSameDay(new Date(), item.dateObj)) {
 					item.statusStyle.color = this.color;

+ 1 - 1
config.js

@@ -4,5 +4,5 @@
  */
 
 export default {
-	getPhone: false  // 需要获取用户手机号
+	getPhone: true  // 需要获取用户手机号
 }

+ 4 - 1
pages/signs/subscribe/index.scss

@@ -80,7 +80,7 @@
 	}
 	.date-time-wrap{
 		display: flex;
-		height: 551rpx;
+		height: 601rpx;
 		.label{
 			font-size: 30rpx;
 			font-family: PingFang SC;
@@ -116,6 +116,9 @@
 				color: #212121;
 				letter-spacing: 1rpx;
 				flex-basis: 3em;
+				&.not{
+					color: #dedede !important;
+				}
 			}
 			.tig{
 				display: flex;

+ 45 - 11
pages/signs/subscribe/subscribe.vue

@@ -30,15 +30,15 @@
 			<view class="card">
 				<view class="date-name">预约时间</view>
 				<view class="date-box">
-					<c-datepicker v-model="form.day" @change="bindDateChange"></c-datepicker>
+					<c-datepicker v-model="form.day" @change="bindDateChange" :beginDate="form.beginDate"></c-datepicker>
 					<view class="date-divide"></view>
 					<view class="date-time-wrap">
 						<view class="label">可选时间段</view>
 						<view class="time-range" v-if="times.length > 0">
-							<swiper class="picker-view" vertical :autoplay="false" :display-multiple-items="8">
+							<swiper class="picker-view" vertical :autoplay="false" :display-multiple-items="9">
 								<swiper-item v-for="(item, index) in times" :key="item.id">
 									<view class="picker-item" :hover-stay-time="100" hover-class="hover-active" :class="{active: index == current}" @click="pickeClick(item, index)">
-										<view class="value">{{item.text}}</view>
+										<view class="value" :class="{not : !item.isCheck}">{{item.text}}</view>
 										<view class="tig" v-if="item.num">{{item.num}}/{{item.max}}</view>
 										<view class="stauts-wrap">
 											<view class="mark" v-if="index == current">
@@ -81,34 +81,58 @@
 					blessingPositionId: '',
 					blessingPositionName: '',
 					num: '',
+					beginDate: dayjs().format('YYYY-MM-DD'),
 					visitDate: dayjs().format('YYYY-MM-DD'),
 					visitTime: ''
 				},
-				current: 0,
+				current: null,
 				times: []
 			};
 		},
 		mounted() {
-			this.initTimes()
+			this.initTimes(this.form.visitDate)
 		},
 		methods: {
+		   /**
+			* 比较时间大小 时间
+			* @param {dayjs} time1
+			* @param {dayjs} time2
+			*/	
+		   isLittleTime(time1, time2){
+			   const diff = time1.diff(time2,'minutes' )
+			   if(diff >= 0){
+				   return false
+			   }else{
+				   return true
+			   }
+		   },	
 		   async initTimes(date = '') {
 			    try{
 			    	const res = await this.$api('signs.getOpenidVisitDateTime', {visitDate: date})
 					const timeStr = dayjs().unix()
-					this.current = 0;
+					this.current = null;
 					let isfuzhi = false
+					
+					const time1 = dayjs()
+					const time2YMD = dayjs(date)
 			    	const times = res.data.map((item, index) => {
+						let isCheck = false // 点击
+						const _time2 = dayjs().year(time2YMD.year()).month(time2YMD.month()).day(time2YMD.day()).hour(item.visitTime.split(':')[0]).minute(item.visitTime.split(':')[1]).second(0);
 						// 自动选中未录满
-						if(item.max > item.num && !isfuzhi) {
-							isfuzhi = true;
-							this.current = index
-							this.form.visitTime = item.visitTime;
+						if(this.isLittleTime(time1 , _time2) && item.max > item.num) {
+							// 可以点击
+							isCheck = true
+							if(!isfuzhi){
+								isfuzhi = true;
+								this.current = index
+								this.form.visitTime = item.visitTime;
+							}
 						}
 						// 获取item
-						return { id: timeStr + '' + index, text: item.visitTime, visitTime: item.visitTime, max: item.max, num: item.num}
+						return { id: timeStr + '' + index, text: item.visitTime, visitTime: item.visitTime, max: item.max, num: item.num, isCheck: isCheck}
 					})
 			    	this.times = times
+					console.log(times, '---------')
 			    }catch(e){
 			    	//TODO handle the exception
 			    }
@@ -137,6 +161,10 @@
 				this.initTimes(dateString)
 			},
 			pickeClick(item, index){
+				if(!item.isCheck) {
+					this.$refs.uToast.show({type: 'error', message: '不能选择', position: 'top'})
+					return
+				}
 				if(item.num >= item.max) {
 					this.$refs.uToast.show({type: 'error', message: '时段已经约满', position: 'top'})
 					return
@@ -156,6 +184,12 @@
 					return;
 				}
 				
+				if(!this.current && this.current != 0){
+					this.$refs.uToast.show({type: 'error', message: '请选择随访时间', position: 'top'})
+					return;
+				}
+				
+				
 				this.$refs.uToast.show({
 					type: 'loading',
 					message: '请稍后',

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/c-datepicker/c-datepicker.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/c-form-type-action-sheet/c-form-type-action-sheet.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/c-pop-auth/c-pop-auth.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/c-pop-phone/c-pop-phone.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/c-radio/c-radio.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/loading/loading.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/signs/address/address.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/signs/contract/contract.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/signs/invitation/invitation.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/signs/main/main.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/signs/me/me.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/signs/me/nav-bar/nav-bar.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/signs/subscribe/subscribe.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/signs/userCenter/userCenter.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-button/u-button.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-code/u-code.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-gap/u-gap.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-icon/u-icon.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-loading-icon/u-loading-icon.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-overlay/u-overlay.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-toast/u-toast.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-transition/u-transition.js.map


Algunos archivos no se mostraron porque demasiados archivos cambiaron en este cambio