From 82a7eba143cc761b303b99889193f7aad2dc9d08 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期一, 28 八月 2023 08:56:08 +0800
Subject: [PATCH] 修改bug，称重页面增加历史和异常原因填写
---
pages/freight-forwarder-page/freightForwarder-my/freightForwarder-my.vue | 595 ++++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 364 insertions(+), 231 deletions(-)
diff --git a/pages/freight-forwarder-page/freightForwarder-my/freightForwarder-my.vue b/pages/freight-forwarder-page/freightForwarder-my/freightForwarder-my.vue
index 0d7dbb5..e3cbe92 100644
--- a/pages/freight-forwarder-page/freightForwarder-my/freightForwarder-my.vue
+++ b/pages/freight-forwarder-page/freightForwarder-my/freightForwarder-my.vue
@@ -1,11 +1,14 @@
<template>
<view class="freightForwarder-my">
- <view class="driver-banner"><view class="navgation">鎴戠殑</view></view>
+ <view class="driver-banner">
+ <view class="navgation">鎴戠殑</view>
+ </view>
<view class="personal-information">
<view class="personal-information-block">
<view class="block-main">
<view class="fleet-container">
- <combined-title title="鎴戠殑杞﹂槦" @rightText="addFleet">
+ <combined-title title="鎴戠殑杞﹂槦"
+ @rightText="addFleet">
<template v-slot:rightText>
<text>娣诲姞</text>
</template>
@@ -13,15 +16,20 @@
<view class="fleet-list">
<u-swipe-action>
<u-cell-group :border="false">
- <u-swipe-action-item
- :options="options1"
+ <u-swipe-action-item :options="options1"
v-for="(item, index) in fleetData"
:index="index"
:name="item.id"
:key="index"
- @click="deleteFleetClick"
- >
- <u-cell :title="item.name" :value="item.userSijisum + '杈�'" @click="tofleetDetails(item.id)"></u-cell>
+ @click="deleteFleetClick">
+ <u-cell :title="item.name"
+ :value="item.userSijisum + '杈�'"
+ @click="tofleetDetails(item.id)">
+ <u-icon name="arrow-right"
+ color="#999999"
+ size="30"
+ slot="right-icon"></u-icon>
+ </u-cell>
</u-swipe-action-item>
</u-cell-group>
</u-swipe-action>
@@ -33,278 +41,403 @@
<!-- 鏂板缓杞﹂槦寮瑰嚭妗� -->
<view class="addNewGroup">
- <u-popup :show="updateGroupShow" @close="addNewFleetPopupClose" @open="addNewFleetPopupOpen" mode="center">
- <view class="title"><u--text text="鏂板缓杞﹂槦" size="30" lineHeight="80" align="center"></u--text></view>
+ <u-popup :show="updateGroupShow"
+ @close="addNewFleetPopupClose"
+ @open="addNewFleetPopupOpen"
+ mode="center">
+ <view class="title"><u--text text="鏂板缓杞﹂槦"
+ size="30"
+ lineHeight="80"
+ align="center"></u--text></view>
<view class="addCarForm">
- <u--form labelPosition="left" :model="addGroupForm" ref="form1" labelAlign="center">
- <u-form-item label="缁勫悕" borderBottom ref="groupName" labelWidth="100">
- <u--input v-model="addGroupForm.name" border="none" placeholder="璇疯緭鍏ヨ溅闃熷悕绉�"></u--input>
+ <u--form labelPosition="left"
+ :model="addGroupForm"
+ ref="form1"
+ labelAlign="center">
+ <u-form-item label="缁勫悕"
+ borderBottom
+ ref="groupName"
+ labelWidth="100">
+ <u--input v-model="addGroupForm.name"
+ border="none"
+ placeholder="璇疯緭鍏ヨ溅闃熷悕绉�"></u--input>
</u-form-item>
<!-- <u-form-item label="杞︾墝" borderBottom ref="cars" labelWidth="80">
<u--textarea maxlength="2000" v-model="addGroupForm.carNums" placeholder="璇疯緭鍏ヨ溅鐗�" height="150"></u--textarea>
</u-form-item> -->
</u--form>
</view>
- <view class="addCarButton"><u-button text="娣诲姞" type="primary" @click="addNewGroupClick"></u-button></view>
+ <view class="addCarButton"><u-button text="娣诲姞"
+ type="primary"
+ @click="addNewGroupClick"></u-button></view>
</u-popup>
</view>
<!-- <view class="statistics"><u-button text="鍙戣繍缁熻" type="primary" @click="statistics"></u-button></view> -->
<view class="utils-button">
- <view class="utils"><u-button text="閫�鍑虹櫥褰�" type="primary" @click="logout"></u-button></view>
+ <view class="utils"><u-button text="淇敼瀵嗙爜"
+ type="primary"
+ @click="modifyPwd"></u-button></view>
+ <view class="utils"><u-button text="閲嶇疆瀵嗙爜"
+ type="primary"
+ @click="initPwd"></u-button></view>
+ <view class="utils"><u-button text="閫�鍑虹櫥褰�"
+ type="primary"
+ @click="logout"></u-button></view>
</view>
<!-- 鍒犻櫎杞﹂槦妯℃�佹 -->
<view class="deleteFleetModal">
- <u-modal
- :show="deleteFleetShow"
+ <u-modal :show="deleteFleetShow"
:title="deleteFleetTitle"
@close="deleteFleetClose"
@cancel="deleteFleetCancel"
@confirm="deleteFleetConfirm"
:closeOnClickOverlay="true"
- :showCancelButton="true"
- >
+ :showCancelButton="true">
<view class="slot-content"><rich-text :nodes="deleteFleetContent"></rich-text></view>
</u-modal>
</view>
<view class="logoutModel">
- <u-modal :show="logoutShow" :title="logoutTitle" showCancelButton :content="logoutContent" @confirm="logoutConfirm" @cancel="logoutCancel"></u-modal>
+ <u-modal :show="logoutShow"
+ :title="logoutTitle"
+ showCancelButton
+ :content="logoutContent"
+ @confirm="logoutConfirm"
+ @cancel="logoutCancel"></u-modal>
+ </view>
+ <!-- 閲嶇疆瀵嗙爜寮瑰嚭妗� -->
+ <view class="initPwdModal">
+ <u-modal :show="initPwdShow"
+ title="閲嶇疆瀵嗙爜"
+ showCancelButton
+ content="鍒濆瀵嗙爜灏嗗彉鏇翠负123456,鏄惁纭閲嶇疆"
+ @confirm="initPwdConfirm"
+ @cancel="initPwdCancel"></u-modal>
+ </view>
+ <!-- 淇敼瀵嗙爜寮瑰嚭妗� -->
+ <view class="modifyPwdModal">
+ <u-modal :show="modifyPwdShow"
+ title="淇敼瀵嗙爜"
+ showCancelButton
+ @confirm="modifyPwdConfirm"
+ @cancel="modifyPwdCancel">
+ <view class="modifyPwd">
+ <u-input v-model="passwordModified"
+ placeholder="璇疯緭鍏ヤ慨鏀瑰悗鐨勫瘑鐮�"
+ border="surround"
+ type="password"></u-input>
+ </view>
+ </u-modal>
</view>
</view>
</template>
<script>
-import { redirectLogin } from '@/utils/status';
-export default {
- data() {
- return {
- fleetData: [],
- // 鏂板缓杞﹂槦
- addGroupForm: {
- name: ''
- // wxUserId: uni.getStorageSync('userInfo').id
- },
- updateGroupShow: false,
- options1: [
- {
+ import { redirectLogin } from '@/utils/status';
+ export default {
+ data() {
+ return {
+ fleetData: [],
+ // 鏂板缓杞﹂槦
+ addGroupForm: {
+ name: ''
+ // wxUserId: uni.getStorageSync('userInfo').id
+ },
+ updateGroupShow: false,
+ options1: [{
text: '鍒犻櫎'
- }
- ],
- // 鍒犻櫎杞﹂槦妯℃�佹
- deleteFleetId: null, // 鍒犻櫎杞﹂槦id
- deleteFleetShow: false,
- deleteFleetTitle: '',
- deleteFleetContent: '',
- // 閫�鍑烘ā鎬佹
- logoutShow: false,
- logoutTitle: '鎻愮ず',
- logoutContent: '鏄惁纭閫�鍑�'
- };
- },
- onShow() {
- this.init();
- },
- methods: {
- init() {
- this.getFleet();
+ }],
+ // 鍒犻櫎杞﹂槦妯℃�佹
+ deleteFleetId: null, // 鍒犻櫎杞﹂槦id
+ deleteFleetShow: false,
+ deleteFleetTitle: '',
+ deleteFleetContent: '',
+ // 閫�鍑烘ā鎬佹
+ logoutShow: false,
+ logoutTitle: '鎻愮ず',
+ logoutContent: '鏄惁纭閫�鍑�',
+ initPwdShow: false,
+ modifyPwdShow: false,
+ passwordModified: '',
+ // 鐢ㄦ埛淇℃伅瀵硅薄
+ userEntity: {},
+ };
},
- // 鑾峰彇杞﹂槦
- getFleet() {
- // this.$reqGet('getFleet', { wxUserId: this.addGroupForm.wxUserId }).then(res => {
- this.$reqGet('getFleet').then(res => {
- console.log('璐т唬1杞﹂槦', res);
- this.fleetData = res.data;
- });
+ onLoad() {
+ this.init();
},
- // 娣诲姞杞﹂槦
- addFleet() {
- console.log('娣诲姞杞﹂槦');
- this.updateGroupShow = true;
- },
- addNewFleetPopupClose() {
- this.updateGroupShow = false;
- this.addGroupForm.name = '';
- },
- addNewFleetPopupOpen() {
- console.log('娣诲姞杞﹂槦鎵撳紑');
- },
- // 纭鏂板缓杞﹂槦鎸夐挳
- addNewGroupClick() {
- this.updateGroupShow = false;
- this.$reqPost('saveFleet', this.addGroupForm, 'params').then(res => {
- if (res.code == 0) {
- this.$u.toast('娣诲姞鎴愬姛');
- this.getFleet();
- }
- });
- },
- // 鍒犻櫎杞﹂槦
- deleteFleetClick(args) {
- console.log(args.name, '杞﹂槦id');
- this.deleteFleetId = args.name;
- this.deleteFleetShow = true;
- this.fleetData.forEach(item => {
- if (item.id == this.deleteFleetId) {
- this.deleteFleetContent = '纭鍒犻櫎杞﹂槦' + item.name;
- }
- });
- },
- deleteFleetClose() {
- this.deleteFleetShow = false;
- },
- deleteFleetCancel() {
- this.deleteFleetShow = false;
- },
- deleteFleetConfirm() {
- this.deleteFleetShow = false;
- 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();
+ methods: {
+ init() {
this.getFleet();
- });
- },
- // 杞﹂槦璇︽儏
- tofleetDetails(id) {
- uni.navigateTo({
- url: `/pages/customer-page/fleet-management/fleet-management?id=${id}`
- });
- },
- logout() {
- this.logoutShow = true;
- },
- logoutConfirm() {
- redirectLogin();
- },
- logoutCancel() {
- this.logoutShow = false;
- },
- // 璺宠浆鍙戣繍缁熻椤甸潰
- statistics() {
- uni.navigateTo({
- url: '/pages/customer-page/customer-my/faYunstatistics/faYunstatistics'
- });
+ this.getUserEntity()
+ },
+ // 鑾峰彇鐢ㄦ埛淇℃伅
+ getUserEntity() {
+ this.$reqGet('getUserEntity').then(res => {
+ this.userEntity = res.data;
+ });
+ },
+ // 鑾峰彇杞﹂槦
+ getFleet() {
+ // this.$reqGet('getFleet', { wxUserId: this.addGroupForm.wxUserId }).then(res => {
+ this.$reqGet('getFleet').then(res => {
+ console.log('璐т唬1杞﹂槦', res);
+ this.fleetData = res.data;
+ });
+ },
+ // 娣诲姞杞﹂槦
+ addFleet() {
+ console.log('娣诲姞杞﹂槦');
+ this.updateGroupShow = true;
+ },
+ addNewFleetPopupClose() {
+ this.updateGroupShow = false;
+ this.addGroupForm.name = '';
+ },
+ addNewFleetPopupOpen() {
+ console.log('娣诲姞杞﹂槦鎵撳紑');
+ },
+ // 纭鏂板缓杞﹂槦鎸夐挳
+ addNewGroupClick() {
+ this.updateGroupShow = false;
+ this.$reqPost('saveFleet', this.addGroupForm, 'params').then(res => {
+ if (res.code == 0) {
+ this.$u.toast('娣诲姞鎴愬姛');
+ this.getFleet();
+ }
+ });
+ },
+ // 鍒犻櫎杞﹂槦
+ deleteFleetClick(args) {
+ console.log(args.name, '杞﹂槦id');
+ this.deleteFleetId = args.name;
+ this.deleteFleetShow = true;
+ this.fleetData.forEach(item => {
+ if (item.id == this.deleteFleetId) {
+ this.deleteFleetContent = '纭鍒犻櫎杞﹂槦' + item.name;
+ }
+ });
+ },
+ deleteFleetClose() {
+ this.deleteFleetShow = false;
+ },
+ deleteFleetCancel() {
+ this.deleteFleetShow = false;
+ },
+ deleteFleetConfirm() {
+ this.deleteFleetShow = false;
+ 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();
+ });
+ },
+ // 杞﹂槦璇︽儏
+ tofleetDetails(id) {
+ uni.navigateTo({
+ url: `/pages/customer-page/fleet-management/fleet-management?id=${id}`
+ });
+ },
+ updateInfo() {
+ this.$reqPost('updateUser', this.userEntity, 'json').then(res => {
+ uni.hideLoading()
+ if (res.code == 0) {
+ uni.showToast({
+ title: '閲嶇疆鎴愬姛',
+ duration: 2000,
+ icon: 'success'
+ })
+ } else {
+ this.$u.toast(res.msg ? res.msg : '淇敼澶辫触');
+ }
+ }).catch(err => {
+ this.$u.toast('淇敼澶辫触');
+ });
+ },
+ initPwd() {
+ this.initPwdShow = true
+ },
+ initPwdConfirm() {
+ this.initPwdShow = false
+ uni.showLoading({
+ title: '鍔犺浇涓�'
+ })
+ this.userEntity.password = '123456'
+ this.updateInfo()
+ },
+ initPwdCancel() {
+ this.initPwdShow = false
+ },
+ modifyPwd() {
+ this.modifyPwdShow = true
+ },
+ modifyPwdConfirm() {
+ if (this.passwordModified.length === 0) {
+ return this.$u.toast('瀵嗙爜涓嶈兘涓虹┖')
+ }
+ this.modifyPwdShow = false
+ this.userEntity.password = this.passwordModified
+ this.updateInfo()
+ },
+ modifyPwdCancel() {
+ this.modifyPwdShow = false
+ },
+ logout() {
+ this.logoutShow = true;
+ },
+ logoutConfirm() {
+ redirectLogin();
+ this.$store.commit('changeisLogin', false)
+ this.$store.dispatch('websocketOnClose')
+ },
+ logoutCancel() {
+ this.logoutShow = false;
+ },
+ // 璺宠浆鍙戣繍缁熻椤甸潰
+ statistics() {
+ uni.navigateTo({
+ url: '/pages/customer-page/customer-my/faYunstatistics/faYunstatistics'
+ });
+ }
}
- }
-};
+ };
</script>
-<style lang="scss" scoped>
-.statistics {
- margin-top: vww(10);
- margin-bottom: vww(10);
-}
-.utils-button {
- margin-top: vww(35);
- .utils {
+<style lang="scss"
+ scoped>
+ .statistics {
margin-top: vww(10);
margin-bottom: vww(10);
- /deep/ .u-button {
- width: 631rpx;
- height: 74rpx;
- border: 2px solid #3b56eb;
- background-color: #fff;
- color: #3b56eb;
- border-radius: 37rpx 37rpx 37rpx 37rpx;
- }
}
-}
-::v-deep.freightForwarder-my {
- width: 100%;
- margin: vww(90) auto;
- .driver-banner {
- width: 100%;
- height: 430rpx;
- background: linear-gradient(0deg, #ffffff 0%, #0055fe 100%);
- background-size: contain;
- position: fixed;
- top: 0;
- .navgation {
- width: 77rpx;
- height: 37rpx;
- font-size: 40rpx;
- font-family: Adobe Heiti Std;
- font-weight: normal;
- color: #ffffff;
- line-height: 69rpx;
- margin: vww(60) auto;
- }
- }
- .personal-information {
- width: 100%;
- display: flex;
- align-items: center;
- justify-content: space-around;
- flex-direction: column;
- position: relative;
- top: vww(20);
- &-block {
- width: 690rpx;
- min-height: 478rpx;
- background: #ffffff;
- box-shadow: 0rpx 0rpx 14rpx 0rpx rgba(73, 120, 240, 0.14), 0rpx 7rpx 45rpx 0rpx rgba(73, 120, 240, 0.12);
- border-radius: 20rpx;
- display: flex;
- flex-direction: column;
- justify-content: space-between;
- margin-top: vww(8);
- .block-main {
- width: 636rpx;
- margin: vww(10) vww(14);
- }
- }
- }
- // 鏂板缓杞﹂槦
- .addNewGroup {
- .u-popup {
- .u-popup__content {
- width: 94%;
- height: vww(160);
- border-radius: 1%;
- .title {
- width: 100%;
- text-align: center;
- font-size: 20;
- .u-text {
- .u-text__value {
- }
- }
- }
- .addCarForm {
- width: 80%;
- margin: 0 auto vww(30);
- }
- .addCarButton {
- width: 40%;
- margin: 0 auto;
- color: rgb(10, 108, 255);
- }
+
+ .utils-button {
+ margin-top: vww(35);
+
+ .utils {
+ margin-top: vww(10);
+ margin-bottom: vww(10);
+
+ /deep/ .u-button {
+ width: 631rpx;
+ height: 74rpx;
+ border: 2px solid #3b56eb;
+ background-color: #fff;
+ color: #3b56eb;
+ border-radius: 37rpx 37rpx 37rpx 37rpx;
}
}
}
- .fleet-container {
- .fleet-list {
- .u-swipe-action {
- .u-swipe-action-item {
- .u-swipe-action-item__right {
- .u-swipe-action-item__right__button {
- .u-swipe-action-item__right__button__wrapper {
- background-color: #f56c6c !important;
+ ::v-deep.freightForwarder-my {
+ width: 100%;
+ margin: vww(90) auto;
+
+ .driver-banner {
+ width: 100%;
+ height: 430rpx;
+ background: linear-gradient(0deg, #ffffff 0%, #0055fe 100%);
+ background-size: contain;
+ position: fixed;
+ top: 0;
+
+ .navgation {
+ width: 80rpx;
+ height: 37rpx;
+ font-size: 40rpx;
+ font-weight: normal;
+ color: #ffffff;
+ line-height: 69rpx;
+ margin: vww(60) auto;
+ }
+ }
+
+ .personal-information {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: space-around;
+ flex-direction: column;
+ position: relative;
+ top: vww(20);
+
+ &-block {
+ width: 690rpx;
+ min-height: 478rpx;
+ background: #ffffff;
+ box-shadow: 0rpx 0rpx 14rpx 0rpx rgba(73, 120, 240, 0.14), 0rpx 7rpx 45rpx 0rpx rgba(73, 120, 240, 0.12);
+ border-radius: 20rpx;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+ margin-top: vww(8);
+
+ .block-main {
+ width: 636rpx;
+ margin: vww(10) vww(14);
+ }
+ }
+ }
+
+ // 鏂板缓杞﹂槦
+ .addNewGroup {
+ .u-popup {
+ .u-popup__content {
+ width: 94%;
+ height: vww(160);
+ border-radius: 1%;
+
+ .title {
+ width: 100%;
+ text-align: center;
+ font-size: 20;
+
+ .u-text {
+ .u-text__value {}
+ }
+ }
+
+ .addCarForm {
+ width: 80%;
+ margin: 0 auto vww(30);
+ }
+
+ .addCarButton {
+ width: 40%;
+ margin: 0 auto;
+ color: rgb(10, 108, 255);
+ }
+ }
+ }
+ }
+
+ .fleet-container {
+ .fleet-list {
+ .u-swipe-action {
+ .u-swipe-action-item {
+ .u-swipe-action-item__right {
+ .u-swipe-action-item__right__button {
+ .u-swipe-action-item__right__button__wrapper {
+ background-color: #f56c6c !important;
+ }
}
}
}
}
}
}
+
+ .modifyPwd {
+ width: 100%;
+ border: 1rpx solid rgb(220, 223, 230);
+ }
}
-}
-</style>
+</style>
\ No newline at end of file
--
Gitblit v1.9.1