Commit 3641f176 authored by FE-安焕焕's avatar FE-安焕焕 👣

修改支付未登录的问题和优惠券展示问题

parent 1b3c469f
...@@ -23,7 +23,6 @@ export default { ...@@ -23,7 +23,6 @@ export default {
}, },
// 订单创建 // 订单创建
orderCreate(data) { orderCreate(data) {
console.log(data);
return http.post(`${talosHost}/api/kdsp/order-info/e/vmSubmit`, encryption(data)); return http.post(`${talosHost}/api/kdsp/order-info/e/vmSubmit`, encryption(data));
} }
}; };
...@@ -39,7 +39,6 @@ export function encryption(data = '') { ...@@ -39,7 +39,6 @@ export function encryption(data = '') {
* @return {String} 加密后的数据16进制 * @return {String} 加密后的数据16进制
*/ */
export async function encryptByDESModeEBC(message) { export async function encryptByDESModeEBC(message) {
console.log(message);
const [{ payPwdSalt }] = await desSalt(); const [{ payPwdSalt }] = await desSalt();
var keyHex = CryptoJS.enc.Utf8.parse(payPwdSalt); var keyHex = CryptoJS.enc.Utf8.parse(payPwdSalt);
var encrypted = CryptoJS.DES.encrypt(message, keyHex, { var encrypted = CryptoJS.DES.encrypt(message, keyHex, {
......
...@@ -20,7 +20,6 @@ function payByWeixinJsapi(info = {}, callback) { ...@@ -20,7 +20,6 @@ function payByWeixinJsapi(info = {}, callback) {
function onBridgeReady() { function onBridgeReady() {
// eslint-disable-next-line no-undef // eslint-disable-next-line no-undef
WeixinJSBridge.invoke('getBrandWCPayRequest', info, function(res) { WeixinJSBridge.invoke('getBrandWCPayRequest', info, function(res) {
console.log(res);
if (res.err_msg == 'get_brand_wcpay_request:ok') { if (res.err_msg == 'get_brand_wcpay_request:ok') {
// 使用以上方式判断前端返回,微信团队郑重提示: // 使用以上方式判断前端返回,微信团队郑重提示:
//res.err_msg将在用户支付成功后返回ok,但并不保证它绝对可靠。 //res.err_msg将在用户支付成功后返回ok,但并不保证它绝对可靠。
...@@ -84,7 +83,6 @@ function payByWeixinH5(info) { ...@@ -84,7 +83,6 @@ function payByWeixinH5(info) {
*/ */
function payByALIH5(info) { function payByALIH5(info) {
if (!info.url) return; if (!info.url) return;
console.log('ali:', info.url);
const aliWrap = document.createElement('div'); const aliWrap = document.createElement('div');
aliWrap.id = 'ALIWEB_WRAP'; aliWrap.id = 'ALIWEB_WRAP';
aliWrap.setAttribute('id', 'ALIWEB_WRAP'); aliWrap.setAttribute('id', 'ALIWEB_WRAP');
......
...@@ -9,7 +9,7 @@ const payTypeE = [ ...@@ -9,7 +9,7 @@ const payTypeE = [
'PD_YXMMAEC_UserClickCashierSelectWechatPay' 'PD_YXMMAEC_UserClickCashierSelectWechatPay'
]; ];
const codeArr = ['4034', '4035', '4036', '3005', '6049']; const codeArr = ['4034', '4035', '4036', '3005', '6049', '401'];
// (4034, "密码错误"), // (4034, "密码错误"),
// (4035, "密码重试超限,无法验证"), // (4035, "密码重试超限,无法验证"),
// (4036, "验证码错误"); // (4036, "验证码错误");
......
...@@ -23,7 +23,12 @@ ...@@ -23,7 +23,12 @@
:class="{ disable: couponDisabled }" :class="{ disable: couponDisabled }"
@click.stop="openCouponModal" @click.stop="openCouponModal"
> >
{{ couponInfo.name || '未选择优惠券' }} <span v-if="couponInfo.pickupId">
{{ `满${couponInfo.limitAmount}减${couponInfo.faceValue}元` }}
</span>
<span v-else>
未选择优惠券
</span>
<cr-icon type="arrow" class="selectArrow" size="15px" /> <cr-icon type="arrow" class="selectArrow" size="15px" />
</div> </div>
</div> </div>
...@@ -71,7 +76,10 @@ export default { ...@@ -71,7 +76,10 @@ export default {
this.pay.changePayType(payType, mergePayPretreatmentInfo); this.pay.changePayType(payType, mergePayPretreatmentInfo);
}, },
openCouponModal() { openCouponModal() {
if (this.couponDisabled) return; if (this.couponDisabled) {
this.$toast('优惠券不可更改');
return;
}
this.pay.openCouponModal(this.pay.orderNo); this.pay.openCouponModal(this.pay.orderNo);
} }
} }
......
...@@ -50,7 +50,6 @@ export default { ...@@ -50,7 +50,6 @@ export default {
computed: {}, computed: {},
watch: { watch: {
value: function(val) { value: function(val) {
console.log(val);
if (val) { if (val) {
this.sendSms(1); this.sendSms(1);
} }
......
...@@ -102,7 +102,6 @@ import { ...@@ -102,7 +102,6 @@ import {
codeArr, codeArr,
payTypeE, payTypeE,
CREDIT_PAY, CREDIT_PAY,
WECHAT_PAY,
PAY_SUCCESS, PAY_SUCCESS,
creditStatus, creditStatus,
IS_THIRD_PAY, IS_THIRD_PAY,
...@@ -114,7 +113,6 @@ import { ...@@ -114,7 +113,6 @@ import {
ACCOUNT_APPLY_FAIL, ACCOUNT_APPLY_FAIL,
creditPayStatusType, creditPayStatusType,
ACCOUNT_APPLY_SUCCESS, ACCOUNT_APPLY_SUCCESS,
ACCOUNT_APPLY_AUDIT_FAIL,
SMS_VERIFICATION_CODE_PAY, //短信验证码 SMS_VERIFICATION_CODE_PAY, //短信验证码
FACE_VERIFICATION_CODE_PAY FACE_VERIFICATION_CODE_PAY
} from './STATIC_DATA'; } from './STATIC_DATA';
...@@ -233,7 +231,6 @@ export default { ...@@ -233,7 +231,6 @@ export default {
this.selectedCoupon = displayInfo.payCouponInfo.optimalPayCoupon; this.selectedCoupon = displayInfo.payCouponInfo.optimalPayCoupon;
this.selectedCoupon.id = this.selectedCoupon.pickupId; this.selectedCoupon.id = this.selectedCoupon.pickupId;
this.showCoupon = displayInfo.payCouponInfo.optimalType === 3; this.showCoupon = displayInfo.payCouponInfo.optimalType === 3;
console.log(this.selectedCoupon, 'selectedCoupon');
} }
this.payContractInfo = displayInfo.payContractInfo || {}; this.payContractInfo = displayInfo.payContractInfo || {};
for (const p of payMethods) { for (const p of payMethods) {
...@@ -429,7 +426,7 @@ export default { ...@@ -429,7 +426,7 @@ export default {
this.payResult('Fail', error.message); this.payResult('Fail', error.message);
return; return;
} }
// error?.message && this.$toast(error?.message); error?.message && this.$toast(error?.message);
this.error = error?.message; this.error = error?.message;
this.retrieve(); this.retrieve();
return; return;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment