Merge branch 'developerB' of git.caimei365.com:caimei-repository/caimei-applets-caimei into developerB

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/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/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

@@ -1,25 +1,29 @@
 <template name="secondHandrelease">
 	<view class="fleaMarketForm">
-	     <view class="bannerimg"><image src="https://admin-b.caimei365.com/userfiles/1/images/photo/2020/11/banner3.png"></image></view>
+	     <view class="bannerimg"><image src="https://admin-b.caimei365.com/userfiles/1/images/photo/2020/11/secondbg.jpg"></image></view>
 	      <view class="my-maintenance" >
 	            <view class="newsTitle">
-					<view>欢迎您来到采美365网二手商品市场，您可以在这里发布二手
+					<view class="nestext">欢迎您来到采美365网二手商品市场，您可以在这里发布二手
 					设备/产品信息，每个商品需要收取您100元的展示费，展示期为6个月； 为了完整展示您的商品，请您认真填写以下内容，谢谢合作</view>
 	             </view>
 				 <form>
 					 <view class="row fenlei"> 
 						 <view class="label">分类</view>
 						 <view class="secondradio">
-							  <view v-for="(item,index) in fenlei" :key="index" v-model="secondParams.secondHandType"  @click="secondHandRidio(item)"
-								  :class="currentId==item.value?'active':''">
-								  <label class="iconfont" :class="currentId==item.value?'icon-yixuanze':'icon-weixuanze'"></label>{{item.name}}
-							  </view>
+							  <radio-group class="row-group" @change="secondHandRidio" >
+							  	<label class="row-input" v-for="(item, index) in fenlei" :key="index">
+									<radio class="row-radio" :value="item.value" color="#E15616"/>
+							  		<view class="row-text">{{item.name}}</view>
+							  	</label>
+							  </radio-group>
 						  </view>
 						  <view class="secondradio Secondary"  v-if="isShow" >
-							  <view v-for="(item ,index) in radioList" :key="index" :class="item.isChecked ? 'active':''"
-									  @click="secondHandType(item)" class="icon mIcon ">
-								      <label class="iconfont" :class="item.isChecked?'icon-yixuanze':'icon-weixuanze'"></label>{{item.name}}
-							  </view>
+							  <checkbox-group class="row-group" @change="secondHandType">
+									<label class="row-input" v-for="(item, index) in radioList" :key="item.value" >
+										<checkbox class="row-check" :value="item.value" ></checkbox>
+										<view class="row-text">{{item.name}}</view>
+									</label>
+							  </checkbox-group>
 						  </view>
 						  <view class="linqi_text" v-show="secondParams.secondHandType==2">
 							  <view class="jiaobiao"></view>
@@ -28,13 +32,32 @@
 					 </view>
 					 <view class="row">
 						<view class="label">商品品牌</view>
-						 <view class="select spacing" @click="showBrand">
-							 <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> -->
+						<view class="select spacing"  @click="hanldOperationConfim">
+							 <view class="placeholder">{{brandname}}</view>
 							 	 <text class="iconfont icon-xiayibu"></text>
 						 </view>
+						<!-- 品牌弹窗 -->
+						<tui-bottom-popup :radius="true" :show="popupShow" @close="hidePopup()">
+							<view class="tui-popup-box clearfix">
+								<text class="iconfont  icon-iconfontguanbi"  @click="hidePopup()"></text>
+								<view class="content">
+									<view class="freight-radio">
+										<radio-group class="row-group" @change="radioChange" >
+											<label class="row-input" v-for="(item, index) in BrandList" :key="item.id">
+												<view class="row-text">{{item.name}}</view>
+												<radio class="row-radio" :value="item.id"  color="#E15616"/>
+											</label>
+										</radio-group>
+									</view>
+								</view>
+							</view>	
+						</tui-bottom-popup>	
+					 </view>
+					 <view class="row" v-if="secondParams.brandID==161">
+						 <view class="label">其它品牌</view>
+						 <view class="spacing">
+							 <input type="text" maxlength="40" v-model="secondParams.brandName" placeholder="请输入商品品牌">
+						 </view>
 					 </view>
 					 <view class="row">
 						 <view class="label">商品名称</view>
