diff --git a/App.vue b/App.vue index ad53463..2d7fbda 100644 --- a/App.vue +++ b/App.vue @@ -133,12 +133,33 @@ console.log("通知", result) if (result.extras.type == 'ORDER_CREATE') { - if (this.audioTeam.length > 0) { - this.audioTeam.push(result.extras.type); - } else { - this.audio(result.extras.mp3) - this.audioTeam.push(result.extras.type); - } + result.extras.mp3.map(item=>{ + if(item=='零') return this.audioTeam.push('/static/audio/0.MP3') + if(item=='一') return this.audioTeam.push('/static/audio/1.MP3') + if(item=='二') return this.audioTeam.push('/static/audio/2.MP3') + if(item=='三') return this.audioTeam.push('/static/audio/3.MP3') + if(item=='四') return this.audioTeam.push('/static/audio/4.MP3') + if(item=='五') return this.audioTeam.push('/static/audio/5.MP3') + if(item=='六') return this.audioTeam.push('/static/audio/6.MP3') + if(item=='七') return this.audioTeam.push('/static/audio/7.MP3') + if(item=='八') return this.audioTeam.push('/static/audio/8.MP3') + if(item=='九') return this.audioTeam.push('/static/audio/9.MP3') + if(item=='点') return this.audioTeam.push('/static/audio/dian.MP3') + if(item=='元') return this.audioTeam.push('/static/audio/yuan.MP3') + if(item=='亿') return this.audioTeam.push('/static/audio/yi.MP3') + if(item=='十') return this.audioTeam.push('/static/audio/shi.MP3') + if(item=='百') return this.audioTeam.push('/static/audio/bai.MP3') + if(item=='千') return this.audioTeam.push('/static/audio/qian.MP3') + if(item=='万') return this.audioTeam.push('/static/audio/wan.MP3') + if(item=='微信') return this.audioTeam.push('/static/audio/wechat.MP3') + if(item=='支付宝') return this.audioTeam.push('/static/audio/pay.MP3') + }) + // if (this.audioTeam.length > 0) { + // this.audioTeam.push(result.extras.type); + // } else { + // this.audio(result.extras.mp3) + // this.audioTeam.push(result.extras.type); + // } } // 点击事件 if (notificationEventType == 'notificationOpened') { @@ -204,14 +225,32 @@ } // #endif that.getConfigData(); - // setTimeout(()=>{ - // this.audioTeam = ['pay', 'five', 'qian', 'one', 'bai', 'six', 'shi', 'four', 'dian', 'three', 'two', 'yuan']; - // this.audioTeam = this.audioTeam.map(item=>{ - // return `/static/audio/${item}.MP3` - // }) - // this.audio(this.audioTeam[0]) - // // this.audio('https://lihai001.oss-cn-chengdu.aliyuncs.com/app/out.wav') - // }, 1500) + setTimeout(()=>{ + let arr = ['一', '点', '零', '九', '元'] + arr.map(item=>{ + if(item=='零') return this.audioTeam.push('/static/audio/0.MP3') + if(item=='一') return this.audioTeam.push('/static/audio/1.MP3') + if(item=='二') return this.audioTeam.push('/static/audio/2.MP3') + if(item=='三') return this.audioTeam.push('/static/audio/3.MP3') + if(item=='四') return this.audioTeam.push('/static/audio/4.MP3') + if(item=='五') return this.audioTeam.push('/static/audio/5.MP3') + if(item=='六') return this.audioTeam.push('/static/audio/6.MP3') + if(item=='七') return this.audioTeam.push('/static/audio/7.MP3') + if(item=='八') return this.audioTeam.push('/static/audio/8.MP3') + if(item=='九') return this.audioTeam.push('/static/audio/9.MP3') + if(item=='点') return this.audioTeam.push('/static/audio/dian.MP3') + if(item=='元') return this.audioTeam.push('/static/audio/yuan.MP3') + if(item=='亿') return this.audioTeam.push('/static/audio/yi.MP3') + if(item=='十') return this.audioTeam.push('/static/audio/shi.MP3') + if(item=='百') return this.audioTeam.push('/static/audio/bai.MP3') + if(item=='千') return this.audioTeam.push('/static/audio/qian.MP3') + if(item=='万') return this.audioTeam.push('/static/audio/wan.MP3') + if(item=='微信') return this.audioTeam.push('/static/audio/wechat.MP3') + if(item=='支付宝') return this.audioTeam.push('/static/audio/pay.MP3') + }) + this.audio(this.audioTeam[0]) + // this.audio('https://lihai001.oss-cn-chengdu.aliyuncs.com/app/out.wav') + }, 1500) }, onShow() { let that = this diff --git a/pages/store/home/index.vue b/pages/store/home/index.vue index 57d5bf1..1a5361a 100644 --- a/pages/store/home/index.vue +++ b/pages/store/home/index.vue @@ -555,7 +555,12 @@ value: 4, }], // 底部菜单 - tabs3: [{ + tabs3: [ + { + icon: 'icon-yizhan_o', + name: '云商品', + value: 7, + },{ icon: 'icon-gouwu_o', name: '商品', value: 3, @@ -630,6 +635,9 @@ case 6: this.getCoupon(); break; + case 7: + this.getCoupon(); + break; } }, }, @@ -881,7 +889,7 @@ }) } }, - // 获取商品详情 + // 获取店铺详情 getStore: function() { getStoreDetail(this.id).then(res => { this.store = res.data; diff --git a/static/audio/zero.MP3 b/static/audio/0.MP3 similarity index 100% rename from static/audio/zero.MP3 rename to static/audio/0.MP3 diff --git a/static/audio/one.MP3 b/static/audio/1.MP3 similarity index 100% rename from static/audio/one.MP3 rename to static/audio/1.MP3 diff --git a/static/audio/two.MP3 b/static/audio/2.MP3 similarity index 100% rename from static/audio/two.MP3 rename to static/audio/2.MP3 diff --git a/static/audio/three.MP3 b/static/audio/3.MP3 similarity index 100% rename from static/audio/three.MP3 rename to static/audio/3.MP3 diff --git a/static/audio/four.MP3 b/static/audio/4.MP3 similarity index 100% rename from static/audio/four.MP3 rename to static/audio/4.MP3 diff --git a/static/audio/five.MP3 b/static/audio/5.MP3 similarity index 100% rename from static/audio/five.MP3 rename to static/audio/5.MP3 diff --git a/static/audio/six.MP3 b/static/audio/6.MP3 similarity index 100% rename from static/audio/six.MP3 rename to static/audio/6.MP3 diff --git a/static/audio/seven.MP3 b/static/audio/7.MP3 similarity index 100% rename from static/audio/seven.MP3 rename to static/audio/7.MP3 diff --git a/static/audio/eight.MP3 b/static/audio/8.MP3 similarity index 100% rename from static/audio/eight.MP3 rename to static/audio/8.MP3 diff --git a/static/audio/nine.MP3 b/static/audio/9.MP3 similarity index 100% rename from static/audio/nine.MP3 rename to static/audio/9.MP3