From 658245fa44094ad44cf42b4d4df8104e7acb36d5 Mon Sep 17 00:00:00 2001
From: song <srf428110@163.com>
Date: Fri, 10 Dec 2021 18:53:31 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=AE=8C=E5=96=84=E6=89=AB=E6=8F=8F?=
 =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                               |  1 +
 rest/燕园.http                             |  2 +-
 src/App.vue                                | 43 ++++++++++++++
 src/components/Upload/Upload.vue           | 67 +++++++++++++++-------
 src/mixins/tool.js                         |  4 +-
 src/pagesYanyuan/input-code/input-code.vue |  4 ++
 src/pagesYanyuan/scan-code/scan-code.vue   | 60 +++++++++----------
 src/store/yanyuan/mutations.js             | 29 +++++++++-
 src/store/yanyuan/state.js                 |  3 +
 9 files changed, 157 insertions(+), 56 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 63efd66..0f2f181 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -95,6 +95,7 @@
  - | 项目列表, 项目url | [32e005b](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/32e005b)
  - | 项目列表排序 | [224c58b](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/224c58b)
  - | 项目合并整理,设置页面添加 | [725491a](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/725491a)
+ - | 首页用户身份判断 | [ac81030](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/ac81030)
  - | 首页项目样式改变 | [8514c85](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/8514c85)
 
 
diff --git a/rest/燕园.http b/rest/燕园.http
index 1fe8f01..033538b 100644
--- a/rest/燕园.http
+++ b/rest/燕园.http
@@ -121,7 +121,7 @@ Authorization: Bearer {{login.response.body.$.data.token}}
 
 {
     "param":{
-        "id":"6"
+        "id":"3"
     }
 }
 ###体验账号升级
diff --git a/src/App.vue b/src/App.vue
index 7a1abb6..0b5c8f2 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -8,6 +8,15 @@ export default {
   async onLaunch(options) {
     // TODO: this 先判断是不是通过扫二维码进来的
     console.log('options: ', options);
+    if (options.scene === 1047) {
+      // 扫描小程序码
+      if (options.query && options.query.scene) {
+        const scene = options.query.scene;
+        const toolCode = scene.substring(scene.length - 10);
+        this.setEnterByCode(true);
+        this.setToolCode(toolCode);
+      }
+    }
 
     this.getSystemInfo(); // 获取系统设备信息
 
@@ -35,13 +44,16 @@ export default {
   computed: {
     ...mapGetters(['useStorage']),
     ...mapState('user', ['token']),
+    ...mapState('yanyuan', ['enterByCode', 'toolCode']),
   },
 
   methods: {
     ...mapActions('user', ['getToken']),
     ...mapActions('socket', ['initSocket']),
+    ...mapActions('yanyuan', ['getBindTool']),
     ...mapMutations(['setSystemInfo']),
     ...mapMutations('user', ['setToken', 'setUser']),
+    ...mapMutations('yanyuan', ['setIdentityInfo', 'setToolCode', 'setEnterByCode']),
 
     // 登录
     async signin() {
@@ -51,6 +63,11 @@ export default {
           this.setUser(data);
           this.setToken(data.token);
           this.noPhone(data);
+          // 首页用户身份判断
+          await this.homeIdentity();
+          if (this.enterByCode && this.toolCode) {
+            await this.bindTool();
+          }
         } else {
           this.$t.ui.showToast('返回数据异常');
         }
@@ -81,6 +98,32 @@ export default {
         },
       });
     },
+
+    /**
+     * 首页用户身份判断
+     */
+    async homeIdentity() {
+      try {
+        const data = await this.$u.api.homeIdentity();
+        this.setIdentityInfo(data);
+      } catch (error) {
+        console.log('error: ', error);
+      }
+    },
+
+    /**
+     * 绑定工具箱
+     */
+    async bindTool() {
+      console.log('绑定工具箱');
+      try {
+        const params = { toolCode: this.toolCode };
+        await this.getBindTool(params);
+        this.initTool();
+      } catch (error) {
+        console.error('error: ', error);
+      }
+    },
   },
 };
 </script>
diff --git a/src/components/Upload/Upload.vue b/src/components/Upload/Upload.vue
index 2a29a92..621a317 100644
--- a/src/components/Upload/Upload.vue
+++ b/src/components/Upload/Upload.vue
@@ -14,12 +14,7 @@
           : 'icons3'
       "
     >
