commit -m 提交

components/cm-module/creatOrder/choiceAddress.vue

@@ -26,7 +26,7 @@
 		 		</view>
 		 	</view>
 		 </navigator>
-		 <image  src="../../../static/temp/line@3x.png" mode=""></image>
+		 <image  src="../../../static/ws/address_cat.png" mode=""></image>
 	</view>
 </template>
 

components/cm-module/creatOrder/sellerAddress.vue

@@ -27,7 +27,7 @@
 		 		</view>
 		 	</view>
 		 </navigator>
-		 <image  src="../../../static/temp/line@3x.png" mode=""></image>
+		 <image  src="../../../static/ws/address_cat.png" mode=""></image>
 	</view>
 </template>
 

components/cm-module/orderDetails/goodsList.vue

@@ -333,42 +333,21 @@
 					text-align: center;
 					box-sizing: border-box;
 					float: left;
-					padding:10rpx 0 0 0;
+					padding:0 0 10rpx 0;
 					.floor-tags{
 						height: 28rpx;
 						border-radius: 6rpx;
 						background-color: #FFFFFF;
 						line-height: 28rpx;
-						color: $color-system;
+						color: #ff2a2a;
 						text-align: center;
 						display: inline-block;
 						padding:0 16rpx;
 						font-size: $font-size-20;
-						border: 1px solid #E15616;
+						border: 1px solid #ff2a2a;
 						float: left;
 					}
 				}
-				.floor-item-act{
-					height: 56rpx;
-					text-align: center;
-					box-sizing: border-box;
-					float: left;
-					padding: 10rpx 0;
-					margin-right: 12rpx;
-					.floor-tags{
-						float: left;
-						height: 28rpx;
-						border-radius: 6rpx;
-						background-color: #FFFFFF;
-						line-height: 28rpx;
-						color: $color-system;
-						text-align: center;
-						display: inline-block;
-						padding:0 16rpx;
-						font-size: $font-size-20;
-						border: 1px solid #E15616;
-					}
-				}
 			}
 			.goods-pros-m{
 				width: 100%;

components/cm-module/orderDetails/orderAddress.vue

@@ -22,7 +22,7 @@
 				</view>
 		 	</view>
 		 </view>
-		 <image  src="../../../static/temp/line@3x.png" mode=""></image>
+		 <image  src="../../../static/ws/address_cat.png" mode=""></image>
 	</view>
 </template>
 

components/cm-module/orderDetails/orderButton.vue

@@ -2,8 +2,6 @@
 	<view class="button-template" :style="{paddingBottom :isIphoneX ? '68rpx' : '0rpx'}">
 		<!-- 底部按钮 -->
 		<view class="button-content">
-			<view class="btn btn-payment" v-if="order.affirmPaymentFlag=='00'" @click.stop="btnConfirm('payment',order)">确认打款<text>供应商</text></view>
-			<view class="btn btn-confirm" v-if="btnState.isConfirmation" @click.stop="btnConfirm('confirmation',order)">确认订单</view>
 			<view class="btn btn-pay" v-if="btnState.isPay" @click.stop="btnConfirm('pay',order)">付款</view>
 			<view class="btn btn-share" @click.stop="onShareCode">
 				<view class="tips" v-if="shareCode">分享码：{{shareCode}}</view>
@@ -48,7 +46,6 @@
 					{label:'isDelete',val:[6],status: true},
 					{label:'isCancel',val:[0,111],status: true},
 					{label:'isConfirm',val:[33],status: true},
-					{label:'isConfirmation',val:[0],status: true},
 					{label:'isPay',val:[11,12,13,21,22,23,111],status: true},
 				]
 			}
@@ -85,7 +82,6 @@
 						isDelete: false,
 						isCancel: false,
 						isConfirm: false,
-						isConfirmation:false,
 					}
 				return 	btnState
 			},
@@ -195,10 +191,7 @@
 				color: #FFFFFF;
 			}
 			.btn-pay{
-				background:#f94b4b;
 				margin-right: 0;
-				border: 2rpx solid #f94b4b;
-				color: #fff;
 			}
 			.btn-share{
 				.tips{

components/cm-module/orderDetails/orderInformation.vue

@@ -4,7 +4,10 @@
 		 <view class="information-content">
 			<view class="information-view title">
 				<view class="view-num">
-					<view class="bage-text">订单编号：<label class="label">{{orderData.orderNo =='undefined' ? '' : orderData.orderNo}}</label></view>
+					<view class="bage-text">
+						订单编号：<label class="label">{{orderData.orderNo =='undefined' ? '' : orderData.orderNo}}</label>
+						<text class="clipboard" @click="clipboard(orderData.orderNo)">复制</text>
+					</view>
 				</view>
 			</view>
 			<view class="information-view same">
@@ -13,7 +16,6 @@
 			<view class="information-view">
 				<view class="view-num bold">
 					订单标识：<label class="label">{{ orderData.orderMark =='undefined' ? '' : orderData.orderMark }}</label>
-					<text class="clipboard" @click="clipboard(orderData.orderMark)">复制</text>
 				</view>
 			</view>
 			<view class="information-view same">
@@ -158,10 +160,10 @@
 				font-size: $font-size-24;
 				margin: 4rpx 0;
 				// display: flex;
-				width: 55%;
+				width: 62%;
 				display: inline-block;
 				&.same{
-					width: 45%;
+					width: 38%;
 					text-align: right;
 				}
 				// &.title{
@@ -189,30 +191,6 @@
 						right: 0;
 						top: 9rpx;
 					}
-					.bage-buss{
-						display: inline-block;
-						width: 72rpx;
-						height: 30rpx;
-						background:radial-gradient(circle,rgba(255,39,180,1) 0%,rgba(193,77,245,1) 100%);
-						border-radius: 4rpx;
-						line-height: 30rpx;
-						font-size: $font-size-24;
-						text-align: center;
-						color: #FFFFFF;
-						margin-top: 10rpx;
-					}
-					.bage-auto{
-						display: inline-block;
-						width: 72rpx;
-						height: 30rpx;
-						background:radial-gradient(circle,rgba(255,180,39,1) 0%,rgba(245,142,77,1) 100%);
-						border-radius: 4rpx;
-						line-height: 30rpx;
-						font-size: $font-size-24;
-						text-align: center;
-						color: #FFFFFF;
-						margin-top: 10rpx;
-					}
 					.bage-text{
 						display: inline-block;
 						font-size: $font-size-28;
@@ -245,16 +223,16 @@
 					flex:4;
 				}
 				.clipboard{
-					width: 84rpx;
-					height: 36rpx;
-					background: linear-gradient(34deg,rgba(255,41,41,1) 0%,rgba(255,109,27,1) 100%);
+					width: 64rpx;
+					height: 32rpx;
+					background: linear-gradient(270deg, #c4761f 0%, #fccd90 100%);
 					text-align: center;
-					font-size: $font-size-24;
+					font-size: $font-size-22;
 					color: #FFFFFF;
-					border-radius: 6rpx;
-					line-height: 36rpx;
+					border-radius: 16rpx;
+					line-height: 32rpx;
 					display: inline-block;
-					margin-left: 42rpx;
+					margin-left: 15rpx;
 				}
 			}
 		}

