Your Name 6d31441e12 Merge branch 'develop' of ssh://code.juyouwu.cn:2222/pay/pay-customer into develop
* '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
2025-12-15 18:26:08 +08:00

6 lines
13 KiB
JavaScript

<<<<<<< HEAD
"use strict";const e=require("../common/libraries/request.js");require("../common/store/useWeAppAuthStore.js"),require("../common/store/useWorkStore.js");const t={Activity:{Activities:{List:t=>e.request("customer/activity/activities/list",{data:t}),Show:t=>e.request("customer/activity/activities/show",{data:t})},ActivityEnrolls:{List:t=>e.request("customer/activity/activity_enrolls/list",{data:t}),Store:t=>e.request("customer/activity/activity_enrolls/store",{data:t}),GetCustomerEnroll:t=>e.request("customer/activity/activity_enrolls/get_customer_enroll",{data:t}),Cancelled:t=>e.request("customer/activity/activity_enrolls/cancelled",{data:t}),Show:t=>e.request("customer/activity/activity_enrolls/show",{data:t})}},Archive:{HouseOccupants:{List:t=>e.request("customer/archive/house_occupants/list",{data:t}),GetCustomerHouseIsExist:()=>e.request("customer/archive/house_occupants/get_customer_house_is_exist",{}),UpdateSelectedHouse:t=>e.request("customer/archive/house_occupants/update_selected_house",{data:t}),GetHouseOccupants:t=>e.request("customer/archive/house_occupants/get_house_occupants",{data:t}),GetOwner:t=>e.request("customer/archive/house_occupants/get_owner",{data:t}),Show:t=>e.request("customer/archive/house_occupants/show",{data:t}),DeleteOccupant:t=>e.request("customer/archive/house_occupants/delete_occupant",{data:t}),Unbind:t=>e.request("customer/archive/house_occupants/unbind",{data:t})},HouseRegisters:{List:t=>e.request("customer/archive/house_registers/list",{data:t}),Store:t=>e.request("customer/archive/house_registers/store",{data:t}),Update:t=>e.request("customer/archive/house_registers/update",{data:t}),Show:t=>e.request("customer/archive/house_registers/show",{data:t}),OwnerAuditList:t=>e.request("customer/archive/house_registers/owner_audit_list",{data:t}),GetOwnerIsAudit:()=>e.request("customer/archive/house_registers/get_owner_is_audit",{}),Audit:t=>e.request("customer/archive/house_registers/audit",{data:t})}},Asset:{AssetHouses:{SelectProject:t=>e.request("customer/asset/asset_houses/select_project",{data:t}),SelectProjectByLocation:t=>e.request("customer/asset/asset_houses/select_project_by_location",{data:t}),SelectBuilding:t=>e.request("customer/asset/asset_houses/select_building",{data:t}),SelectUnit:t=>e.request("customer/asset/asset_houses/select_unit",{data:t}),SelectHouse:t=>e.request("customer/asset/asset_houses/select_house",{data:t}),Show:t=>e.request("customer/asset/asset_houses/show",{data:t})},AssetProjects:{GetProjectPropertyBrand:t=>e.request("customer/asset/asset_projects/get_project_property_brand",{data:t})}},Banner:{BannerSpaces:{List:t=>e.request("customer/banner/banner_spaces/list",{data:t})}},Bill:{HouseBills:{List:t=>e.request("customer/bill/house_bills/list",{data:t}),MyBillYearList:t=>e.request("customer/bill/house_bills/my_bill_year_list",{data:t}),MyBillList:t=>e.request("customer/bill/house_bills/my_bill_list",{data:t}),GetCountBills:()=>e.request("customer/bill/house_bills/get_count_bills",{})}},Common:{ConvenienceServices:{List:t=>e.request("customer/common/convenience_services/list",{data:t})}},Customer:{CustomerBacklogs:{List:t=>e.request("customer/customer/customer_backlogs/list",{data:t}),Show:t=>e.request("customer/customer/customer_backlogs/show",{data:t})},CustomerConsults:{List:t=>e.request("customer/customer/customer_consults/list",{data:t}),Store:t=>e.request("customer/customer/customer_consults/store",{data:t}),Show:t=>e.request("customer/customer/customer_consults/show",{data:t})},CustomerOpinions:{Store:t=>e.request("customer/customer/customer_opinions/store",{data:t})},Customers:{GetCountHouse:()=>e.request("customer/customer/customers/get_count_house",{})}},Grid:{Grids:{GetHousekeeper:t=>e.request("customer/grid/grids/get_housekeeper",{data:t})}},HouseOrder:{HouseOrders:{List:t=>e.request("customer/house_order/house_orders/list",{data:t}),Store:t=>e.request("customer/house_order/house_orders/store",{data:t}),Show:t=>e.request("customer/house_order/house_orders/show",{data:t}),Payment:t=>e.request("customer/house_order/house_orders/payment",{data:t}),HouseOrderNotify:()=>e.request("customer/house_order/house_orders/house_order_notify",{})},HousePrepaymentLogs:{List:t=>e.request("customer/house_order/house_prepayment_logs/list",{data:t}),Show:t=>e.request("customer/house_order/house_prepayment_logs/show",{data:t})},HousePrepayments:{List:t=>e.request("customer/house_order/house_prepayments/list",{data:t}),Payment:t=>e.request("customer/house_order/house_prepayments/payment",{data:t}),Show:t=>e.request("customer/house_order/house_prepayments/show",{data:t}),HousePrepaymentNotify:()=>e.request("customer/house_order/house_prepayments/house_prepayment_notify",{})}},Login:{Auth:{Login:t=>e.request("customer/login/auth/login",{data:t}),Register:t=>e.request("customer/login/auth/register",{data:t}),Logout:()=>e.request("customer/login/auth/logout",{}),Me:()=>e.request("customer/login/auth/me",{}),ChangeName:t=>e.request("customer/login/auth/change_name",{data:t}),BindPhoneNumber:t=>e.request("customer/login/auth/bind_phone_number",{data:t}),SendValidateSms:t=>e.request("customer/login/auth/send_validate_sms",{data:t}),GetAccessToken:t=>e.request("customer/login/auth/get_access_token",{data:t}),PreUpload:t=>e.request("customer/login/auth/pre_upload",{data:t}),TemporaryUrl:t=>e.request("customer/login/auth/temporary_url",{data:t})}},Msg:{MsgPropertyAnnouncements:{List:t=>e.request("customer/msg/msg_property_announcements/list",{data:t}),Show:t=>e.request("customer/msg/msg_property_announcements/show",{data:t}),CountMsg:()=>e.request("customer/msg/msg_property_announcements/count_msg",{})}},WechatWork:{Notification:{WechatWorkNotify:()=>e.request("customer/wechat_work/notification/wechat_work_notify",{}),ThirdAppNotify:()=>e.request("customer/wechat_work/notification/third_app_notify",{})}},WorkOrder:{HouseWorkOrders:{List:t=>e.request("customer/work_order/house_work_orders/list",{data:t}),Store:t=>e.request("customer/work_order/house_work_orders/store",{data:t}),Show:t=>e.request("customer/work_order/house_work_orders/show",{data:t})}}};exports.Apis=t;
=======
"use strict";const e=require("../common/libraries/request.js");require("../common/store/useWeAppAuthStore.js"),require("../common/store/useWorkStore.js");const t={Activity:{Activities:{List:t=>e.request("customer/activity/activities/list",{data:t}),Show:t=>e.request("customer/activity/activities/show",{data:t})},ActivityEnrolls:{List:t=>e.request("customer/activity/activity_enrolls/list",{data:t}),Store:t=>e.request("customer/activity/activity_enrolls/store",{data:t}),GetCustomerEnroll:t=>e.request("customer/activity/activity_enrolls/get_customer_enroll",{data:t}),Cancelled:t=>e.request("customer/activity/activity_enrolls/cancelled",{data:t}),Show:t=>e.request("customer/activity/activity_enrolls/show",{data:t})}},Archive:{HouseOccupants:{List:t=>e.request("customer/archive/house_occupants/list",{data:t}),GetCustomerHouseIsExist:()=>e.request("customer/archive/house_occupants/get_customer_house_is_exist",{}),UpdateSelectedHouse:t=>e.request("customer/archive/house_occupants/update_selected_house",{data:t}),GetHouseOccupants:t=>e.request("customer/archive/house_occupants/get_house_occupants",{data:t}),GetOwner:t=>e.request("customer/archive/house_occupants/get_owner",{data:t}),Show:t=>e.request("customer/archive/house_occupants/show",{data:t}),DeleteOccupant:t=>e.request("customer/archive/house_occupants/delete_occupant",{data:t}),Unbind:t=>e.request("customer/archive/house_occupants/unbind",{data:t})},HouseRegisters:{List:t=>e.request("customer/archive/house_registers/list",{data:t}),Store:t=>e.request("customer/archive/house_registers/store",{data:t}),Update:t=>e.request("customer/archive/house_registers/update",{data:t}),Show:t=>e.request("customer/archive/house_registers/show",{data:t}),OwnerAuditList:t=>e.request("customer/archive/house_registers/owner_audit_list",{data:t}),GetOwnerIsAudit:()=>e.request("customer/archive/house_registers/get_owner_is_audit",{}),Audit:t=>e.request("customer/archive/house_registers/audit",{data:t})}},Asset:{AssetHouses:{SelectProject:t=>e.request("customer/asset/asset_houses/select_project",{data:t}),SelectProjectByLocation:t=>e.request("customer/asset/asset_houses/select_project_by_location",{data:t}),SelectBuilding:t=>e.request("customer/asset/asset_houses/select_building",{data:t}),SelectUnit:t=>e.request("customer/asset/asset_houses/select_unit",{data:t}),SelectHouse:t=>e.request("customer/asset/asset_houses/select_house",{data:t}),Show:t=>e.request("customer/asset/asset_houses/show",{data:t})},AssetProjects:{GetProjectPropertyBrand:t=>e.request("customer/asset/asset_projects/get_project_property_brand",{data:t})}},Banner:{BannerSpaces:{List:t=>e.request("customer/banner/banner_spaces/list",{data:t})}},Bill:{HouseBills:{List:t=>e.request("customer/bill/house_bills/list",{data:t}),MyBillYearList:t=>e.request("customer/bill/house_bills/my_bill_year_list",{data:t}),MyBillList:t=>e.request("customer/bill/house_bills/my_bill_list",{data:t}),GetCountBills:()=>e.request("customer/bill/house_bills/get_count_bills",{})}},Common:{ConvenienceServices:{List:t=>e.request("customer/common/convenience_services/list",{data:t})}},Customer:{CustomerBacklogs:{List:t=>e.request("customer/customer/customer_backlogs/list",{data:t}),Show:t=>e.request("customer/customer/customer_backlogs/show",{data:t})},CustomerConsults:{List:t=>e.request("customer/customer/customer_consults/list",{data:t}),Store:t=>e.request("customer/customer/customer_consults/store",{data:t}),Show:t=>e.request("customer/customer/customer_consults/show",{data:t})},CustomerOpinions:{Store:t=>e.request("customer/customer/customer_opinions/store",{data:t})},Customers:{GetCountHouse:()=>e.request("customer/customer/customers/get_count_house",{})}},Grid:{Grids:{GetHousekeeper:t=>e.request("customer/grid/grids/get_housekeeper",{data:t})}},HouseOrder:{HouseOrders:{List:t=>e.request("customer/house_order/house_orders/list",{data:t}),Store:t=>e.request("customer/house_order/house_orders/store",{data:t}),Show:t=>e.request("customer/house_order/house_orders/show",{data:t}),Payment:t=>e.request("customer/house_order/house_orders/payment",{data:t}),HouseOrderNotify:()=>e.request("customer/house_order/house_orders/house_order_notify",{})},HousePrepaymentLogs:{List:t=>e.request("customer/house_order/house_prepayment_logs/list",{data:t}),Show:t=>e.request("customer/house_order/house_prepayment_logs/show",{data:t})},HousePrepayments:{List:t=>e.request("customer/house_order/house_prepayments/list",{data:t}),Show:t=>e.request("customer/house_order/house_prepayments/show",{data:t}),Payment:t=>e.request("customer/house_order/house_prepayments/payment",{data:t}),GetPayments:t=>e.request("customer/house_order/house_prepayments/get_payments",{data:t}),HousePrepaymentNotify:()=>e.request("customer/house_order/house_prepayments/house_prepayment_notify",{})}},Login:{Auth:{Login:t=>e.request("customer/login/auth/login",{data:t}),Register:t=>e.request("customer/login/auth/register",{data:t}),Logout:()=>e.request("customer/login/auth/logout",{}),Me:()=>e.request("customer/login/auth/me",{}),ChangeName:t=>e.request("customer/login/auth/change_name",{data:t}),BindPhoneNumber:t=>e.request("customer/login/auth/bind_phone_number",{data:t}),SendValidateSms:t=>e.request("customer/login/auth/send_validate_sms",{data:t}),GetAccessToken:t=>e.request("customer/login/auth/get_access_token",{data:t}),PreUpload:t=>e.request("customer/login/auth/pre_upload",{data:t}),TemporaryUrl:t=>e.request("customer/login/auth/temporary_url",{data:t})}},Msg:{MsgPropertyAnnouncements:{List:t=>e.request("customer/msg/msg_property_announcements/list",{data:t}),Show:t=>e.request("customer/msg/msg_property_announcements/show",{data:t}),CountMsg:()=>e.request("customer/msg/msg_property_announcements/count_msg",{})}},WechatWork:{Notification:{WechatWorkNotify:()=>e.request("customer/wechat_work/notification/wechat_work_notify",{}),ThirdAppNotify:()=>e.request("customer/wechat_work/notification/third_app_notify",{})}},WorkOrder:{HouseWorkLogs:{List:t=>e.request("customer/work_order/house_work_logs/list",{data:t})},HouseWorkOrders:{List:t=>e.request("customer/work_order/house_work_orders/list",{data:t}),Store:t=>e.request("customer/work_order/house_work_orders/store",{data:t}),Show:t=>e.request("customer/work_order/house_work_orders/show",{data:t}),Close:t=>e.request("customer/work_order/house_work_orders/close",{data:t}),ChangeExpectTime:t=>e.request("customer/work_order/house_work_orders/change_expect_time",{data:t}),Accept:t=>e.request("customer/work_order/house_work_orders/accept",{data:t}),Evaluation:t=>e.request("customer/work_order/house_work_orders/evaluation",{data:t}),Rework:t=>e.request("customer/work_order/house_work_orders/rework",{data:t}),WorkOrderPayment:t=>e.request("customer/work_order/house_work_orders/work_order_payment",{data:t}),WorkOrderPaymentCallback:()=>e.request("customer/work_order/house_work_orders/work_order_payment_callback",{})}}};exports.Apis=t;
>>>>>>> 6b1220997d2fd629b6dcb6dfbd7960a21d065f82