From 8100250a3b3d4a4d008a5d02287cff8670144a89 Mon Sep 17 00:00:00 2001 From: weipengfei <2187978347@qq.com> Date: Mon, 1 Apr 2024 11:12:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 59 +++++++++++++++++++------------------- pages/store/home/index.vue | 44 +++++++++++++++++++++------- 2 files changed, 64 insertions(+), 39 deletions(-) diff --git a/App.vue b/App.vue index 2d7fbda..a3909ec 100644 --- a/App.vue +++ b/App.vue @@ -133,6 +133,8 @@ console.log("通知", result) if (result.extras.type == 'ORDER_CREATE') { + if(result.extras.mp3[0]=='微信') this.audioTeam.push('/static/audio/wechat.MP3') + if(result.extras.mp3[0]=='支付宝') this.audioTeam.push('/static/audio/pay.MP3') 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') @@ -146,14 +148,13 @@ 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(item=='亿') return this.audioTeam.push('/static/audio/yi.MP3') }) + if (this.audioTeam.length > 0) this.audio(this.audioTeam[0]); // if (this.audioTeam.length > 0) { // this.audioTeam.push(result.extras.type); // } else { @@ -225,32 +226,32 @@ } // #endif that.getConfigData(); - 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) + // 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 7865378..73a0dc8 100644 --- a/pages/store/home/index.vue +++ b/pages/store/home/index.vue @@ -59,7 +59,7 @@ - + 默认商品 @@ -81,12 +81,14 @@ - - {{ store.care ? '已关注' : '关注' }} - - - {{ store.care ? '已关注' : '关注' }} - + + + {{ store.care ? '已关注' : '关注' }} + + + {{ store.care ? '已关注' : '关注' }} + + - + @@ -639,7 +641,7 @@ case 7: this.resetParmas(); this.goods = []; - this.getCloudGoods(); + this.getGoods(); break; } }, @@ -927,7 +929,28 @@ if (that.goodsLoading) return; that.goodsLoading = true; that.loadTitle = ''; - getStoreGoods(that.id, that.where).then(res => { + if(this.tabActive==7) getStoreCloudGoods(that.id, that.where).then(res => { + that.goodsLoading = false; + let list = res.data.list; + let goodsList = that.$util.SplitArray(list, that.goods); + let loadend = list.length < that.where.limit; + that.loadend = loadend; + that.loading = false; + that.loadTitle = loadend ? '已全部加载' : '加载更多'; + that.$set(that, 'goods', goodsList); + that.$set(that.where, 'page', that.where.page + 1); + }).catch(err => { + that.loading = false; + that.goodsLoading = false; + uni.showToast({ + title: err, + icon: 'none' + }) + setTimeout(function() { + uni.navigateBack() + }, 1000); + }); + else getStoreGoods(that.id, that.where).then(res => { that.goodsLoading = false; let list = res.data.list; let goodsList = that.$util.SplitArray(list, that.goods); @@ -1134,6 +1157,7 @@ this.goodsLoading = this.loadend = this.loading = false }, resetParmas() { + this.navActive = 0; this.where = { order: '', keyword: '',