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

# Conflicts:
#	seller/pages/order/order-details.vue

components/cm-module/creatOrder/sellerRegulations.vue

@@ -169,7 +169,7 @@
 			line-height: 66rpx;
 			width: 100%;
 			display: block;
-			&:nth-of-type(1){
+			.row-text:nth-child(1){
 				color: #666666;
 				pointer-events: none;
 			}

components/cm-module/orderDetails/goodsList.vue

@@ -7,7 +7,8 @@
 					<view v-if="item.shopPromotion" class="floor-item-act">
 						<view class="floor-tags" @click.stop="clickPopupShow(item.shopPromotion)">{{item.shopPromotion.name}}</view>	
 					</view>
-					<view class="title-text"  @click="goShophome(item.shopID)">{{item.shopName}}<label class="iconfont icon-jinrudianpu"></label></view> 
+					<view class="title-text" v-if="secondHandOrderFlag==1">{{item.shopName}}</view>
+					<view class="title-text" v-else @click="goShophome(item.shopID)">{{item.shopName}}<label class="iconfont icon-jinrudianpu"></label></view> 
 				</view>
 				<view class="productlist" v-for="(pros,idx) in item.orderProductList" :key="idx">
 					<view class="goods-pros-t " @click="details(pros.productID)">
@@ -90,6 +91,9 @@
 		props:{
 			shopOrderData:{
 				type:Array
+			},
+			secondHandOrderFlag:{
+				type:String
 			}
 		},
 		data() {

seller/pages/order/create-order.vue

@@ -54,7 +54,7 @@
 		</seller-regulations>
 		<regula-alert v-if="isregulaTip" ref="csPhone"></regula-alert>
 		<!-- 返佣订单 -->
-		<view class="Rebate" @click="RebateChang" v-if="productsList.length==1">
+		<view class="Rebate" @click="RebateChang" v-if="goodsData.length==1">
 			<text class="rebate-title">返佣订单</text>
 			<text class="iconfont" :class="rebatecheck?'icon-yixuanze':'icon-weixuanze'" ></text>
 		</view>

seller/pages/order/order-details.vue

@@ -13,7 +13,7 @@
 			<!-- 地址选择 -->
 			<order-address ref="orderAddress" v-if="isRequest" :addressData="addressData"></order-address>
 			<!-- 商品 -->
-			<goods-list ref='goods' v-if="isRequest" :shopOrderData="shopOrderData" @popupClick="hanldePopupFn"></goods-list>
+			<goods-list ref='goods' v-if="isRequest" :shopOrderData="shopOrderData" :secondHandOrderFlag="information.secondHandOrderFlag" @popupClick="hanldePopupFn"></goods-list>
 			<!-- 订单信息 -->
 			<order-information ref="information" v-if="isRequest" :information="information"></order-information>
 			<!-- 发票信息 -->
@@ -24,7 +24,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" @click="openclauseConten(clauseData.id)" :class="clauseData.name=='无条款'?'noclick':''">
+			<view class="clause" v-if="information.secondHandOrderFlag!=1" @click="openclauseConten(clauseData.id)" :class="clauseData.name=='无条款'?'noclick':''">
 				售后条款：<label class="text" :class="clauseData.name=='无条款'?'color-bg':''">{{clauseData.name}}</label>
 			</view>
 			<!-- 底部button -->