Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui

buyer/src/pages/home/enumeration.js

@@ -17,6 +17,10 @@ export const orderStatusList = [
     name: '待发货',
     status: 'UNDELIVERED'
   },
+  {
+    name: '部分发货',
+    status: 'PARTS_DELIVERED'
+  },
   {
     name: '已发货',
     status: 'DELIVERED'

manager/src/components/lili-dialog/template/marketing.vue

@@ -339,15 +339,15 @@ export default {
               this.sortGoods("SECKILL");
             },
           };
-        case "COUPON":
+        // case "COUPON":
-          return {
+        //   return {
-            title: "优惠券",
+        //     title: "优惠券",
-            methodsed: () => {
+        //     methodsed: () => {
-              this.showPromotionList = [];
+        //       this.showPromotionList = [];
-              this.activeColumns = this.pintuanColumns;
+        //       this.activeColumns = this.pintuanColumns;
-              this.sortGoods("COUPON");
+        //       this.sortGoods("COUPON");
-            },
+        //     },
-          };
+        //   };
         case "POINTS_GOODS":
           return {
             title: "积分商品",
@@ -383,6 +383,8 @@ export default {
     getPromotion(res) {
       if (res.result) {
         this.promotionList = res.result;
+        // 去除优惠券
+        delete this.promotionList.COUPON;
         Object.keys(res.result)[0] && this.typeOption(Object.keys(res.result)[0]).methodsed();
       }
 

manager/src/views/order/order/orderList.vue

@@ -267,6 +267,10 @@ export default {
               return h("div", [
                 h("tag", { props: { color: "geekblue" } }, "待自提"),
               ]);
+            } else if (params.row.orderStatus == "PARTS_DELIVERED") {
+              return h("div", [
+                h("tag", { props: { color: "cyan" } }, "部分发货"),
+              ]);
             } else if (params.row.orderStatus == "DELIVERED") {
               return h("div", [
                 h("tag", { props: { color: "cyan" } }, "已发货"),
@@ -320,6 +324,7 @@ export default {
         {title: '未付款', value: 'UNPAID'},
         {title: '已付款', value: 'PAID'},
         {title: '待发货', value: 'UNDELIVERED'},
+        {title: '部分发货', value: 'PARTS_DELIVERED'},
         {title: '已发货', value: 'DELIVERED'},
         {title: '待核验', value: 'TAKE'},
         {title: '待自提', value: 'STAY_PICKED_UP'},

manager/src/views/page-decoration/modelForm.vue

@@ -134,7 +134,7 @@
               <td>
                 <Input
                   v-model="item.url"
-                  disabled
+                  :disabled="!item.title || item.title !== '外部链接'"
                 />
               </td>
               <!-- <td><Input v-model="item.sort"/></td> -->
@@ -201,15 +201,16 @@ export default {
         bgColor: "#de000d",
         size: "1200*80",
       },
+      currentIndex: 0,
       navList: {
         // 分类nav数据
         type: "navBar",
         list: [
-          { name: "秒杀", url: "" },
+          { name: "秒杀", url: "", title: "" },
-          { name: "闪购", url: "" },
+          { name: "闪购", url: "", title: "" },
-          { name: "优惠券", url: "" },
+          { name: "优惠券", url: "", title: "" },
-          { name: "拍卖", url: "" },
+          { name: "拍卖", url: "", title: "" },
-          { name: "服装城", url: "" },
+          { name: "服装城", url: "", title: "" },
         ],
       },
     };
@@ -228,21 +229,19 @@ export default {
       // 调起选择链接弹窗
       if (item) this.selectedNav = item;
       this.$refs.liliDialog.open("link");
-      console.log(item);
+      this.currentIndex = index;
     },
     // 已选链接
     selectedLink(val) {
 
-
       if (this.showModalNav) {
         this.selectedNav.url = this.$options.filters.formatLinkType(val);
-        this.selectedNav.type =
+        this.selectedNav.type = val.___type === "other" && val.url === "" ? "link" : "other";
-          val.___type === "other" && val.url === "" ? "link" : "other";
       } else {
         this.topAdvert.url = this.$options.filters.formatLinkType(val);
-        this.topAdvert.type =
+        this.topAdvert.type = val.___type === "other" && val.url === "" ? "link" : "other";
-          val.___type === "other" && val.url === "" ? "link" : "other";
       }
+      this.navList.list[this.currentIndex].title = val.title;
     },
     handleDelNav(index) {
       // 删除导航
@@ -250,7 +249,9 @@ export default {
     },
     handleAddNav() {
       // 添加导航
-      this.navList.list.push({ name: "", url: "" });
+      this.navList.list.push({ name: "", url: "", title: "" });this.$nextTick(() => {
+        this.selectedNav.title = val.title;
+      });
     },
     // 拖动结束回调
     handleMoveEnd({ newIndex, oldIndex }) {

seller/src/views/order/order/orderList.vue

@@ -36,6 +36,7 @@
             <Option value="UNPAID">未付款</Option>
             <Option value="PAID">已付款</Option>
             <Option value="UNDELIVERED">待发货</Option>
+            <Option value="PARTS_DELIVERED">部分发货</Option>
             <Option value="DELIVERED">已发货</Option>
             <Option value="COMPLETED">已完成</Option>
             <Option value="CANCELLED">已取消</Option>
@@ -233,10 +234,14 @@ export default {
               return h("div", [
                 h("tag", { props: { color: "geekblue" } }, "待发货"),
               ]);
-            }else if (params.row.orderStatus == "STAY_PICKED_UP") {
+            } else if (params.row.orderStatus == "STAY_PICKED_UP") {
               return h("div", [
                 h("tag", { props: { color: "geekblue" } }, "待自提"),
               ]);
+            } else if (params.row.orderStatus == "PARTS_DELIVERED") {
+              return h("div", [
+                h("tag", { props: { color: "cyan" } }, "部分发货"),
+              ]);
             } else if (params.row.orderStatus == "DELIVERED") {
               return h("div", [
                 h("tag", { props: { color: "cyan" } }, "已发货"),