发布品牌

components/cm-module/creatOrder/sellerGoodsList.vue

@@ -299,15 +299,16 @@
 					-webkit-align-items: center;
 					align-items: center;
 					position: relative;
-					width: 580rpx;
+					width: 576rpx;
 					height: 36rpx;
 					padding: 20rpx;
-					background: #F7F7F7;
+					background: #fff;
 					border-radius: 10rpx;
+					border: 2rpx solid #b2b2b2;
 					input{
 						width: 100%;
 						height: 100%;
-						background: #F7F7F7;
+						// background: #F7F7F7;
 						font-size: $font-size-26;
 						line-height: 36rpx;
 						color: #333333;

components/cm-module/creatOrder/sellerRegulations.vue

@@ -1,9 +1,37 @@
 <template name="regulations">
 	<view class="regulations-template">
 		<view class="regulations-title" @tap.stop="hanldOperationConfim">
-			<text class="text">售后条例:</text>
-			<text>{{regulaText}}</text>
-			<text class="iconfont icon-xiayibu"></text>
+			<text class="text">售后条款</text>
+			<view class="freight-right">
+				<text class="text-l">{{regulaText}}</text>
+				<text class="iconfont icon-xiayibu"></text>
+			</view>
+		</view>
+		<!--底部选择模态层弹窗组件 -->
+		<view class="popup spec" :class="specClass"  @touchmove.stop.prevent="discard" >
+			<!-- 遮罩层 -->
+			<view class="mask"></view>
+			<view class="layer">
+				<view class="content">
+					<view class="freight-ltitle">售后条款</view>
+					<text class="iconfont icon-iconfontguanbi" @click="freightConfim"></text>
+					<view class="freight-radio">
+						<radio-group class="row-group" @change="radioChange">
+							<label class="row-input">
+								<view class="row-text noTk">无条款</view>
+								<radio class="row-radio" value="无条款" color="#E15616"/>
+							</label>
+							<label class="row-input" v-for="(item, index) in freightList" :key="item.value">
+								<view class="row-text">{{item.name}}</view>
+								<radio class="row-radio" :value="item.name" :checked="index === current" color="#E15616"/>
+							</label>
+						</radio-group>
+					</view>
+				</view>
+				<view class="btn">
+					<view class="button add" @click="freightConfim">确定</view>
+				</view>
+			</view>
 		</view>
 	</view>
 </template>
@@ -18,8 +46,41 @@
 		},
 		data(){
 			return{
-				regulaText:'无条理',
+				regulaText:'无条款',
+				freightList:[
+					{value:1,name:'第一款—售后条款（无仪器产权'},
+					{value:0,name:'第一款—售后条款（无仪器产权'},
+					{value:-1,name:'第一款—售后条款（无仪器产权'},
+					{value:-1,name:'第一款—售后条款（无仪器产权'},
+					{value:-1,name:'第一款—售后条款（无仪器产权'},
+					{value:-1,name:'第一款—售后条款（无仪器产权'},
+					{value:-1,name:'第一款—售后条款（无仪器产权'},
+					{value:-1,name:'第一款—售后条款（无仪器产权'},
+				],
+				freightMoney:0,
+				specClass: '',//规格弹窗css类，控制开关动画
 			}
+		},
+		methods:{
+			radioChange(e){
+				this.regulaText = e.target.value;
+			},
+			freightConfim(){//提交完成选择
+			this.hideSpec()
+			},
+			hideSpec() {//关闭弹窗
+				this.specClass = 'hide';
+				setTimeout(() => {
+					this.specClass = 'none';
+				}, 200);
+			},
+			hanldOperationConfim(data){//显示弹窗
+				this.specClass = 'show';
+				this.freightMoney = this.hanldFreight
+			},
+			showTip(){//显示弹窗
+				this.$emit('@showregulaAlert');
+			},
 		}
 	}
 </script>
@@ -36,23 +97,341 @@
 			padding: 0 24rpx;
 			height: 88rpx;
 			line-height: 88rpx;
