liyongli 3 жил өмнө
parent
commit
269307ede7

+ 13 - 0
src/api/index.js

@@ -161,3 +161,16 @@ export function upRule(data) {
     data,
   });
 }
+
+/**
+ * 菜单列表
+ * @returns {AjaxPromise}
+ */
+ export function menulist(data) {
+    return ajax({
+      urlType: 'menuURL',
+      url: "/menu/recently",
+      method: "GET",
+      data,
+    });
+  }

+ 2 - 1
src/config/index.js

@@ -1,6 +1,7 @@
 export default {
     base:{
         defaultURl: "http://47.108.249.49:9001",
-        M3BaseURL: "http://113.142.79.115:8081"
+        M3BaseURL: "http://113.142.79.115:8081",
+        menuURL: "http://47.108.249.49:9002"
     }
 }

+ 12 - 46
src/views/MenuDiet.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="MenuDiet">
-    <br v-if="!list.length" />
-    <br v-if="!list.length" />
-    <van-skeleton title v-if="!list.length" :row="10" />
+    <br v-if="load" />
+    <br v-if="load" />
+    <van-skeleton title v-if="load" :row="10" />
     <van-dropdown-menu v-if="list.length">
       <van-dropdown-item v-model="value1" :options="list" @change="change">
         <template #title>
@@ -63,12 +63,13 @@ import "vant/lib/skeleton/style/index";
 import "vant/lib/cell/style/index";
 import "vant/lib/cell-group/style/index";
 
-// import { orderList, cancel } from "../api/index";
+import { menulist } from "../api/index";
 
 export default {
   name: "MenuDiet",
   data() {
     return {
+      load: false,
       list: [],
       option1: [
         { text: "今天(2022/02/11)", value: 0 },
@@ -78,51 +79,16 @@ export default {
     };
   },
   mounted() {
-    let list = [
-      {
-        text: "今天",
-        date: "2022/02/12",
-        id: 0,
-        child: [
-          {
-            meal: "早餐",
-            varietyOfDishes: [
-              {
-                title: "热菜",
-                value: [
-                  "干炸马面鱼",
-                  "宽粉红烧肉",
-                  "莲菜炒肉片",
-                  "麻婆豆腐",
-                  "酸辣土豆丝",
-                  "蘑菇青菜",
-                ],
-              },
-              {
-                title: "主食",
-                value: ["米饭", "馒头", "花卷", "杂粮"],
-              },
-              {
-                title: "汤",
-                value: ["西红柿鸡蛋汤", "醪糟羹"],
-              },
-              {
-                title: "其他",
-                value: ["时令水果"],
-              },
-            ],
-          },
-        ],
-      },
-    ];
-    let o = setTimeout(() => {
-      clearTimeout(o);
-      this.list = list.map((v, i) => {
+    this.load = true;
+    menulist().then(r => {
+      this.list = (r || []).map((v, i) => {
         v.value = i;
         return v;
       });
-    }, 2000);
-    console.log(this.list);
+      this.load = false;
+    }).catch(()=>{
+      this.load = false;
+    });
     document.title = "菜单";
   },
   computed: {},

+ 15 - 6
src/views/PushMenu.vue

@@ -1,7 +1,8 @@
 <template>
   <div class="PushMenu">
     <el-date-picker
-      v-model="value1"
+      v-model="dt"
+      value-format="yyyyMMdd"
       type="week"
       format="yyyy 第 WW 周"
       placeholder="选择周"
@@ -12,7 +13,8 @@
     <el-upload
       class="upload-demo"
       drag
-      action="https://jsonplaceholder.typicode.com/posts/"
+      :data="{dt}"
+      :action="baseURl + '/menu/upload'"
       :before-upload="beforeUpload"
       multiple
     >
@@ -26,17 +28,24 @@
 <script>
 // @ is an alias to /src
 
-// import { orderList, cancel } from "../api/index";
-
+import config from "../config/index.js";
 export default {
   name: "PushMenu",
   data() {
     return {
-      value1: "",
+      dt: "",
+      baseURl: config.base.menuURL
     };
   },
   mounted() {
-    this.value1 = new Date();
+    let dt = new Date();
+    let y = dt.getFullYear(),
+    m = dt.getMonth() + 1,
+    d = dt.getDate();
+    y > 9 ? '' : y = '0' + y;
+    m > 9 ? '' : m = '0' + m;
+    d > 9 ? '' : d = '0' + d;
+    this.dt = [y,m,d].join("")
     document.title = "上传菜单";
   },
   computed: {},