From c636483eef9fcdf1805f6a968914bf95255de2fc Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期三, 26 七月 2023 09:26:33 +0800
Subject: [PATCH] 修改错误
---
pages/customer-page/customer-my/userMange/userMange.vue | 319 +++++++++++++++++++++++++-------------------
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue | 4
pages.json | 20 +-
pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail.vue | 60 +++++--
pages/customer-page/customer-my/faYunstatistics/faYunstatistics.vue | 4
pages/driver-page/driver-index/driver-index.vue | 2
6 files changed, 235 insertions(+), 174 deletions(-)
diff --git a/pages.json b/pages.json
index 37dfe0e..3fa499a 100644
--- a/pages.json
+++ b/pages.json
@@ -162,7 +162,7 @@
{
"path": "pages/driver-page/driver-index/bill-of-lading-details/punchTheClock/punchTheClock",
"style": {
- "navigationBarTitleText": "鐭垮満绛惧埌",
+ "navigationBarTitleText": "浠撳簱绛惧埌",
"enablePullDownRefresh": false
}
},
@@ -224,17 +224,15 @@
"enablePullDownRefresh": false
}
+ }, {
+ "path": "pages/login/PrivacyAgreementText/PrivacyAgreementText",
+ "style": {
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": false
+ }
+
}
- ,{
- "path" : "pages/login/PrivacyAgreementText/PrivacyAgreementText",
- "style" :
- {
- "navigationBarTitleText": "",
- "enablePullDownRefresh": false
- }
-
- }
- ],
+ ],
"subPackages": [{
"root": "pages/register",
"pages": [{
diff --git a/pages/customer-page/customer-my/faYunstatistics/faYunstatistics.vue b/pages/customer-page/customer-my/faYunstatistics/faYunstatistics.vue
index 96537cd..17f7386 100644
--- a/pages/customer-page/customer-my/faYunstatistics/faYunstatistics.vue
+++ b/pages/customer-page/customer-my/faYunstatistics/faYunstatistics.vue
@@ -134,7 +134,7 @@
</view>
</view>
<view class="filter-body">
- <view class="condition-name">鐓ょ</view>
+ <view class="condition-name">鍝佺</view>
<view class="filter-name">
<view class="filter-button"
v-for="(item, index) in coalList"
@@ -224,7 +224,7 @@
</view>
</view>
<view class="filter-body">
- <view class="condition-name">鐭垮満</view>
+ <view class="condition-name">浠撳簱</view>
<view class="filter-name">
<view class="filter-button"
v-for="(item, index) in filedList"
diff --git a/pages/customer-page/customer-my/userMange/userMange.vue b/pages/customer-page/customer-my/userMange/userMange.vue
index 694e387..82bbc06 100644
--- a/pages/customer-page/customer-my/userMange/userMange.vue
+++ b/pages/customer-page/customer-my/userMange/userMange.vue
@@ -1,24 +1,52 @@
<template>
<view>
- <u-empty mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png" textSize="30" iconSize="1000" v-if="userList.length == 0"></u-empty>
+ <u-empty mode="data"
+ icon="http://cdn.uviewui.com/uview/empty/data.png"
+ textSize="30"
+ iconSize="1000"
+ v-if="userList.length == 0"></u-empty>
<u-list @scrolltolower="scrolltolower">
- <u-list-item v-for="(item, index) in userList" :key="index">
- <u-cell size="large" center :label="item.deptNames">
- <view slot="title" class="u-slot-title">
+ <u-list-item v-for="(item, index) in userList"
+ :key="index">
+ <u-cell size="large"
+ center
+ :label="item.deptNames">
+ <view slot="title"
+ class="u-slot-title">
<text class="u-cell-text">{{ item.name }}</text>
</view>
- <view slot="value" class="u-slot-value">
- <u-tag text="鏌ョ湅" type="primary" plain size="mini" icon="eye" @click="viewInfo(item)"></u-tag>
- <u-tag text="缂栬緫" type="primary" plain size="mini" icon="edit-pen" @click="editInfo(item)"></u-tag>
- <u-tag text="鍒犻櫎" type="warning" plain size="mini" icon="trash" @click="deleteInfo(item)"></u-tag>
+ <view slot="value"
+ class="u-slot-value">
+ <u-tag text="鏌ョ湅"
+ type="primary"
+ plain
+ size="mini"
+ icon="eye"
+ @click="viewInfo(item)"></u-tag>
+ <u-tag text="缂栬緫"
+ type="primary"
+ plain
+ size="mini"
+ icon="edit-pen"
+ @click="editInfo(item)"></u-tag>
+ <u-tag text="鍒犻櫎"
+ type="warning"
+ plain
+ size="mini"
+ icon="trash"
+ @click="deleteInfo(item)"></u-tag>
</view>
</u-cell>
</u-list-item>
</u-list>
- <u-popup :show="infoShow" mode="center" :round="10" :closeable="true" @close="close">
+ <u-popup :show="infoShow"
+ mode="center"
+ :round="10"
+ :closeable="true"
+ @close="close">
<view class="info-main">
<view class="info-block">
- <view class="info-block_label">鏈嶅姟鐭垮満</view>
+ <view class="info-block_label">鏈嶅姟浠撳簱</view>
<view class="info-block_value">{{ userInfo.deptNames }}</view>
</view>
<view class="info-block">
@@ -35,144 +63,159 @@
</view>
</view>
</u-popup>
- <view class="add-icon" @click.stop="addUser"><u-icon name="plus" color="#fff" size="40"></u-icon></view>
- <u-modal :show="deleteShow" title="鍒犻櫎" content="纭鍒犻櫎?" @confirm="deleteConfirm" @cancel="deleteCancel" :showCancelButton="true"></u-modal>
+ <view class="add-icon"
+ @click.stop="addUser"><u-icon name="plus"
+ color="#fff"
+ size="40"></u-icon></view>
+ <u-modal :show="deleteShow"
+ title="鍒犻櫎"
+ content="纭鍒犻櫎?"
+ @confirm="deleteConfirm"
+ @cancel="deleteCancel"
+ :showCancelButton="true"></u-modal>
</view>
</template>
<script>
-export default {
- data() {
- return {
- userList: [],
- infoShow: false,
- userInfo: {},
- deleteShow: false,
- userId: ''
- };
- },
- onShow() {
- this.getappUserPage();
- },
- methods: {
- close() {
- this.infoShow = false;
+ export default {
+ data() {
+ return {
+ userList: [],
+ infoShow: false,
+ userInfo: {},
+ deleteShow: false,
+ userId: ''
+ };
},
- getappUserPage() {
- uni.showLoading({
- title: '鍔犺浇涓�'
- });
- this.$reqGet('appUserPage').then(res => {
- this.userList = res.data.records;
- uni.hideLoading();
- });
+ onShow() {
+ this.getappUserPage();
},
- scrolltolower() {},
- // 鏌ョ湅淇℃伅
- viewInfo(v) {
- uni.showLoading({
- title: '鍔犺浇涓�'
- });
- this.$reqGet('getAppById', { userId: v.userId.toString() }).then(res => {
- if (res.code == 0) {
- uni.hideLoading();
- this.userInfo = res.data;
- this.infoShow = true;
- } else {
- this.$u.toast('鍔犺浇澶辫触');
- }
- });
- },
- // 缂栬緫淇℃伅
- editInfo(v) {
- uni.navigateTo({
- url: `/pages/customer-page/customer-my/userMange/userManageEdit/userManageEdit?userId=${v.userId}`
- });
- },
- // 鍒犻櫎淇℃伅
- deleteInfo(v) {
- this.userId = v.userId.toString();
- this.deleteShow = true;
- },
- deleteConfirm() {
- uni.showLoading({
- title: '鍔犺浇涓�'
- });
- this.$reqPost('appRemoveById', { userId: this.userId }, 'params')
- .then(res => {
- if (res.code === 0) {
- uni.hideLoading();
- this.$u.toast('鍒犻櫎鎴愬姛');
- this.deleteShow = false;
- } else {
- uni.hideLoading();
- this.$u.toast('鍒犻櫎澶辫触');
- this.deleteShow = false;
- }
- })
- .then(() => {
- this.getappUserPage();
+ methods: {
+ close() {
+ this.infoShow = false;
+ },
+ getappUserPage() {
+ uni.showLoading({
+ title: '鍔犺浇涓�'
});
- },
- deleteCancel() {
- this.deleteShow = false;
- },
- // 鐐瑰嚮娣诲姞鎸夐挳
- addUser() {
- uni.navigateTo({
- url: '/pages/customer-page/customer-my/userMange/userManageEdit/userManageEdit'
- });
+ this.$reqGet('appUserPage').then(res => {
+ this.userList = res.data.records;
+ uni.hideLoading();
+ });
+ },
+ scrolltolower() {},
+ // 鏌ョ湅淇℃伅
+ viewInfo(v) {
+ uni.showLoading({
+ title: '鍔犺浇涓�'
+ });
+ this.$reqGet('getAppById', { userId: v.userId.toString() }).then(res => {
+ if (res.code == 0) {
+ uni.hideLoading();
+ this.userInfo = res.data;
+ this.infoShow = true;
+ } else {
+ this.$u.toast('鍔犺浇澶辫触');
+ }
+ });
+ },
+ // 缂栬緫淇℃伅
+ editInfo(v) {
+ uni.navigateTo({
+ url: `/pages/customer-page/customer-my/userMange/userManageEdit/userManageEdit?userId=${v.userId}`
+ });
+ },
+ // 鍒犻櫎淇℃伅
+ deleteInfo(v) {
+ this.userId = v.userId.toString();
+ this.deleteShow = true;
+ },
+ deleteConfirm() {
+ uni.showLoading({
+ title: '鍔犺浇涓�'
+ });
+ this.$reqPost('appRemoveById', { userId: this.userId }, 'params')
+ .then(res => {
+ if (res.code === 0) {
+ uni.hideLoading();
+ this.$u.toast('鍒犻櫎鎴愬姛');
+ this.deleteShow = false;
+ } else {
+ uni.hideLoading();
+ this.$u.toast('鍒犻櫎澶辫触');
+ this.deleteShow = false;
+ }
+ })
+ .then(() => {
+ this.getappUserPage();
+ });
+ },
+ deleteCancel() {
+ this.deleteShow = false;
+ },
+ // 鐐瑰嚮娣诲姞鎸夐挳
+ addUser() {
+ uni.navigateTo({
+ url: '/pages/customer-page/customer-my/userMange/userManageEdit/userManageEdit'
+ });
+ }
}
- }
-};
+ };
</script>
-<style lang="scss" scoped>
-@mixin flex {
- display: flex;
- justify-content: space-between;
- align-items: center;
-}
-/deep/ .u-slot-value {
- width: 150px;
- height: 60px;
- @include flex;
-}
-.info-main {
- width: 690rpx;
- height: 600rpx;
- @include flex;
- flex-direction: column;
- padding: vww(10);
- box-shadow: 0rpx 0rpx 14rpx 0rpx rgba(73, 120, 240, 0.14), 0rpx 7rpx 45rpx 0rpx rgba(73, 120, 240, 0.12);
- .info-block {
- width: 94%;
- height: 120rpx;
+<style lang="scss"
+ scoped>
+ @mixin flex {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ }
+
+ /deep/ .u-slot-value {
+ width: 150px;
+ height: 60px;
@include flex;
- border-bottom: 1px solid #d6d6d6;
- &_label {
- line-height: 28rpx;
- font-size: 28rpx;
- font-weight: 300;
- color: #303030;
- }
- &_value {
- line-height: 28rpx;
- font-size: 28rpx;
- font-weight: 300;
- color: #303030;
+ }
+
+ .info-main {
+ width: 690rpx;
+ height: 600rpx;
+ @include flex;
+ flex-direction: column;
+ padding: vww(10);
+ box-shadow: 0rpx 0rpx 14rpx 0rpx rgba(73, 120, 240, 0.14), 0rpx 7rpx 45rpx 0rpx rgba(73, 120, 240, 0.12);
+
+ .info-block {
+ width: 94%;
+ height: 120rpx;
+ @include flex;
+ border-bottom: 1px solid #d6d6d6;
+
+ &_label {
+ line-height: 28rpx;
+ font-size: 28rpx;
+ font-weight: 300;
+ color: #303030;
+ }
+
+ &_value {
+ line-height: 28rpx;
+ font-size: 28rpx;
+ font-weight: 300;
+ color: #303030;
+ }
}
}
-}
-.add-icon {
- position: fixed;
- bottom: vww(60);
- right: vww(20);
- width: 89rpx;
- height: 89rpx;
- border-radius: 50%;
- background: #035cfb;
- @include flex;
- justify-content: center;
-}
-</style>
+
+ .add-icon {
+ position: fixed;
+ bottom: vww(60);
+ right: vww(20);
+ width: 89rpx;
+ height: 89rpx;
+ border-radius: 50%;
+ background: #035cfb;
+ @include flex;
+ justify-content: center;
+ }
+</style>
\ No newline at end of file
diff --git a/pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail.vue b/pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail.vue
index 9fdf498..6e48a53 100644
--- a/pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail.vue
+++ b/pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail.vue
@@ -57,7 +57,8 @@
</view>
</view>
<view class="notice-num">
- <view class="num-text">
+ <view class="num-text"
+ style="margin-left: 10rpx;">
<u--text text="閫氱煡鏁伴噺"
size='32'></u--text>
</view>
@@ -78,11 +79,17 @@
<u--text text="涓嶅悎鏍煎搧鍚�"
size='32'></u--text>
</view>
- <view class="tag-select">
+ <view class="tag-select"
+ @click="selectunqualifiedBreed(i)">
+ <text>
+ {{item.unqualifiedBreed||'璇烽�夋嫨'}}
+ </text>
+ </view>
+ <!-- <view class="tag-select">
<u-tag :text="item.unqualifiedBreed||'璇烽�夋嫨'"
plain
@click='selectunqualifiedBreed(i)'></u-tag>
- </view>
+ </view> -->
</view>
<view class="notice-num">
<view class="num-text">
@@ -108,27 +115,32 @@
<u--text text="鐗╄祫鏄庣粏"
size='32'></u--text>
</view>
- <view class="tag-select">
- <view class="tag-select_text"
- @click="goodsPopoverShow(i)"
- v-if='roleType===4'>
- <text>
- {{item.breed+item.spec||item.modifygoodsName||'鏆傛棤'}}
- </text>
- </view>
+ <view class="tag-select"
+ @click="goodsPopoverShow(i)"
+ v-if='roleType===4'>
+ <text>
+ {{item.breed+item.spec||item.modifygoodsName||'鏆傛棤'}}
+ </text>
</view>
</view>
<view class="level"
v-if='item.modifygoodsName||flag'>
- <view style="width: 200rpx;">
+ <view style="width: 180rpx;">
<u--text text="鍝佸悕涓庤鏍�"
size='32'></u--text>
</view>
- <view v-if="showWeighCopy[i].modifyProductName||item.breed&&item.spec">
+ <view class="tag-select"
+ @click="productNamePopoverShow(i)"
+ v-if="showWeighCopy[i].modifyProductName||item.breed&&item.spec">
+ <text>
+ {{!flag?showWeighCopy[i].modifyProductName:item.breed+item.spec}}
+ </text>
+ </view>
+ <!-- <view v-if="showWeighCopy[i].modifyProductName||item.breed&&item.spec">
<u-tag :text="!flag?showWeighCopy[i].modifyProductName:(item.breed?item.breed+item.spec:'璇烽�夋嫨')"
plain
@click="productNamePopoverShow(i)"></u-tag>
- </view>
+ </view> -->
</view>
<view style="display: flex;margin-top: 20rpx;margin-left: 20rpx;"
v-if="item.isImage">
@@ -575,21 +587,29 @@
}
.level {
- width: 96%;
+ width: 89%;
margin: 30rpx 80rpx;
display: flex;
justify-content: flex-start;
.tag-select {
- // flex: 0.7;
+ flex: 1;
margin-left: 14rpx;
text-align: center;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ border: 1rpx solid rgb(60, 156, 255);
+ padding: 8rpx 14rpx;
+ color: rgb(60, 156, 255);
+ font-size: 26rpx;
.tag-select_text {
- border: 1rpx solid rgb(60, 156, 255);
- padding: 8rpx 14rpx;
- color: rgb(60, 156, 255);
- font-size: 26rpx;
+ // width: vww(180);
+ // border: 1rpx solid rgb(60, 156, 255);
+ // padding: 8rpx 14rpx;
+ // color: rgb(60, 156, 255);
+ // font-size: 26rpx;
}
}
}
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 f294eaf..cc8e129 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
@@ -29,7 +29,7 @@
<view class="main-information"
v-if="weighList.orderType=='杞叆'||weighList.orderType=='杞嚭'">
<view class="prefix">
- 鍙戣揣鍦扮叅鍦�:
+ 鍙戣揣鍦板熀鍦�:
</view>
<view class="suffix">
{{ weighList.filedName || '' }}
@@ -38,7 +38,7 @@
<view class="main-information"
v-if="weighList.orderType=='杞叆'||weighList.orderType=='杞嚭'">
<view class="prefix">
- 鏀惰揣鍦扮叅鍦�:
+ 鏀惰揣鍦板熀鍦�:
</view>
<view class="suffix">
{{ weighList.toFiledName || '' }}
diff --git a/pages/driver-page/driver-index/driver-index.vue b/pages/driver-page/driver-index/driver-index.vue
index 4821623..9129f11 100644
--- a/pages/driver-page/driver-index/driver-index.vue
+++ b/pages/driver-page/driver-index/driver-index.vue
@@ -269,7 +269,7 @@
fleetId: '',
xsUserId: '',
customerId: '',
- coalStatus: ['鏈О閲�', '绉伴噸涓�', '楠岃川涓�', '绉伴噸瀹屾垚'],
+ coalStatus: ['鏈О閲�', '绉伴噸涓�', '楠岃川涓�', '绉伴噸瀹屾垚', '楠岃川瀹屾垚'],
onlineurl,
};
},
--
Gitblit v1.9.1