diff --git a/package.json b/package.json index 5370a600..df5cf15b 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,6 @@ "src/components", "src/common/util.js", "src/common/dict.js", - "src/common/dictHlj.js", "src/common/monent.js", "src/common/modules.js", "src/common/http.js", diff --git a/src/common/axios.js b/src/common/axios.js index 531a3824..8ccaf91b 100644 --- a/src/common/axios.js +++ b/src/common/axios.js @@ -35,8 +35,6 @@ instance.interceptors.response.use(res => { return res.data } else if (res.config.alwaysReturn) { return res.data - } else if (res.data.code == 200) { //黑龙江接口200 正常 - return res.data } else if (res.data.code == 0) { return res.data } else if (res.data.code === 1) { diff --git a/src/common/dictHlj.js b/src/common/dictHlj.js deleted file mode 100644 index b5a3b6e7..00000000 --- a/src/common/dictHlj.js +++ /dev/null @@ -1,73 +0,0 @@ -/** - * 封装字典工具类 - */ - -const $dictHlj = { - instance: null, - url: "/system/dictData/types/", - init(config) { - this.instance = config?.instance - this.url = config?.url || this.url - }, - dicts() { - let dicts = uni.getStorageSync('dicts') || null - typeof dicts == "string" ? (dicts = JSON.parse(dicts)) : dicts - return dicts || []; - }, - load(...code) { - var url = this.url + code.toString() - return this.instance && this.instance.get(url, { - withoutToken: true, - }).then((res) => { - if (res && res.data) { - let dicts=[] - for (var i in res.data) { - var e = { - key: res.data[i][0].dictType, - values: res.data[res.data[i][0].dictType] - } - dicts.push(e) - } - this.dicts() - uni.setStorageSync('dicts', dicts); - - } - }) - }, - getDict(key) { - if (this.dicts().length) { - let dict = this.dicts().find((e) => e.key == key); - return dict ? dict.values : []; - } else return []; - }, - getValue(key, label) { - if (this.dicts().length) { - let dict = this.dicts().find((e) => e.key == key); - if (dict) { - let item = dict.values.find((v) => v.label == label); - return item ? item.value : label; - } else return label; - } else return label; - }, - getLabel(key, value) { - if (this.dicts().length) { - let dict = this.dicts().find((e) => e.key == key); - if (dict) { - let item = dict.values.find((v) => v.value == value); - return item ? item.label : value; - } else return value ? value : ''; - } else return value ? value : ''; - }, - getColor(key, value) { - if (this.dicts().length) { - let dict = this.dicts().find((e) => e.key == key); - if (dict) { - let item = dict.values.find((v) => v.dictValue == value); - return item ? item.dictColor : value; - } else return value; - } else return value; - } -} - -export default $dictHlj - \ No newline at end of file diff --git a/src/common/util.js b/src/common/util.js index 92953d50..859e3e0d 100644 --- a/src/common/util.js +++ b/src/common/util.js @@ -1,5 +1,4 @@ import dict from "./dict" -import dictHlj from "./dictHlj" import dayjs from './monent' import qs from 'query-string' import reg from "./regular"; @@ -256,7 +255,6 @@ export const copy = any => { export default { dict, - dictHlj, confirm, calcAge, injectLib: (url, cb = () => 0) => { diff --git a/src/components/AiUploader.vue b/src/components/AiUploader.vue index 24be0b7f..91c4e54c 100644 --- a/src/components/AiUploader.vue +++ b/src/components/AiUploader.vue @@ -58,10 +58,6 @@ export default { size: {default: 10 * 1024 * 1024}, disabled: Boolean, sourceType: {default: () => ['album', 'camera']}, - withoutToken: { - type: Boolean, - default: false, - }, }, computed: { ...mapState(['token']), @@ -143,8 +139,7 @@ export default { uni.hideLoading() } else { this.$http.post(this.api, formData, { - params: {type: this.type}, - withoutToken: this.withoutToken + params: {type: this.type} }).then((res) => { if (res?.data) { this.$emit('data', res.data) @@ -167,8 +162,6 @@ export default { this.fileList.push(res.data) } else if (this.api == '/admin/file/add-portrait') { this.fileList.push({url: res.data?.split(";")?.[0], id: res.data?.split(";")?.[1]}) - }else if (this.api == '/common/upload') { //黑龙江图片上传接口 - this.fileList.push({fileName: res.data.fileName, filePath: res.data.fileName}) } this.$emit("update:def", this.fileList) this.$emit("list", this.fileList) diff --git a/src/main.js b/src/main.js index 0d4c058b..30753f3d 100644 --- a/src/main.js +++ b/src/main.js @@ -28,7 +28,6 @@ Vue.prototype.$dayjs = dayjs Vue.prototype.$cdn = 'https://cdn.cunwuyun.cn/dvcp/h5/'; Object.keys(utils).map((e) => (Vue.prototype['$' + e] = utils[e])); utils.dict.init({instance: axios}) -utils.dictHlj.init({instance: axios}) App.mpType = 'app'; process.env.NODE_ENV == 'development' && new VConsole(); // new VConsole() diff --git a/src/manifest.json b/src/manifest.json index aee53b67..5e9463ef 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -29,7 +29,7 @@ "open": true, "proxy": { "/lan": { - "target": "http://8.148.23.227:8080", + "target": "http://192.168.1.87:9000", "changeOrigin": true, "pathRewrite": { "^/lan": "/" diff --git a/src/package.json b/src/package.json index 16a827a3..51ae6c06 100644 --- a/src/package.json +++ b/src/package.json @@ -9,7 +9,6 @@ "components", "common/util.js", "common/dict.js", - "common/dictHlj.js", "common/monent.js", "common/modules.js", "common/http.js", diff --git a/src/project/hljjm/AppChildrenInfo/AppChildrenDetail.vue b/src/project/hljjm/AppChildrenInfo/AppChildrenDetail.vue deleted file mode 100644 index 3eee10b5..00000000 --- a/src/project/hljjm/AppChildrenInfo/AppChildrenDetail.vue +++ /dev/null @@ -1,245 +0,0 @@ - - - - - diff --git a/src/project/hljjm/AppChildrenInfo/AppChildrenDetailView.vue b/src/project/hljjm/AppChildrenInfo/AppChildrenDetailView.vue deleted file mode 100644 index 4677a7d4..00000000 --- a/src/project/hljjm/AppChildrenInfo/AppChildrenDetailView.vue +++ /dev/null @@ -1,150 +0,0 @@ - - - - - diff --git a/src/project/hljjm/AppChildrenInfo/AppChildrenInfo.vue b/src/project/hljjm/AppChildrenInfo/AppChildrenInfo.vue deleted file mode 100644 index 530f97f2..00000000 --- a/src/project/hljjm/AppChildrenInfo/AppChildrenInfo.vue +++ /dev/null @@ -1,153 +0,0 @@ - - - - - diff --git a/src/project/hljjm/AppChildrenInfo/AppChildrenList.vue b/src/project/hljjm/AppChildrenInfo/AppChildrenList.vue deleted file mode 100644 index 32c19730..00000000 --- a/src/project/hljjm/AppChildrenInfo/AppChildrenList.vue +++ /dev/null @@ -1,139 +0,0 @@ - - - - - diff --git a/src/project/hljjm/AppHome/AppHome.vue b/src/project/hljjm/AppHome/AppHome.vue deleted file mode 100644 index 520529ff..00000000 --- a/src/project/hljjm/AppHome/AppHome.vue +++ /dev/null @@ -1,71 +0,0 @@ - - - - - diff --git a/src/project/hljjm/AppRecognize/AppRecognize.vue b/src/project/hljjm/AppRecognize/AppRecognize.vue deleted file mode 100644 index e2e16878..00000000 --- a/src/project/hljjm/AppRecognize/AppRecognize.vue +++ /dev/null @@ -1,243 +0,0 @@ - - - - - diff --git a/src/project/hljjm/AppRecognize/AppRecognizeAdd.vue b/src/project/hljjm/AppRecognize/AppRecognizeAdd.vue deleted file mode 100644 index 6c354299..00000000 --- a/src/project/hljjm/AppRecognize/AppRecognizeAdd.vue +++ /dev/null @@ -1,604 +0,0 @@ - - - - - diff --git a/src/project/hljjm/AppRecognize/AppRecognizeDetail.vue b/src/project/hljjm/AppRecognize/AppRecognizeDetail.vue deleted file mode 100644 index e7938e0d..00000000 --- a/src/project/hljjm/AppRecognize/AppRecognizeDetail.vue +++ /dev/null @@ -1,351 +0,0 @@ - - - - - diff --git a/src/project/hljjm/AppRecognize/AppRecognizeSearch.vue b/src/project/hljjm/AppRecognize/AppRecognizeSearch.vue deleted file mode 100644 index ee9ec17a..00000000 --- a/src/project/hljjm/AppRecognize/AppRecognizeSearch.vue +++ /dev/null @@ -1,138 +0,0 @@ - - - - - diff --git a/src/project/hljjm/AppRecognize/AppRecognizeSearchList.vue b/src/project/hljjm/AppRecognize/AppRecognizeSearchList.vue deleted file mode 100644 index d7194e32..00000000 --- a/src/project/hljjm/AppRecognize/AppRecognizeSearchList.vue +++ /dev/null @@ -1,123 +0,0 @@ - - - - - diff --git a/src/project/hljjm/AppRecognize/AppRecognizeSearchTab.vue b/src/project/hljjm/AppRecognize/AppRecognizeSearchTab.vue deleted file mode 100644 index 6554d106..00000000 --- a/src/project/hljjm/AppRecognize/AppRecognizeSearchTab.vue +++ /dev/null @@ -1,60 +0,0 @@ - - - - - diff --git a/src/project/hljjm/AppSecurityObject/AppSecurityObject.vue b/src/project/hljjm/AppSecurityObject/AppSecurityObject.vue deleted file mode 100644 index 2c022a1d..00000000 --- a/src/project/hljjm/AppSecurityObject/AppSecurityObject.vue +++ /dev/null @@ -1,197 +0,0 @@ - - - - - diff --git a/src/project/hljjm/AppSecurityObject/AppSecurityObjectDetail.vue b/src/project/hljjm/AppSecurityObject/AppSecurityObjectDetail.vue deleted file mode 100644 index f60437c8..00000000 --- a/src/project/hljjm/AppSecurityObject/AppSecurityObjectDetail.vue +++ /dev/null @@ -1,250 +0,0 @@ - - - - -