chenrui 4 years ago
parent
commit
e0c61a9c20

+ 10 - 8
pages.json

@@ -38,17 +38,13 @@
 		{
 			"path": "pages/workOrder/sellOrder/bundleList",
 			"style": {
-				"navigationStyle": "custom",  //  是否显示导航栏  default显示,custom不显示
-				"navigationBarTitleText": "已购套餐",
-				"app-plus":{
-					"titleView":false
-				}
+				"navigationBarTitleText": "销售记录"
 			}
 		},
 		{
-			"path": "pages/workOrder/sellOrder/customBundleDetail",		//  客户已购套餐详细
+			"path": "pages/workOrder/sellOrder/customBundleDetail",		//  销售详情
 			"style": {
-				"navigationBarTitleText": "客户已购套餐详细"
+				"navigationBarTitleText": "销售详情"
 			}
 		},
 		{
@@ -99,7 +95,13 @@
 			"pagePath": "pages/workOrder/sellOrder/chooseBundle",
 			"iconPath": "static/tabbar/record.png",
 			"selectedIconPath": "static/tabbar/record-active.png",
-			"text": "购买套餐"
+			"text": "套餐销售"
+		},
+		{
+			"pagePath": "pages/workOrder/sellOrder/bundleList",
+			"iconPath": "static/tabbar/record.png",
+			"selectedIconPath": "static/tabbar/record-active.png",
+			"text": "销售记录"
 		},
 		{
 			"pagePath": "pages/userCenter/index",

+ 0 - 16
pages/userCenter/index.vue

@@ -69,22 +69,6 @@
 					url: pageUrl[index]
 				})
 			},
-			//  跳转
-			toUserPage(){
-				//  未登录跳转登录,已登录跳转用户信息页
-				uni.navigateTo({
-					url: '/pages/userCenter/userInfo/userInfo'
-				})
-			},
-			//  乐豆明细
-			toLdPage(){
-				uni.navigateTo({
-					url: '/pages/userCenter/ldDetailed'
-				})
-			},
-			bindGetUserInfo(res){
-				console.log(res)
-			},
 			// 退出登录
 			quitSys(){
 				let _this = this

+ 13 - 11
pages/workOrder/sellOrder/bundleDetail.vue

@@ -24,17 +24,19 @@
 			bundleDetail
 		},
 		methods: {
-	       // 查看套餐详情
-	       getDetail (id) {
-	       			 let _this = this
-	         getBundleDetails({id: id}).then(res => {
-	           console.log(res)
-	           if (res.status == 200) {
-	             _this.bundleData = res.data
-	       				 console.log(_this.bundleData)
-	           }
-	         })
-	       }
+			// 查看套餐详情
+			getDetail (id) {
+				const _this = this
+				getBundleDetails({id: id}).then(res => {
+					console.log(res)
+					if (res.status == 200) {
+						_this.bundleData = res.data
+	       				console.log(_this.bundleData)
+					}else{
+						_this.bundleData = []
+					}
+				})
+			}
 		}
 	}
 </script>

+ 139 - 443
pages/workOrder/sellOrder/bundleList.vue

@@ -1,6 +1,6 @@
 <template>
-	<view class="pagesCons">
-		<u-navbar title-color="#fff" back-icon-size="30" back-icon-color="#fff" :border-bottom="false" :background="background">
+	<view class="bundleList-wrap">
+		<!-- <u-navbar title-color="#fff" back-icon-size="30" back-icon-color="#fff" :border-bottom="false" :background="background">
 			<view class="slot-wrap">
 				<view class="left-icon">
 					已购套餐
@@ -9,170 +9,97 @@
 					<uni-font-icons type="icon-sousuo" size="16" color="#fff"></uni-font-icons> 查询
 				</view>
 			</view>
-		</u-navbar>
+		</u-navbar> -->
 		<view class="tab-body">
-			    <view>
-					<u-tabs-swiper ref="uTabs" :list="tabList" name="dispName" :current="current" @change="tabsChange" :is-scroll="false"
-					 swiperWidth="750"></u-tabs-swiper>
-				</view>
-				<swiper class="check-list" :current="swiperCurrent" @transition="transition" @change="swiperChange" @animationfinish="animationfinish">
-					<swiper-item class="swiper-item" style="height: 100%;width: 100%;overflow: hidden;" v-for="(tabs, index) in tabList" :key="index">
-						<scroll-view scroll-y style="height: 100%;width: 100%;overflow: auto;" @scrolltolower="onreachBottom">
-							<view  
-							class="check-order-list" 
-							v-for="item in list" 
-							:key="item.id + '-' + item.number"
-							>
-							   
-								 <view class="check-row" @click="viewRow(item)">
-									 <view>{{item.orderDate}}</view>
-									 <view>
-										 <text style="color: #333;">{{filterpayType(item.refundStatus,tabList)}}</text>
-									 </view>
-								 </view>
-								 <view class="check-row" @click="viewRow(item)">
-									 <view class="flex flex_column justify_center">
-									 	<view style="margin-bottom: 20rpx;">
-									 		 {{item.bundleName}}
-									 	</view>
-										<view>
-											 {{item.customName}}
-											 <uni-font-icons size="14" type="icon-phone"></uni-font-icons>{{item.customMobile}}
-										</view>
-									 </view>
-								 	 
-								 	 <view style="width: 40upx;text-align: right;" v-if="item.resultState != 10">
-								 		 <uni-font-icons type="icon-xiangyoujiantou"></uni-font-icons>
-								 	 </view>
-								 </view>
-								 <view class="check-row" v-if="item.orderStatus=='UNPA'" >
-									 <view>
-										 应收:<text style="padding: 0 10rpx; color: red;font-size: 30rpx;">¥{{item.totalAmount.toFixed(2)}}</text>
-									 </view>
-									 <view style="text-align: right;">
-									     <button :hover-stop-propagation="true" @click="collectMoney(item)" class="action pay" size="mini">收款</button>
-									 </view>
-								 </view>
-								 <view class="check-row" v-if="item.orderStatus=='PAED'" >
-									 <view>
-										 实收:<text style="padding: 0 10rpx; color: red;">¥{{item.payedAmount.toFixed(2)}}</text>
-									 </view>
-									 <view style="text-align: right;font-size: 26rpx;">
-										 <text>付款方式:{{filterpayType(item.payType,payTypeList)}}</text>
-									 </view>
+			<view style="background-color: #fff;padding: 10rpx 0;" @click="openSearch">
+				查询
+			</view>
+			<scroll-view scroll-y style="height: 100%;width: 100%;overflow: auto;" @scrolltolower="onreachBottom">
+				 <view class="list-cont">
+					 <view class="list-item-con" v-for="(item,index) in list" :key="index">
+						 <view class="con-header">
+							 <text class="item-time">{{item.orderDate}}</text>
+							 <text class="item-orderNo">{{item.number}}</text>
+						 </view>
+						 <view class="con-main" @click="viewRow(item)">
+							 <view class="con-main-m">
+								 <view class="item-bundleName">{{item.bundleName}}</view>
+								 <view class="item-bundleMain">
+									<text class="item-cname">{{item.custName}}</text>
+									<view class="item-phone" @click.stop="goTel(item.custMobile)">
+										<u-icon name="phone" size="28"></u-icon>
+										{{item.custMobile}}
+									</view>
 								 </view>
 							 </view>
