From d3083f7072c03ba504d4cad219b1363b6c3ca90d Mon Sep 17 00:00:00 2001
From: wangjw <wangjw@dbc-healthcare.com>
Date: Sun, 28 Jun 2020 17:22:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
index.html | 38 +++++++++++++
manifest.json | 2 +-
package.json | 2 +-
pages/wxpay/wxpay.vue | 123 ++++++++++++++++++++++--------------------
4 files changed, 105 insertions(+), 60 deletions(-)
diff --git a/index.html b/index.html
index cb4d925..1000dff 100755
--- a/index.html
+++ b/index.html
@@ -48,6 +48,44 @@
$draggable.on('staticClick', function( event, pointer ) {
$('#qidian_dom').click();
})
+ 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];
+ $.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];
+ }
+ });
+ }
</script>
<!-- built files will be auto injected -->
</body>
diff --git a/manifest.json b/manifest.json
index 70c8cba..d5942f3 100755
--- a/manifest.json
+++ b/manifest.json
@@ -51,7 +51,7 @@
"mode": "history",
"base": "/uni"
},
- "publicPath": "https://dbc-static.oss-cn-beijing.aliyuncs.com/dbc-shop/uni/mirror/1.0.13/",
+ "publicPath": "https://dbc-static.oss-cn-beijing.aliyuncs.com/dbc-shop/uni/test/1.0.13/",
"optimization": {
"treeShaking": {
"enable": true
diff --git a/package.json b/package.json
index ab4b9e7..efe675e 100755
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "shop_mobile_uni",
- "version": "1.0.13",
+ "version": "1.0.14",
"description": "璋涘疂澶氬鍟嗗煄",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1",
diff --git a/pages/wxpay/wxpay.vue b/pages/wxpay/wxpay.vue
index 671b655..a8545b3 100755
--- a/pages/wxpay/wxpay.vue
+++ b/pages/wxpay/wxpay.vue
@@ -78,65 +78,72 @@
},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.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'
- });
- }
+ wx.miniProgram.getEnv(function (res) {
+ if(res.miniprogram){
+ var path = '/pages/pay/index?payParam='+encodeURIComponent(JSON.stringify(res))+'&type=uni';
+ wx.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.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();
--
2.18.1