Merge branch 'master' of http://git.jihengcc.cn/liubaiyan/qjd-shell-uniapp

pages/index/register.vue

@@ -1,49 +1,54 @@
 <template>
 	<view class="container">
 		<u-cell-group class="form-info" :border="false">
-			<u-field label="商家名称" placeholder="请输入商家名称" label-width="180" v-model="shopInfo.name"></u-field>
-			<u-cell-item title="请上传商家图标" :arrow="false">
-				<view slot="label">
-					<u-upload :action="uploadUrl" :file-list="defaultList1" :form-data="uploadData" @on-success="logoUploadSuccess"
-					 @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">
-				<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>
-				</view>
-			</u-cell-item>
-			<u-cell-item title="请上传身份证正反面" :arrow="false" class="all-width">
-				<view slot="label" class="id-card-box">
-					<u-upload :action="uploadUrl" :file-list="defaultList3" :form-data="uploadData" @on-success="uploadIdCardSuccess1"
-					 @on-error="uploadError" :custom-btn="true" max-count="1" style="margin-right: 16px;" :style="{width: cWidth + 'px', height: (cWidth * 0.66 + 30) + 'px'}">
-						<view slot="addBtn" class="id-card card-img1" :style="{width: cWidth + 'px', height: (cWidth * 0.66 + 30) + 'px', paddingTop: (cWidth * 0.66) + 'px', backgroundSize: '100% ' + (cWidth * 0.66) + 'px'}">拍摄正面</view>
-					</u-upload>
-					<u-upload :action="uploadUrl" :file-list="defaultList4" :form-data="uploadData" @on-success="uploadIdCardSuccess2"
-					 @on-error="uploadError" :custom-btn="true" max-count="1" :style="{width: cWidth + 'px', height: (cWidth * 0.66 + 30) + 'px'}">
-						<view slot="addBtn" class="id-card card-img2" :style="{width: cWidth + 'px', height: (cWidth * 0.66 + 30) + 'px', paddingTop: (cWidth * 0.66) + 'px', backgroundSize: '100% ' + (cWidth * 0.66) + 'px'}">拍摄反面</view>
-					</u-upload>
-				</view>
-			</u-cell-item>
-			<u-cell-item title="请上传营业执照照片" :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">
-						<image slot="addBtn" class="license-img" src="../../static/images/license-img.png"></image>
-					</u-upload>
-					<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">
-				<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 :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-form-item> -->
+				<u-cell-item title="请上传商家图标" :arrow="false">
+					<view slot="label">
+						<u-upload :action="uploadUrl" :file-list="defaultList1" :form-data="uploadData" @on-success="logoUploadSuccess"
+						 @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">
+					<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>
+					</view>
+				</u-cell-item>
+				<u-cell-item title="请上传身份证正反面" :arrow="false" class="all-width">
+					<view slot="label" class="id-card-box">
+						<u-upload :action="uploadUrl" :file-list="defaultList3" :form-data="uploadData" @on-success="uploadIdCardSuccess1"
+						 @on-error="uploadError" :custom-btn="true" max-count="1" style="margin-right: 16px;" :style="{width: cWidth + 'px', height: (cWidth * 0.66 + 30) + 'px'}">
+							<view slot="addBtn" class="id-card card-img1" :style="{width: cWidth + 'px', height: (cWidth * 0.66 + 30) + 'px', paddingTop: (cWidth * 0.66) + 'px', backgroundSize: '100% ' + (cWidth * 0.66) + 'px'}">拍摄正面</view>
+						</u-upload>
+						<u-upload :action="uploadUrl" :file-list="defaultList4" :form-data="uploadData" @on-success="uploadIdCardSuccess2"
+						 @on-error="uploadError" :custom-btn="true" max-count="1" :style="{width: cWidth + 'px', height: (cWidth * 0.66 + 30) + 'px'}">
+							<view slot="addBtn" class="id-card card-img2" :style="{width: cWidth + 'px', height: (cWidth * 0.66 + 30) + 'px', paddingTop: (cWidth * 0.66) + 'px', backgroundSize: '100% ' + (cWidth * 0.66) + 'px'}">拍摄反面</view>
+						</u-upload>
+					</view>
+				</u-cell-item>
+				<u-cell-item title="请上传营业执照照片" :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">
+							<image slot="addBtn" class="license-img" src="../../static/images/license-img.png"></image>
+						</u-upload>
+						<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">
+					<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-cell-group>
 		<view class="form-handle">
 			<u-button type="success" shape="circle" :ripple="true" @click="submitData" class="handle-custom">提交</u-button>
@@ -88,8 +93,22 @@
 				defaultList3: [],
 				defaultList4: [],
 				defaultList5: [],
