订单部分

ghs/src/admin/home/order.vue

@@ -55,45 +55,10 @@
               <span>金额：</span>
               <span class="app-size-30 app-bold">¥{{ item.actPrice }}</span>
             </div>
-
             <div class="list-button">
-              <template v-if="item.status == 0">
-                <div class="admin-button-com default" @click.stop>自取</div>
-                <div class="admin-button-com default" @click.stop>发货</div>
-              </template>
-              <template v-else-if="item.status == 4"></template>
-              <template v-else-if="item.status == 6">
-                <div
-                  v-if="item.sendType == 3"
-                  class="admin-button-com default"
-                  style="color: #dddddd;border-color:#dddddd;"
-                >已退款</div>
-              </template>
-              <template v-else-if="item.status == 5">
-                <div
-                  v-if="item.sendType != 1"
-                  class="admin-button-com default"
-                  @click.stop="seeSendFn(item)"
-                >配送详情</div>
-              </template>
-              <template v-else>
-                <template v-if="item.currentFlow == 1">
-                  <div class="admin-button-com" @click.stop="freeShippingFn(item, index)">自取</div>
-                  <div
-                    class="admin-button-com"
-                    @click.stop="pageTo({url: '/admin/order/ship',query: {id: item.id,pageStatus: 0}})"
-                  >发货</div>
-                </template>
-                <template v-else>
-                  <div
-                    class="admin-button-com"
-                    @click.stop="pageTo({url: '/admin/order/ship',query: {id: item.id,pageStatus: 0}})"
-                  >发货</div>
-                </template>
-              </template>
-              <template v-if="item.payStatus == 1 && item.classify == 0">
-                <div class="admin-button-com mini" @click.stop="classifyOrder(item.id)" >分类</div>
-              </template>
+               <div class="admin-button-com default" >花材</div>
+               <div class="admin-button-com default" >自取</div>
+               <div class="admin-button-com default" >发货</div>
             </div>
           </div>
         </div>
@@ -114,10 +79,9 @@
     ></modal-module>
 
 		<!-- 选取分类 -->
-		<modal-module :show="classifyModal" :maskClosable="false" @cancel="modalCancel" @click="confirmClassify" title="订单分类" padding="30rpx 30rpx">
+		<!-- <modal-module :show="classifyModal" :maskClosable="false" @cancel="modalCancel" @click="confirmClassify" title="订单分类" padding="30rpx 30rpx">
 			<template v-slot:content>
 				<div class="upload-confirm-wrap">
-					<!-- 选择分类 -->
 					<div class="sel-wrap">
 						<div class="sel-tit">类型</div>
 						<div class="sel-btn">
@@ -126,7 +90,6 @@
 							</block>
 						</div>
 					</div>
-					<!-- 选择用途 -->
 					<div class="sel-wrap">
 						<div class="sel-tit">用途</div>
 						<div class="sel-btn">
@@ -137,14 +100,14 @@
 					</div>
 				</div>
 			</template>
-		</modal-module>
+		</modal-module> -->
 
   </div>
 </template>
 
 <script>
 import AppTabs from "@/components/plugin/tabs";
-import ListModule from "@/components/module/app-order-list";
+// import ListModule from "@/components/module/app-order-list";
 import AppWrapperEmpty from "@/components/app-wrapper-empty";
 import ModalModule from "@/components/plugin/modal";
 import { getCategory, getUsage } from '@/utils/config'
