test

components/cm-module/orderDetails/goodsList.vue

@@ -33,14 +33,14 @@
 							<view class="view-num">已退货/已取消</view>
 							<view class="view-right">{{pros.returnedNum}}/{{pros.actualCancelNum}}</view>
 						</view>
-						<view class="product-view">
-							<view class="view-num">税率</view>
-							<view class="view-right">{{pros.taxRate}}%</view>
-						</view>
 						<view class="product-view">
 							<view class="view-num">折扣</view>
 							<view class="view-right">{{pros.discount == null ? '0' : pros.discount}}%</view>
 						</view>
+						<view class="product-view">
+							<view class="view-num">税率</view>
+							<view class="view-right">{{pros.taxRate}}%</view>
+						</view>
 						<view class="product-view">
 							<view class="view-num">折后单价</view>
 							<view class="view-right">￥{{pros.discountPrice | NumFormat}}</view>

components/cm-module/orderDetails/orderInformation.vue

@@ -4,10 +4,7 @@
 		 <view class="information-content">
 			<view class="information-view title">
 				<view class="view-num">
-					<!-- <text class="bage-buss" v-if="orderData.orderSubmitType == 3 || orderData.orderSubmitType == 4">协销</text>
-					<text class="bage-auto" v-if="orderData.orderSubmitType == 0 || orderData.orderSubmitType == 1 ||orderData.orderSubmitType == 2">自主</text> -->
-					<text class="bage-text">订单编号：<label class="label">{{orderData.orderNo =='undefined' ? '' : orderData.orderNo}}</label></text>
-					<!-- <image class="bage-icon" src="http://static-b.caimei365.com/app/img/icon/icon-type@3x.png" mode="widthFix" v-if="orderData.secondHandOrderFlag == 1"></image> -->
+					<view class="bage-text">订单编号：<label class="label">{{orderData.orderNo =='undefined' ? '' : orderData.orderNo}}</label></view>
 				</view>
 			</view>
 			<view class="information-view same">

seller/pages/order/order-details.vue

@@ -25,7 +25,7 @@
 			<!-- 退款记录 -->
 			<refund-record ref="refund" v-if="isRequest" :returnedPurchaseList="returnedPurchaseList" :returnedPurchaseFee="returnedPurchaseFee"></refund-record>
 			<view class="clause" @click="openclauseConten(clauseData.id)" :class="clauseData.name=='无条款'?'noclick':''">
-				售后条款：<label class="text" :class="clauseData.name=='无条款'?'color-bg':''">{{clauseData.name.length>10?clauseData.name.substr(0,10)+'...':clauseData.name}}</label>
+				售后条款：<label class="text" :class="clauseData.name=='无条款'?'color-bg':''">{{clauseData.name}}</label>
 			</view>
 			<!-- 底部button -->
 			<order-button ref="orderButton" 
@@ -195,6 +195,9 @@
 					this.returnedPurchaseFee = resData.order.returnedPurchaseFee
 					this.ableUserMoney = resData.ableUserMoney
 					this.clauseData = resData.clause
+					if(clauseData.name.length>10){
+						clauseData.name = clauseData.name.substr(0,10)+'...'
+					}
 				}).catch(error =>{
 					this.$util.modal('提示','订单查询失败，请稍后重试~','确定','',false,() =>{
 						this.$api.switchTabTo('/seller/pages/index/index')