Browse Source

commit -m 提测

zhengjinyi 4 years ago
parent
commit
fca25b1a3b
3 changed files with 10 additions and 5 deletions
  1. 7 2
      pages/user/order/create-order.vue
  2. 2 2
      services/ajax.env.js
  3. 1 1
      services/order.service.js

+ 7 - 2
pages/user/order/create-order.vue

@@ -316,12 +316,17 @@
 					if(data.code === '1'){
 						this.submitState ='success'
 						this.isSubLoading = false;
+						setTimeout(()=>{
+							this.isSubLoading = false;
+						},2000)
 						let data = {orderID:response.data.orderID}
 						this.$api.navigateTo(`/pages/user/order/success?data=${JSON.stringify({data:data})}`)
 					}else{
 						this.submitState ='confirm'
-						this.isSubLoading = false;
 						this.$util.msg('订单提交成功',3000,true,'success')
+						setTimeout(()=>{
+							this.isSubLoading = false;
+						},2000)
 						setTimeout(()=>{
 							this.$api.redirectTo(`/pages/user/order/order-payment?type=${this.submitState}&orderID=${response.data.orderID}`)
 						},3000)
@@ -551,7 +556,7 @@
 				line-height: 80rpx;
 				border-radius: 40rpx;
 				&.disabled{
-					background: #F7F7F7;
+					background: #e4e8eb;
 					color: #999999;
 				}
 			}

+ 2 - 2
services/ajax.env.js

@@ -4,8 +4,8 @@ if(process.env.NODE_ENV === 'development'){
 	// URL_CONFIG = 'http://192.168.2.68:8008'	 //涛涛联调地址
 	// URL_CONFIG = 'http://192.168.2.67:8008'	 //裴裴联调地址
 	// URL_CONFIG = 'http://192.168.2.75:8008'	 //超超联调地址
-    // URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
-	URL_CONFIG = 'https://spi.caimei365.com'
+    URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
+	// URL_CONFIG = 'https://spi.caimei365.com'
 }else{
     // 生产环境
 	URL_CONFIG = 'https://spi-b.caimei365.com'

+ 1 - 1
services/order.service.js

@@ -46,7 +46,7 @@ export default class OrderService {
 	 * @param orderID
 	 */
 	OrderShareCode (data = {}) {
-		return this.AjaxService.get({ url:'/order/shareCode', data, isLoading: true,isStatus: true })
+		return this.AjaxService.get({ url:'/order/shareCode', data, isLoading: true })
 	}
 	/**
 	 *机构搜索订单