机构

common/config/config.js

@@ -1,8 +1,8 @@
 let URL_CONFIG = ""
 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.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'

components/cm-module/orderDetails/goodsList.vue

@@ -21,37 +21,44 @@
 							<view class="producttitle">{{pros.name}}</view>
 							<view class="productspec product-view" v-if="pros.productCategory != 2">规格：{{pros.productUnit ? pros.productUnit : ''}}</view>
 							<view class="product-view">
-								<view class="view-num">单价：￥{{pros.price | NumFormat}}</view>
+								<view class="view-num red">￥{{pros.price | NumFormat}}</view>
 							</view>
 							<view class="product-view">
-								<view class="view-num">数量：{{pros.num}}</view>
-							</view>
-							<view class="product-view" v-if="pros.returnedNum>0 || pros.actualCancelNum>0">
-								<view class="view-num">已退货/已取消：{{pros.returnedNum}}/{{pros.actualCancelNum}}</view>
-							</view>
-							<view class="product-view">
-								<view class="view-num">税率：{{pros.taxRate}}%</view>
-							</view>
-							<view class="product-view">
-								<view class="view-num">折扣：{{pros.discount == null ? '0' : pros.discount}}%</view>
-							</view>
-							<view class="product-view">
-								<view class="view-num">折后单价：￥{{pros.discountPrice | NumFormat}}</view>
-							</view>
-							<view class="floor-item-act" v-if="pros.productPromotion!=null" >
-								<view v-if="PromotionsFormat(pros.productPromotion)" class="floor-tags" @click.stop="clickPopupShow(pros.productPromotion)">
-									{{pros.productPromotion.name}}
-									<text v-if ="pros.productPromotion!=null && pros.productPromotion.type !=3">
-										:￥{{ pros.productPromotion == null ? '0.00' : pros.productPromotion.touchPrice | NumFormat}}
-									</text>
-								</view>
-								<view v-else-if="pros.productPromotion.type !=3" class="floor-tags" @click.stop="clickPopupShow(pros.productPromotion)">{{pros.productPromotion.name}}</view>	
-							</view>
-							<view class="product-view allPrice">
-								<view class="view-num">合计：<label style="color:#f94b4b ;">￥{{pros.totalFee | NumFormat}}</label></view>
+								<view class="view-num right">x {{pros.num}}</view>
 							</view>
 						</view>	
 					</view>
+					<view class=" product-info">
+						<view class="product-view" v-if="pros.returnedNum>0 || pros.actualCancelNum>0">
+							<view class="view-num">已退货/已取消</view>
+							<view class="view-right">{{pros.returnedNum}}/{{pros.actualCancelNum}}</view>
+						</view>
+						<view class="product-view">
+							<view class="view-num">税率</view>
+							<view class="view-right">{{pros.taxRate}}%</view>
+						</view>
+						<view class="product-view">
+							<view class="view-num">折扣</view>
+							<view class="view-right">{{pros.discount == null ? '0' : pros.discount}}%</view>
+						</view>
+						<view class="product-view">
+							<view class="view-num">折后单价</view>
+							<view class="view-right">￥{{pros.discountPrice | NumFormat}}</view>
+						</view>
+						<view class="floor-item-act" v-if="pros.productPromotion!=null" >
+							<view v-if="PromotionsFormat(pros.productPromotion)" class="floor-tags" @click.stop="clickPopupShow(pros.productPromotion)">
+								{{pros.productPromotion.name}}
+								<text v-if ="pros.productPromotion!=null && pros.productPromotion.type !=3">
+									:￥{{ pros.productPromotion == null ? '0.00' : pros.productPromotion.touchPrice | NumFormat}}
+								</text>
+							</view>
+							<view v-else-if="pros.productPromotion.type !=3" class="floor-tags" @click.stop="clickPopupShow(pros.productPromotion)">{{pros.productPromotion.name}}</view>	
+						</view>
+						<view class="product-view allPrice">
+							<view class="view-num">合计</view>
+							<view class="view-right">￥{{pros.totalFee | NumFormat}}</view>
+						</view>
+					</view>
 				</view>	
 				<view class="goods-pros-m" v-if="item.note!=''">
 					<view class="m-text">留言:</view>
@@ -60,7 +67,7 @@
 					</view>	
 				</view>
 				<view class="goods-pros-b">
