11111

ghsPad/src/admin/home/components/select-customer.vue

@@ -1,45 +0,0 @@
-<template>
-    <view>
-        <textarea @tap="activeKeyboard" disabled :value="input" placeholder="点击调起键盘输入"></textarea>
-        <VKeyboard ref="keyboard" :pointIsShow="true" :digital="false" :disorderly="false" @typing="typing" @enter="enter"></VKeyboard>
-    </view>
-</template>
-
-<script>
-    import VKeyboard from '@/components/plugin/vKeyboard/VKeyboard.vue'
-    export default {
-        name:'selectCustomer',
-        components:{
-            VKeyboard
-        },
-        data() {
-			return {
-				input: ''//键盘输入
-			};
-		},
-        methods: {
-			//键盘方法
-			activeKeyboard() {
-				this.$refs.keyboard.activate();
-			},
-			typing(e) {
-				if (e.backspace) {
-					if (this.input.length > 0) {
-						this.input = this.input.substring(0, this.input.length - 1);
-					}
-				}
-				else {
-					this.input += e.char;
-				}
-			},
-			enter() {
-				this.$refs.keyboard.deactivate();
-			},
-			//键盘方法end
-		}
-    }
-</script>
-
-<style lang="scss" scoped>
-
-</style>

ghsPad/src/admin/home/components/select-settle.vue

@@ -0,0 +1,158 @@
+<template>
+    <view class="app-select_customer">
+        <view class="select-left">
+            <view class="select-item_box">
+                <view class="title">结账方式</view>
+                <view class="item-list_box">
+                    <view class="active">
+                        欠账
+                    </view>
+                    <view>
+                        已付款
+                    </view>
+                    <view>
+                      待付款
+                    </view>    
+                </view>
+            </view>
+            <view class="select-item_box">
+                <view class="title">收款方式</view>
+                <view class="item-list_box">
+                    <view class="active">
+                        欠账
+                    </view>
+                    <view>
+                        已付款
+                    </view>
+                    <view>
+                      待付款
+                    </view>    
+                </view>
+            </view>
+            <view class="select-item_box">
+                <view class="title">收款人</view>
+                <view class="item-list_box">
+                    <view class="active">
+                        欠账
+                    </view>
+                    <view>
+                        已付款
+                    </view>
+                    <view>
+                      待付款
+                    </view>    
+                </view>
+            </view>
+            <view class="select-item_box">
+                <view class="title">打印小票</view>
+                <view class="item-list_box">
+                    <view class="active">
+                        打印
+                    </view>   
+                </view>
+            </view>
+        </view>
+        <view class="line"></view>
+        <view class="select-right">
+            <AppInputAll v-model="shopVal" title="商品合计" disabled></AppInputAll>
+            <AppInputAll v-model="shopVal" title="运费" placeholder="没有运费留空"></AppInputAll>
+            <AppInputAll v-model="shopVal" title="总金额" placeholder="总金额"></AppInputAll>
+            <AppInputAll v-model="shopVal" title="实收金额" placeholder="实收金额"></AppInputAll>
+            <view class="shop-distoracn">优惠5</view>
+        </view>
+        <!-- <textarea @tap="activeKeyboard" disabled :value="input" placeholder="点击调起键盘输入"></textarea> -->
+        <VKeyboard ref="keyboard" :pointIsShow="true" :digital="false" :disorderly="false" @typing="typing" @enter="enter"></VKeyboard>
+    </view>
+</template>
+
+<script>
+    import VKeyboard from '@/components/plugin/vKeyboard/VKeyboard.vue'
+    import TuiListCell from "@/components/plugin/list-cell";
+    import AppInputAll from '@/components/app_input_all'
+    export default {
+        name:'selectCustomer',
+        components:{
+            VKeyboard,
+            AppInputAll
+        },
+        data() {
+			return {
+				input: '',//键盘输入
+                shopVal: '￥100'
+			};
+		},
+        methods: {
+			//键盘方法
+			activeKeyboard() {
+				this.$refs.keyboard.activate();
+			},
+			typing(e) {
+				if (e.backspace) {
+					if (this.input.length > 0) {
+						this.input = this.input.substring(0, this.input.length - 1);
+					}
+				}
+				else {
+					this.input += e.char;
+				}
+			},
+			enter() {
+				this.$refs.keyboard.deactivate();
+			},
+			//键盘方法end
+		}
+    }
+</script>
+
+<style lang="scss" scoped>
+    .app-select_customer {
+        background-color: #ffffff;
+        display: flex;
+     
+        .select-left {
+            flex: 1;
+            padding: 10rpx;
+            & .select-item_box {
+                & > .title {
+                    font-size: 14rpx;
+                }
+                & .item-list_box {
+                        display: flex;
+                        align-items: center;
+                        justify-content: flex-start;
+                        flex-wrap: wrap;
+                        padding: 10rpx 0;
+                        & > view {
+                            width: 85rpx;
+                            height: 35rpx;
+                            text-align: center;
+                            line-height: 35rpx;
+                            font-size: 12rpx;
+                            border: 1px solid #eee;
+                            margin: 0 8rpx 8rpx 0;
+                            color: #333333;
+                            border-radius: 3rpx;
+                            &.active {
+                                background-color: #468c71;
+                                color: #ffffff;
+                            }
+                        }
+                    }
+            }
+        }
+        & .line {
+            width: 1px;
+            background-color: #eee;
+        }
+        .select-right {
+            flex: 1;
+            padding: 10rpx;
+            & .shop-distoracn {
+                text-align: right;
+                font-size: 14rpx;
+                margin-top: 10rpx;
+                color: #008000;
+            }
+        }
+    }
+</style>

