fuwei há 4 anos atrás
pai
commit
5450f50113

+ 104 - 3
ghsPad/src/admin/home/components/select-user.vue

@@ -1,13 +1,77 @@
 <template>
     <view class="app-select_user">
         <view class="title">客户列表</view>
-        
+        <view class="app-userList_box">
+											<view class="userList-item_box">
+													<view class="head-box">
+															<image class="img" src="../../../static/images/member/bg.png" mode=""></image>
+															<view class="name">花落谁家</view>
+													</view>
+													<view class="footer-box">
+															<view>
+																03-07 12:00
+															</view>
+															<view>欠28755</view>
+													</view>
+											</view>
+											<view class="userList-item_box">
+													<view class="head-box">
+															<image class="img" src="../../../static/images/member/bg.png" mode=""></image>
+															<view class="name">花落谁家</view>
+													</view>
+													<view class="footer-box">
+															<view>
+																03-07 12:00
+															</view>
+															<view>欠28755</view>
+													</view>
+											</view>
+								</view>
+								<VKeyboard
+								ref="keyboard"
+								:pointIsShow="false"
+								:digital="false"
+								:disorderly="false"
+								@typing="typing"
+								@enter="enter">
+								</VKeyboard>
     </view>
 </template>
 
 <script>
+			import VKeyboard from '@/components/plugin/vKeyboard/VKeyboard.vue'
     export default {
-        name:'selectUser'
+        name:'selectUser',
+								components:{
+									VKeyboard
+								},
+								data(){
+									return {
+
+									}
+								},
+								mounted(){
+								    this.activeKeyboard()
+								},
+								methods:{
+									//键盘方法
+									activeKeyboard() {
+										this.$refs.keyboard.activate();
+									},
+									typing(e) {
+										if (e.backspace) {
+											if (this.currentNum.length > 0) {
+												this.currentNum = this.input.substring(0, this.input.length - 1);
+											}
+										}
+										else {
+											this.currentNum += e.char;
+										}
+									},
+									enter() {
+										//this.$refs.keyboard.deactivate();
+									}
+								}
     }
 </script>
 
@@ -19,5 +83,42 @@
             font-size: 14rpx;
             color: #666666;
         }
+								& .app-userList_box {
+									padding: 10rpx;
+									display: flex;
+									align-items: center;
+									flex-wrap: wrap;
+										& .userList-item_box {
+												 margin: 0 10rpx 10rpx 0;
+													width: 180rpx;
+													height: 100rpx;
+													border: 1px solid #333;
+													padding: 5rpx;
+													border-radius: 5rpx;
+													display: flex;
+													flex-direction: column;
+													justify-content: center;
+												& .head-box {
+														display: flex;
+														font-size: 14rpx;
+														align-items: center;
+														margin-bottom: 10rpxs;
+														 & .name {
+																	padding-left: 5rpx;
+															}
+														& > .img {
+															width: 50rpx;
+															height: 50rpx;
+															border-radius: 50%;
+														}
+												}
+												& .footer-box {
+														font-size: 12rpx;
+														display: flex;
+														justify-content: space-between;
+														align-items: center;
+												}
+										}
+								}
     }
-</style>
+</style>

+ 46 - 44
ghsPad/src/admin/home/workbench.vue

@@ -46,7 +46,7 @@
 				</view>
 				<view>
 					合计:
-					<text style="color:red">¥123</text>	
+					<text style="color:red">¥123</text>
 				</view>
 			</view>
 		</view>
@@ -75,7 +75,7 @@
 				</view>
 			</view>
 			<view class="shop-show_box">
-				<view 
+				<view
 				@click="selectItem"
 				class="show-shop_box">
 					<image
@@ -95,7 +95,7 @@
 				<view class="btn-breakage">
 					报损
 				</view>
-				<view 
+				<view
 					@click="settle"
 				class="btn-account">
 					结算
@@ -104,7 +104,7 @@
 		</view>
 		<uniPopup
 		:show.sync="isShowFllowNum"
-	
+		type="top"
 		>
 			<div>
 				<keyboardSetFlower></keyboardSetFlower>
@@ -119,6 +119,7 @@
 		<uniPopup
 		:show.sync="isShowUser"
 		type="top"
+		maxHeight="auto"
 		>
 			<selectUser></selectUser>
 		</uniPopup>
