1

admin/src/app/api/pay.ts

@@ -71,6 +71,7 @@ export function getRefundTransfer(params: Record<string, any>) {
   })
 }
 
+
 /**
  * 全部支付方式
  */
@@ -107,3 +108,16 @@ export function getFriendsPay(
     showErrorMessage: false,
   })
 }
+
+
+export function orderPay(params: Record<string, any>) {
+  return request.post(`pay/order_pay`, params, {
+    showSuccessMessage: true,
+  })
+}
+
+
+export function checkPaymentStatus(params: Record<string, any>) {
+  return request.post(`pay/check_payment_status`, params)
+}
+

admin/src/app/api/student.ts

@@ -2,6 +2,8 @@ import request from '@/utils/request'
 
 
 
+
+
 // USER_CODE_BEGIN -- student
 /**
  * 获取学员列表
@@ -49,12 +51,12 @@ export function deleteStudent(id: number) {
     return request.delete(`student/student/${id}`, { showErrorMessage: true, showSuccessMessage: true })
 }
 
-export function getWithCampusList(params: Record<string,any>){
+export function getWithCustomerResourcesList(params: Record<string,any>){
+    return request.get('student/customer_resources_all', {params})
+}export function getWithCampusList(params: Record<string,any>){
     return request.get('student/campus_all', {params})
 }export function getWithClassGradeList(params: Record<string,any>){
     return request.get('student/class_grade_all', {params})
-}export function getWithMemberList(params: Record<string,any>){
-    return request.get('student/member_all', {params})
 }
 
 // USER_CODE_END -- student

admin/src/app/lang/zh-cn/student.student.json

@@ -1,10 +1,10 @@
 {
+      "userId":"资源",
+      "userIdPlaceholder":"请输入资源",
       "campusId":"校区",
       "campusIdPlaceholder":"全部",
       "classId":"班级",
       "classIdPlaceholder":"请输入班级",
-      "userId":"用户",
-      "userIdPlaceholder":"请输入用户",
       "name":"学员姓名",
       "namePlaceholder":"请输入学员姓名",
       "gender":"性别",

admin/src/app/views/customer_resources/components/customer-resources-edit.vue

@@ -547,37 +547,7 @@ const formRules = computed(() => {
         message: t('cognitiveIdeaPlaceholder'),
         trigger: 'blur',
       },
-    ],
+    ]
-    optional_class_time: [
-      {
-        required: true,
-        message: t('optionalClassTimePlaceholder'),
-        trigger: 'blur',
-      },
-    ],
-    distance: [
-      { required: true, message: t('distancePlaceholder'), trigger: 'blur' },
-    ],
-    decision_maker: [
-      {
-        required: true,
-        message: t('decisionMakerPlaceholder'),
-        trigger: 'blur',
-      },
-    ],
-    initial_intent: [
-      {
-        required: true,
-        message: t('initialIntentPlaceholder'),
-        trigger: 'blur',
-      },
-    ],
-    campus: [
-      { required: true, message: t('campusPlaceholder'), trigger: 'blur' },
-    ],
-    status: [
-      { required: true, message: t('statusPlaceholder'), trigger: 'blur' },
-    ],
   }
 })
 

admin/src/app/views/customer_resources/customer_resources.vue

@@ -138,11 +138,13 @@
 					</el-table-column>
 
 
-					<el-table-column :label="t('operation')" fixed="right" min-width="200"
+					<el-table-column :label="t('operation')" fixed="right" min-width="300"
 						v-if="customerResourcesTable.searchParam.type == 'zylb'">
 						<template #default="{ row }">
 							<el-button type="primary" link @click="editEvent(row)">{{ t('edit') }}</el-button>
 
+							<el-button type="primary" link @click="orderList(row.id)">订单列表</el-button>
+
 							<el-button type="primary" link @click="addOrder({'resource_id':row.id})">添加订单</el-button>
 							
 							<el-button type="primary" link @click="tcEvent({'resource_id':row.id})">体测</el-button>
@@ -252,6 +254,11 @@
 		TcCustomerResourcesDialog.value.showDialog = true
 	}
 
+	const orderList = (resource_id : number) => {
+		
+		router.push({ path: '/order_table/order_table', query: { resource_id: resource_id } })
+	}
+
 
 
 

admin/src/app/views/order_table/order_table.vue

@@ -8,46 +8,23 @@
 				</el-button>
 			</div>
 
-      <el-card
+			<el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
-        class="box-card !border-none my-[10px] table-search-wrap"
+				<el-form :inline="true" :model="orderTableTable.searchParam" ref="searchFormRef">
-        shadow="never"
-      >
-        <el-form
-          :inline="true"
-          :model="orderTableTable.searchParam"
-          ref="searchFormRef"
-        >
 					<el-form-item :label="t('orderStatus')" prop="order_status">
-            <el-select
+						<el-select class="w-[280px]" v-model="orderTableTable.searchParam.order_status" clearable
-              class="w-[280px]"
+							:placeholder="t('orderStatusPlaceholder')">
-              v-model="orderTableTable.searchParam.order_status"
-              clearable
-              :placeholder="t('orderStatusPlaceholder')"
-            >
 							<el-option label="全部" value=""></el-option>
-              <el-option
+							<el-option v-for="(item, index) in order_statusList" :key="index" :label="item.name"
-                v-for="(item, index) in order_statusList"
+								:value="item.value" />
-                :key="index"
-                :label="item.name"
-                :value="item.value"
-              />
 						</el-select>
 					</el-form-item>
 
 					<el-form-item :label="t('paymentType')" prop="payment_type">
-            <el-select
+						<el-select class="w-[280px]" v-model="orderTableTable.searchParam.payment_type" clearable
-              class="w-[280px]"
+							:placeholder="t('paymentTypePlaceholder')">
-              v-model="orderTableTable.searchParam.payment_type"
-              clearable
-              :placeholder="t('paymentTypePlaceholder')"
-            >
 							<el-option label="全部" value=""></el-option>
-              <el-option
+							<el-option v-for="(item, index) in payment_typeList" :key="index" :label="item.name"
-                v-for="(item, index) in payment_typeList"
+								:value="item.value" />
-                :key="index"
-                :label="item.name"
-                :value="item.value"
-              />
 						</el-select>
 					</el-form-item>
 
@@ -63,27 +40,15 @@
 			</el-card>
 
 			<div class="mt-[10px]">
-        <el-table
+				<el-table :data="orderTableTable.data" size="large" v-loading="orderTableTable.loading">
-          :data="orderTableTable.data"
-          size="large"
-          v-loading="orderTableTable.loading"
-        >
 					<template #empty>
 						<span>{{ !orderTableTable.loading ? t('emptyData') : '' }}</span>
 					</template>
-          <el-table-column
+					<el-table-column prop="resource_id_name" :label="t('resourceId')" min-width="120"
-            prop="resource_id_name"
+						:show-overflow-tooltip="true" />
-            :label="t('resourceId')"
+
-            min-width="120"
+					<el-table-column :label="t('orderStatus')" min-width="180" align="center"
-            :show-overflow-tooltip="true"
+						:show-overflow-tooltip="true">
-          />
-
-          <el-table-column
-            :label="t('orderStatus')"
-            min-width="180"
-            align="center"
-            :show-overflow-tooltip="true"
-          >
 						<template #default="{ row }">
 							<div v-for="(item, index) in order_statusList">
 								<div v-if="item.value == row.order_status">{{ item.name }}</div>
@@ -91,12 +56,8 @@
 						</template>
 					</el-table-column>
 
-          <el-table-column
+					<el-table-column :label="t('paymentType')" min-width="180" align="center"
-            :label="t('paymentType')"
+						:show-overflow-tooltip="true">
-            min-width="180"
-            align="center"
-            :show-overflow-tooltip="true"
-          >
 						<template #default="{ row }">
 							<div v-for="(item, index) in payment_typeList">
 								<div v-if="item.value == row.payment_type">{{ item.name }}</div>
@@ -104,47 +65,26 @@
 						</template>
 					</el-table-column>
 
-          <el-table-column
+					<el-table-column prop="order_amount" :label="t('orderAmount')" min-width="120"
-            prop="order_amount"
+						:show-overflow-tooltip="true" />
-            :label="t('orderAmount')"
+
-            min-width="120"
+					<el-table-column prop="course_id_name" :label="t('courseId')" min-width="120"
-            :show-overflow-tooltip="true"
+						:show-overflow-tooltip="true" />
-          />
+
-
+					<el-table-column prop="class_id_name" :label="t('classId')" min-width="120"
-          <el-table-column
+						:show-overflow-tooltip="true" />
-            prop="course_id_name"
+
-            :label="t('courseId')"
+					<el-table-column prop="staff_id_name" :label="t('staffId')" min-width="120"
-            min-width="120"
+						:show-overflow-tooltip="true" />
-            :show-overflow-tooltip="true"
+
-          />
+					<el-table-column prop="payment_time" :label="t('paymentTime')" min-width="120"
-
+						:show-overflow-tooltip="true" />
-          <el-table-column
+
-            prop="class_id_name"
+					<el-table-column :label="t('operation')" fixed="right" min-width="120">
-            :label="t('classId')"
-            min-width="120"
-            :show-overflow-tooltip="true"
-          />
-
-          <el-table-column
-            prop="staff_id_name"
-            :label="t('staffId')"
-            min-width="120"
-            :show-overflow-tooltip="true"
-          />
-
-          <el-table-column
-            prop="payment_time"
-            :label="t('paymentTime')"
-            min-width="120"
-            :show-overflow-tooltip="true"
-          />
-
-          <el-table-column
-            :label="t('operation')"
-            fixed="right"
-            min-width="120"
-          >
 						<template #default="{ row }">
+
+							<el-button type="primary" link @click="startPayment(row.id)" v-if="row.order_status == 'pending'">支付</el-button>
+
 							<el-button type="primary" link @click="editEvent(row)">{{
                 t('edit')
               }}</el-button>
@@ -155,24 +95,29 @@
 					</el-table-column>
 				</el-table>
 				<div class="mt-[16px] flex justify-end">
-          <el-pagination
+					<el-pagination v-model:current-page="orderTableTable.page" v-model:page-size="orderTableTable.limit"
-            v-model:current-page="orderTableTable.page"
+						layout="total, sizes, prev, pager, next, jumper" :total="orderTableTable.total"
-            v-model:page-size="orderTableTable.limit"
+						@size-change="loadOrderTableList()" @current-change="loadOrderTableList" />
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="orderTableTable.total"
-            @size-change="loadOrderTableList()"
-            @current-change="loadOrderTableList"
-          />
 				</div>
 			</div>
 
 			<edit ref="editOrderTableDialog" @complete="loadOrderTableList" />
 		</el-card>
+
+
+		<el-dialog v-model="showDialog" title="请扫码支付" width="320px" center @close="handleClose">
+		    <div v-if="qrCodeUrl" class="qr-box">
+		      <img :src="qrCodeUrl" alt="二维码" class="qr-img" />
+		      <p class="pay-id">支付编号：{{ payId }}</p>
+		    </div>
+		  </el-dialog>
+
 	</div>
 </template>
 
 <script lang="ts" setup>
-import { reactive, ref, watch } from 'vue'
+	import QrcodeVue from '@/app/views/order_table/components/qrcode.vue'
+	import { reactive, ref, watch, onBeforeUnmount } from 'vue'
 	import { t } from '@/lang'
 	import { useDictionary } from '@/app/api/dict'
 	import {
@@ -183,6 +128,12 @@ import {
 		getWithClassGradeList,
 		getWithPersonnelList,
 	} from '@/app/api/order_table'
+	import {
+		orderPay,
+		checkPaymentStatus
+	} from '@/app/api/pay'
+
+
 	import { img } from '@/utils/common'
 	import { ElMessageBox, FormInstance } from 'element-plus'
 	import Edit from '@/app/views/order_table/components/order-table-edit.vue'
@@ -190,6 +141,7 @@ import { useRoute } from 'vue-router'
 	const route = useRoute()
 	const pageName = route.meta.title
 
+	
 	let orderTableTable = reactive({
 		page: 1,
 		limit: 10,
@@ -199,9 +151,69 @@ let orderTableTable = reactive({
 		searchParam: {
 			order_status: '',
 			payment_type: '',
+			resource_id: route.query.resource_id ?? ''
 		},
 	})
 
+	
+	const showDialog = ref(false)
+	const qrCodeUrl = ref('')
+	const payId = ref('')
+	let checkTimer: ReturnType<typeof setInterval> | null = null
+	
+	const startPayment = async (order_id : number) => {
+
+		orderPay({
+			order_id: order_id
+		})
+		.then((res) => {
+			qrCodeUrl.value = res.data.qrcode_url
+			payId.value = res.data.out_trade_no
+			showDialog.value = true
+
+			// 开始轮询检查支付状态
+			startCheckingStatus()
+		})
+		.catch(() => {
+
+		})
+	}
+	
+	const startCheckingStatus = () => {
+	  if (checkTimer) clearInterval(checkTimer)
+	  checkTimer = setInterval(async () => {
+		checkPaymentStatus({
+			out_trade_no: payId.value
+		})
+		.then((res) => {
+			if (res.data.order_status === 'paid') {
+				clearInterval(checkTimer!)
+				showDialog.value = false
+				handlePaymentSuccess()
+			}
+		})
+		.catch(() => {
+		
+		})  
+	  }, 3000)
+	  
+	}
+	
+	
+	const handleClose = () => {
+		if (checkTimer) clearInterval(checkTimer)
+	}
+	
+	const handlePaymentSuccess = () => {
+	  // 处理支付成功后的逻辑
+	  loadOrderTableList();
+	}
+
+	onBeforeUnmount(() => {
+	  if (checkTimer) clearInterval(checkTimer)
+	})
+
+
 	const searchFormRef = ref<FormInstance>()
 
 	// 选中数据
@@ -320,4 +332,32 @@ const resetForm = (formEl: FormInstance | undefined) => {
 		-webkit-line-clamp: 2;
 		-webkit-box-orient: vertical;
 	}
+	
+	
+	.qr-box {
+	  display: flex;
+	  flex-direction: column;
+	  align-items: center;
+	  justify-content: center;
+	  padding: 16px;
+	  background-color: #fdfdfd;
+	  border-radius: 12px;
+	  box-shadow: 0 6px 20px rgba(0, 0, 0, 0.08);
+	  transition: all 0.3s ease-in-out;
+	}
+	
+	.qr-img {
+	  width: 200px;
+	  height: 200px;
+	  border-radius: 8px;
+	  object-fit: contain;
+	  border: 1px solid #e5e5e5;
+	}
+	
+	.pay-id {
+	  margin-top: 14px;
+	  font-size: 13px;
+	  color: #666;
+	  word-break: break-all;
+	}
 </style>

admin/src/app/views/student/components/student-edit.vue

@@ -1,6 +1,18 @@
 <template>
     <el-dialog v-model="showDialog" :title="formData.id ? t('updateStudent') : t('addStudent')" width="50%" class="diy-dialog-wrap" :destroy-on-close="true">
         <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+                <el-form-item :label="t('userId')" prop="user_id">
+                    <el-select class="input-width" v-model="formData.user_id" clearable :placeholder="t('userIdPlaceholder')">
+                       <el-option label="请选择" value=""></el-option>
+                        <el-option
+                            v-for="(item, index) in userIdList"
+                            :key="index"
+                            :label="item['name']"
+                            :value="item['id']"
+                        />
+                    </el-select>
+                </el-form-item>
+                
                 <el-form-item :label="t('campusId')" >
                     <el-select class="input-width" v-model="formData.campus_id" clearable :placeholder="t('campusIdPlaceholder')">
                        <el-option label="请选择" value=""></el-option>
@@ -25,18 +37,6 @@
                     </el-select>
                 </el-form-item>
                 
-                <el-form-item :label="t('userId')" prop="user_id">
-                    <el-select class="input-width" v-model="formData.user_id" clearable :placeholder="t('userIdPlaceholder')">
-                       <el-option label="请选择" value=""></el-option>
-                        <el-option
-                            v-for="(item, index) in userIdList"
-                            :key="index"
-                            :label="item['nickname']"
-                            :value="item['member_id']"
-                        />
-                    </el-select>
-                </el-form-item>
-                
                 <el-form-item :label="t('name')" prop="name">
                     <el-input v-model="formData.name" clearable :placeholder="t('namePlaceholder')" class="input-width" />
                 </el-form-item>
@@ -109,7 +109,7 @@ import { ref, reactive, computed, watch } from 'vue'
 import { useDictionary } from '@/app/api/dict'
 import { t } from '@/lang'
 import type { FormInstance } from 'element-plus'
-import { addStudent, editStudent, getStudentInfo, getWithCampusList, getWithClassGradeList, getWithMemberList } from '@/app/api/student'
+import { addStudent, editStudent, getStudentInfo, getWithCustomerResourcesList, getWithCampusList, getWithClassGradeList } from '@/app/api/student'
 
 let showDialog = ref(false)
 const loading = ref(false)
@@ -119,9 +119,9 @@ const loading = ref(false)
  */
 const initialFormData = {
     id: '',
+    user_id: '',
     campus_id: '',
     class_id: '',
-    user_id: '',
     name: '',
     gender: '',
     age: '',
@@ -138,6 +138,11 @@ const formRef = ref<FormInstance>()
 // 表单验证规则
 const formRules = computed(() => {
     return {
+    user_id: [
+        { required: true, message: t('userIdPlaceholder'), trigger: 'blur' },
+        
+    ]
+,
     campus_id: [
         { required: true, message: t('campusIdPlaceholder'), trigger: 'blur' },
         
@@ -146,11 +151,6 @@ const formRules = computed(() => {
     class_id: [
         { required: true, message: t('classIdPlaceholder'), trigger: 'blur' },
         
-    ]
-,
-    user_id: [
-        { required: true, message: t('userIdPlaceholder'), trigger: 'blur' },
-        
     ]
 ,
     name: [
@@ -238,6 +238,11 @@ const confirm = async (formEl: FormInstance | undefined) => {
     watch(() => statusList.value, () => { formData.status = statusList.value[0].value })
 
     
+    const userIdList = ref([] as any[])
+    const setUserIdList = async () => {
+    userIdList.value = await (await getWithCustomerResourcesList({})).data
+    }
+    setUserIdList()
     const campusIdList = ref([] as any[])
     const setCampusIdList = async () => {
     campusIdList.value = await (await getWithCampusList({})).data
@@ -248,11 +253,6 @@ const confirm = async (formEl: FormInstance | undefined) => {
     classIdList.value = await (await getWithClassGradeList({})).data
     }
     setClassIdList()
-    const userIdList = ref([] as any[])
-    const setUserIdList = async () => {
-    userIdList.value = await (await getWithMemberList({})).data
-    }
-    setUserIdList()
 const setFormData = async (row: any = null) => {
     Object.assign(formData, initialFormData)
     loading.value = true

admin/src/app/views/student/student.vue

@@ -49,12 +49,12 @@
                     <template #empty>
                         <span>{{ !studentTable.loading ? t('emptyData') : '' }}</span>
                     </template>
+                    <el-table-column prop="user_id_name" :label="t('userId')" min-width="120" :show-overflow-tooltip="true"/>
+                    
                     <el-table-column prop="campus_id_name" :label="t('campusId')" min-width="120" :show-overflow-tooltip="true"/>
                     
                     <el-table-column prop="class_id_name" :label="t('classId')" min-width="120" :show-overflow-tooltip="true"/>
                     
-                    <el-table-column prop="user_id_name" :label="t('userId')" min-width="120" :show-overflow-tooltip="true"/>
-                    
                     <el-table-column prop="name" :label="t('name')" min-width="120" :show-overflow-tooltip="true"/>
                     
                     <el-table-column :label="t('gender')" min-width="180" align="center" :show-overflow-tooltip="true">
@@ -105,7 +105,7 @@
 import { reactive, ref, watch } from 'vue'
 import { t } from '@/lang'
 import { useDictionary } from '@/app/api/dict'
-import { getStudentList, deleteStudent, getWithCampusList, getWithClassGradeList, getWithMemberList } from '@/app/api/student'
+import { getStudentList, deleteStudent, getWithCustomerResourcesList, getWithCampusList, getWithClassGradeList } from '@/app/api/student'
 import { img } from '@/utils/common'
 import { ElMessageBox,FormInstance } from 'element-plus'
 import Edit from '@/app/views/student/components/student-edit.vue'
@@ -204,6 +204,11 @@ const deleteEvent = (id: number) => {
 }
 
     
+    const userIdList = ref([])
+    const setUserIdList = async () => {
+    userIdList.value = await (await getWithCustomerResourcesList({})).data
+    }
+    setUserIdList()
     const campusIdList = ref([])
     const setCampusIdList = async () => {
     campusIdList.value = await (await getWithCampusList({})).data
@@ -214,11 +219,6 @@ const deleteEvent = (id: number) => {
     classIdList.value = await (await getWithClassGradeList({})).data
     }
     setClassIdList()
-    const userIdList = ref([])
-    const setUserIdList = async () => {
-    userIdList.value = await (await getWithMemberList({})).data
-    }
-    setUserIdList()
 
 const resetForm = (formEl: FormInstance | undefined) => {
     if (!formEl) return