投诉页面优化，商家入驻bug修改

pages/news1/MerchantSettlement.vue

@@ -342,61 +342,101 @@ export default {
 				})
 				.finally()
 		},
+		onShowToast(t) {
+			uni.showToast({
+				title: t,
+				icon: 'none',
+				duration: 2000
+			})
+		},
 		sureSubmit() {
 			let tip_title = null
 			if (!this.form.store_name) {
-				tip_title = '请输入主体公司名称！'
+				this.onShowToast('请输入主体公司名称！')
+				return
 			}
 			if (!this.form.store_cat) {
 				tip_title = '请选择主营类目体类目！'
+				this.onShowToast(tip_title)
+				return
 			}
 			if (!this.form.store_address) {
 				tip_title = '请选择公司地址！'
+				this.onShowToast(tip_title)
+				return
 			}
 			if (!this.form.store_brand) {
 				tip_title = '请输入合作品牌！'
+				this.onShowToast(tip_title)
+				return
 			}
 			if (!this.brand_name) {
 				tip_title = '请选择代理入驻！'
+				this.onShowToast(tip_title)
+				return
 			}
 			if (!this.authorize_name) {
 				tip_title = '请选择一二级授权！'
 			}
 			if (!this.rate_name) {
 				tip_title = '请选择可否含税！'
+				this.onShowToast(tip_title)
+				return
 			}
 			if (!this.form.user_name) {
 				tip_title = '请输入联系人姓名！'
+				this.onShowToast(tip_title)
+				return
 			}
 			if (!this.form.user_position) {
 				tip_title = '请选择联系人职位！'
+				this.onShowToast(tip_title)
+				return
 			}
 			if (!this.form.user_mobile) {
 				tip_title = '请输入联系人手机号！'
+				this.onShowToast(tip_title)
+				return
 			}
 			if (this.form.user_mobile && (!/^\+?\d[\d -]{8,12}\d/.test(this.form.user_mobile))) {
 				tip_title = '手机号格式不正确！'
+				this.onShowToast(tip_title)
+				return
 			}
 			if (!this.form.user_wx) {
 				tip_title = '请输入联系人微信！'
+				this.onShowToast(tip_title)
+				return
 			}
 			if (!this.form.user_email) {
 				tip_title = '请输入联系人邮箱！'
+				this.onShowToast(tip_title)
+				return
 			}
 			if (!this.form.store_model) {
 				tip_title = '请选择仓库模式！'
+				this.onShowToast(tip_title)
+				return
 			}
 			if (!this.send_name) {
 				tip_title = '请选择周末是否发货！'
+				this.onShowToast(tip_title)
+				return
 			}
 			if (!this.factory_name) {
 				tip_title = '请选择是否自有工厂！'
+				this.onShowToast(tip_title)
+				return
 			}
 			if (!this.offline_name) {
 				tip_title = '请选择是否有线下渠道'
+				this.onShowToast(tip_title)
+				return
 			}
 			if (!this.shop_name) {
 				tip_title = '请选择是否有电商店铺！'
+				this.onShowToast(tip_title)
+				return
 			}
 			let plat_form = []
 			this.btnList.map(item => {
@@ -407,19 +447,21 @@ export default {
 			this.form.store_type = plat_form
 			if (plat_form.length == 0 && this.form.has_online_shop == 1) {
 				tip_title = '请选择电商平台！'
-			}
-			if (tip_title != null) {
-				uni.showToast({
-					title: tip_title,
-					icon: 'none',
-					duration: 2000
-				})
+				this.onShowToast(tip_title)
 				return
 			}
 			help.joinStore(this.form)
 				.then(res => {
 					if (res.status) {
 						this.popShow = true
+						this.form = this.$options.data().form
+						this.send_name = ''
+						this.factory_name = ''
+						this.offline_name = ''
+						this.shop_name = ''
+						this.btnList.map(item => {
+							item.active = false
+						})
 					} else {
 						uni.showToast({
 							title: '入驻失败',
@@ -429,14 +471,6 @@ export default {
 					}
 				})
 				.finally(() => {
-					this.form = this.$options.data().form
-					this.send_name = ''
-					this.factory_name = ''
-					this.offline_name = ''
-					this.shop_name = ''
-					this.btnList.map(item => {
-						item.active = false
-					})
 				})
 		},
 	}

pages/news1/feedback.vue

@@ -66,7 +66,7 @@
 				提交
 			</view>
 		</view>
-		<view class="section2" v-if="OrderType == 1">
+		<view class="section2" v-if="OrderType == 1 && feedBackList.length > 0">
 			<view class="feedShow" v-for="(item, index) in feedBackList" :key="index">
 				<view class="feedbackItem">
 					<view class="feedbackContent">
@@ -110,10 +110,9 @@
 						</u-collapse>
 					</view>
 				</view>
-
 			</view>
 		</view>
-		<view class="section2" v-if="OrderType == 2">
+		<view class="section2" v-if="OrderType == 2 && feedBackList.length > 0">
 			<view class="feedShow" style="padding: 0;" v-for="(item, index) in feedBackList" :key="index">
 				<view class="feedbackResult">
 					<u-collapse>
@@ -127,35 +126,15 @@
 								</u-form-item>
 							</u-form>
 						</u-collapse-item>
-
 					</u-collapse>
 				</view>
-				<!-- <view class="feedbackItem">
-					<view class="feedbackResult">
-						<u-collapse>
-							<u-collapse-item :open="false" title="处理结果">
-								<u-form :model="item" ref="item">
-									<u-form-item label="处理时间" label-width="150" prop="time">
-										{{ item.replay_at }}
-									</u-form-item>
-									<u-form-item label="反馈内容" label-width="150" prop="feedback">
-										{{ item.content }}
-									</u-form-item>
-								</u-form>
-							</u-collapse-item>
-
-						</u-collapse>
-
-					</view> -->
-				<!-- </view> -->
-
 			</view>
-			<!-- <view class="empty">
-				<image src="/static/news1/feedbackempty.png" mode="widthFix"></image>
-				<view class="emptytext">
-					还没有反馈内容
-				</view>
-			</view> -->
+		</view>
+		<view class="empty" v-if="OrderType == 2">
+			<image class="emptyImg" :src="$picUrl + '/static/news1/feedbackempty.png'" mode="widthFix"></image>
+			<view class="emptytext">
+				还没有反馈内容
+			</view>
 		</view>
 	</view>
 </template>
@@ -233,6 +212,22 @@ export default {
 		},
 		submit() {
 			const that = this
+			if (that.form.comment == '') {
+				uni.showToast({
+					title: '请填写投诉内容！',
+					icon: 'none',
+					duration: 2000
+				})
+				return
+			}
+			if (this.form.phone && (!/^\+?\d[\d -]{8,12}\d/.test(this.form.phone))) {
+				uni.showToast({
+					title: '手机号格式不正确！',
+					icon: 'none',
+					duration: 2000
+				})
+				return
+			}
 			let params = {
 				shop_id: that.shop_id,
 				type: that.form.type,
@@ -243,6 +238,8 @@ export default {
 				feedback.add(params)
 					.then(res => {
 						that.$toast(res.message)
+						that.shop_id = ''
+						that.form = that.$options.data().form
 					})
 					.catch(reject)
 			})
@@ -253,6 +250,7 @@ export default {
 		 */
 		onOrderTab(type) {
 			this.OrderType = type;
+			this.feedBackList = []
 			if (type != 0) {
 				this.getFeedBack(type)
 			}
@@ -265,7 +263,7 @@ export default {
 				is_my: 0,
 				page: that.page
 			}
-			// params.is_my = type == 1 ? 0 : 1
+			params.is_my = type == 1 ? 0 : 1
 			return new Promise((resolve, reject) => {
 				feedback.list(params)
 					.then(res => {
@@ -505,7 +503,7 @@ page {
 
 		.feedbackContent {
 			padding: 0 30rpx 30rpx;
-			border-bottom: 1px solid #A0A0A0;
+			border-bottom: 1px solid #eee;
 
 			.fbTitle {
 				position: relative;
@@ -574,24 +572,27 @@ page {
 
 	}
 
-	.empty {
-		text-align: center;
-		position: relative;
-		top: 150rpx;
-
-		image {
-			width: 210rpx;
-			height: auto;
-		}
+}
 
-		.emptytext {
-			font-size: 32rpx;
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 500;
-			color: #717171;
+.empty {
+	width: 100%;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	flex-direction: column;
+	height: calc(100vh - 102rpx);
 
-		}
+	.emptyImg {
+		width: 210rpx;
 	}
 
+	.emptytext {
+		font-size: 32rpx;
+		font-family: PingFang SC, PingFang SC;
+		font-weight: 500;
+		color: #717171;
+		margin-top: 36rpx;
+
+	}
 }
 </style>