shish vor 4 Jahren
Ursprung
Commit
c767ee0ccc

+ 4 - 4
hdPad/src/pages/home/components/nav.vue

@@ -15,9 +15,9 @@ export default {
     return {
     return {
       nav: [
       nav: [
         { name: "收银", page: "/pages/home/cash" },
         { name: "收银", page: "/pages/home/cash" },
-        { name: "制单", page: "/pages/home/work" },
-        { name: "选品", page: "/pages/home/selectMake" },
-        { name: "新做", page: "/pages/home/make" },
+        { name: "制单", page: "/pages/home/work" },
+        { name: "选品建单", page: "/pages/home/selectMake" },
+        { name: "选材建单", page: "/pages/home/make" },
       ],
       ],
       device:'',
       device:'',
     };
     };
@@ -66,7 +66,7 @@ export default {
   & .item-list {
   & .item-list {
     font-size: 10upx;
     font-size: 10upx;
     text-align: center;
     text-align: center;
-    padding: 15upx 0;
+    padding: 20upx 0;
     color: white;
     color: white;
     width: 28upx;
     width: 28upx;
   }
   }

+ 4 - 4
hdPad/src/pages/home/components/workList.vue

@@ -14,7 +14,10 @@
                         <view class="current-item-title"><text class="name">{{item.name}}</text></view>
                         <view class="current-item-title"><text class="name">{{item.name}}</text></view>
                         <image class="flower-image" :src="item.cover"></image>
                         <image class="flower-image" :src="item.cover"></image>
                     </view>
                     </view>
-                    <view class="item-price-num"> <view>今天 12:00</view> <view>待完成</view></view>
+                    <view class="item-price-num">
+                        <view>{{item.addTime ?item.addTime.substr(5,11):''}}</view>
+                        <view>{{item.status == 0 ? '待完成':item.status==1?'已完成':item.status==2?'已取消':'待完成'}}</view>
+                    </view>
                 </view>
                 </view>
             </view>
             </view>
         </scroll-view>
         </scroll-view>
@@ -78,9 +81,6 @@ export default {
         onRestore(){
         onRestore(){
             console.log('onRestore')
             console.log('onRestore')
         },
         },
-        onAbort() {  
-            console.log(1);  
-        },
         getOrder(item,click=0){
         getOrder(item,click=0){
             if(click == 1){
             if(click == 1){
                 this.$util.hitVoice()
                 this.$util.hitVoice()