注册商户信息校验/获取订单数量等优化

pages/index/register.vue

@@ -1,10 +1,10 @@
 <template>
 	<view class="container">
 		<u-cell-group class="form-info" :border="false">
-		    <!-- <u-form :model="shopInfo" ref="shopInfo"> -->
+		    <u-form :model="shopInfo" ref="shopInfo">
 				<!-- <u-form-item label="商家名称" prop="name">
 				  <u-input placeholder="请输入商家名称" label-width="180" v-model="shopInfo.name" /> -->
-				  <u-field label="商家名称" placeholder="请输入商家名称" label-width="180" v-model="shopInfo.name"></u-field>
+				  <u-field label="商家名称" required placeholder="请输入商家名称" label-width="180" v-model="shopInfo.name"></u-field>
 				<!-- </u-form-item> -->
 				<u-cell-item title="请上传商家图标" :arrow="false">
 					<view slot="label">
@@ -12,7 +12,7 @@
 						 @on-error="uploadError" max-count="1"></u-upload>
 					</view>
 				</u-cell-item>
-				<u-cell-item :title="'请上传店铺主图' + (fileList.length?`（${fileList.length}/3)`:'')" :arrow="false" class="all-width">
+				<u-cell-item title="请上传店铺主图" :arrow="false" class="all-width">
 					<view slot="label">
 						<u-upload :action="uploadUrl" :file-list="defaultList2" :form-data="uploadData" @on-success="uploadSuccess"
 						 @on-error="uploadError" @on-remove="uploadRemove" max-count="3"></u-upload>
@@ -30,7 +30,7 @@
 						</u-upload>
 					</view>
 				</u-cell-item>
-				<u-cell-item title="请上传营业执照照片" :arrow="false" class="all-width">
+				<u-cell-item title="请上传营业执照照片" required :arrow="false" class="all-width">
 					<view slot="label" class="license-box">
 						<u-upload :action="uploadUrl" :file-list="defaultList5" :form-data="uploadData" @on-success="uploadLicenseSuccess"
 						 @on-error="uploadError" :custom-btn="true" max-count="1" class="diy-upload">
@@ -39,16 +39,19 @@
 						<view class="license-text"> 营业执照</view>
 					</view>
 				</u-cell-item>
-				<u-field label="法人姓名" placeholder="请输入法人姓名" label-width="180" v-model="shopInfo.duty"></u-field>
-				<u-cell-item title="所在城市" @click="regionShow = true">
+				<u-field label="法人姓名" required placeholder="请输入法人姓名" label-width="180" v-model="shopInfo.duty"></u-field>
+				<u-cell-item title="所在城市" required @click="regionShow = true">
 					<text v-show="shopInfo.companyAddressProvince">{{shopInfo.companyAddressProvince}}-{{shopInfo.companyAddressCity}}-{{shopInfo.companyAddressDistrict}}</text>
 				</u-cell-item>
-				<u-field label="联系方式" placeholder="请输入联系方式" label-width="180" v-model="shopInfo.contactTel"></u-field>
-				<u-field label="收款人姓名" placeholder="请输入收款人姓名" label-width="180" v-model="shopInfo.collectionName"></u-field>
-				<u-field label="户名" placeholder="请输入户名" label-width="180" v-model="shopInfo.bankAccountName"></u-field>
-				<u-field label="银行名称" placeholder="请输入银行名称" label-width="180" v-model="shopInfo.bankAllName"></u-field>
-				<u-field label="银行卡号" placeholder="请输入银行卡号" label-width="180" v-model="shopInfo.bankNumber"></u-field>
-			<!-- </u-form> -->
+				<!-- <u-form-item label="联系方式" prop="contactTel"> -->
+				<u-field label="联系方式" required :error-message="errorMessage1" placeholder="请输入联系方式" label-width="180" v-model="shopInfo.contactTel"></u-field>
+					<!-- <input type="number" placeholder="请输入联系方式" label-width="180" v-model="shopInfo.contactTel" /> -->
+				<!-- </u-form-item> -->
+				<u-field label="收款人姓名" required placeholder="请输入收款人姓名" label-width="180" v-model="shopInfo.collectionName"></u-field>
+				<u-field label="户名" required placeholder="请输入户名" label-width="180" v-model="shopInfo.bankAccountName"></u-field>
+				<u-field label="银行名称" required placeholder="请输入银行名称" label-width="180" v-model="shopInfo.bankAllName"></u-field>
+				<u-field label="银行卡号" required :error-message="errorMessage2" placeholder="请输入银行卡号" label-width="180" v-model="shopInfo.bankNumber"></u-field>
+			</u-form>
 		</u-cell-group>
 		<view class="form-handle">
 			<u-button type="success" shape="circle" :ripple="true" @click="submitData" class="handle-custom">提交</u-button>
