Jacob
1 天以前 e6fea61c05d96ed2e6aa1aff9e7026e48b046332
pages/zone/index.vue
....@@ -1483,11 +1483,8 @@
14831483 console.log('专区详情入参::', params)
14841484 getZoneDetail(that.id, params).then(res => {
14851485 that.info = res.data;
1486
-<<<<<<< Updated upstream
1487
-=======
14881486 //that.info.zoneType=8;
14891487 that.setLotteryBannerSize(res.data);
1490
->>>>>>> Stashed changes
14911488 that.updateZoneShareMenu();
14921489 if (res.data.zoneType == 6) {
14931490 that.setYueyangZone()