mkm/new_shop_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
weipengfei 2024-04-01 11:12:20 +08:00
parent 774211387e
commit 8100250a3b
2 changed files with 64 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
App.vue
View File

@ -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

44
pages/store/home/index.vue
View File

@ -59,7 +59,7 @@
</view>
<scroll-view class="main" scroll-y="true" @scroll="scrollHome" catchtouchmove :style="viewColor">
<view v-show="!navShow && tabActive === 3" class="nav">
<view v-show="!navShow && (tabActive === 3 || tabActive === 7)" class="nav">
<view class="nav-cont" :class="{noPointer : preview}" id="nav-cont">
<view :class="{ active: navActive === 0 }" class="item" @click="set_where(0,0)">
<view class="cont">默认商品</view>
@ -81,12 +81,14 @@
</view>
</view>
<view class="guanzhu" :class="{'guanzhu-active':store.care}" v-if="!isLogin" @click="authOpen">
{{ store.care ? '已关注' : '关注' }}
</view>
<view v-else class="guanzhu" :class="{'guanzhu-active':store.care}" @click="followToggle">
{{ store.care ? '已关注' : '关注' }}
</view>
<block v-if="tabActive != 7">
<view class="guanzhu" :class="{'guanzhu-active':store.care}" v-if="!isLogin" @click="authOpen">
{{ store.care ? '已关注' : '关注' }}
</view>
<view v-else class="guanzhu" :class="{'guanzhu-active':store.care}" @click="followToggle">
{{ store.care ? '已关注' : '关注' }}
</view>
</block>
</view>
<view class="tab-cont" :style="viewColor,{'height':'calc(100vh - '+listHeight+' - 84rpx)'}"
@ -130,7 +132,7 @@
</view>
<!-- 首页 -->
<view v-show="(tabActive == 3 || diyActive == 1 || diyActive == 2) && tabActive != 5 && tabActive != 2">
<view v-show="(tabActive == 3 || tabActive == 7 || diyActive == 1 || diyActive == 2) && tabActive != 5 && tabActive != 2">
<!-- 商品 -->
<view v-if="goods.length" class="goods-wrap" id="goods" @touchmove="onTouchmove">
<view v-if="isColumn" class="goods column">
@ -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: '',