23.3.7

components/tabbar/tabbar.vue

@@ -78,7 +78,7 @@ export default {
 					url: path.url
 				});
 			}
-			this.$emit('tabBarChange', path.url, path.type);
+			// this.$emit('tabBarChange', path.url, path.type);
 		}
 	}
 };

demand/payment/index.vue

@@ -28,12 +28,12 @@
 				</view>
 			</view>
 		</view>
-		<view class="content-discounts">
+		<view class="content-discounts" @click="jump(1)">
 			<view class="">
 				选择优惠券
 			</view>
 			<view class="">
-				-99
+				{{times}}元
 				<image src="@/static/icon/jt.png" mode=""></image>
 			</view>
 		</view>
@@ -41,7 +41,7 @@
 			<view class="">
 				截止1小时内支付完成 <text>00:59:42</text>
 			</view>
-			<button @click="jump">立即支付 300.00元</button>
+			<button @click="jump(2)">立即支付 300.00元</button>
 		</view>
 	</view>
 </template>
@@ -53,15 +53,22 @@
 			return {
 				imgBgUrl: apiBaseConfig.imgBgUrl,
 				globalData: getApp().globalData,
-				scrollTopHeader: 0
+				scrollTopHeader: 0,
+				times:'0'
 			};
 		},
 		onLoad() {},
 		methods: {
-			jump() {
-				this.$uniGo.navigateTo({
-					url: `/demand/confirm/index`
-				});
+			jump(val) {
+				if(val == 1){
+					this.$uniGo.navigateTo({
+						url: `/my/coupon/index?type=pay`
+					});
+				}else{
+					this.$uniGo.navigateTo({
+						url: `/demand/confirm/index`
+					});
+				}
 			}
 		}
 	}

pages/demand/index.vue

@@ -8,16 +8,16 @@
 				<view v-show="subscript == index" class="content-tabs-text-area"></view>
 			</view>
 		</view>
-		<template v-if="arr && arr.length">
+		<!-- <template v-if="arr && arr.length"> -->
 			<comindex class="content-mindex" :subscript='subscript'></comindex>
-		</template>
-		<view v-else class="diagram">
+		<!-- </template> -->
+<!-- 		<view v-else class="diagram">
 			<image src="@/static/icon/qst.png" mode=""></image>
 			<view class="">
 				暂无数据
 			</view>  
-		</view>
-		<com-tabbar @tabBarChange='tabBarChange' :list=" [{
+		</view> -->
+		<com-tabbar  :list=" [{
 					name: '首页',
 					icon: '/static/tabbar/tb1.png', 
 					selectIcon:'/static/tabbar/td1.png', 
@@ -84,13 +84,6 @@
 			}
 		},
 		methods: {
-			tabBarChange(url, type) {
-				if (type == 'type') {
-					uniGo.reLaunch({
-						url: url
-					});
-				}
-			},
 			jump(ind) {
 				this.subscript = ind
 			}

pages/home/index.vue

@@ -42,7 +42,7 @@
 		</view>
 		<com-navbar :leftIcon="false" :homeShow="false" bgColor="transparent" title="首页"
 			:titleStyle="{ color: '#FFFFFF', fontSize: '32rpx',scrollTopHeader: scrollTopHeader }" />
-		<com-tabbar @tabBarChange='tabBarChange' :list="tabBarList"></com-tabbar>
+		<com-tabbar  :list="tabBarList"></com-tabbar>
 	</view>
 </template>
 
@@ -100,13 +100,6 @@
 					url: `/home/index/index`
 				});
 			},
-			tabBarChange(url, type) {
-				if (type == 'type') {
-					this.$uniGo.reLaunch({
-						url: url
-					});
-				}
-			}
 		}
 	}
 </script>
@@ -119,7 +112,6 @@
 	.content {
 		display: flex;
 		flex-direction: column;
-		// align-items: center;
 		justify-content: center;
 
 		&-swiper {
@@ -149,7 +141,6 @@
 
 				>view:nth-child(2) {
 					font-size: 28rpx;
-					font-family: AlibabaPuHuiTi-Medium, AlibabaPuHuiTi;
 					font-weight: 500;
 					color: #333333;
 				}
@@ -173,7 +164,6 @@
 
 					>view:nth-child(1) {
 						font-size: 28rpx;
-						font-family: AlibabaPuHuiTi-Medium, AlibabaPuHuiTi;
 						font-weight: 700;
 						color: #333333;
 						margin-top: 8rpx;
@@ -182,7 +172,6 @@
 					>view:nth-child(2) {
 						margin-top: 6rpx;
 						font-size: 24rpx;
-						font-family: AlibabaPuHuiTi-Regular, AlibabaPuHuiTi;
 						font-weight: 400;
 						color: #444444;
 					}
@@ -190,7 +179,6 @@
 					>view:nth-child(3) {
 						margin-top: 9rpx;
 						font-size: 20rpx;
-						font-family: AlibabaPuHuiTi-Regular, AlibabaPuHuiTi;
 						font-weight: 400;
 						color: #5281FF;
 					}