fix

hookehuyr
Commit ed73b96c1d9dcce814f76b260cfbdc915e796051 ed73b96c 1 parent b28e8492
Showing 7 changed files with 143 additions and 16 deletions
config/index.js
package-lock.json
package.json
src/api/fn.js
src/utils/request.js
src/utils/tools.js
yarn.lock
--- a/config/index.js
View file @ed73b96
+++ b/config/index.js
View file @ed73b96
@@ -61,6 +61,8 @@ const config = {
     "@/components": path.resolve(__dirname, "../src/components"),
     "@/images": path.resolve(__dirname, "../src/assets/images"),
     "@/assets": path.resolve(__dirname, "../src/assets"),
+    "@/composables": path.resolve(__dirname, "../src/composables"),
+    "@/api": path.resolve(__dirname, "../src/api"),
   },
   sourceRoot: 'src',
   outputRoot: 'dist',
--- a/package-lock.json
View file @ed73b96
+++ b/package-lock.json
View file @ed73b96
@@ -23,6 +23,7 @@
         "pinia": "^2.0.6",
         "taro-plugin-pinia": "^1.0.0",
         "taro-ui-vue3": "^1.0.0-alpha.21",
+        "uuid": "^9.0.0",
         "vant": "^4.0.0-alpha.3",
         "vue": "^3.2.24"
       },
@@ -16276,6 +16277,16 @@
         "node": ">=0.8.0"
       }
     },
+    "node_modules/sockjs/node_modules/uuid": {
+      "version": "3.4.0",
+      "resolved": "https://mirrors.cloud.tencent.com/npm/uuid/-/uuid-3.4.0.tgz",
+      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+      "devOptional": true,
+      "license": "MIT",
+      "bin": {
+        "uuid": "bin/uuid"
+      }
+    },
     "node_modules/sockjs/node_modules/websocket-driver": {
       "version": "0.6.5",
       "resolved": "http://mirrors.tencent.com/npm/websocket-driver/-/websocket-driver-0.6.5.tgz",
@@ -18376,13 +18387,12 @@
       }
     },
     "node_modules/uuid": {
-      "version": "3.4.0",
+      "version": "9.0.0",
-      "resolved": "https://mirrors.tencent.com/npm/uuid/-/uuid-3.4.0.tgz",
+      "resolved": "https://mirrors.cloud.tencent.com/npm/uuid/-/uuid-9.0.0.tgz",
-      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+      "integrity": "sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==",
-      "devOptional": true,
       "license": "MIT",
       "bin": {
-        "uuid": "bin/uuid"
+        "uuid": "dist/bin/uuid"
       }
     },
     "node_modules/v8-compile-cache": {
@@ -19105,6 +19115,16 @@
         "node": ">= 6"
       }
     },
