From 8c82102ab7bb34e29a73f56b829cd622ab34604c Mon Sep 17 00:00:00 2001
From: zhangxiaoxu <819527061@qq.com>
Date: 星期二, 25 十一月 2025 11:30:23 +0800
Subject: [PATCH] 解决运输方式显示不对得问题
---
pages/new-application-form-data/new-application-form-data.vue | 3 +
pages/home/home.vue | 6 ++-
utils/request.js | 6 ++-
pages.json | 19 +++++++++
pages/my-todo/my-todo.vue | 2 +
store/index.js | 32 ++++++++++------
6 files changed, 50 insertions(+), 18 deletions(-)
diff --git a/pages.json b/pages.json
index b91175e..989368b 100644
--- a/pages.json
+++ b/pages.json
@@ -72,7 +72,14 @@
"enablePullDownRefresh": false
}
- }, {
+ },{
+ "path": "pages/payment-form-data/payment-form-data",
+ "style": {
+ "navigationBarTitleText": "鏂板鏀舵琛ㄥ崟",
+ "enablePullDownRefresh": false
+ }
+
+ },{
"path": "pages/jihua/jihua",
"style": {
"navigationBarTitleText": "鏃ュ彂杩愯鍒�"
@@ -135,5 +142,15 @@
"titleSize": "28rpx"
}
}
+ },
+ "condition" : { //妯″紡閰嶇疆锛屼粎寮�鍙戞湡闂寸敓鏁�
+ "current": 0, //褰撳墠婵�娲荤殑妯″紡(list 鐨勭储寮曢」)
+ "list": [
+ {
+ "name": "", //妯″紡鍚嶇О
+ "path": "", //鍚姩椤甸潰锛屽繀閫�
+ "query": "" //鍚姩鍙傛暟锛屽湪椤甸潰鐨刼nLoad鍑芥暟閲岄潰寰楀埌
+ }
+ ]
}
}
diff --git a/pages/home/home.vue b/pages/home/home.vue
index f0910eb..5950805 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -221,9 +221,9 @@
</view>
<!-- 鏃ヨ鍒� -->
- <combined-title title="鏃ュ彂杩愯鍒�" detailsPath="/pages/jihua/jihua" v-if="rijihuaMenu"></combined-title>
+ <combined-title title="鏃ュ彂杩愯鍒�" detailsPath="/pages/jihua/jihua"></combined-title>
<view class="card-group bottomChild">
- <combination-card class="card" :showTop="false" v-for="(item, index) in fyData.slice(0, 2)" :key="item.id" v-if="rijihuaMenu">
+ <combination-card class="card" :showTop="false" v-for="(item, index) in fyData.slice(0, 2)" :key="item.id">
<template v-slot:top></template>
<template v-slot:center>
<view class="main-block-box">
@@ -352,6 +352,7 @@
},
computed: {
rijihuaMenu() {
+ console.log(this.$store.state.rijihuaMenu,'this.$store.state.rijihuaMenu==============',this.$store.state)
return this.$store.state.rijihuaMenu;
},
shenqingMenu() {
@@ -585,6 +586,7 @@
};
this.$reqGet('xscarshippingdayplan', params)
.then(res => {
+ console.log('鍙戣繍鏃ヨ鍒�----------------------------------',res)
if (res.code == 0) {
this.fyData = res.data.records;
uni.hideLoading();
diff --git a/pages/my-todo/my-todo.vue b/pages/my-todo/my-todo.vue
index 6f42c1c..12359cc 100644
--- a/pages/my-todo/my-todo.vue
+++ b/pages/my-todo/my-todo.vue
@@ -438,6 +438,7 @@
this.modalType = 0;
},
batchAdoptClick() {
+ console.log('鎵归噺閫氳繃鎸夐挳')
if (this.checkBoxValue.length != 0) {
this.adoptModalShow = true;
} else {
@@ -453,6 +454,7 @@
})
this.adoptForm.ids = this.adoptDataBox.toString();
}
+ console.log(this.adoptForm,'this.adoptForm===鎻愪氦===鎵归噺')
this.$reqPost('passAll', this.adoptForm).then(res => {
console.log('鏄惁杩樺師', this.adoptForm.ids, this.rejectForm.procInstIds);
if (res.code == 0) {
diff --git a/pages/new-application-form-data/new-application-form-data.vue b/pages/new-application-form-data/new-application-form-data.vue
index beedf8c..ef62c42 100644
--- a/pages/new-application-form-data/new-application-form-data.vue
+++ b/pages/new-application-form-data/new-application-form-data.vue
@@ -619,7 +619,8 @@
</view>
<view class="">
杩愯緭锛�
- <text>{{ item.trainType == 1 ? '璺繍' : '鍦伴攢' }}</text>
+<!-- <text>{{ item.trainType == 1 ? '璺繍' : '鍦伴攢' }}</text>-->
+ <text>{{ item.trainType == 1 ? '鍦伴攢' : '璺繍' }}</text>
</view>
</view>
<view class="cardList_item">
diff --git a/store/index.js b/store/index.js
index 03ea9c7..8041058 100644
--- a/store/index.js
+++ b/store/index.js
@@ -4,7 +4,19 @@
// 璇锋眰鐩稿叧
import { reqAll, reqGet, reqPost } from '../utils/index.js';
-
+const findNodeByNme = (arr) => {
+ for (let i = 0; i < arr.length; i++) {
+ let node = arr[i];
+ if (node.name === '姹借溅鏃ュ彂杩愯鍒掔鐞�') return node;
+ if (node.children && node.children.length > 0) {
+ // 濡傛灉褰撳墠鑺傜偣鏈夊瓙鑺傜偣锛屽垯閫掑綊鏌ユ壘瀛愯妭鐐�
+ let foundNode = findNodeByNme(node.children);
+ if (foundNode) return foundNode;
+ }
+ }
+ // 娌℃湁鎵惧埌鐩爣鑺傜偣锛岃繑鍥� null
+ return null;
+}
const store = new Vuex.Store({
state: {
shenqingMenu: uni.getStorageSync('shenqingMenu') || false, //鐢宠鑿滃崟
@@ -34,19 +46,15 @@
}
},
+
ISHAS_RIJIHUA: (state, data) => {
+ console.log(data,'data-----',state)
let labelArry = []
- let newObj = data.filter(e => e.label == '鍦伴攢璁￠噺')
- newObj && newObj.forEach(e => {
- if(e.children.length > 0) {
- e.children.forEach(item => {
- labelArry.push(item.label)
- })
- }else{
- state.rijihuaMenu = false
- uni.setStorageSync('rijihuaMenu',state.rijihuaMenu)
- }
- })
+ // let newObj = data.filter(e => e.label == '姹借溅鏃ュ彂杩愯鍒掔鐞�')
+ let newObj = findNodeByNme(data) //鎵� 姹借溅鏃ュ彂杩愯鍒掔鐞�
+ if(newObj && newObj.label) {
+ labelArry.push(newObj.label)
+ }
if(labelArry.indexOf('姹借溅鏃ュ彂杩愯鍒掔鐞�') > -1) {
state.rijihuaMenu = true
uni.setStorageSync('rijihuaMenu',state.rijihuaMenu)
diff --git a/utils/request.js b/utils/request.js
index 91402b3..0cd164d 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -83,8 +83,10 @@
500: responseError
}
- //let BaseUrl = 'http://192.168.0.159:9999';
-const BaseUrl = 'https://mx.jzeg.cn:9998';
+ // let BaseUrl = 'http://192.168.0.115:9999';
+// const BaseUrl = 'https://mx.jzeg.cn:9998';
+// const BaseUrl = 'https://mx.res.jzeg.cn:8887';
+const BaseUrl = 'https://mxwx.res.jzeg.cn:8887';
// let BaseUrl = 'http://192.168.0.114:9999';
// const BaseUrl = 'http://192.168.0.102:9999'; // 椋炲摜
--
Gitblit v1.9.1