供货商

ghsPad/src/admin/home/workbench.vue

@@ -102,6 +102,7 @@
 		</view>
 		<uniPopup
 		:show.sync="isShowFllowNum"
+	
 		>
 			<div>
 				<keyboardSetFlower></keyboardSetFlower>
@@ -174,7 +175,7 @@ export default {
 <style lang="scss" scoped>
 	.app-workbench_box {
 		display: flex;
-		height: 100%;
+		height: 100vh;
 		& .shop-list {
 			flex: 1;
 		}
@@ -239,7 +240,7 @@ export default {
 		}
 		& .open-box {
 			width: 80upx;
-			height: 100%;
+			height: 100vh;
 			display: flex;
 			flex-direction: column;
 			padding: 5upx;
@@ -247,10 +248,11 @@ export default {
 			& > view {
 				border: 1px solid #eee;
 				text-align: center;
-				padding: 10upx;
+				padding: 10upx 0;
 				color: #333333;
 				margin-bottom: 15upx;
 				font-size: 14upx;
+				text-align: center;
 				&.active {
 					color: #008000;
 					border-color: #008000;

ghsPad/src/components/app-boardSet-flower.vue

@@ -1,20 +1,52 @@
 <template>
-    <view>
-        <textarea @tap="activeKeyboard" disabled :value="input" placeholder="点击调起键盘输入"></textarea>
+    <view class="boardset-flowert">
+         <!-- <textarea @tap="activeKeyboard" disabled :value="input" placeholder="点击调起键盘输入"></textarea> -->
+        <view class="flower-input_box">
+            <view class="flower-title">粉佳人</view>
+            <view class="flower-open_box">
+                <view>
+                    <view class="desc">数量</view>
+                    <div class="flower-unit_box">
+                        <input @tap="activeKeyboard" disabled type="number" v-model="currentNum">
+                        <span>扎</span>
+                    </div>  
+                </view>
+                <i class="icon-qiehuan">换</i>
+                <view>
+                    <view class="desc">单价</view>
+                    <div class="flower-unit_box">
+                        <input type="number" v-model="currentPrice">
+                    </div>
+                </view>
+            </view>
+            <view class="set-residue_box">
+                还剩5扎2支
+            </view>
+        </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>
 
 <script>
     import VKeyboard from '@/components/plugin/vKeyboard/VKeyboard.vue'
+    import keyboardModule from '@/components/keyboard.vue'
     export default {
         name:'keyboardSetFlower',
         components:{
-            VKeyboard
+            VKeyboard,
+            keyboardModule
         },
         data() {
 			return {
-				input: ''//键盘输入
+				input: '',//键盘输入
+                currentNum: 0,
+                currentPrice: 0,
+                keyShow: false
 			};
 		},
         methods: {
@@ -24,22 +56,67 @@
 			},
 			typing(e) {
 				if (e.backspace) {
-					if (this.input.length > 0) {
-						this.input = this.input.substring(0, this.input.length - 1);
+					if (this.currentNum.length > 0) {
+						this.currentNum = this.input.substring(0, this.input.length - 1);
 					}
 				}
 				else {
-					this.input += e.char;
+					this.currentNum += e.char;
 				}
 			},
 			enter() {
 				this.$refs.keyboard.deactivate();
-			},
+			}
 			//键盘方法end
 		}
     }
 </script>
 
 <style lang="scss" scoped>
-
+    .boardset-flowert {
+        width: 400upx;
+        height: 300upx;
+        background-color: #ffffff;
+        margin: 0 auto;
+        border-radius: 5upx;
+        padding: 10upx;
+        & .flower-input_box {
+            & .flower-title {
+                text-align: center;
+                color: #333333;
+                font-size: 14upx;
+            }
+            & .set-residue_box {
+                font-size: 14upx;
+                color: #666666;
+                margin-top: 10upx;
+                text-align: left;
+            }
+        }
+        & .flower-open_box {
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            & > view {
+                & .desc {
+                    font-size: 12upx;
+                    margin-bottom: 8upx;
+                }
+                & .flower-unit_box {
+                    display: flex;
+                    align-items: center;
+                    & > input {
+                        flex: 1;
+                        height: 40upx;
+                        border-bottom: 1px solid #eee;
+                    }
+                }
+            }
+            & .icon-qiehuan {
+                width: 35upx;
+                height: 35upx;
+                padding: 0 7upx;
+            }
+        }
+    }
 </style>

ghsPad/src/components/keyboard.vue

@@ -0,0 +1,110 @@
+<template>
+	<div class="keyboard">
+		<bottom-popup 
+            class="popup-wrap" :show="show" maskBgcolor="none" @close="comfirm" :mask="false">
+			<div class="ui-keyboard">
+				<ul class="ui-keyboard-numbers">
+					<li :class="{'zero': item == 0}" v-for="(item, index) in keyLeftData" :key="index" @click="clickKeyFn(item)">{{ item }}</li>
+				</ul>
+				<ul class="ui-keyboard-btn">
+					<li class="btn-del" @click="del">
+                        <i class="iconfont iconshanchu"></i>
+                    </li>
+					<li class="btn-ok" @click="comfirm">完成</li>
+				</ul>
+			</div>
+		</bottom-popup>
+	</div>
+</template>
+
+<script>
+import BottomPopup from '@/components/plugin/bottom-popup'
+export default {
+	name: 'keyboard',
+	components: {
+		BottomPopup
+	},
+	props: {
+		show: {
+			type: Boolean,
+			default: false
+		}
+	},
+	data() {
+		return {
+			keyLeftData: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '.']
+		}
+	},
+	methods: {
+		close() {
+			this.$emit('comfirm')
+		},
+		// 点击数字键盘
+		clickKeyFn(val) {
+			this.$emit('clickKey', val)
+		},
+		// 确认
+		comfirm() {
+			this.$emit('comfirm')
+		},
+		// 删除
+		del() {
+			this.$emit('del')
+		}
+	}
+}
+</script>
+
+<style lang="scss" scoped>
+    .popup-wrap {
+        .ui-keyboard {
+            @include disFlex(center, center);
+            padding: 0 20px 20px 20px;
+            background-color: $backColor;
+            box-shadow: 0 -8px 16px #ddd;
+         
+            // 左侧键盘
+            .ui-keyboard-numbers {
+                width: 78%;
+                display: flex;
+                align-items: center;
+                flex-wrap: wrap;
+                li {
+                    width: calc(33.33% - 20px);
+                }
+                li.zero {
+                    width: calc(66.66% - 20px);
+                }
+            }
+            // 右侧键盘
+            .ui-keyboard-btn {
+                width: 22%;
+                li {
+                    margin-right: 0;
+                }
+                li.btn-ok {
+                    height: 310px;
+                    color: #fff;
+                    background-color: $mainColor;
+                    // line-height: 310px
+                }
+            }
+            li {
+                @include disFlex(center, center);
+                height: 90px;
+                // line-height: 90px;
+                text-align: center;
+                border-radius: 10px;
+                background-color: #fff;
+                margin-top: 20px;
+                margin-right: 20px;
+                font-size: 38px;
+                font-weight: bold;
+                box-shadow: 0 2px 10px #ddd;
+            }
+            li:active {
+                background-color: rgba(0, 0, 0, 0.1);
+            }
+        }
+    }
+</style>

ghsPad/src/components/plugin/vKeyboard/VKeyboard.vue

@@ -1,5 +1,6 @@
 <template>
-	<view v-if="showKeyboard" :class="keyboardStyle" class="enl-size">
+	<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">
 				<template v-for="(digit, index) in digits">
@@ -190,7 +191,10 @@
 	.enl-size {
 		font-size: 40rpx;
 	}
-
+	.enl-size_custom {
+		// width: 700rpx!important;
+		
+	}
 	.enl-key-button {
 		display: inline-block;
 		overflow: hidden;
@@ -199,7 +203,7 @@
 		color: #333;
 		background-color: #fff;
 		box-shadow: 0 2px 2px rgba(230, 230, 230, .7);
-		border-radius: 0.35em;
+		border-radius: 3upx;
 		text-align: center;
 		white-space: nowrap;
 		user-select: none;
@@ -212,15 +216,13 @@
 	}
 
 	.v-keyboard {
-		// transform: translateY(100%);
 		width: 100%;
-		// position: absolute;
-		// bottom: 0;
-		// left: 0;
+		position: fixed;
+		bottom: 0;
+		left: 0;
 		background: #f5f5f5;
-		padding: .5em 0;
+		padding: .2em 0;
 		z-index: 100;
-
 		/*全键盘*/
 		.full-keyboard {
 			.line {
@@ -277,12 +279,11 @@
 		.digit-keyboard {
 			display: flex;
 			flex-direction: row;
-			font-size: 38rpx;
-
+			font-size: 28rpx;
+			justify-content: center;
 			.digit-button-box {
-				padding: 0 .35em;
-				flex: 80;
-
+				padding: 0 .2em;
+				max-width: 420rpx;
 				.enl-digit {
 					width: 4.46em;
 					height: 2.5em;
@@ -302,9 +303,8 @@
 			}
 
 			.special-button-box {
-				flex: 20;
+				flex: 0;
 				padding: 0 .35em 0 0;
-
 				.special-button {
 					display: block;
 					line-height: 5.5em;

ghsPad/src/components/uni-popup.vue

@@ -100,6 +100,7 @@ export default {
 </script>
 <style lang="scss">
 .uni-popup {
+    width: 100%;
     position: fixed;
     /*  #ifdef  H5  */
     top: 0upx;
@@ -139,7 +140,6 @@ export default {
         position: absolute;
         z-index: 999;
         box-sizing: border-box;
-
         &.ani {
             transition: all 0.3s;
         }