用户id获取

folacin-app/src/axios/api.js

@@ -36,3 +36,6 @@ export const getUserInfoLast = residentId => {
 export const getChildAreaByParentCode = areaCode => {
     return apiInstance.get(`/v1/folacin-resident-app/resident/area-child/${areaCode}`);
 };
+export const getUserByToken = token => {
+    return apiInstance.get(`/v1/folacin-resident-app/resident/get-user-id/${token}`);
+};

folacin-app/src/router/index.js

@@ -13,7 +13,7 @@ const routes = [
 	{path: '/receiveDetail',name: 'receiveDetail',component: () => import('../views/receiveDetail/receiveDetail.vue')},
 	{path: '/canvas',name: 'canvas',component: () => import('../views/canvas/canvas.vue')},
 	{path: '/questionAnswer',name: 'canvas',component: () => import('../views/questionAnswer/questionAnswer.vue')},
-
+	{path: '/debugInfo',name: 'canvas',component: () => import('../views/index/debugInfo.vue')},
 	{path: '/test1',name: 'test1',component: () => import('../views/test/test1.vue')},
 ]
 

folacin-app/src/views/index/debugInfo.vue

+<template>
+  <div>
+    <van-nav-bar fixed>
+      <template #title>
+        <div>
+          调试信息
+        </div>
+      </template>
+    </van-nav-bar>
+    <br> <br>
+    <van-divider />
+    <van-list
+        v-model:loading="loading"
+        :finished="finished"
+        finished-text=""
+
+    >
+      <van-cell :title="'Token: '+userInfo.token"/>
+      <van-cell :title="'账号: '+userInfo.account"/>
+      <van-cell :title="'用户ID: '+userInfo.userId"/>
+      <van-cell :title="'接入地址: '+userInfo.domain"/>
+    </van-list>
+    <br>
+    <van-button style="margin-left: 10%;width: 80%" round type="primary" color="#1989fa" @click="copyUserInfo()">
+      复制
+    </van-button>
+    <br>    <br>
+    <van-button style="margin-left: 10%;width: 80%" round type="danger" color="#EC808D" @click="handleBack()">
+      关闭
+    </van-button>
+  </div>
+</template>
+
+<script>
+export default {
+  components: {},
+  data() {
+    return {
+      loading: true,
+      finished: true,
+      userInfo: JSON.parse(sessionStorage.getItem("userInfo"))||{},
+    }
+  },
+  methods: {
+    copyUserInfo(){
+      let textarea = document.createElement('textarea');
+      textarea.style.position = 'fixed';
+      textarea.style.opacity = 0;
+      textarea.value = JSON.stringify(this.userInfo);
+      document.body.appendChild(textarea);
+      textarea.select();
+      document.execCommand('copy');
+      document.body.removeChild(textarea);
+      this.$toast.tips('已复制到剪贴板！');
+    },
+    handleBack(){
+      this.$router.go(-1);
+    }
+  }
+}
+</script>
+<style scoped lang="less">
+
+</style>
\ No newline at end of file

folacin-app/src/views/index/index.vue

 <template>
   <div>
+    <van-nav-bar fixed>
+      <template #title>
+        <div @click="debugInfo">
+          提示
+        </div>
+      </template>
+    </van-nav-bar>
+    <br> <br>
+    <van-divider />
     <div v-if="msg">
-      <br><br><br><br><br>
+      <br><br><br><br>
       <van-empty image="error" :description="msg"/>
       <van-button style="margin-left: 10%;width: 80%" round type="danger" color="#EC808D" @click="handleBack()">
         关闭
@@ -12,6 +21,7 @@
 <script>
 import {callMobile, isIOSWebKit} from '@/utils/common';
 import {Dialog} from 'vant';
+import {getUserByToken} from "@/axios/api";
 
 export default {
   components: {},
@@ -29,8 +39,7 @@ export default {
       if (path != '/') {
         return;
       }
-      vm.initUserInfo(result);
-      vm.showMsg();
+      vm.getUserByToken(result);
     };
   },
   mounted() {
@@ -40,39 +49,60 @@ export default {
     window.scrollTo(0, this.scrollPosition);
   },
   methods: {
-    init(){
-      if (process.env.NODE_ENV == "dev") {
+    init() {
+      if (process.env.NODE_ENV == "dev1") {
         let userInfo = {
           account: '18487125843',
-          token: '7de354fd8be1484cacbc41e96fe88d7e',
-          userId: '11133351501171512',
+          token: 'd2e2c11475a04436bbcf1ca96a7ee056',
+          userId: null,
+          domain: window.location.href,
         };
-        window.sessionStorage.setItem('userInfo', JSON.stringify(userInfo));
-        this.showMsg();
+        this.initUserInfo(userInfo);
+        this.getUserByToken(userInfo);
       } else {
         let query = this.$route.query;
         let userInfo = {
           account: query.account,
           token: query.token,
-          userId: query.userId,
+          userId: null,
+          domain: window.location.href,
         };
-        if (!userInfo.userId && !userInfo.account) {
+        this.initUserInfo(userInfo);
+        if (!userInfo.token && !userInfo.account) {
           this.msg = "用户信息获取失败！"
           callMobile('init', {});
         } else {
-          if (!userInfo.userId || !userInfo.account) {
-            this.msg = "用户信息获取失败！"
+          if (!userInfo.token) {
+            this.msg = "Token获取失败！"
             return;
           }
-          window.sessionStorage.setItem('userInfo', JSON.stringify(userInfo));
-          this.showMsg();
+          if (!userInfo.account) {
+            this.msg = "账号获取失败！"
+            return;
+          }
+          this.getUserByToken(userInfo)
         }
       }
     },
+    getUserByToken(userInfo) {
+      getUserByToken(userInfo.token).then(res => {
+        if (res.code == 'SUCCESS') {
+          userInfo.userId = res.data
+          this.initUserInfo(userInfo)
+          this.showMsg();
+        } else {
+          this.msg = "用户id获取失败！"
+        }
+      })
+    },
     handleBack() {
       callMobile('goIndex', {});
     },
     initUserInfo(val) {
+      if (process.env.NODE_ENV == "dev") {
+        window.sessionStorage.setItem('userInfo', JSON.stringify(val));
+        return;
+      }
       let ios = isIOSWebKit();
       if (ios) {
         window.sessionStorage.setItem('userInfo', val);
@@ -89,7 +119,10 @@ export default {
 
       });
       this.$router.push('provideUnit');
-    }
+    },
+    debugInfo(){
+      this.$router.push('debugInfo');
+    },
   },
   beforeRouteLeave(to, from, next) {
     this.scrollPosition = document.documentElement.scrollTop || document.body.scrollTop;

folacin-app/src/views/provideUnit/provideUnit.vue

 <template>
   <div class="provideUnit">
-      <!-- 头部 -->
-      <van-nav-bar fixed title="选择叶酸发放单位">
-        <template #left>
-          <img src="../../assets/images/back.png" alt="" @click="handleBack"/>
-        </template>
-        <template #right>
-          <div @click="handleRecord">申请记录</div>
-        </template>
-      </van-nav-bar>
-      <!-- 搜索框 -->
-      <van-search @blur="handleInput" style="width: 88%;display: inline-block" @clear="handleCancel"
-                  v-model="seachInfo.unitName" placeholder="请输入搜索关键词"/>
-      <van-icon size="33" style="float: right;margin-right: 8px;" name="scan" @click="openQrCode"/>
-      <!-- 申请部分 -->
-      <template v-if="unitList.length != 0">
-        <div class="flex_block" v-for="item in unitList" :key="item.id" @click="handleClick(item)">
-          <div class="flex_block_title">
-            <span class="top">{{ item.unitName }}</span>
-            <span class="bottom">地址：{{
-                (item.areaFullName ? item.areaFullName : "") + (item.unitAddress ? item.unitAddress : "")
-              }}</span>
-          </div>
-          <div class="flex_block_btn">申请</div>
+    <!-- 头部 -->
+    <van-nav-bar fixed>
+      <template #title>
+        <div  @click="debugInfo">
+          选择叶酸发放单位
         </div>
       </template>
-      <van-empty v-else description="暂无发放单位"/>
+      <template #left>
+        <img src="../../assets/images/back.png" alt="" @click="handleBack"/>
+      </template>
+      <template #right>
+        <div @click="handleRecord">申请记录</div>
+      </template>
+    </van-nav-bar>
+    <!-- 搜索框 -->
+    <van-search @blur="handleInput" style="width: 88%;display: inline-block" @clear="handleCancel"
+                v-model="searchInfo.unitName" placeholder="请输入搜索关键词"/>
+    <van-icon size="33" style="float: right;margin-right: 8px;" name="scan" @click="openQrCode"/>
+    <!-- 申请部分 -->
+    <template v-if="unitList.length != 0">
+      <div class="flex_block" v-for="item in unitList" :key="item.id" @click="handleClick(item)">
+        <div class="flex_block_title">
+          <span class="top">{{ item.unitName }}</span>
+          <span class="bottom">地址：{{
+              (item.areaFullName ? item.areaFullName : "") + (item.unitAddress ? item.unitAddress : "")
+            }}</span>
+        </div>
+        <div class="flex_block_btn">申请</div>
+      </div>
+    </template>
+    <van-empty v-else description="暂无发放单位"/>
   </div>
 </template>
 <script>
@@ -36,8 +41,8 @@ export default {
   components: {},
   data() {
     return {
-      seachInfo: {
-        unitName: '云南省',
+      searchInfo: {
+        unitName: null,
       },
       unitList: [],
       scrollPosition: 0,
@@ -67,7 +72,7 @@ export default {
     },
     getProvideUnitList() {
       this.$toast.open();
-      let unitName = this.seachInfo.unitName;
+      let unitName = this.searchInfo.unitName || '云南省';
       if (isEmpty(unitName)) {
         unitName = undefined;
       }
@@ -83,6 +88,9 @@ export default {
         this.$toast.close();
       });
     },
+    debugInfo(){
+      this.$router.push('debugInfo');
+    },
     // 申请
     handleClick(val) {
       let areaFullName = val.areaFullName ? val.areaFullName : "";