zhaoyun 1 dzień temu
rodzic
commit
187eb58a46

+ 19 - 0
mer_plat_admin/src/components/linkaddress/index.vue

@@ -67,6 +67,20 @@
               </div>
             </div>
           </div>
+					<div v-if="orderList.length">
+					  <div class="cont">订单中心</div>
+					  <div class="Box">
+					    <div
+					      class="cont_box"
+					      :class="currenId == item.id ? 'on' : ''"
+					      v-for="(item, index) in orderList"
+					      :key="index"
+					      @click="getUrl(item)"
+					    >
+					      {{ item.name }}
+					    </div>
+					  </div>
+					</div>
         </div>
         <div class="right_box" v-if="currenType == 'marketing_link'">
           <div v-if="coupon.length">
@@ -269,6 +283,7 @@ export default {
       basicsList: [],
       userList: [],
       distributionList: [],
+	  orderList: [],
       coupon: [],
       group: [],
       integral: [],
@@ -414,6 +429,7 @@ export default {
       }
       let basicsList = [];
       let distributionList = [];
+	  let orderList = [];
       let userList = [];
       let integral = [];
       let coupon = [];
@@ -429,6 +445,8 @@ export default {
           integral.push(e);
         } else if (e.type == 8) {
           group.push(e);
+        }  else if (e.type == 5) {
+          orderList.push(e);
         } else {
           coupon.push(e);
         }
@@ -436,6 +454,7 @@ export default {
       this.basicsList = basicsList;
       this.distributionList = distributionList;
       this.userList = userList;
+	  this.orderList = orderList;
       this.coupon = coupon;
       this.integral = integral;
       this.group = group;

+ 85 - 1
mer_plat_admin/src/components/linkaddress/linkData.json

@@ -420,7 +420,91 @@
         "status": 1,
         "sort": 998,
         "add_time": 1626837579
-      }
+      },
+	  {
+	    "id": 32,
+	    "cate_id": 5,
+	    "type": 1,
+	    "name": "订单",
+	    "url": "/pages/order/index",
+	    "param": " ",
+	    "example": "/pages/order/index",
+	    "status": 1,
+	    "sort": 999,
+	    "add_time": 1626837579
+	  },
+	  {
+	    "id": 33,
+	    "cate_id": 5,
+	    "type": 5,
+	    "name": "待付款",
+	    "url": "/pages/goods/order_list/index?status=0",
+	    "param": " ",
+	    "example": "/pages/goods/order_list/index?status=0",
+	    "status": 1,
+	    "sort": 0,
+	    "add_time": 1626837579
+	  },
+	  {
+	    "id": 34,
+	    "cate_id": 5,
+	    "type": 5,
+	    "name": "待取餐",
+	    "url": "/pages/goods/order_list/index?status=1",
+	    "param": " ",
+	    "example": "/pages/goods/order_list/index?status=1",
+	    "status": 1,
+	    "sort": 0,
+	    "add_time": 1626837579
+	  },
+	  {
+	    "id": 35,
+	    "cate_id": 5,
+	    "type": 5,
+	    "name": "待核销",
+	    "url": "/pages/goods/order_list/index?status=3",
+	    "param": " ",
+	    "example": "/pages/goods/order_list/index?status=3",
+	    "status": 1,
+	    "sort": 0,
+	    "add_time": 1626837579
+	  },
+	  {
+	    "id": 36,
+	    "cate_id": 5,
+	    "type": 5,
+	    "name": "配送中",
+	    "url": "/pages/goods/order_list/index?status=4",
+	    "param": " ",
+	    "example": "/pages/goods/order_list/index?status=4",
+	    "status": 1,
+	    "sort": 0,
+	    "add_time": 1626837579
+	  },
+	  {
+	    "id": 37,
+	    "cate_id": 5,
+	    "type": 5,
+	    "name": "待评价",
+	    "url": "/pages/goods/evaluation_list/index",
+	    "param": " ",
+	    "example": "/pages/goods/evaluation_list/index",
+	    "status": 1,
+	    "sort": 0,
+	    "add_time": 1626837579
+	  },
+	  {
+	    "id": 38,
+	    "cate_id": 5,
+	    "type": 5,
+	    "name": "售后/退款",
+	    "url": "/pages/goods/user_return_list/index",
+	    "param": " ",
+	    "example": "/pages/goods/user_return_list/index",
+	    "status": 1,
+	    "sort": 0,
+	    "add_time": 1626837579
+	  }
     ]
   }
 }