@@ -112,9 +135,15 @@
 					 <view class="row">
 						 <view class="label">商品类型</view>
 						 <view class="secondradio">
-							 <view class="buy " v-for="(item ,index) in beauty" :key='index' value="item.value" @click="getProductType(item.value)" :class="secondType==item.value?' active':''">
+							<!-- <view class="buy " v-for="(item ,index) in beauty" :key='index' value="item.value" @click="getProductType(item.value)" :class="secondType==item.value?' active':''">
 								 <label class="iconfont" :class="secondType==item.value?'icon-yixuanze':'icon-weixuanze'"></label>{{item.name}}
-							 </view>
+							 </view> -->
+							 <radio-group class="row-group" @change="getProductType" >
+							 	<label class="row-input" v-for="(item, index) in beauty" :key="index">
+							 		<radio class="row-radio" :value="item.value" color="#E15616"/>
+							 		<view class="row-text">{{item.name}}</view>
+							 	</label>
+							 </radio-group>
 						 </view>
 					 </view>
 					<view class="row" >
@@ -170,6 +199,7 @@
 							<view   @click="submitBtn" class="btn-submit">发布</view>
 					</div>
 				 </form>
+				 <!-- 地址弹窗 -->
 				 <mpvue-city-picker :themeColor="themeColor"
 				 					ref="mpvueCityPicker" 
 				 				    :pickerValueDefault="cityPickerValueDefault"
