Merge branch 'youmengting-dev' of http://gitea.dctpay.com/yangjie/high-mini into new-dev

pages.json

@@ -1168,7 +1168,10 @@
 			},
 			{
 				"path": "classify/order/paymentResult",
+				
 				"style": {
+					"navigationBarBackgroundColor": "#3da7e7",
+					"backgroundColorTop": "#3da7e7",
 					"navigationBarTitleText": "支付结果",
 					"enablePullDownRefresh": false
 				}

pages/user/order_list/order_list.vue

@@ -297,7 +297,6 @@
 					pageNum: this.pageNum,
 					pageSize: this.pageSize
 				}
-
 				getUserOrderList(params).then(res => {
 					if (res.return_code == '000000' && res.return_data.list != '') {
 						uni.hideLoading();

physical-merchants/classify/cart/cart.vue

@@ -375,6 +375,7 @@
 			},
 			// 结算
 			settleAccount() {
+				
 				if (!this.isHaveGoods()) return;
 
 				if (this.priceAll > 0) {
@@ -471,11 +472,11 @@
 
 				goodsEditNum(params).then(res => {
 					if (res.return_code == '000000') {
-						uni.showToast({
-							title: res.return_data,
-							icon: 'none',
-							duration: 2000
-						})
+						// uni.showToast({
+						// 	title: res.return_data,
+						// 	icon: 'none',
+						// 	duration: 2000
+						// })
 					} else {
 						//增加数量失败
 						// this.cartList.map(item=>{

physical-merchants/classify/order/pay.vue

@@ -1,8 +1,8 @@
 <template>
 	<view class="backcor9 pay-syt pd-main">
-		<view class="fotct">
-			<view class="">
-				¥<text class="font28 fontwig6">{{payPrice}}</text>
+		<view class="fotct  ">
+			<view class="dis-flex flex-center">
+				¥<text class=" font28 fontwig6">{{payPrice}}</text>
 			</view>
 			<view class="fcor666 font14 paddtop10 paddbotm10">
 				支付剩余时间<text class="paddleft10">{{countdownm}}:{{countdowns}}</text>
@@ -198,7 +198,7 @@
 					if (res.return_code == '000000') {
 						this.paytypeList = res.return_data.productPayType.split(',');
 						this.paytypeList = this.paytypeList.slice(0, this.paytypeList.length - 1);
-						console.log(this.paytypeList, "this.paytypeList1111111111111111111")
+						// console.log(this.paytypeList, "this.paytypeList1111111111111111111")
 					} else {
 						uni.showToast({
 							title: res.return_msg,
@@ -226,13 +226,13 @@
 				this.countdownm = leftm; //返回倒计时的字符串
 				this.countdowns = lefts; //返回倒计时的字符串
 				// 倒计时结束时，显示00:00:00
-				if (lefttime < 0) {
+				if (lefttime <= 0) {
 					clearInterval(this.timers);
-					// this.getDetailByOrderNo();
-					this.countdownh = this.countdownm = this.countdowns = "00";
-					uni.reLaunch({
-						url:'/pages/user/order_list/order_list'
+					uni.redirectTo({
+						url:'/pages/user/order_list/order_list?tbIndex='+'-1'
 					})
+					this.countdownh = this.countdownm = this.countdowns = "00";
+					
 				}
 			},
 
@@ -244,13 +244,6 @@
 
 			//确认支付
 			payMoney() {
-				// uni.reLaunch({
-				// 	url: "/pages/classify/order/paymentResult?id=202304201646301166509" 
-				// 	// url: '../../user/order_details/order_details?id=' +that.orderNo
-				// });
-				
-				// return
-				//
 				
 				let that = this;
 				if (that.paytype == '') {
@@ -295,7 +288,7 @@
 									uni.showToast({
 										title: '支付成功'
 									})
-									uni.reLaunch({
+									uni.redirectTo({
 										url: "/physical-merchants/classify/order/paymentResult?id=" + that
 											.orderNo
 										// url: '../../user/order_details/order_details?id=' +that.orderNo
@@ -303,9 +296,7 @@
 								},
 								fail: function(err) {
 									uni.hideLoading();
-									uni.navigateBack({
-										delta:2
-									})
+									uni.navigateBack({})
 								},
 							});
 							// #endif
@@ -390,7 +381,7 @@
 							uni.showToast({
 								title: '支付成功'
 							})
-							uni.reLaunch({
+							uni.redirectTo({
 								url: "/physical-merchants/classify/order/paymentResult?id=" + that
 									.orderNo
 								// url: '../../user/order_details/order_details?id=' +that.orderNo
@@ -452,7 +443,7 @@
 						uni.showToast({
 							title: '支付成功'
 						})
-						uni.reLaunch({
+						uni.redirectTo({
 							url: "/physical-merchants/classify/order/paymentResult?id=" + that.orderNo
 							// url: '../../user/order_details/order_details?id=' +this.orderNo
 						})

physical-merchants/classify/order/paymentResult.vue

@@ -4,7 +4,7 @@
 			<view class="colorgr icon-ymt zhenque font22"></view>
 			<view class="mart5">支付成功</view>
 			<view class="mart5">¥<text class="fontwig6 font24">{{recinfo.payablePrice}}</text></view>
-			<view class="mart5 font16 color999">{{ recinfo.payType | filtersType}}支付</view>
+			<view class="mart5 font16 ">{{ recinfo.payType | filtersType}}支付</view>
 		</view>
 		<!-- <view class="min-con color999 font18">
 			<view class="">
@@ -39,7 +39,7 @@
 		
 		onLoad(option){
 			this.orderId=option.id
-			console.log(option)
+			
 		},
 		onShow(){
 			this.getDetailByOrderNo()
@@ -83,12 +83,12 @@
 				})
 			},
 			orderDetail(){
-				uni.reLaunch({
-					url:"/pages/user/order_list/order_list"
+				uni.redirectTo({
+					url:"/pages/user/order_list/order_list?tbIndex="+'-1'
 				})
 			},
 			yaoqin(){
-				uni.navigateTo({
+				uni.redirectTo({
 					url:"/pages/user/generatePoster/generatePoster"
 				})
 			}
@@ -99,9 +99,10 @@
 <style lang="scss" scoped>
 .pay-suc{
 	height: 100vh;
-	// background: url('@/static/img/bgimg.jpg') no-repeat ;
-	background-color: rgba(40, 116, 204, 0.8);
-	
+	// background: url('@/physical-merchants/static/img/bgimg.jpg') no-repeat ;
+	// background-color: rgba(40, 116, 204, 0.8);
+	background: linear-gradient(to bottom, #3da7e7, #FFFFFF) no-repeat;
+	    background-size: 100%;
 	.top-con{
 		text-align: center;
 		height: 25vh;
@@ -110,7 +111,7 @@
 		justify-content: center;
 	}
 	.colorgr{
-		color: #5C9D41 !important;
+		color: green;
 	}
 	
 	.min-con{
@@ -138,7 +139,9 @@
 			text-align: center;
 		}
 		.btn1{
-			border:1px solid #666666;
+			// border:1px solid #666666;
+			border: 1px solid #f6f6f6;
+			    color: #f6f6f6;
 		}
 		.btn2{
 			border:1px solid #CD2C3C;

physical-merchants/settleAccounts/settleAccounts.vue

@@ -386,7 +386,7 @@
 		
 		onLoad(options) {
 			this.goodsList = JSON.parse(options.goodsList);
-			console.log(this.goodsList,"this.goodsList")
+			// console.log(this.goodsList,"this.goodsList")
 			if (this.goodsList.length > 1) {
 				this.isMoreThanOne = true;
 			}
@@ -482,7 +482,7 @@
 						if (res.return_data.length > 0) {
 							_this.discountList = res.return_data;
 
-							console.log(_this.discountList, "优惠券")
+							// console.log(_this.discountList, "优惠券")
 						}
 					} else {
 						uni.showToast({
@@ -535,7 +535,7 @@
 							this.availIntegal = 0;
 						}
 
-						console.log(this.userInfo, "this.userInfo", "积分", this.availIntegal)
+						// console.log(this.userInfo, "this.userInfo", "积分", this.availIntegal)
 
 					} else {
 						uni.showToast({
@@ -693,7 +693,7 @@
 					childOrderList: childOrderList //购买的商品信息	
 				}
 
-				console.log(params, "params")
+				
 
 				uni.showLoading({
 					title: '支付中...'
@@ -701,7 +701,7 @@
 				createOrder(params).then(res => {
 					uni.hideLoading();
 					if (res.return_code == '000000') {
-						console.log(res,"订单信息")
+						// console.log(res,"订单信息")
 						let obj = {
 							orderNo : res.return_data.orderNo,
 							createTime:res.return_data.createTime,
@@ -710,17 +710,17 @@
 						}
 						obj = JSON.stringify(obj)
 						
-						console.log(_this.priceSettle,_this.availIntegalUse)
+						// console.log(_this.priceSettle,_this.availIntegalUse)
 						
 						if(_this.priceSettle ==0&&_this.availIntegalUse!=0){
-							uni.reLaunch({
+							uni.redirectTo({
 								url: "/physical-merchants/classify/order/paymentResult?id=" + res.return_data.orderNo
 							});
 							
 							return
 						}
 						
-						uni.reLaunch({
+						uni.redirectTo({
 							url: '/physical-merchants/classify/order/pay?obj=' + obj
 						})
 						return
@@ -743,7 +743,7 @@
 			//密码支付完成
 			submitHandle(e) {
 				this.PaymentPassword = e.value;
-				console.log(e, "eeeeeee")
+				
 				if (this.PaymentPassword == 0) {
 					uni.showToast({
 						title: '请勿手动关闭弹窗',