[原下单页面去掉统一下单页面，服务券提货券商品详情页面调整]

pages/goods/details.vue

@@ -116,6 +116,9 @@
                                 满{{item.full}}可用
                             </view>
                         </view>
+												<view class="coupons-left" v-if="item.type.value == '1' || item.type.value =='3'">
+												    <image :src="item.cover" mode="aspectFill" class="coupon-left-img"  />
+												</view>
                         <view class="coupons-left" v-else-if="item.type.value == '3'">
                             <view class="coupons-number coupons-small">
                                 提货券
@@ -202,12 +205,15 @@
 					userLogin.Login()
 					return
 				}
-				this.$Router.push({
+				// this.$Router.push({
-					name: 'Buy',
+				// 	name: 'Buy',
-					params: {
+				// 	params: {
-						skuId: this.goodsObj.skus[0].sku_id,
+				// 		skuId: this.goodsObj.skus[0].sku_id,
-						qty	 : this.goodsObj.skus[0].number
+				// 		qty	 : this.goodsObj.skus[0].number
-					}
+				// 	}
+				// })
+				uni.navigateTo({
+					url: '/pages/property/coupon/confirmOrder?qty=1&type=2&goods_sku_id=' + this.goodsObj.skus[0].sku_id
 				})
 			},
 			// 打开微信小程序
@@ -637,9 +643,10 @@
                 overflow: hidden;
                 position: relative;
                 margin-top: $margin;
+								// background-color: red;
                 .coupons-tips {
                     // background-color: #211e17;
-					background-image: linear-gradient(to right, #f8e5c0, #d6a46a);
+					         background-image: linear-gradient(to right, #f8e5c0, #d6a46a);
                    color: #8d4928;
                     position: absolute;
                     border-radius: 0 0 20rpx 0;
@@ -648,6 +655,7 @@
                     line-height: 34rpx;
                     left: 0;
                     top: 0;
+										z-index: 10;
                     .coupons-tips-text {
                         font-size: 24rpx;
                         transform:scale(.85);
@@ -661,6 +669,11 @@
                     text-align: center;
                     padding: $padding - 10 0;
                     border-right: 2rpx dashed #eccdd4;
+										.coupon-left-img{
+											width: 180rpx;
+											height: 100rpx;
+											border-radius: 20rpx;
+										}
                     .coupons-number {
                         font-size: 40rpx;
                         font-weight: 600;

pages/order/buy.vue

@@ -20,7 +20,7 @@
 				<label>订单金额</label>
 				<view class="price nowrap">{{amount}}</view>
 			</view>
-			<block v-if="coupons.length > 1">
+			<block v-if="coupons.length >= 1">
 				<view class="item">
 					<label>使用优惠券</label>
 					<picker mode="selector" :range="coupons" range-key="title" :value="couponIndex" @change="couponsChange">
@@ -134,7 +134,6 @@
 			// 选择支付类型
 			payType(e){
 				console.log(e.detail.value)
-				
 				this.payValue = e.detail.value
 			},
 			//数量变化
@@ -149,7 +148,7 @@
 					goods_sku_id	: this.$Route.query.skuId,
 					qty				: this.qty,
 					coupon_grant_id	: this.couponId,
-					type			: 1,
+					type			: this.payValue === 'wx'?2:1,
 					remark			: 'app订单，易货产品',
 					channel			: 'app'
 				}, 'POST').then(res=>{

pages/property/coupon/confirmOrder.vue

@@ -148,11 +148,12 @@
 						this.coupon_price = res.coupon_price
 					} else {
 						this.order_no = res.order_no
-						this.$refs.uToast.show({
+						// this.$refs.uToast.show({
-							title: '下单成功',
+						// 	title: '下单成功',
-							duration: 1888,
+						// 	duration: 1888,
-							type: 'primary',
+						// 	type: 'primary',
-						})
+						// })
+						
 						this.nowPay()
 					}
 				}).catch(err => {
@@ -190,8 +191,9 @@
 				}
 				apiUrl(data).then(res => {
 					if (this.selectTypeId === '2') {
+						console.log(typeof res)
+						if (typeof res === 'string') {
 						let payInfo = JSON.parse(res)
-						if (payInfo.timestamp) {
 
 
 							// app 支付未完。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。

unpackage/dist/dev/app-plus/app-view.js

@@ -22716,7 +22716,7 @@ var render = function() {
                                             ),
                                             attrs: { _i: "61-" + $34 }
                                           },
-                                          [_vm._v("代金券")]
+                                          [_vm._v("代金券11")]
                                         )
                                       : _c(
                                           "v-uni-text",