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

# Conflicts:
#	components/cm-module/orderDetails/orderButton.vue

components/cm-module/orderDetails/orderButton.vue

@@ -8,7 +8,7 @@
 				<view class="tips" v-if="shareCode">分享码：{{shareCode}}</view>
 				分享订单
 			</view>
-			<view class="btn btn-confirm" v-if="btnState.isConfirmation" @click.stop="btnConfirm('confirmation',order)">确认订单</view>
+			<view class="btn btn-pay" v-if="btnState.isConfirmation" @click.stop="btnConfirm('confirmation',order)">确认订单</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>
 			<view class="btn btn-query" v-if="btnState.isQuery" @click.stop="btnConfirm('query',order)">查看物流</view>
@@ -189,19 +189,6 @@
 					}
 				}
 			}
-			.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:#ff7a51;
 				border-color:#ff7a51;

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"  v-if="secondHandOrderFlag!=1"  @click.stop="btnConfirm('again',order)">再来一单</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">
@@ -36,6 +36,9 @@
 			},
 			serviceProviderId:{
 				type:Number
+			},
+			secondHandOrderFlag:{
+				type:String
 			}
 		},
 		watch:{

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" v-if="secondHandOrderFlag!=1"  @click.stop="btnConfirm('again',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>
@@ -26,6 +26,9 @@
 			},
 			serviceProviderId:{
 				type:Number
+			},
+			secondHandOrderFlag:{
+				type:String
 			}
 		},
 		data() {

pages/user/order/order-details.vue

@@ -22,7 +22,7 @@
 			<payment-record ref="payment" v-if="isRequest" :discernReceiptList="discernReceiptList" :receiptAmount="receiptAmount"></payment-record>
 			<!-- 退款记录 -->
 			<refund-record ref="refund" v-if="isRequest" :returnedPurchaseList="returnedPurchaseList" :returnedPurchaseFee="returnedPurchaseFee"></refund-record>
-			<view class="clause" @tap.stop="openclauseConten(clauseData.id)" :class="clauseData.name=='无条款'?'noclick':''">
+			<view class="clause" v-if="information.secondHandOrderFlag!=1" @tap.stop="openclauseConten(clauseData.id)" :class="clauseData.name=='无条款'?'noclick':''">
 				售后条款：<label class="text" :class="clauseData.name=='无条款'?'color-bg':''">{{clauseData.name}}</label>
 			</view>
 			<!-- 底部button -->

pages/user/order/order-list.vue

@@ -37,7 +37,8 @@
 										<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" @click="goShophome(shop.shopID)">{{shop.shopName}}<label class="iconfont icon-jinrudianpu"></label></view>
+										<view class="title-text" v-if="order.secondHandOrderFlag==1">{{shop.shopName}}</view>
+										<view class="title-text tui-skeleton-fillet" v-else @click="goShophome(shop.shopID)">{{shop.shopName}}<label class="iconfont icon-jinrudianpu"></label></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">

seller/pages/order/order-details.vue

@@ -36,6 +36,7 @@
 						  :ableUserMoney = "ableUserMoney"
 						  :shareCode= "shareCode"
 						  :serviceProviderId = "serviceProviderId"
+						  :secondHandOrderFlag = "information.secondHandOrderFlag"
 						   @buttonConfirm="handButtonConfirm">
 			</order-button>
 		</view>
@@ -200,7 +201,7 @@
 					this.ableUserMoney = resData.ableUserMoney
 					this.clauseData = resData.clause
 					if(this.clauseData && this.clauseData.name.length>10){
-						this.clauseData.name = clauseData.name.substr(0,10)+'...'
+						this.clauseData.name = this.clauseData.name.substr(0,10)+'...'
 					}
 				}).catch(error =>{
 					this.$util.modal('提示','订单查询失败，请稍后重试~','确定','',false,() =>{

seller/pages/order/order-list.vue

@@ -94,6 +94,7 @@
 											  :orderID="order.orderID" 
 											  :userID = "order.userID"
 											  :serviceProviderId = "serviceProviderId"
+											  :secondHandOrderFlag = "order.secondHandOrderFlag"
 											  @buttonConfirm="handButtonConfirm">
 								</order-button>
 							</view>