From 4206bf2aa4384118ba66c7261a6b0e3eb96d5fde Mon Sep 17 00:00:00 2001
From: wally <18603454788@163.com>
Date: Wed, 1 Sep 2021 17:30:38 +0800
Subject: [PATCH 1/4] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E5=B0=8F?=
 =?UTF-8?q?=E7=A8=8B=E5=BA=8Fid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md       | 3 ++-
 package.json       | 4 ++--
 src/config/user.js | 2 +-
 src/manifest.json  | 4 ++--
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c170a6f..450a68b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# 0.1.0 (2021-08-31)
+# 0.1.0 (2021-09-01)
 
 ### 🌟 新功能
 范围|描述|commitId
@@ -220,6 +220,7 @@
  信息配置 | 配置eslint等配置 | 7421443
  - | 修复不能build的问题 | 0b7b91e
  - | 删除多余的构建的命令 | 3f4eb2f
+ - | 添加mp-weixin的构建命令 | 3776a67
 
 
 范围|描述|commitId
diff --git a/package.json b/package.json
index aed2d09..df1af49 100644
--- a/package.json
+++ b/package.json
@@ -12,8 +12,8 @@
     "dev:h5-pro": "cross-env NODE_ENV=development UNI_PLATFORM=h5 vue-cli-service uni-serve --mode production",
     "build:h5-test": "cross-env NODE_ENV=production UNI_PLATFORM=h5 vue-cli-service uni-build --mode development",
     "build:h5": "cross-env NODE_ENV=production UNI_PLATFORM=h5 vue-cli-service uni-build --mode production",
-    "build:app-plus": "cross-env NODE_ENV=production UNI_PLATFORM=app-plus vue-cli-service uni-build",
-    "build:mp-weixin": "cross-env NODE_ENV=production UNI_PLATFORM=mp-weixin vue-cli-service uni-build",
+    "build:app-plus": "cross-env NODE_ENV=production UNI_PLATFORM=app-plus vue-cli-service uni-build --mode production",
+    "build:mp-weixin": "cross-env NODE_ENV=production UNI_PLATFORM=mp-weixin vue-cli-service uni-build --mode production",
     "cz": "npm run log && git add . && git cz",
     "dev:app-plus": "cross-env NODE_ENV=development UNI_PLATFORM=app-plus vue-cli-service uni-build --watch",
     "dev:custom": "cross-env NODE_ENV=development uniapp-cli custom",
