From 8903e1a476fd1140acbc1a91e187de6d771e4664 Mon Sep 17 00:00:00 2001
From: 付延余 <f-yanyu@outlook.com>
Date: 星期四, 23 三月 2023 17:56:23 +0800
Subject: [PATCH] 1.待领取列表增加字段 矿、煤场、煤种、客户名称、发运日期、日计划编号(完成) 2.多次抢单弹框再次确认是否抢单(完成) 3.待预约提煤单列表显示样式(完成)

---
 pages/register/register.vue |   36 +++++++++++-------------------------
 1 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/pages/register/register.vue b/pages/register/register.vue
index 1b90898..5767e42 100644
--- a/pages/register/register.vue
+++ b/pages/register/register.vue
@@ -1,6 +1,5 @@
 <template>
 	<view class="register">
-		<!-- <home-species title="娉ㄥ唽"></home-species> -->
 		<view class="registerForm">
 			<u--form :rules="rules" :model="registerFormModel" ref="regesterFormRef">
 				<u-form-item labelWidth="20%" label="閫夋嫨韬唤" borderBottom ref="roleRef" required>
@@ -36,13 +35,13 @@
 					<u--input v-model="registerFormModel.carNo" placeholder="璇疯緭鍏ュ唴瀹�" clearable></u--input>
 				</u-form-item>
 				<u-form-item prop="carImg" label="杞﹁締鐓х墖" labelWidth="20%" borderBottom v-if="radiovalue1 == '鍙告満'" required>
-					<u-upload :fileList="fileList1" @afterRead="afterRead" @delete="deletePic" name="1" multiple :maxCount="1" width="250" height="150">
+					<u-upload :fileList="fileList1" deletable @afterRead="afterRead" @delete="deletePic" name="1" multiple :maxCount="1" width="250" height="150">
 						<!-- <image src="https://cdn.uviewui.com/uview/demo/upload/positive.png"
 						mode="widthFix" style="width: 250px;height: 150px;"></image> -->
 					</u-upload>
 				</u-form-item>
 				<u-form-item prop="drivingImg" label="琛岄┒璇�" labelWidth="20%" borderBottom v-if="radiovalue1 == '鍙告満'" required>
-					<u-upload :fileList="fileList2" @afterRead="afterRead" @delete="deletePic" name="2" multiple :maxCount="1" width="250" height="150">
+					<u-upload :fileList="fileList2" deletable @afterRead="afterRead" @delete="deletePic" name="2" multiple :maxCount="1" width="250" height="150">
 						<!-- <image src="https://cdn.uviewui.com/uview/demo/upload/positive.png"
 						mode="widthFix" style="width: 250px;height: 150px;"></image> -->
 					</u-upload>
@@ -58,7 +57,6 @@
 </template>
 
 <script>
-// import HomeSpecies from '@/components/home-species/HomeSpecies.vue';
 import { apiRegister } from '@/api/publicInterface.js';
 import { BaseUrl } from '@/api/publicInterface.js';
 export default {
@@ -77,9 +75,6 @@
 	//     }
 	//   })
 	// },
-	components: {
-		// HomeSpecies
-	},
 	// 鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚銆傛敞鎰忓鏋滄覆鏌撻�熷害蹇紝浼氬湪椤甸潰杩涘叆鍔ㄧ敾瀹屾垚鍓嶈Е鍙�
 	onReady() {
 		// this.$refs.regesterFormRef.setRules(this.rules);
@@ -107,7 +102,7 @@
 				carImg: '',
 				drivingImg: '',
 				tuiJianMa: '',
-				confirmPassword:''
+				confirmPassword: ''
 			},
 			fileList1: [],
 			fileList2: [],
@@ -149,7 +144,7 @@
 						message: '闀垮害鍦�6-12涓瓧绗︿箣闂�'
 					}
 				],
-				confirmPassword:[
+				confirmPassword: [
 					{
 						required: true,
 						message: '璇疯缃垵濮嬪瘑鐮�',
@@ -182,7 +177,6 @@
 					trigger: ['blur', 'change']
 				}
 			},
-			confirmPassword:'',
 			// 鍩烘湰妗堝垪鏁版嵁
 			radiolist1: [
 				{
@@ -229,7 +223,7 @@
 	},
 	methods: {
 		registerClick() {
-			if(this.registerFormModel.password == this.registerFormModel.confirmPassword){
+			if (this.registerFormModel.password == this.registerFormModel.confirmPassword) {
 				this.$refs.regesterFormRef
 					.validate()
 					.then(res => {
@@ -237,7 +231,6 @@
 						this.registerFormModel.username = this.registerFormModel.phone;
 						apiRegister(this.registerFormModel)
 							.then(res => {
-								console.log(res);
 								if (res.data.code == 0) {
 									uni.showToast({
 										title: '娉ㄥ唽鎴愬姛,鍗冲皢杩涘叆鐧诲綍锛�',
@@ -248,7 +241,7 @@
 										uni.redirectTo({ url: '/pages/login/login' });
 									}, 1000);
 								} else {
-									this.$u.toast(res.data.msg);
+									this.$u.toast(res.data.data?res.data.data:'娣诲姞澶辫触');
 								}
 							})
 							.catch(err => {
@@ -260,15 +253,9 @@
 						uni.$u.toast('璇疯鑼冭緭鍏ュ唴瀹�');
 					});
 			} else {
-				this.$u.toast('涓ゆ瀵嗙爜涓嶄竴鑷�')
+				this.$u.toast('涓ゆ瀵嗙爜涓嶄竴鑷�');
 			}
 		},
-		// 闊宠棰戦�氳瘽
-		// callingIn() {
-		// 	uni.navigateTo({
-		// 		url: '/pages/calling-index/calling-index'
-		// 	});
-		// },
 		// 鍗曢�夋浜嬩欢
 		groupChange(e) {
 			console.log('鍗曢�夋灏忕粍', e);
@@ -287,11 +274,10 @@
 				this.beforeChangeValue = e;
 			}
 		},
-		jiaoYanPassword(){
-			console.log('瀵嗙爜锛�',this.registerFormModel.password ,'纭瀵嗙爜锛�',this.confirmPassword);
-			// if(this.registerFormModel.password != this.confirmPassword){
-			// 	this.$u.toast('涓ゆ瀵嗙爜涓嶄竴鑷�')
-			// }
+		jiaoYanPassword() {
+			if (this.registerFormModel.password != this.registerFormModel.confirmPassword) {
+				this.$u.toast('涓ゆ瀵嗙爜涓嶄竴鑷�');
+			}
 		},
 		// 涓婁紶鍥剧墖鏂规硶
 		// 鍒犻櫎鍥剧墖

--
Gitblit v1.9.1