优化

ghsPad/src/pages/home/components/cashConsole.vue

@@ -2,8 +2,8 @@
 <view class="button-area">
 	<view class="active" @click="openBox">开箱</view>
 	 <view class="active" 
- style="background-color:orange;color:white;border-color:orange;position:fixed;left:135upx;bottom:13upx;width:84upx;height:50upx;line-height:30upx;font-size:16upx;" 
- @click="beginSettle">结算</view>
+ style="background-color:orange;color:white;border-color:orange;position:fixed;left:85upx;bottom:13upx;width:84upx;height:50upx;line-height:30upx;font-size:16upx;" 
+ @click="beginSettle">批发结算</view>
     <view class="active" @click="clearItemFn">清空</view>
 	<view class="active" @click="cancelKdFn">返回</view>
 

ghsPad/src/pages/home/components/customerList.vue

@@ -94,9 +94,9 @@ export default {
     overflow-y: scroll;
     & .userList-item_box {
       margin: 0 5upx 5upx 0;
-      width: 100upx;
+      width: 96upx;
       height: 60upx;
-      border: 1px solid #cccccc;
+      border: 1px solid #3385FF;
       padding: 3upx;
       border-radius: 3upx;
       display: flex;
@@ -108,7 +108,7 @@ export default {
         align-items: center;
         margin-bottom: 15upxs;
         & .name {
-          color:#666666;
+          color:#3385FF;
           padding-left: 2upx;
           overflow:hidden;
           text-overflow:ellipsis;

ghsPad/src/pages/home/components/leftArea.vue

@@ -1,6 +1,6 @@
 <template>
     <view class="itemList-box">
-        <view class="title">列表</view>
+        <view class="title">批发</view>
         <view class="itemList-item_box">
             <view v-for="item in selectList" :key="item.id" class="show-item_box">
                 <view class="item-body_box not-active" @click="popAddModelFn(item)">

ghsPad/src/pages/home/components/leftGroup.vue

@@ -1,6 +1,6 @@
 <template>
     <view class="itemList-box">
-        <view class="title">列表</view>
+        <view class="title">批发</view>
         <scroll-view class="itemList-item_box" scroll-y="true" @scrolltolower="reachBottom" lower-threshold="50">
             <view v-for="item in list.data" :key="item.id" class="show-item_box">
                 <view class="item-body_box not-active" @click="getDetail(item)">

ghsPad/src/pages/home/components/nav.vue

@@ -29,6 +29,8 @@ export default {
     return {
       nav: [
         { name: "收银", page: "/pages/home/selectCustom",flag:'casher' },
+        { name: "关闭", page: "/pages/home/close",flag:'close' },
+        { name: "退出", page: "/pages/home/logout",flag:'logout' },
         { name: "零售", page: "/pages/home/waste",flag:'retail' },
         //{ name: "损耗", page: "/pages/home/waste",flag:'waste' },
         //{ name: "订单", page: "/pages/home/order",flag:'order' }
@@ -105,9 +107,38 @@ export default {
       }
 		},
     goTo(item) {
+      let that = this
       this.$util.hitVoice();
       if(item.flag == 'retail'){
         this.openRetail()
+      }else if(item.flag == 'close'){
+        // #ifdef APP-PLUS
+        let type = uni.getSystemInfoSync().platform
+        switch(type){
+          case 'android':
+            plus.runtime.quit()
+            break;
+          case 'ios':
+            that.$msg('IOS暂不支持关闭')
+            break;
+          default:
+        }
+        // #endif
+      }else if(item.flag == 'logout'){
+        this.$util.hitVoice()
+        uni.showModal({
+          title: '提示',
+          content: '确认退出？',
+          success: function (res){
+            if (res.confirm){ 
+              uni.clearStorage()
+              that.$store.commit("setLoginInfo", {})
+              // #ifdef APP-PLUS
+              plus.runtime.restart()
+              // #endif            
+            }
+          }
+        })
       }else{
         this.$util.pageTo({ url: item.page, type: 2 });
       }

ghsPad/src/pages/home/components/settlePop.vue

@@ -116,7 +116,7 @@ export default {
             //输入类型 0 实收金额 1 运费
             fillType:0,
             form:{
-                hasPay: 2,
+                hasPay: 0,
                 payWay:0,
                 needPrint:1,
                 freight: '',
@@ -133,7 +133,7 @@ export default {
                 dealPrice:0
             },
             proceeds: '0',
-            hasPayList:[{ name:'欠款', id:2, },{ name:'扫码', id:0, },{ name:'线下', id:1, }],
+            hasPayList:[{ name:'扫码', id:0, },{ name:'欠款', id:2, },{ name:'线下', id:1, }],
             payWayList:[{ name:'员工微信', id:0 }, { name:'员工支付宝', id:1 },{ name:'现金', id:4 },{name:'银行卡',id:5}],
             currentInputType:'proceeds',
             totalMoney: 0,
@@ -189,7 +189,7 @@ export default {
         settleOpenStatus:{
             handler(val){
                 if(Number(val) == 1){
-                    this.form.hasPay = 2
+                    this.form.hasPay = 0
                     this.form.payWay = 0
                     this.form.needPrint = 1
                     this.form.groupName = ''