diff --git a/element/headerIndex.vue b/element/headerIndex.vue index 946a3e4c..b3849c4c 100644 --- a/element/headerIndex.vue +++ b/element/headerIndex.vue @@ -11,7 +11,7 @@ 性别:{{info.gender==1?'男':info.gender==2?'女':'未知'}} 年龄:{{info.age}}岁 - 地区:{{info.address}} + 当前地区:{{info.address}} @@ -27,7 +27,7 @@ - 选择地区标准: + 中招地区标准: {{region?region:info.address}} @@ -86,8 +86,8 @@ userList() { return this.familayList }, - userId() { - return this.user.id + userAddress() { + return this.user.address }, }, props: { @@ -109,7 +109,7 @@ }, 1000); }, watch: { - userId() { + userAddress() { let that = this that.region = that.user.address that.handleCityList() diff --git a/pageTwo/devices/PCT01.vue b/pageTwo/devices/PCT01.vue index aaec1c7b..f15155d0 100644 --- a/pageTwo/devices/PCT01.vue +++ b/pageTwo/devices/PCT01.vue @@ -108,22 +108,12 @@ that.$store.commit("changeBluetooth", res.available); }) }, - // #ifdef APP-PLUS - onBackPress(options) { - let that = this - that.handleEnd() - innerAudioContext.stop(); - console.log("PCT01返回onBackPress") - }, - // #endif - // #ifndef APP-PLUS onUnload: function() { let that = this that.handleEnd() innerAudioContext.stop(); console.log("PCT01返回onUnload") }, - // #endif watch: { isConnected: function() { let that = this @@ -185,7 +175,6 @@ let that = this if (that.isStart) { that.handleAudio() - console.log("11111111") } } }, @@ -293,8 +282,10 @@ cancelText: "返回", success: function(res) { if (res.cancel) { - that.handleEnd() innerAudioContext.stop(); + uni.navigateBack({ //返回 + delta: 1 + }) } }, }) @@ -341,6 +332,7 @@ if (res.code == 0) { that.bpm = that.weight / (that.time / 60) that.iswrapper = true + that.info.isSuccessful = true that.$store.dispatch('getUserInfo', { aud_id: uni.getStorageSync('userid') }) @@ -387,7 +379,6 @@ }, handleTarget() { let that = this - uni.$emit('updateData', JSON.stringify(that.info)) uni.navigateBack({ //返回 delta: 1 }) @@ -400,9 +391,7 @@ that.handleStart('结束') }, 400) setTimeout(function() { - uni.redirectTo({ - url: "/pages/skiping/skip?info=" + JSON.stringify(that.info) - }) + uni.$emit('updateData', JSON.stringify(that.info)) }, 600) } } diff --git a/pages/PublicCards/PublicCards.vue b/pages/PublicCards/PublicCards.vue index 223cdb7d..b969aecc 100644 --- a/pages/PublicCards/PublicCards.vue +++ b/pages/PublicCards/PublicCards.vue @@ -149,12 +149,13 @@ labelList() { let that = this if (that.PublicContent) { - that.labelName = that.PublicContent.label_list[0] + that.labelName = that.PublicContent.label_list[that.active] that.lineList = that.PublicContent.line_list that.label_data = that.PublicContent.label_data - that.chartData.series[0].data = Number(that.PublicContent.label_data[0].offset) / 100 - that.offset = that.PublicContent.label_data[0].offset + that.chartData.series[0].data = Number(that.PublicContent.label_data[that.active].offset) / 100 + that.offset = that.PublicContent.label_data[that.active].offset } + console.log("11111", that.PublicContent, that.active, that.labelName) return that.PublicContent ? that.PublicContent.label_list : [] }, }, diff --git a/pages/my/me.vue b/pages/my/me.vue index 75e3054a..3f45465f 100644 --- a/pages/my/me.vue +++ b/pages/my/me.vue @@ -40,16 +40,6 @@ - @@ -62,16 +52,6 @@ - 退出登录 @@ -207,9 +187,6 @@ overflow: hidden; position: relative; - - - .item { width: auto; font-size: 32rpx; @@ -230,6 +207,14 @@ } } + .href { + display: flex; + width: 100%; + color: #000; + text-decoration: none; + justify-content: space-between; + } + .btn { width: auto; background: $btncolor; diff --git a/pages/score/score.vue b/pages/score/score.vue index 0409a92c..23a08f98 100644 --- a/pages/score/score.vue +++ b/pages/score/score.vue @@ -1,12 +1,12 @@