'销售折扣查询特殊活动优化'

pages/loan-query/loan-detail.nvue

@@ -204,7 +204,11 @@ export default {
 			});
 		},
 		async changeStatus(mode) {
-			const str = '终端：' + this.orderDetail.INFO.terminal_name + ' ，折扣金额为：' + this.orderDetail.INFO.total_amount+'元。';
+			let end_ = '';
+			if(mode == 'SUBMIT' && this.orderDetail.INFO.flag){
+				end_ = '\r\n该终端本次申请使用'+ this.orderDetail.INFO.sheet_num+'张进货折扣券，需进货'+ this.orderDetail.INFO.sheet_num+'件使用。'
+			}
+			const str = '终端：' + this.orderDetail.INFO.terminal_name + ' ，折扣金额为：' + this.orderDetail.INFO.total_amount+'元。'+end_;
 			this.showConfirmation(
 				str,
 				() => {

pages/loan-query/loan-query.nvue

@@ -3,23 +3,33 @@
 		<view class="status_bar" :style="navHeight"></view>
 		<view class="tabs">
 			<scroll-view ref="tabbar1" id="tab-bar" class="tab-bar" :scroll="false" :scroll-x="true" :scroll-into-view="scrollInto">
-				<view class="tab-bar-list">
-					<view class="tab-bar-list-wrapper">
-						<view class="uni-tab-item" v-for="(tab, index) in tabList" :key="tab.id" :ref="'tabitem' + index">
-							<text
-								:id="tab.id"
-								:data-id="index"
-								:data-current="index"
-								class="uni-tab-item-title"
-								:class="{ 'uni-tab-item-title-active': tabIndex == index }"
-								@click="ontabtap($event, tab.newsid)"
-							>
-								{{ tab.name }}
-							</text>
+				
+				<view style="display: flex;">
+					
+					<view class="tab-bar-list">
+						<view style="position: absolute;left: 0;top: 0;">
+							<picker mode="selector" :range="typeArr" @change="typeChange">
+								<view class="uni-tab-item-title-picker">{{ typeArr[typeIndex] }}  <image src="/static/image/arrow_down@3x.png" mode="widthFix"></image></view>
+								
+							</picker>
+						</view>
+						<view class="tab-bar-list-wrapper">
+							<view class="uni-tab-item" v-for="(tab, index) in tabList" :key="tab.id" :ref="'tabitem' + index">
+								<text
+									:id="tab.id"
+									:data-id="index"
+									:data-current="index"
+									class="uni-tab-item-title"
+									:class="{ 'uni-tab-item-title-active': tabIndex == index }"
+									@click="ontabtap($event, tab.newsid)"
+								>
+									{{ tab.name }}
+								</text>
+							</view>
+						</view>
+						<view class="scroll-view-indicator">
+							<view ref="underline" class="scroll-view-underline" :class="{ 'scroll-view-animation': isTap }" :style="underlineStyle"></view>
 						</view>
-					</view>
-					<view class="scroll-view-indicator">
-						<view ref="underline" class="scroll-view-underline" :class="{ 'scroll-view-animation': isTap }" :style="underlineStyle"></view>
 					</view>
 				</view>
 			</scroll-view>
@@ -69,7 +79,7 @@
 				@onAnimationEnd="animationfinish"
 			>
 				<swiper-item class="swiper-item" v-for="(page, index) in tabList" :key="index">
-					<orderPage :ref="'page' + index" class="page-item" :tabIndex="tabIndex" :nid="page.newsid" :conditions="condition"></orderPage>
+					<orderPage :ref="'page' + index" class="page-item" :tabIndex="tabIndex" :nid="page.newsid" :conditions="condition" :typeIndex="typeIndex"></orderPage>
 				</swiper-item>
 			</swiper>
 		</view>
@@ -126,6 +136,8 @@ export default {
 					newsid: '3'
 				}
 			],
+			typeArr: ['全部活动', '特殊活动'],
+			typeIndex: 0,
 			tabIndex: 0,
 			cacheTab: [],
 			scrollInto: '',
@@ -153,7 +165,7 @@ export default {
 	computed: {
 		underlineStyle() {
 			return {
-				left: this.indicatorLineLeft + 'px',
+				left: this.indicatorLineLeft - uni.upx2px(170) + 'px',
 				width: this.indicatorLineWidth + 'px'
 			};
 		},
@@ -191,6 +203,13 @@ export default {
 		this.selectorQuery();
 	},
 	methods: {
+		typeChange(e){
+			console.log(e.detail.value);
+			this.typeIndex = e.detail.value;
+			this.$nextTick(() => {
+				this.search();
+			})
+		},
 		handleShowDetail() {
 			this.ishowDetail = !this.ishowDetail;
 		},
@@ -216,10 +235,14 @@ export default {
 			// #ifdef APP-PLUS || H5 || MP-WEIXIN || MP-QQ
 			this.isTap = true;
 			var currentSize = this.tabListSize[index];
+			console.log(currentSize)
 			this.updateIndicator(currentSize.left, currentSize.width);
 			this._touchTabIndex = index;
 			// #endif
 			this.switchTab(index);
+			this.$nextTick(() => {
+				this.search();
+			})
 		},
 		onswiperchange(e) {
 			// 注意：百度小程序会触发2次
@@ -346,7 +369,7 @@ export default {
 			// #endif
 
 			// #ifndef APP-NVUE
-			this.scrollInto = this.tabList[index].id;
+			// this.scrollInto = this.tabList[index].id;
 			// #endif
 
 			// 释放 tabId
@@ -431,10 +454,11 @@ page {
 
 .tab-bar-list {
 	flex-direction: column;
+	padding-left: 170rpx;
 }
 
 .tab-bar-list-wrapper {
-	width: 750rpx;
+	width: 580rpx;
 	flex-direction: row;
 }
 
@@ -568,6 +592,20 @@ uni-button:after {
 	white-space: nowrap;
 	/* #endif */
 }
+.uni-tab-item-title-picker{
+	width: 170rpx;
+	justify-content: center;
+	color: $text-base-color;
+	font-size: 28rpx;
+	height: 40px;
+	line-height: 40px;
+	font-weight: 400;
+	align-items: center;
+	image{
+		width: 28rpx;
+		margin-left: 10rpx;
+	}
+}
 
 .uni-tab-item-title-active {
 	color: $tabbar-color;
@@ -702,4 +740,4 @@ uni-button:after {
 .height25 {
 	height: 50rpx;
 }
-</style>
+</style>
\ No newline at end of file

pages/loan-query/order-item.nvue

@@ -2,7 +2,7 @@
 	<view class="order view">
 		<view class="top" @click="handleDetail(newsItem)">
 			<text class="dot" v-if="!newsItem.new_flag && newsItem.state == '0'"></text>
-			<text class="title-no">{{ newsItem.fee_code }}</text>
+			<text class="title-no" :class="newsItem.flag?'redColor':''">{{ newsItem.fee_code }}</text>
 			<view class="title-info" v-if="newsItem.state_text">
 				<button class="title-info__status" type="default">
 					<text class="item-block-btn__text">{{ newsItem.state_text }}</text>
@@ -11,12 +11,12 @@
 		</view>
 		<view class="middle view">
 			<view class="middle-title" @click="handleDetail(newsItem)">
-				<text class="middle-title__text flex1">终端：</text>
-				<text class="middle-title__text flex6">{{ newsItem.terminal_name }}</text>
+				<text class="middle-title__text flex1" :class="newsItem.flag?'redColor':''">终端：</text>
+				<text class="middle-title__text flex6" :class="newsItem.flag?'redColor':''">{{ newsItem.terminal_name }}</text>
 			</view>
 			<view class="middle-title" @click="handleDetail(newsItem)">
-				<text class="middle-title__text flex1">产品：</text>
-				<text class="middle-title__text flex6">{{ newsItem.product_name }}</text>
+				<text class="middle-title__text flex1" :class="newsItem.flag?'redColor':''">产品：</text>
+				<text class="middle-title__text flex6" :class="newsItem.flag?'redColor':''">{{ newsItem.product_name }}</text>
 			</view>
 			<view class="check-box">
 				<radio-group @change="handleCheck(idx)">
@@ -28,8 +28,10 @@
 					<button class="title-info__status blue" type="default" @click="goActDetail(newsItem.acts)">
 						<text class="item-block-btn__text">活动明细</text>
 					</button>
-					<text class="middle-title__text">总金额：</text>
-					<text class="middle-title__text red">{{ newsItem.total_amount }}</text>
+					<view>
+						<text class="middle-title__text">总金额：</text>
+						<text class="middle-title__text red">{{ newsItem.total_amount }}</text>
+					</view>
 				</view>
 			</view>
 		</view>
@@ -45,6 +47,10 @@
 					<text class="middle-date middle-date-select">活动金额：</text>
 					<text class="middle-date-des middle-date-des-select">{{ item.amount }}</text>
 				</view>
+				<view class="text-block">
+					<text class="middle-date middle-date-select">张数：</text>
+					<text class="middle-date-des middle-date-des-select">{{ item.sheet_num }}</text>
+				</view>
 			</view>
 		  </scroll-view>
 		</uni-popup>
@@ -417,7 +423,8 @@ export default {
 	flex-direction: column;
 }
 .total-amount {
-	justify-content: end;
+	flex: 1;
+	justify-content: space-between;
 }
 .red {
 	color: #f61d30;
@@ -459,4 +466,11 @@ export default {
 	border-bottom: 1px solid #999;
 	margin-bottom: 10rpx;
 }
+.redColor{
+	color: red;
+}
+.middle-date-des-select{
+	flex: 1;
+	flex-wrap: wrap;
+}
 </style>
\ No newline at end of file

pages/loan-query/order-page.nvue

@@ -72,6 +72,10 @@ export default {
 		conditions: {
 			type: Object,
 			default: () => {}
+		},
+		typeIndex:{
+			type: Number,
+			default: 0
 		}
 	},
 	data() {
@@ -160,7 +164,11 @@ export default {
 		},
 		async changeStatus(mode) {
 			const data = this.dataList.filter((v) => v.checked);
-			const str = '终端：' + data[0].terminal_name +'\r\n' +'折扣金额为：' + data[0].total_amount+'元。';
+			let end_ = '';
+			if(mode == 'SUBMIT' && data[0].flag){
+				end_ = '\r\n该终端本次申请使用'+data[0].acts[0].sheet_num+'张进货折扣券，需进货'+data[0].acts[0].sheet_num+'件使用。'
+			}
+			const str = '终端：' + data[0].terminal_name +'\r\n' +'折扣金额为：' + data[0].total_amount+'元。'+end_;
 			this.showConfirmation(
 				str,
 				() => {
@@ -227,7 +235,8 @@ export default {
 				...this.condition,
 				...obj,
 				user_bp: this.userInfo.code,
-				role: 'WLY001'
+				role: 'WLY001',
+				flag:this.typeIndex == 0?'':this.typeIndex == 1?'X':''
 			};
 			params.fee_code[0].low = params.fee_code[0].low ? '*' + params.fee_code[0].low + '*' : delete params.fee_code;
 			params.terminal_code[0].low = params.terminal_code[0].low ? '*' + params.terminal_code[0].low + '*' : delete params.terminal_code;