update

mobile-code/src/pages/home/components/login-popup.vue

@@ -47,7 +47,7 @@
 						<official-account @binderror="officialErr"></official-account>
 					</block>
 					<block v-else>
-						<button class="button-com red big">完成</button>
+						<button class="button-com red big" @click="hidePopup">完成</button>
 					</block>
 					<!-- <div class="app-color-3">国兰华尚关联的公众号</div>
 					<div class="flex-center-between">

mobile-code/src/pages/pay/index.vue

@@ -39,7 +39,7 @@
 				<div class="logo-img">
 					<img :src="orderShop.merchant.smallLogoUrl | default_img" alt mode="widthFix" />
 				</div>
-				<div class="app-size-30">{{ orderShop.merchant.merchantName }}</div>
+				<!-- <div class="app-size-30">{{ orderShop.merchant.merchantName }}</div> -->
 			</div>
 			<div class="module-com pay-input-wrap">
 				<pay-input-module :focus="inpFocus" :num="amount" @focusFn="focusFn" @blurFn="blurFn" @clickKey="clickKeyFn" />
@@ -162,7 +162,7 @@
 				},
 				payCallData: null,
 				// 优惠折扣
-				discountArr: []
+				discountArr: false
 			}
 		},
 		computed: {
@@ -254,6 +254,9 @@
 					if (this.option.store) {
 						params.store = this.option.store
 					}
+					if (!this.$util.isEmpty(discountArr)) {
+						params.couponId = this.$refs.couponSel.couponId
+					}
 					host = fastPay
 				}
 				host(params).then(res => {
@@ -418,9 +421,10 @@
 			padding-bottom: 20px;
 			@include disFlex(center, center);
 			.logo-img {
-				width: 80px;
+				width: 120px;
 				border-radius: 50%;
-				margin-right: 20px;
+				margin: 10px auto;
+				// margin-right: 20px;
 				img {
 					border-radius: 50%;
 				}