-							 <u-empty text="暂无数据" img-width="120" v-if="list.length==0 && status!='loading'" mode="list"></u-empty>
-							 <view style="padding: 20upx;">
-								 <u-loadmore v-if="total>pageSize || status=='loading'" :status="status" />
-							 </view>
-						</scroll-view>
-					</swiper-item>
-				</swiper>
+							 <u-icon name="arrow-right" size="28"></u-icon>
+						 </view>
+						 <view class="con-footer">
+							 <view class="item-price">实收:<text>¥{{item.payedAmount}}</text></view>
+							 <view class="item-type">付款方式:<text>现金</text></view>
+						 </view>
+					 </view>
+				 </view>
+				 <u-empty text="暂无数据" img-width="120" v-if="list.length==0 && status!='loading'" mode="list"></u-empty>
+				 <view style="padding: 20upx;">
+					 <u-loadmore v-if="total>pageSize || status=='loading'" :status="status" />
+				 </view>
+			</scroll-view>
 		</view>
 		<!-- 工单查询 -->
-		<u-popup v-model="showSearch" class="search-popup" mode="right" :custom-style="{top:'var(--status-bar-height)'}" length="80%">
-				<view class="search-title">已购套餐查询</view>
-				<view class="uni-list">
-					<view class="uni-list-cell">
-						<view class="uni-list-cell-left">
-							关键词:
-						</view>
-						<view class="uni-list-cell-db">
-							<input class="uni-input" placeholder-class="form-input-placeholder" v-model="queryWord" placeholder="客户姓名、手机号" />
-						</view>
+		<u-popup v-model="showSearch" class="search-popup" mode="right" length="80%">
+			<view class="search-title">已购套餐查询</view>
+			<view class="uni-list">
+				<view class="uni-list-cell">
+					<view class="uni-list-cell-left">
+						客户手机:
 					</view>
-				</view>
-				<view class="uni-list">
-					<view class="uni-list-cell">
-						<view class="uni-list-cell-left">
-							车牌号:
-						</view>
-						<view class="uni-list-cell-db">
-							<input class="uni-input" @input="queryCustomByCar" placeholder-class="form-input-placeholder" v-model="carNumber" placeholder="请输入车牌号(后5,6位或全部)" />
-						</view>
+					<view class="uni-list-cell-db">
+						<input class="uni-input" placeholder-class="form-input-placeholder" v-model="queryWord" placeholder="客户姓名、手机号" />
 					</view>
 				</view>
-				<view class="uni-list">
-					<view class="uni-list-cell">
-						<view class="uni-list-cell-left">
-							工单号:
-						</view>
-						<view class="uni-list-cell-db">
-							<input class="uni-input" placeholder-class="form-input-placeholder" v-model="number" placeholder="请输入工单号" />
-						</view>
+			</view>
+			<view class="uni-list">
+				<view class="uni-list-cell">
+					<view class="uni-list-cell-left">
+						套餐名称:
 					</view>
-				</view>
-				<view class="uni-list">
-					<view class="uni-list-cell">
-						<view class="uni-list-cell-left">
-							套餐名称:
-						</view>
-						<view class="uni-list-cell-db">
-							<input class="uni-input" placeholder-class="form-input-placeholder" v-model="bundleName" placeholder="请输入套餐名称" />
-						</view>
+					<view class="uni-list-cell-db">
+						<input class="uni-input" placeholder-class="form-input-placeholder" v-model="bundleName" placeholder="请输入套餐名称" />
 					</view>
 				</view>
-				<view class="uni-list">
-					<view class="uni-list-cell">
-						<view class="uni-list-cell-left">
-							支付方式:
-						</view>
-						<view class="uni-list-cell-db">
-							<v-select ref="payType" :disabled="true" @itemChange="getpayTypeText" :code="'PAY_PROCUCT_TYPE'" placeholder="请选择支付方式" ></v-select>
-						</view>
+			</view>
+			<view class="uni-list">
+				<view class="uni-list-cell">
+					<view class="uni-list-cell-left">
+						开始时间:
 					</view>
-				</view>
-				<view class="uni-list">
-					<view class="uni-list-cell">
-						<view class="uni-list-cell-left">
-							创建渠道:
-						</view>
-						<view class="uni-list-cell-db">
-							<v-select ref="createChannel" :disabled="true" @itemChange="getcreateChannelText" :code="'CREATE_CHANNEL'" placeholder="请选择创建渠道" ></v-select>
-						</view>
+					<view class="uni-list-cell-db">
+						<picker mode="date" v-model="beginDate" :end="endDate" @change="bindBeginDateChange">
+							<view class="uni-input" v-if="beginDate">{{beginDate}}</view>
+							<view v-else class="uni-input form-input-placeholder">请选择开始时间</view>
+						</picker>
 					</view>
 				</view>
-				<view class="uni-list">
-					<view class="uni-list-cell">
-						<view class="uni-list-cell-left">
-							开始时间:
-						</view>
-						<view class="uni-list-cell-db">
-							<picker mode="date" v-model="beginDate" :end="endDate" @change="bindBeginDateChange">
-								<view class="uni-input" v-if="beginDate">{{beginDate}}</view>
-								<view v-else class="uni-input form-input-placeholder">请选择开始时间</view>
-							</picker>
-						</view>
+			</view>
+			<view class="uni-list">
+				<view class="uni-list-cell">
+					<view class="uni-list-cell-left">
+						结束时间:
 					</view>
-				</view>
-				<view class="uni-list">
-					<view class="uni-list-cell">
-						<view class="uni-list-cell-left">
-							结束时间:
-						</view>
-						<view class="uni-list-cell-db">
-							<picker mode="date" v-model="endDate" :start="beginDate" @change="bindEndDateChange">
-								<view class="uni-input" v-if="endDate">{{endDate}}</view>
-								<view v-else class="uni-input form-input-placeholder">请选择结束时间</view>
-							</picker>
-						</view>
+					<view class="uni-list-cell-db">
+						<picker mode="date" v-model="endDate" :start="beginDate" @change="bindEndDateChange">
+							<view class="uni-input" v-if="endDate">{{endDate}}</view>
+							<view v-else class="uni-input form-input-placeholder">请选择结束时间</view>
+						</picker>
 					</view>
 				</view>
