Merge branch 'master' of http://175.178.51.79:3000/Augcl/recycle-front

config.js

@@ -1,5 +1,5 @@
 // config.js
-const type = 'prod'
+const type = 'local'
 
 const config = {
   local: {

pages/manager/order-detail.vue

@@ -240,8 +240,11 @@ export default {
             { label: '预约时间', value: data.goTime || data.createTime }
           ]
           // 质检信息（如有）
+		  
+		  let sum = (data.qualifiedNum || 0) + (data.noQualifiedNum || 0) + (data.unrecyclable || 0)
+		  
           this.qcInfo = [
-            { label: '质检数量', value: data.num ? data.qualifiedNum + data.noQualifiedNum + data.unrecyclable + ' 件' : '' },
+            { label: '质检数量', value: sum ? sum + ' 件' : '' },
             { label: '质检合格', value: data.qualifiedNum ? data.qualifiedNum + ' 件' : '' },
             { label: '质量问题', value: data.noQualifiedNum ? data.noQualifiedNum + ' 件' : '' },
             { label: '不可回收', value: data.unrecyclable ? data.unrecyclable + ' 件' : '' }

pages/manager/order.vue

@@ -203,11 +203,11 @@
 			if (options && options.userId) {
 				this.userId = options.userId;
 			}
-			this.fetchOrderList()
-			this.fetchOrderStatusStatistics()
+			// this.fetchOrderStatusStatistics()
 		},
 		onShow() {
 			this.fetchOrderStatusStatistics()
+			this.fetchOrderList()
 		},
 		computed: {
 			filteredOrders() {
@@ -703,7 +703,7 @@
 		.unread-dot {
 			position: absolute;
 			top: -4px;
-			left: -4px;
+			left: -24rpx;
 			width: 12px;
 			height: 12px;
 			background: #ff4d4f;

pages/subcomponent/detail.vue

@@ -51,9 +51,9 @@
         <view v-if="state === 3" class="cancel-tip">期待您下次的支持，共同为地球减少碳排放出一份力！</view>
         <!-- 物流公司，仅status为0、1时显示，且必须有物流信息 -->
         <view class="express-info" v-if="state !== 3||4 && status <= 1 && expressCompany && wuliuNo">
-          <text class="express-label">物流公司</text>
+          <text class="express-label">物流</text>
           <view class="express-row">
-            <text class="express-value">{{ expressCompany }}{{ wuliuNo }}</text>
+            <text class="express-value">{{ wuliuNo }}</text>
             <view class="express-actions">
               <text class="express-view" @tap="viewLogistics">查看物流</text>
             <text class="express-copy" @tap="copyExpressNo">复制</text>

pages/subcomponent/inspection-report.vue

@@ -48,8 +48,8 @@
                 <!-- <view class="goods-desc">{{item.desc}}</view> -->
                 <view class="goods-bottom-row">
                   <view class="goods-price-row">
-                    <text class="goods-price">￥{{item.price}}</text>
-                    <text class="goods-unit">/{{item.unit}}</text>
+                    <text class="goods-price" v-if="item.price">￥{{(item.price / item.count).toFixed(2)}}</text>
+                    <text class="goods-unit" v-if="item.price && item.unit">/{{item.unit}}</text>
                     <text class="goods-count">x{{item.count}}</text>
                   </view>
                   <!-- <view class="goods-total">￥{{item.total}}</view> -->
@@ -79,8 +79,8 @@
                 <!-- <view class="goods-desc">{{item.desc}}</view> -->
                 <view class="goods-bottom-row">
                   <view class="goods-price-row problem-price-row">
-                    <!-- <text class="goods-price">￥{{item.price}}</text>
-                    <text class="goods-unit">/件</text> -->
+                    <text class="goods-price" v-if="item.price">￥{{(item.price / item.count).toFixed(2)}}</text>
+                    <text class="goods-unit" v-if="item.price">/件</text>
                     <text class="goods-count">x{{item.count}}</text>
                   </view>
                   <!-- <view class="goods-total">￥{{item.total}}</view> -->
@@ -110,8 +110,8 @@
                 <!-- <view class="goods-desc">{{item.desc}}</view> -->
                 <view class="goods-bottom-row">
                   <view class="goods-price-row problem-price-row">
-                    <!-- <text class="goods-price">￥{{item.price}}</text>
-                    <text class="goods-unit">/件</text> -->
+                    <text class="goods-price" v-if="item.price">￥{{(item.price / item.count).toFixed(2)}}</text>
+                    <text class="goods-unit" v-if="item.price">/件</text>
                     <text class="goods-count">x{{item.count}}</text>
                   </view>
                   <!-- <view class="goods-total">￥{{item.total}}</view> -->
@@ -167,20 +167,19 @@ export default {
       return this.goodsList.reduce((sum, item) => sum + item.count, 0)
     },
     totalAmount() {
-      console.log('this.goodsList', this.goodsList)
-      return this.goodsList.reduce((sum, item) => sum + item.total, 0).toFixed(2)
+      return this.goodsList.reduce((sum, item) => sum + item.price, 0).toFixed(2)
     },
     problemCount() {
       return this.problemList.reduce((sum, item) => sum + item.count, 0)
     },
     problemAmount() {
-      return this.problemList.reduce((sum, item) => sum + item.total, 0).toFixed(2)
+      return this.problemList.reduce((sum, item) => sum + item.price, 0).toFixed(2)
     },
     unrecyclableCount() {
       return this.unrecyclableList.reduce((sum, item) => sum + item.count, 0)
     },
     unrecyclableAmount() {
-      return this.unrecyclableList.reduce((sum, item) => sum + item.total, 0).toFixed(2)
+      return this.unrecyclableList.reduce((sum, item) => sum + item.price, 0).toFixed(2)
     },
     fixedHeaderHeight() {
       // 导航栏高度 + 状态栏高度 + 特性区域高度 (约140rpx转px)