xiala

components/mask-model/mask-model.vue

@@ -2,11 +2,15 @@
 	<view class="mask-model" v-show="showMask">
 		<view class="mask" @click="hide"></view>
 		<view class="model-count">
-			<view class="amen-tit">提示信息</view>
+			<view class="amen-tit">{{ !typeShow ? '下拉提示' : '提示信息'}}</view>
 			<view class="count" :style="{'color':titleColoe}">{{maskTitle}}</view>
-			<button form-type="submit" class="switchBtn" >切换航班</button>
-			<button form-type="submit" class="switchBtn" >强制装载</button>
-			<button form-type="submit" class="eleBtn" @click="hide">取消</button>
+			<button form-type="submit" class="switchBtn" v-if="typeShow">切换{{tabname}}</button>
+			<button form-type="submit" class="switchBtn" v-if="typeShow">强制装载</button>
+			<button form-type="submit" class="eleBtn" @click="hide" v-if="typeShow">取消</button>
+			<view class="bot"  v-if="!typeShow">
+				<button form-type="submit" class="eleBtns" @click="hide">取消</button>
+				<button form-type="submit" class="switchBtndel" >确定</button>
+				</view>
 			<!-- <view class="btm-box">
 				<view v-show="btnType==1" class="btn cancel" @click="hide" :style="{'color':cancelColor}">取消</view>
 				<view class="btn confirm" @click="confirm" :style="{'color':confirmColor}">确定</view>
@@ -36,6 +40,13 @@
 			btnType:{//1显示取消按钮
 				type: String,
 				default:'1'
+			},
+			tabname:{//名称
+				type: String,
+				default:'1'
+			},
+			typeShow: {
+				type: Boolean,
 			}
 		},
 		data() {
@@ -77,13 +88,21 @@
 		top: 0;
 		z-index: 999;
 	}
+	.bot{
+		width: 100%;
+		/* padding: 0 .55rem 0 .55rem; */
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		margin-top: 1.25rem;
+	}
 	.mask-model .mask{
 		width: 100%;
 		height: 100%;
 		background: rgba(0,0,0,0.65);
 	}
 	.switchBtn{
-		width: 11.5rem;
+		width: 12rem;
     height: 2.125rem;
 		background: linear-gradient(179.11deg, rgba(51,161,165,1.00) 1.866%,rgba(59,111,142,1.00) 137.144%,rgba(59,111,142,1.00) 137.144%,rgba(59,111,142,1.00) 137.144%);
 		border-radius:
@@ -97,8 +116,37 @@
 		font-weight: 700;
 		margin-bottom: 1rem;
 	}
+	.switchBtndel{
+		width: 5rem;
+    height: 2rem;
+		background: linear-gradient(179.11deg, rgba(51,161,165,1.00) 1.866%,rgba(59,111,142,1.00) 137.144%,rgba(59,111,142,1.00) 137.144%,rgba(59,111,142,1.00) 137.144%);
+		border-radius:
+		4px;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		color: rgb(255, 255, 255);
+		font-family: Noto Sans SC;
+		font-size: 15px;
+		font-weight: 700;
+	}
+	.eleBtns{
+		width: 5rem;
+    height: 2rem;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		background: rgb(243, 253, 255);
+		border: 1px solid rgb(172, 218, 230);
+		border-radius:
+		4px;
+		color: rgb(59, 150, 159);
+		font-family: Noto Sans SC;
+		font-size: 15px;
+		font-weight: 500;
+	}
 	.eleBtn{
-		width: 11.5rem;
+		width: 12rem;
     height: 2.125rem;
 		display: flex;
 		align-items: center;
@@ -121,7 +169,7 @@
 		top: 50%;
 		transform: translate(-50%,-50%);
 		z-index: 9;
-		min-height: 360rpx;
+		min-height: 9.375rem;
 		padding: 1.5rem 0 1.5rem 0;
 		overflow: hidden;
 	}
@@ -136,7 +184,7 @@
 	.count{
 		/* text-align: center; */
 		/* padding:30rpx; */
-		padding: .625rem 1.5625rem 1.875rem 1.5625rem;
+		padding: .625rem .875rem 1.875rem .875rem;
 		color: rgb(106, 113, 125);
 		font-family: Noto Sans SC;
 		font-size: 14px;

pages/sorting/index.vue

@@ -40,14 +40,14 @@
 				<scroll-view  scroll-y="true" class="scroll-Y">
 					<view :class="item.types ? 'ups':'up'" v-for="(item, index) in listdate" :key="index" @touchstart="start"  @touchend="(e)=>end(e,item)">
 						<view class="list">行李编号：{{ item.name }}</view>
-						<view class="down_up"></view>
+						<view class="down_up" @tap="up"></view>
 						<view class="delete"><view class="log"  @click="()=>checkMore(item)"></view></view>
 					</view>
 				</scroll-view>
 				<view class="but" v-if="!action" @tap="clickOrder">一键添加</view>
 			</view>
 		</view>
-		<mask-model ref="showMask" btnType="1" @confirm="confirm" @cancel="cancel" titleColoe="#666666" cancelColor="#666666" confirmColor="#007AFF" :maskTitle="maskTitle"></mask-model>
+		<mask-model :typeShow="typeShow" :tabname="tabname" ref="showMask" btnType="1" @confirm="confirm" @cancel="cancel" titleColoe="#666666" cancelColor="#666666" confirmColor="#007AFF" :maskTitle="maskTitle"></mask-model>
 	</view>
 </template>
 
@@ -133,13 +133,18 @@
 				},
 				stratvalue: '',//开始位置
 				endvalue: '',//结束位置
-				maskTitle:'该行李不属于当前航班，请选择处理方式。'
+				maskTitle:'该行李不属于当前航班，请选择处理方式。',
+				tabname: '',//按钮名称
+				typeShow:true
 			}
 		},
 		created(option) {
 		},
 		onLoad(option){
 			this.navname = JSON.parse(decodeURIComponent(option.item))
+			if (this.navname == '分拣') {
+        this.tabname = '航班'
+			}
 		},
 		onUnload() {
 			// this.$refs.showMask.show();
@@ -163,6 +168,12 @@
 			maskModel:maskModel,
 		},
 		methods: {
+			//下拉
+			up () {
+				this.typeShow = false
+				this.maskTitle = '是否确定要拉下该件行李？'
+				this.$refs.showMask.show();
+			},
 			confirm:function(e){//确定按钮
 				console.log('您点击了确定按钮');
 			},