-				<view class="uni-list-btns">
-					<button type="primary" @click="pageInit(false)">查询</button>
-					<button type="info" @click="resetForm">重置</button>
-				</view>
-			</u-popup>
-			
-			<u-action-sheet 
-			:list="customList" 
-			:mask-close-able="false" 
-			:tips="tips" 
-			@close="closeSelCust"
-			@click="selectCustomCar" 
-			v-model="showCustomeList">
-			</u-action-sheet>
+			</view>
+			<view class="uni-list-btns">
+				<button type="primary" @click="pageInit(false)">查询</button>
+				<button type="info" @click="resetForm">重置</button>
+			</view>
+		</u-popup>
 	</view>
 </template>
 
@@ -187,7 +114,6 @@
 		data() {
 			return {
 				showSearch: false,
-				showCustomeList: false,
 				customList: [],
 				tips: {
 					text: '请选择客户信息',
@@ -199,24 +125,6 @@
 					// 渐变色
 					backgroundImage: 'linear-gradient(45deg, rgb(85, 170, 255), rgb(21, 102, 223))'
 				},
-				tabList: [
-					{
-						dispName: '全部',
-						code:''
-					},
-					{
-						dispName: '正常',
-						code:'1'
-					},
-					{
-						dispName: '退款中',
-						code:'2'
-					},
-					{
-						dispName: '已退款',
-						code:'3'
-					}
-				],
 				current: 0,
 				swiperCurrent: 0,
 				orderStatus: '', // 订单状态
@@ -240,13 +148,7 @@
 			}
 		},
 		onLoad() {
-			let _this = this
-			this.getpayType()
 			this.pageInit()
-			uni.$on('refreshBundle',function(data){
-				 console.log(data.msg,'refreshOrder')
-			     _this.pageInit()
-			})
 		},
 		methods:{ 
 			message(title){
@@ -255,31 +157,6 @@
 					title: title
 				})
 			},
-			// 获取退款状态 
-			getRefundList () {
-			  let _this = this
-			  this.status = "loading"
-			  uni.showLoading({
-			  	title: '加载中...'
-			  })
-			  getLookUpDatas({
-			    type: 'REFUND_STATUS'
-			  }).then(result => {
-				  uni.hideLoading() 
-			    if (result && result.status + '' === '200') {
-					result.data.unshift({
-					    dispName: '全部',
-						code:''
-					  })
-			      _this.tabList = result.data
-				   _this.pageInit()
-			    }
-			  })
-			},
-			// 获取所有收费方式
-			getpayType () {
-				this.payTypeList = this.$store.state.vuex_paymentTypeList
-			},
 			filterpayType (val,dataList) {
 			  var _value = ''
 			    for (let i = 0; i < dataList.length; i++) {
@@ -290,12 +167,6 @@
 			    }
 			  return _value
 			},
-			getpayTypeText(v) {
-				this.payTypes = v
-			},
-			getcreateChannelText(v){
-				this.createChannel=v
-			},
 			pageInit(showSearch){
 				if(this.endDate&&!this.beginDate){
 				  this.message('请选择开始日期')
@@ -308,37 +179,9 @@
 				//this.swiperCurrent 
 				this.total = 0
 				this.pageNo = 1
-				this.refundStatus = this.tabList.length ? this.tabList[this.current].code : ''
 				this.getRow()
 				this.showSearch = showSearch
 			},
-			// tabs通知swiper切换
-			tabsChange(index) {
-				this.swiperCurrent = index;
-			},
-			swiperChange(event){
-				console.log(event.detail)
-				this.list = []
-				this.status = "loading"
-			},
-			// swiper-item左右移动,通知tabs的滑块跟随移动
-			transition(e) {
-				console.log(e,'eeeeeeeee')
-				let dx = e.detail.dx;
-				this.$refs.uTabs.setDx(dx);
-			},
-			// 由于swiper的内部机制问题,快速切换swiper不会触发dx的连续变化,需要在结束时重置状态
-			// swiper滑动结束,分别设置tabs和swiper的状态
-			animationfinish(e) {
-				console.log('---------')
-				let current = e.detail.current;
-				if(current != this.current){
-					this.$refs.uTabs.setFinishCurrent(current);
-					this.swiperCurrent = current;
-					this.current = current;
-					this.pageInit()
-				}
-			},
 			// scroll-view到底部加载更多
 			onreachBottom() {
 				console.log(this.list.length, this.total)
@@ -349,20 +192,13 @@
 					this.status = "nomore"
 				}
 			},
