From c15dbd1b5dd10cc1b51d8d88188e6b6bd889b54f Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Tue, 11 Jun 2024 01:07:56 +0800
Subject: [PATCH] uu
---
common/api/user.js | 2 +-
.../buns-post-edit-templates/bpe-cost-tmp.vue | 42 +++++++------
.../bpe-gooditem-edit-tmp.vue | 2 +-
.../bpe-goodstatic-tmp.vue | 63 ++++++++++---------
components/tpx-input/tpx-input.vue | 6 +-
pages/login/login.vue | 10 ++-
pages/post/model.js | 4 ++
pages/post/openorder.vue | 16 +++++
pages/user/updatePassword.vue | 8 ++-
9 files changed, 98 insertions(+), 55 deletions(-)
diff --git a/common/api/user.js b/common/api/user.js
index 867319d..f4c3be7 100644
--- a/common/api/user.js
+++ b/common/api/user.js
@@ -9,5 +9,5 @@ export const getInfoByApp = (data = {})=> {
return coreRequest(url.getInfoByApp, data, {}, 'GET')
}
export const updatePwdByApp = (data = {})=> {
- return coreRequest(url.updatePwdByApp, data, {})
+ return coreRequest(url.updatePwdByApp, data, {}, 'GET')
}
diff --git a/components/buns-post-edit-templates/bpe-cost-tmp.vue b/components/buns-post-edit-templates/bpe-cost-tmp.vue
index cf16c9f..1c4d0b1 100644
--- a/components/buns-post-edit-templates/bpe-cost-tmp.vue
+++ b/components/buns-post-edit-templates/bpe-cost-tmp.vue
@@ -32,31 +32,39 @@
- 应收: {{item.fee || 0}}
+ {{item.feeName}}
-
- {{item.feeName}}
-
-
-
- 续重单价
-
-
首重费
+
+ 续重单价
+
+
-
+
+
+ 应收: {{item.fee || 0}}
+
+
+ 实收
+
+
+
+
+
+
@@ -71,14 +79,12 @@
-
+
总费用
-
+
-
-
- {{modelInfo.freight || 0}}CNY
+ :disabled="modelInfo.calcFeeType!=3"
+ inputAlign="right" custom-style="height: 46rpx;" suffix="CNY">
diff --git a/components/buns-post-edit-templates/bpe-gooditem-edit-tmp.vue b/components/buns-post-edit-templates/bpe-gooditem-edit-tmp.vue
index c105d9b..ff2d598 100644
--- a/components/buns-post-edit-templates/bpe-gooditem-edit-tmp.vue
+++ b/components/buns-post-edit-templates/bpe-gooditem-edit-tmp.vue
@@ -119,7 +119,7 @@
.yditem{
padding: 20rpx 20rpx;
// background-color: #F6F6F6;
- background-color: #e1e1e1;
+ background-color: #F6F6F6;
border-radius: 10rpx;
margin-bottom: 20rpx;
}
diff --git a/components/buns-post-edit-templates/bpe-goodstatic-tmp.vue b/components/buns-post-edit-templates/bpe-goodstatic-tmp.vue
index 443aa03..b78cfb4 100644
--- a/components/buns-post-edit-templates/bpe-goodstatic-tmp.vue
+++ b/components/buns-post-edit-templates/bpe-goodstatic-tmp.vue
@@ -6,12 +6,7 @@
-
-
- 包装类型
-
-
-
+
@@ -20,21 +15,6 @@
-
-
- 产地{{item.nationArea}}
-
-
-
-
- 件数 {{item.cargoQty}}
-
-
-
-
- 单价{{item.price}} CNY
-
-
尺寸
@@ -43,12 +23,29 @@
{{item.length || '0'}}cm
-
+
- 体积
- {{item.volume || '0'}}m³
+ 产地{{item.nationArea}}
+
+
+
+ 件数 {{item.cargoQty}}
+
+
+ 体积
+ {{item.volume || '0'}}m³
+
+
+
+
+
+ 单价{{item.price}} CNY
+
+
+
+
@@ -71,29 +68,29 @@
- {{modelInfo.billWeight || '-'}}
+ {{modelInfo.volumeWeight || '-'}}
kg
- 实际重量
+ 体积重量
-
+
- {{modelInfo.volumeWeight || '-'}}
+ {{modelInfo.billWeight || '-'}}
kg
- 体积重量
+ 实际重量
@@ -105,6 +102,12 @@
+
+
+ 包装类型
+
+
+
diff --git a/components/tpx-input/tpx-input.vue b/components/tpx-input/tpx-input.vue
index 85f1657..5d1893f 100644
--- a/components/tpx-input/tpx-input.vue
+++ b/components/tpx-input/tpx-input.vue
@@ -17,7 +17,11 @@
inputStyle(){
let bgColor = '#F6F6F6'
let sty1 = 'border:0;border-radius: 10rpx;padding: 11rpx 20rpx;'
- if(this.isWhite) {
+ // if(this.isWhite) {
+ // bgColor = '#fff'
+ // sty1 += 'border: 1rpx solid #dadbde;'
+ // }
+ if(true) {
bgColor = '#fff'
sty1 += 'border: 1rpx solid #dadbde;'
}
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 179ac55..84c2a35 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -56,7 +56,7 @@
data() {
return {
submitParams: {
- // isEncrypt: true,
+ isEncrypt: true,
username: '',
password: '',
remberPassport: []
@@ -80,8 +80,12 @@
const { submitParams } = this
this.showLoading()
try{
- await this.$store.dispatch(USERKEY.LOGIN, { ...submitParams,
- // password: encrypt(submitParams.password)
+ await this.$store.dispatch(USERKEY.LOGIN, {
+ ...submitParams,
+ ...(submitParams.isEncrypt ? {
+ password: encrypt(submitParams.password),
+ username: encrypt(submitParams.username),
+ } : {})
})
await this.$store.dispatch(USERKEY.GETUSERINFO)
setSessionLoginInfo(submitParams)
diff --git a/pages/post/model.js b/pages/post/model.js
index 932c261..4f9401a 100644
--- a/pages/post/model.js
+++ b/pages/post/model.js
@@ -154,5 +154,9 @@ export const getOrderModels = () => {
blSpecialQuote: 0, // 特殊报价
blSpecialGoods: 0, // 敏感物
+ blGenSubbill: '1', // 生成子单
+ custOrderId: '', // 合同号
+
+
}
}
\ No newline at end of file
diff --git a/pages/post/openorder.vue b/pages/post/openorder.vue
index 14c81a6..3e82298 100644
--- a/pages/post/openorder.vue
+++ b/pages/post/openorder.vue
@@ -177,6 +177,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/user/updatePassword.vue b/pages/user/updatePassword.vue
index c72e577..39ea06a 100644
--- a/pages/user/updatePassword.vue
+++ b/pages/user/updatePassword.vue
@@ -35,9 +35,11 @@