销售折扣

pages/loan-query/order-item.nvue

@@ -25,11 +25,29 @@
 					</label>
 				</radio-group>
 				<view class="total-amount">
+					<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>
 			</view>
 		</view>
+		<uni-popup ref="popup" type="center">
+		  <scroll-view scroll-x scroll-y class="popup-content">
+			<view class="view planout-block-item" v-for="(item,index) in actArr" >
+				<view class="text-block">
+					<text class="middle-date middle-date-select">活动名称：</text>
+					<!-- <text class="middle-date-pro middle-date-des-select">五粮液39度重点城市的终端活动-优化0801</text> -->
+					<text class="middle-date-pro middle-date-des-select" :class="item.act_name.length>15?'pro-flex': ''">{{ item.act_name }}</text>
+				</view>
+				<view class="text-block">
+					<text class="middle-date middle-date-select">活动金额：</text>
+					<text class="middle-date-des middle-date-des-select">{{ item.amount }}</text>
+				</view>
+			</view>
+		  </scroll-view>
+		</uni-popup>
 	</view>
 </template>
 
@@ -61,7 +79,8 @@ export default {
 			receiveInfoHeight: '132',
 			receiveInfoDetailSize: {},
 			allFiles: [],
-			cb: ''
+			cb: '',
+			actArr: []
 		};
 	},
 	computed: {
@@ -88,6 +107,14 @@ export default {
 	},
 	mounted() {},
 	methods: {
+		goActDetail(arr){
+			this.actArr = arr
+			this.$refs.popup.open()
+		},
+		closePopup(){
+			this.actArr = []
+			this.$refs.popup.close()
+		},
 		handleCheck() {
 			this.$emit('handleCheck', this.idx);
 		},
@@ -157,7 +184,10 @@ export default {
 	padding: 0 10rpx;
 	border: none;
 }
-
+.blue{
+	background: #007aff;
+	margin-right: 20rpx;
+}
 .item-block-btn__text {
 	font-size: 12px;
 	color: #fff;
@@ -188,9 +218,9 @@ export default {
 }
 
 .text-block {
-	flex: 1;
-	flex-direction: column;
-	margin-bottom: 16rpx;
+	margin-bottom: 10rpx;
+	display: flex;
+	overflow: auto;
 }
 
 .text-block-last {
@@ -199,13 +229,21 @@ export default {
 
 .middle-date {
 	font-size: 28rpx;
-	color: $text-base-color;
-	margin-top: 8rpx;
+	color: #333;
+	margin-bottom: 8rpx;
+}
+.middle-date-pro {
+	font-size: 28rpx;
+	color: #888;
+	overflow: auto;
+}
+.pro-flex{
+	flex: 4;
+	height: 74rpx;
 }
-
 .middle-date-des {
-	font-size: 24rpx;
-	color: #999;
+	font-size: 28rpx;
+	color: #888;
 }
 
 .text-block-box {
@@ -272,10 +310,7 @@ export default {
 .block-detal {
 	display: flex;
 	flex-direction: column;
-	background: #f8f8f8;
-	border-radius: 20rpx;
-	padding: 28rpx 32rpx;
-	margin-bottom: 16rpx;
+	margin-bottom: 6rpx;
 }
 
 .block-detal-last {
@@ -284,7 +319,7 @@ export default {
 
 .block-detal-item {
 	display: flex;
-	margin-bottom: 32rpx;
+	margin-bottom: 20rpx;
 	justify-content: space-between;
 }
 
@@ -294,7 +329,7 @@ export default {
 
 .detal-item-label {
 	color: #999;
-	font-size: 24rpx;
+	font-size: 28rpx;
 }
 
 .detal-item-value {
@@ -410,4 +445,18 @@ export default {
 	display: flex;
 	justify-content: space-between;
 }
+.popup-content{
+	background: #fff;
+	padding: 20rpx 20rpx;
+	width: 600rpx;
+	max-height: 800rpx;
+	border-radius: 5px;
+	overflow: auto;
+	display: flex;
+	flex-direction: column;
+}
+.planout-block-item {
+	border-bottom: 1px solid #999;
+	margin-bottom: 10rpx;
+}
 </style>
\ No newline at end of file

pages/loan-query/order-page.nvue

@@ -49,7 +49,7 @@ import uniCell from '@/components/uni-cell.vue';
 import uniRefresh from '@/components/uni-refresh.vue';
 import uniLoadMore from '@/components/uni-load-more.vue';
 import noData from '@/components/nodata.nvue';
-import { getDhk, getSubmitDhk } from '@/servers/loan.js';
+import { getDhkApp, getSubmitDhk } from '@/servers/loan.js';
 import orderItem from './order-item.nvue';
 export default {
 	components: {
@@ -242,7 +242,7 @@ export default {
 			}
 			!params.state[0].low && delete params.state;
 			let res = null;
-			res = await getDhk(params);
+			res = await getDhkApp(params);
 			if (res.msgtype == 'S') {
 				this.isLoading = false;
 				if (refresh) {

pages/out-web-site/out-web-site.vue

@@ -8,11 +8,15 @@
 </template>
 
 <script>
+	import {
+		querySysDictionaryDetailsByCode,
+	} from '@/servers/purchaseList.js'
 	import { getClientByApp } from '@/servers/address.js'
 	import { mapState } from 'vuex'
 	export default {
 		data() {
 			return {
+				token: '',
 				src: '',
 				webview_styles: {
 				}
@@ -33,9 +37,11 @@
 			async getClientByApp(){
 				const res = await getClientByApp({code: this.userInfo.code})
 				if(res){
+					this.token = res
+					this.getSelectDictDataOrigin()
 					// this.src = 'https://yingxiao.wuliangye.com.cn/webroot/login/jxsLogin_test.html?'+res //测试环境
 					// this.src = 'https://yingxiao.wuliangye.com.cn/webroot/login/jxsLogin.html?'+res  //生产环境
-					this.src = 'https://vls.wuliangyegroup.com.cn:8090/webroot/decision?'+res  //25.6.23生产环境
+					// this.src = 'https://vls.wuliangyegroup.com.cn:8090/webroot/decision?'+res  //25.6.23生产环境
 				}else{
 					uni.showToast({
 						title: '权限校验不通过',
@@ -46,6 +52,17 @@
 				}
 				
 			},
+			getSelectDictDataOrigin() {
+			  querySysDictionaryDetailsByCode({'code': 'thirdSysUrl'})
+				.then(res => {
+					const arr = res.data.Rows
+					if(arr.length > 0){
+						const result = arr.find(item => item.name === 'kanban');
+						this.src = result.value + this.token
+					}
+				})
+				.catch(() => {})
+			},
 			message(event) {
 				console.log(JSON.stringify(event.detail));
 			},

servers/loan.js

@@ -21,3 +21,7 @@ export async function getDhkDbsl(params) {
 	const res = await apiHelper.post('/sap/bc/ztpm/to_new_crm/transdata/get_dhk_dbsl', params)
 	return res
 }
+export async function getDhkApp(params) {
+	const res = await apiHelper.post('/sap/bc/ztpm/to_new_crm/transdata/get_dhk_app', params)
+	return res
+}
\ No newline at end of file