+ 34 - 10
mer_plat_admin/src/views/pagediy/viewDesign/index.vue

@@ -102,7 +102,7 @@
                     </div>
                   </div>
                 </div>
-                <div class="order_wrap">
+                <div class="order_wrap cur_pointer"  :class="{ select_ctive: shows == 9 }" @click="handleMessage('orderMenu')">
                   <div class="order_wrap_tit">
                     <span class="weight_600">订单中心</span>
                     <div>
@@ -111,7 +111,11 @@
                     </div>
                   </div>
                   <div class="order_wrap_list">
-                    <div class="order_list_item">
+										<div class="order_list_item" v-for="(item, index) in dataList[5]" :key="index">
+										  <img :src="item.pic" alt="" />
+										  <p>{{ item.name }}</p>
+										</div>
+                    <!-- <div class="order_list_item">
                       <img src="@/assets/imgs/fukuan.png" alt="" />
                       <p>待付款</p>
                     </div>
@@ -130,7 +134,7 @@
                     <div class="order_list_item">
                       <img src="@/assets/imgs/tuikuan.png" alt="" />
                       <p>售后/退款</p>
-                    </div>
+                    </div> -->
                   </div>
                 </div>
                 <div
@@ -444,12 +448,21 @@ export default {
         this.infoStatus = true;
         this.$message.warning('设置数据不能超过4条');
       } else {
-        const indexMenu = JSON.parse(JSON.stringify(this.menuList[0]));
-        indexMenu.id = null;
-        indexMenu.name = '';
-        indexMenu.url = '';
-        indexMenu.info = '';
-        indexMenu.pic = '';
+        const indexMenu ={
+			id: null,
+			name: '',
+			url: '',
+			info: '',
+			pic: ''
+		};
+		// if(this.menuList.length>0){
+		// 	indexMenu=JSON.parse(JSON.stringify(this.menuList[0]));
+		// }
+  //       indexMenu.id = null;
+  //       indexMenu.name = '';
+  //       indexMenu.url = '';
+  //       indexMenu.info = '';
+  //       indexMenu.pic = '';
         this.menuList.push(indexMenu);
       }
     },
@@ -482,7 +495,10 @@ export default {
         let userBanner = res.userBanner.filter((item, index, arr) => {
           return item.status == true;
         });
-        newArr.push(indexMenu, indexBanner, userMenu, indexNews, userBanner);
+		let orderMenu = res.orderMenu.filter((item, index, arr) => {
+				  return item.status == true;
+		});
+        newArr.push(indexMenu, indexBanner, userMenu, indexNews, userBanner,orderMenu);
         this.dataList = newArr;
         this.$set(this, 'newsInfo', indexNews[0] ? indexNews[0].title : '这是一个新闻标题');
       });
@@ -530,6 +546,11 @@ export default {
           this.tip = false;
           this.shows = 7;
           break;
+		case 'orderMenu':
+		    this.menuList = this.menuInfo.orderMenu;
+		    this.shows = 9;
+		    this.mockGoods = false;
+		    break;
       }
     },
     switchNav(index) {
@@ -583,6 +604,9 @@ export default {
         case 'bottomNavigation':
           this.saveData('bottomNavigation', '/admin/platform/page/layout/bottom/navigation/save');
           break;
+		case 'orderMenu':
+		  this.saveData('orderMenu', '/admin/platform/page/layout/order/menu/save');
+		  break;
       }
     }),
     saveData(param, url) {