-			position: relative;
-			border-bottom: 1px solid #EBEBEB;
-			.text{
+			font-size: $font-size-28;
+			color: $text-color;
+			background: #FFFFFF;
+			float: left;
+			font-weight: bold;
+			border-bottom: 1rpx solid #EBEBEB;
+			.freight-left{
+				float: left;
+				.icon-yunfeishuoming{
+					height: 100%;
+					padding:15rpx;
+					color: $color-system;
+					font-weight: normal;
+				}
+			}
+			.Tk{
+				float: right;
+				margin-right: 38rpx;
 				font-size: $font-size-28;
-				color: $text-color;
+				color: #666666;
+			}
+			.freight-right{
+				float: right;
+				color: #2A81FF;
+				.text-l{
+					margin-right: 20rpx;
+				}
+				.text{
+					line-height: 88rpx;
+					color: #ff0000;
+					margin:0 20rpx;
+					font-weight: normal;
+				}
+				.icon-xiayibu{
+					line-height: 88rpx;
+					color: #999999;
+					font-weight: normal;
+				}
 			}
-			.iconfont{
-				width: 50rpx;
+		}
+	}
+	.freight-ltitle{
+		width: 100%;
+		line-height: 60rpx;
+		height: 60rpx;
+		font-size: $font-size-34;
+		color: #333333;
+		text-align:center;
+	}
+	.icon-iconfontguanbi{
+		position: absolute;
+		top: 0;
+		right: 0;
+		font-size: 34rpx;
+		color: #b2b2b2
+	}
+	.freight-radio{
+		height: 66rpx;
+		line-height: 66rpx;
+		padding: 0 20rpx;
+		.row-group{
+			width: 100%;
+			max-height: 460rpx;
+			overflow: auto;
+
+		}
+		.row-input{
+			height: 66rpx;
+			line-height: 66rpx;
+			width: 100%;
+			display: block;
+
+		}
+		.row-radio{
+			float: right;
+			transform: scale(0.9);
+			color: #b2b2b2;
+		}
+		.row-text{
+			font-size: $font-size-28;
+			color: #1890f9;
+			float: left;
+			&.noTk{
+				color: #666666;
+			}
+		}
+	}
+	.freight-group{
+		width: 100%;
+		height: 88rpx;
+		display: flex;
+		border-bottom: 1px solid #FFFFFF;
+		flex-direction: row;
+		.text{
+			display: block;
+			flex: 1;
+			line-height: 88rpx;
+			font-size: $font-size-24;
+			color: #999999;
+			text-align: left;
+			padding-left: 10rpx;
+		}
+		.group-from{
+			flex: 1;
+			height: 40rpx;
+			padding: 20rpx;
+			line-height: 40rpx;
+			align-items: flex-start;
+			font-size: $font-size-24;
+			color: $text-color;
+			background: #F7F7F7;
+			border-radius: 14rpx;
+			margin-bottom: 20rpx;
+			margin-top: 10rpx;
+			.form-input{
+				height: 40rpx;
+				line-height: 40rpx;
+				flex-grow: 1;
+			}
+		}
+	}	
+	/* 加入购物模态层*/
+	@keyframes showPopup {
+		0% {
+			opacity: 0;
+		}
+		100% {
+			opacity: 1;
+		}
+	}
+	@keyframes hidePopup {
+		0% {
+			opacity: 1;
+		}
+		100% {
+			opacity: 0;
+		}
+	}
+	@keyframes showLayer {
+		0% {
+			transform: translateY(0);
+		}
+		100% {
+			transform: translateY(-100%);
+		}
+	}
+	@keyframes hideLayer {
+		0% {
+			transform: translateY(-100%);
+		}
+		100% {
+			transform: translateY(0);
+		}
+	}
+	@keyframes showAmnation {
+		0% {
+			top: -12rpx;
+			opacity: 0;
+		}
+		50% {
+			top: -60rpx;
+			opacity: 1;
+		}
+		100% {
+			top: -100rpx;
+			opacity: 0;
+		}
+	}
+	@keyframes hideAmnation {
+		0% {
+			top: -100rpx;
+			opacity: 0;
+		}
+		100% {
+			top: -12rpx;
+			opacity: 0;
+		}
+	}
+	.popup {
+		position: fixed;
+		top: 0;
+		width: 100%;
+		height: 100%;
+		z-index: 999;
+		display: none;
+		.mask{
+			position: fixed;
+			top: 0;
+			width: 100%;
+			height: 100%;
+			z-index: 21;
+			background-color: rgba(0, 0, 0, 0.6);
+		}
+		.layer {
+			position: fixed;
+			z-index: 22;
+			bottom: -710rpx;
+			width: 702rpx;
+			padding: 24rpx 24rpx 36rpx 24rpx;
+			height: 670rpx;
+			border-radius: 20rpx 20rpx 0 0;
+			background-color: #fff;
+			display: flex;
+			flex-wrap: wrap;
+			align-content: space-between;
+			.content {
+				width: 100%;
+				position: relative;
+			}
+			.btn {
+				width: 100%;
 				height: 88rpx;
-				line-height: 88rpx;
-				color: #999999;
-				display: block;
-				position: absolute;
-				right: 0;
-				top: 0;
+				display: flex;
+				.button {
+					width: 702rpx;
+					height: 88rpx;
+					color: #fff;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					font-size: $font-size-28;
+					border-radius: 14rpx;
+					background: $btn-confirm;
+				}
 			}
 		}
 		
-	}
+		&.show {
+			display: block;
+			.mask{
+				animation: showPopup 0.2s linear both;
+			}
+			.layer {
+				animation: showLayer 0.2s linear both;
+			}
+		}
+		&.hide {
+			display: block;
+			.mask{
+				animation: hidePopup 0.2s linear both;
+			}
+			
+			.layer {
+				animation: hideLayer 0.2s linear both;
+			}
+		}
+		&.none {
+			display: none;
+		}
+		&.service {
+			.row {
+				margin: 30upx 0;
+				.title {
+					font-size: 30upx;
+					margin: 10upx 0;
+				}
+				.description {
+					font-size: 28upx;
+					color: #999;
+				}
+			}
+		}
+		.layer-smimg{
+			width: 114rpx;
+			height: 114rpx;
+			float: left;
+			border-radius: 10rpx;
+			margin-right: 24rpx;
+			image{
+				width: 114rpx;
+				height: 114rpx;	
+				border-radius: 10rpx;
+			}
+		}
+		.layer-nunbox{
+			justify-content: space-between;
+			align-items: center;
+			width: 536rpx;
+			height: 88rpx;
+			padding: 13rpx 0 0 0;
+			float: left;
+			.layer-nunbox-t{
+				width: 100%;
+				height:44rpx;
+				position:relative;
+				display: flex;
+				.layer-nunbox-text{
+					line-height: 44rpx;
+					font-size: $font-size-28;
+				}
+				.number-box{
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					.iconfont{
+						font-size: $font-size-32;
+						padding:0 20rpx;
+						font-size: $text-color;
+					}
+					.btn-input{
+						width: 62rpx;
+						height: 48rpx;
+						line-height: 48rpx;
+						background: #F8F8F8;
+						border-radius: 4rpx;
+						text-align: center;
+						font-size: $font-size-28;
+					}
+				}
+				.product-step{
+					position: absolute;
+					left: 45rpx;
+					bottom: 0;
+					height: 44rpx;
+					background: #FFFFFF;
+				}
+			}
+			.layer-nunbox-b{
+				width: 100%;
+				height:44rpx;
+				margin-top: 13rpx;
+			}
+			.text{
+				line-height: 44rpx;
+				font-size: $font-size-28;
+				.p{
+					color: #FF2A2A;
+				}
+				.p:first-child{
+					margin-left: 30rpx;
+				}
+				.p.sm{
+					font-size: $font-size-24;
+				}
+			}
+		}
+	}	
 </style>

