lilei 3 år sedan
förälder
incheckning
a47230d3be

+ 3 - 0
pages/scan-frame/scan-frame.vue

@@ -128,6 +128,9 @@ export default {
 			});
 			console.log(base64Str,'base64Str图片')
 			// 此处为后端接口 传base64图片 进行ocr识别
+			uni.redirectTo({
+				url: "/pages/vinInput/confirmVin?verifyCode=123456ads11234567&filePath="+base64Str
+			})
 		  },
 		  fail: (err) => {
 			console.log(err)

+ 91 - 8
pages/vinInput/confirmVin.vue

@@ -4,15 +4,28 @@
 			<view>请核对VIN识别是否正确?</view>
 			<view>如果有误,请修改</view>
 		</view>
-		<view class="vin-img">
-			<u-image src="vinImg"></u-image>
+		<view class="vin-img" v-if="vinImg">
+			<u-image :src="vinImg" width="100%" height="165"></u-image>
 		</view>
 		<xt-verify-code v-model="verifyCode" inputType='text' size="17" @confirm="confirm"></xt-verify-code>
 		<view class="confirm-button">
-			<u-button @click="ok" type="primary" shape="circle">确认输入</u-button>
+			<u-button @click="ok" :custom-style="{background:'#1283d4'}" type="primary" shape="circle">确认</u-button>
 		</view>
-		<view class="share-list">
-			
+		<view class="share-list flex align_center">
+			<view @click="toScan">
+				<view><u-icon name="scan" size="60" color="##d5d5d5"></u-icon></view>
+				<view>重新扫描</view>
+			</view>
+			<view>
+				<view>
+					<button open-type="share"><u-icon name="chat" size="60" color="##d5d5d5"></u-icon></button>
+				</view>
+				<view>分享给好友</view>
+			</view>
+			<view @click="toCopy">
+				<view><u-icon name="file-text" size="60" color="##d5d5d5"></u-icon></view>
+				<view>复制VIN</view>
+			</view>
 		</view>
 	</view>
 </template>
@@ -25,7 +38,36 @@
 				vinImg: ''
 			}
 		},
+		onLoad(opts) {
+			this.verifyCode = opts.verifyCode
+			this.vinImg = opts.filePath || ''
+		},
+		onShareAppMessage(e){
+			console.log(e)
+			return {
+			  title: '修配一码通车架号(VIN)分享',
+			  path: '/pages/vinIput/share?userId=123&vin='+this.verifyCode,
+			  imageUrl:'/static/share.png',
+			  type: '1',
+			  success(res){
+				  console.log(res)
+			  },
+			  fail(err){
+				  console.log(err)
+			  }
+			}
+		},
 		methods: {
+			toScan(){
+				uni.navigateTo({
+					url: "/pages/scan-frame/scan-frame"
+				})
+			},
+			toCopy(){
+				uni.setClipboardData({
+					data: this.verifyCode,
+				})
+			},
 			confirm(code){
 				console.log(code)
 				this.verifyCode = code
@@ -37,9 +79,10 @@
 						icon:"none"
 					})
 				}else{
-					uni.navigateTo({
-						url: "/pages/vinInput/confirmVin"
-					})
+					// 到选择配件页面
+					// uni.navigateTo({
+					// 	url: "/pages/vinInput/confirmVin"
+					// })
 				}
 			}
 		}
@@ -50,4 +93,44 @@
 .confirm-button{
 	padding: 50rpx;
 }
+.confirm-text{
+	text-align: center;
+	padding: 60rpx 30rpx 0;
+	line-height: 45rpx;
+	color: #999;
+}
+.vin-img{
+	padding: 30rpx 20rpx;
+}
+.share-list{
+	padding: 30rpx;
+	justify-content: space-around;
+	> view{
+		text-align: center;
+		>view{
+			&:first-child{
+				margin: 10rpx auto;
+				border:2rpx solid #aaa;
+				border-radius: 200rpx;
+				width: 100rpx;
+				height: 100rpx;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				color: #aaa;
+				button{
+					background: none;
+					border: 0;
+					color: #aaa;
+					line-height: normal;
+					margin: 0;
+					padding: 0;
+					&:after{
+						border: 0;
+					}
+				}
+			}
+		}
+	}
+}
 </style>

+ 2 - 2
pages/vinInput/vinInput.vue

@@ -2,7 +2,7 @@
 	<view style="width: 100%;">
 		<xt-verify-code v-model="verifyCode" inputType='text' size="17" @confirm="confirm"></xt-verify-code>
 		<view class="confirm-button">
-			<u-button @click="ok" type="primary" shape="circle">确认输入</u-button>
+			<u-button @click="ok" type="primary" :custom-style="{background:'#1283d4'}" shape="circle">确认输入</u-button>
 		</view>
 	</view>
 </template>
@@ -27,7 +27,7 @@
 					})
 				}else{
 					uni.redirectTo({
-						url: "/pages/vinInput/confirmVin"
+						url: "/pages/vinInput/confirmVin?verifyCode="+this.verifyCode
 					})
 				}
 			}

BIN
static/share.png


+ 1 - 1
uni_modules/xt-verify-code/components/xt-verify-code/xt-verify-code.vue

@@ -244,7 +244,7 @@ export default {
 			position: relative;
 			display: inline-block;
 			width: 40rpx;
-			height: 50rpx;
+			height: 80rpx;
 			&-bottom {
 				border-bottom-width: 2rpx;
 				border-bottom-style: solid;