@@ -190,30 +191,31 @@ export default {
 		display: flex;
 		height: 100vh;
 		& .shop-list {
-			flex: 1;
+			flex: 63;
 		}
 		& .nav-left {
 			height: 100%;
-			width: 50upx;
+			// width: 50rpx;
+			flex: 4;
 			background-color: rgba(72, 91, 107, 1);
 			// #599981
 			& .item-list {
-				margin-top: 50upx;
-				font-size: 20upx;
+				margin-top: 50rpx;
+				font-size: 20rpx;
 				text-align: center;
-				padding: 15upx 0;
+				padding: 15rpx 0;
 				background-color: #599981;
 				color: #FFFFFF;
 			}
 		}
 		& .shopList-box {
-			width: 250upx;
+				flex: 25;
 			height: 100%;
 			display: flex;
 			flex-direction: column;
 			& .title {
-				padding: 3upx;
-				font-size: 12upx;
+				padding: 3rpx;
+				font-size: 12rpx;
 				background-color: rgba(72, 91, 107, 1);
 				color: #FFFFFF;
 			}
@@ -221,13 +223,13 @@ export default {
 				flex: 1;
 			    border: 1px solid #eee;
 				& .shop-item_box {
-					padding: 5upx;
+					padding: 5rpx;
 					& .shop-body_box {
 						background-color: #f2f8f8;
-						padding: 5upx;
-						font-size: 14upx;
+						padding: 5rpx;
+						font-size: 14rpx;
 						& .flower-name_box {
-							padding: 0 5upx;
+							padding: 0 5rpx;
 							& .name {
 								color: #333333;
 								font-weight: bold;
@@ -237,39 +239,39 @@ export default {
 							display: flex;
 							align-items: center;
 							justify-content: space-between;
-							padding-top: 15upx;
+							padding-top: 15rpx;
 						}
 					}
 				}
 			}
 			& .shopList-footer_box {
-				height: 50upx;
+				height: 50rpx;
 				border: 1px solid #eee;
-				font-size: 12upx;
+				font-size: 12rpx;
 				display: flex;
 				align-items: center;
 				justify-content: space-around;
 			}
 		}
 		& .open-box {
-			width: 80upx;
+			flex: 8;
 			height: 100vh;
 			display: flex;
 			flex-direction: column;
-			padding: 5upx;
-			padding-top: 10upx;
+			padding: 5rpx;
+			padding-top: 10rpx;
 			& > view {
 				border: 1px solid #eee;
 				text-align: center;
-				padding: 10upx 0;
+				padding: 10rpx 0;
 				color: #333333;
-				margin-bottom: 15upx;
-				font-size: 14upx;
+				margin-bottom: 15rpx;
+				font-size: 14rpx;
 				text-align: center;
 				&.active {
 					color: #008000;
 					border-color: #008000;
-					border-radius: 2upx;
+					border-radius: 2rpx;
 				}
 			}
 		}
@@ -279,12 +281,12 @@ export default {
 			display: flex;
 			flex-direction: column;
 			& .shop-type_box {
-				max-height: 300upx;
+				max-height: 300rpx;
 				display: flex;
 				align-items: center;
 				& > view {
 					border:1px solid #e4e4e4;
-					padding: 8upx 5upx;
+					padding: 8rpx 5rpx;
 					font-size: 14px;
 					&.active {
 						background-color: #428369;
@@ -294,49 +296,49 @@ export default {
 			}
 			& .shop-show_box {
 				flex: 1;
-				padding: 5upx;
+				padding: 5rpx;
 				display: flex;
 				flex-wrap: wrap;
 				& .show-shop_box {
 					position: relative;
-					width: 120upx;
-					height: 100upx;
-					 
+					width: 120rpx;
+					height: 100rpx;
+
 					& .img {
 						height: 100%;
 					}
 					.shop-info_price {
 						position: absolute;
-						height: 42upx;
+						height: 42rpx;
 						background-color: rgba(0, 0, 0, 0.2);
 						bottom: 0;
 						width: 100%;
-						font-size: 14upx;
+						font-size: 14rpx;
 						color: #ffffff;
 						& > view {
 							display: flex;
 							flex-direction: column;
-							padding: 3upx;
-						   
+							padding: 3rpx;
+
 							justify-content: center;
 							& > view:nth-child(1) {
-								margin-bottom: 2upx;
+								margin-bottom: 2rpx;
 							}
 						}
 					}
 				}
 			}
 			& .shop-footer_box {
-				height: 40upx;
+				height: 40rpx;
 				display: flex;
 				align-items: center;
 				justify-content: flex-end;
 				& > view {
-					height: 40upx;
-					padding: 5upx 25upx;
-					border-radius: 5upx;
-					font-size: 14upx;
-					margin: 0 10upx;
+					height: 40rpx;
+					padding: 5rpx 25rpx;
+					border-radius: 5rpx;
+					font-size: 14rpx;
+					margin: 0 10rpx;
 					vertical-align: middle;
 					display: flex;
 					align-items: center;
@@ -352,4 +354,4 @@ export default {
 			}
 		}
 	}
-</style>
+</style>

+ 14 - 11
ghsPad/src/components/app-boardSet-flower.vue

@@ -9,7 +9,7 @@
                     <div class="flower-unit_box">
                         <input @tap="activeKeyboard" disabled type="number" v-model="currentNum">
                         <span>扎</span>
-                    </div>  
+                    </div>
                 </view>
                 <i class="icon-qiehuan">换</i>
                 <view>
@@ -22,13 +22,15 @@
             <view class="set-residue_box">
                 还剩5扎2支
             </view>
+            <VKeyboard
+            ref="keyboard" 
+            :pointIsShow="false" 
+            :digital="true" 
+            :disorderly="false" 
+            @typing="typing" 
+            @enter="enter">
+            </VKeyboard>
         </view>
-        <VKeyboard ref="keyboard" :pointIsShow="false" :digital="true" :disorderly="false" @typing="typing" @enter="enter"></VKeyboard>
-        <!-- <keyboard-module  
-            :show.sync="keyShow" 
-            @comfirm="hideKeyFn" 
-            @clickKey="clickKeyFn" 
-            @del="delFn" /> -->
     </view>
 </template>
 
@@ -49,6 +51,9 @@
                 keyShow: false
 			};
 		},
+        mounted(){
+            this.activeKeyboard()
+        },
         methods: {
 			//键盘方法
 			activeKeyboard() {
@@ -65,7 +70,7 @@
 				}
 			},
 			enter() {
-				this.$refs.keyboard.deactivate();
+				//this.$refs.keyboard.deactivate();
 			}
 			//键盘方法end
 		}
@@ -74,8 +79,6 @@
 
 <style lang="scss" scoped>
     .boardset-flowert {
-        width: 400upx;
-        height: 300upx;
         background-color: #ffffff;
         margin: 0 auto;
         border-radius: 5upx;
@@ -119,4 +122,4 @@
             }
         }
     }
-</style>
+</style>

+ 15 - 10
ghsPad/src/components/plugin/vKeyboard/VKeyboard.vue

@@ -1,5 +1,5 @@
 <template>
-	<view v-if="showKeyboard" 
+	<view v-if="showKeyboard"
 	:class="['enl-size', digital?'enl-size_custom':'',keyboardStyle]">
 		<view class="digit-keyboard" v-if="mode === 'digit' || digital">
 			<view class="digit-button-box">
@@ -7,14 +7,17 @@
 					<!-- <view :key="index" class="enl-key-button enl-digit" @tap="typing('.')" v-if="index === 9">.</view> -->
 					<view :key="index" class="enl-key-button enl-digit" @tap="typing(digit)">{{digit}}</view>
 				</template>
-				<view class="enl-key-button enl-digit">
-					<i class="iconfont icon-shouqijianpan enl-middle" v-if="digital" @tap="deactivate"></i>
-					<i class="iconfont icon-ABC enl-middle" v-else @tap="typingLetter"></i>
+				<view class="enl-key-button enl-digit" v-if="!digital">
+					<!-- <i class="iconfont icon-shouqijianpan enl-middle"  @tap="deactivate"></i> -->
+					<i class="iconfont icon-ABC enl-middle" v-if="!digital" @tap="typingLetter"></i>
 				</view>
 			</view>
 			<view class="special-button-box">
 				<view class="enl-key-button special-button enl-gray" @tap="backspace"><i class="iconfont icon-backspace enl-large"></i></view>
-				<view class="enl-key-button special-button enl-gray" @tap="enter"><i class="iconfont icon-huiche enl-large"></i></view>
+				<view class="enl-key-button special-button enl-gray" @tap="enter">
+						<!-- <i class="iconfont icon-huiche enl-large"></i> -->
+						确定
+				</view>
 			</view>
 		</view>
 		<view class="full-keyboard" v-else>
@@ -31,7 +34,9 @@
 				</view>
 				<view class="enl-letter enl-key-button space" @tap="typing(' ')"><text class="enl-logo">spacebar</text></view>
 				<view class="enl-letter enl-key-button swith-key enl-gray" @tap="typingDigit"><i class="iconfont icon-shuzi"></i></view>
-				<view class="enl-letter enl-key-button swith-key enl-gray" @tap="enter"><i class="iconfont icon-huiche"></i></view>
+			<!-- 	<view class="enl-letter enl-key-button swith-key enl-gray" @tap="enter">
+					<i class="iconfont icon-huiche"></i>
+				</view> -->
 			</view>
 		</view>
 	</view>
@@ -167,11 +172,11 @@
 		created() {
 			this.lines = this.disorderly ? disorder() : order;
 			this.digits = this.disorderly ? digits() : natural;
-			
+
 			if(!this.pointIsShow) {
 				this.digits = this.digits.filter(i=>i!=='.')
 			}
-			
+
 		}
 	}
 </script>
@@ -193,7 +198,7 @@
 	}
 	.enl-size_custom {
 		// width: 700rpx!important;
-		
+
 	}
 	.enl-key-button {
 		display: inline-block;
@@ -217,7 +222,7 @@
 
 	.v-keyboard {
 		width: 100%;
-		position: fixed;
+		position: relative;
 		bottom: 0;
 		left: 0;
 		background: #f5f5f5;

+ 1 - 1
ghsPad/src/components/plugin/vKeyboard/utils.js

@@ -7,7 +7,7 @@ export const chars = ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l'
 
 //顺序排序全键盘
 export const order = [
-	['1', '2', '3', '4', '5', '6', '7', '8', '9', '0'],
+	// ['1', '2', '3', '4', '5', '6', '7', '8', '9', '0'],
 	['q', 'w', 'e', 'r', 't', 'y', 'u', 'i', 'o', 'p'],
 	['a', 's', 'd', 'f', 'g', 'h', 'j', 'k', 'l'],
 	['z', 'x', 'c', 'v', 'b', 'n', 'm']