components/cm-module/modelAlert/secondBrandAlert.vue

@@ -0,0 +1,437 @@
+<template name="brandalert">
+	<view class="regulations-template">
+		<view class="regulations-title" @tap.stop="hanldOperationConfim">
+			<text class="text">售后条款</text>
+			<view class="freight-right">
+				<text class="text-l">{{regulaText}}</text>
+				<text class="iconfont icon-xiayibu"></text>
+			</view>
+		</view>
+		<!--底部选择模态层弹窗组件 -->
+		<view class="popup spec" :class="specClass"  @touchmove.stop.prevent="discard" >
+			<!-- 遮罩层 -->
+			<view class="mask"></view>
+			<view class="layer">
+				<view class="content">
+					<view class="freight-ltitle">售后条款</view>
+					<text class="iconfont icon-iconfontguanbi" @click="freightConfim"></text>
+					<view class="freight-radio">
+						<radio-group class="row-group" @change="radioChange">
+							<label class="row-input">
+								<view class="row-text noTk">无条款</view>
+								<radio class="row-radio" value="无条款" color="#E15616"/>
+							</label>
+							<label class="row-input" v-for="(item, index) in freightList" :key="item.value">
+								<view class="row-text">{{item.name}}</view>
+								<radio class="row-radio" :value="item.name" :checked="index === current" color="#E15616"/>
+							</label>
+						</radio-group>
+					</view>
+				</view>
+				<view class="btn">
+					<view class="button add" @click="freightConfim">确定</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default{
+		name:'brandalert',
+		props:{
+			barndDatas:{
+				type:Object
+			}
+		},
+		data(){
+			return{
+				regulaText:'无条款',
+				freightList:[
+					{value:1,name:'第一款—售后条款'},
+					{value:0,name:'第一款—售后条款'},
+					{value:-1,name:'第一款—售后条款'},
+					{value:-1,name:'第一款—售后条款'},
+					{value:-1,name:'第一款—售后条款'},
+					{value:-1,name:'第一款—售后条款'},
+					{value:-1,name:'第一款—售后条款'},
+					{value:-1,name:'第一款—售后条'},
+				],
+				freightMoney:0,
+				specClass: '',//规格弹窗css类，控制开关动画
+			}
+		},
+		methods:{
+			radioChange(e){
+				this.regulaText = e.target.value;
+			},
+			freightConfim(){//提交完成选择
+			this.hideSpec()
+			},
+			hideSpec() {//关闭弹窗
+				this.specClass = 'hide';
+				setTimeout(() => {
+					this.specClass = 'none';
+				}, 200);
+			},
+			hanldOperationConfim(data){//显示弹窗
+				this.specClass = 'show';
+				this.freightMoney = this.hanldFreight
+			},
+			showTip(){//显示弹窗
+				this.$emit('@showregulaAlert');
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	.regulations-template{
+		width: 100%;
+		height: auto;
+		background: #FFFFFF;
+		float: left;
+		margin-top: 24rpx;
+		.regulations-title{
+			width: 702rpx;
+			padding: 0 24rpx;
+			height: 88rpx;
+			line-height: 88rpx;
+			font-size: $font-size-28;
+			color: $text-color;
+			background: #FFFFFF;
+			float: left;
+			font-weight: bold;
+			border-bottom: 1rpx solid #EBEBEB;
+			.freight-left{
+				float: left;
+				.icon-yunfeishuoming{
+					height: 100%;
+					padding:15rpx;
+					color: $color-system;
+					font-weight: normal;
+				}
+			}
+			.Tk{
+				float: right;
+				margin-right: 38rpx;
+				font-size: $font-size-28;
+				color: #666666;
+			}
+			.freight-right{
+				float: right;
+				color: #2A81FF;
+				.text-l{
+					margin-right: 20rpx;
+				}
+				.text{
+					line-height: 88rpx;
+					color: #ff0000;
+					margin:0 20rpx;
+					font-weight: normal;
+				}
+				.icon-xiayibu{
+					line-height: 88rpx;
+					color: #999999;
+					font-weight: normal;
+				}
+			}
+		}
+	}
+	.freight-ltitle{
+		width: 100%;
+		line-height: 60rpx;
+		height: 60rpx;
+		font-size: $font-size-34;
+		color: #333333;
+		text-align:center;
+	}
+	.icon-iconfontguanbi{
+		position: absolute;
+		top: 0;
+		right: 0;
+		font-size: 34rpx;
+		color: #b2b2b2
+	}
+	.freight-radio{
+		height: 66rpx;
+		line-height: 66rpx;
+		padding: 0 20rpx;
+		.row-group{
+			width: 100%;
+			max-height: 460rpx;
+			overflow: auto;
+
+		}
+		.row-input{
+			height: 66rpx;
+			line-height: 66rpx;
+			width: 100%;
+			display: block;
+
+		}
+		.row-radio{
+			float: right;
+			transform: scale(0.9);
+			color: #b2b2b2;
+		}
+		.row-text{
+			font-size: $font-size-28;
+			color: #1890f9;
+			float: left;
+			&.noTk{
+				color: #666666;
+			}
+		}
+	}
+	.freight-group{
+		width: 100%;
+		height: 88rpx;
+		display: flex;
+		border-bottom: 1px solid #FFFFFF;
+		flex-direction: row;
+		.text{
+			display: block;
+			flex: 1;
+			line-height: 88rpx;
+			font-size: $font-size-24;
+			color: #999999;
+			text-align: left;
+			padding-left: 10rpx;
+		}
+		.group-from{
+			flex: 1;
+			height: 40rpx;
+			padding: 20rpx;
+			line-height: 40rpx;
+			align-items: flex-start;
+			font-size: $font-size-24;
+			color: $text-color;
+			background: #F7F7F7;
+			border-radius: 14rpx;
+			margin-bottom: 20rpx;
+			margin-top: 10rpx;
+			.form-input{
+				height: 40rpx;
+				line-height: 40rpx;
+				flex-grow: 1;
+			}
+		}
+	}	
+	/* 加入购物模态层*/
+	@keyframes showPopup {
+		0% {
+			opacity: 0;
+		}
+		100% {
+			opacity: 1;
+		}
+	}
+	@keyframes hidePopup {
+		0% {
+			opacity: 1;
+		}
+		100% {
+			opacity: 0;
+		}
+	}
+	@keyframes showLayer {
+		0% {
+			transform: translateY(0);
+		}
+		100% {
+			transform: translateY(-100%);
+		}
+	}
+	@keyframes hideLayer {
+		0% {
+			transform: translateY(-100%);
+		}
+		100% {
+			transform: translateY(0);
+		}
+	}
+	@keyframes showAmnation {
+		0% {
+			top: -12rpx;
+			opacity: 0;
+		}
+		50% {
+			top: -60rpx;
+			opacity: 1;
+		}
+		100% {
+			top: -100rpx;
+			opacity: 0;
+		}
+	}
+	@keyframes hideAmnation {
+		0% {
+			top: -100rpx;
+			opacity: 0;
+		}
+		100% {
+			top: -12rpx;
+			opacity: 0;
+		}
+	}
+	.popup {
+		position: fixed;
+		top: 0;
+		width: 100%;
+		height: 100%;
+		z-index: 999;
+		display: none;
+		.mask{
+			position: fixed;
+			top: 0;
+			width: 100%;
+			height: 100%;
+			z-index: 21;
+			background-color: rgba(0, 0, 0, 0.6);
+		}
+		.layer {
+			position: fixed;
+			z-index: 22;
+			bottom: -710rpx;
+			width: 702rpx;
+			padding: 24rpx 24rpx 36rpx 24rpx;
+			height: 670rpx;
+			border-radius: 20rpx 20rpx 0 0;
+			background-color: #fff;
+			display: flex;
+			flex-wrap: wrap;
+			align-content: space-between;
+			.content {
+				width: 100%;
+				position: relative;
+			}
+			.btn {
+				width: 100%;
+				height: 88rpx;
+				display: flex;
+				.button {
+					width: 702rpx;
+					height: 88rpx;
+					color: #fff;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					font-size: $font-size-28;
+					border-radius: 14rpx;
+					background: $btn-confirm;
+				}
+			}
+		}
+		
+		&.show {
+			display: block;
+			.mask{
+				animation: showPopup 0.2s linear both;
+			}
+			.layer {
+				animation: showLayer 0.2s linear both;
+			}
+		}
+		&.hide {
+			display: block;
+			.mask{
+				animation: hidePopup 0.2s linear both;
+			}
+			
+			.layer {
+				animation: hideLayer 0.2s linear both;
+			}
+		}
+		&.none {
+			display: none;
+		}
+		&.service {
+			.row {
+				margin: 30upx 0;
+				.title {
+					font-size: 30upx;
+					margin: 10upx 0;
+				}
+				.description {
+					font-size: 28upx;
+					color: #999;
+				}
+			}
+		}
+		.layer-smimg{
+			width: 114rpx;
+			height: 114rpx;
+			float: left;
+			border-radius: 10rpx;
+			margin-right: 24rpx;
+			image{
+				width: 114rpx;
+				height: 114rpx;	
+				border-radius: 10rpx;
+			}
+		}
+		.layer-nunbox{
+			justify-content: space-between;
+			align-items: center;
+			width: 536rpx;
+			height: 88rpx;
+			padding: 13rpx 0 0 0;
+			float: left;
+			.layer-nunbox-t{
+				width: 100%;
+				height:44rpx;
+				position:relative;
+				display: flex;
+				.layer-nunbox-text{
+					line-height: 44rpx;
+					font-size: $font-size-28;
+				}
+				.number-box{
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					.iconfont{
+						font-size: $font-size-32;
+						padding:0 20rpx;
+						font-size: $text-color;
+					}
+					.btn-input{
+						width: 62rpx;
+						height: 48rpx;
+						line-height: 48rpx;
+						background: #F8F8F8;
+						border-radius: 4rpx;
+						text-align: center;
+						font-size: $font-size-28;
+					}
+				}
+				.product-step{
+					position: absolute;
+					left: 45rpx;
+					bottom: 0;
+					height: 44rpx;
+					background: #FFFFFF;
+				}
+			}
+			.layer-nunbox-b{
+				width: 100%;
+				height:44rpx;
+				margin-top: 13rpx;
+			}
+			.text{
+				line-height: 44rpx;
+				font-size: $font-size-28;
+				.p{
+					color: #FF2A2A;
+				}
+				.p:first-child{
+					margin-left: 30rpx;
+				}
+				.p.sm{
+					font-size: $font-size-24;
+				}
+			}
+		}
+	}	
+</style>

components/cm-module/orderDetails/sellerDetaileButton.vue

@@ -2,9 +2,10 @@
 	<view class="button-template" :style="{paddingBottom :isIphoneX ? '68rpx' : '0rpx'}">
 		<!-- 底部按钮 -->
 		<view class="button-content">
+			<view class="btn btn-cancel">再来一单</view>
 			<view class="btn btn-cancel" v-if="btnState.isCancel"  @click.stop="btnConfirm('cancel',order)">取消订单</view>
 			<view class="btn btn-cancel" v-if="btnState.isDelete"  @click.stop="btnConfirm('delete',order)">删除订单</view>
-			<view class="btn btn-color" @click.stop="onShareCode">
+			<view class="btn btn-cancel" @click.stop="onShareCode">
 				<view class="tips" v-if="shareCode">分享码：{{shareCode}}</view>
 				分享订单
 			</view>	
@@ -143,6 +144,7 @@
 			height: auto;
 			float: left;
 			position: relative;
+			margin: 20rpx 0;
 			.share-code{
 				width: 200rpx;
 				height:  64rpx;
@@ -158,17 +160,17 @@
 			.btn{
 				width: 160rpx;
 				height:  64rpx;
-				margin:22rpx;
+				// margin:22rpx;
 				line-height: 64rpx;
 				font-size:$font-size-26;
 				color: #FFFFFF;
 				text-align: center;
-				border-radius: 6rpx;
+				border-radius: 32rpx;
 				float: right;
 			}
 			.btn-color{
-				background: $btn-confirm;
-				margin: 20rpx 0 20rpx 20rpx;
+				background: #f94b4b;
+				// margin: 20rpx 0 20rpx 20rpx;
 				.tips{
 					width: 160rpx;
 					height: 34rpx;
@@ -198,10 +200,11 @@
 			}
 			.btn-cancel{
 				background:#FFFFFF;
-				color: #999999;
+				color: #666666;
 				float: left;
-				margin: 22rpx 0;
-				text-align: left;
+				// margin: 22rpx 0;
+				margin-right: 15rpx;
+				border: 2rpx solid #999999;
 			}
 			.btn-delete{
 				background:linear-gradient(315deg,rgba(255,163,3,1) 0%,rgba(255,53,1,1) 100%);

components/cm-module/orderDetails/sellerOrderButton.vue

@@ -1,10 +1,11 @@
 <template name="button">
 	<view class="button-template">
 		<!-- 底部按钮 -->
-		<view class="button-content">
+		<view class="button-content"> 
 			<view class="btn btn-cancel" v-if="btnState.isCancel" @click.stop="btnConfirm('cancel',orderID)">取消订单</view>
 			<view class="btn btn-cancel" v-if="btnState.isDelete" @click.stop="btnConfirm('delete',orderID)">删除订单</view>
-			<view class="btn btn-color"  @click.stop="onShareCode(orderID,userID)">分享订单</view>	
+			<view class="btn btn-cancel"  @click.stop="btnConfirm('add',orderID)">再来一单</view>
+			<view class="btn btn-cancel"  @click.stop="onShareCode(orderID,userID)">分享订单</view>	
 			<view class="btn btn-color" v-if="btnState.isConfirm" @click.stop="btnConfirm('confirm',orderID)">确认订单</view>
 		</view>
 	</view>
@@ -110,6 +111,7 @@
 			height: auto;
 			float: left;
 			position: relative;
+			margin: 20rpx 0;
 			.share-code{
 				width: 200rpx;
 				height:  64rpx;
@@ -125,24 +127,23 @@
 			.btn{
 				width: 160rpx;
 				height:  64rpx;
-				margin:22rpx;
 				line-height: 64rpx;
 				font-size:$font-size-26;
 				color: #FFFFFF;
 				text-align: center;
-				border-radius: 6rpx;
-				float: right;
+				border-radius:32rpx;
+				float: right; 
 			}
 			.btn-color{
 				background: $btn-confirm;
-				margin: 22rpx 0 22rpx 22rpx;
+				// margin: 22rpx 0 22rpx 22rpx;
 			}
 			.btn-cancel{
+				border: 2rpx solid #999999;
 				background:#FFFFFF;
-				color: #999999;
+				color: #666666;
 				float: left;
-				margin: 22rpx 0;
-				text-align: left;
+				margin-right: 15rpx;
 			}
 			.btn-delete{
 				background:linear-gradient(315deg,rgba(255,163,3,1) 0%,rgba(255,53,1,1) 100%);

second/pages/form/form.vue

@@ -28,13 +28,19 @@
 					 </view>
 					 <view class="row">
 						<view class="label">商品品牌</view>
-						 <view class="select spacing" @click="showBrand">
+						<!-- <view class="select spacing"  @tap.stop="hanldOperationConfim">
 							 <view class="placeholder" >{{brandname}}</view>
-							<!-- <ul v-show="selectBrand">
-								 <li  v-for="(item,index) in BrandList" :key="index" :value='item.id' @click="ChangeBrand(item)">{{item.name}}</li>
-							 </ul> -->
 							 	 <text class="iconfont icon-xiayibu"></text>
-						 </view>
+						 </view> -->
+						 <!-- 品牌弹窗 -->
+						 <second-brandalert ref="brandalert"
+						 					:barndDatas="brandData" 
+						 					@showAlert="handAlertShow">
+						 </second-brandalert>
+						 <!-- <seller-regulations ref="regulations"
+						 					:regulaDatas="regulationsData" 
+						 					@showregulaAlert="handregulaAlertShow">
+						 </seller-regulations> -->
 					 </view>
 					 <view class="row">
 						 <view class="label">商品名称</view>
@@ -170,12 +176,15 @@
 							<view   @click="submitBtn" class="btn-submit">发布</view>
 					</div>
 				 </form>
+				 <!-- 地址弹窗 -->
 				 <mpvue-city-picker :themeColor="themeColor"
 				 					ref="mpvueCityPicker" 
 				 				    :pickerValueDefault="cityPickerValueDefault"
 				 					@onCancel="onCancel" 
 				 					@onConfirm="onConfirm">
 				 </mpvue-city-picker>
+				 
+				
 	          </view>
 			<view class="secondBj thebj"   v-show="vShow_secondBj" :class="vShow_secondBj?'show':''">
 					<view class="bjmain theresult">
@@ -195,7 +204,9 @@
 <script>
 	import listCell from "@/components/tui-components/list-cell/list-cell.vue"
 	import mpvueCityPicker from '@/components/mpvue-citypicker/mpvueCityPicker.vue'
-	import paymentRecord from '@/components/cm-module/orderDetails/paymentRecord'	
+	import paymentRecord from '@/components/cm-module/orderDetails/paymentRecord'
+	import secondBbrandAlert from '@/components/cm-module/modelAlert/secondBrandAlert.vue'
+	import sellerRegulations from '@/components/cm-module/creatOrder/sellerRegulations.vue'
 	import { uploadFileImage } from "@/api/utils.js"
 	import { mapState,mapMutations } from 'vuex';
 	export default{
@@ -203,7 +214,9 @@
 		components:{
 			listCell,
 			mpvueCityPicker,
-			paymentRecord
+			paymentRecord,
+			secondBbrandAlert,
+			sellerRegulations
 		},
 		data(){
 			return{
@@ -273,7 +286,6 @@
 				        vShow_secondBj:false,
 				        resultBj:false,
 				        vShow_detailTalkFlag:false,
-						isShowInput:true,
 						showtips:false
 			}
 		},
@@ -294,10 +306,10 @@
 		 onConfirmbrand(e){
 			 this.brandname = e.name;
 		 },
-			showBrand:function(){
-						this.isShowInput = true
-						this.$refs.listCell.show()
-			        },
+			// hanldOperationConfim(){
+			// 	console.log(111)
+			// 			this.specClass = 'show';
+			//         },
 			        secondHandRidio: function(item) {
 			            this.currentId = item.value;
 			            this.secondParams.secondHandType = item.value;

seller/pages/order/create-order.vue

@@ -46,6 +46,12 @@
 				</view>
 			</view>
 		</view>
+		<!-- 售后条例 -->
+		<seller-regulations ref="regulations"
+							:regulaDatas="regulationsData" 
+							@showregulaAlert="handregulaAlertShow">
+		</seller-regulations>
+		<regula-alert v-if="isregulaTip" ref="csPhone"></regula-alert>
 		<!-- 底部 -->
 		<view class="footer" :style="{paddingBottom :isIphoneX ? '68rpx' : '0rpx'}">
 			<view class="footer-le">
@@ -72,6 +78,7 @@
 	import sellerInvoice from '@/components/cm-module/creatOrder/sellerInvoice'
 	import sellerFreight from '@/components/cm-module/creatOrder/sellerFreight'
 	import freightAlert from '@/components/cm-module/modelAlert/freightAlert.vue'
+	import sellerRegulations from '@/components/cm-module/creatOrder/sellerRegulations.vue'
 	import modalLayer from "@/components/modal-layer"
 	export default {
 		components:{
@@ -80,7 +87,8 @@
 			sellerInvoice,
 			sellerFreight,
 			freightAlert,
-			modalLayer
+			modalLayer,
+			sellerRegulations
 		},
 		data() {
 			return {
@@ -118,7 +126,8 @@
 				rechargeGoods:false,
 				isDepositFlg:true,
 				depositIds : [6060,6061,6062,6063,6064,6065,6066,6067,6068,6069],//定金&充值余额商品ID
-				isIphoneX:this.$store.state.isIphoneX
+				isIphoneX:this.$store.state.isIphoneX,
+				regulationsData:{},
 			}
 		},
 		onLoad(option){//商品数据
@@ -357,7 +366,7 @@
 			},
 			hideFreight(){//关闭邮费弹窗
 				this.isfreightTip = false;
-			}
+			},
 		},
 		onShow() {
 			// this.addressID = ''		

seller/pages/order/order-list.vue

@@ -84,7 +84,7 @@
 									<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">应付总额：<label style="color: #f94b4b;">¥{{ order.payableAmount | NumFormat }}</label></view>
 									</view>
 								</view>
 								<!-- 底部button -->
@@ -651,7 +651,7 @@
 				font-size: $font-size-28;
 				line-height: 68rpx;
 				text-align: left;
-				color: $color-system;
+				color: $text-color;
 				margin-left: 10rpx;
 			}
 		}