Jelajahi Sumber

更新约车登录缓存

1410417013 7 bulan lalu
induk
melakukan
c3c82e3174
100 mengubah file dengan 23115 tambahan dan 208 penghapusan
  1. 44 33
      pages/authenticate/authenticate.vue
  2. 28 25
      pages/chooseCar/chooseCar.vue
  3. 65 17
      pages/home/home.vue
  4. 13 10
      pages/order/order.vue
  5. 12 9
      pages/orderDetail/orderDetail.vue
  6. 5 3
      pages/pay/pay.vue
  7. 26 9
      pages/transportation/transportation.vue
  8. TEMPAT SAMPAH
      static/images/home/car-box.png
  9. TEMPAT SAMPAH
      static/images/home/line-bu.png
  10. 43 1
      unpackage/dist/dev/mp-weixin/app.js
  11. 2362 2
      unpackage/dist/dev/mp-weixin/app.wxss
  12. 23 1
      unpackage/dist/dev/mp-weixin/common/assets.js
  13. 8705 16
      unpackage/dist/dev/mp-weixin/common/vendor.js
  14. 87 1
      unpackage/dist/dev/mp-weixin/components/AuthorizePopup.js
  15. 44 1
      unpackage/dist/dev/mp-weixin/components/AuthorizePopup.wxss
  16. 538 1
      unpackage/dist/dev/mp-weixin/pages/authenticate/authenticate.js
  17. 1 1
      unpackage/dist/dev/mp-weixin/pages/authenticate/authenticate.wxml
  18. 34 1
      unpackage/dist/dev/mp-weixin/pages/authenticate/authenticate.wxss
  19. 441 1
      unpackage/dist/dev/mp-weixin/pages/chooseCar/chooseCar.js
  20. 1 1
      unpackage/dist/dev/mp-weixin/pages/chooseCar/chooseCar.wxml
  21. 425 1
      unpackage/dist/dev/mp-weixin/pages/chooseCar/chooseCar.wxss
  22. 131 1
      unpackage/dist/dev/mp-weixin/pages/commonPeople/commonPeople.js
  23. 53 1
      unpackage/dist/dev/mp-weixin/pages/commonPeople/commonPeople.wxss
  24. 48 1
      unpackage/dist/dev/mp-weixin/pages/coupon/coupon.js
  25. 22 1
      unpackage/dist/dev/mp-weixin/pages/coupon/coupon.wxss
  26. 43 1
      unpackage/dist/dev/mp-weixin/pages/date/date.js
  27. 11 1
      unpackage/dist/dev/mp-weixin/pages/date/date.wxss
  28. 202 1
      unpackage/dist/dev/mp-weixin/pages/handlePeople/handlePeople.js
  29. 17 1
      unpackage/dist/dev/mp-weixin/pages/handlePeople/handlePeople.wxss
  30. 181 1
      unpackage/dist/dev/mp-weixin/pages/home/home.js
  31. 1 1
      unpackage/dist/dev/mp-weixin/pages/home/home.wxml
  32. 164 1
      unpackage/dist/dev/mp-weixin/pages/home/home.wxss
  33. 118 1
      unpackage/dist/dev/mp-weixin/pages/identity/identity.js
  34. 93 1
      unpackage/dist/dev/mp-weixin/pages/identity/identity.wxss
  35. 17 1
      unpackage/dist/dev/mp-weixin/pages/index/index.js
  36. 2 0
      unpackage/dist/dev/mp-weixin/pages/index/index.wxss
  37. 258 1
      unpackage/dist/dev/mp-weixin/pages/mine/mine.js
  38. 85 1
      unpackage/dist/dev/mp-weixin/pages/mine/mine.wxss
  39. 341 1
      unpackage/dist/dev/mp-weixin/pages/order/order.js
  40. 1 1
      unpackage/dist/dev/mp-weixin/pages/order/order.wxml
  41. 217 1
      unpackage/dist/dev/mp-weixin/pages/order/order.wxss
  42. 250 1
      unpackage/dist/dev/mp-weixin/pages/orderDetail/orderDetail.js
  43. 1 1
      unpackage/dist/dev/mp-weixin/pages/orderDetail/orderDetail.wxml
  44. 230 1
      unpackage/dist/dev/mp-weixin/pages/orderDetail/orderDetail.wxss
  45. 225 1
      unpackage/dist/dev/mp-weixin/pages/pay/pay.js
  46. 163 1
      unpackage/dist/dev/mp-weixin/pages/pay/pay.wxss
  47. 249 1
      unpackage/dist/dev/mp-weixin/pages/transportation/transportation.js
  48. 1 1
      unpackage/dist/dev/mp-weixin/pages/transportation/transportation.wxml
  49. 195 1
      unpackage/dist/dev/mp-weixin/pages/transportation/transportation.wxss
  50. 133 1
      unpackage/dist/dev/mp-weixin/pages/useDetail/useDetail.js
  51. 63 1
      unpackage/dist/dev/mp-weixin/pages/useDetail/useDetail.wxss
  52. 0 1
      unpackage/dist/dev/mp-weixin/project.config.json
  53. TEMPAT SAMPAH
      unpackage/dist/dev/mp-weixin/static/images/home/car-box.png
  54. TEMPAT SAMPAH
      unpackage/dist/dev/mp-weixin/static/images/home/line-bu.png
  55. 3 1
      unpackage/dist/dev/mp-weixin/uni_modules/uv-qrcode/components/uv-qrcode/cache.js
  56. 82 1
      unpackage/dist/dev/mp-weixin/uni_modules/uv-qrcode/components/uv-qrcode/props.js
  57. 656 1
      unpackage/dist/dev/mp-weixin/uni_modules/uv-qrcode/components/uv-qrcode/qrcode.js
  58. 37 1
      unpackage/dist/dev/mp-weixin/uni_modules/uv-qrcode/components/uv-qrcode/queue.js
  59. 681 1
      unpackage/dist/dev/mp-weixin/uni_modules/uv-qrcode/components/uv-qrcode/uv-qrcode.js
  60. 99 1
      unpackage/dist/dev/mp-weixin/uni_modules/uv-qrcode/components/uv-qrcode/uv-qrcode.wxss
  61. 19 1
      unpackage/dist/dev/mp-weixin/uni_modules/uv-ui-tools/libs/function/debounce.js
  62. 63 1
      unpackage/dist/dev/mp-weixin/uni_modules/uv-ui-tools/libs/function/digit.js
  63. 502 1
      unpackage/dist/dev/mp-weixin/uni_modules/uv-ui-tools/libs/function/index.js
  64. 177 1
      unpackage/dist/dev/mp-weixin/uni_modules/uv-ui-tools/libs/function/test.js
  65. 20 1
      unpackage/dist/dev/mp-weixin/uni_modules/uv-ui-tools/libs/function/throttle.js
  66. 151 1
      unpackage/dist/dev/mp-weixin/uni_modules/uv-ui-tools/libs/mixin/mixin.js
  67. 8 1
      unpackage/dist/dev/mp-weixin/uni_modules/uv-ui-tools/libs/mixin/mpMixin.js
  68. 106 1
      unpackage/dist/dev/mp-weixin/uni_modules/uv-ui-tools/libs/util/route.js
  69. 23 1
      unpackage/dist/dev/mp-weixin/uni_modules/wot-design-uni/components/common/AbortablePromise.js
  70. 27 1
      unpackage/dist/dev/mp-weixin/uni_modules/wot-design-uni/components/common/base64.js
  71. 44 1
      unpackage/dist/dev/mp-weixin/uni_modules/wot-design-uni/components/common/props.js
  72. 306 1
      unpackage/dist/dev/mp-weixin/uni_modules/wot-design-uni/components/common/util.js
  73. 12 1
      unpackage/dist/dev/mp-weixin/uni_modules/wot-design-uni/components/composables/useCell.js
  74. 80 1
      unpackage/dist/dev/mp-weixin/uni_modules/wot-design-uni/components/composables/useChildren.js
  75. 21 1
      unpackage/dist/dev/mp-weixin/uni_modules/wot-design-uni/components/composables/useParent.js
  76. 41 1
      unpackage/dist/dev/mp-weixin/uni_modules/wot-design-uni/components/composables/useTouch.js
  77. 13 1
      unpackage/dist/dev/mp-weixin/uni_modules/wot-design-uni/components/composables/useTranslate.js
  78. 189 1
      unpackage/dist/dev/mp-weixin/uni_modules/wot-design-uni/components/composables/useUpload.js
  79. 37 1
      unpackage/dist/dev/mp-weixin/uni_modules/wot-design-uni/components/wd-badge/types.js
  80. 58 1
      unpackage/dist/dev/mp-weixin/uni_modules/wot-design-uni/components/wd-badge/wd-badge.js
  81. 216 1
      unpackage/dist/dev/mp-weixin/uni_modules/wot-design-uni/components/wd-badge/wd-badge.wxss
  82. 95 1
      unpackage/dist/dev/mp-weixin/uni_modules/wot-design-uni/components/wd-button/types.js
  83. 171 1
      unpackage/dist/dev/mp-weixin/uni_modules/wot-design-uni/components/wd-button/wd-button.js
  84. 430 1
      unpackage/dist/dev/mp-weixin/uni_modules/wot-design-uni/components/wd-button/wd-button.wxss
  85. 341 1
      unpackage/dist/dev/mp-weixin/uni_modules/wot-design-uni/components/wd-calendar-view/month/month.js
  86. 286 1
      unpackage/dist/dev/mp-weixin/uni_modules/wot-design-uni/components/wd-calendar-view/month/month.wxss
  87. 19 1
      unpackage/dist/dev/mp-weixin/uni_modules/wot-design-uni/components/wd-calendar-view/month/types.js
  88. 330 1
      unpackage/dist/dev/mp-weixin/uni_modules/wot-design-uni/components/wd-calendar-view/monthPanel/month-panel.js
  89. 236 1
      unpackage/dist/dev/mp-weixin/uni_modules/wot-design-uni/components/wd-calendar-view/monthPanel/month-panel.wxss
  90. 26 1
      unpackage/dist/dev/mp-weixin/uni_modules/wot-design-uni/components/wd-calendar-view/monthPanel/types.js
  91. 67 1
      unpackage/dist/dev/mp-weixin/uni_modules/wot-design-uni/components/wd-calendar-view/types.js
  92. 273 1
      unpackage/dist/dev/mp-weixin/uni_modules/wot-design-uni/components/wd-calendar-view/utils.js
  93. 112 1
      unpackage/dist/dev/mp-weixin/uni_modules/wot-design-uni/components/wd-calendar-view/wd-calendar-view.js
  94. 11 0
      unpackage/dist/dev/mp-weixin/uni_modules/wot-design-uni/components/wd-calendar-view/wd-calendar-view.wxss
  95. 19 1
      unpackage/dist/dev/mp-weixin/uni_modules/wot-design-uni/components/wd-calendar-view/year/types.js
  96. 188 1
      unpackage/dist/dev/mp-weixin/uni_modules/wot-design-uni/components/wd-calendar-view/year/year.js
  97. 281 1
      unpackage/dist/dev/mp-weixin/uni_modules/wot-design-uni/components/wd-calendar-view/year/year.wxss
  98. 18 1
      unpackage/dist/dev/mp-weixin/uni_modules/wot-design-uni/components/wd-calendar-view/yearPanel/types.js
  99. 129 1
      unpackage/dist/dev/mp-weixin/uni_modules/wot-design-uni/components/wd-calendar-view/yearPanel/year-panel.js
  100. 0 0
      unpackage/dist/dev/mp-weixin/uni_modules/wot-design-uni/components/wd-calendar-view/yearPanel/year-panel.wxss

