VConsole去除

public/index.html

@@ -31,14 +31,14 @@
         }
     </script>
     <script type="text/javascript" src="https://webapi.amap.com/maps?v=2.0&key=2560bbf04daef66c810c5e6a97e8c508&plugin=AMap.AutoComplete,AMap.PlaceSearch,AMap.Geolocation,AMap.Geocoder,AMap.Marker,AMap.Driving"></script>
-    <script src="https://unpkg.com/vconsole@latest/dist/vconsole.min.js"></script>
+<!--    <script src="https://unpkg.com/vconsole@latest/dist/vconsole.min.js"></script>-->
     <script>
         window.selfLink = window.location.href;
         window.selfSearch = window.location.search;
     </script>
     <script>
         // VConsole 默认会挂载到 `window.VConsole` 上
-        let vConsole = new window.VConsole();
+        // let vConsole = new window.VConsole();
         (function (doc, win) {
             // console.log("==window.location.pathname===",window.location.pathname)
             let docEl = doc.documentElement

src/api/order.js

@@ -159,3 +159,12 @@ export function getConfigByCode(data){
     data
   })
 }
+
+//获取最新版本
+export function getNewVersion(key){
+  return request({
+    url: '/driverApp/app/updateVersion',
+    method:'GET',
+    params: key
+  })
+}

src/router/index.js

@@ -324,6 +324,14 @@ const routes = [
             title:'电瓶详情'
         }
     },
+    {
+        path: '/goToApp',
+        name: 'goToApp',
+        component:()=>import('@/views/goToApp/goToApp.vue'),
+        meta: {
+            title:'电瓶详情'
+        }
+    },
     ...kpiRouter,
     ...invoiceRouter,
     ...secondHandRouter,

src/utils/http.js

