预订收款

hdApp/src/admin/home/workbench.vue

@@ -185,7 +185,7 @@ export default {
           url: "/admin/cg/mall"
         },
         {
-          name: "送货地址",
+          name: "预订收款",
           img: `${this.$constant.imgUrl}/ghs/home/icon_sk.png`,
           url: "/admin/billing/priceChange"
         },

mallApp/src/pages/pay/components/keyboard.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="keyboard">
-		<bottom-popup class="popup-wrap" :show="show" maskBgcolor="none" @close="comfirm">
+		<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>

mallApp/src/pages/pay/index.vue

@@ -1,7 +1,6 @@
 <template>
 	<div class="app-content pay-wrap">
-		<!-- 我要配送 -->
-		<!-- <block v-else> -->
+
 		<div class="delivery-wrap" v-if="!$util.isEmpty(orderShop)">
 			<div class="shop-logo-wrap" v-if="!$util.isEmpty(orderShop)">
 				<div class="logo-img">
@@ -15,35 +14,34 @@
 					<span class="app-size-30">{{ shopUser.userAsset.balance }}</span>
 				</div>
 			</div>
-			<!-- 查看更多 -->
-			<div class="view-more" :class="{'open' : tabIndex == 1}" @click="tabIndex = tabIndex == 0 ? 1 : 0">
-				<button type="primary" size="mini" plain="true">{{ tabIndex == 0 ? '点我填写收花人' : '收起' }}</button>
+			
+			<div class="view-more" :class="{'open' : tabIndex == 1}" @click="fillGetMan">
+				<text v-if="tabIndex == 0">需要送人，点我 <text class="fill-get-man">填写收花人</text></text>
+				<text v-if="tabIndex == 1">不填了，<text class="pack-up">收起</text></text>
 			</div>
-			<!-- 查看更多 -->
+			
 			<block v-if="tabIndex == 1">
 				<app-delivery-module ref="appDelivery" :anonymous="true" />
 			</block>
-			<!-- 可选优惠 -->
+			
 			<div class="module-com discount-wrap" v-if="!$util.isEmpty(discountArr)">
 				<div class="module-tit">可选优惠</div>
 				<div class="module-det">
 					<app-coupon-sel ref="couponSel" :price="amount" :discountArr="['member', 'coupon']" />
 				</div>
 			</div>
-			<!-- 按钮 -->
+			
 			<div class="btn-wrap">
 				<button v-if="!$util.isEmpty(shopUser) && shopUser.userAsset.balance && shopUser.userAsset.balance != '0.00'" class="button-com red" @click="balancePayFn">余额支付</button>
 				<button class="button-com green" v-if="isWxMiniapp()" @click="wexinPayFn">微信支付</button>
 				<button class="button-com red" v-else @click="aliPayFn">支付宝支付</button>
 			</div>
 		</div>
-		<!-- </block> -->
-		<!-- 支付密码弹窗 -->
+
 		<modal-module :show="passwordModal" @cancel="modalCancel" @click="passwordModalClick" :maskClosable="false" title="支付密码" padding="30rpx 30rpx">
 			<template v-slot:content>
 				<div class="app-modal-input-wrap">
 					<div class="inp-list-line">
-						<!-- <div class="line-label">支付密码</div> -->
 						<div class="line-input">
 							<input type="password" v-model="modalForm.payPassword" :adjust-position="false" class="inp-input" />
 						</div>
@@ -51,9 +49,9 @@
 				</div>
 			</template>
 		</modal-module>
-		<!-- 阿里支付 -->
+
 		<div class="al-pay" v-html="aliPayHtml" ref="alipayWap"></div>
-		<!-- 未设置支付密码弹窗 -->
+
 		<alert-module :show="setPassModal" btnText="去设置" btnColor="#FF2842" padding="66rpx 24rpx 66rpx 24rpx" @click="hideAlert">
 			<div class="go-login-module">
 				<div>暂未设置密码，去设置密码！</div>
@@ -132,12 +130,16 @@
 		},
 		mounted() {},
 		methods: {
+			fillGetMan(){
+				this.tabIndex = this.tabIndex == 0 ? 1 : 0
+				this.inpFocus = false
+			},
 			isWxMiniapp(){
-        return isWxMiniapp()
-      },
-      init(){
-			  this.specialInit();
-      },
+        		return isWxMiniapp()
+			},
+			init(){
+				this.specialInit();
+			},
 			specialInit() {
 				// #ifdef H5
 				// 微信二次分享
@@ -429,21 +431,35 @@
 
 		// 查看更多
 		.view-more {
-			width: 100%;
-			// padding-top: 10px;
+			width: auto;
 			padding-bottom: 20px;
 			margin-bottom: 20px;
 			font-size: 28px;
 			@include disFlex(center, center);
 			background-color: #fff;
-			color: #3385ff;
+			color: #666565;
+			justify-content: start;
+			z-index:9999999;
 			.view-more-text {
 				margin-right: 14px;
 			}
+			padding-left:40rpx;
 			i {
 				font-size: 30px;
 				font-weight: 600;
 			}
+			.fill-get-man{
+				color:red;
+				margin-left:10rpx;
+				font-weight:600;
+				text-decoration:underline;
+			}
+			.pack-up{
+				margin-left:20rpx;
+				font-weight:600;
+				color:red;
+				text-decoration:underline;
+			}
 			&.open {
 				i {
 					transform: rotate(180deg);
@@ -451,4 +467,4 @@
 			}
 		}
 	}
-</style>
+</style>