* '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
72 lines
3.0 KiB
JavaScript
72 lines
3.0 KiB
JavaScript
"use strict";
|
|
const common_vendor = require("../../common/vendor.js");
|
|
const gen_Apis = require("../../gen/Apis.js");
|
|
const INDEX_pay_model = require("./model.js");
|
|
const common_libraries_apiLoading = require("../../common/libraries/apiLoading.js");
|
|
const common_libraries_pay = require("../../common/libraries/pay.js");
|
|
const getShow = (timer) => {
|
|
var _a, _b, _c;
|
|
gen_Apis.Apis.HouseOrder.HouseOrders.Show({ id: (_c = (_b = (_a = INDEX_pay_model.useModel) == null ? void 0 : _a.OrderInfo) == null ? void 0 : _b.value) == null ? void 0 : _c.id }).then((res) => {
|
|
var _a2;
|
|
INDEX_pay_model.useModel.loadingShowNumber.value += 1;
|
|
INDEX_pay_model.useModel.orderShow.value = res == null ? void 0 : res.data;
|
|
if (((_a2 = res == null ? void 0 : res.data) == null ? void 0 : _a2.order_status) === "Paid") {
|
|
INDEX_pay_model.useModel.payDisabled.value = false;
|
|
clearInterval(timer);
|
|
INDEX_pay_model.useModel.loadingLabel.value = "";
|
|
common_vendor.index.hideLoading();
|
|
common_vendor.index.redirectTo({
|
|
url: "/INDEX/pay/success"
|
|
});
|
|
}
|
|
console.log("orderShow", res == null ? void 0 : res.data);
|
|
});
|
|
};
|
|
const loadShow = () => {
|
|
INDEX_pay_model.useModel.loadingLabel.value = "更新账单中...";
|
|
INDEX_pay_model.useModel.timer.value = setInterval(() => {
|
|
var _a, _b, _c, _d, _e;
|
|
if (((_b = (_a = INDEX_pay_model.useModel) == null ? void 0 : _a.loadingShowNumber) == null ? void 0 : _b.value) > 5 && ((_e = (_d = (_c = INDEX_pay_model.useModel) == null ? void 0 : _c.orderShow) == null ? void 0 : _d.value) == null ? void 0 : _e.order_status) === "Pending") {
|
|
INDEX_pay_model.useModel.loading.value = false;
|
|
INDEX_pay_model.useModel.payDisabled.value = false;
|
|
INDEX_pay_model.useModel.loadingShowNumber.value = 0;
|
|
INDEX_pay_model.useModel.loadingLabel.value = "";
|
|
common_vendor.index.hideLoading();
|
|
clearInterval(INDEX_pay_model.useModel.timer.value);
|
|
return;
|
|
}
|
|
if (INDEX_pay_model.useModel.loadingShowNumber.value <= 5) {
|
|
getShow(INDEX_pay_model.useModel.timer.value);
|
|
}
|
|
<<<<<<< HEAD
|
|
}, 1500);
|
|
=======
|
|
}, 1e3);
|
|
>>>>>>> 6b1220997d2fd629b6dcb6dfbd7960a21d065f82
|
|
};
|
|
const method = {
|
|
onPay() {
|
|
var _a, _b, _c;
|
|
INDEX_pay_model.useModel.loading.value = true;
|
|
common_libraries_apiLoading.getApiLoading(gen_Apis.Apis.HouseOrder.HouseOrders.Payment, { id: (_c = (_b = (_a = INDEX_pay_model.useModel) == null ? void 0 : _a.OrderInfo) == null ? void 0 : _b.value) == null ? void 0 : _c.id }).then(
|
|
(res) => {
|
|
console.log("onPay", res == null ? void 0 : res.data);
|
|
INDEX_pay_model.useModel.loading.value = false;
|
|
INDEX_pay_model.useModel.payDisabled.value = true;
|
|
common_libraries_pay.tongLianPay(
|
|
res == null ? void 0 : res.data,
|
|
() => {
|
|
},
|
|
() => {
|
|
INDEX_pay_model.useModel.loading.value = false;
|
|
INDEX_pay_model.useModel.payDisabled.value = false;
|
|
}
|
|
);
|
|
}
|
|
);
|
|
},
|
|
loadShow,
|
|
getShow
|
|
};
|
|
exports.method = method;
|