diff --git a/yudao-ui-app/package.json b/yudao-ui-app/package.json
index 40092a0fc..a991192ef 100644
--- a/yudao-ui-app/package.json
+++ b/yudao-ui-app/package.json
@@ -21,7 +21,7 @@
"env": {
"UNI_PLATFORM": "h5",
"isVConsole": true,
- "APP_BASE_URL": "http://192.168.1.147:48080"
+ "APP_BASE_URL": "http://192.168.1.188:48080"
}
},
"prod": {
diff --git a/yudao-ui-app/pages/goods_cashier/index.vue b/yudao-ui-app/pages/goods_cashier/index.vue
index 0af7ecaff..a07634451 100644
--- a/yudao-ui-app/pages/goods_cashier/index.vue
+++ b/yudao-ui-app/pages/goods_cashier/index.vue
@@ -125,7 +125,7 @@
onLoad(options) {
if (options.order_id) this.orderId = options.order_id
if (options.from_type) this.fromType = options.from_type
- // this.getCashierOrder()
+ this.getCashierOrder()
},
onShow() {
let options = wx.getEnterOptionsSync();
@@ -175,7 +175,7 @@
},
getCashierOrder() {
uni.showLoading({
- title: '创建订单中'
+ title: '加载中'
});
getCashierOrder(this.orderId, this.fromType).then(res => {
console.log(res)
diff --git a/yudao-ui-app/pages/users/order_confirm/index.vue b/yudao-ui-app/pages/users/order_confirm/index.vue
index 9fc1eaa07..2a6448db6 100644
--- a/yudao-ui-app/pages/users/order_confirm/index.vue
+++ b/yudao-ui-app/pages/users/order_confirm/index.vue
@@ -16,7 +16,7 @@
[默认]
- {{addressInfo.province}}{{addressInfo.city}}{{addressInfo.district}}{{addressInfo.detail}}
+ {{addressInfo.province}}{{addressInfo.city}}{{addressInfo.district}}{{addressInfo.detail}}
@@ -53,7 +53,7 @@
-
+
积分抵扣
@@ -333,11 +333,11 @@
*/
onShow: function() {
let _this = this
- // wx.getLaunchOptionsSync
+ // wx.getLaunchOptionsSync
this.textareaStatus = true;
if (this.isLogin && this.toPay == false) {
//this.getaddressInfo();
-
+
}
uni.$on("handClick", res => {
@@ -387,7 +387,7 @@
},
/**
* 授权回调事件
- *
+ *
*/
onLoadFun: function() {
//this.getaddressInfo();
@@ -485,7 +485,7 @@
},
/**
* 处理点击优惠券后的事件
- *
+ *
*/
ChangCoupons: function(e) {
// this.usableCoupon = e
@@ -549,7 +549,7 @@
},
/**
* 获取当前金额可用优惠券
- *
+ *
*/
getCouponList: function() {
getCouponsOrderPrice(this.preOrderNo).then(res => {
@@ -617,7 +617,7 @@
let that = this;
orderCreate(data).then(res => {
console.log(res.data,'订单信息')
- that.getOrderPay(res.data.orderNo, '支付成功');
+ that.getOrderPay(res.data.columns.orderNo, '支付成功');
}).catch(err => {
uni.hideLoading();
@@ -628,6 +628,7 @@
},
getOrderPay: function(orderNo, message) {
let that = this;
+ console.log('orderNO---', orderNo)
uni.navigateTo({
url: '/pages/goods_cashier/index?order_id=' + orderNo
})
@@ -674,7 +675,7 @@
// title: err
// });
// })
-
+
// },
// fail: function(e) {
// uni.hideLoading();