skyblued 2 years ago
parent
commit
0edb683501

+ 5 - 1
src/teacher/share-page/share-mall/index.tsx

@@ -22,6 +22,10 @@ import ColSticky from '@/components/col-sticky'
 import { shareCall } from '../share'
 import { state } from '@/state'
 
+// interface Product{
+//   [key]?: any
+// }
+
 export default defineComponent({
   name: 'goods-detail',
   data() {
@@ -29,7 +33,7 @@ export default defineComponent({
     return {
       id: query.id,
       albumPics: [] as any[],
-      product: {} as any,
+      product: {} as Record<string | number | symbol, any>,
       radio: 0,
       skuStockList: [] as any[],
       detailMobileHtml: '',

+ 3 - 5
src/views/goods-order/after-sale.tsx

@@ -84,7 +84,7 @@ export default defineComponent({
 
     async getList() {
       //避免重复请求
-      console.log(this.loading , this.finished)
+      console.log(this.loading, this.finished)
       if (this.loading && this.finished) {
         return
       }
@@ -130,7 +130,7 @@ export default defineComponent({
         let res = await request.get('/api-mall-portal/order/list', {
           params: {
             ...this.params,
-            status: '1,2'
+            status: '1,2,3'
           }
         })
         return res
@@ -285,9 +285,7 @@ export default defineComponent({
                                   default: () => (
                                     <div class={styles.btnList}>
                                       {this.active === '0' &&
-                                      (item.status !== 0 ||
-                                        item.status !== 6) &&
-                                      n.returnStatus < 0 ? (
+                                      n.returnStatus < 0 && (item.status == 3 ? (item.afterSale == 0) : true) ? (
                                         <Button
                                           size="small"
                                           round

+ 1 - 1
src/views/shop-mall/goods-detail/index.tsx

@@ -38,7 +38,7 @@ export default defineComponent({
     return {
       id: query.id,
       albumPics: [] as any[],
-      product: {} as any,
+      product: {} as  Record<string | number | symbol, any>,
       radio: 0,
       skuStockListTemp: [],
       detailMobileHtml: '',