李志伟 3 年之前
父節點
當前提交
0be4649c9d
共有 3 個文件被更改,包括 30 次插入51 次删除
  1. 12
    22
      src/hotel/pages/landlord/addRoom/addRoom.jsx
  2. 0
    20
      src/pages/MineUserAll/RefundMoney/index.jsx
  3. 18
    9
      src/utils/request.js

+ 12
- 22
src/hotel/pages/landlord/addRoom/addRoom.jsx 查看文件

@@ -6,7 +6,8 @@ import { useEffect, useState } from "react"
6 6
 import { saveRoom, getRoomDetail, updateRoom } from '@/services/landlord'
7 7
 import { getExtendContent } from "@/services/home";
8 8
 import { saveExtend } from '@/services/landlord'
9
-import uploadFile from '@/utils/request'
9
+//export default是导出模块的   export也是导出模块的    如果引用时不加{}就是引用默认模块加了就是引用相应的模块
10
+import { uploadFile } from '@/utils/request'
10 11
 import Popup from '@/components/Popup'
11 12
 import Extend from "../../components/Extend";
12 13
 import './addRoom.less'
@@ -128,28 +129,17 @@ export default withLayout((props) => {
128 129
     Taro.chooseImage({
129 130
       count: 1,
130 131
       success: function (res) {
131
-        // const tempFilePaths = res.tempFilePaths[0]
132
-        console.log(res)
133
-          uploadFile(res.tempFilePaths[0]).then((res2)=>{
134
-            console.log(res2)
135
-          })
132
+        uploadFile(res.tempFilePaths[0]).then((res2) => {
133
+          const date = {
134
+            targetId: roomId,
135
+            targetType: 'room',
136
+            content: res2,
137
+            contentType: 'image'
138
+          }
139
+          saveExtend(date)
140
+          setReset(!reset)
141
+        })
136 142
       }
137
-
138
-
139
-
140
-
141
-
142
-
143
-      // success: function (res) {
144
-      //   const date = {
145
-      //     targetId: roomId,
146
-      //     targetType: 'room',
147
-      //     content: res.tempFilePaths[0],
148
-      //     contentType: 'image'
149
-      //   }
150
-      //   saveExtend(date)
151
-      //   setReset(!reset)
152
-      // }
153 143
     })
154 144
   }
155 145
   const isError = (s) => {

+ 0
- 20
src/pages/MineUserAll/RefundMoney/index.jsx 查看文件

@@ -10,7 +10,6 @@ import "./style.less";
10 10
 export default withLayout((props) => {
11 11
   const { router, person } = props;
12 12
   const [list, setList] = useState([]);
13
-  const [IsPull, setPull] = useState(false);
14 13
   const [pageNum, setNumber] = useState(1);
15 14
   const [HasNextPage, setHasNextPage] = useState(true);
16 15
   const [isFirst, setFirst] = useState(true)
@@ -29,16 +28,11 @@ export default withLayout((props) => {
29 28
         pageNum === 1 ? res.records || [] : list.concat(res.records || [])
30 29
       );
31 30
       setHasNextPage(res.current < res.pages);
32
-      setPull(false);
33 31
       Taro.hideLoading();
34 32
 
35 33
     });
36 34
   };
37 35
 
38
-  const pageRefresh = () => {
39
-    // 页面下拉刷新回调
40
-    setPull(true);
41
-  };
42 36
 
43 37
   const pageLoadMore = () => {
44 38
     // 页面上拉加载更多
@@ -54,16 +48,6 @@ export default withLayout((props) => {
54 48
 
55 49
   })
56 50
 
57
-  useEffect(() => {
58
-    // 下拉刷新触发
59
-    if (IsPull) {
60
-      if (pageNum === 1) {
61
-        getList();
62
-      } else {
63
-        setNumber(1);
64
-      }
65
-    }
66
-  }, [IsPull]);
67 51
 
68 52
   useEffect(() => {
69 53
     getList();
@@ -77,10 +61,6 @@ export default withLayout((props) => {
77 61
       <scroll-view
78 62
         scrollY
79 63
         style='height: calc(100vh - 176rpx);'
80
-        refresher-enabled
81
-        refresher-triggered={IsPull}
82
-        onrefresherrefresh={pageRefresh}
83
-        refresher-background='#fff'
84 64
         onscrolltolower={pageLoadMore}
85 65
       >
86 66
         <view className='View-box-Card'>

+ 18
- 9
src/utils/request.js 查看文件

@@ -87,21 +87,30 @@ export function uploadFile(filePath) {
87 87
       name: 'file',
88 88
       header: tokenHeader,
89 89
       success: (res) => {
90
-        const { code, message, data, token } = res.data
91
-
92
-        if (token || data?.token) {
93
-          Taro.setStorage({ key: 'token', data: token || data?.token })
94
-        }
95
-
96
-        if (code === 1000) {
97
-          resolve(data)
90
+        if (res.errMsg === 'uploadFile:ok') {
91
+          const { code, message, data, token } = JSON.parse(res.data)
92
+  
93
+          if (token || data?.token) {
94
+            Taro.setStorage({ key: 'token', data: token || data?.token })
95
+          }
96
+  
97
+          if (code === 1000) {
98
+            resolve(data)
99
+          } else {
100
+            console.error(res)
101
+  
102
+            logger.error("上传文件失败")
103
+            logger.error(res)
104
+  
105
+            reject(message?.indexOf('java') > -1 ? '系统内部错误' : message)
106
+          }
98 107
         } else {
99 108
           console.error(res)
100 109
 
101 110
           logger.error("上传文件失败")
102 111
           logger.error(res)
103 112
 
104
-          reject(message?.indexOf('java') > -1 ? '系统内部错误' : message)
113
+          reject(res.errMsg)
105 114
         }
106 115
       },
107 116
       fail: (err) => {