Skip to content

S
shop_mobile_uni
Commit 447e663d authored by zhengxiuming's avatar zhengxiuming
Browse files
Options

Merge branch 'develop'

parents daac47f7 d1ecdebd
Hide whitespace changes
Inline Side-by-side
Showing with 2932 additions and 74 deletions
main.js
View file @ 447e663d
......@@ -6,13 +6,13 @@ import {
go
} from '@/common/host.js';
import {
getNavigationBarTitle,
getNavigationBarTitle,
getCache
} from './common/util.js';
// 微信分享公共接口
// #ifdef H5
import wechat from './common/wechat.js';
import wechat from './common/wechat.js';
Vue.prototype.$wechat = wechat;
// if (wechat.isWechat() || wechat.isMini()) {
// Vue.prototype.$wechat = wechat;
......@@ -20,6 +20,49 @@ Vue.prototype.$wechat = wechat;
// #endif
Vue.config.productionTip = false;
const {
origin
} = window.location;
let url = '';
// 测试环境
if (origin.indexOf('local') > -1 || origin.indexOf('test') > -1) {
if (origin.indexOf('test') > -1) {
url = origin + '/mobile/index.php?';
} else {
url = 'https://test.pet-dbc.cn/mobile/index.php?';
}
} else if (origin.indexOf('jingxiang') > -1) {
url = 'https://jingxiang.pet-dbc.cn/mobile/index.php?';
} else {
url = 'https://shop.pet-dbc.cn/mobile/index.php?';
}
var search = window.location.href.split('?');
if (search[1]) {
var arr = search[1].split('&');
arr.every((item, index) => {
var kv = item.split('=');
if (kv[0] === 'openId') {
localStorage.openId = kv[1];
var exp = new Date();
exp.setTime(exp.getTime() + 3650*24*60*60*1000);
document.cookie = 'openId='+kv[1]+';expires='+exp.toGMTString();
$.ajax({
url: url + 'app=weixin&act=autoLogin',
type: 'get',
data: {
openid: kv[1]
},
dataType: 'json',
success: function(res) {
alert(JSON.stringify(res))
}
})
}
if (kv[0] === 'inionid') {
localStorage.unionid = kv[1];
}
});
}
// 加入购物车
function addCart(spec_id, quantity, isLogin) {
......@@ -62,16 +105,16 @@ function __reloadResource(_this) {
_this._source.default_image =
'https://dbc-static.oss-cn-beijing.aliyuncs.com/credit_shop/20190605/goods/5cf78b96601be.png?x-oss-process=image/resize,m_lfit,w_300,h_300/auto-orient,0/quality,Q_85/format,jpg';
}
// 毫秒数转时间
// 毫秒数转时间
// 跳转商品详情页,只传一个商品ID,方便以后全局修改
function jumpGoodDetail(goods_id) {
window.location.href = `${php}app=goods&id=${goods_id}`;
}
function jumpOrderDetail(order_id) {
window.location.href = `${php}app=buyer_order&act=view&order_id=${order_id}`;
}
function jumpOrderDetail(order_id) {
window.location.href = `${php}app=buyer_order&act=view&order_id=${order_id}`;
}
function backup() {
......@@ -86,15 +129,15 @@ function backup() {
// 跳转外部链接,使用webview
function jump(url, type) {
// #ifdef H5
if(type === 1){
if (type === 1) {
// 重定向到指定地址，防止回退
window.location.replace(url);
} else if (type === 2){
uni.navigateTo({
url: url
} else if (type === 2) {
uni.navigateTo({
url: url
})
} else {
window.location.href = url;
} else {
window.location.href = url;
}
// #endif
......@@ -108,8 +151,8 @@ function jump(url, type) {
}
Vue.prototype.$jumpGoodDetail = jumpGoodDetail;
Vue.prototype.$jump = jump;
Vue.prototype.$jumpOrderDetail = jumpOrderDetail;
Vue.prototype.$jump = jump;
Vue.prototype.$jumpOrderDetail = jumpOrderDetail;
Vue.prototype.$getCache = getCache;
Vue.prototype.$addCart = addCart;
Vue.prototype.$backup = backup;
......
pages/wxpay/wxpay.vue
View file @ 447e663d
......@@ -86,66 +86,73 @@
},2000);
return;
}
WeixinJSBridge.invoke(
'getBrandWCPayRequest', {
"appId": res.app_id, //公众号名称，由商户传入
"timeStamp": res.timeStamp, //时间戳，自1970年以来的秒数
"nonceStr": res.nonce_str, //随机串
"package": res.package,
"signType": res.sign_type, //微信签名方式：
"paySign": res.pay_sign //微信签名
},
function (res) {
WeixinJSBridge.log(res.err_msg);
const url = window.location.origin;
if (res.err_msg === "get_brand_wcpay_request:ok") {
uni.removeStorageSync('monthly');
uni.navigateTo({
url: '/pages/payresult/payresult'
})
} else if (res.err_msg === "get_brand_wcpay_request:cancel") {
uni.showToast({
title: '已取消支付,请重新支付',
duration: 2000,
icon: 'none'
});
setTimeout(() => {
history.back();
},2000);
} else if (res.err_msg === "get_brand_wcpay_request:fail") {
// Toast.fail('支付失败', 3);
uni.showToast({
title: '支付失败，请重新支付',
duration: 2000,
icon: 'none'
});
// 回退上一页重新支付
setTimeout(() => {
history.back();
},2000);
// 提示支付失败，关闭当前页面
// setTimeout(function() {
//这个可以关闭安卓系统的手机
// document.addEventListener(
// "WeixinJSBridgeReady",
// function() {
// WeixinJSBridge.call("closeWindow");
// },
// false
// );
// //这个可以关闭ios系统的手机
// WeixinJSBridge.call("closeWindow");
// this.$jump(`${url}?app=member`);
// }, 300);
} else {
uni.showToast({
title: '未知错误，刷新重试',
duration: 2000,
icon: 'none'
});
}
jWeixin.miniProgram.getEnv(function (result) {
if(result.miniprogram){
var path = '/pages/pay/index?payParam='+encodeURIComponent(JSON.stringify(res))+'&type=uni';
jWeixin.miniProgram.navigateTo({url: path});
} else {
WeixinJSBridge.invoke(
'getBrandWCPayRequest', {
"appId": res.app_id, //公众号名称，由商户传入
"timeStamp": res.timeStamp, //时间戳，自1970年以来的秒数
"nonceStr": res.nonce_str, //随机串
"package": res.package,
"signType": res.sign_type, //微信签名方式：
"paySign": res.pay_sign //微信签名
},
function (res) {
WeixinJSBridge.log(res.err_msg);
const url = window.location.origin;
if (res.err_msg === "get_brand_wcpay_request:ok") {
uni.removeStorageSync('monthly');
uni.navigateTo({
url: '/pages/payresult/payresult'
})
} else if (res.err_msg === "get_brand_wcpay_request:cancel") {
uni.showToast({
title: '已取消支付,请重新支付',
duration: 2000,
icon: 'none'
});
setTimeout(() => {
history.back();
},2000);
} else if (res.err_msg === "get_brand_wcpay_request:fail") {
// Toast.fail('支付失败', 3);
uni.showToast({
title: '支付失败，请重新支付',
duration: 2000,
icon: 'none'
});
// 回退上一页重新支付
setTimeout(() => {
history.back();
},2000);
// 提示支付失败，关闭当前页面
// setTimeout(function() {
//这个可以关闭安卓系统的手机
// document.addEventListener(
// "WeixinJSBridgeReady",
// function() {
// WeixinJSBridge.call("closeWindow");
// },
// false
// );
// //这个可以关闭ios系统的手机
// WeixinJSBridge.call("closeWindow");
// this.$jump(`${url}?app=member`);
// }, 300);
} else {
uni.showToast({
title: '未知错误，刷新重试',
duration: 2000,
icon: 'none'
});
}
}
);
}
);
})
},
goBack(){
this.$backup();
......
yarn.lock 0 → 100644
View file @ 447e663d
This source diff could not be displayed because it is too large. You can view the blob instead.
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