订单模块修改

pages/seller/order/order-details.vue

@@ -1,19 +1,43 @@
 <template>
-	<view class="container details clearfix" :style="{paddingBottom :isIphoneX ? (130+68)+'rpx' : '130rpx'}">
+	<view class="container details clearfix" :style="{ paddingBottom: isIphoneX ? 130 + 68 + 'rpx' : '130rpx' }">
 		<!-- 自定义返回 -->
-		<header-back :systeminfo='systeminfo' :navbar-data='nvabarData' :headerBtnPosi ="headerBtnPosi" :isShare='isOrderShare'></header-back>
-		<view class="container-details" :style="{paddingTop:navbarHeight+'px'}">
+		<header-back
+			:systeminfo="systeminfo"
+			:navbar-data="nvabarData"
+			:headerBtnPosi="headerBtnPosi"
+			:isShare="isOrderShare"
+		></header-back>
+		<view class="container-details" :style="{ paddingTop: navbarHeight + 'px' }">
 			<view class="status-text">
 				<view class="view-type">{{ information.status | TextFormat }}</view>
-					<view class="Rebate " v-if="information.rebateFlag==1">返佣</view>
-					<text class="bage-buss btn" v-if="information.orderSubmitType == 3 || information.orderSubmitType == 4">协销</text>
-					<text class="bage-auto btn" v-if="information.orderSubmitType == 0 || information.orderSubmitType == 1 ||information.orderSubmitType == 2">自主</text>
-					
+				<view class="Rebate " v-if="information.rebateFlag == 1">返佣</view>
+				<text class="bage-buss btn" v-if="information.orderSubmitType == 3 || information.orderSubmitType == 4"
+					>协销</text
+				>
+				<text
+					class="bage-auto btn"
+					v-if="
+						information.orderSubmitType == 0 ||
+							information.orderSubmitType == 1 ||
+							information.orderSubmitType == 2
+					"
+					>自主</text
+				>
 			</view>
 			<!-- 地址选择 -->
-			<order-address ref="orderAddress" v-if="isRequest && !rechargeGoods" :addressData="addressData"></order-address>
+			<order-address
+				ref="orderAddress"
+				v-if="isRequest && !rechargeGoods"
+				:addressData="addressData"
+			></order-address>
 			<!-- 商品 -->
-			<goods-list ref='goods' v-if="isRequest" :shopOrderData="shopOrderData" :information="information" @popupClick="hanldePopupFn"></goods-list>
+			<goods-list
+				ref="goods"
+				v-if="isRequest"
+				:shopOrderData="shopOrderData"
+				:information="information"
+				@popupClick="hanldePopupFn"
+			></goods-list>
 			<!-- 订单信息 -->
 			<order-information ref="information" v-if="isRequest" :information="information"></order-information>
 			<!-- 发票信息 -->
@@ -21,35 +45,53 @@
 			<!-- 转账信息 -->
 			<!-- <transfe-record ref="transfe" v-if="isRequest"></transfe-record> -->
 			<!-- 支付记录 -->
-			<payment-record ref="payment" v-if="isRequest" :discernReceiptList="discernReceiptList" :receiptAmount="receiptAmount"></payment-record>
+			<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" v-if="information.secondHandOrderFlag!=1" @click="openclauseConten(clauseData.id)" :class="clauseData.name=='无条款'?'noclick':''">
-				售后条款：<label class="text" :class="clauseData.name=='无条款'?'color-bg':''">{{clauseData.name}}</label>
+			<refund-record
+				ref="refund"
+				v-if="isRequest"
+				:returnedPurchaseList="returnedPurchaseList"
+				:returnedPurchaseFee="returnedPurchaseFee"
+			></refund-record>
+			<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 -->
-			<order-button ref="orderButton" 
-						  v-if= "isRequest" 
-						  :status= "btnStatus" 
-						  :order="information" 
-						  :rechargeGoods = "rechargeGoods"
-						  :ableUserMoney = "ableUserMoney"
-						  :shareCode= "shareCode"
-						  :serviceProviderId = "serviceProviderId"
-						  :secondHandOrderFlag = "information.secondHandOrderFlag"
-						   @buttonConfirm="handButtonConfirm">
+			<order-button
+				ref="orderButton"
+				v-if="isRequest"
+				:status="btnStatus"
+				:order="information"
+				:rechargeGoods="rechargeGoods"
+				:ableUserMoney="ableUserMoney"
+				:shareCode="shareCode"
+				:serviceProviderId="serviceProviderId"
+				:secondHandOrderFlag="information.secondHandOrderFlag"
+				@buttonConfirm="handButtonConfirm"
+			>
 			</order-button>
 		</view>
 		<!-- 付款弹窗 -->
-		<order-model v-if="isPayModel" 
-					:payModelData="payModelData" 
-					:modelType='modelType' 
-					@paymentConfirm ='hanldPaymentConfirm'/>
-		<!-- 分享弹窗 -->			
-		<share-alert  :orderId="orderId" 
-					  v-if="isShareModal"  
-					  @shareConfirm ='onShareAppMessage'>
-		</share-alert>		
+		<order-model
+			v-if="isPayModel"
+			:payModelData="payModelData"
+			:modelType="modelType"
+			@paymentConfirm="hanldPaymentConfirm"
+		/>
+		<!-- 分享弹窗 -->
+		<share-alert :orderId="orderId" v-if="isShareModal" @shareConfirm="onShareAppMessage"> </share-alert>
 		<!-- 促销活动弹窗 -->
 		<activi-popup :Promotion="handlerPros" :popupShow="popupShow"></activi-popup>
 		<!-- 再来一单 -->
@@ -57,9 +99,9 @@
 			<view class="alertAgan">
 				<text class="title">{{ promptitle }}</text>
 				<view class="goods">
-					<view class="list" v-for="(item,index) in failList"  :key="index">
+					<view class="list" v-for="(item, index) in failList" :key="index">
 						<image class="image-left" :src="item.image"></image>
-						<view class="name-right">{{item.name}}</view>
+						<view class="name-right">{{ item.name }}</view>
 					</view>
 				</view>
 				<view class="BtnAll">
@@ -72,140 +114,143 @@
 </template>
 
 <script>
