From 67bcc526468aa90f71dcdd10db79d7f3a0ad764d Mon Sep 17 00:00:00 2001
From: "USER-20200413TQ\\Administrator" <812952667@qq.com>
Date: Thu, 20 Oct 2022 17:56:01 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=AF=B9=E6=8E=A5=E7=AB=99=E5=86=85=E4=BF=A1?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Utils/Api.js                 |   6 +
 pages/order/confirmation.vue | 523 ++++++++++++++---------------------
 pages/user/news/news.vue     | 116 ++++++--
 3 files changed, 301 insertions(+), 344 deletions(-)

diff --git a/Utils/Api.js b/Utils/Api.js
index 48c3f9d..c6ba27a 100644
--- a/Utils/Api.js
+++ b/Utils/Api.js
@@ -187,6 +187,12 @@ export const getDiscountByCode = params => {
 }
 
 
+
+
+//站内信列表
+export const queryMsgByList = params => {
+	return POST('GET', `${base}/bsMsg/queryMsgByList`, params).then(res => res.data);
+}
 // 根据优惠券查卡券
 export const getCouponByDiscount = params => {
 	return POST('GET', `${base}/discount/getCouponByDiscount`, params).then(res => res.data);
diff --git a/pages/order/confirmation.vue b/pages/order/confirmation.vue
index e83e383..f9e014f 100644
--- a/pages/order/confirmation.vue
+++ b/pages/order/confirmation.vue
@@ -87,107 +87,98 @@
 				</view>
 			</view>
 		</view>
-		
-		<view class="width94 backcorfff mart10">
-			<view class="width94 alijusstart height50 font14 fcor666">
-				<view class="width40 fcor333 fontwig6 font16" style="padding-left: 2%;">邀请码</view>
-				<input class="width60 fotrt font15" v-model="identificationCode" placeholder="请输入邀请码" />
-			</view>
-		</view>
-		
-		<view class="width94 comorder mart10">
-			
-			<view class="width92 alijusstart paddtop20">
-				<view class="width30 fcor333 fontwig6 font16">
-					积分抵扣
-				</view>
-				<view class="cj-slider">
-					<view class="flleft fotct font14 fcor666" style="width: 15%;">0</view>
-					<cj-slider style="width: 60%; float:left;" v-if="isDiscount" v-model="priceValue" :min="0"
-						:max="availIntegal" :step="1" :blockWidth="40" @start="blockStart" @moving="blockMoving"
-						@end="blockEnd" />
-					<!-- <cj-slider style="width: 60%; float:left;" v-if="isDiscount == 2" v-model="priceValue" :min="0"
-						:max="availIntegal" :step="1" :blockWidth="40" @start="blockStart" @moving="blockMoving"
-						@end="blockEnd" /> -->
-					<view class="flright fotrt font14 fcor666" style="width: 25%;">{{availIntegal}}</view>
-				</view>
-			</view>
-			<view class="width94 line1 mart15 marb5"></view>
-			<view class="height50 width100 backcorfff">
-				<view class="width70 flleft fcor333 fontwig6 font16 text1" style="padding-left: 4%;">
-					抵扣金额
-				</view>
-				<view class="width20 flright fotrt paddtright10 font15 fontwig6 fcor666 alijun"
-					style="align-items: center;">
-					¥{{priceValue[1] / 100}}
-				</view>
-			</view>
-			<view class="width94 line1 mart5 marb5"></view>
-			
-			<view class="height40 width100 backcorfff">
-				<view class="width40 flleft fcor666 font15 fontwig6 text1 alijusstart" style="padding-left: 2%;">
-					<image src="../../static/img/rebate.png" mode="widthFix" style="width: 25px;"></image>
-					<text>下单返积分</text>
-				</view>
-				<view class="width50 flright fotrt paddtright10 font15 colore95 alijun" v-if="Integrastu == 1"
-					style="align-items: center;">
-					返{{rebateIntegral}}积分
-				</view>
-				<view class="width50 flright fotrt paddtright10 font15 colore95 alijun" v-if="Integrastu == 2"
-					style="align-items: center;">
-					{{rebateIntegral}}
-				</view>
-			</view>
-			<view class=" width100 backcorfff alijusstart paddbotm10" style="padding-left: 2%;">
-				<image src="../../static/img/sigh.png" mode="widthFix" class="icon20"></image>
-				<text class="fcor999 font13">积分抵扣与优惠券抵扣不同享</text>
-			</view>
-			
-			
-			<view class="height50 width100 backcorfff">
-				<view class="width100 flleft fcor333 fontwig6 font16" style="padding-left: 4%;">
-					支付方式: <text class="jfrecharge" @click="jumpdeposits"
-						v-if="couponList.payType == 1 || couponList.payType == 2 || couponList.payType==3">积分充值</text>
+
+		<view class="width94 backcorfff mart10">
+			<view class="width94 alijusstart height50 font14 fcor666">
+				<view class="width40 fcor333 fontwig6 font16" style="padding-left: 2%;">邀请码</view>
+				<input class="width60 fotrt font15" v-model="identificationCode" placeholder="请输入邀请码" />
+			</view>
+		</view>
+
+		<view class="width94 comorder mart10">
+
+			<view class="width92 alijusstart paddtop20">
+				<view class="width30 fcor333 fontwig6 font16">
+					积分抵扣
+				</view>
+				<view class="cj-slider">
+					<view class="flleft fotct font14 fcor666" style="width: 15%;">0</view>
+					<cj-slider style="width: 60%; float:left;" v-if="isDiscount" v-model="priceValue" :min="0"
+						:max="availIntegal" :step="1" :blockWidth="40" @start="blockStart" @moving="blockMoving"
+						@end="blockEnd" />
+					<!-- <cj-slider style="width: 60%; float:left;" v-if="isDiscount == 2" v-model="priceValue" :min="0"
+						:max="availIntegal" :step="1" :blockWidth="40" @start="blockStart" @moving="blockMoving"
+						@end="blockEnd" /> -->
+					<view class="flright fotrt font14 fcor666" style="width: 25%;">{{availIntegal}}</view>
 				</view>
 			</view>
-			<view class="width94 line1 mart5 marb5"></view>
-			<view class="height50 width100 backcorfff"
-				v-if="couponList.payType == 1 || couponList.payType == 2 || couponList.payType==3"
-				@tap="paytype='jinbi'">
-				<view class="width70 flleft fcor333 font16 text1" style="padding-left: 4%;">
-					积分支付<text class="font14 fcor666 margle">可用积分: {{user.gold}}</text>
+			<view class="width94 line1 mart15 marb5"></view>
+			<view class="height50 width100 backcorfff">
+				<view class="width70 flleft fcor333 fontwig6 font16 text1" style="padding-left: 4%;">
+					抵扣金额
 				</view>
 				<view class="width20 flright fotrt paddtright10 font15 fontwig6 fcor666 alijun"
 					style="align-items: center;">
-					<radio :checked="paytype=='jinbi'" color="#0083f5" />
+					¥{{priceValue[1] / 100}}
 				</view>
 			</view>
-			<view class="width94 line1 mart5 marb5"
-				v-if="couponList.payType == 1 || couponList.payType == 2 || couponList.payType==3"></view>
-			<view class="height50 width100 backcorfff" @tap="paytype='weixin'"
-				v-if="couponList.payType == 1 || couponList.payType==3 ">
-				<view class="width50 flleft fcor333 font16" style="padding-left: 4%;">
-					微信支付
+			<view class="width94 line1 mart5 marb5"></view>
+
+			<view class="height40 width100 backcorfff">
+				<view class="width40 flleft fcor666 font15 fontwig6 text1 alijusstart" style="padding-left: 2%;">
+					<image src="../../static/img/rebate.png" mode="widthFix" style="width: 25px;"></image>
+					<text>下单返积分</text>
 				</view>
-				<view class="width40 flright fotrt paddtright10 font15 fontwig6 fcor666 alijun"
+				<view class="width50 flright fotrt paddtright10 font15 colore95 alijun" v-if="Integrastu == 1"
+					style="align-items: center;">
+					返{{rebateIntegral}}积分
+				</view>
+				<view class="width50 flright fotrt paddtright10 font15 colore95 alijun" v-if="Integrastu == 2"
 					style="align-items: center;">
-					<radio :checked="paytype=='weixin'" color="#0083f5" />
+					{{rebateIntegral}}
 				</view>
 			</view>
-			<view class="width94 line1 mart5 marb5" v-if="couponList.payType == 1 || couponList.payType==3"></view>
-			<view class="height50 width100 backcorfff" @tap="paytype='gonghuika'" v-if="couponList.payType== 4">
-				<view class="width70 flleft fcor333 font16 text1" style="padding-left: 4%;">
-					汇联通工会卡<text class="font14 fcor666 margle">可用余额: {{tongCardPrice}}元</text>
+			<view class=" width100 backcorfff alijusstart paddbotm10" style="padding-left: 2%;">
+				<image src="../../static/img/sigh.png" mode="widthFix" class="icon20"></image>
+				<text class="fcor999 font13">积分抵扣与优惠券抵扣不同享</text>
+			</view>
+
+
+			<view class="height50 width100 backcorfff">
+				<view class="width100 flleft fcor333 fontwig6 font16" style="padding-left: 4%;">
+					支付方式
+					<!-- : <text class="jfrecharge" @click="jumpdeposits"
+						v-if="couponList.payType == 1 || couponList.payType == 2 || couponList.payType==3">积分充值</text> -->
 				</view>
-				<view class="width20 flright fotrt paddtright10 font15 fontwig6 fcor666 alijun"
-					style="align-items: center;">
-					<radio :checked="paytype=='gonghuika'" @click="changeRiado()" color="#0083f5" />
+			</view>
+			<!-- <view class="width94 line1 mart5 marb5"></view> -->
+			<view class="width100" v-for="(item,index) in paytypeList" :key="index">
+				<view class="width94 line1 mart5 marb5"
+					v-if="item == 2"></view>
+				<view class="height50 width100 backcorfff" @tap="paytype='2'" v-if="item == 2">
+					<view class="width50 flleft fcor333 font16" style="padding-left: 4%;">
+						微信支付
+					</view>
+					<view class="width40 flright fotrt paddtright10 font15 fontwig6 fcor666 alijun"
+						style="align-items: center;">
+						<radio :checked="paytype=='2'" color="#0083f5" />
+					</view>
+				</view>
+				<view class="width94 line1 mart5 marb5" v-if="item == 3"></view>
+				<view class="height50 width100 backcorfff" @tap="paytype='3'" v-if="item == 3">
+					<view class="width70 flleft fcor333 font16 text1" style="padding-left: 4%;">
+						汇联通工会卡<text class="font14 fcor666 margle">可用余额: {{tongCardPrice}}元</text>
+					</view>
+					<view class="width20 flright fotrt paddtright10 font15 fontwig6 fcor666 alijun"
+						style="align-items: center;">
+						<radio :checked="paytype=='3'" @click="changeRiado()" color="#0083f5" />
+					</view>
 				</view>
 			</view>
 		</view>
 
-		
-		
+
+
 		<!-- <view class="width94 comorder mart10">
 			<view class="height50 width100 backcorfff">
 				<view class="width80p flleft fcor333 fontwig6 font14" style="padding-left: 4%;">
@@ -242,7 +233,7 @@
 
 <script>
 	import {
-		addOrder,
+		addOrder,
 		create,
 		getCouponById,
 		loginByPhone,
@@ -250,12 +241,12 @@
 		orderToPay,
 		orderToGoldPay,
 		findUser,
-		hltUnionCardPay,
+		hltUnionCardPay,
 		getRebateIntegral,
-		getHuiLianTongCardBalance,
-		findById
+		getHuiLianTongCardBalance,
+		getThirdPartyByDetail
 	} from '../../Utils/Api.js';
-	import wybPopup from '../../components/wyb-popup/wyb-popup.vue';
+	import wybPopup from '../../components/wyb-popup/wyb-popup.vue';
 	import cjSlider from '../../components/cj-slider/cj-slider.vue';
 	import ssPaymentPassword from '../../components/sanshui-payment-password'
 	let app = getApp();
@@ -295,14 +286,15 @@
 				coupondiscountid: '',
 				orderDetails: '', //订单详情
 				payGold: '', //积分数
-				identificationCode: '' ,//渠道商
-				paytypeList: [], //支付方式
-				priceValue: [0, 0], // 积分可以指定默认值
-				changePrice: '', //滑动值
-				isDiscount: true,
-				availIntegal: '', // 可用积分
-				isUse: true, // 是否禁用状态
-				rebateIntegral: '', //返回积分
+				identificationCode: '', //渠道商
+				paytypeList: [], //支付方式
+				priceValue: [0, 0], // 积分可以指定默认值
+				changePrice: '', //滑动值
+				isDiscount: true,
+				availIntegal: '', // 可用积分
+				isUse: true, // 是否禁用状态
+				rechargeDes: '', // 支付详情
+				rebateIntegral: '', //返回积分
 				Integrastu: 1 //返积分状态 
 			};
 		},
