订单列表优化

hdApp/src/admin/home/components/order-item.vue

@@ -32,6 +32,7 @@
 						<text>备注：</text>
 						<text style="overflow:hidden;text-overflow:ellipsis;white-space:nowrap;width:420upx;display:inline-block;line-height:27upx;">{{info.remark||''}}</text>
 					</view>
+
 				</view>
 			</view>
 		</block>

hdApp/src/admin/home/order.vue

@@ -33,6 +33,13 @@
               <span v-if="item.sendCost > 0" class="freight-text">运费 ￥{{ item.sendCost ? parseFloat(item.sendCost) : 0 }}</span>
               <span class="app-size-30 app-bold">¥{{ item.orderPrice ? parseFloat(item.orderPrice) :0 }}</span>
             </view>
+
+        <view v-if="item.sameTimeIdsNum && item.sameTimeIdsNum>1" style="text-align: center;color:white;
+        margin-top:20upx;font-size:32upx;background-color:#3780a5ad;padding-top:7upx;padding-bottom:7upx;display: flex;justify-content: center;"
+        @click.stop="pageTo({url:'/admin/order/itemOrder?ids='+item.sameTimeIds})">
+          本客户共有{{item.sameTimeIdsNum?item.sameTimeIdsNum:0}}个订单，可合并发货
+        </view>
+
             <view class="list-button">
                 <view class="admin-button-com middle" v-if="item.status == 2" @click.stop="sendOrderFn(item)">发货</view>
                 <view class="admin-button-com default" v-else>发货</view>

hdApp/src/admin/order/itemOrder.vue

@@ -84,7 +84,7 @@ export default {
 		//返回上一页时不需要刷新
 		let pages = getCurrentPages();
 		let prevPage = pages[ pages.length - 2 ];
-		prevPage.$vm.fromDetail = {status:1}
+		prevPage.$vm.refreshPage = 0
 
   },
   methods: {
@@ -142,10 +142,23 @@ export default {
       })
     },
     getOrderList() {
-        let productId = this.option.productId ? this.option.productId : 0
-        return getOrderInfoList({ productId:productId, page: this.list.page }).then((res) => {
+      if(this.option.productId){
+        return getOrderInfoList({ productId:this.option.productId, page: this.list.page,ids:ids }).then((res) => {
           this.completes(res)
         })
+      }
+
+      if(this.option.customId){
+        return getListB({ page: this.list.page,customId:this.option.customId }).then((res) => {
+          this.completes(res)
+        })
+      }
+      if(this.option.ids){
+        return getListB({ page: this.list.page,ids:this.option.ids }).then((res) => {
+          this.completes(res)
+        }) 
+      }
+
     }
   },
 };