From 607dbf70184ec000be6bf89b41ca81c8b502f10e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BD=87?= <hbycchenxiao@163.com>
Date: Tue, 1 Apr 2025 21:19:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=AD=E9=9F=B3=E6=92=AD?=
 =?UTF-8?q?=E6=8A=A5=E8=8E=AB=E5=90=8D=E5=85=B6=E5=A6=99=20bug=EF=BC=8C?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=20ai=E5=8F=96=E4=BB=B6=20=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/icon/images.png                | Bin 0 -> 1096 bytes
 components/background-notice/index.js |  31 +++++++++++++++-----------
 pages/index/index.js                  |  28 +++++++++++------------
 pages/index/index.wxml                |   4 ++--
 pages/order-detail/index.wxml         |   9 +++++---
 pages/order-detail/index.wxss         |   4 ++++
 project.config.json                   |   2 +-
 project.private.config.json           |   2 +-
 8 files changed, 46 insertions(+), 34 deletions(-)
 create mode 100644 assets/icon/images.png

diff --git a/assets/icon/images.png b/assets/icon/images.png
new file mode 100644
index 0000000000000000000000000000000000000000..87bbd45520f68f526b8295b4a81e691e5ca16990
GIT binary patch
literal 1096
zcmV-O1h@N%P)<h;3K|Lk000e1NJLTq002S&002S=1^@s6<5U3X00001b5ch_0Itp)
z=>Px#1am@3R0s$N2z&@+hyVZs@<~KNRCt{2n%z~~NEF9^*O+})2}%WVDv0u!10<$`
zg$|$sLj{lu%vPW*GRKc56`)jrO7QbyboW6bu|AAP@>mu*`n}nj(Tx6Q?%a<V=;-L^
z=;-L^sE3#|(mMvkxCkFn2HT#L1?C75F+bVoUOp48>+q@&I>qIg5z2|J8SVt(h9}PD
znEC1^E6@NBVT|H#WpYg;L<q-nKv@2`1od&~^9VRwom|rh5qo?pGnIa6hdyKSA_x)i
zotU5YXSfA=ya$Gv6|JeM!)d;GVMS<w2h4J<*4kJbQ6GnWMkr^wN1x<~`{h4+#oh(4
z5WYnb0OXjt9CDtn=HHZfzM>Gxl3MQc&s!8BL(I3#Z{cIUNpX*e@iGRJSF-{-#bv<&
z7@*7%LKcLL3o8Xr;pUr^Z<bjqPx@E<u~>>fUc~J)*9n($$aU5CT0@K8uxJ{aj&a9;
zXJ)SiVGhcb2Kcte-UO>c=oFWjnPCt%)CpHM$KM3ID<bjH=0TWprqgyruGWN5AE#DM
zl8Co+?5&7BhPC>&B%8IqS=OKvBBd3<noZLvO>YgT+s`W2gpdQmT2ZL-udO+3f?d;y
zxvbP)h<N6v?r?g?z?S<p39*flFWhK=3q~$+j&NKx@6cOL5WWH)F%B_kz#RC-g6q0@
zjP=b@j<|p|D?^Cr^I=ultPJ&Wbix>63=GKzZVoV_&!YzQ-1t_!h8%H0pLYn?K!_5d
zX@yHUl|$Z{RF+@RDK7gw7zAt%;OlMmz|N{^ER%ld`KIqtA16)XT=T&h>uqAHrd`?)
zN4!qIq6jY}Vw{){(_(bO)kYzBx-wwB8MbysXuz<f=vp0NjPUomW*e;t^>O$Mm;Z=t
zmfzA6-`LjsOtRw2LM$BvCbh_zr2G~T(&w~_H(1G{<XmOT7@LMpadpC&1&^u1%eLzP
z9t$4oxUS4NNgUv9@{T$f384WOO9H%xQ+2n_jN{`VyD8t92r<GeWd4mX)=7<xE;*HQ
zEBCX2i4b0`Hz$?q3*+W@46JyGnrz#Bj*P{KcU#eJB90iXE8C}L<TWstl{6DjDQ6lm
zQ@`jEQ<K<vCA-PU(qo^8^x6TC#w3bQ3ofKIn`<N<VU`wBLKeF<hh=t^Ya{_!i)d}q
z)ij+DDMcZq9S1H=Q???arYF%jz3fG@<gYx+k0$1_Q%bH#mYGH?j^MUR$u|~+kR$Gq
z`lnBCfbaP`maxie>~XotZMqgSXHmR$3oC?>&&dVuKT3?`TUH)1u8bq(fRHCX{1Ij%
z+^|=?cARZufKG9F!lTFgG+)?xlC%~fMEOCFsLB~@M@L6TM@L6TRsIJ?8$r}m!OYwM
O0000<MNUMnLSTZ+4+FRW

literal 0
HcmV?d00001

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 @@
               }}
             </view>
           </view>
-          <view class="sl-item" wx:if="{{item.pickup_images&&item.pickup_images.length>0}}">
+          <!-- <view class="sl-item" wx:if="{{item.pickup_images&&item.pickup_images.length>0}}">
             <view class="name">图片取件 {{item.pickup_images_count}} 件</view>
-          </view>
+          </view> -->
         </view>
         <view class="address">
           <view class="title">
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 @@
     <view class="page-container station-info" wx:for="{{orderDetail.packages}}" wx:key="index">
       <view class="title">
         <view class="name">{{item.station_name}}</view>
+        <image src="/assets/icon/images.png" class="view-img-icon" bind:tap="previewPackageImage"
+          data-item="{{orderDetail.pickup_images}}" 
+          wx:if="{{orderDetail.status!=orderStatus.created&&!item.station_id}}"/>
         <view class="received-status {{orderDetail.status==orderStatus.received&&!item.receivedAll?'done':''}}" 
           wx:if="{{item.status!=orderStatus.created}}">
           <!-- {{item.receivedAll?'已取件':'待取件'}} -->
@@ -43,9 +46,9 @@
         </label>
       </checkbox-group>
     </view>
-    <view class="page-container station-info" wx:if="{{orderDetail.pickup_images&&orderDetail.pickup_images.length>0}}">
+    <view class="page-container station-info" wx:if="{{false&&orderDetail.pickup_images&&orderDetail.pickup_images.length>0}}">
       <view class="title">
-        <view class="name">图片取件 {{orderDetail.pickup_images_count}} 件</view>
+        <view class="name">原始图片信息</view>
       </view>
       <view class="images" wx:if="{{orderDetail.status==orderStatus.created}}">
         <view class="image empty-img" wx:for="{{orderDetail.pickup_images}}" wx:key="index" src="{{item}}">
@@ -120,7 +123,7 @@
       </view>
       <view class="row">
         <view class="key">订单金额</view>
-        <view class="value money money-normal">{{orderDetail.original_amount}}</view>
+        <view class="value money money-normal">{{orderDetail.final_amount}}</view>
       </view>
     </view>
     <view class="scroll-view-dispatch"></view>
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