@@ -195,7 +225,7 @@
 <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 { uploadFileImage } from "@/api/utils.js"
 	import { mapState,mapMutations } from 'vuex';
 	export default{
@@ -203,16 +233,16 @@
 		components:{
 			listCell,
 			mpvueCityPicker,
-			paymentRecord
+			paymentRecord,
 		},
 		data(){
 			return{
+				popupShow:false,
 				fenlei:[
 				            {name:'二手仪器',value:'1'},
 				            {name:'临期产品',value:'2'},
 				            {name:'其他',value:'3'},
 				        ],
-				        currentId:0,
 				        radioList:[
 				            {name:'轻光电',value:'1',isChecked:false},
 				            {name:'重光电',value:'2',isChecked:false},
@@ -226,10 +256,7 @@
 				        BrandList:[],
 				        isShow:false,
 				        GoodsImagesList:[],
-				        oldNum:0,
-				        secondType:0,
 				        vShow_GoodsImages:false,
-				        fromMessage:'',//提示文字
 				        secondParams:{
 				            secondHandType:'',//一级分类
 				            instrumentType:'',//二手仪器分类
@@ -264,26 +291,25 @@
 				        brandname:'请选择品牌名称',
 				        checkbox:false,
 				        shoplogoTwo:false,
-				        provinceIndex:'',
-				        provinceArray:[],
-				        cityArray: [],//市
-				        townArray: [],//区
-				        playid:'',
-				        checkVal:[],
 				        vShow_secondBj:false,
 				        resultBj:false,
 				        vShow_detailTalkFlag:false,
-						isShowInput:true,
-						showtips:false
 			}
 		},
 		methods:{
+			radioChange(e){//品牌
+				this.secondParams.brandID = e.target.value;
+				this.BrandList.forEach((item,index)=>{
+					if(item.id==this.secondParams.brandID){
+						this.brandname = item.name;
+					}
+				})
+			},
 			showMulLinkageThreePicker() {//三级地址联动
 				this.isShowInput = true
 				this.$refs.mpvueCityPicker.show()
 			},
 			onConfirm(e) {//获取选择的地址信息
-				console.log('地址',e);
 				this.addressData.address = e.name;
 				this.addressData.townID = e.townCode;
 				this.addressData.cityID = e.cityCode;
@@ -291,168 +317,150 @@
 				this.secondParams.townId = this.addressData.townID;
 				this.secondParams.address = this.addressData.address;
 			},
-		 onConfirmbrand(e){
-			 this.brandname = e.name;
-		 },
-			showBrand:function(){
-						this.isShowInput = true
-						this.$refs.listCell.show()
-			        },
-			        secondHandRidio: function(item) {
-			            this.currentId = item.value;
-			            this.secondParams.secondHandType = item.value;
-			            if (item.value==1){
-			            this.isShow = true;
-			            }else {
-			             this.isShow = false;
-			            }
-			        },
-			        secondHandType:function(item){ //二手仪器
-			        item.isChecked = ! item.isChecked;
-			          if(item.isChecked){
-			           this.checkVal.push(item.value);
-			           this.secondParams.instrumentType =  this.checkVal.toString();
-			          } else {
-			            this.checkVal.splice(this.checkVal.indexOf(item.value), 1);
-			            this.secondParams.instrumentType = this.checkVal.toString();
-			          }
-			        },
-			        ChangeBrand:function(item){ //品牌列表
-			            this.brandname = item.name;
-			            this.secondParams.brandID = item.id;
-			            if(this.secondParams.brandID==161){
-			              this.shoplogoTwo = true;
-			            }else {
-			              this.shoplogoTwo = false;
-			            }
-			        },
-			        Detailed:function(){
-					this.vShow_detailTalkFlag = !this.vShow_detailTalkFlag;
-			         if(this.vShow_detailTalkFlag){
-			             this.secondParams.detailTalkFlag = 2 ;//启用价格详聊
-			          }else {
-			            this.secondParams.detailTalkFlag = 1 ;//不启用价格详聊
-			          }
-			        },
-			        dragstart: function(value) {  // 记录初始信息
-			            this.oldNum = value;
-			        },
-			         uploadGoodsImagesFn: function(event){//上传商品图片
-							uploadFileImage().then(res =>{
-								 this.GoodsImagesList.push(JSON.parse(res.data).data);
-								 this.secondParams.image1 =this.GoodsImagesList.toString()+',';
-							})
-			        },
-			         removeGoodsImagesFn: function(index){//删除商品图片
-			            this.GoodsImagesList.splice(index,1);
-			            this.secondParams.image1 =this.GoodsImagesList.toString()+',';
-			         },
-			        getProductType:function(item){
-			         this.secondType=item;
-			          this.secondParams.secondProductType = item ;
-			        },
-			        submitBtn:function () {
-			          if(this.secondParams.secondHandType == ''){
-							this.$util.msg('请选择分类',2000);
-			                return;
-			            }
-			            if(this.secondParams.secondHandType == 1 ){
-			               if(this.secondParams.instrumentType ==''){
-							this.$util.msg('请完善仪器分类',2000);
-			                return;
-			                }
-			            }
-			    //      if(this.secondParams.brandID == ''){
-							// this.$util.msg('请选择商品品牌',2000);
-			    //             return;
-			    //         }
-			         if(this.secondParams.name == ''){
-						  this.$util.msg('请输入商品名称',2000);
-			                return
-			         }
-			         if(this.secondParams.secondHandType ==2) {
-			         if (this.secondParams.normalPrice == '') {
-							 this.$util.msg('请输入市场价',2000);
-			                 return
-			             }
-			             if (this.secondParams.maturityYears == '') {
-							 this.$util.msg('请输入产品到期日',2000);
-			                 return
-			             }
-			         }
-			         if(this.secondParams.price1 == ''){
-							  this.$util.msg('请输入交易价',2000);
-			                    return
-			             }
-			         if(this.secondParams.secondHandType ==2){
-			             if(this.secondParams.originalPrice == ''){
-						  this.$util.msg('请输入采购价/原价',2000);
-			                return
-			           }
-			         if(this.secondParams.stock == ''){
-						  this.$util.msg('请输入数量',2000);
-			                return
-			            }
-			         }
-			         if(this.secondParams.productQuality == ''){
-						  this.$util.msg('请输入商品成色',2000);
-			                return
-			         }
-			          if(this.secondParams.contactName == ''){
-						  this.$util.msg('请输入联系人姓名',2000);
-			                return
-			         }
-			          if(this.secondParams.contactMobile == ''){
-						  console.log(this.secondParams.contactMobile)
-						  this.$util.msg('请输入联系方式',2000);
-			                return
-			         }
-			         if(this.secondParams.contactMobile.length !=11){
-						  this.$util.msg('联系方式格式不正确',2000);
-			                 return
-			          }
-			          if(this.secondParams.townId == ''|| this.secondParams.townId == undefined){
-						  this.$util.msg('请完善联系地址',2000);
-			                return
-			         }
-			           if(this.secondParams.address == ''){
-						  this.$util.msg('请填写详细地址',2000);
-			                return
-			         }
-			            if(this.GoodsImagesList ==''){
-						    this.$util.msg('请上传图片',2000);
-			                return;
-			            }
-			         if(this.checkbox==false){
-						   this.$util.msg('请勾选已阅读',2000);
-			                return
-			         }
-			         console.log(this.secondParams)
-					 this.SecondService.SecondHandProduct(this.secondParams).then(res=>{ //提交发布
-			             if (res.code==0){
-			               this.vShow_secondBj = true;
-			               this.playid= res.data;
-			             }else{
-			                  this.$util.msg(res.msg,2000)
-			                 this.secondBj = false;
-			                 return
-			             }
-			         })
-			        },
-			        quxiao:function(){
-			         this.vShow_secondBj = false;
-			        },
-			        gopay:function(){
-						this.$api.navigateTo(`/pages/user/order/order-payment?type=confirm&productID=${this.playid}`)
-			            this.vShow_secondBj = false;
-			        },
-			        changeBox:function () {
-						this.checkbox = !this.checkbox;
-			        },
-					
+			hanldOperationConfim(){
+				this.popupShow = true;
+			},
+			hidePopup(){
+				this.popupShow = false;
+			},
+			secondHandRidio(e) {
+				this.secondParams.secondHandType = e.target.value;
+				if (e.target.value == 1){
+					this.isShow = true;
+				}else {
+					this.isShow = false;
+				}
+			},
+			secondHandType(e){ //二手仪器
+				this.secondParams.instrumentType = e.target.value.toString();
+			},
+			Detailed(){
+			this.vShow_detailTalkFlag = !this.vShow_detailTalkFlag;
+			 if(this.vShow_detailTalkFlag){
+				 this.secondParams.detailTalkFlag = 2 ;//启用价格详聊
+			  }else {
+				this.secondParams.detailTalkFlag = 1 ;//不启用价格详聊
+			  }
+			},
+			 uploadGoodsImagesFn(event){//上传商品图片
+					uploadFileImage().then(res =>{
+						 this.GoodsImagesList.push(JSON.parse(res.data).data);
+						 this.secondParams.image1 =this.GoodsImagesList.toString()+',';
+					})
+			},
+			 removeGoodsImagesFn(index){//删除商品图片
+				this.GoodsImagesList.splice(index,1);
+				this.secondParams.image1 =this.GoodsImagesList.toString()+',';
+			 },
+			getProductType(e){
+			  this.secondParams.secondProductType = e.target.value ;
+			},
+			submitBtn () {
+			  if(this.secondParams.secondHandType == ''){
+					this.$util.msg('请选择分类',2000);
+					return;
+				}
+				if(this.secondParams.secondHandType == 1 ){
+				   if(this.secondParams.instrumentType ==''){
+					this.$util.msg('请完善仪器分类',2000);
+					return;
+					}
+				}
+		     if(this.secondParams.brandID == ''){
+					this.$util.msg('请选择商品品牌',2000);
+		            return;
+		        }
+			 if(this.secondParams.name == ''){
+				  this.$util.msg('请输入商品名称',2000);
+					return
+			 }
+			 if(this.secondParams.secondHandType ==2) {
+			 if (this.secondParams.normalPrice == '') {
+					 this.$util.msg('请输入市场价',2000);
+					 return
+				 }
+				 if (this.secondParams.maturityYears == '') {
+					 this.$util.msg('请输入产品到期日',2000);
+					 return
+				 }
+			 }
+			 if(this.secondParams.price1 == ''){
+					  this.$util.msg('请输入交易价',2000);
+						return
+				 }
+			 if(this.secondParams.secondHandType ==2){
+				 if(this.secondParams.originalPrice == ''){
+				  this.$util.msg('请输入采购价/原价',2000);
+					return
+			   }
+			 if(this.secondParams.stock == ''){
+				  this.$util.msg('请输入数量',2000);
+					return
+				}
+			 }
+			 if(this.secondParams.productQuality == ''){
+				  this.$util.msg('请输入商品成色',2000);
+					return
+			 }
+			  if(this.secondParams.contactName == ''){
+				  this.$util.msg('请输入联系人姓名',2000);
+					return
+			 }
+			  if(this.secondParams.contactMobile == ''){
+				  console.log(this.secondParams.contactMobile)
+				  this.$util.msg('请输入联系方式',2000);
+					return
+			 }
+			 if(this.secondParams.contactMobile.length !=11){
+				  this.$util.msg('联系方式格式不正确',2000);
+					 return
+			  }
+			  if(this.secondParams.townId == ''|| this.secondParams.townId == undefined){
+				  this.$util.msg('请完善联系地址',2000);
+					return
+			 }
+			   if(this.secondParams.address == ''){
+				  this.$util.msg('请填写详细地址',2000);
+					return
+			 }
+				if(this.GoodsImagesList =='https://admin-b.caimei365.com/userfiles/1/images/photo/2020/11/secondbg.jpg'){
+					this.$util.msg('请上传图片',2000);
+					return;
+				}
+			 if(this.checkbox==false){
+				   this.$util.msg('请勾选已阅读',2000);
+					return
+			 }
+			 console.log(this.secondParams)
+			 this.SecondService.SecondHandProduct(this.secondParams).then(res=>{ //提交发布
+				 if (res.code==0){
+				   this.vShow_secondBj = true;
+				   this.playid= res.data;
+				 }else{
+					  this.$util.msg(res.msg,2000)
+					 this.secondBj = false;
+					 return
+				 }
+			 })
+			},
+			quxiao:function(){
+			 this.vShow_secondBj = false;
+			},
+			gopay:function(){
+				this.$api.navigateTo(`/pages/user/order/order-payment?type=confirm&productID=${this.playid}`)
+				this.vShow_secondBj = false;
+			},
+			changeBox:function () {
+				this.checkbox = !this.checkbox;
+			},
 		},
-		 created(){
-		    },
+		created(){
+			 this.SecondService.brandList().then(res =>{//品牌列表
+						if(res.code == 0){
+						   this.BrandList = res.data;
+						}
+					})
+			},
 	}
 </script>
 
@@ -466,25 +474,24 @@
 	    .my-maintenance{padding: 20rpx;} 
 		.bannerimg {height: 66rpx;width: 100%;}
 	    .bannerimg  image{width: 100%;height: 100% ;}
-		.newsTitle {line-height: 48rpx;text-align: left;color: #e15616;padding:20rpx;background-color: rgba(225, 86, 22, .1);font-size: 28rpx;}
-		.secondradio view{display: inline-block;color: #333333;padding: 0 20rpx;}
+		.newsTitle {line-height: 48rpx;text-align: left;color: #e15616;padding:20rpx;background-color: rgba(225, 86, 22, .1);}
+		.nestext{font-size: 24rpx;}
+		.secondradio view{display: inline-block;color: #333333;margin-right: 21rpx}
 		.secondradio{display: inline-block;margin-left: 40rpx;}	
-		.Secondary{width: 100%;text-align: center;margin: 0;}
+		.Secondary{margin-left: 161rpx;}
 		.secondradio view.active {color: #e15616;}
-		.label .red{color: #f94b4b;}
-		input[type="text"]::placeholder, textarea::placeholder {color: #b2b2b2;}
+		input[type="text"]::placeholder{color: #b2b2b2;}
+		textarea::placeholder{color: #b2b2b2;}
 		input[type="text"]{line-height: 90rpx;overflow: unset;}
-		.row label.iconfont{margin-right: 10rpx;}
-		.icon-weixuanze{color: #b2b2b2;}
 		.linqi_text { width: 100%; height: 68rpx;background-color: #1890f9;box-shadow: 0rpx 4rpx 6rpx 0rpx rgba(24, 144, 249, 0.17);text-align: center;
 		    line-height: 68rpx;color: #ffffff;margin: auto;font-size:24rpx;position: relative;}
 		.jiaobiao {width: 0;height: 0;border-left: 20rpx solid transparent;border-right: 20rpx solid transparent;top: -30%;
-		    right: 48%;border-bottom: 20rpx solid #1890f9;position: absolute;}
-		.label{color: #666666;display: inline-block;idth: 120rpx;}
+		    right: 40%;border-bottom: 20rpx solid #1890f9;position: absolute;}
+		.label{color: #666666;display: inline-block;width: 120rpx;}
 		.row{border-bottom: 2rpx solid #e1e1e1;line-height: 90rpx;height: 90rpx;}
-		.row.fenlei{height: auto;}
+		.row.fenlei{height: auto;margin: 10rpx 0;border: 0}
 		.select {position: relative;color: #9aa5b5;text-align: left;user-select: none;}
-		.row .spacing{display: inline-block;margin-left: 60rpx;width: 68%;vertical-align:middle;position: relative}
+		.row .spacing{display: inline-block;margin-left: 50rpx;width: 75%;vertical-align:middle;position: relative}
 		.select .placeholder {position: relative;cursor: pointer;width: 100%;display: inline-block;}
 		.icon-xiayibu{right: 0rpx;;color: #b2b2b2;position: absolute}
 		.xiangliao{font-size: 26rpx;margin-right: 10rpx;color: #b2b2b2}
@@ -494,6 +501,12 @@
 		.border-grey{width: 100%;resize: none;padding: 20rpx 0;height: 160rpx;border-bottom: 2rpx solid #e1e1e1;}
 		.release-main-container {overflow: hidden;margin: 20rpx 0}
 		.uploadGoodsImages{display: flex;overflow-x: auto;overflow-y: hidden;}
+		.secondradio{
+			.row-radio{
+				transform: scale(.8);
+			}
+			.row-input{margin-right: 10rpx;}
+		}
 		.upload-file {
 		    position: relative;
 		    float: left;
@@ -673,5 +686,71 @@
 			width: 50rpx;
 		}
 		.form-upload-tips:hover .wen-tips {display: block;}
-			
+		.tui-popup-box {
+			z-index: 22;
+			width: 702rpx;
+			padding: 24rpx 24rpx 36rpx 24rpx;
+			height: 670rpx;
+			position: relative;
+			.icon-iconfontguanbi{
+				font-size: 40rpx;
+				color: #b2b2b2;
+				width: 60rpx;
+				float: right;
+				display: block;
+			}
+			.content{
+				.freight-radio{
+					height: 66rpx;
+					line-height: 66rpx;
+					padding: 0 35rpx;
+					.row-group{
+						width: 100%;
+						max-height: 605rpx;
+						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: #666666;
+						float: left;
+					}
+				}
+			}
+			}
+			checkbox .wx-checkbox-input{
+			  border-radius: 50%;
+			}
+			.row-check{
+				 transform: scale(0.8);
+			}
+			checkbox .wx-checkbox-input.wx-checkbox-input-checked{
+			  background: #E15616;
+			  border: 2rpx solid #e15616;
+			}
+			checkbox .wx-checkbox-input.wx-checkbox-input-checked::before{
+			  border-radius: 50%;
+			  border: 2rpx solid #e15616;
+			  width: 34rpx;
+			  height: 34rpx;
+			  line-height: 34rpx;
+			  text-align: center;
+			  font-size:34rpx; 
+			  color:#fff;
+			  background: transparent;
+			  transform:translate(-50%, -50%) scale(.8);
+			  -webkit-transform:translate(-50%, -50%) scale(.8);
+			}
 </style>

second/pages/product/product-list.vue

@@ -7,7 +7,7 @@
 						   type="text" 
 						   :focus="isFocus"
 						   confirm-type="search" 
-						   v-model="searchKeyword" 
+						   v-model="name" 
 						   placeholder="请输入商品关键词" 
 						   @input="onShowClose" 
 						   @confirm="searchOpertor"
@@ -15,26 +15,27 @@
 				<text class="iconfont icon-shanchu1" v-if="isShowClose" @click="delInputText"></text>
 			</view>
 		</view>
-		<view class="ListImg">
+		<view class="ListImg" v-if="searchHide">
 			<image src="https://admin-b.caimei365.com/userfiles/1/images/photo/2020/11/banner.png" class="banner-img"></image>
 		</view>
-		<view class="main-content">
+		<view class="main-content" v-if="searchHide">
 			<ul class="secondTitle">
 				<li class="ClassA mIcon off" @click="handle('1')" :class="currentId == '1' ? 'active':''">
 					{{ tabTitleName }}
-					<span class="line" v-if="currentId == '1'"></span>
+					<text class="iconfont" :class="mainflag?'icon-xiangxiajiantou':'icon-xiangshangjiantou'"></text>
+					<label class="line" v-if="currentId == '1'"></label>
 				</li>
 				<li class="ClassA" @click="handle('2')" :class="[currentId == '2' ? 'active':'',currentId == '2' ? 'off':'']">
 					临期产品
-					<span class="line" v-if="currentId == '2'"></span>
+					<label class="line" v-if="currentId == '2'"></label>
 				</li>
 				<li class="ClassA" @click="handle('3')" :class="[currentId == '3' ? 'active':'',currentId == '3' ? 'off':'']">
 					其他
-					<span class="line" v-if="currentId == '3'"></span>
+					<label class="line" v-if="currentId == '3'"></label>
 				</li>
 			</ul>
 		</view>
-		<ul class="mainTab" v-if="mainflag">
+		<ul class="mainTab" v-if="mainflag" v-show="searchHide">
 			 <li v-for="(item,index) in tabList" @click='handleChild(item)' :key="index" :class="currentID2 ==index?'addstyle':' '">{{item.name}}</li>
 		</ul>
 		<view class="shopList" :style="{'overflow':(showSkeleton? 'hidden' : 'auto'),'height': (showSkeleton? windowHeight + 'px' : 'auto')}">
@@ -122,10 +123,11 @@
 							{value:'2',name:'重光电'},
 							{value:'3',name:'耗材配件'},
 				   ],
-			    listQuery:{
+			    // listQuery:{
 						pageNum:1,
 						pageSize:10,
-					},   
+						name:'',
+					// },   
 			  tabchildList:[],
 			  productsList:[],
 			  tabchild:{},
@@ -137,11 +139,11 @@
 			 pullFlag: true,
 			 isFocus:false,
 			 isShowEmpty: false,
-			 searchKeyword:'',//搜索关键字
 			 isShowEmptyText: '搜索相关商品',
 			 showSkeleton:true,
 			 windowHeight: '',
 			 scrollHeight: '',
+			 searchHide:true,
 			}
 		},
 		created() {
@@ -168,7 +170,7 @@
 				   const _this = this;
 				   _this.currentId = index;
 				   _this.tabTitleName = '二手仪器';
-				   this.listQuery.pageNum = 1
+				   this.pageNum = 1
 				   if ( _this.currentId == '1'){
 						_this.mainflag = true;
 				   }else {
@@ -198,26 +200,40 @@
 				this.isModallayer = false;
 			},
 			gettabList:function (loadMore) {
-			                const _this = this;
 							this.showLoading = true;
 							this.loadingNow = true;
 							this.loadingText = '加载中';
 							this.isShowEmpty = false;				
-							if(loadMore) {this.listQuery.pageNum += 1;}
-			                const params = Object.assign({secondHandType: _this.currentId,instrumentType:_this.currentID2}, _this.listQuery);
+							// if(loadMore) {this.listQuery.pageNum += 1;}
+							if(loadMore) {this.pageNum += 1;}
+			                // const params = Object.assign({secondHandType: _this.currentId,instrumentType:_this.currentID2}, _this.listQuery);
+							let params = {
+									secondHandType:this.currentId,
+									instrumentType:this.currentID2,
+									name:this.name,
+									pageNum:this.pageNum,
+									pageSize:this.pageSize
+							}
 						this.SecondService.SeconHandProductList(params).then(res =>{
 			                     if (res.code == 0) {
 			                           const data = res.data;
 			                           if(data.results.length == 0){
-			                               _this.tabchildList = [];
-			                               _this.showflag = true;
-			                               _this.listRecord = data.totalRecord;
+			                               this.tabchildList = [];
+			                               this.showflag = true;
+			                               this.listRecord = data.totalRecord;
 			                           }else {
-			                               _this.showflag = false;
-			                               _this.isShow = true;
-			                               _this.hasNextPage = data.hasNextPage;
-			                               _this.listRecord = data.totalRecord;
-										   _this.tabchildList = data.results;
+			                               this.showflag = false;
+			                               this.isShow = true;
+										   let results = data.results;
+										   if(loadMore) {
+										   	this.tabchildList = [...this.tabchildList,...results];
+										   } else {
+										   	this.tabchildList = [...results];
+										   	this.showSkeleton = false;
+										   }
+			                               this.hasNextPage = data.hasNextPage;
+			                               this.listRecord = data.totalRecord;
+										  
 			                           }
 									   // 防上拉暴滑
 									   this.pullFlag = false;
@@ -233,27 +249,42 @@
 			                         }else{
 			                            this.$util.msg(error.msg,2000);
 			                         }
-			                    _this.requestFlag = true;
+			                    this.requestFlag = true;
 			                })
 			          },	
 			  onShowClose () {//输入框失去焦点时触发
-				if(this.searchKeyword != ''){
-					this.isShowClose = true
+				if(this.name != ''){
+					this.isShowClose = true;
 				}else{					
 					this.isShowClose = false
 				}
 			  },
+			  delInputText(){//清除输入框内容
+			  	this.name = '';
+			  	this.tabchildList =[];
+			  	this.isFocus = true
+			  	this.isShowClose = false;
+			  	this.loadingNow = false;
+			  	this.isShowEmpty = true;
+			  	this.secondHandType = 1;
+			  	this.instrumentType='';
+			  	this.gettabList();
+				this.searchHide = true;
+			  },
 			  searchOpertor(){//搜索商品
-				if(this.searchKeyword == ''){
+				if(this.name == ''){
 					this.$util.msg('请输入商品关键词',2000)
 					this.secondHandType = 1
 					this.instrumentType=''
 					// this.gettabList();
+					this.searchHide = true;
 				}else{
-					this.listQuery.pageNum = 1
+					this.pageNum = 1
 					this.showSkeleton = true;
 					this.gettabList();
-					this.isFocus = false
+					this.isFocus = false;
+					this.searchHide = false;
+					
 				}
 			  },
 				},
@@ -261,7 +292,10 @@
 	}
 </script>
 <style lang="scss">
-	
+	.ClassA .iconfont{
+		position: absolute;
+		right: 20rpx;
+	}
 	.warp-container{
 		width: 100%;
 		height: 100%;

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;
 			}
 		}

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'