Merge branch 'master' of http://8.134.10.79:3000/Leadfyy.co/ec.uniapp-master

pages/order/index/onlineorder.vue

@@ -106,7 +106,7 @@
 					},
 					{
 						id: 2,
-						name: '代付款',
+						name: '待付款',
 						type: 1,
 						list: [],
 						isRefresher: false,

pages/store/cart/cart.vue

@@ -192,6 +192,9 @@
 						content: '确定移除该商品吗？',
 						success: result => {
 							if(result.confirm){
+								uni.showLoading({
+									title: '正在删除'
+								})
 								this.$http.ajax({
 									api: 'api/shopping/cart/'+ __raw_id,
 									method: 'DELETE',
@@ -209,7 +212,8 @@
 									}else{
 										this.$msg('删除失败', {icon: 'error'});
 									}
-								})
+									uni.hideLoading();
+								}).catch(err => uni.hideLoading())
 							}
 						}
 					})