no message

pagesRepairs/addGoods/addGoods.vue

@@ -91,6 +91,7 @@ export default {
 	flex-direction: column;
 	width: 100vw;
 	height: 100vh;
+	font-size: 32rpx;
 	overflow-y: auto;
 
 	.search {
@@ -128,7 +129,7 @@ export default {
 
 			.left_item {
 				height: 80rpx;
-				font-size: 28rpx;
+				// font-size: 28rpx;
 				font-weight: bold;
 			}
 
@@ -152,7 +153,7 @@ export default {
 				line-height: 30rpx;
 				text-align: center;
 				color: #808080;
-				font-size: 28rpx;
+				// font-size: 28rpx;
 				border-radius: 53rpx;
 				background-color: #e6e6e6;
 				overflow: hidden;
@@ -215,4 +216,4 @@ export default {
 		background-color: #6fb6b8;
 	}
 }
-</style>
+</style>

pagesRepairs/addressBook/addressBook.vue

@@ -161,6 +161,7 @@ export default {
 .container {
 	width: 100vw;
 	height: calc(100vh - 152rpx);
+	font-size: 32rpx;
 	overflow-y: auto;
 
 	.search {
@@ -237,13 +238,13 @@ export default {
 			.info_phone {
 				margin-top: 10rpx;
 				color: #808080;
-				font-size: 28rpx;
+				// font-size: 28rpx;
 			}
 		}
 
 		.item_type {
 			margin-left: auto;
-			font-size: 24rpx;
+			// font-size: 24rpx;
 		}
 
 		.color_type {

pagesRepairs/helpPeople/helpPeople.vue

@@ -144,6 +144,7 @@ export default {
 
 <style lang="scss" scoped>
 .container {
+	font-size: 32rpx;
 	.search {
 		display: flex;
 		align-items: center;
@@ -212,13 +213,13 @@ export default {
 				.info_phone {
 					margin-top: 10rpx;
 					color: #808080;
-					font-size: 28rpx;
+					// font-size: 28rpx;
 				}
 			}
 
 			.item_type {
 				margin-left: auto;
-				font-size: 24rpx;
+				// font-size: 24rpx;
 			}
 
 			.color_type {
@@ -248,4 +249,4 @@ export default {
 		background-color: #6fb6b8;
 	}
 }
-</style>
+</style>

pagesRepairs/home/home.vue

@@ -61,8 +61,8 @@
 				<uni-tr>
 					<uni-th width="80" align="center">姓名</uni-th>
 					<uni-th width="50" align="center">工种</uni-th>
-					<uni-th width="80" align="center">状态</uni-th>
-					<uni-th width="70" align="center">是否值班</uni-th>
+					<uni-th width="80" align="center">接单状态</uni-th>
+					<uni-th width="70" align="center">值班班次</uni-th>
 				</uni-tr>
 				<!-- 表格数据行 -->
 				<uni-tr v-for="(item, index) in tableData" :key="index">
@@ -94,11 +94,11 @@
 					</view>
 
 					<view class="poop_body">
-						<view class="body_item" v-for="(item, index_pop) in workArray" :key="index_pop" @click="handleChangeWork(item)">
+						<view class="body_item" v-for="item in workArray" :key="item.id" @click="handleChangeWork(item)">
 							<view class="body_item_info">
-								{{ item }}
+								{{ item.text }}
 							</view>
-							<view class="body_item_icon" v-if="defaultList.includes(item)">✔</view>
+							<view class="body_item_icon" v-if="defaultList.some((ele) => ele.text == item.text)">✔</view>
 						</view>
 					</view>
 				</view>
@@ -114,7 +114,7 @@
 			<!-- 排行榜柱状图 -->
 			<view class="rank_charts">
 				<!-- 加上canvas2d属性后 模拟器上图表显示异常，真机调试没有问题，开发时不添加canvas2d属性，发布时添加canvas2d属性 -->
-				<qiun-data-charts type="bar" :opts="opts" :chartData="chartData" />
+				<qiun-data-charts canvas2d type="bar" :opts="opts" :chartData="chartData" />
 			</view>
 		</view>
 
@@ -141,7 +141,16 @@ export default {
 			// 排班状态数组
 			typeArray: ['接单中', '订单饱和', '停止接单'],
 			// 值班状态数组
-			workArray: ['正常班次', '值班班次'],
+			workArray: [
+				{
+					id: 0,
+					text: '正常班次'
+				},
+				{
+					id: 1,
+					text: '值班班次'
+				}
+			],
 			// 分段器数组数据
 			items: ['团队数据统计', '个人数据统计'],
 			// 分段器当前索引
@@ -198,37 +207,71 @@ export default {
 					name: '张三',
 					type: '电工',
 					status: 0,
-					work: ['正常班次', '值班班次']
+					work: [
+						{
+							id: 0,
+							text: '正常班次'
+						},
+						{
+							id: 1,
+							text: '值班班次'
+						}
+					]
 				},
 				{
 					name: '张三三',
 					type: '泥工',
 					status: 1,
-					work: ['值班班次']
+					work: [
+						{
+							id: 1,
+							text: '值班班次'
+						}
+					]
 				},
 				{
 					name: '张三',
 					type: '电工',
 					status: 2,
-					work: ['正常班次']
+					work: [
+						{
+							id: 0,
+							text: '正常班次'
+						}
+					]
 				},
 				{
 					name: '张三三',
 					type: '泥工',
 					status: 0,
-					work: ['值班班次']
+					work: [
+						{
+							id: 1,
+							text: '值班班次'
+						}
+					]
 				},
 				{
 					name: '张三',
 					type: '电工',
 					status: 1,
-					work: ['值班班次']
+					work: [
+						{
+							id: 0,
+							text: '正常班次'
+						}
+					]
 				},
 				{
 					name: '张三三',
 					type: '泥工',
 					status: 2,
-					work: ['正常班次']
+					work: [
+						{
+							id: 0,
+							text: '正常班次'
+						}
+					]
 				}
 			]
 		}
@@ -266,19 +309,27 @@ export default {
 		},
 		// 切换值班状态回调
 		handleChangeWork(item) {
-			if (this.defaultList.includes(item)) {
-				const temIndex = this.defaultList.indexOf(item)
+			let temIndex
+			let flag = this.defaultList.some((ele, index) => {
+				if (ele.text == item.text) {
+					temIndex = index
+				}
+				return ele.text == item.text
+			})
+			if (flag) {
 				this.defaultList.splice(temIndex, 1)
 			} else {
 				this.defaultList.push(item)
 			}
+			// 修改数组的排序,id小的在前面
+			this.defaultList.sort((a, b) => a.id - b.id)
 		},
 
-		// 切换排班状态回调
+		// 切换接单状态回调
 		bindPickerChange(e, item) {
 			uni.showModal({
 				title: '提示',
-				content: '确定修改状态吗？',
+				content: '确定修改接单状态吗？',
 				success: (res) => {
 					if (res.confirm) {
 						item.status = e.detail.value
@@ -315,9 +366,9 @@ export default {
 			let str = ''
 			list.forEach((ele, index) => {
 				if (index + 1 == list.length && list.length > 1) {
-					str += '、' + ele.substring(0, 1)
+					str += '、' + ele.text.substring(0, 1)
 				} else {
-					str += ele.substring(0, 1)
+					str += ele.text.substring(0, 1)
 				}
 			})
 			return str

pagesRepairs/management/management.vue

@@ -138,7 +138,7 @@
 				</view>
 
 				<!-- 维修师傅 -->
-				<view class="item_time" v-if="item.type === 2 || item.type === 3 || item.type === 4 || item.type === 6">
+				<view class="item_time" v-if="item.type === 2 || item.type === 3 || item.type === 4 || item.type === 6 || item.type === 5">
 					<view class="time_msg">
 						维修师傅：
 						<text>{{ item.workerName }}</text>
@@ -146,7 +146,7 @@
 				</view>
 
 				<!-- 师傅电话 -->
-				<view class="item_box" v-if="item.type === 2 || item.type === 3 || item.type === 4 || item.type === 6">
+				<view class="item_box" v-if="item.type === 2 || item.type === 3 || item.type === 4 || item.type === 6 || item.type === 5">
 					<view class="box_key">师傅电话：</view>
 					<view class="box_value phone" @click="handleCallPhone(item.workerPhone)">
 						{{ item.workerPhone }}
@@ -155,9 +155,9 @@
 				</view>
 
 				<!-- 维修费用 -->
-				<view class="item_box" v-if="item.type === 3 || item.type === 4">
+				<view class="item_box" v-if="item.type === 3 || item.type === 4 || item.type === 5">
 					<view class="box_key">维修费用：</view>
-					<view class="box_value2 phone" @click="checkFeeDetail">
+					<view class="box_value2 phone" @click="checkFeeDetail(item)">
 						{{ item.money }}元
 						<img src="../../static/images/repairsImg/eye.png" />
 					</view>
@@ -171,11 +171,11 @@
 					<view class="btn_box type" v-if="item.type === 1 && btns.includes('接单')" @click="handleOrderReceiving">接单</view>
 					<view class="btn_box type2" v-if="item.type === 1 && btns.includes('转单')" @click="handleTransferOrder">转单</view>
 					<view class="btn_box type2" v-if="item.type === 1 && btns.includes('派单')" @click="handleSendOrder">派单</view>
-					<view class="btn_box type" v-if="item.type === 2 && btns.includes('报价')" @click="handleOffer">报价</view>
+					<view class="btn_box type" v-if="item.type === 2 && btns.includes('报价')" @click="handleOffer(item)">报价</view>
 					<view class="btn_box type2" v-if="item.type === 2 && btns.includes('维修完成')" @click="handleFinish">维修完成</view>
 
 					<view class="btn_box type" v-if="item.type === 3 && btns.includes('审核')" @click="handleAudit(item.status)">审核</view>
-					<view class="btn_box type" v-if="item.type === 5" @click="handleChangeOffer">改价</view>
+					<view class="btn_box type" v-if="item.type === 5" @click="handleChangeOffer(item)">改价</view>
 					<view class="btn_box type2" v-if="item.type === 5" @click="handleLeaveWords">留言</view>
 				</view>
 
@@ -219,21 +219,25 @@
 							维修费用
 							<text @click="$refs.popup_fee[0].close()">×</text>
 						</view>
-						<view class="fee_box">
-							耗材：
-							<text>螺丝刀</text>
-						</view>
-						<view class="fee_box">
-							耗材单价：
-							<text>1元</text>
-						</view>
-						<view class="fee_box">
-							耗材数量：
-							<text>2</text>
-						</view>
-						<view class="fee_box">
-							耗材费用：
-							<text>2元</text>
+						<view class="fee_content">
+							<view class="fee_item" v-for="(element, index2) in goodsList" :key="index2">
+								<view class="fee_box">
+									耗材：
+									<text>{{ element.name }}</text>
+								</view>
+								<view class="fee_box">
+									耗材单价：
+									<text>{{ element.price }}元</text>
+								</view>
+								<view class="fee_box">
+									耗材数量：
+									<text>{{ element.num }}</text>
+								</view>
+								<view class="fee_box">
+									耗材费用：
+									<text>{{ element.count }}元</text>
+								</view>
+							</view>
 						</view>
 					</view>
 				</uni-popup>
@@ -320,8 +324,16 @@ export default {
 					],
 					workerName: '老张',
 					workerPhone: '13659585689',
-					money: 50,
-					status: 1
+					money: 10,
+					status: 1,
+					goodsList: [
+						{
+							name: '螺丝刀',
+							price: 5,
+							num: 2,
+							count: 10
+						}
+					]
 				},
 				{
 					id: 369,
@@ -342,8 +354,22 @@ export default {
 					],
 					workerName: '老张',
 					workerPhone: '13659585689',
-					money: 50,
-					status: 2
+					money: 12,
+					status: 2,
+					goodsList: [
+						{
+							name: '螺丝刀',
+							price: 5,
+							num: 2,
+							count: 10
+						},
+						{
+							name: '螺丝',
+							price: 1,
+							num: 2,
+							count: 2
+						}
+					]
 				}
 			],
 			temList2: [
@@ -405,7 +431,15 @@ export default {
 					workerName: '老张',
 					workerPhone: '13659585689',
 					money: 50,
-					status: 1
+					status: 1,
+					goodsList: [
+						{
+							name: '螺丝刀',
+							price: 5,
+							num: 2,
+							count: 10
+						}
+					]
 				},
 				{
 					id: 369,
@@ -427,7 +461,15 @@ export default {
 					workerName: '老张',
 					workerPhone: '13659585689',
 					money: 50,
-					status: 2
+					status: 2,
+					goodsList: [
+						{
+							name: '螺丝刀',
+							price: 5,
+							num: 2,
+							count: 10
+						}
+					]
 				},
 				{
 					id: 4,
@@ -448,7 +490,21 @@ export default {
 					],
 					workerName: '老张',
 					workerPhone: '13659585689',
-					money: 50
+					money: 50,
+					goodsList: [
+						{
+							name: '螺丝刀',
+							price: 5,
+							num: 2,
+							count: 10
+						},
+						{
+							name: '螺丝',
+							price: 1,
+							num: 2,
+							count: 2
+						}
+					]
 				},
 				{
 					id: 5,
@@ -469,7 +525,15 @@ export default {
 					],
 					workerName: '老张',
 					workerPhone: '13659585689',
-					money: 50
+					money: 50,
+					goodsList: [
+						{
+							name: '螺丝刀',
+							price: 5,
+							num: 2,
+							count: 10
+						}
+					]
 				},
 				{
 					id: 6,
@@ -490,9 +554,25 @@ export default {
 					],
 					workerName: '老张',
 					workerPhone: '13659585689',
-					money: 50
+					money: 50,
+					goodsList: [
+						{
+							name: '螺丝刀',
+							price: 5,
+							num: 2,
+							count: 10
+						},
+						{
+							name: '螺丝',
+							price: 1,
+							num: 2,
+							count: 2
+						}
+					]
 				}
-			]
+			],
+			// 维修费用弹窗数组
+			goodsList: []
 		}
 	},
 	mounted() {
@@ -564,15 +644,17 @@ export default {
 			this.activeIndex = val
 		},
 		// 报价按钮回调
-		handleOffer() {
+		handleOffer(item) {
+			let info = encodeURIComponent(JSON.stringify(item))
 			uni.navigateTo({
-				url: '/pagesRepairs/offer/offer'
+				url: `/pagesRepairs/offer/offer?info=${info}`
 			})
 		},
 		// 改价按钮回调
-		handleChangeOffer() {
+		handleChangeOffer(item) {
+			let info = encodeURIComponent(JSON.stringify(item))
 			uni.navigateTo({
-				url: '/pagesRepairs/offer/offer?type=1'
+				url: `/pagesRepairs/offer/offer?info=${info}&type=1`
 			})
 		},
 		// 维修完成按钮回调
@@ -631,7 +713,9 @@ export default {
 			}
 		},
 		// 查看维修费用回调
-		checkFeeDetail() {
+		checkFeeDetail(item) {
+			// console.log(item)
+			this.goodsList = item.goodsList
 			this.$refs.popup_fee[0].open('center')
 		},
 		// 点击电话号码回调
@@ -1046,16 +1130,24 @@ export default {
 					}
 				}
 
-				.fee_box {
-					display: flex;
-					align-items: center;
-					padding-left: 42rpx;
-					height: 80rpx;
-					// font-size: 28rpx;
-					color: #808080;
-
-					text {
-						color: #000000;
+				.fee_content {
+					max-height: 50vh;
+					overflow-y: auto;
+
+					.fee_item {
+						border-bottom: 1rpx solid #e6e6e6;
+						.fee_box {
+							display: flex;
+							align-items: center;
+							padding-left: 42rpx;
+							height: 80rpx;
+							// font-size: 28rpx;
+							color: #808080;
+
+							text {
+								color: #000000;
+							}
+						}
 					}
 				}
 			}

pagesRepairs/offer/offer.vue

@@ -57,9 +57,9 @@ export default {
 	data() {
 		return {
 			// 维修师傅
-			worker: '张三',
+			worker: '',
 			// 手机号码
-			phone: '13659854589',
+			phone: '',
 			// 耗材列表
 			goodList: []
 		}
@@ -79,10 +79,18 @@ export default {
 		}
 	},
 	onLoad(options) {
-		console.log(options)
+		// console.log(options)
+		let info = JSON.parse(decodeURIComponent(options.info))
+		this.worker = info.workerName
+		this.phone = info.workerPhone
 		if (options.type) {
 			console.log('改价')
+			this.goodList = info.goodsList
+			uni.setNavigationBarTitle({
+				title: '改价'
+			})
 		}
+
 		uni.$on('addConsumable', this.addConsumable)
 	},
 	methods: {