From 72935b2a35765bcc3622561bb06f2eccd64caf83 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期二, 16 五月 2023 16:49:00 +0800
Subject: [PATCH] 修改上传图片时页面跳转问题
---
pages/public-page/forward/forward.vue | 2
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue | 3 -
pages/login/userPassword.vue | 2
pages/public-page/mapRoute/mapRoute.vue | 32 +++-------
pages/register/register.vue | 12 +++-
pages/customer-page/customer-index/customer-index.vue | 2
App.vue | 6 +
pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue | 19 +++--
pages/customer-page/customer-my/customer-my.vue | 64 ++++++++++++---------
store/index.js | 6 +
10 files changed, 78 insertions(+), 70 deletions(-)
diff --git a/App.vue b/App.vue
index 697e173..727d723 100644
--- a/App.vue
+++ b/App.vue
@@ -2,10 +2,12 @@
import { mapState, mapMutations } from 'vuex';
export default {
onShow() {},
+ onLaunch() {},
onHide() {
console.log('appvue闅愯棌鍚庡彴');
this.changeisconnect(false);
- if (!this.globalisconnect) {
+ console.log(this.globalisUploadimg);
+ if (!this.globalisconnect && !this.globalisUploadimg) {
uni.switchTab({
url: '/pages/tabbar-page/index-tabbar/index-tabbar'
});
@@ -15,7 +17,7 @@
...mapMutations(['changeisconnect'])
},
computed: {
- ...mapState(['globalisconnect'])
+ ...mapState(['globalisconnect', 'globalisUploadimg'])
}
};
</script>
diff --git a/pages/customer-page/customer-index/customer-index.vue b/pages/customer-page/customer-index/customer-index.vue
index ed37706..5cb4eb9 100644
--- a/pages/customer-page/customer-index/customer-index.vue
+++ b/pages/customer-page/customer-index/customer-index.vue
@@ -429,7 +429,7 @@
.second-line {
width: 100%;
height: vww(30);
- margin-left: vww(12);
+ margin-left: vww(16);
display: flex;
align-items: center;
justify-content: flex-start;
diff --git a/pages/customer-page/customer-my/customer-my.vue b/pages/customer-page/customer-my/customer-my.vue
index 9c4b348..ebeef7a 100644
--- a/pages/customer-page/customer-my/customer-my.vue
+++ b/pages/customer-page/customer-my/customer-my.vue
@@ -16,7 +16,7 @@
<u-swipe-action-item
:options="options1"
v-for="(item, index) in huoDaiData"
- :index="index"
+ :index="item.userId"
:name="item.userId"
:key="index"
@click="deleteHuoDaiClick"
@@ -43,7 +43,7 @@
<u-swipe-action-item
:options="options1"
v-for="(item, index) in fleetData"
- :index="index"
+ :index="item.id"
:name="item.id"
:key="index"
@click="deleteFleetClick"
@@ -218,15 +218,19 @@
title: '鍔犺浇涓�...'
});
// 鏂板缓杞﹂槦
- this.$reqPost('saveFleet', this.addGroupForm, 'params').then(res => {
- uni.hideLoading();
- if (res.code == 0) {
- this.$u.toast('娣诲姞鎴愬姛');
+ this.$reqPost('saveFleet', this.addGroupForm, 'params')
+ .then(res => {
+ uni.hideLoading();
+ console.log(res, '鏂板缓杞﹂槦');
+ if (res.code == 0) {
+ this.$u.toast('娣诲姞鎴愬姛');
+ } else {
+ this.$u.toast(res.msg ? res.msg : '娣诲姞澶辫触');
+ }
+ })
+ .then(r => {
this.getFleet();
- } else {
- this.$u.toast(res.msg ? res.msg : '娣诲姞澶辫触');
- }
- });
+ });
this.updateGroupShow = false;
},
// 鍒犻櫎璐т唬
@@ -251,17 +255,18 @@
uni.showLoading({
title: '鍔犺浇涓�...'
});
- this.$reqPost('deleteHuoDai', { id: this.deleteHuoDaiId }, 'params').then(res => {
- uni.hideLoading();
- if (res.code == 0) {
- if (res.data) {
+ this.$reqPost('deleteHuoDai', { id: this.deleteHuoDaiId }, 'params')
+ .then(res => {
+ uni.hideLoading();
+ if (res.code == 0) {
this.$u.toast('鍒犻櫎鎴愬姛');
- this.getAllHuoDaiByCustomerId();
} else {
- this.$u.toast('鍒犻櫎澶辫触');
+ this.$u.toast(res.msg ? res.msg : '鍒犻櫎澶辫触');
}
- }
- });
+ })
+ .then(r => {
+ this.getAllHuoDaiByCustomerId();
+ });
},
// 鍒犻櫎杞﹂槦
deleteFleetClick(args) {
@@ -285,16 +290,19 @@
uni.showLoading({
title: '鍔犺浇涓�...'
});
- this.$reqPost('deleteFleet', { id: this.deleteFleetId }, 'params').then(res => {
- console.log('鍒犻櫎杞﹂槦', res);
- if (res.code == 0) {
- this.$u.toast('鍒犻櫎鎴愬姛');
- } else {
- this.$u.toast(res.msg ? res.msg : '鍒犻櫎澶辫触');
- }
- uni.hideLoading();
- this.getFleet();
- });
+ this.$reqPost('deleteFleet', { id: this.deleteFleetId }, 'params')
+ .then(res => {
+ console.log('鍒犻櫎杞﹂槦', res);
+ if (res.code == 0) {
+ this.$u.toast('鍒犻櫎鎴愬姛');
+ } else {
+ this.$u.toast(res.msg ? res.msg : '鍒犻櫎澶辫触');
+ }
+ uni.hideLoading();
+ })
+ .then(() => {
+ this.getFleet();
+ });
},
// 璐т唬璇︽儏
toFreightForwarderDetails(userId) {
diff --git a/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue b/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue
index 138a077..5ddce20 100644
--- a/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue
+++ b/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue
@@ -259,9 +259,6 @@
handler(v) {
this.weighData.weigh = this.realTimeWeigh = v;
console.log(this.realTimeWeigh, '鐪熷疄閲嶉噺鏀瑰彉浜�');
- // setTimeout(() => {
- // this.weighData.weigh = this.realTimeWeigh = v;
- // }, 0);
},
deep: true,
immediate: true
diff --git a/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue b/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue
index 04e9c87..11d83ee 100644
--- a/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue
+++ b/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue
@@ -10,10 +10,9 @@
<view class="first-line">
<view class="main-information">
<view class="sign">瑁�</view>
- <view class="filedname">
- <text v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢' || item.orderType == '杞嚭'">{{ item.deptName.slice(0, 16) }}</text>
- <text v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘' || item.orderType == '杞叆'">{{ item.customerName.slice(0, 16) }}</text>
- <text v-show="item.deptName.length >= 15 || item.customerName.length >= 15">...</text>
+ <view class="filedname exceedHide">
+ <text v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢' || item.orderType == '杞嚭'">{{ item.deptName }}</text>
+ <text v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘' || item.orderType == '杞叆'">{{ item.customerName }}</text>
</view>
</view>
<view class="main-divider"></view>
@@ -25,10 +24,9 @@
<view class="first-extra">
<view class="main-information">
<view class="sign">鍗�</view>
- <view class="filedname">
- <text v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢' || item.orderType == '杞嚭'">{{ item.customerName.slice(0, 16) }}</text>
- <text v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘' || item.orderType == '杞叆'">{{ item.deptName.slice(0, 16) }}</text>
- <text v-show="item.customerName.length >= 15 || item.deptName.length >= 15">...</text>
+ <view class="filedname exceedHide">
+ <text v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢' || item.orderType == '杞嚭'">{{ item.customerName }}</text>
+ <text v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘' || item.orderType == '杞叆'">{{ item.deptName }}</text>
</view>
</view>
</view>
@@ -340,6 +338,11 @@
}
}
}
+.exceedHide {
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+}
::v-deep.freightForwarder-index {
width: 100%;
margin: 0 auto;
diff --git a/pages/login/userPassword.vue b/pages/login/userPassword.vue
index 01bd995..036390e 100644
--- a/pages/login/userPassword.vue
+++ b/pages/login/userPassword.vue
@@ -7,7 +7,7 @@
clearable
maxlength="32"
type="text"
- placeholder="璇疯緭鍏ョ敤鎴峰悕"
+ placeholder="璇疯緭鍏ユ墜鏈哄彿"
prefixIcon="account"
prefixIconStyle="font-size: 22px;color: #909399"
></u--input>
diff --git a/pages/public-page/forward/forward.vue b/pages/public-page/forward/forward.vue
index 03a6cd2..13e809f 100644
--- a/pages/public-page/forward/forward.vue
+++ b/pages/public-page/forward/forward.vue
@@ -19,7 +19,7 @@
<view class="card-block">
<view class="forward-card" v-for="(val, index) in jhOrderPlanForwardList" :key="index">
<u-swipe-action>
- <u-swipe-action-item :options="options1" @click="deleteGroup(index, val)">
+ <u-swipe-action-item :options="options1" @click="deleteGroup(index, val)" :index="index" :name="val.xsUserId || val.fleetId">
<view class="card-content">
<u--form labelPosition="left" :model="forwardForm" ref="form1">
<u-form-item label="杞彂瀵硅薄" labelWidth="21%" ref="item1" @click="forwardObjectClick(index)">
diff --git a/pages/public-page/mapRoute/mapRoute.vue b/pages/public-page/mapRoute/mapRoute.vue
index 24b8544..b534ca6 100644
--- a/pages/public-page/mapRoute/mapRoute.vue
+++ b/pages/public-page/mapRoute/mapRoute.vue
@@ -15,7 +15,7 @@
<text>{{ duration || '' }}</text>
</view>
</view>
- <!-- <view class="" @click="awaken"><button type="default">璺宠浆</button></view> -->
+ <view class="open-button" @click="awaken"><button type="default">璺宠浆</button></view>
</view>
</template>
@@ -213,27 +213,11 @@
},
// 鍞ら啋
awaken() {
- uni.getSystemInfo({
- success: function(res) {
- if (res.platform == 'android') {
- uni.navigateTo({
- url: `intent://map/routeplan?type=drive&fromcoord=&from=${_this.fromLocation}&tocoord=${_this.toLocation.latitude},${
- _this.toLocation.longitude
- }&to=name&policy=0&referer=myapp#Intent;scheme=qqmap;package=com.tencent.map;end`
- });
- } else if (res.platform == 'ios') {
- uni.navigateTo({
- url: `qqmap://map/routeplan?type=drive&fromcoord=&from=${_this.fromLocation}&tocoord=${_this.toLocation.latitude},${
- _this.toLocation.longitude
- }&to=name&policy=0&referer=myapp`
- });
- } else {
- uni.showToast({
- title: '褰撳墠璁惧涓嶆敮鎸佸湴鍥惧鑸�',
- icon: 'none'
- });
- }
- }
+ uni.openLocation({
+ latitude: this.markers[1].latitude,
+ longitude: this.markers[1].longitude,
+ name: '鐩殑鍦颁綅缃�',
+ address: '鐩殑鍦颁綅缃�'
});
}
},
@@ -268,4 +252,8 @@
}
}
}
+.open-button {
+ width: 200rpx;
+ margin: 10rpx 0;
+}
</style>
diff --git a/pages/register/register.vue b/pages/register/register.vue
index e32320d..6809847 100644
--- a/pages/register/register.vue
+++ b/pages/register/register.vue
@@ -34,7 +34,7 @@
<u-form-item prop="carNo" label="杞︾墝鍙�" labelWidth="20%" borderBottom v-if="radiovalue1 == '鍙告満'" required>
<u--input v-model="registerFormModel.carNo" placeholder="璇疯緭鍏ュ唴瀹�" clearable></u--input>
</u-form-item>
- <u-form-item prop="carImg" label="杞﹁締鐓х墖" labelWidth="20%" borderBottom v-if="radiovalue1 == '鍙告満'" required>
+ <u-form-item prop="carImg" label="杞﹁締鐓х墖" labelWidth="20%" borderBottom v-if="radiovalue1 == '鍙告満'" required @click="beforeRead">
<u-upload
:fileList="fileList1"
deletable
@@ -51,7 +51,7 @@
mode="widthFix" style="width: 250px;height: 150px;"></image> -->
</u-upload>
</u-form-item>
- <u-form-item prop="drivingImg" label="琛岄┒璇�" labelWidth="20%" borderBottom v-if="radiovalue1 == '鍙告満'" required>
+ <u-form-item prop="drivingImg" label="琛岄┒璇�" labelWidth="20%" borderBottom v-if="radiovalue1 == '鍙告満'" required @click="beforeRead">
<u-upload
:fileList="fileList2"
deletable
@@ -89,6 +89,7 @@
<script>
import { apiRegister } from '@/api/publicInterface.js';
import { BaseUrl } from '@/api/publicInterface.js';
+import { mapMutations } from 'vuex';
export default {
// onLoad: function() {
// // 鏌ョ湅鏄惁鎺堟潈
@@ -265,6 +266,7 @@
}
},
methods: {
+ ...mapMutations(['changeisUploadimg']),
registerClick() {
if (this.registerFormModel.password == this.registerFormModel.confirmPassword) {
this.$refs.regesterFormRef
@@ -284,7 +286,7 @@
uni.redirectTo({ url: '/pages/login/login' });
}, 1000);
} else {
- this.$u.toast(res.data.data ? res.data.data : '娣诲姞澶辫触');
+ this.$u.toast(res.msg ? res.msg : '娣诲姞澶辫触');
}
})
.catch(err => {
@@ -319,8 +321,12 @@
}
},
// 涓婁紶鍥剧墖鏂规硶
+ beforeRead() {
+ this.changeisUploadimg(true);
+ },
// 鍒犻櫎鍥剧墖
deletePic(event) {
+ this.changeisUploadimg(true);
this[`fileList${event.name}`].splice(event.index, 1);
},
// 鏂板鍥剧墖
diff --git a/store/index.js b/store/index.js
index 77612ae..72a6b9c 100644
--- a/store/index.js
+++ b/store/index.js
@@ -71,7 +71,8 @@
weight: '',
userId: ''
},
- globalisconnect: false
+ globalisconnect: false,
+ globalisUploadimg: false
},
mutations: {
lengthchange(state, payload) {
@@ -115,6 +116,9 @@
// 鏀圭増鍏ㄥ眬websocket鐘舵��
changeisconnect(state, payload) {
state.globalisconnect = payload
+ },
+ changeisUploadimg(state, payload) {
+ state.globalisUploadimg = payload
}
}
})
--
Gitblit v1.9.1