解决canvas问题

components/nav-bar/nav-bar2.vue

@@ -72,20 +72,19 @@
 			uni.redirectTo({
 				url: `/subpackage/orders/choice-product?type=${type}`
 			})
-		} else if (title == "ETC开户新办申请-个人" || title == "ETC开户新办申请-单位" || title == "行驶证信息上传" || title == "微信车主服务" || title == "加购权益产品" || title == "产品详情") {
-			uni.showToast({
-				title: '当前ETC正在办理中，终端后续可在订单管理继续办理。',
-				icon: 'none',
-				duration: 2000
-			})
-			setTimeout(function () {
-				uni.switchTab({
-					url: "/pages/order/order"
-				})
-			}, 2000)
-
-
-
+		} else if (title == "ETC开户新办申请-个人" || title == "ETC开户新办申请-单位" || title == "行驶证信息上传" || title == "微信车主服务" || title == "加购权益产品" || title == "产品详情" || title == "支付账户签约") {
+			uni.showModal({
+				content: '当前ETC正在办理中，终端后续可在订单管理继续办理。',
+				success: function (res) {
+					if (res.confirm) {
+						uni.switchTab({
+							url: "/pages/order/order"
+						})
+					} else if (res.cancel) {
+						console.log('用户点击取消');
+					}
+				}
+			});
 		} else {
 			uni.navigateBack({
 				delta: 1

composables/order/useOrderSkip.ts

@@ -8,7 +8,7 @@ export default function useOrderSkip() {
 
 	//根据订单类型 跳转到不同的订单详情页面
 	const gotoOrderDetails = (orderInfo) => {
-		console.log('输出内容=====', orderInfo.orderType)
+		console.log('输出内容=====', orderInfo)
 		if (orderInfo.orderType === 'ISSUE') {
 			navTo(`/subpackage/orders/order-details-new?id=${orderInfo.id}&appraise=${orderInfo.appraise}`);
 
@@ -37,7 +37,7 @@ export default function useOrderSkip() {
 	}
 
 	//跳转到修改地址页面
-	const gotoEditAddress = (orderInfo: any) => {
+	const gotoEditAddress = (orderInfo : any) => {
 		const item = {
 			id: orderInfo.orderInfoExt.id ? orderInfo.orderInfoExt.id : '',
 			consignee: orderInfo.orderInfoExt.consignee ? orderInfo.orderInfoExt.consignee : '',
@@ -51,7 +51,7 @@ export default function useOrderSkip() {
 	}
 
 	//取消订单
-	const gotoCancelOrder = (orderInfo: any) => {
+	const gotoCancelOrder = (orderInfo : any) => {
 		const item = {
 			id: orderInfo.id,
 			orderId: orderInfo.orderId,
@@ -62,7 +62,7 @@ export default function useOrderSkip() {
 	}
 
 	//继续申请、修改资料
-	const gotoEditUserOrUnitInfo = (orderInfo: any) => {
+	const gotoEditUserOrUnitInfo = (orderInfo : any) => {
 		console.log("******************", orderInfo.orderStep);
 		console.log("********555555555555**********", orderInfo);
 		let url = '';
@@ -85,7 +85,7 @@ export default function useOrderSkip() {
 	}
 
 	//确认收货
-	const gotoConfirmReceipt = (orderInfo: any) => {
+	const gotoConfirmReceipt = (orderInfo : any) => {
 		const item = {
 			id: orderInfo.id,
 			orderId: orderInfo.orderId,
@@ -98,7 +98,7 @@ export default function useOrderSkip() {
 	}
 
 	//去支付-选择产品
-	const gotoPay = (orderInfo: any) => {
+	const gotoPay = (orderInfo : any) => {
 		const data = {
 			orderId: orderInfo.orderId,
 			amount: orderInfo.amount,
@@ -110,7 +110,7 @@ export default function useOrderSkip() {
 	}
 
 	//申请退货
-	const gotoReturnOrder = (orderInfo: any) => {
+	const gotoReturnOrder = (orderInfo : any) => {
 		const data = {
 			id: orderInfo.id,
 			orderId: orderInfo.orderId,
@@ -121,54 +121,54 @@ export default function useOrderSkip() {
 	}
 
 	//去换货
-	const gotoExchangeOrder = (orderInfo: any) => {
+	const gotoExchangeOrder = (orderInfo : any) => {
 		navTo(`/subpackage/orders/apply-ex-goods-step1?orderId=${orderInfo.orderId}&id=${orderInfo.id}`);
 	}
 
 	//去激活订单
-	const gotoActiveOrder = (orderInfo: any) => {
+	const gotoActiveOrder = (orderInfo : any) => {
 		navTo(`/subpackage/after-sale/activation/operation-tips?id=${orderInfo.id}&orderId=${orderInfo.orderId}&cardStatus=${orderInfo.cardStatus}&obuStatus=${orderInfo.obuStatus}`);
 	}
 
 	//新办订单-去评价
-	const gotoEvaluateOrder = (orderInfo: any) => {
+	const gotoEvaluateOrder = (orderInfo : any) => {
 		navTo(`/subpackage/orders/order-evaluate?id=${orderInfo.id}`);
 	}
 
 	//新办订单-去评价 发行产品，权益产品
-	const gotoEvaluateProduct = (orderInfo: any) => {
+	const gotoEvaluateProduct = (orderInfo : any) => {
 		navTo(`/subpackage/orders/order-evaluate-product?id=${orderInfo.id}&orderId=${orderInfo.orderId}`);
 	}
 
 	//新办订单-去评价  业务办理满意度，业务员满意度
-	const gotoEvaluateSalesman = (orderInfo: any) => {
+	const gotoEvaluateSalesman = (orderInfo : any) => {
 		navTo(`/subpackage/orders/order-evaluate-salesman?id=${orderInfo.id}&orderId=${orderInfo.orderId}`);
 	}
 
 	//查看物流
-	const gotoCheckLogistics = (orderInfo: any) => {
+	const gotoCheckLogistics = (orderInfo : any) => {
 		navTo(`/subpackage/orders/order-detail-logistics?id=${orderInfo.id}`);
 	}
 
 
 	//换卡、换签、同时换卡换签订单支付确认页面
-	const gotoCardSignPay = (orderInfo: any) => {
+	const gotoCardSignPay = (orderInfo : any) => {
 		navTo(`/subpackage/orders/order-card-sign-payment?id=${orderInfo.id}`);
 	}
 
 	//重新申请ETC注销
-	const gotoLogoffETC = (orderInfo: any) => {
+	const gotoLogoffETC = (orderInfo : any) => {
 		navTo(`/subpackage/after-sale/ETC-log-off/log-off-confirm?orderId=${orderInfo.orderId}`);
 	}
 
 	//车辆信息变更-信息重写
-	const gotoEditCarWriteInfo = (orderInfo: any) => {
+	const gotoEditCarWriteInfo = (orderInfo : any) => {
 		// navTo(`/pages/bluetooth/bluetooth?id=${orderInfo.id}&orderId=${orderInfo.orderId}`);
 		navTo(`/pages/bluetooth/bluetooth?routeType=3`);
 	}
 
 	//车辆信息变更-重新申请
-	const gotoEditCarApplyAgain = (orderInfo: any) => {
+	const gotoEditCarApplyAgain = (orderInfo : any) => {
 		//跳转到车辆信息变更界面
 		navTo(`/subpackage/personal-center/setting/car-information/car-change`);
 	}

pages/order/components/order-list-item-new.vue

@@ -96,16 +96,20 @@
 
 			<!-- 已完成 -->
 			<view class="btns" v-else-if="item.orderStep == OrderStatus.已完成">
-				<view v-if="!item.appraise" class='evaluation'>
-					<!-- <view class="btn btn-primary" @click.stop="gotoEvaluateOrder(item)" >去评价最初的</view> -->
-					<view class="btn btn-primary" v-if="item.isProduct!=1 && item.isEquity!=1"
+
+				<view class="btn btn-normal"
+					v-if="(item.promotionModes==1 && item.isProduct==1 && item.isEquity==1 && item.isService==1) || (item.promotionModes==2 && item.isProduct==1 && item.isEquity==1 && item.isService==1 &&item.isStaff==1)">
+					已评价
+				</view>
+				<view class='evaluation' v-else>
+					<!-- <view class="btn btn-primary" @click.stop="gotoEvaluateOrder(item)">去评价最初的</view> -->
+					<view class="btn btn-primary" v-if="item.isProduct==0 && item.isEquity==0"
 						@click.stop="gotoEvaluateProduct(item)">去评价产品</view>
 					<!-- promotionModes字段判断的,1-线上模式 ，2-线下模式 ,线上模式就是自主办理不展示业务员评价 -->
 					<view class="btn btn-primary"
-						v-if="(item.promotionModes==2) && (item.isStaff!=1 && item.isService!=1)"
+						v-if="(item.promotionModes==1 && item.isService==0) || (item.promotionModes==2&&item.isStaff==0 && item.isService==0)"
 						@click.stop="gotoEvaluateSalesman(item)">去评价业务员</view>
 				</view>
-				<view class="btn btn-normal" v-else>已评价</view>
 			</view>
 
 			<!-- 已结束 -->

subpackage/after-sale/ETC-log-off/etc-log-off.vue

@@ -16,7 +16,8 @@
 						<radio-group @change="radioChange" class="radios">
 							<block v-for="(item, index) in radiolist" :key="item.val">
 								<view class="radio-box">
-									<radio :value="item.val" :checked="form.equipmentState == item.val" color="#13e7c1" style="transform:scale(0.75)" />
+									<radio :value="item.val" :checked="form.equipmentState == item.val" color="#13e7c1"
+										style="transform:scale(0.75)" />
 									<view>{{item.name}}</view>
 								</view>
 							</block>
@@ -143,6 +144,7 @@
 		form.type = option.type
 		params.cardId = option.cardId
 		params.obuId = option.obuId
+		params.orderId = option.orderId
 	});
 
 	const getCode = () => {
@@ -220,14 +222,16 @@
 	}
 </style>
 <style lang="scss" scoped>
-	.radios{
+	.radios {
 		display: flex;
 	}
-	.radio-box{
+
+	.radio-box {
 		display: flex;
 		align-items: center;
 		padding-left: 40rpx;
 	}
+
 	.hint2 {
 		display: flex;
 
@@ -319,7 +323,8 @@
 				::v-deep .input {
 					text-align: left;
 					flex: 1;
-                    background: transparent;
+					background: transparent;
+
 					input {
 						text-align: left;
 					}

subpackage/after-sale/ETC-log-off/log-off-confirm.vue

@@ -126,7 +126,8 @@
 
 	/*视图进入后操作*/
 	onLoad((option) => {
-		queryOrderDetail(option.id).then((val: any) => {
+		console.log("option", option)
+		queryOrderDetail(option.id).then((val : any) => {
 			state.data = val
 		})
 
@@ -332,4 +333,4 @@
 			line-height: 80rpx;
 		}
 	}
-</style>
+</style>

subpackage/after-sale/ETC-log-off/upload-card.vue

@@ -90,6 +90,7 @@
 		form.cardId = option.cardId;
 		form.orderId = option.orderId
 		form.equipmentState = option.equipmentState
+		console.log("option.orderId", option)
 		/*监听蓝牙回调*/
 		uni.$on('bluetoothLink', function (status) {
 			queryCardSignCancellation(1, 1, 1).then((item : any) => {
@@ -238,6 +239,7 @@
 				method: "POST",
 				showLoading: true,
 			});
+
 			const data = stringToJson(res.bizContent);
 			resolve(data);
 		}).catch((error) => {

subpackage/service/statistics/index.vue

@@ -27,8 +27,9 @@
 			<view class="change_type">
 				<uni-data-select v-model="selectTypeValue" :localdata="typeRange" @change="changeType"
 					:clear="false"></uni-data-select>
-				<view class='time' @click="hideCanvas">
-					<uni-datetime-picker type="date" :clear-icon="false" v-model="dateTime" @change="change" />
+				<view class='time'>
+					<uni-datetime-picker type="date" :clear-icon="false" v-model="dateTime" @change="change"
+						@show="showTan" @close="closeTan" />
 				</view>
 			</view>
 			<view v-if="pieData !={} || chartData !={} || lineData !={} ">
@@ -37,7 +38,7 @@
 						<view class="choice_item1"><uni-data-select v-model="selectPieValue" :localdata="pieRange"
 								@change="changePie" :clear="false"></uni-data-select></view>
 					</view>
-					<view class="charts-box">
+					<view class="charts-box" v-if="hideCanvas">
 						<qiun type="pie" :opts="opts" :chartData="pieData" />
 					</view>
 				</view>
@@ -46,7 +47,7 @@
 						<view class="choice_item1"><uni-data-select v-model="selectLineValue" :localdata="lineRange"
 								@change="changeLine" :clear="false"></uni-data-select></view>
 					</view>
-					<view class="charts-box">
+					<view class="charts-box" v-if="hideCanvas">
 						<qiun type="line" :opts="optsLine" :chartData="lineData" :ontouch="true" />
 					</view>
 				</view>
@@ -55,7 +56,7 @@
 						<view class="choice_item"><uni-data-select v-model="selectColValue" :localdata="colRange"
 								@change="changeCol" :clear="false"></uni-data-select></view>
 					</view>
-					<view class="charts-box">
+					<view class="charts-box" v-if="hideCanvas">
 						<qiun type="column" :opts="optsCol" :chartData="chartData" :ontouch="true" />
 					</view>
 				</view>
@@ -91,6 +92,7 @@
 	export default {
 		data() {
 			return {
+				hideCanvas: false,
 				canvasShow: false,
 				dateTime: Date.now(), //日期
 				noDealDateTime: '', //没有处理过的时间，传给后端
@@ -208,7 +210,14 @@
 
 		},
 		methods: {
-
+			showTan() {
+				console.log("展示")
+				this.hideCanvas = false;
+			},
+			closeTan() {
+				console.log("隐藏")
+				this.hideCanvas = true;
+			},
 			getPieData(data) {
 				//模拟从服务器获取数据时的延时
 				setTimeout(() => {

uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue

@@ -469,6 +469,7 @@
 				this.windowWidth = windowWidth
 			},
 			show() {
+				this.$emit('show')
 				if (this.disabled) {
 					return
 				}
@@ -507,6 +508,7 @@
 				}, 50)
 			},
 			close() {
+				this.$emit('close')
 				setTimeout(() => {
 					this.pickerVisible = false
 					this.$emit('maskClick', this.value)
@@ -631,6 +633,7 @@
 				this.endMultipleStatus = Object.assign({}, this.endMultipleStatus, obj)
 			},
 			mobileChange(e) {
+				this.$emit('close')
 				if (this.isRange) {
 					const {
 						before,