lilei пре 3 година
родитељ
комит
3fdaf2547a
6 измењених фајлова са 23 додато и 67 уклоњено
  1. 1 1
      api/car.js
  2. 1 1
      api/request.js
  3. 0 9
      pages.json
  4. 1 1
      pages/scan-frame/scan-frame.vue
  5. 20 12
      pages/vinInput/confirmVin.vue
  6. 0 43
      pages/vinInput/vinInput.vue

+ 1 - 1
api/car.js

@@ -1,4 +1,4 @@
-import axios from '@/libs/axios.js'
+import request from './request';
 
 
 //  request()  第二个参数若为true则表示不传token
 //  request()  第二个参数若为true则表示不传token
 
 

+ 1 - 1
api/request.js

@@ -18,7 +18,7 @@ function request(options) {
 			'USER-TERM-TYPE': 'ipad', // 支付时需要用到 与pad一致
 			'USER-TERM-TYPE': 'ipad', // 支付时需要用到 与pad一致
 			'App-Type': 2,
 			'App-Type': 2,
 			'Version': '',
 			'Version': '',
-			'authorization':'Bearer clz|eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyX25hbWUiOiIxNTA5MTMzMDAwMCIsImF1dGhfdXNlciI6eyJ1c2VyU24iOiIxMDc1OSIsInVzZXJpZCI6IjEwNzU5IiwidXNlcm5hbWUiOiIxNTA5MTMzMDAwMCIsInVzZXJUeXBlIjoiMiIsIm1lcmNoYW50SWQiOiIxMDA0MCIsIm1lcmNoYW50U24iOiIxMDA0MCIsIm9yZ0lkIjoiMTAwMDAiLCJvcmdTbiI6IjEwMDAwIiwib3JnTmFtZSI6Iui9pumihuS4u-aAu-mDqOmXqOW6lyIsIm9yZ1N0YXR1cyI6IjEiLCJvcmdFeHBpcmVEYXRlIjoiMjA5OS0wMS0wMSIsIm9yZ1RoZW1lVHlwZSI6ImNoZWxpbmd6aHUiLCJyb290T3JnSWQiOiIxMDAwMCIsInJvb3RPcmdTbiI6IjEwMDAwIiwicm9vdE9yZ05hbWUiOiLovabpoobkuLsiLCJyb290T3JnRXhwaXJlRGF0ZSI6IjIwOTktMDEtMDEiLCJyb290T3JnVGhlbWVUeXBlIjoiY2hlbGluZ3podSIsInJvb3RPcmdTdGF0dXMiOiIxIiwib3JnVHlwZSI6ImxzIiwic2NvcGVUeXBlIjoiYWxsIiwicm9vdE1lbnVNb3VsZElkIjoiMiIsIm9yZ01lbnVNb3VsZElkIjoiMiIsInN1cGVyQWRtaW4iOiIwIiwidXNlck5hbWVDTiI6IuW8oOS4ieS6miIsIm1vYmlsZSI6IjE1MDkxMzMwMDAwIiwiZW1haWwiOm51bGwsInNleCI6IjEiLCJwYXNzd29yZCI6ImZmMDNjYWI5MjBmMmFjN2I4NzUyNWNmMzhhMjIyMTlmZTAyNjlmMjRkZjhiMWVhNWQ1OGFiNTk5Iiwic2FsdCI6bnVsbCwiYXV0aG9yaXRpZXMiOm51bGwsInBlcm1Db2RlcyI6bnVsbCwiYWNsTWFwIjpudWxsLCJhY2NvdW50Tm9uRXhwaXJlZCI6dHJ1ZSwiYWNjb3VudE5vbkxvY2tlZCI6dHJ1ZSwiY3JlZGVudGlhbHNOb25FeHBpcmVkIjp0cnVlLCJlbmFibGVkIjp0cnVlLCJhcHBOYW1lIjpudWxsLCJleHRlbmRJbmZvIjpudWxsLCJleHRJbmZvIjp7fSwic291cmNlRmxhZyI6bnVsbCwiY2xpZW50VHlwZSI6bnVsbCwibXVzdENoYW5nZVB3ZCI6bnVsbCwiZXhwZWN0VHJ1c3QiOmZhbHNlfSwic2NvcGUiOlsiYWxsIl0sImV4cCI6MTY1MzcxODA2NiwianRpIjoiNTBlMzE5ZTktZTg1MC00NGU2LWE1OTItODkyNzk4OTA3MjZjIiwiY2xpZW50X2lkIjoiY2xpZW50X3Bhc3N3b3JkIiwic3RhdHVzIjoiMjAwIn0.zeyKjVatzDT9fnw_c6x0CzQWORbxEcNg486qy5rsYvk'
+			'authorization':'Bearer clz|eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyX25hbWUiOiIxNTA5MTMzMDAwMCIsImF1dGhfdXNlciI6eyJ1c2VyU24iOiIxMDc1OSIsInVzZXJpZCI6IjEwNzU5IiwidXNlcm5hbWUiOiIxNTA5MTMzMDAwMCIsInVzZXJUeXBlIjoiMiIsIm1lcmNoYW50SWQiOiIxMDA0MCIsIm1lcmNoYW50U24iOiIxMDA0MCIsIm9yZ0lkIjoiMTAwMDAiLCJvcmdTbiI6IjEwMDAwIiwib3JnTmFtZSI6Iui9pumihuS4u-aAu-mDqOmXqOW6lyIsIm9yZ1N0YXR1cyI6IjEiLCJvcmdFeHBpcmVEYXRlIjoiMjA5OS0wMS0wMSIsIm9yZ1RoZW1lVHlwZSI6ImNoZWxpbmd6aHUiLCJyb290T3JnSWQiOiIxMDAwMCIsInJvb3RPcmdTbiI6IjEwMDAwIiwicm9vdE9yZ05hbWUiOiLovabpoobkuLsiLCJyb290T3JnRXhwaXJlRGF0ZSI6IjIwOTktMDEtMDEiLCJyb290T3JnVGhlbWVUeXBlIjoiY2hlbGluZ3podSIsInJvb3RPcmdTdGF0dXMiOiIxIiwib3JnVHlwZSI6ImxzIiwic2NvcGVUeXBlIjoiYWxsIiwicm9vdE1lbnVNb3VsZElkIjoiMiIsIm9yZ01lbnVNb3VsZElkIjoiMiIsInN1cGVyQWRtaW4iOiIwIiwidXNlck5hbWVDTiI6IuW8oOS4ieS6miIsIm1vYmlsZSI6IjE1MDkxMzMwMDAwIiwiZW1haWwiOm51bGwsInNleCI6IjEiLCJwYXNzd29yZCI6ImZmMDNjYWI5MjBmMmFjN2I4NzUyNWNmMzhhMjIyMTlmZTAyNjlmMjRkZjhiMWVhNWQ1OGFiNTk5Iiwic2FsdCI6bnVsbCwiYXV0aG9yaXRpZXMiOm51bGwsInBlcm1Db2RlcyI6bnVsbCwiYWNsTWFwIjpudWxsLCJhY2NvdW50Tm9uRXhwaXJlZCI6dHJ1ZSwiYWNjb3VudE5vbkxvY2tlZCI6dHJ1ZSwiY3JlZGVudGlhbHNOb25FeHBpcmVkIjp0cnVlLCJlbmFibGVkIjp0cnVlLCJhcHBOYW1lIjpudWxsLCJleHRlbmRJbmZvIjpudWxsLCJleHRJbmZvIjp7fSwic291cmNlRmxhZyI6bnVsbCwiY2xpZW50VHlwZSI6bnVsbCwibXVzdENoYW5nZVB3ZCI6bnVsbCwiZXhwZWN0VHJ1c3QiOmZhbHNlfSwic2NvcGUiOlsiYWxsIl0sImV4cCI6MTY1NDA2MjgyNSwianRpIjoiMjUyNDVjNGMtZjhlNy00MTk3LTkyNGYtOTRlNjdmNjcyNTkxIiwiY2xpZW50X2lkIjoiY2xpZW50X3Bhc3N3b3JkIiwic3RhdHVzIjoiMjAwIn0.Jdv8-owZWdbKLoFFSaIZBGfvNNiSV9iYx_9gmNVjd1Q'
 	}
 	}
 	_obj.header = header
 	_obj.header = header
 	_obj.header['X-HEADER-APPID'] = 'WuyoKG1AcDZzLwxfhOAC+E16SeG3+mDqVYmsa/e5HRE=';
 	_obj.header['X-HEADER-APPID'] = 'WuyoKG1AcDZzLwxfhOAC+E16SeG3+mDqVYmsa/e5HRE=';

+ 0 - 9
pages.json

@@ -58,15 +58,6 @@
 				"navigationBarTitleText": "扫描VIN"
 				"navigationBarTitleText": "扫描VIN"
 			}
 			}
 		}
 		}
-	    ,{
-            "path" : "pages/vinInput/vinInput",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "手动输入VIN",
-                "enablePullDownRefresh": false
-            }
-            
-        }
         ,{
         ,{
             "path" : "pages/vinInput/confirmVin",
             "path" : "pages/vinInput/confirmVin",
             "style" :                                                                                    
             "style" :                                                                                    

+ 1 - 1
pages/scan-frame/scan-frame.vue

@@ -41,7 +41,7 @@ export default {
 	// 手动输入
 	// 手动输入
 	inputs(){
 	inputs(){
 		uni.redirectTo({
 		uni.redirectTo({
-			url:"/pages/vinInput/vinInput"
+			url: "/pages/vinInput/confirmVin?verifyCode="
 		})
 		})
 	},
 	},
     // 相册
     // 相册

+ 20 - 12
pages/vinInput/confirmVin.vue

@@ -1,9 +1,12 @@
 <template>
 <template>
 	<view style="width: 100%;">
 	<view style="width: 100%;">
-		<view class="confirm-text">
+		<view class="confirm-text" v-if="vinImg">
 			<view>请核对VIN识别是否正确?</view>
 			<view>请核对VIN识别是否正确?</view>
 			<view>如果有误,请修改</view>
 			<view>如果有误,请修改</view>
 		</view>
 		</view>
+		<view class="confirm-text" v-else>
+			<view>请正确输入17位VIN码</view>
+		</view>
 		<view class="vin-img" v-if="vinImg">
 		<view class="vin-img" v-if="vinImg">
 			<u-image :src="vinImg" width="100%" height="165"></u-image>
 			<u-image :src="vinImg" width="100%" height="165"></u-image>
 		</view>
 		</view>
@@ -12,14 +15,14 @@
 			<u-input v-model="verifyCode" :custom-style="{fontSize:'40rpx'}" type="text" height="90" :maxlength='17' input-align="center" placeholder="请输入VIN" :border="true" />
 			<u-input v-model="verifyCode" :custom-style="{fontSize:'40rpx'}" type="text" height="90" :maxlength='17' input-align="center" placeholder="请输入VIN" :border="true" />
 		</view>
 		</view>
 		<view class="confirm-button">
 		<view class="confirm-button">
-			<u-button @click="ok" :custom-style="{background:'#1283d4'}" type="primary" shape="circle">确认</u-button>
+			<u-button @click="submitForm" :custom-style="{background:'#1283d4'}" type="primary" shape="circle">确认</u-button>
 		</view>
 		</view>
 		<view class="share-list flex align_center">
 		<view class="share-list flex align_center">
 			<view @click="toScan">
 			<view @click="toScan">
 				<view><u-icon name="scan" size="60" color="##d5d5d5"></u-icon></view>
 				<view><u-icon name="scan" size="60" color="##d5d5d5"></u-icon></view>
 				<view>重新扫描</view>
 				<view>重新扫描</view>
 			</view>
 			</view>
-			<view>
+			<view v-if="verifyCode.length>=17">
 				<view>
 				<view>
 					<button open-type="share"><u-icon name="chat" size="60" color="##d5d5d5"></u-icon></button>
 					<button open-type="share"><u-icon name="chat" size="60" color="##d5d5d5"></u-icon></button>
 				</view>
 				</view>
@@ -43,12 +46,11 @@
 			}
 			}
 		},
 		},
 		onLoad(opts) {
 		onLoad(opts) {
-			this.verifyCode = opts.verifyCode
+			this.verifyCode = opts.verifyCode || ''
 			this.vinImg = opts.filePath || ''
 			this.vinImg = opts.filePath || ''
 		},
 		},
 		// 分享
 		// 分享
 		onShareAppMessage(e){
 		onShareAppMessage(e){
-			console.log(e)
 			return {
 			return {
 			  title: '修配一码通车架号(VIN)分享',
 			  title: '修配一码通车架号(VIN)分享',
 			  path: '/pages/vinIput/share?userId=123&vin='+this.verifyCode,
 			  path: '/pages/vinIput/share?userId=123&vin='+this.verifyCode,
@@ -71,14 +73,20 @@
 			},
 			},
 			// 复制
 			// 复制
 			toCopy(){
 			toCopy(){
-				uni.setClipboardData({
-					data: this.verifyCode,
-				})
-			},
-			confirm(code){
-				console.log(code)
-				this.verifyCode = code
+				if(this.verifyCode.length>=17){
+					uni.setClipboardData({
+						data: this.verifyCode,
+					})
+				}else{
+					uni.showToast({
+						icon: 'none',
+						title: '请输入正确的VIN码'
+					})
+				}
 			},
 			},
+			// confirm(code){
+			// 	this.verifyCode = code
+			// },
 			// 提交并匹配车型
 			// 提交并匹配车型
 			submitForm(){
 			submitForm(){
 				const _this = this
 				const _this = this

+ 0 - 43
pages/vinInput/vinInput.vue

@@ -1,43 +0,0 @@
-<template>
-	<view style="width: 100%;">
-		<view style="padding: 30rpx 60rpx;margin-top: 10vh;">
-			<u-input v-model="verifyCode" type="text" :custom-style="{fontSize:'40rpx'}" height="90" :maxlength='17' input-align="center" placeholder="请输入VIN" :border="true" focus />
-		</view>
-		<view class="confirm-button">
-			<u-button @click="ok" type="primary" :custom-style="{background:'#1283d4'}" shape="circle">确认输入</u-button>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		components: {},
-		data() {
-			return {
-				verifyCode: ''
-			}
-		},
-		onLoad() {
-		},
-		methods: {
-			ok(){
-				if(this.verifyCode==''||this.verifyCode.length<17){
-					uni.showToast({
-						title: "请输入VIN码",
-						icon:"none"
-					})
-				}else{
-					uni.redirectTo({
-						url: "/pages/vinInput/confirmVin?verifyCode="+this.verifyCode
-					})
-				}
-			},
-		}
-	}
-</script>
-
-<style lang="less">
-.confirm-button{
-	padding: 50rpx;
-}
-</style>