uu

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`, // 获取枚举字段

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, {})
+}

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({

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)

components/buns-order-templates/bo-detail-tmp.vue

@@ -190,6 +190,29 @@
 			</u-row>
 		</view>
 		
+		<view class="dt-block">
+			<view class="dt-tle">
+				<view class="t1">底单图片</view>
+				<view class="t2"></view>
+			</view>
+			<u-line margin="20rpx 0 20rpx"></u-line>
+			<view class="blcok-grey-sm" style="margin-top: 0;">
+				<bpd-pic-preview-tmp label="货物图片" :list="modelInfo.billPicGoodsRmk" ></bpd-pic-preview-tmp>
+			</view>
+			<view class="blcok-grey-sm mt-20">
+				<bpd-pic-preview-tmp label="揽收底单图片" :list="modelInfo.billPicSendRmk" ></bpd-pic-preview-tmp>
+			</view>
+			<!-- <view class="blcok-grey-sm mt-20">
+				<bpd-pic-preview-tmp label="收件进仓单图片TODO" :list="modelInfo.TODO" ></bpd-pic-preview-tmp>
+			</view> -->
+			<view class="blcok-grey-sm mt-20">
+				<bpd-pic-preview-tmp label="签收货物图片" :list="modelInfo.billPicDispatchRmk" ></bpd-pic-preview-tmp>
+			</view>
+			<!-- <view class="blcok-grey-sm mt-20">
+				<bpd-pic-preview-tmp label="签收签名图片TODO" :list="modelInfo.TODO" ></bpd-pic-preview-tmp>
+			</view> -->
+		</view>
+		
 		<view class="dt-block">
 			<view class="dt-tle">
 				<view class="t1">物流动态</view>
@@ -203,29 +226,7 @@
 			</view>
 		</view>
 		
-		<view class="dt-block">
+		
-			<view class="dt-tle">
-				<view class="t1">底单图片</view>
-				<view class="t2"></view>
-			</view>
-			<u-line margin="20rpx 0 20rpx"></u-line>
-			<view class="blcok-grey-sm" style="margin-top: 0;">
-				<bpd-pic-preview-tmp label="货物图片" :list="modelInfo.billPicGoodsRmk" ></bpd-pic-preview-tmp>
-			</view>
-			<view class="blcok-grey-sm mt-20">
-				<bpd-pic-preview-tmp label="揽收底单图片" :list="modelInfo.billPicSendRmk" ></bpd-pic-preview-tmp>
-			</view>
-			<u-line margin="20rpx 0 20rpx"></u-line>
-			<view class="blcok-grey-sm mt-20">
-				<bpd-pic-preview-tmp label="收件进仓单图片TODO" :list="modelInfo.TODO" ></bpd-pic-preview-tmp>
-			</view>
-			<view class="blcok-grey-sm mt-20">
-				<bpd-pic-preview-tmp label="签收货物图片" :list="modelInfo.billPicDispatchRmk" ></bpd-pic-preview-tmp>
-			</view>
-			<view class="blcok-grey-sm mt-20">
-				<bpd-pic-preview-tmp label="签收签名图片TODO" :list="modelInfo.TODO" ></bpd-pic-preview-tmp>
-			</view>
-		</view>
 		<view style="height: 30rpx;"></view>
 	</tpx-page>
 	

components/buns-post-edit-templates/bpe-addressjiami-tmp.vue

@@ -19,10 +19,7 @@
 					<u-text :text="sendDetail" size="26" color="#999"></u-text>
 				</view>
 			</view>
-			<view class="flex-column-center">
+			
-				<image style="height: 32rpx;width: 28rpx;" :src="getCdnUrl(`post/eye-off.svg`)">
-				</image>
-			</view>
 			<view style="position: absolute;left: 20rpx;bottom: -20rpx;top: 46rpx;">
 				<u-line custom-style="height:100%;" direction="col" dashed="true"></u-line>
 			</view>
@@ -53,10 +50,7 @@
 					<u-text :text="recieverDetail" size="26" color="#999"></u-text>
 				</view>
 			</view>
-			<view class="flex-column-center">
+			
-				<image style="height: 32rpx;width: 28rpx;" :src="getCdnUrl(`post/eye-line.svg`)">
-				</image>
-			</view>
 		</u-row>
 	</view>
 </template>

components/buns-post-edit-templates/bpe-goodstatic-tmp.vue

@@ -3,9 +3,9 @@
 		<view>
 			<text class="clr-sub pr-10">货物名称</text> {{modelInfo.goodsInfo}}
 		</view>
-		<view class="pt-10">
+		<!-- <view class="pt-10">
 			<text class="clr-sub pr-10">货物大类</text> {{modelInfo.goodsType}}
-		</view>
+		</view> -->
 		<view class="pt-10">
 			<u-row justify="">
 				<text class="clr-sub pr-10">包装类型</text> 

pages/user/updatePassword.vue

@@ -8,15 +8,15 @@
 						<view class="">
 							
 							<view class="">
-								<tpx-input type="password" v-model:value="submitParam.postCode" placeholder="原密码"></tpx-input>
+								<tpx-input type="password" v-model:value="submitParam.oldPassword" placeholder="原密码"></tpx-input>
 							</view>
 							
 							<view class="mt-30">
-								<tpx-input type="password" v-model:value="submitParam.postCode" placeholder="新密码"></tpx-input>
+								<tpx-input type="password" v-model:value="submitParam.newPassword" placeholder="新密码"></tpx-input>
 							</view>
 							
 							<view class="mt-30">
-								<tpx-input type="password" v-model:value="submitParam.postCode" placeholder="新确认密码"></tpx-input>
+								<tpx-input type="password" v-model:value="submitParam._confirmNewPassword" placeholder="新确认密码"></tpx-input>
 							</view>
 						</view>
 					</view>
@@ -34,8 +34,10 @@
 </template>
 
 <script>
+	import { USERKEY } from "@/store/actionKey"
 	import * as apiService from "@/common/api"
-	
+	import { checkParams } from "@/common/validate"
+	import { getSessionLoginInfo, setSessionLoginInfo } from "@/session"
 	export default {
 		props: {
 		},
@@ -48,8 +50,24 @@
 				
 				},
 				submitParam: {
-					
+					oldPassword: '',
-				}
+					newPassword: '',
+					_confirmNewPassword: '',
+				},
+				submitValidConfig: {
+					oldPassword: { required: true, requiredMsg: '原密码不能为空' },
+					newPassword: { required: true, requiredMsg: '新密码不能为空' },
+					_confirmNewPassword: { 
+						required: true, requiredMsg: '新确认密码不能为空', 
+						validMsgFun: ({ val })=> {
+							let msg = ''
+							if(val.newPassword != val._confirmNewPassword) {
+								msg = '新确认密码和新密码必须一样'
+							}
+							return msg
+						} 
+					},
+				},
 			}
 		},
 		onShareAppMessage() {
@@ -71,9 +89,14 @@
 			},
 			async handleSubmit() {
 				let params = { ...this.submitParam }
-				await apiService.TODO()
+				await checkParams(this.submitParam, this.submitValidConfig)
-				this.showToast("操作成功")
+				await apiService.updatePwdByApp(params)
-				this.goBack()
+				this.showToast("修改成功，请重新登录")
+				let info = getSessionLoginInfo()
+				delete info.password
+				setSessionLoginInfo()
+				await this.$store.dispatch(USERKEY.LOGOUT)
+				this.goto(`login/login`, 2)
 			},
 			
 		}