Merge branch 'master' into master-pro

# Conflicts:
#	manifest.json

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/order/arriveUpload.vue

@@ -95,6 +95,7 @@
 			},
 			// 提交
 			submit() {
+				console.log(this.uploadedFiles)
 				if (this.uploadedFiles.length < 3) {
 					uni.showToast({
 						title: '请至少上传3张照片',
@@ -113,9 +114,10 @@
 								merchantUserId: uni.getStorageSync('login_user_info').id,
 								businessType: this.uptype,
 								taskId : this.taskId,
-								imgUrl:this.imageHttp + item.message
+								imgUrl:this.imageHttp + item.response.message
 							})
 					});
+					console.log(temp)
 					
 					this.$http.post("/ts/merchant/addImg", temp).then(res => {
 					    console.log(res);

pages/order/components/serviceDetail.vue

@@ -1,12 +1,12 @@
 <template>
-	<view class="service-detail-container">
+	<view class="service-detail-container" @click="confirm">
 		<view class="popup">
 			<view class="header">
 				服务明细
 			</view>
 			<view class="detail-list">
 				<view class="item" v-for="(item,index) in form.serviceDetails" :key="index">
-					<view class="item_name">
+					<view class="item_name" style="margin-bottom: 10rpx;">
 						{{item.itemName}}
 					</view>
 					<view class="item_center">

pages/order/serviceOrder/orderDetail.vue

@@ -37,7 +37,7 @@
 			<view class="car_data" v-if="form.checkType == 0">
 				<view class="car_id user_name">
 					<span style="display: block;padding: 0px;">用户姓名：{{form.contactsName}}</span>
-					<span class="call">
+					<span class="call"  @click="callUser">
 						<image src="/static/order/call.png" mode=""></image> 联系客户
 					</span>
 				</view>

pages/order/serviceOrder/photo.vue

@@ -12,7 +12,7 @@
 		<view class="content">
 			<view class="img" v-for="(item,index) in imgList" :key="index">
 				<image :src="item.imgUrl" mode=""></image>
-					<span v-if="item.imgType == 1 &&businessType != 4">正前方</span>
+					<!-- <span v-if="item.imgType == 1 &&businessType != 4">正前方</span>
 					<span v-if="item.imgType == 4 &&businessType != 4">车辆后侧</span>
 					<span v-if="item.imgType == 2  &&businessType != 4">车辆左侧</span>
 					<span v-if="item.imgType == 3  &&businessType != 4">车辆右侧</span>
@@ -21,7 +21,7 @@
 					<span v-if="item.imgType == 7  &&businessType != 4">后排座</span>
 					<span v-if="item.imgType == 8  &&businessType != 4">服务前</span>
 					<span v-if="item.imgType == 9  &&businessType != 4">服务中</span>
-					<span v-if="item.imgType == 10  &&businessType != 4">服务后</span>
+					<span v-if="item.imgType == 10  &&businessType != 4">服务后</span> -->
 			</view>
 		</view>
 		<view class="btn">
@@ -84,11 +84,11 @@
 				}
 				this.$http.get("/ts/merchant/selectImg?taskId=" + this.taskId + '&businessType=' + Number(this.businessType))
 					.then(res => {
-						console.log(res)
+						
 						if (res.data.code == 200) {
 							// this.isSuccess = true
 							this.imgList = res.data.result
-
+console.log(this.imgList)
 						}
 					})
 			}

pages/product/index.vue

@@ -66,7 +66,8 @@
 					<view class="data">
 						<span>{{item.productName}}</span>
 						<!-- <span>售卖时间：{{item.time}}</span> -->
-						<view class="repertory">库存：{{item.stockQuantity}} <span @click.stop="goUser(item)">销量：{{item.soldQuantity}}</span> </view>
+						<view class="repertory">库存：{{item.stockQuantity}} <span
+								@click.stop="goUser(item)">销量：{{item.soldQuantity}}</span> </view>
 						<view class="price">
 							<span style="font-size: 22rpx;margin: 0px;">￥</span>{{item.soldPrice}}
 							<span v-if="item.categoryId == 1945013773786701826 ">～</span>
@@ -238,10 +239,11 @@
 				})
 			},
 			//销量页面
-			goUser(item){
+			goUser(item) {
 				console.log(item)
 				uni.navigateTo({
-					url: '/pages/product/salesUser?productName='+item.productName+'&productImage='+item.productImage+'&productId='+item.productId
+					url: '/pages/product/salesUser?productName=' + item.productName + '&productImage=' + item.productImage +
+						'&productId=' + item.productId
 				})
 			},
 			handleClear() {
@@ -330,16 +332,16 @@
 			remove() {
 				console.log(this.productList)
 				this.productList.forEach((item => {
-					if(item.select){
-							this.productHandleList.push(item.productId)
+					if (item.select) {
+						this.productHandleList.push(item.productId)
 					}
-				
+
 				}))
 				this.isDelete = true
 			},
 			removeProduct() {
-				let ids =[]
-				 ids = this.productHandleList.join(',')
+				let ids = []
+				ids = this.productHandleList.join(',')
 				console.log(ids)
 				this.$http.get("/app/product/deleteBatch?ids=" + ids, )
 					.then(res => {
@@ -433,12 +435,25 @@
 			},
 			//上架
 			sell(item) {
-				console.log(item)
-				this.sellProducts.push({
-					productId: item.productId,
-					productStatus: 1
-				})
-				this.isSell = true
+				console.log(item.categoryId)
+				let noStockCheckCategoryIds = [
+					'1889837335015636994',
+					'1889837859597238273',
+					'1909434886438043649'
+				];
+
+				if (item.stockQuantity == 0 && !noStockCheckCategoryIds.includes(item.categoryId)) {
+					uni.showToast({
+						icon: 'none',
+						title: '上架商品，库存不能为0'
+					})
+				} else {
+					this.sellProducts.push({
+						productId: item.productId,
+						productStatus: 1
+					})
+					this.isSell = true
+				}
 			},
 			sellProduct() {
 				this.$http.post("/app/product/shelves", this.sellProducts)
@@ -772,7 +787,7 @@
 								// width: 1rpx;
 								// height: 20rpx;
 								// background: #d9d9d9;
-								margin-left:  12rpx;
+								margin-left: 12rpx;
 							}
 						}
 

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({