-					<view class="count">共<label style="color: #e15616;">{{item.itemCount}}</label>件商品</view>
+					<view class="count">共{{item.itemCount}}件商品</view>
 					<view class="sum">
 						<view class="sum-none" v-if="item.promotionFullReduction>0">
 							<text class="money-sign">￥</text>
@@ -197,7 +204,7 @@
 				display: flex;
 				width: 100%;
 				height: auto;
-				padding: 12rpx 0;
+				margin: 20rpx 0;
 				.pros-left{
 					width: 210rpx;
 					height: 100%;
@@ -230,6 +237,24 @@
 					}
 				}
 			}
+			.product-info{
+				border-top: 2rpx solid #e1e1e1;
+				padding: 10rpx 0;
+				.product-view{
+					font-size:$font-size-24;
+					color: #999999;
+					overflow: hidden;
+					height: 44rpx;
+					line-height: 44rpx;
+					.view-num{
+						float: left;
+					}
+					.view-right{
+						color: #666666;
+						float: right;
+					}
+				}
+			}
 			.pros-product{
 				width: 468rpx;
 				height: 100%;
@@ -237,10 +262,10 @@
 				font-size: $font-size-26;	
 				position: relative;
 				.product-view{
-					width: 50%;
-					height: auto;
+					// width: 50%;
+					// height: auto;
 					// display: flex;
-					display: inline-block;
+					// display: inline-block;
 					&.allPrice{
 						width: 100%;
 					}
@@ -250,8 +275,13 @@
 						font-size: $font-size-26;
 						color: #999999;
 						line-height: 44rpx;
-						.red{
+						float: left;
+						&.right{
+							float: right;
+						}
+						&.red{
 							color: #FF2000;
+							font-weight: bold;
 						}
 					}
 				}
@@ -271,6 +301,7 @@
 					height: 44rpx;
 					color: #999999;
 					line-height: 44rpx;
+					margin: 20rpx 0;
 				}
 				.productprice{
 					height: 48rpx;
@@ -353,15 +384,14 @@
 				height: 80rpx;
 				margin-top: 12rpx;
 				float: left;
-				border-top: 2rpx solid #e1e1e1;
-
 				.count{
 					float: left;
-					font-size: $font-size-28;
+					font-size: $font-size-26;
 					line-height: 80rpx;
 					color: $text-color;
 					display: flex;
 					justify-content: flex-end;
+					font-weight: bold;
 				}
 				.sum{
 					width: 520rpx;

components/cm-module/orderDetails/orderAddress.vue

@@ -57,11 +57,11 @@
 		width: 100%;
 		height: auto;
 		background: #FFFFFF;
-		border-top: 1px solid #F8F8F8;
+		// border-top: 1px solid #F8F8F8;
 		image{
 			float: left;
 			width: 100%;
-			height: 16rpx;
+			height: 6rpx;
 		}
 	}
 	.address-section {
@@ -98,7 +98,7 @@
 			align-items: center;
 			justify-content: center;
 			width: 40rpx;
-			color: $color-system;
+			color: #666666;
 			font-size: 46rpx;
 			margin-right: 10rpx;
 		}	
@@ -117,12 +117,10 @@
 				display: flex;
 				float: left;
 				.name{
-					font-weight: bold;
 					margin-right: 48rpx;
 				}
 				.mobile{
 					margin-right: 40rpx;
-					font-weight: bold;
 				}
 			}
 			.address {
@@ -141,7 +139,7 @@
 					float: left;
 					line-height: 40rpx;
 					font-size: $font-size-28;
-					color: $text-color;
+					color: #666666;
 					text-align: left;
 					-o-text-overflow: ellipsis;
 					text-overflow: ellipsis;

components/cm-module/orderDetails/orderButton.vue

@@ -11,7 +11,7 @@
 			<view class="btn btn-cancel" v-if="btnState.isCancel" @click.stop="btnConfirm('cancel',order)">取消订单</view>
 			<view class="btn btn-delete" v-if="btnState.isDelete" @click.stop="btnConfirm('delete',order)">删除订单</view>
 			<view class="btn btn-query" v-if="btnState.isQuery" @click.stop="btnConfirm('query',order)">查看物流</view>
-			<view class="btn btn-confirm" v-if="btnState.isConfirm" @click.stop="btnConfirm('confirm',order)">确认收货</view>
+			<view class="btn " v-if="btnState.isConfirm" @click.stop="btnConfirm('confirm',order)">确认收货</view>
 		</view>
 	</view>
 </template>
@@ -139,10 +139,12 @@
 				margin:22rpx;
 				line-height: 64rpx;
 				font-size:$font-size-26;
-				color: #FFFFFF;
+				color: #666666;
 				text-align: center;
 				border-radius: 6rpx;
 				float: right;
+				border: 2rpx solid #999999;
+				border-radius: 32rpx;
 			}
 			.btn-color{
 				background: $btn-confirm;
@@ -175,23 +177,23 @@
 				}
 			}
 			.btn-cancel{
-				background:#FFFFFF;
-				color: #999999;
+				// background:#FFFFFF;
+				// color: #999999;
 				float: left;
 				margin: 22rpx 0;
-				text-align: left;
-			}
-			.btn-delete{
-				background:linear-gradient(315deg,rgba(255,163,3,1) 0%,rgba(255,53,1,1) 100%);
-			}
-			.btn-query{
-				background:linear-gradient(135deg,rgba(255,212,129,1) 0%,rgba(198,129,0,1) 100%);
+				// text-align: left;
 			}
