Merge remote-tracking branch 'origin/dev' into dev

src/pages/fabricModeling/modelingOrder.vue

@@ -52,7 +52,7 @@
 					<view class="">全部订单：共{{ total }}单</view>
 					<view class="">截止日期：{{ dateTime }}</view>
 				</view>
-				<view v-if="!isEmpty" class="bg-fff color_FA5353 hs-weight-700 u-flex u-row-between u-p-t-24 u-p-b-24 u-p-l-30 u-p-r-30">
+				<view v-if="!isEmpty && overtimeOrderNum > 0 && currentTab == 0" class="bg-fff color_FA5353 hs-weight-700 u-flex u-row-between u-p-t-24 u-p-b-24 u-p-l-30 u-p-r-30">
 					<view @click="change(5)">有订单超时未完成，请前往操作</view>
 				</view>
 				<!-- list -->
@@ -86,7 +86,7 @@
 								<view v-if="item.status == 1 || item.status == 2" @click="dateilEnt(item, '即刻发布')" class="u-m-l-10 btn">即刻发布</view>
 								<view v-if="item.status == 3" class="u-m-l-10 btn">撤回</view>
 								<view v-if="item.status == 4" @click="dateilEnt(item, '马上寄送')" class="u-m-l-10 btn">马上寄送</view>
-								<view v-if="item.status == 5 || item.status == 6" @click.stop="reminder(item.id)" class="u-m-l-10 btn">催单</view>
+								<view v-if="item.oddStatus == 2 && item.status == 5" @click.stop="reminder(item.id)" class="u-m-l-10 btn">催单</view>
 								<view v-if="item.status == 7" class="u-m-l-10 btn">前往审核</view>
 							</view>
 						</view>
@@ -295,16 +295,16 @@ export default {
 						this.overtimeOrderNum = data.overtimeOrderNum; // 超时订单
 						this.quantityNum = data.quantityToBeConfirmed; // 待确认数量
 						this.loadStatus = this.entrustmentList.length < this.total ? 'loadmore' : 'nomore';
-						this.$refs.uToast.show({
-							title: '操作成功'
-						});
+						// this.$refs.uToast.show({
+						// 	title: '操作成功'
+						// });
 					}
 					uni.stopPullDownRefresh();
 				})
 				.catch(err => {
-					this.$refs.uToast.show({
-						title: '操作失败'
-					});
+					// this.$refs.uToast.show({
+					// 	title: '操作失败'
+					// });
 					uni.stopPullDownRefresh();
 				});
 		},