@dongkboy 3 долоо хоног өмнө
parent
commit
c32576d819

+ 10 - 10
components/uni-OCRUploadPopup/uni-OCRUploadPopup.vue

@@ -324,9 +324,9 @@
 				});
 				let size = chooseImageRes.tempFiles[0].size / 1024 / 1024 < 5;
 				if (!size) {
-					this.$refs.uToast.show({
+					uni.showToast({
 						title: '上传图片大小不能超过 5MB!',
-						type: 'error',
+						icon: 'none',
 					})
 					return false
 				}
@@ -423,9 +423,9 @@
 				});
 				let size = chooseImageRes.tempFiles[0].size / 1024 / 1024 < 5;
 				if (!size) {
-					this.$refs.uToast.show({
+					uni.showToast({
 						title: '上传图片大小不能超过 5MB!',
-						type: 'error',
+						icon: 'none',
 					})
 					return false
 				}
@@ -498,9 +498,9 @@
 
 				let size = chooseImageRes.tempFiles[0].size / 1024 / 1024 < 5;
 				if (!size) {
-					this.$refs.uToast.show({
+					uni.showToast({
 						title: '上传图片大小不能超过 5MB!',
-						type: 'error',
+						icon: 'none',
 					})
 					return false
 				}
@@ -608,9 +608,9 @@
 				});
 				let size = chooseImageRes.tempFiles[0].size / 1024 / 1024 < 5;
 				if (!size) {
-					this.$refs.uToast.show({
+					uni.showToast({
 						title: '上传图片大小不能超过 5MB!',
-						type: 'error',
+						icon: 'none',
 					})
 					return false
 				}
@@ -752,9 +752,9 @@
 
 				let size = chooseImageRes.tempFiles[0].size / 1024 / 1024 < 5;
 				if (!size) {
-					this.$refs.uToast.show({
+					uni.showToast({
 						title: '上传图片大小不能超过 5MB!',
-						type: 'error',
+						icon: 'none',
 					})
 					return false
 				}

+ 16 - 10
pages/orders/orders1.vue

@@ -118,11 +118,12 @@
 					</view>
 					<view class="cardAll-btn dis a-c j-end ">
 						<view v-for="(cardAllitem,cardAllindex) in cardAllbtns(item.orderStatus)" :key="cardAllindex"
-							@click="cardAllbtnChange(cardAllitem.value,item.mainDetails[cardAllitem.value],'ITEM')">
+							@click="cardAllbtnChange(cardAllitem.value,item.mainDetails[cardAllitem.value],'ITEM',item)">
 							<text>{{cardAllitem.label}}</text>
-							<u-badge v-if="item.mainDetails[cardAllitem.value]" numberType="overflow" :max="99"
-								:value="item.mainDetails[cardAllitem.value].length" :absolute="true" bgColor="#FF4545"
-								:offset="[-5,-16]" style="font-size: 18rpx;"></u-badge>
+							<u-badge v-if="item.mainDetails  && item.mainDetails[cardAllitem.value]  "
+								numberType="overflow" :max="99" :value="item.mainDetails[cardAllitem.value].length"
+								:absolute="true" bgColor="#FF4545" :offset="[-5,-16]"
+								style="font-size: 18rpx;"></u-badge>
 						</view>
 						<view @click="cardAllbtnChangeAll(item.mainDetails,'ALL')">查看全部</view>
 					</view>
@@ -221,8 +222,8 @@
 			headerTitle="选择出单机构" overflow="auto" maxHeight="1280rpx" class="subOrderStatusModalClass">
 			<template #header>
 				<view class="dis a-c j-c">
-					<text class="plateNo">京AG6862</text>
-					<view class="tag">交商</view>
+					<text class="plateNo">{{itemInfo.licenseNo}}</text>
+					<view class="tag">{{itemInfo.productName}}</view>
 				</view>
 			</template>
 			<template #content>
@@ -463,6 +464,7 @@
 
 				],
 				scrollTop: 0,
+				itemInfo: {}, //操作中数据信息
 			}
 		},
 		async onShow() {
@@ -795,8 +797,8 @@
 			 * @param {Object} value  当前按钮对应的订单状态
 			 * @param {Object} list   该状态下的所有报价记录
 			 */
-			cardAllbtnChange(value, list, identifier) {
-				console.log(value, list, identifier);
+			cardAllbtnChange(value, list, identifier, item) {
+				this.itemInfo = item;
 				this.cardAllbtnsIndex = value;
 				this.bigOrderIndicator = identifier;
 				this.subOrderStatusModalList.map(val => {
@@ -1273,9 +1275,13 @@
 				.right-company {
 					width: 100%;
 					height: 100%;
-					padding: 30rpx 20rpx;
+					padding: 30rpx 20rpx 0;
 					box-sizing: border-box;
-					gap: 30rpx 0;
+
+					// gap: 30rpx 0;
+					.item {
+						margin-bottom: 30rpx;
+					}
 
 					.logo {
 						width: 36rpx;