shish %!s(int64=4) %!d(string=hai) anos
pai
achega
11cb72dc6b

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

@@ -2,12 +2,12 @@
 <view class="button-area">
 	<view class="active" @click="changeProperty(1)">花材</view>
 	<view @click="changeProperty(0)">成品</view>
-    <view @click="logout">退出</view>
-    <view @click="resetCustomer">选客</view>
+	<view @click="gosettleCommit">结算 </view>
 	<view>收款</view>
-    <view @click="clearItemFn">清空</view>
     <view @click="breakage">报损</view>
-    <view @click="gosettleCommit">结算 </view>
+	<view @click="resetCustomer">选客</view>
+    <view @click="clearItemFn">清空</view>
+	<view @click="logout">退出</view>
 
     <!-- 清空 -->
     <uni-popup ref="clearItemRef" type="dialog">

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

@@ -7,7 +7,7 @@
 export default {
   data() {
     return {
-        nav:[{name:'收银',page:'/pages/home/cash'},{name:'工单',page:'/pages/home/work'},{name:'新款',page:'/pages/home/make'},{name:'选款',page:'/pages/home/selectMake'}]
+        nav:[{name:'收银',page:'/pages/home/cash'},{name:'工单',page:'/pages/home/work'},{name:'选款',page:'/pages/home/selectMake'},{name:'新款',page:'/pages/home/make'}]
     }
   },
   methods:{

+ 3 - 3
hdPad/src/pages/home/components/orderInfo.vue

@@ -75,11 +75,11 @@
       </view>
 
       <view class="button-area">
-        <view @click="modifyItem(orderInfo)">修改</view>
-        <view>取消</view>
-        <view>锁定</view>
         <view class="active" @tap="finish">完成</view>
+        <view @click="modifyItem(orderInfo)">修改</view>
         <view>打印</view>
+        <view>锁定</view>
+        <view>取消</view>
       </view>
 
       <!-- 完成工单弹框 -->

+ 2 - 3
hdPad/src/pages/home/make.vue

@@ -15,10 +15,9 @@
             <!-- 按钮操作 -->
             <view class="open-box">
 				<view class="button-area">
-					<view @click="logout">退出</view>
-					<view @click="clearItemFn">清空</view>
-					<view @click="breakage">报损</view>
 					<view>制作</view>
+					<view @click="breakage">报损</view>
+					<view @click="clearItemFn">清空</view>
 				</view>
             </view>
         </view>

+ 1 - 2
hdPad/src/pages/home/selectMake.vue

@@ -15,9 +15,8 @@
             <!-- 按钮操作 -->
             <view class="open-box">
 				<view class="button-area">
-					<view @click="logout">退出</view>
-					<view @click="clearItemFn">清空</view>
 					<view>制作</view>
+					<view @click="clearItemFn">清空</view>
 				</view>
             </view>
         </view>