+ 44 - 33
pages/authenticate/authenticate.vue

@@ -88,8 +88,7 @@
 				/> -->
 				<wd-input
 					v-model="formValue.mobile"
-					v-if="cardType == '教师认证'"
-					label="手机号"
+					label="手机号"  
 					label-width="100px"
 					prop="mobile"
 					clearable
@@ -504,22 +503,22 @@ const submitAddReq = async () => {
 const submitEditReq = async () => {
 	const leng=frontFileList.value.length-1
 	const leng2=frontFileList.value.length-1
-	if (frontFileList.value.length > 0) {
+	// if (frontFileList.value.length > 0) {
 		
-	  formValue.value.file1 = frontFileList.value[leng];
-	} else {
-	  // 若列表为空,清空file2(可选)
-	  formValue.value.file1 = '';
-	  uni.showToast({ title:  '请上传身份证正面照片', icon: 'none' });
-	}
-	if (backFileList.value.length > 0) {
+	//   formValue.value.file1 = frontFileList.value[leng];
+	// } else {
+	//   // 若列表为空,清空file2(可选)
+	//   formValue.value.file1 = '';
+	//   uni.showToast({ title:  '请上传身份证正面照片', icon: 'none' });
+	// }
+	// if (backFileList.value.length > 0) {
 		
-	  formValue.value.file2 = backFileList.value[leng2];
-	} else {
-	  // 若列表为空,清空file2(可选)
-	  formValue.value.file2 = '';
-	  uni.showToast({ title:  '请上传身份证反面照片', icon: 'none' });
-	}
+	//   formValue.value.file2 = backFileList.value[leng2];
+	// } else {
+	//   // 若列表为空,清空file2(可选)
+	//   formValue.value.file2 = '';
+	//   uni.showToast({ title:  '请上传身份证反面照片', icon: 'none' });
+	// }
 	
 	// 基础数据(必传字段)
 	  const requestData = {
@@ -551,6 +550,12 @@ const submitEditReq = async () => {
 			})
 		}, 1500)
 	}
+	else{
+		uni.showToast({
+			title: res.message,
+			icon: 'err'
+		})
+	}
 }
 
 //暖心认证
