帮我送

mall/src/App.vue

@@ -71,7 +71,7 @@
 </script>
 
 <style lang="scss">
-	//没有scss变量方法的，主要引入 这样打包的时候就不会所以的组件都打包进去
+	//没有scss变量方法的，主要引入 这样打包的时候就不会所有的组件都打包进去
 	@import './static/iconfont/iconfont.css';
 	@import './static/css/uni2.css';
 	@import './static/css/base.scss';

mall/src/pages/pay/index.vue

@@ -1,45 +1,10 @@
 <template>
 	<div class="app-content pay-wrap">
-		<!-- <block v-if="option.pageStatus == 'recharge'">
-			<div class="tabs-wrap">充值</div>
-		</block>
-		<block v-else>
-			<div class="tabs-wrap">付款</div>
-		</block>-->
-		<!-- <block v-else>
-			<app-tabs :tabs="tabs" :currentTab="tabIndex" :isFixed="true" :borderLeft="true" @change="tabChange" itemWidth="50%" />
-		</block>-->
-		<!-- 直接付款 -->
-		<!-- <block v-if="tabIndex == 0">
-			<div class="pay-wrap" v-if="!$util.isEmpty(orderShop)">
-				<div class="logo-wrap">
-					<div class="logo-img">
-						<img :src="orderShop.merchant.smallLogoUrl | default_img" alt mode="widthFix" />
-					</div>
-					<div class="app-size-30">{{ !$util.isEmpty(shopUser) ? shopUser.userName : orderShop.merchant.merchantName }}</div>
-				</div>
-				<div class="pay-input-wrap">
-					<pay-input-module :focus="inpFocus" :num="amount" @focusFn="focusFn" @blurFn="blurFn" @clickKey="clickKeyFn" />
-					<div class="balance" v-if="!$util.isEmpty(shopUser) && shopUser.userAsset.balance != '0.00'">
-						<span>账户余额 ¥</span>
-						<span class="app-size-30">{{ shopUser.userAsset.balance }}</span>
-					</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="isWxBrowser()" @click="wexinPayFn">微信支付</button>
-						<button class="button-com red" v-else @click="aliPayFn">支付宝支付</button>
-					</div>
-				</div>
-			</div>
-		</block>-->
-		<!-- 我要配送 -->
-		<!-- <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">
 					<img :src="orderShop.merchant.smallLogoUrl | default_img" alt mode="widthFix" />
 				</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" />
@@ -50,20 +15,13 @@
 			</div>
 			<!-- 查看更多 -->
 			<div class="view-more" :class="{'open' : tabIndex == 1}" @click="changeDelivery">
-				<div class="view-more-text">{{ tabIndex == 0 ? '我要送人' : '收起' }}</div>
+				<div class="view-more-text">{{ tabIndex == 0 ? '帮我送' : '收起' }}</div>
 				<i class="iconfont iconjiantouxia"></i>
 			</div>
 			<!-- 查看更多 -->
 			<block v-if="tabIndex == 1">
 				<app-delivery-module ref="appDelivery" :anonymous="true" />
 			</block>
-			<!-- 匿名派送 -->
-			<!-- <block v-if="tabIndex == 1">
-				<div class="none-name-delivery flex-center">
-					<checkbox class="ljd-checkbox" @change="anonymityChange"></checkbox>
-					<span class="none-name-text">匿名派送</span>
-				</div>
-			</block>-->
 			<!-- 可选优惠 -->
 			<div class="module-com discount-wrap" v-if="!$util.isEmpty(discountArr)">
 				<div class="module-tit">可选优惠</div>
@@ -79,8 +37,6 @@
 				<button class="button-com red" v-else @click="aliPayFn">支付宝支付</button>
 			</div>
 		</div>
-		<!-- </block> -->
-		<!-- <button @click="_pay">提交</button> -->
 		<!-- 支付密码弹窗 -->
 		<modal-module :show="passwordModal" @cancel="modalCancel" @click="passwordModalClick" :maskClosable="false" title="支付密码" padding="30rpx 30rpx">
 			<template v-slot:content>

saas/src/saas/shop/list.vue

@@ -345,10 +345,14 @@ export default {
 			this.wxPayDialog = false;
 		},
 		getH5MallQrCode(id) {
-			MerchantService.getH5MallQrCode(id).then(res => {
-				this.$alert("<img src='"+res.imgUrl+"' style='width:200px;margin:0 auto;' />", 'H5商城', {
-					dangerouslyUseHTMLString: true
-				});
+			MerchantService.getH5MallQrCode({ id: id }).then(res => {
+				this.$alert(
+					"<img src='" + res.imgUrl + "' style='width:200px;margin:0 auto;' />",
+					'H5商城',
+					{
+						dangerouslyUseHTMLString: true
+					}
+				);
 			});
 		}
 	}