订单修改

common/config/caimeiApi.js

@@ -224,7 +224,7 @@ const caimeiApi = {
 			if(pros.linkType){
 				console.log(pros.linkType)
 				const typeMap = {
-				 	1:`/pages/goods/goods-instrument?linkId=${pros.linkParam.id}&title=${pros.name}`,
+				 	1:`/pages/goods/goods-instrument?linkId=${pros.linkParam.id}`,
 				 	2:`/pages/goods/instrument-details?id=${pros.linkParam.id}`,
 					4:`/h5/pages/activity/activity?title=${pros.crmTitle}&link=${pros.crmLink}`,
 				 	5:`/pages/goods/product?id=${pros.linkParam.id}`,

components/cm-module/creatOrder/choiceAddress.vue

@@ -16,7 +16,6 @@
 							<text class="iconfont icon-shouhuodizhi"></text>
 						</view>
 						<view class="address-text">
-							收货地址：
 							{{addressData.province !== undefined ? addressData.province : ''}}
 							{{addressData.city !== undefined ? addressData.city : ''}}
 							{{addressData.town !== undefined ? addressData.town : ''}}

components/cm-module/homeIndex/pageFloor.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="page-content clearfix" v-for="(page,index) in pageFloorList" :key="index">
-			<view class="tui-group-name" >
+			<view class="tui-group-name" v-if="page.floorContent">
 				<view class="tui-group-title">
 					<view class="tui-group-l">{{ page.title }}</view>
 					<view class="tui-group-r"  v-if="page.floorContent.templateType != '8'" @click="NavToDetailPage(page)">

components/cm-module/orderDetails/goodsList.vue

@@ -61,7 +61,7 @@
 						</view>
 					</view>
 				</view>	
-				<view class="goods-pros-m" v-if="item.note!=''">
+				<view class="goods-pros-m" v-if="item.note">
 					<view class="m-text">留言:</view>
 					<view class="m-input">
 						<view class="text">{{item.note ? item.note : ''}}</view>

components/cm-module/orderDetails/orderAddress.vue

@@ -13,7 +13,6 @@
 							<text class="iconfont icon-shouhuodizhi"></text>
 						</view>
 						<view class="address-text">
-							收货地址：
 							{{addressData.province !== undefined ? addressData.province : ''}}
 							{{addressData.city !== undefined ? addressData.city : ''}}
 							{{addressData.town !== undefined ? addressData.town : ''}}
@@ -98,7 +97,7 @@
 			align-items: center;
 			justify-content: center;
 			width: 40rpx;
-			color: #666666;
+			color: $color-system;
 			font-size: 46rpx;
 			margin-right: 10rpx;
 		}	

h5/pages/activity/activity-list.vue

@@ -13,7 +13,7 @@
 			</view>
 			<!--加载loadding-->
 			<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-			<tui-nomore :visible="!pullUpOn" bgcolor="#F7F7F7" :text='nomoreText'></tui-nomore>
+			<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text='nomoreText'></tui-nomore>
 			<!--加载loadding-->
 		</scroll-view>
 	</view>

pages.json

@@ -474,12 +474,6 @@
 						"navigationStyle":"custom"
 					}
 				},