@@ -48,6 +48,7 @@ service.interceptors.request.use(
 
 service.interceptors.response.use(
     response => {
+        console.log('response', response.data)
       const res = response.data
       if ( res.code === 401 || res.code === 400  || res.code == 500) {
           Toast(res.msg || 'Error')

src/views/goToApp/goToApp.vue

@@ -0,0 +1,73 @@
+<template>
+  <div class="wrap">
+    <div class="content">
+      <div class="goToBtn" @click="goAppHandler">立即打开</div>
+      <div class="content_tip">
+        <div class="font_cls">如未安装请点击下载</div>
+        <div class="font_cls">如已安装未自动跳转，请 <span @click="downLoadHandler">立即下载</span></div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getNewVersion } from "@/api/order"
+export default {
+  name: "goToApp",
+  methods: {
+    goAppHandler() {
+      window.location.href = "rvdriver://page/pagesLogin/phoneLogin?source=h5Link";
+    },
+    async downLoadHandler() {
+      getNewVersion({
+        appType: 5
+      }).then((res) => {
+        window.location.href = res?.result?.path
+      }).catch(() => {
+        this.$message.error('请求版本失败，请重试');
+      });
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.wrap {
+  width: 100%;
+  height: 100vh;
+  background-image: url('@/assets/toAppBg.png');
+  background-repeat: no-repeat;
+  background-size: 100% 100%;
+}
+.content  {
+  width: 100%;
+  position: fixed;
+  top: 74vh;
+}
+.goToBtn {
+  width: 70%;
+  height: 45px;
+  margin-left: 15%;
+  background: linear-gradient( 270deg, #2347C0 0%, #72A3FF 100%);
+  border-radius: 23px;
+  //font-weight: bold;
+  font-size: 17px;
+  color: #FFFFFF;
+  letter-spacing: 2px;
+  line-height: 45px;
+  text-align: center;
+}
+.content_tip {
+  width: 100%;
+  margin-top: 15px;
+  .font_cls {
+    font-size: 14px;
+    color: #808080;
+    line-height: 20px;
+    text-align: center;
+    span {
+      color: #007BE9;
+    }
+  }
+}
+</style>

src/views/kpi/kpiIndex.vue

@@ -1626,13 +1626,13 @@ export default {
     getTitle(type) {
       switch (type) {
         case 0:
-          return '接单时效';
-        case 1:
           return '客户评价';
-        case 2:
+        case 1:
           return 'APP使用';
-        case 3:
+        case 2:
           return '时效';
+       /* case 3:
+          return '时效';*/
       }
     },
   }

src/views/mine/personList.vue

@@ -70,7 +70,7 @@
       <div v-show="type==1" class="revise common" @click="reviseHandle">立即修改</div>
       <div v-show="type==1" class="confirm common" @click="confirmHandle">确认信息无误</div>
     </div>
-    <van-dialog v-model="dialogShow" title="请先添加企微，成功添加后将更新微信号。" show-cancel-button
+    <van-dialog v-model="dialogShow" title="请将此二维码发送至相应人员进行添加，成功添加后将更新微信号。" show-cancel-button
                 confirmButtonText="确认已添加" confirmButtonColor="#354E93" className="customDialog"
                 @confirm="wechatConfirm" @cancel="cancelHandle">
       <img v-if="wechatInfo?.qrCode" :src="wechatInfo.qrCode"  style="width: 83%"/>
@@ -97,6 +97,7 @@ export default {
       supplierId:'',
       wechatInfo:'',
       personInfoId:'',
+      personInfo:'',
       isMaster:false,
     }
   },
@@ -150,7 +151,7 @@ export default {
         this.type=1
       }
       this.isMaster=result.data.isMaster
-      // this.type=1
+      // this.type=2
       let res=await getConfirmPerson({supplierId:this.supplierId})
       if(res.data && res.data.length>0){
         this.personList=res.data
@@ -159,10 +160,33 @@ export default {
       }
     },
     async wechatConfirm(){//确认已添加微信按钮
-      let res=await confirmAddWechat({supplierId:this.supplierId,supplierPersonInfoId:this.personInfoId})
+      Dialog.confirm({
-      this.personList[this.reviseIndex].wechatId=res.data?.externalUserId
+        message:'请确认相关人员是否已添加该二维码。',
-      this.personList[this.reviseIndex].wechatName=res.data?.name
+        confirmButtonText:'确认',
-      await this.cancelHandle()
+        cancelButtonText:'取消',
+        confirmButtonColor:'#354E93',
+      }).then(async() => {
+        let res=await confirmAddWechat({supplierId:this.supplierId,supplierPersonInfoId:this.personInfoId})
+        console.log('res',this.personInfo,res.data?.name,this.personInfo.wechatName)
+        if((res.data?.name == this.personInfo.wechatName) || (!res.data && this.personInfo.wechatName)){
+          console.log('11111111')
+          this.$set(this.personList[this.reviseIndex],'isChange',false)
+        }else {
+          console.log('2222222')
+          this.$set(this.personList[this.reviseIndex],'isChange',true)
+        }
+        console.log('this.personList',this.personList)
+        let flagRevise=this.personList.some(item => 'isChange' in item && !item.isChange)
+        console.log('存在未修改',flagRevise)
+        if(res.data){
+          this.personList[this.reviseIndex].wechatId=res.data?.externalUserId
+          this.personList[this.reviseIndex].wechatName=res.data?.name
+        }
+        await this.cancelHandle()
+      }).catch(async () => {
+        await this.cancelHandle()
+
+      });
     },
     cancelHandle(){
       this.dialogShow=false
@@ -171,10 +195,11 @@ export default {
       this.personInfoId=''
     },
     async wechatRevise(item,index){
-      // console.log('index',index)
+      console.log('item,index',item,index)
       // console.log('item',item)
       this.personInfoId=item.id
       this.reviseIndex=index
+      this.personInfo=item
       await this.getCode()
       this.dialogShow=true
     },
@@ -189,6 +214,13 @@ export default {
         this.$toast('必填项不可为空')
         return
       }
+      console.log('----',this.personList)
+      let flagRevise=this.personList.some(item => 'isChange' in item && !item.isChange)
+      console.log('存在未修改',flagRevise)
+      if(flagRevise){
+        this.$toast('您仍未修改微信号，请先修改再提交审批。')
+        return
+      }
       let phone1Flag= this.personList.every(item => this.validatePhone(item.phone1))
       let phone2Flag= this.personList.every(item => (item.phone2 && this.validatePhone(item.phone2) || !item.phone2))
       console.log('phone1Flag',phone1Flag)
@@ -212,6 +244,11 @@ export default {
       this.type=2
     },
     async confirmHandle(){//确认信息无误
+      let flag=this.personList.every(item => item.name && item.phone1 && item.wechatId && item.wechatName)
+      if(!flag){
+        this.$toast('必填项不可为空，请点击“立即修改”将信息补充完整')
+        return
+      }
       Dialog.confirm({
         message:'请务必仔细确认信息是否无误。',
         confirmButtonText:'确认无误',
@@ -241,6 +278,10 @@ export default {
  .van-dialog__content{
     text-align: center !important;
   }
+  .van-dialog__header {
+    box-sizing: border-box;
+    padding: 12px;
+  }
 }
 </style>
 <style scoped lang="scss">