Explorar o código

产线App修改

chen %!s(int64=2) %!d(string=hai) anos
pai
achega
a5a7743481
Modificáronse 1 ficheiros con 26 adicións e 16 borrados
  1. 26 16
      pages/index/index1.vue

+ 26 - 16
pages/index/index1.vue

@@ -57,24 +57,18 @@
 		
 		<!-- 提示信息弹窗 -->
 		<uni-popup ref="message" type="message">
-			<uni-popup-message :type="msgType" fontSizt="76rpx" :message="messageText" :duration="3000"></uni-popup-message>
+			<uni-popup-message :type="msgType" fontSizt="80rpx" :message="messageText" :duration="3000"></uni-popup-message>
 		</uni-popup>
 		
 		<!-- 普通弹窗 -->
 		<uni-popup ref="popup" type="center"  background-color="#fff" :mask-click="false" >
-			<view class="popup-content popup-height" >
-				<view style="margin: 100rpx 400rpx 200rpx; 400rpx;">
-					<view style="margin: 200rpx 0;font-size:76rpx;">产品000020009528-010010142308AI检测为NG,请确认</view>
-					<view style="margin-bottom: 200rpx;">
-						<uni-row :gutter="100">
-							<uni-col :span="12">
-								<button class="mini-btn" type="default" style="font-size: 60rpx;" @click="productOkOrNg(0)" :loading="btnLoad" :disabled="btnLoad">AI误判</button>
-							</uni-col>
-							<uni-col :span="12">
-								<button class="mini-btn" type="primary" style="font-size: 60rpx;" @click="productOkOrNg(1)" :loading="btnLoad" :disabled="btnLoad">发起维修</button>
-							</uni-col>
-						</uni-row>
-					</view>
+			<view class="popup-row">
+				<view class="content"  v-html="contentText" ><p></p></view>
+				<view class="button-row">
+					<button class="mini-btn" type="default" style="font-size: 60rpx;" @click="productOkOrNg(0)" :loading="btnLoad" :disabled="btnLoad">AI误判</button>
+				</view>
+				<view class="button-row">
+					<button class="mini-btn" type="primary" style="font-size: 60rpx;" @click="productOkOrNg(1)" :loading="btnLoad" :disabled="btnLoad">发起维修</button>
 				</view>
 			</view>
 		</uni-popup>
@@ -154,8 +148,8 @@
 						that.messageText = data.message
 						that.$refs.message.open()
 						if(data.isNg==1){
-							that.contentText = "产品"+data.qrCode+"AI检测为NG,请确认"
-							that.$refs.popup.open('center')
+							that.contentText = "产品\n"+data.qrCode+"\nAI检测为NG,请确认"
+							that.$refs.popup.open('right')
 						}else{
 							that.$refs.popup.close()
 						}
@@ -206,6 +200,8 @@
 			},
 			clickRow(item,index){
 				this.imgUrl = item.productAiImage?item.productAiImage:item.productImage
+				// this.contentText = "产品\n"+item.qrCode+"\nAI检测为NG,请确认"
+				// this.$refs.popup.open('right')
 			},
 			productOkOrNg(isNg){
 				this.btnLoad = true;
@@ -264,4 +260,18 @@
 		font-size: 50rpx;
 		font-weight: bold;
 	}
+	.popup-row{
+		width: 33.3vw;
+		margin: 40%  0; 
+		.content{
+			margin: 200rpx 0;
+			font-size:76rpx;
+			line-height: 86rpx;
+			white-space:pre-wrap;
+			text-align: center;
+		}
+		.button-row{
+			margin: 100rpx;
+		}
+	}
 </style>