test

components/cm-module/orderDetails/sellerDetaileButton.vue

@@ -2,7 +2,7 @@
 	<view class="button-template" :style="{paddingBottom :isIphoneX ? '68rpx' : '0rpx'}">
 		<!-- 底部按钮 -->
 		<view class="button-content">
-			<view class="btn btn-cancel"  @click.stop="btnConfirm('again',order)">再来一单</view>
+			<view class="btn btn-cancel"  @click.stop="btnagainConfirm('again',order,serviceProviderId)">再来一单</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-cancel" @click.stop="onShareCode">
@@ -33,6 +33,9 @@
 			},
 			shareCode:{
 				type:String
+			},
+			serviceProviderId:{
+				type:Number
 			}
 		},
 		watch:{
@@ -125,7 +128,15 @@
 						order:order
 					}
 				this.$emit('buttonConfirm',data)
-			}
+			},
+			btnagainConfirm(type,id,serviceid){
+				let data = {
+					type:type,
+					orderId:id,
+					serviceProviderId:serviceid,
+				}
+				this.$emit('buttonConfirm',data)
+			},
 		}
 	}
 </script>

components/cm-module/orderDetails/sellerOrderButton.vue

@@ -4,7 +4,7 @@
 		<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-cancel"  @click.stop="btnConfirm('again',orderID)">再来一单</view>
+			<view class="btn btn-cancel"  @click.stop="btnagainConfirm('again',orderID,serviceProviderId)">再来一单</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>
@@ -23,6 +23,9 @@
 			},
 			userID:{
 				type:Number
+			},
+			serviceProviderId:{
+				type:Number
 			}
 		},
 		data() {
@@ -92,9 +95,17 @@
 			btnConfirm(type,id){
 				let data = {
 						type:type,
-						orderId:id
+						orderId:id,
 					}
 				this.$emit('buttonConfirm',data)
+			},
+			btnagainConfirm(type,id,serviceid){
+				let data = {
+					type:type,
+					orderId:id,
+					serviceProviderId:serviceid,
+				}
+				this.$emit('buttonConfirm',data)
 			}
 		}
 	}

pages.json

@@ -252,6 +252,11 @@
 			"style": {
 				"navigationBarTitleText": "搜索"
 			}
