1111

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

@@ -2,9 +2,10 @@
   <view class="app-select_user">
     <view class="title">客户列表</view>
     <view class="app-userList_box">
-      <view 
-	  	:key="item.id"
-	  	class="userList-item_box" v-for="item in list">
+      <view
+							:key="item.id"
+							@click="selectUser(item)"
+							class="userList-item_box" v-for="item in list">
         <view class="head-box">
           <image
             class="img"
@@ -18,31 +19,17 @@
           <view>欠{{item.debtAmount}}</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>
-	<input 
-		disabled 
-		class="input-serach_box" 
-		v-model="searchUser" 
+	<input
+		disabled
+		class="input-serach_box"
+		v-model="searchUser"
 		type="text"
 		@change="changSearch"
 		placeholder-class="input-placeholder"
 		placeholder="搜索客户"/>
 	 <view class="keyboard-body_box">
-		 
+
 		<VKeyboard
 		ref="keyboard"
 		:pointIsShow="false"
@@ -75,14 +62,18 @@ export default {
     this.activeKeyboard();
   },
   methods: {
+			selectUser(val){
+				this.$emit('selectUser',val)
+			},
 	  changSearch(val){
 		  this.init()
 	  },
 	 async init() {
 		 try {
-		let { data } = await customList({
-				name: this.searchUser
-			}) 
+		let { data:{list} } = await customList({
+																								name: this.searchUser
+																							})
+			this.list = list
 		 }catch(err) {
 
 		 }
@@ -92,17 +83,15 @@ export default {
       this.$refs.keyboard.activate();
     },
     typing(e) {
-	  if(e.char === '确定') {
-		  return false
-	  }
-      if (e.backspace) {                                                        
+      if (e.backspace) {
           this.searchUser = this.searchUser.substring(0, this.searchUser.length - 1);
       } else {
         this.searchUser += e.char;
       }
-	  
+
     },
     enter() {
+					 this.init()
       //this.$refs.keyboard.deactivate();
     },
   },
@@ -124,8 +113,10 @@ export default {
   & .app-userList_box {
     padding: 5rpx;
     display: flex;
-    align-items: center;
+    // align-items: center;
     flex-wrap: wrap;
+				min-height: 140rpx;
+				overflow-y: scroll;
     & .userList-item_box {
       margin: 0 5rpx 5rpx 0;
       width: 130rpx;
@@ -159,7 +150,7 @@ export default {
     }
   }
   & .keyboard-body_box {
-	  flex: 1;
+			flex: 1;
 	  overflow: hidden;
   }
   & .input-serach_box {
@@ -167,11 +158,11 @@ export default {
 	  line-height: 28rpx;
 	  text-align: center;
 	  height: 28rpx;
-	  
+
   }
   & .input-placeholder {
 		font-size: 18rpx!important;
-		color: #333!important; 
+		color: #333!important;
 	}
 }
 </style>

ghsPad/src/admin/home/components/shopTypeSelect.vue

@@ -44,7 +44,7 @@
             type="top"
             maxHeight="90vh"
 		>
-			<keyboardSetFlower :selectItem="selectItem"></keyboardSetFlower>
+			<keyboardSetFlower :selectItem.sync="selectItem"></keyboardSetFlower>
 		</uniPopup>
 		<uniPopup
             :show.sync="isShowSettle"
@@ -82,6 +82,11 @@
         created(){
             this.init()
         },
+								watch:{
+										selectItem(){
+											console.log(3333,this.selectItem)
+										}
+								},
         methods:{
            async init(){
                try {
@@ -112,9 +117,11 @@
                 this.selectItem = {
                     ...item,
                     currentUnit:item.bigUnit,
-                    currentUnitPrice: item.bigPrice,
-                    currentNum: 0
+                    currentUnitPrice:item.property==1?item.bigPrice:item.price,
+                    currentNum: 0,
+																				unitType: 0
                 }
+																console.log(33333,this.selectItem)
                 this.isShowFllowNum = true
             },
             settle(){
@@ -207,4 +214,4 @@
 				}
 			}
 		}
-</style>
+</style>

ghsPad/src/admin/home/workbench.vue

@@ -57,10 +57,10 @@
 			<view class="active">
 				扎
 			</view>
-			<view>
+			<view @click="deleteShop">
 				删除商品
 			</view>
-			<view>
+			<view @click="clearShop">
 				清空商品
 			</view>
 		</view>
@@ -72,7 +72,7 @@
 		type="top"
 		maxHeight="90vh"
 		>
-			<selectUser></selectUser>
+			<selectUser @selectUser="selectUserReturn"></selectUser>
 		</uniPopup>
 		<NotLogin></NotLogin>
 	</view>
@@ -96,6 +96,8 @@ export default {
 			isShowFllowNum: false,
 			isShowUser: false,
 			isShowSettle: false,
+			shopList:[],
+			currenSelectShop:{}
 		};
 	},
 	computed: {
@@ -111,6 +113,9 @@ export default {
 	onShow() {
 	},
 	methods: {
+		selectUserReturn(val){
+					this.isShowUser = false
+		},
 		init() {
 		},
 		selectItem(){
@@ -121,6 +126,12 @@ export default {
 		},
 		settle(){
 			this.isShowSettle = true
+		},
+		clearShop(){
+			this.shopList = []
+		},
+		deleteShop(){
+			
 		}
 	}
 };

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

@@ -7,15 +7,17 @@
                 <view>
                     <view class="desc">数量</view>
                     <div class="flower-unit_box">
-                        <input 
-                            @tap="activeKeyboard" 
-                            disabled 
-                            type="number" 
+                        <input
+                            disabled
+																												@tap="changeType('currentNum')"
+																												:key="selectItem.currentNum"
+                            type="text"
                             v-model="selectItem.currentNum">
                         <span>{{selectItem.currentUnit}}</span>
                     </div>
                 </view>
                 <image
+																			@tap="changeUnit"
                     class="change-unit"
                     src="https://bpic.51yuansu.com/pic3/cover/03/80/68/5c0607c96e49d_610.jpg"
                     mode="scaleToFill"
@@ -23,7 +25,7 @@
                 <view>
                     <view class="desc">单价</view>
                     <div class="flower-unit_box">
-                        <input type="number" v-model="currentPrice">
+                        <input @tap="changeType('currentUnitPrice')" disabled type="text" v-model="selectItem.currentUnitPrice">
                     </div>
                 </view>
             </view>
@@ -33,11 +35,11 @@
         </view>
         <view class="keyboard-body_box">
          <VKeyboard
-            ref="keyboard" 
-            :pointIsShow="false" 
-            :digital="true" 
-            :disorderly="false" 
-            @typing="typing" 
+            ref="keyboard"
+            :pointIsShow="false"
+            :digital="true"
+            :disorderly="false"
+            @typing="typing"
             @enter="enter">
             </VKeyboard>
         </view>
@@ -60,39 +62,56 @@
             }
         },
         data() {
-			return {
-				input: '',//键盘输入
-                currentNum: 0,
-                currentPrice: 0,
-                keyShow: false
-			};
+							return {
+									keyShow: false,
+									enterType:'currentNum',
+							};
 		},
-        mounted(){
-            this.activeKeyboard()
-        },
-        methods: {
+		mounted(){
+
+					this.activeKeyboard()
+					this.currentUnit = 	this.selectItem.currentUnit
+					this.currentPrice = this.selectItem.currentUnitPrice
+
+
+
+		},
+		methods: {
+			changeType(type){
+					this.enterType = type
+			},
 			//键盘方法
 			activeKeyboard() {
 				this.$refs.keyboard.activate();
 			},
 			typing(e) {
 				if (e.backspace) {
-					if (this.currentNum.length > 0) {
-						this.currentNum = this.currentNum.substring(0, this.currentNum.length - 1);
+					if (this.selectItem[this.enterType].length > 0) {
+						this.selectItem[this.enterType] = this.selectItem[this.enterType].substring(0, this.selectItem[this.enterType].length - 1);
 					}
 				}else {
-                    if(this.currentNum == 0) {
-                        this.currentNum = e.char
-                    }else {
-                        this.currentNum += e.char;
-                    }
+								if(this.selectItem[this.enterType] == 0|| this.$util.isEmpty(this.selectItem[this.enterType])) {
+												this.selectItem[this.enterType] = e.char
+								}else {
+												this.selectItem[this.enterType] += e.char;
+								}
 				}
+				this.$emit('update:selectItem', this.selectItem)
 			},
 			enter() {
 				//this.$refs.keyboard.deactivate();
+			},
+			changeUnit(){
+							
+
+								this.selectItem.unitType = this.selectItem.unitType === 0?1:0
+								this.selectItem.currentUnit = this.selectItem.unitType ===0?this.selectItem.bigUnit:this.selectItem.smallUnit
+									this.$emit('update:selectItem', this.selectItem)
+
+
 			}
 			//键盘方法end
-		}
+				}
     }
 </script>
 

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

@@ -38,9 +38,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">
+					<text>确定</text>
+				</view>
 			</view>
 		</view>
 	</view>
@@ -285,7 +285,7 @@
 
 				.swith-key {
 					width: 13%;
-					
+
 				}
 
 				.enl-logo {