From c8b32b8bca79a116cfab70eb8c389907b664c9ca Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 23 四月 2025 10:43:14 +0800
Subject: [PATCH] 提交
---
h5/main.js | 4 +-
h5/utils/http.api.js | 20 +++++-----
h5/pages/chart_details/chart_details.vue | 6 ++-
h5/pages/workOrder/workOrder.vue | 6 ++-
h5/App.vue | 17 ++++----
h5/utils/decryption.js | 8 ++--
h5/pages/report/report.vue | 8 ++-
h5/utils/http.interceptor.js | 22 ++++++-----
h5/pages/details_dca/details_dca.vue | 3 +
9 files changed, 53 insertions(+), 41 deletions(-)
diff --git a/h5/App.vue b/h5/App.vue
index 8840678..85703fe 100644
--- a/h5/App.vue
+++ b/h5/App.vue
@@ -11,13 +11,14 @@
},
methods: {
async init() {
- // if (!this.$store.state.userInfo) {
- // let res = await this.$u.api.login({ code: 'ShiXuHui' })
- // if (res.code === 200) {
- // this.$store.commit('setUserInfo', res.data)
- // }
- // }
- // return
+ // ShiXuHui GuoJiWenWu
+ if (!this.$store.state.userInfo) {
+ let res = await this.$u.api.login({ code: 'GuoJiWenWu' })
+ if (res.code === 200) {
+ this.$store.commit('setUserInfo', res.data)
+ }
+ }
+ return
let code = this.getQueryVariable('code')
if (code) {
if (!uni.getStorageSync('code')) {
@@ -81,7 +82,7 @@
}
}
}
-
+
} else {
let loc_href = encodeURIComponent("https://dmtest.ahapp.net/lianhelihua_web/")
diff --git a/h5/main.js b/h5/main.js
index 0b4bd45..13eca89 100644
--- a/h5/main.js
+++ b/h5/main.js
@@ -10,8 +10,8 @@
App.mpType = 'app'
Vue.use(uView);
-Vue.prototype.$baseUrl = 'https://dmtest.ahapp.net/lianhelihua_interface'
-// Vue.prototype.$baseUrl = 'http://192.168.0.131:10040'
+// Vue.prototype.$baseUrl = 'https://dmtest.ahapp.net/lianhelihua_interface'
+Vue.prototype.$baseUrl = 'http://192.168.0.134:10040'
Vue.prototype.$store = store;
Vue.prototype.$ww = ww;
Vue.prototype.$vConsole= new Vconsole()
diff --git a/h5/pages/chart_details/chart_details.vue b/h5/pages/chart_details/chart_details.vue
index 656fc41..5ed67c1 100644
--- a/h5/pages/chart_details/chart_details.vue
+++ b/h5/pages/chart_details/chart_details.vue
@@ -7,11 +7,11 @@
</view>
<view class="search_item" v-if="['2'].includes(this.type)" @click="$refs.pengTree._show()">
<view class="search_item_label">浣嶇疆</view>
- <view class="search_item_value">{{ model.localtionName ? model.localtionName : '鍏ㄩ儴' }}</view>
+ <view class="search_item_value">{{ model.localtionId ? model.localtionName : '鍏ㄩ儴' }}</view>
</view>
<view class="search_item" v-if="['2'].includes(this.type)" @click="openZT">
<view class="search_item_label">涓婚</view>
- <view class="search_item_value">{{ model.typeName ? model.typeName : '鍏ㄩ儴' }}</view>
+ <view class="search_item_value">{{ model.typeId ? model.typeName : '鍏ㄩ儴' }}</view>
</view>
<view class="search_item" @click="openRQ">
<view class="search_item_label">鏃ユ湡</view>
@@ -230,6 +230,7 @@
async getLocation() {
let res = await this.$u.api.categoryTree({ categoryType: 3 })
if (res.code === 200) {
+ res.data.unshift({ name: '鍏ㄩ儴', id: '', childList: [] })
this.address = res.data
}
},
@@ -237,6 +238,7 @@
async getZhuti() {
let res = await this.$u.api.categoryList({ categoryType: 4, isRoot: 1 })
if (res.code === 200) {
+ res.data.unshift({ name: '鍏ㄩ儴', id: '', childList: [] })
this.theme = [res.data]
}
},
diff --git a/h5/pages/details_dca/details_dca.vue b/h5/pages/details_dca/details_dca.vue
index 5436cb9..68184e5 100644
--- a/h5/pages/details_dca/details_dca.vue
+++ b/h5/pages/details_dca/details_dca.vue
@@ -62,6 +62,9 @@
<view class="dca_wt_list_item_btn" v-if="item.closeButton === 1">
<view class="btn" @click="handle(item.id)">澶勭悊</view>
</view>
+ <view class="dca_wt_list_item_btn" v-else>
+ <view class="btn" @click="handle(item.id)">鏌ョ湅</view>
+ </view>
</view>
</view>
</view>
diff --git a/h5/pages/report/report.vue b/h5/pages/report/report.vue
index b481c41..32fbeed 100644
--- a/h5/pages/report/report.vue
+++ b/h5/pages/report/report.vue
@@ -10,11 +10,11 @@
<u-icon name="arrow-down-fill" color="#666666" size="13"></u-icon>
</view>
<view class="report_search_row" @click="$refs.pengTree._show()" v-if="['3'].includes(typeId)">
- <text>{{locationName ? locationName : '鍙戠敓鍦扮偣'}}</text>
+ <text>{{localtionId ? locationName : '鍙戠敓鍦扮偣'}}</text>
<u-icon name="arrow-down-fill" color="#666666" size="13"></u-icon>
</view>
<view class="report_search_row" @click="$refs.pengTree1._show()" v-if="['1'].includes(typeId)">
- <text>{{locationName ? locationName : '浣嶇疆'}}</text>
+ <text>{{localtionId ? locationName : '浣嶇疆'}}</text>
<u-icon name="arrow-down-fill" color="#666666" size="13"></u-icon>
</view>
</view>
@@ -150,7 +150,7 @@
this.$refs.pengTree._hide()
},
// 浣嶇疆
- selectAddress(e) {
+ selectAddress1(e) {
this.localtionId = e[0].id
this.locationName = e[0].name
this.search.page = 1
@@ -163,6 +163,7 @@
async getLocation() {
let res = await this.$u.api.categoryTree({ categoryType: 2 })
if (res.code === 200) {
+ res.data.unshift({ name: '鍏ㄩ儴', id: '', childList: [] })
this.address = res.data
}
},
@@ -170,6 +171,7 @@
async getLocation1() {
let res = await this.$u.api.categoryTree({ categoryType: 3 })
if (res.code === 200) {
+ res.data.unshift({ name: '鍏ㄩ儴', id: '', childList: [] })
this.address1 = res.data
}
},
diff --git a/h5/pages/workOrder/workOrder.vue b/h5/pages/workOrder/workOrder.vue
index d89a3cb..eaf750a 100644
--- a/h5/pages/workOrder/workOrder.vue
+++ b/h5/pages/workOrder/workOrder.vue
@@ -10,11 +10,11 @@
<u-icon name="arrow-down-fill" color="#666666" size="13"></u-icon>
</view>
<view class="report_search_row" @click="$refs.pengTree._show()" v-if="['3'].includes(typeId)">
- <text>{{locationName ? locationName : '鍙戠敓鍦扮偣'}}</text>
+ <text>{{localtionId ? locationName : '鍙戠敓鍦扮偣'}}</text>
<u-icon name="arrow-down-fill" color="#666666" size="13"></u-icon>
</view>
<view class="report_search_row" @click="$refs.pengTree1._show()" v-if="['1'].includes(typeId)">
- <text>{{locationName ? locationName : '浣嶇疆'}}</text>
+ <text>{{localtionId ? locationName : '浣嶇疆'}}</text>
<u-icon name="arrow-down-fill" color="#666666" size="13"></u-icon>
</view>
</view>
@@ -163,6 +163,7 @@
async getLocation() {
let res = await this.$u.api.categoryTree({ categoryType: 2 })
if (res.code === 200) {
+ res.data.unshift({ name: '鍏ㄩ儴', id: '', childList: [] })
this.address = res.data
}
},
@@ -170,6 +171,7 @@
async getLocation1() {
let res = await this.$u.api.categoryTree({ categoryType: 3 })
if (res.code === 200) {
+ res.data.unshift({ name: '鍏ㄩ儴', id: '', childList: [] })
this.address1 = res.data
}
},
diff --git a/h5/utils/decryption.js b/h5/utils/decryption.js
index ae73403..9324979 100644
--- a/h5/utils/decryption.js
+++ b/h5/utils/decryption.js
@@ -10,15 +10,15 @@
// const privateKey = uni.getStorageSync('aes_private_key')
export function decryptedData (msg, data) {
- console.log(msg)
- console.log(data)
+ // console.log(msg)
+ // console.log(data)
// 鍙樻崲key:灏嗗綋鏈堜綅鏁板瓧绗︿覆鍘婚櫎锛岀劧鍚庡�掑簭
const monthIndex = new Date().getMonth() + 1
const msgStr = msg.slice(0, monthIndex) + msg.slice(monthIndex + 1)
const reverseMsgStr = msgStr.split('').reverse().join('')
const str1 = data.replace(/\s/g, '')
- console.log(reverseMsgStr)
- console.log(str1)
+ // console.log(reverseMsgStr)
+ // console.log(str1)
// 瑙ｅ瘑骞惰繑鍥炵粨鏋�
return (
JSON.parse(
diff --git a/h5/utils/http.api.js b/h5/utils/http.api.js
index 9d4009c..687912e 100644
--- a/h5/utils/http.api.js
+++ b/h5/utils/http.api.js
@@ -7,23 +7,23 @@
return config;
})
- let login = (data = {}) => vm.$u.http.post('web/member/loginH5', data); // 鐧诲綍 encryptData(data)
+ let login = (data = {}) => vm.$u.http.post('web/member/loginH5', encryptData(data)); // 鐧诲綍
let categoryTree = (params = {}) => vm.$u.http.get('web/category/categoryTree', { params }); // 鏌ヨ鏍�
- let workOrderCreate = (data = {}) => vm.$u.http.post('web/workOrder/create', data); // 鍒涘缓宸ュ崟
+ let workOrderCreate = (data = {}) => vm.$u.http.post('web/workOrder/create', encryptData(data)); // 鍒涘缓宸ュ崟
let upload = (data = {}) => vm.$u.http.post('web/public/upload', data); // 涓婁紶
let uploadBatch = (data = {}) => vm.$u.http.post('web/public/uploadBatch', data); // 鎵归噺涓婁紶鏂囦欢鍒癋TP
let detail = (params = {}) => vm.$u.http.get('web/workOrder/detail', { params }); // 椋庨櫓涓婃姤璇︽儏
- let managersList = (data = {}) => vm.$u.http.post('web/workOrder/managersList', data); // 涓婁紶
+ let managersList = (data = {}) => vm.$u.http.post('web/workOrder/managersList', encryptData(data)); // 涓婁紶
let categoryList = (params = {}) => vm.$u.http.get('web/category/categoryList', { params }); // 鑾峰彇鍒嗙被绫诲埆鑾峰彇鍒嗙被鍒楄〃
- let page = (data = {}) => vm.$u.http.post('web/workOrder/page', data); // 鍒嗛〉鏌ヨ
- let getWorkOrderData = (data = {}) => vm.$u.http.post('web/workOrder/getWorkOrderData', data); // 鍒嗛〉鏌ヨ
- let passOn = (data = {}) => vm.$u.http.post('web/workOrder/passOn', data); // 宸ュ崟鎸囨淳
- let closeWorkOrder = (data = {}) => vm.$u.http.post('web/workOrder/closeWorkOrder', data); // 宸ュ崟鍏抽棴
+ let page = (data = {}) => vm.$u.http.post('web/workOrder/page', encryptData(data)); // 鍒嗛〉鏌ヨ
+ let getWorkOrderData = (data = {}) => vm.$u.http.post('web/workOrder/getWorkOrderData', encryptData(data)); // 鍒嗛〉鏌ヨ
+ let passOn = (data = {}) => vm.$u.http.post('web/workOrder/passOn', encryptData(data)); // 宸ュ崟鎸囨淳
+ let closeWorkOrder = (data = {}) => vm.$u.http.post('web/workOrder/closeWorkOrder', encryptData(data)); // 宸ュ崟鍏抽棴
let urge = (params = {}) => vm.$u.http.get('web/workOrder/urge', { params }); // 宸ュ崟鍌績
- let sendCopy = (data = {}) => vm.$u.http.post('web/workOrder/sendCopy', data); // 宸ュ崟鎶勯��
- let getQwSignature = (data = {}) => vm.$u.http.post('web/member/getQwSignature', data); // 鑾峰彇titket
+ let sendCopy = (data = {}) => vm.$u.http.post('web/workOrder/sendCopy', encryptData(data)); // 宸ュ崟鎶勯��
+ let getQwSignature = (data = {}) => vm.$u.http.post('web/member/getQwSignature', encryptData(data)); // 鑾峰彇titket
let getCategoryVOForGCXTree = (params = {}) => vm.$u.http.get('web/category/getCategoryVOForGCXTree', { params }); // 鏌ヨ鏍�
- let getCopySendUserPage = (data = {}) => vm.$u.http.post('web/member/getCopySendUserPage', data); // 鏌ヨ鍙鎶勯�佷汉鍒嗛〉
+ let getCopySendUserPage = (data = {}) => vm.$u.http.post('web/member/getCopySendUserPage', encryptData(data)); // 鏌ヨ鍙鎶勯�佷汉鍒嗛〉
vm.$u.api = {
login,
diff --git a/h5/utils/http.interceptor.js b/h5/utils/http.interceptor.js
index 52941c5..88bc070 100644
--- a/h5/utils/http.interceptor.js
+++ b/h5/utils/http.interceptor.js
@@ -30,6 +30,7 @@
if (response.data.code === 5112) {
uni.showToast({
title: '鐧诲綍杩囨湡锛屾鍦ㄩ噸鏂拌烦杞巿鏉�',
+ icon: 'none',
duration: 2000,
success() {
setTimeout(() => {
@@ -50,16 +51,17 @@
duration: 2000
});
}
- // if (response.data.message) {
- // const tm = response.data.message
- // const list = tm.split(' ')
- // let msg = list[0]
- // if (list.length > 1 && response.data.data) {
- // msg = decryptedData(list[1], list[0])
- // response.data.data = decryptedData(list[1], response.data.data)
- // response.data.message = msg
- // }
- // }
+ if (response.data.message) {
+ const tm = response.data.message
+ const list = tm.split(' ')
+ let msg = list[0]
+ if (list.length > 1 && response.data.data) {
+ msg = decryptedData(list[1], list[0])
+ response.data.data = decryptedData(list[1], response.data.data)
+ console.log(response.data.data)
+ response.data.message = msg
+ }
+ }
return response.data;
}, (response) => {
return Promise.reject(response)
--
Gitblit v1.9.3