-      <u-icon
-        class="icons"
-        size="88"
-        name="https://www.tall.wiki/staticrec/yanyuan/icon1.png"
-        @click="openPage('/pagesYanyuan/scan-code/scan-code')"
-      ></u-icon>
+      <u-icon class="icons" size="88" name="https://www.tall.wiki/staticrec/yanyuan/icon1.png" @click="scancode"></u-icon>
       <u-icon
         v-if="identityInfo.isMax === 0"
         class="icons"
@@ -45,20 +40,24 @@
 </template>
 
 <script>
-import { mapGetters } from 'vuex';
+import { mapState, mapGetters, mapActions } from 'vuex';
+import toolMixin from '@/mixins/tool';
 
 export default {
+  mixins: [toolMixin],
+
   data() {
-    return { showMenu: false, identityInfo: null };
+    return { showMenu: false };
   },
 
-  computed: mapGetters('user', ['userId']),
-
-  async mounted() {
-    await this.homeIdentity();
+  computed: {
+    ...mapState('yanyuan', ['identityInfo']),
+    ...mapGetters('user', ['userId']),
   },
 
   methods: {
+    ...mapActions('yanyuan', ['getBindTool']),
+
     // 导入wbs
     async handleUpload() {
       try {
@@ -76,7 +75,7 @@ export default {
           });
         }, 2000);
       } catch (error) {
-        console.log('error: ', error);
+        console.error('error: ', error);
         this.$emit('error', error);
       }
     },
@@ -92,24 +91,48 @@ export default {
     },
 
     // 扫码