@@ -349,40 +341,37 @@
 				return `${year}${spe}${month}${spe}${day} ${h}:${mm}:${s}`;
 			}
 		},
-		methods: {
-			//查询详情
-			findById() {
-				uni.showLoading({
-					title: '加载中'
-				})
-				let showType;
-				// #ifdef H5
-				showType = 2;
-				// #endif
-				// #ifdef MP
-				showType = 1;
-				// #endif
-				let datas = {
-					platformId: showType,
-					id: this.objectId
-				}
-				findById(datas).then(res => {
-					if (res.return_code == '000000') {
-						uni.hideLoading();
-						this.rechargeDes = res.return_data;
-						this.paytypeList = res.return_data.productPayTypeString.split(',');
-						this.paytypeList = this.paytypeList.slice(0, this.paytypeList.length - 1);
-						let zkprice = parseFloat(res.return_data.integralDiscount / 100).toFixed(2);
-						let pprice = parseFloat(res.return_data.payPrice * 100).toFixed(0)
-						let payprice = parseFloat(res.return_data.payPrice * 100 * zkprice).toFixed(
-							0);
-						if (payprice > this.user.gold) {
-							this.availIntegal = this.user.gold;
-						} else {
-							this.availIntegal = payprice;
-						}
-					}
-				});
+		methods: {
+			//查询支付方式
+			getThirdPartyByDetail() {
+				// #ifdef H5
+				this.showType = 2;
+				// #endif
+				// #ifdef MP
+				this.showType = 1;
+				// #endif
+				let datas = {
+					platformId: this.showType,
+					regionId: app.globalData.cityId,
+					productType: 4,
+					productId: this.couponList.couponSource
+				}
+				getThirdPartyByDetail(datas).then(res => {
+					if (res.return_code == '000000') {
+						this.rechargeDes = res.return_data;
+						this.paytypeList = res.return_data.productPayType.split(',');
+						this.paytypeList = this.paytypeList.slice(0, this.paytypeList.length - 1);
+						let zkprice = parseFloat(res.return_data.integralDiscount / 100).toFixed(2);
+						let pprice = parseFloat(this.totalprice * 100).toFixed(0)
+						let payprice = parseFloat(this.totalprice * 100 * zkprice).toFixed(
+							0);
+						if (payprice > this.user.gold) {
+							this.availIntegal = this.user.gold;
+						} else {
+							this.availIntegal = payprice;
+						}
+					}
+				});
 			},
 			//查询积分
 			findUser() {
@@ -390,13 +379,13 @@
 				findUser(params).then(res => {
 					if (res.return_code == '000000') {
 						app.globalData.userInfo = res.return_data;
-						this.user = res.return_data;
-						this.availIntegal = res.return_data.gold;
+						this.user = res.return_data;
+						this.availIntegal = res.return_data.gold;
 						this.findById();
 						if (this.user.hltCardNo) {
-							this.getHuiLianTongCardBalance();
+							this.getHuiLianTongCardBalance();
 						}
-						this.getUserNormalDiscountList();
+						this.getUserNormalDiscountList();
 						this.getRebateIntegral();
 						uni.setStorage({
 							key: "user",
@@ -404,24 +393,24 @@
 						})
 					}
 				});
-			},
-			//支付返利积分
-			getRebateIntegral() {
-				let datas = {
-					"companyId": app.globalData.companyId,
-					"price": this.paytheprice,
-					"productId": 1,
-					"type": 1,
-				}
-				getRebateIntegral(datas).then(res => {
-					if (res.return_code == '000000') {
-						this.rebateIntegral = res.return_data;
-						this.Integrastu = 1;
-					} else {
-						this.rebateIntegral = res.return_msg;
-						this.Integrastu = 2;
-					}
-				})
+			},
+			//支付返利积分
+			getRebateIntegral() {
+				let datas = {
+					"companyId": app.globalData.companyId,
+					"price": this.paytheprice,
+					"productId": 1,
+					"type": 1,
+				}
+				getRebateIntegral(datas).then(res => {
+					if (res.return_code == '000000') {
+						this.rebateIntegral = res.return_data;
+						this.Integrastu = 1;
+					} else {
+						this.rebateIntegral = res.return_msg;
+						this.Integrastu = 2;
+					}
+				})
 			},
 			//查询卡券详情
 			getCouponById() {
@@ -436,6 +425,7 @@
 					if (res.return_code == '000000') {
 						this.couponList = res.return_data;
 						this.paytheprice = res.return_data.discountPrice;
+						this.getThirdPartyByDetail();
 					}
 				})
 			},
@@ -617,7 +607,7 @@
 			//获取订单数据
 			orderToPay(item) {
 				let that = this;
-				if (that.paytype == 'weixin') {
+				if (that.paytype == '2') {
 					// #ifdef H5
 					let params = {
 						"orderId": item.id,
@@ -678,104 +668,7 @@
 							})
 						}
 					})
