From 129fcb13f0cd9a81801dd1dbf000d99c4503fdf9 Mon Sep 17 00:00:00 2001
From: zeyan <258785420@qq.com>
Date: Thu, 3 Jul 2025 13:22:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 niucloud/app/api/controller/pay/Pay.php       |   6 +-
 niucloud/app/api/route/route.php              |   2 +
 niucloud/app/listener/personnel/Student.php   |   3 +-
 .../model/student_courses/StudentCourses.php  |   8 +-
 niucloud/app/service/admin/pay/PayService.php |  66 +-
 uniapp/api/apiRoute.js                        |   7 +-
 .../components/custom-modal/custom-modal.vue  |  70 ++
 uniapp/components/custom-modal/example.vue    | 234 ++++++
 uniapp/pages.json                             |   7 +-
 uniapp/pages/market/clue/clue_table.vue       | 120 ++-
 uniapp/pages/market/clue/order_list.vue       | 737 ++++++++++--------
 11 files changed, 835 insertions(+), 425 deletions(-)
 create mode 100644 uniapp/components/custom-modal/custom-modal.vue
 create mode 100644 uniapp/components/custom-modal/example.vue

diff --git a/niucloud/app/api/controller/pay/Pay.php b/niucloud/app/api/controller/pay/Pay.php
index f4757902..c3b08d02 100644
--- a/niucloud/app/api/controller/pay/Pay.php
+++ b/niucloud/app/api/controller/pay/Pay.php
@@ -101,11 +101,9 @@ class Pay extends BaseApiController
      */
     public function getQrcode(){
         $data = $this->request->params([
-            ['trade_type', ''],
-            ['trade_id', ''],
-            ['type', ''],
+            ['order_id', ''],
         ]);
-        return success('SUCCESS',(new PayService())->getQrcode($data['type'], $data['trade_type'], $data['trade_id']));
+        return success('SUCCESS',(new \app\service\admin\pay\PayService())->order_pay($data));
     }
 
     public function qrcodeNotify(int $order_id)
diff --git a/niucloud/app/api/route/route.php b/niucloud/app/api/route/route.php
index 71ebd452..31224872 100644
--- a/niucloud/app/api/route/route.php
+++ b/niucloud/app/api/route/route.php
@@ -369,6 +369,8 @@ Route::group(function () {
     Route::get('personnel/serviceLogDetail', 'apiController.Personnel/serviceLogDetail');
     Route::post('personnel/updateServiceRemark', 'apiController.Personnel/updateServiceRemark');
 
+    Route::get('getQrcode', 'pay.Pay/getQrcode');
+
 
 })->middleware(ApiChannel::class)
     ->middleware(ApiPersonnelCheckToken::class, true)
diff --git a/niucloud/app/listener/personnel/Student.php b/niucloud/app/listener/personnel/Student.php
index 824a124f..129592c5 100644
--- a/niucloud/app/listener/personnel/Student.php
+++ b/niucloud/app/listener/personnel/Student.php
@@ -91,7 +91,8 @@ class Student
             'gift_hours' => $course_info['gift_session_count'],
             'start_date' => date("Y-m-d"),
             'end_date' => date("Y-m-d", strtotime("+30 days")),
-            'single_session_count' => $course_info['single_session_count']
+            'single_session_count' => $course_info['single_session_count'],
+            'resource_id'=> $order_info['resource_id']
         ]);
 
 
diff --git a/niucloud/app/model/student_courses/StudentCourses.php b/niucloud/app/model/student_courses/StudentCourses.php
index 7b5b7126..970df88c 100644
--- a/niucloud/app/model/student_courses/StudentCourses.php
+++ b/niucloud/app/model/student_courses/StudentCourses.php
@@ -69,18 +69,14 @@ class StudentCourses extends BaseModel
             $query->where("course_id", $value);
         }
     }
-    
-    
-
-    
 
     
     public function student(){
-       return $this->hasOne(Student::class, 'id', 'student_id')->joinType('left')->withField('name,id')->bind(['student_id_name'=>'name']);
+       return $this->hasOne(Student::class, 'id', 'student_id');
     }
 
     public function course(){
-       return $this->hasOne(Course::class, 'id', 'course_id')->joinType('left')->withField('course_name,id')->bind(['course_id_name'=>'course_name']);
+       return $this->hasOne(Course::class, 'id', 'course_id');
     }
 
 }
diff --git a/niucloud/app/service/admin/pay/PayService.php b/niucloud/app/service/admin/pay/PayService.php
index d41e816c..5af587b9 100644
--- a/niucloud/app/service/admin/pay/PayService.php
+++ b/niucloud/app/service/admin/pay/PayService.php
@@ -49,7 +49,7 @@ class PayService extends BaseAdminService
     public function getAuditPage(array $where)
     {
         $field = 'id, out_trade_no, type, money, body, voucher, create_time, trade_id, trade_type, status';
-        $search_model = $this->model->where([ [ 'type', '=', PayDict::OFFLINEPAY ] ])->withSearch([ 'create_time', 'out_trade_no', 'status' ], $where)->field($field)->append([ 'type_name' ])->order('create_time desc');
+        $search_model = $this->model->where([['type', '=', PayDict::OFFLINEPAY]])->withSearch(['create_time', 'out_trade_no', 'status'], $where)->field($field)->append(['type_name'])->order('create_time desc');
         return $this->pageQuery($search_model);
     }
 
@@ -61,9 +61,9 @@ class PayService extends BaseAdminService
     public function getDetail(int $id)
     {
         $field = 'id,out_trade_no,trade_type,trade_id,trade_no,body,money,voucher,status,create_time,pay_time,cancel_time,type,channel,fail_reason';
-        return $this->model->where([ [ 'id', '=', $id ] ])
+        return $this->model->where([['id', '=', $id]])
             ->field($field)
-            ->append([ 'type_name', 'channel_name', 'status_name' ])
+            ->append(['type_name', 'channel_name', 'status_name'])
             ->findOrEmpty()
             ->toArray();
     }