-    scanCode() {
+    scancode() {
+      this.showMenu = false;
+      const that = this;
+      // 校验扫描结果，并处理
       uni.scanCode({
-        success: function (res) {
-          console.log('条码类型：' + res.scanType);
-          console.log('条码内容：' + res.result);
+        onlyFromCamera: true,
+        success(res) {
+          that.$t.ui.showToast('扫码成功');
+          const arr = res.path.split('=');
+          const toolCode = arr && arr.length ? arr[arr.length - 1] : '';
+          that.submit(toolCode);
+        },
+        fail() {
+          that.failMsg('扫码失败');
+        },
+      });
+    },
+
+    // 失败提示
+    failMsg(title) {
+      uni.showModal({
+        title,
+        content: '是否跳转到输入工具码界面？',
+        showCancel: true,
+        success: async ({ confirm }) => {
+          if (confirm) {
+            this.$t.page.openPage('/pagesYanyuan/input-code/input-code');
+          }
         },
       });
     },
 
     /**
-     * 首页用户身份判断
+     * 绑定工具箱
      */
-    async homeIdentity() {
+    async submit(toolCode) {
       try {
-        const data = await this.$u.api.homeIdentity();
-        this.identityInfo = data;
+        const params = { toolCode };
+        await this.getBindTool(params);
+        this.initTool();
       } catch (error) {
-        console.log('error: ', error);
+        console.error('error: ', error);
       }
     },
   },
diff --git a/src/mixins/tool.js b/src/mixins/tool.js
index 099b662..6a4b9ed 100644
--- a/src/mixins/tool.js
+++ b/src/mixins/tool.js
@@ -31,8 +31,8 @@ export default {
       // 工具箱是否被绑定
       if (!toolInfo || !toolInfo.bindUserId || toolInfo.isBind !== 1) {
         console.log('工具箱没有被绑定');
-        this.$t.page.openPage('/pagesYanyuan/scan-code/scan-code');
-        // this.$t.page.openPage('/pagesYanyuan/input-code/input-code');
+        // this.$t.page.openPage('/pagesYanyuan/scan-code/scan-code');
+        this.$t.page.openPage('/pagesYanyuan/input-code/input-code');
         return;
       }
 
diff --git a/src/pagesYanyuan/input-code/input-code.vue b/src/pagesYanyuan/input-code/input-code.vue
index c971df5..4a062a6 100644
--- a/src/pagesYanyuan/input-code/input-code.vue
+++ b/src/pagesYanyuan/input-code/input-code.vue
@@ -62,6 +62,10 @@ export default {
     },
 
     async submit() {
+      if (!this.toolCode) {
+        this.$t.ui.showToast('请输入工具码!');
+        return;
+      }
       try {
         const params = { toolCode: this.toolCode };
         await this.getBindTool(params);
diff --git a/src/pagesYanyuan/scan-code/scan-code.vue b/src/pagesYanyuan/scan-code/scan-code.vue
index 60933af..79dc13c 100644
--- a/src/pagesYanyuan/scan-code/scan-code.vue
+++ b/src/pagesYanyuan/scan-code/scan-code.vue
@@ -1,12 +1,21 @@
 <template>
   <view>
     <!--scan.wxml-->
-    <view class="scan-view">
-      <camera class="scan-camera" mode="scanCode" binderror="cameraError" bindscancode="scancode" frame-size="large" :flash="flash">
+    <!-- <view class="scan-view">
+      <camera
+        class="scan-camera"
+        mode="scanCode"
+        binderror="cameraError"
+        bindscancode="scancode"
+        frame-size="large"
+        :flash="flash"
+        @initdone="initdone"
+        @scancode="scancode"
+      >
         <cover-view class="scan-animation" :animation="animation"></cover-view>
       </camera>
       <view class="text-white">扫二维码/条形码</view>
-    </view>
+    </view> -->
     <!-- 这里可以处理其他内容 -->
     <view class="w-full flex justify-around btns">
       <view class="flex flex-col text-center" @click="$t.page.openPage('/pagesYanyuan/input-code/input-code')">
@@ -61,6 +70,7 @@
 </template>
 
 <script>
+import { mapActions } from 'vuex';
 import toolMixin from '@/mixins/tool';
 // 移动动画
 let animation = wx.createAnimation({});
@@ -69,39 +79,29 @@ export default {
   mixins: [toolMixin],
 
   data() {
-    return { animation, open: false, flash: 'auto' };
+    return { animation, open: false, flash: 'auto', src: '' };
   },
-  onLoad() {},
   onShow() {
-    this.donghua();
+    // this.scancode();
+  },
+  onLoad(options) {
+    console.log('options: ', options);
+    if (options.toolCode) {
+      this.submit(options.toolCode);
+    }
   },
   methods: {
-    donghua() {
-      var that = this;
-      console.log('that: ', that);
-      // 控制向上还是向下移动
-      let m = true;
-
-      setInterval(
-        function () {
-          if (m) {
-            animation.translateY(250).step({ duration: 3000 });
-            m = !m;
-          } else {
-            animation.translateY(-10).step({ duration: 3000 });
-            m = !m;
-          }
-          // that.setData({ animation: animation.export() });
-        }.bind(this),
-        3000,
-      );
-    },
-    scancode(e) {
-      // 校验扫描结果，并处理
-      let res = e.detail.result;
-      console.log('res: ', res);
+    ...mapActions('yanyuan', ['getBindTool']),
+
+    error(e) {
+      console.log(e.detail);
     },
 
+    // initdone(e) {
+    //   console.log('相机初始化完成时触发e: ', e);
+    //   this.scancode();
+    // },
+
     // 打开手电筒
     openElectric() {
       this.open = !this.open;
diff --git a/src/store/yanyuan/mutations.js b/src/store/yanyuan/mutations.js
index 6bb66ab..75cafe7 100644
--- a/src/store/yanyuan/mutations.js
+++ b/src/store/yanyuan/mutations.js
@@ -119,11 +119,38 @@ const mutations = {
   /**
    * 设置zarit是否测评
    * @param {object} state
-   * @param {array} show
+   * @param {Boolean} show
    */
   setIsTest(state, show) {
     state.isTest = show;
   },
+
+  /**
+   * 设置首页用户身份
+   * @param {object} state
+   * @param {object} data
+   */
+  setIdentityInfo(state, data) {
+    state.identityInfo = data;
+  },
+
+  /**
+   * 设置是不是通过扫码进入
+   * @param {object} state
+   * @param {Boolean} show
+   */
+  setEnterByCode(state, show) {
+    state.enterByCode = show;
+  },
+
+  /**
+   * 设置二维码携带的工具箱code
+   * @param {object} state
+   * @param {object} data
+   */
+  setToolCode(state, data) {
+    state.toolCode = data;
+  },
 };
 
 export default mutations;
diff --git a/src/store/yanyuan/state.js b/src/store/yanyuan/state.js
index 49b9f25..c0c1131 100644
--- a/src/store/yanyuan/state.js
+++ b/src/store/yanyuan/state.js
@@ -14,6 +14,9 @@ const state = {
   code: 'NLCP',
   reportId: '', // 测评ID 脑力测评ID或zaritID
   isTest: false, // zarit是否测评
+  identityInfo: null, // 首页用户身份
+  enterByCode: false, // 是不是通过扫码进入
+  toolCode: '', // 二维码携带的工具箱code
 };
 
 export default state;