From 910c37c43eceb27888b90631c868caa08f7eafcc Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期四, 30 五月 2024 15:36:59 +0800
Subject: [PATCH] 开泵流程相关界面优化

---
 api/request.js |   68 +++++++++++++++++++++++++++-------
 1 files changed, 54 insertions(+), 14 deletions(-)

diff --git a/api/request.js b/api/request.js
index 29411f7..62f4b83 100644
--- a/api/request.js
+++ b/api/request.js
@@ -1,7 +1,9 @@
 // 寮曞叆鐘舵�佺爜statusCode
 const statusCode = require('./statusCode')
 // 瀹氫箟璇锋眰璺緞, BASEURL: 鏅�氳姹侫PI; CBASEURL: 涓彴API,涓嶄娇鐢ㄤ腑鍙板彲涓嶅紩鍏BASEURL
-const { BASEURL } = require('./config')
+const {
+  BASEURL
+} = require('./config')
 // 瀹氫箟榛樿鍙傛暟
 const defaultOptions = {
   data: {},
@@ -17,9 +19,20 @@
  * ignoreToken: <Boolean> 鏄惁蹇界暐token楠岃瘉
  * form: <Boolean> 鏄惁浣跨敤formData璇锋眰
  */
-function request (options) {
-  let _options = Object.assign(defaultOptions, options)
-  let { method, url, data, ignoreToken, form } = _options
+function request(options) {
+  // let _options = Object.assign(defaultOptions, options)
+  let _options = {
+    ...defaultOptions,
+    ...options
+  }
+  let {
+    method,
+    url,
+    data,
+    ignoreToken,
+    form,
+    isShowLoding
+  } = _options
   const app = getApp()
   // 璁剧疆璇锋眰澶�
   let header = {}
@@ -38,15 +51,34 @@
     header.Authorization = `Bearer ${token}`
   }
   return new Promise((resolve, reject) => {
+    console.log("url:" + BASEURL + url);
+    if (isShowLoding) {
+      wx.showLoading({
+        title: '閫氫俊涓�...', // 鍔犺浇鍔ㄧ敾鏍囬
+        mask: true, // 鏄惁鏄剧ず閫忔槑钂欏眰锛岄槻姝㈣Е鎽哥┛閫�
+      });
+    }
+    let myUrl;
+    if (url.startsWith('http')) {
+      myUrl = url;
+    } else {
+      myUrl = BASEURL + url;
+    }
     wx.request({
-      url: BASEURL + url,
+      url: myUrl,
       data,
       header,
       method,
       success: (res) => {
-        let { statusCode: code } = res
+        let {
+          statusCode: code
+        } = res
+        console.log("success  statusCode:" + code);
+        if (isShowLoding) {
+          wx.hideLoading(); // 闅愯棌鍔犺浇鍔ㄧ敾
+        }
         if (code === statusCode.SUCCESS) {
-          if (res.data.code !== 0) {
+          if (res.data.code !== "0001") {
             // 缁熶竴澶勭悊璇锋眰閿欒
             showToast(res.data.errorMsg)
             reject(res.data)
@@ -58,12 +90,18 @@
           showToast(`鐧诲綍杩囨湡, 璇烽噸鏂板埛鏂伴〉闈)
           reject(res.data)
         } else {
-          showToast(`璇锋眰閿欒${url}, CODE: ${code}`)
+          // showToast(`璇锋眰閿欒${url}, CODE: ${code}`)
+          console.log("success  璇锋眰閿欒:" + code);
           reject(res.data)
         }
+        console.log("success  statusCode:1111111111");
       },
       fail: (err) => {
-        console.log('%c err', 'color: red;font-weight: bold', err)
+        console.log("Error  " + err);
+        if (isShowLoding) {
+          wx.hideLoading(); // 闅愯棌鍔犺浇鍔ㄧ敾
+        }
+
         showToast(err.errMsg)
         reject(err)
       }
@@ -72,7 +110,7 @@
 }
 
 // 灏佽toast鍑芥暟
-function showToast (title, icon='none', duration=2500, mask=false) {
+function showToast(title, icon = 'none', duration = 2500, mask = false) {
   wx.showToast({
     title: title || '',
     icon,
@@ -81,14 +119,14 @@
   });
 }
 
-function get (options) {
+function get(options) {
   return request({
     method: 'GET',
     ...options
   })
 }
 
-function post (options) {
+function post(options) {
   // url, data = {}, ignoreToken, form
   return request({
     method: 'POST',
@@ -97,5 +135,7 @@
 }
 
 module.exports = {
-  request, get, post
-}
+  request,
+  get,
+  post
+}
\ No newline at end of file

--
Gitblit v1.8.0