diff --git a/package1/index/.DS_Store b/package1/index/.DS_Store
new file mode 100644
index 0000000..9462556
Binary files /dev/null and b/package1/index/.DS_Store differ
diff --git a/package1/index/feedBack.vue b/package1/index/feedBack.vue
new file mode 100644
index 0000000..28ed355
--- /dev/null
+++ b/package1/index/feedBack.vue
@@ -0,0 +1,184 @@
+<!-- 底部菜单--库存--新增商品 -->
+<template>
+	<view>
+		<view class="formBox">
+			<uni-forms ref="form" :modelValue="formData" :rules="rules" labelWidth="85px">
+				<uni-forms-item label="问题图片" name="productPicture">
+					<view v-if="formData.productPicture !=''">
+						<img :src="formData.productPicture" alt="" class="upload-img">
+					</view>
+					<u-upload :fileList="formData.productPicture" @afterRead="afterRead" @delete="deletePic" name="1" multiple
+						:maxCount="1"></u-upload>
+				</uni-forms-item>
+				<uni-forms-item label="问题说明" name="productIntro">
+					<uni-easyinput type="textarea" autoHeight v-model="formData.productIntro" placeholder="请简要描述问题"
+						trim="all" />
+				</uni-forms-item>
+			</uni-forms>
+
+			<u-button type="primary" @tap.stop="submit()">保存</u-button>
+			
+		</view>
+		<view class="make-call" @tap="makeCall('15533910775')">联系客服</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				fileList1: [],
+				formData: {
+					productPicture: '',
+					productIntro: ''
+				},
+				categoryList: [],
+				productId:'',
+				arrtList: [],
+				arrtChange: [],
+				dataList:[],
+				shopName:'',
+				rules: {
+					productIntro: {
+						rules: [{
+							required: true,
+							errorMessage: '请简要描述问题',
+						}, ],
+					}
+				}
+			}
+		},
+		onLoad(option) {
+			this.shopName = uni.getStorageSync('shopName')
+		},
+		methods: {
+			// 删除图片
+			deletePic(event) {
+				this[`fileList${event.name}`].splice(event.index, 1)
+			},
+			// 新增图片
+			async afterRead(event) {
+				
+				let lists = [].concat(event.file)
+				if (this.formData.productPicture == undefined) this.formData.productPicture = [];
+				let fileListLen = this[`fileList${event.name}`].length
+				
+				lists.map((item) => {
+					this[`fileList${event.name}`].push({
+						...item,
+						status: 'uploading',
+						message: '上传中'
+					})
+				})
+				
+				for (let i = 0; i < lists.length; i++) {
+					const result = await this.uploadFilePromise(lists[i].url)
+					let item = this[`fileList${event.name}`][fileListLen]
+					this[`fileList${event.name}`].splice(fileListLen, 1, Object.assign(item, {
+						status: 'success',
+						message: '',
+						url: result
+					}))
+					fileListLen++
+				}
+			},
+			uploadFilePromise(url) {
+				
+				return new Promise((resolve, reject) => {
+					let a = uni.uploadFile({
+						url: 'https://dev.xenjoyou.com/hiver/upload/file',
+						filePath: url,
+						name: 'file',
+						header: {
+							"content-type": "multipart/form-data",
+							'accessToken': this.tui.getToken()
+						},
+						formData: {},
+						success: (uploadFileRes) => {
+							
+							let path = JSON.parse(uploadFileRes.data)
+							//后端返回的地址，存入图片地址
+							this.formData.productPicture = path.result
+						}
+					});
+				})
+			},
+			makeCall(phone) {
+				uni.makePhoneCall({
+					phoneNumber: phone + ''
+				});
+			},
+			// 触发提交表单
+			submit() {
+				let that = this;
+				let url = ''
+				this.$refs.form.validate().then(res => {
+					that.tui.request('/app/problemFeedback/saveOrUpdateProblemFeedback', "post", {
+						problemPicture:that.formData.productPicture,
+						problemContent:that.formData.productIntro,
+						shopName:this.shopName
+					}, false, false).then((res1) => {
+						if (res1.code == 200) {
+							this.tui.toast('反馈成功！')
+							setTimeout(res=>{
+								uni.navigateBack({
+									delta: 2
+								})
+							},1000)
+							
+						} else {
+							uni.showToast({
+								title: "添加失败",
+								icon: 'none'
+							})
+						}
+					})
+				}).catch(err => {
+					
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.formBox {
+		margin: 20rpx;
+		padding: 20rpx 26rpx;
+		border-radius: 14rpx;
+		box-shadow: 0px 1px 10px 2px #e2e2e2;
+		background-color: #fff;
+
+		.uni-data-select {
+			width: 100%;
+		}
+
+		.attrs {
+			text {
+				display: inline-block;
+				border: 1px solid $u-primary;
+				padding: 7px 20rpx;
+				margin: 20rpx;
+				background-color: #fff;
+				color: $u-primary;
+			}
+
+			.checkedText {
+				background-color: $u-primary;
+				color: #fff;
+			}
+		}
+	}
+	.upload-img{
+		width: 160rpx;
+		height: 160rpx;
+	}
+	.make-call{
+		text-decoration: underline;
+		color: blue;
+		position: fixed;
+		bottom: 60rpx;
+		text-align: center;
+		width: 100%;
+	}
+</style>
\ No newline at end of file
diff --git a/package1/index/order.vue b/package1/index/order.vue
new file mode 100644
index 0000000..35c77ca
--- /dev/null
+++ b/package1/index/order.vue
@@ -0,0 +1,296 @@
+<template>
+	<view>
+		<view class="search" style="position: fixed;top: 0;z-index: 99;">
+			<uni-datetime-picker style="margin-bottom:10px;" v-model="range" @change="searchList" type="daterange" />
+			<uni-search-bar class="uni-mt-10" radius="5" placeholder="输入客户名称/销售人员搜索" cancelButton="none"
+				@confirm="searchList" />
+		</view>
+		<!-- <u-alert description="点击列表可跳转至销售单" type="primary"></u-alert> -->
+		<view class="u-transition" style="display:flex;background: #ecf5ff;width: 100%;color: #5fd9ee;height: 80rpx;line-height: 80rpx;padding-left: 20rpx;">
+			<view>点击列表可跳转至销售单</view>
+			<!-- <view @tap.stop="printCodeBtn" class="dayin-text" v-if="btnStatus">打印商品码</view>
+			<view @tap.stop="printCodeBtn" class="dayin-text" v-else>取消操作</view> -->
+		</view>
+		<view class="ulList" v-if="inventoryList.length > 0" style="overflow: scroll;margin-top:300rpx;">
+			<ul :style="{'margin-bottom':btnStatus==false?'160rpx':''}">
+				<li v-for="(item,index) in inventoryList" :key="index">
+					<checkbox-group @change="checkboxChange">
+						<label class="uni-list-cell uni-list-cell-pd" >
+							<checkbox v-if="btnStatus==false" :value="item" style="float: left;width: 60rpx;line-height: 300rpx;margin: 0 20rpx;" />
+							<view :style="{width:btnStatus==false?'95%':'100%'}" @tap="gotoDetail(item.id)">
+								<uni-card :title="item.userName == null ?'暂无':item.userName" :sub-title="item.createTime == null ?'暂无':item.createTime" :extra="'数量：'+(item.productCount == null ?'暂无':item.productCount)"
+									:thumbnail="item.saleDetailDTOList[0].productPicture">
+									<view class="uni-body"><text class="cardText">销售员：</text> {{item.createByName == null ?'暂无':item.createByName}}</view>
+									<view class="uni-body"> <text class="cardText"> 营业额：</text> <text class="priceText">
+											{{item.realAmount == null ?'暂无':item.realAmount}} </text> <text decode class="cardText">
+											{{'&nbsp;&nbsp;&nbsp;&nbsp; 欠款： '}} </text> <text class="priceText">{{item.noEarn == null ?'暂无':item.noEarn}}
+										</text></view>
+									<view class="uni-body"> <text class="cardText">
+										订单状态：</text>{{item.status == '0' ?'待抢单' :item.status == '2' ?'作废' :item.status == '1' ?'待取货' :item.status == '3' ?'待送达' :item.status == '4' ?'已完成' :item.status == '5' ?'下游客户待退货' :item.status == '00' ?'退货待抢单' :item.status == '01' ?'退货待取货' :item.status == '03' ?'退货待送达' :item.status == '04' ?'待确认退货' :item.status == '6' ?'待配货':item.status == '8' ?'待物流上门':item.status == '9' ?'已完成' :'挂单'}}
+									</view>
+									<view class="floatRight" v-if="item.status == 6" @tap.stop="goSaleGoods(item)">去开单</view>
+									<view class="floatRight" style="color: red;width: 150rpx;" @tap.stop="delItemModal(item)" v-if="item.status == 6">删除订单</view>
+								</uni-card>
+							</view>
+						</label>
+					</checkbox-group>
+				</li>
+				<u-loadmore :status="status" />
+			</ul>
+
+		</view>
+		<u-empty v-else mode="order" margin-top="200"></u-empty>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				searchStr: '',
+				type: '',
+				inventoryList: [],
+				status: 'loadmore',
+				page: 1,
+				totalPages: 0,
+				// type:'',
+				range:[],
+				btnStatus:true
+			};
+		},
+		onLoad(options) {
+			this.type = options.type;
+			this.listStatus = options.listStatus
+			
+		},
+		onShow(){
+			this.getOrderInfoList()
+		},
+		onReachBottom() {
+			if (this.page >= this.totalPages) return;
+			this.status = 'loading';
+			this.page = ++this.page;
+			this.getOrderInfoList();
+		},
+		methods: {
+			gotoDetail(id) {
+				this.page = 1
+				uni.navigateTo({
+					url: '/package1/index/orderDetail?id=' + id
+				})
+			},
+			searchList(res) {
+				this.searchStr = res.value
+				this.page = 1;
+				this.inventoryList = [];
+				this.getOrderInfoList()
+			},
+			// 订单查询 
+			getOrderInfoList() {
+				this.status = 'loading';
+				this.tui.request("/app/sale/listPages", "POST", {
+					pageVo: {
+						pageSize: 10,
+						pageNumber: this.page
+					},
+					startTime:this.range[0],
+					endTime:this.range[1],
+					searchStr:this.searchStr,
+					status:this.listStatus
+				}, false, false).then((res) => {
+					this.status = 'nomore';
+					if (res.code == 200) {
+						if (this.page == 1) {
+							this.inventoryList = res.result.records
+						} else {
+							this.inventoryList = [...this.inventoryList, ...res.result.records]
+						}
+						this.totalPages = res.result.pages
+					} else {
+						this.tui.toast(res.message)
+					}
+				}).catch((res) => {})
+			},
+			sliceMsg(val) {
+				var name = ''
+				if (typeof(val) == 'string') {
+					let newObj = JSON.parse(val)
+					for (let as in newObj) {
+						name += newObj[as] + '/'
+					}
+				}
+				return name;
+			},
+			//带参数跳转到开单页
+			goSaleGoods(item) {
+				let dataList = []
+				if(item.saleDetailDTOList){
+					for (let i = 0; i < item.saleDetailDTOList.length; i++) {
+						
+						let obj = {}
+						let attrMap = new Map()
+						let newSaleDetailDTOList = []
+						let num = 0
+						for(let m = 0; m < item.saleDetailDTOList[i].stockLogList1.length; m++){
+							
+							if(attrMap.has(item.saleDetailDTOList[i].stockLogList1[m].attributeList) == true){
+								let hasCount = attrMap.get(item.saleDetailDTOList[i].stockLogList1[m].attributeList)
+								newSaleDetailDTOList[hasCount].productCount = Number(newSaleDetailDTOList[hasCount].productCount) + Number(item.saleDetailDTOList[i].stockLogList1[m].productCount)
+							}else{
+								item.saleDetailDTOList[i].stockLogList1[m].name = this.sliceMsg(item.saleDetailDTOList[i].stockLogList1[m].attributeList)
+								newSaleDetailDTOList.push(item.saleDetailDTOList[i].stockLogList1[m])
+								attrMap.set(item.saleDetailDTOList[i].stockLogList1[m].attributeList,num)
+								num++
+							}
+						}
+						obj.saleDetailQueryDTO = newSaleDetailDTOList
+						obj.num = 0
+						obj.id = item.saleDetailDTOList[i].productId
+						obj.price = item.saleDetailDTOList[i].price
+						obj.lsprice = item.saleDetailDTOList[i].price
+						obj.categoryId=item.saleDetailDTOList[i].categoryId
+						obj.zPrice = item.saleDetailDTOList[i].discountAmount
+						obj.unitPrice = item.saleDetailDTOList[i].discountAmount || item.saleDetailDTOList[i].wholesalePrice
+						obj.productName = item.saleDetailDTOList[i].productName
+						obj.productPicture = item.saleDetailDTOList[i].productPicture+'?time='+new Date().getTime()
+						obj.productSn = item.saleDetailDTOList[i].productSn
+						obj.wholesalePrice = item.saleDetailDTOList[i].wholesalePrice
+						obj.saleId = item.id
+						obj.remark = item.remark
+						obj.xsyId = item.createBy
+						obj.createByName = item.createByName
+						dataList.push(obj)
+					}
+				}else{
+					let obj = {}
+					obj.num = 0
+					obj.price = 0
+					obj.saleId = item.id
+					obj.remark = item.remark
+					obj.xsyId = item.createBy
+					obj.createByName = item.createByName
+					dataList.push(obj)
+				}
+				let khName = {
+					name:item.userName,
+					id:item.userId,
+					area:item.area,
+					city:item.city,
+					address:item.receiveAddress,
+					province:item.province,
+				}
+				
+				
+				item.name = item.userName;
+				item.id = item.userId
+				uni.setStorageSync('khName',JSON.stringify(item))
+				uni.setStorageSync('carList1',JSON.stringify(dataList))
+				uni.setStorageSync('hangOrder', true)		
+				uni.switchTab({
+					url: '/pages/inventory/goodsList1'
+				})
+			},
+			//点击打印按钮
+			printCodeBtn(){
+				this.btnStatus = !this.btnStatus
+			},
+			// checkboxChange(e){
+
+			// },
+			delItemModal(item) {
+				
+				let that = this;
+				uni.showModal({
+					title: "提示",
+					content: "确定删除此条待配货订单吗？",
+					success: function(res) {
+						if (res.confirm) {
+							that.tui.request("/app/sale/delById", "post", {
+								id: item.id,
+							}, false, true).then((res) => {
+								if (res.code == 200) {
+									that.getOrderInfoList();
+									uni.showToast({
+										title:"删除成功",
+										icon: 'none'
+									})
+								} else {
+									uni.showToast({
+										title:"删除失败",
+										icon: 'none'
+									})
+								}
+							}).catch((res) => {})
+						}
+					}
+				})
+				
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.u-transition{
+		width: 100%;
+		position: fixed;
+		top: 226rpx;
+		z-index: 99;
+	}
+	.search {
+		padding: 20upx;
+		background-color: #fff;
+		width: 100%;
+		background-color: #fff;
+	}
+	.uni-searchbar{
+		padding: 20rpx 0 !important;
+	}
+	.dayin-text{
+		flex: 1;
+		text-align: right;
+		padding-right: 20rpx;
+		text-decoration: underline;
+		color: blue;
+	}
+	.ulList {
+
+		ul {
+			li {
+				font-size: 12px;
+
+				.floatRight {
+					float: right;
+					padding: 14rpx;
+					color: $u-primary;
+					font-size: 26upx;
+				}
+
+				.cardText {
+					font-size: 12px;
+				}
+
+				.priceText {
+					color: $u-primary;
+					font-size: 14px;
+				}
+			}
+		}
+	}
+	.order-bottom{
+		background: #fff;
+		height: 120rpx;
+		width: 100%;
+		position: fixed;
+		bottom:0;
+		
+		button{
+			width: 90%;
+			height: 80rpx;
+			margin: 0 auto;
+			background: #088FEB;
+			color: #fff;
+			margin-top: 20rpx;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/package1/index/orderDetail.vue b/package1/index/orderDetail.vue
new file mode 100644
index 0000000..570c2d1
--- /dev/null
+++ b/package1/index/orderDetail.vue
@@ -0,0 +1,1613 @@
+<template>
+	<view class="container">
+		<view>
+			<uni-card v-if="sales.userName !='散客'" :title="sales.userName == null ?'暂无':sales.userName+'（'+order.phone+'）'">
+				<view class="uni-body" v-if="sales.province != null">
+					{{sales.province + sales.city + sales.area + sales.receiveAddress}}
+				</view>
+			</uni-card>
+			<uni-card v-else :title="sales.userName == null ?'暂无':sales.userName" thumbnail="/static/images/dingdan/dd0.png">
+			</uni-card>
+			<button open-type="share"
+				style="font-size: 22rpx;position: absolute;top: 50rpx;right: 70rpx;background: blue;color: #fff;width: 100rpx;height: 50rpx;text-align: center;line-height: 50rpx;border-radius: 7px;">
+				分享
+			</button>
+		</view>
+		<view class="tui-order-item boxbg">
+			<view class="content-box">
+				<view class="shop-box" style="border-top:5px solid #eee;" v-for="(item,index) in list" :key="index">
+					<view class="shop-name" style="position: relative;">
+						<img class="img-radius" :src="item.productPicture" alt=""
+							style="width: 140rpx;height: 140rpx;margin: 30rpx 0 0 30rpx;" v-if="item.productPicture">
+						<view class="noPic" v-else>暂无图片</view>
+						<view class="shop-productName">
+							<view style="color:#FF5809;">{{item.productName}}
+								（{{item.productSn == null ? '暂无':item.productSn}}）</view>
+							<view>单价:{{item.discountAmount == null ? '暂无':item.discountAmount}}
+								数量:{{item.productCount == null ? '暂无':item.productCount}}
+								总价:{{item.productCount * item.discountAmount}}</view>
+							<view v-if="item.supplierName !=undefined">
+								供应商：{{item.supplierName == null ? '暂无':item.supplierName}}</view>
+						</view>
+					</view>
+					<view class="shop-type">
+						<view class="shop-collapse" v-if="item1.productCount != 0"
+							v-for="(item1,index1) in item.stockLogList1" :key='index1'>
+							<text>{{item1.attributeList | sliceMsg}}</text>
+							<text>数量：{{item1.productCount}}</text>
+							<!-- <u-number-box integer v-if="isReturn" :max="item1.productCount - " :min="0" -->
+							<u-number-box integer v-if="isReturn && item1.maxNum != 0" :max="item1.maxNum" :min="0"
+								v-model="item1.returnCount"></u-number-box>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="tui-goods-info">
+				<view class="tui-price-flex tui-size32 tui-pbtm20">
+					<view class="tui-flex-shrink">收款方式</view>
+					<view class="tui-goods-price">
+						<view class="tui-price-large">{{ sales.payType == null ?'暂无':sales.payType == 0 ?'现金收款':sales.payType == 1 ?'微信收款':sales.payType == 2 ?'支付宝收款':sales.payType == 3 ?'银行卡转账':sales.payType == 4 ?'收款码收款':'' }}</view>
+					</view>
+				</view>
+				<view class="tui-price-flex tui-size32 tui-pbtm20">
+					<view class="tui-flex-shrink">总金额</view>
+					<view class="tui-goods-price">
+						<view class="tui-size-24">￥</view>
+						<view class="tui-price-large">{{ sales.totalAmount == null ?'暂无':sales.totalAmount }}</view>
+					</view>
+				</view>
+				<view class="tui-price-flex tui-size32" v-if="type == 0">
+					<view class="tui-flex-shrink">总成本</view>
+					<view class="tui-goods-price">
+						<view class="tui-size-24">￥</view>
+						<view class="tui-price-large">{{ sales.zongchengben == null ?'暂无':sales.zongchengben }}</view>
+					</view>
+				</view>
+				<view class="tui-price-flex tui-size32">
+					<view class="tui-flex-shrink">实收金额</view>
+					<view class="tui-goods-price">
+						<view class="tui-size-24">￥</view>
+						<view class="tui-price-large">{{ sales.realAmount == null ?'暂无':sales.realAmount }}</view>
+					</view>
+				</view>
+				<view class="tui-price-flex tui-size32">
+					<view class="tui-flex-shrink">已收金额</view>
+					<view class="tui-goods-price">
+						<view class="tui-size-24">￥</view>
+						<view class="tui-price-large">{{ sales.alreadyEarn == null ?'暂无':sales.alreadyEarn }}</view>
+					</view>
+				</view>
+
+				<view class="tui-price-flex tui-size32">
+					<view class="tui-flex-shrink">其他费用</view>
+					<view class="tui-goods-price">
+						<view class="tui-size-24">￥</view>
+						<view class="tui-price-large">{{ sales.otherExpense == null ?'暂无':sales.otherExpense}}</view>
+					</view>
+				</view>
+				<view class="tui-price-flex tui-size32">
+					<view class="tui-flex-shrink">备注</view>
+					<view class="tui-goods-price">
+						<uni-tooltip :content="sales.remark == null ?'暂无':sales.remark" placement="left">
+							<view
+								style="font-size: 13px;width: 200px;height: 40rpx;overflow: hidden;text-align: right;">
+								{{ sales.remark == null ?'':sales.remark}}</view>
+							<text style="color: blue;" v-if="sales.remark != null">查看更多</text>
+						</uni-tooltip>
+					</view>
+				</view>
+				<view class="tui-price-flex tui-size32">
+					<view class="tui-flex-shrink">欠款</view>
+					<view class="tui-goods-price tui-primary-color">
+						<view class="tui-size-24">￥</view>
+						<view class="tui-price-large">{{ sales.noEarn == null ?'暂无':sales.noEarn}}</view>
+					</view>
+				</view>
+				<view class="tui-price-flex tui-size32" v-if="isReturn">
+					<view class="tui-flex-shrink">退货金额</view>
+					<view class="tui-goods-price">
+						<view class="tui-size-24">￥</view>
+						<view class="tui-price-large">{{ changeAmount}}</view>
+					</view>
+				</view>
+				<!-- <view class="tui-price-flex tui-size32" v-if="isReturn">
+					<view class="tui-flex-shrink">退货金额</view>
+					<view class="tui-goods-price">
+						<view class="tui-size-24">￥</view>
+						<input type="digit" style="width: 150rpx;text-align: right;border-bottom: 1px solid #eee;" v-model='returnAmount' @input="getReturnA">
+					</view>
+				</view> -->
+				<!-- <view class="tui-price-flex tui-size32" v-if="isReturn">
+					<view class="tui-flex-shrink">欠款抵扣</view>
+					<view class="tui-goods-price">
+						<view class="tui-size-24">￥</view>
+						<view class="tui-price-large">{{ qkdk}}</view>
+					</view>
+				</view> -->
+				<view class="tui-price-flex tui-size32" v-if="editNoPrice">
+					<view class="tui-flex-shrink">还款金额</view>
+					<view class="tui-goods-price">
+						<view class="tui-price-large"><uni-easyinput type="digit" v-model="newEarn" trim="all" @change="getNoPay" />
+						</view>
+					</view>
+				</view>
+				<view class="tui-price-flex tui-size32" v-if="isReturn">
+					<view class="tui-flex-shrink">平台取货</view>
+					<view class="tui-goods-price">
+						<uni-data-checkbox v-model="radio1" :localdata="sex"
+							@change="checkBoxChange"></uni-data-checkbox>
+					</view>
+				</view>
+				<!-- &&  orderByWorkerCandidates.length > 0 -->
+				<view class="tui-price-flex tui-size32" v-if="isReturn && radio1 == 0">
+					<view class="tui-flex-shrink">配送人员</view>
+					<view class="tui-goods-price">
+						<input type="text" v-model="lbgName.workerName" @tap.stop="goPopleList('lbgName')"
+							placeholder="可指定拉包工" disabled
+							style="height:75rpx;line-height:84rpx;border-bottom: 1px solid #088fe0;text-align: center;">
+					</view>
+				</view>
+				<view class="tui-price-flex tui-size32" v-if="isReturn && radio1 == 0">
+					<view class="tui-flex-shrink">取货地址</view>
+					<view class="tui-goods-price">
+						<input type="text" @input="changeAddress" placeholder="请输入取货地址"
+							style="height:75rpx;line-height:84rpx;border-bottom: 1px solid #088fe0;text-align: center;">
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="tui-order-info boxbg" v-if="isgys">
+			<view class="tui-order-title">
+				退款历史
+			</view>
+			<view class="tui-order-content">
+				<u-collapse>
+					<u-collapse-item v-for="(item,index) in returnList" :key="index" :title="item.returnSale.createTime"
+						:name="item.returnSale.saleId">
+						<view style="display: flex;text-align: center;">
+							<view style="width:50%;">退货金额:{{item.returnSale.totalAmount}}</view>
+							<view style="width:50%;">
+								拉包工:{{item.returnSale.workerName == null?'暂无':item.returnSale.workerName}}</view>
+						</view>
+
+						<view class="u-collapse-content" v-for="(val, index2) in item.saleDetailDTOList" :key="index2">
+							<view style="text-align: center;margin-top: 20rpx;">{{val.productName}} </view>
+							<view style="display: flex;text-align: center;border-top:1px solid #eee;margin-top:20rpx;">
+								<view style="width:50%;">规格</view>
+								<view style="width:50%;">数量</view>
+							</view>
+							<view v-for="(val1, index3) in val.stockLogList1" :key="index3" v-if="val1.productCount!=0"
+								style="display: flex;text-align: center;">
+								<view style="width:50%;">{{val1.attributeList | sliceMsg}}</view>
+								<view style="width:50%;">{{val1.productCount}}</view>
+							</view>
+						</view>
+					</u-collapse-item>
+				</u-collapse>
+			</view>
+		</view>
+		<view class="tui-order-info boxbg">
+			<view class="tui-order-title">
+				回款历史
+			</view>
+			<view class="tui-order-content" style="border-bottom: 1px solid #E0E0E0;" v-for="(item,index) in collection"
+				:key="index">
+				<view class="tui-order-flex">
+					<view class="tui-item-title">回款金额:</view>
+					<view class="tui-item-content">{{ item.amount }}</view>
+				</view>
+				<view class="tui-order-flex">
+					<view class="tui-item-title">操作人:</view>
+					<view class="tui-item-content">{{ item.createByName }}</view>
+				</view>
+				<view class="tui-order-flex">
+					<view class="tui-item-title">操作时间:</view>
+					<view class="tui-item-content">{{ item.createTime }}</view>
+				</view>
+			</view>
+		</view>
+		<view class="tui-order-info boxbg" v-if="isgys">
+			<view class="tui-order-title">
+				物流信息
+			</view>
+			<view class="tui-order-content">
+				<view class="tui-order-flex">
+					<view class="tui-item-title">订单号:</view>
+					<view class="tui-item-content">{{ sales.id }}</view>
+				</view>
+				<view class="tui-order-flex">
+					<view class="tui-item-title">物流单:</view>
+					<!-- <view class="tui-item-content">{{ order.kdOrderId }}</view> -->
+					<image :show-menu-by-longpress="true" :src="orderXd.orderPicture" @tap="showImage"></image>
+				</view>
+				<view style="color:red">*长按图片可分享给您的客户</view>
+				<view class="tui-order-flex">
+					<view class="tui-item-title">创建时间:</view>
+					<view class="tui-item-content">{{ sales.createTime }}</view>
+				</view>
+				<view class="tui-order-flex">
+					<view class="tui-item-title">配送方式:</view>
+					<view class="tui-item-content">
+						{{ sales.transportType == 0 ?  '物流' : sales.transportType == 1 ?  '快递' : sales.transportType == 2 ?  '自送' : sales.transportType == 3 ?  '拼包':sales.transportType == null ?  '暂无':'厢货'   }}
+					</view>
+				</view>
+				<view class="tui-order-flex">
+					<view class="tui-item-title">配送公司:</view>
+					<view class="tui-item-content">
+						{{ sales.companyName == null ?'暂无':sales.companyName}} <text
+							style="color: blue;text-decoration-line: underline;"
+							@tap="makeCall(sales.companyPhone)">({{sales.companyPhone == null ?'':sales.companyPhone}})</text>
+					</view>
+				</view>
+				<view class="tui-order-flex">
+					<view class="tui-item-title">配送人员:</view>
+					<view class="tui-item-content">
+						{{orderXd.worker.workerName == null ?'暂无':orderXd.worker.workerName }} <text
+							style="color: blue;text-decoration-line: underline;" @tap="makeCall(orderXd.worker.mobile)">
+							({{orderXd.worker.mobile == null ?'暂无':orderXd.worker.mobile}})</text>
+					</view>
+				</view>
+				<view class="tui-order-flex">
+					<view class="tui-item-title">配送状态:</view>
+					<view class="tui-item-content">
+						{{sales.status == '0' ?'待抢单' :sales.status == '2' ?'作废' :sales.status == '1' ?'待取货' :sales.status == '3' ?'待送达' :sales.status == '4' ?'已完成' :sales.status == '5' ?'下游客户待退货' :sales.status == '00' ?'退货待抢单' :sales.status == '01' ?'退货待取货' :sales.status == '03' ?'退货待送达' :sales.status == '04' ?'待确认退货' :sales.status == '6' ?'待配货':sales.status == '8' ?'待物流上门':sales.status == '9' ?'已完成' :'挂单'}}
+					</view>
+				</view>
+			</view>
+		</view>
+		<u-popup :show="popupShow" @close="close" @open="open" mode="bottom">
+			<view class="popupBox">
+			</view>
+		</u-popup>
+		<view class="tui-tabbar">
+			<view class="tui-btn-mr" v-if="sales.status != 6 && sales.status != 2 && sales.status != '7'">
+				<kk-printer ref="kkprinter" :bufferData="bufferData" :defaultText="'贴包单'"
+					@onPrint="onPrint"></kk-printer>
+			</view>
+			<view class="tui-btn-mr" v-if="sales.status != 6 && sales.status != 2 && sales.status != '7'">
+				<kk-printer ref="kkprinter" :bufferData="bufferData" :defaultText="'打印小票'"
+					@onPrintSmall="onPrintSmall"></kk-printer>
+			</view>
+			<view class="tui-btn-mr" v-if="sales.status == '0' || sales.status == '1'" @click="cancelOrder('qxdd')">取消订单
+			</view>
+			<!-- 下面这个取消订单，只是名字叫取消订单，其实是挂单和待配货的删除 -->
+			<view class="tui-btn-mr" v-if="sales.status == '7'" @click="deleteOrder()">取消订单</view>
+			<view class="tui-btn-mr"
+				v-if="sales.status == '0' || sales.status == '1' || sales.status == '00' || sales.status == '01'"
+				@click="cancelOrder('qxps')">取消配送</view>
+			<view class="tui-btn-mr" v-if="sales.status == '4'" @click="returnGoods">{{ !isReturn ? '退货' : '确认退货'}}
+			</view>
+			<view class="tui-btn-mr" @tap="inputDialogToggle()"
+				v-if="sales.status != 6 && !editNoPrice && sales.status != 2 && sales.noEarn >0">回款</view>
+		</view>
+		<!-- 回款金额输入框 -->
+		<uni-popup ref="inputDialog" type="dialog">
+			<uni-popup-dialog ref="inputClose" mode="input" inputType="digit" title="回款金额" placeholder="请输入回款金额"
+				@confirm="sureNpPay"></uni-popup-dialog>
+		</uni-popup>
+		<!-- 退货确认输入框 -->
+		<uni-popup ref="returnDialog" type="dialog">
+			<uni-popup-dialog ref="returnClose" mode="input" inputType="digit" title="请再次确认退货金额" placeholder="请输入退货金额"
+				@confirm="sureReturn"></uni-popup-dialog>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import util from '@/components/kk-printer/utils/util.js';
+	import * as blesdk from '@/components/kk-printer/utils/bluetoolth.js';
+	import kkPrinter from '@/components/kk-printer/index.vue';
+	import gbk from '@/components/kk-printer/utils/printUtil-GBK.js';
+	import {
+		maskShopName,
+		maskPhone
+	} from '@/utils/global.js'
+	export default {
+		data() {
+			return {
+				defaultText: '贴包单',
+				radio1: 0,
+				sex: [{
+					text: '是',
+					value: 0
+				}, {
+					text: '否',
+					value: 2
+				}],
+				orderByWorkerCandidates: [],
+				orderByWorker: '',
+				bufferData: [],
+				show: false,
+				popupShow: false,
+				sales: {},
+				order: {},
+				list: [],
+				isReturn: false,
+				orderByWorkerList: [],
+				inventoryList: [],
+				shopList: [],
+				returnList: [],
+				editNoPrice: false,
+				newEarn: 0,
+				qrcodeData: '',
+				isgys: true,
+				isReturnPrice: 1,
+				type: '',
+				orderXd: [],
+				collection: [],
+				lbgName: [],
+				returnAmount: 0,
+				shopData: [],
+				changeA: '',
+				sAmout: 0,
+				yNum: 150,
+				printTotal: 1040,
+				zReturnNum: "",
+				deviceType: 'ios',
+				qrArr: []
+			}
+		},
+		components: {
+			kkPrinter
+		},
+		computed: {
+			changeAmount() {
+				if (this.isReturn) {
+					let sum = 0
+					this.list.forEach(item1 => {
+						item1.stockLogList1.forEach(v => {
+							if (v.returnCount) {
+								sum = v.returnCount * item1.discountAmount + sum
+							}
+						});
+					})
+					this.sAmout = sum.toFixed(2) //临时存储退货信息，用于用户删除了输入框值后重新赋值
+					this.returnAmount = sum.toFixed(2)
+					return this.returnAmount
+				} else {
+					return 0
+				}
+			},
+		},
+		filters: {
+			sliceMsg(val) {
+				var name = ''
+				if (typeof(val) == 'string') {
+					let newObj = JSON.parse(val)
+					for (let as in newObj) {
+						name += newObj[as] + '/'
+					}
+				}
+				return name;
+			},
+			maxNum(val) {
+				if (val >= 10) {
+					return 10
+				} else if (val < 0) {
+					return 0
+				}
+			}
+		},
+		onShareAppMessage() {
+			return {
+				title: '查看采购单详情',
+				imageUrl: 'https://jewel-shop.oss-cn-beijing.aliyuncs.com/b28b3d46c21d4f60a334b25f56175cf3.jpg',
+				path: '/pages/login/login?saleId=' + this.saleId + '&userId=' + this.order.id
+			}
+		},
+		onShow() {
+			// 初始化蓝牙模块
+			wx.openBluetoothAdapter({
+				mode: 'central'
+			})
+			this.lbgName = JSON.parse(JSON.stringify(this.lbgName))
+			this.type = uni.getStorageSync('type')
+		},
+		onLoad(option) {
+			var that = this;
+			this.saleId = option.id
+			if (option.id != null && option.id != undefined && option.id != "") {
+				if (option.type == 'gys') {
+					this.type = option.type;
+					this.tui.request("/app/purchase/getPurchaseAllData", "post", {
+						id: option.id
+					}, false, true).then((res) => {
+						if (res.code == 200) {
+							this.isgys = false
+							this.sales = res.result.purchase
+							this.list = res.result.purchaseDetails
+
+						} else {
+							this.tui.toast(res.message)
+						}
+					}).catch((res) => {})
+				} else {
+					this.tui.request("/app/sale/get/" + option.id, "GET", null, false, false).then((res) => {
+						if (res.code == 200 && res.result != null && res.result != undefined) {
+							this.sales = res.result.sale
+							this.list = res.result.saleDetailDTOList
+							for (var i = 0; i < this.list.length; i++) {
+								for (var m = 0; m < this.list[i].stockLogList1.length; m++) {
+									if (this.list[i].productCount == null) {
+										this.list[i].productCount = this.list[i].stockLogList1[m].productCount
+									} else {
+										this.list[i].productCount += this.list[i].stockLogList1[m].productCount
+									}
+								}
+								this.list[i].chengben = this.list[i].productCount * this.list[i].purchasePrice
+							}
+							this.sales.zongchengben = 0
+							for (var i = 0; i < this.list.length; i++) {
+								this.sales.zongchengben += this.list[i].chengben
+							}
+							this.sales.zongchengben = this.sales.zongchengben.toFixed(2)
+							this.order = res.result.customer
+							this.orderXd = res.result.orderXd
+							this.shopData = res.result.shop
+							this.getReturnOrder(option.id)
+							this.collectionList(option.id)
+						} else {
+							this.tui.toast(res.message)
+						}
+					}).catch((res) => {})
+				}
+			}
+			uni.getSystemInfo({
+				success(res) {
+					that.deviceType = res.osName
+					
+				}
+			})
+			this.analysisQrCode()
+		},
+		methods: {
+			//打印小票二维码，分割二维码字符串
+			analysisQrCode() {
+				let qrCode = uni.getStorageSync('shopIcon')
+				if(qrCode != ''){
+					let data = qrCode.split(',')
+					for(let i=0;i<data.length;i++){
+						var weixin = data[i].indexOf("微信");
+						var dianpu = data[i].indexOf("店铺");
+						var zifubao = data[i].indexOf("支付");
+						var yinlian = data[i].indexOf("收款");
+						if (dianpu != -1) {
+						    var result = data[i].substring(dianpu + 2);
+							let obj = {
+								name:'店铺微信',
+								path:result,
+								level:"M"
+							}
+						    this.qrArr.push(obj)
+						}
+						if (weixin != -1) {
+						    var result =  data[i].substring(weixin + 2);
+							let obj = {
+								name:'微信收款码',
+								path:result,
+								level:"M"
+							}
+						    this.qrArr.push(obj)
+						}
+						if (zifubao != -1) {
+						    var result =  data[i].substring(zifubao + 2);
+							let obj = {
+								name:'支付宝收款码',
+								path:result,
+								level:"Q"
+							}
+						    this.qrArr.push(obj)
+						}
+						if (yinlian != -1) {
+						    var result =  data[i].substring(yinlian + 2);
+							let obj = {
+								name:'银行收款码',
+								path:result,
+								level:"M"
+							}
+						    this.qrArr.push(obj)
+						}
+					}
+				}
+			},
+			deleteOrder() {
+				var that = this;
+				uni.showModal({
+					title: "提示",
+					content: "确定删除此条挂单吗？",
+					success: function(res) {
+						if (res.confirm) {
+							that.tui.request("/app/sale/delById", "post", {
+								id: that.saleId,
+							}, false, true).then((res) => {
+								if (res.code == 200) {
+									setTimeout(res => {
+										uni.showToast({
+											title: "删除成功",
+											icon: 'none'
+										})
+									}, 1000)
+									uni.navigateBack();
+								} else {
+									uni.showToast({
+										title: "删除失败",
+										icon: 'none'
+									})
+								}
+							}).catch((res) => {})
+						}
+					}
+				})
+			},
+			//回款历史
+			collectionList(id) {
+				this.tui.request('/app/dealingRecord/getDealingsRecordList', 'post', {
+					orderId: id
+				}, false, true).then(res => {
+					this.collection = res.result
+				}).catch(res => {});
+			},
+			//打印小票
+			onPrintSmall() {
+				let that = this;
+				let strCmd = ''
+				that.yNum = 150
+				strCmd = blesdk.CreatCPCLPage(600, 1040, 1, 0);
+				strCmd += blesdk.addCPCLSETMAG(2, 2)
+				blesdk.addCPCLSETBOLD('bold')
+				strCmd += blesdk.addCPCLLocation(2);
+				strCmd += blesdk.addCPCLText('0', '30', '24', '0', 0, uni.getStorageSync('shopName'))
+
+				strCmd += blesdk.addCPCLSETMAG(1, 1)
+				strCmd += blesdk.addCPCLLocation(0);
+				strCmd += blesdk.addCPCLText('0', '100', '24', '0', 0, '客户:' + this.order.name)
+				strCmd += blesdk.addCPCLText('280', '100', '24', '0', 0, this.sales.id)
+				strCmd += blesdk.addCPCLText('0', '130', '24', '0', 0, '销售:' + this.sales.createByName)
+				strCmd += blesdk.addCPCLText('280', '130', '24', '0', 0, '日期:' + this.sales.createTime)
+				strCmd += blesdk.addCPCLText('0', '150', '24', '0', 0,
+					'=========================================================')
+				for (var i = 0; i < this.list.length; i++) {
+					if (that.countPrint() < that.printTotal) {
+						strCmd += blesdk.addCPCLText('0', that.yNum, '24', '0', 0, this.list[i].productName + '（' +
+							this.list[i].productSn + '）')
+					} else {
+						that.yNum = 0
+						strCmd += blesdk.addCPCLPrint();
+						that.bufferData.push(strCmd);
+						strCmd = blesdk.CreatCPCLPage(600, 1040, 1, 0);
+						strCmd += blesdk.addCPCLLocation(0);
+						strCmd += blesdk.addCPCLText('0', that.countPrint(), '24', '0', 0, this.list[i].productName + '（' +
+							this.list[i].productSn + '）')
+
+					}
+					for (var m = 0; m < this.list[i].stockLogList1.length; m++) {
+						if (that.countPrint() < that.printTotal) {
+							strCmd += blesdk.addCPCLText('0', that.yNum, '24', '0', 0, '□ '+(that.slicePrint(
+									this.list[i].stockLogList1[m].attributeList)) + '*' + this.list[i].stockLogList1[m]
+								.productCount)
+							strCmd += blesdk.addCPCLText('240', that.yNum, '24', '0', 0, '单价:' + this.list[i]
+								.discountAmount)
+							strCmd += blesdk.addCPCLText('400', that.yNum, '24', '0', 0, '总价:' + (this.list[i]
+								.discountAmount * this.list[i].stockLogList1[m].productCount))
+						} else {
+							that.yNum = 0
+							strCmd += blesdk.addCPCLPrint();
+							that.bufferData.push(strCmd);
+							strCmd = ''
+							strCmd = blesdk.CreatCPCLPage(600, 1040, 1, 0);
+							strCmd += blesdk.addCPCLLocation(0);
+							strCmd += blesdk.addCPCLText('0', (that.yNum += 30), '24', '0', 0, '□ '+(that.slicePrint(
+									this.list[i].stockLogList1[m].attributeList)) + '*' + this.list[i].stockLogList1[m]
+								.productCount)
+							strCmd += blesdk.addCPCLText('240', that.yNum, '24', '0', 0, '单价:' + this.list[i]
+								.discountAmount)
+							strCmd += blesdk.addCPCLText('400', that.yNum, '24', '0', 0, '总价:' + (this.list[i]
+								.discountAmount * this.list[i].stockLogList1[m].productCount))
+						}
+					}
+				}
+				if (that.countPrint() < this.printTotal) {
+					strCmd += blesdk.addCPCLText('0', this.countPrint(), '24', '0', 0,
+						'===============================================================')
+				} else {
+					this.yNum = 0
+					strCmd += blesdk.addCPCLPrint();
+					this.bufferData.push(strCmd);
+					strCmd = ''
+					strCmd = blesdk.CreatCPCLPage(600, 1040, 1, 0);
+					strCmd += blesdk.addCPCLLocation(0);
+					strCmd += blesdk.addCPCLText('0', this.countPrint(), '24', '0', 0,
+						'===============================================================')
+				}
+				if (that.countPrint() < this.printTotal) {
+					strCmd += blesdk.addCPCLText('0', this.countPrint(), '24', '0', 0, '总数量:' + this.sales.productCount)
+					strCmd += blesdk.addCPCLText('200', this.yNum, '24', '0', 0, '总金额:' + this.sales.totalAmount)
+					strCmd += blesdk.addCPCLText('400', this.yNum, '24', '0', 0, '应收:' + this.sales.realAmount)
+				} else {
+					this.yNum = 0
+					strCmd += blesdk.addCPCLPrint();
+					this.bufferData.push(strCmd);
+					strCmd = ''
+					strCmd = blesdk.CreatCPCLPage(600, 1040, 1, 0);
+					strCmd += blesdk.addCPCLLocation(0);
+					strCmd += blesdk.addCPCLText('0', (this.yNum += 30), '24', '0', 0, '总数量:' + this.sales.productCount)
+					strCmd += blesdk.addCPCLText('200', this.yNum, '24', '0', 0, '总金额' + this.sales.totalAmount)
+					strCmd += blesdk.addCPCLText('400', this.yNum, '24', '0', 0, '应收:' + this.sales.realAmount)
+
+				}
+				if (that.countPrint() < this.printTotal) {
+					strCmd += blesdk.addCPCLText('0', this.countPrint(), '24', '0', 0, '实收:' + this.sales.alreadyEarn)
+					strCmd += blesdk.addCPCLText('200', this.yNum, '24', '0', 0, '欠款:' + (this.sales.noEarn))
+					strCmd += blesdk.addCPCLText('400', this.yNum, '24', '0', 0, '其他费用:' + (this.sales.otherExpense))
+				} else {
+					this.yNum = 0
+					strCmd += blesdk.addCPCLPrint();
+					this.bufferData.push(strCmd);
+					strCmd = ''
+					strCmd = blesdk.CreatCPCLPage(600, 1040, 1, 0);
+					strCmd += blesdk.addCPCLLocation(0);
+					strCmd += blesdk.addCPCLText('0', (this.yNum += 30), '24', '0', 0, '实收:' + this.sales.alreadyEarn)
+					strCmd += blesdk.addCPCLText('200', this.yNum, '24', '0', 0, '欠款:' + (this.sales.noEarn))
+					strCmd += blesdk.addCPCLText('400', this.yNum, '24', '0', 0, '其他费用:' + (this.sales.otherExpense))
+
+				}
+				if (this.sales.remark) {
+					// if (Math.ceil(Number(this.sales.remark.length) / 20) * 30 + this.yNum < this.printTotal) {
+					// 	if (this.sales.remark.length > 20) {
+					// 		let position = 20;
+					// 		let part1 = this.sales.remark.substring(0, position);
+					// 		let part2 = this.sales.remark.substring(position);
+					// 		strCmd += blesdk.addCPCLText('0', this.countPrint(), '24', '0', 0, '备注:' + part1)
+					// 		strCmd += blesdk.addCPCLText('0', this.countPrint(), '24', '0', 0, part2)
+					// 	} else {
+					// 		strCmd += blesdk.addCPCLText('0', this.countPrint(), '24', '0', 0, '备注:' + this.sales.remark)
+					// 	}
+					// 	strCmd += blesdk.addCPCLLocation(0);
+					// 	strCmd += blesdk.addCPCLPrint();
+					// 	this.bufferData.push(strCmd);
+					// } else {
+					// 	this.yNum = 0
+					// 	strCmd += blesdk.addCPCLLocation(0);
+					// 	strCmd += blesdk.addCPCLPrint();
+					// 	this.bufferData.push(strCmd);
+					// 	strCmd = ''
+					// 	if (this.sales.remark.length > 20) {
+					// 		let position = 20;
+					// 		let part1 = this.sales.remark.substring(0, position);
+					// 		let part2 = this.sales.remark.substring(position);
+					// 		strCmd = blesdk.CreatCPCLPage(600, 1040, 1, 0);
+					// 		strCmd += blesdk.addCPCLLocation(0);
+					// 		strCmd += blesdk.addCPCLText('0', this.countPrint(), '24', '0', 0, '备注:' + part1)
+					// 		strCmd += blesdk.addCPCLText('0', this.countPrint(), '24', '0', 0, part2)
+					// 	} else {
+					// 		strCmd = blesdk.CreatCPCLPage(600, 1040, 1, 0);
+					// 		strCmd += blesdk.addCPCLLocation(0);
+					// 		strCmd += blesdk.addCPCLText('0', this.countPrint(), '24', '0', 0, '备注:' + this.sales.remark)
+					// 	}
+					// 	strCmd += blesdk.addCPCLLocation(0);
+					// 	strCmd += blesdk.addCPCLPrint();
+
+					// 	this.bufferData.push(strCmd);
+
+					// }
+					if (Math.ceil(Number(this.sales.remark.length) / 20) * 30 + this.yNum < that.printTotal) {
+						if (this.sales.remark.length > 20) {
+							let position = 20;
+							let part1 = this.sales.remark.substring(0, position);
+							let part2 = this.sales.remark.substring(position);
+							strCmd += blesdk.addCPCLText('0', this.countPrint(), '24', '0', 0, '备注:' + part1)
+							strCmd += blesdk.addCPCLText('0', this.countPrint(), '24', '0', 0, part2)
+						} else {
+							strCmd += blesdk.addCPCLText('0', this.countPrint(), '24', '0', 0, '备注:' + this.sales.remark)
+						}
+					
+					} else {
+						this.yNum = 0
+						strCmd += blesdk.addCPCLLocation(0);
+						strCmd += blesdk.addCPCLPrint();
+						this.bufferData.push(strCmd);
+						strCmd = ''
+						if (this.sales.remark.length > 20) {
+							let position = 20;
+							let part1 = this.sales.remark.substring(0, position);
+							let part2 = this.sales.remark.substring(position);
+							strCmd = blesdk.CreatCPCLPage(600, 1040, 1, 0);
+							strCmd += blesdk.addCPCLLocation(0);
+							strCmd += blesdk.addCPCLText('0', this.countPrint(), '24', '0', 0, '备注:' + part1)
+							strCmd += blesdk.addCPCLText('0', this.countPrint(), '24', '0', 0, part2)
+						} else {
+							strCmd = blesdk.CreatCPCLPage(600, 1040, 1, 0);
+							strCmd += blesdk.addCPCLLocation(0);
+							strCmd += blesdk.addCPCLText('0', this.countPrint(), '24', '0', 0, '备注:' + this.sales.remark)
+						}
+					}
+				}
+				if (that.countPrint() < that.printTotal) {
+					strCmd += blesdk.addCPCLText('0', this.countPrint(), '24', '0', 0,
+						'===============================================================')
+				} else {
+					this.yNum = 0
+					strCmd += blesdk.addCPCLPrint();
+					this.bufferData.push(strCmd);
+					strCmd = ''
+					strCmd = blesdk.CreatCPCLPage(600, 1040, 1, 0);
+					strCmd += blesdk.addCPCLLocation(0);
+					strCmd += blesdk.addCPCLText('0', this.countPrint(), '24', '0', 0,
+						'===============================================================')
+				}
+				//店铺地址
+				if (that.countPrint() < that.printTotal) {
+					strCmd += blesdk.addCPCLText('0', this.countPrint(), '24', '0', 0, '店铺地址:' + uni.getStorageSync(
+						'shopAddress'))
+				} else {
+					this.yNum = 0
+					strCmd += blesdk.addCPCLPrint();
+					this.bufferData.push(strCmd);
+					strCmd = ''
+					strCmd = blesdk.CreatCPCLPage(600, 1040, 1, 0);
+					strCmd += blesdk.addCPCLLocation(0);
+					strCmd += blesdk.addCPCLText('0', (that.yNum += 30), '24', '0', 0, '店铺地址:' + uni.getStorageSync(
+						'shopAddress'))
+				}
+				//店铺电话
+				if (that.countPrint() < that.printTotal) {
+					strCmd += blesdk.addCPCLText('0', that.countPrint(), '24', '0', 0, '店铺电话:' + uni.getStorageSync(
+						'username'))
+				} else {
+					that.yNum = 0
+					strCmd += blesdk.addCPCLPrint();
+					that.bufferData.push(strCmd);
+					strCmd = ''
+					strCmd = blesdk.CreatCPCLPage(600, 1040, 1, 0);
+					strCmd += blesdk.addCPCLLocation(0);
+					strCmd += blesdk.addCPCLText('0', (that.yNum += 30), '24', '0', 0, '店铺电话:' + uni.getStorageSync(
+						'username'))
+				}
+				if(this.qrArr.length != 0){
+					//店铺微信/微信收款/支付宝收款/收款码收款（店铺，微信，支付，收款）
+					for (let i = 0; i < this.qrArr.length; i++) {
+						//店铺二维码
+						if ((that.yNum + 200) < that.printTotal) {
+							console.log('11111')
+							strCmd += blesdk.addCPCLQRCode(that.countWidth(i,600/that.qrArr.length), (that.yNum + 50), that.qrArr[i].level, '2', 3, that.qrArr[i].path) //二维码
+							strCmd += blesdk.addCPCLText(that.countWidth(i,600/that.qrArr.length), (that.yNum + 180), '24', '0', 0, that.qrArr[i].name)
+							strCmd += blesdk.addCPCLLocation(0);
+							if(this.qrArr.length == (i+1)){
+								strCmd += blesdk.addCPCLPrint();
+								that.bufferData.push(strCmd);
+							}
+						} else {
+							console.log('2222')
+							// that.yNum = 0
+							strCmd += blesdk.addCPCLPrint();
+							that.bufferData.push(strCmd);
+							strCmd = ''
+							strCmd = blesdk.CreatCPCLPage(600, 1040, 1, 0);
+							strCmd += blesdk.addCPCLLocation(0);
+							strCmd += blesdk.addCPCLQRCode(that.countWidth(i,600/that.qrArr.length) , 30, that.qrArr[i].level, '2', 3, that.qrArr[i].path) //二维码
+							strCmd += blesdk.addCPCLText(that.countWidth(i,600/that.qrArr.length), 180, '24', '0', 0, that.qrArr[i].name)
+							strCmd += blesdk.addCPCLPrint();
+							that.bufferData.push(strCmd);
+						}
+					}
+				}else{
+					strCmd += blesdk.addCPCLPrint();
+					that.bufferData.push(strCmd);
+				}
+				
+				this.$nextTick(() => {
+					that.bufferData = []
+					uni.hideLoading();
+				})
+
+			},
+			countWidth(num,len){
+				return num*len + 20
+			},
+			goPrint(type){
+				let strCmd = ''
+				strCmd = blesdk.CreatCPCLPage(600, 1040, 1, 1);
+				strCmd += blesdk.addCPCLSETMAG(2, 2)
+				blesdk.addCPCLSETBOLD('bold')
+				strCmd += blesdk.addCPCLText('40', '30', '24', '0', 0, '沧州明珠商贸城--快衣店')
+				strCmd += blesdk.addCPCLSETMAG(3, 3)
+				blesdk.addCPCLSETBOLD('bold')
+				strCmd += blesdk.addCPCLText('50', '120', '24', '0', 0, '收：' + maskShopName(this.sales.userName))
+				strCmd += blesdk.addCPCLSETMAG(1, 1)
+				strCmd += blesdk.addCPCLText('50', '250', '24', '0', 0, maskPhone(this.order.phone))
+				strCmd += blesdk.addCPCLText('250', '250', '24', '0', 0, '编号：' + this.sales.id)
+				strCmd += blesdk.addCPCLSETMAG(1, 1)
+				blesdk.addCPCLSETBOLD('bold')
+				strCmd += blesdk.addCPCLText('50', '330', '24', '0', 0, this.sales.province + '/' + this.sales.city + '/' +
+					this.sales.area)
+				strCmd += blesdk.addCPCLSETMAG(1, 1)
+				if(type == 'confirm'){
+					strCmd += blesdk.addCPCLText('50', '410', '24', '0', 0, "*****")
+				}else{
+					if (this.sales.receiveAddress.length > 20) {
+						let position = 20;
+						let part1 = this.sales.receiveAddress.substring(0, position);
+						let part2 = this.sales.receiveAddress.substring(position);
+						strCmd += blesdk.addCPCLText('50', '410', '24', '0', 0, part1)
+						strCmd += blesdk.addCPCLText('50', '440', '24', '0', 0, part2)
+					} else {
+						strCmd += blesdk.addCPCLText('50', '410', '24', '0', 0, this.sales.receiveAddress)
+					}
+				}
+				strCmd += blesdk.addCPCLSETMAG(2, 2)
+				blesdk.addCPCLSETBOLD('bold')
+				strCmd += blesdk.addCPCLText('0', '490', '24', '0', 0, '——————————————————————————————')
+				strCmd += blesdk.addCPCLText('50', '570', '24', '0', 0, '发货方式：' + (this.sales.companyName ? this.sales
+					.companyName : '暂无'))
+				strCmd += blesdk.addCPCLSETMAG(2, 2)
+				strCmd += blesdk.addCPCLText('0', '650', '24', '0', 0, '——————————————————————————————')
+				strCmd += blesdk.addCPCLText('50', '730', '24', '0', 0, '店铺：' + maskShopName(this.sales.shopName))
+				strCmd += blesdk.addCPCLText('50', '810', '24', '0', 0, maskPhone(this.sales.createByPhone))
+				strCmd += blesdk.addCPCLText('50', '890', '24', '0', 0, '地址：' + this.shopData.shopAddress)
+				strCmd += blesdk.addCPCLLocation(0);
+				strCmd += blesdk.addCPCLPrint();
+				this.bufferData.push(strCmd);
+				this.xierushuju(this.bufferData)
+				this.$nextTick(() => {
+					this.bufferData = []
+					uni.hideLoading();
+				})
+			},
+			xierushuju() {
+				let that = this;
+				//写入数据
+				if (this.defaultText == '打印小票') {
+					that.$emit('onPrintSmall');
+				} else if (this.defaultText == '确认打印') {
+					that.$emit('goPrint');
+				} else {
+					that.$emit('onPrint');
+				}
+				
+				that.$nextTick(() => {
+					var dataStr = ''
+					for (let m = 0; m < that.bufferData.length; m++) {
+						dataStr += that.bufferData[m]
+					}
+					const maxChunk = that.deviceType == 'android' ? 20 : 180;
+					const delay = that.deviceType == 'android' ? 20 : 180;
+			
+					let buffer = gbk.strToGBKByte(dataStr)
+					for (let i = 0, j = 0, length = buffer.byteLength; i < length; i += maxChunk, j++) {
+						let subPackage = buffer.slice(i, i + maxChunk <= length ? (i + maxChunk) : length);
+						setTimeout(that._writeBLECharacteristicValue, j * delay, subPackage);
+					}
+			
+				})
+				return;
+			},
+			_writeBLECharacteristicValue(buffer) {
+				let that = this;
+				wx.writeBLECharacteristicValue({
+					deviceId: uni.getStorageSync('deviceId'),
+					serviceId: uni.getStorageSync('serviceId'),
+					characteristicId: uni.getStorageSync('characteristicId'),
+					value: buffer,
+					success(res) {
+						
+						
+					},
+					fail(res) {
+						
+						wx.closeBLEConnection({
+							deviceId: uni.getStorageSync('deviceId'),
+							success(res) {
+								
+							}
+						})
+						if (uni.getStorageSync('deviceId')) {
+							
+							that.xierushuju()
+						} else {
+							that.jiantingshebei()
+						}
+					}
+				})
+				uni.hideLoading();
+			},
+			//打印贴包单
+			onPrint(opt) {
+				let that = this;
+				uni.showModal({
+					title: "提示",
+					content: "要隐藏客户信息吗？",
+					cancelText:'不隐藏',
+					confirmText:'隐藏',
+					
+					success: function(res) {
+						if (res.confirm) {
+							
+							that.goPrint('confirm');
+						}
+						if(res.cancel){
+							
+							that.goPrint('cancel');
+						}
+					}
+				})
+			},
+			//计算打印机当前行高度
+			countPrint() {
+				if ((this.yNum + 50) >= 1040) {
+					return this.yNum += 50
+				} else {
+					return this.yNum += 30
+				}
+			},
+			//截取
+			slicePrint(val) {
+				var name = ''
+				if (typeof(val) == 'string') {
+					let newObj = JSON.parse(val)
+					for (let as in newObj) {
+						name += newObj[as] + '/'
+					}
+				}
+				return name;
+			},
+			makeCall(phone) {
+				uni.makePhoneCall({
+					phoneNumber: phone + ''
+				});
+			},
+			changeAddress(e) {
+				this.changeA = e.detail.value
+			},
+			//点击图片放大
+			showImage() {
+				uni.previewImage({
+					urls: [this.orderXd.orderPicture],
+					current: this.orderXd.orderPicture
+				})
+			},
+			sureNpPay(e) {
+				uni.showLoading({
+					title: '加载中...'
+				})
+				if (e > this.sales.noEarn) {
+					uni.showToast({
+						title: "回款金额不应超过欠款金额！",
+						icon: 'none'
+					})
+					return
+				}
+				if (this.type == 'gys') {
+					this.tui.request('/app/purchase/editPayPrice', 'post', {
+						id: this.sales.id,
+						price: e
+					}, false, true).then(res => {
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+						uni.navigateBack();
+					}).catch(res => {});
+				} else {
+					this.sales.alreadyEarn = (this.sales.alreadyEarn * 1) + (this.newEarn * 1);
+					this.tui.request('/app/sale/editPayPrice', 'post', {
+						id: this.sales.id,
+						price: e
+					}, false, true).then(res => {
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+						uni.navigateBack();
+					}).catch(res => {});
+				}
+				setTimeout(res => {
+					uni.hideLoading();
+				}, 200)
+			},
+			//回款金额输入框
+			inputDialogToggle() {
+				this.$refs.inputDialog.open()
+			},
+			//回款按钮  this.type==gys时，是上游客户欠款接口。否则为销售单欠款接口
+			editnoEarn() {
+				this.editNoPrice = true;
+			},
+			getNoPay(en) {
+				if (en != undefined) {
+					if (0 < en && en <= this.sales.noEarn) {
+						this.sales.noEarn = this.sales.newEarn - en;
+					} else {
+						uni.showToast({
+							title: '请输入正确金额',
+							icon: "none"
+						});
+					}
+				}
+			},
+			//发货方式选择
+			goPopleList(popleType) {
+				uni.navigateTo({
+					url: '/package1/index/peopleList?popleType=' + popleType
+				})
+			},
+			//退款接口
+			getReturnOrder(id) {
+				let that = this;
+				this.tui.request("/app/return/list", "post", {
+					remark: 3,
+					saleId: id
+				}, false, false).then((res) => {
+					if (res.code == 200 && res.result != null && res.result != undefined) {
+						if (res.result != '') {
+							this.inventoryList = res.result
+							let returnDat = new Map();
+							this.inventoryList.forEach(item => {
+								this.tui.request("/app/return/get/" + item.id, "GET", null, false, false)
+								.then((res) => {
+									if (res.code == 200 && res.result != null && res.result !=
+										undefined) {
+										that.returnList.push(res.result)
+										that.shopList.push(...res.result.saleDetailDTOList);
+										var data = res.result.saleDetailDTOList
+										for (let i = 0; i < data.length; i++) {
+											for (let m = 0; m < data[i].stockLogList1
+												.length; m++) {
+												if (returnDat.has(data[i].productId + '-' + data[i]
+														.stockLogList1[m].attributeList) == true) {
+													returnDat.set(data[i].productId + '-' + data[i]
+														.stockLogList1[m].attributeList,
+														returnDat.get(data[i].productId + '-' +
+															data[i].stockLogList1[m]
+															.attributeList) + data[i]
+														.stockLogList1[m].productCount)
+												} else {
+													returnDat.set(data[i].productId + '-' + data[i]
+														.stockLogList1[m].attributeList, data[
+															i].stockLogList1[m].productCount)
+												}
+											}
+										}
+										this.zReturnNum = 0
+										this.$nextTick(() => {
+											for (let i = 0; i < that.list.length; i++) {
+												for (let z = 0; z < that.list[i]
+													.stockLogList1.length; z++) {
+
+													that.zReturnNum += that.list[i]
+														.stockLogList1[z].productCount
+													if (returnDat.has(that.list[i]
+															.productId + '-' + that.list[i]
+															.stockLogList1[z].attributeList
+															) == true) {
+														that.list[i].stockLogList1[z]
+															.maxNum = that.list[i]
+															.stockLogList1[z]
+															.productCount -
+															returnDat.get(that.list[i]
+																.productId + '-' + that
+																.list[i].stockLogList1[z]
+																.attributeList)
+													} else {
+														that.list[i].stockLogList1[z]
+															.maxNum = that.list[i]
+															.stockLogList1[z]
+															.productCount
+													}
+												}
+											}
+
+										})
+										
+										returnDat.forEach(function(value, key) {
+											that.zReturnNum -= value
+										})
+										
+									}
+								}).catch((res) => {})
+							})
+						} else {
+							for (let i = 0; i < that.list.length; i++) {
+								for (let z = 0; z < that.list[i].stockLogList1.length; z++) {
+									that.list[i].stockLogList1[z].maxNum = that.list[i].stockLogList1[z]
+										.productCount
+								}
+							}
+						}
+					} else {
+						this.tui.toast(res.message)
+					}
+				})
+				
+			},
+			checkBoxChange() {
+				if (this.radio1 == 2) {
+					this.lbgName = []
+					this.changeA = ''
+				}
+			},
+			open() {
+				this.popupShow = true
+			},
+			close() {
+				this.popupShow = false
+			},
+			//调用退货接口
+			sureReturn() {
+				uni.showLoading({
+					title: '加载中...'
+				})
+				if (this.sales.productCount - this.zReturnNum == 0) {
+					this.tui.toast("已经超过最大退货数量")
+					return
+				}
+				if (this.$refs.returnClose.val == '' || this.$refs.returnClose.val <= 0) {
+					this.tui.toast("金额不能为空")
+					return
+				}
+				let returnNum = 0
+				for (let i = 0; i < this.inventoryList.length; i++) {
+					returnNum += this.inventoryList[i].totalAmount
+				}
+				if (this.inventoryList == '') {
+					if (this.$refs.returnClose.val > this.sales.realAmount) {
+						this.tui.toast('退货金额不能超出可退货金额')
+						return
+					}
+				} else {
+					if (this.$refs.returnClose.val > this.inventoryList[0].realAmount - returnNum) {
+						this.tui.toast('退货金额不能超出可退货金额')
+						return
+					}
+				}
+				let dataList = []
+				let returnCount = 0;
+				// 新增一个stockLogList参数，把有returnCount的放进去
+				for (var i = 0; i < this.list.length; i++) {
+					this.list[i].stockLogList = []
+					let isTrue = false
+					let returnStock = []
+					for (var m = 0; m < this.list[i].stockLogList1.length; m++) {
+						if (this.list[i].stockLogList1[m].returnCount && this.list[i].stockLogList1[m].returnCount > 0) {
+							returnCount += this.list[i].stockLogList1[m].returnCount
+							this.list[i].stockLogList1[m].productCount = this.list[i].stockLogList1[m].returnCount
+							returnStock.push(this.list[i].stockLogList1[m])
+							if (m == 0) {
+								this.list[i].productCount = this.list[i].stockLogList1[m].productCount
+							} else {
+								this.list[i].productCount += this.list[i].stockLogList1[m].productCount
+							}
+							isTrue = true
+						}
+
+					}
+					if (isTrue) {
+						this.list[i].stockLogList1 = returnStock
+						dataList.push(this.list[i])
+					}
+				}
+				if (returnCount == 0) {
+					this.tui.toast("退货数量不能为零")
+					return;
+				}
+				this.sales.saleId = this.sales.id;
+				this.sales.province = ''
+				this.sales.city = ''
+				this.sales.area = ''
+				this.sales.receiveAddress = this.changeA
+				this.sales.totalAmount = this.$refs.returnClose.val;
+				this.sales.transportType = this.radio1
+				this.tui.request("/app/return/rtg", "post", {
+					returnSale: this.sales,
+					returnSaleDetailList: dataList,
+					transCompany: this.radio1 == 0 ? '99999999' : '',
+					orderByWorker: this.lbgName.workerId,
+					isReturnPrice: 1
+				}, false, false).then((res) => {
+					uni.showToast({
+						title: res.message
+					});
+					if (res.code == 200) {
+						uni.navigateBack()
+					} else {
+						this.tui.toast(res.message)
+					}
+				}).catch((res) => {})
+				setTimeout(res => {
+					uni.hideLoading();
+				}, 200)
+			},
+			returnGoods() {
+
+				if (this.isReturn) {
+					// this.returnAmount = this.sAmout
+					if (this.radio1 == 0 && this.changeA == '') {
+						this.tui.toast("请输入取货地址")
+						return
+					}
+					this.$refs.returnClose.val = this.returnAmount
+					this.$refs.returnDialog.open()
+				} else {
+					
+					this.isReturn = true;
+				}
+			},
+			getPrice(price) {
+				price = price || 0;
+				return price.toFixed(2)
+			},
+			logistics() {
+				this.tui.href("/pages/my/logistics/logistics")
+			},
+			// 取消订单
+			cancelOrder(type) {
+				this.tui.modal("提示", "您确定要取消吗？", true, (res) => {
+					if (res) {
+						var data = {},
+							url
+						if (type == 'qxdd') {
+							data = {
+								status: 2,
+								orderId: this.sales.id
+							}
+							url = '/app/sale/status'
+						} else {
+							if (this.sales.status == '0' || this.sales.status == '1') {
+								//开单取消配送
+								data = {
+									status: 4,
+									orderId: this.sales.id
+								}
+								url = '/app/sale/status'
+							} else {
+								data = {
+									orderId: this.inventoryList[0].id
+								}
+								url = '/app/return/cancelOrder'
+							}
+
+						}
+						this.tui.request(url, "POST", data, true, true).then((res1) => {
+							if (res1.code == 200) {
+								this.tui.toast("取消成功")
+								uni.navigateBack()
+							} else {
+								this.tui.toast(res.message)
+							}
+						}).catch((res1) => {})
+					}
+				})
+			},
+		},
+	}
+</script>
+
+<style lang="scss">
+	.btn-wrap {
+		width: 164rpx;
+		height: 80rpx;
+		border-radius: 16upx;
+		border: 2upx solid $u-primary;
+		box-sizing: border-box;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.container {
+		padding-bottom: 118rpx;
+
+		.boxbg {
+			background-color: #fff;
+			margin: 30upx;
+			padding: 20upx;
+			border-radius: 10upx;
+			box-shadow: 0px 1px 10px 2px #e2e2e2;
+		}
+
+		.tui-order-item {
+			.u-collapse-content {
+				display: flex;
+				justify-content: space-between;
+				line-height: 30px;
+			}
+
+			.tui-goods-item {
+				width: 100%;
+				padding: 20rpx 30rpx;
+				box-sizing: border-box;
+				display: flex;
+				justify-content: space-between;
+
+				.tui-goods-img {
+					width: 180rpx;
+					height: 180rpx;
+					display: block;
+					flex-shrink: 0;
+				}
+
+				.tui-goods-center {
+					flex: 1;
+					padding: 20rpx 8rpx;
+					box-sizing: border-box;
+
+					.tui-goods {
+						word-break: break-all;
+						overflow: hidden;
+						text-overflow: ellipsis;
+						display: -webkit-box;
+						-webkit-box-orient: vertical;
+						-webkit-line-clamp: 2;
+						line-height: 32rpx;
+					}
+
+					.tui-goods-name {
+						font-weight: 700;
+						max-width: 310rpx;
+						font-size: 26rpx;
+					}
+
+					.tui-goods-attr {
+						font-size: 22rpx;
+						color: #888888;
+						padding-top: 20rpx;
+					}
+
+				}
+
+				.tui-price-right {
+					text-align: right;
+					font-size: 26upx;
+					font-weight: 700;
+					line-height: 30rpx;
+					padding-top: 160rpx;
+				}
+			}
+
+			.tui-goods-info {
+				width: 100%;
+				padding: 30rpx;
+				box-sizing: border-box;
+				background: #fff;
+				line-height: 26px;
+
+				.tui-price-flex {
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+				}
+
+				.tui-size32 {
+					font-size: 32rpx;
+					font-weight: 500;
+				}
+
+				.tui-size-24 {
+					font-size: 24rpx;
+				}
+
+				.tui-price-large {
+					font-size: 32rpx;
+
+					.lineText {
+						text-decoration: line-through;
+						font-size: 12px;
+						color: #888;
+					}
+				}
+
+				.tui-flex-shrink {
+					flex-shrink: 0;
+				}
+
+				.tui-goods-price {
+					width: 100%;
+					display: flex;
+					align-items: flex-end;
+					justify-content: flex-end;
+					font-size: 24rpx;
+				}
+
+				.tui-primary-color {
+					color: #EB0909;
+				}
+
+				.tui-pbtm20 {
+					padding-bottom: 20rpx;
+				}
+
+			}
+		}
+
+		.tui-order-info {
+			margin-top: 20rpx;
+		}
+	}
+
+
+
+
+
+
+	.tui-color-red {
+		color: #E41F19;
+		padding-right: 30rpx;
+	}
+
+
+
+
+
+
+
+
+
+	.tui-size24 {
+		padding-bottom: 20rpx;
+		font-size: 24rpx;
+		line-height: 24rpx;
+		color: #888;
+	}
+
+
+
+
+	.tui-order-title {
+		position: relative;
+		font-size: 28upx;
+		line-height: 28upx;
+		padding-left: 16upx;
+		box-sizing: border-box;
+	}
+
+	.uni-tooltip {
+		display: flex;
+	}
+
+	.tui-order-title::before {
+		content: '';
+		position: absolute;
+		left: 0;
+		top: 0;
+		border-left: 8upx solid $u-primary;
+		height: 120%;
+		border-radius: 4upx;
+	}
+
+	.tui-order-content {
+		width: 100%;
+		padding: 24rpx 30rpx;
+		box-sizing: border-box;
+		background: #fff;
+		font-size: 24rpx;
+		line-height: 30rpx;
+	}
+
+	.tui-order-flex {
+		display: flex;
+		padding-top: 18rpx;
+	}
+
+	.tui-order-flex:first-child {
+		padding-top: 0
+	}
+
+	.tui-item-title {
+		width: 132rpx;
+		flex-shrink: 0;
+	}
+
+	.tui-item-content {
+		color: #666;
+		line-height: 32rpx;
+	}
+
+	.tui-safe-area {
+		height: 1rpx;
+		padding-bottom: env(safe-area-inset-bottom);
+	}
+
+	.tui-tabbar {
+		width: 100%;
+		height: 98rpx;
+		background: #fff;
+		position: fixed;
+		left: 0;
+		bottom: 0;
+		display: flex;
+		align-items: center;
+		justify-content: flex-end;
+		font-size: 26rpx;
+		box-shadow: 0 0 1px rgba(0, 0, 0, .3);
+		padding-bottom: env(safe-area-inset-bottom);
+		z-index: 996;
+	}
+
+	.tui-btn-mr {
+		width: 130rpx;
+		height: 60rpx;
+		background: #088FEB;
+		color: #fff;
+		border-radius: 10px;
+		line-height: 60rpx;
+		text-align: center;
+		margin-right: 30rpx;
+	}
+
+	.tui-contact {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		font-size: 28rpx;
+	}
+
+	.tui-contact image {
+		width: 36rpx;
+		height: 36rpx;
+		margin-right: 16rpx;
+	}
+
+	.content-box {
+		width: 100%;
+		height: auto;
+		background: #fff;
+		margin-bottom: 20rpx;
+
+	}
+
+	.shop-box {
+		width: 95%;
+		margin: 0 auto;
+	}
+
+	.shop-name {
+		width: 100%;
+		height: 200rpx;
+		line-height: 80rpx;
+		border-top: 1px solid #eee;
+		border-bottom: 1px solid #eee;
+		font-size: 28rpx;
+		font-weight: bold;
+		display: flex;
+	}
+
+	.shop-productName {
+		flex: 1;
+		display: flex;
+		flex-direction: column;
+		padding-left: 20rpx;
+	}
+
+	.shop-productName view {
+		height: 55rpx;
+	}
+
+	.shop-collapse {
+		display: flex;
+		height: 80rpx;
+		font-size: 26rpx;
+		line-height: 80rpx;
+	}
+
+	.shop-collapse text {
+		flex: 1;
+		text-align: center;
+		// padding-right: 40rpx;
+		border-right: 1px solid #eee;
+	}
+
+	.noPic {
+		border-radius: 10px;
+		width: 140rpx;
+		height: 140rpx;
+		margin: 30rpx 0 0 30rpx;
+		text-align: center;
+		line-height: 140rpx;
+		color: #777;
+		background: #eee;
+	}
+
+	.checklist-box {
+		margin-right: 0 !important;
+		margin-left: 50rpx !important;
+	}
+</style>
\ No newline at end of file
diff --git a/package1/index/peopleList.vue b/package1/index/peopleList.vue
new file mode 100644
index 0000000..66dd802
--- /dev/null
+++ b/package1/index/peopleList.vue
@@ -0,0 +1,495 @@
+<template>
+	<view class="">
+		<view style="width: 100%;position: fixed;top: 0;z-index: 99;">
+			<view v-if="popleType== 'khName' || popleType== 'gysName'" style="background:#fff;padding-top:20rpx;">
+				<button size="default" type="default" @tap="goAddPeople" hover-class="is-hover">{{popleType=='khName'?'新增客户':'新增供应商'}}</button>
+			</view>
+			<view class="title-box" v-if="popleType=='wlName' || popleType=='dbName' || popleType=='fcName'">
+				<uni-search-bar class="uni-mt-10" radius="5" placeholder="请输入名称或发货地查询" cancelButton="none"
+					@confirm="search" />
+			</view>
+			<view class="title-box" v-else>
+				<uni-search-bar class="uni-mt-10" radius="5" placeholder="请输入名称查询" cancelButton="none"
+					@confirm="search" />
+			</view>
+		</view>
+		<view style="overflow:scroll;" :style="{'margin-top':popleType == 'khName' || popleType == 'gysName'?'230rpx':'110rpx'}">
+			<view v-if="popleType== 'khName' || popleType== 'gysName'" style="overflow:scroll;">
+				<!-- 供应商、客户走这一套 -->
+				<view class="list-1" v-for="item in popleList" :key="item" @tap="clickList(item)"
+					style="display: flex;flex-direction: column;height: auto;min-height: 160rpx;padding-bottom: 20rpx;">
+					<view class="name-tel" style="width: 100%;" v-if="popleType=='gysName'">
+						<text style="line-height: 75rpx;">{{item.consigneeName}}</text>
+						<text>{{item.consigneeMobile}}</text>
+					</view>
+					<view class="name-tel" style="width: 100%;" v-else>
+						<text style="line-height: 75rpx;">{{item.name}}</text>
+						<text v-if="item.name != '散客'">{{item.phone}}</text>
+					</view>
+					<view class="name-tel" style="width: 100%;display: flex;flex-direction: column;height:auto;font-size: 30rpx;">
+						<text>{{item.name == '散客'?'-':item.province + item.city + item.area}}</text>
+						<text style="width:75%;font-size: 26rpx;color:#747474;height: auto;line-height: 30rpx;">{{item.name == '散客'?'-':item.address}}</text>
+					</view>
+					<view v-if="item.name != '散客' && popleType== 'khName'" style="color: red;position: absolute;top: 8px;right: 17px;font-size: 13px;">
+						欠款:{{item.noEarn?item.noEarn :0}}
+					</view>
+					<view v-if="item.name != '散客'" class="name-edit" @tap.stop="goAddPeople('edit',item)" style="bottom: 86rpx;">
+						编辑
+					</view>
+					<view v-if="item.name != '散客'" class="name-edit" @tap.stop="goDetail(item)" style="background: #FF9797;bottom:16rpx">
+						查看明细
+					</view>
+				</view>
+			</view>
+			<!-- 物流、发车走这一套 -->
+			<view class="" v-if="popleType== 'wlName' || popleType== 'fcName'">
+				<view class="list-1" v-for="(item,index) in popleList[0]" :key="index" v-if="user!='13521030702' && item.shippingMethod != '测试勿选'" :style="{height:popleType == 'kdName'?'75rpx':'120rpx'}" style="display: flex;position: relative;" @tap="clickList(item)">
+					<view class="name-tel">
+						<text style="line-height: 75rpx;" v-if="item.companyName">{{item.companyName}} <text v-if="item.isOnLine == 0" style="color: red;">（已下线）</text></text>
+						<text style="line-height: 75rpx;" v-if="item.shippingMethod">{{item.shippingMethod}} <text v-if="item.isOnLine == 0" style="color: red;">（已下线）</text></text>
+						<text style="line-height: 75rpx;" v-if="item.workerName">{{item.workerName}} <text v-if="item.isOnLine == 0" style="color: red;">（已下线）</text></text>
+					</view>
+					<view class="standard-box" @tap.stop="toggle('center',item)">
+						<view class="">
+							<text style="padding-left:40rpx;">线路查询</text>
+							<uni-icons type="info" color='#088FEB' size="16" style="line-height: 75rpx;"></uni-icons>
+						</view>
+						<view class="phone-btn" @tap.stop="clickPhone(item.mobile)" v-if="popleType != 'kdName'">拨打电话</view>
+					</view>
+					<view style="position: absolute;bottom: 0;left: 40rpx;" v-if="popleType == 'fcName' || popleType == 'lbgName' || popleType == 'wlName'">
+						<text style="line-height: 45rpx;color:red;font-size: 24rpx;" v-if="item.rebateAmount">本单返佣{{item.rebateAmount}}元</text>
+					</view>
+				</view>
+				<view class="no-more" v-if="searchName == ''">
+					<view>以上结果根据客户地址自动匹配得出</view>
+					<view>↓↓下方为区域内所有物流公司↓↓</view>
+				</view>
+				<view class="list-1" :style="{height:popleType == 'kdName'?'75rpx':'120rpx'}" style="display: flex;position: relative;" @tap="clickList(item)" v-for="item in popleList[1]" :key="item" v-if="user!='13521030702' && item.companyName != '测试勿选'">
+					<!-- <view class="shop-mask" v-if="item.isOnLine == 0" @tap.stop="clickMask(item)">
+						<view style="width: 100%;height: 100%;line-height: 120rpx;text-align: center;color: red;" @tap.stop="clickPhone(item.mobile)">
+							此{{popleType== 'wlName'?'物流公司': popleType== 'fcName'?'厢货车': popleType== 'dbName'?'大巴车':'公司'}}已下线,点击可拨打电话
+						</view>
+					</view> -->
+					<view class="name-tel">
+						<text style="line-height: 75rpx;" v-if="item.companyName">{{item.companyName}} <text v-if="item.isOnLine == 0" style="color: red;">（已下线）</text></text>
+						<text style="line-height: 75rpx;" v-if="item.shippingMethod">{{item.shippingMethod}} <text v-if="item.isOnLine == 0" style="color: red;">（已下线）</text></text>
+						<text style="line-height: 75rpx;" v-if="item.workerName">{{item.workerName}} <text v-if="item.isOnLine == 0" style="color: red;">（已下线）</text></text>
+					</view>
+					<view class="standard-box" @tap.stop="toggle('center',item)">
+						<view class="">
+							<text style="padding-left:40rpx;">线路查询</text>
+							<uni-icons type="info" color='#088FEB' size="16" style="line-height: 75rpx;"></uni-icons>
+						</view>
+						<view class="phone-btn" @tap.stop="clickPhone(item.mobile)" v-if="popleType != 'kdName'">拨打电话</view>
+					</view>
+					<view style="position: absolute;bottom: 0;left: 40rpx;" v-if="popleType == 'fcName' || popleType == 'lbgName' || popleType == 'wlName'">
+						<text style="line-height: 45rpx;color:red;font-size: 24rpx;" v-if="item.rebateAmount">本单返佣{{item.rebateAmount}}元</text>
+					</view>
+				</view>
+			</view>
+			<!--快递、拉包工、大巴 -->
+			<view class="" v-if="popleType== 'kdName' || popleType== 'lbgName' || popleType== 'kdyName' || popleType== 'dbName'">
+				<view class="list-1" :style="{height:popleType == 'kdName'?'75rpx':'120rpx'}" style="display: flex;position: relative;" @tap="clickList(item)" v-for="item in popleList" :key="item">
+					<!-- <view class="shop-mask" v-if="item.isOnLine == 0" @tap.stop="clickMask(item)">
+						<view style="width: 100%;height: 100%;line-height: 120rpx;text-align: center;color: red;" @tap.stop="clickPhone(item.mobile)">
+							此{{popleType== 'wlName'?'物流公司': popleType== 'fcName'?'厢货车': popleType== 'dbName'?'大巴车':'公司'}}已下线,点击可拨打电话
+						</view>
+					</view> -->
+					<view class="name-tel">
+						<text style="line-height: 75rpx;" v-if="item.companyName">{{item.companyName}} <text v-if="item.isOnLine == 0" style="color: red;">（已下线）</text></text>
+						<text style="line-height: 75rpx;" v-if="item.shippingMethod">{{item.shippingMethod}} <text v-if="item.isOnLine == 0" style="color: red;">（已下线）</text></text>
+						<text style="line-height: 75rpx;" v-if="item.workerName">{{item.workerName}} <text v-if="item.isOnLine == 0" style="color: red;">（已下线）</text></text>
+					</view>
+					<view class="standard-box" @tap.stop="toggle('center',item)">
+						<view class="" v-if="popleType !='kdyName' && popleType !='lbgName'">
+							<text style="padding-left:40rpx;">收费标准</text>
+							<uni-icons type="info" color='#088FEB' size="16" style="line-height: 75rpx;"></uni-icons>
+						</view>
+						<view class="phone-btn" :style="{'line-height':(popleType !='kdyName' && popleType !='lbgName')?'':'80rpx'}" @tap.stop="clickPhone(item.mobile)" v-if="popleType != 'kdName'">拨打电话</view>
+					</view>
+					<!-- <view style="position: absolute;bottom: 0;left: 40rpx;" v-if="popleType == 'fcName' || popleType == 'lbgName' || popleType == 'wlName'">
+						<text style="line-height: 45rpx;color:red;font-size: 24rpx;" v-if="item.rebateAmount">本单返佣{{item.rebateAmount}}元</text>
+					</view> -->
+				</view>
+			</view>
+			<u-loadmore :status="status" />
+		</view>
+		<view>
+			<uni-popup ref="popup" background-color="#fff">
+				<view class="popup-content">
+					<view class="popup-title">
+						<text>收费标准</text>
+						<uni-icons @tap='close' type="closeempty" color='red' size="16"
+							style="height:40rpx;line-height: 40rpx;position: absolute;right: 0;"></uni-icons>
+					</view>
+					<view class="popup-container">
+						<text style="display: inline-block;text-indent: 2em;">{{remark}}</text>
+					</view>
+				</view>
+			</uni-popup>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				popleType: '',
+				popleList: [],
+				signCompany: '', // 1物流  2快递  3发车
+				people: '', //快递、物流、发车的id
+				radioType: '', //选择的是快递还是物流
+				companyType: '', //运输公司类型  快递公司有值  物流公司直接传空
+				modelShow:false,
+				status: 'loadmore',
+				remark:'',
+				khName:{},
+				searchName:'',
+				pages: 1,
+				totalPages: 0,
+				noClick:0,
+				hour:0,
+				user:''
+			}
+		},
+		onReachBottom() {
+			if (this.pages >= this.totalPages) return;
+			this.status = 'loading';
+			this.pages = ++this.pages;
+			this.getPeopleType();
+		},
+		onShow(){
+			if(this.modelShow == true){
+				this.popleType = this.popleType
+				this.khOrGysList();
+			}
+		},
+		onLoad(options) {
+			this.popleType = options.popleType
+			this.noClick = options.noClick || 0
+			this.companyType = options.companyType || ''
+			uni.setStorageSync('clearMsg','1')
+			this.user = uni.getStorageSync('username')
+			if(options.khName){
+				this.khName = JSON.parse(options.khName) || ''
+			}
+			if(options.popleType == 'khName'){
+				uni.setNavigationBarTitle({
+					title: '客户列表'
+				});
+			}else if(options.popleType == 'gysName'){
+				uni.setNavigationBarTitle({
+					title: '供应商列表'
+				});
+			}
+			this.getPeopleType();
+		},
+		methods: {
+			getPeopleType(){
+				if (this.popleType == 'khName' || this.popleType == 'gysName') { //供应商或者客户
+					this.khOrGysList();
+				} else if (this.popleType == 'wlName' || this.popleType == 'kdName' || this.popleType == 'fcName' || this.popleType == 'dbName') { //物流快递
+					this.wlOrKdList(this.popleType)
+				} else {
+					this.kdyOrlbgList();
+				}
+			},
+			//客户、供应商列表
+			khOrGysList() {
+				this.status = 'loading';
+				if(this.popleType == 'gysName'){ //供应商
+					this.tui.request("/app/supplier/getByCondition", "post", {
+						searchStr:this.searchName,
+						pageNumber: this.pages,
+						pageSize: 10
+					}, false, true).then((res) => {
+						this.status = 'nomore';
+						if (res.code == 200) {
+							if (this.pages == 1) {
+								this.popleList = res.result.content
+							} else {
+								this.popleList = [...this.popleList, ...res.result.content]
+							}
+							this.totalPages = res.result.totalPages
+						}else{
+							this.tui.toast(res.message)
+						}
+					})
+				}else{ //客户
+					this.tui.request("/app/customer/list", "post", {
+						searchStr:this.searchName,
+						pageNum: this.pages, 
+						pageSize: 10
+					}, false, false).then((res) => {
+						this.status = 'nomore';
+						if (res.code == 200) {
+							if (this.pages == 1) {
+								this.popleList = res.result.records
+							} else {
+								this.popleList = [...this.popleList, ...res.result.records]
+							}
+							this.totalPages = res.result.pages
+						}else{
+							this.tui.toast(res.message)
+						}
+					})
+				}
+			},
+			//物流或者快递列表
+			wlOrKdList(e,num) {
+				this.status = 'loading';
+				let url,
+					data = {},
+					isTrue
+				//物流：1  快递：2  发车3
+				if (e == 'wlName') {
+					url = '/app/operatingArea/getByArea'
+					isTrue = true
+					data = {
+						province:this.searchName == '' ? this.khName.province : '',
+						city:this.searchName == '' ? this.khName.city : '',
+						area:this.searchName == '' ? this.khName.area : '',
+						shippingType:0,
+						seachParams:this.searchName
+					}
+					
+				} else if (e == 'kdName') {
+					isTrue = false
+					url = '/app/logitics/getAll'
+					data = {
+						signCompany:1
+					}
+				} else if (e == 'fcName') {
+					isTrue = true
+					data = {
+						province:this.searchName == '' ? this.khName.province : '',
+						city:this.searchName == '' ? this.khName.city : '',
+						area:this.searchName == '' ? this.khName.area : '',
+						shippingType:4,
+						seachParams:this.searchName
+					}
+					url = '/app/operatingArea/getByArea'
+				}else if (e == 'dbName') {
+					isTrue = false
+					url = '/app/logitics/getAll'
+					data = {
+						signCompany:5,
+						seachParams:this.searchName
+					}
+				}
+				this.tui.request(url, "post", data, false, isTrue).then((res) => {
+					this.status = 'nomore';
+					if (res.code == 200) {
+						if(e == 'kdName' || e == 'dbName'){
+							this.popleList = res.result;
+						}else{
+							this.popleList.push(res.result.operatingAreaList)
+							this.popleList.push(res.result.logiticsCompanyList)
+						}
+					}else{
+						this.tui.toast(res.message)
+					}
+				})
+			},
+			//未入库遮罩
+			clickMask(item){
+				let title = ''
+				if(item.delFlag == 0){
+					title = '请将商品上架后再操作！'
+				}else{
+					title = '请将上次入库的采购价维护后再进行操作！'
+				}
+				uni.showToast({
+					title: title,
+					icon: 'none'
+				})
+			},
+			//点击选择列表，带参数 返回上一页
+			clickList(item) {
+				if(item.isOnLine ==0){
+					this.tui.toast(this.popleType== 'wlName'?'物流公司已下线': this.popleType== 'fcName'?'厢货车已下线': this.popleType== 'dbName'?'大巴车已下线':this.popleType== 'lbgName'?'拉包工已下线':this.popleType== 'kdyName'?'快递员已下线':'公司已下线')
+					return
+				}
+				if(this.isAfterNoon() && this.popleType== 'dbName'){
+					this.tui.toast('大巴车已下线')
+					return
+				}
+				if(this.noClick == 0){
+					let pages = getCurrentPages(); // 获取当前页面栈的实例，以数组形式按栈的顺序给出，第一个元素为首页，最后一个元素为当前页面。
+					let prevPage = pages[pages.length - 2]; //上一页页面实例
+					//客户和供应商用一个名字
+					if (this.popleType == 'khName' || this.popleType == 'gysName') {
+						prevPage.$vm.khName = item
+					} else if (this.popleType == 'kdName' || this.popleType == 'wlName' || this.popleType == 'fcName' ||this.popleType == 'dbName') {
+						prevPage.$vm.wlName = item
+					} else if (this.popleType == 'lbgName') {
+						prevPage.$vm.lbgName = item
+					} else if (this.popleType == 'kdyName') {
+						prevPage.$vm.kdyName = item
+					}
+					uni.navigateBack({
+						delta: 1
+					})
+				}
+			},
+			//大巴车判断是否超过了下午两点，超过不能选择
+			isAfterNoon() {
+			  const now = new Date();
+			  const hour = now.getHours();
+			  return hour >= 14; // 下午2点对应的小时数是14（注意：JS中的getHours() 返回的是0到23的整数）
+			},
+			//拨打电话
+			clickPhone(phone) {
+				uni.makePhoneCall({
+					phoneNumber: phone
+				});
+			},
+			//顶部搜索框
+			search(res) {
+				this.pages = 1
+				this.searchName = res.value
+				this.popleList = []
+				this.getPeopleType()
+			},
+			//查询拉包工和快递人员的列表
+			kdyOrlbgList() {
+				this.status = 'loading';
+				this.tui.request("/worker/getByCondition", "post", {
+					ownerCompany: this.companyType, //公司id，如果是快递公司，才需要传
+					searchStr:this.searchName,
+					pageNum: this.pages,
+					pageSize: 10
+				}, false, false).then((res) => {
+					this.status = 'nomore';
+					if (res.code == 200) {
+						if (this.pages == 1) {
+							this.popleList = res.result.content
+						} else {
+							this.popleList = [...this.popleList, ...res.result.content]
+						}
+						this.totalPages = res.result.totalPages
+					}else{
+						this.tui.toast(res.message)
+					}
+				})
+
+			},
+			//新增人员
+			goAddPeople(type,data){
+				this.modelShow = true;
+				this.pages = 1
+				this.searchName = ""
+				this.popleList = []
+				uni.navigateTo({
+					url: "/pages/billing/addUser?type="+type+'&data='+JSON.stringify(data) + '&popleType=' + this.popleType
+				})
+			},
+			goDetail(data){
+				uni.navigateTo({
+					url: "/pages/index/customAndSupplierProductDetail?popleType="+this.popleType+'&id='+data.id
+				})
+			},
+			//打开弹出层
+			toggle(type,item) {
+				uni.setStorageSync("transCompany", item.shippingMethodId || item.id)
+				uni.navigateTo({
+					url: "/package1/other/logisticsAddress?type=kaidan"
+				})
+			},
+			//关闭弹出层
+			close() {
+				this.$refs.popup.close()
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	button {
+		color: #ffffff;
+		background: #5fd9ee;
+		width: 90%;
+	}
+
+	.list-1 {
+		display: flex;
+		height: 150rpx;
+		border-bottom: 1px solid #eee;
+		background: #fff;
+		font-size: 32rpx;
+		margin: 20rpx auto 0;
+		width: 95%;
+		padding-left: 30rpx;
+		position: relative;
+	}
+
+	.name-tel {
+		width: 75%;
+		display: flex;
+		flex-direction: column;
+		height: auto;
+		font-size: 15px;
+	}
+	.name-edit{
+		width: 110rpx;
+		height: 55rpx;
+		position: absolute;
+		right: 35rpx;
+		background: #088FEB;
+		color: #fff;
+		font-size: 22rpx;
+		line-height: 55rpx;
+		text-align: center;
+		border-radius: 5px;
+	}
+	
+	.standard-box {
+		color: #088FEB;
+		width: 30%;
+		font-size: 26rpx;
+	}
+
+
+	.popup-content {
+		align-items: center;
+		justify-content: center;
+		padding: 15px;
+		width: 500rpx;
+		height: 700rpx;
+		background-color: #fff;
+	}
+	.title-box {
+		background: #fff;
+	}
+	.popup-title {
+		font-size: 36rpx;
+		font-weight: bold;
+		text-align: center;
+		position: relative;
+	}
+
+	.popup-container {
+		margin-top: 20rpx;
+	}
+
+	.phone-btn {
+		width: 150rpx;
+		color: #088FEB;
+		font-size: 26rpx;
+		padding-left:40rpx;
+	}
+	.no-more{
+		text-align: center;
+		color: #BEBEBE;
+		margin-top:20rpx;
+	}
+	.shop-mask {
+		width: 100%;
+		height: 120rpx;
+		position: absolute;
+		top: 0;	
+		left: 0;
+		background: rgba(0, 0, 0, 0.6);
+	}
+</style>
\ No newline at end of file