components/cm-module/orderDetails/orderListButton.vue

@@ -2,9 +2,7 @@
 	<view class="button-template">
 		<!-- 底部按钮 -->
 		<view class="button-content">
-			<view class="btn btn-payment" v-if="order.affirmPaymentFlag=='00'" @click.stop="btnConfirm('payment',order)">确认打款<text>供应商</text></view>
 			<view class="btn btn-pay" v-if="btnState.isPay" @click.stop="btnConfirm('pay',order)">付款</view>
-			<view class="btn btn-confirm" v-if="btnState.isConfirmation" @click.stop="btnConfirm('confirmation',order)">确认订单</view>
 			<view class="btn btn-share"  @click.stop="onShareCode(order.orderID)">分享订单</view>
 			<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>
@@ -35,7 +33,6 @@
 					{label:'isDelete',val:[6],status: true},
 					{label:'isCancel',val:[0,111],status: true},
 					{label:'isConfirm',val:[33],status: true},
-					{label:'isConfirmation',val:[0],status: true},
 					{label:'isPay',val:[11,12,13,21,22,23,111],status: true},
 				]
 			}
@@ -81,7 +78,6 @@
 						isCancel: false,
 						isConfirm: false,
 						isShare: true,
-						isConfirmation:false,
 					}
 				return 	btnState
 			},
@@ -128,7 +124,7 @@
 				top: 24rpx;
 			}
 			.btn{
-				width: 150rpx;
+				width: 160rpx;
 				height:  64rpx;
 				margin: 22rpx 0 20rpx 20rpx;
 				line-height: 64rpx;
@@ -172,11 +168,6 @@
 				border-color:#ff7a51;
 				color: #FFFFFF;
 			}