+			// .btn-delete{
+			// 	background:linear-gradient(315deg,rgba(255,163,3,1) 0%,rgba(255,53,1,1) 100%);
+			// }
+			// .btn-query{
+			// 	background:linear-gradient(135deg,rgba(255,212,129,1) 0%,rgba(198,129,0,1) 100%);
+			// }
 			.btn-confirm{
 				background:linear-gradient(315deg,rgba(231,0,0,1) 0%,rgba(255,104,1,1) 100%);
 			}
 			.btn-pay{
-				background:linear-gradient(135deg,rgba(242,143,49,1) 0%,rgba(225,86,22,1) 100%);
+				background:#f94b4b;
 				margin-right: 0;
 			}
 			.btn-share{

components/cm-module/orderDetails/orderInformation.vue

@@ -3,48 +3,57 @@
 		 <!-- 订单信息 -->
 		 <view class="information-content">
 			<view class="information-view title">
-				<view class="view-num title">
-					<text class="bage-buss" v-if="orderData.orderSubmitType == 3 || orderData.orderSubmitType == 4">协销</text>
-					<text class="bage-auto" v-if="orderData.orderSubmitType == 0 || orderData.orderSubmitType == 1 ||orderData.orderSubmitType == 2">自主</text>
-					<text class="bage-text">订单编号：{{orderData.orderNo =='undefined' ? '' : orderData.orderNo}}</text>
-					<image class="bage-icon" src="../../../static/temp/icon-type@3x.png" mode="widthFix" v-if="orderData.secondHandOrderFlag == 1"></image>
+				<view class="view-num">
+					<!-- <text class="bage-buss" v-if="orderData.orderSubmitType == 3 || orderData.orderSubmitType == 4">协销</text>
+					<text class="bage-auto" v-if="orderData.orderSubmitType == 0 || orderData.orderSubmitType == 1 ||orderData.orderSubmitType == 2">自主</text> -->
+					<text class="bage-text">订单编号：<label class="label">{{orderData.orderNo =='undefined' ? '' : orderData.orderNo}}</label></text>
+					<!-- <image class="bage-icon" src="../../../static/temp/icon-type@3x.png" mode="widthFix" v-if="orderData.secondHandOrderFlag == 1"></image> -->
 				</view>
 			</view>
-			<view class="information-view">
-				<view class="view-num time">下单时间：{{ orderData.orderTime =='undefined' ? '' : orderData.orderTime }}</view>
-				<view class="view-type">{{ orderData.status | TextFormat }}</view>
+			<view class="information-view same">
+				<view class="view-num">订单总额：<label class="label">￥{{ orderData.payTotalFee =='undefined' ? '' : orderData.payTotalFee | NumFormat }}</label></view>
 			</view>
 			<view class="information-view">
 				<view class="view-num bold">
-					订单标识：{{ orderData.orderMark =='undefined' ? '' : orderData.orderMark }}
+					订单标识：<label class="label">{{ orderData.orderMark =='undefined' ? '' : orderData.orderMark }}</label>
 					<text class="clipboard" @click="clipboard(orderData.orderMark)">复制</text>
 				</view>
 			</view>
-			<view class="information-view">
-				<view class="view-num">订单总额：￥{{ orderData.payTotalFee =='undefined' ? '' : orderData.payTotalFee | NumFormat }}</view>
-				<view class="view-man">应付总额：￥{{ orderData.payableAmount =='undefined' ? '0.00' : orderData.payableAmount | NumFormat }}</view>
-			</view>
-			<view class="information-view">
+			<view class="information-view same">
 				<view class="view-num">待付金额：<text class="red">￥{{ orderData.pendingPayments =='undefined' ? '0.00' : orderData.pendingPayments | NumFormat }}</text></view>
 				<view class="view-man"></view>
 			</view>
+			<template v-if="openShowflag">
 			<view class="information-view">
-				<view class="view-num">经理折扣：￥{{ orderData.discountFee =='undefined' ? '' : orderData.discountFee | NumFormat}}</view>
-				<view class="view-man" v-show="orderData.promotionFullReduction>0">促销满减：￥{{ orderData.promotionFullReduction | NumFormat}}</view>
+				<view class="view-num time">下单时间：<label class="label">{{ orderData.orderTime =='undefined' ? '' : orderData.orderTime }}</label></view>
+				<!-- <view class="view-type">{{ orderData.status | TextFormat }}</view> -->
+			</view>
+			<view class="information-view same">
+				<view class="view-man">应付总额：<label class="red">￥{{ orderData.payableAmount =='undefined' ? '0.00' : orderData.payableAmount | NumFormat }}</label></view>
 			</view>
 			<view class="information-view">
-				<view class="view-num">余额抵扣：￥{{ orderData.balancePayFee =='undefined' ? '' : orderData.balancePayFee | NumFormat}}</view>
-				<view class="view-man">赠品总数:{{ orderData.presentCount + orderData.promotionalGiftsCount}}</view>
+				<view class="view-num">余额抵扣：<label class="label">￥{{ orderData.balancePayFee =='undefined' ? '' : orderData.balancePayFee | NumFormat}}</label></view>
+			</view>
+			<view class="information-view same">
+				<view class="view-num" v-if="orderData.freePostFlag == '0'">运费：<label class="label">包邮</label></view>
+				<view class="view-num" v-if="orderData.freePostFlag == '-1'">运费：<label class="label">到付</label></view>
+				<view class="view-num" v-if="orderData.freePostFlag == '1'">运费：<label class="label">￥{{ orderData.freight | NumFormat}}</label></view>
 			</view>
 			<view class="information-view">
-				<view class="view-num" v-if="orderData.freePostFlag == '0'">运费：包邮</view>
-				<view class="view-num" v-if="orderData.freePostFlag == '-1'">运费：到付</view>
-				<view class="view-num" v-if="orderData.freePostFlag == '1'">运费：￥{{ orderData.freight | NumFormat}}</view>
+				<view class="view-num">经理折扣：<label class="label">￥{{ orderData.discountFee =='undefined' ? '' : orderData.discountFee | NumFormat}}</label></view>
+				<view class="view-man" v-show="orderData.promotionFullReduction>0">促销满减：<label class="label">￥{{ orderData.promotionFullReduction | NumFormat}}</label></view>
+			</view>
+			<view class="information-view same">
+				<view class="view-man">赠品总数：<label class="label">{{ orderData.presentCount + orderData.promotionalGiftsCount}}</label></view>
 			</view>
 			<view class="information-view">
-				<view class="view-num">已支付：￥{{ orderData.receiptAmount == null ? '0.00' : orderData.receiptAmount | NumFormat }}</view>
+				<view class="view-num">已支付：<label class="red">￥{{ orderData.receiptAmount == null ? '0.00' : orderData.receiptAmount | NumFormat }}</label></view>
 				<view class="view-man"></text></view>
 			</view>
+			</template>
+		 </view>
+		 <view class="openinfo" v-if="infoflag">
+		 	<view class="btnInfo" @click="openShow">查看更多<label class="iconfont icon-xiangxiajiantou"></label></view>
 		 </view>
 	</view>
 </template>
@@ -62,6 +71,8 @@
 			return{
 				orderData:'',
 				freePostFlag:'',
+				openShowflag:false,
+				infoflag:true
 			}
 		},
 		created(){
@@ -112,6 +123,10 @@
 			}
 		},
 		methods:{
+			openShow(){
+				this.openShowflag = true;
+				this.infoflag = false;
+			},
 			initData(res) {
 				this.orderData = res;
 			},
@@ -137,23 +152,31 @@
 		margin-top: 24rpx;
 		.information-content{
 			width: 702rpx;
-			padding: 0  24rpx 20rpx 24rpx;
+			padding: 15rpx  24rpx 20rpx 24rpx;
 			.information-view{
 				height: 50rpx;
 				line-height: 50rpx;
-				font-size: $font-size-28;
-				color: $text-color;
+				font-size: $font-size-24;
 				margin: 4rpx 0;
-				display: flex;
-				&.title{
-					height: 68rpx;
-					line-height: 68rpx;
-					margin-bottom: 5rpx;
+				// display: flex;
+				width: 55%;
+				display: inline-block;
+				&.same{
+					width: 45%;
 				}
+				// &.title{
+				// 	height: 68rpx;
+				// 	line-height: 68rpx;
+				// 	margin-bottom: 5rpx;
+				// }
 				view{
-					flex: 1;
+					// flex: 1;
 					color: $text-color;
 					text-align: left;
+					color: #999999;
+					.label{
+						color: #666666;
+					}
 				}
 				.view-num.title{
 					height: 68rpx;
@@ -197,7 +220,7 @@
 						line-height: 68rpx;
 						text-align: left;
 						color: $color-system;
-						margin-left: 10rpx;
+						// margin-left: 10rpx;
 					}
 				}
 				.view-num.ord{
@@ -210,9 +233,9 @@
 					color: #999999;
 					flex: 6;
 				}
-				.bold{
-					font-weight: bold;
-				}
+				// .bold{
+				// 	font-weight: bold;
+				// }
 				.red{
 					color: #FF2A2A;
 				}
@@ -237,4 +260,22 @@
 			}
 		}
 	}