+		},{
+			"path": "pages/search/search-second",
+			"style": {
+				"navigationBarTitleText": "搜索"
+			}
 		},{
 			"path": "pages/login/register",
 			"style": {

second/pages/product/product-list.vue

@@ -1,12 +1,11 @@
 <template name="secondList">
 	<view class="container">
 		<view class="good-search-top">
-			<view class="search-from name">
+			<view class="search-from name" @click="this.$api.navigateTo(clickPath)">
 				<text class="iconfont icon-iconfonticonfontsousuo1"></text>
 					<input class="input"  
 						   type="text" 
 						   :focus="isFocus"
-						   confirm-type="search" 
 						   v-model="name" 
 						   placeholder="请输入商品关键词" 
 						   @input="onShowClose" 
@@ -104,6 +103,7 @@
 		},
 		data(){
 			return{
+				clickPath:'/pages/search/search-second',
 				 isShowClose:false,
 				 isModallayer:false,
 				 currentId:1,

seller/pages/address/address.vue

@@ -284,7 +284,7 @@
 		color: #FFFFFF;
 		text-align: center;
 		background: $btn-confirm;
-		border-radius: 14rpx;
+		border-radius: 45rpx;
 	}
 	.adds-btn{
 		width: 702rpx;

seller/pages/address/addressManage.vue

@@ -198,7 +198,7 @@
 	page{
 		height: auto;
 		background: $bg-color;
-		border-top: 1px solid #EBEBEB;
+		// border-top: 1px solid #EBEBEB;
 	}
 	.add-content{
 		width: 702rpx;
@@ -211,30 +211,35 @@
 			height: 88rpx;
 			padding:0 24rpx;
 			margin: 0 auto;
-			background: #F7F7F7;
-			border-radius: 14rpx;
+			// background: #F7F7F7;
+			// border-radius: 14rpx;
 			.input{
 				width: 100%;
 				height: 100%;
-				background: #F7F7F7;
+				// background: #F7F7F7;
 				font-size: $font-size-28;
 				line-height: 88rpx;
 				color: #333333;
+				border-bottom: 2rpx solid #e1e1e1;
+
 			}
 			&.b-b{
-				margin: 32rpx 0;
+				margin: 20rpx 0;
 			}
 		}
 	}
 	.icon-xiayibu{
 		font-size: 36rpx;
-		color: $text-color;
+		color: #b2b2b2;
+		position: absolute;
+		right: 0;
 	}
 	.text-textarea{
 		width: 654rpx;
-		height: 216rpx;
-		padding: 24rpx;
-		background: #F7F7F7;
+		height: 146rpx;
+		padding: 0 24rpx;
+		// background: #F7F7F7;
+		border-bottom: 2rpx solid #e1e1e1;
 		.textarea{
 			width: 100%;
 			height: 100%;
@@ -263,20 +268,20 @@
 		}
 	}
 	.add-btn{
-		width: 702rpx;
-		height: 88rpx;
+		width: 600rpx;
+		height: 90rpx;
 		font-size: $font-size-28;
-		line-height: 88rpx;
+		line-height: 90rpx;
 		color: #FFFFFF;
 		margin: 0 auto;
 		text-align: center;
 		background: $btn-confirm;
-		border-radius: 14rpx;
+		border-radius: 45rpx;
 		margin-top: 80rpx;
 	}
 	.add-btn.disabled{
 		background: #F8F8F8;
-		border-radius: 14rpx;
+		border-radius: 45rpx;
 	}
 </style>
 

seller/pages/order/order-details.vue

@@ -35,6 +35,7 @@
 						  :rechargeGoods = "rechargeGoods"
 						  :ableUserMoney = "ableUserMoney"
 						  :shareCode= "shareCode"
+						  :serviceProviderId = "serviceProviderId"
 						   @buttonConfirm="handButtonConfirm">
 			</order-button>
 		</view>
@@ -219,13 +220,13 @@
 						this.getOrderPaymentValidation(data)
 						break;
 					case 'again':
-						this.handOrderAgain(data.orderId);
+						this.handOrderAgain(data.orderId,data.serviceProviderId);
 						break		
 				}
 			},
-			handOrderAgain(id){
+			handOrderAgain(id,serviceid){
 				this.aganOrderID = id;
-				this.SellerService.SellerCreateOrderAgain({orderId:this.aganOrderID,confirmFlag:0}).then(res =>{
+				this.SellerService.SellerCreateOrderAgain({orderId:this.aganOrderID,serviceProviderId:serviceid,confirmFlag:0}).then(res =>{
 					if(res.code==0){
 						this.$api.setStorage('orderUserInfo',{clubID:res.data.clubId,againBuyProductIds:res.data.againBuyProductIds,userID:res.data.userId})
 						this.$api.navigateTo('/seller/pages/cart/cart');

seller/pages/order/order-list.vue

@@ -93,6 +93,7 @@
 											  :status="order.status" 
 											  :orderID="order.orderID" 
 											  :userID = "order.userID"
+											  :serviceProviderId = "serviceProviderId"
 											  @buttonConfirm="handButtonConfirm">
 								</order-button>
 							</view>
@@ -388,13 +389,13 @@
 						this.handOrderConfirm(data.orderId);
 						break
 					case 'again':
-						this.handOrderAgain(data.orderId);
+						this.handOrderAgain(data.orderId,data.serviceProviderId);
 						break	
 				}
 			},
-			handOrderAgain(id){
+			handOrderAgain(id,serviceid){
 				this.aganOrderID = id;
-				this.SellerService.SellerCreateOrderAgain({orderId:this.aganOrderID,confirmFlag:0}).then(res =>{
+				this.SellerService.SellerCreateOrderAgain({orderId:this.aganOrderID,serviceProviderId:serviceid,confirmFlag:0}).then(res =>{
 					if(res.code==0){
 						this.$api.setStorage('orderUserInfo',{clubID:res.data.clubId,againBuyProductIds:res.data.againBuyProductIds,userID:res.data.userId})
 						this.$api.navigateTo('/seller/pages/cart/cart');