add

api/address.js

@@ -24,9 +24,9 @@ export const brigadeListApi = (data) => {
 }
 
 export const getMassageCode = (data) => {
-	return request.post('/brigade', data);
+	return request.get('/user/user/send_sms', data);
 }
 
 export const setPayPassword = (data) => {
-	return request.post('/brigade', data);
+	return request.post('/user/user/set_payPassword', data);
 }

pagesOrder/setPayPassword/index.vue

@@ -1,11 +1,15 @@
 <template>
 	<view class='card'>
-		<up-input v-model="form.phone" placeholder="手机号" border="none"></up-input>
+		<up-input v-model="form.phone" placeholder="手机号" border="none" readonly></up-input>
-		<up-line color="#D3E3FD" style="margin: 30rpx 0;"></up-line>
+		<view style="margin: 30rpx 0;">
+			<up-line color="#D3E3FD"></up-line>
+		</view>
 		<view style="display: flex;justify-content: space-between;align-items: center;">
 			<up-input v-model="form.code" placeholder="验证码" border="none" type='number'></up-input>
 			<view class="code-btn">
-				<up-line color="grey" direction="col" length="30rpx" style="margin: 0 20rpx;"></up-line>
+				<view style="margin: 0 20rpx;">
+					<up-line color="grey" direction="col" length="30rpx"></up-line>
+				</view>
 				<text class='btn-text' style="color: grey;" v-if='cutDown'>重新获取({{cutDown}})</text>
 				<text @click="getCode" class='btn-text' v-else> {{flag?'获取验证码':'重新获取' }} </text>
 			</view>
@@ -17,7 +21,9 @@
 			<up-input style="pointer-events: none;" v-model="form.password" placeholder="请输入你的密码" border="none"
 				readonly></up-input>
 		</view>
-		<up-line color="#D3E3FD" style="margin: 30rpx 0;"></up-line>
+		<view style="margin: 30rpx 0;">
+			<up-line color="#D3E3FD"></up-line>
+		</view>
 		<view @click="showKeyBorad=true,type=2">
 			<up-input style="pointer-events: none;" v-model="form.rePassword" placeholder="请再次输入你的密码" border="none"
 				readonly></up-input>
@@ -61,7 +67,7 @@
 
 
 	const getCode = async () => {
-		if (!checkPhone(phone.value)) return uni.$u.toast('请输入正确的手机号')
+		if (!checkPhone(form.phone)) return uni.$u.toast('请输入正确的手机号')
 		await getMassageCode()
 		flag.value = false
 		cutDown.value = 10
@@ -100,7 +106,9 @@
 	const submit = async () => {
 		if (!form.code) return uni.$u.toast('请输入验证码');
 		if (form.password !== form.rePassword) return uni.$u.toast('两次密码不一致');
-		await setPayPassword(...form)
+		await setPayPassword({
+			...form
+		})
 		uni.$u.toast('设置成功')
 		setTimeout(() => {
 			uni.navigateBack()

pagesOrder/settle/settle.vue

@@ -154,9 +154,11 @@
 			@change="changeShop" @search="searchShop" />
 		<modal title="尚未设置收货地址" content="您还没有添加收货地址，请点击添加" cancleText="添加地址" confirmText="继续支付" :show="toastAddressShow"
 			@close="addAddress" @change="goPay" />
-		<ZyPasswordboard v-model:visible="passwordBoardVisible" v-bind="passwordBoardProps" />
+		<ZyPasswordboard v-if='passwordBoardVisible' v-model:visible="passwordBoardVisible" v-bind="passwordBoardProps"
-		<!-- <modal title="是否要拨打电话" :content="`即将拨打电话${phone}`" cancleText="取消" confirmText="拨打" :show="callShow" @close="callShow = false"
+			@close='closeKeyBord' />
-      @change="onCall" /> -->
+		<up-modal :show="showModal" title="您还没设置密码" :closeOnClickOverlay="true" zoom confirmText='去设置' showCancelButton
+			@close='showModal=false' @cancel='showModal=false' @confirm="navgo('/pagesOrder/setPayPassword/index')"
+			confirmColor='#27B52F' cancelText='取消'></up-modal>
 	</view>
 </template>
 
@@ -178,6 +180,7 @@
 		checkOrderApi
 	} from "@/api/cart.js";
 	import {
+		userInfoApi,
 		addressListsApi,
 		merchantListApi
 	} from "@/api/user.js";
@@ -298,14 +301,6 @@
 	const searchShop = (e) => {
 		getMerchantList(e)
 	}
-
-	// 拨打电话
-	// const callShow = ref(false)
-	// const phone = ref('');
-	// const callphone = (e) => {
-	//   callShow.value = true;
-	//   phone.value = e;
-	// }
 	const onCall = (e) => {
 		uni.makePhoneCall({
 			phoneNumber: e,
@@ -361,30 +356,25 @@
 
 	// 支付密码
 	const passwordBoardVisible = ref(false);
-	const handleItemClick = () => {
+
-		passwordBoardVisible.value = true;
-	};
 	const passwordBoardProps = {
 		title: '输入支付密码',
 		onComplete(value) {
-			console.log(value);
+			password.value = value
+			passwordBoardVisible.value = false
+			payFn()
 		}
 	};
 
+	const closeKeyBord = () => {
+		password.value = ''
+	}
 
-
+	const password = ref('')
-	const createOrder = () => {
+	const payFn = () => {
-		if (!pay_type.value) return uni.$u.toast('请选择支付方式');
 		let shareInfo = uni.getStorageSync('SHARE_INFO');
-
-
-		if (pay_type.value == 3 || pay_type.value == 17) {
-			passwordBoardVisible.value = true
-			return
-		}
-
-
 		createOrderApi({
+			password: password.value,
 			spread_uid: (shareInfo && shareInfo.uid) ? shareInfo.uid : '',
 			cart_id: cartStore.cartList,
 			address_id: addressInfo.value.address_id,
@@ -447,6 +437,24 @@
 		})
 	}
 
+	const showModal = ref(false)
+	const navgo = (url) => {
+		showModal.value &&= false
+		uni.navigateTo({
+			url
+		})
+	}
+
+	const createOrder = async () => {
+		if (!pay_type.value) return uni.$u.toast('请选择支付方式');
+		if (pay_type.value == 3 || pay_type.value == 18) {
+			let res = await userInfoApi()
+			return res.data.pay_password ? passwordBoardVisible.value = true : showModal.value = true
+		}
+		payFn()
+	}
+
+
 	const c_price = (price, index = 0) => {
 		price = price + '';
 		return price.split('.')[index] || (index ? '00' : '0');