diff --git a/Laravel/app/Http/Controllers/API/Web/OrderController.php b/Laravel/app/Http/Controllers/API/Web/OrderController.php index e7a946e..7577a4d 100644 --- a/Laravel/app/Http/Controllers/API/Web/OrderController.php +++ b/Laravel/app/Http/Controllers/API/Web/OrderController.php @@ -249,7 +249,19 @@ class OrderController extends Controller $action="pay"; } $AspZhuan=new AspNetZhuanController(); - $AspZhuan::PublicSendMsg(8,$hospital_id,$person['phone'],$person['name'],$plan->date." ".$plan->time."健康体检,请尽快到医院小程序健康体检界面,进行缴费"); + $reqst_data=[ + 'ghzid'=>$person['ghzid'], + 'yyid'=>6, + 'type'=>28, + 'msg1'=>$person['name'], + 'msg2'=>$title, + 'msg3'=>$true_price, + 'msg4'=>$plan->date.' '.$plan->time, + 'msg5'=>"体检中心", + 'msg6'=>"", + 'url'=>"pages/other/entry/index?path=/pages/other/jump-h5/index&src=https%3A%2F%2Ftj-h5.hnxdfe.com%2Fh5%2F%23%2Fpages%2Fmain%2Flogin%2Flogin%3Fpath%3Dorder&scene=1014", + ]; + $AspZhuan::WeiXinSend($reqst_data); return \Yz::return(true, "操作成功", ['action' => $action,'orderid'=>$insert]); } else { DB::rollBack(); diff --git a/Laravel/public/tool/register.html b/Laravel/public/tool/register.html index c97addf..53dece2 100644 --- a/Laravel/public/tool/register.html +++ b/Laravel/public/tool/register.html @@ -526,6 +526,7 @@ vip: "2", doctor: "", appdoctor_department: "", + ghzid: "", birthday: formatDatetime(new Date(), "YYYY-MM-DD"), }; const api_map = { @@ -1054,6 +1055,7 @@ name: input_data.value.name, id_number: input_data.value.id_number, phone: input_data.value.phone, + ghzid: input_data.value.ghzid, }, group_id: '', plan_id: plan_data.value.active diff --git a/h5/pages/main/index/index.vue b/h5/pages/main/index/index.vue index 88d8986..eed5493 100644 --- a/h5/pages/main/index/index.vue +++ b/h5/pages/main/index/index.vue @@ -20,6 +20,13 @@ useStore } from '@/store' const $store = useStore() + + const $props = defineProps({ + path:{ + type:String, + default:'' + } + }); const getUserInfo = async () => { const response = await $api('UserInfo') @@ -217,6 +224,11 @@ uni.hideLoading(); $response(response, async () => { NoticeInfo.value=response.data + if (!!$props.path && $props.path=='order') { + uni.navigateTo({ + url: "/pages/main/order/order" + }) + } }); }; const getItemValue=(name) =>{ @@ -314,7 +326,7 @@ - 03041658 + 03281011 diff --git a/h5/pages/main/login/login.vue b/h5/pages/main/login/login.vue index aeba80a..6359cfb 100644 --- a/h5/pages/main/login/login.vue +++ b/h5/pages/main/login/login.vue @@ -18,18 +18,28 @@ import DraggableButton from "@/pages/components/goHome.vue"; openid: { type: String, default: '' + }, + path:{ + type:String, + default:'' } }); const tip_str = ref('授权登录中,请稍候...') const checkOpenid = () => { let openid = '' + let path='' + let param='' if (!!$props.openid) { openid = decodeURIComponent($props.openid) } + if (!!$props.path) { + path = decodeURIComponent($props.path) + param=param+"?path="+path + } if (!!openid) { uni.setStorageSync('OPENID', openid) uni.redirectTo({ - url: "/pages/main/index/index" + url: "/pages/main/index/index"+param }) } else { tip_str.value = '未获取到授权信息,请从小程序进入'