@@ -76,11 +79,11 @@
 					companyAddressProvince: '',
 					companyAddressCity: '',
 					companyAddressDistrict: '',
-					contactTel: '',
+					contactTel: null,
 					collectionName: '',
 					bankAccountName: '',
 					bankAllName: '',
-					bankNumber: '',
+					bankNumber: null,
 				},
 				regionShow: false,
 				uploadData: {
@@ -102,12 +105,14 @@
 							trigger: 'blur',
 						}
 					]
-				}
+				},
+				errorMessage1: '',
+				errorMessage2: ''
 			}
 		},
 		// 必须要在onReady生命周期，因为onLoad生命周期组件可能尚未创建完毕
 		onReady() {
-		  this.$refs.shopInfo.setRules(this.rules);
+		  // this.$refs.shopInfo.setRules(this.rules);
 		},
 		onLoad(options) {
 			this.cWidth = (uni.upx2px(750) - 40) / 2;
@@ -223,6 +228,7 @@
 			},
 			//  提交
 			submitData() {
+				debugger
 				let required = true
 				for (let key in this.shopInfo) {
 					if (!this.shopInfo[key]) {
@@ -236,6 +242,18 @@
 					})
 					return false
 				}
+				if (!Number(this.shopInfo.contactTel)) {
+					this.errorMessage1 = '请输入数字'
+					return
+				} else {
+					this.errorMessage1 = ''
+				}
+				if (!Number(this.shopInfo.bankNumber)) {
+					this.errorMessage2 = '请输入数字'
+					return
+				} else {
+					this.errorMessage2 = ''
+				}
 				if (!this.fileList.length) {
 					this.$refs.uTips.show({
 						title: '请上传店铺主页图',

pages/user/index.vue

@@ -13,20 +13,26 @@
 		<view class="order-box">
 			<view class="order-item" @click="orderClick(2)">
 				<view class="iconfont icondaifahuo order-item-icon">
-					<view v-if="false" class="order-item-icon-num">10</view>
+					<view v-if="num.unSend" class="order-item-icon-num">{{num.unSend}}</view>
 				</view>
 				<view class="order-item-text">待发货</view>
 			</view>
 			<view class="order-item" @click="orderClick(3)">
-				<view class="iconfont icondaishouhuo order-item-icon"></view>
+				<view class="iconfont icondaishouhuo order-item-icon">
+					<view v-if="num.unReceive" class="order-item-icon-num">{{num.unReceive}}</view>
+				</view>
 				<view class="order-item-text">已发货</view>
 			</view>
 			<view class="order-item" @click="orderClick(4)">
-				<view class="iconfont iconyishouhuo order-item-icon"></view>
+				<view class="iconfont iconyishouhuo order-item-icon">
+					<view v-if="num.unComment" class="order-item-icon-num">{{num.unComment}}</view>
+				</view>
 				<view class="order-item-text">已收货</view>
 			</view>
 			<view class="order-item" @click="orderClick(5)">
-				<view class="iconfont icondaipingjia order-item-icon"></view>
+				<view class="iconfont icondaipingjia order-item-icon">
+					<view v-if="num.finished" class="order-item-icon-num">{{num.finished}}</view>
+				</view>
 				<view class="order-item-text">已评价</view>
 			</view>
 		</view>
@@ -83,7 +89,14 @@
 					isMaster: 0,
 				},
 				manageInfo: {},
-				modalShow: false
+				modalShow: false,
+				num: {
+					unComment: 0, // 待评价
+					unPay: 0,  // 待付款
+					unReceive: 0, // 待收货
+					unSend: 0, // 待发货
+					finished: 0 // 已评价
+				}
 			}
 		},
 		onShow() {
@@ -97,6 +110,7 @@
 					type: 'warning',
 				})
 			})
+			this.getNum()
 		},
 		methods: {
 			//  我的订单
@@ -113,6 +127,24 @@
 					url: '/pagesMain/orderList?type=' + type
 				});
 			},
+			// 获取订单数量
+			getNum() {
+				NET.request(API.getOrderNum, {}, 'GET').then(res => {
+					if (res.isSuccess) {
+					    this.num = res.data
+					} else {
+						this.$refs.uTips.show({
+							title: res.msg,
+							type: 'warning',
+						})
+					}
+				}).catch(error => {
+					this.$refs.uTips.show({
+						title: '获取个人信息失败',
+						type: 'warning',
+					})
+				})
+			},
 			//  自助采摘
 			pickClick() {
 				if(!this.userData.roleInfos.some(v=>v.menuInfos.some(vv=>vv.label == '订单管理'))){

pagesGood/goodForm.vue

@@ -186,6 +186,7 @@
 			},
 			//  设置时间
 			setDate(data) {
+				console.log('时间data', data)
 				this.goodInfo.auctionEndTime = data.year + '-' + data.month + '-' + data.day + ' ' + data.hour + ':' + data.minute +
 					':' + data.second
 			},