+    "node_modules/webpack-log/node_modules/uuid": {
+      "version": "3.4.0",
+      "resolved": "https://mirrors.cloud.tencent.com/npm/uuid/-/uuid-3.4.0.tgz",
+      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+      "devOptional": true,
+      "license": "MIT",
+      "bin": {
+        "uuid": "bin/uuid"
+      }
+    },
     "node_modules/webpack-merge": {
       "version": "4.2.2",
       "resolved": "http://mirrors.tencent.com/npm/webpack-merge/-/webpack-merge-4.2.2.tgz",
@@ -31087,6 +31107,12 @@
         "websocket-driver": "0.6.5"
       },
       "dependencies": {
+        "uuid": {
+          "version": "3.4.0",
+          "resolved": "https://mirrors.cloud.tencent.com/npm/uuid/-/uuid-3.4.0.tgz",
+          "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+          "devOptional": true
+        },
         "websocket-driver": {
           "version": "0.6.5",
           "resolved": "http://mirrors.tencent.com/npm/websocket-driver/-/websocket-driver-0.6.5.tgz",
@@ -32639,10 +32665,9 @@
       "devOptional": true
     },
     "uuid": {
-      "version": "3.4.0",
+      "version": "9.0.0",
-      "resolved": "https://mirrors.tencent.com/npm/uuid/-/uuid-3.4.0.tgz",
+      "resolved": "https://mirrors.cloud.tencent.com/npm/uuid/-/uuid-9.0.0.tgz",
-      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+      "integrity": "sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg=="
-      "devOptional": true
     },
     "v8-compile-cache": {
       "version": "2.3.0",
@@ -33210,6 +33235,14 @@
       "requires": {
         "ansi-colors": "^3.0.0",
         "uuid": "^3.3.2"
+      },
+      "dependencies": {
+        "uuid": {
+          "version": "3.4.0",
+          "resolved": "https://mirrors.cloud.tencent.com/npm/uuid/-/uuid-3.4.0.tgz",
+          "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+          "devOptional": true
+        }
       }
     },
     "webpack-merge": {
--- a/package.json
View file @ed73b96
+++ b/package.json
View file @ed73b96
@@ -48,6 +48,7 @@
     "pinia": "^2.0.6",
     "taro-plugin-pinia": "^1.0.0",
     "taro-ui-vue3": "^1.0.0-alpha.21",
+    "uuid": "^9.0.0",
     "vant": "^4.0.0-alpha.3",
     "vue": "^3.2.24"
   },
--- a/src/api/fn.js
View file @ed73b96
+++ b/src/api/fn.js
View file @ed73b96
 /*
  * @Date: 2022-05-18 22:56:08
  * @LastEditors: hookehuyr hookehuyr@gmail.com
- * @LastEditTime: 2022-10-14 17:33:20
+ * @LastEditTime: 2022-10-17 13:19:28
  * @FilePath: /swx/src/api/fn.js
  * @Description: 文件描述
  */
-import axios from '../utils/request';
+import axios from '@/utils/request';
-import Toast from '../components/vant-weapp/toast/toast';
+import Toast from '@/components/vant-weapp/toast/toast';
 import qs from 'Qs'
 /**
--- a/src/utils/request.js
View file @ed73b96
+++ b/src/utils/request.js
View file @ed73b96
 /*
  * @Date: 2022-09-19 14:11:06
  * @LastEditors: hookehuyr hookehuyr@gmail.com
- * @LastEditTime: 2022-10-14 17:36:27
+ * @LastEditTime: 2022-10-17 09:31:22
  * @FilePath: /swx/src/utils/request.js
  * @Description: 简单axios封装，后续按实际处理
  */
@@ -9,6 +9,9 @@
 import axios from 'axios-miniprogram';
 import Taro from '@tarojs/taro'
 import Toast from '../components/vant-weapp/toast/toast';
+import { strExist } from './tools'
+import qs from 'Qs'
+
 // import { ProgressStart, ProgressEnd } from '@/components/axios-progress/progress';
 // import store from '@/store'
 // import { getToken } from '@/utils/auth'
@@ -29,7 +32,11 @@ service.interceptors.request.use(
   config => {
     // console.warn(config)
     // console.warn(store)
-
+    /**
+     * POST PHP需要修改数据格式
+     * 序列化POST请求时需要屏蔽上传相关接口，上传相关接口序列化后报错
+     */
+    config.data = config.method === 'post' && !strExist(['a=upload', 'upload.qiniup.com'], config.url) ? qs.stringify(config.data) : config.data;
     return config
   },
   error => {
--- a/src/utils/tools.js 0 → 100644
View file @ed73b96
+++ b/src/utils/tools.js 0 → 100644
View file @ed73b96
+/*
+ * @Date: 2022-04-18 15:59:42
+ * @LastEditors: hookehuyr hookehuyr@gmail.com
+ * @LastEditTime: 2022-06-30 13:54:32
+ * @FilePath: /tswj/src/utils/tools.js
+ * @Description: 文件描述
+ */
+import dayjs from 'dayjs';
+
+// 格式化时间
+const formatDate = (date) => {
+  return dayjs(date).format('YYYY-MM-DD HH:mm');
+};
+
+/**
+ * @description 判断浏览器属于平台
+ * @returns 
+ */
+const wxInfo = () => {
+  let u = navigator.userAgent;
+  let isAndroid = u.indexOf('Android') > -1 || u.indexOf('Linux') > -1; //android终端或者uc浏览器
+  let isiOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/); //ios终端
+  let uAgent = navigator.userAgent.toLowerCase();
+  let isTable = (uAgent.match(/MicroMessenger/i) == 'micromessenger') ? true : false;
+  return {
+    isAndroid,
+    isiOS,
+    isTable
+  };
+};
+
+/**
+ * @description 判断多行省略文本
+ * @param {*} id 目标dom标签
+ * @returns 
+ */
+const hasEllipsis = (id) => {
+  let oDiv = document.getElementById(id);
+  let flag = false;
+  if (oDiv.scrollHeight > oDiv.clientHeight) {
+    flag = true
+  }
+  return flag
+}
+
+/**
+ * @description 解析URL参数
+ * @param {*} url 
+ * @returns 
+ */
+const parseQueryString = url => {
+  var json = {};
+  var arr = url.indexOf('?') >= 0 ? url.substr(url.indexOf('?') + 1).split('&') : [];
+  arr.forEach(item => {
+    var tmp = item.split('=');
+    json[tmp[0]] = tmp[1];
+  });
+  return json;
+}
+
+/**
+ * 字符串包含字符数组中字符的状态
+ * @param {*} array 字符数组
+ * @param {*} str 字符串
+ * @returns 包含状态
+ */
+const strExist = (array, str) => {
+  const exist = array.filter(arr => {
+    if (str.indexOf(arr) >= 0) return str;
+  })
+  return exist.length > 0
+}
+
+export { formatDate, wxInfo, hasEllipsis, parseQueryString, strExist };
--- a/yarn.lock
View file @ed73b96
+++ b/yarn.lock
View file @ed73b96
@@ -10243,11 +10243,21 @@
   "resolved" "http://mirrors.tencent.com/npm/utils-merge/-/utils-merge-1.0.1.tgz"
   "version" "1.0.1"
-"uuid@^3.3.2", "uuid@^3.4.0":
+"uuid@^3.3.2":
   "integrity" "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
-  "resolved" "https://mirrors.tencent.com/npm/uuid/-/uuid-3.4.0.tgz"
+  "resolved" "https://mirrors.cloud.tencent.com/npm/uuid/-/uuid-3.4.0.tgz"
   "version" "3.4.0"
+"uuid@^3.4.0":
+  "integrity" "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
+  "resolved" "https://mirrors.cloud.tencent.com/npm/uuid/-/uuid-3.4.0.tgz"
+  "version" "3.4.0"
+
+"uuid@^9.0.0":
+  "integrity" "sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg=="
+  "resolved" "https://mirrors.cloud.tencent.com/npm/uuid/-/uuid-9.0.0.tgz"
+  "version" "9.0.0"
+
 "v8-compile-cache@^2.0.3":
   "integrity" "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA=="
   "resolved" "https://mirrors.tencent.com/npm/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz"