bug修复

components/selectType.vue

@@ -20,7 +20,7 @@
 			return {
 				selectLocality: [{
 						value: 1,
-						label: '普通企业'
+						label: '个人独资'
 					},
 					{
 						value: 2,

pages/evaluate/evaluate.vue

@@ -49,7 +49,7 @@
 							<view class="left">
 								<view class="img">
 									
-									<image :src="item.commentsReply" mode="" v-if="item.commentsReply"></image>
+									<image :src="item.userAvatar" mode="" v-if="item.userAvatar"></image>
 									<image src="/static/avatar_boy.png" mode="" v-else></image>
 								</view>
 								<view class="name">

pages/store/businessInfor.vue

@@ -71,7 +71,7 @@
 			<button style="margin-left: 12upx;width:77%" class="cu-btn bg-blue round " @click="sumbit">提交审核</button>
 		</view>
 
-		<u-picker v-model="show" mode="time" @confirm="selectTime"></u-picker>
+		<u-picker v-model="show" mode="time" @confirm="selectTime" style="z-index: 999 !important;"></u-picker>
 	</view>
 
 </template>

pages/store/businessQua.vue

@@ -6,10 +6,10 @@
 			</cu-custom>
 		</view>
 		<view class="" style="height:140rpx;margin-bottom: 20rpx;">
-			<status v-if="form && form.specialStatus !== null" :status="form.specialStatus" :updateTime="form.specialUpdateTime"
-				:remark="form.specialRemark"></status>
+			<status v-if="form && form.specialStatus !== null" :status="form.specialStatus"
+				:updateTime="form.specialUpdateTime" :remark="form.specialRemark"></status>
 		</view>
-		
+
 
 		<view class="tab-top">
 			<view class="content " style="margin-bottom: 16rpx;">
@@ -117,7 +117,7 @@
 				this.form = obj
 				this.qualificationNameMap = this.form.qualificationNameListDTOS;
 				this.qualificationNameMap.forEach((item) => {
-					this.showText += item.categoryName+' / '
+					this.showText += item.categoryName + ' / '
 					item.qualificationNameCategoryDTOS?.forEach((row) => {
 						// row.special = '';
 						row.imgList = [];
@@ -137,7 +137,15 @@
 				})
 			},
 			showPicker() {
-				this.$refs.treePicker._show();
+				if (this.form.specialStatus == 0) {
+					uni.showToast({
+						icon: 'none',
+						title: '待审核状态不能修改'
+					})
+				} else {
+					this.$refs.treePicker._show();
+				}
+
 			},
 			//监听选择（ids为数组）
 			selectChange(ids, names) {
@@ -148,14 +156,14 @@
 			},
 			selectClassify() {
 				let categoryIds = this.classifyList.join(',')
-				let merchantId =  uni.getStorageSync(USER_INFO).merchantId
+				let merchantId = uni.getStorageSync(USER_INFO).merchantId
 				let categoryNames = this.showText
 				this.$http.get('/localQualificationClassifica/localQualificationClassifica/getByCategoryId?categoryIds=' +
-					categoryIds+'&merchantId='+merchantId+'&categoryNames='+categoryNames).then(res => {
+					categoryIds + '&merchantId=' + merchantId + '&categoryNames=' + categoryNames).then(res => {
 					this.qualificationNameMap = res.data.result
 					this.qualificationNameMap.forEach((item) => {
 						item.qualificationNameCategoryDTOS?.forEach((row) => {
-							row.special = row.special?row.special:'';
+							row.special = row.special ? row.special : '';
 							row.imgList = [];
 						});
 					});
@@ -164,37 +172,46 @@
 
 
 			async businessChange(row) {
-				let [chooseImageErr, chooseImageRes] = await uni.chooseImage({
-					count: 1,
-					sizeType: ['compressed']
-				});
-				let size = chooseImageRes.tempFiles[0].size / 1024 / 1024 < 5;
-				if (!size) {
-					this.$refs.uToast.show({
-						title: '上传图片大小不能超过 5MB!',
-						type: 'error',
+				if (this.form.specialStatus == 0) {
+					uni.showToast({
+						icon: 'none',
+						title: '待审核状态不能修改'
 					})
-					return false
-				}
+				} else {
 
-				if (chooseImageRes) {
-					// this.specialImg = chooseImageRes.tempFilePaths[0];
-					uni.uploadFile({
-						url: configService.apiUrl + '/sys/common/upload',
-						filePath: chooseImageRes.tempFilePaths[0],
-						name: "file",
-						formData: {
-							'biz': 'temp',
-						},
-						success: (files) => {
-							let data = JSON.parse(files.data);
-							if (data.success) {
-								// this.specialImg = configService.apiUrl + '/' + data.message
-								row.special = configService.apiUrl + '/' + data.message
 
-							}
-						}
+					let [chooseImageErr, chooseImageRes] = await uni.chooseImage({
+						count: 1,
+						sizeType: ['compressed']
 					});
+					let size = chooseImageRes.tempFiles[0].size / 1024 / 1024 < 5;
+					if (!size) {
+						this.$refs.uToast.show({
+							title: '上传图片大小不能超过 5MB!',
+							type: 'error',
+						})
+						return false
+					}
+
+					if (chooseImageRes) {
+						// this.specialImg = chooseImageRes.tempFilePaths[0];
+						uni.uploadFile({
+							url: configService.apiUrl + '/sys/common/upload',
+							filePath: chooseImageRes.tempFilePaths[0],
+							name: "file",
+							formData: {
+								'biz': 'temp',
+							},
+							success: (files) => {
+								let data = JSON.parse(files.data);
+								if (data.success) {
+									// this.specialImg = configService.apiUrl + '/' + data.message
+									row.special = configService.apiUrl + '/' + data.message
+
+								}
+							}
+						});
+					}
 				}
 			},
 			sumbit() {
@@ -225,8 +242,8 @@
 				if (hasEmptyImage) {
 					// message.error('请上传全部图片');
 					uni.showToast({
-						icon:'none',
-						message:'请上传全部图片'
+						icon: 'none',
+						message: '请上传全部图片'
 					})
 				} else {
 					if (this.form.specialStatus == null) {
@@ -265,7 +282,7 @@
 				// 	special: this.specialImg,
 				// }
 
-			
+
 
 			}
 		},
@@ -299,6 +316,7 @@
 	.borderRadiu {
 		background-color: #fff;
 		border-radius: 16rpx;
+
 		.customize {
 			padding: 0 18upx 18upx;
 		}
@@ -449,6 +467,7 @@
 		flex: 1;
 		overflow-y: auto;
 		padding: 0 24rpx;
+
 		.fath {
 			width: 100%;
 			// height: 100px;

pages/store/components/status.vue

@@ -29,7 +29,7 @@
                 </view>
                 <!-- <text style="color: #999;">{{updateTime }}</text> -->
             </view>
-            <view>驳回原因：{{updateTime }}{{ remark }} </view>
+            <view>驳回原因：{{ remark }}{{updateTime }} </view>
         </view>
     </view>
 </template>

pages/store/editStore.vue

@@ -130,6 +130,7 @@ export default {
     methods: {
         submit() {
             this.$http.post('/merchant/localMerchantInfo/edit', { ...this.form, headPhoto: this.form.headPhoto.join(',') }).then(res => {
+							// this.$http.post('/merchant/localMerchantInfo/edit/new', { ...this.form, headPhoto: this.form.headPhoto.join(',') }).then(res => {
                 if (res.data.success) {
                     this.$tip.success(res.data.result || '成功')
                     uni.navigateBack({