+	.openinfo{
+		.btnInfo{
+			width: 140rpx;
+			height: 40rpx;
+			border: 2rpx solid #e1e1e1;
+			border-radius: 6rpx;
+			padding: 5rpx;
+			text-align: center;
+			color: #b2b2b2;
+			margin: 20rpx auto;
+			font-size:  $font-size-24;
+			.iconfont{
+				position: relative;
+				top: 5rpx;
+				right: -3rpx;
+			}
+		}
+	}
 </style>

components/cm-module/orderDetails/orderListButton.vue

@@ -8,7 +8,7 @@
 			<view class="btn btn-cancel" v-if="btnState.isCancel" @click.stop="btnConfirm('cancel',order)">取消订单</view>
 			<view class="btn btn-delete" v-if="btnState.isDelete" @click.stop="btnConfirm('delete',order)">删除订单</view>
 			<view class="btn btn-query" v-if="btnState.isQuery" @click.stop="btnConfirm('query',order)">查看物流</view>
-			<view class="btn btn-confirm" v-if="btnState.isConfirm" @click.stop="btnConfirm('confirm',order)">确认收货</view>
+			<view class="btn " v-if="btnState.isConfirm" @click.stop="btnConfirm('confirm',order)">确认收货</view>
 		</view>
 	</view>
 </template>
