commit -m 订单修改

pages/user/order/order-historylist.vue

@@ -31,6 +31,7 @@
 								</view>
 								<block v-for="(shop,index) in order.shopOrderList" :key="index">
 									<view class="goods-title">
+										<view class="title-logo"><image :src="shop.shopLogo" mode=""></image></view>
 										<view class="title-text tui-skeleton-fillet">{{shop.shopName}}</view>
 									</view>
 									<view class="goods-item" v-for="(pros,prosIndex) in shop.orderProductList" :key="prosIndex">
@@ -641,6 +642,19 @@
 		height: 56rpx;
 		float: left;
 		margin-top:10rpx;
+		.title-logo{
+			width: 56rpx;
+			height: 56rpx;
+			float: left;
+			box-sizing: border-box;
+			margin-right: 10rpx;
+			border: 1px solid #e1e1e1;
+			image{
+				width: 56rpx;
+				height: 56rpx;
+				display: block;
+			}
+		}
 		.title-text{
 			width: 400rpx;
 			overflow: hidden;

pages/user/order/order-list.vue

@@ -258,8 +258,15 @@
 					this.$api.getStorage().then((resolve) =>{
 						this.userId = resolve.userId
 						this.organizeId = resolve.organizeId
-						let params = {orderState:index,organizeId:resolve.organizeId,pageNum:1,pageSize:this.pageSize};
-						this.OrderService.QueryOrderList(params).then(response =>{
+						this.OrderService.QueryOrderList(
+							{
+								orderState:index,
+								organizeId:resolve.organizeId,
+								pageNum:1,
+								pageSize:this.pageSize,
+								}
+						)
+						.then(response =>{
 							//loaded新字段用于表示数据加载完毕，如果为空可以显示空白页
 							let orderList = response.data.list.filter(item=>{
 									//添加不同状态下订单的表现形式
@@ -291,8 +298,15 @@
 			}, 
 			getOnReachBottomData(index){//上拉加载
 				this.pageNum+=1
-				let params = {orderState:index,userId:this.userId,pageNum:this.pageNum,pageSize:this.pageSize};
-				this.OrderService.QueryOrderList(params).then(response =>{
+				this.OrderService.QueryOrderList(
+					{
+						orderState:index,
+						organizeId:this.organizeId,
+						pageNum:this.pageNum,
+						pageSize:this.pageSize
+					}
+				)
+				.then(response =>{
 					let orderItem = this.orderTabBar[index];
 					let resData = response.data.results
 					this.hasNextPage = response.data.hasNextPage;

pages/user/order/search-order.vue

@@ -234,8 +234,14 @@
 				 * @param：pageSize(每页条数)
 				 * @param：organizeID(全局变量组织ID)
 				 */ 
-				let params = {searchWord:this.searchInputVal,organizeId:this.organizeId,pageNum:1,pageSize:this.pageSize};
-				this.OrderService.SearchOrderInfo(params).then(response =>{
+				this.OrderService.SearchOrderInfo(
+					{
+						searchWord:this.searchInputVal,
+						organizeId:this.organizeId,
+						pageNum:1,pageSize:this.pageSize,
+					}
+				)
+				.then(response =>{
 					this.isShowWrapper = true
 					this.showSkeleton = true
 					const _responseData = response.data.list;
@@ -271,8 +277,15 @@
 			}, 
 			getOnReachBottomData(index){//上拉加载
 				this.pageNum+=1
-				let params = {searchWord:this.searchInputVal,userId:this.userID,pageNum:this.pageNum,pageSize:this.pageSize}
-				this.OrderService.SearchOrderInfo(params).then(response =>{
+				this.OrderService.SearchOrderInfo(
+					{
+						searchWord:this.searchInputVal,
+						organizeId:this.organizeId,
+						pageNum:this.pageNum,
+						pageSize:this.pageSize,
+					}
+				)
+				.then(response =>{
 					let resData = response.data.list
 					this.hasNextPage = response.data.hasNextPage;
 					this.orderList = this.orderList.concat(resData)

services/config.env.js

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