diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json index a9d1769..f861ffb 100644 --- a/.hbuilderx/launch.json +++ b/.hbuilderx/launch.json @@ -20,7 +20,7 @@ }, { "customPlaygroundType" : "device", - "playground" : "custom", + "playground" : "standard", "type" : "uni-app:app-android" } ] diff --git a/pages/restaurant/order/orders-settlement/orders-settlement.vue b/pages/restaurant/order/orders-settlement/orders-settlement.vue index 9e93461..09719b9 100644 --- a/pages/restaurant/order/orders-settlement/orders-settlement.vue +++ b/pages/restaurant/order/orders-settlement/orders-settlement.vue @@ -225,8 +225,9 @@ } from 'vuex'; // 商品组件 import bRxCommodityItem from '@/components/b-rx-commodity-item/b-rx-commodity-item.vue'; - import { launchWechatMiniProgram } from '@/utils/index.js'; - + import { launchWechatMiniProgram } from '@/utils/index.js'; + import webView from '@/static/js/uni.webview.1.5.2.js' + let self; export default { mixins: [mixin, restaurantmixins, calculationamountmixin], @@ -438,25 +439,32 @@ // 创建订单 createFoodOrder(from).then(res => { - console.log(res.adta) - let redirect_url = '/pages/restaurant/order/order-details/details'; uni.hideLoading(); if (res.data.is_zero_pay) { uni.showLoading({ title: '支付成功, 跳转订单页' }); - setTimeout(() => { - this.$wx.miniProgram.getEnv((wx) => { - if (this.$wx.miniprogram) { - this.$wx.miniProgram.navigateTo({ - url: `/pages/goods/order_list/index` - }); - } else { - window.location.href = `${HTTP_REQUEST_URL}/JXH5/pages/goods/order_list/index`; - } - }) - uni.hideLoading(); - }, 1000) + if (this.GetIsApp) { + setTimeout(() => { + uni.webView.reLaunch({ + url: '/pages/goods/order_list/index' + }); + uni.hideLoading(); + }, 1000) + } else { + setTimeout(() => { + this.$wx.miniProgram.getEnv((wx) => { + if (this.$wx.miniprogram) { + this.$wx.miniProgram.navigateTo({ + url: `/pages/goods/order_list/index` + }); + } else { + window.location.href = `${HTTP_REQUEST_URL}/JXH5/pages/goods/order_list/index`; + } + }) + uni.hideLoading(); + }, 1000) + } } else { if (this.GetIsApp) { launchWechatMiniProgram(res.data.miniProgramOrgId, 0, res.data.prePayTn); diff --git a/pages/restaurant/order/orders-settlement/settlement.vue b/pages/restaurant/order/orders-settlement/settlement.vue index d390e43..83f959c 100644 --- a/pages/restaurant/order/orders-settlement/settlement.vue +++ b/pages/restaurant/order/orders-settlement/settlement.vue @@ -248,6 +248,7 @@ } from '@/request/restaurant/index.js'; import { mapGetters } from 'vuex'; import { launchWechatMiniProgram } from '@/utils/index.js'; + import webView from '@/static/js/uni.webview.1.5.2.js' let self; export default { @@ -449,24 +450,32 @@ FormInfor.products = JSON.parse(FormInfor.products) createFoodOrder(FormInfor).then(res => { - uni.hideLoading(); let redirect_url = '/pages/restaurant/order/order-details/details'; uni.hideLoading(); if (res.data.is_zero_pay) { uni.showLoading({ title: '支付成功, 跳转订单页' }); - setTimeout(() => { - this.$wx.miniProgram.getEnv((wx) => { - if (this.$wx.miniprogram) { - this.$wx.miniProgram.navigateTo({ - url: `/pages/goods/order_list/index` - }); - }else { - window.location.href = `${HTTP_REQUEST_URL}/JXH5/pages/goods/order_list/index`; - } - }) - uni.hideLoading(); - }, 1000) + if (this.GetIsApp) { + setTimeout(() => { + uni.webView.reLaunch({ + url: '/pages/goods/order_list/index' + }); + uni.hideLoading(); + }, 1000) + } else { + setTimeout(() => { + this.$wx.miniProgram.getEnv((wx) => { + if (this.$wx.miniprogram) { + this.$wx.miniProgram.navigateTo({ + url: `/pages/goods/order_list/index` + }); + }else { + window.location.href = `${HTTP_REQUEST_URL}/JXH5/pages/goods/order_list/index`; + } + }) + uni.hideLoading(); + }, 1000) + } } else { if (this.GetIsApp) { launchWechatMiniProgram(res.data.miniProgramOrgId, 0, res.data.prePayTn); diff --git a/request/request.js b/request/request.js index 908defa..a5e47e9 100644 --- a/request/request.js +++ b/request/request.js @@ -208,8 +208,6 @@ class Request { config['header']['form-type'] = 'app'; } - config['header']['form-type'] = 'app'; - console.log(cityInfor, '定位信息头') if (cityInfor?.adcode) { // config['header']['city'] = encodeURIComponent(cityInfor['city']); diff --git a/static/js/uni.webview.1.5.2.js b/static/js/uni.webview.1.5.2.js new file mode 100644 index 0000000..328b91e --- /dev/null +++ b/static/js/uni.webview.1.5.2.js @@ -0,0 +1 @@ +!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?module.exports=n():"function"==typeof define&&define.amd?define(n):(e=e||self).uni=n()}(this,(function(){"use strict";try{var e={};Object.defineProperty(e,"passive",{get:function(){!0}}),window.addEventListener("test-passive",null,e)}catch(e){}var n=Object.prototype.hasOwnProperty;function i(e,i){return n.call(e,i)}var t=[];function r(){return window.__dcloud_weex_postMessage||window.__dcloud_weex_}var o=function(e,n){var i={options:{timestamp:+new Date},name:e,arg:n};if(r()){if("postMessage"===e){var o={data:[n]};return window.__dcloud_weex_postMessage?window.__dcloud_weex_postMessage(o):window.__dcloud_weex_.postMessage(JSON.stringify(o))}var a={type:"WEB_INVOKE_APPSERVICE",args:{data:i,webviewIds:t}};window.__dcloud_weex_postMessage?window.__dcloud_weex_postMessageToService(a):window.__dcloud_weex_.postMessageToService(JSON.stringify(a))}if(!window.plus)return window.parent.postMessage({type:"WEB_INVOKE_APPSERVICE",data:i,pageId:""},"*");if(0===t.length){var d=plus.webview.currentWebview();if(!d)throw new Error("plus.webview.currentWebview() is undefined");var s=d.parent(),w="";w=s?s.id:d.id,t.push(w)}if(plus.webview.getWebviewById("__uniapp__service"))plus.webview.postMessageToUniNView({type:"WEB_INVOKE_APPSERVICE",args:{data:i,webviewIds:t}},"__uniapp__service");else{var u=JSON.stringify(i);plus.webview.getLaunchWebview().evalJS('UniPlusBridge.subscribeHandler("'.concat("WEB_INVOKE_APPSERVICE",'",').concat(u,",").concat(JSON.stringify(t),");"))}},a={navigateTo:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},n=e.url;o("navigateTo",{url:encodeURI(n)})},navigateBack:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},n=e.delta;o("navigateBack",{delta:parseInt(n)||1})},switchTab:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},n=e.url;o("switchTab",{url:encodeURI(n)})},reLaunch:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},n=e.url;o("reLaunch",{url:encodeURI(n)})},redirectTo:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},n=e.url;o("redirectTo",{url:encodeURI(n)})},getEnv:function(e){r()?e({nvue:!0}):window.plus?e({plus:!0}):e({h5:!0})},postMessage:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};o("postMessage",e.data||{})}},d=/uni-app/i.test(navigator.userAgent),s=/Html5Plus/i.test(navigator.userAgent),w=/complete|loaded|interactive/;var u=window.my&&navigator.userAgent.indexOf(["t","n","e","i","l","C","y","a","p","i","l","A"].reverse().join(""))>-1;var g=window.swan&&window.swan.webView&&/swan/i.test(navigator.userAgent);var v=window.qq&&window.qq.miniProgram&&/QQ/i.test(navigator.userAgent)&&/miniProgram/i.test(navigator.userAgent);var c=window.tt&&window.tt.miniProgram&&/toutiaomicroapp/i.test(navigator.userAgent);var m=window.wx&&window.wx.miniProgram&&/micromessenger/i.test(navigator.userAgent)&&/miniProgram/i.test(navigator.userAgent);var p=window.qa&&/quickapp/i.test(navigator.userAgent);var f=window.ks&&window.ks.miniProgram&&/micromessenger/i.test(navigator.userAgent)&&/miniProgram/i.test(navigator.userAgent);var l=window.tt&&window.tt.miniProgram&&/Lark|Feishu/i.test(navigator.userAgent);var _=window.jd&&window.jd.miniProgram&&/micromessenger/i.test(navigator.userAgent)&&/miniProgram/i.test(navigator.userAgent);var E=window.xhs&&window.xhs.miniProgram&&/xhsminiapp/i.test(navigator.userAgent);for(var h,P=function(){window.UniAppJSBridge=!0,document.dispatchEvent(new CustomEvent("UniAppJSBridgeReady",{bubbles:!0,cancelable:!0}))},b=[function(e){if(d||s)return window.__dcloud_weex_postMessage||window.__dcloud_weex_?document.addEventListener("DOMContentLoaded",e):window.plus&&w.test(document.readyState)?setTimeout(e,0):document.addEventListener("plusready",e),a},function(e){if(m)return window.WeixinJSBridge&&window.WeixinJSBridge.invoke?setTimeout(e,0):document.addEventListener("WeixinJSBridgeReady",e),window.wx.miniProgram},function(e){if(v)return window.QQJSBridge&&window.QQJSBridge.invoke?setTimeout(e,0):document.addEventListener("QQJSBridgeReady",e),window.qq.miniProgram},function(e){if(u){document.addEventListener("DOMContentLoaded",e);var n=window.my;return{navigateTo:n.navigateTo,navigateBack:n.navigateBack,switchTab:n.switchTab,reLaunch:n.reLaunch,redirectTo:n.redirectTo,postMessage:n.postMessage,getEnv:n.getEnv}}},function(e){if(g)return document.addEventListener("DOMContentLoaded",e),window.swan.webView},function(e){if(c)return document.addEventListener("DOMContentLoaded",e),window.tt.miniProgram},function(e){if(p){window.QaJSBridge&&window.QaJSBridge.invoke?setTimeout(e,0):document.addEventListener("QaJSBridgeReady",e);var n=window.qa;return{navigateTo:n.navigateTo,navigateBack:n.navigateBack,switchTab:n.switchTab,reLaunch:n.reLaunch,redirectTo:n.redirectTo,postMessage:n.postMessage,getEnv:n.getEnv}}},function(e){if(f)return window.WeixinJSBridge&&window.WeixinJSBridge.invoke?setTimeout(e,0):document.addEventListener("WeixinJSBridgeReady",e),window.ks.miniProgram},function(e){if(l)return document.addEventListener("DOMContentLoaded",e),window.tt.miniProgram},function(e){if(_)return window.JDJSBridgeReady&&window.JDJSBridgeReady.invoke?setTimeout(e,0):document.addEventListener("JDJSBridgeReady",e),window.jd.miniProgram},function(e){if(E)return window.xhs.miniProgram},function(e){return document.addEventListener("DOMContentLoaded",e),a}],y=0;y