@@ -133,37 +133,43 @@
 				margin:22rpx;
 				line-height: 64rpx;
 				font-size:$font-size-26;
-				color: #FFFFFF;
+				color: #999999;
 				text-align: center;
 				border-radius:6rpx;
 				float: right;
+				border-radius: 32rpx;
+				border: 2rpx solid #999999;
 			}
 			.btn-color{
 				background: $btn-confirm;
 				margin: 22rpx 0 22rpx 22rpx;
 			}
 			.btn-cancel{
-				background:#FFFFFF;
-				color: #999999;
-				float: left;
+				// background:#FFFFFF;
+				// color: #999999;
+				// float: left;
 				margin: 22rpx 0;
-				text-align: left;
-			}
-			.btn-delete{
-				background:linear-gradient(315deg,rgba(255,163,3,1) 0%,rgba(255,53,1,1) 100%);
-			}
-			.btn-query{
-				background:linear-gradient(135deg,rgba(255,212,129,1) 0%,rgba(198,129,0,1) 100%);
+				text-align: center;
 			}
+			// .btn-delete{
+			// 	background:linear-gradient(315deg,rgba(255,163,3,1) 0%,rgba(255,53,1,1) 100%);
+			// }
+			// .btn-query{
+			// 	background:linear-gradient(135deg,rgba(255,212,129,1) 0%,rgba(198,129,0,1) 100%);
+			// }
 			.btn-confirm{
-				background:linear-gradient(315deg,rgba(231,0,0,1) 0%,rgba(255,104,1,1) 100%);
+				background:#ff7a51;
+				border: 2rpx solid #ff7a51;
+				color: #FFFFFF;
 			}
 			.btn-pay{
-				background:linear-gradient(135deg,rgba(242,143,49,1) 0%,rgba(225,86,22,1) 100%);
+				background:#f94b4b;
 				margin-right: 0;
+				color: #FFFFFF;
+				border: 2rpx solid #f94b4b;
 			}
 			.btn-share{
-				background:linear-gradient(315deg,rgba(0,212,150,1) 0%,rgba(126,243,174,1) 100%);
+				// background:linear-gradient(315deg,rgba(0,212,150,1) 0%,rgba(126,243,174,1) 100%);
 				position: relative;
 				.tips{
 					width: 160rpx;

pages/user/order/order-details.vue

@@ -3,12 +3,17 @@
 		<!-- 自定义返回 -->
 		<header-back :systeminfo='systeminfo' :navbar-data='nvabarData' :headerBtnPosi ="headerBtnPosi" :isShare='isOrderShare'></header-back>
 		<view class="container-details" :style="{paddingTop:navbarHeight+'px'}">
+			<view class="status-text">
+				<view class="view-type">{{ information.status | TextFormat }}</view>
+				<text class="bage-buss" v-if="information.orderSubmitType == 3 || information.orderSubmitType == 4">协销</text>
+				<text class="bage-auto" v-if="information.orderSubmitType == 0 || information.orderSubmitType == 1 ||information.orderSubmitType == 2">自主</text>
+			</view>
 			<!-- 地址选择 -->
 			<order-address ref="orderAddress" v-if="isRequest" :addressData="addressData"></order-address>
-			<!-- 订单信息 -->
-			<order-information ref="information" v-if="isRequest" :information="information"></order-information>
 			<!-- 商品 -->
 			<goods-list ref='goods' v-if="isRequest" :shopOrderData="shopOrderData" @popupClick="hanldePopupFn"></goods-list>
+			<!-- 订单信息 -->
+			<order-information ref="information" v-if="isRequest" :information="information"></order-information>
 			<!-- 发票信息 -->
 			<invoice-tent ref="invoice" v-if="isRequest" :orderInvoice="orderInvoice"></invoice-tent>
 			<!-- 转账信息 -->
@@ -17,6 +22,9 @@
 			<payment-record ref="payment" v-if="isRequest" :discernReceiptList="discernReceiptList" :receiptAmount="receiptAmount"></payment-record>
 			<!-- 退款记录 -->
 			<refund-record ref="refund" v-if="isRequest" :returnedPurchaseList="returnedPurchaseList" :returnedPurchaseFee="returnedPurchaseFee"></refund-record>
+			<view class="clause" @tap.stop="openclauseConten(clauseData.id)" :class="clauseData.name=='无条款'?'noclick':''">
+				售后条款：<label class="text" :class="clauseData.name=='无条款'?'color-bg':''">{{clauseData.name}}</label>
+			</view>
 			<!-- 底部button -->
 			<order-button ref="orderButton" 
 						  v-if= "isRequest" 
@@ -109,7 +117,8 @@
 				nvabarData: {							 //顶部自定义导航
 					showCapsule: 1, // 是否显示左上角图标   1表示显示    0表示不显示
 					title: '订单详情', // 导航栏 中间的标题
-				}
+				},
+				clauseData:{},
 			}
 		},
 		onLoad(option){
@@ -127,7 +136,39 @@
 			this.getHeaderTopHeight()
 			this.initOrderDetaileData()
 		},
