diff --git a/App.vue b/App.vue index 62d5aa34..03292127 100644 --- a/App.vue +++ b/App.vue @@ -62,6 +62,6 @@ img { --font-button-size:24rpx; --font-button-size-p:28rpx; /* tab图标 */ - --tab-url:url('https://vespa.qxyushen.top/h5/image/tabline.png'); + --tab-url:url('http://1.13.101.98/h5/image/tabline.png'); } \ No newline at end of file diff --git a/package.json b/package.json index 0907b21d..1ec78b05 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,7 @@ { "dependencies": { "axios": "^1.9.0", + "office-viewer": "^0.3.14", "video-animation-player": "^1.0.5", "vue-i18n": "^11.1.5" } diff --git a/pages/feedback/report.vue b/pages/feedback/report.vue index ca758e6b..b9ecbd0f 100644 --- a/pages/feedback/report.vue +++ b/pages/feedback/report.vue @@ -65,7 +65,8 @@ statusBarHeight: 0, typeIndex: 0, messageText: "", - msgType: "success" + msgType: "success", + fromView: null } }, watch: { @@ -79,6 +80,7 @@ id, fromType, fromId, + fromView, h } = options this.optionsProps = { @@ -86,6 +88,8 @@ fromType, fromId } + this.fromView = fromView + // console.log(this.fromView) uni.setStorageSync('token', id) this.statusBarHeight = h uni.setStorageSync('BarHeight', h) @@ -95,7 +99,12 @@ }, methods: { back() { - this.closeWeb() + if (this.fromView == 1) { + uni.navigateBack() + } else { + this.closeWeb() + } + }, closeWeb() { // 关闭页面 @@ -156,6 +165,9 @@ image: "", } this.$refs.uploadImage.clearImage() + // if(this.fromView == 1) { + // uni.navigateBack() + // } } else { this.messageText = msg this.msgType = 'error' diff --git a/pages/other/grade.vue b/pages/other/grade.vue index 2a826449..c5fb4185 100644 --- a/pages/other/grade.vue +++ b/pages/other/grade.vue @@ -13,6 +13,9 @@ 魅力等级 + + 歌手等级 + @@ -37,7 +40,7 @@ - + @@ -72,19 +75,22 @@ - {{`如何获得${currentIndex ? '魅力' : '财富'}值?`}} + {{`如何获得${currentIndex === 1 ? '魅力' : currentIndex === 2 ? '歌手经验' : '财富'}值?`}} - {{`${currentIndex ? `在平台收到的所有打赏均可转化为魅力值,具体比例为1金币=${detailData.coin_charm_exp}魅力值。` : `在平台的所有打赏均可转化为财富值,具体比例为1金币=${detailData.coin_wealth_exp}财富值。`}`}} + {{`${currentIndex === 1 ? `在平台收到的所有打赏均可转化为魅力值,具体比例为1金币=${detailData.coin_charm_exp}魅力值。` : currentIndex === 2 ? `在平台的所有打赏均可转化为歌手经验值,具体比例为1金币=${detailData.singer_coin_exp}经验值` : `在平台的所有打赏均可转化为财富值,具体比例为1金币=${detailData.coin_wealth_exp}财富值。`}`}} -