* 'develop' of ssh://code.juyouwu.cn:2222/pay/pay-customer: fix:更新 # Conflicts: # .env.development # ci/project.config.json # dist/build/mp-weixin/INDEX/bill/list/index.wxml # dist/build/mp-weixin/INDEX/invitation/index.js # dist/build/mp-weixin/INDEX/invitation/index.json # dist/build/mp-weixin/INDEX/invitation/index.wxml # dist/build/mp-weixin/INDEX/invitation/index.wxss # dist/build/mp-weixin/INDEX/parking_payment/index.js # dist/build/mp-weixin/INDEX/parking_payment/index.wxml # dist/build/mp-weixin/INDEX/parking_payment/index.wxss # dist/build/mp-weixin/INDEX/parking_payment_record/index.js # dist/build/mp-weixin/INDEX/parking_payment_record/index.json # dist/build/mp-weixin/INDEX/parking_payment_record/index.wxml # dist/build/mp-weixin/INDEX/parking_payment_record/index.wxss # dist/build/mp-weixin/INDEX/pay/method.js # dist/build/mp-weixin/INDEX/pay/success.js # dist/build/mp-weixin/INDEX/pay/success.wxml # dist/build/mp-weixin/INDEX/pay/success.wxss # dist/build/mp-weixin/ME/payment_pre_stored/index.js # dist/build/mp-weixin/ME/payment_pre_stored/index.wxml # dist/build/mp-weixin/ME/payment_pre_stored/index.wxss # dist/build/mp-weixin/ME/pre_stored_form/index.js # dist/build/mp-weixin/ME/pre_stored_form/index.wxml # dist/build/mp-weixin/ME/vehicle_management/add/index.js # dist/build/mp-weixin/ME/vehicle_management/add/index.wxml # dist/build/mp-weixin/ME/vehicle_management/add/index.wxss # dist/build/mp-weixin/WORKORDER/add/index.js # dist/build/mp-weixin/WORKORDER/add/index.json # dist/build/mp-weixin/WORKORDER/add/index.wxml # dist/build/mp-weixin/WORKORDER/add/method.js # dist/build/mp-weixin/WORKORDER/list/index.js # dist/build/mp-weixin/WORKORDER/list/index.wxml # dist/build/mp-weixin/WORKORDER/list/index.wxss # dist/build/mp-weixin/WORKORDER/show/index.js # dist/build/mp-weixin/WORKORDER/show/index.json # dist/build/mp-weixin/WORKORDER/show/index.wxml # dist/build/mp-weixin/WORKORDER/show/index.wxss # dist/build/mp-weixin/WORKORDER/show/method.js # dist/build/mp-weixin/WORKORDER/show/model.js # dist/build/mp-weixin/common/components/cc-scroll-loading/cc-scroll-loading.js # dist/build/mp-weixin/common/components/cc-scroll-loading/cc-scroll-loading.wxml # dist/build/mp-weixin/common/components/cc-scroll-loading/cc-scroll-loading.wxss # dist/build/mp-weixin/common/libraries/day.js # dist/build/mp-weixin/common/vendor.js # dist/build/mp-weixin/components/hs-button/hs-button.js # dist/build/mp-weixin/components/hs-button/hs-button.wxml # dist/build/mp-weixin/components/hs-button/hs-button.wxss # dist/build/mp-weixin/components/hs-popup-evaluate/hs-popup-evaluate.js # dist/build/mp-weixin/components/hs-popup-evaluate/hs-popup-evaluate.wxml # dist/build/mp-weixin/components/hs-popup-evaluate/hs-popup-evaluate.wxss # dist/build/mp-weixin/components/hs-reservation-picker/hs-reservation-picker.js # dist/build/mp-weixin/components/hs-reservation-picker/hs-reservation-picker.wxml # dist/build/mp-weixin/components/hs-reservation-picker/hs-reservation-picker.wxss # dist/build/mp-weixin/gen/Apis.js # dist/build/mp-weixin/gen/Enums.js # dist/build/mp-weixin/node-modules/uview-plus/components/u-keyboard/u-keyboard.js # dist/build/mp-weixin/pages/index/components/Classification.js # dist/build/mp-weixin/pages/index/components/Classification.wxml # dist/build/mp-weixin/pages/index/components/Classification.wxss # dist/build/mp-weixin/pages/index/components/ConvenienceServices.js # dist/build/mp-weixin/pages/index/components/ConvenienceServices.json # dist/build/mp-weixin/pages/index/components/ConvenienceServices.wxml # dist/build/mp-weixin/pages/index/components/ConvenienceServices.wxss # dist/build/mp-weixin/pages/index/index.wxss # dist/build/mp-weixin/pages/me/components/AreaFunctional.js # dist/build/mp-weixin/pages/me/components/AreaFunctional.json # dist/build/mp-weixin/pages/me/components/AreaFunctional.wxml # dist/build/mp-weixin/pages/me/components/AreaFunctional.wxss # dist/build/mp-weixin/pages/transfer/index.js # dist/dev/mp-weixin/INDEX/pay/method.js # dist/dev/mp-weixin/INDEX/pay/success.wxml # dist/dev/mp-weixin/WORKORDER/add/index.js # dist/dev/mp-weixin/WORKORDER/list/index.js # dist/dev/mp-weixin/WORKORDER/list/index.json # dist/dev/mp-weixin/WORKORDER/list/index.wxml # dist/dev/mp-weixin/WORKORDER/list/index.wxss # dist/dev/mp-weixin/WORKORDER/show/index.js # dist/dev/mp-weixin/WORKORDER/show/index.json # dist/dev/mp-weixin/WORKORDER/show/index.wxml # dist/dev/mp-weixin/WORKORDER/show/index.wxss # dist/dev/mp-weixin/WORKORDER/show/model.js # dist/dev/mp-weixin/app.js # dist/dev/mp-weixin/common/libraries/day.js # dist/dev/mp-weixin/common/libraries/request.js # dist/dev/mp-weixin/common/vendor.js # dist/dev/mp-weixin/components/hs-popup-evaluate/hs-popup-evaluate.js # dist/dev/mp-weixin/components/hs-reservation-picker/hs-reservation-picker.js # dist/dev/mp-weixin/components/hs-reservation-picker/hs-reservation-picker.wxss # dist/dev/mp-weixin/gen/Enums.js # dist/dev/mp-weixin/node-modules/uview-plus/components/u-keyboard/u-keyboard.js # dist/dev/mp-weixin/pages/transfer/index.js # dist/dev/mp-weixin/project.private.config.json # src/INDEX/pay/method.ts # src/INDEX/pay/success.vue # src/WORKORDER/add/index.vue # src/WORKORDER/list/index.vue # src/WORKORDER/list/style.scss # src/WORKORDER/show/index.vue # src/WORKORDER/show/model.ts # src/WORKORDER/show/style.scss # src/common/libraries/day.ts # src/components/hs-popup-evaluate/hs-popup-evaluate.vue # src/components/hs-reservation-picker/hs-reservation-picker.vue # src/gen/ApiTypes.d.ts # src/gen/Enums.ts # src/pages/transfer/index.vue
127 lines
4.6 KiB
JavaScript
127 lines
4.6 KiB
JavaScript
"use strict";
|
|
const common_vendor = require("../../common/vendor.js");
|
|
const common_libraries_day = require("../../common/libraries/day.js");
|
|
if (!Array) {
|
|
const _easycom_uni_icons2 = common_vendor.resolveComponent("uni-icons");
|
|
_easycom_uni_icons2();
|
|
}
|
|
const _easycom_uni_icons = () => "../../uni_modules/uni-icons/components/uni-icons/uni-icons.js";
|
|
if (!Math) {
|
|
_easycom_uni_icons();
|
|
}
|
|
const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
|
|
__name: "hs-reservation-picker",
|
|
props: [
|
|
"Enums",
|
|
"title",
|
|
"pickerIndex",
|
|
"value",
|
|
"borderTop",
|
|
"required",
|
|
"valueExpectStartTime",
|
|
"valueExpectEndTime",
|
|
"icon",
|
|
"iconSize"
|
|
],
|
|
emits: ["change", "update:valueExpectStartTime", "update:valueExpectEndTime"],
|
|
setup(__props, { emit }) {
|
|
const props = __props;
|
|
const borderStyle = "1rpx solid #eee";
|
|
const placeholder = "请选择";
|
|
const listData = common_vendor.ref([]);
|
|
const selectValue = common_vendor.ref("");
|
|
const onChange = (e) => {
|
|
var _a;
|
|
let res = (_a = e == null ? void 0 : e.detail) == null ? void 0 : _a.value;
|
|
let label_str = listData.value[0][res[0]];
|
|
let label_end = listData.value[1][res[1]];
|
|
console.log(e, "e");
|
|
let str_time = `${label_str == null ? void 0 : label_str.value} ${label_end == null ? void 0 : label_end.str}`;
|
|
let end_time = `${label_str == null ? void 0 : label_str.value} ${label_end == null ? void 0 : label_end.end}`;
|
|
selectValue.value = `${label_str == null ? void 0 : label_str.label}(${label_end == null ? void 0 : label_end.label})`;
|
|
emit("update:valueExpectStartTime", str_time);
|
|
emit("update:valueExpectEndTime", end_time);
|
|
emit("change", {
|
|
str_time,
|
|
end_time
|
|
});
|
|
};
|
|
const setDayList = () => {
|
|
let dayInfo = common_libraries_day.getCurrentHour();
|
|
let day0 = common_libraries_day.getTheFutureDay(0);
|
|
let day1 = common_libraries_day.getTheFutureDay(1);
|
|
let day2 = common_libraries_day.getTheFutureDay(2);
|
|
let timeSlots = common_libraries_day.generateTimeSlots();
|
|
<<<<<<< HEAD
|
|
listData.value = [
|
|
[
|
|
{ label: "今天", value: day0 },
|
|
{ label: "明天", value: day1 },
|
|
{ label: "后天", value: day2 }
|
|
],
|
|
timeSlots
|
|
];
|
|
=======
|
|
if (day0 == null ? void 0 : day0.length) {
|
|
listData.value = [
|
|
[
|
|
{ label: "今天", value: day0 },
|
|
{ label: "明天", value: day1 },
|
|
{ label: "后天", value: day2 }
|
|
],
|
|
timeSlots
|
|
];
|
|
} else {
|
|
listData.value = [
|
|
[
|
|
{ label: "明天", value: day1 },
|
|
{ label: "后天", value: day2 }
|
|
],
|
|
timeSlots
|
|
];
|
|
}
|
|
>>>>>>> 6b1220997d2fd629b6dcb6dfbd7960a21d065f82
|
|
console.log(dayInfo, "day1");
|
|
};
|
|
const onColumnchange = (e) => {
|
|
var _a, _b, _c, _d, _e;
|
|
if (((_a = e == null ? void 0 : e.detail) == null ? void 0 : _a.column) === 0) {
|
|
if ((_b = e == null ? void 0 : e.detail) == null ? void 0 : _b.value) {
|
|
let val = (_e = listData.value[(_c = e == null ? void 0 : e.detail) == null ? void 0 : _c.column][(_d = e == null ? void 0 : e.detail) == null ? void 0 : _d.value]) == null ? void 0 : _e.value;
|
|
let timeSlots = common_libraries_day.generateTimeSlots(val);
|
|
listData.value[1] = timeSlots;
|
|
console.log(timeSlots, "timeSlots");
|
|
} else {
|
|
let timeSlots = common_libraries_day.generateTimeSlots();
|
|
listData.value[1] = timeSlots;
|
|
console.log(timeSlots, "timeSlots");
|
|
}
|
|
}
|
|
console.log(e, "e");
|
|
};
|
|
common_vendor.onMounted(() => {
|
|
setDayList();
|
|
});
|
|
return (_ctx, _cache) => {
|
|
return common_vendor.e({
|
|
a: common_vendor.t((props == null ? void 0 : props.title) || "标题"),
|
|
b: __props.required
|
|
}, __props.required ? {} : {}, {
|
|
c: common_vendor.t(selectValue.value || placeholder),
|
|
d: common_vendor.p({
|
|
type: "right",
|
|
size: "15",
|
|
color: "#999"
|
|
}),
|
|
e: common_vendor.n(selectValue.value ? "valueStyle" : "valueStyle placeholderStyle"),
|
|
f: props.borderTop ? borderStyle : "",
|
|
g: listData.value,
|
|
h: common_vendor.o(onChange),
|
|
i: common_vendor.o(onColumnchange)
|
|
});
|
|
};
|
|
}
|
|
});
|
|
const Component = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-1a4ad8b9"], ["__file", "/Users/zsq/Sources/github/2025property-pay/pay-customer/src/components/hs-reservation-picker/hs-reservation-picker.vue"]]);
|
|
wx.createComponent(Component);
|