Merge branch 'dev1.4' of http://222.85.201.140:10002//xuyunhui/chain_jje_uniapp into dev1.5

 Conflicts:

	components/pay/pay.vue

	orderPages/storeService/index.vue

orderPages/bookService/index.vue

@@ -339,7 +339,7 @@
 					}
 					if (bindPickerChange){
 						if (this.orderParam.childService.length === 0){
-							this.selectServiceObject(this.serviceObjectList[0])
+							// this.selectServiceObject(this.serviceObjectList[0])
 						}else {
 							this.serviceObjectList.forEach(i=>{
 								if (i.select){
@@ -392,7 +392,7 @@
 						})
 					}
 					if (i === 0){
-						this.selectServiceObject(items[i])
+						// this.selectServiceObject(items[i])
 					}
 				}
 			},