diff --git a/assets/icon/images.png b/assets/icon/images.png new file mode 100644 index 0000000..87bbd45 Binary files /dev/null and b/assets/icon/images.png differ diff --git a/components/background-notice/index.js b/components/background-notice/index.js index 4e45025..de292a0 100644 --- a/components/background-notice/index.js +++ b/components/background-notice/index.js @@ -86,19 +86,24 @@ Component({ } }, notice(){ - this.bgam.src = this.data.haveOrderAudio; - this.bgam.onEnded(()=>{ - this.bgam.src = this.data.emptyAudio; - }); - // console.log('notice order'); - // const innerAudioContext = wx.createInnerAudioContext({ - // useWebAudioImplement:true - // }) - // innerAudioContext.src = this.data.haveOrderAudio; - // innerAudioContext.play(); - // innerAudioContext.onEnded(()=>{ - // innerAudioContext.destroy(); - // }) + //这里通知改为下面的inneraudio 之前用的上面的 但是突然有一天 在切换 src 之后会执行onStop + //从而导致停止播放音乐逻辑 不知道为什么 怀疑微信偷偷改东西或者手机问题 + + // this.bgam.src = this.data.haveOrderAudio; + // this.bgam.onEnded(()=>{ + // this.bgam.src = this.data.emptyAudio; + // }); + + + console.log('notice order'); + const innerAudioContext = wx.createInnerAudioContext({ + useWebAudioImplement:true + }) + innerAudioContext.src = this.data.haveOrderAudio; + innerAudioContext.play(); + innerAudioContext.onEnded(()=>{ + innerAudioContext.destroy(); + }) }, downloadFile(url,filePath){ console.log('download',url,filePath); diff --git a/pages/index/index.js b/pages/index/index.js index 435b932..e4a692e 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -189,12 +189,12 @@ Page({ this.data.statusDetail.delivering.value = 0; this.data.statusDetail.completed.value = 0; data.map((item)=>{ - if(item.status==this.data.orderStatus.unpaid||item.status==this.data.orderStatus.completed){ - this.data.statusDetail.completed.value += item.count; - }else{ - if(this.data.statusDetail[item.status.toLowerCase()]){ - this.data.statusDetail[item.status.toLowerCase()].value = item.count; - } + // if(item.status==this.data.orderStatus.unpaid||item.status==this.data.orderStatus.completed){ + // this.data.statusDetail.completed.value += item.count; + // }else{ + // } + if(this.data.statusDetail[item.status.toLowerCase()]){ + this.data.statusDetail[item.status.toLowerCase()].value = item.count; } }); console.log(this.data.statusDetail); @@ -207,9 +207,9 @@ Page({ const cid = this.data.userInfo.community_id; const status = this.data.statusDetail[this.data.statusDetailKey]; let _status = status.key; - if(status.key==this.data.orderStatus.completed){ - _status = `${this.data.orderStatus.unpaid},${this.data.orderStatus.completed}`; - } + // if(status.key==this.data.orderStatus.completed){ + // _status = `${this.data.orderStatus.unpaid},${this.data.orderStatus.completed}`; + // } let data = await orderApi.buildingList(cid,_status); let totalCount = 0; (data||[]).map((item)=>{ @@ -238,11 +238,11 @@ Page({ }else{ params.community_id = this.data.userInfo.community_id; } - if(this.data.statusDetailKey=='completed'){ - params.status = `${this.data.orderStatus.unpaid},${this.data.orderStatus.completed}` - }else{ - params.status = this.data.statusDetail[this.data.statusDetailKey].key; - } + // if(this.data.statusDetailKey=='completed'){ + // params.status = `${this.data.orderStatus.unpaid},${this.data.orderStatus.completed}` + // }else{ + // } + params.status = this.data.statusDetail[this.data.statusDetailKey].key; orderApi.list(params).then((data)=>{ const date = new Date(); if(this.data.pager.pageIndex==0){ diff --git a/pages/index/index.wxml b/pages/index/index.wxml index 00256e2..bc5e50b 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -62,9 +62,9 @@ }} - + diff --git a/pages/order-detail/index.wxml b/pages/order-detail/index.wxml index 856e8ea..88b19be 100644 --- a/pages/order-detail/index.wxml +++ b/pages/order-detail/index.wxml @@ -19,6 +19,9 @@ {{item.station_name}} + @@ -43,9 +46,9 @@ - + - 图片取件 {{orderDetail.pickup_images_count}} 件 + 原始图片信息 @@ -120,7 +123,7 @@ 订单金额 - {{orderDetail.original_amount}} + {{orderDetail.final_amount}} diff --git a/pages/order-detail/index.wxss b/pages/order-detail/index.wxss index b07445d..2830522 100644 --- a/pages/order-detail/index.wxss +++ b/pages/order-detail/index.wxss @@ -44,6 +44,10 @@ font-weight: 500; flex: 1; } +.station-info .title .view-img-icon{ + width:40rpx;height:40rpx; + padding:0 18rpx; +} .station-info .title .received-status{ font-size: 32rpx; border-left: 1rpx solid #999999; diff --git a/project.config.json b/project.config.json index a04d956..b768a60 100644 --- a/project.config.json +++ b/project.config.json @@ -1,5 +1,5 @@ { - "miniprogramRoot": "./", + "miniprogramRoot": "", "compileType": "miniprogram", "libVersion": "trial", "packOptions": { diff --git a/project.private.config.json b/project.private.config.json index 47882a9..68f48d8 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -4,5 +4,5 @@ "setting": { "compileHotReLoad": true }, - "libVersion": "3.7.7" + "libVersion": "3.6.6" } \ No newline at end of file