解决冲突

hdApp/src/admin/home/order.vue

@@ -233,41 +233,16 @@ export default {
       uni.stopPullDownRefresh();
     }
   },
-<<<<<<< HEAD
-  mounted () {
-    // getCategory()
-    // getUsage()
+  computed: {
+    ...mapGetters({ categoryData: 'getCategory' }),
+    ...mapGetters({ usageData: 'getUsage' })
   },
-  onLoad (option) {
-    let dateDefaultOption = [];
-    let list = this.getDictionariesInfo.dateDefaultOption;
-    for (let i = 0; i < list.length; i++) {
-      dateDefaultOption.push({ name: list[i].name, id: list[i].value });
-    }
-    this.menuObj = {
-      title: "时间",
-      titleChild: "时间",
-      list: dateDefaultOption,
-    };
-    let tabIndex = uni.getStorageSync("switchTabQuery") || null;
-    if (tabIndex) {
-      uni.removeStorageSync("switchTabQuery");
-      this.tabIndex = parseInt(tabIndex.tabIndex);
-    }
+  mounted () {
+    getCategory()
+    getUsage()
   },
+  onLoad: function () { },
   onShow () {
-=======
-	computed: {
-		...mapGetters({ categoryData: 'getCategory' }),
-		...mapGetters({ usageData: 'getUsage' })
-  },
-	mounted() {
-		getCategory()
-		getUsage()
-	},
-  onLoad: function() {},
-  onShow() {
->>>>>>> 7987aa03fda3bc7f44659e2753ca83574acfb8b8
     let tabIndex = uni.getStorageSync("switchTabQuery") || null;
     if (tabIndex) {
       uni.removeStorageSync("switchTabQuery");
@@ -275,98 +250,11 @@ export default {
     }
   },
   methods: {
-<<<<<<< HEAD
-    selectTime (type) {
-      (this.customizationTime = [time, time]),
-        (this.customizationTimeType = type),
-        (this.isShow = true);
-    },
-    //选择自定义时间确定
-    timeChange (e) {
-      this.isShow = false;
-      this.resetList();
-      this._list(this.customizationTimeType, e);
-    },
-    //选择自定义时间取消
-    timeCancel (e) {
-      this.isShow = false;
-    },
-    statusFormat (status) {
-      switch (status) {
-        case "1":
-          return "待付款";
-          break;
-        case "2":
-          return "待配送";
-          break;
-        case "3":
-          return "配送中";
-          break;
-        case "4":
-          return "已完成";
-          break;
-        case "5":
-          return "已取消";
-          break;
-        case "6":
-          return "已退款";
-          break;
-        default:
-          return "";
-      }
-    }, // 操作按钮
-    openBt (s, item) {
-      console.log(123);
-      // 花材
-      if (s.type === "item") {
-        uni.navigateTo({ url: `/pagesOrder/select?id=${item.id}` });
-        // 自取
-      } else if (s.type === "selfGet") {
-        this.operateData = item;
-        let self = this;
-        uni.showModal({
-          title: "提示",
-          content: "确认客户已自取",
-          confirmText: "确认",
-          success: function (res) {
-            if (res.confirm) {
-              self.freeShipModalClick();
-            }
-          },
-        });
-        //发货
-      } else if (s.type === "send") {
-        this.pageTo({
-          url: "/pagesOrder/ship",
-          query: {
-            id: item.id,
-          },
-        });
-      }
-    },
-    selectSussess (val) {
-      // this._list();
-      console.log(val);
-      if (val.select == "自定义") {
-        this.selectTime(val.selectItem.id);
-      } else {
-        this.resetList();
-        this._list(val.selectItem.id, "");
-      }
-    },
-    searchFn (e) {
-      this.resetList();
-      this.seekVal = e;
-      this._list();
-    },
-    _list (type, timeArr) {
-=======
-    init() {
+    init () {
       this._list();
     },
-    _list() {
+    _list () {
       let status = JSON.parse(JSON.stringify(this.tabIndex));
->>>>>>> 7987aa03fda3bc7f44659e2753ca83574acfb8b8
       return getListB({
         status: status,
         search: "",
@@ -381,12 +269,7 @@ export default {
         this.tabs[4].value = res.data.asset.finishOrder;
       });
     },
-<<<<<<< HEAD
     change (e) {
-      console.log(e);
-=======
-    change(e) {
->>>>>>> 7987aa03fda3bc7f44659e2753ca83574acfb8b8
       if (this.tabIndex == e.index) {
         return false;
       } else {
@@ -402,14 +285,7 @@ export default {
       this.freeShipModal = true;
     },
     // 免发货
-<<<<<<< HEAD
     freeShipModalClick (e) {
-      freeShipping({ id: this.operateData.id }).then((res) => {
-        this._list();
-        this.$msg("操作成功！");
-      });
-=======
-    freeShipModalClick(e) {
       if (e.index === 0) {
         this.modalCancel();
       } else {
@@ -420,7 +296,6 @@ export default {
           this.modalCancel();
         });
       }
->>>>>>> 7987aa03fda3bc7f44659e2753ca83574acfb8b8
     },
     // 查看配送
     seeSendFn (item) {
@@ -437,13 +312,8 @@ export default {
       this.freeShipModal = false;
       this.classifyModal = false;
     },
-<<<<<<< HEAD
     classifyOrder (id) {
-      // this.classifyModal = true
-=======
-    classifyOrder(id){
       this.classifyModal = true
->>>>>>> 7987aa03fda3bc7f44659e2753ca83574acfb8b8
       this.currentOrderId = id;
     },
     confirmClassify (e) {