Merge branch 'master' of ssh://gitlab.fuxicarbon.com:1111/hongshan/fuxi-dmrv-admin

src/views/curriculum/curr.vue

@@ -457,12 +457,12 @@
             },
 
             { title: "讲师",
-              key: "teacherId",
-              dataIndex: "teacherId",
+              key: "teacherName",
+              dataIndex: "teacherName",
             },
             { title: "录播讲师",
-              key: "recordId",
-              dataIndex: "recordId",
+              key: "recordName",
+              dataIndex: "recordName",
             },
             { title: "原价",
               key: "oprice",
@@ -477,8 +477,8 @@
               dataIndex: "discountmsg",
             },
             { title: "课程分类",
-              key: "type",
-              dataIndex: "type",
+              key: "typeStr",
+              dataIndex: "typeStr",
             },
             { title: "权重",
               key: "weight",
@@ -500,8 +500,8 @@
               dataIndex: "updatedAt",
             },
             { title: "状态",
-              key: "status",
-              dataIndex: "status",
+              key: "statusStr",
+              dataIndex: "statusStr",
               fixed: 'right',
             },
             {

src/views/curriculum/order.vue

@@ -62,14 +62,14 @@
           </template>
         </a-table>
         <!-- 页码-->
-        <!-- <a-pagination 
+        <a-pagination 
           v-model:current="paginationData.current" 
           pageSize="20"
           :total="paginationData.total"
           :show-total="(total, range) => `第${range[0]}-${range[1]} 条，共 ${total} 条`"
           @change="changePage"
           show-less-items 
-        /> -->
+        />
         <!-- 新增--编辑弹窗 -->
         <a-modal   v-model:visible="addPop" :title="addData.id ? '编辑订单' :'新增订单'" @ok="submit" okText="确定" cancelText="取消"  >
           <a-form :model="addData"  :labelCol="{ style: 'width:120px' }"  ref="formRef" :rules="rules">
@@ -383,59 +383,49 @@ export default defineComponent({
           },
           {
             title: "录播讲师",
-            key: "title",
-            dataIndex: "title",
+            key: "recordName",
+            dataIndex: "recordName",
           },
           {
             title: "录播讲师手机号",
-            key: "title",
-            dataIndex: "title",
+            key: "recordPhone",
+            dataIndex: "recordPhone",
           },
           {
             title: "用户名",
-            key: "title",
-            dataIndex: "title",
+            key: "nickName",
+            dataIndex: "nickName",
           },
           {
             title: "手机号",
-            key: "title",
-            dataIndex: "title",
+            key: "phoneNumber",
+            dataIndex: "phoneNumber",
           },
           {
             title: "来源",
-            key: "title",
-            dataIndex: "title",
+            key: "channelName",
+            dataIndex: "channelName",
           },
           {
             title: "价格（元）",
-            key: "title",
-            dataIndex: "title",
+            key: "price",
+            dataIndex: "price",
           },
           {
             title: "订单状态",
-            key: "title",
-            dataIndex: "title",
+            key: "statusStr",
+            dataIndex: "statusStr",
           },
           {
             title: "下单时间",
-            key: "title",
-            dataIndex: "title",
-          },
-          {
-            title: "支付时间",
-            key: "title",
-            dataIndex: "title",
-          }, 
-          {
-            title: "创建时间",
             key: "createdAt",
             dataIndex: "createdAt",
           },
           {
-            title: "修改时间",
-            key: "updatedAt",
-            dataIndex: "updatedAt",
-          },
+            title: "支付时间",
+            key: "payAt",
+            dataIndex: "payAt",
+          }, 
         ],
       searchData,
       currOptions,