diff --git a/src/config/user.js b/src/config/user.js
index a27a905..d6aa986 100644
--- a/src/config/user.js
+++ b/src/config/user.js
@@ -22,7 +22,7 @@ export const mp = () => {
           const params = {
             client: uni.$t.user.clients['mp'],
             type: uni.$t.user.types['mp'],
-            data: { identifier: res.code },
+            data: { identifier: res.code, credential: 'tall' },
           };
           resolve(params);
         } else {
diff --git a/src/manifest.json b/src/manifest.json
index 0b7f1bc..7464ba9 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -1,6 +1,6 @@
 {
   "name": "TALL",
-  "appid": "wx356e01c7eb01d55d",
+  "appid": "wxf72a76c2ea24a472",
   "description": "",
   "versionName": "1.0.0",
   "versionCode": "100",
@@ -57,7 +57,7 @@
     /* 快应用特有相关 */
   },
   "mp-weixin": {
-    "appid": "wx356e01c7eb01d55d",
+    "appid": "wxf72a76c2ea24a472",
     "setting": {
       "urlCheck": false
     },

From a3c54f1374eff732d90f66fa4477decaf7fdc340 Mon Sep 17 00:00:00 2001
From: wally <18603454788@163.com>
Date: Thu, 2 Sep 2021 10:17:47 +0800
Subject: [PATCH 2/4] =?UTF-8?q?feat:=20=E8=8E=B7=E5=8F=96=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E6=94=B6=E5=8F=96=E9=82=A3=EF=BC=8C=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                        |  3 ++-
 src/apis/tall.js                    |  2 ++
 src/mixins/userAuth.js              | 42 +++++++++++++++++++++++++++++
 src/pages/index/index.vue           |  6 +++--
 src/pages/phone-bind/phone-bind.vue |  5 +++-
 5 files changed, 54 insertions(+), 4 deletions(-)
 create mode 100644 src/mixins/userAuth.js

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 450a68b..78d280c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# 0.1.0 (2021-09-01)
+# 0.1.0 (2021-09-02)
 
 ### 🌟 新功能
 范围|描述|commitId
@@ -23,6 +23,7 @@
  - | 上传逻辑变化 | 3ff1dc2
  - | 任务状态时间显示 | 56f5183
  - | 任务进行中状态数字 | 27b7326
+ - | 修改小程序id | 4206bf2
  - | 全局插件及默认插件位置修改 | 6c80d08
  - | 升级版本v3.1.0；tailwindcss添加class | 9ef05e1
  - | 向右箭头图标变化 | 8e9ca55
diff --git a/src/apis/tall.js b/src/apis/tall.js
index 04cedce..37285b3 100644
--- a/src/apis/tall.js
+++ b/src/apis/tall.js
@@ -30,6 +30,8 @@ const install = (Vue, vm) => {
   vm.$u.api.getToken = userId => vm.$u.get(`${tall}/users/userId`, { userId });
   // 绑定手机号
   vm.$u.api.phoneBind = (phone, smsCode) => vm.$u.http.post(`${tall}/users/binding`, { phone, smsCode });
+  // 修改用户信息
+  vm.$u.api.updateUserInfo = params => vm.$u.http.post(`${tall}/users/userInfo`, params);
 
   // 获取项目列表
   vm.$u.api.getProjects = (startTime, endTime) => vm.$u.post(`${tall}/project/query`, { startTime, endTime });
diff --git a/src/mixins/userAuth.js b/src/mixins/userAuth.js
new file mode 100644
index 0000000..ec42012
--- /dev/null
+++ b/src/mixins/userAuth.js
@@ -0,0 +1,42 @@
+import { mapState } from 'vuex';
+import { waitTokenRequest } from '@/utils/cacheAndRequest';
+
+export default {
+  computed: mapState('user', ['token', 'user']),
+  methods: {
+    // 获取授权
+    openAuth() {
+      if (this.user && this.user.wxInfo && this.user.wxInfo.nickname) return; // 用户信息里有微信信息就不用再获取了
+      if (this.token) {
+        this.updateUserInfo();
+      } else {
+        waitTokenRequest(this.updateUserInfo);
+      }
+    },
+
+    // 弹出授权框
+    // 用户允许后 提交微信用户信息
+    updateUserInfo() {
+      /* #ifdef MP-WEIXIN */
+      uni.getUserProfile({
+        desc: 'TALL仅需要获取您的基本用户信息',
+        success: res => {
+          const { avatarUrl, city, country, gender, language, nickName, province } = res.userInfo;
+          this.$u.api.updateUserInfo({
+            city,
+            country,
+            headImgUrl: avatarUrl,
+            language,
+            nickname: nickName,
+            province,
+            sex: gender,
+          });
+        },
+        fail: error => {
+          console.log('error: ', error);
+        },
+      });
+      /* #endif */
+    },
+  },
+};
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 7b91407..dc7b800 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <view class="flex flex-col h-full bg-gray-50">
+  <view class="flex flex-col h-full bg-gray-50" @click="openAuth">
     <view class="relative" @touchmove="onMove">
       <!-- 日历 -->
       <Calendar @selected-change="onDateChange" :show-back="true" ref="calendar" @handleFindPoint="handleFindPoint" />
@@ -17,10 +17,12 @@
 
 <script>
 import { mapState, mapMutations } from 'vuex';
+import UserAuthMixin from '@/mixins/userAuth';
 
 let prevY = 0;
 
 export default {
+  mixins: [UserAuthMixin],
   data() {
     return {
       calendar: null,
@@ -28,7 +30,7 @@ export default {
     };
   },
 
-  computed: mapState('user', ['token']),
+  computed: mapState('user', ['token', 'user']),
 
   watch: {
     token(value) {
diff --git a/src/pages/phone-bind/phone-bind.vue b/src/pages/phone-bind/phone-bind.vue
index 000532b..28c9bde 100644
--- a/src/pages/phone-bind/phone-bind.vue
+++ b/src/pages/phone-bind/phone-bind.vue
@@ -1,5 +1,5 @@
 <template>
-  <view class="wrap">
+  <view class="wrap" @click="openAuth">
     <u-form :model="model" :rules="rules" ref="uForm" :errorType="errorType">
       <!-- 手机号 -->
       <u-form-item :rightIconStyle="{ color: '#888', fontSize: '32rpx' }" label="手机号码" prop="phone" label-width="160">
@@ -27,7 +27,10 @@
 </template>
 
 <script>
+import UserAuthMixin from '@/utils/userAuth';
+
 export default {
+  mixins: [UserAuthMixin],
   data() {
     return {
       model: {

From e0cf2ed7e245c67ef470750bf954f78c7b63c59a Mon Sep 17 00:00:00 2001
From: wally <18603454788@163.com>
Date: Thu, 9 Sep 2021 10:16:41 +0800
Subject: [PATCH 3/4] =?UTF-8?q?perf:=20=E6=8F=90=E4=BA=A4=E6=9C=AC?=
 =?UTF-8?q?=E5=9C=B0=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                        |  3 ++-
 src/App.vue                         | 20 ++++++++++++++++----
 src/components/Upload/Upload.vue    |  1 +
 src/mixins/userAuth.js              | 12 +++++++++---
 src/pages/index/index.vue           |  2 ++
 src/pages/phone-bind/phone-bind.vue |  2 +-
 src/store/index.js                  | 15 +++++++++++++++
 7 files changed, 46 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 78d280c..44ac6e0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# 0.1.0 (2021-09-02)
+# 0.1.0 (2021-09-09)
 
 ### 🌟 新功能
 范围|描述|commitId
@@ -55,6 +55,7 @@
  - | 细节调整，添加project-webview | 4d9050b
  - | 绑定手机号 | 52e0352
  - | 缓存修改 | 63e1f0d
+ - | 获取用户收取那，提交用户信息 | a3c54f1
  - | 角色栏实现 | 94cd671
  - | 设置小红点 | 9316bcb
  - | 距调整pc端 | 5069aa1
diff --git a/src/App.vue b/src/App.vue
index 8bcef53..ce88e44 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -5,9 +5,10 @@ export default {
   async onLaunch(options) {
     console.log('options: ', options);
     this.checkNetwork(); // 监听网络状态
+    this.getSystemInfo(); // 获取系统设备信息
+
     /* #ifdef MP-WEIXIN */
     await this.signin();
-    this.initSocket();
     /* #endif */
 
     /* #ifdef H5 */
@@ -23,9 +24,8 @@ export default {
         this.noPhone(data.phone);
       }
     }
-    // FIXME: 这里重复书写的
-    this.initSocket();
     /* #endif */
+    this.initSocket();
   },
 
   computed: {
@@ -36,7 +36,7 @@ export default {
   methods: {
     ...mapActions('user', ['getToken']),
     ...mapActions('socket', ['initSocket']),
-    ...mapMutations(['setNetworkConnected']),
+    ...mapMutations(['setNetworkConnected', 'setSystemInfo']),
     ...mapMutations('user', ['setToken', 'setUser']),
 
     // 检查网络状态 设置store里的网络状态变量
@@ -79,6 +79,18 @@ export default {
         this.$u.route('/pages/phone-bind/phone-bind');
       }
     },
+
+    // 获取系统设备信息
+    getSystemInfo() {
+      uni.getSystemInfo({
+        success: result => {
+          this.setSystemInfo(result);
+        },
+        fail: error => {
+          console.error('getSystemInfo fail:', error);
+        },
+      });
+    },
   },
 };
 </script>
diff --git a/src/components/Upload/Upload.vue b/src/components/Upload/Upload.vue
index 75f7cfd..f23e6e9 100644
--- a/src/components/Upload/Upload.vue
+++ b/src/components/Upload/Upload.vue
@@ -27,6 +27,7 @@ export default {
           });
         }, 2000);
       } catch (error) {
+        console.log('error: ', error);
         this.$emit('error', error);
       }
     },
diff --git a/src/mixins/userAuth.js b/src/mixins/userAuth.js
index ec42012..ffbe93f 100644
--- a/src/mixins/userAuth.js
+++ b/src/mixins/userAuth.js
@@ -1,9 +1,11 @@
-import { mapState } from 'vuex';
+import { mapMutations, mapState } from 'vuex';
+
 import { waitTokenRequest } from '@/utils/cacheAndRequest';
 
 export default {
   computed: mapState('user', ['token', 'user']),
   methods: {
+    ...mapMutations('user', ['setUser']),
     // 获取授权
     openAuth() {
       if (this.user && this.user.wxInfo && this.user.wxInfo.nickname) return; // 用户信息里有微信信息就不用再获取了
@@ -20,9 +22,9 @@ export default {
       /* #ifdef MP-WEIXIN */
       uni.getUserProfile({
         desc: 'TALL仅需要获取您的基本用户信息',
-        success: res => {
+        success: async res => {
           const { avatarUrl, city, country, gender, language, nickName, province } = res.userInfo;
-          this.$u.api.updateUserInfo({
+          const data = await this.$u.api.updateUserInfo({
             city,
             country,
             headImgUrl: avatarUrl,
@@ -31,6 +33,10 @@ export default {
             province,
             sex: gender,
           });
+          console.log('data: ', data);
+          const { user } = this;
+          user.wxInfo = data;
+          this.setUser(user);
         },
         fail: error => {
           console.log('error: ', error);
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index dc7b800..6facca9 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -3,8 +3,10 @@
     <view class="relative" @touchmove="onMove">
       <!-- 日历 -->
       <Calendar @selected-change="onDateChange" :show-back="true" ref="calendar" @handleFindPoint="handleFindPoint" />
+      <!-- #ifdef H5 -->
       <!-- 上传 导入wbs -->
       <Upload @success="onUploadSuccess" @error="onUploadError" />
+      <!-- #endif -->
     </view>
 
     <!-- 项目列表 -->
diff --git a/src/pages/phone-bind/phone-bind.vue b/src/pages/phone-bind/phone-bind.vue
index 28c9bde..39d1aeb 100644
--- a/src/pages/phone-bind/phone-bind.vue
+++ b/src/pages/phone-bind/phone-bind.vue
@@ -27,7 +27,7 @@
 </template>
 
 <script>
-import UserAuthMixin from '@/utils/userAuth';
+import UserAuthMixin from '@/mixins/userAuth';
 
 export default {
   mixins: [UserAuthMixin],
diff --git a/src/store/index.js b/src/store/index.js
index 37332cb..8477da7 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -9,6 +9,7 @@ import user from './user/index';
 const state = {
   networkConnected: true, // 网络是否连接
   forceUseStorage: false, // 强制启用storage
+  systemInfo: null, // 系统设备信息
 };
 
 const getters = {
@@ -17,6 +18,11 @@ const getters = {
   useStorage({ networkConnected, forceUseStorage }) {
     return forceUseStorage || !networkConnected;
   },
+
+  // 是不是微信平台
+  isWeChat({ systemInfo }) {
+    return !(!systemInfo || !systemInfo.host || systemInfo.host.env !== 'WeChat');
+  },
 };
 
 const mutations = {
@@ -28,6 +34,15 @@ const mutations = {
   setNetworkConnected(state, networkConnected) {
     state.networkConnected = networkConnected;
   },
+
+  /**
+   * 设置系统信息的数据
+   * @param {object} state
+   * @param {object | null} data 获取到的数据
+   */
+  setSystemInfo(state, data) {
+    state.systemInfo = data;
+  },
 };
 
 Vue.use(Vuex);

From 8f491295be47d7b9697369caa2279c1b5d81e45e Mon Sep 17 00:00:00 2001
From: wally <18603454788@163.com>
Date: Thu, 9 Sep 2021 11:36:23 +0800
Subject: [PATCH 4/4] =?UTF-8?q?refactor:=20=E4=BF=AE=E6=94=B9utils/upload?=
 =?UTF-8?q?=20=E5=85=BC=E5=AE=B9=E5=B0=8F=E7=A8=8B=E5=BA=8F=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E5=AE=A2=E6=88=B7=E7=AB=AF=E6=96=87=E4=BB=B6=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0WBS?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .eslintrc.js              |  2 +-
 CHANGELOG.md              |  1 +
 src/pages/index/index.vue |  2 +-
 src/utils/upload.js       | 62 +++++++++++++++++++++++++++++++++------
 4 files changed, 56 insertions(+), 11 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 067c1dd..d1d7b97 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -41,8 +41,8 @@ module.exports = {
     Vue: true,
     VueRouter: true,
     Vuex: true,
-    axios: true,
     _: true,
     uni: true,
+    wx: true,
   },
 };
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 44ac6e0..c716016 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -195,6 +195,7 @@
  - | 修改代码格式 | 14123d7
  - | 修改定期任务骨架屏高度 | 909a734
  - | 小红点api缓存修改 | e992343
+ - | 提交本地代码 | e0cf2ed
  - | 插件查询及展示 | 4dba770
  - | 整理代码 | 7a55315
  - | 日历的更改 | 7353ac8
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 6facca9..fad3cf0 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -3,9 +3,9 @@
     <view class="relative" @touchmove="onMove">
       <!-- 日历 -->
       <Calendar @selected-change="onDateChange" :show-back="true" ref="calendar" @handleFindPoint="handleFindPoint" />
-      <!-- #ifdef H5 -->
       <!-- 上传 导入wbs -->
       <Upload @success="onUploadSuccess" @error="onUploadError" />
+      <!-- #ifdef H5 -->
       <!-- #endif -->
     </view>
 
diff --git a/src/utils/upload.js b/src/utils/upload.js
index 537a82a..bd3de1d 100644
--- a/src/utils/upload.js
+++ b/src/utils/upload.js
@@ -1,3 +1,49 @@
+// H5选择文件
+const chooseFileH5 = (extension = ['.xls', '.xlsx']) => {
+  return new Promise((resolve, reject) => {
+    uni.chooseFile({
+      count: 1, //默认100
+      extension,
+      success(res) {
+        resolve(res.tempFilePaths[0]);
+      },
+      fail() {
+        reject('上传失败');
+      },
+    });
+  });
+};
+
+// 微信选择文件 从客户端会话选择文件。
+const chooseFileWeixin = (extension = ['.xls', '.xlsx']) => {
+  return new Promise((resolve, reject) => {
+    wx.chooseMessageFile({
+      count: 1,
+      extension,
+      type: 'file',
+      success(res) {
+        resolve(res.tempFiles[0].path);
+      },
+      fail() {
+        reject('上传失败');
+      },
+    });
+  });
+};
+
+// 选择文件
+const chooseFile = (extension = ['.xls', '.xlsx']) => {
+  let fn = null;
+  /* #ifdef H5 */
+  fn = chooseFileH5(extension);
+  /* #endif */
+
+  /* #ifdef MP-WEIXIN */
+  fn = chooseFileWeixin(extension);
+  /* #endif */
+  return fn;
+};
+
 export default {
   /**
    * 上传单个文件
@@ -16,10 +62,9 @@ export default {
       if (!token) {
         return reject('用户未登录，请登录后重试');
       }
-      uni.chooseFile({
-        count: 1, //默认100
-        extension,
-        success: res => {
+      chooseFile(extension)
+        .then(filePath => {
+          console.log('filePath: ', filePath);
           if (!timer) {
             timer = setTimeout(() => {
               uni.$t.ui.showLoading('正在上传...');
@@ -29,7 +74,7 @@ export default {
           // 开始上传
           uni.uploadFile({
             url,
-            filePath: res.tempFilePaths[0],
+            filePath,
             name,
             formData,
             header: { Authorization: `Bearer ${token}` },
@@ -54,13 +99,12 @@ export default {
               reject(error);
             },
           });
-        },
-        fail: error => {
+        })
+        .catch(error => {
           clearTimeout(timer);
           uni.hideLoading();
           reject(error);
-        },
-      });
+        });
     });
   },
 };