|
|
@@ -62,7 +62,6 @@
|
|
|
<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"
|
|
|
@@ -86,7 +85,7 @@
|
|
|
@click="hideAlert"
|
|
|
>
|
|
|
<div class="go-login-module">
|
|
|
- <div>暂未设置密码,去设置密码!</div>
|
|
|
+ <div>请先设置支付密码!</div>
|
|
|
</div>
|
|
|
</alert-module>
|
|
|
</div>
|
|
|
@@ -97,7 +96,6 @@ import { mapGetters } from "vuex";
|
|
|
import AppTabs from "@/components/plugin/tabs";
|
|
|
import PayInputModule from "./components/pay-input";
|
|
|
import AppDeliveryModule from "@/components/app-delivery";
|
|
|
-// import { getMiniAppUrl } from '@/utils/common'
|
|
|
import wexinPay from "@/utils/pay/wxPay";
|
|
|
import ModalModule from "@/components/plugin/modal";
|
|
|
import AppCouponSel from "@/components/app-coupon-sel";
|
|
|
@@ -147,12 +145,7 @@ export default {
|
|
|
payPassword: ""
|
|
|
},
|
|
|
appendFrm: {
|
|
|
- // anonymity: '0', // 是否匿名 0不 1要
|
|
|
sendDistance: "", // 配送距离,根据腾讯js进行计算
|
|
|
- // goodsId: '', // 【商城下单特有字段】商品id
|
|
|
- // goodsStyleId: '', // 【商城下单特有字段】商品款式id
|
|
|
- // goodsNum: '', // 【商城下单特有字段】商品数量
|
|
|
- // couponId: '0', // 优惠券id,默认0没有使用优惠券
|
|
|
receiveLat: "", // 收花人纬度
|
|
|
receiveLong: "" // 收花人经度
|
|
|
},
|
|
|
@@ -168,10 +161,6 @@ export default {
|
|
|
...mapGetters({ shopUser: "getShopUser" })
|
|
|
},
|
|
|
onLoad(option) {
|
|
|
- // this.option = this.$util.isEmpty(option) || {
|
|
|
- // account: 12358,
|
|
|
- // shopId: 15680
|
|
|
- // }
|
|
|
this.specialInit();
|
|
|
},
|
|
|
mounted() {},
|
|
|
@@ -189,7 +178,6 @@ export default {
|
|
|
return false;
|
|
|
}
|
|
|
// #endif
|
|
|
- // this.$util.getCheckLogin().then(res => {})
|
|
|
if (this.option.pageType) {
|
|
|
this.tabIndex = parseInt(this.option.pageType);
|
|
|
}
|
|
|
@@ -238,8 +226,6 @@ export default {
|
|
|
prePrice: this.amount,
|
|
|
payWay: this.form.payWay,
|
|
|
payPassword: this.modalForm.payPassword
|
|
|
- // sourceType: 1,
|
|
|
- // shopId: 15680
|
|
|
};
|
|
|
if (this.tabIndex == 1) {
|
|
|
let deliveryForm = this.$refs.appDelivery.form
|
|
|
@@ -280,12 +266,9 @@ export default {
|
|
|
this.$nextTick(() => {
|
|
|
this.$refs.alipayWap.children[0].submit();
|
|
|
});
|
|
|
- // location.href = res.data
|
|
|
} else {
|
|
|
- // this.$msg('支付成功!')
|
|
|
this.paySuccess();
|
|
|
}
|
|
|
- // window.location.href = res.data.pay_button.mweb_url
|
|
|
});
|
|
|
},
|
|
|
// tab切换
|
|
|
@@ -356,7 +339,8 @@ export default {
|
|
|
alert("支付失败!");
|
|
|
},
|
|
|
changeDelivery() {
|
|
|
- this.tabIndex = this.tabIndex == 0 ? 1 : 0;
|
|
|
+ this.inpFocus = false
|
|
|
+ this.tabIndex = this.tabIndex == 0 ? 1 : 0
|
|
|
}
|
|
|
}
|
|
|
};
|
|
|
@@ -492,7 +476,6 @@ export default {
|
|
|
// 查看更多
|
|
|
.view-more {
|
|
|
width: 100%;
|
|
|
- // padding-top: 10px;
|
|
|
padding-bottom: 20px;
|
|
|
margin-bottom: 20px;
|
|
|
font-size: 28px;
|
|
|
@@ -500,6 +483,7 @@ export default {
|
|
|
background-color: #fff;
|
|
|
color: #3385ff;
|
|
|
.view-more-text {
|
|
|
+ z-index: 9999;
|
|
|
margin-right: 14px;
|
|
|
}
|
|
|
i {
|