diff --git a/public/config/index.js b/public/config/index.js index 415da64..b0aa92a 100644 --- a/public/config/index.js +++ b/public/config/index.js @@ -12,7 +12,7 @@ (function () { window.SITE_CONFIG = {}; // api接口请求地址 - window.SITE_CONFIG["baseUrl"] = "https://admin-test.damajishi.cn/"; + window.SITE_CONFIG["baseUrl"] = "https://admin.damajishi.cn/"; // 在线api接口请求地址 // window.SITE_CONFIG['baseUrl'] = 'http://119.29.103.250:8082/red-memory'; // 在线api接口请求地址 diff --git a/src/views/modules/presale/products/popup/add-or-update.vue b/src/views/modules/presale/products/popup/add-or-update.vue index ea97f05..4493216 100644 --- a/src/views/modules/presale/products/popup/add-or-update.vue +++ b/src/views/modules/presale/products/popup/add-or-update.vue @@ -539,13 +539,13 @@ export default { this.$set(this, 'ruleForm', { productId: row.id, advanceSellId: row.advanceSellId, - startTime: row.startTime, + startTime: this.orderTime[0], name: row.name, - endTime: row.endTime, - balancePaymentStartTime: row.balancePaymentStartTime, - balancePaymentEndTime: row.balancePaymentEndTime, - estimatedStartDeliveryTime: row.estimatedStartDeliveryTime, - estimatedEndDeliveryTime: row.estimatedEndDeliveryTime, + endTime: this.orderTime[1], + balancePaymentStartTime: this.arrears[0], + balancePaymentEndTime: this.arrears[1], + estimatedStartDeliveryTime: this.delivery[0], + estimatedEndDeliveryTime: this.delivery[1], isRefundEarnestMoney: Number(row.isRefundEarnestMoney), productSpecificationList: row.productSpecificationList })