@@ -157,7 +120,7 @@ import DorpdownSelect from '@/components/module/dorpdownSelect'
 export default {
   name: "order-list",
   components: {
-    ListModule,
+    // ListModule,
     AppTabs,
     AppWrapperEmpty,
     ModalModule,
@@ -168,27 +131,32 @@ export default {
   data() {
     return {
       tabIndex: 0,
-      classifyModal:false,
+      // classifyModal:false,
       tabs: [
         {
           name: "全部",
-          value: 0
+          value: 0,
+          id:0
         },
         {
           name: "待付款",
-          value: 0
+          value: 0,
+          id:1
         },
         {
           name: "待配送",
-          value: 0
+          value: 0,
+          id:2
         },
         {
           name: "配送中",
-          value: 0
+          value: 0,
+          id:3
         },
         {
           name: "已完结",
-          value: 0
+          value: 0,
+          id:6
         }
       ],
       operateIndex: null,
@@ -243,23 +211,22 @@ export default {
       this._list();
     },
     _list() {
-      let status = JSON.parse(JSON.stringify(this.tabIndex));
-      status = status == 4 ? 5 : status - 1;
       return getListB({
-        status: status,
+        status: this.tabs[this.tabIndex].id,
         search: "",
         page: this.list.page
       }).then(res => {
         this.completes(res);
         if (this.$util.isEmpty(res.data)) return false;
-        this.tabs[0].value = res.data.asset.totalOrder;
-        this.tabs[1].value = res.data.asset.unPayOrder;
-        this.tabs[2].value = res.data.asset.unSendOrder;
-        this.tabs[3].value = res.data.asset.sendingOrder;
-        this.tabs[4].value = res.data.asset.finishOrder;
+        this.tabs[0].value = res.data.allNum || 0;
+        this.tabs[1].value = res.data.unPayNum || 0;
+        this.tabs[2].value = res.data.unSendNum || 0;
+        this.tabs[3].value = res.data.sendingNum || 0;
+        this.tabs[4].value = res.data.finishNum || 0;
       });
     },
     change(e) {
+      console.log(e)
       if (this.tabIndex == e.index) {
         return false;
       } else {
@@ -300,31 +267,31 @@ export default {
     // 关闭弹窗
     modalCancel() {
       this.freeShipModal = false;
-      this.classifyModal = false;
+      // this.classifyModal = false;
     },
     classifyOrder(id){
-      this.classifyModal = true
+      // this.classifyModal = true
       this.currentOrderId = id;
     },
-		confirmClassify(e) {
-			if (e.index === 0) {
-				this.modalCancel()
-			} else {
-				orderClass({
-					id: this.currentOrderId,
-					...this.classifyForm
-				}).then(res => {
-          this.classifyModal = false;
-					this.$msg('分类成功！')
-				})
-			}
-    },
-    selCategoryFn(item) {
-      this.classifyForm.categoryId = item.id
-    },
-    selUsageFn(item) {
-      this.classifyForm.usageId = item.id
-    }
+		// confirmClassify(e) {
+		// 	if (e.index === 0) {
+		// 		this.modalCancel()
+		// 	} else {
+		// 		orderClass({
+		// 			id: this.currentOrderId,
+		// 			...this.classifyForm
+		// 		}).then(res => {
+    //       this.classifyModal = false;
+		// 			this.$msg('分类成功！')
+		// 		})
+		// 	}
+    // },
+    // selCategoryFn(item) {
+    //   this.classifyForm.categoryId = item.id
+    // },
+    // selUsageFn(item) {
+    //   this.classifyForm.usageId = item.id
+    // }
   }
 };
 </script>

ghs/src/components/plugin/tabs.vue

@@ -23,7 +23,7 @@
 				class="tui-tabs-item"
 				:class="{ 'border-left': borderLeft }"
 				:style="{ width: itemWidth }"
-				@tap.stop="swichTabs(index)"
+				@tap.stop="swichTabs(item,index)"
 			>
 				<view
 					class="tui-tabs-title"
@@ -227,14 +227,15 @@ export default {
 			this.scrollLeft = scrollLeft;
 		},
 		// 点击标题切换当前页时改变样式
-		swichTabs: function(index) {
+		swichTabs: function(i,index) {
 			let item = this.tabs[index];
 			if (item && item.disabled) return;
 			if (this.currentTab == index) {
 				return false;
 			} else {
 				this.$emit("change", {
-					index: Number(index)
+					index: Number(index),
+					item: i
 				});
 			}
 		},