-			checkNums (states, i){
-			  if(states){
-				  let arr = states.split(',')
-				  return arr[i]
-			  }
-				return 0
-			},
 			// 查询列表
 			getRow (pageNo) {
-			  let _this = this
+				console.log('列表---')
+			  const _this = this
 			  if (pageNo) {
 			    this.pageNo = pageNo
 			  }
-			  
 			  let sdata = {
 			    pageNo: this.pageNo,
 			    pageSize: this.pageSize,
@@ -370,32 +206,12 @@
 				beginDate: this.beginDate,
 				endDate: this.endDate
 			  }
-			  if (this.number) {
-			    sdata.number = this.number
-			  }
 			  if (this.bundleName) {
 			    sdata.bundleName = this.bundleName
 			  }
-			  if (this.payTypes) {
-				  let arr = []
-				  arr.push(this.payTypes)
-			    sdata.payTypes = arr
-			  }
-			  if (this.createChannels) {
-			  let arr = []
-			  arr.push(this.createChannels)
-			    sdata.createChannels = arr
-			  }
-			  if (this.sellChannel) {
-			    sdata.sellChannelCode = this.sellChannel
-			  }
-			  if (this.refundStatus) {
-			    sdata.refundStatus = this.refundStatus
-			  }
-			 
 			  _this.status = "loading"
 			  listCustomerBundle(sdata).then(res => {
-				if (res.code == 200 || res.status == 204 || res.status == 200) {
+				if (res.status == 200) {
 				  if(_this.pageNo>1){
 					  _this.list = _this.list.concat(res.data.list || [])
 				  }else{
@@ -411,18 +227,18 @@
 			},
 			// 查询条件
 			openSearch(){
-				let _this = this
+				const _this = this
 				this.showSearch = true
-				if (this.payTypes) {
-					setTimeout(function(){
-						_this.$refs.payType.setVal(_this.payTypes)
-					},300)
-				}
-				if(_this.createChannels){
-					setTimeout(function(){
-						_this.$refs.createChannel.setVal(_this.createChannels)
-					},300)
-				}
+				// if (this.payTypes) {
+				// 	setTimeout(function(){
+				// 		_this.$refs.payType.setVal(_this.payTypes)
+				// 	},300)
+				// }
+				// if(_this.createChannels){
+				// 	setTimeout(function(){
+				// 		_this.$refs.createChannel.setVal(_this.createChannels)
+				// 	},300)
+				// }
 			},
 			bindBeginDateChange(e){
 				this.beginDate = e.target.value
@@ -436,13 +252,6 @@
 				this.beginDate = ''
 				this.endDate = ''
 				this.bundleName = ''
-				this.number = ''
-				this.payTypes = ''
-				this.sellChannel = ''
-				this.carNumber = ''
-				this.createChannels=''
-				this.$refs.createChannel.resetVal()
-				this.$refs.payType.resetVal()
 				this.pageInit(true)
 			},
 			// 详细页
@@ -452,189 +261,76 @@
 					url: "/pages/workOrder/sellOrder/customBundleDetail?id="+item.id
 				})
 			},
-		   // 付款
-		   payRow (params) {
-		     let _this = this
-		     let id = params.row.id
-		     this.currentId = id
-		     this.$Modal.confirm({
-		       title: '确认付款操作吗',
-		       onOk: () => {
-		         // 打开购买套餐页面
-		         _this.openPackagePay = true
-		       },
-		       onCancel: () => {
-		       }
-		     })
-		   },
-			collectMoney (data){
-                 // 进入收款页面
-				 uni.redirectTo({
-					 url: '/pages/workOrder/sellOrder/bundlePay?id='+data.id
-				 })
-		    },
-			// 车牌号查询客户信息
-			queryCustomByCar (event) {
-				console.log(event.detail.value, '==搜索关键词')
-			   let queryWord = event.detail.value
-			   if (queryWord.length > 0){
-				 let params = {vehicleNumber: ''}
-				 if (queryWord.length == 5 || queryWord.length == 6){
-				   params.vehicle5Number = queryWord.toUpperCase()
-				   this.queryCustomInfo(params)
-				 } else if (queryWord.length == 7 || queryWord.length == 8){
-				   params.vehicleNumber = queryWord.toUpperCase()
-				   this.queryCustomInfo(params)
-				 }
-			   }else{
-				   this.queryWord = ''
-			   }
-			},
-			// 获取客户车辆信息
-			queryCustomInfo (params) {
-			    let _this = this
-				searchCustomerList(params).then(res => {
-				  if (res.status - 0 === 200) {
-					_this.customList = res.data || []
-					if(_this.customList.length){
-						_this.customList.map(item=>{
-							item.text = item.customer.mobile + '-' + item.vehicle.number
-						})
-						if(_this.customList.length > 1){
-							this.showCustomeList = true
-							uni.hideKeyboard()
-						}else{
-							this.selectCustomCar(0)
-						}
-					}else{
-						uni.showToast({
-							icon:'none',
-							title:'此车牌不存在'
-						})
-						this.carNumber = ''
-					}
-				  } 
+			//  拨打电话
+			goTel(phone){
+				uni.makePhoneCall({
+				    phoneNumber: phone
 				})
-			},
-			// 选择下拉选项
-			selectCustomCar (index){
-				let row = this.customList[index]
-				if (row){
-					this.queryWord = row.customer.mobile
-					this.carNumber = row.vehicle.number
-				}
-			},
-			// 取消选择已存在的客户信息
-			closeSelCust(){
-				this.customList = []
-				this.queryWord = ''
-				this.carNumber = ''
-			},
+			}
 		}
 	}
 </script>
 
 <style lang="scss">
-	page{
-		height: 100%;
-	}
-	.status-bars{
-		height: var(--status-bar-height);
-		background: linear-gradient(60deg, rgb(85, 170, 255), rgb(0, 114, 167));
-	}
-	.pagesCons{
-		height: 100%;
-		display: flex;
-		flex-direction: column;
-		.tab-body{
-			.check-list{
-				height: calc(100vh - 120px);
-			}
-			.check-order-list{
+	.bundleList-wrap{
+		width: 100%;
+		.list-cont{
+			.list-item-con{
 				background: #ffffff;
-				padding: 10upx 20upx;
-				margin: 25upx;
-				border-radius: 6upx;
-				box-shadow: 1px 1px 3px #EEEEEE;
-				.check-row{
+				padding: 10rpx 20rpx;
+				margin: 24rpx;
+				border-radius: 6rpx;
+				box-shadow: 2rpx 2rpx 6rpx #EEEEEE;
+				.con-header, .con-main, .con-footer{
 					display: flex;
+					justify-content: space-between;
 					align-items: center;
-					padding: 20upx 10upx;
-					font-size: 28upx;
-					&:first-child{
+				}
+				.con-header{
+					font-size: 26rpx;
+					padding: 20rpx 10rpx;
+					border-bottom: 1px dashed #F8F8F8;
+					.item-time{
 						color: #666;
-						border-bottom: 1px dashed #F8F8F8;
-						font-size: 26upx;
 					}
-					&:last-child{
-						border-top: 1px dashed #F8F8F8;
+					.item-orderNo{
+						color: #333;
 					}
-					> view{
-						&:first-child{
-							flex-grow: 1;
+				}
+				.con-main{
+					font-size: 28rpx;
+					color: #333;
+					padding: 20rpx 10rpx;
+					border-bottom: 1px dashed #F8F8F8;
+					.con-main-m{
+						.item-bundleName{
+							margin-bottom: 14rpx;
 						}
-					}
-					.action{
-						margin: 0 6rpx;
-						padding: 0 20rpx;
-						color: #fff;
-					}
-					.edit{
-						background-color: #f9ba09;
-					}
-					.view{
-						background-color: #ff7801;
-					}
-					.del{
-						background-color: #f72525;
-					}
-					.finish{
-						background-color: #2d8cf0;
-					}
-					.pay{
-						background-color: #10c71e;
-					}
-					.check-btns{
-						width: '50%';
-						display: flex;
-						align-items: center;
-						justify-content: flex-end;
-						> view{
-							margin-left: 35upx;
-							font-size: 28upx;
+						.item-bundleMain{
+							.item-cname{
+								display: inline-block;
+								margin-right: 10rpx;
+							}
+							.item-phone{
+								display: inline-block;
+							}
 						}
 					}
-					.u-tag{
-						border-radius: 0;
-					}
-					.uni-icons{
-						margin: 0 5upx;
+				}
+				.con-footer{
+					padding: 20rpx 10rpx;
+					.item-price{
+						text{
+							font-size: 30rpx;
+							color: red;
+						}
 					}
 				}
 			}
 		}
 	}
-   .slot-wrap {
-		display: flex;
-		align-items: center;
-		/* 如果您想让slot内容占满整个导航栏的宽度 */
-		flex: 1;
-		/* 如果您想让slot内容与导航栏左右有空隙 */
-		padding: 0 30rpx 0 0;
-		color: #fff;
-		font-size: 28upx;
-		.left-icon{
-			flex-grow: 1;
-			font-size: 32upx;
-		}
-		.right-icon{
-			padding-left:50upx;
-		}
-		.uni-icons{
-			margin-right: 10upx;
-		}
-	}
 	.search-popup{
+		height: 100vh;
 		.search-title{
 			text-align: center;
 			padding: 22upx;

+ 454 - 476
pages/workOrder/sellOrder/customBundleDetail.vue

@@ -1,53 +1,40 @@
 <template>
-	<view class="content">
+	<view class="customBundleDetail-wrap">
+		<v-select v-show="false" ref="payType" code="PAY_PROCUCT_TYPE" placeholder="支付方式"></v-select>
 		<view class="header">
 			 <view class="header-row">
 				 <text>单据信息</text>
 			 </view>
-			 <view class="header-row r2">
-			 	<view><text>购买日期:</text>{{panelData.orderDate}}</view>
-				<view><text>使用门店:</text>{{panelData.useStoreName}}</view>
-			 </view>
-			 <view class="header-row r2">
-			 	<view><text>客户名称:</text>{{panelData.orderBundle.customName||'--'}}</view>
-				<view><text>手机号:</text>{{panelData.orderBundle.customMobile}}</view>
-			 </view>
-			 <view class="header-row">
-			 	<view><text>套餐名称:</text>{{panelData.orderBundle.bundleName}}</view>
-			 </view>
-			 <view class="header-row r2">
-				<view><text>套餐价格:</text>¥{{panelData.orderBundle.bundlePrice}}</view>
-			 </view>
-			 <view class="header-row">
-				 <view>
-					 <text>优惠金额:</text>
-					 ¥{{panelData.orderBundle.couponAmount+(panelData.orderBundle.ticketCouponAmount?panelData.orderBundle.ticketCouponAmount:0)}}
-					 <text class="couponText" v-if="panelData.orderBundle.couponAmount || panelData.orderBundle.ticketCouponAmount">
-					    (其中:
-					   <text class="couponText" v-if="usedCouponList.length" v-for="(item,index) in usedCouponList" :key="index">【{{item.title}}】使用 {{item.usedCount}}张,</text>
-					   <text class="couponText">【员工自主优惠】{{panelData.orderBundle.couponAmount}}元) </text>
-					 </text>
-				 </view>
-			 </view>
-			 <v-select ref="payType" v-show="false" :code="'PAY_PROCUCT_TYPE'"></v-select>
-			 <view class="header-row r2">
-				<view><text>实际收款:</text>¥{{panelData.orderBundle.totalAmount}}</view>
-			 	<view><text>支付方式:</text>{{filterpayType(panelData.orderBundle.payType)}}</view>
-			 </view>
-			 <view class="header-row r2">
-				<view><text>销售渠道:</text>{{panelData.orderBundle.sellChannel}}</view>
-				<view><text>销售人员:</text>{{panelData.orderBundle.sellerName}}</view>
-			 </view>
-			 <view class="header-row">
-			 	<view><text>销售门店:</text>{{panelData.orderBundle.storeName}}</view>
-			 </view>
-			 <view class="header-row">
-			 	<view><text>工单号:</text>{{panelData.orderBundle.number}}</view>
-			 </view>
-			 <view class="header-row">
-				<view><text>创建渠道:</text>{{panelData.orderBundle.createChannel||'--'}}</view>
+			 <view v-if="panelData">
+				<view class="header-row r2">
+					<view><text>购买日期:</text>{{panelData.orderDate||'--'}}</view>
+				</view>
+				<view class="header-row r2">
+					<view><text>订单号:</text>{{panelData.orderBundle.number||'--'}}</view>
+				</view>
+				<view class="header-row r2">
+					<view><text>客户名称:</text>{{panelData.orderBundle.custName||'--'}}</view>
+								<view><text>手机号:</text>{{panelData.orderBundle.custMobile||'--'}}</view>
+				</view>
+				<view class="header-row r2">
+					<view><text>销售合作商:</text>{{panelData.dataSourceName||'--'}}</view>
+				</view>
+				<view class="header-row">
+					<view><text>套餐名称:</text>{{panelData.orderBundle.bundleName||'--'}}</view>
+				</view>
+				<view class="header-row r2">
+					<view><text>套餐价格:</text>¥{{panelData.orderBundle.totalAmount ? panelData.orderBundle.totalAmount + '元' : '--'}}</view>
+				</view>
+				<view class="header-row r2">
+					<view><text>销售人员:</text>{{panelData.sellerName||'--'}}</view>
+				</view>
+				<view class="header-row">
+					<view><text>收款金额:</text>{{panelData.orderBundle.payedAmount ? panelData.orderBundle.payedAmount + '元' : '--'}}</view>
+				</view>
+				<view class="header-row">
+					<view v-if="panelData.paymentDetailList"><text>支付方式:</text>{{$refs.payType.getCodeByName(panelData.paymentDetailList[0].payType)}}</view>
+				</view>
 			 </view>
-			 
 		</view>
 		<view class="tabs">
 			<view class="need-treament" @click="cur = 0" :class="{ active: cur == 0 }">套餐内容</view>
@@ -122,8 +109,6 @@ export default {
 	},
 	data() {
 		return {
-			payTypeList: [], // 付款方式
-			usedCouponList: [], // 已使用优惠券列表
 			cur: 0,
 			id: '', 
 			panelData: {
@@ -138,22 +123,10 @@ export default {
 	onLoad(opts) {
 		console.log(opts);
 		this.id = opts.id;
-		this.getCustomerBundleDetail();
-		this.getCustomerBundleHistory();
-		this.payTypeList = this.$store.state.vuex_paymentTypeList
+		this.getCustomerBundleDetail()
+		this.getCustomerBundleHistory()
 	},
 	methods: {
-		filterpayType (val) {
-			let dataList = this.payTypeList
-		    let _value = ''
-		    for (let i = 0; i < dataList.length; i++) {
-		      if (val == dataList[i].code) {
-		        _value = dataList[i].dispName
-		        break
-		      }
-		    }
-		  return _value
-		},
 		message(title){
 			uni.showToast({
 				icon:'none',
@@ -166,21 +139,26 @@ export default {
 			customerBundleDetail({
 			  id: this.id
 			}).then(res => {
-			  this.panelData = res.data
-			  let list = []
-			  _.forEach(res.data.customerBundleItemList, (item) => {
-			    list.push({
-			      name: item.itemName,
-			      amount: item.itemTimes + '次'
-			    })
-			  })
-			  _.forEach(res.data.customerBundlePartList, (item) => {
-			    list.push({
-			      name: item.partName,
-			      amount: item.quantity + (item.spec || '')
-			    })
-			  })
-			  this.itemData = list
+				if(res.status == 200){
+					this.panelData = res.data
+					let list = []
+					_.forEach(res.data.customerBundleItemList, (item) => {
+					  list.push({
+					    name: item.itemName,
+					    amount: item.itemTimes + '次'
+					  })
+					})
+					_.forEach(res.data.customerBundlePartList, (item) => {
+					  list.push({
+					    name: item.partName,
+					    amount: item.quantity + (item.spec || '')
+					  })
+					})
+					this.itemData = list
+				}else{
+					this.panelData = []
+					this.itemData = []
+				}
 			})
 		},
 		// 获取套餐使用记录
@@ -250,421 +228,421 @@ export default {
 	page{
 		height: 100%;
 	}
-.content {
-	padding: 0;
-	display: flex;
-	flex-direction: column;
-	height: 100%;
-}
-.cont-list{
-	// padding: 0upx 20upx;
-	flex: 1;
-	overflow-y: scroll;
-	> view{
-		&:last-child{
-			border: 0;
+	.customBundleDetail-wrap {
+		padding: 0;
+		display: flex;
+		flex-direction: column;
+		width: 100%;
+		height: 100%;
+		.cont-list{
+			flex: 1;
+			overflow-y: scroll;
+			> view{
+				&:last-child{
+					border: 0;
+				}
+			}
+			.check-order-list{
+				background: #ffffff;
+				padding: 10upx 20upx;
+				margin: 15upx 25upx;
+				border-radius: 6upx;
+				box-shadow: 1px 1px 3px #EEEEEE;
+				.check-row{
+					display: flex;
+					align-items: center;
+					padding: 15upx 10upx;
+					font-size: 30upx;
+					word-break: break-all;
+					&:first-child{
+						color: #666;
+					}
+					> view{
+						&:first-child{
+							flex-grow: 1;
+							width: 60%;
+						}
+					}
+					.action{
+						margin: 0 6rpx;
+						padding: 0 20rpx;
+						color: #fff;
+					}
+					.edit{
+						background-color: #f9ba09;
+					}
+					.view{
+						background-color: #ff7801;
+					}
+					.del{
+						background-color: #f72525;
+					}
+					.finish{
+						background-color: #2d8cf0;
+					}
+					.pay{
+						background-color: #10c71e;
+					}
+					.check-btns{
+						width: '50%';
+						display: flex;
+						align-items: center;
+						justify-content: flex-end;
+						> view{
+							margin-left: 35upx;
+							font-size: 28upx;
+						}
+					}
+					.u-tag{
+						border-radius: 0;
+					}
+					.uni-icons{
+						margin: 0 5upx;
+					}
+				}
+			}
 		}
-	}
-	.check-order-list{
-		background: #ffffff;
-		padding: 10upx 20upx;
-		margin: 15upx 25upx;
-		border-radius: 6upx;
-		box-shadow: 1px 1px 3px #EEEEEE;
-		.check-row{
+		.footer{
+			padding: 20upx;
+		}
+		.noDate {
+			font-size: 32rpx;
+			color: #999;
+			text-align: center;
+			padding: 60rpx 0;
+		}
+		.header {
+			position: relative;
+			background: #FFFFFF;
+			padding: 10upx 20upx;
+			font-size: 30upx;
+		}
+		.header-row{
 			display: flex;
 			align-items: center;
-			padding: 15upx 10upx;
-			font-size: 30upx;
-			word-break: break-all;
-			&:first-child{
+			padding: 10upx 0;
+			color: #666666;
+			.couponText{
+				font-size: 28rpx;
 				color: #666;
 			}
+			&:first-child{
+				font-size: 32upx;
+				color: #333333;
+			}
 			> view{
 				&:first-child{
-					flex-grow: 1;
-					width: 60%;
+					margin-left: 20upx;
 				}
-			}
-			.action{
-				margin: 0 6rpx;
-				padding: 0 20rpx;
-				color: #fff;
-			}
-			.edit{
-				background-color: #f9ba09;
-			}
-			.view{
-				background-color: #ff7801;
-			}
-			.del{
-				background-color: #f72525;
-			}
-			.finish{
-				background-color: #2d8cf0;
-			}
-			.pay{
-				background-color: #10c71e;
-			}
-			.check-btns{
-				width: '50%';
-				display: flex;
-				align-items: center;
-				justify-content: flex-end;
-				> view{
-					margin-left: 35upx;
-					font-size: 28upx;
+				text{
+					color: #333333;
 				}
 			}
-			.u-tag{
-				border-radius: 0;
+		}
+		.header-row.r3{
+			> view{
+				width: 33%;
 			}
-			.uni-icons{
-				margin: 0 5upx;
+		}
+		.header-row.r2{
+			> view{
+				width: 50%;
 			}
 		}
-	}
-}
-.footer{
-	padding: 20upx;
-}
-.noDate {
-	font-size: 32rpx;
-	color: #999;
-	text-align: center;
-	padding: 60rpx 0;
-}
-.header {
-	position: relative;
-	background: #FFFFFF;
-	padding: 10upx 20upx;
-	font-size: 30upx;
-}
-.header-row{
-	display: flex;
-	align-items: center;
-	padding: 10upx 0;
-	color: #666666;
-	.couponText{
-		font-size: 28rpx;
-		color: #666;
-	}
-	&:first-child{
-		font-size: 32upx;
-		color: #333333;
-	}
-	> view{
-		&:first-child{
-			margin-left: 20upx;
+		.img-box > image {
+			width: 25%;
+			height: 160rpx;
+			float: left;
+			padding: 20rpx;
 		}
-		text{
-			color: #333333;
+		 
+		
+		.carImage {
+			width: 104rpx;
+			height: 104rpx;
+			text-align: center;
+			padding: 15rpx;
+		}
+		.little-img {
+			width: 104rpx;
+			height: 104rpx;
+		}
+		.text {
+			font-size: 36rpx;
+		}
+		
+		.text1 {
+			color: rab(40, 40, 40);
+			font-size: 30rpx;
+		}
+		 
+		.tabs {
+			width: 100%;
+			background: #fff;
+			margin: 20rpx auto 0 auto;
+			border-radius: 10rpx;
+		}
+		
+		.need-treament,
+		.pay-close,
+		.good-condition {
+			font-size: 28rpx;
+			color: rgb(74, 74, 74);
+			display: inline-block;
+			text-align: center;
+			padding: 20rpx 0;
+			width: 25%;
+		}
+		 
+		.need-treament-tab1 {
+			margin: 20rpx auto 0 auto;
+			background: #fff;
+			display: flex;
+			border-bottom: 1rpx solid rgb(228, 228, 228);
+			width: 100%;
+			align-items: center;
+		}
+		.oil {
+			flex-grow: 1;
+			padding: 0 16rpx;
+			font-size: 30rpx;
+			display: flex;
+			align-items: center;
+		}
+		.jiyou {
+			width: 44rpx;
+			height: 44rpx;
+			margin-right: 16rpx;
+		}
+		.zhang {
+			width: 20%;
+		}
+		.zhang-logo {
+			height: 72rpx;
+			width: 110rpx;
+			display: inline-block;
+		}
+		.intruce {
+			font-size: 36rpx;
+			display: inline-block;
+			margin: 36rpx 0 0 -60rpx;
+			width: 14%;
+			text-align: center;
+		}
+		
+		.list {
+			width: 80%;
+		}
+		
+		.matter {
+			background: #fff;
+			border-bottom: 1rpx dashed rgb(228, 228, 227);
+			display: flex;
+			padding: 30rpx;
+		}
+		.matter .red {
+			background: #f2711c;
+		}
+		.matter .blue {
+			background: #07cc04;
+		}
+		.matter .green {
+			background: #239ff2;
+		}
+		.problem {
+			font-size: 24rpx;
+			background: #fefefe;
+			width: 90rpx;
+			text-align: center;
+			border-radius: 10rpx;
+			padding: 6rpx;
+			color: #fff;
+		}
+		
+		.num-left {
+			width: 20%;
+		}
+		.num-right {
+			width: 80%;
+			color: rgb(74, 74, 74);
+			padding-top: 6rpx;
+		}
+		.num-right > view {
+			display: flex;
+			align-items: center;
+			font-size: 24rpx;
+			margin-bottom: 20rpx;
+		}
+		.num-right > view:last-child {
+			margin-bottom: 0;
+		}
+		.num-right .uni-badge {
+			margin: 0 10rpx;
+		}
+		.number {
+			font-size: 26rpx;
+			background: #ccc;
+			border-radius: 50rpx;
+			text-align: center;
+			width: 40rpx;
+			height: 40rpx;
+			display: inline-block;
+			margin: 0 8rpx 0 0;
+		}
+		
+		.num-list {
+			font-size: 30rpx;
+			display: inline-block;
+			color: rgb(74, 74, 74);
+		}
+		
+		.cle {
+			clear: both;
+		}
+		
+		.instructions-box {
+			width: 100%;
+			background: #fff;
+			margin: 0 auto;
+		}
+		
+		.instructions {
+			width: 16%;
+			font-size: 24rpx;
+			background: rgb(252, 232, 41);
+			width: 90rpx;
+			text-align: center;
+			border-radius: 10rpx;
+			color: rgb(74, 74, 74);
+			padding: 6rpx;
+		}
+		
+		.elaborate {
+			width: 76%;
+			font-size: 24rpx;
+			color: rgb(74, 74, 74);
+			float: right;
+			margin: -50rpx 0 30rpx 0;
+		}
+		
+		.int {
+			padding: 30rpx 0 0 30rpx;
+		}
+		
+		.del {
+			clear: both;
+		}
+		
+		.illustrations {
+			width: 100%;
+			margin: 0 auto;
+		}
+		
+		.banner {
+			width: 100%;
+			height: 150rpx;
+		}
+		
+		.horn {
+			width: 96%;
+			background: #ffffff;
+			margin: 10rpx auto 0 auto;
+			border-bottom: 1rpx solid rgb(228, 228, 227);
+		}
+		
+		.laba {
+			width: 44rpx;
+			height: 44rpx;
+			margin: 20rpx 0 10rpx 20rpx;
+		}
+		.uni-collapse-cell__title-text {
+			font-size: 24rpx !important;
+		}
+		.right-text {
+			font-size: 24rpx;
+		}
+		
+		.video-box {
+			padding: 20rpx;
+			text-align: center;
+		}
+		.horn-text {
+			font-size: 36rpx;
+			float: right;
+			margin: -64rpx 550rpx 0 0;
+		}
+		
+		.instructions-box4 {
+			width: 96%;
+			background: #fff;
+			margin: 30rpx auto 0 auto;
+			border-bottom: 1rpx dashed rgb(228, 228, 227);
+		}
+		
+		.condition {
+			background: #fff;
+			margin: 30rpx auto 0 auto;
+		}
+		
+		.dianchi-img {
+			width: 60rpx;
+			height: 60rpx;
+			background: #aaff7f;
+			border-radius: 100%;
+			padding: 20rpx;
+		}
+		
+		.battery-box {
+			width: 100%;
+			padding-bottom: 20rpx;
+		}
+		
+		.bateery {
+			font-size: 26rpx;
+			padding: 10rpx 0;
+		}
+		
+		.condit-title {
+			font-size: 30rpx;
+			color: rgb(40, 40, 40);
+			border-bottom: 1rpx solid rgb(228, 228, 227);
+			padding: 20rpx 0 20rpx 20rpx;
+		}
+		
+		.lis-img {
+			display: inline-block;
+			width: 25%;
+			text-align: center;
+			margin: 30rpx 0 0 0;
+			color: rgb(74, 74, 74);
+		}
+		.note {
+			padding: 30rpx;
+			font-size: 26rpx;
+			color: rgb(74, 74, 74);
+		}
+		
+		.note-text {
+			padding: 20rpx 0 0 0;
+			line-height: 45rpx;
+			color: #666;
+		}
+		.disclaimer {
+			padding: 30rpx;
+			font-size: 26rpx;
+			color: rgb(74, 74, 74);
+		}
+		.disclaimer > view {
+			margin-bottom: 20rpx;
+			line-height: 45rpx;
+		}
+		
+		.active {
+			border-bottom: 6rpx solid rgb(85, 170, 255);
+			color: #009AE1;
+		}
+		.uni-badge {
+			margin: 8rpx 16rpx 0 16rpx;
 		}
 	}
-}
-.header-row.r3{
-	> view{
-		width: 33%;
-	}
-}
-.header-row.r2{
-	> view{
-		width: 50%;
-	}
-}
-.img-box > image {
-	width: 25%;
-	height: 160rpx;
-	float: left;
-	padding: 20rpx;
-}
- 
-
-.carImage {
-	width: 104rpx;
-	height: 104rpx;
-	text-align: center;
-	padding: 15rpx;
-}
-.little-img {
-	width: 104rpx;
-	height: 104rpx;
-}
-.text {
-	font-size: 36rpx;
-}
-
-.text1 {
-	color: rab(40, 40, 40);
-	font-size: 30rpx;
-}
- 
-.tabs {
-	width: 100%;
-	background: #fff;
-	margin: 20rpx auto 0 auto;
-	border-radius: 10rpx;
-}
-
-.need-treament,
-.pay-close,
-.good-condition {
-	font-size: 28rpx;
-	color: rgb(74, 74, 74);
-	display: inline-block;
-	text-align: center;
-	padding: 20rpx 0;
-	width: 25%;
-}
- 
-.need-treament-tab1 {
-	margin: 20rpx auto 0 auto;
-	background: #fff;
-	display: flex;
-	border-bottom: 1rpx solid rgb(228, 228, 228);
-	width: 100%;
-	align-items: center;
-}
-.oil {
-	flex-grow: 1;
-	padding: 0 16rpx;
-	font-size: 30rpx;
-	display: flex;
-	align-items: center;
-}
-.jiyou {
-	width: 44rpx;
-	height: 44rpx;
-	margin-right: 16rpx;
-}
-.zhang {
-	width: 20%;
-}
-.zhang-logo {
-	height: 72rpx;
-	width: 110rpx;
-	display: inline-block;
-}
-.intruce {
-	font-size: 36rpx;
-	display: inline-block;
-	margin: 36rpx 0 0 -60rpx;
-	width: 14%;
-	text-align: center;
-}
-
-.list {
-	width: 80%;
-}
-
-.matter {
-	background: #fff;
-	border-bottom: 1rpx dashed rgb(228, 228, 227);
-	display: flex;
-	padding: 30rpx;
-}
-.matter .red {
-	background: #f2711c;
-}
-.matter .blue {
-	background: #07cc04;
-}
-.matter .green {
-	background: #239ff2;
-}
-.problem {
-	font-size: 24rpx;
-	background: #fefefe;
-	width: 90rpx;
-	text-align: center;
-	border-radius: 10rpx;
-	padding: 6rpx;
-	color: #fff;
-}
-
-.num-left {
-	width: 20%;
-}
-.num-right {
-	width: 80%;
-	color: rgb(74, 74, 74);
-	padding-top: 6rpx;
-}
-.num-right > view {
-	display: flex;
-	align-items: center;
-	font-size: 24rpx;
-	margin-bottom: 20rpx;
-}
-.num-right > view:last-child {
-	margin-bottom: 0;
-}
-.num-right .uni-badge {
-	margin: 0 10rpx;
-}
-.number {
-	font-size: 26rpx;
-	background: #ccc;
-	border-radius: 50rpx;
-	text-align: center;
-	width: 40rpx;
-	height: 40rpx;
-	display: inline-block;
-	margin: 0 8rpx 0 0;
-}
-
-.num-list {
-	font-size: 30rpx;
-	display: inline-block;
-	color: rgb(74, 74, 74);
-}
-
-.cle {
-	clear: both;
-}
-
-.instructions-box {
-	width: 100%;
-	background: #fff;
-	margin: 0 auto;
-}
-
-.instructions {
-	width: 16%;
-	font-size: 24rpx;
-	background: rgb(252, 232, 41);
-	width: 90rpx;
-	text-align: center;
-	border-radius: 10rpx;
-	color: rgb(74, 74, 74);
-	padding: 6rpx;
-}
-
-.elaborate {
-	width: 76%;
-	font-size: 24rpx;
-	color: rgb(74, 74, 74);
-	float: right;
-	margin: -50rpx 0 30rpx 0;
-}
-
-.int {
-	padding: 30rpx 0 0 30rpx;
-}
-
-.del {
-	clear: both;
-}
-
-.illustrations {
-	width: 100%;
-	margin: 0 auto;
-}
-
-.banner {
-	width: 100%;
-	height: 150rpx;
-}
-
-.horn {
-	width: 96%;
-	background: #ffffff;
-	margin: 10rpx auto 0 auto;
-	border-bottom: 1rpx solid rgb(228, 228, 227);
-}
-
-.laba {
-	width: 44rpx;
-	height: 44rpx;
-	margin: 20rpx 0 10rpx 20rpx;
-}
-.uni-collapse-cell__title-text {
-	font-size: 24rpx !important;
-}
-.right-text {
-	font-size: 24rpx;
-}
-
-.video-box {
-	padding: 20rpx;
-	text-align: center;
-}
-.horn-text {
-	font-size: 36rpx;
-	float: right;
-	margin: -64rpx 550rpx 0 0;
-}
-
-.instructions-box4 {
-	width: 96%;
-	background: #fff;
-	margin: 30rpx auto 0 auto;
-	border-bottom: 1rpx dashed rgb(228, 228, 227);
-}
-
-.condition {
-	background: #fff;
-	margin: 30rpx auto 0 auto;
-}
-
-.dianchi-img {
-	width: 60rpx;
-	height: 60rpx;
-	background: #aaff7f;
-	border-radius: 100%;
-	padding: 20rpx;
-}
-
-.battery-box {
-	width: 100%;
-	padding-bottom: 20rpx;
-}
-
-.bateery {
-	font-size: 26rpx;
-	padding: 10rpx 0;
-}
-
-.condit-title {
-	font-size: 30rpx;
-	color: rgb(40, 40, 40);
-	border-bottom: 1rpx solid rgb(228, 228, 227);
-	padding: 20rpx 0 20rpx 20rpx;
-}
-
-.lis-img {
-	display: inline-block;
-	width: 25%;
-	text-align: center;
-	margin: 30rpx 0 0 0;
-	color: rgb(74, 74, 74);
-}
-.note {
-	padding: 30rpx;
-	font-size: 26rpx;
-	color: rgb(74, 74, 74);
-}
-
-.note-text {
-	padding: 20rpx 0 0 0;
-	line-height: 45rpx;
-	color: #666;
-}
-.disclaimer {
-	padding: 30rpx;
-	font-size: 26rpx;
-	color: rgb(74, 74, 74);
-}
-.disclaimer > view {
-	margin-bottom: 20rpx;
-	line-height: 45rpx;
-}
-
-.active {
-	border-bottom: 6rpx solid rgb(85, 170, 255);
-	color: #009AE1;
-}
-.uni-badge {
-	margin: 8rpx 16rpx 0 16rpx;
-}
 </style>