ghsPad/src/admin/home/components/select-user.vue

@@ -0,0 +1,23 @@
+<template>
+    <view class="app-select_user">
+        <view class="title">客户列表</view>
+        
+    </view>
+</template>
+
+<script>
+    export default {
+        name:'selectUser'
+    }
+</script>
+
+<style lang="scss" scoped>
+    .app-select_user {
+        background-color: #ffffff;
+        padding: 10rpx;
+        & .title {
+            font-size: 14rpx;
+            color: #666666;
+        }
+    }
+</style>

ghsPad/src/admin/home/workbench.vue

@@ -95,7 +95,9 @@
 				<view class="btn-breakage">
 					报损
 				</view>
-				<view class="btn-account">
+				<view 
+					@click="settle"
+				class="btn-account">
 					结算
 				</view>
 			</view>
@@ -109,11 +111,17 @@
 			</div>
 		</uniPopup>
 		<uniPopup
+		:show.sync="isShowSettle"
+		type="top"
+		>
+			<selectSettle></selectSettle>
+		</uniPopup>
+		<uniPopup
 		:show.sync="isShowUser"
+		type="top"
 		>
-			<selectCustomer></selectCustomer>
+			<selectUser></selectUser>
 		</uniPopup>
-		
 	</view>
 </template>
 <script>
@@ -123,15 +131,17 @@ import productMins from "@/mixins/product";
 import autoUpdateMixins from "@/mixins/autoUpdate";
 import uniPopup from '@/components/uni-popup'
 import keyboardSetFlower from '@/components/app-boardSet-flower.vue'