@@ -558,22 +563,22 @@ const submitEditReq = async () => {
 const submitAddReqStu = async () => {
 	const leng=frontFileList.value.length-1
 	const leng2=frontFileList.value.length-1
-	if (frontFileList.value.length > 0) {
+	// if (frontFileList.value.length > 0) {
 		
-	  formValue.value.file1 = frontFileList.value[leng];
-	} else {
-	  // 若列表为空,清空file2(可选)
-	  formValue.value.file1 = '';
-	  uni.showToast({ title:  '请上传身份证正面照片', icon: 'none' });
-	}
-	if (backFileList.value.length > 0) {
+	//   formValue.value.file1 = frontFileList.value[leng];
+	// } else {
+	//   // 若列表为空,清空file2(可选)
+	//   formValue.value.file1 = '';
+	//   uni.showToast({ title:  '请上传身份证正面照片', icon: 'none' });
+	// }
+	// if (backFileList.value.length > 0) {
 		
-	  formValue.value.file2 = backFileList.value[leng2];
-	} else {
-	  // 若列表为空,清空file2(可选)
-	  formValue.value.file2 = '';
-	  uni.showToast({ title:  '请上传身份证反面照片', icon: 'none' });
-	}
+	//   formValue.value.file2 = backFileList.value[leng2];
+	// } else {
+	//   // 若列表为空,清空file2(可选)
+	//   formValue.value.file2 = '';
+	//   uni.showToast({ title:  '请上传身份证反面照片', icon: 'none' });
+	// }
 	
 	// 基础数据(必传字段)
 	  const requestData = {
@@ -581,7 +586,7 @@ const submitAddReqStu = async () => {
 	    cardNumber: formValue.value.cardNumber,
 	    // college: formValue.value.college,
 	    // instructor: formValue.value.instructor,
-	    // mobile: formValue.value.mobile,
+	    mobile: formValue.value.mobile,
 	    // file1: formValue.value.file1,
 	    // file2: formValue.value.file2
 	    // 先不包含 professor
@@ -592,7 +597,7 @@ const submitAddReqStu = async () => {
 		method: 'post',
 		data: formValue.value
 	})
-	// console.log(res)
+	console.log(res,'lll',res.code == 200)
 	if (res.code == 200) {
 		uni.showToast({
 			title: res.message,
@@ -603,6 +608,12 @@ const submitAddReqStu = async () => {
 				url: '/pages/transportation/transportation'
 			})
 		}, 1500)
+	}else{
+		console.log(res,'lll')
+		uni.showToast({
+			title: res.message,
+			icon: 'err'
+		})
 	}
 }
 
@@ -634,7 +645,7 @@ const submitEditReqStu = async () => {
 	    cardNumber: formValue.value.cardNumber,
 	    // college: formValue.value.college,
 	    // instructor: formValue.value.instructor,
-	    // mobile: formValue.value.mobile,
+	    mobile: formValue.value.mobile,
 	    // file1: formValue.value.file1,
 	    // file2: formValue.value.file2
 	    // 先不包含 professor

+ 28 - 25
pages/chooseCar/chooseCar.vue

@@ -10,9 +10,12 @@
 
 				<image class="carMsg_line" src="@/static/images/chooseCar/line.png" mode="aspectFill" />
 
-				<view class="carMsg_start">{{getRouteParts(info.route_end).prefix}}</view>
+				<!-- <view class="carMsg_start">{{getRouteParts(info.route_end).prefix}}</view> -->
+				<view class="carMsg_start"> 
+					<view :class="{ '': true, 'app': index2 > 0 }"  v-for="(item2, index2) in getRouteParts(info.route_end)" :key="index2">{{item2}}</view>
+				</view>
 
-				<view class="carMsg_end">{{getRouteParts(info.route_end).suffix}}</view>
+				<!-- <view class="carMsg_end">{{getRouteParts(info.route_end).suffix}}</view> -->
 
 				<view class="carMsg_bottom">
 					<view class="bottom_box" @click="handleRule">退改规则</view>
@@ -243,14 +246,11 @@ const payParams = ref({
 
 // 截取箭头前后的文字
 const getRouteParts = (str) => {
-  if (str && typeof str === 'string') {
-    const parts = str.split('→');
-    return {
-      prefix: parts[0] || '', // 箭头前的文字
-      suffix: parts[1] || ''  // 箭头后的文字
-    };
+  if (typeof str === 'string' && str.length > 0) {
+  	return str.split('→');
   }
-  return { prefix: '', suffix: '' };
+  
+  return [];
 };
 
 onLoad((options) => {
@@ -554,42 +554,45 @@ const invokeWechatPay = () => {
 			background-size: 100% 100%;
 
 			.carMsg_time {
-				position: absolute;
+				position: relative;
 				top: 36rpx;
 				font-size: 36rpx;
 				color: #001713;
 			}
 
 			.carMsg_number {
-				position: absolute;
-				top: 44rpx;
-				right: 55rpx;
+				position: relative;
+				top: -8rpx;
+				left: 180px;
 				font-size: 24rpx;
 				color: #f86818;
 			}
 
 			.carMsg_volume {
-				position: absolute;
-				top: 86rpx;
-				right: 55rpx;
+				position: relative;
+				top: 10rpx;
+				left: 180px;
 				font-size: 24rpx;
 				color: #f86818;
 			}
 
 			.carMsg_line {
-				position: absolute;
-				top: 128rpx;
-				left: 55rpx;
+				position: relative;
+				top: 2rpx;
+				left: 1px;
 				width: 14rpx;
 				height: 88rpx;
 			}
 
 			.carMsg_start {
-				position: absolute;
-				top: 106rpx;
-				left: 95rpx;
+				position: relative;
+				top: -110rpx;
+				left: 15px;
 				width: 460rpx;
 			}
+			.app{
+				margin-top: 1px;
+			}
 
 			.carMsg_end {
 				position: absolute;
@@ -599,9 +602,9 @@ const invokeWechatPay = () => {
 			}
 
 			.carMsg_bottom {
-				position: absolute;
-				top: 236rpx;
-				left: 46rpx;
+				position: relative;
+				top: -100rpx;
+				// left: 46rpx;
 				display: flex;
 				align-items: center;
 				width: 630rpx;

+ 65 - 17
pages/home/home.vue

@@ -37,12 +37,13 @@
 			选择车辆
 			<view class="car_list">
 				<!-- 每一个车辆区域 -->
-				<view v-for="(item, index) in busList" :key="index" class="car_box" @click="handleClickItem(item)">
+				<view v-for="(item, index) in busList" :key="index" :class="{ 'car_box': true, 'car_box1': item.isExpired,'car_box2': !item.isExpired  }" @click="handleClickItem(item)"> 
 					<view class="box_top">
 						<view class="top_time">{{item.ci_time}}</view>
+						<image class="top-line" src="../../static/images/home/line.png"></image>
 						<view class="top_info">
-							<view class="info_box">{{getRouteParts(item.route_end).prefix}}</view>
-							<view class="info_box top">{{getRouteParts(item.route_end).suffix}}</view>
+							<view :class="{ 'info_box': true, 'top': index2 > 0 }"  v-for="(item2, index2) in getRouteParts(item.route_end)" :key="index2">{{item2}}</view>
+							<!-- <view class="info_box top">{{getRouteParts(item.route_end).suffix}}</view> -->
 						</view>
 						<view class="top_msg">   
 							<view class="msg_price">
@@ -54,7 +55,8 @@
 						</view>
 					</view>
 
-					<view class="box_bottom">
+					<image class="top-line2" src="../../static/images/home/line-bu.png" v-if="item.isExpired==false"></image>
+					<view class="box_bottom">   
 						<view class="bottom_box">6点30分起售</view>
 
 						<view class="bottom_box">车牌:{{ item.car_number }}</view>
@@ -117,14 +119,19 @@ const yy_end = ref(0)
 
 // 截取箭头前后的文字
 const getRouteParts = (str) => {
-  if (str && typeof str === 'string') {
-    const parts = str.split('→');
-    return {
-      prefix: parts[0] || '', // 箭头前的文字
-      suffix: parts[1] || ''  // 箭头后的文字
-    };
-  }
-  return { prefix: '', suffix: '' };
+	if (typeof str === 'string' && str.length > 0) {
+		return str.split('→');
+	}
+	
+	return [];
+  // if (str && typeof str === 'string') {
+  //   const parts = str.split('→').slice(1); // 分割后取第2个及以后的元素
+  //   // return {
+  //   //   prefix: parts[0] || '', // 箭头前的文字
+  //   //   suffix: parts[parts.length - 1] || ''  // 箭头最后的文字 
+  //   // };
+  // }
+  // return { prefix: '', suffix: '' };
 };
 
 // 获取预约时间段数据
@@ -147,7 +154,24 @@ async function getBusList(route) {
 		}
 	})
 	// console.log(res)
-	busList.value = res.data.data || []
+	// ... 在获取到 res 数据之后
+	if (res.data && res.data.data) {
+	  res.data.data.forEach(item => {
+	    // 1. 拼接目标时间字符串
+	    const targetDateStr = `${item.s_date} ${item.yy_end}`;
+	    
+	    // 2. 转换为时间戳并比较
+	    const targetTimestamp = new Date(targetDateStr).getTime();
+	    const nowTimestamp = new Date().getTime();
+	    
+	    // 3. 添加判断后的参数到 item 对象中
+	    // 这里我们添加一个叫 isExpired 的布尔值
+	    item.isExpired = nowTimestamp > targetTimestamp;
+	  }); 
+	  busList.value = res.data.data || []
+	  console.log(busList.value,'车次')
+	}
+	
 }
 
 // 获取所有的发车路线
@@ -298,27 +322,45 @@ const handleClose = () => {
 		.car_list {
 			margin-top: 20rpx;
 
+			.car_box1{
+				/* 背景色调:浅灰色系,可根据需求微调 */
+				  background-color: rgba(0, 0, 0, 0.1);    
+				  /* 阴影:轻微立体感,参数为 水平偏移 垂直偏移 模糊度 扩散度 颜色 */
+				  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1); 
+				  /* 可选:圆角优化视觉 */
+				  border-radius: 8px;    
+			}
+			.car_box2{
+				background-color: #FFFFFF;
+			}
 			.car_box {
 				box-sizing: border-box;
 				padding: 34rpx 34rpx 0;
 				margin-bottom: 20rpx;
 				width: 100%;
-				height: 222rpx;
-				background: url(@/static/images/home/car-box.png);
+				height: 100%;
+				background-color: #FFFFFF;
+				// background: url(@/static/images/home/car-box.png);
 				background-size: 100% 100%;
 
 				.box_top {
 					display: flex;
 					align-items: center;
-					height: 110rpx;
+					// height: 110rpx;
 
 					.top_time {
 						margin-top: -30rpx;
 						margin-right: 76rpx;
 						font-size: 44rpx;
 					}
+					.top-line{
+						width: 7px;
+						height: 34px;
+						background-size: 100%;
+					}
 
 					.top_info {
+						margin-left: 2px;
 						height: 100%;
 						font-size: 28rpx;
 
@@ -330,7 +372,7 @@ const handleClose = () => {
 						}
 
 						.top {
-							margin-top: 14rpx;
+							margin-top: 8rpx; 
 						}
 					}
 
@@ -353,6 +395,12 @@ const handleClose = () => {
 						}
 					}
 				}
+				.top-line2{
+					margin-left: -20px;
+					width: 114%;
+					height: 17px; 
+					background-size: 100%; 
+				}
 
 				.box_bottom {
 					display: flex;

+ 13 - 10
pages/order/order.vue

@@ -28,10 +28,13 @@
 							<view class="box_center">
 								<image class="center_img" src="@/static/images/home/line.png" mode="aspectFill" />
 
-								<view class="center_text">
-									<view class="text_start">{{getRouteParts(item.route_end).prefix}}</view>
+								<!-- <view class="center_text" v-for="item2 in getRouteParts(item.route_end).parts" :key="item2.id">
+									<view class="text_start">{{item2}}</view> -->
 
-									<view class="text_end">{{getRouteParts(item.route_end).suffix}}</view>
+									<!-- <view class="text_end">{{getRouteParts(item.route_end).suffix}}</view> -->
+								<!-- </view> -->
+								<view class="center_text">
+									<view :class="{ 'text_start': true, 'app': index2 > 0 }"  v-for="(item2, index2) in getRouteParts(item.route_end)" :key="index2">{{item2}}</view>
 								</view>
 
 								<view class="center_price">
@@ -191,14 +194,11 @@ const payParams = ref({
 
 // 截取箭头前后的文字
 const getRouteParts = (str) => {
-  if (str && typeof str === 'string') {
-    const parts = str.split('→');
-    return {
-      prefix: parts[0] || '', // 箭头前的文字
-      suffix: parts[1] || ''  // 箭头后的文字
-    };
+  if (typeof str === 'string' && str.length > 0) {
+  	return str.split('→');
   }
-  return { prefix: '', suffix: '' };
+  
+  return [];
 };
 
 // 获取用户预约数据
@@ -458,6 +458,9 @@ const tuiPay = async (item) => {
 						white-space: nowrap;
 						overflow: hidden;
 					}
+					.app{
+						margin-top: 1px;
+					}
 
 					.text_end {
 						margin-top: 30rpx;

+ 12 - 9
pages/orderDetail/orderDetail.vue

@@ -51,9 +51,12 @@
 
 					<image class="carMsg_line" src="@/static/images/chooseCar/line.png" mode="aspectFill" />
 
-					<view class="carMsg_start">{{getRouteParts(info.route_end).prefix}}</view>
+					<!-- <view class="carMsg_start">{{getRouteParts(info.route_end).prefix}}</view> -->
+					<view class="carMsg_start">
+						<view :class="{ '': true, 'app': index2 > 0 }"  v-for="(item2, index2) in getRouteParts(info.route_end)" :key="index2">{{item2}}</view>
+					</view>
 
-					<view class="carMsg_end">{{getRouteParts(info.route_end).suffix}}</view>
+					<!-- <view class="carMsg_end">{{getRouteParts(info.route_end).suffix}}</view> -->
 				</view>
 
 				<!-- 二维码区域 -->
@@ -169,14 +172,11 @@ const selectedPay = ref(null);
 const orderNo = ref('');
 // 截取箭头前后的文字
 const getRouteParts = (str) => {
-  if (str && typeof str === 'string') {
-    const parts = str.split('→');
-    return {
-      prefix: parts[0] || '', // 箭头前的文字
-      suffix: parts[1] || ''  // 箭头后的文字
-    };
+  if (typeof str === 'string' && str.length > 0) {
+  	return str.split('→');
   }
-  return { prefix: '', suffix: '' };
+  
+  return [];
 };
 
 onLoad((options) => {
@@ -391,6 +391,9 @@ const tuiPay = async (item) => {
 					left: 40rpx;
 					width: 460rpx;
 				}
+				.app{
+					margin-top: 1px;
+				}
 
 				.carMsg_end {
 					position: absolute;

+ 5 - 3
pages/pay/pay.vue

@@ -76,7 +76,8 @@
 <script setup>
 import { onMounted, ref } from 'vue'
 import { myRequest } from '@/utils/api.ts'
-
+import { useTabParamStore } from '@/utils/tabParams.js';
+const tabParamStore = useTabParamStore();
 const userInfo = uni.getStorageSync('carUserInfo')
 // 胶囊按钮距离页面顶部的距离
 const paddingTop = ref(0)
@@ -126,11 +127,12 @@ const payParams = ref({
 const selectedPay = ref(null);
 
 onMounted(() => {
+	console.log(uni.getStorageSync('cardTypeNum'),'身份')
 	paddingTop.value = uni.getMenuButtonBoundingClientRect().top
 	getChongcommon()
 })
 
-// 点击切换选项的回调
+// 点击切换选项的回调    
 const hadnleChange = (item) => {
 	chongList.value.forEach(item => {
 	    item.isChecked = false;
@@ -146,7 +148,7 @@ const jiaotong = async () => {
 		method: 'POST', // 明确指定请求方法为POST
 		data: {
 			mobile: userInfo.mobile,
-			type: 1,
+			type: uni.getStorageSync('cardTypeNum'),
 			account4: totalAmount.value,
 			account5: zengAmount.value,
 		}

+ 26 - 9
pages/transportation/transportation.vue

@@ -17,8 +17,8 @@
 						<image v-if="cardType == '优行卡'" class="img" src="/static/images/transportation/logo.png" mode="aspectFill"></image>
 						<image v-if="cardType == '教师卡'" class="img" src="/static/images/transportation/logo2.png" mode="aspectFill"></image>
 						<image v-if="cardType == '暖心卡'" class="img" src="/static/images/transportation/logo3.png" mode="aspectFill"></image>
-						{{ cardType }}
-					</view>
+						{{ cardType }} 
+					</view> 
 					<view class="type_au" @click="goPage()">
 						<text class="text">身份认证</text>
 						<wd-icon name="arrow-right" color="#376477" size="8"></wd-icon>
@@ -49,7 +49,7 @@
 
 			<!-- 使用规则区域 -->
 			<view class="body_rule">交通卡使用规则</view>
-			<image class="body_rule_img" :src="rulesImg">交通卡使用规则</image>
+			<image class="body_rule_img" :src="rulesImg" @click="clickImg">交通卡使用规则</image>
 		</view>
 	</view>
 
@@ -76,7 +76,9 @@
 <script setup>
 import { onMounted, ref } from 'vue'
 import { myRequest } from '@/utils/api.ts'
-
+import { useTabParamStore } from '@/utils/tabParams.js';
+const tabParamStore = useTabParamStore();
+ 
 // 胶囊按钮距离页面顶部的距离
 const paddingTop = ref(0)
 // 用户信息
@@ -101,7 +103,16 @@ const rulesImg = ref('')
 const rulesImg1= ref('')
 const rulesImg2= ref('')
 const rulesImg3= ref('')
-
+//点击放大图片
+const clickImg = () => {
+	wx.previewImage({
+		urls: [rulesImg.value], //需要预览的图片http链接列表,多张的时候,url直接写在后面就行了
+		current: '', // 当前显示图片的http链接,默认是第一个
+		success: function(res) {},
+		fail: function(res) {},
+		complete: function(res) {},
+	})
+};
 // 查看我的认证信息
 async function getMyVetry() {
 	const res = await myRequest({
@@ -120,11 +131,17 @@ async function getMyVetry() {
 			cardType.value = '暖心卡'
 			cardTypeNum.value=2
 		}
-		getYougui()     
+		getYougui()   
+		  console.log('卡',cardTypeNum.value)
+		  // 1. 存储参数到全局状态
+		  uni.setStorageSync('cardTypeNum', cardTypeNum.value)
 	}else if(res.code==205){
 		cardType.value = '优行卡'
 		cardTypeNum.value=0
-		getYougui()     
+		getYougui()
+		 console.log('卡',cardTypeNum.value)
+		 // 1. 存储参数到全局状态
+		 uni.setStorageSync('cardTypeNum', cardTypeNum.value)
 	}
 	
 }
@@ -419,8 +436,8 @@ const handleBack = () => {
 			font-size: 36rpx;
 		}
 		.body_rule_img{
-			width: 353rpx;
-			height: 438rpx;
+			width: 100%;
+			height: 200px;
 			background-size: 100%;
 		}
 	}

TEMPAT SAMPAH
static/images/home/car-box.png


TEMPAT SAMPAH
static/images/home/line-bu.png


File diff ditekan karena terlalu besar
+ 43 - 1
unpackage/dist/dev/mp-weixin/app.js


File diff ditekan karena terlalu besar
+ 2362 - 2
unpackage/dist/dev/mp-weixin/app.wxss


File diff ditekan karena terlalu besar
+ 23 - 1
unpackage/dist/dev/mp-weixin/common/assets.js


File diff ditekan karena terlalu besar
+ 8705 - 16
unpackage/dist/dev/mp-weixin/common/vendor.js


File diff ditekan karena terlalu besar
+ 87 - 1
unpackage/dist/dev/mp-weixin/components/AuthorizePopup.js


File diff ditekan karena terlalu besar
+ 44 - 1
unpackage/dist/dev/mp-weixin/components/AuthorizePopup.wxss


File diff ditekan karena terlalu besar
+ 538 - 1
unpackage/dist/dev/mp-weixin/pages/authenticate/authenticate.js


File diff ditekan karena terlalu besar
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/authenticate/authenticate.wxml


File diff ditekan karena terlalu besar
+ 34 - 1
unpackage/dist/dev/mp-weixin/pages/authenticate/authenticate.wxss


File diff ditekan karena terlalu besar
+ 441 - 1
unpackage/dist/dev/mp-weixin/pages/chooseCar/chooseCar.js


File diff ditekan karena terlalu besar
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/chooseCar/chooseCar.wxml


File diff ditekan karena terlalu besar
+ 425 - 1
unpackage/dist/dev/mp-weixin/pages/chooseCar/chooseCar.wxss


File diff ditekan karena terlalu besar
+ 131 - 1
unpackage/dist/dev/mp-weixin/pages/commonPeople/commonPeople.js


File diff ditekan karena terlalu besar
+ 53 - 1
unpackage/dist/dev/mp-weixin/pages/commonPeople/commonPeople.wxss


File diff ditekan karena terlalu besar
+ 48 - 1
unpackage/dist/dev/mp-weixin/pages/coupon/coupon.js


+ 22 - 1
unpackage/dist/dev/mp-weixin/pages/coupon/coupon.wxss

@@ -1 +1,22 @@
-.container.data-v-96ba783d{box-sizing:border-box;padding:0 30rpx;height:100%;color:#001713;background-color:#fffdfb}.container.data-v-96ba783d .custom_class_tab .wd-tabs__line{background-color:#ff8205}.container .content.data-v-96ba783d{box-sizing:border-box;padding:30rpx 0;height:calc(100vh - 84rpx);color:#001713;overflow-y:auto}.container .content .status_tip.data-v-96ba783d{margin-top:100rpx}
+/* 水平间距 */
+/* 水平间距 */
+.container.data-v-96ba783d {
+  box-sizing: border-box;
+  padding: 0 30rpx;
+  height: 100%;
+  color: #001713;
+  background-color: #fffdfb;
+}
+.container.data-v-96ba783d .custom_class_tab .wd-tabs__line {
+  background-color: #ff8205;
+}
+.container .content.data-v-96ba783d {
+  box-sizing: border-box;
+  padding: 30rpx 0;
+  height: calc(100vh - 84rpx);
+  color: #001713;
+  overflow-y: auto;
+}
+.container .content .status_tip.data-v-96ba783d {
+  margin-top: 100rpx;
+}

File diff ditekan karena terlalu besar
+ 43 - 1
unpackage/dist/dev/mp-weixin/pages/date/date.js


+ 11 - 1
unpackage/dist/dev/mp-weixin/pages/date/date.wxss

@@ -1 +1,11 @@
-.container.data-v-0877a28a{height:100vh}.container.data-v-0877a28a .customClass .wd-month-panel__container{height:100vh!important}.container.data-v-0877a28a .customClass .is-selected .wd-month__day-text{background-color:#ff8205}
+/* 水平间距 */
+/* 水平间距 */
+.container.data-v-0877a28a {
+  height: 100vh;
+}
+.container.data-v-0877a28a .customClass .wd-month-panel__container {
+  height: 100vh !important;
+}
+.container.data-v-0877a28a .customClass .is-selected .wd-month__day-text {
+  background-color: #ff8205;
+}

File diff ditekan karena terlalu besar
+ 202 - 1
unpackage/dist/dev/mp-weixin/pages/handlePeople/handlePeople.js


+ 17 - 1
unpackage/dist/dev/mp-weixin/pages/handlePeople/handlePeople.wxss

@@ -1 +1,17 @@
-.container.data-v-148e6f85{box-sizing:border-box;padding:20rpx 0;height:100vh;background-color:#fff}.container .footer.data-v-148e6f85{position:absolute;left:40rpx;right:40rpx;bottom:100rpx}.container .footer.data-v-148e6f85 .wd-button{background-color:#ff8205}
+/* 水平间距 */
+/* 水平间距 */
+.container.data-v-148e6f85 {
+  box-sizing: border-box;
+  padding: 20rpx 0;
+  height: 100vh;
+  background-color: #fff;
+}
+.container .footer.data-v-148e6f85 {
+  position: absolute;
+  left: 40rpx;
+  right: 40rpx;
+  bottom: 100rpx;
+}
+.container .footer.data-v-148e6f85 .wd-button {
+  background-color: #ff8205;
+}

File diff ditekan karena terlalu besar
+ 181 - 1
unpackage/dist/dev/mp-weixin/pages/home/home.js


File diff ditekan karena terlalu besar
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/home/home.wxml


File diff ditekan karena terlalu besar
+ 164 - 1
unpackage/dist/dev/mp-weixin/pages/home/home.wxss


File diff ditekan karena terlalu besar
+ 118 - 1
unpackage/dist/dev/mp-weixin/pages/identity/identity.js


File diff ditekan karena terlalu besar
+ 93 - 1
unpackage/dist/dev/mp-weixin/pages/identity/identity.wxss


+ 17 - 1
unpackage/dist/dev/mp-weixin/pages/index/index.js

@@ -1 +1,17 @@
-"use strict";const e=require("../../common/vendor.js"),n={__name:"index",setup(a){return e.onLoad(()=>{e.index.reLaunch({url:"/pages/home/home"})}),(c,r)=>({})}},_=e._export_sfc(n,[["__scopeId","data-v-1cf27b2a"],["__file","D:/创海项目/CH2025/约车小程序/yueche_app/pages/index/index.vue"]]);wx.createPage(_);
+"use strict";
+const common_vendor = require("../../common/vendor.js");
+const _sfc_main = {
+  __name: "index",
+  setup(__props) {
+    common_vendor.onLoad(() => {
+      common_vendor.index.reLaunch({
+        url: "/pages/home/home"
+      });
+    });
+    return (_ctx, _cache) => {
+      return {};
+    };
+  }
+};
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-1cf27b2a"], ["__file", "D:/创海项目/CH2025/约车小程序/yueche_app/pages/index/index.vue"]]);
+wx.createPage(MiniProgramPage);

+ 2 - 0
unpackage/dist/dev/mp-weixin/pages/index/index.wxss

@@ -0,0 +1,2 @@
+/* 水平间距 */
+/* 水平间距 */

File diff ditekan karena terlalu besar
+ 258 - 1
unpackage/dist/dev/mp-weixin/pages/mine/mine.js


File diff ditekan karena terlalu besar
+ 85 - 1
unpackage/dist/dev/mp-weixin/pages/mine/mine.wxss


File diff ditekan karena terlalu besar
+ 341 - 1
unpackage/dist/dev/mp-weixin/pages/order/order.js


File diff ditekan karena terlalu besar
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/order/order.wxml


File diff ditekan karena terlalu besar
+ 217 - 1
unpackage/dist/dev/mp-weixin/pages/order/order.wxss


File diff ditekan karena terlalu besar
+ 250 - 1
unpackage/dist/dev/mp-weixin/pages/orderDetail/orderDetail.js


File diff ditekan karena terlalu besar
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/orderDetail/orderDetail.wxml


File diff ditekan karena terlalu besar
+ 230 - 1
unpackage/dist/dev/mp-weixin/pages/orderDetail/orderDetail.wxss


File diff ditekan karena terlalu besar
+ 225 - 1
unpackage/dist/dev/mp-weixin/pages/pay/pay.js


File diff ditekan karena terlalu besar
+ 163 - 1
unpackage/dist/dev/mp-weixin/pages/pay/pay.wxss


File diff ditekan karena terlalu besar
+ 249 - 1
unpackage/dist/dev/mp-weixin/pages/transportation/transportation.js


File diff ditekan karena terlalu besar
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/transportation/transportation.wxml


File diff ditekan karena terlalu besar
+ 195 - 1
unpackage/dist/dev/mp-weixin/pages/transportation/transportation.wxss


File diff ditekan karena terlalu besar
+ 133 - 1
unpackage/dist/dev/mp-weixin/pages/useDetail/useDetail.js


File diff ditekan karena terlalu besar
+ 63 - 1
unpackage/dist/dev/mp-weixin/pages/useDetail/useDetail.wxss


+ 0 - 1
unpackage/dist/dev/mp-weixin/project.config.json

@@ -11,7 +11,6 @@
     "minified": false,
     "newFeature": true,
     "bigPackageSizeSupport": true,
-    "ignoreUploadUnusedFiles": true,
     "babelSetting": {
       "ignore": [],
       "disablePlugins": [],

TEMPAT SAMPAH
unpackage/dist/dev/mp-weixin/static/images/home/car-box.png


TEMPAT SAMPAH
unpackage/dist/dev/mp-weixin/static/images/home/line-bu.png


+ 3 - 1
unpackage/dist/dev/mp-weixin/uni_modules/uv-qrcode/components/uv-qrcode/cache.js

@@ -1 +1,3 @@
-"use strict";const c=[];exports.cacheImageList=c;
+"use strict";
+const cacheImageList = [];
+exports.cacheImageList = cacheImageList;

File diff ditekan karena terlalu besar
+ 82 - 1
unpackage/dist/dev/mp-weixin/uni_modules/uv-qrcode/components/uv-qrcode/props.js


File diff ditekan karena terlalu besar
+ 656 - 1
unpackage/dist/dev/mp-weixin/uni_modules/uv-qrcode/components/uv-qrcode/qrcode.js


+ 37 - 1
unpackage/dist/dev/mp-weixin/uni_modules/uv-qrcode/components/uv-qrcode/queue.js

@@ -1 +1,37 @@
-"use strict";function c(){let i=this.waitingQueue=[],s=this.isRunning=!1;function a(n,u,t){n().then(e=>{u(e)}).catch(e=>{t(e)}).finally(()=>{if(i.length){const e=i.shift();a(e.task,e.resolve,e.reject)}else s=!1})}this.exec=function(n){return new Promise((u,t)=>{s?i.push({task:n,resolve:u,reject:t}):(s=!0,a(n,u,t))})}}const f=new c,l=new c;exports.queueDraw=f;exports.queueLoadImage=l;
+"use strict";
+function Queue() {
+  let waitingQueue = this.waitingQueue = [];
+  let isRunning = this.isRunning = false;
+  function execute(task, resolve, reject) {
+    task().then((data) => {
+      resolve(data);
+    }).catch((e) => {
+      reject(e);
+    }).finally(() => {
+      if (waitingQueue.length) {
+        const next = waitingQueue.shift();
+        execute(next.task, next.resolve, next.reject);
+      } else {
+        isRunning = false;
+      }
+    });
+  }
+  this.exec = function(task) {
+    return new Promise((resolve, reject) => {
+      if (isRunning) {
+        waitingQueue.push({
+          task,
+          resolve,
+          reject
+        });
+      } else {
+        isRunning = true;
+        execute(task, resolve, reject);
+      }
+    });
+  };
+}
+const queueDraw = new Queue();
+const queueLoadImage = new Queue();
+exports.queueDraw = queueDraw;
+exports.queueLoadImage = queueLoadImage;

File diff ditekan karena terlalu besar
+ 681 - 1
unpackage/dist/dev/mp-weixin/uni_modules/uv-qrcode/components/uv-qrcode/uv-qrcode.js


File diff ditekan karena terlalu besar
+ 99 - 1
unpackage/dist/dev/mp-weixin/uni_modules/uv-qrcode/components/uv-qrcode/uv-qrcode.wxss


+ 19 - 1
unpackage/dist/dev/mp-weixin/uni_modules/uv-ui-tools/libs/function/debounce.js

@@ -1 +1,19 @@
-"use strict";let e=null;function u(t,o=500,l=!1){if(e!==null&&clearTimeout(e),l){const i=!e;e=setTimeout(()=>{e=null},o),i&&typeof t=="function"&&t()}else e=setTimeout(()=>{typeof t=="function"&&t()},o)}exports.debounce=u;
+"use strict";
+let timeout = null;
+function debounce(func, wait = 500, immediate = false) {
+  if (timeout !== null)
+    clearTimeout(timeout);
+  if (immediate) {
+    const callNow = !timeout;
+    timeout = setTimeout(() => {
+      timeout = null;
+    }, wait);
+    if (callNow)
+      typeof func === "function" && func();
+  } else {
+    timeout = setTimeout(() => {
+      typeof func === "function" && func();
+    }, wait);
+  }
+}
+exports.debounce = debounce;

File diff ditekan karena terlalu besar
+ 63 - 1
unpackage/dist/dev/mp-weixin/uni_modules/uv-ui-tools/libs/function/digit.js


File diff ditekan karena terlalu besar
+ 502 - 1
unpackage/dist/dev/mp-weixin/uni_modules/uv-ui-tools/libs/function/index.js


File diff ditekan karena terlalu besar
+ 177 - 1
unpackage/dist/dev/mp-weixin/uni_modules/uv-ui-tools/libs/function/test.js


+ 20 - 1
unpackage/dist/dev/mp-weixin/uni_modules/uv-ui-tools/libs/function/throttle.js

@@ -1 +1,20 @@
-"use strict";let t;function i(e,o=500,f=!0){f?t||(t=!0,typeof e=="function"&&e(),setTimeout(()=>{t=!1},o)):t||(t=!0,setTimeout(()=>{t=!1,typeof e=="function"&&e()},o))}exports.throttle=i;
+"use strict";
+let flag;
+function throttle(func, wait = 500, immediate = true) {
+  if (immediate) {
+    if (!flag) {
+      flag = true;
+      typeof func === "function" && func();
+      setTimeout(() => {
+        flag = false;
+      }, wait);
+    }
+  } else if (!flag) {
+    flag = true;
+    setTimeout(() => {
+      flag = false;
+      typeof func === "function" && func();
+    }, wait);
+  }
+}
+exports.throttle = throttle;

File diff ditekan karena terlalu besar
+ 151 - 1
unpackage/dist/dev/mp-weixin/uni_modules/uv-ui-tools/libs/mixin/mixin.js


+ 8 - 1
unpackage/dist/dev/mp-weixin/uni_modules/uv-ui-tools/libs/mixin/mpMixin.js

@@ -1 +1,8 @@
-"use strict";const i={options:{virtualHost:!0}};exports.mpMixin=i;
+"use strict";
+const mpMixin = {
+  // 将自定义节点设置成虚拟的(去掉自定义组件包裹层),更加接近Vue组件的表现,能更好的使用flex属性
+  options: {
+    virtualHost: true
+  }
+};
+exports.mpMixin = mpMixin;

File diff ditekan karena terlalu besar
+ 106 - 1
unpackage/dist/dev/mp-weixin/uni_modules/uv-ui-tools/libs/util/route.js


+ 23 - 1
unpackage/dist/dev/mp-weixin/uni_modules/wot-design-uni/components/common/AbortablePromise.js

@@ -1 +1,23 @@
-"use strict";class s{constructor(t){this._reject=null,this.promise=new Promise((e,r)=>{t(e,r),this._reject=r})}abort(t){this._reject&&this._reject(t)}then(t,e){return this.promise.then(t,e)}catch(t){return this.promise.catch(t)}}exports.AbortablePromise=s;
+"use strict";
+class AbortablePromise {
+  constructor(executor) {
+    this._reject = null;
+    this.promise = new Promise((resolve, reject) => {
+      executor(resolve, reject);
+      this._reject = reject;
+    });
+  }
+  // 提供abort方法来中止Promise
+  abort(error) {
+    if (this._reject) {
+      this._reject(error);
+    }
+  }
+  then(onfulfilled, onrejected) {
+    return this.promise.then(onfulfilled, onrejected);
+  }
+  catch(onrejected) {
+    return this.promise.catch(onrejected);
+  }
+}
+exports.AbortablePromise = AbortablePromise;

File diff ditekan karena terlalu besar
+ 27 - 1
unpackage/dist/dev/mp-weixin/uni_modules/wot-design-uni/components/common/base64.js


+ 44 - 1
unpackage/dist/dev/mp-weixin/uni_modules/wot-design-uni/components/common/props.js

@@ -1 +1,44 @@
-"use strict";const o=[Number,String],t=e=>({type:e,required:!0}),a=()=>({type:Array,default:()=>[]}),m=e=>({type:Boolean,default:e}),p=e=>({type:Number,default:e}),u=e=>({type:o,default:e}),r=e=>({type:String,default:e}),s={customStyle:r(""),customClass:r("")};exports.baseProps=s;exports.makeArrayProp=a;exports.makeBooleanProp=m;exports.makeNumberProp=p;exports.makeNumericProp=u;exports.makeRequiredProp=t;exports.makeStringProp=r;exports.numericProp=o;
+"use strict";
+const numericProp = [Number, String];
+const makeRequiredProp = (type) => ({
+  type,
+  required: true
+});
+const makeArrayProp = () => ({
+  type: Array,
+  default: () => []
+});
+const makeBooleanProp = (defaultVal) => ({
+  type: Boolean,
+  default: defaultVal
+});
+const makeNumberProp = (defaultVal) => ({
+  type: Number,
+  default: defaultVal
+});
+const makeNumericProp = (defaultVal) => ({
+  type: numericProp,
+  default: defaultVal
+});
+const makeStringProp = (defaultVal) => ({
+  type: String,
+  default: defaultVal
+});
+const baseProps = {
+  /**
+   * 自定义根节点样式
+   */
+  customStyle: makeStringProp(""),
+  /**
+   * 自定义根节点样式类
+   */
+  customClass: makeStringProp("")
+};
+exports.baseProps = baseProps;
+exports.makeArrayProp = makeArrayProp;
+exports.makeBooleanProp = makeBooleanProp;
+exports.makeNumberProp = makeNumberProp;
+exports.makeNumericProp = makeNumericProp;
+exports.makeRequiredProp = makeRequiredProp;
+exports.makeStringProp = makeStringProp;
+exports.numericProp = numericProp;

File diff ditekan karena terlalu besar
+ 306 - 1
unpackage/dist/dev/mp-weixin/uni_modules/wot-design-uni/components/common/util.js


+ 12 - 1
unpackage/dist/dev/mp-weixin/uni_modules/wot-design-uni/components/composables/useCell.js

@@ -1 +1,12 @@
-"use strict";const n=require("../../../../common/vendor.js"),r=require("./useParent.js"),s=require("../wd-cell-group/types.js");function t(){const{parent:e,index:o}=r.useParent(s.CELL_GROUP_KEY);return{border:n.computed(()=>e&&e.props.border&&o.value)}}exports.useCell=t;
+"use strict";
+const common_vendor = require("../../../../common/vendor.js");
+const uni_modules_wotDesignUni_components_composables_useParent = require("./useParent.js");
+const uni_modules_wotDesignUni_components_wdCellGroup_types = require("../wd-cell-group/types.js");
+function useCell() {
+  const { parent: cellGroup, index } = uni_modules_wotDesignUni_components_composables_useParent.useParent(uni_modules_wotDesignUni_components_wdCellGroup_types.CELL_GROUP_KEY);
+  const border = common_vendor.computed(() => {
+    return cellGroup && cellGroup.props.border && index.value;
+  });
+  return { border };
+}
+exports.useCell = useCell;

File diff ditekan karena terlalu besar
+ 80 - 1
unpackage/dist/dev/mp-weixin/uni_modules/wot-design-uni/components/composables/useChildren.js


+ 21 - 1
unpackage/dist/dev/mp-weixin/uni_modules/wot-design-uni/components/composables/useParent.js

@@ -1 +1,21 @@
-"use strict";const n=require("../../../../common/vendor.js");function s(r){const e=n.inject(r,null);if(e){const t=n.getCurrentInstance(),{link:i,unlink:u,internalChildren:c}=e;i(t),n.onUnmounted(()=>u(t));const o=n.computed(()=>c.indexOf(t));return{parent:e,index:o}}return{parent:null,index:n.ref(-1)}}exports.useParent=s;
+"use strict";
+const common_vendor = require("../../../../common/vendor.js");
+function useParent(key) {
+  const parent = common_vendor.inject(key, null);
+  if (parent) {
+    const instance = common_vendor.getCurrentInstance();
+    const { link, unlink, internalChildren } = parent;
+    link(instance);
+    common_vendor.onUnmounted(() => unlink(instance));
+    const index = common_vendor.computed(() => internalChildren.indexOf(instance));
+    return {
+      parent,
+      index
+    };
+  }
+  return {
+    parent: null,
+    index: common_vendor.ref(-1)
+  };
+}
+exports.useParent = useParent;

File diff ditekan karena terlalu besar
+ 41 - 1
unpackage/dist/dev/mp-weixin/uni_modules/wot-design-uni/components/composables/useTouch.js


+ 13 - 1
unpackage/dist/dev/mp-weixin/uni_modules/wot-design-uni/components/composables/useTranslate.js

@@ -1 +1,13 @@
-"use strict";const s=require("../common/util.js"),c=require("../../locale/index.js"),i=n=>{const t=n?s.camelCase(n)+".":"";return{translate:(o,...r)=>{const a=c.Locale.messages(),e=s.getPropByPath(a,t+o);return s.isFunction(e)?e(...r):s.isDef(e)?e:`${t}${o}`}}};exports.useTranslate=i;
+"use strict";
+const uni_modules_wotDesignUni_components_common_util = require("../common/util.js");
+const uni_modules_wotDesignUni_locale_index = require("../../locale/index.js");
+const useTranslate = (name) => {
+  const prefix = name ? uni_modules_wotDesignUni_components_common_util.camelCase(name) + "." : "";
+  const translate = (key, ...args) => {
+    const currentMessages = uni_modules_wotDesignUni_locale_index.Locale.messages();
+    const message = uni_modules_wotDesignUni_components_common_util.getPropByPath(currentMessages, prefix + key);
+    return uni_modules_wotDesignUni_components_common_util.isFunction(message) ? message(...args) : uni_modules_wotDesignUni_components_common_util.isDef(message) ? message : `${prefix}${key}`;
+  };
+  return { translate };
+};
+exports.useTranslate = useTranslate;

File diff ditekan karena terlalu besar
+ 189 - 1
unpackage/dist/dev/mp-weixin/uni_modules/wot-design-uni/components/composables/useUpload.js


+ 37 - 1
unpackage/dist/dev/mp-weixin/uni_modules/wot-design-uni/components/wd-badge/types.js

@@ -1 +1,37 @@
-"use strict";const o=require("../common/props.js"),e={...o.baseProps,modelValue:o.numericProp,showZero:o.makeBooleanProp(!1),bgColor:String,max:Number,isDot:Boolean,hidden:Boolean,type:o.makeStringProp(void 0),top:o.numericProp,right:o.numericProp};exports.badgeProps=e;
+"use strict";
+const uni_modules_wotDesignUni_components_common_props = require("../common/props.js");
+const badgeProps = {
+  ...uni_modules_wotDesignUni_components_common_props.baseProps,
+  /**
+   * 显示值
+   */
+  modelValue: uni_modules_wotDesignUni_components_common_props.numericProp,
+  /** 当数值为 0 时,是否展示徽标 */
+  showZero: uni_modules_wotDesignUni_components_common_props.makeBooleanProp(false),
+  bgColor: String,
+  /**
+   * 最大值,超过最大值会显示 '{max}+',要求 value 是 Number 类型
+   */
+  max: Number,
+  /**
+   * 是否为红色点状标注
+   */
+  isDot: Boolean,
+  /**
+   * 是否隐藏 badge
+   */
+  hidden: Boolean,
+  /**
+   * badge类型,可选值primary / success / warning / danger / info
+   */
+  type: uni_modules_wotDesignUni_components_common_props.makeStringProp(void 0),
+  /**
+   * 为正时,角标向下偏移对应的像素
+   */
+  top: uni_modules_wotDesignUni_components_common_props.numericProp,
+  /**
+   * 为正时,角标向左偏移对应的像素
+   */
+  right: uni_modules_wotDesignUni_components_common_props.numericProp
+};
+exports.badgeProps = badgeProps;

File diff ditekan karena terlalu besar
+ 58 - 1
unpackage/dist/dev/mp-weixin/uni_modules/wot-design-uni/components/wd-badge/wd-badge.js


File diff ditekan karena terlalu besar
+ 216 - 1
unpackage/dist/dev/mp-weixin/uni_modules/wot-design-uni/components/wd-badge/wd-badge.wxss


File diff ditekan karena terlalu besar
+ 95 - 1
unpackage/dist/dev/mp-weixin/uni_modules/wot-design-uni/components/wd-button/types.js


File diff ditekan karena terlalu besar
+ 171 - 1
unpackage/dist/dev/mp-weixin/uni_modules/wot-design-uni/components/wd-button/wd-button.js


File diff ditekan karena terlalu besar
+ 430 - 1
unpackage/dist/dev/mp-weixin/uni_modules/wot-design-uni/components/wd-button/wd-button.wxss


File diff ditekan karena terlalu besar
+ 341 - 1
unpackage/dist/dev/mp-weixin/uni_modules/wot-design-uni/components/wd-calendar-view/month/month.js


File diff ditekan karena terlalu besar
+ 286 - 1
unpackage/dist/dev/mp-weixin/uni_modules/wot-design-uni/components/wd-calendar-view/month/month.wxss


+ 19 - 1
unpackage/dist/dev/mp-weixin/uni_modules/wot-design-uni/components/wd-calendar-view/month/types.js

@@ -1 +1,19 @@
-"use strict";const e=require("../../common/props.js"),r={type:e.makeRequiredProp(String),date:e.makeRequiredProp(Number),value:e.makeRequiredProp([Number,Array,null]),minDate:e.makeRequiredProp(Number),maxDate:e.makeRequiredProp(Number),firstDayOfWeek:e.makeRequiredProp(Number),formatter:Function,maxRange:Number,rangePrompt:String,allowSameDay:e.makeBooleanProp(!1),defaultTime:{type:[Array]},showTitle:e.makeBooleanProp(!0)};exports.monthProps=r;
+"use strict";
+const uni_modules_wotDesignUni_components_common_props = require("../../common/props.js");
+const monthProps = {
+  type: uni_modules_wotDesignUni_components_common_props.makeRequiredProp(String),
+  date: uni_modules_wotDesignUni_components_common_props.makeRequiredProp(Number),
+  value: uni_modules_wotDesignUni_components_common_props.makeRequiredProp([Number, Array, null]),
+  minDate: uni_modules_wotDesignUni_components_common_props.makeRequiredProp(Number),
+  maxDate: uni_modules_wotDesignUni_components_common_props.makeRequiredProp(Number),
+  firstDayOfWeek: uni_modules_wotDesignUni_components_common_props.makeRequiredProp(Number),
+  formatter: Function,
+  maxRange: Number,
+  rangePrompt: String,
+  allowSameDay: uni_modules_wotDesignUni_components_common_props.makeBooleanProp(false),
+  defaultTime: {
+    type: [Array]
+  },
+  showTitle: uni_modules_wotDesignUni_components_common_props.makeBooleanProp(true)
+};
+exports.monthProps = monthProps;

File diff ditekan karena terlalu besar
+ 330 - 1
unpackage/dist/dev/mp-weixin/uni_modules/wot-design-uni/components/wd-calendar-view/monthPanel/month-panel.js


File diff ditekan karena terlalu besar
+ 236 - 1
unpackage/dist/dev/mp-weixin/uni_modules/wot-design-uni/components/wd-calendar-view/monthPanel/month-panel.wxss


File diff ditekan karena terlalu besar
+ 26 - 1
unpackage/dist/dev/mp-weixin/uni_modules/wot-design-uni/components/wd-calendar-view/monthPanel/types.js


File diff ditekan karena terlalu besar
+ 67 - 1
unpackage/dist/dev/mp-weixin/uni_modules/wot-design-uni/components/wd-calendar-view/types.js


File diff ditekan karena terlalu besar
+ 273 - 1
unpackage/dist/dev/mp-weixin/uni_modules/wot-design-uni/components/wd-calendar-view/utils.js


File diff ditekan karena terlalu besar
+ 112 - 1
unpackage/dist/dev/mp-weixin/uni_modules/wot-design-uni/components/wd-calendar-view/wd-calendar-view.js


+ 11 - 0
unpackage/dist/dev/mp-weixin/uni_modules/wot-design-uni/components/wd-calendar-view/wd-calendar-view.wxss

@@ -0,0 +1,11 @@
+/* 水平间距 */
+/* 水平间距 */
+/*
+ * @Author: weisheng
+ * @Date: 2023-06-12 10:04:19
+ * @LastEditTime: 2023-07-15 16:16:34
+ * @LastEditors: weisheng
+ * @Description: 
+ * @FilePath: \wot-design-uni\src\uni_modules\wot-design-uni\components\wd-calendar-view\index.scss
+ * 记得注释
+ */

+ 19 - 1
unpackage/dist/dev/mp-weixin/uni_modules/wot-design-uni/components/wd-calendar-view/year/types.js

@@ -1 +1,19 @@
-"use strict";const e=require("../../common/props.js"),r={type:e.makeRequiredProp(String),date:e.makeRequiredProp(Number),value:e.makeRequiredProp([Number,Array]),minDate:e.makeRequiredProp(Number),maxDate:e.makeRequiredProp(Number),formatter:Function,maxRange:Number,rangePrompt:String,allowSameDay:e.makeBooleanProp(!1),defaultTime:{type:[Array]},showTitle:e.makeBooleanProp(!0)};exports.yearProps=r;
+"use strict";
+const uni_modules_wotDesignUni_components_common_props = require("../../common/props.js");
+const yearProps = {
+  type: uni_modules_wotDesignUni_components_common_props.makeRequiredProp(String),
+  date: uni_modules_wotDesignUni_components_common_props.makeRequiredProp(Number),
+  value: uni_modules_wotDesignUni_components_common_props.makeRequiredProp([Number, Array]),
+  minDate: uni_modules_wotDesignUni_components_common_props.makeRequiredProp(Number),
+  maxDate: uni_modules_wotDesignUni_components_common_props.makeRequiredProp(Number),
+  // 日期格式化函数
+  formatter: Function,
+  maxRange: Number,
+  rangePrompt: String,
+  allowSameDay: uni_modules_wotDesignUni_components_common_props.makeBooleanProp(false),
+  defaultTime: {
+    type: [Array]
+  },
+  showTitle: uni_modules_wotDesignUni_components_common_props.makeBooleanProp(true)
+};
+exports.yearProps = yearProps;

File diff ditekan karena terlalu besar
+ 188 - 1
unpackage/dist/dev/mp-weixin/uni_modules/wot-design-uni/components/wd-calendar-view/year/year.js


File diff ditekan karena terlalu besar
+ 281 - 1
unpackage/dist/dev/mp-weixin/uni_modules/wot-design-uni/components/wd-calendar-view/year/year.wxss


+ 18 - 1
unpackage/dist/dev/mp-weixin/uni_modules/wot-design-uni/components/wd-calendar-view/yearPanel/types.js

@@ -1 +1,18 @@
-"use strict";const e=require("../../common/props.js"),r={type:e.makeRequiredProp(String),value:e.makeRequiredProp([Number,Array]),minDate:e.makeRequiredProp(Number),maxDate:e.makeRequiredProp(Number),formatter:Function,maxRange:Number,rangePrompt:String,allowSameDay:e.makeBooleanProp(!1),showPanelTitle:e.makeBooleanProp(!1),defaultTime:{type:[Array]},panelHeight:e.makeRequiredProp(Number)};exports.yearPanelProps=r;
+"use strict";
+const uni_modules_wotDesignUni_components_common_props = require("../../common/props.js");
+const yearPanelProps = {
+  type: uni_modules_wotDesignUni_components_common_props.makeRequiredProp(String),
+  value: uni_modules_wotDesignUni_components_common_props.makeRequiredProp([Number, Array]),
+  minDate: uni_modules_wotDesignUni_components_common_props.makeRequiredProp(Number),
+  maxDate: uni_modules_wotDesignUni_components_common_props.makeRequiredProp(Number),
+  formatter: Function,
+  maxRange: Number,
+  rangePrompt: String,
+  allowSameDay: uni_modules_wotDesignUni_components_common_props.makeBooleanProp(false),
+  showPanelTitle: uni_modules_wotDesignUni_components_common_props.makeBooleanProp(false),
+  defaultTime: {
+    type: [Array]
+  },
+  panelHeight: uni_modules_wotDesignUni_components_common_props.makeRequiredProp(Number)
+};
+exports.yearPanelProps = yearPanelProps;

File diff ditekan karena terlalu besar
+ 129 - 1
unpackage/dist/dev/mp-weixin/uni_modules/wot-design-uni/components/wd-calendar-view/yearPanel/year-panel.js


+ 0 - 0
unpackage/dist/dev/mp-weixin/uni_modules/wot-design-uni/components/wd-calendar-view/yearPanel/year-panel.wxss


Beberapa file tidak ditampilkan karena terlalu banyak file yang berubah dalam diff ini