xinyin025/smart-admin
1
0
Fork 0
mirror of https://gitee.com/lab1024/smart-admin.git synced 2025-11-17 16:13:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'sit-Leung' into sit-jiamin-v2

Browse Source
This commit is contained in:
952108534@qq.com
2022-01-28 15:06:58 +08:00
parent c9c50b3a63 808807c563
commit cbe204d689
6 changed files with 158 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
rc-busness/ajax/getData.js
View File

@@ -288,12 +288,19 @@ export const searchchanpin = (stype,usertype,curPage,curRow) => {
//查询订单
export const userindent = (phoneNumber,orderNumber,) => {
var data = {
phoneNumber:phoneNumber,
orderNumber:orderNumber,
export const userindent = (phoneNumber,orderNumber,page,rows) => {
var data = {};
if(phoneNumber) {
data.phoneNumber = phoneNumber;
}
return fetch('orderMaster/?type=query', data, 'POST' )
if(orderNumber) {
data.orderNumber = orderNumber;
}
let url='orderMaster/?type=query';
if(page && rows) {
url = url+"&page="+page+"&rows="+rows;
}
return fetch(url, data, 'POST' )
}
//查询订单详情
export const userin = (orderNumber,) => {
@@ -479,16 +486,18 @@ export const goodsmessage = (productCode) => {
//微信支付
export const generateOrderWX = (list,isH5Pay) => {
if(!isH5Pay)
export const generateOrderWX = (list,payType) => {
//Dictionary : 1: scan qrcode, 2:redirect 3: raise local app
if(payType==1)
return fetch('generateOrderWX', list, 'POST' )
else
return fetch('generateOrderWXH5', list, 'POST' )
}
//再次支付
export const repayOrde = (ordernumber,isH5Pay) => {
if(!isH5Pay)
export const repayOrde = (ordernumber,payType) => {
//Dictionary : 1: scan qrcode, 2:redirect 3: raise local app
if(payType==1)
return fetch('repayOrderWX?orderNo='+ordernumber,'', 'POST' )
else
return fetch('repayOrderWXH5?orderNo='+ordernumber,'', 'POST' )

82
rc-busness/ajax/util.js
View File

@@ -1,28 +1,4 @@
/*
export const isMobile = () => {
var sUserAgent = navigator.userAgent.toLowerCase();
var bIsIpad = sUserAgent.match(/ipad/i) == "ipad";
var bIsIphoneOs = sUserAgent.match(/iphone os/i) == "iphone os";
var bIsMidp = sUserAgent.match(/midp/i) == "midp";
var bIsUc7 = sUserAgent.match(/rv:1.2.3.4/i) == "rv:1.2.3.4";
var bIsUc = sUserAgent.match(/ucweb/i) == "ucweb";
var bIsAndroid = sUserAgent.match(/android/i) == "android";
var bIsCE = sUserAgent.match(/windows ce/i) == "windows ce";
var bIsWM = sUserAgent.match(/windows mobile/i) == "windows mobile";
if (!(bIsIpad || bIsIphoneOs || bIsMidp || bIsUc7 || bIsUc || bIsAndroid || bIsCE || bIsWM)) {
return false;
} else {
return true;
}
}
*/
export default {
isMobile :false
}
/*
export default {
let util = {
isMobile(){
var sUserAgent = navigator.userAgent.toLowerCase();
var bIsIpad = sUserAgent.match(/ipad/i) == "ipad";
@@ -38,27 +14,41 @@ export default {
} else {
return true;
}
}
}
*/
/*
function isMobile() {
var sUserAgent = navigator.userAgent.toLowerCase();
var bIsIpad = sUserAgent.match(/ipad/i) == "ipad";
var bIsIphoneOs = sUserAgent.match(/iphone os/i) == "iphone os";
var bIsMidp = sUserAgent.match(/midp/i) == "midp";
var bIsUc7 = sUserAgent.match(/rv:1.2.3.4/i) == "rv:1.2.3.4";
var bIsUc = sUserAgent.match(/ucweb/i) == "ucweb";
var bIsAndroid = sUserAgent.match(/android/i) == "android";
var bIsCE = sUserAgent.match(/windows ce/i) == "windows ce";
var bIsWM = sUserAgent.match(/windows mobile/i) == "windows mobile";
if (!(bIsIpad || bIsIphoneOs || bIsMidp || bIsUc7 || bIsUc || bIsAndroid || bIsCE || bIsWM)) {
},
isWX(){
var ua = navigator.userAgent.toLowerCase();
return (/micromessenger/.test(ua)) ? true : false;
},
pickPaytype() {
let isMobile = this.isMobile();
let isWx = this.isWX();
//Dictionary : 1: scan qrcode, 2:redirect 3: raise local app
if(isWx) {
//return 3;
return 1;
}
if(!isMobile) {
//Desktop, use native pay
return 1;
} else {
return 2;
}
},
checkPaytypeValidated($paytype) {
if(isWx && $paytype == 1) {
//return 3;
return true;
} else if(isWx && $paytype!=1) {
return false;
}
if(!isMobile && $paytype == 1) {
//Desktop, use native pay
return true;
} else if(isMobile && $paytype == 2) {
return true;
}
return false;
} else {
return true;
}
}
export { isMobile }
*/
export default util;