From ad685ebb7a5af63cd00d2da6d2e540dd8049ac93 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 18 四月 2025 16:15:26 +0800
Subject: [PATCH] 提交
---
h5/pages/index/index.vue | 6 ++
h5/main.js | 4 +-
h5/pages/workOrder_dca/workOrder_dca.vue | 15 ++++++-
h5/pages/type_dca/type_dca.vue | 8 +++
h5/pages/workOrder_she/workOrder_she.vue | 10 ++---
h5/pages/workOrder/workOrder.vue | 3 -
h5/App.vue | 18 ++++----
h5/utils/http.interceptor.js | 42 +++++++--------------
h5/pages/details_dca/details_dca.vue | 4 +-
9 files changed, 57 insertions(+), 53 deletions(-)
diff --git a/h5/App.vue b/h5/App.vue
index 960cc4d..8c4787c 100644
--- a/h5/App.vue
+++ b/h5/App.vue
@@ -11,13 +11,13 @@
},
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
+ 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
let code = this.getQueryVariable('code')
if (code) {
if (!uni.getStorageSync('code')) {
@@ -40,7 +40,7 @@
})
} else if (value[0] == 1) {
uni.navigateTo({
- url: `/pages/workOrder_dca/workOrder_dca?id=${value[1]}`
+ url: `/pages/details_dca/details_dca?id=${value[1]}&isShow=true`
})
} else if (value[0] == 3) {
uni.navigateTo({
@@ -71,7 +71,7 @@
})
} else if (value[0] == 1) {
uni.navigateTo({
- url: `/pages/workOrder_dca/workOrder_dca?id=${value[1]}`
+ url: `/pages/details_dca/details_dca?id=${value[1]}&isShow=true`
})
} else if (value[0] == 3) {
uni.navigateTo({
diff --git a/h5/main.js b/h5/main.js
index 4afe780..8ac3dd9 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.135:10040'
+// Vue.prototype.$baseUrl = 'https://dmtest.ahapp.net/lianhelihua_interface'
+Vue.prototype.$baseUrl = 'http://192.168.0.131:10040'
Vue.prototype.$store = store;
Vue.prototype.$ww = ww;
Vue.prototype.$vConsole= new Vconsole()
diff --git a/h5/pages/details_dca/details_dca.vue b/h5/pages/details_dca/details_dca.vue
index 772df24..c8eb31f 100644
--- a/h5/pages/details_dca/details_dca.vue
+++ b/h5/pages/details_dca/details_dca.vue
@@ -59,7 +59,7 @@
<view class="dca_wt_list_item_info">
{{item.problemTitle}}
</view>
- <view class="dca_wt_list_item_btn">
+ <view class="dca_wt_list_item_btn" v-if="item.closeButton === 1">
<view class="btn" @click="handle(item.id)">澶勭悊</view>
</view>
</view>
@@ -210,10 +210,10 @@
workorderId: that.info.id
})
if (res.code === 200) {
- uni.showToast({ title: '鎿嶄綔鎴愬姛', icon: 'none' })
that.canScroll()
that.show = false
that.getDetails()
+ uni.showToast({ title: '鎿嶄綔鎴愬姛', icon: 'none' })
}
}).catch(errors => {
diff --git a/h5/pages/index/index.vue b/h5/pages/index/index.vue
index 0acda3e..dfce10a 100644
--- a/h5/pages/index/index.vue
+++ b/h5/pages/index/index.vue
@@ -19,7 +19,7 @@
</view>
<image src="/static/bg_b.png" mode="widthFix"></image>
</view>
- <view class="index_list_item" @click="jump(3)">
+ <view class="index_list_item" @click="jump(3)" v-if="userInfo.dcaButton === 1">
<view class="index_list_item_info">
<text>娣卞害绗﹀悎鎬у鏌CA</text>
<text>DCA</text>
@@ -31,7 +31,11 @@
</template>
<script>
+ import { mapState } from 'vuex'
export default {
+ computed: {
+ ...mapState(['userInfo'])
+ },
data() {
return {
title: 'Hello'
diff --git a/h5/pages/type_dca/type_dca.vue b/h5/pages/type_dca/type_dca.vue
index eb46a1e..66c91dd 100644
--- a/h5/pages/type_dca/type_dca.vue
+++ b/h5/pages/type_dca/type_dca.vue
@@ -49,7 +49,7 @@
<view class="list_row_img" v-if="child.status === 2">
<view class="list_row_img_label">鍥剧墖</view>
<view class="list_row_img_list" v-if="child.imgList">
- <view class="list_row_img_list_row" v-for="(imgRow, n) in child.imgList.split(',')" :key="n">
+ <view class="list_row_img_list_row" v-for="(imgRow, n) in child.imgList.split(',')" :key="n" @click="previewImage(base + imgRow, child.imgList.split(',').map(item => base + item))">
<image :src="base + imgRow" mode="widthFix"></image>
</view>
<view class="list_row_img_list_zw"></view>
@@ -101,6 +101,12 @@
this.base = res.data.path
})
},
+ previewImage(current, urls) {
+ uni.previewImage({
+ current,
+ urls
+ });
+ },
submit() {
// 鎬绘暟
let tatal = 0
diff --git a/h5/pages/workOrder/workOrder.vue b/h5/pages/workOrder/workOrder.vue
index a3d5aff..d89a3cb 100644
--- a/h5/pages/workOrder/workOrder.vue
+++ b/h5/pages/workOrder/workOrder.vue
@@ -180,7 +180,6 @@
page: this.search.page,
model: {
myWorkOrder: 1,
- memberId: this.userInfo.id,
type: this.typeId,
dealStatus: this.statusId,
localtionId: this.localtionId
@@ -248,7 +247,7 @@
if (type === 0) {
return 'SHE浜嬩欢涓婃姤'
} else if (type === 3) {
- return '璺岀粖婊戜簨浠�'
+ return '璺岀粖婊戜簨浠朵笂鎶�'
}
}
}
diff --git a/h5/pages/workOrder_dca/workOrder_dca.vue b/h5/pages/workOrder_dca/workOrder_dca.vue
index 850fb68..abaa3f4 100644
--- a/h5/pages/workOrder_dca/workOrder_dca.vue
+++ b/h5/pages/workOrder_dca/workOrder_dca.vue
@@ -2,6 +2,7 @@
<view class="dca" v-if="info">
<view class="dca_head">
<text>浠诲姟{{returnStatus(info.status)}}</text>
+ <text>宸ュ崟鍙凤細{{info.code}}</text>
</view>
<u-gap height="5" bgColor="#EFEFEF"></u-gap>
<view class="dca_list">
@@ -65,7 +66,7 @@
</view>
<view class="lc_item_content" v-else-if="item.objType === 4">
<view class="lc_item_content_item">
- <view class="lc_item_content_item_label">宸插偓淇冿細</view>
+ <!-- <view class="lc_item_content_item_label">宸插偓淇冿細</view> -->
<view class="lc_item_content_item_val">
<text>{{item.content}}</text>
</view>
@@ -185,6 +186,15 @@
this.getDetails()
},
methods: {
+ // 宸ュ崟鍌績
+ async urge() {
+ let res = await this.$u.api.urge({ workorderId: this.info.id })
+ if (res.code === 200) {
+ uni.showToast({ title: '鍌績鎴愬姛', icon: 'none' })
+ this.getDetails()
+ this.show2 = false
+ }
+ },
previewImage(current, urls) {
uni.previewImage({
current,
@@ -230,7 +240,8 @@
info: that.model.info,
passOnUserId: that.model.passOnUserId,
multifileList: that.model.multifileList,
- workorderId: that.info.id
+ workorderId: that.info.id,
+ passOnType: this.info.status
})
if (res.code === 200) {
uni.showToast({ title: '鎿嶄綔鎴愬姛', icon: 'none' })
diff --git a/h5/pages/workOrder_she/workOrder_she.vue b/h5/pages/workOrder_she/workOrder_she.vue
index a1ccd90..1083ca0 100644
--- a/h5/pages/workOrder_she/workOrder_she.vue
+++ b/h5/pages/workOrder_she/workOrder_she.vue
@@ -86,7 +86,7 @@
</view>
<view class="lc_item_content" v-else-if="item.objType === 4">
<view class="lc_item_content_item">
- <view class="lc_item_content_item_label">宸插偓淇冿細</view>
+ <!-- <view class="lc_item_content_item_label">宸插偓淇冿細</view> -->
<view class="lc_item_content_item_val">
<text>{{item.content}}</text>
</view>
@@ -265,7 +265,8 @@
info: that.model.info,
passOnUserId: that.model.passOnUserId,
multifileList: that.model.multifileList,
- workorderId: that.info.id
+ workorderId: that.info.id,
+ passOnType: this.info.status
})
if (res.code === 200) {
uni.showToast({ title: '鎿嶄綔鎴愬姛', icon: 'none' })
@@ -281,10 +282,7 @@
async urge() {
let res = await this.$u.api.urge({ workorderId: this.info.id })
if (res.code === 200) {
- uni.showToast({
- title: '鎿嶄綔鎴愬姛',
- icon: 'none'
- })
+ uni.showToast({ title: '鍌績鎴愬姛', icon: 'none' })
this.getDetails()
this.show2 = false
}
diff --git a/h5/utils/http.interceptor.js b/h5/utils/http.interceptor.js
index d109c15..ee462f4 100644
--- a/h5/utils/http.interceptor.js
+++ b/h5/utils/http.interceptor.js
@@ -26,35 +26,21 @@
uni.$u.http.interceptors.response.use((response) => {
uni.hideLoading();
// 鐧诲綍杩囨湡
- if (response.data.code === 401) {
- if (!isRefreshing) { // 鏄惁宸茬粡鎵ц鍒锋柊
- isRefreshing = true
- uni.login({
- provider: 'weixin',
- success: async function (loginRes) {
- let { code } = loginRes;
- uni.request({
- url: vm.$baseUrl + 'mobile/system/login',
- method: "GET",
- data: { code },
- success: (res) => {
- isRefreshing = false
- vm.$store.commit('setToken', res.data.data)
- // 宸茬粡鍒锋柊浜唗oken锛屽皢鎵�鏈夐槦鍒椾腑鐨勮姹傝繘琛岄噸璇�
- requests.forEach(item => item(res.data.data))
- requests = []
- }
- });
- }
- });
- }
- return new Promise((resolve) => {
- // 灏唕esolve鏀捐繘闃熷垪锛岀敤涓�涓嚱鏁板舰寮忔潵淇濆瓨锛岀瓑token鍒锋柊鍚庣洿鎺ユ墽琛�
- requests.push(token => {
- response.config.header['eva-auth-token'] = token
- resolve(uni.$u.http.request(response.config));
- })
+ if (response.data.code === 5112) {
+ uni.showToast({
+ title: '鐧诲綍杩囨湡锛屾鍦ㄩ噸鏂拌烦杞巿鏉�',
+ duration: 2000,
+ success() {
+ setTimeout(() => {
+ let loc_href = encodeURIComponent("https://dmtest.ahapp.net/lianhelihua_web/")
+ let corpId = 'wweea8f71b54e3b835';
+ let agentId = '1000095';
+ let wxUrl = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=${corpId}&redirect_uri=${loc_href}&response_type=code&scope=snsapi_base&state=#wechat_redirect`
+ location.href = wxUrl;
+ }, 1500)
+ }
})
+ return
}
if (response.data.code !== 200) {
uni.showToast({
--
Gitblit v1.9.3