键盘样式

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

@@ -18,15 +18,11 @@
     </view>
 </template>
 <script>
-import uniPopup from '@/components/uni-popup'
 import settlePop from './settle-pop.vue'
 import { showClass,showList } from '@/api/home/index'
 export default {
-    name:'shopTypeSelect',
-    components:{
-        uniPopup,
-        settlePop
-    },
+    name:'rightItemArea',
+    components:{ settlePop },
     data(){
         return {
             shopListType:[],
@@ -109,7 +105,7 @@ export default {
     }
     & .shop-show_box {
         flex: 1;
-        padding: 5upx;
+        padding: 2upx;
         display: flex;
         flex-wrap: wrap;
         overflow-y: scroll;

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

@@ -9,13 +9,12 @@
         </view>
         <view class="footer-box">
           <view> {{item.updateTime.substr(5,11)}} </view>
-          <!-- <view>欠{{parseFloat(item.debtAmount)}}</view> -->
         </view>
       </view>
     </view>
-    <input disabled class="input-serach_box" v-model="searchUser" type="text" @change="changSearch" placeholder-class="input-placeholder" placeholder="搜索客户"/>
+    <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" :digital="false" :disorderly="false" @typing="typing" @enter="enter" > </VKeyboard>
+      <VKeyboard ref="keyboard" :pointIsShow="false" :digital="false" :disorderly="false" @typing="typing" @enter="enter" @cancel="cancel" > </VKeyboard>
     </view>
   </view>
 </template>
@@ -38,25 +37,19 @@ export default {
     this.activeKeyboard();
   },
   methods: {
-			selectUser(val){
-				this.$emit('selectUser',val)
-			},
-	  changSearch(val){
-		  this.init()
-	  },
-	 async init() {
-		 try {
-		let { data:{list} } = await customList({
-                            name: this.searchUser
-                          })
-			this.list = list
-		 }catch(err) {
-
-		 }
-	 },
+    selectUser(val){
+      this.$emit('selectUser',val)
+    },
+    changSearch(val){
+      this.init()
+    },
+    async init() {
+      let { data:{list} } = await customList({ name: this.searchUser })
+      this.list = list
+    },
     //键盘方法
     activeKeyboard() {
-      this.$refs.keyboard.activate();
+      this.$refs.keyboard.activate()
     },
     typing(e) {
       if (e.backspace) {
@@ -66,18 +59,20 @@ export default {
       }
     },
     enter() {
-					 this.init()
-      //this.$refs.keyboard.deactivate();
+		  this.init()
     },
+    cancel(){
+      this.$emit('cancelSelectUser')
+    }
   },
 };
 </script>
-
 <style lang="scss">
 .app-select_user {
   background-color: #ffffff;
   padding: 5upx;
-  height: 90vh;
+  height: 99vh;
+  width:70vw;
   display: flex;
   flex-direction: column;
   box-sizing: border-box;
@@ -88,7 +83,6 @@ export default {
   & .app-userList_box {
     padding: 5upx;
     display: flex;
-    // align-items: center;
     flex-wrap: wrap;
     min-height: 130upx;
     overflow-y: scroll;
@@ -127,7 +121,6 @@ export default {
   }
   & .keyboard-body_box {
 		flex: 1;
-	  overflow: hidden;
   }
   & .input-serach_box {
 	  font-size: 20upx;

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

@@ -43,7 +43,6 @@
 </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',
@@ -61,77 +60,18 @@ export default {
     },
     data() {
         return {
-            // shopVal: '100',
             freight: '',
             settleId: 1,
             payId:1,
             payUserId:1,
             isPrint:1,
             proceeds: '0',
-            returnWay:[
-                {
-                    name:'扫码付款',
-                    id:0,
-                },
-                {
-                    name:'已付款',
-                    id:1,
-                },
-                {
-                    name:'待付款',
-                    id:2,
-                }
-            ],
-            payWay:[
-                {
-                    name:'微信',
-                    id:0
-                },
-                {
-                    name:'支付宝',
-                    id:1
-                },
-                {
-                    name:'现金',
-                    id:4
-                },
-                    {
-                    name:'银行卡',
-                    id:5
-                }
-            ],
-            payUser:[
-                {
-                    name:'收款码',
-                    id:0   
-                },
-                {
-                    name:'微信客服1',
-                    id:1 
-                },
-                {
-                    name:'微信客服2',
-                    id:2   
-                },{
-                    name:'微信客服3',
-                    id:3  
-                },{
-                    name:'微信客服4',
-                    id:4   
-                }
-            ],
+            returnWay:[ { name:'扫码付款', id:0, }, { name:'已付款', id:1, }, { name:'待付款', id:2, } ],
+            payWay:[ { name:'微信', id:0 }, { name:'支付宝', id:1 }, { name:'现金', id:4 }, { name:'银行卡', id:5 } ],
+            payUser:[ { name:'收款码', id:0 }, { name:'微信客服1', id:1 }, { name:'微信客服2', id:2 },{ name:'微信客服3', id:3 },{ name:'微信客服4', id:4 } ],
             currentInputType:'proceeds',
             totalMoney: 0,
-            printOptions:[
-                {
-                    name:'打印',
-                    id:1
-                },
-                {
-                    name:'不大',
-                    id:2
-                }
-            ]
+            printOptions:[ { name:'打印', id:1 }, { name:'不打印', id:2 } ]
         };
     },
     mounted() {
@@ -182,11 +122,11 @@ export default {
     }
 }
 </script>
-
 <style lang="scss" scoped>
 .app-select_customer {
     background-color: #ffffff;
     display: flex;
+    width:80vw;
     height: 90vh;
     .select-left {
         flex: 1;
@@ -237,7 +177,7 @@ export default {
     }
     & .keyboard-body_box {
         flex: 1;
-        overflow: hidden;
+        overflow: auto;
     }
 }
 </style>

ghsPad/src/admin/home/login.vue

@@ -3,7 +3,7 @@
 		<view class="login-model">
 			<view class="experFrame">
 				<view>
-					<view style="text-align:center;margin-bottom:20upx;">
+					<view class="logo-area">
 						<image :src="`${constant.imgUrl}/logo3.png`" class="logo" mode="widthFix"></image> 
 					</view>
 					<view style="color:#666666;text-align:center;margin-bottom:10upx;font-size:20upx;">销花宝</view>
@@ -81,7 +81,6 @@ export default {
 					that.$store.commit('setLoginInfo', { ...subRes.data.admin, ...subRes.data })
 					getUser(true).then(res => { uni.setNavigationBarTitle({ title: res.name }) })
 					that.setUserShopAll()
-					uni.navigateBack()
 				}
 			})
 
@@ -131,8 +130,8 @@ export default {
       margin-top: 25upx;
       height: 0upx;
       .experInput{
-        height: 60upx;
-        width: 600upx;
+        height: 35upx;
+        width: 230upx;
         margin-bottom:14upx;
         display: inline-block;
         vertical-align: middle;
@@ -146,18 +145,25 @@ export default {
       }
       .buttonText{
         display: inline-block;
-        line-height:60upx;
+        line-height:40upx;
         padding: 0 20upx;
         vertical-align: middle;
-        font-size: 25upx;
-        width: 600upx;
-        height:60upx;
-      }
-      .logo{
-        width:100upx;
-        margin:0 auto;
-		border-radius:5upx;
+        font-size: 20upx;
+        width: 230upx;
+        height:40upx;
       }
+	  .logo-area{
+		text-align:center;
+		margin-bottom:10upx;
+		height:50upx;
+		text-align:center;
+		.logo{
+			width:50upx;
+			margin:0 auto;
+			border-radius:5upx;
+			margin:0 auto;
+		}
+	  }
   }
 }
 </style>

ghsPad/src/admin/home/workbench.vue

@@ -1,111 +1,106 @@
 <template>
-	<view class="app-workbench_box">
-		<view class="nav-left">
-			<view class="item-list"> 收银 </view>
-		</view>
-		<view class="itemList-box">
-			<view class="title">商品列表</view>
-			<view class="itemList-item_box">
-				<view v-for="item in itemList" :key="item.id" @click="selectCurrentActive(item)" class="show-item_box">
-					<view :class="[ 'item-body_box', selectCurrentActiveItem.id===item.id?'active':'not-active']">
-						<view class="flower-name_box">
-							<view class="name">
-								{{item.name}}
+<view>
+	<view v-if="isLogin == false">
+		<loginComponent></loginComponent>
+	</view>
+	<view v-else>
+		<view class="app-workbench_box">
+			<view class="nav-left">
+				<view class="item-list"> 收银 </view>
+			</view>
+			<view class="itemList-box">
+				<view class="title">花材列表</view>
+				<view class="itemList-item_box">
+					<view v-for="item in itemList" :key="item.id" @click="selectCurrentActive(item)" class="show-item_box">
+						<view :class="[ 'item-body_box', selectCurrentActiveItem.id===item.id?'active':'not-active']">
+							<view class="flower-name_box">
+								<view class="current-item-title"><text class="name">{{item.name}}</text><text @click.stop="delSelectItem" class="del">删除</text></view>
+							</view>
+							<view class="item-price-num">
+								<view>{{parseFloat(item.currentUnitPrice)}}元/{{item.currentUnit}}</view>
+								<view>{{item.currentNum}} {{item.currentUnit}}</view>
+								<view>￥{{item.currentNum * item.currentUnitPrice}}</view>
 							</view>
-						</view>
-						<view>
-							<view>{{parseFloat(item.currentUnitPrice)}}元/{{item.currentUnit}}</view>
-							<view>{{item.currentNum}} {{item.currentUnit}}</view>
-							<view>￥{{item.currentNum * item.currentUnitPrice}}</view>
 						</view>
 					</view>
 				</view>
-			</view>
-			<view class="itemList-footer_box">
-				<view> 数量
-					<text style="margin-left:5upx;">
-						<text v-if="Number(totalShop.bigUnit)>0">{{totalShop.bigUnit}}扎</text>
-						<text v-if="Number(totalShop.smallUnit)>0">{{totalShop.smallUnit}}支</text>
-					</text>
+				<view class="itemList-footer_box">
+					<view> 数量
+						<text style="margin-left:5upx;">
+							<text v-if="Number(totalShop.bigUnit)>0">{{totalShop.bigUnit}}扎</text>
+							<text v-if="Number(totalShop.smallUnit)>0">{{totalShop.smallUnit}}支</text>
+						</text>
+					</view>
+					<view> 合计 <text style="margin-left:5upx;">￥{{totalShop.totalPrice}}</text> </view>
 				</view>
-				<view> 合计 <text style="margin-left:5upx;">￥{{totalShop.totalPrice}}</text> </view>
 			</view>
+			<view class="open-box">
+				<view @click="logout"> 退出 </view>
+				<view @click="selectUser"> 客户 </view>
+				<view @click="clearItemFn"> 清空花材 </view>
+				<view>临时商品</view>
+				<view @click="breakage"> 报损 </view>
+				<view @click="settle"> 结算 </view>
+			</view>
+			<!-- 分类和花材展示区 -->
+			<view class="item-show-list">
+				<rightItemArea @kdSelectItem="kdSelectItem"> </rightItemArea>
+			</view>
+			<!-- 选客户 isShowUser -->
+			<uni-popup ref="selectUserRef" background-color="#fff" type="center" :animation="false">
+				<selectUser @selectUser="selectUserReturn" @cancelSelectUser="cancelSelectUser"> </selectUser>
+			</uni-popup>
+			<!-- 开单选花材输入数量和金额 -->
+			<uni-popup ref="kdSelectNumPriceRef" background-color="#fff" type="center" :animation="false">
+				<kdSelectNumPrice @enterNum="enterReturn" :selectItem.sync="selectItem"></kdSelectNumPrice>
+			</uni-popup>
+			<!-- 结算弹框 isShowSettle -->
+			<uni-popup ref="settlePopRef" background-color="#fff" type="center" :animation="false">
+				<settlePop @settleReturn="settleReturn" ref="settlePop" :totalShop="totalShop"></settlePop>
+			</uni-popup>
+			<!-- 选择支付方式 isShowselectPayWay -->
+			<uni-popup ref="selectPayWayRef" background-color="#fff" type="center" :animation="false">
+				<selectPayWay @cancel="cancelPay()" @selectPayWayBack="selectPayWayBack"></selectPayWay>
+			</uni-popup>
+			<!-- 清空花材 -->
+			<uni-popup ref="clearItemRef" type="dialog">
+				<uni-popup-dialog type="info" cancelText="取消" confirmText="确认" title="提示" content="确认清空？" @confirm="confirmClearItem"></uni-popup-dialog>
+			</uni-popup>
+			<uni-popup ref="logoutRef" type="dialog">
+				<uni-popup-dialog type="info" cancelText="取消" confirmText="确认" title="提示" content="确认退出？" @confirm="confirmLogout"></uni-popup-dialog>
+			</uni-popup>
 		</view>
-		<view class="open-box">
-			<view @click="logout"> 退出 </view>
-			<view @click="selectUser"> 客户 </view>
-			<view @click="deleteShop"> 删除商品 </view>
-			<view @click="clearShop"> 清空商品 </view>
-			<view @click="breakage"> 报损 </view>
-			<view @click="settle"> 结算 </view>
-		</view>
-		<!-- 分类和花材展示区 -->
-		<view class="item-show-list">
-			<rightItemArea @kdSelectItem="kdSelectItem"> </rightItemArea>
-		</view>
-		<!-- 选客户 -->
-		<uniPopup :show.sync="isShowUser" type="top" maxHeight="90vh" >
-			<selectUser @selectUser="selectUserReturn"> </selectUser>
-		</uniPopup>
-		<!-- 开单选商品输入数量和金额 -->
-		<uniPopup :show.sync="isShowFllowNum" type="top" maxHeight="90vh">
-			<kdSelectNumPrice @enterNum="enterReturn" :selectItem.sync="selectItem"></kdSelectNumPrice>
-		</uniPopup>
-		<!-- 结算弹框 -->
-		<uniPopup :show.sync="isShowSettle" type="top" maxHeight="90vh" >
-			<settlePop @settleReturn="settleReturn" ref="settlePop" :totalShop="totalShop"></settlePop>
-		</uniPopup>
-		<!-- 选择支付方式 -->
-		<uniPopup :show.sync="isShowselectPayWay" type="top" maxHeight="90vh" >
-			<selectPayWay @cancel="isShowselectPayWay=false" @selectPayWayBack="selectPayWayBack"></selectPayWay>
-		</uniPopup>
-		<NotLogin></NotLogin>
 	</view>
+</view>
 </template>
 <script>
 import { mapGetters,mapActions } from "vuex";
-import NotLogin from "@/components/not-login";
 import productMins from "@/mixins/product";
 import autoUpdateMixins from "@/mixins/autoUpdate";
-import uniPopup from '@/components/uni-popup'
 import kdSelectNumPrice from '@/components/app-kd-select-num-price.vue'
 import settlePop from './components/settle-pop.vue'
 import selectUser from './components/select-user.vue'
 import rightItemArea from './components/rightItemArea.vue'
 import selectPayWay from '@/components/select-pay-way.vue'
+import loginComponent from './login.vue'
 import { createCreateOrder, wastageCreateOrder } from '@/api/home/index'
 export default {
 	name: "workbench",
-	components: {
-		NotLogin,
-		uniPopup,
-		selectUser,
-		rightItemArea,
-		kdSelectNumPrice,
-		settlePop,
-		selectPayWay
-		},
+	components: { selectUser, rightItemArea, kdSelectNumPrice, settlePop, selectPayWay,loginComponent },
 	mixins: [productMins,autoUpdateMixins],
 	data() {
 		return {
-			isShowFllowNum: false,
-			isShowUser: false,
-			isShowSettle: false,
-			isShowselectPayWay: false,
 			itemList:[],
 			currenSelectShop:{},
 			selectItem: {},
 			selectCurrentActiveItem:{},
-			totalShop:{
-					bigUnit: 0,
-					smallUnit:0,
-					totalPrice: 0
-			},
-			selectItemUser:{}
+			totalShop:{ bigUnit: 0, smallUnit:0, totalPrice: 0 },
+			selectItemUser:{},
+			isLogin:false
 		};
 	},
 	computed: {
-		...mapGetters({ loginInfo: "getLoginInfo" }),
+		...mapGetters(["getLoginInfo"]),
 		...mapGetters({ myShopInfo: "getMyShopInfo" }),
 	},
 	onLoad(option) {
@@ -116,9 +111,19 @@ export default {
 	},
 	onShow() {
 	},
-	mounted(){
+	mounted() {
+		if(this.$util.isEmpty(this.getLoginInfo.admin) || this.getLoginInfo.admin.currentShopId == 0){
+			this.isLogin = false
+		}
 	},
 	watch:{
+		getLoginInfo: {
+			handler(newValue) {
+				if(this.$util.isEmpty(newValue.admin) == false && newValue.admin.currentShopId > 0){
+					this.isLogin = true
+				}				
+			}
+		},
 		itemList(){
 			if(this.$util.isEmpty(this.itemList)) {
 				this.totalShop = { bigUnit: 0, smallUnit:0, totalPrice: 0 }
@@ -152,13 +157,16 @@ export default {
 					sendCost: freight,
 					remark:''
 				})
-				this.isShowSettle = false
-				this.isShowselectPayWay = true
+				this.$refs.settlePopRef.close()
+				this.$refs.selectPayWayRef.open('center')
 				this.$msg('订单创建成功')
 			}catch(err) {
 				console.log(err)
 			}
 		},
+		cancelPay(){
+			this.$refs.selectPayWayRef.close()
+		},
 		async settleReturn(){
 			this.setCreateOrder()
 		},
@@ -167,16 +175,19 @@ export default {
 		},
 		selectUserReturn(val){
 			this.selectItemUser = val
-			this.isShowUser = false
+			this.$refs.selectUserRef.close()
 		},
-		init() {
+		cancelSelectUser(){
+			this.$refs.selectUserRef.close()
 		},
 		selectUser(){
-			this.isShowUser = true
+			this.$refs.selectUserRef.open('center')
+		},
+		init() {
 		},
 		breakage(){
 			if(this.$util.isEmpty(this.itemList)) {
-				this.$msg('请选择报损商品')
+				this.$msg('请选择报损花材')
 				return false
 			}
 			this.$util.confirmModal({content:'确定报损吗？'},
@@ -194,63 +205,37 @@ export default {
 				}catch(err) {
 					console.log(err)
 				}
-
 			})
 		},
 		settle(){
 			if(this.$util.isEmpty(this.itemList)) {
-				this.$msg('请选择结算商品')
+				this.$msg('请选择结算花材')
 				return false
 			}
 			if(this.$util.isEmpty(this.selectItemUser)) {
 				this.$msg('请选择客户')
 				return false
 			}
-			this.isShowSettle = true
+			this.$refs.settlePopRef.open('center')
+		},
+		//清空花材弹框
+		clearItemFn(){
+			this.$refs.clearItemRef.open()
+		},
+		//确认清空花材
+		confirmClearItem(){
 
 		},
-		clearShop(){
-			let self = this
-			uni.showModal({
-				title: '提示',
-				content: '确认清空？',
-				success: function (res) {
-					if (res.confirm) {
-						self.itemList = []
-					}
-				}
-			})
+		confirmLogout(){
+			uni.clearStorage()
+			this.$store.commit("setLoginInfo", {})
+			plus.runtime.restart()
 		},
 		logout(){
-		let that = this
-			uni.showModal({
-				title: '提示',
-				content: '确认退出？',
-				success: function (res) {
-					if (res.confirm) {
-						uni.clearStorage()
-						that.$store.commit("setLoginInfo", {})
-						plus.runtime.restart()
-					}
-				}
-			})
+			this.$refs.logoutRef.open()
 		},
-		deleteShop(){
-			if(this.$util.isEmpty(this.selectCurrentActiveItem)) {
-				this.$msg('请选择要删除的商品')
-				return false
-			}
-			let self = this
-			uni.showModal({
-				title: '提示',
-				content: '确认删除？',
-				success: function (res) {
-					if (res.confirm) {
-						let index =	self.itemList.findIndex(i=>self.selectCurrentActiveItem.id === i.id)
-						self.itemList = self.itemList.filter(i=>self.selectCurrentActiveItem.id !== i.id)
-					}
-				}
-			})
+		delSelectItem(){
+
 		},
 		kdSelectItem(item){
 			let obj	=	this.itemList.find(i=>i.id===item.id)
@@ -265,13 +250,11 @@ export default {
 			}else{
 				this.selectItem = obj
 			}
-		    this.isShowFllowNum = true
+			this.$refs.kdSelectNumPriceRef.open('center')
 		},
 		enterReturn(item){
-			this.isShowFllowNum = false
+			this.$refs.kdSelectNumPriceRef.close()
 		 	let index =	this.itemList.findIndex(i=>i.id===item.id)
-			console.log(1111,index)
-			console.log(item)
 			if(index >= 0) {
 				this.itemList.splice(index,1,item)
 			}else{
@@ -347,22 +330,38 @@ export default {
 			flex: 1;
 			border: 1px solid #eee;
 			& .show-item_box {
-				padding: 5upx;
+				padding: 2upx;
 				& .item-body_box {
-					border-radius: 3upx;
-					padding: 5upx;
+					border-radius: 2upx;
+					padding: 2upx;
 					font-size: 14upx;
+					color:#666666;
 					&.active {
-						background-color: #b2b4b4;
+						background-color: #d4d6d6;
 					}
 					&.not-active {
-						background-color: #e1e4e4;
+						background-color: #e7e9e9;
+					}
+					.item-price-num{
+						color:#afaeae;
+						font-size:10upx;
 					}
 					& .flower-name_box {
 						padding: 0 5upx;
-						& .name {
-							color: #333333;
-							font-weight: bold;
+						.current-item-title {
+							.name{
+								color: #333333;
+								font-weight: bold;
+								overflow: hidden;
+								text-overflow:ellipsis;
+								white-space: nowrap;
+								width:50upx;
+							}
+							.del{
+								color:orange;
+								font-size:12upx;
+								float:right;
+							}
 						}
 					}
 					& > view:nth-child(2) {

ghsPad/src/components/app-kd-select-num-price.vue

@@ -95,7 +95,7 @@ export default {
 </script>
 <style lang="scss" scoped>
 .boardset-flowert {
-    width:70vh;
+    width:75vh;
     background-color: #ffffff;
     margin: 0 auto;
     border-radius: 5upx;

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

@@ -15,7 +15,7 @@
 			</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"> <text style="color:#666666;font-size:15upx;">取消</text> </view>
+				<view class="enl-key-button special-button enl-gray" @tap="cancel"> <text style="color:#666666;font-size:15upx;">取消</text> </view>
 				<view class="enl-key-button special-button enl-gray" @tap="enter"> <text style="color:green;font-size:15upx;">确定</text> </view>
 			</view>
 		</view>
@@ -28,7 +28,6 @@
 				</view>
 				<view class="enl-letter enl-key-button special-key enl-gray" v-if="index === 2" @tap="backspace"><i class="iconfont icon-backspace"></i></view>
 			</view>
-
 			<view class="line special-line">
 				<view class="enl-letter enl-key-button swith-key enl-gray">
 					<i class="iconfont icon-fuhao" @tap="typingSymbol" v-if="mode === 'letter'"></i>
@@ -37,9 +36,8 @@
 				<view class="enl-letter enl-key-button space" @tap="typing(' ')"><text class="enl-logo"> </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"><text style="color:#666666;font-size:15upx;">清</text></view>
-				<view class="enl-letter enl-key-button swith-key enl-gray" @tap="enter"><text style="color:#666666;font-size:15upx;">取消</text></view>
+				<view class="enl-letter enl-key-button swith-key enl-gray" @tap="cancel"><text style="color:#666666;font-size:15upx;">取消</text></view>
 			</view>
-
 		</view>
 	</view>
 </template>
@@ -127,6 +125,9 @@ export default {
 			//this.deactivate();
 			this.$emit('enter');
 		},
+		cancel(){
+			this.$emit('cancel')
+		},
 		//激活键盘
 		activate() {
 			// #ifdef APP-PLUS
@@ -224,7 +225,7 @@ export default {
 		display: flex;
 		flex-direction: column;
 		align-items: center;
-		height: 42vh;
+		height: 48vh;
 		.line {
 			text-align: center;
 			flex: 1;

ghsPad/src/components/uni-popup.vue

@@ -1,221 +0,0 @@
-<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="['uni-popup__wrapper-box', isRadius?'uni-popup__wrapper-radius':'']" @click.stop="clear" :style="{'maxHeight': maxHeight,'width': width}">
-                <slot />
-            </view>
-        </view>
-    </view>
-</template>
-
-<script>
-export default {
-	name: 'UniPopup',
-	props: {
-		// 开启动画
-		animation: {
-			type: Boolean,
-			default: true
-		},
-		// 弹出层类型，可选值，top: 顶部弹出层；bottom：底部弹出层；center：全屏弹出层
-		type: {
-			type: String,
-			default: 'center'
-		},
-		// 是否开启自定义
-		custom: {
-			type: Boolean,
-			default: false
-		},
-		// maskClick
-		maskClick: {
-			type: Boolean,
-			default: true
-		},
-		show: {
-			type: Boolean,
-			default: true
-		},
-		// 最大高度，以upx为单位
-		maxHeight: {
-			type: String,
-			default: '500upx'
-		},
-		// 定义宽度
-		width: {
-			type: String,
-			default: '80%'
-		},
-		zIndex: {
-			type: Number,
-			default: 99999
-		},
-		isRadius: {
-			type: Boolean,
-			default: false
-		}
-	},
-	data() {
-		return {
-			ani: '',
-			showPopup: false
-		}
-	},
-	watch: {
-		show(newValue) {
-			if (newValue) {
-				this.open()
-			} else {
-				this.close()
-			}
-		}
-	},
-	created() {},
-	methods: {
-		clear() {},
-		open() {
-			this.$emit('change', {
-				show: true
-			})
-			this.showPopup = true
-
-			this.$nextTick(() => {
-				this.ani = 'uni-' + this.type
-			})
-		},
-		close(type) {
-			if (!this.maskClick && type) return
-			this.$emit('change', {
-				show: false
-			})
-			this.ani = ''
-			this.$emit('update:show', false)
-			this.$nextTick(() => {
-				this.showPopup = false
-			})
-		}
-	}
-}
-</script>
-<style lang="scss">
-.uni-popup {
-    width: 100%;
-    position: fixed;
-    /*  #ifdef  H5  */
-    top: 0upx;
-    // top: 50upx;
-    /*  #endif  */
-    /*  #ifndef  H5  */
-    top: 0upx;
-    /*  #endif  */
-    bottom: 0;
-    left: 0;
-    right: 0;
-    z-index: 9999;
-    overflow: hidden;
-
-    &__mask {
-        position: absolute;
-        top: 0;
-        bottom: 0;
-        left: 0;
-        right: 0;
-        z-index: 998;
-        background: rgba(0, 0, 0, 0.4);
-        opacity: 0;
-
-        &.ani {
-            transition: all 0.3s;
-        }
-
-        &.uni-top,
-        &.uni-bottom,
-        &.uni-center {
-            opacity: 1;
-        }
-    }
-
-    &__wrapper {
-        position: absolute;
-        z-index: 999;
-        box-sizing: border-box;
-      
-        &.ani {
-            transition: all 0.3s;
-        }
-
-        &.top {
-            top: 5vh!important;
-            left: 50%;
-            width: 100%;
-            transform: translate(-50%,0)!important;
-            & .uni-popup__wrapper-box {
-                margin: 0 auto!important;
-            }
-        }
-
-        &.bottom {
-            bottom: 0;
-            left: 0;
-            width: 100%;
-            transform: translateY(100%);
-        }
-
-        &.center {
-            width: 100%;
-            height: 100%;
-            display: flex;
-            // justify-content: center;
-            align-items: center;
-            transform: scale(1.2);
-            // opacity: 0;
-           
-        }
-            &-radius {
-            border-radius: 20upx;
-        }
-        &-box {
-            position: relative;
-            box-sizing: border-box;
-        }
-
-        &.uni-custom {
-            // & .uni-popup__wrapper-box {
-            //    padding: 30upx;
-            //    background-color: inherit;
-            // }
-
-            &.center {
-                & .uni-popup__wrapper-box {
-                    position: relative;
-                    max-width: 90%;
-                    max-height: 90%;
-                }
-            }
-
-            &.top,
-            &.bottom {
-                & .uni-popup__wrapper-box {
-                    width: 100%;
-                    overflow: hidden;
-                    border-top-left-radius: 5upx;
-                    border-top-right-radius: 5upx;
-                }
-            }
-        }
-
-        &.uni-top,
-        &.uni-bottom {
-            transform: translateY(0);
-        }
-
-        &.uni-center {
-            transform: scale(1);
-            opacity: 1;
-        }
-    }
-}
-</style>