-				} else if (that.paytype == 'jinbi') {
-					if (that.user.gold < that.paytheprice * 100 && !this.couponList.buyPoints) {
-						uni.showToast({
-							icon: 'none',
-							title: '积分不足',
-							duration: 2000,
-							success() {
-								setTimeout(() => {
-									uni.navigateTo({
-										url: '../user/deposit/deposit'
-									})
-								}, 1000)
-							}
-						});
-						return;
-					}
-
-					if (that.user.gold < that.paytheprice * 100 && this.couponList.buyPoints) {
-
-						uni.showModal({
-							title: '积分支付',
-							content: '积分不足，请购买并兑换',
-							success: function(res) {
-								if (res.confirm) {
-									// #ifdef H5
-									let params = {
-										"orderId": item.id,
-										"openId": app.globalData.openId,
-										"orderScene": "GOODS_ORDER",
-										"openIdType": 2
-									}
-									// #endif
-									// #ifdef MP
-									let params = {
-										"orderId": item.id,
-										"openId": app.globalData.openId,
-										"orderScene": "GOODS_ORDER"
-									}
-									// #endif
-									orderToPay(params).then(res => {
-										if (res.return_code == '000000') {
-											// #ifdef MP
-											uni.showLoading({
-												title: '支付中...'
-											})
-											uni.requestPayment({
-												"appId": res.return_data.appId,
-												"nonceStr": res.return_data.nonceStr,
-												"package": res.return_data.package,
-												"paySign": res.return_data.sign,
-												"signType": "MD5",
-												"timeStamp": res.return_data.timeStamp,
-												success: function(res) {
-													uni.hideLoading();
-													uni.showToast({
-														title: '支付成功'
-													})
-													app.globalData.storeid = '';
-													app.globalData.storename = '';
-													uni.reLaunch({
-														url: '../pay/success/success?id=' +
-															that.couponId
-													});
-												},
-												fail: function(err) {
-													uni.hideLoading();
-													uni.navigateBack({})
-												},
-											});
-											// #endif
-
-											//判断是否是公众号
-											// #ifdef H5
-											//判断微信浏览器
-											that.payRequest(res);
-											// #endif
-
-										} else {
-											uni.showToast({
-												title: res.return_msg,
-												icon: 'none'
-											})
-										}
-									})
-								}
-							}
-						})
-
-						return;
-					}
-					if (!that.user.isSetPayPwd) {
-						uni.navigateTo({
-							url: '../login/updatePas/updatePas'
-						})
-						return;
-					}
-					that.$refs.paymentPassword.modalFun('show');
-				} else if (that.paytype == 'gonghuika') {
+				} else if (that.paytype == '3') {
 					if (that.tongCardPrice < that.paytheprice) {
 						uni.showToast({
 							icon: 'none',
@@ -827,37 +720,37 @@
 				uni.showLoading({
 					title: '支付中...'
 				})
-				if (this.paytype == 'jinbi') {
-					let params = {
-						"orderId": this.orderId,
-						"password": this.PaymentPassword
-					}
-					orderToGoldPay(params).then(res => {
-						uni.hideLoading();
-						if (res.return_code == '000000') {
-							uni.showToast({
-								title: '支付成功'
-							})
-							app.globalData.storeid = '';
-							app.globalData.storename = '';
-							uni.reLaunch({
-								url: '../pay/success/success?id=' + this.couponId
-							});
-							return;
-						}
-						if (res.return_code == '102130') {
-							uni.navigateTo({
-								url: '../../login/updatePas/updatePas'
-							})
-							return;
-						}
-						uni.showToast({
-							title: res.return_msg,
-							icon: 'none'
-						})
-					})
-					return;
-				}
+				// if (this.paytype == 'jinbi') {
+				// 	let params = {
+				// 		"orderId": this.orderId,
+				// 		"password": this.PaymentPassword
+				// 	}
+				// 	orderToGoldPay(params).then(res => {
+				// 		uni.hideLoading();
+				// 		if (res.return_code == '000000') {
+				// 			uni.showToast({
+				// 				title: '支付成功'
+				// 			})
+				// 			app.globalData.storeid = '';
+				// 			app.globalData.storename = '';
+				// 			uni.reLaunch({
+				// 				url: '../pay/success/success?id=' + this.couponId
+				// 			});
+				// 			return;
+				// 		}
+				// 		if (res.return_code == '102130') {
+				// 			uni.navigateTo({
+				// 				url: '../../login/updatePas/updatePas'
+				// 			})
+				// 			return;
+				// 		}
+				// 		uni.showToast({
+				// 			title: res.return_msg,
+				// 			icon: 'none'
+				// 		})
+				// 	})
+				// 	return;
+				// }
 
 				let params = {
 					"orderId": this.orderId,
@@ -948,31 +841,31 @@
 						duration: 4000
 					});
 				});
-			},
-			
-			blockStart() {},
-			blockMoving() {
-				// console.log('正在滑动中')
-			},
-			//滑动结束
-			blockEnd() {
-				this.isDiscount = 1;
-				if (this.deductionPrice == 0) {
-					this.payPrice = parseFloat(this.saveprice - parseFloat(this.priceValue[1] / 100).toFixed(2)).toFixed(
-						2);
-				} else {
-					this.payPrice = parseFloat(this.orderPrice - parseFloat(this.priceValue[1] / 100).toFixed(2) - this
-						.deductionPrice).toFixed(2);
-				}
-				if (this.payPrice == 0) {
-					this.isUse = false;
-					this.paytype = '';
-				} else {
-					this.isUse = true;
-				}
-				this.getRebateIntegral();
-			},
-			
+			},
+
+			blockStart() {},
+			blockMoving() {
+				// console.log('正在滑动中')
+			},
+			//滑动结束
+			blockEnd() {
+				this.isDiscount = 1;
+				if (this.deductionPrice == 0) {
+					this.payPrice = parseFloat(this.saveprice - parseFloat(this.priceValue[1] / 100).toFixed(2)).toFixed(
+						2);
+				} else {
+					this.payPrice = parseFloat(this.orderPrice - parseFloat(this.priceValue[1] / 100).toFixed(2) - this
+						.deductionPrice).toFixed(2);
+				}
+				if (this.payPrice == 0) {
+					this.isUse = false;
+					this.paytype = '';
+				} else {
+					this.isUse = true;
+				}
+				this.getRebateIntegral();
+			},
+
 			//跳转积分充值
 			jumpdeposits() {
 				uni.navigateTo({
@@ -998,12 +891,12 @@
 		width: 40rpx;
 		height: 40rpx;
 		margin-top: 30rpx;
-	}
-	
-	.cj-slider {
-		width: 100%;
-		align-items: center;
-		display: flex;
+	}
+
+	.cj-slider {
+		width: 100%;
+		align-items: center;
+		display: flex;
 	}
 
 	.goodsimg {
diff --git a/pages/user/news/news.vue b/pages/user/news/news.vue
index b72b5b8..d76f8e4 100644
--- a/pages/user/news/news.vue
+++ b/pages/user/news/news.vue
@@ -2,36 +2,50 @@
 	<view>
 		<!-- 顶部类型 -->
 		<scroll-view scroll-x='true' class="srollview width100" :style="{top:headerTop}" scroll-with-animation>
-			<view class="conent" :class="[newstypeid == index ? 'activeconent' : 'frontconent']"
-				v-for="(item,index) in newsTyplist" :key="index">{{item}}</view>
+			<view class="conent" :class="[newstypeid == item.codeValue ? 'activeconent' : 'frontconent']"
+				v-for="(item,index) in newsTyplist" :key="index" @click="queryMsgByList(item.codeValue)">
+				{{item.codeName}}</view>
 		</scroll-view>
 		<view class="mart10 height70"></view>
 		<!-- 内容 -->
-		<view class="newscont width90 border-8r backcorfff mart20" v-for="(item,index) in newsTyplist" :key="index">
-			<view class="alijusstart mart10 margle10">
+		
+		<view v-if="newsList == ''"
+			class="mart60 fotct font14 fcor666">
+			<image mode="widthFix" style="width: 70vw;" :src="imagewxUrl+imgadres"></image>
+		</view>
+		<view class="newscont width90 border-8r backcorfff mart20" v-for="(item,index) in newsList" :key="index">
+			<view class="alijusstart mart10 margle10" v-if="item.type == 1">
 				<image src="../../../static/img/cusservice.png" mode="widthFix" class="icon30"></image>
 				<text class="font18 margle" style="color: #0B1D83;">服务通知</text>
 			</view>
+			<view class="alijusstart mart10 margle10" v-if="item.type == 2">
+				<image src="../../../static/img/cusservice.png" mode="widthFix" class="icon30"></image>
+				<text class="font18 margle" style="color: #0B1D83;">交易信息</text>
+			</view>
+			<view class="alijusstart mart10 margle10" v-if="item.type == 3">
+				<image src="../../../static/img/cusservice.png" mode="widthFix" class="icon30"></image>
+				<text class="font18 margle" style="color: #0B1D83;">客服消息</text>
+			</view>
 			<view class="width90 line1 mart10"></view>
 			<!-- 服务通知 -->
-			<view class="width90 mart20" v-if="index != 1">
-				<view class="font18 fcor333">最新电影已上映快来抢购</view>
-				<image mode="widthFix" class="width100 mart10" src="../../../static/img/user/1.png"></image>
+			<view class="width90 mart20" v-if="item.type == 1">
+				<view class="font18 fcor333">{{item.title}}</view>
+				<image mode="widthFix" class="width100 mart10" :src="imageUrl+item.image"></image>
 			</view>
 
 			<!-- 交易信息 -->
-			<view class="width90 mart20" v-if="index == 1">
-				<view class="font18 fcor333">付款成功</view>
+			<view class="width90 mart20" v-if="item.type == 2">
+				<view class="font18 fcor333" >{{item.title}}</view>
 				<view class="mart10 border-r backcor9">
-					<view class="font20 colore95 fontwig6 paddtop10 fotct">¥9.58</view>
+					<view class="font20 colore95 fontwig6 paddtop10 fotct">¥{{item.content | msgFormat('price')}}</view>
 					<view class="width94 mart10 alijusstart font14">
 						<view class="fontwig6 fcor333 width30">交易对象</view>
-						<view class="width70 fcor666 fotrt">电信话费充值200元</view>
+						<view class="width70 fcor666 fotrt">{{item.content | msgFormat('objectName') }}</view>
 					</view>
 
 					<view class="width94 mart15 alijusstart font14">
 						<view class="fontwig6 fcor333 width30">交易时间</view>
-						<view class="width70 fcor666 fotrt">2022年9月30日</view>
+						<view class="width70 fcor666 fotrt">{{item.content | msgFormat('time') }}</view>
 					</view>
 					<view class="font16 fcor666 alijus mart10 fotct paddbotm20">查看详情<image
 							src="../../../static/img/jt.png" mode="widthFix" class="icon15 margle"></image>
@@ -40,11 +54,11 @@
 			</view>
 
 			<!-- 客服消息 -->
-			<view class="width90 mart20" v-if="index == 2">
-				<view class="font18 fcor333">客服消息提醒</view>
+			<view class="width90 mart20" v-if="item.type == 3">
+				<view class="font18 fcor333">{{item.title}}</view>
 				<view class="mart10 border-r backcor9">
 					<view class="width92 fcor333 fontwig6 paddtop15">
-						你的问题我们已提交技术人员处理，请耐心等候
+						{{item.content}}
 					</view>
 
 					<view class="font16 fcor666 alijus mart10 fotct paddbotm20">查看详情<image
@@ -58,21 +72,65 @@
 </template>
 
 <script>
+	import {
+		queryMsgByList,
+		getDictionaryByCodeType
+	} from '../../../Utils/Api.js';
+	let app = getApp();
 	export default {
 		data() {
 			return {
-				newsTyplist: ['全部订单', '在线加油', '肯德基', '星巴克', '话费充值', '卡券订单'], //消息类型
-				newstypeid: 1 ,//类型id
-				headerTop:'0px'
+				imageUrl: app.globalData.imgUrl,
+				imagewxUrl: app.globalData.imageWxImg,
+				imgadres: 'noorder.png',
+				newsTyplist: [], //消息类型
+				newsList: [], // 信内容
+				newstypeid: 1, //类型id
+				headerTop: '0px'
 			}
-		},
-		onLoad() {
-			// #ifdef H5
-				this.headerTop = '44px';
-			// #endif
+		},
+		filters: {
+			//过滤器 用于格式化时间
+			msgFormat: function(value,value1) {
+				let a  = JSON.parse(value);
+				return a[value1];
+			}
+		},
+		onLoad() {
+			// #ifdef H5
+			this.headerTop = '44px';
+			// #endif
+			this.getDictionaryByCodeType();
 		},
 		methods: {
-
+			//查询类型
+			getDictionaryByCodeType() {
+				let datas = {
+					codeType: 'MSG_TYPE'
+				}
+				getDictionaryByCodeType(datas).then(res => {
+					if (res.return_code == '000000') {
+						this.newsTyplist = res.return_data;
+						this.newstypeid = res.return_data[0].codeValue;
+						this.queryMsgByList(res.return_data[0].codeValue);
+					}
+				})
+			},
+			//查询列表
+			queryMsgByList(item) {
+				this.newstypeid = item;
+				let datas = {
+					companyId: app.globalData.companyId,
+					type: item
+				}
+				queryMsgByList(datas).then(res => {
+					if (res.return_code == '000000' && res.return_data) {
+						this.newsList = res.return_data;
+					}else{
+						this.newsList = [];
+					}
+				})
+			}
 		}
 	}
 </script>
@@ -82,9 +140,9 @@
 		background-color: #f3f3f3;
 	}
 
-	.srollview {
-		position: fixed;
-		height: 70px; 
+	.srollview {
+		position: fixed;
+		height: 70px;
 		background-color: #ffffff;
 		display: flex;
 		flex-direction: row;
@@ -96,8 +154,8 @@
 			line-height: 24px;
 			margin-top: 15px;
 			padding-left: 10px;
-			font-size: 11px; 
-			padding-right: 10px;     
+			font-size: 11px;
+			padding-right: 10px;
 			margin-left: 15px;
 			display: inline-flex;
 			flex-direction: column;