diff --git a/.env.development b/.env.development index 36d7655..401cd85 100644 --- a/.env.development +++ b/.env.development @@ -3,5 +3,5 @@ VUE_APP_BASE_URL=https://test.tall.wiki VUE_APP_API_URL=https://test.tall.wiki/gateway VUE_APP_MSG_URL=wss://test.tall.wiki/websocket/message/v4.0/ws VUE_APP_PROJECT_PATH=https://test.tall.wiki/tall-project -VUE_APP_YY_API_URL=http://192.168.0.99/gateway +VUE_APP_YY_API_URL=https://test.tall.wiki/gateway VUE_APP_VERSION=v3.2.0 diff --git a/.env.production b/.env.production index 4ea1f34..6f6ee49 100644 --- a/.env.production +++ b/.env.production @@ -3,5 +3,5 @@ VUE_APP_BASE_URL=https://www.tall.wiki VUE_APP_API_URL=https://www.tall.wiki/gateway VUE_APP_MSG_URL=wss://www.tall.wiki/websocket/message/v4.0/ws VUE_APP_PROJECT_PATH=https://www.tall.wiki/tall-project -VUE_APP_YY_API_URL=http://192.168.0.99/gateway +VUE_APP_YY_API_URL=https://test.tall.wiki/gateway VUE_APP_VERSION=v3.2.0 diff --git a/CHANGELOG.md b/CHANGELOG.md index 2a8ab1d..e0d5f17 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -133,6 +133,7 @@ - | 1.任务 角色切换显示加载中... 2.题目图片大小等比例修改 | [22f8cc8](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/22f8cc8) - | 1.时间轴上下滑动页面有更新感bug修复 2.没有定位在当天的任务上bug修复 | [b423ce7](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/b423ce7) - | 1.时间轴数据渲染 2.时间基准线 | [d643af2](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/d643af2) + - | 1.添加血脂小数点 2.修改当前题号缓存机制 | [ce35b31](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/ce35b31) - | api 存storage | [81032ba](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/81032ba) ID1000343 | 解决向下预加载查询参数时间没+1颗粒度;以及滚动加载颗粒度写死的问题 | [940603a](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/940603a), closes [#ID1000343](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/issues/ID1000343) plugin | 插件解析机制完善 | [0f5a27d](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/0f5a27d) diff --git a/rest/http-client.env.json b/rest/http-client.env.json index 34ce0f9..523f84c 100644 --- a/rest/http-client.env.json +++ b/rest/http-client.env.json @@ -6,10 +6,10 @@ }, "dev": { "name": "dev", - "url": "http://192.168.0.99/gateway" + "url": "https://test.tall.wiki/gateway" }, "local": { "version": "v2", - "url": "http://192.168.0.99/gateway" + "url": "https://test.tall.wiki/gateway" } } diff --git a/src/App.vue b/src/App.vue index d7933eb..89e5484 100644 --- a/src/App.vue +++ b/src/App.vue @@ -12,6 +12,7 @@ export default { // 扫描小程序码 if (options.query && options.query.scene) { const scene = options.query.scene; + console.log('scene: ', scene); const toolCode = scene.substring(scene.length - 10); this.setEnterByCode(true); this.setToolCode(toolCode); diff --git a/src/components/Upload/Upload.vue b/src/components/Upload/Upload.vue index efdc46a..ff0238b 100644 --- a/src/components/Upload/Upload.vue +++ b/src/components/Upload/Upload.vue @@ -37,32 +37,13 @@ > - - - - - - - - - - - - diff --git a/src/pages.json b/src/pages.json index ee83c8b..46f9461 100644 --- a/src/pages.json +++ b/src/pages.json @@ -102,7 +102,7 @@ "path": "git-phone-power/git-phone-power", "style": { "navigationBarTitleText": "授权信息", - "navigationStyle": "custom" + "navigationStyle": "default" } } ] diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index b983d15..12a05e3 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -4,7 +4,12 @@ - + @@ -68,6 +73,7 @@ export default { user(value) { if (value.wxInfo && value.wxInfo.nickname && value.phone) { if (this.options && this.options.scene && !this.options.code) { + console.log('watch user:', this.toolCode); // 首页用户身份判断 this.homeIdentity(); } @@ -77,6 +83,7 @@ export default { onShow() { if (!this.token) return; + console.log('onShow'); this.getProjects(); this.handleFindPoint(); this.setProject(); @@ -85,6 +92,7 @@ export default { async onLoad(options) { this.options = options; if (options.code === 'true') { + console.log('onLoad options: ', options); // 首页用户身份判断 await this.homeIdentity(); } @@ -187,6 +195,7 @@ export default { async bindTool() { try { const params = { toolCode: this.toolCode }; + console.log('params: ', params); await this.getBindTool(params); this.initTool(); } catch (error) { diff --git a/src/pagesProject/project/components/NotEvaluated/NotEvaluated.vue b/src/pagesProject/project/components/NotEvaluated/NotEvaluated.vue index 5d8950d..f06a257 100644 --- a/src/pagesProject/project/components/NotEvaluated/NotEvaluated.vue +++ b/src/pagesProject/project/components/NotEvaluated/NotEvaluated.vue @@ -39,6 +39,7 @@ export default { this.setTask(task); this.setCode('NLCP'); const arr = this.$t.storage.getStorageSync('NLCPNum').split('+'); + console.log('arr: ', arr); const pid = arr[0]; const num = pid === this.projectId ? arr[1] : 0; @@ -47,6 +48,7 @@ export default { reportId: task.id, num: num ? num - 0 + 1 : 1, }; + console.log('params: ', params); await this.handleQuestion(params); uni.navigateTo({ url: '/pagesYanyuan/assess/assess' }); } catch (error) { diff --git a/src/pagesProject/project/components/Roles/Roles.vue b/src/pagesProject/project/components/Roles/Roles.vue index 1b23074..7f70fae 100644 --- a/src/pagesProject/project/components/Roles/Roles.vue +++ b/src/pagesProject/project/components/Roles/Roles.vue @@ -1,6 +1,6 @@