1.修改页面样式

App.vue

@@ -5,15 +5,15 @@
 			// brestUrl: 'http://192.168.3.4:9302/brest',
 			// imgUrl: 'https://192.168.3.4:9301/filesystem/',
 			//正式
-			url: 'https://hsg.dctpay.com/crest',
+			// url: 'https://hsg.dctpay.com/crest',
-			imgUrl: 'https://hsg.dctpay.com/filesystem/',
+			// imgUrl: 'https://hsg.dctpay.com/filesystem/',
-			brestUrl : 'https://hsg.dctpay.com/brest',
+			// brestUrl : 'https://hsg.dctpay.com/brest',
-			imageWxImg:'https://hsg.dctpay.com/filesystem/wxApplets/',
+			// imageWxImg:'https://hsg.dctpay.com/filesystem/wxApplets/',
 			//测试
-			// url: 'https://hsgcs.dctpay.com/crest',
+			url: 'https://hsgcs.dctpay.com/crest',
-			// brestUrl : 'https://hsgcs.dctpay.com/brest',
+			brestUrl : 'https://hsgcs.dctpay.com/brest',
-			// imgUrl: 'https://hsgcs.dctpay.com/filesystem/',
+			imgUrl: 'https://hsgcs.dctpay.com/filesystem/',
-			// imageWxImg:'https://hsgcs.dctpay.com/filesystem/wxApplets/',
+			imageWxImg:'https://hsgcs.dctpay.com/filesystem/wxApplets/',
 			userInfo: "",
 			brestUserInfo : '',
 			openId: '',

pages.json

@@ -315,6 +315,10 @@
 			"path": "pages/goods/coupon-details/coupon-details",
 			"style": {
 				"navigationBarTitleText": "卡券详情",
+				"backgroundTextStyle": "light",
+				"navigationBarBackgroundColor": "#0083f5",
+				"backgroundColorTop": "#0083f5",
+				"navigationBarTextStyle": "white",
 				"enablePullDownRefresh": false
 			}
 

pages/goods/goods.vue

@@ -75,7 +75,7 @@
 			</view>
 			<view class="mart10 width100 font14 fcor999 height20">
 				<view class="width70 flleft">有效期至: {{goodsData[0].salesEndTime | formatDate('-')}}</view>
-				<view class="width30 flright fotrt">库存 : {{goodsData[0].stockCount}}件</view>
+				<view class="width30 flright fotrt" v-if="goodsData[0].couponSource != 4">库存 : {{goodsData[0].stockCount}}件</view>
 			</view>
 		</view>
 		<!-- 服务-规则选择 -->
@@ -369,7 +369,7 @@
 			},
 			buy() {
 				let that = this;
-				if (that.goodsData[0].stockCount) {
+				// if (that.goodsData[0].stockCount && that.goodsData[0].couponSource == 4) {
 					uni.showToast({
 						title: '提交订单...',
 						icon: 'none',
@@ -380,13 +380,13 @@
 							})
 						}
 					})
-				} else {
+				// } else {
-					uni.showToast({
+				// 	uni.showToast({
-						title: '卡券数量不足',
+				// 		title: '卡券数量不足',
-						icon: 'none',
+				// 		icon: 'none',
-						duration: 2000
+				// 		duration: 2000
-					})
+				// 	})
-				}
+				// }
 
 			},
 

pages/order/confirmation.vue

@@ -358,7 +358,7 @@
 						uni.redirectTo({
 							url: '../pay/payment/payment?amount=' + res.return_data.payPrice +
 								'&paytype=' + this.couponList.payType + '&orderId=' + res.return_data.id +
-								'&couponId=' + this.couponId
+								'&couponId=' + this.couponId +'&typeaout='+ res.return_data.highChildOrderList[0].ext1
 						})
 					} else {
 						uni.hideLoading();

pages/pay/payment/payment.vue

@@ -80,7 +80,8 @@
 				paytype: '', //支付类型
 				orderNo: '',
 				user: '',
-				couponId: ''
+				couponId: '',
+				jumpType:''
 			};
 		},
 		onLoad(e) {
@@ -88,6 +89,7 @@
 			this.orderNo = e.orderId;
 			this.couponId = e.couponId;
 			this.user = app.globalData.userInfo;
+			this.jumpType = e.typeaout;
 			if (this.pryType == 1) {
 				this.paytype = 'wxpay';
 			} else if (this.pryType == 2) {
@@ -139,6 +141,12 @@
 									uni.showToast({
 										title: '支付成功'
 									})
+									if(that.jumpType == 4){
+										uni.reLaunch({
+											url: '/pages/tabBar/user/user'
+										});
+										return;
+									}
 									uni.reLaunch({
 										url: '../success/success?id=' + that.couponId
 									});
@@ -180,6 +188,12 @@
 										uni.showToast({
 											title: '支付成功'
 										})
+										if(that.jumpType == 4){
+											uni.reLaunch({
+												url: '/pages/tabBar/user/user'
+											});
+											return;
+										}
 										uni.reLaunch({
 											url: '../success/success?id=' + that.couponId
 										});
@@ -235,6 +249,12 @@
 							uni.showToast({
 								title: '支付成功'
 							})
+							if(that.jumpType == 4){
+								uni.reLaunch({
+									url: '/pages/tabBar/user/user'
+								});
+								return;
+							}
 							uni.reLaunch({
 								url: '../success/success?id=' + that.couponId
 							});

pages/user/order_details/order_details.vue

@@ -397,7 +397,7 @@
 				uni.redirectTo({
 					url: "/pages/pay/payment/payment?amount=" + this.recinfo.payPrice +
 						'&paytype=' + payTypes + '&orderId=' + this.recinfo.id + '&couponId=' + this.recinfo
-						.highChildOrderList[0].goodsId
+						.highChildOrderList[0].goodsId + '&typeaout='+ this.recinfo.highChildOrderList[0].ext1
 				})
 
 				//商品列表
@@ -647,6 +647,8 @@
 				.money {
 					font-size: 20px;
 					font-weight: 600;
+					display: flex;
+					    align-items: center;
 				}
 			}
 

pages/user/order_list/order_list.vue

@@ -289,7 +289,7 @@
 				uni.redirectTo({
 					url: "/pages/pay/payment/payment?amount=" + row.payPrice +
 						'&paytype=' + payTypes + '&orderId=' + row.id + '&couponId=' + this.orderList[0]
-						.highChildOrderList[0].goodsId
+						.highChildOrderList[0].goodsId + '&typeaout='+ this.orderList[0].highChildOrderList[0].ext1
 				})
 			}
 		}