多单分享问题 开始

ghsApp/src/admin/cp/item.vue

@@ -180,7 +180,7 @@
 		},
 		orderRecord(){
 			this.closeRightShow()
-			this.pageTo({url: "/admin/order/itemOrder?productId="+this.currentInfo.productId})
+			this.pageTo({url: "/admin/order/productOrder?productId="+this.currentInfo.productId})
 		},
 		onStockChange(){
 			this.closeRightShow()

ghsApp/src/admin/home/components/OrderItem.vue

@@ -89,7 +89,7 @@
         <view class="order-info_box remark-box" v-if="!$util.isEmpty(item.remark)">
           <view class="remark-text">{{ item.remark }}</view>
         </view>
-        <view v-if="item.sameTimeIdsNum && item.sameTimeIdsNum > 1 && moreOrderRemind == true" class="merge-tips" @click.stop="pageTo({ url: '/admin/order/itemOrder?ids=' + item.sameTimeIds })" >
+        <view v-if="item.sameTimeIdsNum && item.sameTimeIdsNum > 1 && moreOrderRemind == true" class="merge-tips" @click.stop="pageTo({ url: '/admin/order/mergeOrder?ids=' + item.sameTimeIds+'&mergeId='+item.id })" >
           客户共有{{ item.sameTimeIdsNum }}个订单，可合并发货
         </view>
       </view>

ghsApp/src/admin/item/detail.vue

@@ -972,7 +972,7 @@ export default {
     },
     orderRecord(info){
 			this.closeMoreDoPop()
-			this.pageTo({url: "/admin/order/itemOrder?productId="+info.id})
+			this.pageTo({url: "/admin/order/productOrder?productId="+info.id})
     },
     moreDo(){
       this.$refs.rightShowMore.open('top')

ghsApp/src/admin/item/list.vue

@@ -446,7 +446,7 @@ export default {
 		},
 		orderRecord(){
 			this.closeRightShow()
-			this.pageTo({url: "/admin/order/itemOrder?productId="+this.currentInfo.id})
+			this.pageTo({url: "/admin/order/productOrder?productId="+this.currentInfo.id})
 		},
 		preSell(){
 			this.closeRightShow()

ghsApp/src/admin/item/list2.vue

@@ -617,7 +617,7 @@ export default {
 		},
 		orderRecord(){
 			this.closeRightShow()
-			this.pageTo({url: "/admin/order/itemOrder?productId="+this.currentInfo.id})
+			this.pageTo({url: "/admin/order/productOrder?productId="+this.currentInfo.id})
 		},
 		preSell(){
 			this.closeRightShow()

ghsApp/src/admin/item/selectList.vue

@@ -394,7 +394,7 @@ export default {
 		},
 		orderRecord(){
 			this.closeRightShow()
-			this.pageTo({url: "/admin/order/itemOrder?productId="+this.currentInfo.id})
+			this.pageTo({url: "/admin/order/productOrder?productId="+this.currentInfo.id})
 		},
 		preSell(){
 			this.closeRightShow()

ghsApp/src/admin/item/simple.vue

@@ -255,7 +255,7 @@ export default {
 		},
 		orderRecord(){
 			this.closeRightShow()
-			this.pageTo({url: "/admin/order/itemOrder?productId="+this.currentInfo.id})
+			this.pageTo({url: "/admin/order/productOrder?productId="+this.currentInfo.id})
 		},
 		preSell(){
 			this.closeRightShow()

ghsApp/src/admin/order/customOrder.vue

@@ -0,0 +1,306 @@
+<template>
+  <div class="app-main app-content">
+    <div class="list-wrap">
+      <block v-if="!$util.isEmpty(list.data)">
+        <div class="list" v-for="(item, index) in list.data" :key="index">
+          <div v-if="!$util.isEmpty(item.orderInfo)">
+            <OrderItem :item="item.orderInfo" @printOrder="printOrder"></OrderItem>
+          </div>
+          <div v-else>
+            <OrderItem :ref="`orderRef${item.id}`" :item="item" @printOrder="printOrder" @directFh="directFh" @fillNoFh="fillNoFh" :moreOrderRemind="false"></OrderItem>
+          </div>
+        </div>
+      </block>
+      <block v-else>
+        <app-wrapper-empty title="暂无数据" :is-empty="$util.isEmpty(list.data)" />
+      </block>
+    </div>
+
+    <view class="bottom-bar-view" v-if="!$util.isEmpty(ids)">
+      <view class="bar-content">
+        <button class="admin-button-com big blue" @click="batchFh()">全部发货</button>
+        <button class="admin-button-com big blue" style="margin-left: 50upx;" @click="batchPrint()">合并打印</button>
+      </view>
+    </view>
+
+		<modal-module :show="fhLabelShow" @click="fhConfirm" :maskClosable="true" title="物流信息" padding="30rpx 30rpx" >
+      <template v-slot:content>
+        <div class="app-modal-input-wrap">
+          <div class="inp-list-line">
+            <div class="line-label">物流名称</div>
+            <div class="line-input">
+            <input type="text" v-model="fhWl" @focus="fhWl=''" class="inp-input" />
+            </div>
+          </div>
+          <div class="inp-list-line">
+            <div class="line-label">物流单号</div>
+            <div class="line-input">
+            <input type="text" v-model="fhWlNo" :focus="fhWlFocus" @focus="fhWlNo=''" class="inp-input" />
+            </div>
+          </div>
+        </div>
+      </template>
+		</modal-module>
+
+  </div>
+</template>
+<script>
+import AppWrapperEmpty from "@/components/app-wrapper-empty";
+import ModalModule from "@/components/plugin/modal";
+import { list } from "@/mixins";
+import { mapGetters } from "vuex";
+import orderMixin from "@/mixins/order";
+import OrderItem from "../home/components/OrderItem"
+import { getListB,cloudPrintOrder,mergePrintFn,allFhAction,orderFh} from "@/api/order";
+export default {
+  name: "customOrder",
+  components: {
+    AppWrapperEmpty,
+    ModalModule,
+    OrderItem,
+  },
+  mixins: [list,orderMixin],
+  computed: { ...mapGetters(["getLoginInfo", "getDictionariesInfo"]) },
+  data() {
+    return {
+      ids:'',
+      fhWlInfo:[],
+      fhWlNo:'',
+      fhWl:'顺丰',
+      fhWlFocus:false,
+      fhLabelShow:false,
+    }
+  },
+  onPullDownRefresh() {
+    this.resetList();
+    this.getOrderList().then((res) => {
+      uni.stopPullDownRefresh();
+    });
+  },
+  onReachBottom() {
+    if (!this.list.finished) {
+      this.getOrderList().then((res) => {
+        uni.stopPullDownRefresh();
+      });
+    } else {
+      uni.stopPullDownRefresh();
+    }
+  },
+  onLoad() {
+    this.getOrderList()
+
+		//返回上一页时不需要刷新
+		let pages = getCurrentPages();
+		let prevPage = pages[ pages.length - 2 ];
+		prevPage.$vm.fromDetail = {status:1}
+
+    this.ids = this.option.ids?this.option.ids:''
+
+  },
+  methods: {
+    //这个有多处要同步修改，关键词：fh_express_pop
+    fillNoFh(info){
+      let that = this
+      this.fhLabelShow = true
+      this.fhWlInfo = info
+			setTimeout(x => {
+				this.$nextTick(() => {
+          that.fhWlFocus = true
+        })
+			}, 200)
+    },
+    fhConfirm(val){
+      let that = this
+			if (val.index == 0) {
+				that.fhLabelShow = false
+				that.fhWlFocus = false
+        that.fhWlNo = ''
+				return
+			}
+      if (this.$util.isEmpty(this.fhWl)){
+        that.$msg('请填写物流名称')
+        return false
+      }
+      if (this.$util.isEmpty(this.fhWlNo)){
+        that.$msg('请填写物流单号')
+        return false
+      }
+      let id = that.fhWlInfo.id ? that.fhWlInfo.id : 0
+      that.$util.confirmModal({content:'确认发货？'},() => {
+          orderFh({id:id,fhType:1,fhWl:that.fhWl,fhWlNo:that.fhWlNo}).then(res=>{
+            if(res.code == 1){
+              that.$refs[`orderRef${id}`][0].currentStatus = 3
+              that.fhLabelShow = false
+              that.fhWlFocus = false
+              that.fhWlNo = ''
+              that.$msg('发货成功')
+            }
+          })
+      })
+    },
+    init(){
+
+    },
+    directFh(info){
+      let that = this
+      that.$util.confirmModal({content:'确认发货？'},() => {
+          orderFh({id:info.id,fhType:0}).then(res=>{
+            if(res.code == 1){
+              that.$refs[`orderRef${info.id}`][0].currentStatus = 3
+              that.$msg('发货成功')
+            }
+          })
+      })
+    },
+    batchFh(){
+      let that = this
+      if(this.$util.isEmpty(this.option.ids)){
+        this.$msg('没有订单')
+      }
+      let mergeId = this.option.mergeId?this.option.mergeId:0
+      that.$util.confirmModal({content:'确认全部发货？'},() => {
+        allFhAction({mergeId:mergeId}).then(res=>{
+          if(res.code == 1){
+            that.$msg('操作成功')
+            that.resetList()
+            that.getOrderList()
+          }
+        })
+      })
+    },
+    batchPrint(){
+      let that = this
+      if(this.$util.isEmpty(this.option.ids)){
+        this.$msg('没有订单')
+      }
+      let mergeId = this.option.mergeId?this.option.mergeId:0
+      that.$util.confirmModal({content:'确认合并打印？'},() => {
+        mergePrintFn({mergeId:mergeId}).then(res=>{
+          if(res.code == 1){
+            that.$msg('打印成功')
+          }
+        })
+      })
+    },
+    printOrder(item){
+      let that = this
+      uni.showLoading({title: '打印中...'});
+      cloudPrintOrder({id:item.id}).then((res) => {
+        uni.hideLoading()
+        if(res.code == 1){
+          if(res.data.hasNoPrint == 1){
+            that.$util.confirmModal({content:'请先设置打印机'},() => {
+              that.$util.pageTo({url: "/admin/shop/print"})
+            })
+          }else{
+            item.printNum++
+          }
+        }
+      })
+    },
+    getOrderList() {
+        return getListB({ page: this.list.page,customId:this.option.customId }).then((res) => {
+          this.completes(res)
+        })
+    }
+  },
+};
+</script>
+<style lang="scss" scoped>
+page{
+	width: 750upx;
+	overflow: hidden;
+}
+.app-content {
+	width: 100%;
+  padding-bottom: 160upx;
+	overflow: hidden;
+  .select-dn_bx {
+    padding-left: 18upx;
+  }
+  .app-tabs {
+    position: fixed;
+    width: 100%;
+    z-index: 9;
+  }
+  .input-wrap_box {
+    background-color: #fff;
+    position: fixed;
+    top: 0;
+    z-index: 10;
+    width: 100%;
+    height: 100upx;
+    display: flex;
+    align-items: center;
+    padding: 0 30upx;
+    & > view:nth-child(2) {
+      flex: 1;
+    }
+  }
+  .list-wrap {
+    padding-top: 20upx;
+    .list {
+      background-color: #fff;
+      margin-bottom: 20upx;
+    }
+  }
+}
+.upload-confirm-wrap {
+  max-height: 600upx;
+  overflow-y: auto;
+  .modal-tit {
+    @include disFlex(center, center);
+    font-size: 40upx;
+    margin-top: 30upx;
+    margin-bottom: 50upx;
+    .iconfont {
+      color: #09bb07;
+      margin-right: 20upx;
+      font-size: 50upx;
+    }
+  }
+  .sel-wrap {
+    color: $fontColor2;
+    font-size: 32upx;
+    .sel-tit {
+      text-align: left;
+    }
+    .sel-btn {
+      @include disFlex(center, flex-start);
+      flex-wrap: wrap;
+      padding: 10upx 0 40upx;
+    }
+  }
+}
+
+// 按钮
+.bottom-bar-view {
+  position: fixed;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 9999;
+  width: 100%;
+  background-color: #FFFFFF;
+  border-top: 1upx solid #eee;
+  box-shadow: 0upx -1upx 6upx 0upx rgba(4, 0, 0, 0.06);
+
+  /* #ifdef MP-WEIXIN */
+  padding-bottom: constant(safe-area-inset-bottom); /* iOS 11.2- */
+  padding-bottom: env(safe-area-inset-bottom); /* iOS 11.2+ */
+  /* #endif */
+
+  /* #ifdef APP-PLUS */
+  padding-bottom: constant(safe-area-inset-bottom); /* iOS 11.2- */
+  padding-bottom: env(safe-area-inset-bottom); /* iOS 11.2+ */
+  /* #endif */
+
+  .bar-content {
+    width: 100%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    padding: 10upx 40upx;
+  }
+}
+</style>

ghsApp/src/admin/order/mergeOrder.vue

@@ -0,0 +1,307 @@
+<template>
+  <div class="app-main app-content">
+    <div class="list-wrap">
+      <block v-if="!$util.isEmpty(list.data)">
+        <div class="list" v-for="(item, index) in list.data" :key="index">
+          <div v-if="!$util.isEmpty(item.orderInfo)">
+            <OrderItem :item="item.orderInfo" @printOrder="printOrder"></OrderItem>
+          </div>
+          <div v-else>
+            <OrderItem :ref="`orderRef${item.id}`" :item="item" @printOrder="printOrder" @directFh="directFh" @fillNoFh="fillNoFh" :moreOrderRemind="false"></OrderItem>
+          </div>
+        </div>
+      </block>
+      <block v-else>
+        <app-wrapper-empty title="暂无数据" :is-empty="$util.isEmpty(list.data)" />
+      </block>
+    </div>
+
+    <view class="bottom-bar-view" v-if="!$util.isEmpty(ids)">
+      <view class="bar-content">
+        <button class="admin-button-com big blue" @click="batchFh()">全部发货</button>
+        <button class="admin-button-com big blue" style="margin-left: 50upx;" @click="batchPrint()">合并打印</button>
+      </view>
+    </view>
+
+		<modal-module :show="fhLabelShow" @click="fhConfirm" :maskClosable="true" title="物流信息" padding="30rpx 30rpx" >
+      <template v-slot:content>
+        <div class="app-modal-input-wrap">
+          <div class="inp-list-line">
+            <div class="line-label">物流名称</div>
+            <div class="line-input">
+            <input type="text" v-model="fhWl" @focus="fhWl=''" class="inp-input" />
+            </div>
+          </div>
+          <div class="inp-list-line">
+            <div class="line-label">物流单号</div>
+            <div class="line-input">
+            <input type="text" v-model="fhWlNo" :focus="fhWlFocus" @focus="fhWlNo=''" class="inp-input" />
+            </div>
+          </div>
+        </div>
+      </template>
+		</modal-module>
+
+  </div>
+</template>
+<script>
+import AppWrapperEmpty from "@/components/app-wrapper-empty";
+import ModalModule from "@/components/plugin/modal";
+import { list } from "@/mixins";
+import { mapGetters } from "vuex";
+import orderMixin from "@/mixins/order";
+import OrderItem from "../home/components/OrderItem"
+import { getMergeOrderList,cloudPrintOrder,mergePrintFn,allFhAction,orderFh} from "@/api/order";
+export default {
+  name: "mergeOrder",
+  components: {
+    AppWrapperEmpty,
+    ModalModule,
+    OrderItem,
+  },
+  mixins: [list,orderMixin],
+  computed: { ...mapGetters(["getLoginInfo", "getDictionariesInfo"]) },
+  data() {
+    return {
+      ids:'',
+      fhWlInfo:[],
+      fhWlNo:'',
+      fhWl:'顺丰',
+      fhWlFocus:false,
+      fhLabelShow:false,
+    }
+  },
+  onPullDownRefresh() {
+    this.resetList();
+    this.getOrderList().then((res) => {
+      uni.stopPullDownRefresh();
+    });
+  },
+  onReachBottom() {
+    if (!this.list.finished) {
+      this.getOrderList().then((res) => {
+        uni.stopPullDownRefresh();
+      });
+    } else {
+      uni.stopPullDownRefresh();
+    }
+  },
+  onLoad() {
+    this.getOrderList()
+
+		//返回上一页时不需要刷新
+		let pages = getCurrentPages();
+		let prevPage = pages[ pages.length - 2 ];
+		prevPage.$vm.fromDetail = {status:1}
+
+    this.ids = this.option.ids?this.option.ids:''
+
+  },
+  methods: {
+    //这个有多处要同步修改，关键词：fh_express_pop
+    fillNoFh(info){
+      let that = this
+      this.fhLabelShow = true
+      this.fhWlInfo = info
+			setTimeout(x => {
+				this.$nextTick(() => {
+          that.fhWlFocus = true
+        })
+			}, 200)
+    },
+    fhConfirm(val){
+      let that = this
+			if (val.index == 0) {
+				that.fhLabelShow = false
+				that.fhWlFocus = false
+        that.fhWlNo = ''
+				return
+			}
+      if (this.$util.isEmpty(this.fhWl)){
+        that.$msg('请填写物流名称')
+        return false
+      }
+      if (this.$util.isEmpty(this.fhWlNo)){
+        that.$msg('请填写物流单号')
+        return false
+      }
+      let id = that.fhWlInfo.id ? that.fhWlInfo.id : 0
+      that.$util.confirmModal({content:'确认发货？'},() => {
+          orderFh({id:id,fhType:1,fhWl:that.fhWl,fhWlNo:that.fhWlNo}).then(res=>{
+            if(res.code == 1){
+              that.$refs[`orderRef${id}`][0].currentStatus = 3
+              that.fhLabelShow = false
+              that.fhWlFocus = false
+              that.fhWlNo = ''
+              that.$msg('发货成功')
+            }
+          })
+      })
+    },
+    init(){
+
+    },
+    directFh(info){
+      let that = this
+      that.$util.confirmModal({content:'确认发货？'},() => {
+          orderFh({id:info.id,fhType:0}).then(res=>{
+            if(res.code == 1){
+              that.$refs[`orderRef${info.id}`][0].currentStatus = 3
+              that.$msg('发货成功')
+            }
+          })
+      })
+    },
+    batchFh(){
+      let that = this
+      if(this.$util.isEmpty(this.option.ids)){
+        this.$msg('没有订单')
+      }
+      let mergeId = this.option.mergeId?this.option.mergeId:0
+      that.$util.confirmModal({content:'确认全部发货？'},() => {
+        allFhAction({mergeId:mergeId}).then(res=>{
+          if(res.code == 1){
+            that.$msg('操作成功')
+            that.resetList()
+            that.getOrderList()
+          }
+        })
+      })
+    },
+    batchPrint(){
+      let that = this
+      if(this.$util.isEmpty(this.option.ids)){
+        this.$msg('没有订单')
+      }
+      let mergeId = this.option.mergeId?this.option.mergeId:0
+      that.$util.confirmModal({content:'确认合并打印？'},() => {
+        mergePrintFn({mergeId:mergeId}).then(res=>{
+          if(res.code == 1){
+            that.$msg('打印成功')
+          }
+        })
+      })
+    },
+    printOrder(item){
+      let that = this
+      uni.showLoading({title: '打印中...'});
+      cloudPrintOrder({id:item.id}).then((res) => {
+        uni.hideLoading()
+        if(res.code == 1){
+          if(res.data.hasNoPrint == 1){
+            that.$util.confirmModal({content:'请先设置打印机'},() => {
+              that.$util.pageTo({url: "/admin/shop/print"})
+            })
+          }else{
+            item.printNum++
+          }
+        }
+      })
+    },
+    getOrderList() {
+        let mergeId = this.option.mergeId?this.option.mergeId:0
+        return getMergeOrderList({ mergeId:mergeId }).then((res) => {
+          this.completes(res)
+        }) 
+    }
+  },
+};
+</script>
+<style lang="scss" scoped>
+page{
+	width: 750upx;
+	overflow: hidden;
+}
+.app-content {
+	width: 100%;
+  padding-bottom: 160upx;
+	overflow: hidden;
+  .select-dn_bx {
+    padding-left: 18upx;
+  }
+  .app-tabs {
+    position: fixed;
+    width: 100%;
+    z-index: 9;
+  }
+  .input-wrap_box {
+    background-color: #fff;
+    position: fixed;
+    top: 0;
+    z-index: 10;
+    width: 100%;
+    height: 100upx;
+    display: flex;
+    align-items: center;
+    padding: 0 30upx;
+    & > view:nth-child(2) {
+      flex: 1;
+    }
+  }
+  .list-wrap {
+    padding-top: 20upx;
+    .list {
+      background-color: #fff;
+      margin-bottom: 20upx;
+    }
+  }
+}
+.upload-confirm-wrap {
+  max-height: 600upx;
+  overflow-y: auto;
+  .modal-tit {
+    @include disFlex(center, center);
+    font-size: 40upx;
+    margin-top: 30upx;
+    margin-bottom: 50upx;
+    .iconfont {
+      color: #09bb07;
+      margin-right: 20upx;
+      font-size: 50upx;
+    }
+  }
+  .sel-wrap {
+    color: $fontColor2;
+    font-size: 32upx;
+    .sel-tit {
+      text-align: left;
+    }
+    .sel-btn {
+      @include disFlex(center, flex-start);
+      flex-wrap: wrap;
+      padding: 10upx 0 40upx;
+    }
+  }
+}
+
+// 按钮
+.bottom-bar-view {
+  position: fixed;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 9999;
+  width: 100%;
+  background-color: #FFFFFF;
+  border-top: 1upx solid #eee;
+  box-shadow: 0upx -1upx 6upx 0upx rgba(4, 0, 0, 0.06);
+
+  /* #ifdef MP-WEIXIN */
+  padding-bottom: constant(safe-area-inset-bottom); /* iOS 11.2- */
+  padding-bottom: env(safe-area-inset-bottom); /* iOS 11.2+ */
+  /* #endif */
+
+  /* #ifdef APP-PLUS */
+  padding-bottom: constant(safe-area-inset-bottom); /* iOS 11.2- */
+  padding-bottom: env(safe-area-inset-bottom); /* iOS 11.2+ */
+  /* #endif */
+
+  .bar-content {
+    width: 100%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    padding: 10upx 40upx;
+  }
+}
+</style>

ghsApp/src/admin/order/itemOrder.vue → ghsApp/src/admin/order/productOrder.vue

@@ -54,7 +54,7 @@ import orderMixin from "@/mixins/order";
 import OrderItem from "../home/components/OrderItem"
 import { getListB,cloudPrintOrder,mergePrintFn,allFhAction,orderFh} from "@/api/order";
 export default {
-  name: "itemOrder",
+  name: "productOrder",
   components: {
     AppWrapperEmpty,
     ModalModule,
@@ -155,33 +155,33 @@ export default {
     },
     batchFh(){
       let that = this
-      if(this.option.ids && !this.$util.isEmpty(this.option.ids)){
-        that.$util.confirmModal({content:'确认全部发货？'},() => {
-          allFhAction({ids:this.option.ids}).then(res=>{
-            if(res.code == 1){
-              that.$msg('操作成功')
-              that.resetList()
-              that.getOrderList()
-            }
-          })
-        })
-      }else{
+      if(this.$util.isEmpty(this.option.ids)){
         this.$msg('没有订单')
       }
+      let mergeId = this.option.mergeId?this.option.mergeId:0
+      that.$util.confirmModal({content:'确认全部发货？'},() => {
+        allFhAction({mergeId:mergeId}).then(res=>{
+          if(res.code == 1){
+            that.$msg('操作成功')
+            that.resetList()
+            that.getOrderList()
+          }
+        })
+      })
     },
     batchPrint(){
       let that = this
-      if(this.option.ids && !this.$util.isEmpty(this.option.ids)){
-        that.$util.confirmModal({content:'确认合并打印？'},() => {
-          mergePrintFn({ids:this.option.ids}).then(res=>{
-            if(res.code == 1){
-              that.$msg('打印成功')
-            }
-          })
-        })
-      }else{
+      if(this.$util.isEmpty(this.option.ids)){
         this.$msg('没有订单')
       }
+      let mergeId = this.option.mergeId?this.option.mergeId:0
+      that.$util.confirmModal({content:'确认合并打印？'},() => {
+        mergePrintFn({mergeId:mergeId}).then(res=>{
+          if(res.code == 1){
+            that.$msg('打印成功')
+          }
+        })
+      })
     },
     printOrder(item){
       let that = this
@@ -200,21 +200,9 @@ export default {
       })
     },
     getOrderList() {
-      if(this.option.productId){
         return getOrderInfoList({ productId:this.option.productId, page: this.list.page }).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)
-        }) 
-      }
     }
   },
 };

ghsApp/src/api/order/index.js

@@ -284,4 +284,7 @@ export const modifyAddress = data => {
 }
 
 //获取订单花材的筛数明细
-export const getTree = data => https.get("/order-tree/get-tree", data);
+export const getTree = data => https.get("/order-tree/get-tree", data);
+
+export const getMergeOrderList = data => https.get("/order/merge-order-list", data);
+

ghsApp/src/pages.json

@@ -504,7 +504,9 @@
 		{
 			"root": "admin/order",
 			"pages": [
-				{"path": "itemOrder","style": {"navigationBarTitleText": "订单列表"}},
+				{"path": "productOrder","style": {"navigationBarTitleText": "下单记录"}},
+				{"path": "customOrder","style": {"navigationBarTitleText": "下单记录"}},
+				{"path": "mergeOrder","style": {"navigationBarTitleText": "订单列表"}},
 				{"path": "scanPay","style": {"navigationBarTitleText": "收款码流水"}},
 				{"path": "bookSet","style": {"navigationBarTitleText": "预订开关"}},
 				{"path": "statBook","style": {"navigationBarTitleText": "预订汇总","enablePullDownRefresh": true}},

ghsApp/src/pagesClient/member/detail.vue

@@ -154,7 +154,7 @@
               <div class="tui-title">挂账变动明细</div>
             </tui-list-cell>
 
-            <tui-list-cell class="line-cell" :hover="false" :arrow="true" @click="pageTo({url:'/admin/order/itemOrder?customId='+userInfo.id})">
+            <tui-list-cell class="line-cell" :hover="false" :arrow="true" @click="pageTo({url:'/admin/order/customOrder?customId='+userInfo.id})">
               <div class="tui-title">下单记录</div>
               <view style="font-size:24upx;" v-if="userInfo.recentExpend!='0000-00-00 00:00:00'">最近下单 {{ userInfo.recentExpend ? userInfo.recentExpend.substr(5,11) : '' }}</view>
             </tui-list-cell>