@@ -75,7 +75,7 @@ class PayService extends BaseAdminService
      */
     public function pass(string $out_trade_no)
     {
-        return ( new CoreOfflineService() )->pass($out_trade_no);
+        return (new CoreOfflineService())->pass($out_trade_no);
     }
 
     /**
@@ -85,7 +85,7 @@ class PayService extends BaseAdminService
      */
     public function refuse(string $out_trade_no, string $reason)
     {
-        return ( new CoreOfflineService() )->refuse($out_trade_no, $reason);
+        return (new CoreOfflineService())->refuse($out_trade_no, $reason);
     }
 
     /**
@@ -114,7 +114,7 @@ class PayService extends BaseAdminService
      */
     public function pay(string $type, string $trade_type, int $trade_id, string $return_url = '', string $quit_url = '', string $buyer_id = '', string $voucher = '', string $openid = '')
     {
-        return ( new CorePayService() )->pay($trade_type, $trade_id, $type, ChannelDict::PC, $openid, $return_url, $quit_url, $buyer_id, $voucher);
+        return (new CorePayService())->pay($trade_type, $trade_id, $type, ChannelDict::PC, $openid, $return_url, $quit_url, $buyer_id, $voucher);
     }
 
     /**
@@ -125,7 +125,7 @@ class PayService extends BaseAdminService
      */
     public function getInfoByTrade(string $trade_type, int $trade_id)
     {
-        return ( new CorePayService() )->getInfoByTrade($trade_type, $trade_id, ChannelDict::H5);
+        return (new CorePayService())->getInfoByTrade($trade_type, $trade_id, ChannelDict::H5);
     }
 
     /**
@@ -136,26 +136,26 @@ class PayService extends BaseAdminService
      */
     public function getFriendspayInfoByTrade(string $trade_type, int $trade_id, string $channel)
     {
-        $pay_info = ( new CorePayService() )->getInfoByTrade($trade_type, $trade_id, ChannelDict::H5, PaySceneDict::FRIENDSPAY);
+        $pay_info = (new CorePayService())->getInfoByTrade($trade_type, $trade_id, ChannelDict::H5, PaySceneDict::FRIENDSPAY);
         if (!empty($pay_info)) {
             //海报
-            $poster = ( new Poster() )->field('id')->where([
-                [ 'type', '=', 'friendspay' ],
-                [ 'status', '=', 1 ],
-                [ 'is_default', '=', 1 ]
+            $poster = (new Poster())->field('id')->where([
+                ['type', '=', 'friendspay'],
+                ['status', '=', 1],
+                ['is_default', '=', 1]
             ])->findOrEmpty()->toArray();
             if (!empty($poster)) {
-                $pay_info[ 'poster_id' ] = $poster[ 'id' ];
+                $pay_info['poster_id'] = $poster['id'];
             }
             //发起帮付会员信息
-            $member = ( new Member() )->field('member_id,nickname,headimg')->where([
-                [ 'member_id', '=', $pay_info[ 'from_main_id' ] ]
+            $member = (new Member())->field('member_id,nickname,headimg')->where([
+                ['member_id', '=', $pay_info['from_main_id']]
             ])->findOrEmpty()->toArray();
-            $pay_info[ 'member' ] = $member;
+            $pay_info['member'] = $member;
             //二维码
             $qrcode = $this->getQrcode($trade_type, $trade_id, $channel);
-            $pay_info[ 'link' ] = $qrcode[ 'url' ];
-            $pay_info[ 'qrcode' ] = $qrcode[ 'path' ];
+            $pay_info['link'] = $qrcode['url'];
+            $pay_info['qrcode'] = $qrcode['path'];
         }
         return $pay_info;
     }
@@ -168,7 +168,7 @@ class PayService extends BaseAdminService
      */
     public function getQrcode(string $trade_type, int $trade_id, string $channel)
     {
-        $url = ( new CoreSysConfigService() )->getSceneDomain()[ 'wap_url' ];
+        $url = (new CoreSysConfigService())->getSceneDomain()['wap_url'];
         $page = 'app/pages/friendspay/money';
 
         $data = [
@@ -193,7 +193,7 @@ class PayService extends BaseAdminService
         $url = $url . '/' . $page;
         $scene = [];
         foreach ($data as $v) {
-            $scene[] = $v[ 'key' ] . '=' . $v[ 'value' ];
+            $scene[] = $v['key'] . '=' . $v['value'];
         }
         $url .= '?' . implode('&', $scene);
 
@@ -212,11 +212,11 @@ class PayService extends BaseAdminService
      */
     public function getPayTypeList()
     {
-        $pay_type_list = ( new CorePayService() )->getPayTypeByTrade('', ChannelDict::H5);
+        $pay_type_list = (new CorePayService())->getPayTypeByTrade('', ChannelDict::H5);
         if (!empty($pay_type_list)) {
             foreach ($pay_type_list as $k => $v) {
-                if (!in_array($v['key'], [ PayDict::BALANCEPAY, PayDict::FRIENDSPAY ])) {
-                    unset($pay_type_list[ $k ]);
+                if (!in_array($v['key'], [PayDict::BALANCEPAY, PayDict::FRIENDSPAY])) {
+                    unset($pay_type_list[$k]);
                 }
             }
             $pay_type_list = array_values($pay_type_list);
@@ -224,17 +224,18 @@ class PayService extends BaseAdminService
         return $pay_type_list;
     }
 
-    public function order_pay($data){
-        $out_trade_no = 'sm'.date("YmdHis").time();
+    public function order_pay($data)
+    {
+        $out_trade_no = 'sm' . date("YmdHis") . time();
         $order = new OrderTable();
         $order_info = $order->where(['id' => $data['order_id']])->find();
         $cr = new CustomerResources();
         $resource_info = $cr->where(['id' => $order_info['resource_id']])->find();
-        $config = return_pay_config($resource_info['campus'],$data['order_id']);
+        $config = return_pay_config($resource_info['campus'], $data['order_id']);
 
         $params = [
             'out_trade_no' => $out_trade_no,
-            'body' => '订单扫码支付:'.$out_trade_no,
+            'body' => '订单扫码支付:' . $out_trade_no,
             'money' => $order_info['order_amount'] * 100,
         ];
 
@@ -242,15 +243,16 @@ class PayService extends BaseAdminService
 
         $url = $pay->scan($params);
 
-        $path = qrcode($url['code_url'],'',[],'upload/qrcode/pay/');
+        $path = qrcode($url['code_url'], '', [], 'upload/qrcode/pay/');
 
-        $order->where(['id' => $data['order_id']])->update(['payment_id' => $out_trade_no,'ipv3' => $config['mch_secret_key']]);
-        return ['qrcode_url' => getCurrentDomain().$path,'out_trade_no'=>$out_trade_no];
+        $order->where(['id' => $data['order_id']])->update(['payment_id' => $out_trade_no, 'ipv3' => $config['mch_secret_key']]);
+        return ['qrcode_url' => getCurrentDomain() . $path, 'out_trade_no' => $out_trade_no, 'code_url' => $url['code_url']];
     }
 
-    public function check_payment_status($data){
+    public function check_payment_status($data)
+    {
         $order = new OrderTable();
         $order_status = $order->where(['payment_id' => $data['out_trade_no']])->value("order_status");
-        return ['order_status'=>$order_status];
+        return ['order_status' => $order_status];
     }
 }
diff --git a/uniapp/api/apiRoute.js b/uniapp/api/apiRoute.js
index 8c45cd65..48e7ef16 100644
--- a/uniapp/api/apiRoute.js
+++ b/uniapp/api/apiRoute.js
@@ -387,7 +387,10 @@ export default {
 	//更新学生课程人员配置
 	async updateStudentCoursePersonnel(data = {}) {
 	    return await http.post('/updateStudentCoursePersonnel', data);
-	}
-	
+	},
 	
+// 	获取订单支付二维码
+    async getOrderPayQrcode(data = {}) {
+        return await http.get('/getQrcode', data);
+    },
 }
\ No newline at end of file
diff --git a/uniapp/components/custom-modal/custom-modal.vue b/uniapp/components/custom-modal/custom-modal.vue
new file mode 100644
index 00000000..8cbe164d
--- /dev/null
+++ b/uniapp/components/custom-modal/custom-modal.vue
@@ -0,0 +1,70 @@
+<template>
+  <fui-modal :buttons="[]" :width="width" :show="show" :maskClose="maskClose">
+    <!-- 默认内容插槽 -->
+    <slot>
+      <!-- 默认内容 -->
+    </slot>
+    
+    <!-- 按钮插槽 -->
+    <view v-if="$slots.buttons" class="button-section">
+      <slot name="buttons"></slot>
+    </view>
+    
+    <!-- 关闭按钮 -->
+    <view v-if="showClose" class="fui-icon__close" @tap="handleClose">
+      <fui-icon name="close" color="#B2B2B2" :size="48"></fui-icon>
+    </view>
+  </fui-modal>
+</template>
+
+<script>
+export default {
+  name: 'CustomModal',
+  props: {
+    // 是否显示弹窗
+    show: {
+      type: Boolean,
+      default: false
+    },
+    // 弹窗宽度
+    width: {
+      type: [String, Number],
+      default: 600
+    },
+    // 是否显示关闭按钮
+    showClose: {
+      type: Boolean,
+      default: true
+    },
+    // 是否允许点击遮罩关闭
+    maskClose: {
+      type: Boolean,
+      default: true
+    }
+  },
+  methods: {
+    // 处理关闭事件
+    handleClose() {
+      this.$emit('cancel', 'close')
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+.button-section {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  flex-direction: column;
+  gap: 20rpx;
+  margin-top: 40rpx;
+}
+
+.fui-icon__close {
+  position: absolute;
+  right: 24rpx;
+  top: 20rpx;
+  z-index: 1000;
+}
+</style>
\ No newline at end of file
diff --git a/uniapp/components/custom-modal/example.vue b/uniapp/components/custom-modal/example.vue
new file mode 100644
index 00000000..d10b26b1
--- /dev/null
+++ b/uniapp/components/custom-modal/example.vue
@@ -0,0 +1,234 @@
+<template>
+  <view class="container">
+    <fui-button @click="showSuccessModal = true" text="显示成功弹窗"></fui-button>
+    <fui-button @click="showConfirmModal = true" text="显示确认弹窗"></fui-button>
+    <fui-button @click="showCustomModal = true" text="显示自定义弹窗"></fui-button>
+    
+    <!-- 成功弹窗示例 -->
+    <custom-modal 
+      :show="showSuccessModal" 
+      width="600"
+      @cancel="handleModalCancel"
+    >
+      <fui-icon name="checkbox-fill" :size="108" color="#09BE4F"></fui-icon>
+      <text class="fui-title">购买成功</text>
+      <text class="fui-descr">成功购买一张月卡，可免费阅读30天</text>
+      
+      <template #buttons>
+        <fui-button 
+          text="我知道了" 
+          width="240rpx" 
+          height="72rpx" 
+          :size="28" 
+          radius="36rpx" 
+          background="#FFB703"
+          borderWidth="0" 
+          :margin="['0','0','24rpx']" 
+          @click="handleButtonClick('success_confirm')"
+        />
+      </template>
+    </custom-modal>
+    
+    <!-- 确认弹窗示例 -->
+    <custom-modal 
+      :show="showConfirmModal" 
+      width="500"
+      @cancel="handleModalCancel"
+    >
+      <fui-icon name="warning-fill" :size="108" color="#FF6B35"></fui-icon>
+      <text class="fui-title">确认删除</text>
+      <text class="fui-descr">删除后无法恢复，确定要继续吗？</text>
+      
+      <template #buttons>
+        <fui-button 
+          text="取消" 
+          width="200rpx" 
+          height="72rpx" 
+          :size="28" 
+          radius="36rpx" 
+          background="#F5F5F5"
+          color="#333"
+          borderWidth="0" 
+          :margin="['0','0','12rpx']" 
+          @click="handleButtonClick('confirm_cancel')"
+        />
+        <fui-button 
+          text="确定删除" 
+          width="200rpx" 
+          height="72rpx" 
+          :size="28" 
+          radius="36rpx" 
+          background="#FF6B35"
+          borderWidth="0" 
+          @click="handleButtonClick('confirm_delete')"
+        />
+      </template>
+    </custom-modal>
+    
+    <!-- 自定义内容弹窗示例 -->
+    <custom-modal 
+      :show="showCustomModal" 
+      width="700"
+      :showClose="false"
+      @cancel="handleModalCancel"
+    >
+      <view class="custom-content">
+        <text class="custom-title">支付二维码</text>
+        <view class="custom-form">
+          <fui-qrcode :value="qrcode"></fui-qrcode>
+        </view>
+      </view>
+      
+      <template #buttons>
+        <view class="button-row">
+          <fui-button 
+            text="发送二维码给用户"
+            width="200rpx" 
+            height="72rpx" 
+            :size="28" 
+            radius="36rpx" 
+            background="#007AFF"
+            borderWidth="0" 
+            @click="handleButtonClick('custom_submit')"
+          />
+        </view>
+      </template>
+    </custom-modal>
+  </view>
+</template>
+
+<script>
+import CustomModal from './custom-modal.vue'
+
+export default {
+  components: {
+    CustomModal
+  },
+  data() {
+    return {
+      showSuccessModal: false,
+      showConfirmModal: false,
+      showCustomModal: false,
+      qrcode: 'https://mp.weixin.qq.com/cgi-bin/showqrcode?ticket=TICKET',
+      formData: {
+        name: '',
+        phone: ''
+      }
+    }
+  },
+  methods: {
+    // 处理弹窗取消事件
+    handleModalCancel(type) {
+      console.log('弹窗取消:', type)
+      this.showSuccessModal = false
+      this.showConfirmModal = false
+      this.showCustomModal = false
+    },
+    
+    // 处理按钮点击事件
+    handleButtonClick(action) {
+      console.log('按钮点击:', action)
+      
+      switch(action) {
+        case 'success_confirm':
+          this.showSuccessModal = false
+          uni.showToast({
+            title: '确认成功',
+            icon: 'success'
+          })
+          break
+          
+        case 'confirm_cancel':
+          this.showConfirmModal = false
+          break
+          
+        case 'confirm_delete':
+          this.showConfirmModal = false
+          uni.showToast({
+            title: '删除成功',
+            icon: 'success'
+          })
+          break
+          
+        case 'custom_cancel':
+          this.showCustomModal = false
+          break
+          
+        case 'custom_submit':
+          if (!this.formData.name || !this.formData.phone) {
+            uni.showToast({
+              title: '请填写完整信息',
+              icon: 'none'
+            })
+            return
+          }
+          
+          this.showCustomModal = false
+          uni.showToast({
+            title: '提交成功',
+            icon: 'success'
+          })
+          
+          // 重置表单
+          this.formData = {
+            name: '',
+            phone: ''
+          }
+          break
+      }
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+.container {
+  padding: 40rpx;
+  display: flex;
+  flex-direction: column;
+  gap: 30rpx;
+}
+
+.fui-title {
+  font-size: 36rpx;
+  font-weight: bold;
+  color: #333;
+  text-align: center;
+  margin: 20rpx 0;
+}
+
+.fui-descr {
+  font-size: 28rpx;
+  color: #666;
+  text-align: center;
+  margin: 0 0 30rpx 0;
+  line-height: 1.5;
+}
+
+.custom-content {
+  width: 100%;
+  padding: 20rpx;
+}
+
+.custom-title {
+  font-size: 32rpx;
+  font-weight: bold;
+  color: #333;
+  text-align: center;
+  display: block;
+  margin-bottom: 30rpx;
+}
+
+.custom-form {
+  display: flex;
+  flex-direction: column;
+  gap: 20rpx;
+}
+
+.button-row {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  gap: 40rpx;
+}
+</style>
\ No newline at end of file
diff --git a/uniapp/pages.json b/uniapp/pages.json
index 9b78e1eb..a6f22eaa 100644
--- a/uniapp/pages.json
+++ b/uniapp/pages.json
@@ -177,7 +177,7 @@
 		{
 			"path": "pages/common/im_chat_info",
 			"style": {
-				"navigationBarTitleText": "",
+				"navigationBarTitleText": "消息",
 				"navigationStyle": "default",
 				"navigationBarBackgroundColor": "#292929",
 				"navigationBarTextStyle": "white"
@@ -677,9 +677,8 @@
 		{
 			"path": "pages/market/clue/clue_table",
 			"style": {
-				"navigationBarTitleText": "线索统计表",
-				"navigationStyle": "default",
-				"navigationBarBackgroundColor": "#18181c",
+				"navigationBarTitleText": "数据统计",
+				"navigationBarBackgroundColor": "#292929",
 				"navigationBarTextStyle": "white"
 			}
 		}
diff --git a/uniapp/pages/market/clue/clue_table.vue b/uniapp/pages/market/clue/clue_table.vue
index e830be48..46f36e54 100644
--- a/uniapp/pages/market/clue/clue_table.vue
+++ b/uniapp/pages/market/clue/clue_table.vue
@@ -1,31 +1,42 @@
 <template>
   <view class="dark-table-container">
-    <scroll-view scroll-x="true" class="table-scroll">
-      <view class="table">
-        <!-- 表头 -->
-        <view class="table-row table-header">
-          <view class="table-cell" v-for="(col, idx) in columns" :key="idx">
+    <view v-for="(row, rIdx) in data" :key="rIdx" class="card">
+      <view class="card-title" @click="toggleExpand(rIdx)">
+        {{ row.channel }}
+        <text class="expand-icon">{{ expanded[rIdx] ? '▲' : '▼' }}</text>
+      </view>
+      <view class="card-content">
+        <view
+          class="card-row"
+          v-for="(col, cIdx) in getVisibleColumns(rIdx)"
+          :key="cIdx"
+        >
+          <view class="card-label">
             {{ col.label }}
-            <text v-if="col.tip" class="tip" @click="showTip(col.tip)">?</text>
-          </view>
-        </view>
-        <!-- 数据行 -->
-        <view class="table-row" v-for="(row, rIdx) in data" :key="rIdx">
-          <view class="table-cell" v-for="(col, cIdx) in columns" :key="cIdx">
-            {{ row[col.key] || '-' }}
+            <text v-if="col.tip" class="tip" @click.stop="showTip(col.tip)">?</text>
           </view>
+          <view class="card-value">{{ row[col.key] || '-' }}</view>
         </view>
       </view>
-    </scroll-view>
+      <view v-if="columns.length > 6" class="expand-btn" @click="toggleExpand(rIdx)">
+        {{ expanded[rIdx] ? '收起' : '展开全部' }}
+      </view>
+    </view>
     <!-- 说明弹窗 -->
     <uni-popup ref="popup" type="center">
       <view class="popup-content">{{ tipContent }}</view>
     </uni-popup>
+    <AQTabber></AQTabber>
   </view>
 </template>
 
 <script>
+import AQTabber from "@/components/AQ/AQTabber.vue"
+
 export default {
+  components: {
+    AQTabber,
+  },
   data() {
     return {
       columns: [
@@ -48,13 +59,23 @@ export default {
       data: [
         { channel: '体检包（地推）', resource: 10, visit1: 5, visitRate1: '50%', visit2: 2, visitRate2: '40%', close1: 1, closeRate1: '20%', close2: 1, closeRate2: '50%', monthTrans: '10%', lastMonthVisit: 0, monthTotalVisit: 5, lastMonthClose: 0, monthTotalClose: 1 },
       ],
-      tipContent: ''
+      tipContent: '',
+      expanded: {},
     }
   },
   methods: {
     showTip(content) {
       this.tipContent = content
       this.$refs.popup.open()
+    },
+    toggleExpand(idx) {
+      this.$set(this.expanded, idx, !this.expanded[idx])
+    },
+    getVisibleColumns(idx) {
+      // 只展示前5个字段，展开后展示全部（不含渠道）
+      const cols = this.columns.slice(1)
+      if (this.expanded[idx]) return cols
+      return cols.slice(0, 5)
     }
   }
 }
@@ -65,29 +86,58 @@ export default {
   background: #18181c;
   color: #f1f1f1;
   min-height: 100vh;
-  padding: 16rpx;
+  padding: 24rpx 12rpx;
+}
+.card {
+  background: #23232a;
+  border-radius: 18rpx;
+  box-shadow: 0 4rpx 24rpx rgba(0,0,0,0.18);
+  margin-bottom: 32rpx;
+  padding: 24rpx 20rpx 8rpx 20rpx;
+  transition: box-shadow 0.2s;
+}
+.card-title {
+  font-size: 32rpx;
+  font-weight: bold;
+  margin-bottom: 18rpx;
+  color: #ffb300;
+  letter-spacing: 2rpx;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  cursor: pointer;
 }
-.table-scroll {
-  width: 100%;
-  overflow-x: auto;
+.expand-icon {
+  font-size: 24rpx;
+  color: #bdbdbd;
+  margin-left: 12rpx;
 }
-.table {
-  min-width: 1200rpx;
+.card-content {
+  display: flex;
+  flex-direction: column;
+  gap: 12rpx;
+  overflow: hidden;
+  transition: max-height 0.3s;
 }
-.table-row {
+.card-row {
   display: flex;
-  border-bottom: 1px solid #333;
+  justify-content: space-between;
+  align-items: center;
+  border-bottom: 1px dashed #333;
+  padding: 8rpx 0;
 }
-.table-header {
-  background: #23232a;
-  font-weight: bold;
+.card-label {
+  color: #bdbdbd;
+  font-size: 26rpx;
+  display: flex;
+  align-items: center;
 }
-.table-cell {
-  flex: 0 0 180rpx;
-  padding: 16rpx 8rpx;
-  text-align: center;
-  border-right: 1px solid #333;
-  position: relative;
+.card-value {
+  color: #f1f1f1;
+  font-size: 26rpx;
+  text-align: right;
+  max-width: 60%;
+  word-break: break-all;
 }
 .tip {
   color: #ffb300;
@@ -95,6 +145,14 @@ export default {
   font-size: 24rpx;
   cursor: pointer;
 }
+.expand-btn {
+  color: #ffb300;
+  text-align: center;
+  font-size: 26rpx;
+  margin: 10rpx 0 0 0;
+  padding-bottom: 8rpx;
+  cursor: pointer;
+}
 .popup-content {
   background: #23232a;
   color: #fff;
diff --git a/uniapp/pages/market/clue/order_list.vue b/uniapp/pages/market/clue/order_list.vue
index be7b19b6..cf671517 100644
--- a/uniapp/pages/market/clue/order_list.vue
+++ b/uniapp/pages/market/clue/order_list.vue
@@ -4,26 +4,26 @@
 
     <view class="main_section">
       <scroll-view
-          class="section_1"
-          scroll-y="true"
-          :lower-threshold="lowerThreshold"
-          @scrolltolower="loadMoreData"
-          style="height: 83vh;"
+        class="section_1"
+        scroll-y="true"
+        :lower-threshold="lowerThreshold"
+        @scrolltolower="loadMoreData"
+        style="height: 83vh;"
       >
         <view
-            class="item"
-            v-for="(v,k) in tableList"
-            :key="k"
-            @click="handleOrderClick(v)"
+          class="item"
+          v-for="(v,k) in tableList"
+          :key="k"
+          @click="handleOrderClick(v)"
         >
           <view class="top">
-            <view class="title">订单状态：{{v.order_status == 'pending' ? '待支付':'已支付' }}</view>
-<!--            <view class="btn" @click="downloadFile($util.img(v.file_data))">下载合同 <fui-icon name="arrowright" color="#A4ADB3" size="35"></fui-icon></view>-->
+            <view class="title">订单状态：{{ v.order_status == 'pending' ? '待支付' : '已支付' }}</view>
+            <!--            <view class="btn" @click="downloadFile($util.img(v.file_data))">下载合同 <fui-icon name="arrowright" color="#A4ADB3" size="35"></fui-icon></view>-->
           </view>
           <view class="bottom">
             <view class="box">
               <view class="title">客户姓名：</view>
-              <view class="content">{{ v.resource_id_name || ''}}</view>
+              <view class="content">{{ v.resource_id_name || '' }}</view>
             </view>
 
             <view class="box">
@@ -35,12 +35,12 @@
 
             <view class="box">
               <view class="title">订单金额：</view>
-              <view class="content">￥{{ v.order_amount || ''}}</view>
+              <view class="content">￥{{ v.order_amount || '' }}</view>
             </view>
 
             <view class="box">
               <view class="title">课程：</view>
-              <view class="content">{{ v.course_id_name || ''}}</view>
+              <view class="content">{{ v.course_id_name || '' }}</view>
             </view>
 
             <view class="box">
@@ -50,7 +50,7 @@
 
             <view class="box">
               <view class="title">人员：</view>
-              <view class="content">{{ v.staff_id_name || ''}}</view>
+              <view class="content">{{ v.staff_id_name || '' }}</view>
             </view>
 
             <view class="box">
@@ -67,7 +67,7 @@
       </view>
     </view>
 
-<!--创建订单弹出层-->
+    <!--创建订单弹出层-->
     <fui-modal class="order_modal" :buttons="[]" width="600" :show="order_show">
       <text class="fui-title">创建订单</text>
       <text class="fui-descr"></text>
@@ -75,123 +75,123 @@
         <view class="input-style">
           <!--客户名称-->
           <fui-form-item
-              label="客户名称"
-              labelSize='26'
-              prop=""
-              background='#fff'
-              labelColor='#000'
-              :bottomBorder='true'
+            label="客户名称"
+            labelSize='26'
+            prop=""
+            background='#fff'
+            labelColor='#000'
+            :bottomBorder='true'
           >
             <view class="input-title" style="margin-right:14rpx;">
               <fui-input
-                  :disabled="true"
-                  :borderBottom="false"
-                  :padding="[0]"
-                  placeholder="请输入客户名称"
-                  v-model="formData.resource_id_name"
-                  backgroundColor="#fff"
-                  size="26"
-                  color="#000"
+                :disabled="true"
+                :borderBottom="false"
+                :padding="[0]"
+                placeholder="请输入客户名称"
+                v-model="formData.resource_id_name"
+                backgroundColor="#fff"
+                size="26"
+                color="#000"
               ></fui-input>
             </view>
           </fui-form-item>
 
           <!--付款类型-->
           <fui-form-item
-              label="付款类型"
-              asterisk
-              asteriskPosition="right"
-              labelSize='26'
-              prop=""
-              background='#fff'
-              labelColor='#000'
-              :bottomBorder='true'
+            label="付款类型"
+            asterisk
+            asteriskPosition="right"
+            labelSize='26'
+            prop=""
+            background='#fff'
+            labelColor='#000'
+            :bottomBorder='true'
           >
             <view class="input-title" style="margin-right:14rpx;">
               <view
-                  class="input-title"
-                  style="margin-right:14rpx;"
-                  @click="openPaymentType()">
+                class="input-title"
+                style="margin-right:14rpx;"
+                @click="openPaymentType()">
                 {{ (formData.payment_type) ? formData.payment_type_name : '点击选择' }}
               </view>
             </view>
             <fui-picker
-                :linkage='true'
-                :options="payment_type_options"
-                :layer="1"
-                :show="payment_type_show"
-                @change="changePaymentType"
-                @cancel="cancelPaymentType">
+              :linkage='true'
+              :options="payment_type_options"
+              :layer="1"
+              :show="payment_type_show"
+              @change="changePaymentType"
+              @cancel="cancelPaymentType">
             </fui-picker>
           </fui-form-item>
 
           <!--课程-->
           <fui-form-item
-              label="选择课程"
-              asterisk
-              asteriskPosition="right"
-              labelSize='26'
-              prop=""
-              background='#fff'
-              labelColor='#000'
-              :bottomBorder='true'
+            label="选择课程"
+            asterisk
+            asteriskPosition="right"
+            labelSize='26'
+            prop=""
+            background='#fff'
+            labelColor='#000'
+            :bottomBorder='true'
           >
             <view class="input-title" style="margin-right:14rpx;">
               <view
-                  class="input-title"
-                  style="margin-right:14rpx;"
-                  @click="openCourseId()">
+                class="input-title"
+                style="margin-right:14rpx;"
+                @click="openCourseId()">
                 {{ (formData.course_id) ? formData.course_id_name : '点击选择' }}
               </view>
             </view>
             <fui-picker
-                :linkage='true'
-                :options="course_id_options"
-                :layer="1"
-                :show="course_id_show"
-                @change="changeCourseId"
-                @cancel="cancelCourseId">
+              :linkage='true'
+              :options="course_id_options"
+              :layer="1"
+              :show="course_id_show"
+              @change="changeCourseId"
+              @cancel="cancelCourseId">
             </fui-picker>
           </fui-form-item>
 
           <!--班级-->
           <fui-form-item
-              label="选择班级"
-              asterisk
-              asteriskPosition="right"
-              labelSize='26'
-              prop=""
-              background='#fff'
-              labelColor='#000'
-              :bottomBorder='true'
+            label="选择班级"
+            asterisk
+            asteriskPosition="right"
+            labelSize='26'
+            prop=""
+            background='#fff'
+            labelColor='#000'
+            :bottomBorder='true'
           >
             <view class="input-title" style="margin-right:14rpx;">
               <view
-                  class="input-title"
-                  style="margin-right:14rpx;"
-                  @click="openClassId()">
+                class="input-title"
+                style="margin-right:14rpx;"
+                @click="openClassId()">
                 {{ (formData.class_id) ? formData.class_id_name : '点击选择' }}
               </view>
             </view>
             <fui-picker
-                :linkage='true'
-                :options="class_id_options"
-                :layer="1"
-                :show="class_id_show"
-                @change="changeClassId"
-                @cancel="cancelClassId">
+              :linkage='true'
+              :options="class_id_options"
+              :layer="1"
+              :show="class_id_show"
+              @change="changeClassId"
+              @cancel="cancelClassId">
             </fui-picker>
           </fui-form-item>
           <!--订单类型-->
           <fui-form-item
-              label="订单类型"
-              asterisk
-              asteriskPosition="right"
-              labelSize='26'
-              prop=""
-              background='#fff'
-              labelColor='#000'
-              :bottomBorder='true'
+            label="订单类型"
+            asterisk
+            asteriskPosition="right"
+            labelSize='26'
+            prop=""
+            background='#fff'
+            labelColor='#000'
+            :bottomBorder='true'
           >
             <fui-radio-group name="radio" v-model="formData.order_type">
               <view style="display: flex;justify-content: flex-end">
@@ -213,30 +213,34 @@
           </fui-form-item>
           <!--订单金额-->
           <fui-form-item
-              label="订单金额"
-              labelSize='26'
-              prop=""
-              background='#fff'
-              labelColor='#000'
-              :bottomBorder='true'
+            label="订单金额"
+            labelSize='26'
+            prop=""
+            background='#fff'
+            labelColor='#000'
+            :bottomBorder='true'
           >
             <view class="input-title" style="margin-right:14rpx;">
               <fui-input
-                  :disabled="true"
-                  :borderBottom="false"
-                  :padding="[0]"
-                  placeholder="订单金额"
-                  v-model="formData.money"
-                  backgroundColor="#fff"
-                  size="26"
-                  color="#000"
+                :disabled="true"
+                :borderBottom="false"
+                :padding="[0]"
+                placeholder="订单金额"
+                v-model="formData.money"
+                backgroundColor="#fff"
+                size="26"
+                color="#000"
               ></fui-input>
             </view>
           </fui-form-item>
         </view>
         <view class="button_box">
-          <fui-button background="#fff" color="#414141" borderColor="#465CFF" btnSize="small" @click="closeOrderShow">取消</fui-button>
-          <fui-button background="#fff" color="#465CFF" borderColor="#465CFF" btnSize="small" @click="clickOrder({index:1})">确定</fui-button>
+          <fui-button background="#fff" color="#414141" borderColor="#465CFF" btnSize="small" @click="closeOrderShow">
+            取消
+          </fui-button>
+          <fui-button background="#fff" color="#465CFF" borderColor="#465CFF" btnSize="small"
+                      @click="clickOrder({index:1})">确定
+          </fui-button>
 
         </view>
       </fui-form>
@@ -244,82 +248,115 @@
         <fui-icon name="close" color="#B2B2B2" :size="48"></fui-icon>
       </view>
     </fui-modal>
+    <!-- 自定义内容弹窗示例 -->
+    <custom-modal
+      :show="showCustomModal"
+      width="700"
+      :showClose="true"
+      :maskClose="true"
+      @cancel="handleModalCancel"
+    >
+      <view class="custom-content">
+        <text class="custom-title">支付二维码</text>
+        <view class="custom-form">
+          <fui-qrcode :value="qrcode"></fui-qrcode>
+        </view>
+      </view>
+
+      <template #buttons>
+        <view class="button-row">
+          <fui-button
+            text="发送二维码给用户"
+            width="300rpx"
+            height="72rpx"
+            :size="28"
+            radius="36rpx"
+            background="#007AFF"
+            borderWidth="0"
+            @click="handleButtonClick"
+          />
+        </view>
+      </template>
+    </custom-modal>
   </view>
 </template>
 
 <script>
-import apiRoute from '@/api/apiRoute.js';
+import apiRoute from '@/api/apiRoute.js'
 import FuiRadioGroup from '../../../components/firstui/fui-radio-group/fui-radio-group.vue'
+import CustomModal from '../../../components/custom-modal/custom-modal.vue'
 
 export default {
   components: {
+    CustomModal,
     FuiRadioGroup,
   },
   data() {
     return {
-      loading:false,//加载状态
+      loading: false,//加载状态
       lowerThreshold: 100,//距离底部多远触发
       isReachedBottom: false,//防止重复加载|true=不可加载|false=可加载
-
+      showCustomModal: false,
+      qrcode: 'https://www.baidu.com',
       //筛选条件
-      filteredData:{
-        page:1,//当前页码
-        limit:10,//每页返回数据条数
-        total:10,//数据总条数
-        resource_id:'',//客户资源表id
+      filteredData: {
+        page: 1,//当前页码
+        limit: 10,//每页返回数据条数
+        total: 10,//数据总条数
+        resource_id: '',//客户资源表id
       },
-      tableList:[],//聊天数据列表
+      tableList: [],//聊天数据列表
 
       //订单表单
-      formData:{
-        payment_type:'',//付款类型必填验证
-        payment_type_name:'',//付款类型必填验证
+      formData: {
+        payment_type: '',//付款类型必填验证
+        payment_type_name: '',//付款类型必填验证
 
-        course_id:'',//课程ID必填验证
-        course_id_name:'',//课程ID必填验证
+        course_id: '',//课程ID必填验证
+        course_id_name: '',//课程ID必填验证
 
-        class_id:'',//班级ID必填验证
-        class_id_name:'',//班级ID必填验证
+        class_id: '',//班级ID必填验证
+        class_id_name: '',//班级ID必填验证
 
-        staff_id:'',//员工ID必填验证
-        staff_id_name:'',//员工ID必填验证
+        staff_id: '',//员工ID必填验证
+        staff_id_name: '',//员工ID必填验证
 
-        resource_id:'',//客户资源表ID必填验证
-        resource_id_name:'',//客户资源表ID必填验证
+        resource_id: '',//客户资源表ID必填验证
+        resource_id_name: '',//客户资源表ID必填验证
 
-        money:'',//金额|这个不入库就展示先
-        order_type:'1'
+        money: '',//金额|这个不入库就展示先
+        order_type: '1',
       },
 
-      order_show:false,//创建订单弹出层是否显示|true=显示,false=隐藏
+      order_show: false,//创建订单弹出层是否显示|true=显示,false=隐藏
 
       //付款类型-下拉选择器相关
-      payment_type_options:[
+      payment_type_options: [
         // {
         //   text:'张三',
         //   value:'1'
         // },
       ],//可选值列表
-      payment_type_show:false,//下拉选择器是否展示
+      payment_type_show: false,//下拉选择器是否展示
 
       //课程-下拉选择器相关
-      course_id_options:[
+      course_id_options: [
         // {
         //   text:'张三',
         //   value:'1',
         //   price:'1'//课程价格
         // },
       ],//可选值列表
-      course_id_show:false,//下拉选择器是否展示
+      course_id_show: false,//下拉选择器是否展示
 
       //班级-下拉选择器相关
-      class_id_options:[
+      class_id_options: [
         // {
         //   text:'张三',
         //   value:'1'
         // },
       ],//可选值列表
-      class_id_show:false,//下拉选择器是否展示
+      class_id_show: false,//下拉选择器是否展示
     }
   },
   onLoad(options) {
@@ -328,7 +365,7 @@ export default {
     if (!options || !options.resource_id) {
       uni.showToast({
         title: '缺少必要参数',
-        icon: 'none'
+        icon: 'none',
       })
       return
     }
@@ -341,7 +378,7 @@ export default {
     this.formData.staff_id = options.staff_id || '' // 员工资源表id
     this.formData.staff_id_name = options.staff_id_name || '' // 员工资源表id姓名
   },
-  onShow(){
+  onShow() {
     this.init()
   },
   //下拉刷新
@@ -352,7 +389,7 @@ export default {
   },
   methods: {
 //初始化
-    async init(){
+    async init() {
       try {
         //获取付款类型
         await this.getPaymentTypeList()
@@ -362,12 +399,12 @@ export default {
         await this.getClassList()
 
         //获取列表
-        await this.getList();
+        await this.getList()
       } catch (error) {
         console.error('初始化失败:', error)
         uni.showToast({
           title: '初始化数据失败',
-          icon: 'none'
+          icon: 'none',
         })
       }
     },
@@ -376,73 +413,75 @@ export default {
     loadMoreData() {
       //判断是否加载
       if (!this.isReachedBottom) {
-        this.isReachedBottom = true;//设置为不可请求状态
-        this.getList();
+        this.isReachedBottom = true//设置为不可请求状态
+        this.getList()
       }
     },
     //重置为第一页
     async resetFilteredData() {
-      this.isReachedBottom = false; // 重置状态，以便下次触发加载更多
+      this.isReachedBottom = false // 重置状态，以便下次触发加载更多
 
       this.filteredData.page = 1//当前页码
       this.filteredData.limit = 10//每页返回数据条数
       this.filteredData.total = 10//数据总条数
     },
-
+    handleModalCancel() {
+      this.showCustomModal = false
+    },
     //获取合同列表
-    async getList(){
+    async getList() {
       this.loading = true
 
-      let params = {...this.filteredData}
+      let params = { ...this.filteredData }
 
       //判断是否还有数据
       if ((this.filteredData.page - 1) * this.filteredData.limit >= this.filteredData.total) {
         this.loading = false
         uni.showToast({
           title: '暂无更多',
-          icon: 'none'
+          icon: 'none',
         })
         return
       }
 
-      if(params.page == 1){
+      if (params.page == 1) {
         this.tableList = []
       }
 
       let res = await apiRoute.xs_orderTableList(params)//获取订单那列表
       this.loading = false
-      this.isReachedBottom = false;
-      if (res.code != 1){
+      this.isReachedBottom = false
+      if (res.code != 1) {
         uni.showToast({
           title: res.msg,
-          icon: 'none'
+          icon: 'none',
         })
         return
       }
 
-      this.tableList = this.tableList.concat(res.data.data); // 使用 concat 方法 将新数据追加到数组中
+      this.tableList = this.tableList.concat(res.data.data) // 使用 concat 方法 将新数据追加到数组中
       // this.tableList.unshift(...res.data.data); // 将新数据插入到数组头部
 
-      console.log('列表',this.tableList)
+      console.log('列表', this.tableList)
       this.filteredData.total = res.data.total
       this.filteredData.page++
     },
 
     //获取付款类型
-    async getPaymentTypeList(){
+    async getPaymentTypeList() {
       try {
-        let res = await apiRoute.common_Dictionary({key:'payment_type'})
-        if(res.code != 1){
+        let res = await apiRoute.common_Dictionary({ key: 'payment_type' })
+        if (res.code != 1) {
           uni.showToast({
             title: res.msg || '获取付款类型失败',
-            icon: 'none'
+            icon: 'none',
           })
           return
         }
 
         let dictionary = res.data
         let arr = []
-        dictionary.forEach((v,k) => {
+        dictionary.forEach((v, k) => {
           arr.push({
             text: v.name,
             value: v.value,
@@ -454,16 +493,16 @@ export default {
         console.error('获取付款类型失败:', error)
       }
     },
-    
+
     //获取课程列表
-    async getCourseList(){
+    async getCourseList() {
       try {
         let params = {}
         let res = await apiRoute.common_getCourseAll(params)
-        if(res.code != 1){
+        if (res.code != 1) {
           uni.showToast({
             title: res.msg || '获取课程列表失败',
-            icon: 'none'
+            icon: 'none',
           })
           return
         }
@@ -474,7 +513,7 @@ export default {
         }
 
         let arr = []
-        res.data.forEach((v,k) => {
+        res.data.forEach((v, k) => {
           arr.push({
             text: `${v.course_name}`,
             value: v.id,
@@ -487,18 +526,18 @@ export default {
         console.error('获取课程列表失败:', error)
       }
     },
-    
+
     //获取班级列表
-    async getClassList(){
+    async getClassList() {
       try {
         let params = {
           status: 1, //班级状态(1开启  2关闭)
         }
         let res = await apiRoute.common_getClassAll(params)
-        if(res.code != 1){
+        if (res.code != 1) {
           uni.showToast({
             title: res.msg || '获取班级列表失败',
-            icon: 'none'
+            icon: 'none',
           })
           return
         }
@@ -509,7 +548,7 @@ export default {
         }
 
         let arr = []
-        res.data.forEach((v,k) => {
+        res.data.forEach((v, k) => {
           arr.push({
             text: `${v.campus_name}-${v.class_name}`,
             value: v.id,
@@ -523,11 +562,9 @@ export default {
     },
 
 
-
-
     //创建订单相关
     //显示创建订单弹窗
-    openOrderShow(){
+    openOrderShow() {
       //重置的数据
       this.formData.payment_type = ''//付款类型必填验证
       this.formData.payment_type_name = ''//付款类型必填验证
@@ -543,57 +580,57 @@ export default {
       this.order_show = true//展示弹层
     },
     //关闭打卡弹窗
-    closeOrderShow(){
+    closeOrderShow() {
       this.order_show = false
     },
     //监听-打卡签到回调
-    async clickOrder(e){
-      if(e.index == 0){
+    async clickOrder(e) {
+      if (e.index == 0) {
         //取消按钮
         this.closeOrderShow()
-      }else{
-        console.log('提交',this.formData)
+      } else {
+        console.log('提交', this.formData)
         await this.submitFormData()
       }
     },
     //提交表单
     async submitFormData() {
       try {
-        let param = {...this.formData}
+        let param = { ...this.formData }
         //表单验证
-        if(!param.resource_id){
+        if (!param.resource_id) {
           uni.showToast({
             title: '客户信息缺失',
-            icon: 'none'
+            icon: 'none',
           })
           return
         }
-        if(!param.class_id){
+        if (!param.class_id) {
           uni.showToast({
             title: '请选择班级',
-            icon: 'none'
+            icon: 'none',
           })
           return
         }
-        if(!param.course_id){
+        if (!param.course_id) {
           uni.showToast({
             title: '请选择课程',
-            icon: 'none'
+            icon: 'none',
           })
           return
         }
-        if(!param.payment_type){
+        if (!param.payment_type) {
           uni.showToast({
             title: '请选择付款类型',
-            icon: 'none'
+            icon: 'none',
           })
           return
         }
         // 移除员工ID验证，让后端自行获取
-        if(!param.money){
+        if (!param.money) {
           uni.showToast({
             title: '订单金额为空',
-            icon: 'none'
+            icon: 'none',
           })
           return
         }
@@ -602,36 +639,36 @@ export default {
         this.closeOrderShow()
 
         uni.showLoading({
-          title: '提交中...'
+          title: '提交中...',
         })
 
         let res = await apiRoute.xs_orderTableAdd(param)
         uni.hideLoading()
-        
+
         if (res.code != 1) {
           uni.showToast({
             title: res.msg || '创建订单失败',
-            icon: 'none'
+            icon: 'none',
           })
           return
         }
 
         uni.showToast({
           title: '创建订单成功',
-          icon: 'success'
+          icon: 'success',
         })
 
         //延迟1s执行
         setTimeout(() => {
           this.resetFilteredData()//重置表单
-          this.getList();//刷新列表
+          this.getList()//刷新列表
         }, 1500)
       } catch (error) {
         uni.hideLoading()
         console.error('提交订单失败:', error)
         uni.showToast({
           title: '创建订单失败，请重试',
-          icon: 'none'
+          icon: 'none',
         })
       }
     },
@@ -639,12 +676,12 @@ export default {
 
     //下拉选择器相关-付款类型
     //监听-付款类型
-    changePaymentType(e){
+    changePaymentType(e) {
       console.log('选择的付款类型:', e)
       if (!e || !e.value) {
         uni.showToast({
           title: '请选择有效的付款类型',
-          icon: 'none'
+          icon: 'none',
         })
         return
       }
@@ -653,11 +690,11 @@ export default {
       this.cancelPaymentType()
     },
     //打开选择器-付款类型
-    openPaymentType(){
+    openPaymentType() {
       if (!this.payment_type_options || this.payment_type_options.length === 0) {
         uni.showToast({
           title: '付款类型数据加载中，请稍后再试',
-          icon: 'none'
+          icon: 'none',
         })
         this.getPaymentTypeList() // 尝试重新加载
         return
@@ -665,18 +702,18 @@ export default {
       this.payment_type_show = true
     },
     //关闭选择器-付款类型
-    cancelPaymentType(){
+    cancelPaymentType() {
       this.payment_type_show = false
     },
 
     //下拉选择器相关-课程
     //监听-课程
-    changeCourseId(e){
+    changeCourseId(e) {
       console.log('选择的课程:', e)
       if (!e || !e.value) {
         uni.showToast({
           title: '请选择有效的课程',
-          icon: 'none'
+          icon: 'none',
         })
         return
       }
@@ -695,11 +732,11 @@ export default {
       this.cancelCourseId()
     },
     //打开选择器-课程
-    openCourseId(){
+    openCourseId() {
       if (!this.course_id_options || this.course_id_options.length === 0) {
         uni.showToast({
           title: '课程数据加载中，请稍后再试',
-          icon: 'none'
+          icon: 'none',
         })
         this.getCourseList() // 尝试重新加载
         return
@@ -707,18 +744,18 @@ export default {
       this.course_id_show = true
     },
     //关闭选择器-课程
-    cancelCourseId(){
+    cancelCourseId() {
       this.course_id_show = false
     },
 
     //下拉选择器相关-班级
     //监听-班级
-    changeClassId(e){
+    changeClassId(e) {
       console.log('选择的班级:', e)
       if (!e || !e.value) {
         uni.showToast({
           title: '请选择有效的班级',
-          icon: 'none'
+          icon: 'none',
         })
         return
       }
@@ -727,11 +764,11 @@ export default {
       this.cancelClassId()
     },
     //打开选择器-班级
-    openClassId(){
+    openClassId() {
       if (!this.class_id_options || this.class_id_options.length === 0) {
         uni.showToast({
           title: '班级数据加载中，请稍后再试',
-          icon: 'none'
+          icon: 'none',
         })
         this.getClassList() // 尝试重新加载
         return
@@ -739,14 +776,14 @@ export default {
       this.class_id_show = true
     },
     //关闭选择器-班级
-    cancelClassId(){
+    cancelClassId() {
       this.class_id_show = false
     },
 
     //订单卡片点击事件
     handleOrderClick(orderData) {
       console.log('点击订单:', orderData)
-      
+
       // 检查订单状态，只有待支付订单才能发起支付
       if (orderData.order_status === 'pending') {
         this.initiatePayment(orderData)
@@ -755,7 +792,7 @@ export default {
         console.log('订单已支付，无需再次支付')
         uni.showToast({
           title: '订单已支付',
-          icon: 'none'
+          icon: 'none',
         })
       }
     },
@@ -764,7 +801,7 @@ export default {
     initiatePayment(orderData) {
       console.log('发起支付，订单信息:', orderData)
       console.log('支付类型:', orderData.payment_type)
-      
+
       // 根据支付类型处理不同的支付方式
       switch (orderData.payment_type) {
         case 'cash':
@@ -779,7 +816,7 @@ export default {
         default:
           uni.showToast({
             title: '未知支付类型',
-            icon: 'none'
+            icon: 'none',
           })
           break
       }
@@ -792,9 +829,9 @@ export default {
       // 你可以在这里实现具体的现金支付逻辑
       uni.showToast({
         title: '现金支付处理中...',
-        icon: 'loading'
+        icon: 'loading',
       })
-      
+
       // 示例：调用支付确认接口
       // this.confirmCashPayment(orderData)
     },
@@ -803,14 +840,10 @@ export default {
     handleScanCodePayment(orderData) {
       console.log('处理扫码支付:', orderData)
       // 这里调用扫码支付相关接口
-      // 你可以在这里实现具体的扫码支付逻辑
-      uni.showToast({
-        title: '扫码支付处理中...',
-        icon: 'loading'
+      apiRoute.getOrderPayQrcode({ order_id: orderData.id }).then(res => {
+        this.qrcode = res.data.code_url
+        this.showCustomModal = true
       })
-      
-      // 示例：调用扫码支付接口
-      // this.initiateScanCodePayment(orderData)
     },
 
     //处理订阅支付
@@ -820,9 +853,9 @@ export default {
       // 你可以在这里实现具体的订阅支付逻辑
       uni.showToast({
         title: '订阅支付处理中...',
-        icon: 'loading'
+        icon: 'loading',
       })
-      
+
       // 示例：调用订阅支付接口
       // this.initiateSubscriptionPayment(orderData)
     },
@@ -831,15 +864,15 @@ export default {
     async downloadFile(fileUrl) {
       if (!fileUrl) {
         this.$util.showToast({
-          title: '暂无电子发票'
-        });
-        return false;
+          title: '暂无电子发票',
+        })
+        return false
       }
 
       uni.downloadFile({
         url: fileUrl,
-        success: function (res) {
-          console.log('下载成功');
+        success: function(res) {
+          console.log('下载成功')
           // uni.openDocument({
           //   filePath: res.tempFilePath,
           //   fileType: 'pdf',
@@ -847,155 +880,169 @@ export default {
           //     console.log('打开文档成功');
           //   }
           // });
-        }
-      });
+        },
+      })
 
-    }
+    },
+    handleButtonClick(){
 
-  }
+    }
+  },
 }
 </script>
 
 <style lang="less" scoped>
-	.main_box {
-		background: #292929;
-	}
-
-	//自定义导航栏
-	.navbar_section {
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		background: #29d3b4;
-
-		.title {
-			padding: 20rpx 0;
-			font-size: 30rpx;
-			color: #315d55;
-		}
-	}
-
-	.main_section {
-		min-height: 100vh;
-		background: #292929 100%;
-		padding: 0 0rpx;
-		padding-top: 32rpx;
-		padding-bottom: 150rpx;
-		font-size: 28rpx;
-		display: flex;
-		flex-direction: column;
-		gap: 20rpx;
-
-		.section {
-			background-color: #434544;
-			padding: 40rpx 40rpx;
-		}
-
-    .section_1{
-      padding: 0 24rpx;
+.main_box {
+  background: #292929;
+}
+
+.custom-content {
+  width: 100%;
+  padding: 20rpx;
+  display: flex;
+  justify-content: center;
+  flex-wrap: wrap;
+
+  .custom-title {
+    width: 100%;
+    text-align: center;
+    font-size: 32rpx;
+    font-weight: 600;
+    margin-bottom: 20rpx;
+  }
+}
+
+.main_section {
+  min-height: 100vh;
+  background: #292929 100%;
+  padding: 0 0rpx;
+  padding-top: 32rpx;
+  padding-bottom: 150rpx;
+  font-size: 28rpx;
+  display: flex;
+  flex-direction: column;
+  gap: 20rpx;
+
+  .section {
+    background-color: #434544;
+    padding: 40rpx 40rpx;
+  }
+
+  .section_1 {
+    padding: 0 24rpx;
+    display: flex;
+    flex-direction: column;
+
+    .item {
+      margin-bottom: 38rpx;
       display: flex;
       flex-direction: column;
+      padding: 32rpx 24rpx;
+      border-radius: 14rpx;
+      background-color: #434544;
+      color: #fff;
 
-      .item{
-        margin-bottom: 38rpx;
+      .top {
+        font-size: 28rpx;
+        display: flex;
+        justify-content: space-between;
+
+        .title {
+          font-size: 30rpx;
+        }
+
+        .btn {
+          display: flex;
+          align-items: center;
+          color: #29D3B4;
+        }
+      }
+
+      .bottom {
+        font-size: 26rpx;
+        margin-top: 25rpx;
         display: flex;
         flex-direction: column;
-        padding: 32rpx 24rpx;
-        border-radius: 14rpx;
-        background-color: #434544;
-        color: #fff;
-        .top{
-          font-size: 28rpx;
+        gap: 15rpx;
+
+        .box {
           display: flex;
           justify-content: space-between;
-          .title{
-            font-size: 30rpx;
-          }
-          .btn{
-            display: flex;
-            align-items: center;
-            color: #29D3B4;
+
+          .title {
+            width: 180rpx;
           }
-        }
-        .bottom{
-          font-size: 26rpx;
-          margin-top: 25rpx;
-          display: flex;
-          flex-direction: column;
-          gap: 15rpx;
-          .box{
-            display: flex;
-            justify-content: space-between;
-            .title{
-              width: 180rpx;
-            }
-            .content{
-              width: 100%;
-            }
+
+          .content {
+            width: 100%;
           }
         }
-
       }
+
     }
+  }
 
-    .btn_section{
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      .btn{
-        border-radius: 10rpx;
-        padding: 15rpx 0;
-        width: 70%;
-        color: #fff;
-        font-size: 30rpx;
-        text-align: center;
-      }
+  .btn_section {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+    .btn {
+      border-radius: 10rpx;
+      padding: 15rpx 0;
+      width: 70%;
+      color: #fff;
+      font-size: 30rpx;
+      text-align: center;
     }
+  }
 
 
+}
 
-	}
+.describe {
+  color: #999999;
+  padding-left: 30rpx;
+}
 
-	.describe {
-		color: #999999;
-		padding-left: 30rpx;
-	}
 
+//创建订单弹出层
+.order_modal {
+  .fui-title {
+    font-size: 32rpx;
+    padding-top: 24rpx;
+  }
 
-  //创建订单弹出层
-  .order_modal{
-    .fui-title {
-      font-size: 32rpx;
-      padding-top: 24rpx;
-    }
+  .fui-descr {
+    font-size: 24rpx;
+    color: #B2B2B2;
+    padding-top: 12rpx;
+    padding-bottom: 48rpx;
+  }
 
-    .fui-descr {
-      font-size: 24rpx;
-      color: #B2B2B2;
-      padding-top: 12rpx;
-      padding-bottom: 48rpx;
-    }
+  .fui-icon__close {
+    position: absolute;
+    right: 24rpx;
+    top: 20rpx;
+  }
 
-    .fui-icon__close {
-      position: absolute;
-      right: 24rpx;
-      top: 20rpx;
-    }
+  .form-section {
 
-    .form-section{
+    .input-style {
+      text-align: right !important;
 
-      .input-style {
-        text-align: right !important;
-        .input-title{}
-      }
-      .button_box{
-        margin-top: 30rpx;
-        padding: 20rpx;
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-        gap: 20rpx;
+      .input-title {
       }
     }
+
+    .button_box {
+      margin-top: 30rpx;
+      padding: 20rpx;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      gap: 20rpx;
+    }
   }
+}
 </style>
\ No newline at end of file