+				rules: {
+					name: [
+						{ 
+							required: true, 
+							message: '请输入姓名', 
+							// 可以单个或者同时写两个触发验证方式 
+							trigger: 'blur',
+						}
+					]
+				}
 			}
 		},
+		// 必须要在onReady生命周期，因为onLoad生命周期组件可能尚未创建完毕
+		onReady() {
+		  this.$refs.shopInfo.setRules(this.rules);
+		},
 		onLoad(options) {
 			this.cWidth = (uni.upx2px(750) - 40) / 2;
 			this.uploadUrl = API.uploadFile

pages/user/index.vue

@@ -12,7 +12,9 @@
 		</view>
 		<view class="order-box">
 			<view class="order-item" @click="orderClick(2)">
-				<view class="iconfont icondaifahuo order-item-icon"></view>
+				<view class="iconfont icondaifahuo order-item-icon">
+					<view v-if="false" class="order-item-icon-num">10</view>
+				</view>
 				<view class="order-item-text">待发货</view>
 			</view>
 			<view class="order-item" @click="orderClick(3)">
@@ -265,6 +267,21 @@
 				.order-item-icon {
 					color: #52A63A;
 					font-size: 30px;
+					display: flex;
+					position: relative;
+					.order-item-icon-num {
+						background: #ffffff;
+						width: 22px;
+						height: 20px;
+						font-size: 12px;
+						border-radius: 50%;
+						color: #52A63A;
+						text-align: center;
+						position: absolute; 
+						left: 20px;
+						border: 1px solid #52A63A;
+						line-height: 20px;
+					}
 				}
 
 				.order-item-text {

pagesGood/goodForm.vue

@@ -30,7 +30,7 @@
 			<u-cell-item title="库存" :arrow="false">
 				<u-number-box :min="1" v-model="goodInfo.stock" bg-color="#51A539" color="#ffffff" :disabled="ifEdit()"></u-number-box>
 			</u-cell-item>
-			<u-field label="商品说明" type="textarea" placeholder="请输入商品说明" label-width="180" v-model="goodInfo.productDescribe"
+			<u-field label="商品说明" placeholder="请输入商品说明" label-width="180" v-model="goodInfo.productDescribe"
 			 :disabled="ifEdit()"></u-field>
 			<u-cell-item title="商品分类" :value="sortText" @click="selectShow = !ifEdit()"></u-cell-item>
 			<u-cell-item title="拍卖截止时间" :value="goodInfo.auctionEndTime" @click="dateShow = !ifEdit()" v-if="formType == 2"></u-cell-item>

pagesMain/orderDetail.vue

@@ -84,6 +84,34 @@
 				<view class="order-info-row" v-if="orderData.orderStatus == 6">取消时间：{{orderData.cancelTime}}</view>
 			</view>
 		</view>
+		<view class="order-info-box" v-if="orderData.evaluateResVO.evaluateContent">
+			<view class="info-title-box">
+				<view class="info-title">评价信息</view>
+			</view>
+			<view class="info-content-box">
+				<view class="assess-row">
+					<image class="assess-head" :src="orderData.merchantInfoResVO.headImg"></image>
+					<view class="assess-info">
+						<view class="assess-name">{{orderData.nickname}}</view>
+						<view class="assess-date">{{orderData.evaluateResVO.evaluateTime ? orderData.evaluateResVO.evaluateTime : ''}}</view>
+						<view class="assess-sore-box">
+							<u-rate v-model="orderData.evaluateResVO.score" active-color="#FFAE21" disabled></u-rate>
+						</view>
+						<view class="assess-text">{{orderData.evaluateResVO.evaluateContent ? orderData.evaluateResVO.evaluateContent : '暂无评价'}}</view>
+						<view class="assess-img-box">
+							<image class="img-col" :src="item.imgUrl" v-for="(item,i) in orderData.evaluateResVO.evaluateImgs" :key="i"></image>
+						</view>
+					</view>
+					<view class="shop-reply-box" v-if="orderData.evaluateResVO.replyContent">
+						<view class="shop-head">
+							<view class="iconfont icondianpu"></view>
+							<view class="shop-name">我的回复</view>
+						</view>
+						<view class="shop-reply">{{orderData.evaluateResVO.replyContent}}</view>
+					</view>
+				</view>
+			</view>
+		</view>
 		<uni-goods-nav :fill="true" :options="[]" @click="" @buttonClick="orderHandle" class="order-handle" :buttonGroup="buttonGroup"
 		 v-if="(orderData.orderStatus >= 2 && orderData.orderStatus <= 4) || (orderData.orderStatus == 5 && orderData.evaluateReplyStatus == 1)" />
 		<u-top-tips ref="uTips"></u-top-tips>
@@ -131,7 +159,13 @@
 				// 	backgroundColor: '#52A63A',
 				// 	color: '#fff'
 				// }],
-				buttonGroup: [],
+				buttonGroup: [
+				    {
+				    	text: '',
+				    	backgroundColor: '#52A63A',
+				    	color: '#fff'
+				    }	
+				],
 				noPick: true // 没有自助采摘的商品
 			}
 		},