-			.btn-pay{
-				background:#f94b4b;
-				color: #FFFFFF;
-				border: 2rpx solid #f94b4b;
-			}
 			.btn-share{
 				// background:linear-gradient(315deg,rgba(0,212,150,1) 0%,rgba(126,243,174,1) 100%);
 				position: relative;

components/cm-module/orderDetails/supplierDetaileButton.vue

@@ -1,195 +0,0 @@
-<template name="button">
-	<view class="button-template clearfix" :style="{paddingBottom :isIphoneX ? '68rpx' : '0rpx'}">
-		<!-- 底部按钮 -->
-		<view class="btn btn-color" v-if="btnState.isDeliver"  @click.stop="btnConfirm('deliver')">发货</view>
-		<view class="btn btn-cancel" @click.stop="onShareCode">
-			<view class="tips" v-if="shareCode">分享码：{{shareCode}}</view>
-			分享订单
-		</view>	
-		<view class="btn btn-cancel" v-if="btnState.isRecord" @click.stop="btnConfirm('record')">发货记录</view>
-	</view>
-</template>
-
-<script>
-	export default{
-		name:"button",
-		props:{
-			status:{
-				type:Number
-			},
-			shareCode:{
-				type:String,
-				default: ''
-			}
-		},
-		watch:{
-			status:{
-				handler:function(val){
-					this.initData(val)
-				},
-				deep:true//对象内部的属性监听，也叫深度监听
-			}
-		},
-		data() {
-			return{
-				btnState:this.initStatus(),
-				isIphoneX:this.$store.state.isIphoneX,
-				mapStateArr:[
-					{label:'isDeliver',val:[1,2],status: true},
-					{label:'isRecord',val:[2,3],status: true},
-				]
-			}
-		},
-		created(){
-			this.initData(this.status)
-		},
-		computed: {
-
-		},
-		methods:{
-			initData(resVal) {
-				/**
-				 * @分享按钮统一显示
-				 * @按钮根据状态显示
-				 * @(1,2)显示[发货]按钮
-				 */
-				this.btnState = this.initStatus()
-				this.mapStateArr.forEach(el => {
-					el.val.forEach(value => {
-						if(resVal === value){
-							this.btnState[el.label] = el.status
-							//console.log(this.btnState[el.label]);
-						}
-					})
-				})
-			},
-			initStatus(){
-				let btnState= {
-						isDeliver: false,
-						isRecord: false,
-					}
-				return 	btnState
-			},
-			getShareCode(code){
-				this.shareCode = code
-			},
-			onShareCode(){
-				this.$parent.isShareModal = true
-				this.$emit('shareConfirm')
-			},
-			btnConfirm(type){
-				this.$emit('buttonConfirm',type)
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	.button-template{
-		width: 100%;
-		padding:0 24rpx;
-		height: auto;
-		background-color: #FFF;
-		-webkit-box-shadow: 0px 3px 10px rgba(51, 51, 51, 0.5);
-		box-shadow: 0px 3px 10px rgba(51, 51, 51, 0.5);
-		padding-bottom: 24rpx;
-		z-index: 999;
-		box-sizing: border-box;
-		.share-code{
-			width: 200rpx;
-			height:  64rpx;
-			line-height: 64rpx;
-			color: #2A45FF;
-			text-align: left;
-			position: absolute;
-			font-size: $font-size-28;
-			font-weight: bold;
-			left: 24rpx;
-			top: 24rpx;
-		}
-		.btn{
-			width: 160rpx;
-			height:  64rpx;
-			margin:22rpx;
-			line-height: 64rpx;
-			font-size:$font-size-26;
-			color: #FFFFFF;
-			text-align: center;
-			border-radius: 34rpx;
-			float: right;
-		}
-		.btn-color{
-			background: #ff7a51;
-		}
-		.btn-cancel{
-			background:#FFFFFF;
-			color: #666666;
-			border: 1px solid #666666;
-			.tips{
-				width: 160rpx;
-				height: 34rpx;
-				padding: 10rpx 10rpx;
-				background:linear-gradient(45deg,rgba(0,0,0,1) 0%,rgba(87,87,87,1) 100%);
-				box-shadow:0px 2px 4px 0px rgba(0,0,0,0.2);
-				border-radius: 8rpx;
-				position: absolute;
-				color: #FFFFFF;
-				line-height: 34rpx;
-				font-size: $font-size-24;
-				text-align: left;
-				right: 24rpx;
-				top: -45rpx;
-				&:before{
-					content: "";
-					width: 25rpx;
-					height: 25rpx;
-					background:linear-gradient(45deg,rgba(0,0,0,1) 0%,rgba(87,87,87,1) 100%);
-					position: absolute;
-					bottom: -8rpx;
-					right: 30rpx;
-					z-index: -1;
-					transform:rotate(45deg);
-				}
-			}
-		}
-		.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-share{
-			background:linear-gradient(315deg,rgba(0,212,150,1) 0%,rgba(126,243,174,1) 100%);
-			margin-right: 0;
-			position: relative;
-			.tips{
-				width: 160rpx;
-				height: 34rpx;
-				padding: 10rpx 10rpx;
-				background:#E15616;
-				border-radius: 8rpx;
-				position: absolute;
-				color: #FFFFFF;
-				line-height: 34rpx;
-				font-size: $font-size-24;
-				text-align: left;
-				right: 0;
-				top: -65rpx;
-				&:before{
-					content: "";
-					width: 25rpx;
-					height: 25rpx;
-					background:#E15616;
-					position: absolute;
-					bottom: -8rpx;
-					left: 30rpx;
-					z-index: -1;
-					transform:rotate(45deg);
-				}
-			}
-		}
-	}
-</style>

components/cm-module/orderDetails/supplierListButton.vue

@@ -1,203 +0,0 @@
-<template name="button">
-	<view class="button-template clearfix">
-		<!-- 底部按钮 -->
-		<view class="btn btn-color" v-if="btnState.isDeliver"  @click.stop="btnConfirm('deliver',orderInfo)">发货</view>
-		<view class="btn btn-cancel" @click.stop="onShareCode(orderInfo.shopOrderID)">
-			<view class="tips" v-if="shareCode">分享码：{{shareCode}}</view>
-			分享订单
-		</view>	
-		<view class="btn btn-cancel" v-if="btnState.isRecord" @click.stop="btnConfirm('record',orderInfo)">发货记录</view>
-	</view>
-</template>
-
-<script>
-	export default{
-		name:"button",
-		props:{
-			status:{
-				type:Number
-			},
-			orderInfo:{
-				type:Object
-			},
-			shareCode:{
-				type:String,
-				default: ''
-			}
-		},
-		watch:{
-			status:{
-				handler:function(val){
-					this.initData(val)
-				},
-				deep:true//对象内部的属性监听，也叫深度监听
-			}
-		},
-		data() {
-			return{
-				btnState:this.initStatus(),
-				isIphoneX:this.$store.state.isIphoneX,
-				mapStateArr:[
-					{label:'isDeliver',val:[1,2],status: true},
-					{label:'isRecord',val:[2,3],status: true},
-				]
-			}
-		},
-		created(){
-			console.log(this.status)
-			this.initData(this.status)
-		},
-		computed: {
-
-		},
-		methods:{
-			initData(resVal) {
-				/**
-				 * @分享按钮统一显示
-				 * @按钮根据状态显示
-				 * @(1,2)显示[发货]按钮
-				 */
-				this.btnState = this.initStatus()
-				this.mapStateArr.forEach(el => {
-					el.val.forEach(value => {
-						if(resVal === value){
-							this.btnState[el.label] = el.status
-							console.log(this.btnState[el.label]);
-						}
-					})
-				})
-			},
-			initStatus(){
-				let btnState= {
-						isDeliver: false,
-						isRecord: false,
-					}
-				return 	btnState
-			},
-			getShareCode(code){
-				this.shareCode = code
-			},
-			onShareCode(shopOrderID){
-				console.log(shopOrderID)
-				this.$parent.isShareModal = true
-				this.$parent.btnoRderID = shopOrderID
-				this.$emit('shareConfirm')
-			},
-			btnConfirm(type,orderInfo){
-				console.log(orderInfo)
-				let data = {type:type, orderInfo:orderInfo}
-				this.$emit('buttonConfirm',data)
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	.button-template{
-		width: 100%;
-		height: auto;
-		background-color: #FFF;
-		// -webkit-box-shadow: 0px 3px 10px rgba(51, 51, 51, 0.5);
-		// box-shadow: 0px 3px 10px rgba(51, 51, 51, 0.5);
-		z-index: 999;
-		box-sizing: border-box;
-		.share-code{
-			width: 200rpx;
-			height:  64rpx;
-			line-height: 64rpx;
-			color: #2A45FF;
-			text-align: left;
-			position: absolute;
-			font-size: $font-size-28;
-			font-weight: bold;
-			left: 24rpx;
-			top: 24rpx;
-		}
-		.btn{
-			width: 160rpx;
-			height:  64rpx;
-			margin:22rpx;
-			line-height: 64rpx;
-			font-size:$font-size-26;
-			color: #FFFFFF;
-			text-align: center;
-			border-radius: 34rpx;
-			float: right;
-			margin-right: 0;
-		}
-		.btn-color{
-			background: #ff7a51;
-		}
-		.btn-cancel{
-			background:#FFFFFF;
-			color: #666666;
-			border: 1px solid #666666;
-			.tips{
-				width: 160rpx;
-				height: 34rpx;
-				padding: 10rpx 10rpx;
-				background:linear-gradient(45deg,rgba(0,0,0,1) 0%,rgba(87,87,87,1) 100%);
-				box-shadow:0px 2px 4px 0px rgba(0,0,0,0.2);
-				border-radius: 8rpx;
-				position: absolute;
-				color: #FFFFFF;
-				line-height: 34rpx;
-				font-size: $font-size-24;
-				text-align: left;
-				right: 24rpx;
-				top: -45rpx;
-				&:before{
-					content: "";
-					width: 25rpx;
-					height: 25rpx;
-					background:linear-gradient(45deg,rgba(0,0,0,1) 0%,rgba(87,87,87,1) 100%);
-					position: absolute;
-					bottom: -8rpx;
-					right: 30rpx;
-					z-index: -1;
-					transform:rotate(45deg);
-				}
-			}
-		}
-		.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-share{
-			background:linear-gradient(315deg,rgba(0,212,150,1) 0%,rgba(126,243,174,1) 100%);
-			margin-right: 0;
-			position: relative;
-			.tips{
-				width: 160rpx;
-				height: 34rpx;
-				padding: 10rpx 10rpx;
-				background:linear-gradient(45deg,rgba(0,0,0,1) 0%,rgba(87,87,87,1) 100%);
-				box-shadow:0px 2px 4px 0px rgba(0,0,0,0.2);
-				border-radius: 8rpx;
-				position: absolute;
-				color: #FFFFFF;
-				line-height: 34rpx;
-				font-size: $font-size-24;
-				text-align: left;
-				right: 0;
-				top: -65rpx;
-				&:before{
-					content: "";
-					width: 25rpx;
-					height: 25rpx;
-					background:linear-gradient(45deg,rgba(0,0,0,1) 0%,rgba(87,87,87,1) 100%);
-					position: absolute;
-					bottom: -8rpx;
-					right: 30rpx;
-					z-index: -1;
-					transform:rotate(45deg);
-				}
-			}
-		}
-	}
-</style>

components/cm-module/orderDetails/supplierRecorgButton.vue

@@ -1,127 +0,0 @@
-<template name="button">
-	<view class="button-template">
-		<!-- 底部按钮 -->
-		<view class="button-content">
-			<view class="btn btn-color" v-if="hanldData.mailer == '1'" @click.stop="btnConfirm('cancel',hanldData)">撤销发货</view>
-			<view class="btn btn-color" @click.stop="btnConfirm('add',hanldData)">添加物流</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default{
-		name:"button",
-		props:{
-			hanldData: {
-				type:Object
-			}
-		},
-		data() {
-			return{
-
-			}
-		},
-		created(){
-			
-		},
-		computed: {
-			
-		},
-		methods:{
-			btnConfirm(type,hanldData){
-				let data = { hanldType:type,hanldData:hanldData }
-				this.$emit('buttonConfirm',data)
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	.button-template{
-		width: 100%;
-		height: auto;
-		float: left;
-		background: #FFFFFF;
-		.button-content{
-			width: 702rpx;
-			padding: 0 24rpx;
-			height: auto;
-			float: left;
-			position: relative;
-			.share-code{
-				width: 200rpx;
-				height:  64rpx;
-				line-height: 64rpx;
-				color: #2A45FF;
-				text-align: left;
-				position: absolute;
-				font-size: $font-size-28;
-				font-weight: bold;
-				left: 24rpx;
-				top: 24rpx;
-			}
-			.btn{
-				width: 160rpx;
-				height:  64rpx;
-				margin:22rpx;
-				line-height: 64rpx;
-				font-size:$font-size-26;
-				color: #FFFFFF;
-				text-align: center;
-				border-radius: 10rpx;
-				float: right;
-			}
-			.btn-color{
-				background: $btn-confirm;
-				margin: 22rpx 0 22rpx 22rpx;
-			}
-			.btn-cancel{
-				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%);
-			}
-			.btn-confirm{
-				background:linear-gradient(315deg,rgba(231,0,0,1) 0%,rgba(255,104,1,1) 100%);
-			}
-			.btn-share{
-				background:linear-gradient(315deg,rgba(0,212,150,1) 0%,rgba(126,243,174,1) 100%);
-				margin-right: 0;
-				position: relative;
-				.tips{
-					width: 160rpx;
-					height: 34rpx;
-					padding: 10rpx 10rpx;
-					background:linear-gradient(45deg,rgba(0,0,0,1) 0%,rgba(87,87,87,1) 100%);
-					box-shadow:0px 2px 4px 0px rgba(0,0,0,0.2);
-					border-radius: 8rpx;
-					position: absolute;
-					color: #FFFFFF;
-					line-height: 34rpx;
-					font-size: $font-size-24;
-					text-align: left;
-					right: 0;
-					top: -65rpx;
-					&:before{
-						content: "";
-						width: 25rpx;
-						height: 25rpx;
-						background:linear-gradient(45deg,rgba(0,0,0,1) 0%,rgba(87,87,87,1) 100%);
-						position: absolute;
-						bottom: -8rpx;
-						right: 30rpx;
-						z-index: -1;
-						transform:rotate(45deg);
-					}
-				}
-			}
-		}
-	}
-</style>

manifest.json

@@ -1,8 +1,8 @@
 {
-    "name" : "caimei-applets-caimei",
+    "name" : "caimei-applets-weisha",
     "appid" : "__UNI__1EA8401",
-    "description" : "采美采购商城",
-    "versionName" : "1.1.4",
+    "description" : "维沙采购商城",
+    "versionName" : "1.0.0",
     "versionCode" : "100",
     "transformPx" : false,
     /* 5+App特有相关 */

pages/user/order/order-details.vue

@@ -5,8 +5,6 @@
 		<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>
@@ -22,9 +20,6 @@
 			<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" v-if="information.secondHandOrderFlag!=1 && !orderSubmitType" @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" 
@@ -45,6 +40,8 @@
 					  v-if="isShareModal"  
 					  @btnConfirm ='onShareAppMessage'>
 		</share-alert>		
+		<!-- 操作弹窗 -->
+		<tui-modal :show="modal" @click="handleClick" @cancel="hideMobel" :content="contentModalText" color="#333" :size="32" shape="circle" :maskClosable="false"></tui-modal>
 		<!-- 促销活动弹窗 -->
 		<activi-popup :Promotion="handlerPros" :popupShow="popupShow"></activi-popup>
 	</view>
@@ -119,6 +116,9 @@
 				},
 				clauseData:{},
 				orderSubmitType:false,//自主订单
+				modal:false,
+				OperationType:'',
+				contentModalText:''
 			}
 		},
 		onLoad(option){
@@ -201,33 +201,75 @@
 					})
 				})
 			},
-			handButtonConfirm(data){//监听点击时间的按钮类型并执行...
+			handButtonConfirm(data) {//获取点击
+				console.log(data)
+				this.hanldOrder = data
+				this.btnoRderID = data.orderId
+				this.OperationType = data.type
 				this.handShowAlert(data)
 			},
-			handShowAlert(data){//判断点击的按钮类型并执行...
+			handShowAlert(data) {//执行
 				switch(data.type){
+					case 'pay':
+						this.$api.navigateTo(`/pages/user/order/order-details?path=pay&state=0&orderID=${this.btnoRderID}`)
+						// this.WeChatMiniWxPay(this.hanldOrder);
+						break;
 					case 'delete':
-						this.handOrderDetele();
-						break
+						this.modal = true;
+						this.contentModalText = '确认删除该订单吗？';
+						break;
 					case 'cancel':
-						this.handCenceConfirm();
-						break
+						this.modal = true;
+						this.contentModalText = '确认取消该订单吗？';
+						break;
+					case 'refund':
+						uni.setStorageSync('refundData',data.order)
+						this.$api.navigateTo('/pages/user/order/order-refund')
+						break;
+					case 'returned':
+						uni.setStorageSync('refundData',data.order)
+						this.$api.navigateTo('/pages/user/order/order-refund')
+						break;
 					case 'query':
-						this.$api.navigateTo('/pages/user/order/order-logistics?orderID='+this.orderID)
-						break
+						this.isModalLayer = true;
+						this.$api.navigateTo('/pages/user/order/order-logistics?orderID='+data.orderId)
+						break;
 					case 'confirm':
-						this.handOrderConfirm()
-						break
-					case 'pay':
-						this.getOrderPaymentValidation(data)
-						break
-					case 'confirmation':
-						this.handOrderConfirmation()
-						break
-					case 'payment':
-						this.hanldConfirmFn(data.orderId);
-						break	
+						this.modal = true;
+						this.contentModalText = '是否确认收货？'	
+						// this.handOrderConfirm(data.orderId);
+						break;
+					case 'cancelRefund':
+						this.modal = true;
+						this.contentModalText = '确定取消退货/退款？'	
+						// this.handCancelRefundConfirm(data.orderId);
+						break;
+				}
+			},
+			handleClick(e) {//用户操作订单
+				let index = e.index;
+				if(index == 1){
+					switch(this.OperationType){
+						case 'delete':
+							this.handOrderDetele(data.orderId);
+							break
+						case 'cancel':
+							this.handCenceConfirm(data.orderId)
+							break
+						case 'query':
+							this.isModalLayer = true;
+							this.$api.navigateTo('/pages/user/order/order-logistics?orderID='+data.orderId)
+							break
+						case 'confirm':
+							this.handOrderConfirm(data.orderId);
+							break
+						case 'pay':
+							this.hanldOrderData = data.order;
+							this.getOrderPaymentValidation(data)
+							break
+					}
 				}
+				this.modal = false;
 			},
 			getOrderPaymentValidation(data){//监听根据付款状态做操作
 				this.OrderService.OrderPaymentValidation({orderId:data.orderId}).then(response =>{
@@ -280,18 +322,6 @@
 					this.$api.navigateTo(`/pages/user/order/order-payment?type=payfirm&orderID=${data.orderId}`)
 				}
 			},
-			hanldConfirmFn (orderId){//确认打款供应商
-				this.$util.modal('提示','确定委托采美平台打款给供应商吗？确定之前请务必确保货品完好？','确定','取消',true,() =>{
-					this.OrderService.confirmpayment({orderID:orderId,userId:this.userID}).then(response =>{
-						this.$util.msg('确认成功',2000,true,'success');
-						setTimeout(() => {
-							this.getOrderDatainit(this.currentTab)
-						},2000)
-					}).catch(error =>{
-						this.$util.msg(error.msg,2000)
-					})
-				})
-			},
 			handOrderConfirm(){//确认收货
 				this.$util.modal('提示','是否确认收货','确定','取消',true,() =>{
 					this.OrderService.ConfirmReceipt({orderID:this.orderID}).then(response =>{
@@ -302,16 +332,6 @@
 					})
 				})
 			},
-			handOrderConfirmation (){//确认订单
-				this.$util.modal('提示','确认此订单？','确定','取消',true,() =>{
-					this.OrderService.AffirmOrder({orderID:this.orderID}).then(response =>{
-						this.$util.msg(response.msg,2000,true,'success');
-						this.initOrderDetaileData()
-					}).catch(error =>{
-						this.$util.msg(error.msg,2000)
-					})
-				})
-			},
 			handOrderDetele(){//删除订单
 				this.$util.modal('提示','确认删除该订单吗？','确定','取消',true,() =>{
 					this.OrderService.DeleteOrder({orderID:this.orderID}).then(response =>{
@@ -489,37 +509,13 @@
 	}
 	.status-text{
 		overflow: hidden;
-		padding: 24rpx;
+		padding:0 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

@@ -21,24 +21,19 @@
 						<view v-else class="tui-order-content">
 							<view  class="tui-order-item" v-for="(order,orderIndex) in tabItem.orderList" :key="orderIndex" >
 								<view class="order-title">
+									<view class="order-title-name">{{order.clubName}}</view>
 									<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>
-										<image class="bage-icon" src="https://static.caimei365.com/app/img/icon/icon-type@3x.png" mode="widthFix" v-if="order.secondHandOrderFlag == 1"></image>
+										<text class="bage-text tui-skeleton-fillet"><text class="text">订单编号：</text>{{order.orderNo}}</text>
 									</view>
 									<view class="order-title-b">
-										<view class="order-title-btxt tui-skeleton-fillet">下单时间：{{order.orderTime}}</view>
+										<view class="order-title-btxt tui-skeleton-fillet"><text class="text">下单时间：</text>{{order.orderTime}}</view>
 										<view class="order-title-tip tui-skeleton-fillet">{{ StateExpFormat(order.status) }}</view>
 									</view>
 								</view>
 								<block v-for="(shop,sindex) in order.shopOrderList" :key="sindex">
 									<view class="goods-title">
-										<view v-if="shop.shopPromotion" class="floor-item-act">
-											<view class="floor-tags">{{shop.shopPromotion.name}}</view>	
-										</view>
-										<view class="title-text" v-if="order.secondHandOrderFlag==1">{{shop.shopName}}<label class="paymenttext" v-if="order.affirmPaymentFlag==1">已确认打款供应商</label></view>
-										<view class="title-text tui-skeleton-fillet" v-else @click="goShophome(shop.shopID)">{{shop.shopName}}<label class="iconfont icon-jinrudianpu"></label></view>
+										<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" @click.stop="detail(order.orderID)">
 										<view class="goods-pros-t">
@@ -94,6 +89,8 @@
 				</scroll-view>
 			</swiper-item>
 		</swiper>
+		<!-- 操作弹窗 -->
+		<tui-modal :show="modal" @click="handleClick" @cancel="hideMobel" :content="contentModalText" color="#333" :size="32" shape="circle" :maskClosable="false"></tui-modal>
 		<!-- 付款弹窗 -->
 		<order-model v-if="isPayModel" 
 					:payModelData="payModelData" 
@@ -175,6 +172,9 @@
 				modelType:0,
 				nomoreText: '上拉显示更多',
 				isOnloadFlag:false,
+				modal:false,
+				OperationType:'',
+				contentModalText:''
 			}
 		},
 		onLoad(e) {
@@ -334,36 +334,75 @@
 				this.$api.navigateTo(`/pages/user/order/order-details?state=${this.currentTab}&orderID=${id}`)
 			},
 			handButtonConfirm(data) {//获取点击
-				this.handShowAlert(data)
+				console.log(data)
+				this.hanldOrder = data
 				this.btnoRderID = data.orderId
+				this.OperationType = data.type
+				this.handShowAlert(data)
 			},
 			handShowAlert(data) {//执行
 				switch(data.type){
+					case 'pay':
+						this.$api.navigateTo(`/pages/user/order/order-details?path=pay&state=0&orderID=${this.btnoRderID}`)
+						// this.WeChatMiniWxPay(this.hanldOrder);
+						break;
 					case 'delete':
-						this.handOrderDetele(data.orderId);
-						break
+						this.modal = true;
+						this.contentModalText = '确认删除该订单吗？';
+						break;
 					case 'cancel':
-						this.handCenceConfirm(data.orderId)
-						break
+						this.modal = true;
+						this.contentModalText = '确认取消该订单吗？';
+						break;
+					case 'refund':
+						uni.setStorageSync('refundData',data.order)
+						this.$api.navigateTo('/pages/user/order/order-refund')
+						break;
+					case 'returned':
+						uni.setStorageSync('refundData',data.order)
+						this.$api.navigateTo('/pages/user/order/order-refund')
+						break;
 					case 'query':
 						this.isModalLayer = true;
 						this.$api.navigateTo('/pages/user/order/order-logistics?orderID='+data.orderId)
-						break
+						break;
 					case 'confirm':
-						this.handOrderConfirm(data.orderId);
-						break
-					case 'pay':
-						this.hanldOrderData = data.order;
-						this.getOrderPaymentValidation(data)
-						break
-					case 'confirmation':
-						this.handOrderConfirmation(data.orderId);
-						break
-					case 'payment':
-						this.hanldConfirmFn(data.orderId);
-						break	
+						this.modal = true;
+						this.contentModalText = '是否确认收货？'	
+						// this.handOrderConfirm(data.orderId);
+						break;
+					case 'cancelRefund':
+						this.modal = true;
+						this.contentModalText = '确定取消退货/退款？'	
+						// this.handCancelRefundConfirm(data.orderId);
+						break;
 				}
 			},
+			handleClick(e) {//用户操作订单
+				let index = e.index;
+				if(index == 1){
+					switch(this.OperationType){
+						case 'delete':
+							this.handOrderDetele(data.orderId);
+							break
+						case 'cancel':
+							this.handCenceConfirm(data.orderId)
+							break
+						case 'query':
+							this.isModalLayer = true;
+							this.$api.navigateTo('/pages/user/order/order-logistics?orderID='+data.orderId)
+							break
+						case 'confirm':
+							this.handOrderConfirm(data.orderId);
+							break
+						case 'pay':
+							this.hanldOrderData = data.order;
+							this.getOrderPaymentValidation(data)
+							break
+					}
+				}
+				this.modal = false;
+			},
 			getOrderPaymentValidation(data){//监听根据付款状态做操作
 				this.OrderService.OrderPaymentValidation({orderId:data.orderId}).then(response =>{
 					let dataCode = response.data.code
@@ -415,18 +454,6 @@
 					this.$api.navigateTo(`/pages/user/order/order-payment?type=payfirm&orderID=${data.orderId}`)
 				}
 			},
-			hanldConfirmFn (orderId){//确认打款供应商
-				this.$util.modal('提示','确定委托采美平台打款给供应商吗？确定之前请务必确保货品完好？','确定','取消',true,() =>{
-					this.OrderService.confirmpayment({orderID:orderId,userId:this.userID}).then(response =>{
-						this.$util.msg('确认成功',2000,true,'success');
-						setTimeout(() => {
-							this.getOrderDatainit(this.currentTab)
-						},2000)
-					}).catch(error =>{
-						this.$util.msg(error.msg,2000)
-					})
-				})
-			},
 			handOrderConfirm (id){//确认收货
 				this.$util.modal('提示','是否确认收货','确定','取消',true,() =>{
 					this.OrderService.ConfirmReceipt({orderID:id}).then(response =>{
@@ -439,18 +466,6 @@
 					})
 				})
 			},
-			handOrderConfirmation (id){//确认订单
-				this.$util.modal('提示','确认此订单？','确定','取消',true,() =>{
-					this.OrderService.AffirmOrder({orderID:id}).then(response =>{
-						this.$util.msg(response.msg,2000,true,'success');
-						setTimeout(() => {
-							this.getOrderDatainit(this.currentTab)
-						},2000)
-					}).catch(error =>{
-						this.$util.msg(error.msg,2000)
-					})
-				})
-			},
 			handOrderDetele(id){//删除订单
 				this.$util.modal('提示','确认删除该订单吗？','确定','取消',true,() =>{
 					this.OrderService.DeleteOrder({orderID:id}).then(response =>{
@@ -659,11 +674,21 @@
 	.order-title{
 		width: 100%;
 		height: auto;
+		padding-bottom: 20rpx;
+		border-bottom: 1px solid #e1e1e1;
+		.order-title-name{
+			width: 100%;
+			height: 48rpx;
+			line-height: 48rpx;
+			text-align: left;
+			font-size: $font-size-28;
+			color: #333333;
+		}
 		.order-title-t{
 			width: 100%;
-			height: 68rpx;
+			height: 48rpx;
 			float: left;
-			line-height: 68rpx;
+			line-height: 48rpx;
 			position: relative;
 			.bage-icon{
 				width: 50rpx;
@@ -673,53 +698,36 @@
 				right: 0;
 				top: 9rpx;
 			}
-			.bage-buss{
-				display: inline-block;
-				width: 72rpx;
-				height: 30rpx;
-				background:radial-gradient(circle,rgba(255,39,180,1) 0%,rgba(193,77,245,1) 100%);
-				border-radius: 4rpx;
-				line-height: 30rpx;
-				font-size: $font-size-22;
-				text-align: center;
-				color: #FFFFFF;
-			}
-			.bage-auto{
-				display: inline-block;
-				width: 72rpx;
-				height: 30rpx;
-				background:radial-gradient(circle,rgba(255,180,39,1) 0%,rgba(245,142,77,1) 100%);
-				border-radius: 4rpx;
-				line-height: 30rpx;
-				font-size: $font-size-22;
-				text-align: center;
-				color: #FFFFFF;
-			}
 			.bage-text{
 				display: inline-block;
 				font-size: $font-size-28;
-				line-height: 68rpx;
+				line-height: 48rpx;
 				text-align: left;
 				color: $text-color;
-				margin-left: 10rpx;
+				.text{
+					color: #999999;
+				}
 			}
 		}
 		.order-title-b{
 			width: 100%;
-			height: 40rpx;
+			height: 48rpx;
 			float: left;
 			margin-top: 8rpx;
 			.order-title-btxt{
 				float: left;
 				font-size: $font-size-28;
-				line-height: 40rpx;
-				color: #999999;
-				text-align: lef
+				line-height: 48rpx;
+				color: $text-color;
+				text-align: left;
+				.text{
+					color: #999999;
+				}
 			}
 			.order-title-tip{
 				float: right;
 				font-size: $font-size-28;
-				line-height: 40rpx;
+				line-height: 48rpx;
 				text-align: right;
 				color: #FF2A2A;
 			}
@@ -730,25 +738,17 @@
 		height: 56rpx;
 		float: left;
 		margin-top:10rpx;
-		.floor-item-act{
+		.title-logo{
+			width: 56rpx;
 			height: 56rpx;
-			text-align: center;
-			box-sizing: border-box;
 			float: left;
-			padding: 10rpx 0;
-			margin-right: 12rpx;
-			.floor-tags{
-				height: 28rpx;
-				border-radius: 6rpx;
-				background-color: #FFFFFF;
-				line-height: 28rpx;
-				color: $color-system;
-				text-align: center;
-				display: inline-block;
-				padding:0 16rpx;
-				font-size: $font-size-20;
-				border: 1px solid #E15616;
-				float: left;
+			box-sizing: border-box;
+			margin-right: 10rpx;
+			border: 1px solid #e1e1e1;
+			image{
+				width: 56rpx;
+				height: 56rpx;
+				display: block;
 			}
 		}
 		.title-text{
@@ -762,16 +762,6 @@
 			text-align: left;
 			line-height: 56rpx;
 			font-weight: bold;
-			.iconfont{
-				color: #999999;
-				font-size: 28rpx;
-				margin-left: 10rpx;
-			}
-			.paymenttext{
-				color: #f9a94b;
-				font-size: $font-size-22;
-				margin-left: 20rpx;
-			}
 		}
 	}
 	.goods-item{
@@ -868,12 +858,12 @@
 				border-radius: 6rpx;
 				background-color: #FFFFFF;
 				line-height: 28rpx;
-				color: $color-system;
+				color: #ff2a2a;
 				text-align: center;
 				display: inline-block;
 				padding:0 16rpx;
 				font-size: $font-size-20;
-				border: 1px solid #E15616;
+				border: 1px solid #ff2a2a;
 				float: left;
 			}
 		}

pages/user/order/search-order.vue

@@ -31,23 +31,19 @@
 					<view v-else class="tui-order-content">
 						<view  class="tui-order-item" v-for="(order,orderIndex) in orderList" :key="orderIndex" @click.stop="detail(order.orderID)">
 							<view class="order-title">
+								<view class="order-title-name">{{order.clubName}}</view>
 								<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>
-									<image class="bage-icon" src="https://static.caimei365.com/app/img/icon/icon-type@3x.png" mode="widthFix" v-if="order.secondHandOrderFlag == 1"></image>
+									<text class="bage-text tui-skeleton-fillet"><text class="text">订单编号：</text>{{order.orderNo}}</text>
 								</view>
 								<view class="order-title-b">
-									<view class="order-title-btxt tui-skeleton-fillet">下单时间：{{order.orderTime}}</view>
+									<view class="order-title-btxt tui-skeleton-fillet"><text class="text">下单时间：</text>{{order.orderTime}}</view>
 									<view class="order-title-tip tui-skeleton-fillet">{{ StateExpFormat(order.status) }}</view>
 								</view>
 							</view>
 							<block v-for="(shop,index) in order.shopOrderList" :key="index">
 								<view class="goods-title">
-										<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-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">
 									<view class="goods-pros-t">
@@ -660,67 +656,51 @@
 	.order-title{
 		width: 100%;
 		height: auto;
+		padding-bottom: 20rpx;
+		.order-title-name{
+			width: 100%;
+			height: 48rpx;
+			line-height: 48rpx;
+			text-align: left;
+			font-size: $font-size-28;
+			color: #333333;
+		}
 		.order-title-t{
 			width: 100%;
-			height: 68rpx;
+			height: 48rpx;
 			float: left;
-			line-height: 68rpx;
+			line-height: 48rpx;
 			position: relative;
-			.bage-icon{
-				width: 50rpx;
-				height: 50rpx;
-				display: block;
-				position: absolute;
-				right: 0;
-				top: 9rpx;
-			}
-			.bage-buss{
-				display: inline-block;
-				width: 72rpx;
-				height: 30rpx;
-				background:radial-gradient(circle,rgba(255,39,180,1) 0%,rgba(193,77,245,1) 100%);
-				border-radius: 4rpx;
-				line-height: 30rpx;
-				font-size: $font-size-22;
-				text-align: center;
-				color: #FFFFFF;
-			}
-			.bage-auto{
-				display: inline-block;
-				width: 72rpx;
-				height: 30rpx;
-				background:radial-gradient(circle,rgba(255,180,39,1) 0%,rgba(245,142,77,1) 100%);
-				border-radius: 4rpx;
-				line-height: 30rpx;
-				font-size: $font-size-22;
-				text-align: center;
-				color: #FFFFFF;
-			}
 			.bage-text{
 				display: inline-block;
 				font-size: $font-size-28;
-				line-height: 68rpx;
+				line-height: 48rpx;
 				text-align: left;
 				color: $color-system;
-				margin-left: 10rpx;
+				.text{
+					color: #999999;
+				}
 			}
 		}
 		.order-title-b{
 			width: 100%;
-			height: 40rpx;
+			height: 48rpx;
 			float: left;
 			margin-top: 8rpx;
 			.order-title-btxt{
 				float: left;
 				font-size: $font-size-28;
-				line-height: 40rpx;
+				line-height: 48rpx;
 				color: #999999;
-				text-align: lef
+				text-align: left;
+				.text{
+					color: #999999;
+				}
 			}
 			.order-title-tip{
 				float: right;
 				font-size: $font-size-28;
-				line-height: 40rpx;
+				line-height: 48rpx;
 				text-align: right;
 				color: #FF2A2A;
 			}
@@ -731,25 +711,17 @@
 		height: 56rpx;
 		float: left;
 		margin-top:10rpx;
-		.floor-item-act{
+		.title-logo{
+			width: 56rpx;
 			height: 56rpx;
-			text-align: center;
-			box-sizing: border-box;
 			float: left;
-			padding: 10rpx 0;
-			margin-right: 12rpx;
-			.floor-tags{
-				height: 28rpx;
-				border-radius: 6rpx;
-				background-color: #FFFFFF;
-				line-height: 28rpx;
-				color: $color-system;
-				text-align: center;
-				display: inline-block;
-				padding:0 16rpx;
-				font-size: $font-size-20;
-				border: 1px solid #E15616;
-				float: left;
+			box-sizing: border-box;
+			margin-right: 10rpx;
+			border: 1px solid #e1e1e1;
+			image{
+				width: 56rpx;
+				height: 56rpx;
+				display: block;
 			}
 		}
 		.title-text{
@@ -860,12 +832,12 @@
 				border-radius: 6rpx;
 				background-color: #FFFFFF;
 				line-height: 28rpx;
-				color: $color-system;
+				color: #ff2a2a;
 				text-align: center;
 				display: inline-block;
 				padding:0 16rpx;
 				font-size: $font-size-20;
-				border: 1px solid #E15616;
+				border: 1px solid #ff2a2a;
 				float: left;
 			}
 		}