+		filters:{
+			TextFormat(status) {//处理金额
+				let HtmlText,
+					typeTextObject={
+						0:'待确认',
+						4:'交易完成',
+						5:'订单完成',
+						6:'已关闭',
+						7:'交易全退',
+						77:'交易全退',
+						11:'待付款待发货',
+						12:'待付款部分发货',
+						13:'待付款已发货',
+						21:'部分付款待发货',
+						22:'部分付款部分发货',
+						23:'部分付款已发货',
+						31:'已付款待发货',
+						32:'已付款部分发货',
+						33:'已付款已发货',
+						111:'待付款待发货',
+					};
+				Object.keys(typeTextObject).forEach(key => {
+					if(key == status){
+						HtmlText = typeTextObject[key]
+					}
+				})
+				return HtmlText
+			},
+		},
 		methods: {
+			openclauseConten(id){
+				this.$api.navigateTo(`/pages/service/sellconten?clauseId=${id}`)
+			},
 			initOrderDetaileData(){//初始化页面数据@参数：订单ID
 				queryOrderDetails({ orderID : this.orderID }).then(response =>{
 					let resData = response.data;
@@ -147,6 +188,7 @@
 					this.discernReceiptList = resData.discernReceiptList
 					this.receiptAmount = resData.order.receiptAmount
 					this.returnedPurchaseFee = resData.order.returnedPurchaseFee
+					this.clauseData = resData.clause
 				}).catch(error =>{
 					this.$util.modal('提示','订单查询失败，请稍后重试~','确定','',false,() =>{
 						this.$api.switchTabTo('/pages/tabBar/home/index')
@@ -408,5 +450,55 @@
 			}	
 		}
 	}
+	.clause{
+		float: right;
+		font-size: 24rpx;
+		color: #999999;
+		margin-top: 60rpx;
+		margin-right: 24rpx;
+		&.noclick{
+			pointer-events: none;
+		}
+		.text{
+			color: #1890f9;
+			&.color-bg{
+				color: #333333;
+			}
+		}
+	}
+	.status-text{
+		overflow: hidden;
+		padding: 24rpx;
+		background: #fff;
+		font-size: $font-size-26;
+		.view-type{
+			float: left;
+			color: #ff2a2a;
+		}
+		.bage-buss{
+			display: inline-block;
+			width: 72rpx;
+			height: 32rpx;
+			background:radial-gradient(circle,rgba(255,39,180,1) 0%,rgba(193,77,245,1) 100%);
+			border-radius: 6rpx;
+			line-height: 32rpx;
+			text-align: center;
+			color: #FFFFFF;
+			margin-top: 10rpx;
+			float: right;
+		}
+		.bage-auto{
+			display: inline-block;
+			width: 72rpx;
+			height: 32rpx;
+			background:radial-gradient(circle,rgba(255,180,39,1) 0%,rgba(245,142,77,1) 100%);
+			border-radius: 6rpx;
+			line-height: 32rpx;
+			text-align: center;
+			color: #FFFFFF;
+			margin-top: 10rpx;
+			float: right;
+		}
+	}
 	
 </style>

pages/user/order/order-list.vue

@@ -19,7 +19,7 @@
 						<empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0" :typeIndex="currentTab" :navbarHeight="navbarHeight"></empty>
 						<!-- 列表 -->
 						<view v-else class="tui-order-content">
-							<view  class="tui-order-item" v-for="(order,orderIndex) in tabItem.orderList" :key="orderIndex" @click.stop="detail(order.orderID)">
+							<view  class="tui-order-item" v-for="(order,orderIndex) in tabItem.orderList" :key="orderIndex" >
 								<view class="order-title">
 									<view class="order-title-t">
 										<text class="bage-buss tui-skeleton-fillet" v-if="order.orderSubmitType == 3 || order.orderSubmitType == 4">协销</text>
@@ -37,9 +37,9 @@
 										<view v-if="shop.shopPromotion" class="floor-item-act">
 											<view class="floor-tags">{{shop.shopPromotion.name}}</view>	
 										</view>
-										<view class="title-text tui-skeleton-fillet">{{shop.shopName}}</view>
+										<view class="title-text tui-skeleton-fillet" @click="goShophome()">{{shop.shopName}}<label class="iconfont icon-jinrudianpu"></label></view>
 									</view>
-									<view class="goods-item" v-for="(pros,prosIndex) in shop.orderProductList" :key="prosIndex">
+									<view class="goods-item" v-for="(pros,prosIndex) in shop.orderProductList" :key="prosIndex" @click.stop="detail(order.orderID)">
 										<view class="goods-pros-t">
 											<view class="pros-img tui-skeleton-fillet">
 												<image :src="pros.productImage" alt="" />
@@ -73,7 +73,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 -->
@@ -195,6 +196,9 @@
 			},
 		},	
 		methods: {
+			goShophome(){
+				this.$api.navigateTo('/supplier/pages/user/my-shop')
+			},
 			// 滚动切换标签样式
 			onChange: function(e) {
 				let index = e.target.current || e.detail.current;
@@ -672,7 +676,7 @@
 				font-size: $font-size-28;
 				line-height: 68rpx;
 				text-align: left;
-				color: $color-system;
+				color: $text-color;
 				margin-left: 10rpx;
 			}
 		}
@@ -733,6 +737,11 @@
 			text-align: left;
 			line-height: 56rpx;
 			font-weight: bold;
+			.iconfont{
+				color: #999999;
+				font-size: 28rpx;
+				margin-left: 10rpx;
+			}
 		}
 	}
 	.goods-item{
@@ -794,6 +803,7 @@
 		.productspec{
 			height: 36rpx;
 			color: #999999;
+			margin: 30rpx 0;
 		}
 		.productprice{
 			height: 48rpx;
@@ -841,6 +851,7 @@
 		width: 100%;
 		height: 78rpx;
 		float: left;
+		margin-top: 20rpx;
 		.order-footer-top{
 			width: 100%;
 			height: 34rpx;
@@ -855,12 +866,12 @@
 			height: 48rpx;
 			line-height: 48rpx;
 			font-size: $font-size-28;
-			font-weight: bold;
 			color: $text-color;
 			.count{
 				width: 50%;
 				float: left;
 				text-align: left;
+				font-weight: bold;
 			}
 			.money{
 				width: 50%;

seller/pages/cart/cart.vue

@@ -825,7 +825,7 @@
 			background-color:#FFFFFF;
 			font-size: 36rpx;
 			color:$color-system;
-			&.icon-yixuanze{
+			&.icon-weixuanze{
 				color: #b2b2b2;
 			}
 		}
@@ -1088,15 +1088,17 @@
 							text-align: center;
 							line-height: 48rpx;
 							font-weight: bold;
+							background: #ffe6dc;
 						}
 						.btn-input{
 							width: 62rpx;
-							height: 48rpx;
-							line-height: 48rpx;
-							background: #F8F8F8;
+							height: 44rpx;
+							line-height: 44rpx;
 							border-radius: 4rpx;
 							text-align: center;
 							font-size: $font-size-24;
+							border-bottom: 2rpx solid #ffe6dc;
+							border-top: 2rpx solid #ffe6dc;
 						}
 					}
 					.uni-numbox{

seller/pages/order/order-details.vue

@@ -17,7 +17,7 @@
 			<payment-record ref="payment" v-if="isRequest" :discernReceiptList="discernReceiptList" :receiptAmount="receiptAmount"></payment-record>
 			<!-- 退款记录 -->
 			<refund-record ref="refund" v-if="isRequest" :returnedPurchaseList="returnedPurchaseList" :returnedPurchaseFee="returnedPurchaseFee"></refund-record>
-			<view class="clause" @tap.stop="openclauseConten(clauseData.id)">
+			<view class="clause" @tap.stop="openclauseConten(clauseData.id)" :class="clauseData.name=='无条款'?'noclick':''">
 				售后条款：<label class="text" :class="clauseData.name=='无条款'?'color-bg':''">{{clauseData.name}}</label>
 			</view>
 			<!-- 底部button -->
@@ -381,11 +381,13 @@
 		color: #999999;
 		margin-top: 60rpx;
 		margin-right: 24rpx;
+		&.noclick{
+			pointer-events: none;
+		}
 		.text{
 			color: #1890f9;
 			&.color-bg{
 				color: #333333;
-				pointer-events: none;
 			}
 		}
 	}

services/ajax.env.js

@@ -1,8 +1,8 @@
 let URL_CONFIG = ""
 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.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'