diff --git a/Laravel/app/Http/Controllers/API/H5/HomeController.php b/Laravel/app/Http/Controllers/API/H5/HomeController.php index 1f1732d..ffbdb70 100644 --- a/Laravel/app/Http/Controllers/API/H5/HomeController.php +++ b/Laravel/app/Http/Controllers/API/H5/HomeController.php @@ -98,9 +98,9 @@ class HomeController extends Controller 'jump' => '/pages/main/cjwt/cjwt', 'icon' => '/assets/h5/changjianwenti.png' ], [ - 'message' => '暂未开放', + 'message' => '', 'name' => '我的订单', - 'jump' => '/pages/main/cjwt/cjwt', + 'jump' => '/pages/main/order/order', 'icon' => '/assets/h5/changjianwenti.png' ]] ], diff --git a/Laravel/app/Http/Controllers/API/H5/PayController.php b/Laravel/app/Http/Controllers/API/H5/PayController.php index d8029f5..c86746c 100644 --- a/Laravel/app/Http/Controllers/API/H5/PayController.php +++ b/Laravel/app/Http/Controllers/API/H5/PayController.php @@ -55,13 +55,14 @@ class PayController extends Controller 'orderid' => $orderInfo->order_number, 'order_desc' => $orderInfo->title, 'amount' => (int)($orderInfo->true_price * 100), - 'notify_url'=>config('app.globals.PayNotifyUrl') + 'notify_url'=> config('app.globals.PayNotifyUrl') ]; $nonce=self::nonce(); $timestamp=(string)time(); //签名 - $base64Signature=$XCXApi::Sign('/pages/other/entry/index?path=/pages/physical-examination/payment/index',$params,$nonce,$timestamp,true); + $pay_path="/pages/other/entry/index?path=/pages/physical-examination/payment/index"; + $base64Signature=$XCXApi::Sign($pay_path,$params,$nonce,$timestamp,true); $params['timestamp']=$timestamp; $params['nonce']=$nonce; $params['signature']=$base64Signature; diff --git a/Laravel/config/app.php b/Laravel/config/app.php index 204f899..5f7d8e3 100644 --- a/Laravel/config/app.php +++ b/Laravel/config/app.php @@ -5,7 +5,7 @@ return [ 'WxAppid' => 'wx526430047d34c85c', //岚科公众号 'WxAppSecret' => '975b8a8b627b1bde71bbe49149134549', //岚科公众号 'WaitingPaymentTime'=>20, //等待支付时间,单位分钟 - 'PayNotifyUrl' =>"https://www.xxxxxxxxx.xxxx/h5/#/pages/main/order/CheckPay",//支付完成后小程序跳转H5路径 + 'PayNotifyUrl' =>env('APP_URL')."/h5/#/pages/main/order/CheckPay",//支付完成后小程序跳转H5路径 // 'Env'=>'pro', 'Env'=>'dev', ], diff --git a/h5/config.js b/h5/config.js index 75e71d2..3b12687 100644 --- a/h5/config.js +++ b/h5/config.js @@ -1,7 +1,9 @@ const app_type = 'gzh' +//const base_url="https://api.hainan2024.sa0.online" //开发环境 +const base_url="http://124.225.137.54:39080" //正式环境 const config = { - api_map_url: 'https://api.hainan2024.sa0.online/api/ApiMap/h5', - base_assets_url: 'https://api.hainan2024.sa0.online', + api_map_url: base_url+'/api/ApiMap/h5', + base_assets_url: base_url, } uni.$config = JSON.parse(JSON.stringify(config)) export default { diff --git a/h5/pages/main/order/src/order.vue b/h5/pages/main/order/src/order.vue index 464b11e..197a154 100644 --- a/h5/pages/main/order/src/order.vue +++ b/h5/pages/main/order/src/order.vue @@ -9,12 +9,13 @@ onMounted } from 'vue' import { + $api, $response } from '@/api' import { onShow } from '@dcloudio/uni-app' - +import wx from 'weixin-js-sdk' const $props = defineProps({ info: { type: Object, @@ -59,7 +60,14 @@ }) uni.hideLoading() $response(response, () => { - order_list.value = response.data.list + if(response.status){ + let info=response.data.info + let p='&appid='+info.appid+'&sub_org_code='+info.sub_org_code+'&ghzid='+info.ghzid+'&orderid='+info.orderid+'&order_desc='+info.order_desc+'&amount='+info.amount+'¬ify_url='+info.notify_url+'×tamp='+info.timestamp+'&nonce='+info.nonce+'&signature='+info.signature; + console.log(p); + wx.miniProgram.navigateTo({ + url: '/pages/other/entry/index?path=/pages/physical-examination/payment/index'+p + }) + } }) }