-	import headerBack from '@/components/cm-module/headerNavbar/header-back' 		 	 //自定义导航
-	import orderAddress from '@/components/cm-module/orderDetails/orderAddress' 		 //地址信息
-	import goodsList from '@/components/cm-module/orderDetails/goodsList'		 		 //商品列表
-	import invoiceTent from '@/components/cm-module/orderDetails/invoiceTent'	 		 //发票信息
-	import orderInformation from '@/components/cm-module/orderDetails/orderInformation' //订单信息
-	import transfeRecord from '@/components/cm-module/orderDetails/transfeRecord'		 //转账信息
-	import paymentRecord from '@/components/cm-module/orderDetails/paymentRecord'		 //支付记录
-	import refundRecord from '@/components/cm-module/orderDetails/refundRecord'		 //退款记录
-	import orderButton from '@/components/cm-module/orderDetails/sellerDetaileButton'	 //底部按钮
-	import shareAlert from '@/components/cm-module/modelAlert/sellerShareAlert.vue'			 //分享弹窗
-	import orderModel from '@/components/cm-module/modelAlert/order-alert'			 //付款弹窗
-	import activiPopup from '@/components/cm-module/orderDetails/activipopu'		//促销活动弹窗
-	
-	export default {
-		components:{
-			headerBack,
-			orderInformation,
-			orderAddress,
-			invoiceTent,
-			goodsList,
-			transfeRecord,
-			paymentRecord,
-			refundRecord,
-			orderButton,
-			shareAlert,
-			orderModel,
-			activiPopup
-		},
-		data() {
-			return {
-				nvabarData: {							 //顶部自定义导航
-					showCapsule: 1, // 是否显示左上角图标   1表示显示    0表示不显示
-					title: '订单详情', // 导航栏 中间的标题
-				},
-				state:0,
-				userId:'',
-				orderId:'',
-				clubUserId:0,
-				serviceProviderId:'',		//协销ID
-				shareCode:'',				//分享码
-				shareType:'',               //分享登录页过来记录的状态
-				cellPhone:'',				//客服电话
-				payStatus:0,
-				btnStatus:0,				//按钮组件状态
-				isRequest:false,			//是否加载完成渲染子组件
-				isOrderShare:false,
-				isShareModal:false,
-				isPayModel:false,
-				modelType:0,
-				ableUserMoney:'',			//机构余额
-				payModelData:{},
-				addressData:{},				//地址信息初始化
-				information:{},				//订单信息初始化
-				shopOrderData:{},			//商品信息初始化
-				orderInvoice:{},			//发票信息初始化
-				returnedPurchaseList:{},	//退款信息初始化
-				discernReceiptList:{},		//支付信息初始化
-				receiptAmount:0,			//支付金额
-				returnedPurchaseFee:0,		//退款金额
-				navbarHeight:'',
-				rechargeGoods:false,
-				headerBtnPosi:	this.setHeaderBtnPosi(), //获取设备顶部胶囊高度
-				systeminfo: this.setSysteminfo(),		 //获取设备信息
-				isIphoneX:this.$store.state.isIphoneX,
-				CustomBar:this.CustomBar,// 顶部导航栏高度
-				popupShow:false,
-				handlerPros:{},
-				clauseData:{},
-				showAgan:false,
-				failList:[],	// 再来一单可购买商品
-				promptitle:'',
-				aganOrderId:0	// 再来一单商品id
-			}
-		},
-		onLoad(option){
-			console.log(option)
-			this.shareType = option.type
-			this.orderId = option.orderId
-			this.clubUserId = option.userId
-			if(this.shareType ==='share'){
-				this.listType = 0
-				this.isOrderShare = true
-			}else if(option.type === 'confim' || option.type === 'search' || option.type === 'cash'){
-				this.listType = 0
-			}else{
-				this.listType = option.listType
-			}
-			this.getHeaderTopHeight()
-			this.initOrderDetaileData()
-		},
-		filters:{
-			NumFormat(value) {//处理金额
-				return Number(value).toFixed(2)
-			},
-			TextFormat(status) {//处理金额
-				let HtmlText,
-					typeTextObject={
-						0:'待确认',
-						4:'交易完成',
-						5:'订单完成',
-						6:'已关闭',
-						7:'交易全退',
-						77:'交易全退',
-						11:'待付款待发货',
-						12:'待付款部分发货',
-						13:'待付款已发货',
-						21:'部分付款待发货',
-						22:'部分付款部分发货',
-						23:'部分付款已发货',
-						31:'已付款待发货',
-						32:'已付款部分发货',
-						33:'已付款已发货',
-						111:'待付款待发货',
-					}
-				
-				Object.keys(typeTextObject).forEach(key => {
-					if(key == status){
-						HtmlText = typeTextObject[key]
-					}
-				})
-				return HtmlText
+import headerBack from '@/components/cm-module/headerNavbar/header-back' //自定义导航
+import orderAddress from '@/components/cm-module/orderDetails/orderAddress' //地址信息
+import goodsList from '@/components/cm-module/orderDetails/goodsList' //商品列表
+import invoiceTent from '@/components/cm-module/orderDetails/invoiceTent' //发票信息
+import orderInformation from '@/components/cm-module/orderDetails/orderInformation' //订单信息
+import transfeRecord from '@/components/cm-module/orderDetails/transfeRecord' //转账信息
+import paymentRecord from '@/components/cm-module/orderDetails/paymentRecord' //支付记录
+import refundRecord from '@/components/cm-module/orderDetails/refundRecord' //退款记录
+import orderButton from '@/components/cm-module/orderDetails/sellerDetaileButton' //底部按钮
+import shareAlert from '@/components/cm-module/modelAlert/sellerShareAlert.vue' //分享弹窗
+import orderModel from '@/components/cm-module/modelAlert/order-alert' //付款弹窗
+import activiPopup from '@/components/cm-module/orderDetails/activipopu' //促销活动弹窗
+
+export default {
+	components: {
+		headerBack,
+		orderInformation,
+		orderAddress,
+		invoiceTent,
+		goodsList,
+		transfeRecord,
+		paymentRecord,
+		refundRecord,
+		orderButton,
+		shareAlert,
+		orderModel,
+		activiPopup
+	},
+	data() {
+		return {
+			nvabarData: {
+				//顶部自定义导航
+				showCapsule: 1, // 是否显示左上角图标   1表示显示    0表示不显示
+				title: '订单详情' // 导航栏 中间的标题
 			},
+			state: 0,
+			userId: '',
+			orderId: '',
+			clubUserId: 0,
+			serviceProviderId: '', //协销ID
+			shareCode: '', //分享码
+			shareType: '', //分享登录页过来记录的状态
+			cellPhone: '', //客服电话
+			payStatus: 0,
+			btnStatus: 0, //按钮组件状态
+			isRequest: false, //是否加载完成渲染子组件
+			isOrderShare: false,
+			isShareModal: false,
+			isPayModel: false,
+			modelType: 0,
+			ableUserMoney: '', //机构余额
+			payModelData: {},
+			addressData: {}, //地址信息初始化
+			information: {}, //订单信息初始化
+			shopOrderData: {}, //商品信息初始化
+			orderInvoice: {}, //发票信息初始化
+			returnedPurchaseList: {}, //退款信息初始化
+			discernReceiptList: {}, //支付信息初始化
+			receiptAmount: 0, //支付金额
+			returnedPurchaseFee: 0, //退款金额
+			navbarHeight: '',
+			rechargeGoods: false,
+			headerBtnPosi: this.setHeaderBtnPosi(), //获取设备顶部胶囊高度
+			systeminfo: this.setSysteminfo(), //获取设备信息
+			isIphoneX: this.$store.state.isIphoneX,
+			CustomBar: this.CustomBar, // 顶部导航栏高度
+			popupShow: false,
+			handlerPros: {},
+			clauseData: {},
+			showAgan: false,
+			failList: [], // 再来一单可购买商品
+			promptitle: '',
+			aganOrderId: 0 // 再来一单商品id
+		}
+	},
+	onLoad(option) {
+		console.log(option)
+		this.shareType = option.type
+		this.orderId = option.orderId
+		this.clubUserId = option.userId
+		if (this.shareType === 'share') {
+			this.listType = 0
+			this.isOrderShare = true
+		} else if (option.type === 'confim' || option.type === 'search' || option.type === 'cash') {
+			this.listType = 0
+		} else {
+			this.listType = option.listType
+		}
+		this.getHeaderTopHeight()
+		this.initOrderDetaileData()
+	},
+	filters: {
+		NumFormat(value) {
+			//处理金额
+			return Number(value).toFixed(2)
 		},
-		methods: {
-			openclauseConten(id){
-				this.$api.navigateTo(`/pages/service/sellconten?clauseId=${id}`)
-			},
-			initOrderDetaileData(){//初始化页面数据@参数：订单ID
-				this.OrderService.QueryOrderDetails(
-					{ 
-						orderId : this.orderId ,
-						userId : this.clubUserId,
-					}
-				).then(response =>{
+		TextFormat(status) {
+			//处理金额
+			let HtmlText,
+				typeTextObject = {
+					0: '待确认',
+					4: '交易完成',
+					5: '订单完成',
+					6: '已关闭',
+					7: '交易全退',
+					77: '交易全退',
+					11: '待付款待发货',
+					12: '待付款部分发货',
+					13: '待付款已发货',
+					21: '部分付款待发货',
+					22: '部分付款部分发货',
+					23: '部分付款已发货',
+					31: '已付款待发货',
+					32: '已付款部分发货',
+					33: '已付款已发货',
+					111: '待付款待发货'
+				}
+
+			Object.keys(typeTextObject).forEach(key => {
+				if (key == status) {
+					HtmlText = typeTextObject[key]
+				}
+			})
+			return HtmlText
+		}
+	},
+	methods: {
+		openclauseConten(id) {
+			this.$api.navigateTo(`/pages/service/sellconten?clauseId=${id}`)
+		},
+		initOrderDetaileData() {
+			//初始化页面数据@参数：订单ID
+			this.OrderService.QueryOrderDetails({
+				orderId: this.orderId,
+				userId: this.clubUserId
+			})
+				.then(response => {
 					let data = response.data
 					this.isRequest = true
 					this.userId = data.order.userId
@@ -223,417 +268,447 @@
 					this.returnedPurchaseFee = data.order.returnedPurchaseFee
 					this.ableUserMoney = data.ableUserMoney
 					this.clauseData = data.clause
-					if(this.clauseData && this.clauseData.name.length>10){
-						this.clauseData.name = this.clauseData.name.substr(0,10)+'...'
+					if (this.clauseData && this.clauseData.name.length > 10) {
+						this.clauseData.name = this.clauseData.name.substr(0, 10) + '...'
 					}
-				}).catch(error =>{
-					this.$util.modal('提示','订单查询失败，请稍后重试~','确定','',false,() =>{
+				})
+				.catch(error => {
+					this.$util.modal('提示', '订单查询失败，请稍后重试~', '确定', '', false, () => {
 						this.$api.switchTabTo('/pages/seller/index/index')
 					})
 				})
-			},
-			handButtonConfirm(data){//监听点击时间的按钮类型并执行...
-				this.handShowAlert(data)
-			},
-			handShowAlert(data){//判断点击的按钮类型并执行...
-				switch(data.type){
-					case 'query':
-						this.isModalLayer = true
-						this.$api.navigateTo('/pages/user/order/order-logistics?orderId='+data.orderId)
-						break
-					case 'delete':
-						this.handOrderDetele()
-						break
-					case 'cancel':
-						this.handCenceConfirm()
-						break
-					case 'confirm':
-						this.handOrderConfirm(data)
-						break
-					case 'balance':
-						this.getOrderPaymentValidation(data)
-						break
-					case 'again':
-						this.handOrderAgain(data.orderId)
-						break		
-				}
-			},
-			handOrderAgain(orderId){
-				this.aganOrderId = orderId
-				this.SellerService.SellerCreateOrderAgain(
-					{
-						confirmFlag:0,	
-						orderId:this.aganOrderId,
-						serviceProviderId:this.serviceProviderId
-					}
-				).then(res =>{
-					if(res.code==0){
-						this.$api.setStorage('orderUserInfo',{clubID:res.data.clubId,againBuyProductIds:res.data.productIds,userID:res.data.userId})
+		},
+		handButtonConfirm(data) {
+			//监听点击时间的按钮类型并执行...
+			this.handShowAlert(data)
+		},
+		handShowAlert(data) {
+			//判断点击的按钮类型并执行...
+			switch (data.type) {
+				case 'query':
+					this.isModalLayer = true
+					this.$api.navigateTo('/pages/user/order/order-logistics?orderId=' + data.orderId)
+					break
+				case 'delete':
+					this.handOrderDetele()
+					break
+				case 'cancel':
+					this.handCenceConfirm()
+					break
+				case 'confirm':
+					this.handOrderConfirm(data)
+					break
+				case 'balance':
+					this.getOrderPaymentValidation(data)
+					break
+				case 'again':
+					this.handOrderAgain(data.orderId)
+					break
+			}
+		},
+		handOrderAgain(orderId) {
+			this.aganOrderId = orderId
+			this.SellerService.SellerCreateOrderAgain({
+				confirmFlag: 0,
+				orderId: this.aganOrderId,
+				serviceProviderId: this.serviceProviderId
+			})
+				.then(res => {
+					if (res.code == 0) {
+						this.$api.setStorage('orderUserInfo', {
+							clubID: res.data.clubId,
+							againBuyProductIds: res.data.productIds,
+							userID: res.data.userId
+						})
 						this.$api.navigateTo('/pages/seller/cart/cart')
 					}
-				}).catch(error =>{
-					if(error.code== -3){
+				})
+				.catch(error => {
+					if (error.code == -3) {
 						this.showAgan = true
 						this.promptitle = error.msg
 						this.failList = error.data
-					}else if(error.code== -2){
-						this.$util.modal('',error.msg,'确定','',false,() =>{})
-					}else{
-						this.$util.msg(error.msg,2000)
+					} else if (error.code == -2) {
+						this.$util.modal('', error.msg, '确定', '', false, () => {})
+					} else {
+						this.$util.msg(error.msg, 2000)
 					}
 				})
-			},
-			closeBtn(){//
-				this.showAgan = false
-			},
-			cancelBtn(){// 再来一单弹窗
-				this.SellerService.SellerCreateOrderAgain(
-					{
-						serviceProviderId:this.serviceProviderId,
-						orderId:this.aganOrderId,
-						confirmFlag:1,
-					}
-				).then(res =>{
-					if(res.code==0){
-						this.$api.navigateTo('/pages/seller/cart/cart')
-						this.showAgan = false
-					}
-				})
-			},
-			handOrderConfirm(data){//确认订单
-				this.$util.modal('提示','确认此订单？','确定','取消',true,() =>{
-					this.OrderService.AffirmOrder({orderId:this.orderId}).then(response =>{
-						this.$util.msg(response.msg,2000,true,'success')
+		},
+		closeBtn() {
+			//
+			this.showAgan = false
+		},
+		cancelBtn() {
+			// 再来一单弹窗
+			this.SellerService.SellerCreateOrderAgain({
+				serviceProviderId: this.serviceProviderId,
+				orderId: this.aganOrderId,
+				confirmFlag: 1
+			}).then(res => {
+				if (res.code == 0) {
+					this.$api.navigateTo('/pages/seller/cart/cart')
+					this.showAgan = false
+				}
+			})
+		},
+		handOrderConfirm(data) {
+			//确认订单
+			this.$util.modal('提示', '确认此订单？', '确定', '取消', true, () => {
+				this.OrderService.AffirmOrder({ orderId: this.orderId })
+					.then(response => {
+						this.$util.msg(response.msg, 2000, true, 'success')
 						this.initOrderDetaileData()
-					}).catch(error =>{
-						this.$util.msg(error.msg,2000)
 					})
-				})
-			},
-			hanldPaymentConfirm(data){//监听余额抵扣按钮
-				switch(data.type){
-					case 3:
-						this.OrderService.OrderBalanceDeduction({orderId:this.orderId}).then(response =>{
-							this.$util.msg('余额抵扣成功',2000)
+					.catch(error => {
+						this.$util.msg(error.msg, 2000)
+					})
+			})
+		},
+		hanldPaymentConfirm(data) {
+			//监听余额抵扣按钮
+			switch (data.type) {
+				case 3:
+					this.OrderService.OrderBalanceDeduction({ orderId: this.orderId })
+						.then(response => {
+							this.$util.msg('余额抵扣成功', 2000)
 							this.initOrderDetaileData()
-						}).catch(error =>{
-							this.$util.msg(error.msg,2000)
-						})	
-						break
-				}
-			},
-			getOrderPaymentValidation(data){//监听根据付款状态做操作
-				this.OrderService.OrderPaymentValidation({orderId:data.orderId}).then(response =>{
+						})
+						.catch(error => {
+							this.$util.msg(error.msg, 2000)
+						})
+					break
+			}
+		},
+		getOrderPaymentValidation(data) {
+			//监听根据付款状态做操作
+			this.OrderService.OrderPaymentValidation({ orderId: data.orderId })
+				.then(response => {
 					let dataCode = response.data.code
 					this.payModelData = response.data
-					if(dataCode == -1){
-						this.$util.modal('','订单已申请全部退款，无需再付款！','确定','',false,() =>{})
-					}else{
+					if (dataCode == -1) {
+						this.$util.modal('', '订单已申请全部退款，无需再付款！', '确定', '', false, () => {})
+					} else {
 						this.isPayModel = true
 						this.modelType = 3
 					}
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
-				})	
-			},
-			handOrderDetele(){//删除订单
-				this.$util.modal('提示','确认删除该订单吗？','确定','取消',true,() =>{
-					this.OrderService.DeleteOrder({orderId:this.orderId}).then(response =>{
-						this.$util.msg(response.msg,2000,true,'success')
+				})
+				.catch(error => {
+					this.$util.msg(error.msg, 2000)
+				})
+		},
+		handOrderDetele() {
+			//删除订单
+			this.$util.modal('提示', '确认删除该订单吗？', '确定', '取消', true, () => {
+				this.OrderService.DeleteOrder({ orderId: this.orderId })
+					.then(response => {
+						this.$util.msg(response.msg, 2000, true, 'success')
 						setTimeout(() => {
-							if(this.shareType ==='share'){
+							if (this.shareType === 'share') {
 								this.$api.navigateTo('/pages/seller/index/index')
-							}else{
-								this.$api.navigateTo(`/pages/seller/order/order-list?type=detele&listType=${this.listType}`)
+							} else {
+								this.$api.navigateTo(
+									`/pages/seller/order/order-list?type=detele&listType=${this.listType}`
+								)
 							}
-						},500)
-					}).catch(error =>{
-						this.$util.msg(error.msg,2000)
+						}, 500)
 					})
-				})
-			},
-			handCenceConfirm(){//取消订单
-				this.$util.modal('提示','确认取消该订单吗？','确定','取消',true,() =>{
-					this.OrderService.CancelOrder({orderId:this.orderId}).then(response =>{
-						this.$util.msg(response.msg,2000,true,'success')
+					.catch(error => {
+						this.$util.msg(error.msg, 2000)
+					})
+			})
+		},
+		handCenceConfirm() {
+			//取消订单
+			this.$util.modal('提示', '确认取消该订单吗？', '确定', '取消', true, () => {
+				this.OrderService.CancelOrder({ orderId: this.orderId })
+					.then(response => {
+						this.$util.msg(response.msg, 2000, true, 'success')
 						this.initOrderDetaileData()
-					}).catch(error =>{
-						this.$util.msg(error.msg,2000)
 					})
-				})
-			},
-			hanldePopupFn(data){//监听活动内容
-				this.popupShow = true
-				this.handlerPros = data
-			},
-			onShareAppMessage(res){//分享转发
-				this.isShareModal = false
-				if (res.from === 'button') {
-					// 来自页面内转发按钮
-			    }
-				return {
-					title: '您有新的订单，请点击查看~',
-					path: `/pages/user/order/order-sharelogin?orderId=${this.orderId}&userId=${this.userId}&serviceProviderId=${this.serviceProviderId}`,
-					imageUrl:'https://img.caimei365.com/group1/M00/03/95/Cmis216Sk_SABnOFABZCgCzFV_g063.png'
-				}
-			},
-			getHeaderTopHeight(){
-				let statusBarHeight = this.systeminfo.statusBarHeight // 状态栏高度
-				let headerPosi = this.headerBtnPosi
-				let btnPosi = { // 胶囊实际位置，坐标信息不是左上角原点
-				      height: headerPosi.height,
-				      width: headerPosi.width,
-				      // 胶囊top - 状态栏高度
-				      top: headerPosi.top - statusBarHeight,
-				      // 胶囊bottom - 胶囊height - 状态栏height （现胶囊bottom 为距离导航栏底部的长度）
-				      bottom: headerPosi.bottom - headerPosi.height - statusBarHeight,
-				      // 屏幕宽度 - 胶囊right
-				      right: this.systeminfo.screenWidth - headerPosi.right
-				}
-				this.navbarHeight= headerPosi.bottom + btnPosi.bottom// 原胶囊bottom + 现胶囊bottom
-			},
-			setHeaderBtnPosi(){
-				// 获得胶囊按钮位置信息
-				let headerBtnPosi = uni.getMenuButtonBoundingClientRect()
-				return headerBtnPosi
-			},
-			setSysteminfo(){
-				let systeminfo
-				uni.getSystemInfo({ // 获取设备信息
-					success: (res) => {
-						systeminfo = res
-					},
-				})
-				return systeminfo
-			},
+					.catch(error => {
+						this.$util.msg(error.msg, 2000)
+					})
+			})
+		},
+		hanldePopupFn(data) {
+			//监听活动内容
+			this.popupShow = true
+			this.handlerPros = data
 		},
-		onShow() {
-			this.$api.getStorage().then((resolve) =>{
-				this.serviceProviderId = resolve.serviceProviderId ? resolve.serviceProviderId : 0
+		onShareAppMessage(res) {
+			//分享转发
+			this.isShareModal = false
+			if (res.from === 'button') {
+				// 来自页面内转发按钮
+			}
+			return {
+				title: '您有新的订单，请点击查看~',
+				path: `/pages/user/order/order-sharelogin?orderId=${this.orderId}&userId=${
+					this.userId
+				}&serviceProviderId=${this.serviceProviderId}`,
+				imageUrl: 'https://img.caimei365.com/group1/M00/03/95/Cmis216Sk_SABnOFABZCgCzFV_g063.png'
+			}
+		},
+		getHeaderTopHeight() {
+			let statusBarHeight = this.systeminfo.statusBarHeight // 状态栏高度
+			let headerPosi = this.headerBtnPosi
+			let btnPosi = {
+				// 胶囊实际位置，坐标信息不是左上角原点
+				height: headerPosi.height,
+				width: headerPosi.width,
+				// 胶囊top - 状态栏高度
+				top: headerPosi.top - statusBarHeight,
+				// 胶囊bottom - 胶囊height - 状态栏height （现胶囊bottom 为距离导航栏底部的长度）
+				bottom: headerPosi.bottom - headerPosi.height - statusBarHeight,
+				// 屏幕宽度 - 胶囊right
+				right: this.systeminfo.screenWidth - headerPosi.right
+			}
+			this.navbarHeight = headerPosi.bottom + btnPosi.bottom // 原胶囊bottom + 现胶囊bottom
+		},
+		setHeaderBtnPosi() {
+			// 获得胶囊按钮位置信息
+			let headerBtnPosi = uni.getMenuButtonBoundingClientRect()
+			return headerBtnPosi
+		},
+		setSysteminfo() {
+			let systeminfo
+			uni.getSystemInfo({
+				// 获取设备信息
+				success: res => {
+					systeminfo = res
+				}
 			})
+			return systeminfo
 		}
+	},
+	onShow() {
+		this.$api.getStorage().then(resolve => {
+			this.serviceProviderId = resolve.serviceProviderId ? resolve.serviceProviderId : 0
+		})
 	}
+}
 </script>
 
 <style lang="scss">
-	page {
-		height: auto;
-		background:#F7F7F7;
-	}
-	.btn-hover{
-		background: #FFFFFF;
-	}
-	.animation{
-		/* transition: transform 0.3s ease;*/
-		transition-property: transform;
-		transition-duration: 0.3s;
-		transition-timing-function: ease;
-	}
-	.invoice-balance{
-		width: 702rpx;
-		height: auto;
-		padding:0 24rpx;
-		background: #FFFFFF;
+page {
+	height: auto;
+	background: #f7f7f7;
+}
+.btn-hover {
+	background: #ffffff;
+}
+.animation {
+	/* transition: transform 0.3s ease;*/
+	transition-property: transform;
+	transition-duration: 0.3s;
+	transition-timing-function: ease;
+}
+.invoice-balance {
+	width: 702rpx;
+	height: auto;
+	padding: 0 24rpx;
+	background: #ffffff;
+	float: left;
+	margin-top: 24rpx;
+	margin-bottom: 24rpx;
+	.balabce-t {
+		width: 100%;
+		height: 86rpx;
+		line-height: 86rpx;
+		font-size: $font-size-28;
+		color: $text-color;
 		float: left;
-		margin-top: 24rpx;
-		margin-bottom: 24rpx;
-		.balabce-t{
-			width: 100%;
-			height: 86rpx;
-			line-height: 86rpx;
-			font-size: $font-size-28;
-			color: $text-color;
+		.balabce-t-le {
 			float: left;
-			.balabce-t-le{
+			font-weight: bold;
+		}
+		.balabce-t-ri {
+			float: right;
+			display: flex;
+			align-items: center;
+			.money {
+				display: flex;
 				float: left;
-				font-weight: bold;
 			}
-			.balabce-t-ri{
-				float: right;
+			.checkbox-box {
 				display: flex;
-				align-items: center;
-				.money{
-					display: flex;
-					float: left;
-				}
-				.checkbox-box{
-					display: flex;
-					width: 60rpx;
-					float: left;
-					height: 100%;
-					font-size: $font-size-24;
-					.checkbox{
-						width: 40rpx;
-						text-align: right;
-						box-sizing: border-box;
-						text-align: center;
-						text-decoration: none;
-						border-radius: 0;
-						-webkit-tap-highlight-color: transparent;
-						overflow: hidden;
-					}
-				}	
-			}
-		}
-		.balabce-b{
-			width: 100%;	
-			float: left;
-			overflow: hidden;
-			.balabce-b-text{
-				width: 100%;
-				line-height: 58rpx;
+				width: 60rpx;
+				float: left;
+				height: 100%;
 				font-size: $font-size-24;
-				color: #FF2A2A;
-				text-align: right;
-				float: right;
-			}
-			&.balabce-b--hide {
-				padding: 0 0;
-				height: 0px;
-				line-height: 0px;
-			}	
-		}
-	}
-	.clause{
-		float: right;
-		font-size: 24rpx;
-		color: #999999;
-		margin-top: 60rpx;
-		margin-right: 24rpx;
-		&.noclick{
-			pointer-events: none;
-		}
-		.text{
-			color: #1890f9;
-			&.color-bg{
-				color: #333333;
+				.checkbox {
+					width: 40rpx;
+					text-align: right;
+					box-sizing: border-box;
+					text-align: center;
+					text-decoration: none;
+					border-radius: 0;
+					-webkit-tap-highlight-color: transparent;
+					overflow: hidden;
+				}
 			}
 		}
 	}
-	.status-text{
+	.balabce-b {
+		width: 100%;
+		float: left;
 		overflow: hidden;
-		padding: 24rpx;
-		background: #fff;
-		font-size: $font-size-26;
-		.view-type{
-			float: left;
+		.balabce-b-text {
+			width: 100%;
+			line-height: 58rpx;
+			font-size: $font-size-24;
 			color: #ff2a2a;
-		}
-		.bage-buss{
-			display: inline-block;
-			width: 72rpx;
-			height: 32rpx;
-			background:radial-gradient(circle,rgba(255,39,180,1) 0%,rgba(193,77,245,1) 100%);
-			border-radius: 6rpx;
-			line-height: 32rpx;
-			text-align: center;
-			color: #FFFFFF;
-			margin-top: 10rpx;
+			text-align: right;
 			float: right;
-			font-size: $font-size-24;
 		}
-		.bage-auto{
-			display: inline-block;
-			width: 72rpx;
-			height: 32rpx;
-			background:radial-gradient(circle,rgba(255,180,39,1) 0%,rgba(245,142,77,1) 100%);
-			border-radius: 6rpx;
-			line-height: 32rpx;
-			text-align: center;
-			color: #FFFFFF;
-			margin-top: 10rpx;
-			float: right;
-			font-size: $font-size-24;
+		&.balabce-b--hide {
+			padding: 0 0;
+			height: 0px;
+			line-height: 0px;
 		}
-		.Rebate{
-			display: inline-block;
-			width: 72rpx;
-			height: 32rpx;
-			background:#ff7a51;
-			border-radius: 6rpx;
-			line-height: 32rpx;
-			text-align: center;
-			color: #FFFFFF;
-			margin-top: 10rpx;
-			float: right;
-			font-size: $font-size-24;
-			margin-left: 20rpx;
+	}
+}
+.clause {
+	float: right;
+	font-size: 24rpx;
+	color: #999999;
+	margin-top: 60rpx;
+	margin-right: 24rpx;
+	&.noclick {
+		pointer-events: none;
+	}
+	.text {
+		color: #1890f9;
+		&.color-bg {
+			color: #333333;
 		}
 	}
-	.aganBj {
-	    position: fixed;
-	    left: 0;
-	    top: 0;
-	    bottom: 0;
-	    width: 100%;
-	    height: 100%;
-	    background-color: rgba(0, 0, 0, .5);
-	    z-index: 999999;
-		.alertAgan {
-		    position: absolute;
-		    top: 50%;
-		    left: 50%;
-		    transform: translate(-50%, -50%);
-		    width:580rpx;
-		    background-color: #fff;
-		    border-radius: 16rpx;
-			.title{
-				font-size: 30rpx;
-				color: #333333;
-				line-height: 42rpx;
-				padding: 30rpx;
-				display: block;
-			}
-			.goods{
-				padding: 0 30rpx;
-				.list{
-					padding: 10px 0;
-					border-bottom: 1rpx solid #e1e1e1;
-					margin: 10rpx 0;
-					.image-left{
-						width: 86rpx;
-						height: 86rpx;
-						border: 2rpx solid #e1e1e1;
-						border-radius: 6rpx;
-						display: inline-block;
-						vertical-align: middle;
-					}
-					.name-right{
-						display: inline-block;
-						width: 416rpx;
-						margin-left: 15rpx;
-						font-size: 26rpx;
-						color: #666666;
-						vertical-align: middle;
-						word-break: break-all;
-						overflow: hidden;
-						text-overflow: ellipsis;
-						display: -webkit-inline-box;
-						-webkit-line-clamp: 2;
-						-webkit-box-orient: vertical;
-					}
+}
+.status-text {
+	overflow: hidden;
+	padding: 24rpx;
+	background: #fff;
+	font-size: $font-size-26;
+	.view-type {
+		float: left;
+		color: #ff2a2a;
+	}
+	.bage-buss {
+		display: inline-block;
+		width: 72rpx;
+		height: 32rpx;
+		background: radial-gradient(circle, rgba(255, 39, 180, 1) 0%, rgba(193, 77, 245, 1) 100%);
+		border-radius: 6rpx;
+		line-height: 32rpx;
+		text-align: center;
+		color: #ffffff;
+		margin-top: 10rpx;
+		float: right;
+		font-size: $font-size-24;
+	}
+	.bage-auto {
+		display: inline-block;
+		width: 72rpx;
+		height: 32rpx;
+		background: radial-gradient(circle, rgba(255, 180, 39, 1) 0%, rgba(245, 142, 77, 1) 100%);
+		border-radius: 6rpx;
+		line-height: 32rpx;
+		text-align: center;
+		color: #ffffff;
+		margin-top: 10rpx;
+		float: right;
+		font-size: $font-size-24;
+	}
+	.Rebate {
+		display: inline-block;
+		width: 72rpx;
+		height: 32rpx;
+		background: #ff7a51;
+		border-radius: 6rpx;
+		line-height: 32rpx;
+		text-align: center;
+		color: #ffffff;
+		margin-top: 10rpx;
+		float: right;
+		font-size: $font-size-24;
+		margin-left: 20rpx;
+	}
+}
+.aganBj {
+	position: fixed;
+	left: 0;
+	top: 0;
+	bottom: 0;
+	width: 100%;
+	height: 100%;
+	background-color: rgba(0, 0, 0, 0.5);
+	z-index: 999999;
+	.alertAgan {
+		position: absolute;
+		top: 50%;
+		left: 50%;
+		transform: translate(-50%, -50%);
+		width: 580rpx;
+		background-color: #fff;
+		border-radius: 16rpx;
+		.title {
+			font-size: 30rpx;
+			color: #333333;
+			line-height: 42rpx;
+			padding: 30rpx;
+			display: block;
+		}
+		.goods {
+			padding: 0 30rpx;
+			.list {
+				padding: 10px 0;
+				border-bottom: 1rpx solid #e1e1e1;
+				margin: 10rpx 0;
+				.image-left {
+					width: 86rpx;
+					height: 86rpx;
+					border: 2rpx solid #e1e1e1;
+					border-radius: 6rpx;
+					display: inline-block;
+					vertical-align: middle;
+				}
+				.name-right {
+					display: inline-block;
+					width: 416rpx;
+					margin-left: 15rpx;
+					font-size: 26rpx;
+					color: #666666;
+					vertical-align: middle;
+					word-break: break-all;
+					overflow: hidden;
+					text-overflow: ellipsis;
+					display: -webkit-inline-box;
+					-webkit-line-clamp: 2;
+					-webkit-box-orient: vertical;
 				}
 			}
-			.BtnAll{
-				margin-top: 30rpx;
-				.btn{
-				 	display: inline-block;
-					width: 290rpx;
-					height: 90rpx;
-					line-height: 90rpx;
-					text-align: center;
-					&.closebtn{
-						border-radius: 0px 0px 0px 10px;
-						color:#999999 ;
-						background: #efefef;
-					}
-					&.cancel{
-						border-radius: 0px 0px 8px 0px;
-						background: $btn-confirm;
-						color: #fff;
-					}
+		}
+		.BtnAll {
+			margin-top: 30rpx;
+			.btn {
+				display: inline-block;
+				width: 290rpx;
+				height: 90rpx;
+				line-height: 90rpx;
+				text-align: center;
+				&.closebtn {
+					border-radius: 0px 0px 0px 10px;
+					color: #999999;
+					background: #efefef;
+				}
+				&.cancel {
+					border-radius: 0px 0px 8px 0px;
+					background: $btn-confirm;
+					color: #fff;
 				}
 			}
 		}
 	}
+}
 </style>

pages/seller/order/order-historylist.vue

@@ -1,128 +1,210 @@
 <template>
-	<view class="container" :style="{paddingTop:82+'px'}">
+	<view class="container" :style="{ paddingTop: 82 + 'px' }">
 		<view class="order-section-top">
 			<scroll-view scroll-x scroll-with-animation class="tab-view" :scroll-left="scrollLeft">
-				<view v-for="(item,index) in orderTabBar" :key="index" class="tab-bar-item" :class="[currentTab==index ? 'active' : '']"
-				 :data-current="index" @tap.stop="onClickTab">
-					<text class="tab-bar-title">{{item.text}}</text>
+				<view
+					v-for="(item, index) in orderTabBar"
+					:key="index"
+					class="tab-bar-item"
+					:class="[currentTab == index ? 'active' : '']"
+					:data-current="index"
+					@tap.stop="onClickTab"
+				>
+					<text class="tab-bar-title">{{ item.text }}</text>
 				</view>
 			</scroll-view>
 			<view class="tab-screen">
-				<view v-for="(item,index) in screenTabBar" :key="index" class="tab-screen-item" :class="[screenTab == index ? 'active' : '']"
-				 :data-current="index" @tap.stop="onClickScreenTab(index)">{{item.text}}</view>
+				<view
+					v-for="(item, index) in screenTabBar"
+					:key="index"
+					class="tab-screen-item"
+					:class="[screenTab == index ? 'active' : '']"
+					:data-current="index"
+					@tap.stop="onClickScreenTab(index)"
+					>{{ item.text }}</view
+				>
 			</view>
 		</view>
-		<swiper class="tab-content" :current="currentTab" duration="80" @animationfinish="onChange" :style="{height:winHeight+'px'}" >
-			<swiper-item v-for="(tabItem,index) in orderTabBar" :key="index">
-				<tui-skeleton v-if="skeletonShow" backgroundColor="#fafafa" borderRadius="10rpx" :isLoading	="false" :loadingType="5"></tui-skeleton>
-				<scroll-view scroll-y class="scoll-y tui-skeleton" @scrolltolower="scrolltolower" :style="{height:winHeight+'px'}" >
-					<view  :class="{'tui-order-list':scrollTop >= 0}" class="tui-skeleton clearfix">
+		<swiper
+			class="tab-content"
+			:current="currentTab"
+			duration="80"
+			@animationfinish="onChange"
+			:style="{ height: winHeight + 'px' }"
+		>
+			<swiper-item v-for="(tabItem, index) in orderTabBar" :key="index">
+				<tui-skeleton
+					v-if="skeletonShow"
+					backgroundColor="#fafafa"
+					borderRadius="10rpx"
+					:isLoading="false"
+					:loadingType="5"
+				></tui-skeleton>
+				<scroll-view
+					scroll-y
+					class="scoll-y tui-skeleton"
+					@scrolltolower="scrolltolower"
+					:style="{ height: winHeight + 'px' }"
+				>
+					<view :class="{ 'tui-order-list': scrollTop >= 0 }" class="tui-skeleton clearfix">
 						<!-- 空白页 -->
-						<empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0" :typeIndex="currentTab" :navbarHeight="navbarHeight"></empty>
+						<empty
+							v-if="tabItem.loaded === true && tabItem.orderList.length === 0"
+							:typeIndex="currentTab"
+							:navbarHeight="navbarHeight"
+						></empty>
 						<!-- 列表 -->
 						<view v-else class="tui-order-content">
-							<view  class="tui-order-item" v-for="(order,orderIndex) in tabItem.orderList" :key="orderIndex" @click.stop="detail(order)">
+							<view
+								class="tui-order-item"
+								v-for="(order, orderIndex) in tabItem.orderList"
+								:key="orderIndex"
+								@click.stop="detail(order)"
+							>
 								<view class="order-title">
-									<view class="order-title-name">{{order.clubName}}</view>
+									<view class="order-title-name">{{ order.clubName }}</view>
 									<view class="order-title-t">
-										<text class="bage-buss tui-skeleton-fillet" 
-											  v-if="order.orderSubmitType == 3 || order.orderSubmitType == 4">
-											  协销
+										<text
+											class="bage-buss tui-skeleton-fillet"
+											v-if="order.orderSubmitType == 3 || order.orderSubmitType == 4"
+										>
+											协销
 										</text>
-										<text class="bage-auto tui-skeleton-fillet" 
-											  v-if="order.orderSubmitType == 0 || order.orderSubmitType == 1 || order.orderSubmitType == 2">
-											  自主
+										<text
+											class="bage-auto tui-skeleton-fillet"
+											v-if="
+												order.orderSubmitType == 0 ||
+													order.orderSubmitType == 1 ||
+													order.orderSubmitType == 2
+											"
+										>
+											自主
 										</text>
 										<text class="bage-text tui-skeleton-fillet">
-											订单编号：{{order.orderNo}}({{order.orderId}})
+											订单编号：{{ order.orderNo }}({{ order.orderId }})
 										</text>
-										<image class="bage-icon" 
-											   src="https://static.caimei365.com/app/img/icon/icon-type@3x.png" 
-											   mode="widthFix" 
-											   v-if="order.secondHandOrderFlag == 1">
+										<image
+											class="bage-icon"
+											src="https://static.caimei365.com/app/img/icon/icon-type@3x.png"
+											mode="widthFix"
+											v-if="order.secondHandOrderFlag == 1"
+										>
 										</image>
 									</view>
 									<view class="order-title-b">
 										<view class="order-title-btxt tui-skeleton-fillet">
-											下单时间：{{order.orderTime}}
+											下单时间：{{ order.orderTime }}
 										</view>
 										<view class="order-title-tip tui-skeleton-fillet">
-											{{StateExpFormat(order.status)}}
+											{{ StateExpFormat(order.status) }}
 										</view>
 									</view>
 								</view>
-								<block v-for="(shop,index) in order.shopOrderList" :key="index">
+								<block v-for="(shop, index) in order.shopOrderList" :key="index">
 									<view class="goods-title">
 										<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">
-											{{ shop.shopName }}
+											<view class="floor-tags"> {{ shop.shopPromotion.name }} </view>
 										</view>
+										<view class="title-text tui-skeleton-fillet"> {{ shop.shopName }} </view>
 									</view>
-									<view class="goods-item" v-for="(pros,prosIndex) in shop.orderProductList" :key="prosIndex">
+									<view
+										class="goods-item"
+										v-for="(pros, prosIndex) in shop.orderProductList"
+										:key="prosIndex"
+									>
 										<view class="goods-pros-t">
 											<view class="pros-img tui-skeleton-fillet">
 												<image :src="pros.image" alt="" />
-												<text class="tips" v-if="pros.productType ==2 || pros.productType ==1">赠品</text>
+												<text class="tips" v-if="pros.productType == 2 || pros.productType == 1"
+													>赠品</text
+												>
 											</view>
 											<view class="pros-product clearfix">
-												<view class="producttitle tui-skeleton-fillet">{{pros.name}}</view>
-												<view class="productspec tui-skeleton-fillet" v-if="pros.productCategory != 2">
-													规格:{{pros.productUnit ? pros.productUnit : ''}}
+												<view class="producttitle tui-skeleton-fillet">{{ pros.name }}</view>
+												<view
+													class="productspec tui-skeleton-fillet"
+													v-if="pros.productCategory != 2"
+												>
+													规格:{{ pros.productUnit ? pros.productUnit : '' }}
 												</view>
 												<view class="productprice">
 													<view class="price tui-skeleton-fillet">
 														<text>￥{{ pros.price | NumFormat }}</text>
 													</view>
 													<view class="count tui-skeleton-fillet">
-														<text class="small">x</text>{{pros.num}}
+														<text class="small">x</text>{{ pros.num }}
 													</view>
 												</view>
-												<view class="floor-item-act" v-if="pros.productPromotion!=null">
-													<view v-if="PromotionsFormat(pros.productPromotion)"  class="floor-tags">
-														{{pros.productPromotion.name}}
-														<text v-if ="pros.productPromotion!=null && pros.productPromotion.type !=3 ">
-															:￥{{ pros.productPromotion == null ? '0.00' : pros.productPromotion.touchPrice | NumFormat}}
+												<view class="floor-item-act" v-if="pros.productPromotion != null">
+													<view
+														v-if="PromotionsFormat(pros.productPromotion)"
+														class="floor-tags"
+													>
+														{{ pros.productPromotion.name }}
+														<text
+															v-if="
+																pros.productPromotion != null &&
+																	pros.productPromotion.type != 3
+															"
+														>
+															:￥{{
+																pros.productPromotion == null
+																	? '0.00'
+																	: pros.productPromotion.touchPrice | NumFormat
+															}}
 														</text>
 													</view>
-													<view v-else-if="pros.productPromotion.type !=3" class="floor-tags">
+													<view
+														v-else-if="pros.productPromotion.type != 3"
+														class="floor-tags"
+													>
 														{{ pros.productPromotion.name }}
-													</view>	
+													</view>
 												</view>
-											</view>	
+											</view>
 										</view>
-									</view>	
+									</view>
 								</block>
 								<view class="order-footer">
-									<view class="order-footer-top" v-if="order.discountFee!=0">
+									<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" v-if="order.status==31||order.status==32||order.status==33">
-											已支付：<label style="color:#f94b4b ;">¥{{ order.receiptAmount | NumFormat }}</label>
+										<view class="count tui-skeleton-fillet">共{{ order.productCount }}件商品</view>
+										<view
+											class="money tui-skeleton-fillet"
+											v-if="order.status == 31 || order.status == 32 || order.status == 33"
+										>
+											已支付：<label style="color:#f94b4b ;"
+												>¥{{ order.receiptAmount | NumFormat }}</label
+											>
 										</view>
 										<view class="money tui-skeleton-fillet" v-else>
-											待付总额：<label style="color:#f94b4b ;">¥{{ order.pendingPayments | NumFormat }}</label>
+											待付总额：<label style="color:#f94b4b ;"
+												>¥{{ order.pendingPayments | NumFormat }}</label
+											>
 										</view>
 									</view>
 								</view>
 								<!-- 底部button -->
-								<order-button ref="orderButton" 
-											  :status="order.status" 
-											  :rechargeGoods = "order.rechargeGoods"
-											  :orderId="order.orderId" 
-											  :userId = "order.userId"
-											  :secondHandOrderFlag = "order.secondHandOrderFlag"
-											  @buttonConfirm="handButtonConfirm">
+								<order-button
+									ref="orderButton"
+									:status="order.status"
+									:rechargeGoods="order.rechargeGoods"
+									:orderId="order.orderId"
+									:userId="order.userId"
+									:secondHandOrderFlag="order.secondHandOrderFlag"
+									@buttonConfirm="handButtonConfirm"
+								>
 								</order-button>
 							</view>
 							<!--加载loadding-->
 							<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-							<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text='nomoreText'></tui-nomore>
+							<tui-nomore
+								:visible="!pullUpOn"
+								:backgroundColor="'#ffffff'"
+								:text="nomoreText"
+							></tui-nomore>
 							<!--加载loadding-->
 						</view>
 					</view>
@@ -130,20 +212,17 @@
 			</swiper-item>
 		</swiper>
 		<!-- 分享弹窗 -->
-		<share-alert   v-if="isShareModal"
-					   :orderId="btnoRderID" 
-					   @shareConfirm ='onShareAppMessage'>
-		</share-alert>
+		<share-alert v-if="isShareModal" :orderId="btnoRderID" @shareConfirm="onShareAppMessage"> </share-alert>
 		<!-- 透明模态层 -->
-		<modal-layer v-if='isModalLayer'></modal-layer>
+		<modal-layer v-if="isModalLayer"></modal-layer>
 		<!-- 再来一单弹窗 -->
 		<view class="aganBj" v-show="showAgan">
 			<view class="alertAgan">
 				<text class="title">{{ promptitle }}</text>
 				<view class="goods">
-					<view class="list" v-for="(item,index) in failList"  :key="index">
+					<view class="list" v-for="(item, index) in failList" :key="index">
 						<image class="image-left" :src="item.image"></image>
-						<view class="name-right">{{item.name}}</view>
+						<view class="name-right">{{ item.name }}</view>
 					</view>
 				</view>
 				<view class="BtnAll">
@@ -156,845 +235,881 @@
 </template>
 
 <script>
-	import headerBack from '@/components/cm-module/headerNavbar/header-back' 	// 自定义顶部导航
-	import btSearch from '@/components/uni-search/bt-search.vue'				// 搜索
-	import tuiSkeleton from '@/components/tui-skeleton/tui-skeleton'
-	import tuiLoadmore from '@/components/tui-components/loadmore/loadmore'
-	import tuiNomore from '@/components/tui-components/nomore/nomore'
-	import orderButton from '@/components/cm-module/orderDetails/sellerOrderButton' // 操作按钮
-	import modalLayer from '@/components/modal-layer'
-	import empty from '@/components/empty'
-	import shareAlert from '@/components/cm-module/modelAlert/sellerShareAlert'		// 分享弹窗
-	
-	export default {
-		components: {
-			headerBack,
-			empty,
-			btSearch,
-			tuiLoadmore,
-			tuiNomore,
-			orderButton,
-			tuiSkeleton,
-			modalLayer,
-			shareAlert
-		},
-		data() {
-			return {
-				orderTabBar: [{listType: 0,text: '全部订单',orderList: []},
-							  {listType: 1,text: '待确认',orderList: []},
-							  {listType: 2,text: '待付款',orderList: []},
-							  {listType: 3,text: '待发货',orderList: []},
-							  {listType: 4,text: '已发货',orderList: []},
-							  {listType: 5,text: '退货/款',orderList: []},
-							 ],
-				screenTabBar:[
-								{type:0,text:'全部订单'},
-								{type:1,text:'机构自主订单'},
-								{type:2,text:'协销订单'}
-							],			 
-				winHeight: '', //窗口高度
-				clubId:0,		//机构ID
-				userId:0,
-				currentTab: 0, //预设当前项的值
-				screenTab:0,   //筛选预设当前项的值
-				scrollLeft: 0 ,//tab标题的滚动条位置
-				serviceProviderId:0,//协销用户ID
-				orderData: [],
-				btnClubUserID:0,
-				btnoRderID: 0, //点击按钮传入的的订单ID
-				pageNum: 1,	  //页数
-				pageSize: 10,  //条数
-				scrollTop: 0,
-				deteleType:'',
-				skeletonShow: true,
-				isClickChange: false,
-				isShareModal: false,//控制分享弹窗
-				isSeller:false,
-				isModalLayer: false,
-				loadding: false,
-				pullUpOn: true,
-				hasNextPage: false,
-				pullFlag: true,
-				navbarHeight:'',
-				nomoreText: '上拉显示更多',
-				showAgan:false,
-				failList:[],  // 再来一单可购买商品
-				promptitle:'',
-				aganOrderId:0
+import headerBack from '@/components/cm-module/headerNavbar/header-back' // 自定义顶部导航
+import btSearch from '@/components/uni-search/bt-search.vue' // 搜索
+import tuiSkeleton from '@/components/tui-skeleton/tui-skeleton'
+import tuiLoadmore from '@/components/tui-components/loadmore/loadmore'
+import tuiNomore from '@/components/tui-components/nomore/nomore'
+import orderButton from '@/components/cm-module/orderDetails/sellerOrderButton' // 操作按钮
+import modalLayer from '@/components/modal-layer'
+import empty from '@/components/empty'
+import shareAlert from '@/components/cm-module/modelAlert/sellerShareAlert' // 分享弹窗
+
+export default {
+	components: {
+		headerBack,
+		empty,
+		btSearch,
+		tuiLoadmore,
+		tuiNomore,
+		orderButton,
+		tuiSkeleton,
+		modalLayer,
+		shareAlert
+	},
+	data() {
+		return {
+			orderTabBar: [
+				{ listType: 0, text: '全部订单', orderList: [] },
+				{ listType: 1, text: '待确认', orderList: [] },
+				{ listType: 2, text: '待付款', orderList: [] },
+				{ listType: 3, text: '待发货', orderList: [] },
+				{ listType: 4, text: '已发货', orderList: [] },
+				{ listType: 5, text: '退货/款', orderList: [] }
+			],
+			screenTabBar: [
+				{ type: 0, text: '全部订单' },
+				{ type: 1, text: '机构自主订单' },
+				{ type: 2, text: '协销订单' }
+			],
+			winHeight: '', //窗口高度
+			clubId: 0, //机构ID
+			userId: 0,
+			currentTab: 0, //预设当前项的值
+			screenTab: 0, //筛选预设当前项的值
+			scrollLeft: 0, //tab标题的滚动条位置
+			serviceProviderId: 0, //协销用户ID
+			orderData: [],
+			btnClubUserID: 0,
+			btnoRderID: 0, //点击按钮传入的的订单ID
+			pageNum: 1, //页数
+			pageSize: 10, //条数
+			scrollTop: 0,
+			deteleType: '',
+			skeletonShow: true,
+			isClickChange: false,
+			isShareModal: false, //控制分享弹窗
+			isSeller: false,
+			isModalLayer: false,
+			loadding: false,
+			pullUpOn: true,
+			hasNextPage: false,
+			pullFlag: true,
+			navbarHeight: '',
+			nomoreText: '上拉显示更多',
+			showAgan: false,
+			failList: [], // 再来一单可购买商品
+			promptitle: '',
+			aganOrderId: 0
+		}
+	},
+	onLoad(option) {
+		let self = this
+		this.currentTab = option.listType
+		this.initDataInfo()
+		uni.getSystemInfo({
+			//  高度自适应
+			success: function(res) {
+				let calc = res.windowHeight
+				self.winHeight = calc - 82
 			}
+		})
+	},
+	filters: {
+		NumFormat(value) {
+			//处理金额
+			return Number(value).toFixed(2)
+		}
+	},
+	methods: {
+		async initDataInfo() {
+			const clubInfo = await this.$api.getComStorage('orderUserInfo')
+			const userInfo = await this.$api.getStorage()
+			this.clubId = clubInfo.clubID ? clubInfo.clubID : 0
+			this.userId = clubInfo.userID ? clubInfo.userID : 0
+			this.serviceProviderId = userInfo.serviceProviderId ? userInfo.serviceProviderId : 0
+			this.getOrderDatainit(this.currentTab)
 		},
-		onLoad(option) {
-			let self = this
-			this.currentTab = option.listType
-			this.initDataInfo()
-			uni.getSystemInfo({//  高度自适应
-				success: function(res) {
-					let calc = res.windowHeight
-					self.winHeight = calc-82
-				}
-			})
-		},
-		filters:{
-			NumFormat(value) {//处理金额
-				return Number(value).toFixed(2)
-			},
-		},
-		methods: {
-			async initDataInfo(){
-				const clubInfo = await this.$api.getComStorage('orderUserInfo')
-				const userInfo = await this.$api.getStorage()
-				this.clubId = clubInfo.clubID ? clubInfo.clubID : 0
-				this.userId = clubInfo.userID ? clubInfo.userID : 0
-				this.serviceProviderId = userInfo.serviceProviderId ? userInfo.serviceProviderId : 0
-				this.getOrderDatainit(this.currentTab)
-			},
-			onChange (e) {// 滚动切换标签样式
-				let index = e.target.current || e.detail.current
-				if (this.isClickChange) {
-					this.currentTab = index
-					this.isClickChange = false
-					return
-				}
+		onChange(e) {
+			// 滚动切换标签样式
+			let index = e.target.current || e.detail.current
+			if (this.isClickChange) {
+				this.currentTab = index
 				this.isClickChange = false
-				this.currentTab = index 
-				this.checkCor()
-				this.pageNum = 1
-				this.pullUpOn = true //切换时隐藏
-				this.loadding =  false //切换时隐藏
-				this.nomoreText = ''
-				this.getOrderDatainit(this.currentTab,'tabChange')
-			},
-			// 点击标题切换当前页时改变样式
-			onClickTab (e) {
-				let tabIndex = e.target.dataset.current || e.currentTarget.dataset.current
-				if (this.currentTab === tabIndex) {
-					return false
-				} else {
-					this.isClickChange = true
-					this.currentTab = tabIndex
-					this.pageNum = 1
-					this.pullUpOn = true //切换时隐藏
-					this.loadding =  false //切换时隐藏
-					this.getOrderDatainit(this.currentTab)
-				}
-			},
-			onClickScreenTab(index){
-				console.log(index)
-				this.screenTab = index
+				return
+			}
+			this.isClickChange = false
+			this.currentTab = index
+			this.checkCor()
+			this.pageNum = 1
+			this.pullUpOn = true //切换时隐藏
+			this.loadding = false //切换时隐藏
+			this.nomoreText = ''
+			this.getOrderDatainit(this.currentTab, 'tabChange')
+		},
+		// 点击标题切换当前页时改变样式
+		onClickTab(e) {
+			let tabIndex = e.target.dataset.current || e.currentTarget.dataset.current
+			if (this.currentTab === tabIndex) {
+				return false
+			} else {
+				this.isClickChange = true
+				this.currentTab = tabIndex
 				this.pageNum = 1
 				this.pullUpOn = true //切换时隐藏
-				this.loadding =  false //切换时隐藏
-				this.nomoreText = ''
+				this.loadding = false //切换时隐藏
 				this.getOrderDatainit(this.currentTab)
-			},
-			//判断当前滚动超过一屏时，设置tab标题滚动条。
-			checkCor: function() {
-				if (this.currentTab > 3) {
-					//这里距离按实际计算
-					this.scrollLeft = 300
-				} else {
-					this.scrollLeft = 0
-				}
-			},
-			getOrderDatainit(index,source){
-				setTimeout(()=>{this.skeletonShow = false},1500)
-				let orderItem = this.orderTabBar[index]
-				let listType = orderItem.listType
-				if(source === 'tabChange' && orderItem.loaded === true){//tab切换只有第一次需要加载数据
-					return
-				}
-				setTimeout(()=>{
-					this.SellerService.GetSellerClubOrderList(
-						{
-							listType:index,
-							clubId:this.clubId,
-							orderSubmitType:this.screenTab,
-							serviceProviderId:this.serviceProviderId,
-							pageNum:1,
-							pageSize:this.pageSize,
-						}
-					).then(response =>{
-						let data  = response.data
-						let orderList = data.list.filter(item=>{
+			}
+		},
+		onClickScreenTab(index) {
+			console.log(index)
+			this.screenTab = index
+			this.pageNum = 1
+			this.pullUpOn = true //切换时隐藏
+			this.loadding = false //切换时隐藏
+			this.nomoreText = ''
+			this.getOrderDatainit(this.currentTab)
+		},
+		//判断当前滚动超过一屏时，设置tab标题滚动条。
+		checkCor: function() {
+			if (this.currentTab > 3) {
+				//这里距离按实际计算
+				this.scrollLeft = 300
+			} else {
+				this.scrollLeft = 0
+			}
+		},
+		getOrderDatainit(index, source) {
+			setTimeout(() => {
+				this.skeletonShow = false
+			}, 1500)
+			let orderItem = this.orderTabBar[index]
+			let listType = orderItem.listType
+			if (source === 'tabChange' && orderItem.loaded === true) {
+				//tab切换只有第一次需要加载数据
+				return
+			}
+			setTimeout(() => {
+				this.SellerService.GetSellerClubOrderList({
+					listType: index,
+					clubId: this.clubId,
+					orderSubmitType: this.screenTab,
+					serviceProviderId: this.serviceProviderId,
+					pageNum: 1,
+					pageSize: this.pageSize
+				})
+					.then(response => {
+						let data = response.data
+						let orderList = data.list.filter(item => {
 							//添加不同状态下订单的表现形式
 							item = Object.assign(item, this.StateExpFormat(item.listType))
 							return item
 						})
-						orderItem.orderList =[]
-						orderList.forEach(item=>{
+						orderItem.orderList = []
+						orderList.forEach(item => {
 							orderItem.orderList.push(item)
 						})
 						//loaded新字段用于表示数据加载完毕，如果为空可以显示空白页
 						this.$set(orderItem, 'loaded', true)
 						this.hasNextPage = data.hasNextPage
-						if(this.hasNextPage){
+						if (this.hasNextPage) {
 							this.pullUpOn = false
 							this.nomoreText = '上拉显示更多'
-						}else{
-							if(orderItem.orderList.length < 2){
+						} else {
+							if (orderItem.orderList.length < 2) {
 								this.pullUpOn = true
-							}else{
+							} else {
 								this.pullUpOn = false
 								this.nomoreText = '已至底部'
 							}
 						}
-					}).catch(error =>{
-						this.$util.msg(error.msg,2000)
 					})
-				}, 600)	
-			}, 
-			getOnReachBottomData(index){//上拉加载
-				this.pageNum += 1
-				this.SellerService.GetSellerClubOrderList(
-					{
-						listType:index,
-						clubId:this.clubId,
-						orderSubmitType:this.screenTab,
-						serviceProviderId:this.serviceProviderId,
-						pageNum:this.pageNum,
-						pageSize:this.pageSize,
-					}
-				).then(response =>{
+					.catch(error => {
+						this.$util.msg(error.msg, 2000)
+					})
+			}, 600)
+		},
+		getOnReachBottomData(index) {
+			//上拉加载
+			this.pageNum += 1
+			this.SellerService.GetSellerClubOrderList({
+				listType: index,
+				clubId: this.clubId,
+				orderSubmitType: this.screenTab,
+				serviceProviderId: this.serviceProviderId,
+				pageNum: this.pageNum,
+				pageSize: this.pageSize
+			})
+				.then(response => {
 					let orderItem = this.orderTabBar[index]
 					let data = response.data
 					this.hasNextPage = data.hasNextPage
 					orderItem.orderList = orderItem.orderList.concat(data.list)
-					this.pullFlag = false// 防上拉暴滑
-					setTimeout(()=>{this.pullFlag = true},500)
-					if(this.hasNextPage){
+					this.pullFlag = false // 防上拉暴滑
+					setTimeout(() => {
+						this.pullFlag = true
+					}, 500)
+					if (this.hasNextPage) {
 						this.pullUpOn = false
 						this.nomoreText = '上拉显示更多'
-					}else{
+					} else {
 						this.loadding = false
 						this.pullUpOn = false
 						this.nomoreText = '已至底部'
 					}
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
 				})
-			},
-			scrolltolower() {
-				if(this.hasNextPage){
-					this.loadding = true
-					this.pullUpOn = true
-					this.getOnReachBottomData(this.currentTab)
-				}	
-			},
-			detail(order) {//订单详情跳转
-				this.isModalLayer = true	
-				this.$api.navigateTo(`/pages/seller/order/order-details?listType=${this.currentTab}&orderId=${order.orderId}&userId=${order.userId}`)
-			},
-			handButtonConfirm(data) {//获取点击
-				this.handShowAlert(data)
-				this.btnoRderID = data.orderId
-			},
-			handShowAlert(data) {//执行
-				switch(data.type){
-					case 'query':
-						this.isModalLayer = true
-						this.$api.navigateTo('/pages/user/order/order-logistics?orderId='+data.orderId)
-						break
-					case 'delete':
-						this.handOrderDetele(data.orderId)
-						break
-					case 'cancel':
-						this.handCenceConfirm(data.orderId)
-						break
-					case 'confirm':
-						this.handOrderConfirm(data.orderId)
-						break
-					case 'again':
-						this.handOrderAgain(data.orderId)
-						break		
-				}
-			},
-			handOrderAgain(orderId){// 再来一单
-				this.aganOrderId = orderId
-				this.SellerService.SellerCreateOrderAgain(
-					{
-						confirmFlag:0,	
-						orderId:this.aganOrderId,
-						serviceProviderId:this.serviceProviderId
-					}
-				).then(res =>{
-					if(res.code==0){
-						this.$api.setStorage('orderUserInfo',{clubID:res.data.clubId,againBuyProductIds:res.data.productIds,userID:res.data.userId})
+				.catch(error => {
+					this.$util.msg(error.msg, 2000)
+				})
+		},
+		scrolltolower() {
+			if (this.hasNextPage) {
+				this.loadding = true
+				this.pullUpOn = true
+				this.getOnReachBottomData(this.currentTab)
+			}
+		},
+		detail(order) {
+			//订单详情跳转
+			this.isModalLayer = true
+			this.$api.navigateTo(
+				`/pages/seller/order/order-details?listType=${this.currentTab}&orderId=${order.orderId}&userId=${
+					order.userId
+				}`
+			)
+		},
+		handButtonConfirm(data) {
+			//获取点击
+			this.handShowAlert(data)
+			this.btnoRderID = data.orderId
+		},
+		handShowAlert(data) {
+			//执行
+			switch (data.type) {
+				case 'query':
+					this.isModalLayer = true
+					this.$api.navigateTo('/pages/user/order/order-logistics?orderId=' + data.orderId)
+					break
+				case 'delete':
+					this.handOrderDetele(data.orderId)
+					break
+				case 'cancel':
+					this.handCenceConfirm(data.orderId)
+					break
+				case 'confirm':
+					this.handOrderConfirm(data.orderId)
+					break
+				case 'again':
+					this.handOrderAgain(data.orderId)
+					break
+			}
+		},
+		handOrderAgain(orderId) {
+			// 再来一单
+			this.aganOrderId = orderId
+			this.SellerService.SellerCreateOrderAgain({
+				confirmFlag: 0,
+				orderId: this.aganOrderId,
+				serviceProviderId: this.serviceProviderId
+			})
+				.then(res => {
+					if (res.code == 0) {
+						this.$api.setStorage('orderUserInfo', {
+							clubID: res.data.clubId,
+							againBuyProductIds: res.data.productIds,
+							userID: res.data.userId
+						})
 						this.$api.navigateTo('/pages/seller/cart/cart')
 					}
-				}).catch(error =>{
-					if(error.code== -3){
+				})
+				.catch(error => {
+					if (error.code == -3) {
 						this.showAgan = true
 						this.promptitle = error.msg
 						this.failList = error.data
-					}else if(error.code== -2){
-						this.$util.modal('',error.msg,'确定','',false,() =>{})
-					}else{
-						this.$util.msg(error.msg,2000)
-					}
-				})
-			},
-			closeBtn(){//
-				this.showAgan = false
-			},
-			cancelBtn(){// 再来一单弹窗
-				this.SellerService.SellerCreateOrderAgain(
-					{
-						serviceProviderId:this.serviceProviderId,
-						orderId:this.aganOrderId,
-						confirmFlag:1,
-					}
-				).then(res =>{
-					if(res.code==0){
-						this.$api.navigateTo('/pages/seller/cart/cart')
-						this.showAgan = false
+					} else if (error.code == -2) {
+						this.$util.modal('', error.msg, '确定', '', false, () => {})
+					} else {
+						this.$util.msg(error.msg, 2000)
 					}
 				})
-			},
-			handOrderConfirm (orderId){//确认订单
-				this.$util.modal('提示','确认此订单？','确定','取消',true,() =>{
-					this.OrderService.AffirmOrder({orderId:orderId}).then(response =>{
-						this.$util.msg(response.msg,2000,true,'success')
+		},
+		closeBtn() {
+			//
+			this.showAgan = false
+		},
+		cancelBtn() {
+			// 再来一单弹窗
+			this.SellerService.SellerCreateOrderAgain({
+				serviceProviderId: this.serviceProviderId,
+				orderId: this.aganOrderId,
+				confirmFlag: 1
+			}).then(res => {
+				if (res.code == 0) {
+					this.$api.navigateTo('/pages/seller/cart/cart')
+					this.showAgan = false
+				}
+			})
+		},
+		handOrderConfirm(orderId) {
+			//确认订单
+			this.$util.modal('提示', '确认此订单？', '确定', '取消', true, () => {
+				this.OrderService.AffirmOrder({ orderId: orderId })
+					.then(response => {
+						this.$util.msg(response.msg, 2000, true, 'success')
 						setTimeout(() => {
 							this.getOrderDatainit(this.currentTab)
-						},2000)
-					}).catch(error =>{
-						this.$util.msg(error.msg,2000)
+						}, 2000)
 					})
-				})
-			},
-			handOrderDetele(orderId){//删除订单
-				this.$util.modal('提示','确认删除该订单吗？','确定','取消',true,() =>{
-					this.OrderService.DeleteOrder({orderId:orderId}).then(response =>{
-						this.$util.msg(response.msg,2000,true,'success')
+					.catch(error => {
+						this.$util.msg(error.msg, 2000)
+					})
+			})
+		},
+		handOrderDetele(orderId) {
+			//删除订单
+			this.$util.modal('提示', '确认删除该订单吗？', '确定', '取消', true, () => {
+				this.OrderService.DeleteOrder({ orderId: orderId })
+					.then(response => {
+						this.$util.msg(response.msg, 2000, true, 'success')
 						setTimeout(() => {
 							this.getOrderDatainit(this.currentTab)
-						},2000)
-					}).catch(error =>{
-						this.$util.msg(error.msg,2000)
+						}, 2000)
 					})
-				})
-			},
-			handCenceConfirm(orderId){//取消订单
-				this.$util.modal('提示','确认取消该订单吗？','确定','取消',true,() =>{
-					this.OrderService.CancelOrder({orderId:orderId}).then(response =>{
-						this.$util.msg(response.msg,2000,true,'success')
+					.catch(error => {
+						this.$util.msg(error.msg, 2000)
+					})
+			})
+		},
+		handCenceConfirm(orderId) {
+			//取消订单
+			this.$util.modal('提示', '确认取消该订单吗？', '确定', '取消', true, () => {
+				this.OrderService.CancelOrder({ orderId: orderId })
+					.then(response => {
+						this.$util.msg(response.msg, 2000, true, 'success')
 						setTimeout(() => {
 							this.getOrderDatainit(this.currentTab)
-						},2000)
-					}).catch(error =>{
-						this.$util.msg(error.msg,2000)
+						}, 2000)
 					})
-				})
-			},
-			handlSearchPath(){
-				this.$api.navigateTo('/pages/seller/search/search-order')
-			},
-			onShareAppMessage (res){//分享转发
-				this.isShareModal = false
-				if (res.from === 'button') {// 来自页面内转发按钮
-					// console.log(res.target)
-			    }
-				return {
-					title: '您有新的分享订单，快来查看吧~',
-					path: `/pages/user/order/order-sharelogin?orderId=${this.btnoRderID}&userId=${this.btnClubUserID}&serviceProviderId=${this.serviceProviderId}`,
-					imageUrl:'https://img.caimei365.com/group1/M00/03/95/Cmis216Sk_SABnOFABZCgCzFV_g063.png'
-				}
-			},
-			PromotionsFormat(promo){//促销活动类型数据处理
-				if(promo!=null){
-					if(promo.type == 1 && promo.mode == 1){
-						return true
-					}else{
-						return false
-					}
+					.catch(error => {
+						this.$util.msg(error.msg, 2000)
+					})
+			})
+		},
+		handlSearchPath() {
+			this.$api.navigateTo('/pages/seller/search/search-order')
+		},
+		onShareAppMessage(res) {
+			//分享转发
+			this.isShareModal = false
+			if (res.from === 'button') {
+				// 来自页面内转发按钮
+				// console.log(res.target)
+			}
+			return {
+				title: '您有新的分享订单，快来查看吧~',
+				path: `/pages/user/order/order-sharelogin?orderId=${this.btnoRderID}&userId=${
+					this.btnClubUserID
+				}&serviceProviderId=${this.serviceProviderId}`,
+				imageUrl: 'https://img.caimei365.com/group1/M00/03/95/Cmis216Sk_SABnOFABZCgCzFV_g063.png'
+			}
+		},
+		PromotionsFormat(promo) {
+			//促销活动类型数据处理
+			if (promo != null) {
+				if (promo.type == 1 && promo.mode == 1) {
+					return true
+				} else {
+					return false
 				}
-				return false
-			},
-			//订单状态文字和颜色
-			StateExpFormat (state){
-				let stateText = '',
-					stateTextObject={
-						0:'待确认',
-						4:'交易完成',
-						5:'订单完成',
-						6:'已关闭',
-						7:'交易全退',
-						77:'交易全退',
-						11:'待付款待发货',
-						12:'待付款部分发货',
-						13:'待付款已发货',
-						21:'部分付款待发货',
-						22:'部分付款部分发货',
-						23:'部分付款已发货',
-						31:'已付款待发货',
-						32:'已付款部分发货',
-						33:'已付款已发货',
-						111:'待付款待发货',
-					}
-				Object.keys(stateTextObject).forEach(key => {
-					if(key == state){
-						stateText = stateTextObject[key]
-					}
-				})
-				return stateText
-			},
-			orderPriceToFixed (n){
-				let price =''
-				price = n.toFixed(2)
-				return price
-			},
+			}
+			return false
 		},
-		onPageScroll(e) {
-			this.scrollTop = e.scrollTop
+		//订单状态文字和颜色
+		StateExpFormat(state) {
+			let stateText = '',
+				stateTextObject = {
+					0: '待确认',
+					4: '交易完成',
+					5: '订单完成',
+					6: '已关闭',
+					7: '交易全退',
+					77: '交易全退',
+					11: '待付款待发货',
+					12: '待付款部分发货',
+					13: '待付款已发货',
+					21: '部分付款待发货',
+					22: '部分付款部分发货',
+					23: '部分付款已发货',
+					31: '已付款待发货',
+					32: '已付款部分发货',
+					33: '已付款已发货',
+					111: '待付款待发货'
+				}
+			Object.keys(stateTextObject).forEach(key => {
+				if (key == state) {
+					stateText = stateTextObject[key]
+				}
+			})
+			return stateText
 		},
-		onShow() {
-			this.isModalLayer = false
+		orderPriceToFixed(n) {
+			let price = ''
+			price = n.toFixed(2)
+			return price
 		}
+	},
+	onPageScroll(e) {
+		this.scrollTop = e.scrollTop
+	},
+	onShow() {
+		this.isModalLayer = false
 	}
+}
 </script>
 
 <style lang="scss">
-	/*tabbar end*/
-	page{
-		background: #FFFFFF;
-	}
-	/*tabbar start*/
-	::-webkit-scrollbar {
-		width: 0;
-		height: 0;
-		color: transparent;
-	}
-	.order-section-top{
-		width: 100%;
-		position: fixed;
-		top: 0;
-		left: 0;
-		z-index: 99;
-		background: #FFFFFF;
-		.tab-screen{
+/*tabbar end*/
+page {
+	background: #ffffff;
+}
+/*tabbar start*/
+::-webkit-scrollbar {
+	width: 0;
+	height: 0;
+	color: transparent;
+}
+.order-section-top {
+	width: 100%;
+	position: fixed;
+	top: 0;
+	left: 0;
+	z-index: 99;
+	background: #ffffff;
+	.tab-screen {
+		height: 60rpx;
+		width: 702rpx;
+		padding: 10rpx 24rpx;
+		border-top: 1px solid #f7f7f7;
+		border-bottom: 1px solid #f7f7f7;
+		display: flex;
+		justify-content: center;
+		justify-items: center;
+		.tab-screen-item {
+			flex: 1;
 			height: 60rpx;
-			width: 702rpx;
-			padding: 10rpx 24rpx;
-			border-top: 1px solid #F7F7F7;
-			border-bottom: 1px solid #F7F7F7;
-			display: flex;
-			justify-content: center;
-			justify-items: center;
-			.tab-screen-item{
-				flex: 1;
-				height: 60rpx;
-				border-radius: 10rpx;
-				background: #F7F7F7;
-				margin-right: 22rpx;
-				line-height: 66rpx;
-				font-size: $font-size-28;
-				color: #333333;
-				text-align: center;
-				&.active{
-					color: $color-system;
-				}
-				&:last-child{
-					margin-right: 0;
-				}
+			border-radius: 10rpx;
+			background: #f7f7f7;
+			margin-right: 22rpx;
+			line-height: 66rpx;
+			font-size: $font-size-28;
+			color: #333333;
+			text-align: center;
+			&.active {
+				color: $color-system;
+			}
+			&:last-child {
+				margin-right: 0;
 			}
 		}
 	}
-	.tab-view::before {
-		content: '';
-		position: absolute;
-		border-bottom: 1rpx solid #eaeef1;
-		-webkit-transform: scaleY(0.5);
-		transform: scaleY(0.5);
-		bottom: 0;
-		right: 0;
-		left: 0;
-	}
-	.tab-view {
-		width: 100%;
-		height: 80rpx;
-		overflow: hidden;
-		box-sizing: border-box;
-		background: #fff;
-		white-space: nowrap;
-		border-top: 1px solid #F7F7F7;
+}
+.tab-view::before {
+	content: '';
+	position: absolute;
+	border-bottom: 1rpx solid #eaeef1;
+	-webkit-transform: scaleY(0.5);
+	transform: scaleY(0.5);
+	bottom: 0;
+	right: 0;
+	left: 0;
+}
+.tab-view {
+	width: 100%;
+	height: 80rpx;
+	overflow: hidden;
+	box-sizing: border-box;
+	background: #fff;
+	white-space: nowrap;
+	border-top: 1px solid #f7f7f7;
+}
+.tab-bar-item {
+	padding: 0;
+	height: 80rpx;
+	min-width: 80rpx;
+	line-height: 80rpx;
+	margin: 0 28rpx;
+	display: inline-block;
+	text-align: center;
+	box-sizing: border-box;
+	&.active {
+		border-bottom: 6rpx solid $color-system;
 	}
-	.tab-bar-item {
-		padding: 0;
+	.tab-bar-title {
 		height: 80rpx;
-		min-width: 80rpx;
 		line-height: 80rpx;
-		margin: 0 28rpx;
-		display: inline-block;
-		text-align: center;
-		box-sizing: border-box;
-		&.active {
-			border-bottom: 6rpx solid $color-system;
-		}
-		.tab-bar-title {
-			height: 80rpx;
-			line-height: 80rpx;
-			font-size:$font-size-28;
-			color: $text-color;
-		}
-		&.active .tab-bar-title {
-			color: $color-system !important;
-		}
+		font-size: $font-size-28;
+		color: $text-color;
 	}
-	.container {
-		padding-bottom: env(safe-area-inset-bottom);
-		height: auto;
-		position: relative;
+	&.active .tab-bar-title {
+		color: $color-system !important;
 	}
-	.tui-order-content{
+}
+.container {
+	padding-bottom: env(safe-area-inset-bottom);
+	height: auto;
+	position: relative;
+}
+.tui-order-content {
+	width: 100%;
+	height: auto;
+}
+.tui-order-list {
+	width: 100%;
+	position: relative;
+}
+.tui-order-item {
+	display: flex;
+	flex-direction: column;
+	width: 702rpx;
+	padding: 0 24rpx;
+	background: #fff;
+	border-bottom: 20rpx solid #f7f7f7;
+}
+.order-title {
+	width: 100%;
+	height: auto;
+	.order-title-name {
 		width: 100%;
-		height: auto;
+		height: 72rpx;
+		border-bottom: 1px solid #f7f7f7;
+		line-height: 72rpx;
+		text-align: left;
+		font-size: $font-size-28;
+		color: #333333;
 	}
-	.tui-order-list {
+	.order-title-t {
 		width: 100%;
+		height: 68rpx;
+		float: left;
+		line-height: 68rpx;
 		position: relative;
-	}
-	.tui-order-item {
-		display: flex;
-		flex-direction: column;
-		width: 702rpx;
-		padding:0 24rpx;
-		background: #fff;
-		border-bottom: 20rpx solid #F7F7F7;
-	}
-	.order-title{
-		width: 100%;
-		height: auto;
-		.order-title-name{
-			width: 100%;
-			height: 72rpx;
-			border-bottom: 1px solid #F7F7F7;
-			line-height: 72rpx;
-			text-align: left;
-			font-size: $font-size-28;
-			color: #333333;
+		.bage-icon {
+			width: 50rpx;
+			height: 50rpx;
+			display: block;
+			position: absolute;
+			right: 0;
+			top: 9rpx;
 		}
-		.order-title-t{
-			width: 100%;
-			height: 68rpx;
-			float: left;
-			line-height: 68rpx;
-			position: relative;
-			.bage-icon{
-				width: 50rpx;
-				height: 50rpx;
-				display: block;
-				position: absolute;
-				right: 0;
-				top: 9rpx;
-			}
-			.bage-buss{
-				display: inline-block;
-				width: 72rpx;
-				height: 30rpx;
-				background:radial-gradient(circle,rgba(255,39,180,1) 0%,rgba(193,77,245,1) 100%);
-				border-radius: 4rpx;
-				line-height: 30rpx;
-				font-size: $font-size-22;
-				text-align: center;
-				color: #FFFFFF;
-				margin-top: 8rpx;
-			}
-			.bage-auto{
-				display: inline-block;
-				width: 72rpx;
-				height: 30rpx;
-				background:radial-gradient(circle,rgba(255,180,39,1) 0%,rgba(245,142,77,1) 100%);
-				border-radius: 4rpx;
-				line-height: 30rpx;
-				font-size: $font-size-22;
-				text-align: center;
-				color: #FFFFFF;
-				margin-top: 8rpx;
-			}
-			.bage-text{
-				display: inline-block;
-				font-size: $font-size-28;
-				line-height: 68rpx;
-				text-align: left;
-				color: $color-system;
-				margin-left: 15rpx;
-			}
+		.bage-buss {
+			display: inline-block;
+			width: 72rpx;
+			height: 30rpx;
+			background: radial-gradient(circle, rgba(255, 39, 180, 1) 0%, rgba(193, 77, 245, 1) 100%);
+			border-radius: 4rpx;
+			line-height: 30rpx;
+			font-size: $font-size-22;
+			text-align: center;
+			color: #ffffff;
+			margin-top: 8rpx;
 		}
-		.order-title-b{
-			width: 100%;
-			height: 40rpx;
-			float: left;
+		.bage-auto {
+			display: inline-block;
+			width: 72rpx;
+			height: 30rpx;
+			background: radial-gradient(circle, rgba(255, 180, 39, 1) 0%, rgba(245, 142, 77, 1) 100%);
+			border-radius: 4rpx;
+			line-height: 30rpx;
+			font-size: $font-size-22;
+			text-align: center;
+			color: #ffffff;
 			margin-top: 8rpx;
-			.order-title-btxt{
-				float: left;
-				font-size: $font-size-28;
-				line-height: 40rpx;
-				color: #999999;
-				text-align: lef
-			}
-			.order-title-tip{
-				float: right;
-				font-size: $font-size-28;
-				line-height: 40rpx;
-				text-align: right;
-				color: #FF2A2A;
-			}
+		}
+		.bage-text {
+			display: inline-block;
+			font-size: $font-size-28;
+			line-height: 68rpx;
+			text-align: left;
+			color: $color-system;
+			margin-left: 15rpx;
 		}
 	}
-	.goods-title{
+	.order-title-b {
 		width: 100%;
-		height: 56rpx;
+		height: 40rpx;
 		float: left;
-		margin-top:10rpx;
-		.floor-item-act{
-			height: 56rpx;
-			text-align: center;
-			box-sizing: border-box;
+		margin-top: 8rpx;
+		.order-title-btxt {
 			float: left;
-			padding: 10rpx 0;
-			margin-right: 12rpx;
-			.floor-tags{
-				height: 28rpx;
-				border-radius: 6rpx;
-				background-color: #FFFFFF;
-				line-height: 28rpx;
-				color: $color-system;
-				text-align: center;
-				display: inline-block;
-				padding:0 16rpx;
-				font-size: $font-size-20;
-				border: 1px solid #E15616;
-				float: left;
-			}
+			font-size: $font-size-28;
+			line-height: 40rpx;
+			color: #999999;
+			text-align: lef;
 		}
-		.title-text{
-			width: 400rpx;
-			overflow: hidden;
-			text-overflow:ellipsis;
-			white-space: nowrap;
-			float: left;
+		.order-title-tip {
+			float: right;
 			font-size: $font-size-28;
-			color: $text-color;
-			text-align: left;
-			line-height: 56rpx;
-			font-weight: bold;
+			line-height: 40rpx;
+			text-align: right;
+			color: #ff2a2a;
 		}
 	}
-	.goods-item{
-		width: 100%;
-		height: auto;
-	}	
-	.goods-pros-t{
-		width: 100%;
-		height: auto;
-		padding:24rpx 0;
-		.pros-img{
+}
+.goods-title {
+	width: 100%;
+	height: 56rpx;
+	float: left;
+	margin-top: 10rpx;
+	.floor-item-act {
+		height: 56rpx;
+		text-align: center;
+		box-sizing: border-box;
+		float: left;
+		padding: 10rpx 0;
+		margin-right: 12rpx;
+		.floor-tags {
+			height: 28rpx;
+			border-radius: 6rpx;
+			background-color: #ffffff;
+			line-height: 28rpx;
+			color: $color-system;
+			text-align: center;
+			display: inline-block;
+			padding: 0 16rpx;
+			font-size: $font-size-20;
+			border: 1px solid #e15616;
 			float: left;
-			width: 210rpx;
-			height: 100%;
-			border-radius: 10rpx;
-			margin:0 26rpx 0 0;
-			position: relative;
-			.tips{
-				display: inline-block;
-				width: 80rpx;
-				height: 40rpx;
-				background-image: linear-gradient(214deg, #ff4500 0%, #ff5800 53%, #ff4367 100%);
-				line-height: 40rpx;
-				text-align: center;
-				font-size: $font-size-24;
-				color: #FFFFFF;
-				border-radius:10rpx 0 10rpx 0 ;
-				position: absolute;
-				top:0;
-				left: 0;
-			}
-			image{
-				width: 210rpx;
-				height: 210rpx;
-				border-radius: 10rpx;
-				border:1px solid #f3f3f3;
-			}
 		}
 	}
-	.pros-product{
-		width: 460rpx;
+	.title-text {
+		width: 400rpx;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+		float: left;
+		font-size: $font-size-28;
+		color: $text-color;
+		text-align: left;
+		line-height: 56rpx;
+		font-weight: bold;
+	}
+}
+.goods-item {
+	width: 100%;
+	height: auto;
+}
+.goods-pros-t {
+	width: 100%;
+	height: auto;
+	padding: 24rpx 0;
+	.pros-img {
+		float: left;
+		width: 210rpx;
 		height: 100%;
-		line-height: 36rpx;
-		font-size: $font-size-26;	
+		border-radius: 10rpx;
+		margin: 0 26rpx 0 0;
 		position: relative;
-		float: left;
-		.producttitle{
-			width: 100%;
+		.tips {
 			display: inline-block;
-			height: auto;							
-			text-overflow:ellipsis;
-			display: -webkit-box;
-			word-break: break-all;
-			-webkit-box-orient: vertical;
-			-webkit-line-clamp: 2;
-			overflow: hidden;
-			margin-bottom: 8rpx;
+			width: 80rpx;
+			height: 40rpx;
+			background-image: linear-gradient(214deg, #ff4500 0%, #ff5800 53%, #ff4367 100%);
+			line-height: 40rpx;
+			text-align: center;
+			font-size: $font-size-24;
+			color: #ffffff;
+			border-radius: 10rpx 0 10rpx 0;
+			position: absolute;
+			top: 0;
+			left: 0;
 		}
-		.productspec{
-			height: 36rpx;
-			color: #999999;
-			text-overflow:ellipsis;
-			display: -webkit-box;
-			word-break: break-all;
-			-webkit-box-orient: vertical;
-			-webkit-line-clamp: 1;
-			overflow: hidden;
+		image {
+			width: 210rpx;
+			height: 210rpx;
+			border-radius: 10rpx;
+			border: 1px solid #f3f3f3;
 		}
-		.productprice{
-			height: 48rpx;
-			width: 100%;
+	}
+}
+.pros-product {
+	width: 460rpx;
+	height: 100%;
+	line-height: 36rpx;
+	font-size: $font-size-26;
+	position: relative;
+	float: left;
+	.producttitle {
+		width: 100%;
+		display: inline-block;
+		height: auto;
+		text-overflow: ellipsis;
+		display: -webkit-box;
+		word-break: break-all;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 2;
+		overflow: hidden;
+		margin-bottom: 8rpx;
+	}
+	.productspec {
+		height: 36rpx;
+		color: #999999;
+		text-overflow: ellipsis;
+		display: -webkit-box;
+		word-break: break-all;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 1;
+		overflow: hidden;
+	}
+	.productprice {
+		height: 48rpx;
+		width: 100%;
+		float: left;
+		.price {
+			line-height: 48rpx;
+			font-size: $font-size-28;
+			width: 48%;
+			color: #ff2a2a;
 			float: left;
-			.price{
-				line-height: 48rpx;
-				font-size: $font-size-28;
-				width: 48%;
-				color: #FF2A2A;
-				float: left;
-				font-weight: bold;
-			}
-			.count{
-				height: 100%;
-				float: right;
-				position: relative;
-				.small{
-					color: #666666;
-				}
+			font-weight: bold;
+		}
+		.count {
+			height: 100%;
+			float: right;
+			position: relative;
+			.small {
+				color: #666666;
 			}
 		}
-		.floor-item-act{
-			width: 100%;
-			height: 56rpx;
+	}
+	.floor-item-act {
+		width: 100%;
+		height: 56rpx;
+		text-align: center;
+		box-sizing: border-box;
+		float: left;
+		padding: 0 0 10rpx 0;
+		.floor-tags {
+			height: 28rpx;
+			border-radius: 6rpx;
+			background-color: #ffffff;
+			line-height: 28rpx;
+			color: $color-system;
 			text-align: center;
-			box-sizing: border-box;
+			display: inline-block;
+			padding: 0 16rpx;
+			font-size: $font-size-20;
+			border: 1px solid #e15616;
 			float: left;
-			padding:0 0 10rpx 0;
-			.floor-tags{
-				height: 28rpx;
-				border-radius: 6rpx;
-				background-color: #FFFFFF;
-				line-height: 28rpx;
-				color: $color-system;
-				text-align: center;
-				display: inline-block;
-				padding:0 16rpx;
-				font-size: $font-size-20;
-				border: 1px solid #E15616;
-				float: left;
-			}
 		}
 	}
-	.order-footer{
+}
+.order-footer {
+	width: 100%;
+	height: 78rpx;
+	float: left;
+	.order-footer-top {
+		width: 100%;
+		height: 34rpx;
+		line-height: 34rpx;
+		font-size: $font-size-24;
+		color: #999999;
+		text-align: right;
+	}
+	.order-footer-bot {
 		width: 100%;
-		height: 78rpx;
 		float: left;
-		.order-footer-top{
-			width: 100%;
-			height: 34rpx;
-			line-height: 34rpx;
-			font-size: $font-size-24;
-			color: #999999;
-			text-align: right;
-		}
-		.order-footer-bot{
-			width: 100%;
+		height: 48rpx;
+		line-height: 48rpx;
+		font-size: $font-size-28;
+		font-weight: bold;
+		color: $text-color;
+		.count {
+			width: 50%;
 			float: left;
-			height: 48rpx;
-			line-height: 48rpx;
-			font-size: $font-size-28;
-			font-weight: bold;
-			color: $text-color;
-			.count{
-				width: 50%;
-				float: left;
-				text-align: left;
-			}
-			.money{
-				width: 50%;
-				float: right;
-				text-align: right;
-			}
+			text-align: left;
+		}
+		.money {
+			width: 50%;
+			float: right;
+			text-align: right;
 		}
 	}
-	.aganBj {
-	    position: fixed;
-	    left: 0;
-	    top: 0;
-	    bottom: 0;
-	    width: 100%;
-	    height: 100%;
-	    background-color: rgba(0, 0, 0, .5);
-	    z-index: 999999;
-		.alertAgan {
-		    position: absolute;
-		    top: 50%;
-		    left: 50%;
-		    transform: translate(-50%, -50%);
-		    width:580rpx;
-		    background-color: #fff;
-		    border-radius: 16rpx;
-			.title{
-				font-size: 30rpx;
-				color: #333333;
-				line-height: 42rpx;
-				padding: 30rpx;
-				display: block;
-			}
-			.goods{
-				padding: 0 30rpx;
-				.list{
-					padding: 10px 0;
-					border-bottom: 1rpx solid #e1e1e1;
-					margin: 10rpx 0;
-					.image-left{
-						width: 86rpx;
-						height: 86rpx;
-						border: 2rpx solid #e1e1e1;
-						border-radius: 6rpx;
-						display: inline-block;
-						vertical-align: middle;
-					}
-					.name-right{
-						display: inline-block;
-						width: 416rpx;
-						margin-left: 15rpx;
-						font-size: 26rpx;
-						color: #666666;
-						vertical-align: middle;
-						word-break: break-all;
-						overflow: hidden;
-						text-overflow: ellipsis;
-						display: -webkit-inline-box;
-						-webkit-line-clamp: 2;
-						-webkit-box-orient: vertical;
-					}
+}
+.aganBj {
+	position: fixed;
+	left: 0;
+	top: 0;
+	bottom: 0;
+	width: 100%;
+	height: 100%;
+	background-color: rgba(0, 0, 0, 0.5);
+	z-index: 999999;
+	.alertAgan {
+		position: absolute;
+		top: 50%;
+		left: 50%;
+		transform: translate(-50%, -50%);
+		width: 580rpx;
+		background-color: #fff;
+		border-radius: 16rpx;
+		.title {
+			font-size: 30rpx;
+			color: #333333;
+			line-height: 42rpx;
+			padding: 30rpx;
+			display: block;
+		}
+		.goods {
+			padding: 0 30rpx;
+			.list {
+				padding: 10px 0;
+				border-bottom: 1rpx solid #e1e1e1;
+				margin: 10rpx 0;
+				.image-left {
+					width: 86rpx;
+					height: 86rpx;
+					border: 2rpx solid #e1e1e1;
+					border-radius: 6rpx;
+					display: inline-block;
+					vertical-align: middle;
+				}
+				.name-right {
+					display: inline-block;
+					width: 416rpx;
+					margin-left: 15rpx;
+					font-size: 26rpx;
+					color: #666666;
+					vertical-align: middle;
+					word-break: break-all;
+					overflow: hidden;
+					text-overflow: ellipsis;
+					display: -webkit-inline-box;
+					-webkit-line-clamp: 2;
+					-webkit-box-orient: vertical;
 				}
 			}
-			.BtnAll{
-				margin-top: 30rpx;
-				.btn{
-				 	display: inline-block;
-					width: 290rpx;
-					height: 90rpx;
-					line-height: 90rpx;
-					text-align: center;
-					&.closebtn{
-						border-radius: 0px 0px 0px 10px;
-						color:#999999 ;
-						background: #efefef;
-					}
-					&.cancel{
-						border-radius: 0px 0px 8px 0px;
-						background: $btn-confirm;
-						color: #fff;
-					}
+		}
+		.BtnAll {
+			margin-top: 30rpx;
+			.btn {
+				display: inline-block;
+				width: 290rpx;
+				height: 90rpx;
+				line-height: 90rpx;
+				text-align: center;
+				&.closebtn {
+					border-radius: 0px 0px 0px 10px;
+					color: #999999;
+					background: #efefef;
+				}
+				&.cancel {
+					border-radius: 0px 0px 8px 0px;
+					background: $btn-confirm;
+					color: #fff;
 				}
 			}
 		}
 	}
+}
 </style>

pages/seller/order/order-list.vue

@@ -1,132 +1,221 @@
 <template>
-	<view class="container" :style="{paddingTop:(navbarHeight+82)+'px'}">
+	<view class="container" :style="{ paddingTop: navbarHeight + 82 + 'px' }">
 		<!-- 自定义返回 -->
-		<header-back :systeminfo='systeminfo' 
-					 :navbar-data='nvabarData' 
-					 :headerBtnPosi ="headerBtnPosi" 
-					 :isDelete="isDelete" 
-					 :isUsertype="1"
-					 @goSearchPath="handlSearchPath">
+		<header-back
+			:systeminfo="systeminfo"
+			:navbar-data="nvabarData"
+			:headerBtnPosi="headerBtnPosi"
+			:isDelete="isDelete"
+			:isUsertype="1"
+			@goSearchPath="handlSearchPath"
+		>
 		</header-back>
-		<view class="order-section-top" :style="{marginTop:navbarHeight+'px'}">
+		<view class="order-section-top" :style="{ marginTop: navbarHeight + 'px' }">
 			<scroll-view scroll-x scroll-with-animation class="tab-view" :scroll-left="scrollLeft">
-				<view v-for="(item,index) in orderTabBar" :key="index" class="tab-bar-item" :class="[currentTab==index ? 'active' : '']"
-				 :data-current="index" @tap.stop="onClickTab">
-					<text class="tab-bar-title">{{item.text}}</text>
+				<view
+					v-for="(item, index) in orderTabBar"
+					:key="index"
+					class="tab-bar-item"
+					:class="[currentTab == index ? 'active' : '']"
+					:data-current="index"
+					@tap.stop="onClickTab"
+				>
+					<text class="tab-bar-title">{{ item.text }}</text>
 				</view>
 			</scroll-view>
 			<view class="tab-screen">
-				<view v-for="(item,index) in screenTabBar" :key="index" class="tab-screen-item" :class="[screenTab == index ? 'active' : '']"
-				 :data-current="index" @tap.stop="onClickScreenTab(index)">{{item.text}}</view>
+				<view
+					v-for="(item, index) in screenTabBar"
+					:key="index"
+					class="tab-screen-item"
+					:class="[screenTab == index ? 'active' : '']"
+					:data-current="index"
+					@tap.stop="onClickScreenTab(index)"
+					>{{ item.text }}</view
+				>
 			</view>
 		</view>
-		<swiper class="tab-content" :current="currentTab" duration="80" @animationfinish="onChange" :style="{height:winHeight+'px'}" >
-			<swiper-item v-for="(tabItem,index) in orderTabBar" :key="index">
-				<tui-skeleton v-if="skeletonShow" backgroundColor="#fafafa" borderRadius="10rpx" :isLoading	="false" :loadingType="5"></tui-skeleton>
-				<scroll-view scroll-y class="scoll-y tui-skeleton" @scrolltolower="scrolltolower" :style="{height:winHeight+'px'}" >
-					<view  :class="{'tui-order-list':scrollTop >= 0}" class="tui-skeleton clearfix">
+		<swiper
+			class="tab-content"
+			:current="currentTab"
+			duration="80"
+			@animationfinish="onChange"
+			:style="{ height: winHeight + 'px' }"
+		>
+			<swiper-item v-for="(tabItem, index) in orderTabBar" :key="index">
+				<tui-skeleton
+					v-if="skeletonShow"
+					backgroundColor="#fafafa"
+					borderRadius="10rpx"
+					:isLoading="false"
+					:loadingType="5"
+				></tui-skeleton>
+				<scroll-view
+					scroll-y
+					class="scoll-y tui-skeleton"
+					@scrolltolower="scrolltolower"
+					:style="{ height: winHeight + 'px' }"
+				>
+					<view :class="{ 'tui-order-list': scrollTop >= 0 }" class="tui-skeleton clearfix">
 						<!-- 空白页 -->
-						<empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0" :typeIndex="currentTab" :navbarHeight="navbarHeight"></empty>
+						<empty
+							v-if="tabItem.loaded === true && tabItem.orderList.length === 0"
+							:typeIndex="currentTab"
+							:navbarHeight="navbarHeight"
+						></empty>
 						<!-- 列表 -->
 						<view v-else class="tui-order-content">
-							<view  class="tui-order-item" v-for="(order,orderIndex) in tabItem.orderList" :key="orderIndex" @click.stop="detail(order)">
+							<view
+								class="tui-order-item"
+								v-for="(order, orderIndex) in tabItem.orderList"
+								:key="orderIndex"
+								@click.stop="detail(order)"
+							>
 								<view class="order-title">
-									<view class="order-title-name">{{order.clubName ? order.clubName : ''}}</view>
+									<view class="order-title-name">{{ order.clubName ? order.clubName : '' }}</view>
 									<view class="order-title-t">
-										<view class="Rebate " v-if="order.rebateFlag==1">返佣</view>
-										<text class="bage-buss tui-skeleton-fillet" 
-											  v-if="order.orderSubmitType == 3 || order.orderSubmitType == 4">
-											  协销
+										<view class="Rebate " v-if="order.rebateFlag == 1">返佣</view>
+										<text
+											class="bage-buss tui-skeleton-fillet"
+											v-if="order.orderSubmitType == 3 || order.orderSubmitType == 4"
+										>
+											协销
 										</text>
-										<text class="bage-auto tui-skeleton-fillet" 
-											  v-if="order.orderSubmitType == 0 || order.orderSubmitType == 1 || order.orderSubmitType == 2">
-											  自主
+										<text
+											class="bage-auto tui-skeleton-fillet"
+											v-if="
+												order.orderSubmitType == 0 ||
+													order.orderSubmitType == 1 ||
+													order.orderSubmitType == 2
+											"
+										>
+											自主
 										</text>
 										<text class="bage-text tui-skeleton-fillet">
-											订单编号：{{order.orderNo}}({{order.orderId}})
+											订单编号：{{ order.orderNo }}({{ order.orderId }})
 										</text>
-										<image class="bage-icon" 
-											   src="https://static.caimei365.com/app/img/icon/icon-type@3x.png" 
-											   mode="widthFix" 
-											   v-if="order.secondHandOrderFlag == 1">
+										<image
+											class="bage-icon"
+											src="https://static.caimei365.com/app/img/icon/icon-type@3x.png"
+											mode="widthFix"
+											v-if="order.secondHandOrderFlag == 1"
+										>
 										</image>
 									</view>
 									<view class="order-title-b">
 										<view class="order-title-btxt tui-skeleton-fillet">
-											下单时间：{{order.orderTime}}
+											下单时间：{{ order.orderTime }}
 										</view>
 										<view class="order-title-tip tui-skeleton-fillet">
-											{{StateExpFormat(order.status)}}
+											{{ StateExpFormat(order.status) }}
 										</view>
 									</view>
 								</view>
-								<block v-for="(shop,index) in order.shopOrderList" :key="index">
+								<block v-for="(shop, index) in order.shopOrderList" :key="index">
 									<view class="goods-title">
 										<view v-if="shop.shopPromotion" class="floor-item-act">
-											<view class="floor-tags">{{shop.shopPromotion.name}}</view>	
+											<view class="floor-tags">{{ shop.shopPromotion.name }}</view>
 										</view>
-										<view class="title-text tui-skeleton-fillet">{{shop.shopName}}</view>
+										<view class="title-text tui-skeleton-fillet">{{ shop.shopName }}</view>
 									</view>
-									<view class="goods-item" v-for="(pros,prosIndex) in shop.orderProductList" :key="prosIndex">
+									<view
+										class="goods-item"
+										v-for="(pros, prosIndex) in shop.orderProductList"
+										:key="prosIndex"
+									>
 										<view class="goods-pros-t">
 											<view class="pros-img tui-skeleton-fillet">
 												<image :src="pros.image" alt="" />
-												<text class="tips" v-if="pros.productType ==2 || pros.productType ==1">赠品</text>
+												<text class="tips" v-if="pros.productType == 2 || pros.productType == 1"
+													>赠品</text
+												>
 											</view>
 											<view class="pros-product clearfix">
-												<view class="producttitle tui-skeleton-fillet">{{pros.name}}</view>
-												<view class="productspec tui-skeleton-fillet" v-if="pros.productCategory!=2" >
-													规格:{{pros.productUnit ? pros.productUnit : ''}}
+												<view class="producttitle tui-skeleton-fillet">{{ pros.name }}</view>
+												<view
+													class="productspec tui-skeleton-fillet"
+													v-if="pros.productCategory != 2"
+												>
+													规格:{{ pros.productUnit ? pros.productUnit : '' }}
 												</view>
 												<view class="productprice">
 													<view class="price tui-skeleton-fillet">
-														<text>￥{{pros.price | NumFormat}}</text>
+														<text>￥{{ pros.price | NumFormat }}</text>
 													</view>
 													<view class="count tui-skeleton-fillet">
-														<text class="small">x</text>{{pros.num}}
+														<text class="small">x</text>{{ pros.num }}
 													</view>
 												</view>
-												<view class="floor-item-act" v-if="pros.productPromotion!=null">
-													<view v-if="PromotionsFormat(pros.productPromotion)"  class="floor-tags">
-														{{pros.productPromotion.name}}
-														<text v-if ="pros.productPromotion!=null && pros.productPromotion.type !=3 ">
-															:￥{{ pros.productPromotion == null ? '0.00' : pros.productPromotion.touchPrice | NumFormat}}
+												<view class="floor-item-act" v-if="pros.productPromotion != null">
+													<view
+														v-if="PromotionsFormat(pros.productPromotion)"
+														class="floor-tags"
+													>
+														{{ pros.productPromotion.name }}
+														<text
+															v-if="
+																pros.productPromotion != null &&
+																	pros.productPromotion.type != 3
+															"
+														>
+															:￥{{
+																pros.productPromotion == null
+																	? '0.00'
+																	: pros.productPromotion.touchPrice | NumFormat
+															}}
 														</text>
 													</view>
-													<view v-else-if="pros.productPromotion.type !=3" class="floor-tags">
-														{{pros.productPromotion.name}}
-													</view>	
+													<view
+														v-else-if="pros.productPromotion.type != 3"
+														class="floor-tags"
+													>
+														{{ pros.productPromotion.name }}
+													</view>
 												</view>
-											</view>	
+											</view>
 										</view>
-									</view>	
+									</view>
 								</block>
 								<view class="order-footer">
-									<view class="order-footer-top" v-if="order.discountFee!=0">经理折扣：¥{{ order.discountFee | NumFormat }}</view>
+									<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" 
-											  v-if="order.status==31||order.status==32||order.status==33">
-											  已支付：<label style="color:#f94b4b ;">¥{{ order.receiptAmount | NumFormat }}</label>
+										<view class="count tui-skeleton-fillet">共{{ order.productCount }}件商品</view>
+										<view
+											class="money tui-skeleton-fillet"
+											v-if="order.status == 31 || order.status == 32 || order.status == 33"
+										>
+											已支付：<label style="color:#f94b4b ;"
+												>¥{{ order.receiptAmount | NumFormat }}</label
+											>
 										</view>
-										<view class="money tui-skeleton-fillet" v-else>待付总额：<label style="color:#f94b4b ;">
-											¥{{ order.pendingPayments | NumFormat }}</label>
+										<view class="money tui-skeleton-fillet" v-else
+											>待付总额：<label style="color:#f94b4b ;">
+												¥{{ order.pendingPayments | NumFormat }}</label
+											>
 										</view>
 									</view>
 								</view>
 								<!-- 底部button -->
-								<order-button ref="orderButton" 
-											  :status="order.status" 
-											  :orderId="order.orderId" 
-											  :rechargeGoods = "order.rechargeGoods"
-											  :userId = "order.userId"
-											  :secondHandOrderFlag = "order.secondHandOrderFlag"
-											  @buttonConfirm="handButtonConfirm">
+								<order-button
+									ref="orderButton"
+									:status="order.status"
+									:orderId="order.orderId"
+									:rechargeGoods="order.rechargeGoods"
+									:userId="order.userId"
+									:secondHandOrderFlag="order.secondHandOrderFlag"
+									@buttonConfirm="handButtonConfirm"
+								>
 								</order-button>
 							</view>
 							<!--加载loadding-->
 							<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-							<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text='nomoreText'></tui-nomore>
+							<tui-nomore
+								:visible="!pullUpOn"
+								:backgroundColor="'#ffffff'"
+								:text="nomoreText"
+							></tui-nomore>
 							<!--加载loadding-->
 						</view>
 					</view>
@@ -134,19 +223,16 @@
 			</swiper-item>
 		</swiper>
 		<!-- 分享弹窗 -->
-		<share-alert   v-if="isShareModal"
-					   :orderId="btnoRderID" 
-					   @shareConfirm ='onShareAppMessage'>
-		</share-alert>
+		<share-alert v-if="isShareModal" :orderId="btnoRderID" @shareConfirm="onShareAppMessage"> </share-alert>
 		<!-- 透明模态层 -->
-		<modal-layer v-if='isModalLayer'></modal-layer>
+		<modal-layer v-if="isModalLayer"></modal-layer>
 		<view class="aganBj" v-show="showAgan">
 			<view class="alertAgan">
 				<text class="title">{{ promptitle }}</text>
 				<view class="goods">
-					<view class="list" v-for="(item,index) in failList"  :key="index">
+					<view class="list" v-for="(item, index) in failList" :key="index">
 						<image class="image-left" :src="item.image"></image>
-						<view class="name-right">{{item.name}}</view>
+						<view class="name-right">{{ item.name }}</view>
 					</view>
 				</view>
 				<view class="BtnAll">
@@ -159,893 +245,930 @@
 </template>
 
 <script>
-	import headerBack from '@/components/cm-module/headerNavbar/header-back' 		//自定义顶部导航
-	import btSearch from '@/components/uni-search/bt-search.vue'				//搜索
-	import tuiSkeleton from '@/components/tui-skeleton/tui-skeleton'
-	import tuiLoadmore from '@/components/tui-components/loadmore/loadmore'
-	import tuiNomore from '@/components/tui-components/nomore/nomore'
-	import orderButton from '@/components/cm-module/orderDetails/sellerOrderButton' //操作按钮
-	import modalLayer from '@/components/modal-layer'
-	import empty from '@/components/empty'
-	import shareAlert from '@/components/cm-module/modelAlert/sellerShareAlert'			 //分享弹窗
+import headerBack from '@/components/cm-module/headerNavbar/header-back' //自定义顶部导航
+import btSearch from '@/components/uni-search/bt-search.vue' //搜索
+import tuiSkeleton from '@/components/tui-skeleton/tui-skeleton'
+import tuiLoadmore from '@/components/tui-components/loadmore/loadmore'
+import tuiNomore from '@/components/tui-components/nomore/nomore'
+import orderButton from '@/components/cm-module/orderDetails/sellerOrderButton' //操作按钮
+import modalLayer from '@/components/modal-layer'
+import empty from '@/components/empty'
+import shareAlert from '@/components/cm-module/modelAlert/sellerShareAlert' //分享弹窗
 
-	
-	export default {
-		components: {
-			headerBack,
-			empty,
-			btSearch,
-			tuiLoadmore,
-			tuiNomore,
-			orderButton,
-			tuiSkeleton,
-			modalLayer,
-			shareAlert
-		},
-		data() {
-			return {
-				orderTabBar: [{listType: 0,text: '全部订单',orderList: []},
-							  {listType: 1,text: '待确认',orderList: []},
-							  {listType: 2,text: '待付款',orderList: []},
-							  {listType: 3,text: '待发货',orderList: []},
-							  {listType: 4,text: '已发货',orderList: []},
-							  {listType: 5,text: '退货/款',orderList: []},
-							 ],
-				screenTabBar:[
-								{type:0,text:'全部订单'},
-								{type:1,text:'机构自主订单'},
-								{type:2,text:'协销订单'}
-							],			 
-				headerBtnPosi:	this.setHeaderBtnPosi(), //获取设备顶部胶囊高度
-				systeminfo:  this.setSysteminfo(),		 //获取设备信息
-				nvabarData: {							 //顶部自定义导航
-					showCapsule: 1, // 是否显示左上角图标  1表示显示  0表示不显示,
-					showSearch: 1,
-					title: '我的订单 ', // 导航栏中间的标题
-				},
-				CustomBar:this.CustomBar,// 顶部导航栏高度
-				winHeight: '', //窗口高度
-				currentTab: 0, //预设当前项的值
-				screenTab:0,   //筛选预设当前项的值
-				scrollLeft: 0 ,//tab标题的滚动条位置
-				serviceProviderId:0,//协销用户ID
-				orderData: [],
-				btnClubUserID:0,
-				btnoRderID: 0, //点击按钮传入的的订单ID
-				pageNum: 1,	  //页数
-				pageSize: 10,  //条数
-				scrollTop: 0,
-				deteleType:'',
-				skeletonShow: true,
-				isClickChange: false,
-				isShareModal: false,//控制分享弹窗
-				isSeller:false,
-				isModalLayer: false,
-				loadding: false,
-				pullUpOn: true,
-				hasNextPage: false,
-				pullFlag: true,
-				navbarHeight:'',
-				nomoreText: '上拉显示更多',
-				showAgan:false,
-				failList:[],  // 再来一单可购买商品
-				promptitle:'',
-				aganOrderId:0,// 再来一单商品id
-				userId:0
-				
-			}
-		},
-		onLoad(option) {
-			let self = this
-			if(option.type ==='detele'){self.isDelete = true}
-			self.currentTab = option.listType
-			self.getHeaderTopHeight()//设置自定义导航高度
-			//  高度自适应
-			uni.getSystemInfo({
-				success: function(res) {
-					let calc = res.windowHeight
-					self.winHeight = calc-self.CustomBar-82
-				}
-			})
-			this.$api.getStorage().then((resolve) =>{
-				this.userId = resolve.userId ? resolve.userId : 0
-			})
-		},
-		filters:{
-			NumFormat(value) {//处理金额
-				return Number(value).toFixed(2)
+export default {
+	components: {
+		headerBack,
+		empty,
+		btSearch,
+		tuiLoadmore,
+		tuiNomore,
+		orderButton,
+		tuiSkeleton,
+		modalLayer,
+		shareAlert
+	},
+	data() {
+		return {
+			orderTabBar: [
+				{ listType: 0, text: '全部订单', orderList: [] },
+				{ listType: 1, text: '待确认', orderList: [] },
+				{ listType: 2, text: '待付款', orderList: [] },
+				{ listType: 3, text: '待发货', orderList: [] },
+				{ listType: 4, text: '已发货', orderList: [] },
+				{ listType: 5, text: '退货/款', orderList: [] }
+			],
+			screenTabBar: [
+				{ type: 0, text: '全部订单' },
+				{ type: 1, text: '机构自主订单' },
+				{ type: 2, text: '协销订单' }
+			],
+			headerBtnPosi: this.setHeaderBtnPosi(), //获取设备顶部胶囊高度
+			systeminfo: this.setSysteminfo(), //获取设备信息
+			nvabarData: {
+				//顶部自定义导航
+				showCapsule: 1, // 是否显示左上角图标  1表示显示  0表示不显示,
+				showSearch: 1,
+				title: '我的订单 ' // 导航栏中间的标题
 			},
-		},
-		methods: {
-			// 滚动切换标签样式
-			onChange (e) {
-				let index = e.target.current || e.detail.current
-				if (this.isClickChange) {
-					this.currentTab = index
-					this.isClickChange = false
-					return
-				}
-				this.isClickChange = false
+			CustomBar: this.CustomBar, // 顶部导航栏高度
+			winHeight: '', //窗口高度
+			currentTab: 0, //预设当前项的值
+			screenTab: 0, //筛选预设当前项的值
+			scrollLeft: 0, //tab标题的滚动条位置
+			serviceProviderId: 0, //协销用户ID
+			orderData: [],
+			btnClubUserID: 0,
+			btnoRderID: 0, //点击按钮传入的的订单ID
+			pageNum: 1, //页数
+			pageSize: 10, //条数
+			scrollTop: 0,
+			deteleType: '',
+			skeletonShow: true,
+			isClickChange: false,
+			isShareModal: false, //控制分享弹窗
+			isSeller: false,
+			isModalLayer: false,
+			loadding: false,
+			pullUpOn: true,
+			hasNextPage: false,
+			pullFlag: true,
+			navbarHeight: '',
+			nomoreText: '上拉显示更多',
+			showAgan: false,
+			failList: [], // 再来一单可购买商品
+			promptitle: '',
+			aganOrderId: 0, // 再来一单商品id
+			userId: 0
+		}
+	},
+	onLoad(option) {
+		let self = this
+		if (option.type === 'detele') {
+			self.isDelete = true
+		}
+		self.currentTab = option.listType
+		self.getHeaderTopHeight() //设置自定义导航高度
+		//  高度自适应
+		uni.getSystemInfo({
+			success: function(res) {
+				let calc = res.windowHeight
+				self.winHeight = calc - self.CustomBar - 82
+			}
+		})
+		this.$api.getStorage().then(resolve => {
+			this.userId = resolve.userId ? resolve.userId : 0
+		})
+	},
+	filters: {
+		NumFormat(value) {
+			//处理金额
+			return Number(value).toFixed(2)
+		}
+	},
+	methods: {
+		// 滚动切换标签样式
+		onChange(e) {
+			let index = e.target.current || e.detail.current
+			if (this.isClickChange) {
 				this.currentTab = index
-				this.checkCor()
-				this.pageNum = 1
-				this.pullUpOn = true //切换时隐藏
-				this.loadding =  false //切换时隐藏
-				this.nomoreText = ''
-				this.getOrderDatainit(this.currentTab,'tabChange')
-			},
-			// 点击标题切换当前页时改变样式
-			onClickTab (e) {
-				let tabIndex = e.target.dataset.current || e.currentTarget.dataset.current
-				if (this.currentTab === tabIndex) {
-					return false
-				} else {
-					this.isClickChange = true
-					this.currentTab = tabIndex
-					this.pageNum = 1
-					this.pullUpOn = true //切换时隐藏
-					this.loadding =  false //切换时隐藏
-					this.getOrderDatainit(this.currentTab)
-				}
-			},
-			onClickScreenTab(index){
-				this.screenTab = index
+				this.isClickChange = false
+				return
+			}
+			this.isClickChange = false
+			this.currentTab = index
+			this.checkCor()
+			this.pageNum = 1
+			this.pullUpOn = true //切换时隐藏
+			this.loadding = false //切换时隐藏
+			this.nomoreText = ''
+			this.getOrderDatainit(this.currentTab, 'tabChange')
+		},
+		// 点击标题切换当前页时改变样式
+		onClickTab(e) {
+			let tabIndex = e.target.dataset.current || e.currentTarget.dataset.current
+			if (this.currentTab === tabIndex) {
+				return false
+			} else {
+				this.isClickChange = true
+				this.currentTab = tabIndex
 				this.pageNum = 1
 				this.pullUpOn = true //切换时隐藏
-				this.loadding =  false //切换时隐藏
-				this.nomoreText = ''
+				this.loadding = false //切换时隐藏
 				this.getOrderDatainit(this.currentTab)
-			},
-			//判断当前滚动超过一屏时，设置tab标题滚动条。
-			checkCor: function() {
-				if (this.currentTab > 3) {
-					//这里距离按实际计算
-					this.scrollLeft = 300
-				} else {
-					this.scrollLeft = 0
-				}
-			},
-			getOrderDatainit(index,source){
-				setTimeout(()=>{this.skeletonShow = false},1500)
-				let orderItem = this.orderTabBar[index]
-				let listType = orderItem.listType
-				if(source === 'tabChange' && orderItem.loaded === true){//tab切换只有第一次需要加载数据
-					return
-				}
-				setTimeout(()=>{
-					this.$api.getStorage().then((resolve) =>{
-						this.serviceProviderId = resolve.serviceProviderId
-						this.SellerService.GetSellerOrderList(
-							{
-								listType:index,
-								orderSubmitType:this.screenTab,
-								serviceProviderId:this.serviceProviderId,
-								pageNum:1,
-								pageSize:this.pageSize,
-							}
-						).then(response =>{
+			}
+		},
+		onClickScreenTab(index) {
+			this.screenTab = index
+			this.pageNum = 1
+			this.pullUpOn = true //切换时隐藏
+			this.loadding = false //切换时隐藏
+			this.nomoreText = ''
+			this.getOrderDatainit(this.currentTab)
+		},
+		//判断当前滚动超过一屏时，设置tab标题滚动条。
+		checkCor: function() {
+			if (this.currentTab > 3) {
+				//这里距离按实际计算
+				this.scrollLeft = 300
+			} else {
+				this.scrollLeft = 0
+			}
+		},
+		getOrderDatainit(index, source) {
+			setTimeout(() => {
+				this.skeletonShow = false
+			}, 1500)
+			let orderItem = this.orderTabBar[index]
+			let listType = orderItem.listType
+			if (source === 'tabChange' && orderItem.loaded === true) {
+				//tab切换只有第一次需要加载数据
+				return
+			}
+			setTimeout(() => {
+				this.$api.getStorage().then(resolve => {
+					this.serviceProviderId = resolve.serviceProviderId
+					this.SellerService.GetSellerOrderList({
+						listType: index,
+						orderSubmitType: this.screenTab,
+						serviceProviderId: this.serviceProviderId,
+						pageNum: 1,
+						pageSize: this.pageSize
+					})
+						.then(response => {
 							let data = response.data
-							if(data.list && data.list.length>0){
-								let orderList = data.list.filter(item=>{
+							if (data.list && data.list.length > 0) {
+								let orderList = data.list.filter(item => {
 									//添加不同状态下订单的表现形式
 									item = Object.assign(item, this.StateExpFormat(item.listType))
 									return item
 								})
-								orderItem.orderList =[]
-								orderList.forEach(item=>{
+								orderItem.orderList = []
+								orderList.forEach(item => {
 									orderItem.orderList.push(item)
 								})
 								//loaded新字段用于表示数据加载完毕，如果为空可以显示空白页
 								this.$set(orderItem, 'loaded', true)
 								this.hasNextPage = data.hasNextPage
-								if(this.hasNextPage){
+								if (this.hasNextPage) {
 									this.pullUpOn = false
 									this.nomoreText = '上拉显示更多'
-								}else{
-									if(orderItem.orderList.length < 2){
+								} else {
+									if (orderItem.orderList.length < 2) {
 										this.pullUpOn = true
-									}else{
+									} else {
 										this.pullUpOn = false
 										this.nomoreText = '已至底部'
 									}
 								}
 							}
-						}).catch(error =>{
-							this.$util.msg(error.msg,2000)
 						})
-					})
-				}, 600)	
-			}, 
-			getOnReachBottomData(index){//上拉加载
-				this.SellerService.GetSellerOrderList(
-					{
-						listType:index,
-						orderSubmitType:this.screenTab,
-						serviceProviderId:this.serviceProviderId,
-						pageNum:this.pageNum+=1,
-						pageSize:this.pageSize,
-					}
-				).then(response =>{
+						.catch(error => {
+							this.$util.msg(error.msg, 2000)
+						})
+				})
+			}, 600)
+		},
+		getOnReachBottomData(index) {
+			//上拉加载
+			this.SellerService.GetSellerOrderList({
+				listType: index,
+				orderSubmitType: this.screenTab,
+				serviceProviderId: this.serviceProviderId,
+				pageNum: (this.pageNum += 1),
+				pageSize: this.pageSize
+			})
+				.then(response => {
 					let orderItem = this.orderTabBar[index]
 					let data = response.data
-					this.hasNextPage =data.hasNextPage
+					this.hasNextPage = data.hasNextPage
 					orderItem.orderList = orderItem.orderList.concat(data.list)
-					this.pullFlag = false// 防上拉暴滑
-					setTimeout(()=>{this.pullFlag = true},500)
-					if(this.hasNextPage){
+					this.pullFlag = false // 防上拉暴滑
+					setTimeout(() => {
+						this.pullFlag = true
+					}, 500)
+					if (this.hasNextPage) {
 						this.pullUpOn = false
 						this.nomoreText = '上拉显示更多'
-					}else{
+					} else {
 						this.loadding = false
 						this.pullUpOn = false
 						this.nomoreText = '已至底部'
 					}
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
 				})
-			},
-			scrolltolower() {
-				if(this.hasNextPage){
-					this.loadding = true
-					this.pullUpOn = true
-					this.getOnReachBottomData(this.currentTab)
-				}	
-			},
-			detail(order) {//订单详情跳转
-				this.isModalLayer = true	
-				this.$api.navigateTo(`/pages/seller/order/order-details?listType=${this.currentTab}&orderId=${order.orderId}&userId=${order.userId}`)
-			},
-			handButtonConfirm(data) {//获取点击
-				this.handShowAlert(data)
-				this.btnoRderID = data.orderId
-			},
-			handShowAlert(data) {//执行
-				switch(data.type){
-					case 'query':
-						this.isModalLayer = true
-						this.$api.navigateTo('/pages/user/order/order-logistics?orderId='+data.orderId)
-						break
-					case 'delete':
-						this.handOrderDetele(data.orderId)
-						break
-					case 'cancel':
-						this.handCenceConfirm(data.orderId)
-						break
-					case 'confirm':
-						this.handOrderConfirm(data.orderId)
-						break
-					case 'again':
-						this.handOrderAgain(data.orderId)
-						break	
-				}
-			},
-			handOrderAgain(orderId){
-				this.aganOrderId = orderId
-				this.SellerService.SellerCreateOrderAgain(
-					{
-						confirmFlag:0,	
-						orderId:this.aganOrderId,
-						serviceProviderId:this.serviceProviderId
-					}
-				).then(res =>{
-					if(res.code==0){
-						this.$api.setStorage('orderUserInfo',{clubID:res.data.clubId,againBuyProductIds:res.data.productIds,userID:res.data.userId})
+				.catch(error => {
+					this.$util.msg(error.msg, 2000)
+				})
+		},
+		scrolltolower() {
+			if (this.hasNextPage) {
+				this.loadding = true
+				this.pullUpOn = true
+				this.getOnReachBottomData(this.currentTab)
+			}
+		},
+		detail(order) {
+			//订单详情跳转
+			this.isModalLayer = true
+			this.$api.navigateTo(
+				`/pages/seller/order/order-details?listType=${this.currentTab}&orderId=${order.orderId}&userId=${
+					order.userId
+				}`
+			)
+		},
+		handButtonConfirm(data) {
+			//获取点击
+			this.handShowAlert(data)
+			this.btnoRderID = data.orderId
+		},
+		handShowAlert(data) {
+			//执行
+			switch (data.type) {
+				case 'query':
+					this.isModalLayer = true
+					this.$api.navigateTo('/pages/user/order/order-logistics?orderId=' + data.orderId)
+					break
+				case 'delete':
+					this.handOrderDetele(data.orderId)
+					break
+				case 'cancel':
+					this.handCenceConfirm(data.orderId)
+					break
+				case 'confirm':
+					this.handOrderConfirm(data.orderId)
+					break
+				case 'again':
+					this.handOrderAgain(data.orderId)
+					break
+			}
+		},
+		handOrderAgain(orderId) {
+			this.aganOrderId = orderId
+			this.SellerService.SellerCreateOrderAgain({
+				confirmFlag: 0,
+				orderId: this.aganOrderId,
+				serviceProviderId: this.serviceProviderId
+			})
+				.then(res => {
+					if (res.code == 0) {
+						this.$api.setStorage('orderUserInfo', {
+							clubID: res.data.clubId,
+							againBuyProductIds: res.data.productIds,
+							userID: res.data.userId
+						})
 						this.$api.navigateTo('/pages/seller/cart/cart')
 					}
-				}).catch(error =>{
-					if(error.code== -3){
+				})
+				.catch(error => {
+					if (error.code == -3) {
 						this.showAgan = true
 						this.promptitle = error.msg
 						this.failList = error.data
-					}else if(error.code== -2){
-						this.$util.modal('',error.msg,'确定','',false,() =>{})
-					}else{
-						this.$util.msg(error.msg,2000)
+					} else if (error.code == -2) {
+						this.$util.modal('', error.msg, '确定', '', false, () => {})
+					} else {
+						this.$util.msg(error.msg, 2000)
 					}
 				})
-			},
-			closeBtn(){//
-				this.showAgan = false
-			},
-			cancelBtn(){// 再来一单弹窗
-				this.SellerService.SellerCreateOrderAgain(
-					{
-						serviceProviderId:this.serviceProviderId,
-						orderId:this.aganOrderId,
-						confirmFlag:1,
-					}
-				).then(res =>{
-					if(res.code==0){
-						this.$api.navigateTo('/pages/seller/cart/cart')
-						this.showAgan = false
-					}
-				})
-			},
-			handOrderConfirm (orderId){//确认订单
-				this.$util.modal('提示','确认此订单？','确定','取消',true,() =>{
-					this.OrderService.AffirmOrder({orderId:orderId}).then(response =>{
-						this.$util.msg(response.msg,2000,true,'success')
+		},
+		closeBtn() {
+			//
+			this.showAgan = false
+		},
+		cancelBtn() {
+			// 再来一单弹窗
+			this.SellerService.SellerCreateOrderAgain({
+				serviceProviderId: this.serviceProviderId,
+				orderId: this.aganOrderId,
+				confirmFlag: 1
+			}).then(res => {
+				if (res.code == 0) {
+					this.$api.navigateTo('/pages/seller/cart/cart')
+					this.showAgan = false
+				}
+			})
+		},
+		handOrderConfirm(orderId) {
+			//确认订单
+			this.$util.modal('提示', '确认此订单？', '确定', '取消', true, () => {
+				this.OrderService.AffirmOrder({ orderId: orderId })
+					.then(response => {
+						this.$util.msg(response.msg, 2000, true, 'success')
 						setTimeout(() => {
 							this.getOrderDatainit(this.currentTab)
-						},2000)
-					}).catch(error =>{
-						this.$util.msg(error.msg,2000)
+						}, 2000)
 					})
-				})
-			},
-			handOrderDetele(orderId){//删除订单
-				this.$util.modal('提示','确认删除该订单吗？','确定','取消',true,() =>{
-					this.OrderService.DeleteOrder({orderId:orderId}).then(response =>{
-						this.$util.msg(response.msg,2000,true,'success')
+					.catch(error => {
+						this.$util.msg(error.msg, 2000)
+					})
+			})
+		},
+		handOrderDetele(orderId) {
+			//删除订单
+			this.$util.modal('提示', '确认删除该订单吗？', '确定', '取消', true, () => {
+				this.OrderService.DeleteOrder({ orderId: orderId })
+					.then(response => {
+						this.$util.msg(response.msg, 2000, true, 'success')
 						setTimeout(() => {
 							this.getOrderDatainit(this.currentTab)
-						},2000)
-					}).catch(error =>{
-						this.$util.msg(error.msg,2000)
+						}, 2000)
 					})
-				})
-			},
-			handCenceConfirm(orderId){//取消订单
-				this.$util.modal('提示','确认取消该订单吗？','确定','取消',true,() =>{
-					this.OrderService.CancelOrder({orderId:orderId}).then(response =>{
-						this.$util.msg(response.msg,2000,true,'success')
+					.catch(error => {
+						this.$util.msg(error.msg, 2000)
+					})
+			})
+		},
+		handCenceConfirm(orderId) {
+			//取消订单
+			this.$util.modal('提示', '确认取消该订单吗？', '确定', '取消', true, () => {
+				this.OrderService.CancelOrder({ orderId: orderId })
+					.then(response => {
+						this.$util.msg(response.msg, 2000, true, 'success')
 						setTimeout(() => {
 							this.getOrderDatainit(this.currentTab)
-						},2000)
-					}).catch(error =>{
-						this.$util.msg(error.msg,2000)
+						}, 2000)
 					})
-				})
-			},
-			handlSearchPath(){
-				this.$api.navigateTo('/pages/seller/search/search-order')
-			},
-			onShareAppMessage (res){//分享转发
-				this.isShareModal = false
-				if (res.from === 'button') {// 来自页面内转发按钮
-					// console.log(res.target)
-			    }
-				return {
-					title: '您有新的订单，请点击查看~',
-					path: `/pages/user/order/order-sharelogin?orderId=${this.btnoRderID}&userId=${this.btnClubUserID}&serviceProviderId=${this.serviceProviderId}`,
-					imageUrl:'https://img.caimei365.com/group1/M00/03/95/Cmis216Sk_SABnOFABZCgCzFV_g063.png'
+					.catch(error => {
+						this.$util.msg(error.msg, 2000)
+					})
+			})
+		},
+		handlSearchPath() {
+			this.$api.navigateTo('/pages/seller/search/search-order')
+		},
+		onShareAppMessage(res) {
+			//分享转发
+			this.isShareModal = false
+			if (res.from === 'button') {
+				// 来自页面内转发按钮
+				// console.log(res.target)
+			}
+			return {
+				title: '您有新的订单，请点击查看~',
+				path: `/pages/user/order/order-sharelogin?orderId=${this.btnoRderID}&userId=${
+					this.btnClubUserID
+				}&serviceProviderId=${this.serviceProviderId}`,
+				imageUrl: 'https://img.caimei365.com/group1/M00/03/95/Cmis216Sk_SABnOFABZCgCzFV_g063.png'
+			}
+		},
+		PromotionsFormat(promo) {
+			//促销活动类型数据处理
+			if (promo != null) {
+				if (promo.type == 1 && promo.mode == 1) {
+					return true
+				} else {
+					return false
 				}
-			},
-			PromotionsFormat(promo){//促销活动类型数据处理
-				if(promo!=null){
-					if(promo.type == 1 && promo.mode == 1){
-						return true
-					}else{
-						return false
-					}
+			}
+			return false
+		},
+		//订单状态文字和颜色
+		StateExpFormat(state) {
+			let stateText = '',
+				stateTextObject = {
+					0: '待确认',
+					4: '交易完成',
+					5: '订单完成',
+					6: '已关闭',
+					7: '交易全退',
+					77: '交易全退',
+					11: '待付款待发货',
+					12: '待付款部分发货',
+					13: '待付款已发货',
+					21: '部分付款待发货',
+					22: '部分付款部分发货',
+					23: '部分付款已发货',
+					31: '已付款待发货',
+					32: '已付款部分发货',
+					33: '已付款已发货',
+					111: '待付款待发货'
 				}
-				return false
-			},
-			//订单状态文字和颜色
-			StateExpFormat (state){
-				let stateText = '',
-					stateTextObject={
-						0:'待确认',
-						4:'交易完成',
-						5:'订单完成',
-						6:'已关闭',
-						7:'交易全退',
-						77:'交易全退',
-						11:'待付款待发货',
-						12:'待付款部分发货',
-						13:'待付款已发货',
-						21:'部分付款待发货',
-						22:'部分付款部分发货',
-						23:'部分付款已发货',
-						31:'已付款待发货',
-						32:'已付款部分发货',
-						33:'已付款已发货',
-						111:'待付款待发货',
-					}
-				Object.keys(stateTextObject).forEach(key => {
-					if(key == state){
-						stateText = stateTextObject[key]
-					}
-				})
-				return stateText
-			},
-			orderPriceToFixed (n){
-				let price =''
-				price = n.toFixed(2)
-				return price
-			},
-			getHeaderTopHeight (){ // 状态栏高度
-				let statusBarHeight = this.systeminfo.statusBarHeight
-				let headerPosi = this.headerBtnPosi
-				let btnPosi = { // 胶囊实际位置，坐标信息不是左上角原点
-				      height: headerPosi.height,
-				      width: headerPosi.width,
-				      // 胶囊top - 状态栏高度
-				      top: headerPosi.top - statusBarHeight,
-				      // 胶囊bottom - 胶囊height - 状态栏height （现胶囊bottom 为距离导航栏底部的长度）
-				      bottom: headerPosi.bottom - headerPosi.height - statusBarHeight,
-				      // 屏幕宽度 - 胶囊right
-				      right: this.systeminfo.screenWidth - headerPosi.right
+			Object.keys(stateTextObject).forEach(key => {
+				if (key == state) {
+					stateText = stateTextObject[key]
 				}
-				this.navbarHeight= headerPosi.bottom + btnPosi.bottom// 原胶囊bottom + 现胶囊bottom
-			},
-			setHeaderBtnPosi (){
-				// 获得胶囊按钮位置信息
-				let headerBtnPosi = uni.getMenuButtonBoundingClientRect()
-				return headerBtnPosi
-			},
-			setSysteminfo (){
-				let systeminfo
-				uni.getSystemInfo({ // 获取设备信息
-					success: (res) => {
-						systeminfo = res
-					},
-				})
-				return systeminfo
+			})
+			return stateText
+		},
+		orderPriceToFixed(n) {
+			let price = ''
+			price = n.toFixed(2)
+			return price
+		},
+		getHeaderTopHeight() {
+			// 状态栏高度
+			let statusBarHeight = this.systeminfo.statusBarHeight
+			let headerPosi = this.headerBtnPosi
+			let btnPosi = {
+				// 胶囊实际位置，坐标信息不是左上角原点
+				height: headerPosi.height,
+				width: headerPosi.width,
+				// 胶囊top - 状态栏高度
+				top: headerPosi.top - statusBarHeight,
+				// 胶囊bottom - 胶囊height - 状态栏height （现胶囊bottom 为距离导航栏底部的长度）
+				bottom: headerPosi.bottom - headerPosi.height - statusBarHeight,
+				// 屏幕宽度 - 胶囊right
+				right: this.systeminfo.screenWidth - headerPosi.right
 			}
+			this.navbarHeight = headerPosi.bottom + btnPosi.bottom // 原胶囊bottom + 现胶囊bottom
 		},
-		onPageScroll(e) {
-			this.scrollTop = e.scrollTop
+		setHeaderBtnPosi() {
+			// 获得胶囊按钮位置信息
+			let headerBtnPosi = uni.getMenuButtonBoundingClientRect()
+			return headerBtnPosi
 		},
-		onShow() {
-			this.isModalLayer = false
-			this.getOrderDatainit(this.currentTab)
+		setSysteminfo() {
+			let systeminfo
+			uni.getSystemInfo({
+				// 获取设备信息
+				success: res => {
+					systeminfo = res
+				}
+			})
+			return systeminfo
 		}
+	},
+	onPageScroll(e) {
+		this.scrollTop = e.scrollTop
+	},
+	onShow() {
+		this.isModalLayer = false
+		this.getOrderDatainit(this.currentTab)
 	}
+}
 </script>
 
 <style lang="scss">
-	page{
-		background-color: #FFFFFF;
-	}
-	/*tabbar start*/
-	::-webkit-scrollbar {
-		width: 0;
-		height: 0;
-		color: transparent;
-	}
-	.order-section-top{
-		width: 100%;
-		position: fixed;
-		top: 0;
-		left: 0;
-		z-index: 99;
-		background: #FFFFFF;
-		.tab-screen{
+page {
+	background-color: #ffffff;
+}
+/*tabbar start*/
+::-webkit-scrollbar {
+	width: 0;
+	height: 0;
+	color: transparent;
+}
+.order-section-top {
+	width: 100%;
+	position: fixed;
+	top: 0;
+	left: 0;
+	z-index: 99;
+	background: #ffffff;
+	.tab-screen {
+		height: 60rpx;
+		width: 702rpx;
+		padding: 10rpx 24rpx;
+		border-top: 1px solid #f7f7f7;
+		border-bottom: 1px solid #f7f7f7;
+		display: flex;
+		justify-content: center;
+		justify-items: center;
+		.tab-screen-item {
+			flex: 1;
 			height: 60rpx;
-			width: 702rpx;
-			padding: 10rpx 24rpx;
-			border-top: 1px solid #F7F7F7;
-			border-bottom: 1px solid #F7F7F7;
-			display: flex;
-			justify-content: center;
-			justify-items: center;
-			.tab-screen-item{
-				flex: 1;
-				height: 60rpx;
-				border-radius: 10rpx;
-				background: #F7F7F7;
-				margin-right: 22rpx;
-				line-height: 66rpx;
-				font-size: $font-size-28;
-				color: #333333;
-				text-align: center;
-				&.active{
-					color: $color-system;
-				}
-				&:last-child{
-					margin-right: 0;
-				}
+			border-radius: 10rpx;
+			background: #f7f7f7;
+			margin-right: 22rpx;
+			line-height: 66rpx;
+			font-size: $font-size-28;
+			color: #333333;
+			text-align: center;
+			&.active {
+				color: $color-system;
+			}
+			&:last-child {
+				margin-right: 0;
 			}
 		}
 	}
-	.tab-view::before {
-		content: '';
-		position: absolute;
-		border-bottom: 1rpx solid #eaeef1;
-		-webkit-transform: scaleY(0.5);
-		transform: scaleY(0.5);
-		bottom: 0;
-		right: 0;
-		left: 0;
-	}
-	.tab-view {
-		width: 100%;
-		height: 80rpx;
-		overflow: hidden;
-		box-sizing: border-box;
-		background: #fff;
-		white-space: nowrap;
-		border-top: 1px solid #F7F7F7;
+}
+.tab-view::before {
+	content: '';
+	position: absolute;
+	border-bottom: 1rpx solid #eaeef1;
+	-webkit-transform: scaleY(0.5);
+	transform: scaleY(0.5);
+	bottom: 0;
+	right: 0;
+	left: 0;
+}
+.tab-view {
+	width: 100%;
+	height: 80rpx;
+	overflow: hidden;
+	box-sizing: border-box;
+	background: #fff;
+	white-space: nowrap;
+	border-top: 1px solid #f7f7f7;
+}
+.tab-bar-item {
+	padding: 0;
+	height: 80rpx;
+	min-width: 80rpx;
+	line-height: 80rpx;
+	margin: 0 28rpx;
+	display: inline-block;
+	text-align: center;
+	box-sizing: border-box;
+	&.active {
+		border-bottom: 6rpx solid $color-system;
 	}
-	.tab-bar-item {
-		padding: 0;
+	.tab-bar-title {
 		height: 80rpx;
-		min-width: 80rpx;
 		line-height: 80rpx;
-		margin: 0 28rpx;
-		display: inline-block;
-		text-align: center;
-		box-sizing: border-box;
-		&.active {
-			border-bottom: 6rpx solid $color-system;
-		}
-		.tab-bar-title {
-			height: 80rpx;
-			line-height: 80rpx;
-			font-size:$font-size-28;
-			color: $text-color;
-		}
-		&.active .tab-bar-title {
-			color: $color-system !important;
-		}
+		font-size: $font-size-28;
+		color: $text-color;
 	}
-	.container {
-		padding-bottom: env(safe-area-inset-bottom);
-		height: auto;
-		position: relative;
+	&.active .tab-bar-title {
+		color: $color-system !important;
 	}
-	.tui-order-content{
+}
+.container {
+	padding-bottom: env(safe-area-inset-bottom);
+	height: auto;
+	position: relative;
+}
+.tui-order-content {
+	width: 100%;
+	height: auto;
+}
+.tui-order-list {
+	width: 100%;
+	position: relative;
+}
+.tui-order-item {
+	display: flex;
+	flex-direction: column;
+	width: 702rpx;
+	padding: 20rpx 24rpx 0 24rpx;
+	background: #fff;
+	border-bottom: 20rpx solid #f7f7f7;
+}
+.order-title {
+	width: 100%;
+	height: auto;
+	.order-title-name {
 		width: 100%;
-		height: auto;
+		height: 72rpx;
+		border-bottom: 1px solid #f7f7f7;
+		line-height: 72rpx;
+		text-align: left;
+		font-size: $font-size-28;
+		color: #333333;
 	}
-	.tui-order-list {
+	.order-title-t {
 		width: 100%;
+		height: 68rpx;
+		float: left;
+		line-height: 68rpx;
 		position: relative;
-	}
-	.tui-order-item {
-		display: flex;
-		flex-direction: column;
-		width: 702rpx;
-		padding:20rpx 24rpx 0 24rpx;
-		background: #fff;
-		border-bottom: 20rpx solid #F7F7F7;
-	}
-	.order-title{
-		width: 100%;
-		height: auto;
-		.order-title-name{
-			width: 100%;
-			height: 72rpx;
-			border-bottom: 1px solid #F7F7F7;
-			line-height: 72rpx;
-			text-align: left;
-			font-size: $font-size-28;
-			color: #333333;
+		.bage-icon {
+			width: 50rpx;
+			height: 50rpx;
+			display: block;
+			position: absolute;
+			right: 0;
+			top: 9rpx;
 		}
-		.order-title-t{
-			width: 100%;
-			height: 68rpx;
-			float: left;
+		.bage-buss {
+			display: inline-block;
+			width: 72rpx;
+			height: 30rpx;
+			background: radial-gradient(circle, rgba(255, 39, 180, 1) 0%, rgba(193, 77, 245, 1) 100%);
+			border-radius: 4rpx;
+			line-height: 30rpx;
+			font-size: $font-size-22;
+			text-align: center;
+			color: #ffffff;
+		}
+		.bage-auto {
+			display: inline-block;
+			width: 72rpx;
+			height: 30rpx;
+			background: radial-gradient(circle, rgba(255, 180, 39, 1) 0%, rgba(245, 142, 77, 1) 100%);
+			border-radius: 4rpx;
+			line-height: 30rpx;
+			font-size: $font-size-22;
+			text-align: center;
+			color: #ffffff;
+		}
+		.Rebate {
+			display: inline-block;
+			width: 72rpx;
+			height: 32rpx;
+			background: #ff7a51;
+			border-radius: 6rpx;
+			line-height: 32rpx;
+			text-align: center;
+			color: #ffffff;
+			margin-top: 10rpx;
+			font-size: $font-size-22;
+			margin-right: 20rpx;
+		}
+		.bage-text {
+			display: inline-block;
+			font-size: $font-size-28;
 			line-height: 68rpx;
-			position: relative;
-			.bage-icon{
-				width: 50rpx;
-				height: 50rpx;
-				display: block;
-				position: absolute;
-				right: 0;
-				top: 9rpx;
-			}
-			.bage-buss{
-				display: inline-block;
-				width: 72rpx;
-				height: 30rpx;
-				background:radial-gradient(circle,rgba(255,39,180,1) 0%,rgba(193,77,245,1) 100%);
-				border-radius: 4rpx;
-				line-height: 30rpx;
-				font-size: $font-size-22;
-				text-align: center;
-				color: #FFFFFF;
-			}
-			.bage-auto{
-				display: inline-block;
-				width: 72rpx;
-				height: 30rpx;
-				background:radial-gradient(circle,rgba(255,180,39,1) 0%,rgba(245,142,77,1) 100%);
-				border-radius: 4rpx;
-				line-height: 30rpx;
-				font-size: $font-size-22;
-				text-align: center;
-				color: #FFFFFF;
-			}
-			.Rebate{
-				display: inline-block;
-				width: 72rpx;
-				height: 32rpx;
-				background:#ff7a51;
-				border-radius: 6rpx;
-				line-height: 32rpx;
-				text-align: center;
-				color: #FFFFFF;
-				margin-top: 10rpx;
-				font-size: $font-size-22;
-				margin-right: 20rpx;
-			}
-			.bage-text{
-				display: inline-block;
-				font-size: $font-size-28;
-				line-height: 68rpx;
-				text-align: left;
-				color: $text-color;
-				margin-left: 10rpx;
-			}
+			text-align: left;
+			color: $text-color;
+			margin-left: 10rpx;
 		}
-		.order-title-b{
-			width: 100%;
-			height: 40rpx;
+	}
+	.order-title-b {
+		width: 100%;
+		height: 40rpx;
+		float: left;
+		margin-top: 8rpx;
+		.order-title-btxt {
 			float: left;
-			margin-top: 8rpx;
-			.order-title-btxt{
-				float: left;
-				font-size: $font-size-28;
-				line-height: 40rpx;
-				color: #999999;
-				text-align: lef
-			}
-			.order-title-tip{
-				float: right;
-				font-size: $font-size-28;
-				line-height: 40rpx;
-				text-align: right;
-				color: #FF2A2A;
-			}
+			font-size: $font-size-28;
+			line-height: 40rpx;
+			color: #999999;
+			text-align: lef;
+		}
+		.order-title-tip {
+			float: right;
+			font-size: $font-size-28;
+			line-height: 40rpx;
+			text-align: right;
+			color: #ff2a2a;
 		}
 	}
-	.goods-title{
-		width: 100%;
+}
+.goods-title {
+	width: 100%;
+	height: 56rpx;
+	float: left;
+	margin-top: 10rpx;
+	.floor-item-act {
 		height: 56rpx;
+		text-align: center;
+		box-sizing: border-box;
 		float: left;
-		margin-top:10rpx;
-		.floor-item-act{
-			height: 56rpx;
+		padding: 10rpx 0;
+		margin-right: 12rpx;
+		.floor-tags {
+			height: 28rpx;
+			border-radius: 6rpx;
+			background-color: #ffffff;
+			line-height: 28rpx;
+			color: $color-system;
 			text-align: center;
-			box-sizing: border-box;
+			display: inline-block;
+			padding: 0 16rpx;
+			font-size: $font-size-20;
+			border: 1px solid #e15616;
 			float: left;
-			padding: 10rpx 0;
-			margin-right: 12rpx;
-			.floor-tags{
-				height: 28rpx;
-				border-radius: 6rpx;
-				background-color: #FFFFFF;
-				line-height: 28rpx;
-				color: $color-system;
-				text-align: center;
-				display: inline-block;
-				padding:0 16rpx;
-				font-size: $font-size-20;
-				border: 1px solid #E15616;
-				float: left;
-			}
 		}
-		.title-text{
-			width: 400rpx;
-			overflow: hidden;
-			text-overflow:ellipsis;
-			white-space: nowrap;
-			float: left;
-			font-size: $font-size-28;
-			color: $text-color;
-			text-align: left;
-			line-height: 56rpx;
-			font-weight: bold;
+	}
+	.title-text {
+		width: 400rpx;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+		float: left;
+		font-size: $font-size-28;
+		color: $text-color;
+		text-align: left;
+		line-height: 56rpx;
+		font-weight: bold;
+	}
+}
+.goods-item {
+	width: 100%;
+	height: auto;
+}
+.goods-pros-t {
+	width: 100%;
+	height: auto;
+	padding: 24rpx 0;
+	.pros-img {
+		float: left;
+		width: 210rpx;
+		height: 100%;
+		border-radius: 10rpx;
+		margin: 0 26rpx 0 0;
+		position: relative;
+		.tips {
+			display: inline-block;
+			width: 80rpx;
+			height: 40rpx;
+			background-image: linear-gradient(214deg, #ff4500 0%, #ff5800 53%, #ff4367 100%);
+			line-height: 40rpx;
+			text-align: center;
+			font-size: $font-size-24;
+			color: #ffffff;
+			border-radius: 10rpx 0 10rpx 0;
+			position: absolute;
+			top: 0;
+			left: 0;
+		}
+		image {
+			width: 210rpx;
+			height: 210rpx;
+			border-radius: 10rpx;
+			border: 1px solid #f3f3f3;
 		}
 	}
-	.goods-item{
+}
+.pros-product {
+	width: 460rpx;
+	height: 100%;
+	line-height: 36rpx;
+	font-size: $font-size-26;
+	position: relative;
+	float: left;
+	.producttitle {
 		width: 100%;
+		display: inline-block;
 		height: auto;
-	}	
-	.goods-pros-t{
+		text-overflow: ellipsis;
+		display: -webkit-box;
+		word-break: break-all;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 2;
+		overflow: hidden;
+		margin-bottom: 8rpx;
+	}
+	.productspec {
+		height: 36rpx;
+		color: #999999;
+		text-overflow: ellipsis;
+		display: -webkit-box;
+		word-break: break-all;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 1;
+		overflow: hidden;
+	}
+	.productprice {
+		height: 48rpx;
 		width: 100%;
-		height: auto;
-		padding:24rpx 0;
-		.pros-img{
+		float: left;
+		.price {
+			line-height: 48rpx;
+			font-size: $font-size-28;
+			width: 48%;
+			color: #ff2a2a;
 			float: left;
-			width: 210rpx;
+			font-weight: bold;
+		}
+		.count {
 			height: 100%;
-			border-radius: 10rpx;
-			margin:0 26rpx 0 0;
+			float: right;
 			position: relative;
-			.tips{
-				display: inline-block;
-				width: 80rpx;
-				height: 40rpx;
-				background-image: linear-gradient(214deg, #ff4500 0%, #ff5800 53%, #ff4367 100%);
-				line-height: 40rpx;
-				text-align: center;
-				font-size: $font-size-24;
-				color: #FFFFFF;
-				border-radius:10rpx 0 10rpx 0 ;
-				position: absolute;
-				top:0;
-				left: 0;
-			}
-			image{
-				width: 210rpx;
-				height: 210rpx;
-				border-radius: 10rpx;
-				border:1px solid #f3f3f3;
+			.small {
+				color: #666666;
 			}
 		}
 	}
-	.pros-product{
-		width: 460rpx;
-		height: 100%;
-		line-height: 36rpx;
-		font-size: $font-size-26;	
-		position: relative;
+	.floor-item-act {
+		width: 100%;
+		height: 56rpx;
+		text-align: center;
+		box-sizing: border-box;
 		float: left;
-		.producttitle{
-			width: 100%;
-			display: inline-block;
-			height: auto;							
-			text-overflow:ellipsis;
-			display: -webkit-box;
-			word-break: break-all;
-			-webkit-box-orient: vertical;
-			-webkit-line-clamp: 2;
-			overflow: hidden;
-			margin-bottom: 8rpx;
-		}
-		.productspec{
-			height: 36rpx;
-			color: #999999;
-			text-overflow:ellipsis;
-			display: -webkit-box;
-			word-break: break-all;
-			-webkit-box-orient: vertical;
-			-webkit-line-clamp: 1;
-			overflow: hidden;
-		}
-		.productprice{
-			height: 48rpx;
-			width: 100%;
-			float: left;
-			.price{
-				line-height: 48rpx;
-				font-size: $font-size-28;
-				width: 48%;
-				color: #FF2A2A;
-				float: left;
-				font-weight: bold;
-			}
-			.count{
-				height: 100%;
-				float: right;
-				position: relative;
-				.small{
-					color: #666666;
-				}
-			}
-		}
-		.floor-item-act{
-			width: 100%;
-			height: 56rpx;
+		padding: 0 0 10rpx 0;
+		.floor-tags {
+			height: 28rpx;
+			border-radius: 6rpx;
+			background-color: #ffffff;
+			line-height: 28rpx;
+			color: $color-system;
 			text-align: center;
-			box-sizing: border-box;
+			display: inline-block;
+			padding: 0 16rpx;
+			font-size: $font-size-20;
+			border: 1px solid #e15616;
 			float: left;
-			padding:0 0 10rpx 0;
-			.floor-tags{
-				height: 28rpx;
-				border-radius: 6rpx;
-				background-color: #FFFFFF;
-				line-height: 28rpx;
-				color: $color-system;
-				text-align: center;
-				display: inline-block;
-				padding:0 16rpx;
-				font-size: $font-size-20;
-				border: 1px solid #E15616;
-				float: left;
-			}
 		}
 	}
-	.order-footer{
+}
+.order-footer {
+	width: 100%;
+	height: 78rpx;
+	float: left;
+	.order-footer-top {
+		width: 100%;
+		height: 34rpx;
+		line-height: 34rpx;
+		font-size: $font-size-24;
+		color: #999999;
+		text-align: right;
+	}
+	.order-footer-bot {
 		width: 100%;
-		height: 78rpx;
 		float: left;
-		.order-footer-top{
-			width: 100%;
-			height: 34rpx;
-			line-height: 34rpx;
-			font-size: $font-size-24;
-			color: #999999;
-			text-align: right;
-		}
-		.order-footer-bot{
-			width: 100%;
+		height: 48rpx;
+		line-height: 48rpx;
+		font-size: $font-size-28;
+		font-weight: bold;
+		color: $text-color;
+		.count {
+			width: 50%;
 			float: left;
-			height: 48rpx;
-			line-height: 48rpx;
-			font-size: $font-size-28;
-			font-weight: bold;
-			color: $text-color;
-			.count{
-				width: 50%;
-				float: left;
-				text-align: left;
-			}
-			.money{
-				width: 50%;
-				float: right;
-				text-align: right;
-			}
+			text-align: left;
+		}
+		.money {
+			width: 50%;
+			float: right;
+			text-align: right;
 		}
 	}
-	.aganBj {
-	    position: fixed;
-	    left: 0;
-	    top: 0;
-	    bottom: 0;
-	    width: 100%;
-	    height: 100%;
-	    background-color: rgba(0, 0, 0, .5);
-	    z-index: 999999;
-		.alertAgan {
-		    position: absolute;
-		    top: 50%;
-		    left: 50%;
-		    transform: translate(-50%, -50%);
-		    width:580rpx;
-		    background-color: #fff;
-		    border-radius: 16rpx;
-			.title{
-				font-size: 30rpx;
-				color: #333333;
-				line-height: 42rpx;
-				padding: 30rpx;
-				display: block;
-			}
-			.goods{
-				padding: 0 30rpx;
-				.list{
-					padding: 10px 0;
-					border-bottom: 1rpx solid #e1e1e1;
-					margin: 10rpx 0;
-					.image-left{
-						width: 86rpx;
-						height: 86rpx;
-						border: 2rpx solid #e1e1e1;
-						border-radius: 6rpx;
-						display: inline-block;
-						vertical-align: middle;
-					}
-					.name-right{
-						display: inline-block;
-						width: 416rpx;
-						margin-left: 15rpx;
-						font-size: 26rpx;
-						color: #666666;
-						vertical-align: middle;
-						word-break: break-all;
-						overflow: hidden;
-						text-overflow: ellipsis;
-						display: -webkit-inline-box;
-						-webkit-line-clamp: 2;
-						-webkit-box-orient: vertical;
-					}
+}
+.aganBj {
+	position: fixed;
+	left: 0;
+	top: 0;
+	bottom: 0;
+	width: 100%;
+	height: 100%;
+	background-color: rgba(0, 0, 0, 0.5);
+	z-index: 999999;
+	.alertAgan {
+		position: absolute;
+		top: 50%;
+		left: 50%;
+		transform: translate(-50%, -50%);
+		width: 580rpx;
+		background-color: #fff;
+		border-radius: 16rpx;
+		.title {
+			font-size: 30rpx;
+			color: #333333;
+			line-height: 42rpx;
+			padding: 30rpx;
+			display: block;
+		}
+		.goods {
+			padding: 0 30rpx;
+			.list {
+				padding: 10px 0;
+				border-bottom: 1rpx solid #e1e1e1;
+				margin: 10rpx 0;
+				.image-left {
+					width: 86rpx;
+					height: 86rpx;
+					border: 2rpx solid #e1e1e1;
+					border-radius: 6rpx;
+					display: inline-block;
+					vertical-align: middle;
+				}
+				.name-right {
+					display: inline-block;
+					width: 416rpx;
+					margin-left: 15rpx;
+					font-size: 26rpx;
+					color: #666666;
+					vertical-align: middle;
+					word-break: break-all;
+					overflow: hidden;
+					text-overflow: ellipsis;
+					display: -webkit-inline-box;
+					-webkit-line-clamp: 2;
+					-webkit-box-orient: vertical;
 				}
 			}
-			.BtnAll{
-				margin-top: 30rpx;
-				.btn{
-				 	display: inline-block;
-					width: 290rpx;
-					height: 90rpx;
-					line-height: 90rpx;
-					text-align: center;
-					&.closebtn{
-						border-radius: 0px 0px 0px 10px;
-						color:#999999 ;
-						background: #efefef;
-					}
-					&.cancel{
-						border-radius: 0px 0px 8px 0px;
-						background: $btn-confirm;
-						color: #fff;
-					}
+		}
+		.BtnAll {
+			margin-top: 30rpx;
+			.btn {
+				display: inline-block;
+				width: 290rpx;
+				height: 90rpx;
+				line-height: 90rpx;
+				text-align: center;
+				&.closebtn {
+					border-radius: 0px 0px 0px 10px;
+					color: #999999;
+					background: #efefef;
+				}
+				&.cancel {
+					border-radius: 0px 0px 8px 0px;
+					background: $btn-confirm;
+					color: #fff;
 				}
 			}
 		}
 	}
+}
 </style>

pages/seller/search/search-order.vue

@@ -5,134 +5,207 @@
 			<view class="search">
 				<view class="search-input">
 					<text class="iconfont icon-iconfonticonfontsousuo1"></text>
-					<input maxlength="20" focus type="text" value="" confirm-type="search" @focus="onFocus" @input="onShowClose" @confirm="subMitSearch()" placeholder="请输入商品关键词" v-model.trim="listQuery.searchWord"/>
+					<input
+						maxlength="20"
+						focus
+						type="text"
+						value=""
+						confirm-type="search"
+						@focus="onFocus"
+						@input="onShowClose"
+						@confirm="subMitSearch()"
+						placeholder="请输入商品关键词"
+						v-model.trim="listQuery.searchWord"
+					/>
 					<text class="iconfont icon-shanchu1" v-if="isShowClose" @click="delInputText()"></text>
 				</view>
 				<view class="search-btn" @click="subMitSearch()">搜索</view>
 			</view>
 		</view>
 		<view class="search-container-history" v-if="!isShowWrapper">
-			<view :class="'s-' + themeClass" v-if="serachRecordList.length>0">
-				<view class="header">
-					搜索历史<text class="iconfont icon-shanchu" @click="confirmDetele"></text>
-				</view>
+			<view :class="'s-' + themeClass" v-if="serachRecordList.length > 0">
+				<view class="header"> 搜索历史<text class="iconfont icon-shanchu" @click="confirmDetele"></text> </view>
 				<view class="list">
-					<view v-for="(item,index) in serachRecordList" :key="index" @click="keywordsClick(item.searchWord)">{{item.searchWord}}</view>
+					<view
+						v-for="(item, index) in serachRecordList"
+						:key="index"
+						@click="keywordsClick(item.searchWord)"
+						>{{ item.searchWord }}</view
+					>
 				</view>
 			</view>
 		</view>
-		<view class=" order-container" v-if="isShowWrapper" :style="{'overflow' : 'auto','height': (showSkeleton? windowHeight + 'px' : 'auto')}">
-			<scroll-view  class="tui-skeleton" :style="{'height':scrollHeight+'px'}"  @scrolltolower="scrolltolower" scroll-y >
-				<view  :class="{'tui-order-list':scrollTop >= 0}" class="tui-skeleton clearfix">
+		<view
+			class=" order-container"
+			v-if="isShowWrapper"
+			:style="{ overflow: 'auto', height: showSkeleton ? windowHeight + 'px' : 'auto' }"
+		>
+			<scroll-view
+				class="tui-skeleton"
+				:style="{ height: scrollHeight + 'px' }"
+				@scrolltolower="scrolltolower"
+				scroll-y
+			>
+				<view :class="{ 'tui-order-list': scrollTop >= 0 }" class="tui-skeleton clearfix">
 					<!-- 空白页 -->
 					<empty v-if="isShowEmpty" :navbarHeight="navbarHeight"></empty>
 					<!-- 列表 -->
 					<view v-else class="tui-order-content">
-						<view  class="tui-order-item" v-for="(order,orderIndex) in orderList" :key="orderIndex" @click.stop="detail(order)">
+						<view
+							class="tui-order-item"
+							v-for="(order, orderIndex) in orderList"
+							:key="orderIndex"
+							@click.stop="detail(order)"
+						>
 							<view class="order-title">
-								<view class="order-title-name">{{order.clubName ? order.clubName : ''}}</view>
+								<view class="order-title-name">{{ order.clubName ? order.clubName : '' }}</view>
 								<view class="order-title-t">
-									<text class="bage-buss tui-skeleton-fillet" v-if="order.orderSubmitType == 3 || order.orderSubmitType == 4">协销</text>
-									<text class="bage-auto tui-skeleton-fillet" 
-										  v-if="order.orderSubmitType == 0 || order.orderSubmitType == 1 || order.orderSubmitType == 2">
-										  自主
+									<text
+										class="bage-buss tui-skeleton-fillet"
+										v-if="order.orderSubmitType == 3 || order.orderSubmitType == 4"
+										>协销</text
+									>
+									<text
+										class="bage-auto tui-skeleton-fillet"
+										v-if="
+											order.orderSubmitType == 0 ||
+												order.orderSubmitType == 1 ||
+												order.orderSubmitType == 2
+										"
+									>
+										自主
 									</text>
 									<text class="bage-text tui-skeleton-fillet">
-										订单号：{{order.orderNo}}({{order.orderId}})
+										订单号：{{ order.orderNo }}({{ order.orderId }})
 									</text>
-									<image class="bage-icon" 
-										   src="https://static.caimei365.com/app/img/icon/icon-type@3x.png" 
-										   mode="widthFix" 
-										   v-if="order.secondHandOrderFlag == 1">
+									<image
+										class="bage-icon"
+										src="https://static.caimei365.com/app/img/icon/icon-type@3x.png"
+										mode="widthFix"
+										v-if="order.secondHandOrderFlag == 1"
+									>
 									</image>
 								</view>
 								<view class="order-title-b">
-									<view class="order-title-btxt tui-skeleton-fillet">下单时间：{{order.orderTime}}</view>
-									<view class="order-title-tip tui-skeleton-fillet">{{StateExpFormat(order.status)}}</view>
+									<view class="order-title-btxt tui-skeleton-fillet"
+										>下单时间：{{ order.orderTime }}</view
+									>
+									<view class="order-title-tip tui-skeleton-fillet">{{
+										StateExpFormat(order.status)
+									}}</view>
 								</view>
 							</view>
-							<block v-for="(shop,index) in order.shopOrderList" :key="index">
+							<block v-for="(shop, index) in order.shopOrderList" :key="index">
 								<view class="goods-title">
 									<view v-if="shop.shopPromotion" class="floor-item-act">
-										<view class="floor-tags">{{shop.shopPromotion.name}}</view>	
+										<view class="floor-tags">{{ shop.shopPromotion.name }}</view>
 									</view>
-									<view class="title-text tui-skeleton-fillet">{{shop.shopName}}</view>
+									<view class="title-text tui-skeleton-fillet">{{ shop.shopName }}</view>
 								</view>
-								<view class="goods-item" v-for="(pros,prosIndex) in shop.orderProductList" :key="prosIndex">
+								<view
+									class="goods-item"
+									v-for="(pros, prosIndex) in shop.orderProductList"
+									:key="prosIndex"
+								>
 									<view class="goods-pros-t">
 										<view class="pros-img tui-skeleton-fillet">
 											<image :src="pros.image" alt="" />
-											<text class="tips" v-if="pros.productType ==2 || pros.productType ==1">赠品</text>
+											<text class="tips" v-if="pros.productType == 2 || pros.productType == 1"
+												>赠品</text
+											>
 										</view>
 										<view class="pros-product clearfix">
-											<view class="producttitle tui-skeleton-fillet">{{pros.name}}</view>
-											<view class="productspec tui-skeleton-fillet" v-if="pros.productCategory != 2">规格:{{pros.productUnit}}</view>
+											<view class="producttitle tui-skeleton-fillet">{{ pros.name }}</view>
+											<view
+												class="productspec tui-skeleton-fillet"
+												v-if="pros.productCategory != 2"
+												>规格:{{ pros.productUnit }}</view
+											>
 											<view class="productprice">
 												<view class="price tui-skeleton-fillet">
 													<text>￥{{ pros.price | NumFormat }}</text>
 												</view>
 												<view class="count tui-skeleton-fillet">
-													<text class="small">x</text>{{pros.num}}
+													<text class="small">x</text>{{ pros.num }}
 												</view>
 											</view>
-											<view class="floor-item-act" v-if="pros.productPromotion!=null">
-												<view v-if="PromotionsFormat(pros.productPromotion)"  class="floor-tags">
-													{{pros.productPromotion.name}}
-													<text v-if ="pros.productPromotion!=null && pros.productPromotion.type !=3 ">
-														:￥{{ pros.productPromotion == null ? '0.00' : pros.productPromotion.touchPrice | NumFormat }}
+											<view class="floor-item-act" v-if="pros.productPromotion != null">
+												<view v-if="PromotionsFormat(pros.productPromotion)" class="floor-tags">
+													{{ pros.productPromotion.name }}
+													<text
+														v-if="
+															pros.productPromotion != null &&
+																pros.productPromotion.type != 3
+														"
+													>
+														:￥{{
+															pros.productPromotion == null
+																? '0.00'
+																: pros.productPromotion.touchPrice | NumFormat
+														}}
 													</text>
 												</view>
-												<view v-else-if="pros.productPromotion.type !=3" class="floor-tags">{{pros.productPromotion.name}}</view>	
+												<view v-else-if="pros.productPromotion.type != 3" class="floor-tags">{{
+													pros.productPromotion.name
+												}}</view>
 											</view>
-										</view>	
+										</view>
 									</view>
-								</view>	
+								</view>
 							</block>
 							<view class="order-footer">
-								<view class="order-footer-top" v-if="order.discountFee!=0">经理折扣：¥{{ order.discountFee | NumFormat }}</view>
+								<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" v-if="order.status==31||order.status==32||order.status==33">
-										已支付：<label style="color:#f94b4b ;">¥{{ order.receiptAmount | NumFormat }}</label>
+									<view class="count tui-skeleton-fillet">共{{ order.productCount }}件商品</view>
+									<view
+										class="money tui-skeleton-fillet"
+										v-if="order.status == 31 || order.status == 32 || order.status == 33"
+									>
+										已支付：<label style="color:#f94b4b ;"
+											>¥{{ order.receiptAmount | NumFormat }}</label
+										>
 									</view>
 									<view class="money tui-skeleton-fillet" v-else>
-										待付总额：<label style="color:#f94b4b ;">¥{{ order.pendingPayments | NumFormat }}</label>
+										待付总额：<label style="color:#f94b4b ;"
+											>¥{{ order.pendingPayments | NumFormat }}</label
+										>
 									</view>
 								</view>
 							</view>
 							<!-- 底部button -->
-							<order-button ref="orderButton" 
-										  :status="order.status" 
-										  :rechargeGoods = "order.rechargeGoods"
-										  :orderId="order.orderId" 
-										  :userId="order.userId" 
-										  :secondHandOrderFlag = "order.secondHandOrderFlag"
-										  @buttonConfirm="handButtonConfirm">
+							<order-button
+								ref="orderButton"
+								:status="order.status"
+								:rechargeGoods="order.rechargeGoods"
+								:orderId="order.orderId"
+								:userId="order.userId"
+								:secondHandOrderFlag="order.secondHandOrderFlag"
+								@buttonConfirm="handButtonConfirm"
+							>
 							</order-button>
 						</view>
 						<!--加载loadding-->
 						<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-						<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text='nomoreText'></tui-nomore>
+						<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text="nomoreText"></tui-nomore>
 						<!--加载loadding-->
 					</view>
 				</view>
 			</scroll-view>
 		</view>
 		<!-- 分享弹窗 -->
-		<share-alert   v-if="isShareModal"
-					   :orderId="btnoRderID" 
-					   @shareConfirm ='onShareAppMessage'>
-		</share-alert>
+		<share-alert v-if="isShareModal" :orderId="btnoRderID" @shareConfirm="onShareAppMessage"> </share-alert>
 		<!-- 透明模态层 -->
-		<modal-layer v-if='isModalLayer'></modal-layer>
+		<modal-layer v-if="isModalLayer"></modal-layer>
 		<!-- 再来一单弹窗 -->
 		<view class="aganBj" v-show="showAgan">
 			<view class="alertAgan">
 				<text class="title">{{ promptitle }}</text>
 				<view class="goods">
-					<view class="list" v-for="(item,index) in failList"  :key="index">
+					<view class="list" v-for="(item, index) in failList" :key="index">
 						<image class="image-left" :src="item.image"></image>
-						<view class="name-right">{{item.name}}</view>
+						<view class="name-right">{{ item.name }}</view>
 					</view>
 				</view>
 				<view class="BtnAll">
@@ -145,908 +218,947 @@
 </template>
 
 <script>
-	import orSearch from '@/components/uni-search/or-search.vue'
-	import tuiLoadmore from "@/components/tui-components/loadmore/loadmore"
-	import tuiNomore from "@/components/tui-components/nomore/nomore"
-	import orderButton from '@/components/cm-module/orderDetails/sellerOrderButton' //按钮
-	import modalLayer from "@/components/modal-layer"
-	import empty from "@/components/empty";
-	import shareAlert from '@/components/cm-module/modelAlert/sellerShareAlert'			 //分享弹窗
-	import authorize from '@/common/config/authorize.js'
-	const defaultListQuery = {
-			pageNum:1,			// 页码
-			pageSize:10,		// 每页条数
-			serviceProviderId:0,// 用户Id
-			searchWord:''		// 搜索关键词
-		};
-	export default {
-		components: {
-			orSearch,
-			tuiLoadmore,
-			tuiNomore,
-			orderButton,
-			empty,
-			shareAlert,
-		},
-		data() {
-			return {
-				listQuery:Object.assign({}, defaultListQuery),
-				themeClass: 'block',
-				isShowClose:false,							//是否显示清空输入框图标
-				isSearchHistory:false,						//是都显示搜索历史
-				serachRecordList:[],
-				isShowWrapper:false,
-				isModallayer:false,
-				isShowEmpty:false,
-				windowHeight: '',
-				showSkeleton: true,
-				userId:0,
-				orderList: [],
-				btnClubUserID:0,
-				btnoRderID: 0, //点击按钮传入的的订单ID
-				scrollTop: 0,
-				deteleType:'',
-				skeletonShow: true,
-				isShareModal: false,//控制分享弹窗
-				isCenceModal: false,//控制取消订单弹窗
-				isShowDelModal: false,//控制删除订单弹窗
-				isModalLayer: false,
-				loadding: false,
-				pullUpOn: true,
-				hasNextPage: false,
-				pullFlag: true,
-				navbarHeight:'',
-				nomoreText: '上拉显示更多',
-				scrollHeight:'',
-				showAgan:false,
-				failList:[],  // 再来一单可购买商品
-				promptitle:'',
-				aganOrderId:0
+import orSearch from '@/components/uni-search/or-search.vue'
+import tuiLoadmore from '@/components/tui-components/loadmore/loadmore'
+import tuiNomore from '@/components/tui-components/nomore/nomore'
+import orderButton from '@/components/cm-module/orderDetails/sellerOrderButton' //按钮
+import modalLayer from '@/components/modal-layer'
+import empty from '@/components/empty'
+import shareAlert from '@/components/cm-module/modelAlert/sellerShareAlert' //分享弹窗
+import authorize from '@/common/config/authorize.js'
+const defaultListQuery = {
+	pageNum: 1, // 页码
+	pageSize: 10, // 每页条数
+	serviceProviderId: 0, // 用户Id
+	searchWord: '' // 搜索关键词
+}
+export default {
+	components: {
+		orSearch,
+		tuiLoadmore,
+		tuiNomore,
+		orderButton,
+		empty,
+		shareAlert
+	},
+	data() {
+		return {
+			listQuery: Object.assign({}, defaultListQuery),
+			themeClass: 'block',
+			isShowClose: false, //是否显示清空输入框图标
+			isSearchHistory: false, //是都显示搜索历史
+			serachRecordList: [],
+			isShowWrapper: false,
+			isModallayer: false,
+			isShowEmpty: false,
+			windowHeight: '',
+			showSkeleton: true,
+			userId: 0,
+			orderList: [],
+			btnClubUserID: 0,
+			btnoRderID: 0, //点击按钮传入的的订单ID
+			scrollTop: 0,
+			deteleType: '',
+			skeletonShow: true,
+			isShareModal: false, //控制分享弹窗
+			isCenceModal: false, //控制取消订单弹窗
+			isShowDelModal: false, //控制删除订单弹窗
+			isModalLayer: false,
+			loadding: false,
+			pullUpOn: true,
+			hasNextPage: false,
+			pullFlag: true,
+			navbarHeight: '',
+			nomoreText: '上拉显示更多',
+			scrollHeight: '',
+			showAgan: false,
+			failList: [], // 再来一单可购买商品
+			promptitle: '',
+			aganOrderId: 0
+		}
+	},
+	onLoad() {
+		this.initGetSerachRecord()
+	},
+	filters: {
+		NumFormat(value) {
+			//处理金额
+			return Number(value).toFixed(2)
+		}
+	},
+	methods: {
+		subMitSearch() {
+			if (this.listQuery.searchWord == '') {
+				this.$util.msg('请输入订单编号', 2000)
+			} else {
+				this.commodityList = []
+				this.getOrderDatainit()
 			}
 		},
-		onLoad() {
-		  this.initGetSerachRecord()
+		async initGetSerachRecord() {
+			const userInfo = await this.$api.getStorage()
+			this.listQuery.serviceProviderId = userInfo.serviceProviderId ? userInfo.serviceProviderId : 0
+			this.userId = userInfo.userId ? userInfo.userId : 0
+			this.OrderService.SearchOrderHistory({ userId: this.userId })
+				.then(response => {
+					this.serachRecordList = response.data
+					if (this.serachRecordList.length > 0) {
+						this.isSearchHistory = true
+					} else {
+						this.isSearchHistory = false
+					}
+				})
+				.catch(error => {
+					this.$util.msg(error.msg, 2000)
+				})
+		},
+		onShowClose() {
+			//输入框失去焦点时触发
+			this.inputEmpty(this.listQuery.searchWord)
 		},
-		filters:{
-			NumFormat(value) {//处理金额
-				return Number(value).toFixed(2);
-			},
+		onFocus() {
+			//输入框获取焦点时触发
+			this.inputEmpty(this.listQuery.searchWord)
+			this.initGetSerachRecord()
 		},
-		methods:{
-			subMitSearch() {
-				if (this.listQuery.searchWord == '') {
-					this.$util.msg('请输入订单编号',2000);
-				}else{
-					this.commodityList =[]
-					this.getOrderDatainit()
-				}
-			},
-			async initGetSerachRecord(){
-					const userInfo = await this.$api.getStorage()
-					this.listQuery.serviceProviderId = userInfo.serviceProviderId ? userInfo.serviceProviderId : 0
-					this.userId = userInfo.userId ? userInfo.userId : 0
-					this.OrderService.SearchOrderHistory({userId:this.userId}).then(response =>{
-						this.serachRecordList = response.data
-						if(this.serachRecordList.length>0){
-							this.isSearchHistory = true
-						}else{
-							this.isSearchHistory = false
-						}
-					}).catch(error =>{
-						this.$util.msg(error.msg,2000)
+		delInputText() {
+			//清除输入框内容
+			this.listQuery.searchWord = ''
+			this.isShowClose = false
+			this.isShowWrapper = false
+			this.inputEmpty(this.listQuery.searchWord)
+			this.initGetSerachRecord()
+		},
+		keywordsClick(item) {
+			//关键词搜索与历史搜索
+			this.listQuery.searchWord = item
+			this.isShowClose = true
+			this.subMitSearch()
+		},
+		confirmDetele() {
+			//清空历史记录
+			this.$util.modal('提示', '确定删除历史记录？', '确定', '取消', true, () => {
+				this.OrderService.ClearOrderHistory({ userId: this.userId })
+					.then(response => {
+						this.$util.msg('删除记录成功', 2000, true, 'success')
+						this.serachRecordList = []
 					})
-			},
-			onShowClose () { //输入框失去焦点时触发
-				this.inputEmpty(this.listQuery.searchWord)
-			},
-			onFocus () { //输入框获取焦点时触发
-				this.inputEmpty(this.listQuery.searchWord)
-				this.initGetSerachRecord()
-			},
-			delInputText () { //清除输入框内容
-				this.listQuery.searchWord = ''
-				this.isShowClose = false
-				this.isShowWrapper = false
-				this.inputEmpty(this.listQuery.searchWord)
-				this.initGetSerachRecord()
-			},
-			keywordsClick (item) {	//关键词搜索与历史搜索
-				this.listQuery.searchWord = item;
-				this.isShowClose = true;
-				this.subMitSearch();
-			},
-			confirmDetele () {//清空历史记录
-				this.$util.modal('提示','确定删除历史记录？','确定','取消',true,() =>{
-					this.OrderService.ClearOrderHistory({userId:this.userId}).then(response =>{
-						this.$util.msg('删除记录成功',2000,true,'success')
-						this.serachRecordList=[]
-					}).catch(error =>{
-						this.$util.msg(error.msg,2000)
+					.catch(error => {
+						this.$util.msg(error.msg, 2000)
 					})
-				})
-			},
-			inputEmpty(val){
-				this.isShowWrapper = false
-				if(val != ''){
-					this.isShowClose = true
-				}else{					
-					this.isShowClose = false
-				}
-			},
-			getOrderDatainit(index,source){
-				/**
-				 * @订单初始化加载  仅加载第一页码
-				 * @param：searchWord(关键词)
-				 * @param：serviceProviderId(用户ID)
-				 * @param：pageNum(页码数)
-				 * @param：listQuery.pageSize(每页条数)
-				 * @param：organizeID(全局变量组织ID)
-				 */ 
-				this.SellerService.getSellerOrderList(this.listQuery).then(response =>{
+			})
+		},
+		inputEmpty(val) {
+			this.isShowWrapper = false
+			if (val != '') {
+				this.isShowClose = true
+			} else {
+				this.isShowClose = false
+			}
+		},
+		getOrderDatainit(index, source) {
+			/**
+			 * @订单初始化加载  仅加载第一页码
+			 * @param：searchWord(关键词)
+			 * @param：serviceProviderId(用户ID)
+			 * @param：pageNum(页码数)
+			 * @param：listQuery.pageSize(每页条数)
+			 * @param：organizeID(全局变量组织ID)
+			 */
+
+			this.SellerService.getSellerOrderList(this.listQuery)
+				.then(response => {
 					this.isShowWrapper = true
 					this.showSkeleton = true
-					let data = response.data;
-					if(data.list && data.list.length > 0){
-						let filrerData = data.list.filter(item=>{
+					let data = response.data
+					if (data.list && data.list.length > 0) {
+						let filrerData = data.list.filter(item => {
 							//添加不同状态下订单的表现形式
-							item = Object.assign(item, this.StateExpFormat(item.state));
-							return item;
-						});
-						this.orderList =[];
-						filrerData.forEach(item=>{
-							this.orderList.push(item);
+							item = Object.assign(item, this.StateExpFormat(item.state))
+							return item
 						})
-						this.hasNextPage = data.hasNextPage;
-						if(this.hasNextPage){
+						this.orderList = []
+						filrerData.forEach(item => {
+							this.orderList.push(item)
+						})
+						this.hasNextPage = data.hasNextPage
+						if (this.hasNextPage) {
 							this.pullUpOn = false
 							this.nomoreText = '上拉显示更多'
-						}else{
-							if(this.orderList.length < 2){
+						} else {
+							if (this.orderList.length < 2) {
 								this.pullUpOn = true
-							}else{
+							} else {
 								this.pullUpOn = false
 								this.nomoreText = '已至底部'
 							}
 						}
 						this.isShowEmpty = false
-					}else{
+					} else {
 						this.isShowEmpty = true
 					}
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
 				})
-			}, 
-			getOnReachBottomData(index){//上拉加载
-				this.listQuery.pageNum+=1
-				this.SellerService.getSellerOrderList(this.listQuery).then(response =>{
+				.catch(error => {
+					this.$util.msg(error.msg, 2000)
+				})
+		},
+		getOnReachBottomData(index) {
+			//上拉加载
+			this.listQuery.pageNum += 1
+			this.SellerService.getSellerOrderList(this.listQuery)
+				.then(response => {
 					let data = response.data
-					this.hasNextPage = data.hasNextPage;
+					this.hasNextPage = data.hasNextPage
 					this.orderList = this.orderList.concat(data.list)
-					this.pullFlag = false;// 防上拉暴滑
-					setTimeout(()=>{this.pullFlag = true;},500)
-					if(this.hasNextPage){
+					this.pullFlag = false // 防上拉暴滑
+					setTimeout(() => {
+						this.pullFlag = true
+					}, 500)
+					if (this.hasNextPage) {
 						this.pullUpOn = false
 						this.nomoreText = '上拉显示更多'
-					}else{
+					} else {
 						this.loadding = false
 						this.pullUpOn = false
 						this.nomoreText = '已至底部'
 					}
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
 				})
-			},
-			scrolltolower() {
-				if(this.hasNextPage){
-					this.loadding = true
-					this.pullUpOn = true
-					this.showSkeleton = false
-					this.getOnReachBottomData();
-				}	
-			},
-			detail(order) {//订单详情跳转
-				this.isModalLayer = true;	
-				this.$api.navigateTo(`/pages/seller/order/order-details?type=seacrch&orderId=${order.orderId}&userId=${order.userId}`)
-			},
-			handButtonConfirm(data) {//获取点击
-				this.handShowAlert(data)
-				this.btnoRderID = data.orderId
-			},
-			handShowAlert(data) {//执行
-				switch(data.type){
-					case 'query':
-						this.isModalLayer = true;
-						this.$api.navigateTo('/pages/user/order/order-logistics?orderID='+data.orderId)
-						break
-					case 'delete':
-						this.handOrderDetele(data.orderId);
-						break
-					case 'cancel':
-						this.handCenceConfirm(data.orderId)
-						break
-					case 'confirm':
-						this.handOrderConfirm(data.orderId);
-						break
-					case 'again':
-						this.handOrderAgain(data.orderId);
-						
-				}
-			},
-			handOrderAgain(orderId){// 再来一单
-				this.aganOrderId = orderId;
-				this.SellerService.SellerCreateOrderAgain(
-					{
-						confirmFlag:0,	
-						orderId:this.aganOrderId,
-						serviceProviderId:this.listQuery.serviceProviderId
-					}
-				).then(res =>{
-					if(res.code==0){
-						this.$api.setStorage('orderUserInfo',{clubID:res.data.clubId,againBuyProductIds:res.data.againBuyProductIds})
-						this.$api.navigateTo('/pages/seller/cart/cart');
+				.catch(error => {
+					this.$util.msg(error.msg, 2000)
+				})
+		},
+		scrolltolower() {
+			if (this.hasNextPage) {
+				this.loadding = true
+				this.pullUpOn = true
+				this.showSkeleton = false
+				this.getOnReachBottomData()
+			}
+		},
+		detail(order) {
+			//订单详情跳转
+			this.isModalLayer = true
+			this.$api.navigateTo(
+				`/pages/seller/order/order-details?type=seacrch&orderId=${order.orderId}&userId=${order.userId}`
+			)
+		},
+		handButtonConfirm(data) {
+			//获取点击
+			this.handShowAlert(data)
+			this.btnoRderID = data.orderId
+		},
+		handShowAlert(data) {
+			//执行
+			switch (data.type) {
+				case 'query':
+					this.isModalLayer = true
+					this.$api.navigateTo('/pages/user/order/order-logistics?orderID=' + data.orderId)
+					break
+				case 'delete':
+					this.handOrderDetele(data.orderId)
+					break
+				case 'cancel':
+					this.handCenceConfirm(data.orderId)
+					break
+				case 'confirm':
+					this.handOrderConfirm(data.orderId)
+					break
+				case 'again':
+					this.handOrderAgain(data.orderId)
+			}
+		},
+		handOrderAgain(orderId) {
+			// 再来一单
+			this.aganOrderId = orderId
+			this.SellerService.SellerCreateOrderAgain({
+				confirmFlag: 0,
+				orderId: this.aganOrderId,
+				serviceProviderId: this.listQuery.serviceProviderId
+			})
+				.then(res => {
+					if (res.code == 0) {
+						this.$api.setStorage('orderUserInfo', {
+							clubID: res.data.clubId,
+							againBuyProductIds: res.data.againBuyProductIds
+						})
+						this.$api.navigateTo('/pages/seller/cart/cart')
 					}
-				}).catch(error =>{
-					if(error.code== -3){
+				})
+				.catch(error => {
+					if (error.code == -3) {
 						this.showAgan = true
 						this.promptitle = error.msg
 						this.failList = error.data
-					}else if(error.code== -2){
-						this.$util.modal('',error.msg,'确定','',false,() =>{})
-					}else{
-						this.$util.msg(error.msg,2000)
+					} else if (error.code == -2) {
+						this.$util.modal('', error.msg, '确定', '', false, () => {})
+					} else {
+						this.$util.msg(error.msg, 2000)
 					}
 				})
-			},
-			closeBtn(){//
-				this.showAgan = false;
-			},
-			cancelBtn(){// 再来一单弹窗
-				this.SellerService.SellerCreateOrderAgain(
-					{
-						serviceProviderId:this.listQuery.serviceProviderId,
-						orderId:this.aganOrderId,
-						confirmFlag:1,
-					}
-				).then(res =>{
-					if(res.code==0){
-						this.$api.navigateTo('/pages/seller/cart/cart');
-						this.showAgan = false;
-					}
-				})
-			},
-			handOrderConfirm (orderId){//确认订单
-				this.$util.modal('提示','确认此订单？','确定','取消',true,() =>{
-					this.OrderService.AffirmOrder({orderId:orderId}).then(response =>{
-						this.$util.msg(response.msg,2000,true,'success');
+		},
+		closeBtn() {
+			//
+			this.showAgan = false
+		},
+		cancelBtn() {
+			// 再来一单弹窗
+			this.SellerService.SellerCreateOrderAgain({
+				serviceProviderId: this.listQuery.serviceProviderId,
+				orderId: this.aganOrderId,
+				confirmFlag: 1
+			}).then(res => {
+				if (res.code == 0) {
+					this.$api.navigateTo('/pages/seller/cart/cart')
+					this.showAgan = false
+				}
+			})
+		},
+		handOrderConfirm(orderId) {
+			//确认订单
+			this.$util.modal('提示', '确认此订单？', '确定', '取消', true, () => {
+				this.OrderService.AffirmOrder({ orderId: orderId })
+					.then(response => {
+						this.$util.msg(response.msg, 2000, true, 'success')
 						setTimeout(() => {
 							this.getOrderDatainit()
-						},2000)
-					}).catch(error =>{
-						this.$util.msg(error.msg,2000)
+						}, 2000)
 					})
-				})
-			},
-			handOrderDetele(orderId){//删除订单
-				this.$util.modal('提示','确认删除该订单吗？','确定','取消',true,() =>{
-					this.OrderService.DeleteOrder({orderId:orderId}).then(response =>{
-						this.$util.msg(response.msg,2000,true,'success');
+					.catch(error => {
+						this.$util.msg(error.msg, 2000)
+					})
+			})
+		},
+		handOrderDetele(orderId) {
+			//删除订单
+			this.$util.modal('提示', '确认删除该订单吗？', '确定', '取消', true, () => {
+				this.OrderService.DeleteOrder({ orderId: orderId })
+					.then(response => {
+						this.$util.msg(response.msg, 2000, true, 'success')
 						setTimeout(() => {
 							this.getOrderDatainit()
-						},2000)
-					}).catch(error =>{
-						this.$util.msg(error.msg,2000)
+						}, 2000)
 					})
-				})
-			},
-			handCenceConfirm(orderId){//取消订单
-				this.$util.modal('提示','确认取消该订单吗？','确定','取消',true,() =>{
-					this.OrderService.CancelOrder({orderId:orderId}).then(response =>{
-						this.$util.msg(response.msg,2000,true,'success');
+					.catch(error => {
+						this.$util.msg(error.msg, 2000)
+					})
+			})
+		},
+		handCenceConfirm(orderId) {
+			//取消订单
+			this.$util.modal('提示', '确认取消该订单吗？', '确定', '取消', true, () => {
+				this.OrderService.CancelOrder({ orderId: orderId })
+					.then(response => {
+						this.$util.msg(response.msg, 2000, true, 'success')
 						setTimeout(() => {
 							this.getOrderDatainit()
-						},2000)
-					}).catch(error =>{
-						this.$util.msg(error.msg,2000)
+						}, 2000)
 					})
-				})
-			},
-			onShareAppMessage (res){//分享转发
-				this.isShareModal = false
-				if (res.from === 'button') {// 来自页面内转发按钮
-			    }
-				return {
-					title: '您有新的分享订单，快来查看吧~',
-					path: `/pages/user/order/order-sharelogin?orderId=${this.btnoRderID}&userId=${this.btnClubUserID}&serviceProviderId=${this.serviceProviderId}`,
-					imageUrl:'https://img.caimei365.com/group1/M00/03/95/Cmis216Sk_SABnOFABZCgCzFV_g063.png'
-				}
-			},
-			PromotionsFormat(promo){//促销活动类型数据处理
-				if(promo!=null){
-					if(promo.type == 1 && promo.mode == 1){
-						return true
-					}else{
-						return false
-					}
-				}
-				return false
-			},
-			//订单状态文字和颜色
-			StateExpFormat (state){
-				let stateText = '',
-					stateTextObject={
-						4:'交易完成',
-						5:'订单完成',
-						6:'已关闭',
-						7:'交易全退',
-						77:'交易全退',
-						11:'待付款待发货',
-						12:'待付款部分发货',
-						13:'待付款已发货',
-						21:'部分付款待发货',
-						22:'部分付款部分发货',
-						23:'部分付款已发货',
-						31:'已付款待发货',
-						32:'已付款部分发货',
-						33:'已付款已发货',
-						111:'待付款待发货',
-					}
-				Object.keys(stateTextObject).forEach(key => {
-					if(key == state){
-						stateText = stateTextObject[key]
-					}
-				})
-				return stateText;
-			},
-			orderPriceToFixed (n){
-				let price ='';
-				price = n.toFixed(2);
-				return price
-			},
-			setScrollHeight() {
-				const {windowHeight, pixelRatio} = wx.getSystemInfoSync();
-				this.windowHeight = windowHeight - 1;
-				this.scrollHeight = windowHeight - 1;
+					.catch(error => {
+						this.$util.msg(error.msg, 2000)
+					})
+			})
+		},
+		onShareAppMessage(res) {
+			//分享转发
+			this.isShareModal = false
+			if (res.from === 'button') {
+				// 来自页面内转发按钮
+			}
+			return {
+				title: '您有新的分享订单，快来查看吧~',
+				path: `/pages/user/order/order-sharelogin?orderId=${this.btnoRderID}&userId=${
+					this.btnClubUserID
+				}&serviceProviderId=${this.serviceProviderId}`,
+				imageUrl: 'https://img.caimei365.com/group1/M00/03/95/Cmis216Sk_SABnOFABZCgCzFV_g063.png'
 			}
 		},
-		onPageScroll(e) {
-			this.scrollTop = e.scrollTop;
+		PromotionsFormat(promo) {
+			//促销活动类型数据处理
+			if (promo != null) {
+				if (promo.type == 1 && promo.mode == 1) {
+					return true
+				} else {
+					return false
+				}
+			}
+			return false
 		},
-		onShow() {
-			this.setScrollHeight();
-			this.$api.getStorage().then((resolve) =>{
-				this.serviceProviderId = resolve.serviceProviderId
+		//订单状态文字和颜色
+		StateExpFormat(state) {
+			let stateText = '',
+				stateTextObject = {
+					4: '交易完成',
+					5: '订单完成',
+					6: '已关闭',
+					7: '交易全退',
+					77: '交易全退',
+					11: '待付款待发货',
+					12: '待付款部分发货',
+					13: '待付款已发货',
+					21: '部分付款待发货',
+					22: '部分付款部分发货',
+					23: '部分付款已发货',
+					31: '已付款待发货',
+					32: '已付款部分发货',
+					33: '已付款已发货',
+					111: '待付款待发货'
+				}
+			Object.keys(stateTextObject).forEach(key => {
+				if (key == state) {
+					stateText = stateTextObject[key]
+				}
 			})
+			return stateText
+		},
+		orderPriceToFixed(n) {
+			let price = ''
+			price = n.toFixed(2)
+			return price
+		},
+		setScrollHeight() {
+			const { windowHeight, pixelRatio } = wx.getSystemInfoSync()
+			this.windowHeight = windowHeight - 1
+			this.scrollHeight = windowHeight - 1
 		}
+	},
+	onPageScroll(e) {
+		this.scrollTop = e.scrollTop
+	},
+	onShow() {
+		this.setScrollHeight()
+		this.$api.getStorage().then(resolve => {
+			this.serviceProviderId = resolve.serviceProviderId
+		})
 	}
+}
 </script>
 
 <style lang="scss">
-	@import "@/uni.scss";
-	page{
-		background-color: #F7F7F7 !important;
-	}
-	.search{
-		width: 702rpx;
+@import '@/uni.scss';
+page {
+	background-color: #f7f7f7 !important;
+}
+.search {
+	width: 702rpx;
+	height: 70rpx;
+	padding: 12rpx 24rpx;
+	border-bottom: 1px solid #f0f0f0;
+	position: fixed;
+	top: 0;
+	left: 0;
+	background: #ffffff;
+	z-index: 1001;
+	.search-input {
+		width: 448rpx;
 		height: 70rpx;
-		padding: 12rpx 24rpx;
-		border-bottom: 1px solid #F0F0F0;
-		position: fixed;
-		top: 0;
-		left: 0;
-		background: #FFFFFF;
-		z-index: 1001;
-		.search-input{
+		padding: 0 68rpx;
+		line-height: 70rpx;
+		border-radius: 40rpx;
+		position: relative;
+		background: #f0f0f0;
+		float: left;
+		.icon-iconfonticonfontsousuo1 {
+			font-size: 36rpx;
+			color: #8a8a8a;
+			position: absolute;
+			left: 24rpx;
+			z-index: 10;
+		}
+		.icon-shanchu1 {
+			font-size: 36rpx;
+			color: #8a8a8a;
+			position: absolute;
+			right: 24rpx;
+			top: 0;
+			padding: 0 10rpx;
+			z-index: 10;
+		}
+		input {
 			width: 448rpx;
 			height: 70rpx;
-			padding: 0 68rpx;
-			line-height: 70rpx;
-			border-radius: 40rpx;
-			position: relative;
-			background: #F0F0F0;
-			float: left;
-			.icon-iconfonticonfontsousuo1{
-				font-size: 36rpx;
-				color: #8A8A8A;
-				position: absolute;
-				left: 24rpx;
-				z-index: 10;
-			}
-			.icon-shanchu1{
-				font-size: 36rpx;
-				color: #8A8A8A;
-				position: absolute;
-				right: 24rpx;
-				top: 0;
-				padding: 0 10rpx;
-				z-index: 10;
-			}
-			input{
-				width: 448rpx;
-				height: 70rpx;
-				background-color: #F0F0F0;
-				font-size: 26rpx;
-			}
+			background-color: #f0f0f0;
+			font-size: 26rpx;
 		}
-		.search-btn{
-			width: 118rpx;
-			height: 70rpx;
-			line-height: 70rpx;
-			color: $color-system;
-			font-size: 30rpx;
+	}
+	.search-btn {
+		width: 118rpx;
+		height: 70rpx;
+		line-height: 70rpx;
+		color: $color-system;
+		font-size: 30rpx;
+		text-align: center;
+		float: left;
+	}
+	.voice-icon {
+		width: 36rpx;
+		height: 36rpx;
+		padding: 16rpx 20rpx 16rpx 0;
+		position: absolute;
+		left: 16rpx;
+		top: 4rpx;
+		z-index: 10;
+	}
+}
+.search-container {
+	padding-top: 106rpx;
+}
+.s-block {
+	background: #ffffff;
+	.header {
+		font-size: 32rpx;
+		padding: 40rpx 24rpx 22rpx 24rpx;
+		line-height: 42rpx;
+		font-size: 30rpx;
+		font-weight: bold;
+		position: relative;
+		.icon-shanchu {
+			font-size: 36rpx;
+			color: #333333;
+			float: right;
+			padding: 0 10rpx;
+			z-index: 10;
+			font-weight: normal;
+		}
+	}
+	.list {
+		display: flex;
+		flex-wrap: wrap;
+		padding-bottom: 40rpx;
+		view {
+			color: #8a8a8a;
+			font-size: 24rpx;
+			box-sizing: border-box;
 			text-align: center;
-			float: left;
+			height: 48rpx;
+			line-height: 48rpx;
+			border-radius: 24rpx;
+			margin: 12rpx;
+			padding: 0 30rpx;
+			overflow: hidden;
+			white-space: nowrap;
+			text-overflow: ellipsis;
+			background-color: #f3f3f3;
 		}
-		.voice-icon{
+	}
+}
+.s-circle {
+	margin-top: 30rpx;
+	.header {
+		font-size: 32rpx;
+		padding: 30rpx;
+		border-bottom: 2rpx solid #f9f9f9;
+		position: relative;
+		image {
 			width: 36rpx;
 			height: 36rpx;
-			padding: 16rpx 20rpx 16rpx 0;
+			padding: 10rpx;
 			position: absolute;
-			left: 16rpx;
-			top: 4rpx;
-			z-index: 10;
+			right: 40rpx;
+			top: 24rpx;
 		}
-		
-	}
-	.search-container{
-		padding-top: 106rpx;
 	}
-	.s-block{
-		background: #FFFFFF;
-		.header{
-			font-size: 32rpx;
-			padding:40rpx 24rpx 22rpx 24rpx;
-			line-height: 42rpx;
-			font-size: 30rpx;
-			font-weight: bold;
-			position: relative;
-			.icon-shanchu{
-				font-size: 36rpx;
-				color: #333333;
-				float: right;
-				padding: 0 10rpx;
-				z-index: 10;
-				font-weight: normal;
-			}
-		}
-		.list{
-			display: flex;
-			flex-wrap: wrap;
-			padding-bottom: 40rpx;
-			view{
-				color: #8A8A8A;
-				font-size: 24rpx;
-				box-sizing: border-box;
-				text-align: center;
-				height: 48rpx;
-				line-height: 48rpx;
-				border-radius: 24rpx;
-				margin:12rpx;
-				padding:.0 30rpx;
-				overflow: hidden;
-				white-space: nowrap;
-				text-overflow: ellipsis;
-				background-color: #F3F3F3;
-			}
+	.list {
+		display: flex;
+		flex-wrap: wrap;
+		padding: 0 30rpx 20rpx;
+		view {
+			padding: 8rpx 30rpx;
+			margin: 20rpx 30rpx 0 0;
+			font-size: 28rpx;
+			color: #8a8a8a;
+			background-color: #f7f7f7;
+			box-sizing: border-box;
+			text-align: center;
+			border-radius: 20rpx;
 		}
 	}
-	.s-circle{
-		margin-top: 30rpx;
-		.header{
-			font-size: 32rpx;
-			padding: 30rpx;
-			border-bottom: 2rpx solid #F9F9F9;
-			position: relative;
-			image{
-				width: 36rpx;
-				height: 36rpx;
-				padding: 10rpx;
-				position: absolute;
-				right: 40rpx;
-				top: 24rpx;
-			}
-		}
-		.list{
-			display: flex;
-			flex-wrap: wrap;
-			padding: 0 30rpx 20rpx;
-			view{
-				padding: 8rpx 30rpx;
-				margin: 20rpx 30rpx 0 0;
-				font-size: 28rpx;
-				color: #8A8A8A;
-				background-color: #F7F7F7;
-				box-sizing: border-box;
-				text-align: center;
-				border-radius: 20rpx;
-			}
-		}
+}
+.wanted-block {
+	margin-top: 30rpx;
+	.header {
+		font-size: 32rpx;
+		padding: 30rpx;
 	}
-	.wanted-block{
-		margin-top: 30rpx;
-		.header{
-			font-size: 32rpx;
-			padding: 30rpx;
-		}
-		.list{
-			display: flex;
-			flex-wrap: wrap;
-			view{
-				width: 50%;
-				color: #8A8A8A;
-				font-size: 28rpx;
-				box-sizing: border-box;
-				text-align: center;
-				padding: 20rpx 0;
-				border-top: 2rpx solid #FFF;
-				border-left: 2rpx solid #FFF;
-				background-color: #F7F7F7;
-				overflow: hidden;
-				white-space: nowrap;
-				text-overflow: ellipsis;
-			}
+	.list {
+		display: flex;
+		flex-wrap: wrap;
+		view {
+			width: 50%;
+			color: #8a8a8a;
+			font-size: 28rpx;
+			box-sizing: border-box;
+			text-align: center;
+			padding: 20rpx 0;
+			border-top: 2rpx solid #fff;
+			border-left: 2rpx solid #fff;
+			background-color: #f7f7f7;
+			overflow: hidden;
+			white-space: nowrap;
+			text-overflow: ellipsis;
 		}
 	}
-	.wanted-circle{
-		margin-top: 30rpx;
-		.header{
-			font-size: 32rpx;
-			padding: 30rpx;
-		}
-		.list{
-			display: flex;
-			flex-wrap: wrap;
-			padding: 0 30rpx 20rpx;
-			view{
-				padding: 8rpx 30rpx;
-				margin: 20rpx 30rpx 0 0;
-				font-size: 28rpx;
-				color: #8A8A8A;
-				background-color: #F7F7F7;
-				box-sizing: border-box;
-				text-align: center;
-				border-radius: 20rpx;
-			}
+}
+.wanted-circle {
+	margin-top: 30rpx;
+	.header {
+		font-size: 32rpx;
+		padding: 30rpx;
+	}
+	.list {
+		display: flex;
+		flex-wrap: wrap;
+		padding: 0 30rpx 20rpx;
+		view {
+			padding: 8rpx 30rpx;
+			margin: 20rpx 30rpx 0 0;
+			font-size: 28rpx;
+			color: #8a8a8a;
+			background-color: #f7f7f7;
+			box-sizing: border-box;
+			text-align: center;
+			border-radius: 20rpx;
 		}
 	}
-	.order-container {
-		scroll-view {
-			height: 100%;
-			overflow: scroll;
-		}	
-	}	
-	.container {
-		padding-bottom: env(safe-area-inset-bottom);
-		height: auto;
-		position: relative;
+}
+.order-container {
+	scroll-view {
+		height: 100%;
+		overflow: scroll;
 	}
-	.tui-order-content{
+}
+.container {
+	padding-bottom: env(safe-area-inset-bottom);
+	height: auto;
+	position: relative;
+}
+.tui-order-content {
+	width: 100%;
+	height: auto;
+}
+.tui-order-list {
+	width: 100%;
+	position: relative;
+}
+.tui-order-item {
+	display: flex;
+	flex-direction: column;
+	width: 702rpx;
+	padding: 20rpx 24rpx 0 24rpx;
+	background: #fff;
+	border-bottom: 20rpx solid #f7f7f7;
+}
+.order-title {
+	width: 100%;
+	height: auto;
+	.order-title-name {
 		width: 100%;
-		height: auto;
+		height: 72rpx;
+		border-bottom: 1px solid #f7f7f7;
+		line-height: 72rpx;
+		text-align: left;
+		font-size: $font-size-28;
+		color: #333333;
 	}
-	.tui-order-list {
+	.order-title-t {
 		width: 100%;
+		height: 68rpx;
+		float: left;
+		line-height: 68rpx;
 		position: relative;
-	}
-	.tui-order-item {
-		display: flex;
-		flex-direction: column;
-		width: 702rpx;
-		padding:20rpx 24rpx 0 24rpx;
-		background: #fff;
-		border-bottom: 20rpx solid #F7F7F7;
-	}
-	.order-title{
-		width: 100%;
-		height: auto;
-		.order-title-name{
-			width: 100%;
-			height: 72rpx;
-			border-bottom: 1px solid #F7F7F7;
-			line-height: 72rpx;
-			text-align: left;
-			font-size: $font-size-28;
-			color: #333333;
+		.bage-icon {
+			width: 50rpx;
+			height: 50rpx;
+			display: block;
+			position: absolute;
+			right: 0;
+			top: 9rpx;
 		}
-		.order-title-t{
-			width: 100%;
-			height: 68rpx;
-			float: left;
+		.bage-buss {
+			display: inline-block;
+			width: 72rpx;
+			height: 30rpx;
+			background: radial-gradient(circle, rgba(255, 39, 180, 1) 0%, rgba(193, 77, 245, 1) 100%);
+			border-radius: 4rpx;
+			line-height: 30rpx;
+			font-size: $font-size-22;
+			text-align: center;
+			color: #ffffff;
+		}
+		.bage-auto {
+			display: inline-block;
+			width: 72rpx;
+			height: 30rpx;
+			background: radial-gradient(circle, rgba(255, 180, 39, 1) 0%, rgba(245, 142, 77, 1) 100%);
+			border-radius: 4rpx;
+			line-height: 30rpx;
+			font-size: $font-size-22;
+			text-align: center;
+			color: #ffffff;
+		}
+		.bage-text {
+			display: inline-block;
+			font-size: $font-size-28;
 			line-height: 68rpx;
-			position: relative;
-			.bage-icon{
-				width: 50rpx;
-				height: 50rpx;
-				display: block;
-				position: absolute;
-				right: 0;
-				top: 9rpx;
-			}
-			.bage-buss{
-				display: inline-block;
-				width: 72rpx;
-				height: 30rpx;
-				background:radial-gradient(circle,rgba(255,39,180,1) 0%,rgba(193,77,245,1) 100%);
-				border-radius: 4rpx;
-				line-height: 30rpx;
-				font-size: $font-size-22;
-				text-align: center;
-				color: #FFFFFF;
-			}
-			.bage-auto{
-				display: inline-block;
-				width: 72rpx;
-				height: 30rpx;
-				background:radial-gradient(circle,rgba(255,180,39,1) 0%,rgba(245,142,77,1) 100%);
-				border-radius: 4rpx;
-				line-height: 30rpx;
-				font-size: $font-size-22;
-				text-align: center;
-				color: #FFFFFF;
-			}
-			.bage-text{
-				display: inline-block;
-				font-size: $font-size-28;
-				line-height: 68rpx;
-				text-align: left;
-				color: $color-system;
-				margin-left: 10rpx;
-			}
+			text-align: left;
+			color: $color-system;
+			margin-left: 10rpx;
 		}
-		.order-title-b{
-			width: 100%;
-			height: 40rpx;
+	}
+	.order-title-b {
+		width: 100%;
+		height: 40rpx;
+		float: left;
+		margin-top: 8rpx;
+		.order-title-btxt {
 			float: left;
-			margin-top: 8rpx;
-			.order-title-btxt{
-				float: left;
-				font-size: $font-size-28;
-				line-height: 40rpx;
-				color: #999999;
-				text-align: lef
-			}
-			.order-title-tip{
-				float: right;
-				font-size: $font-size-28;
-				line-height: 40rpx;
-				text-align: right;
-				color: #FF2A2A;
-			}
+			font-size: $font-size-28;
+			line-height: 40rpx;
+			color: #999999;
+			text-align: lef;
+		}
+		.order-title-tip {
+			float: right;
+			font-size: $font-size-28;
+			line-height: 40rpx;
+			text-align: right;
+			color: #ff2a2a;
 		}
 	}
-	.goods-title{
-		width: 100%;
+}
+.goods-title {
+	width: 100%;
+	height: 56rpx;
+	float: left;
+	margin-top: 10rpx;
+	.floor-item-act {
 		height: 56rpx;
+		text-align: center;
+		box-sizing: border-box;
 		float: left;
-		margin-top:10rpx;
-		.floor-item-act{
-			height: 56rpx;
+		padding: 10rpx 0;
+		margin-right: 12rpx;
+		.floor-tags {
+			height: 28rpx;
+			border-radius: 6rpx;
+			background-color: #ffffff;
+			line-height: 28rpx;
+			color: $color-system;
 			text-align: center;
-			box-sizing: border-box;
+			display: inline-block;
+			padding: 0 16rpx;
+			font-size: $font-size-20;
+			border: 1px solid #e15616;
 			float: left;
-			padding: 10rpx 0;
-			margin-right: 12rpx;
-			.floor-tags{
-				height: 28rpx;
-				border-radius: 6rpx;
-				background-color: #FFFFFF;
-				line-height: 28rpx;
-				color: $color-system;
-				text-align: center;
-				display: inline-block;
-				padding:0 16rpx;
-				font-size: $font-size-20;
-				border: 1px solid #E15616;
-				float: left;
-			}
 		}
-		.title-text{
-			width: 400rpx;
-			overflow: hidden;
-			text-overflow:ellipsis;
-			white-space: nowrap;
-			float: left;
-			font-size: $font-size-28;
-			color: $text-color;
-			text-align: left;
-			line-height: 56rpx;
-			font-weight: bold;
+	}
+	.title-text {
+		width: 400rpx;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+		float: left;
+		font-size: $font-size-28;
+		color: $text-color;
+		text-align: left;
+		line-height: 56rpx;
+		font-weight: bold;
+	}
+}
+.goods-item {
+	width: 100%;
+	height: auto;
+}
+.goods-pros-t {
+	display: flex;
+	align-items: center;
+	width: 100%;
+	height: 217rpx;
+	padding: 24rpx 0;
+	.pros-img {
+		width: 210rpx;
+		height: 100%;
+		border-radius: 10rpx;
+		margin: 0 26rpx 0 0;
+		border: 1px solid #f3f3f3;
+		image {
+			width: 100%;
+			height: 100%;
+			border-radius: 10rpx;
 		}
 	}
-	.goods-item{
+}
+.pros-product {
+	width: 460rpx;
+	height: 100%;
+	line-height: 36rpx;
+	font-size: $font-size-26;
+	position: relative;
+	float: left;
+	.producttitle {
 		width: 100%;
+		display: inline-block;
 		height: auto;
-	}	
-	.goods-pros-t{
-		display: flex;
-		align-items: center;
+		text-overflow: ellipsis;
+		display: -webkit-box;
+		word-break: break-all;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 2;
+		overflow: hidden;
+		margin-bottom: 8rpx;
+	}
+	.productspec {
+		height: 36rpx;
+		color: #999999;
+	}
+	.productprice {
+		height: 48rpx;
 		width: 100%;
-		height: 217rpx;
-		padding:24rpx 0;
-		.pros-img{
-			width: 210rpx;
+		float: left;
+		.price {
+			line-height: 48rpx;
+			font-size: $font-size-28;
+			width: 48%;
+			color: #ff2a2a;
+			float: left;
+			font-weight: bold;
+		}
+		.count {
 			height: 100%;
-			border-radius: 10rpx;
-			margin:0 26rpx 0 0;
-			border:1px solid #f3f3f3;
-			image{
-				width: 100%;
-				height: 100%;
-				border-radius: 10rpx;
+			float: right;
+			position: relative;
+			.small {
+				color: #666666;
 			}
 		}
 	}
-	.pros-product{
-		width: 460rpx;
-		height: 100%;
-		line-height: 36rpx;
-		font-size: $font-size-26;	
-		position: relative;
+	.floor-item-act {
+		width: 100%;
+		height: 56rpx;
+		text-align: center;
+		box-sizing: border-box;
 		float: left;
-		.producttitle{
-			width: 100%;
+		padding: 0 0 10rpx 0;
+		.floor-tags {
+			height: 28rpx;
+			border-radius: 6rpx;
+			background-color: #ffffff;
+			line-height: 28rpx;
+			color: $color-system;
+			text-align: center;
 			display: inline-block;
-			height: auto;							
-			text-overflow:ellipsis;
-			display: -webkit-box;
-			word-break: break-all;
-			-webkit-box-orient: vertical;
-			-webkit-line-clamp: 2;
-			overflow: hidden;
-			margin-bottom: 8rpx;
-		}
-		.productspec{
-			height: 36rpx;
-			color: #999999;
-		}
-		.productprice{
-			height: 48rpx;
-			width: 100%;
+			padding: 0 16rpx;
+			font-size: $font-size-20;
+			border: 1px solid #e15616;
 			float: left;
-			.price{
-				line-height: 48rpx;
-				font-size: $font-size-28;
-				width: 48%;
-				color: #FF2A2A;
-				float: left;
-				font-weight: bold;
-			}
-			.count{
-				height: 100%;
-				float: right;
-				position: relative;
-				.small{
-					color: #666666;
-				}
-			}
-		}
-		.floor-item-act{
-			width: 100%;
-			height: 56rpx;
-			text-align: center;
-			box-sizing: border-box;
-			float: left;
-			padding:0 0 10rpx 0;
-			.floor-tags{
-				height: 28rpx;
-				border-radius: 6rpx;
-				background-color: #FFFFFF;
-				line-height: 28rpx;
-				color: $color-system;
-				text-align: center;
-				display: inline-block;
-				padding:0 16rpx;
-				font-size: $font-size-20;
-				border: 1px solid #E15616;
-				float: left;
-			}
 		}
 	}
-	.order-footer{
+}
+.order-footer {
+	width: 100%;
+	height: 78rpx;
+	float: left;
+	.order-footer-top {
+		width: 100%;
+		height: 34rpx;
+		line-height: 34rpx;
+		font-size: $font-size-24;
+		color: #999999;
+		text-align: right;
+	}
+	.order-footer-bot {
 		width: 100%;
-		height: 78rpx;
 		float: left;
-		.order-footer-top{
-			width: 100%;
-			height: 34rpx;
-			line-height: 34rpx;
-			font-size: $font-size-24;
-			color: #999999;
-			text-align: right;
-		}
-		.order-footer-bot{
-			width: 100%;
+		height: 48rpx;
+		line-height: 48rpx;
+		font-size: $font-size-28;
+		font-weight: bold;
+		color: $text-color;
+		.count {
+			width: 50%;
 			float: left;
-			height: 48rpx;
-			line-height: 48rpx;
-			font-size: $font-size-28;
-			font-weight: bold;
-			color: $text-color;
-			.count{
-				width: 50%;
-				float: left;
-				text-align: left;
-			}
-			.money{
-				width: 50%;
-				float: right;
-				text-align: right;
-			}
+			text-align: left;
+		}
+		.money {
+			width: 50%;
+			float: right;
+			text-align: right;
 		}
 	}
-	.aganBj {
-	    position: fixed;
-	    left: 0;
-	    top: 0;
-	    bottom: 0;
-	    width: 100%;
-	    height: 100%;
-	    background-color: rgba(0, 0, 0, .5);
-	    z-index: 999999;
-		.alertAgan {
-		    position: absolute;
-		    top: 50%;
-		    left: 50%;
-		    transform: translate(-50%, -50%);
-		    width:580rpx;
-		    background-color: #fff;
-		    border-radius: 16rpx;
-			.title{
-				font-size: 30rpx;
-				color: #333333;
-				line-height: 42rpx;
-				padding: 30rpx;
-				display: block;
-			}
-			.goods{
-				padding: 0 30rpx;
-				.list{
-					padding: 10px 0;
-					border-bottom: 1rpx solid #e1e1e1;
-					margin: 10rpx 0;
-					.image-left{
-						width: 86rpx;
-						height: 86rpx;
-						border: 2rpx solid #e1e1e1;
-						border-radius: 6rpx;
-						display: inline-block;
-						vertical-align: middle;
-					}
-					.name-right{
-						display: inline-block;
-						width: 416rpx;
-						margin-left: 15rpx;
-						font-size: 26rpx;
-						color: #666666;
-						vertical-align: middle;
-						word-break: break-all;
-						overflow: hidden;
-						text-overflow: ellipsis;
-						display: -webkit-inline-box;
-						-webkit-line-clamp: 2;
-						-webkit-box-orient: vertical;
-					}
+}
+.aganBj {
+	position: fixed;
+	left: 0;
+	top: 0;
+	bottom: 0;
+	width: 100%;
+	height: 100%;
+	background-color: rgba(0, 0, 0, 0.5);
+	z-index: 999999;
+	.alertAgan {
+		position: absolute;
+		top: 50%;
+		left: 50%;
+		transform: translate(-50%, -50%);
+		width: 580rpx;
+		background-color: #fff;
+		border-radius: 16rpx;
+		.title {
+			font-size: 30rpx;
+			color: #333333;
+			line-height: 42rpx;
+			padding: 30rpx;
+			display: block;
+		}
+		.goods {
+			padding: 0 30rpx;
+			.list {
+				padding: 10px 0;
+				border-bottom: 1rpx solid #e1e1e1;
+				margin: 10rpx 0;
+				.image-left {
+					width: 86rpx;
+					height: 86rpx;
+					border: 2rpx solid #e1e1e1;
+					border-radius: 6rpx;
+					display: inline-block;
+					vertical-align: middle;
+				}
+				.name-right {
+					display: inline-block;
+					width: 416rpx;
+					margin-left: 15rpx;
+					font-size: 26rpx;
+					color: #666666;
+					vertical-align: middle;
+					word-break: break-all;
+					overflow: hidden;
+					text-overflow: ellipsis;
+					display: -webkit-inline-box;
+					-webkit-line-clamp: 2;
+					-webkit-box-orient: vertical;
 				}
 			}
-			.BtnAll{
-				margin-top: 30rpx;
-				.btn{
-				 	display: inline-block;
-					width: 290rpx;
-					height: 90rpx;
-					line-height: 90rpx;
-					text-align: center;
-					&.closebtn{
-						border-radius: 0px 0px 0px 10px;
-						color:#999999 ;
-						background: #efefef;
-					}
-					&.cancel{
-						border-radius: 0px 0px 8px 0px;
-						background: $btn-confirm;
-						color: #fff;
-					}
+		}
+		.BtnAll {
+			margin-top: 30rpx;
+			.btn {
+				display: inline-block;
+				width: 290rpx;
+				height: 90rpx;
+				line-height: 90rpx;
+				text-align: center;
+				&.closebtn {
+					border-radius: 0px 0px 0px 10px;
+					color: #999999;
+					background: #efefef;
+				}
+				&.cancel {
+					border-radius: 0px 0px 8px 0px;
+					background: $btn-confirm;
+					color: #fff;
 				}
 			}
 		}
 	}
+}
 </style>

pages/user/order/order-details.vue

@@ -1,17 +1,42 @@
 <template>
-	<view class="container details clearfix" :style="{paddingBottom :isIphoneX ? (130+68)+'rpx' : '130rpx'}">
+	<view class="container details clearfix" :style="{ paddingBottom: isIphoneX ? 130 + 68 + 'rpx' : '130rpx' }">
 		<!-- 自定义返回 -->
-		<header-back :systeminfo='systeminfo' :navbar-data='nvabarData' :headerBtnPosi ="headerBtnPosi" :isShare='isOrderShare'></header-back>
-		<view class="container-details" :style="{paddingTop:navbarHeight+'px'}">
+		<header-back
+			:systeminfo="systeminfo"
+			:navbar-data="nvabarData"
+			:headerBtnPosi="headerBtnPosi"
+			:isShare="isOrderShare"
+		></header-back>
+		<view class="container-details" :style="{ paddingTop: navbarHeight + 'px' }">
 			<view class="status-text">
 				<view class="view-type">{{ information.status | TextFormat }}</view>
-				<text class="bage-buss" v-if="information.orderSubmitType == 3 || information.orderSubmitType == 4">协销</text>
-				<text class="bage-auto" v-if="information.orderSubmitType == 0 || information.orderSubmitType == 1 ||information.orderSubmitType == 2">自主</text>
+				<text class="bage-buss" v-if="information.orderSubmitType == 3 || information.orderSubmitType == 4"
+					>协销</text
+				>
+				<text
+					class="bage-auto"
+					v-if="
+						information.orderSubmitType == 0 ||
+							information.orderSubmitType == 1 ||
+							information.orderSubmitType == 2
+					"
+					>自主</text
+				>
 			</view>
 			<!-- 地址选择 -->
-			<order-address ref="orderAddress" v-if="isRequest && !rechargeGoods" :addressData="addressData"></order-address>
+			<order-address
+				ref="orderAddress"
+				v-if="isRequest && !rechargeGoods"
+				:addressData="addressData"
+			></order-address>
 			<!-- 商品 -->
-			<goods-list ref='goods' v-if="isRequest" :shopOrderData="shopOrderData" :information="information" @popupClick="hanldePopupFn"></goods-list>
+			<goods-list
+				ref="goods"
+				v-if="isRequest"
+				:shopOrderData="shopOrderData"
+				:information="information"
+				@popupClick="hanldePopupFn"
+			></goods-list>
 			<!-- 订单信息 -->
 			<order-information ref="information" v-if="isRequest" :information="information"></order-information>
 			<!-- 发票信息 -->
@@ -19,172 +44,197 @@
 			<!-- 转账信息 -->
 			<!-- <transfe-record ref="transfe" v-if="receiptAmount == 0 || onlinePayFlag == '1'"></transfe-record> -->
 			<!-- 支付记录 -->
-			<payment-record ref="payment" v-if="isRequest" :discernReceiptList="discernReceiptList" :receiptAmount="receiptAmount"></payment-record>
+			<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" v-if="information.secondHandOrderFlag!=1 && !orderSubmitType" @tap.stop="openclauseConten(clauseData.id)" :class="clauseData.name=='无条款'?'noclick':''">
-				售后条款：<label class="text" :class="clauseData.name=='无条款'?'color-bg':''">{{clauseData.name}}</label>
+			<refund-record
+				ref="refund"
+				v-if="isRequest"
+				:returnedPurchaseList="returnedPurchaseList"
+				:returnedPurchaseFee="returnedPurchaseFee"
+			></refund-record>
+			<view
+				class="clause"
+				v-if="information.secondHandOrderFlag != 1 && !orderSubmitType"
+				@tap.stop="openclauseConten(clauseData.id)"
+				:class="clauseData.name == '无条款' ? 'noclick' : ''"
+			>
+				售后条款：<label class="text" :class="clauseData.name == '无条款' ? 'color-bg' : ''">{{
+					clauseData.name
+				}}</label>
 			</view>
 			<!-- 底部button -->
-			<order-button ref="orderButton" 
-						  v-if= "isRequest" 
-						  :status= "btnStatus" 
-						  :shareCode= "shareCode"
-						  :order="orderInfo" 
-						   @buttonConfirm="handButtonConfirm">
+			<order-button
+				ref="orderButton"
+				v-if="isRequest"
+				:status="btnStatus"
+				:shareCode="shareCode"
+				:order="orderInfo"
+				@buttonConfirm="handButtonConfirm"
+			>
 			</order-button>
 		</view>
 		<!-- 付款弹窗 -->
-		<order-model v-if="isPayModel" 
-					:payModelData="payModelData" 
-					:modelType='modelType' 
-					@cancelConfirm = "hanldCancelConfirm"
-					@paymentConfirm ='hanldPaymentConfirm'/>
-		<!-- 分享弹窗 -->			
-		<share-alert  :orderId="orderId" 
-					  v-if="isShareModal"  
-					  @btnConfirm ='onShareAppMessage'>
-		</share-alert>		
+		<order-model
+			v-if="isPayModel"
+			:payModelData="payModelData"
+			:modelType="modelType"
+			@cancelConfirm="hanldCancelConfirm"
+			@paymentConfirm="hanldPaymentConfirm"
+		/>
+		<!-- 分享弹窗 -->
+		<share-alert :orderId="orderId" v-if="isShareModal" @btnConfirm="onShareAppMessage"> </share-alert>
 		<!-- 促销活动弹窗 -->
 		<activi-popup :Promotion="handlerPros" :popupShow="popupShow"></activi-popup>
 		<!-- 采美豆提示弹窗 -->
-		<activityBean v-if="isActivityBean" :show="isActivityBean" :beansType="beansType" :beanNumber="beanNumber"  @cancel="handleBeanlClick"></activityBean>
-		
+		<activityBean
+			v-if="isActivityBean"
+			:show="isActivityBean"
+			:beansType="beansType"
+			:beanNumber="beanNumber"
+			@cancel="handleBeanlClick"
+		></activityBean>
 	</view>
 </template>
 
 <script>
-	import headerBack from '@/components/cm-module/headerNavbar/header-back' 		 	 //自定义导航
-	import orderAddress from '@/components/cm-module/orderDetails/orderAddress' 		 //地址信息
-	import goodsList from '@/components/cm-module/orderDetails/goodsList'		 		 //商品列表
-	import invoiceTent from '@/components/cm-module/orderDetails/invoiceTent'	 		 //发票信息
-	import orderInformation from '@/components/cm-module/orderDetails/orderInformation' //订单信息
-	import transfeRecord from '@/components/cm-module/orderDetails/transfeRecord'		 //转账信息
-	import paymentRecord from '@/components/cm-module/orderDetails/paymentRecord'		 //支付记录
-	import refundRecord from '@/components/cm-module/orderDetails/refundRecord'		 //退款记录
-	import orderButton from '@/components/cm-module/orderDetails/orderButton'			 //底部按钮
-	import shareAlert from '@/components/cm-module/modelAlert/shareAlert.vue'			 //分享弹窗
-	import orderModel from '@/components/cm-module/modelAlert/order-alert'			 //付款弹窗
-	import activiPopup from '@/components/cm-module/orderDetails/activipopu'		//促销活动弹窗
-	import activityBean from '@/components/cm-module/activity/activityBean.vue'
-	
-	
-	export default {
-		components:{
-			headerBack,
-			orderInformation,
-			orderAddress,
-			invoiceTent,
-			goodsList,
-			transfeRecord,
-			paymentRecord,
-			refundRecord,
-			orderButton,
-			shareAlert,
-			orderModel,
-			activiPopup,
-			activityBean
-		},
-		data() {
-			return {
-				state:0,
-				userId:'',
-				orderId:'',
-				shareCode:'',				//分享码
-				shareType:'',               //分享登录页过来记录的状态
-				cellPhone:'',				//客服电话
-				payStatus:0,
-				btnStatus:0,				//按钮组件状态
-				onlinePayFlag:'',
-				isRequest:false,			//是否加载完成渲染子组件
-				isOrderShare:false,
-				isShareModal:false,
-				isPayModel:false,
-				modelType:0,
-				orderInfo:{},
-				alertOrderInfo:{},
-				payModelData:{},
-				addressData:{},				//地址信息初始化
-				information:{},				//订单信息初始化
-				shopOrderData:{},			//商品信息初始化
-				orderInvoice:{},			//发票信息初始化
-				returnedPurchaseList:{},	//退款信息初始化
-				discernReceiptList:{},		//支付信息初始化
-				receiptAmount:0,			//支付金额
-				returnedPurchaseFee:0,		//退款金额
-				rechargeGoods:false,
-				navbarHeight:'',
-				headerBtnPosi:	this.setHeaderBtnPosi(), //获取设备顶部胶囊高度
-				systeminfo: this.setSysteminfo(),		 //获取设备信息
-				isIphoneX:this.$store.state.isIphoneX,
-				CustomBar:this.CustomBar,// 顶部导航栏高度
-				popupShow:false,
-				handlerPros:{},
-				nvabarData: {		//顶部自定义导航
-					showCapsule: 1, // 是否显示左上角图标   1表示显示    0表示不显示
-					title: '订单详情', // 导航栏 中间的标题
-				},
-				clauseData:{},
-				orderSubmitType:false,//自主订单
-				beansType:1,
-				beanNumber:0,
-				isActivityBean:false,
-			}
-		},
-		onLoad(option){
-			console.log(option)
-			this.shareType = option.type
-			this.orderId = option.orderId
-			if(this.shareType ==='share'){
-				this.state = 0
-				this.isOrderShare = true
-			}else if(option.type === 'confim' ||option.type === 'search'){
-				this.state = 0
-			}else{
-				this.state = option.state
-				
-			}
-			this.getHeaderTopHeight()
-			this.$api.getStorage().then((resolve) =>{
-				this.userId = resolve.userId ? resolve.userId : 0
-				this.initOrderDetaileData()
-			})	
-		},
-		filters:{
-			TextFormat(status) {//处理金额
-				let HtmlText,
-					typeTextObject={
-						0:'待确认',
-						4:'交易完成',
-						5:'订单完成',
-						6:'已关闭',
-						7:'交易全退',
-						77:'交易全退',
-						11:'待付款待发货',
-						12:'待付款部分发货',
-						13:'待付款已发货',
-						21:'部分付款待发货',
-						22:'部分付款部分发货',
-						23:'部分付款已发货',
-						31:'已付款待发货',
-						32:'已付款部分发货',
-						33:'已付款已发货',
-						111:'待付款待发货',
-					}
-				Object.keys(typeTextObject).forEach(key => {
-					if(key == status){
-						HtmlText = typeTextObject[key]
-					}
-				})
-				return HtmlText
+import headerBack from '@/components/cm-module/headerNavbar/header-back' //自定义导航
+import orderAddress from '@/components/cm-module/orderDetails/orderAddress' //地址信息
+import goodsList from '@/components/cm-module/orderDetails/goodsList' //商品列表
+import invoiceTent from '@/components/cm-module/orderDetails/invoiceTent' //发票信息
+import orderInformation from '@/components/cm-module/orderDetails/orderInformation' //订单信息
+import transfeRecord from '@/components/cm-module/orderDetails/transfeRecord' //转账信息
+import paymentRecord from '@/components/cm-module/orderDetails/paymentRecord' //支付记录
+import refundRecord from '@/components/cm-module/orderDetails/refundRecord' //退款记录
+import orderButton from '@/components/cm-module/orderDetails/orderButton' //底部按钮
+import shareAlert from '@/components/cm-module/modelAlert/shareAlert.vue' //分享弹窗
+import orderModel from '@/components/cm-module/modelAlert/order-alert' //付款弹窗
+import activiPopup from '@/components/cm-module/orderDetails/activipopu' //促销活动弹窗
+import activityBean from '@/components/cm-module/activity/activityBean.vue'
+
+export default {
+	components: {
+		headerBack,
+		orderInformation,
+		orderAddress,
+		invoiceTent,
+		goodsList,
+		transfeRecord,
+		paymentRecord,
+		refundRecord,
+		orderButton,
+		shareAlert,
+		orderModel,
+		activiPopup,
+		activityBean
+	},
+	data() {
+		return {
+			state: 0,
+			userId: '',
+			orderId: '',
+			shareCode: '', //分享码
+			shareType: '', //分享登录页过来记录的状态
+			cellPhone: '', //客服电话
+			payStatus: 0,
+			btnStatus: 0, //按钮组件状态
+			onlinePayFlag: '',
+			isRequest: false, //是否加载完成渲染子组件
+			isOrderShare: false,
+			isShareModal: false,
+			isPayModel: false,
+			modelType: 0,
+			orderInfo: {},
+			alertOrderInfo: {},
+			payModelData: {},
+			addressData: {}, //地址信息初始化
+			information: {}, //订单信息初始化
+			shopOrderData: {}, //商品信息初始化
+			orderInvoice: {}, //发票信息初始化
+			returnedPurchaseList: {}, //退款信息初始化
+			discernReceiptList: {}, //支付信息初始化
+			receiptAmount: 0, //支付金额
+			returnedPurchaseFee: 0, //退款金额
+			rechargeGoods: false,
+			navbarHeight: '',
+			headerBtnPosi: this.setHeaderBtnPosi(), //获取设备顶部胶囊高度
+			systeminfo: this.setSysteminfo(), //获取设备信息
+			isIphoneX: this.$store.state.isIphoneX,
+			CustomBar: this.CustomBar, // 顶部导航栏高度
+			popupShow: false,
+			handlerPros: {},
+			nvabarData: {
+				//顶部自定义导航
+				showCapsule: 1, // 是否显示左上角图标   1表示显示    0表示不显示
+				title: '订单详情' // 导航栏 中间的标题
 			},
+			clauseData: {},
+			orderSubmitType: false, //自主订单
+			beansType: 1,
+			beanNumber: 0,
+			isActivityBean: false
+		}
+	},
+	onLoad(option) {
+		console.log(option)
+		this.shareType = option.type
+		this.orderId = option.orderId
+		if (this.shareType === 'share') {
+			this.state = 0
+			this.isOrderShare = true
+		} else if (option.type === 'confim' || option.type === 'search') {
+			this.state = 0
+		} else {
+			this.state = option.state
+		}
+		this.getHeaderTopHeight()
+		this.$api.getStorage().then(resolve => {
+			this.userId = resolve.userId ? resolve.userId : 0
+			this.initOrderDetaileData()
+		})
+	},
+	filters: {
+		TextFormat(status) {
+			//处理金额
+			let HtmlText,
+				typeTextObject = {
+					0: '待确认',
+					4: '交易完成',
+					5: '订单完成',
+					6: '已关闭',
+					7: '交易全退',
+					77: '交易全退',
+					11: '待付款待发货',
+					12: '待付款部分发货',
+					13: '待付款已发货',
+					21: '部分付款待发货',
+					22: '部分付款部分发货',
+					23: '部分付款已发货',
+					31: '已付款待发货',
+					32: '已付款部分发货',
+					33: '已付款已发货',
+					111: '待付款待发货'
+				}
+			Object.keys(typeTextObject).forEach(key => {
+				if (key == status) {
+					HtmlText = typeTextObject[key]
+				}
+			})
+			return HtmlText
+		}
+	},
+	methods: {
+		openclauseConten(id) {
+			this.$api.navigateTo(`/pages/service/sellconten?clauseId=${id}`)
 		},
-		methods: {
-			openclauseConten(id){
-				this.$api.navigateTo(`/pages/service/sellconten?clauseId=${id}`)
-			},
-			initOrderDetaileData(){//初始化页面数据@参数：订单ID
-				this.OrderService.QueryOrderDetails({ orderId : this.orderId, userId : this.userId}).then(response =>{
+		initOrderDetaileData() {
+			//初始化页面数据@参数：订单ID
+			this.OrderService.QueryOrderDetails({ orderId: this.orderId, userId: this.userId })
+				.then(response => {
 					let data = response.data
 					this.isRequest = true
 					this.orderInfo = data.order
@@ -203,50 +253,59 @@
 					this.receiptAmount = data.order.receiptAmount
 					this.returnedPurchaseFee = data.order.returnedPurchaseFee
 					this.clauseData = data.clause
-					if(this.information.orderSubmitType == 0 || this.information.orderSubmitType == 1 ||this.information.orderSubmitType == 2){
-						this.orderSubmitType=true
-					}else{
-						this.orderSubmitType=false
+					if (
+						this.information.orderSubmitType == 0 ||
+						this.information.orderSubmitType == 1 ||
+						this.information.orderSubmitType == 2
+					) {
+						this.orderSubmitType = true
+					} else {
+						this.orderSubmitType = false
 					}
-				}).catch(error =>{
-					this.$util.modal('提示','订单查询失败，请稍后重试~','确定','',false,() =>{
+				})
+				.catch(error => {
+					this.$util.modal('提示', '订单查询失败，请稍后重试~', '确定', '', false, () => {
 						this.$api.switchTabTo('/pages/tabBar/home/index')
 					})
 				})
-			},
-			handButtonConfirm(data){//监听点击时间的按钮类型并执行...
-				this.handShowAlert(data)
-			},
-			handShowAlert(data){//判断点击的按钮类型并执行...
-				switch(data.type){
-					case 'delete':
-						this.handOrderDetele()
-						break
-					case 'cancel':
-						this.handCenceConfirm()
-						break
-					case 'query':
-						this.$api.navigateTo('/pages/user/order/order-logistics?orderId='+this.orderId)
-						break
-					case 'confirm':
-						this.handOrderConfirm()
-						break
-					case 'pay':
-						this.getOrderPaymentValidation(data)
-						break
-					case 'confirmation':
-						this.handOrderConfirmation()
-						break
-					case 'payment':
-						this.hanldConfirmFn(data.orderId)
-						break	
-				}
-			},
-			getOrderPaymentValidation(data){//监听根据付款状态做操作
-				this.OrderService.OrderPaymentValidation({orderId:data.orderId}).then(response =>{
+		},
+		handButtonConfirm(data) {
+			//监听点击时间的按钮类型并执行...
+			this.handShowAlert(data)
+		},
+		handShowAlert(data) {
+			//判断点击的按钮类型并执行...
+			switch (data.type) {
+				case 'delete':
+					this.handOrderDetele()
+					break
+				case 'cancel':
+					this.handCenceConfirm()
+					break
+				case 'query':
+					this.$api.navigateTo('/pages/user/order/order-logistics?orderId=' + this.orderId)
+					break
+				case 'confirm':
+					this.handOrderConfirm()
+					break
+				case 'pay':
+					this.getOrderPaymentValidation(data)
+					break
+				case 'confirmation':
+					this.handOrderConfirmation()
+					break
+				case 'payment':
+					this.hanldConfirmFn(data.orderId)
+					break
+			}
+		},
+		getOrderPaymentValidation(data) {
+			//监听根据付款状态做操作
+			this.OrderService.OrderPaymentValidation({ orderId: data.orderId })
+				.then(response => {
 					let dataCode = response.data.code
 					this.payModelData = response.data
-					switch(dataCode){
+					switch (dataCode) {
 						case 1:
 							this.isPayModel = true
 							this.modelType = 1
@@ -256,289 +315,336 @@
 							this.modelType = 2
 							break
 						case -1:
-							this.$util.modal('','订单已申请全部退款，无需再付款！','确定','',false,() =>{})
+							this.$util.modal('', '订单已申请全部退款，无需再付款！', '确定', '', false, () => {})
 							break
 						default:
-							if(response.data.onlinePayFlag == '1'){
-								this.$api.navigateTo(`/pages/user/order/order-payment?type=onlinePay&Amount=${response.data.pendingPayments}&orderId=${data.orderId}`)
-							}else{
-								this.$api.navigateTo(`/pages/user/order/order-payment?type=payfirm&orderId=${data.orderId}`)
+							if (response.data.onlinePayFlag == '1') {
+								this.$api.navigateTo(
+									`/pages/user/order/order-payment?type=onlinePay&Amount=${
+										response.data.pendingPayments
+									}&orderId=${data.orderId}`
+								)
+							} else {
+								this.$api.navigateTo(
+									`/pages/user/order/order-payment?type=payfirm&orderId=${data.orderId}`
+								)
 							}
 					}
-					
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
-				})	
-			},
-			hanldPaymentConfirm(data){//余额抵扣跳转
-				this.OrderService.OrderBalanceDeduction({orderId:data.order.orderId}).then(response =>{
-					if(data.type === 2){
-						let _data = {orderId:data.order.orderId}
-						this.$api.navigateTo(`/pages/user/order/success?type=deduction&data=${JSON.stringify({data:_data})}`)
-					}else{
-						if(data.order.onlinePayFlag === '1'){
-							this.$api.navigateTo(`/pages/user/order/order-payment?type=onlinePay&Amount=${data.order.pendingPayments}&orderId=${data.order.orderId}`)
-						}else{
-							this.$api.navigateTo(`/pages/user/order/order-payment?type=payfirm&orderId=${data.order.orderId}`)
+				})
+				.catch(error => {
+					this.$util.msg(error.msg, 2000)
+				})
+		},
+		hanldPaymentConfirm(data) {
+			//余额抵扣跳转
+			this.OrderService.OrderBalanceDeduction({ orderId: data.order.orderId })
+				.then(response => {
+					if (data.type === 2) {
+						let _data = { orderId: data.order.orderId }
+						this.$api.navigateTo(
+							`/pages/user/order/success?type=deduction&data=${JSON.stringify({ data: _data })}`
+						)
+					} else {
+						if (data.order.onlinePayFlag === '1') {
+							this.$api.navigateTo(
+								`/pages/user/order/order-payment?type=onlinePay&Amount=${
+									data.order.pendingPayments
+								}&orderId=${data.order.orderId}`
+							)
+						} else {
+							this.$api.navigateTo(
+								`/pages/user/order/order-payment?type=payfirm&orderId=${data.order.orderId}`
+							)
 						}
 					}
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
-				})	
-			},
-			hanldCancelConfirm(data){//不使用余额抵扣直接跳转收银台
-				if(data.onlinePayFlag == '1'){
-					this.$api.navigateTo(`/pages/user/order/order-payment?type=onlinePay&Amount=${this.orderInfo.pendingPayments}&orderId=${data.orderId}`)
-				}else{
-					this.$api.navigateTo(`/pages/user/order/order-payment?type=payfirm&orderId=${data.orderId}`)
-				}
-			},
-			hanldConfirmFn (orderId){//确认打款供应商
-				this.$util.modal('提示','确定委托采美平台打款给供应商吗？确定之前请务必确保货品完好？','确定','取消',true,() =>{
-					this.OrderService.confirmpayment({orderId:orderId,userId:this.userId}).then(response =>{
-						this.$util.msg('确认成功',2000,true,'success')
-						setTimeout(() => {
-							this.getOrderDatainit(this.currentTab)
-						},2000)
-					}).catch(error =>{
-						this.$util.msg(error.msg,2000)
-					})
 				})
-			},
-			handOrderConfirm(){//确认收货
-				this.$util.modal('提示','是否确认收货','确定','取消',true,() =>{
-					this.OrderService.ConfirmReceipt({orderId:this.orderId}).then(response =>{
+				.catch(error => {
+					this.$util.msg(error.msg, 2000)
+				})
+		},
+		hanldCancelConfirm(data) {
+			//不使用余额抵扣直接跳转收银台
+			if (data.onlinePayFlag == '1') {
+				this.$api.navigateTo(
+					`/pages/user/order/order-payment?type=onlinePay&Amount=${this.orderInfo.pendingPayments}&orderId=${
+						data.orderId
+					}`
+				)
+			} else {
+				this.$api.navigateTo(`/pages/user/order/order-payment?type=payfirm&orderId=${data.orderId}`)
+			}
+		},
+		hanldConfirmFn(orderId) {
+			//确认打款供应商
+			this.$util.modal(
+				'提示',
+				'确定委托采美平台打款给供应商吗？确定之前请务必确保货品完好？',
+				'确定',
+				'取消',
+				true,
+				() => {
+					this.OrderService.confirmpayment({ orderId: orderId, userId: this.userId })
+						.then(response => {
+							this.$util.msg('确认成功', 2000, true, 'success')
+							setTimeout(() => {
+								this.getOrderDatainit(this.currentTab)
+							}, 2000)
+						})
+						.catch(error => {
+							this.$util.msg(error.msg, 2000)
+						})
+				}
+			)
+		},
+		handOrderConfirm() {
+			//确认收货
+			this.$util.modal('提示', '是否确认收货', '确定', '取消', true, () => {
+				this.OrderService.ConfirmReceipt({ orderId: this.orderId })
+					.then(response => {
 						this.beansType = 7
 						this.beanNumber = 100
 						this.isActivityBean = true
-					}).catch(error =>{
-						this.$util.msg(error.msg,2000)
 					})
-				})
-			},
-			handOrderConfirmation (){//确认订单
-				this.$util.modal('提示','确认此订单？','确定','取消',true,() =>{
-					this.OrderService.AffirmOrder({orderId:this.orderId}).then(response =>{
-						this.$util.msg(response.msg,2000,true,'success')
+					.catch(error => {
+						this.$util.msg(error.msg, 2000)
+					})
+			})
+		},
+		handOrderConfirmation() {
+			//确认订单
+			this.$util.modal('提示', '确认此订单？', '确定', '取消', true, () => {
+				this.OrderService.AffirmOrder({ orderId: this.orderId })
+					.then(response => {
+						this.$util.msg(response.msg, 2000, true, 'success')
 						setTimeout(() => {
 							this.initOrderDetaileData()
-						},2000)
-					}).catch(error =>{
-						this.$util.msg(error.msg,2000)
+						}, 2000)
 					})
-				})
-			},
-			handOrderDetele(){//删除订单
-				this.$util.modal('提示','确认删除该订单吗？','确定','取消',true,() =>{
-					this.OrderService.DeleteOrder({orderId:this.orderId}).then(response =>{
-						this.$util.msg(response.msg,2000,true,'success')
+					.catch(error => {
+						this.$util.msg(error.msg, 2000)
+					})
+			})
+		},
+		handOrderDetele() {
+			//删除订单
+			this.$util.modal('提示', '确认删除该订单吗？', '确定', '取消', true, () => {
+				this.OrderService.DeleteOrder({ orderId: this.orderId })
+					.then(response => {
+						this.$util.msg(response.msg, 2000, true, 'success')
 						setTimeout(() => {
-							if(this.shareType ==='share'){
+							if (this.shareType === 'share') {
 								this.$api.switchTabTo('/pages/tabBar/home/index')
-							}else{
+							} else {
 								this.$api.redirectTo(`/pages/user/order/order-list?type=detele&state=${this.state}`)
 							}
-						},500)
-					}).catch(error =>{
-						this.$util.msg(error.msg,2000)
+						}, 500)
 					})
-				})
-			},
-			handCenceConfirm(){//取消订单
-				this.$util.modal('提示','确认取消该订单吗？','确定','取消',true,() =>{
-					this.OrderService.CancelOrder({orderId:this.orderId}).then(response =>{
-						this.$util.msg(response.msg,2000,true,'success')
+					.catch(error => {
+						this.$util.msg(error.msg, 2000)
+					})
+			})
+		},
+		handCenceConfirm() {
+			//取消订单
+			this.$util.modal('提示', '确认取消该订单吗？', '确定', '取消', true, () => {
+				this.OrderService.CancelOrder({ orderId: this.orderId })
+					.then(response => {
+						this.$util.msg(response.msg, 2000, true, 'success')
 						this.initOrderDetaileData()
-					}).catch(error =>{
-						this.$util.msg(error.msg,2000)
 					})
-				})
-			},
-			onShareAppMessage(res){//分享转发
-				this.isShareModal = false
-				if (res.from === 'button') {
-					// 来自页面内转发按钮
-			    }
-				return {
-					title: '您有新的分享订单，快来查看吧~',
-					path: `/pages/user/order/order-sharelogin?orderId=${this.orderId}&userId=${this.userId}`,
-					imageUrl:'https://img.caimei365.com/group1/M00/03/95/Cmis216Sk_SABnOFABZCgCzFV_g063.png'
-				}
-			},
-			hanldePopupFn(data){//监听活动内容
-				this.popupShow = true
-				this.handlerPros = data
-			},
-			getHeaderTopHeight(){
-				let statusBarHeight = this.systeminfo.statusBarHeight // 状态栏高度
-				let headerPosi = this.headerBtnPosi
-				let btnPosi = { // 胶囊实际位置，坐标信息不是左上角原点
-				      height: headerPosi.height,
-				      width: headerPosi.width,
-				      // 胶囊top - 状态栏高度
-				      top: headerPosi.top - statusBarHeight,
-				      // 胶囊bottom - 胶囊height - 状态栏height （现胶囊bottom 为距离导航栏底部的长度）
-				      bottom: headerPosi.bottom - headerPosi.height - statusBarHeight,
-				      // 屏幕宽度 - 胶囊right
-				      right: this.systeminfo.screenWidth - headerPosi.right
+					.catch(error => {
+						this.$util.msg(error.msg, 2000)
+					})
+			})
+		},
+		onShareAppMessage(res) {
+			//分享转发
+			this.isShareModal = false
+			if (res.from === 'button') {
+				// 来自页面内转发按钮
+			}
+			return {
+				title: '您有新的分享订单，快来查看吧~',
+				path: `/pages/user/order/order-sharelogin?orderId=${this.orderId}&userId=${this.userId}`,
+				imageUrl: 'https://img.caimei365.com/group1/M00/03/95/Cmis216Sk_SABnOFABZCgCzFV_g063.png'
+			}
+		},
+		hanldePopupFn(data) {
+			//监听活动内容
+			this.popupShow = true
+			this.handlerPros = data
+		},
+		getHeaderTopHeight() {
+			let statusBarHeight = this.systeminfo.statusBarHeight // 状态栏高度
+			let headerPosi = this.headerBtnPosi
+			let btnPosi = {
+				// 胶囊实际位置，坐标信息不是左上角原点
+				height: headerPosi.height,
+				width: headerPosi.width,
+				// 胶囊top - 状态栏高度
+				top: headerPosi.top - statusBarHeight,
+				// 胶囊bottom - 胶囊height - 状态栏height （现胶囊bottom 为距离导航栏底部的长度）
+				bottom: headerPosi.bottom - headerPosi.height - statusBarHeight,
+				// 屏幕宽度 - 胶囊right
+				right: this.systeminfo.screenWidth - headerPosi.right
+			}
+			this.navbarHeight = headerPosi.bottom + btnPosi.bottom // 原胶囊bottom + 现胶囊bottom
+		},
+		setHeaderBtnPosi() {
+			// 获得胶囊按钮位置信息
+			let headerBtnPosi = uni.getMenuButtonBoundingClientRect()
+			return headerBtnPosi
+		},
+		setSysteminfo() {
+			let systeminfo
+			uni.getSystemInfo({
+				// 获取设备信息
+				success: res => {
+					systeminfo = res
 				}
-				this.navbarHeight= headerPosi.bottom + btnPosi.bottom// 原胶囊bottom + 现胶囊bottom
-			},
-			setHeaderBtnPosi(){// 获得胶囊按钮位置信息
-				let headerBtnPosi = uni.getMenuButtonBoundingClientRect()
-				return headerBtnPosi
-			},
-			setSysteminfo(){
-				let systeminfo
-				uni.getSystemInfo({ // 获取设备信息
-					success: (res) => {
-						systeminfo = res
-					},
-				})
-				return systeminfo
-			},
-			handleBeanlClick(){//关闭采美豆弹窗
-				this.isActivityBean = false
-				this.initOrderDetaileData()
-			},
+			})
+			return systeminfo
 		},
-		onShow() {
-
+		handleBeanlClick() {
+			//关闭采美豆弹窗
+			this.isActivityBean = false
+			this.initOrderDetaileData()
 		}
-	}
+	},
+	onShow() {}
+}
 </script>
 
 <style lang="scss">
-	page {
-		height: auto;
-		background:#F7F7F7;
-	}
-	.details{
-		padding-bottom: 130rpx;
-	}
-	.btn-hover{
-		background: #FFFFFF;
-	}
-	.animation{
-		/* transition: transform 0.3s ease;*/
-		transition-property: transform;
-		transition-duration: 0.3s;
-		transition-timing-function: ease;
-	}
-	.invoice-balance{
-		width: 702rpx;
-		height: auto;
-		padding:0 24rpx;
-		background: #FFFFFF;
+page {
+	height: auto;
+	background: #f7f7f7;
+}
+.details {
+	padding-bottom: 130rpx;
+}
+.btn-hover {
+	background: #ffffff;
+}
+.animation {
+	/* transition: transform 0.3s ease;*/
+	transition-property: transform;
+	transition-duration: 0.3s;
+	transition-timing-function: ease;
+}
+.invoice-balance {
+	width: 702rpx;
+	height: auto;
+	padding: 0 24rpx;
+	background: #ffffff;
+	float: left;
+	margin-top: 24rpx;
+	margin-bottom: 24rpx;
+	.balabce-t {
+		width: 100%;
+		height: 86rpx;
+		line-height: 86rpx;
+		font-size: $font-size-28;
+		color: $text-color;
 		float: left;
-		margin-top: 24rpx;
-		margin-bottom: 24rpx;
-		.balabce-t{
-			width: 100%;
-			height: 86rpx;
-			line-height: 86rpx;
-			font-size: $font-size-28;
-			color: $text-color;
+		.balabce-t-le {
 			float: left;
-			.balabce-t-le{
+			font-weight: bold;
+		}
+		.balabce-t-ri {
+			float: right;
+			display: flex;
+			align-items: center;
+			.money {
+				display: flex;
 				float: left;
-				font-weight: bold;
 			}
-			.balabce-t-ri{
-				float: right;
+			.checkbox-box {
 				display: flex;
-				align-items: center;
-				.money{
-					display: flex;
-					float: left;
-				}
-				.checkbox-box{
-					display: flex;
-					width: 60rpx;
-					float: left;
-					height: 100%;
-					font-size: $font-size-24;
-					.checkbox{
-						width: 40rpx;
-						text-align: right;
-						box-sizing: border-box;
-						text-align: center;
-						text-decoration: none;
-						border-radius: 0;
-						-webkit-tap-highlight-color: transparent;
-						overflow: hidden;
-					}
-				}	
-			}
-		}
-		.balabce-b{
-			width: 100%;	
-			float: left;
-			overflow: hidden;
-			.balabce-b-text{
-				width: 100%;
-				line-height: 58rpx;
+				width: 60rpx;
+				float: left;
+				height: 100%;
 				font-size: $font-size-24;
-				color: #FF2A2A;
-				text-align: right;
-				float: right;
-			}
-			&.balabce-b--hide {
-				padding: 0 0;
-				height: 0px;
-				line-height: 0px;
-			}	
-		}
-	}
-	.clause{
-		float: right;
-		font-size: 24rpx;
-		color: #999999;
-		margin-top: 60rpx;
-		margin-right: 24rpx;
-		&.noclick{
-			pointer-events: none;
-		}
-		.text{
-			color: #1890f9;
-			&.color-bg{
-				color: #333333;
+				.checkbox {
+					width: 40rpx;
+					text-align: right;
+					box-sizing: border-box;
+					text-align: center;
+					text-decoration: none;
+					border-radius: 0;
+					-webkit-tap-highlight-color: transparent;
+					overflow: hidden;
+				}
 			}
 		}
 	}
-	.status-text{
+	.balabce-b {
+		width: 100%;
+		float: left;
 		overflow: hidden;
-		padding: 24rpx;
-		background: #fff;
-		font-size: $font-size-26;
-		.view-type{
-			float: left;
+		.balabce-b-text {
+			width: 100%;
+			line-height: 58rpx;
+			font-size: $font-size-24;
 			color: #ff2a2a;
-		}
-		.bage-buss{
-			display: inline-block;
-			width: 72rpx;
-			height: 32rpx;
-			background:radial-gradient(circle,rgba(255,39,180,1) 0%,rgba(193,77,245,1) 100%);
-			border-radius: 6rpx;
-			line-height: 32rpx;
-			text-align: center;
-			color: #FFFFFF;
-			margin-top: 10rpx;
+			text-align: right;
 			float: right;
 		}
-		.bage-auto{
-			display: inline-block;
-			width: 72rpx;
-			height: 32rpx;
-			background:radial-gradient(circle,rgba(255,180,39,1) 0%,rgba(245,142,77,1) 100%);
-			border-radius: 6rpx;
-			line-height: 32rpx;
-			text-align: center;
-			color: #FFFFFF;
-			margin-top: 10rpx;
-			float: right;
+		&.balabce-b--hide {
+			padding: 0 0;
+			height: 0px;
+			line-height: 0px;
+		}
+	}
+}
+.clause {
+	float: right;
+	font-size: 24rpx;
+	color: #999999;
+	margin-top: 60rpx;
+	margin-right: 24rpx;
+	&.noclick {
+		pointer-events: none;
+	}
+	.text {
+		color: #1890f9;
+		&.color-bg {
+			color: #333333;
 		}
 	}
-	
+}
+.status-text {
+	overflow: hidden;
+	padding: 24rpx;
+	background: #fff;
+	font-size: $font-size-26;
+	.view-type {
+		float: left;
+		color: #ff2a2a;
+	}
+	.bage-buss {
+		display: inline-block;
+		width: 72rpx;
+		height: 32rpx;
+		background: radial-gradient(circle, rgba(255, 39, 180, 1) 0%, rgba(193, 77, 245, 1) 100%);
+		border-radius: 6rpx;
+		line-height: 32rpx;
+		text-align: center;
+		color: #ffffff;
+		margin-top: 10rpx;
+		float: right;
+	}
+	.bage-auto {
+		display: inline-block;
+		width: 72rpx;
+		height: 32rpx;
+		background: radial-gradient(circle, rgba(255, 180, 39, 1) 0%, rgba(245, 142, 77, 1) 100%);
+		border-radius: 6rpx;
+		line-height: 32rpx;
+		text-align: center;
+		color: #ffffff;
+		margin-top: 10rpx;
+		float: right;
+	}
+}
 </style>