修复一些bug

pages/clue/post/index.vue

@@ -50,10 +50,10 @@
 				</view>
 			</view>
 		</view>
-		<view class="sendOrder inquiry" @click.stop="handleInquiry(item)">
+		<!-- <view class="sendOrder inquiry" @click.stop="handleInquiry(item)">
 			<image src='/static/publicClue/inquiry.png' mode="aspectFit" class="sendOrder_img"></image>
 			<view>询价</view>
-		</view>
+		</view> -->
 		<view class="sendOrder" @click.stop="handleSendOrder(item)">
 			<image src='/static/publicClue/littlePlane.png' mode="aspectFit" class="sendOrder_img"></image>
 			<view>发单</view>
@@ -261,6 +261,7 @@ export default {
 			height: 20px;
 		}
 	}
+
 	.inquiry {
 		right: 140rpx;
 		color: #2563eb;

pages/orderDetailNew/components/pageFour.vue

@@ -213,7 +213,7 @@
 
         <!-- 确认入库按钮 -->
         <div class="confirm-button-container">
-            <u-button type="success" @click="confirmWarehouseEntry" style="border-radius: 11px;">
+            <u-button class='next-btn' type="success" @click="confirmWarehouseEntry" style="border-radius: 11px;">
                 <u-icon name="checkmark-circle-fill" size="28rpx" color="#fff"></u-icon>
                 <text style="margin-left: 8rpx;">确认入库</text>
             </u-button>
@@ -221,7 +221,7 @@
 
         <!-- 组织选择 -->
         <u-picker :show="showOrgPicker" title="请选择组织" :columns="columnsOrgList" keyName="label"
-            @confirm="handleOrgConfirmOrg" @cancel='showOrgPicker = false'></u-picker>
+            @confirm="handleOrgConfirmOrg" @cancel=' showOrgPicker = false'></u-picker>
 
 
         <!-- 人员选择 -->
@@ -468,10 +468,10 @@ export default {
                 success: async (res) => {
                     if (res.confirm) {
                         //修改状态
-                        // await uni.$u.api.oderForm({
-                        //     status: "3",
-                        //     id: this.orderDetail.id,
-                        // });
+                        await uni.$u.api.oderForm({
+                            status: "3",
+                            id: this.orderDetail.id,
+                        });
 
                         await uni.$u.api.updateReceiptForm({
                             id: this.currentReceipt.id,
@@ -775,9 +775,12 @@ export default {
     white-space: nowrap;
 }
 
-
+::v-deep .u-form-item__body {
+    padding: 0;
+}
 
 // 图片上传样式
+
 .image-uploader {
     width: 100%;
     height: 65rpx;
@@ -1094,4 +1097,18 @@ export default {
 .delectBtn ::v-deep .u-button--mini {
     min-width: 20rpx !important;
 }
+
+
+
+.next-btn {
+    position: fixed;
+    bottom: 10rpx;
+    left: 2.5%;
+    width: 95%;
+    height: 80rpx;
+    line-height: 80rpx;
+    text-align: center;
+    @include font-styles($size: medium, $weight: bold, $color: #fff);
+    border-radius: 0rpx 0rpx 20rpx 20rpx;
+}
 </style>

pages/orderDetailNew/components/pageOne.vue

@@ -91,7 +91,8 @@
             </view>
         </view>
 
-        <u-button @click="handleNextClick" type="primary" size="middle" style="border-radius: 20rpx;">下一步</u-button>
+        <u-button class='next-btn' @click="handleNextClick" type="primary" size="middle"
+            style="border-radius: 20rpx;">下一步</u-button>
 
     </view>
 </template>
@@ -510,7 +511,7 @@ export default {
 .connect-card {
     flex: 1;
     @include card;
-    padding: 30rpx;
+    padding: 10rpx;
     display: flex;
     flex-direction: column;
     align-items: center;
@@ -542,4 +543,18 @@ export default {
     border-radius: 50%;
     box-shadow: 0 0 4rpx rgba(255, 77, 79, 0.3);
 }
+
+
+
+.next-btn {
+    position: fixed;
+    bottom: 10rpx;
+    left: 2.5%;
+    width: 95%;
+    height: 80rpx;
+    line-height: 80rpx;
+    text-align: center;
+    @include font-styles($size: medium, $weight: bold, $color: #fff);
+    border-radius: 0rpx 0rpx 20rpx 20rpx;
+}
 </style>

pages/orderDetailNew/components/pageThree.vue

@@ -11,7 +11,8 @@
                 </u-col>
                 <u-col span="5.8">
                     <view class="info-label">银行名称</view>
-                    <u-input v-model="paymentInfo.bankName" placeholder="请输入银行名称" class="info-input" />
+                    <u-input v-model="paymentInfo.bankName" placeholder="请输入银行名称" class="info-input"
+                        @input="handleBankNameInput" />
                 </u-col>
             </u-row>
             <!-- 银行账号单独一行 -->
@@ -89,20 +90,23 @@
                 </view>
             </view>
         </view>
-        <u-button @click="handleNextClick" type="primary" size="middle" style="border-radius: 20rpx;">下一步</u-button>
+        <u-button class='next-btn' @click="handleNextClick" type="primary" size="middle"
+            style="border-radius: 20rpx;">下一步</u-button>
 
-        <u-modal :show="unpaidModelShow" :title="'未收评级'" :showConfirmButton="false">
+        <u-modal showCancelButton showConfirmButton @confirm="confirmUnpaid" @cancel="unpaidModelShow = false"
+            :show="unpaidModelShow" :title="'未收评级'">
             <view class="modal-content">
                 <u-rate v-model="unpaidRating" :count="5" :size="50" active-color="#ff9500"></u-rate>
-                <u-button type="primary" size="large" @click="confirmUnpaid" style="margin-top: 40rpx;">确认未收</u-button>
+                <!-- <u-button type="primary" size="large" @click="confirmUnpaid" style="margin-top: 40rpx;">确认未收</u-button> -->
             </view>
         </u-modal>
 
-        <u-modal :show="followUpModelShow" :title="'填写跟进细节'" :showConfirmButton="false">
+        <u-modal showCancelButton showConfirmButton @confirm="confirmFollowUp" @cancel="followUpModelShow = false"
+            :show="followUpModelShow" :title="'填写跟进细节'">
             <view class="modal-content">
                 <u--textarea v-model="followUpNotes" placeholder="请输入情况" confirm-type="done"
                     style="width: 100%; margin-bottom: 30rpx;"></u--textarea>
-                <u-button type="primary" size="large" @click="confirmFollowUp">确认</u-button>
+                <!-- <u-button type="primary" size="large" @click="confirmFollowUp">确认</u-button> -->
             </view>
         </u-modal>
 
@@ -115,7 +119,7 @@
                 <view class="payment-info-section">
                     <view class="info-item">
                         <text class="info-label">收款姓名：</text>
-                        <text class="info-value">{{ paymentInfo.accountHolder || '未填写' }}</text>
+                        <text class="info-value">{{ paymentInfo.customName || '未填写' }}</text>
                     </view>
                     <view class="info-item">
                         <text class="info-label">开户银行：</text>
@@ -226,6 +230,13 @@ export default {
 
     methods: {
 
+        // 银行名称输入处理 - 只允许中文和英文
+        handleBankNameInput(value) {
+            console.log('银行名称输入处理', value)
+            //如果value包括数字则返回空字符串
+
+
+        },
 
 
 
@@ -355,6 +366,8 @@ export default {
 
         // 立即支付按钮点击事件
         async handlePayNowClick() {
+
+
             //保存
             await uni.$u.api.updateReceiptForm({
                 id: this.currentReceipt.id,
@@ -371,6 +384,16 @@ export default {
                 idCard: this.paymentInfo.idNumber || '',
             });
 
+            // 判断是否填写了支付信息
+            if (!this.paymentInfo.customName || !this.paymentInfo.bankName || !this.paymentInfo.bankAccount || !this.paymentInfo.idNumber) {
+                uni.$u.toast('请填写完整的支付信息');
+                return;
+            }
+            if (this.paymentAmount <= 0) {
+                uni.$u.toast('请填写正确的支付总额');
+                return;
+            }
+
             console.log('点击了立即支付按钮');
             this.payNowModelShow = true;
 
@@ -412,12 +435,13 @@ export default {
             });
 
             console.log('page3点击了下一步按钮', this.detailImages);
-            // this.$emit('handleNextClick', {
-            //     nowPage: 'formThree',
-            //     form: {
-            //         ...this.paymentInfo
-            //     }
-            // });
+
+            this.$emit('handleNextClick', {
+                nowPage: 'formThree',
+                form: {
+                    ...this.paymentInfo
+                }
+            });
         },
 
         // 确认未收按钮点击事件
@@ -691,7 +715,7 @@ export default {
     background-color: #f5f7fa;
     border: 2rpx solid #e5e7eb;
     border-radius: 12rpx;
-    padding: 24rpx 30rpx;
+    padding: 0rpx 30rpx;
     box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.05);
     display: flex;
     align-items: center;
@@ -738,7 +762,7 @@ export default {
 .payment-button {
     flex: 1;
     border-radius: 12rpx;
-    padding: 24rpx 0;
+    padding: 5rpx 0;
     display: flex;
     flex-direction: column;
     align-items: center;
@@ -836,6 +860,18 @@ export default {
 .info-value {
     font-size: 28rpx;
     color: #333;
+}
 
+
+.next-btn {
+    position: fixed;
+    bottom: 10rpx;
+    left: 2.5%;
+    width: 95%;
+    height: 80rpx;
+    line-height: 80rpx;
+    text-align: center;
+    @include font-styles($size: medium, $weight: bold, $color: #fff);
+    border-radius: 0rpx 0rpx 20rpx 20rpx;
 }
 </style>

pages/orderDetailNew/components/pageTwo.vue

@@ -122,7 +122,8 @@
             </view>
         </view>
 
-        <u-button @click="handleNextClick" type="primary" size="middle" style="border-radius: 20rpx;">下一步</u-button>
+        <u-button class='next-btn' @click="handleNextClick" type="primary" size="middle"
+            style="border-radius: 20rpx;">下一步</u-button>
     </view>
 </template>
 
@@ -1026,4 +1027,18 @@ u-checkbox {
 .price-input:focus {
     background-color: transparent;
 }
+
+
+
+.next-btn {
+    position: fixed;
+    bottom: 10rpx;
+    left: 2.5%;
+    width: 95%;
+    height: 80rpx;
+    line-height: 80rpx;
+    text-align: center;
+    @include font-styles($size: medium, $weight: bold, $color: #fff);
+    border-radius: 0rpx 0rpx 20rpx 20rpx;
+}
 </style>

pages/orderForm/index.vue

@@ -19,11 +19,11 @@
 							<u--input v-model="form.model" placeholder="例如:CF小号" border="surround"></u--input>
 						</u-form-item>
 					</u-col>
-					 <u-col span="6">
-                        <u-form-item label="实价" prop="price">
+					<u-col span="6">
+						<u-form-item label="实价" prop="price">
 							<u--input v-model="form.price" placeholder="0.00" border="surround"></u--input>
-					</u-form-item>
-                    </u-col>
+						</u-form-item>
+					</u-col>
 				</u-row>
 
 				<u-row gutter="5" justify="space-between">
@@ -32,7 +32,7 @@
 							<u--input v-model="form.phone" placeholder="电话号" border="surround"></u--input>
 						</u-form-item>
 					</u-col>
-					 <u-col span="6">
+					<u-col span="6">
 						<u-form-item label="客户微信" prop="wechat">
 							<u--input v-model="form.wechat" placeholder="微信号" border="surround"></u--input>
 						</u-form-item>
@@ -44,11 +44,13 @@
 						<view>地址信息</view>
 					</view>
 					<u-form-item label="详细地址" prop="address" class='form_card'>
-						<pick-regions :defaultRegion="defaultRegion" @getRegion="handleGetRegion" clearable class="region-picker">
+						<pick-regions :defaultRegion="defaultRegion" @getRegion="handleGetRegion" clearable
+							class="region-picker">
 							<view>
 								<template v-if="form.province">
-									<u--input :value="form.province + '/' + form.city + '/' + form.area" placeholder="点击选择"
-										readonly suffixIcon="arrow-right" suffixIconStyle="color : #c0c4cc"></u--input>
+									<u--input :value="form.province + '/' + form.city + '/' + form.area"
+										placeholder="点击选择" readonly suffixIcon="arrow-right"
+										suffixIconStyle="color : #c0c4cc"></u--input>
 								</template>
 								<template v-else>
 									<u--input placeholder="点击选择" readonly suffixIcon="arrow-right"
@@ -57,7 +59,8 @@
 							</view>
 						</pick-regions>
 					</u-form-item>
-					<u--textarea v-model="form.address" placeholder="粘贴地址自动识别(例如：浙江省杭州市...)" confirmType="done" @blur="handleAddressBlur"></u--textarea>
+					<u--textarea v-model="form.address" placeholder="粘贴地址自动识别(例如：浙江省杭州市...)" confirmType="done"
+						@blur="handleAddressBlur"></u--textarea>
 				</view>
 				<u-form-item label="上门时间" prop="visitTime" class="visit_time_wrap">
 					<date-time-picker v-model="form.visitTime" :value-format="'YYYY-MM-DD HH:mm:ss'" :type="'datetime'">
@@ -86,7 +89,8 @@
 				</u-form-item>
 
 				<u-form-item label="备注信息" prop="remarks" class="remarks_wrap">
-					<u--textarea v-model="form.remarks" placeholder="填写线索来源、客户特殊要求等..." count confirmType="done"></u--textarea>
+					<u--textarea v-model="form.remarks" placeholder="填写线索来源、客户特殊要求等..." count
+						confirmType="done"></u--textarea>
 				</u-form-item>
 
 			</u--form>
@@ -145,7 +149,7 @@ export default {
 				address: '',
 				visitTime: '',
 				remarks: '',
-				category: '',
+				category: '1',
 				brand: '',
 				model: '',
 				price: '',
@@ -194,13 +198,13 @@ export default {
 				},
 				wechat: {
 					type: 'string',
-					required: true,
+					required: false,
 					message: '请输入客户微信',
 					trigger: ['blur', 'change']
 				},
 				phone: {
 					type: 'string',
-					required: true,
+					required: false,
 					message: '请输入联系电话',
 					trigger: ['blur', 'change']
 				},
@@ -260,17 +264,17 @@ export default {
 			this.form.province = provinceData.name;
 			this.form.city = cityData.name;
 			this.form.area = areaData.name;
-			
+
 			// 构建完整的地区信息
 			const regionText = this.form.province + this.form.city + this.form.area;
-			
+
 			// 检查当前地址内容是否为纯地区信息（没有具体街道等）
-			const isPureRegion = !this.form.address || 
-								this.form.address.trim() === '' ||
-								this.form.address.trim().includes(this.form.province) ||
-								this.form.address.trim().includes(this.form.city) ||
-								this.form.address.trim().includes(this.form.area);
-			
+			const isPureRegion = !this.form.address ||
+				this.form.address.trim() === '' ||
+				this.form.address.trim().includes(this.form.province) ||
+				this.form.address.trim().includes(this.form.city) ||
+				this.form.address.trim().includes(this.form.area);
+
 			// 如果是纯地区信息或者是空地址，则更新为选择的地区
 			if (isPureRegion) {
 				this.form.address = regionText;
@@ -435,90 +439,106 @@ export default {
 	padding: 10rpx;
 	/* 确保内容不会溢出 */
 	overflow: hidden;
-	.u-input--square{
+
+	.u-input--square {
 		border-radius: 20rpx;
 	}
+
 	.u-input--square:focus-within,
 	.u-input--square.u-input--focus {
 		border: 2rpx solid #2563eb !important;
 		background-color: #fff !important;
 	}
 }
-.brand_wrap{
-	::v-deep .u-form-item__body__right__content{
-		border:1px solid #dadbde;
-		padding:10rpx;
+
+.brand_wrap {
+	::v-deep .u-form-item__body__right__content {
+		border: 1px solid #dadbde;
+		padding: 10rpx;
 		border-radius: 20rpx;
-		.inputWrap{
-			border:none;
+
+		.inputWrap {
+			border: none;
 		}
 	}
 }
+
 .address_wrap {
 	border-radius: 20rpx;
-	padding:24rpx;
+	padding: 24rpx;
 	display: flex;
 	flex-direction: column;
 	background-color: #fff;
 	box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.05);
 	margin: 0 10rpx;
+
 	.address_title {
 		display: flex;
 		align-items: center;
 		background-color: #fff;
 		padding-bottom: 12rpx;
-		gap:16rpx;
-		font-size:26rpx;
+		gap: 16rpx;
+		font-size: 26rpx;
 		color: #6b7280;
 		font-weight: 600;
 	}
-	::v-deep .u-form-item{
-		margin-bottom:0 !important;
-		padding:0;
-		.u-input--square{
+
+	::v-deep .u-form-item {
+		margin-bottom: 0 !important;
+		padding: 0;
+
+		.u-input--square {
 			background-color: #f9fafb;
 		}
 	}
-	::v-deep .u-textarea--radius{
+
+	::v-deep .u-textarea--radius {
 		border-radius: 20rpx;
 	}
+
 	.region-picker {
 		width: 100%;
 	}
-	::v-deep .u-textarea{
+
+	::v-deep .u-textarea {
 		background-color: #f9fafb;
 	}
 }
 
-.visit_time_wrap{
-	::v-deep .uni-date-x{
+.visit_time_wrap {
+	::v-deep .uni-date-x {
 		border-radius: 10px;
 		padding: 8rpx 10rpx;
-		border:1px solid #dadbde;
+		border: 1px solid #dadbde;
 		background-color: #f8f9fa;
 	}
 }
-.category_wrap{
-	.category_select_wrap{
+
+.category_wrap {
+	.category_select_wrap {
 		border-radius: 20rpx;
-		border:1px solid #dadbde;
-		padding:6rpx;
-		width:100%;
-		::v-deep .ldSelectInput{
+		border: 1px solid #dadbde;
+		padding: 6rpx;
+		width: 100%;
+
+		::v-deep .ldSelectInput {
 			font-size: 28rpx !important;
 		}
 	}
+
 	.category_select_wrap:focus-within,
 	.category_select_wrap:focus {
 		border: 2rpx solid #2563eb !important;
 		background-color: #fff !important;
 	}
 }
-.remarks_wrap{
-	.u-textarea{
+
+.remarks_wrap {
+	.u-textarea {
 		background-color: #fff;
 	}
-	::v-deep .u-textarea--radius{
+
+	::v-deep .u-textarea--radius {
 		border-radius: 20rpx;
 	}
 }
@@ -536,9 +556,9 @@ export default {
 
 .u-button {
 	border-radius: 40rpx;
-	background-color:#2563eb;
-	border:none;
-	color:#fff;
+	background-color: #2563eb;
+	border: none;
+	color: #fff;
 	font-weight: 700;
 	font-size: 40rpx;
 	height: 100rpx;
@@ -596,8 +616,7 @@ export default {
 	opacity: 1;
 }
 
-.u-textarea{
+.u-textarea {
 	background-color: #f5f5f5;
 }
-
 </style>