-import selectCustomer from './components/select-customer.vue'
+import selectSettle from './components/select-settle.vue'
+import selectUser from './components/select-user.vue'
 export default {
 	name: "workbench",
-	components: { NotLogin,uniPopup,keyboardSetFlower,selectCustomer },
+	components: { NotLogin,uniPopup,keyboardSetFlower,selectSettle,selectUser },
 	mixins: [productMins,autoUpdateMixins],
 	data() {
 		return {
 			isShowFllowNum: false,
 			isShowUser: false,
+			isShowSettle: false,
 			shopListType:[
 				{
 					name:'今日特价',
@@ -168,6 +178,9 @@ export default {
 		},
 		selectUser(){
 			this.isShowUser = true
+		},
+		settle(){
+			this.isShowSettle = true
 		}
 	}
 };

ghsPad/src/components/app_input_all.vue

@@ -149,42 +149,42 @@ export default {
         align-items: center;
         justify-content: center;
         box-sizing: content-box;
-        padding-bottom: 15upx;
+        padding-bottom: 0rpx;
         & .line{
             position: absolute;
             width: 100%;
-            height: 1upx;
+            height: 1rpx;
             left: 0;
             bottom: 0;
-            border-bottom: 1upx solid #ebedf0;
+            border-bottom: 1rpx solid #ebedf0;
         }
         .my-input{
             position: relative;
             flex: 1;
             box-sizing: content-box;
             & .text-textarea {
-                min-height: 150upx;
+                min-height: 150rpx;
                 display: inline-block;
                 width: 100%;
-                padding: 20upx 20upx 20upx 10upx;
+                padding: 20rpx 20rpx 20rpx 10rpx;
                 box-sizing: border-box;
             }
            &  input{
-                min-height: 88upx;
-                padding-left: 10upx;
-                padding-right: 50upx;
+                min-height: 35rpx;
+                padding-left: 10rpx;
+                padding-right: 0rpx;
            }
            &.isLink::after{
                 content: "";
                 display: inline-block;
-                width: 15upx;
-                height: 15upx;
-                border-width:2upx 2upx 0 0;
+                width: 15rpx;
+                height: 15rpx;
+                border-width:2rpx 2rpx 0 0;
                 border-color:#C8C8CD;
                 border-style:solid;
                 position: absolute;
                 top: 50%;
-                right: 30upx;
+                right: 30rpx;
                 transform: translate(0,-50%) matrix(0.71, 0.71, -0.71, 0.71, 0, 0);
             }
         }
@@ -194,26 +194,26 @@ export default {
         outline:0;
         background-color:transparent;
         border:0;
-        font-size: 28upx;
+        font-size: 14rpx;
         font-weight: normal;
         font-stretch: normal;
-        letter-spacing: 0upx;
+        letter-spacing: 0rpx;
         color: #4d4d4d;
         display: block;
     }
     .icon-butongguo{
         color: #cccccc;
-        font-size: 28upx;
+        font-size: 14rpx;
         position: absolute;
-        padding: 20upx 10upx 20upx 20upx;
+        padding: 10rpx 5rpx 10rpx 10rpx;
         right: 0;
         top: 50%;
         transform: translate(0,-50%);
     }
     .my-title {
         color: #666;
-        font-size: 28upx;
-        width: 180upx;
+        font-size: 14rpx;
+        width: 180rpx;
 
     }
 </style>

ghsPad/src/components/uni-popup.vue

@@ -1,7 +1,9 @@
 <template>
     <view v-if="showPopup" class="uni-popup" :style="{'z-index': zIndex}">
         <view :class="[ani, animation ? 'ani' : '', !custom ? 'uni-custom' : '']" class="uni-popup__mask" @click="close(true)" />
-        <view :class="[type, ani, animation ? 'ani' : '', !custom ? 'uni-custom' : '']" class="uni-popup__wrapper" @click="close(true)">
+        <view 
+            :class="[type, ani, animation ? 'ani' : '', !custom ? 'uni-custom' : '']" 
+            class="uni-popup__wrapper" @click="close(true)">
             <view :class="['uni-popup__wrapper-box', isRadius?'uni-popup__wrapper-radius':'']" @click.stop="clear" :style="{'maxHeight': maxHeight,'width': width}">
                 <slot />
             </view>
@@ -140,15 +142,19 @@ export default {
         position: absolute;
         z-index: 999;
         box-sizing: border-box;
+      
         &.ani {
             transition: all 0.3s;
         }
 
         &.top {
-            top: 0;
-            left: 0;
+            top: 15vh!important;
+            left: 50%;
             width: 100%;
-            transform: translateY(-100%);
+            transform: translate(-50%,0)!important;
+            & .uni-popup__wrapper-box {
+                margin: 0 auto!important;
+            }
         }
 
         &.bottom {
@@ -162,10 +168,11 @@ export default {
             width: 100%;
             height: 100%;
             display: flex;
-            justify-content: center;
+            // justify-content: center;
             align-items: center;
             transform: scale(1.2);
-            opacity: 0;
+            // opacity: 0;
+           
         }
             &-radius {
             border-radius: 20upx;
@@ -194,8 +201,8 @@ export default {
                 & .uni-popup__wrapper-box {
                     width: 100%;
                     overflow-y: scroll;
-                    border-top-left-radius: 30upx;
-                    border-top-right-radius: 30upx;
+                    border-top-left-radius: 5upx;
+                    border-top-right-radius: 5upx;
                 }
             }
         }