From a186c559c150cdbdd06b3c7b207a0a8d2dabe0d4 Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Sun, 9 Jun 2024 02:06:43 +0800
Subject: [PATCH] uu
---
common/api/url.js | 3 +-
common/api/user.js | 3 ++
common/untool.js | 4 ++
common/validate.js | 4 ++
.../buns-order-templates/bo-detail-tmp.vue | 47 ++++++++++---------
.../bpe-addressjiami-tmp.vue | 10 +---
.../bpe-goodstatic-tmp.vue | 4 +-
pages/user/updatePassword.vue | 41 ++++++++++++----
8 files changed, 73 insertions(+), 43 deletions(-)
diff --git a/common/api/url.js b/common/api/url.js
index 883ce54..1d40df7 100644
--- a/common/api/url.js
+++ b/common/api/url.js
@@ -6,7 +6,8 @@ export default {
uploadFile: '/common/ossUpload',
loginByApp: `/loginByApp`, // 登录
getInfoByApp: `/getInfoByApp`,// 获取用户基本信息
- getStaffQRCodePng: `/emis/emisStaff/getStaffQRCodePng`,// 获取用户基本信息
+ updatePwdByApp: `/updatePwdByApp`,// 修改密码
+ getStaffQRCodePng: `/emis/emisStaff/getStaffQRCodePng`,// 获取用户二维码
getEmisCountry: `/emis/emisCountry/listSimple`, // 获取国家列表
getEmisRegion: `/emis/emisRegion/listSimple`,// 获取省市区列表
getDicDataJson: `/common/getDicDataJson`, // 获取枚举字段
diff --git a/common/api/user.js b/common/api/user.js
index 73b8166..867319d 100644
--- a/common/api/user.js
+++ b/common/api/user.js
@@ -8,3 +8,6 @@ export const loginByApp = (data = {})=> {
export const getInfoByApp = (data = {})=> {
return coreRequest(url.getInfoByApp, data, {}, 'GET')
}
+export const updatePwdByApp = (data = {})=> {
+ return coreRequest(url.updatePwdByApp, data, {})
+}
diff --git a/common/untool.js b/common/untool.js
index c261388..13f20e2 100644
--- a/common/untool.js
+++ b/common/untool.js
@@ -12,6 +12,10 @@ const tabBarUrls = [
]
const goto = (url, type = 1)=> {
+ if(!url) {
+ console.error("goto 缺少入参 url=========")
+ return
+ }
url = `/pages/${url}`
if(tabBarUrls.indexOf(url) > -1) {
return uni.switchTab({
diff --git a/common/validate.js b/common/validate.js
index c17bae1..d59cf2d 100644
--- a/common/validate.js
+++ b/common/validate.js
@@ -7,6 +7,10 @@ const checkParams = (param, validConfig)=> {
if(!errMsg && itemConf.required && !param[key]) {
errMsg = itemConf.requiredMsg || `${itemConf.label}不能为空`
}
+ let customerValidMsg = itemConf?.validMsgFun?.({ val: param })
+ if(!errMsg && customerValidMsg) {
+ errMsg = customerValidMsg
+ }
})
if(errMsg) {
showToast(errMsg)
diff --git a/components/buns-order-templates/bo-detail-tmp.vue b/components/buns-order-templates/bo-detail-tmp.vue
index b0af809..c768cc7 100644
--- a/components/buns-order-templates/bo-detail-tmp.vue
+++ b/components/buns-order-templates/bo-detail-tmp.vue
@@ -190,6 +190,29 @@
+
+
+ 底单图片
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
物流动态
@@ -203,29 +226,7 @@
-
-
- 底单图片
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/components/buns-post-edit-templates/bpe-addressjiami-tmp.vue b/components/buns-post-edit-templates/bpe-addressjiami-tmp.vue
index 443b9aa..a1688e2 100644
--- a/components/buns-post-edit-templates/bpe-addressjiami-tmp.vue
+++ b/components/buns-post-edit-templates/bpe-addressjiami-tmp.vue
@@ -19,10 +19,7 @@
-
-
-
-
+
@@ -53,10 +50,7 @@
-
-
-
-
+
diff --git a/components/buns-post-edit-templates/bpe-goodstatic-tmp.vue b/components/buns-post-edit-templates/bpe-goodstatic-tmp.vue
index 9c68c1a..443aa03 100644
--- a/components/buns-post-edit-templates/bpe-goodstatic-tmp.vue
+++ b/components/buns-post-edit-templates/bpe-goodstatic-tmp.vue
@@ -3,9 +3,9 @@
货物名称 {{modelInfo.goodsInfo}}
-
+
包装类型
diff --git a/pages/user/updatePassword.vue b/pages/user/updatePassword.vue
index 4750c64..19edd9a 100644
--- a/pages/user/updatePassword.vue
+++ b/pages/user/updatePassword.vue
@@ -8,15 +8,15 @@
-
+
-
+
-
+
@@ -34,8 +34,10 @@