shish 1 год назад
Родитель
Сommit
cd57ad228f

+ 16 - 8
ghsPad/src/pages/home/components/console.vue

@@ -1,21 +1,26 @@
 <template>
 <view class="button-area">
 	<view class="active" @click="openBox">开箱</view>
-	<view class="active" @click="toWastage">报损</view>
-	<view class="active" @click="part">拆散</view>
+	<view class="active" @click="toWastage" style="border:1upx solid #f1a313;color:#f1a313;">报损</view>
 	<view class="active2" :class="[fastAction==1 ? 'clear-fast' : 'clear']" style="" @click="beginSettle">结算</view>
 	<view class="active2" :class="[fastAction==1 ? 'hand-fast' : 'hand']" @click="handOrder()" v-if="globalHasHand == 0">挂单</view>
 	<view class="active2" :class="[fastAction==1 ? 'out-fast' : 'out']" @click="getHandOrder()" v-else>取单</view>
 	<view class="active" @click="showCustomPop" style="background-color:#3385FF;color:white;">选客</view>
+	<view class="active" @click="part" style="border:1upx solid #1680b3;color:#1680b3">拆散</view>
 	<view class="active" @click="fastCreate" style="font-size:8upx;">快捷开单</view>
-    <view class="active" @click="clearItemFn">清空</view>
+    <view class="active" @click="clearItemFn" style="border:1upx solid #636161;color:#636161;">清空</view>
 
 	<view v-if="Number(customId)>0" :class="[fastAction==1 ? 'custom-fast':'custom']">{{customName}}</view>
 
-    <!-- 清空 -->
-    <uni-popup ref="clearItemRef" type="dialog">
-        <uni-popup-dialog type="info" cancelText="取消" confirmText="确认" title="提示" content="确认清空?" @confirm="confirmClearItem"></uni-popup-dialog>
-    </uni-popup>
+	<uni-popup ref="clearItemRef" type="dialog">
+		<view style="width:60vw;height:70vh;background-color: white;padding:70upx 20upx 0 20upx;">
+			<view style="margin-bottom:40upx;text-align: center;font-size:24upx;">确认清空?</view>
+			<view style="text-align:center;">
+				<button class="admin-button-com mini-btn default" @click="cancelClear">取消</button>
+				<button class="admin-button-com mini-btn default" @click="confirmClearItem" style="margin-left:30upx;">确认</button>
+			</view>
+		</view>
+	</uni-popup>
 
     <uni-popup ref="logoutRef" type="dialog">
         <uni-popup-dialog type="info" cancelText="取消" confirmText="确认" title="提示" content="确认退出?" @confirm="confirmLogout"></uni-popup-dialog>
@@ -349,10 +354,13 @@ export default {
 			})
 			// #endif
 		},
-		//确认清空花材
 		confirmClearItem(){
 			this.$util.hitVoice()
 			this.removeFromSaveDirect()
+			this.$refs.clearItemRef.close()
+		},
+		cancelClear(){
+			this.$refs.clearItemRef.close()
 		},
 		confirmLogout(){
 			this.$util.hitVoice()

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

@@ -8,7 +8,7 @@
 	<view class="active2" :class="[fastAction==1 ? 'out-fast' : 'out']" @click="getHandOrder()" v-else>取单</view>
     <view class="active" @click="toWastage" style="color:#f1a313;border:1upx solid #f1a313;">报损</view>
 	<view class="active" @click="showCustomPop()" style="background-color: #09C567;border:1upx sold #09C567;color:white;">选客</view>
-	<view class="active" @click="part()">拆散</view>
+	<view class="active" @click="part()" style="border:1upx solid #1680b3;color:#1680b3">拆散</view>
 	<view class="active" @click="fastCreate()" style="font-size:9upx;">快捷开单</view>
 	<view class="active" @click="gatheringFn()" style="color:#3385FF;border:1upx solid #3385FF;">收款</view>
     <view class="active" @click="clearItemFn" style="color:#636161;border:1upx solid #636161;">清空</view>