lilei 5 سال پیش
والد
کامیت
5961ebd25b
2فایلهای تغییر یافته به همراه10 افزوده شده و 7 حذف شده
  1. 1 1
      pages/coupon/index/index.vue
  2. 9 6
      pages/index/index.vue

+ 1 - 1
pages/coupon/index/index.vue

@@ -4,7 +4,7 @@
 			<u-tabs-swiper ref="uTabs" :list="tabsList" bar-width="100" :current="current" @change="tabsChange" :is-scroll="false"
 			 swiperWidth="750"></u-tabs-swiper>
 		</view>
-		<swiper :current="swiperCurrent" @transition="transition" @animationfinish="animationfinish">
+		<swiper style="height: calc(100% - 40px);" :current="swiperCurrent" @transition="transition" @animationfinish="animationfinish">
 			<swiper-item class="swiper-item" v-for="(item, index) in tabsList" :key="index">
 				<scroll-view scroll-y style="height: 100%;width: 100%;" @scrolltolower="onreachBottom">
 					<couponTpl></couponTpl>

+ 9 - 6
pages/index/index.vue

@@ -218,12 +218,15 @@
 			},
 			// 扫码洗车
 			scanCode () {
-				uni.scanCode({
-				    success: function (res) {
-				        console.log('条码类型:' + res.scanType);
-				        console.log('条码内容:' + res.result);
-				    }
-				});
+				uni.navigateTo({
+					url: "/pages/getOrder/getOrder"
+				})
+				// uni.scanCode({
+				//     success: function (res) {
+				//         console.log('条码类型:' + res.scanType);
+				//         console.log('条码内容:' + res.result);
+				//     }
+				// });
 			},
 			// 创建标记点
 			createMarker(point) {