@@ -256,7 +290,7 @@
 				} else if (this.orderData.orderStatus == 3 || this.orderData.orderStatus == 4) {
 					//  追踪物流
 					uni.navigateTo({
-						url: '/pagesMain/logisticsDeatil?logisticCode=' + this.orderData.logisticCode
+						url: '/pagesMain/logisticsDeatil?logisticCode=' + this.orderData.logisticsNum
 					});
 				} else {
 					//  回复
@@ -684,6 +718,129 @@
 					word-break:break-all; 
 				}
 			}
+			.assess-row {
+				width: calc(100% - 30px);
+				margin: 0 15px;
+				float: left;
+				// border-top: 1px solid #F6F6F6;
+				padding: 12px 0;
+			
+				.assess-head {
+					width: 50px;
+					height: 50px;
+					float: left;
+					object-fit: cover;
+					border-radius: 50%;
+				}
+			
+				.assess-info {
+					width: calc(100% - 62px);
+					margin-left: 12px;
+					float: left;
+			
+					.assess-name {
+						height: 18px;
+						float: left;
+						line-height: 18px;
+						font-size: 15px;
+						font-family: PingFang SC;
+						font-weight: bold;
+						color: #343434;
+					}
+			
+					.assess-date {
+						height: 18px;
+						float: right;
+						line-height: 18px;
+						font-size: 12px;
+						font-family: PingFang SC;
+						font-weight: bold;
+						color: #666666;
+					}
+			
+					.assess-sore-box {
+						width: 100%;
+						height: 16px;
+						float: left;
+						margin: 6px 0;
+					}
+			
+					.assess-text {
+						width: 100%;
+						float: left;
+						font-size: 12px;
+						font-family: PingFang SC;
+						font-weight: bold;
+						color: #666666;
+						line-height: 16px;
+						margin: 8px 0 10px 0;
+						overflow: hidden;
+						text-overflow: ellipsis;
+						display: -webkit-box;
+						-webkit-line-clamp: 2;
+						-webkit-box-orient: vertical;
+						word-wrap: break-word;
+					}
+			
+					.assess-img-box {
+						width: 100%;
+						float: left;
+						display: flex;
+			
+						.img-col {
+							height: 60px;
+							width: 60px;
+							object-fit: cover;
+							margin: 0 10px 10px 0;
+						}
+					}
+				}
+			
+				.shop-reply-box {
+					width: 100%;
+					float: left;
+					background: #F5F5F5;
+					border-radius: 5px;
+					margin-top: 10px;
+			
+					.shop-head {
+						width: 100%;
+						height: 36px;
+						float: left;
+						box-sizing: border-box;
+						padding: 10px 12px;
+			
+						.icondianpu {
+							width: 16px;
+							height: 16px;
+							float: left;
+							color: #52A63A;
+							font-size: 20px;
+							margin-right: 8px;
+						}
+			
+						.shop-name {
+							height: 16px;
+							float: left;
+							font-size: 15px;
+							font-family: PingFang SC;
+							color: #52A63A;
+							line-height: 16px;
+						}
+					}
+			
+					.shop-reply {
+						width: 100%;
+						float: left;
+						box-sizing: border-box;
+						padding: 0 12px 12px 12px;
+						font-size: 12px;
+						font-family: PingFang SC;
+						color: #666666;
+						line-height: 16px;
+					}
+				}
+			}
 		}
 
 		.order-handle {

pagesMain/registerForm.vue

@@ -9,11 +9,11 @@
 					 @on-error="uploadError" max-count="1" v-if="edit"></u-upload>
 				</view>
 			</u-cell-item>
-			<u-cell-item :title="'请上传店铺主图（' + defaultList2.length + '/3）'" :arrow="false">
+			<u-cell-item title="请上传店铺主图" :arrow="false">
 				<view slot="label">
 					<image class="shop-img" mode="aspectFill" :src="item.url" v-for="(item, index) in defaultList2" :key="index" v-if="!edit"></image>
 					<u-upload :action="uploadUrl" :file-list="defaultList2" :form-data="uploadData" @on-success="uploadSuccess"
-					 @on-error="uploadError" @on-remove="uploadRemove" max-count="3" v-if="edit"></u-upload>
+					 @on-error="uploadError" @on-remove="uploadRemove" v-if="edit"></u-upload>
 				</view>
 			</u-cell-item>
 			<u-cell-item title="请上传身份证正反面" :arrow="false">