refactor: update code

src/api/goods.js

@@ -28,5 +28,5 @@ export function activeProduct (id, params) {
 
 // ota价格代码
 export function getPricecode (params) {
-  return http.get('/merchant/ota/getPricecode', { params })
+  return http.post('/selfTicketType', { data:params })
 }

src/api/order.js

@@ -1,9 +1,15 @@
 import http from '@/utils/request'
 import { formatGetParams } from '@/utils'
 
+// export function getOrderList (params) {
+//   const data = { ...params, status: params.status.length ? params.status : ['WAIT_CREATE', 'WAIT_USE', 'PART_USE', 'COMPLETE', 'CANCELED'] }
+//   return http.get(`/merchant/order?${formatGetParams(data)}`)
+// }
+
+//new
 export function getOrderList (params) {
   const data = { ...params, status: params.status.length ? params.status : ['WAIT_CREATE', 'WAIT_USE', 'PART_USE', 'COMPLETE', 'CANCELED'] }
-  return http.get(`/merchant/order?${formatGetParams(data)}`)
+  return http.post(`/order/list`,{data:params})
 }
 
 // 创建

src/api/otaPublic.js

@@ -38,6 +38,11 @@ export function getAllOtaList (params) {
 }
 
 // 查看余额信息
+// export function getProject (params) {
+//   return http.get(`/merchant/project?${formatGetParams(params)}`)
+// }
+
+//景区信息管理
 export function getProject (params) {
-  return http.get(`/merchant/project?${formatGetParams(params)}`)
+  return http.post(`/selfScenic`,{data:params})
 }

src/hooks/useTable.js

@@ -23,13 +23,16 @@ export default (props, context, { getFn, delFn, activeFn, exportConfig, getParam
 
   const getData = () => {
     spinning.value = true
+    console.log('formatData',formatData)
+    console.log('params.value',params.value)
 
     return getFn(formatData ? formatData(params.value) : params.value).then(res => {
-      console.log(res)
-      tableData.value = res.extraInfo.list || res.extraInfo
+      console.log('132132')
+      console.log('res',res)
+      tableData.value = res.data.records
+      console.log('tableData.value',tableData.value)
       pagination.total = res.extraInfo.total
       spinning.value = false
-      console.log(tableData.value)
       return res.extraInfo.list || res.extraInfo
     }).finally(() => {
       spinning.value = false

src/pages/merchant/order/column.js

@@ -6,9 +6,9 @@ export const columns = [
   },
   {
     title: '渠道',
-    dataIndex: 'channel',
-    key: 'channel',
-    slots: { customRender: 'channel' }
+    dataIndex: 'otaSourceName',
+    key: 'otaSourceName',
+    slots: { customRender: 'otaSourceName' }
   },
   {
     title: '购买人姓名',
@@ -22,14 +22,14 @@ export const columns = [
   },
   {
     title: '购买人证件类型',
-    dataIndex: 'buyerPapersType',
-    key: 'buyerPapersType',
-    slots: { customRender: 'buyerPapersType' }
+    dataIndex: 'buyerIdentifyType',
+    key: 'buyerIdentifyType',
+    slots: { customRender: 'buyerIdentifyType' }
   },
   {
     title: '购买人证件号',
-    dataIndex: 'buyerIdentity',
-    key: 'buyerIdentity'
+    dataIndex: 'buyerIdentify',
+    key: 'buyerIdentify'
   },
   {
     title: '创建时间',

src/pages/merchant/order/list.vue

@@ -111,7 +111,7 @@
         :loading="loading"
         :scroll="{x:1200}"
         :rowKey="record => record.id">
-        <template #channel="{text:channel}">
+        <!-- <template #channel="{text:channel}">
           <span>
             {{ channel.name }}
           </span>
@@ -195,7 +195,7 @@
             </template>
 
           </a-table>
-        </template>
+        </template> -->
       </a-table>
     </a-card>
     <Modal ref="modal" @update="getOrders"></Modal>
@@ -217,6 +217,7 @@ import QRcode from './QRcode.vue'
 import { ref } from 'vue'
 import { QuestionCircleOutlined } from '@ant-design/icons-vue'
 
+
 export default {
   components: {
     Modal,
@@ -230,7 +231,6 @@ export default {
   },
   setup() {
     const qrcode = ref()
-
     return {
       qrcode,
       moment,

src/pages/merchant/order/useData.js

@@ -103,8 +103,11 @@ export default function order() {
     params.playDateEnd = params.playDateEnd ? moment(params.playDateEnd).format('YYYY-MM-DD') : ''
 
     getOrderList(params).then((res) => {
-      orderList.value = res.extraInfo.list
-      pagination.total = res.extraInfo.total
+      console.log('res.data.total',res.data.total)
+      console.log('res.data.records',res.data.records)
+      orderList.value = res.data.records
+      console.log('orderList.value',orderList.value)
+      pagination.total = res.data.total
       loading.value = false
     }).catch(() => {
       loading.value = false

src/pages/merchant/project/index.vue

@@ -11,7 +11,7 @@
       :dataSource="tableData"
       :rowKey="r=>Math.random()"
     >
-      <a-table-column width="200px" key="projectNickName" title="景区名称" data-index="projectNickName">
+      <a-table-column width="200px" key="projectNickName" title="景区名称" data-index="name">
       </a-table-column>
       <a-table-column key="paymentAmount" title="余额" data-index="paymentAmount">
       </a-table-column>

src/pages/merchant/ticket/index.vue

@@ -23,8 +23,8 @@
         :rowKey="(record) => record.id"
         :dataSource="tableData">
         <a-table-column key="id" title="ID" data-index="id"></a-table-column>
-        <a-table-column key="projectNickName" title="景区名" data-index="projectNickName"></a-table-column>
-        <a-table-column key="otaTicketTypeName" title="票种名称" data-index="otaTicketTypeName"></a-table-column>
+        <a-table-column key="scenicListName" title="景区名" data-index="scenicList[0].selfScenicName"></a-table-column>
+        <a-table-column key="name" title="票种名称" data-index="name"></a-table-column>
         <a-table-column key="price" title="价格" data-index="price"></a-table-column>
 
       </a-table>
@@ -56,13 +56,24 @@ export default {
     })
 
     const projectList = ref([])
-    getProjectList().then(res => {
+    const params = {
+      export:false,
+      exportDetail:false,
+      pageSize: 10,
+      pageNum: 1,
+      category:"",
+      name:"",
+      isSale:1
+    }
+    getProjectList(params).then(res => {
+      // console.log('---getProjectList',res)  
       const list = res.extraInfo.map(i => {
         return {
           value: i.id,
           label: i.projectNickName
         }
       })
+      console.log('---list',list)
       projectList.value = [{ value: '', label: '全部' }].concat(list)
     })
 

src/utils/request.js

@@ -13,9 +13,10 @@ const service = axios.create({
 // request拦截器
 service.interceptors.request.use(config => {
   const token = localStorage.clearauthtoken_tenant
+  
   if (token) {
     Object.assign(config, {
-      headers: { SaToken: token }
+      headers: { SaToken: token, }
     })
   }