-				{
-					"path": "pages/order/order-history",
-					"style": {
-						"navigationBarTitleText": "订单列表"
-					}
-				},
 				{
 					"path": "pages/order/order-historylist",
 					"style": {

pages/goods/goods-active.vue

@@ -28,7 +28,7 @@
 			</view>	
 			<!--加载loadding-->
 			<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-			<tui-nomore :visible="!pullUpOn" bgcolor="#F7F7F7" :text='nomoreText'></tui-nomore>
+			<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text='nomoreText'></tui-nomore>
 			<!--加载loadding-->
 		</view>
 	</view>

pages/goods/goods-classify.vue

@@ -129,11 +129,11 @@
 							</view>
 						</view>
 					</view>
+					<!--加载loadding-->
+					<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
+					<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text='nomoreText'></tui-nomore>
+					<!--加载loadding-->
 				</view>
-				<!--加载loadding-->
-				<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-				<tui-nomore :visible="!pullUpOn" bgcolor="#F7F7F7" :text='nomoreText'></tui-nomore>
-				<!--加载loadding-->
 			</template>
 		</template>
 		<!--右抽屉-->
@@ -282,6 +282,7 @@
 				})
 			},
 			GetProductListInfo(){//查询分类商品列表
+				this.listQuery.pageNum = 1
 				this.ProductService.GetSearchProductTypeData(this.listQuery).then(response =>{
 					const resData = JSON.parse(response.data);
 					const resList = resData.items;
@@ -513,14 +514,12 @@
 		},
 		onPullDownRefresh() {
 			setTimeout(() => {
-				this.listQuery.pageNum = 1
 				this.GetProductListInfo()
 				uni.stopPullDownRefresh()
 			}, 200)
 		},
 		onReachBottom() {
 			if(this.totalPage>this.listData.length) {
-				console.log('2222222222222')
 				this.loadding = true
 				this.pullUpOn = true
 				this.GetOnReachBottomData()
@@ -543,7 +542,7 @@
 
 <style lang="scss">
 	page {
-		background: $sub-bg-color;
+		background: #FFFFFF;
 		.all-type-list-wrapper {
 			display: flex;
 			flex-direction: column;

pages/goods/goods-instrument.vue

@@ -67,7 +67,6 @@
 			let _self = this
 			this.linkId = option.linkId
 			this.linkTitle = option.title
-			uni.setNavigationBarTitle({title:_self.linkTitle});
 			this.GetPageTopicInfo()
 		},
 		methods:{
@@ -91,6 +90,7 @@
 					this.buttonLinkType = data.linkType
 					this.buttonLinkParam = data.linkParam
 					this.buttonLinkKeyword = data.keywords
+					uni.setNavigationBarTitle({title:data.title});
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000)
 				})
@@ -148,17 +148,16 @@
 		.banner{
 			box-sizing: border-box;
 			padding:24rpx;
-			background-color: #FFFFFF;
 			width: 100%;
 			.banner-image{
 				width: 100%;
 				height: 248rpx;
-				border-radius: 4rpx;
+				border-radius: 16rpx;
 				float: left;
 				image{
 					width: 100%;
 					height: 248rpx;
-					border-radius: 4rpx;
+					border-radius: 16rpx;
 				}
 			}
 			.content{
@@ -239,7 +238,7 @@
 						margin-right: 20rpx;
 						margin-bottom: 20rpx;
 						background-color: #FFFFFF;
-						border-radius: 4rpx;
+						border-radius: 16rpx;
 						&:nth-child(2n){
 							margin-right: 0;
 						}
@@ -251,7 +250,7 @@
 								width: 340rpx;
 								height: 340rpx;
 								display: block;
-								border-radius: 4rpx 4rpx 0 0;
+								border-radius: 16rpx 16rpx 0 0;
 							}
 						}
 						.item-pros-name{

pages/user/operator/list.vue

@@ -53,7 +53,7 @@
 					</view>
 					<!--加载loadding-->
 					<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-					<tui-nomore :visible="!pullUpOn" bgcolor="#F7F7F7" :text='nomoreText'></tui-nomore>
+					<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text='nomoreText'></tui-nomore>
 					<!--加载loadding-->
 				</scroll-view>
 			</view>

pages/user/order/order-list.vue

@@ -24,7 +24,7 @@
 									<view class="order-title-t">
 										<text class="bage-buss tui-skeleton-fillet" v-if="order.orderSubmitType == 3 || order.orderSubmitType == 4">协销</text>
 										<text class="bage-auto tui-skeleton-fillet" v-if="order.orderSubmitType == 0 || order.orderSubmitType == 1 || order.orderSubmitType == 2">自主</text>
-										<text class="bage-text tui-skeleton-fillet">订单号：{{order.orderNo}}</text>
+										<text class="bage-text tui-skeleton-fillet">订单编号：{{order.orderNo}}</text>
 										<image class="bage-icon" src="https://static.caimei365.com/app/img/icon/icon-type@3x.png" mode="widthFix" v-if="order.secondHandOrderFlag == 1"></image>
 									</view>
 									<view class="order-title-b">
@@ -87,7 +87,7 @@
 							</view>
 							<!--加载loadding-->
 							<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-							<tui-nomore :visible="!pullUpOn" bgcolor="#F7F7F7" :text='nomoreText'></tui-nomore>
+							<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text='nomoreText'></tui-nomore>
 							<!--加载loadding-->
 						</view>
 					</view>

search/pages/search/search-instrument.vue

@@ -30,7 +30,7 @@
 					</view>
 					<!--加载loadding-->
 					<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-					<tui-nomore :visible="!pullUpOn" bgcolor="#F7F7F7" :text='nomoreText'></tui-nomore>
+					<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text='nomoreText'></tui-nomore>
 					<!--加载loadding-->
 			</view>
 		</view>

search/pages/search/search-order.vue

@@ -34,7 +34,7 @@
 								<view class="order-title-t">
 									<text class="bage-buss tui-skeleton-fillet" v-if="order.orderSubmitType == 3 || order.orderSubmitType == 4">协销</text>
 									<text class="bage-auto tui-skeleton-fillet" v-if="order.orderSubmitType == 0 || order.orderSubmitType == 1 || order.orderSubmitType == 2">自主</text>
-									<text class="bage-text tui-skeleton-fillet">订单号：{{order.orderNo}}</text>
+									<text class="bage-text tui-skeleton-fillet">订单编号：{{order.orderNo}}</text>
 									<image class="bage-icon" src="https://static.caimei365.com/app/img/icon/icon-type@3x.png" mode="widthFix" v-if="order.secondHandOrderFlag == 1"></image>
 								</view>
 								<view class="order-title-b">
@@ -96,7 +96,7 @@
 						</view>
 						<!--加载loadding-->
 						<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-						<tui-nomore :visible="!pullUpOn" bgcolor="#F7F7F7" :text='nomoreText'></tui-nomore>
+						<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text='nomoreText'></tui-nomore>
 						<!--加载loadding-->
 					</view>
 				</view>

search/pages/search/search-supplier.vue

@@ -64,7 +64,7 @@
 					</view>
 					<!--加载loadding-->
 					<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-					<tui-nomore :visible="!pullUpOn" bgcolor="#F7F7F7" :text='nomoreText'></tui-nomore>
+					<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text='nomoreText'></tui-nomore>
 					<!--加载loadding-->
 			</view>
 		</view>

seller/pages/cart/cart.vue

@@ -112,7 +112,7 @@
 					
 					<!--加载loadding-->
 					<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-					<tui-nomore :visible="!pullUpOn" bgcolor="#F7F7F7" :text='nomoreText'></tui-nomore>
+					<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text='nomoreText'></tui-nomore>
 					<!--加载loadding-->
 				</scroll-view>
 				<!-- 脚部菜单 -->

seller/pages/club/allClub-list.vue

@@ -42,7 +42,7 @@
 					</view>
 					<!--加载loadding-->
 					<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-					<tui-nomore :visible="!pullUpOn" bgcolor="#F7F7F7" :text='nomoreText'></tui-nomore>
+					<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text='nomoreText'></tui-nomore>
 					<!--加载loadding-->
 				</scroll-view>
 			</view>

seller/pages/club/club-list.vue

@@ -48,7 +48,7 @@
 					</view>
 					<!--加载loadding-->
 					<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-					<tui-nomore :visible="!pullUpOn" bgcolor="#F7F7F7" :text='nomoreText'></tui-nomore>
+					<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text='nomoreText'></tui-nomore>
 					<!--加载loadding-->
 				</scroll-view>
 			</view>

seller/pages/club/list.vue

@@ -59,7 +59,7 @@
 					</view>
 					<!--加载loadding-->
 					<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-					<tui-nomore :visible="!pullUpOn" bgcolor="#F7F7F7" :text='nomoreText'></tui-nomore>
+					<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text='nomoreText'></tui-nomore>
 				</scroll-view>
 			</view>
 		</view>

seller/pages/order/myOrder.vue

@@ -72,7 +72,7 @@
 					</view>
 					<!--加载loadding-->
 					<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-					<tui-nomore :visible="!pullUpOn" bgcolor="#F7F7F7" :text='nomoreText'></tui-nomore>
+					<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text='nomoreText'></tui-nomore>
 					<!--加载loadding-->
 				</view>
 			</view>

seller/pages/order/order-history.vue

@@ -1,247 +0,0 @@
-<template>
-	<view class="container history clearfix">
-		<view class="history-main">
-			<view v-if="isEmpty" class="empty-container">
-				<image class="club-empty-image" src="https://img.caimei365.com/group1/M00/03/71/Cmis2F3wna6AJZvwAAGWWe4DnXk371.png" mode="aspectFit"></image>
-				<view class="txt">暂无订单数据</view>
-			</view>
-			<view v-else class="history-list">
-				<scroll-view scroll-y="true" >
-					<view class="list" v-for="(item, index) in historyList" :key="index">
-						<view class="list-left">
-							<view class="list-p">订单号:<text class="txt">{{item.orderNo}}</text><text v-if="item.orderSubmitType == 3" class="tag">协销</text></view>
-							<view class="list-p">总金额:<text class="txt">￥{{orderPriceToFixed(item.payTotalFee)}}</text></view>
-							<view class="list-p">数量(赠):<text class="txt">{{item.productCount}}({{item.presentCount}})</text></view>
-						</view>
-						<view class="list-opea">
-							<view class="opea-p">{{orderStateExp(item.status)}}</view>
-							<view class="opea-type-dell" @click.stop="orderDetiles(item.orderID)">
-								<text>查看详情</text>
-							</view>
-						</view>
-					</view>
-					<!--加载loadding-->
-					<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-					<tui-nomore :visible="!pullUpOn" bgcolor="#F7F7F7" :text='nomoreText'></tui-nomore>
-					<!--加载loadding-->
-				</scroll-view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import authorize from '@/common/config/authorize.js'	
-	import tuiLoadmore from "@/components/tui-components/loadmore/loadmore"
-	import tuiNomore from "@/components/tui-components/nomore/nomore"
-	export default {
-		components:{
-			tuiLoadmore,
-			tuiNomore,
-		},
-		data() {
-			return {
-				clubID:'',
-				serviceProviderId:'',
-				isEmpty:false,
-				nomoreText: '上拉显示更多',
-				pageNum:1,
-				pageSize:10,
-				hasNextPage:false,
-				loadding: false,
-				pullUpOn: true,
-				pullFlag: true,
-				allowDataStatus:true,
-				wrapperHeight:'100%',
-				scrollHeight:'',
-				deleteAddressId:'',
-				currPage:'',//当前页面
-				prevPage:'',//上一个页面
-				tabCurrentIndex:0,
-				historyList:[],
-			}
-		},
-		onLoad(option){	
-			this.clubID = option.clubID
-		},
-		methods: {
-			inithistoryList(){	
-				this.$api.getComStorage('orderUserInfo').then((resolve) =>{
-					let params = {clubID:resolve.clubID,serviceProviderId:this.serviceProviderId,pageNum:1,pageSize:this.pageSize};
-					this.SellerService.GetSellerClubOrderList(params).then(response =>{
-						let responseData = response.data
-						if(responseData.results&&responseData.results.length > 0){
-							this.isEmpty = false
-							this.hasNextPage = response.data.hasNextPage
-							this.historyList =responseData.results
-							this.pullFlag = false;
-							setTimeout(()=>{this.pullFlag = true;},500)
-							if(this.hasNextPage){
-								this.pullUpOn = false
-								this.nomoreText = '上拉显示更多'
-							}else{
-								this.pullUpOn = true
-								this.loadding = false
-								this.nomoreText = '已至底部'
-							}
-						}else{
-							this.isEmpty = true
-						}
-					}).catch(error =>{
-						this.$util.msg(error.msg,2000)
-					})
-				})
-			},	
-			getOnReachBottomData(){
-				this.pageNum+=1
-				this.$api.getComStorage('orderUserInfo').then((resolve) =>{
-					let params = {clubID:resolve.clubID,serviceProviderId:this.serviceProviderId,pageNum:this.pageNum,pageSize:this.pageSize};
-					this.SellerService.GetSellerClubOrderList(params).then(response =>{
-						let responseData = response.data
-						if(responseData.results&&responseData.results.length > 0){
-							this.hasNextPage = response.data.hasNextPage
-							this.historyList = this.historyList.concat(responseData.results) 
-							this.pullFlag = false;// 防上拉暴滑
-							setTimeout(()=>{this.pullFlag = true;},500)
-							if(this.hasNextPage){
-								this.pullUpOn = false
-								this.nomoreText = '上拉显示更多'
-							}else{
-								this.pullUpOn = false
-								this.loadding = false
-								this.nomoreText = '已至底部'
-							}
-						}
-					}).catch(error =>{
-						this.$util.msg(error.msg,2000)
-					})
-				})
-			},
-			orderPriceToFixed (n){
-				let price ='';
-				price = n.toFixed(2);
-				return price
-			},
-			//订单状态文字和颜色
-			orderStateExp (state){
-				let stateText = '',
-					stateTextObject={
-						0:'待确认',
-						4:'交易完成',
-						5:'订单完成',
-						6:'已关闭',
-						7:'交易全退',
-						77:'交易全退',
-						11:'待付款待发货',
-						12:'待付款部分发货',
-						13:'待付款已发货',
-						21:'部分付款待发货',
-						22:'部分付款部分发货',
-						23:'部分付款已发货',
-						31:'已付款待发货',
-						32:'已付款部分发货',
-						33:'已付款已发货',
-						111:'待付款待发货',
-					}
-				Object.keys(stateTextObject).forEach(key => {
-					if(key == state){
-						stateText = stateTextObject[key]
-					}
-				})
-				return stateText;
-			},
-			orderDetiles(id){
-				this.$api.navigateTo(`/seller/pages/order/order-details?type=confim&orderID=${id}`)
-			}
-		},
-		onReachBottom() {
-			if(this.hasNextPage){
-				this.loadding = true
-				this.pullUpOn = true
-				this.getOnReachBottomData()
-			}	
-		},
-		onShow() {
-			this.$api.getStorage().then((resolve) =>{
-				this.serviceProviderId = resolve.serviceProviderID
-				this.pageNum = 1;
-				this.inithistoryList();
-			})	
-		}
-	}
-</script>
-
-<style lang='scss'>
-	page {
-		height: auto;
-	}
-	page,.container{
-		/* padding-bottom: 120upx; */
-		background: #F7F7F7;
-		border-top: 1px solid #EBEBEB;
-	}
-	.container{
-		position: relative;
-	}
-	.history-main{
-		.list{
-			display: flex;
-			align-items: center;
-			width: 702rpx;
-			height: auto;
-			padding: 24rpx;
-			background: #FFFFFF;
-			position: relative;
-			border-bottom: 1px solid #EBEBEB;
-			.list-left{
-				flex: 7;
-				.list-p{
-					line-height: 58rpx;
-					font-size: $font-size-26;
-					color: $text-color;
-					text-align: left;
-					.txt{
-						margin-left: 20rpx;
-					}
-					.tag{
-						display: inline-block;
-						width: 60rpx;
-						height: 28rpx;
-						line-height: 28rpx;
-						font-size: $font-size-20;
-						color: #FFFFFF;
-						background: $btn-confirm;
-						text-align: center;
-						border-radius: 14rpx;
-						margin-left: 20rpx;
-					}
-				}
-			}
-			.list-opea{
-				flex: 3;
-				color: #166CE1;
-				align-items: center;
-				display: flex;
-				flex-direction: column;
-				.opea-p{
-					line-height: 70rpx;
-					font-size: $font-size-24;
-					color: #E11616;
-					text-align: right;
-				}
-				.opea-type-dell{
-					width: 160rpx;
-					height: 68rpx;
-					line-height: 68rpx;
-					font-size: $font-size-24;
-					text-align: center;
-					color: #FFFFFF;
-					border-radius: 10rpx;
-					background: #166CE1;
-					margin-top: 24rpx;
-				}
-			}
-		}
-	}
-</style>
-

seller/pages/order/order-historylist.vue

@@ -27,7 +27,7 @@
 									<view class="order-title-t">
 										<text class="bage-buss tui-skeleton-fillet" v-if="order.orderSubmitType == 3 || order.orderSubmitType == 4">协销</text>
 										<text class="bage-auto tui-skeleton-fillet" v-if="order.orderSubmitType == 0 || order.orderSubmitType == 1 || order.orderSubmitType == 2">自主</text>
-										<text class="bage-text tui-skeleton-fillet">订单号：{{order.orderNo}}({{order.orderID}})</text>
+										<text class="bage-text tui-skeleton-fillet">订单编号：{{order.orderNo}}({{order.orderID}})</text>
 										<image class="bage-icon" src="https://static.caimei365.com/app/img/icon/icon-type@3x.png" mode="widthFix" v-if="order.secondHandOrderFlag == 1"></image>
 									</view>
 									<view class="order-title-b">
@@ -76,7 +76,8 @@
 									<view class="order-footer-top" v-if="order.discountFee!=0">经理折扣：¥{{ order.discountFee | NumFormat }}</view>
 									<view class="order-footer-bot">
 										<view class="count tui-skeleton-fillet">共{{order.productCount}}件商品</view>
-										<view class="money tui-skeleton-fillet">应付总额：¥{{ order.payableAmount | NumFormat }}</view>
+										<view class="money tui-skeleton-fillet" v-if="order.status==31||order.status==32||order.status==33">已支付：<label style="color:#f94b4b ;">¥{{ order.receiptAmount | NumFormat }}</label></view>
+										<view class="money tui-skeleton-fillet" v-else>待付总额：<label style="color:#f94b4b ;">¥{{ order.pendingPayments | NumFormat }}</label></view>
 									</view>
 								</view>
 								<!-- 底部button -->
@@ -90,7 +91,7 @@
 							</view>
 							<!--加载loadding-->
 							<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-							<tui-nomore :visible="!pullUpOn" bgcolor="#F7F7F7" :text='nomoreText'></tui-nomore>
+							<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text='nomoreText'></tui-nomore>
 							<!--加载loadding-->
 						</view>
 					</view>
@@ -460,6 +461,10 @@
 </script>
 
 <style lang="scss">
+	/*tabbar end*/
+	page{
+		background: #FFFFFF;
+	}
 	/*tabbar start*/
 	::-webkit-scrollbar {
 		width: 0;
@@ -542,10 +547,6 @@
 			color: $color-system !important;
 		}
 	}
-	/*tabbar end*/
-	page{
-		background: #F7F7F7;
-	}
 	.container {
 		padding-bottom: env(safe-area-inset-bottom);
 		height: auto;

seller/pages/order/order-list.vue

@@ -36,7 +36,7 @@
 										<view class="Rebate " v-if="order.rebateFlag==1">返佣</view>
 										<text class="bage-buss tui-skeleton-fillet" v-if="order.orderSubmitType == 3 || order.orderSubmitType == 4">协销</text>
 										<text class="bage-auto tui-skeleton-fillet" v-if="order.orderSubmitType == 0 || order.orderSubmitType == 1 || order.orderSubmitType == 2">自主</text>
-										<text class="bage-text tui-skeleton-fillet">订单号：{{order.orderNo}}({{order.orderID}})</text>
+										<text class="bage-text tui-skeleton-fillet">订单编号：{{order.orderNo}}({{order.orderID}})</text>
 										<image class="bage-icon" src="https://static.caimei365.com/app/img/icon/icon-type@3x.png" mode="widthFix" v-if="order.secondHandOrderFlag == 1"></image>
 									</view>
 									<view class="order-title-b">
@@ -85,7 +85,8 @@
 									<view class="order-footer-top" v-if="order.discountFee!=0">经理折扣：¥{{ order.discountFee | NumFormat }}</view>
 									<view class="order-footer-bot">
 										<view class="count tui-skeleton-fillet">共{{order.productCount}}件商品</view>
-										<view class="money tui-skeleton-fillet">应付总额：<label style="color: #f94b4b;">¥{{ order.payableAmount | NumFormat }}</label></view>
+										<view class="money tui-skeleton-fillet" v-if="order.status==31||order.status==32||order.status==33">已支付：<label style="color:#f94b4b ;">¥{{ order.receiptAmount | NumFormat }}</label></view>
+										<view class="money tui-skeleton-fillet" v-else>待付总额：<label style="color:#f94b4b ;">¥{{ order.pendingPayments | NumFormat }}</label></view>
 									</view>
 								</view>
 								<!-- 底部button -->
@@ -99,7 +100,7 @@
 							</view>
 							<!--加载loadding-->
 							<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-							<tui-nomore :visible="!pullUpOn" bgcolor="#F7F7F7" :text='nomoreText'></tui-nomore>
+							<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text='nomoreText'></tui-nomore>
 							<!--加载loadding-->
 						</view>
 					</view>
@@ -547,6 +548,9 @@
 </script>
 
 <style lang="scss">
+	page{
+		background-color: #FFFFFF;
+	}
 	/*tabbar start*/
 	::-webkit-scrollbar {
 		width: 0;
@@ -629,10 +633,6 @@
 			color: $color-system !important;
 		}
 	}
-	/*tabbar end*/
-	page{
-		background: #F7F7F7;
-	}
 	.container {
 		padding-bottom: env(safe-area-inset-bottom);
 		height: auto;

seller/pages/search/search-order.vue

@@ -83,7 +83,8 @@
 								<view class="order-footer-top" v-if="order.discountFee!=0">经理折扣：¥{{ order.discountFee | NumFormat }}</view>
 								<view class="order-footer-bot">
 									<view class="count tui-skeleton-fillet">共{{order.productCount}}件商品</view>
-									<view class="money tui-skeleton-fillet">待付总额：¥{{ order.pendingPayments | NumFormat}}</view>
+									<view class="money tui-skeleton-fillet" v-if="order.status==31||order.status==32||order.status==33">已支付：<label style="color:#f94b4b ;">¥{{ order.receiptAmount | NumFormat }}</label></view>
+									<view class="money tui-skeleton-fillet" v-else>待付总额：<label style="color:#f94b4b ;">¥{{ order.pendingPayments | NumFormat }}</label></view>
 								</view>
 							</view>
 							<!-- 底部button -->
@@ -96,7 +97,7 @@
 						</view>
 						<!--加载loadding-->
 						<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-						<tui-nomore :visible="!pullUpOn" bgcolor="#F7F7F7" :text='nomoreText'></tui-nomore>
+						<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text='nomoreText'></tui-nomore>
 						<!--加载loadding-->
 					</view>
 				</view>

services/ajax.env.js

@@ -1,11 +1,11 @@
 let URL_CONFIG = ""
 if(process.env.NODE_ENV === 'development'){
     // 开发环境
-	// URL_CONFIG = 'http://192.168.2.68:8082'	 //涛涛联调地址
-	// URL_CONFIG = 'http://192.168.2.67:8082'	 //裴裴联调地址
-	// URL_CONFIG = 'http://192.168.2.75:8082'	 //超超联调地址
-    // URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
-	URL_CONFIG = 'https://spi.caimei365.com'
+	// 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'
 }else{
     // 生产环境
 	// URL_CONFIG = 'https://spi-b.caimei365.com'

supplier/pages/deliver/deliver-record.vue

@@ -66,7 +66,7 @@
 				</view>
 				<!--加载loadding-->
 				<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-				<tui-nomore :visible="!pullUpOn" bgcolor="#F7F7F7" :text='nomoreText'></tui-nomore>
+				<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text='nomoreText'></tui-nomore>
 				<!--加载loadding-->
 			</scroll-view>	
 		</view>

supplier/pages/order/order-list.vue

@@ -64,7 +64,7 @@
 					</view>
 					<!--加载loadding-->
 					<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-					<tui-nomore :visible="!pullUpOn" bgcolor="#F7F7F7" :text='nomoreText'></tui-nomore>
+					<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text='nomoreText'></tui-nomore>
 					<!--加载loadding-->
 				</view>
 			</view>

supplier/pages/user/my-product.vue

@@ -52,7 +52,7 @@
 				</checkbox-group>
 				<!--加载loadding-->
 				<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-				<tui-nomore :visible="!pullUpOn" bgcolor="#F7F7F7" :text='nomoreText'></tui-nomore>
+				<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text='nomoreText'></tui-nomore>
 				<!--加载loadding-->
 			</view>
 		</view>

supplier/pages/user/operator/list.vue

@@ -53,7 +53,7 @@
 					</view>
 					<!--加载loadding-->
 					<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-					<tui-nomore :visible="!pullUpOn" bgcolor="#F7F7F7" :text='nomoreText'></tui-nomore>
+					<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text='nomoreText'></tui-nomore>
 					<!--加载loadding-->
 				</scroll-view>
 			</view>