更改细节

Laravel/app/Http/Controllers/API/Admin/YeWu/ComboController.php

@@ -122,6 +122,7 @@ class ComboController extends Controller
         } else {
           //如果不存在套餐
           $comboData['tags'] = json_encode([]);
+          $comboData['tags2'] = json_encode([]);
           $u = DB::table('combos')->insert($comboData);
         }
         if ($u) {
@@ -174,6 +175,7 @@ class ComboController extends Controller
     $id = request('id');
     $query = DB::table('combos')->where(['id' => $id])->first();
     if (!!$query) {
+
       $query->tags = implode(", ", json_decode($query->tags, true));
       $query->tags2 = implode(", ", json_decode($query->tags2, true));
       $query->items = json_decode($query->items);

Laravel/app/Http/Controllers/API/H5/OrderController.php

@@ -246,7 +246,7 @@ class OrderController extends Controller
     if ($insert and $up_plan) {
       DB::commit();
       $action=false;
-      if($true_price==0){
+      if($true_price===0){
         //如果是免费的，直接去预约
         $yuyue=  self::Finish($order_num);
         if($yuyue['status']===true){
@@ -298,7 +298,7 @@ class OrderController extends Controller
   public function Finish($order_number)
   {
     $order_info = DB::table('orders')->where(['order_number' => $order_number])->first();
-    if (!$order_info) return ['status' => false, 'msg' => "未找到有效订单"];
+    if (!$order_info) return ['status' => false, 'msg' => "未找到有效订单。"];
     $buy_info = json_decode($order_info->buy_info, true);
     $combo_id = $buy_info['combo']['id'];
     $item_arr = [];

Laravel/app/Http/Controllers/API/H5/PayController.php

@@ -34,6 +34,7 @@ class PayController extends Controller
   {
     $openid = request('openid');
     $id = request('id');
+    if(!isset($id)) return \Yz::echoError1("id不能为空");
     $orderInfo = DB::table('orders')->where(['id' => $id,])->first();
     if (!$orderInfo) return \Yz::echoError1("未找到有效订单");
     if ($orderInfo->status !== 1) return \Yz::echoError1("订单不是待支付状态不能支付。当前状态:" . $orderInfo->status);

Laravel/app/Http/Controllers/API/H5/PlanController.php

@@ -87,12 +87,13 @@ class PlanController extends Controller
       $person_id=request('person_id');
       $date=request('date');
       $use_type=request('use_type');//使用类型 1个检 2团检
-      $checkup_type_id=request('checkup_type_id');//体检类型表对应id
+      $checkup_type_id=(string)request('checkup_type_id');//体检类型表对应id
       $amount=request('amount');//总金额
 
       $list=DB::table('plans')
         ->where('date',$date)->whereIn('status',[1,2])
         ->whereRaw('JSON_CONTAINS(checkup_type_id, ?, "$")', [$checkup_type_id])
+        //->whereRaw('JSON_CONTAINS(CAST(checkup_type_id AS JSON), ?, "$")', ['"'.$checkup_type_id.'"'])
         ->where(['hospital_id'=>$hospital_id,'type'=>1])
         ->whereIn('use_type',[0,$use_type]);
       if ($use_type == 1) {

admin/.env.production

@@ -1,4 +1,4 @@
 ENV = 'production'
-VITE_APP_API = 'https://www.yanzai.vip/common/laravel/public/api/'
-VITE_APP_FILE = 'https://www.yanzai.vip/common/laravel/public'
+VITE_APP_API = 'https://tj-h5.hnxdfe.com/api/'
+VITE_APP_FILE = 'https://tj-h5.hnxdfe.com'
 

h5/config.js

@@ -1,6 +1,6 @@
 const app_type = 'gzh'
 const base_url="https://api.hainan2024.sa0.online" //开发环境
-//const base_url="http://124.225.137.54:39080"  //正式环境
+//const base_url="https://tj-h5.hnxdfe.com"  //正式环境
 const config = {
 	api_map_url: base_url+'/api/ApiMap/h5',
 	base_assets_url: base_url,

h5/pages/main/index/index.vue

@@ -260,7 +260,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="botm_blank_wrapper" style="font-size: 18rpx;color: #ccc;">09262246</view>
+			<view class="botm_blank_wrapper" style="font-size: 18rpx;color: #ccc;">09291029</view>
 		</view>
 	</view>
 </template>

h5/pages/main/tjyy/tjyy.vue

@@ -7,6 +7,7 @@
 import { ref } from "vue";
 import { $api, $response, $image } from "@/api";
 import { onShow } from "@dcloudio/uni-app";
+import wx from 'weixin-js-sdk'
 import { useStore } from "@/store";
 const $store = useStore();
 
@@ -107,7 +108,7 @@ const comfrimyy = async () => {
   $response(response, () => {
     if(response.status){
       if(response.data.action == "pay"){
-        StartPay();
+        StartPay(response.data.orderid);
       }else{
         uni.navigateTo({
           url: "/pages/buy/done/done?id="+response.data.orderid