Compare commits

..

No commits in common. 'addTips' and 'dev' have entirely different histories.
addTips ... dev

  1. 29
      App.vue
  2. 32
      Utils/Api.js
  3. 5
      Utils/Request.js
  4. 248
      pages/index/index.vue
  5. 94
      pages/welcome/welcome.vue
  6. BIN
      static/tipBg.png

@ -15,18 +15,15 @@
snNo: '', // sn
platformType: '', //
//
// url: 'https://hsg.dctpay.com/user',
// graurl: 'https://pay.dctpay.com/crest',
// imgUrl: 'https://pay.dctpay.com/filesystem/',
// imageWxImg: 'https://hsgcs.dctpay.com/filesystem/wxApplets/',
// redirectUrl:'https://pay.dctpay.com/scanPay',
//
url: 'https://hsgcs.dctpay.com/user',
graurl:'https://gratia-pay.dctpay.com/crest',
imgUrl: 'https://hsgcs.dctpay.com/filesystem/',
url: 'https://hsg.dctpay.com/user',
graurl: 'https://pay.dctpay.com/crest',
imgUrl: 'https://pay.dctpay.com/filesystem/',
imageWxImg: 'https://hsgcs.dctpay.com/filesystem/wxApplets/',
redirectUrl:'https://gratia-pay.dctpay.com/scanPay',
isClick: true, //
//
// url: 'https://hsgcs.dctpay.com/user',
// graurl:'https://gratia-pay.dctpay.com/crest',
// imgUrl: 'https://hsgcs.dctpay.com/filesystem/',
// imageWxImg: 'https://hsgcs.dctpay.com/filesystem/wxApplets/',
},
onLaunch: function() {
@ -44,7 +41,7 @@
that.globalData.platformType = 'UQRCODEPAY';
}
/* uni.getStorage({
uni.getStorage({
key: 'openId',
success(e) {
if (e.data) {
@ -68,13 +65,7 @@
that.globalData.token = e.data;
}
}
}) */
that.globalData.openId = uni.getStorageSync("openId");
that.globalData.userInfo = uni.getStorageSync("user");
that.globalData.token = uni.getStorageSync("token");
})
},
onHide: function() {
console.log('App Hide')

@ -11,8 +11,8 @@ export const getQrCodeDetail = params => {
//银行卡识别
export const recognizeBankCard = params => {
return POST('GET', `${grabase}/ocr/recognizeBankCard`, params).then(res => res.data);
}
}
//创建 JSAPI 订单
export const createJSAPIOrder = params => {
return POST('POST', `${grabase}/tradeOrder/createJSAPIOrder`, params).then(res => res.data);
@ -20,22 +20,22 @@ export const createJSAPIOrder = params => {
// 支付 JSAPI 订单
export const jsapiPay = params => {
return POST('POST', `${grabase}/pay/jsapiPay`, params).then(res => res.data);
}
//计算价格
}
//计算价格
export const calculation = params => {
return POST('GET', `${grabase}/tradeOrder/calculation`, params).then(res => res.data);
}
}
//H5 code 转化openid
export const getH5AccessToken = params => {
return POST('GET', `${base}/wechat/getH5AccessToken`, params).then(res => res.data);
}
//支付宝获取openid
//支付宝获取openid
export const getAlipayUserId = params => {
return POST('GET', `${grabase}/login/getAlipayUserId`, params).then(res => res.data);
}
}
//获取登录验证码
export const getLoginSMSCode = params => {
@ -62,14 +62,4 @@ export const getUserDetail = params => {
//查询优惠券
export const queryUserDiscountList = params => {
return POST('GET', `${base}/discount/queryUserDiscountList`, params).then(res => res.data);
}
// 获取拉卡拉银联用户id
export const getUnionUserId = params => {
return POST('POST', `${grabase}/tradeOrder/getUnionUserId`, params).then(res => res.data);
}
//取消订单
export const cancelOrder = params => {
return POST('POST', `${grabase}/tradeOrder/cancelOrder`, params).then(res => res.data);
}
}

@ -39,10 +39,9 @@ function request(method, url, data) {
})
}
},
fail(err) {
app.globalData.isClick = true;
fail(err) {
uni.showToast({
title: '请求失败,查看网络是否正常',
title: '请求失败',
icon: 'none',
duration: 1500,
})

@ -122,7 +122,7 @@
</view>
<!-- 优惠券弹窗 -->
<wybPopup ref="popup" type="bottom" width="500" radius="6" :showCloseIcon="true" :scrollY="true">
<wybPopup ref="popup" type="bottom" width="500" radius="6" :showCloseIcon="true" scrollY="true">
<view class="fotct font18 fontwig6 fcor333 mart10 height30">优惠券选择</view>
<view v-if="discountList == ''" class="mart60 fotct font14 fcor666">
<image mode="widthFix" style="width: 50vw;" src="../../static/noorder.png"></image>
@ -151,7 +151,7 @@
<view class="height40p"></view>
</wybPopup>
<!-- 门店活动 -->
<wybPopup ref="popupstore" type="bottom" width="500" radius="6" :showCloseIcon="true" :scrollY="true">
<wybPopup ref="popupstore" type="bottom" width="500" radius="6" :showCloseIcon="true" scrollY="true">
<view class="fotct font18 fontwig6 fcor333 mart10 height30">门店活动选择</view>
<view v-if="storeCouponlist == ''" class="mart60 fotct font14 fcor666">
<image mode="widthFix" style="width: 50vw;" src="../../static/noorder.png"></image>
@ -200,25 +200,6 @@
</view>
</wybPopup>
<wybPopup ref="popupTip" type="center" :maskClickClose="false" :height="popupHeight" :width="popupWidth"
bgColor="" radius="20" :showCloseIcon="false">
<view class="width100 height100 pr">
<image class="popImg" mode="aspectFit" src="/static/tipBg.png"></image>
<view class="popContain width100 ">
<view class="tip-top font20">恭喜!获得了到店优惠</view>
<view class="tip-price tip-color">
<text class="font45 " v-if="tradeDetail">{{tradeDetail.rebateActivityActualPrice}}</text><text
class=""></text>
</view>
<view class="tip-color tip-desc">
到店付款可当现金用
</view>
<view class="btnPay " @tap.stop="tapToPay">去支付</view>
</view>
</view>
</wybPopup>
</view>
</template>
@ -236,8 +217,7 @@
phone,
getUserAccount,
queryUserDiscountList,
calculation,
cancelOrder
calculation
} from '../../Utils/Api.js';
// #ifdef H5
var jweixin = require('jweixin-module');
@ -290,13 +270,7 @@
storediscountType: '', //
storediscountCondition: '', //
storediscountPrice: '', //
storeDiscountId: '', //id
tradeDetail: null, //
/* 弹窗 */
popupHeight: 485,
popupWidth: 330,
outTradeNo: '', //
storeDiscountId: '' //id
}
},
mounted() {},
@ -309,9 +283,6 @@
this.getUserAccount();
this.queryUserDiscountList();
}
this.popupHeight = this.rpxTopx(this.popupHeight);
this.popupWidth = this.rpxTopx(this.popupWidth);
},
computed: {
//
@ -339,13 +310,6 @@
},
methods: {
rpxTopx(temp) {
let deviceWidth = uni.getSystemInfoSync().windowWidth; //
let rpx = (750 / deviceWidth) * Number(temp)
return Math.floor(rpx);
},
Timer() {},
//
getCode() {
@ -500,7 +464,7 @@
if (item >= this.storediscountCondition) {
storetype = this.storediscountType;
storeprice = this.storediscountPrice;
}
}
// else {
// storetype = this.storediscountType;
// storeprice = this.storediscountPrice;
@ -708,17 +672,13 @@
// if (userAgent.match(/Alipay/i) == "alipay") {
// this.createJSAPIOrder('ALIPAY');
// } else if (userAgent.match(/MicroMessenger/i) == "micromessenger") {
if (app.globalData.isClick) {
this.createJSAPIOrder();
app.globalData.isClick = false;
}
this.createJSAPIOrder();
// }
},
//
createJSAPIOrder(item) {
uni.showLoading({
title: '请求中'
createJSAPIOrder(item) {
uni.showLoading({
title:'请求中'
})
// "WECHAT ALIPAY UQRCODEPAY",
let phone = '';
@ -734,21 +694,11 @@
"userDiscountId": this.memDiscountId,
"userPhone": phone
}
this.tradeDetail = null;
this.outTradeNo = "";
createJSAPIOrder(datas).then(res => {
createJSAPIOrder(datas).then(res => {
uni.hideLoading();
if (res.return_code == '000000') {
this.outTradeNo = res.return_data.outTradeNo;
if (res.return_data.tradeDetail && res.return_data.tradeDetail.rebateActivityPart) {
this.tradeDetail = res.return_data.tradeDetail;
this.$refs.popupTip.show();
return
}
this.jsapiPay(res.return_data.outTradeNo);
} else {
app.globalData.isClick = true;
uni.showToast({
title: res.return_msg,
duration: 2000,
@ -757,26 +707,12 @@
}
})
},
tapToPay() {
this.$refs.popupTip.hide();
this.$nextTick(() => {
if (this.outTradeNo) {
this.jsapiPay(this.outTradeNo);
}
})
},
//
jsapiPay(item) {
uni.showLoading({
title: '请求中',
mask: true,
})
let datas = {
outTradeNo: item
}
jsapiPay(datas).then(res => {
uni.hideLoading();
if (res.return_code == '000000') {
if (res.return_data.payParam && app.globalData.platformType == 'WECHAT') {
this.wechatpayRequest(res.return_data);
@ -797,7 +733,6 @@
duration: 2000
})
} else {
app.globalData.isClick = true;
uni.showToast({
title: res.return_msg,
duration: 2000,
@ -806,29 +741,6 @@
}
})
},
//
cancelOrder(outTradeNo) {
let params = {
"outTradeNo": outTradeNo
}
cancelOrder(params).then(res => {
app.globalData.isClick = true;
this.outTradeNo = "";
if (res.return_code == '000000') {
// uni.showToast({
// title: "",
// icon: 'none',
// duration: 2000
// })
} else {
uni.showToast({
title: res.return_msg,
icon: 'none',
duration: 2000
})
}
})
},
//
deleteVal() {
// this.plateNumberList.pop();
@ -936,11 +848,10 @@
},
//
wechatpayRequest: function(self) {
let that = this;
uni.showLoading({
title: '支付中...'
})
if (self.platformType == 1 || self.platformType == 5) {
if (self.platformType == 1) {
jweixin.config({
debug: false, // ,apialertpclogpc
appId: self.payParam.acc_resp_fields.app_id, //
@ -953,12 +864,8 @@
jweixin.ready(function() {
jweixin.checkJsApi({
jsApiList: ['chooseWXPay'], // JSJS2,
success: function(res) {
// app.globalData.isClick = true;
},
fail: function(res) {
// app.globalData.isClick = true;
}
success: function(res) {},
fail: function(res) {}
});
jweixin.chooseWXPay({
appId: self.payParam.acc_resp_fields.app_id,
@ -976,20 +883,11 @@
title: '支付成功'
})
},
cancel: function(r) {
that.cancelOrder(that.outTradeNo); //
// app.globalData.isClick = true;
},
fail: function(res) {
that.cancelOrder(that.outTradeNo); //
// app.globalData.isClick = true;
}
cancel: function(r) {},
fail: function(res) {}
});
});
// configerrorconfigdebugresSPA
jweixin.error(function(res) {
that.cancelOrder(that.outTradeNo); //
// app.globalData.isClick = true;
uni.showToast({
icon: 'none',
title: '支付失败了',
@ -1025,21 +923,12 @@
uni.showToast({
title: '支付成功'
})
},
cancel: function(r) {
// app.globalData.isClick = true;
that.cancelOrder(that.outTradeNo); //
},
fail: function(res) {
// app.globalData.isClick = true;
that.cancelOrder(that.outTradeNo); //
}
cancel: function(r) {},
fail: function(res) {}
});
});
jweixin.error(function(res) {
// app.globalData.isClick = true;
that.cancelOrder(that.outTradeNo); //
uni.showToast({
icon: 'none',
title: '支付失败了',
@ -1050,40 +939,12 @@
},
//
alipayRequest(item) {
let that = this;
alipayApi.tradePay({
tradeNO: item,
success: function(res) {
if(res.resultCode==9000){
app.globalData.isClick = true;
// uni.showToast({
// title:"!",
// icon:'none'
// })
}else{
// uni.showToast({
// title:"!",
// icon:'none'
// })
that.cancelOrder(that.outTradeNo); //
}
},
fail: function(res) {
uni.showToast({
title:res,
icon:'none'
})
that.cancelOrder(that.outTradeNo); //
},
},
/* function(res) {
app.globalData.isClick = true;
// alert(JSON.stringify(res));
//
} */
);
tradeNO: item
}, function(res) {
// alert(JSON.stringify(res));
//
});
},
@ -1142,9 +1003,6 @@
border-radius: 45rpx;
font-size: 28rpx;
}
}
.re {
@ -1301,66 +1159,4 @@
}
}
/* 活动金弹窗 */
.pr {
position: relative;
}
.popImg {
width: 100%;
height: 100%;
min-height: 430px;
}
.popContain {
position: absolute;
top: 0;
// padding: 20px;
box-sizing: border-box;
text-align: center;
font-size: 28rpx;
.tip-color {
color: #BF0E0F;
}
.tip-top {
color: white;
letter-spacing: 2px;
}
.tip-price {
margin-top: 143px;
font-weight: bold;
display: flex;
align-items: baseline;
justify-content: center;
.font45 {
font-size: 45px;
font-style: oblique;
margin-right: 5px;
}
}
.tip-desc {
font-size: 18px;
font-weight: bold;
margin-top: 10px;
}
}
.btnPay {
color: #FFFFFF;
background: linear-gradient(to right, #F46538, #E8411A);
width: 60%;
margin: 22px auto 16px;
height: 50px;
display: flex;
justify-content: center;
align-items: center;
border-radius: 25px;
font-size: 28rpx;
}
</style>

@ -1,35 +1,25 @@
<template>
<view>
</view>
</template>
<script>
import {
import {
getH5AccessToken,
getAlipayUserId,
getUnionUserId
getAlipayUserId
} from '../../Utils/Api.js';
let app = getApp();
export default {
data() {
return {
appUpIdentifier: ''
}
},
onLoad(options) {
//
if (app.globalData.platformType == 'UQRCODEPAY') {
var useragent = navigator.userAgent;
var agentname = useragent.split('UnionPay/');
var agentno = agentname[1];
var agentnoname = agentno.split(')');
var lastangetname = agentnoname[0];
this.appUpIdentifier = 'UnionPay/' + lastangetname;
}
var arr1 = window.location.href;
var arr2 = arr1.split('=');
if (app.globalData.platformType == 'WECHAT' || app.globalData.platformType == 'ALIPAY' || app.globalData
.platformType == 'UQRCODEPAY') {
if (app.globalData.platformType == 'WECHAT' || app.globalData.platformType == 'ALIPAY') {
if (arr2[1].length == 12) {
var arr3 = arr2[1].split('#/');
app.globalData.snNo = arr3[0];
@ -41,25 +31,14 @@ import {
} else {
let that = this;
var arr4;
if (app.globalData.platformType == 'UQRCODEPAY') {
arr4 = arr2[1].split('&');
app.globalData.code = arr4[0];
uni.getStorage({
key: 'snNumber',
success(e) {
app.globalData.snNo = e.data;
}
})
} else {
arr4 = arr2[2].split('&');
app.globalData.code = arr4[0];
uni.getStorage({
key: 'snNumber',
success(e) {
app.globalData.snNo = e.data;
}
})
}
arr4 = arr2[2].split('&');
app.globalData.code = arr4[0];
uni.getStorage({
key: 'snNumber',
success(e) {
app.globalData.snNo = e.data;
}
})
}
if (app.globalData.code && app.globalData.platformType == 'WECHAT') {
@ -68,9 +47,6 @@ import {
if (app.globalData.code && app.globalData.platformType == 'ALIPAY') {
this.getAlipayUserId();
}
if (app.globalData.code && app.globalData.platformType == 'UQRCODEPAY') {
this.getUnionUserId();
}
} else {
var arr1 = window.location.href;
var arr2 = arr1.split('=');
@ -84,10 +60,9 @@ import {
url: '../index/index'
})
}
},
methods: {
//H5 openId
getH5AccessToken() {
let params = {
@ -96,11 +71,10 @@ import {
getH5AccessToken(params).then(res => {
if (res.return_code == '000000' && res.return_data.openid) {
app.globalData.openId = res.return_data.openid;
uni.setStorageSync("openId",res.return_data.openid)
/* uni.setStorage({
uni.setStorage({
key: "openId",
data: res.return_data.openid
}) */
})
uni.reLaunch({
url: '../index/index'
})
@ -117,34 +91,10 @@ import {
getAlipayUserId(params).then(res => {
if (res.return_code == '000000' && res.return_data.userId) {
app.globalData.openId = res.return_data.userId;
uni.setStorageSync("openId",res.return_data.userId)
/* uni.setStorage({
uni.setStorage({
key: "openId",
data: res.return_data.userId
}) */
uni.reLaunch({
url: '../index/index'
})
} else {
this.jumpWeb();
}
});
},
//openid
getUnionUserId() {
let params = {
"serialNumber": app.globalData.snNo,
"userAuthCode": app.globalData.code,
"appUpIdentifier": this.appUpIdentifier
}
getUnionUserId(params).then(res => {
if (res.return_code == '000000' && res.return_data.respData.userId) {
app.globalData.openId = res.return_data.respData.userId;
uni.setStorageSync("openId",res.return_data.respData.userId);
/* uni.setStorage({
key: "openId",
data: res.return_data.respData.userId
}) */
uni.reLaunch({
url: '../index/index'
})
@ -155,19 +105,13 @@ import {
},
//
jumpWeb() {
let redirectUrl = app.globalData.redirectUrl;
if (app.globalData.platformType == 'WECHAT') {
location.href =
'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxa075e8509802f826&redirect_uri=https://hsg.dctpay.com/wechat_authorize/?redirect_uri='+redirectUrl+'&response_type=code&scope=snsapi_base#wechat_redirect';
'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxa075e8509802f826&redirect_uri=https://hsg.dctpay.com/wechat_authorize/?redirect_uri=https://pay.dctpay.com/scanPay&response_type=code&scope=snsapi_base#wechat_redirect';
}
if (app.globalData.platformType == 'ALIPAY') {
let str =encodeURIComponent(redirectUrl+"?sn=1000017476")
location.href =
'https://openauth.alipay.com/oauth2/publicAppAuthorize.htm?app_id=2021003176605875&scope=auth_base&redirect_uri=https://pay.dctpay.com/redirect?redirect_uri='+str;
}
if (app.globalData.platformType == 'UQRCODEPAY') {
location.href =
'https://qr.95516.com/qrcGtwWeb-web/api/userAuth?version=1.0.0&redirectUrl='+redirectUrl;
'https://openauth.alipay.com/oauth2/publicAppAuthorize.htm?app_id=2021003176605875&scope=auth_base&redirect_uri=https://pay.dctpay.com/redirect?redirect_uri=https%3A%2F%2Fpay.dctpay.com%2FscanPay%3Fsn%3D1000017476';
}
},
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 193 KiB

Loading…
Cancel
Save