核验车辆

src/pages/login/index.vue

@@ -231,7 +231,8 @@ export default {
               console.log(this.$store.state.mixid,'mixid------230')
               //冬奥会测试赛（mixid=CL）定制一键登录直接返回不用手机号
               let isCertified = false;
-              if(this.$store.state.mixid == 'CL') {
+              // this.mpApp.globalData.shopInfo.outCode正式环境提审测试赛项目 这个值后台改为1 审核通过改为空
+              if(this.$store.state.mixid == 'CL' && this.mpApp.globalData.shopInfo.outCode == '') {
                 isCertified = res.data.data.isCertified == 'true'
                 if(isCertified && res.data.data.sessionId) {
                   //有账号

src/pages/wo/verification/index.vue

@@ -18,36 +18,66 @@
         <div class="checkBtn flex" @click="toCheck">核验</div>
       </div>
     </div>
-    <div class="userInfo" v-if="showInfo">
-      <div class="img">
-        <image
-          mode="aspectFill"
-          :src="userInfo.handImage"
-          alt=""
-        ></image>
-      </div>
-      <div class="cell flex">
-        <div class="label">姓名</div>
-        <div class="val">{{userInfo.customerName}}</div>
-      </div>
-      <div class="cell flex">
-        <div class="label">单位</div>
-        <div class="val">{{userInfo.company}}</div>
-      </div>
-      <div class="cell flex">
-        <div class="label">身份</div>
-        <div class="val">{{userInfo.identity}}</div>
-      </div>
-      <div class="cell flex">
-        <div class="label">工作地点</div>
-        <div class="val">{{userInfo.workArea}}</div>
+    <div v-show="showInfo">
+      <div class="userInfo" v-if="isUser">
+        <div class="img">
+          <image mode="aspectFill" :src="userInfo.handImage" alt=""></image>
+        </div>
+        <div class="cell flex">
+          <div class="label">姓名</div>
+          <div class="val">{{ userInfo.customerName }}</div>
+        </div>
+        <div class="cell flex">
+          <div class="label">单位</div>
+          <div class="val">{{ userInfo.company }}</div>
+        </div>
+        <div class="cell flex">
+          <div class="label">身份</div>
+          <div class="val">{{ userInfo.identity }}</div>
+        </div>
+        <div class="cell flex">
+          <div class="label">工作地点</div>
+          <div class="val">{{ userInfo.workArea }}</div>
+        </div>
+        <div class="cell flex">
+          <div class="label">就餐地点</div>
+          <div class="val">{{ userInfo.diningPlace }}</div>
+        </div>
       </div>
-      <div class="cell flex">
-        <div class="label">就餐地点</div>
-        <div class="val">{{userInfo.diningPlace}}</div>
+      <div class="userInfo" v-else>
+        <div class="cell flex">
+          <div class="label">工作单位</div>
+          <div class="val">{{ carInfo.companyName }}</div>
+        </div>
+        <div class="cell flex">
+          <div class="label">车牌号</div>
+          <div class="val">{{ carInfo.numberPlate }}</div>
+        </div>
+        <div class="cell flex">
+          <div class="label">车辆颜色</div>
+          <div class="val">{{ carInfo.vehicleColor }}</div>
+        </div>
+        <div class="cell flex">
+          <div class="label">车辆类型</div>
+          <div class="val">{{ carInfo.vehicleType }}</div>
+        </div>
+        <div class="cell flex">
+          <div class="label">驾驶员姓名</div>
+          <div class="val">{{ carInfo.driverName }}</div>
+        </div>
+        <div class="cell flex">
+          <div class="label">工作区域</div>
+          <div class="val">{{ carInfo.workArea }}</div>
+        </div>
+        <div class="cell flex">
+          <div class="label">车辆用途</div>
+          <div class="val">{{ carInfo.vehicleUse }}</div>
+        </div>
       </div>
     </div>
-    <div v-if="loaded && !showInfo" class="noInfo">暂无人员信息</div>
+    <div v-if="loaded && !showInfo" class="noInfo">
+      暂无{{ isUser ? "人员" : "车辆" }}信息
+    </div>
     <template v-if="showInfo">
       <div class="seat"></div>
       <div class="btm flex">
@@ -58,8 +88,8 @@
 </template>
 
 <script type="text/ecmascript-6">
-import index from "@/api/index"
-import { DFSImg } from '@/utils/common.js'
+import index from "@/api/index";
+import { DFSImg } from "@/utils/common.js";
 export default {
   name: "verification",
   data() {
@@ -67,7 +97,9 @@ export default {
       checkText: "",
       showInfo: false,
       loaded: false,
+      isUser: true, //是人员 false：车辆
       userInfo: {},
+      carInfo: {},
     };
   },
   components: {},
@@ -118,15 +150,22 @@ export default {
       wx.showLoading({
         title: "加载中...",
       });
+      this.isUser = true;
       this.showInfo = false;
       this.loaded = false;
       index.getInfoByUniqueCode(this.checkText).then((res) => {
         wx.hideLoading();
         this.loaded = true;
         if (res.data.ok == "true" && res.data.data) {
-          this.userInfo = res.data.data.uniqueScanUserInfoDTO;
-          this.userInfo.handImage = DFSImg(this.userInfo.handImage);
           this.showInfo = true;
+          // carOrUser 0人 1车
+          if(res.data.data.carOrUser-0 == 0) {
+            this.userInfo = res.data.data.uniqueScanUserInfoDTO;
+            this.userInfo.handImage = DFSImg(this.userInfo.handImage);
+          } else {
+            this.carInfo = res.data.data.vehicleInfoResponseDTO;
+            this.isUser = false;
+          }
         }
       });
     },
@@ -207,7 +246,7 @@ export default {
       }
     }
   }
-  .noInfo{
+  .noInfo {
     text-align: center;
     font-size: 14px;
     color: #666;