Merge branch 'dev/1.0' into custom/common

pages_promotion/point/public/js/payment.js

@@ -95,7 +95,7 @@ export default {
 						title: '未获取到创建订单所需数据！'
 					});
 					setTimeout(() => {
-						this.$util.redirectTo('/pages/index/index');
+						this.$util.redirectTo(this.$util.INDEX_PAGE_URL);
 					}, 1500);
 				}
 				return;
@@ -122,7 +122,7 @@ export default {
 							title: '未获取到创建订单所需数据！'
 						});
 						setTimeout(() => {
-							this.$util.redirectTo('/pages/index/index');
+							this.$util.redirectTo(this.$util.INDEX_PAGE_URL);
 						}, 1500);
 					}
 				},
@@ -547,7 +547,7 @@ export default {
 		}
 		// 判断登录
 		if (!this.storeToken) {
-			this.$util.redirectTo('/pages_tool/login/login');
+			this.$util.redirectTo(this.$util.LOGIN_PAGE_URL);
 		} else {
 			this.getOrderPaymentData();
 		}