Commit 80972b4d authored by lixy's avatar lixy

axios

parent efc40e88
...@@ -3,7 +3,9 @@ ...@@ -3,7 +3,9 @@
<div class="box"> <div class="box">
<ul> <ul>
<li v-for="(item, index) in list" :key="item.id" :class="index === current ? 'active' : ''" @click="bannerClick(index, item)"> <li v-for="(item, index) in list" :key="item.id" :class="index === current ? 'active' : ''" @click="bannerClick(index, item)">
<img :src= "item.banner" style="width:100%;height: auto" :alt="item.title"/> <nuxt-link :to="'/activityList/'+item.id">
<img :src= "item.banner" style="width:100%;height: auto" :alt="item.title"/>
</nuxt-link>
</li> </li>
</ul> </ul>
<div class="status"> <div class="status">
......
...@@ -33,7 +33,6 @@ ...@@ -33,7 +33,6 @@
</template> </template>
<script> <script>
import axios from 'axios'
export default { export default {
transition: 'bounce', transition: 'bounce',
name: 'footerModal', name: 'footerModal',
...@@ -49,7 +48,6 @@ ...@@ -49,7 +48,6 @@
<style scoped> <style scoped>
.footer-container { .footer-container {
width: 100%; width: 100%;
/*height: 423px;*/
height: 300px; height: 300px;
position: relative; position: relative;
background:url("../assets/images/footer.jpg") no-repeat; background:url("../assets/images/footer.jpg") no-repeat;
......
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
</template> </template>
<script> <script>
import axios from 'axios'
export default { export default {
transition: 'bounce', transition: 'bounce',
name: 'menuModal', name: 'menuModal',
...@@ -83,9 +82,6 @@ ...@@ -83,9 +82,6 @@
width: 1200px; width: 1200px;
margin: 0 auto; margin: 0 auto;
} }
/* li{
text-decoration: none;
} */
.users { .users {
list-style-type: none; list-style-type: none;
display: flex; display: flex;
......
...@@ -27,7 +27,6 @@ module.exports = { ...@@ -27,7 +27,6 @@ module.exports = {
{ src: '~plugins/filters.js', srr: false } { src: '~plugins/filters.js', srr: false }
], ],
build: { build: {
extend(config, { isDev, isClient }) { extend(config, { isDev, isClient }) {
if (isDev && isClient) { if (isDev && isClient) {
config.module.rules.push({ config.module.rules.push({
...@@ -51,10 +50,15 @@ module.exports = { ...@@ -51,10 +50,15 @@ module.exports = {
} }
}, },
env: { env: {
host:"https://dev.dfangche.com" host:"https://xxtest.upyuns.com"
}, },
generate: { generate: {
routes: [ routes: [
] ]
} }
// ,
// server: {
// port: 3000, // default: 3000
// host: '10.1.37.172', // default: localhost
// }
} }
...@@ -4,7 +4,12 @@ ...@@ -4,7 +4,12 @@
"description": "Nuxt.js project", "description": "Nuxt.js project",
"author": "yutao <haiyan.xu.vip@gmail.com>", "author": "yutao <haiyan.xu.vip@gmail.com>",
"private": true, "private": true,
"nuxt": {
"host": "10.1.37.172",
"port": "3000"
},
"scripts": { "scripts": {
"test": "nuxt --hostname 10.1.37.172 --port 3333",
"dev": "nuxt", "dev": "nuxt",
"build": "nuxt build", "build": "nuxt build",
"start": "nuxt start", "start": "nuxt start",
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
</template> </template>
<script> <script>
import axios from "axios"; import axios from '../plugins/axios'
import menuModal from "../components/menu"; import menuModal from "../components/menu";
import footerModal from "../components/footer"; import footerModal from "../components/footer";
import vehicleBanner from "../components/vehicleBanner" import vehicleBanner from "../components/vehicleBanner"
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
*/ */
async getBanner(){ async getBanner(){
//关于欣新banner //关于欣新banner
let tempBannerData = await axios.get( 'https://dev.dfangche.com/api/app/banner/app/unauth/findBannerlist?type=6&platform=1'); let tempBannerData = await axios.get( '/api/app/banner/app/unauth/findBannerlist?type=6&platform=1');
let banner = tempBannerData.data.data; let banner = tempBannerData.data.data;
this.bannerList = banner; this.bannerList = banner;
}, },
......
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
</template> </template>
<script> <script>
import axios from "axios"; import axios from '../plugins/axios'
import menuModal from "../components/menu"; import menuModal from "../components/menu";
import footerModal from "../components/footer"; import footerModal from "../components/footer";
import vehicleBanner from "../components/vehicleBanner" import vehicleBanner from "../components/vehicleBanner"
...@@ -55,7 +55,6 @@ ...@@ -55,7 +55,6 @@
}, },
data() { data() {
return { return {
typeId: "营地类型",
dataType: [], dataType: [],
totalCount: "", totalCount: "",
dataDetail: [], dataDetail: [],
...@@ -101,7 +100,7 @@ ...@@ -101,7 +100,7 @@
*/ */
async getBanner(){ async getBanner(){
//首活动banner //首活动banner
let tempBannerData = await axios.get( 'https://dev.dfangche.com/api/app/banner/app/unauth/findBannerlist?type=4&platform=1'); let tempBannerData = await axios.get( '/api/app/banner/app/unauth/findBannerlist?type=4&platform=1');
let banner = tempBannerData.data.data; let banner = tempBannerData.data.data;
this.bannerList = banner; this.bannerList = banner;
}, },
...@@ -116,17 +115,10 @@ ...@@ -116,17 +115,10 @@
async getAll() { async getAll() {
let { let {
data: { data } data: { data }
} = await axios.get( } = await axios.get( `/api/uccn/summitActivity/app/unauth/list?page=${this.listQuery.pageNo}&limit=10000`);
`https://dev.dfangche.com//api/uccn/summitActivity/app/unauth/list?page=${this.listQuery.pageNo}&limit=10000`
);
// console.log(data); // console.log(data);
this.totalCount = data.totalCount; this.totalCount = data.totalCount;
data.data.map(function (item) {
// item.startTime = timestamp2Date(item.startTime);
// item.endTime = timestamp2Date(item.endTime);
})
this.dataDetail = data.data; this.dataDetail = data.data;
// this.dataDetail = this.dataDetail.push(data.data);
}, },
mounted() { mounted() {
window.addEventListener('scroll', this.scrollHandle); // 绑定页面的滚动事件 window.addEventListener('scroll', this.scrollHandle); // 绑定页面的滚动事件
...@@ -167,7 +159,6 @@ ...@@ -167,7 +159,6 @@
*zoom: 1; /*ie6清除浮动的方式 *号只有IE6-IE7执行,其他浏览器不执行*/ *zoom: 1; /*ie6清除浮动的方式 *号只有IE6-IE7执行,其他浏览器不执行*/
} }
.banner { .banner {
/* background-color: #fff; */
text-align: center; text-align: center;
} }
......
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
<h1>{{detail.title}}</h1> <h1>{{detail.title}}</h1>
<div class="r-cc"> <div class="r-cc">
<p>活动人数<span style="margin-left: 20px;">{{detail.limitNum}}</span></p> <p>活动人数<span style="margin-left: 20px;">{{detail.limitNum}}</span></p>
<p>活动时间<span style="margin-left: 20px;">{{detail.startTime}}~{{detail.endTime}}</span></p> <p>活动时间<span style="margin-left: 20px;">{{detail.startTime | formatDate('yyyy-MM-dd hh:mm:ss')}}~{{detail.endTime | formatDate('yyyy-MM-dd hh:mm:ss')}}</span></p>
<p style="ellipsis2">活动地点<span style="margin-left: 20px;">{{detail.province}}{{detail.city}}{{detail.town}}{{detail.address}}</span></p> <p class="ellipsis2">活动地点<span style="margin-left: 20px;">{{detail.province}}{{detail.city}}{{detail.town}}{{detail.address}}</span></p>
</div> </div>
<div class="buttonDetails">报名参加</div> <div class="buttonDetails">报名参加</div>
</div> </div>
...@@ -41,12 +41,11 @@ ...@@ -41,12 +41,11 @@
</template> </template>
<script> <script>
import axios from 'axios' import axios from '../../plugins/axios'
import menuModal from "../../components/menu" import menuModal from "../../components/menu"
import footerModal from "../../components/footer" import footerModal from "../../components/footer"
import Swiper from 'swiper'; import Swiper from 'swiper';
import 'swiper/dist/css/swiper.min.css'; import 'swiper/dist/css/swiper.min.css';
// import { getDetail } from '../../../../demo nuxt/nuxt-bnhcp/ajax/getData';
export default { export default {
transition: 'bounce', transition: 'bounce',
components: { components: {
...@@ -64,41 +63,13 @@ ...@@ -64,41 +63,13 @@
return !isNaN(+params.id) return !isNaN(+params.id)
}, },
async asyncData({ env, params, error}) { async asyncData({ env, params, error}) {
function formatDate(date, fmt) { const { data } = await axios.get( '/api/uccn/summitActivity/app/unauth/'+params.id);
if (/(y+)/.test(fmt)) {
fmt = fmt.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length))
}
let o = {
'M+': date.getMonth() + 1,
'd+': date.getDate(),
'h+': date.getHours(),
'm+': date.getMinutes(),
's+': date.getSeconds()
}
for (let k in o) {
if (new RegExp(`(${k})`).test(fmt)) {
let str = o[k] + ''
fmt = fmt.replace(RegExp.$1, RegExp.$1.length === 1 ? str : padLeftZero(str))
}
}
return fmt
}
function padLeftZero(str) {
return ('00' + str).substr(str.length)
}
function timestamp2Date(timestamp) {
let date = new Date(timestamp);//时间戳为10位需*1000,时间戳为13位的话不需乘1000
return formatDate(date, 'yyyy-MM-dd hh:mm:ss');
}
const { data } = await axios.get( env.host + '/api/uccn/summitActivity/app/unauth/'+params.id);
let detail = data.data; let detail = data.data;
detail.startTime = timestamp2Date(detail.startTime);
detail.endTime = timestamp2Date(detail.endTime);
detail.content =detail.content.replace(/<img/g,"<img style='width:100%'"); detail.content =detail.content.replace(/<img/g,"<img style='width:100%'");
if (!detail) { if (!detail) {
return error({ message: 'detail not found', statusCode: 404 }) return error({ message: 'detail not found', statusCode: 404 })
} }
let tempBannerData = await axios.get( env.host + '/api/uccn/random/list/app/unauth/get?type=4'); let tempBannerData = await axios.get('/api/uccn/random/list/app/unauth/get?type=4');
let hot = tempBannerData.data.data; let hot = tempBannerData.data.data;
return {detail: detail, hotList: hot} return {detail: detail, hotList: hot}
}, },
...@@ -139,9 +110,6 @@ ...@@ -139,9 +110,6 @@
swiper: galleryThumbs swiper: galleryThumbs
} }
}); });
},
head: {
title: '营地详情'
} }
} }
</script> </script>
......
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
</template> </template>
<script> <script>
import axios from "axios"; import axios from '../plugins/axios';
import menuModal from "../components/menu"; import menuModal from "../components/menu";
import footerModal from "../components/footer"; import footerModal from "../components/footer";
import banner from "../components/banner" import banner from "../components/banner"
...@@ -62,8 +62,8 @@ export default { ...@@ -62,8 +62,8 @@ export default {
}, },
data() { data() {
return { return {
showBanner: !0, showBanner: !0,
looptime: 4000, // 循环时间 looptime: 4000, // 循环时间
typeId: "营地类型", typeId: "营地类型",
dataType: [], dataType: [],
totalCount: "", totalCount: "",
...@@ -90,7 +90,7 @@ export default { ...@@ -90,7 +90,7 @@ export default {
window.addEventListener("scroll", this.scrollHandle); // 绑定页面的滚动事件 window.addEventListener("scroll", this.scrollHandle); // 绑定页面的滚动事件
}, },
methods: { methods: {
chooseSelect(e) { chooseSelect(e) {
console.log(e.target.value); console.log(e.target.value);
this.listQuery.type = e.target.value; this.listQuery.type = e.target.value;
...@@ -98,23 +98,19 @@ export default { ...@@ -98,23 +98,19 @@ export default {
}, },
goDetails() { goDetails() {
console.log(2222222); console.log(2222222);
}, },
async getType() { async getType() {
const { const {
data: { data } data: { data }
} = await axios.get( } = await axios.get("/api/campsite/campsiteTag/app/unauth/tags");
"https://dev.dfangche.com/api/campsite/campsiteTag/app/unauth/tags"
);
// console.log(data); // console.log(data);
this.dataType = data; this.dataType = data;
}, },
async getAll() { async getAll() {
let { let {
data: { data } data: { data }
} = await axios.get( } = await axios.get(`/api/uccn/app/unauth/campsite/shops?type=${this.listQuery.type}&pageNo=${this.listQuery.pageNo}&pageSize=${this.listQuery.pageSize}`);
`https://dev.dfangche.com/api/uccn/app/unauth/campsite/shops?type=${this.listQuery.type}&pageNo=${this.listQuery.pageNo}&pageSize=${this.listQuery.pageSize}`
);
// console.log(data); // console.log(data);
if(!data.data.length == 0){ if(!data.data.length == 0){
this.totalCount = data.totalCount; this.totalCount = data.totalCount;
...@@ -125,8 +121,6 @@ export default { ...@@ -125,8 +121,6 @@ export default {
this.dataDetail = data.data; this.dataDetail = data.data;
this.dataNull = true this.dataNull = true
} }
// this.dataDetail = this.dataDetail.push(data.data);
}, },
// 点击下一页回调 // 点击下一页回调
prev () { prev () {
...@@ -155,36 +149,17 @@ export default { ...@@ -155,36 +149,17 @@ export default {
//           console.log("距顶部"+scrollTop+"可视区高度"+windowHeight+"滚动条总高度"+scrollHeight); //           console.log("距顶部"+scrollTop+"可视区高度"+windowHeight+"滚动条总高度"+scrollHeight);
// this.listQuery.pageNo++; // this.listQuery.pageNo++;
// this.getAll(); // this.getAll();
              }                 }  
} }
}, },
head: {
title: "房车营地"
},
async asyncData() { async asyncData() {
const { data } = await axios.get('https://dev.dfangche.com/api/app/banner/app/unauth/findBannerlist?type=2&platform=1'); const { data } = await axios.get('/api/app/banner/app/unauth/findBannerlist?type=2&platform=1');
let cc = data.data; let cc = data.data;
return { bannerList: cc} return { bannerList: cc}
}, },
// async asyncData({store,listQuery}) {
// let [dataType,dataDetail] = await Promise.all([
// axios.get("https://dev.dfangche.com/api/campsite/campsiteTag/app/unauth/tags"),
// axios.get("https://dev.dfangche.com/api/uccn/app/unauth/campsite/shops")
// ])
// console.log(dataDetail.data.data.data);
// console.log(dataType.data.data,);
// return {
// dataType:dataType.data.data,
// dataDetail:dataDetail.data.data.data,
// data3:dataDetail.data.data
// };
// },
}; };
</script> </script>
<style scoped> <style scoped>
.clearfix:after { .clearfix:after {
/*伪元素是行内元素 正常浏览器清除浮动方法*/ /*伪元素是行内元素 正常浏览器清除浮动方法*/
...@@ -201,23 +176,6 @@ export default { ...@@ -201,23 +176,6 @@ export default {
.wrap { .wrap {
padding: 0 0; padding: 0 0;
} }
/* .banner {
text-align: center;
}
.banner h2 {
font-size: 20px;
font-weight: 700;
padding-top: 40px;
}
.banner h3 {
font-size: 16px;
padding-top: 20px;
font-weight: 400;
padding-bottom: 40px;
} */
.campsiteDetail { .campsiteDetail {
padding: 0; padding: 0;
margin: 0; margin: 0;
...@@ -248,4 +206,4 @@ export default { ...@@ -248,4 +206,4 @@ export default {
color: white; /* 字体颜色 */ color: white; /* 字体颜色 */
margin-left: 10px; margin-left: 10px;
} }
</style> </style>
\ No newline at end of file
...@@ -94,12 +94,11 @@ ...@@ -94,12 +94,11 @@
</template> </template>
<script> <script>
import axios from "axios"; import axios from '../../plugins/axios'
import menuModal from "../../components/menu"; import menuModal from "../../components/menu";
import footerModal from "../../components/footer"; import footerModal from "../../components/footer";
import Swiper from "swiper"; import Swiper from "swiper";
import "swiper/dist/css/swiper.min.css"; import "swiper/dist/css/swiper.min.css";
// import { getDetail } from '../../../../demo nuxt/nuxt-bnhcp/ajax/getData';
export default { export default {
transition: "bounce", transition: "bounce",
components: { components: {
...@@ -125,12 +124,9 @@ export default { ...@@ -125,12 +124,9 @@ export default {
return !isNaN(+params.id); return !isNaN(+params.id);
}, },
async asyncData({ env, params, error }) { async asyncData({ env, params, error }) {
const { data } = await axios.get( const { data } = await axios.get("/api/uccn/app/unauth/campsite/shop?id=" + params.id);
env.host + "/api/uccn/app/unauth/campsite/shop?id=" + params.id
);
let user = data.data; let user = data.data;
let campsiteShop = user.campsiteShopCarouselDetailVos; let campsiteShop = user.campsiteShopCarouselDetailVos;
// console.log(user);
if (!user) { if (!user) {
return error({ message: "User not found", statusCode: 404 }); return error({ message: "User not found", statusCode: 404 });
...@@ -141,7 +137,6 @@ export default { ...@@ -141,7 +137,6 @@ export default {
changeImgIndex(index, length) { changeImgIndex(index, length) {
this.$refs.mySwiper.swiper.slideTo(index + 1, 1000, true); this.$refs.mySwiper.swiper.slideTo(index + 1, 1000, true);
this.lengthPic = length; this.lengthPic = length;
// console.log(this.lengthPic);
}, },
visiblePic() { visiblePic() {
this.visible = !this.visible; this.visible = !this.visible;
...@@ -149,25 +144,14 @@ export default { ...@@ -149,25 +144,14 @@ export default {
async getNode() { async getNode() {
const { const {
data: { data } data: { data }
} = await axios.get( } = await axios.get("/api/app/cofig/app/unauth/types?types=13");
"https://dev.dfangche.com/api/app/cofig/app/unauth/types?types=13"
);
// console.log(data[0].value);
this.value = data[0].value; this.value = data[0].value;
}, },
async getHot() { async getHot() {
const { const { data: { data } } = await axios.get("/api/uccn/random/list/app/unauth/get?type=4&number&location=2" );
data: { data }
} = await axios.get(
"https://dev.dfangche.com/api/uccn/random/list/app/unauth/get?type=4&number&location=2"
);
console.log(data);
this.hotList = data this.hotList = data
}, },
toHot(id){ toHot(id){ }
// console.log(id);
// params.id = id
}
}, },
mounted() { mounted() {
let t = this; let t = this;
...@@ -218,7 +202,7 @@ export default { ...@@ -218,7 +202,7 @@ export default {
*zoom: 1; /*ie6清除浮动的方式 *号只有IE6-IE7执行,其他浏览器不执行*/ *zoom: 1; /*ie6清除浮动的方式 *号只有IE6-IE7执行,其他浏览器不执行*/
} }
.wrap { .wrap {
padding: 0 10%; padding: 0 10%;
} }
.gallery-top img { .gallery-top img {
...@@ -261,4 +245,3 @@ export default { ...@@ -261,4 +245,3 @@ export default {
</style> </style>
\ No newline at end of file
...@@ -21,19 +21,28 @@ ...@@ -21,19 +21,28 @@
</template> </template>
<script> <script>
import axios from 'axios' import axios from '../plugins/axios';
export default { export default {
data(){
return{
pageNo: 1,
pageSize:10,
nomore: false,
loading: false,
evns: ""
}
},
async asyncData({ env }) { async asyncData({ env }) {
const { data } = await axios.get( env.host + '/api/uccn/app/unauth/campsite/shops?type=53&pageNo=1&pageSize=10'); const { data } = await axios.get('/api/uccn/app/unauth/campsite/shops?type=53&pageNo=1&pageSize=10000');
let cc = data.data.data; let cc = data.data.data;
console.log(data); return { users: cc, evn: env.host}
},
// return { users: env.users } mounted(){
return { users: cc} let t = this;
t.pageNo = 2;
}, },
// asyncData ({ env }) { methods:{
// return { users: env.users } }
// }
} }
</script> </script>
......
...@@ -6,29 +6,20 @@ ...@@ -6,29 +6,20 @@
</template> </template>
<script> <script>
import axios from 'axios' import axios from '../../plugins/axios'
export default { export default {
validate ({ params }) { validate ({ params }) {
console.log(params.id); console.log(params.id);
return !isNaN(+params.id) return !isNaN(+params.id)
}, },
async asyncData({ env, params, error}) { async asyncData({ env, params, error}) {
const { data } = await axios.get( env.host + '/api/uccn/app/unauth/campsite/shop?id='+params.id); const { data } = await axios.get('/api/uccn/app/unauth/campsite/shop?id='+params.id);
let user = data.data; let user = data.data;
if (!user) { if (!user) {
return error({ message: 'User not found', statusCode: 404 }) return error({ message: 'User not found', statusCode: 404 })
} }
return user return user
}, },
// asyncData ({ params, env, error }) {
////
// const user = env.users.find(user => String(user.id) === params.id)
// if (!user) {
// return error({ message: 'User not found', statusCode: 404 })
// }
// return user
// },
head () { head () {
return { return {
title: this.name title: this.name
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<div class="line-title"></div> <div class="line-title"></div>
</div> </div>
</div> </div>
<img src="../assets/images/tv.png"/> <img src="../assets/images/tv.png" style="width: 1200px;"/>
<!--autoplay="autoplay"--> <!--autoplay="autoplay"-->
<video class="video-play" width="320" height="240" controls muted> <video class="video-play" width="320" height="240" controls muted>
<source src="https://xxtest.upyuns.com/image/test.mp4" type="video/mp4"> <source src="https://xxtest.upyuns.com/image/test.mp4" type="video/mp4">
...@@ -146,7 +146,6 @@ ...@@ -146,7 +146,6 @@
<div class="min-win"> <div class="min-win">
<ul class="v-type-ul"> <ul class="v-type-ul">
<li class="v-type" :class="tabIndex== 0?'v-type-active':''" @click="changeVehicle(0)">上汽大通</li> <li class="v-type" :class="tabIndex== 0?'v-type-active':''" @click="changeVehicle(0)">上汽大通</li>
<!--<li class="v-type" :class="tabIndex== 0?'v-type-active':''" @click="changeVehicle(0)">上汽大通</li>-->
<li class="v-type" :class="tabIndex== 1?'v-type-active':''" @click="changeVehicle(1)">格林卡诺C2</li> <li class="v-type" :class="tabIndex== 1?'v-type-active':''" @click="changeVehicle(1)">格林卡诺C2</li>
<li class="v-type" :class="tabIndex== 2?'v-type-active':''" @click="changeVehicle(2)">齐星依维柯</li> <li class="v-type" :class="tabIndex== 2?'v-type-active':''" @click="changeVehicle(2)">齐星依维柯</li>
<li class="v-type" :class="tabIndex== 3?'v-type-active':''" @click="changeVehicle(3)">奔驰斯宾特</li> <li class="v-type" :class="tabIndex== 3?'v-type-active':''" @click="changeVehicle(3)">奔驰斯宾特</li>
...@@ -268,7 +267,7 @@ ...@@ -268,7 +267,7 @@
</template> </template>
<script> <script>
import axios from 'axios' import axios from '../plugins/axios'
import banner from "../components/banner" import banner from "../components/banner"
import bannerActivity from "../components/bannerActivity" import bannerActivity from "../components/bannerActivity"
import menuModal from "../components/menu" import menuModal from "../components/menu"
...@@ -370,17 +369,17 @@ export default { ...@@ -370,17 +369,17 @@ export default {
} }
// 首页活动 // 首页活动
const { data } = await axios.get( env.host + '/api/uccn/summitActivity/app/unauth/home'); const { data } = await axios.get( '/api/uccn/summitActivity/app/unauth/home');
let cc = data.data; let cc = data.data;
cc.map(function(item){ cc.map(function(item){
item.startTime = timestamp2DateNoTime(item.startTime); item.startTime = timestamp2DateNoTime(item.startTime);
item.endTime = timestamp2DateNoTime(item.endTime); item.endTime = timestamp2DateNoTime(item.endTime);
}); });
//首页banner //首页banner
let tempBannerData = await axios.get( env.host + '/api/app/banner/app/unauth/findBannerlist?type=0&platform=1'); let tempBannerData = await axios.get('/api/app/banner/app/unauth/findBannerlist?type=0&platform=1');
let banner = tempBannerData.data.data; let banner = tempBannerData.data.data;
//首页新闻 //首页新闻
let newsData = await axios.get('https://xxtest.upyuns.com/api/uccn/article/app/unauth/homePage/1'); let newsData = await axios.get('/api/uccn/article/app/unauth/homePage/1');
let news = newsData.data.data; let news = newsData.data.data;
return { activityList: cc, bannerList: banner, newsList: news} return { activityList: cc, bannerList: banner, newsList: news}
}, },
......
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
</template> </template>
<script> <script>
import axios from "axios"; import axios from '../plugins/axios';
import menuModal from "../components/menu"; import menuModal from "../components/menu";
import footerModal from "../components/footer"; import footerModal from "../components/footer";
import vehicleBanner from "../components/vehicleBanner" import vehicleBanner from "../components/vehicleBanner"
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
*/ */
async getBanner(){ async getBanner(){
//首活动banner //首活动banner
let tempBannerData = await axios.get( 'https://dev.dfangche.com/api/app/banner/app/unauth/findBannerlist?type=5&platform=1'); let tempBannerData = await axios.get( '/api/app/banner/app/unauth/findBannerlist?type=5&platform=1');
let banner = tempBannerData.data.data; let banner = tempBannerData.data.data;
this.bannerList = banner; this.bannerList = banner;
}, },
...@@ -116,9 +116,7 @@ ...@@ -116,9 +116,7 @@
async getAll() { async getAll() {
let { let {
data: { data } data: { data }
} = await axios.get( } = await axios.get(`/api/uccn/article/app/unauth/list?type=1&page=1&limit=10000` );
`https://dev.dfangche.com/api/uccn/article/app/unauth/list?type=1&page=1&limit=10000`
);
// console.log(data); // console.log(data);
this.totalCount = data.total; this.totalCount = data.total;
this.dataDetail = data.list; this.dataDetail = data.list;
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
</template> </template>
<script> <script>
import axios from 'axios' import axios from '../../plugins/axios'
import menuModal from "../../components/menu" import menuModal from "../../components/menu"
import footerModal from "../../components/footer" import footerModal from "../../components/footer"
import Swiper from 'swiper'; import Swiper from 'swiper';
...@@ -62,40 +62,12 @@ ...@@ -62,40 +62,12 @@
return !isNaN(+params.id) return !isNaN(+params.id)
}, },
async asyncData({ env, params, error}) { async asyncData({ env, params, error}) {
function formatDate(date, fmt) { const { data } = await axios.get('/api/uccn/article/app/unauth/one?id='+params.id+"&urlType=1");
if (/(y+)/.test(fmt)) {
fmt = fmt.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length))
}
let o = {
'M+': date.getMonth() + 1,
'd+': date.getDate(),
'h+': date.getHours(),
'm+': date.getMinutes(),
's+': date.getSeconds()
}
for (let k in o) {
if (new RegExp(`(${k})`).test(fmt)) {
let str = o[k] + ''
fmt = fmt.replace(RegExp.$1, RegExp.$1.length === 1 ? str : padLeftZero(str))
}
}
return fmt
}
function padLeftZero(str) {
return ('00' + str).substr(str.length)
}
function timestamp2Date(timestamp) {
let date = new Date(timestamp);//时间戳为10位需*1000,时间戳为13位的话不需乘1000
return formatDate(date, 'yyyy-MM-dd hh:mm:ss');
}
const { data } = await axios.get( env.host + '//api/uccn/article/app/unauth/one?id='+params.id+"&urlType=1");
let detail = data.data; let detail = data.data;
detail.startTime = timestamp2Date(detail.startTime);
detail.endTime = timestamp2Date(detail.endTime);
if (!detail) { if (!detail) {
return error({ message: 'detail not found', statusCode: 404 }) return error({ message: 'detail not found', statusCode: 404 })
} }
let tempBannerData = await axios.get( env.host + '/api/uccn/article/app/unauth/three/1'); let tempBannerData = await axios.get('/api/uccn/article/app/unauth/three/1');
let hot = tempBannerData.data.data; let hot = tempBannerData.data.data;
return {detail: detail, hotList: hot} return {detail: detail, hotList: hot}
}, },
...@@ -191,20 +163,11 @@ ...@@ -191,20 +163,11 @@
.content-detail .c-title{ .content-detail .c-title{
padding: 5px; padding: 5px;
} }
/*.content-new{*/
/*background: #fff;*/
/*padding: 10px 20px;*/
/*box-shadow: 5px 5px 5px #ccc;*/
/*margin-bottom: 10px;*/
/*}*/
.content-new a{ .content-new a{
display: flex; display: flex;
color: #333; color: #333;
} }
.swiper-wrapper-thu{ .swiper-wrapper-thu{
/*max-width: 293px;*/
margin: 0 !important; margin: 0 !important;
} }
.swiper-wrapper-thu img{ .swiper-wrapper-thu img{
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
<div style="float:left;width:70%;padding-left:30px"> <div style="float:left;width:70%;padding-left:30px">
<h2 style="font-size: 18px">{{item.name}}</h2> <h2 style="font-size: 18px">{{item.name}}</h2>
<h6 style="font-size: 16px;font-weight:400;margin:35px 8px">{{item.describe}}</h6> <h6 style="font-size: 16px;font-weight:400;margin:35px 8px">{{item.describe}}</h6>
<nuxt-link :to="item.link"> <nuxt-link :to="item.link">
<button class="buttonDetails">旅游详情</button> <button class="buttonDetails">旅游详情</button>
</nuxt-link> </nuxt-link>
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
</template> </template>
<script> <script>
import axios from 'axios' import axios from '../plugins/axios'
import menuModal from "../components/menu" import menuModal from "../components/menu"
import footerModal from "../components/footer" import footerModal from "../components/footer"
import banner from "../components/banner" import banner from "../components/banner"
...@@ -98,25 +98,17 @@ ...@@ -98,25 +98,17 @@
async getType() { async getType() {
const { const {
data: { data } data: { data }
} = await axios.get( } = await axios.get("/api/uccn/app/unauth/tour/tagList" );
"https://dev.dfangche.com/api/uccn/app/unauth/tour/tagList"
);
// console.log(data);
this.dataType = data; this.dataType = data;
}, },
async getAll() { async getAll() {
let { let {
data: { data } data: { data }
} = await axios.get( } = await axios.get(`/api/uccn/app/unauth/tour/getGoodList?tagId=${this.listQuery.tagId}&page=${this.listQuery.page}&limit=${this.listQuery.limit}`);
`https://dev.dfangche.com/api/uccn/app/unauth/tour/getGoodList?tagId=${this.listQuery.tagId}&page=${this.listQuery.page}&limit=${this.listQuery.limit}`
);
console.log(data); console.log(data);
data.data.map(function(item){ data.data.map(function(item){
// item.modelParam = JSON.parse( item.modelParam);
item.link = encodeURI('/tourDetails/' + item.id+'?name='+item.name); item.link = encodeURI('/tourDetails/' + item.id+'?name='+item.name);
item.link = encodeURI(item.link); item.link = encodeURI(item.link);
// item.pictureList = item.picture.split(",");
// item.coverPic = item.coverPic?item.coverPic: item.pictureList.length>0?item.pictureList[0]:'';
}); });
if(!data.data.length == 0){ if(!data.data.length == 0){
this.totalCount = data.totalCount; this.totalCount = data.totalCount;
...@@ -127,20 +119,14 @@ ...@@ -127,20 +119,14 @@
this.dataDetail = data.data; this.dataDetail = data.data;
this.dataNull = true this.dataNull = true
} }
// this.dataDetail = this.dataDetail.push(data.data);
},
// 点击下一页回调
prev () {
}, },
// 点击下一页回调 // 点击下一页回调
next () { prev () {},
}, // 点击下一页回调
next () {},
// 鼠标移入状态点回调 // 鼠标移入状态点回调
changeBanner () { changeBanner () {},
}, bannerClick () {},
bannerClick () {
},
}, },
head: { head: {
title: '房车旅游' title: '房车旅游'
...@@ -195,4 +181,4 @@ ...@@ -195,4 +181,4 @@
margin-left: 10px; margin-left: 10px;
margin-top: 15px; margin-top: 15px;
} }
</style> </style>
\ No newline at end of file
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
</template> </template>
<script> <script>
import axios from "axios"; import axios from '../../plugins/axios'
import menuModal from "../../components/menu"; import menuModal from "../../components/menu";
import footerModal from "../../components/footer"; import footerModal from "../../components/footer";
import Swiper from "swiper"; import Swiper from "swiper";
...@@ -129,8 +129,7 @@ export default { ...@@ -129,8 +129,7 @@ export default {
}, },
async asyncData({ env, params, error }) { async asyncData({ env, params, error }) {
console.log(params.id); console.log(params.id);
const { data } = await axios.get( const { data } = await axios.get("/api/uccn/app/unauth/tour/detail/" + params.id
env.host + "/api/uccn/app/unauth/tour/detail/" + params.id
); );
let user = data.data; let user = data.data;
let campsiteShop = user.bannerDTOS; let campsiteShop = user.bannerDTOS;
...@@ -153,18 +152,14 @@ export default { ...@@ -153,18 +152,14 @@ export default {
async getNode() { async getNode() {
const { const {
data: { data } data: { data }
} = await axios.get( } = await axios.get("/api/app/cofig/app/unauth/types?types=14");
"https://dev.dfangche.com/api/app/cofig/app/unauth/types?types=14"
);
// console.log(data[0].value); // console.log(data[0].value);
this.value = data[0].value; this.value = data[0].value;
}, },
async getHot() { async getHot() {
const { const {
data: { data } data: { data }
} = await axios.get( } = await axios.get("/api/uccn/random/list/app/unauth/get?type=3&number&location=2");
"https://dev.dfangche.com/api/uccn/random/list/app/unauth/get?type=3&number&location=2"
);
console.log(data); console.log(data);
this.hotList = data this.hotList = data
}, },
...@@ -283,4 +278,3 @@ export default { ...@@ -283,4 +278,3 @@ export default {
\ No newline at end of file
...@@ -42,7 +42,8 @@ ...@@ -42,7 +42,8 @@
</template> </template>
<script> <script>
import axios from "axios"; import axios from '../plugins/axios'
import menuModal from "../components/menu"; import menuModal from "../components/menu";
import footerModal from "../components/footer"; import footerModal from "../components/footer";
import vehicleBanner from "../components/vehicleBanner" import vehicleBanner from "../components/vehicleBanner"
...@@ -99,7 +100,7 @@ ...@@ -99,7 +100,7 @@
*/ */
async getBanner(){ async getBanner(){
//车型banner //车型banner
let tempBannerData = await axios.get( 'https://dev.dfangche.com/api/app/banner/app/unauth/findBannerlist?type=1&platform=1'); let tempBannerData = await axios.get( '/api/app/banner/app/unauth/findBannerlist?type=1&platform=1');
let banner = tempBannerData.data.data; let banner = tempBannerData.data.data;
this.bannerList = banner; this.bannerList = banner;
}, },
...@@ -111,9 +112,7 @@ ...@@ -111,9 +112,7 @@
async getAll() { async getAll() {
let { let {
data: { data } data: { data }
} = await axios.get( } = await axios.get(`/api/uccn/vehicleModel/app/unauth/findVehicleModelPage?page=1&limit=100`);
`https://dev.dfangche.com/api/uccn/vehicleModel/app/unauth/findVehicleModelPage?page=1&limit=100`
);
// console.log(data); // console.log(data);
this.totalCount = data.totalCount; this.totalCount = data.totalCount;
data.data.map(function(item){ data.data.map(function(item){
......
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
</template> </template>
<script> <script>
import axios from 'axios' import axios from '../../plugins/axios'
import menuModal from "../../components/menu" import menuModal from "../../components/menu"
import footerModal from "../../components/footer" import footerModal from "../../components/footer"
import Swiper from 'swiper'; import Swiper from 'swiper';
...@@ -117,7 +117,7 @@ ...@@ -117,7 +117,7 @@
return !isNaN(+params.id) return !isNaN(+params.id)
}, },
async asyncData({ env, params, route, error}) { async asyncData({ env, params, route, error}) {
const { data } = await axios.get( env.host + '/api/uccn/vehicleModel/app/unauth/detail/'+route.query.name); const { data } = await axios.get('/api/uccn/vehicleModel/app/unauth/detail/'+route.query.name);
let user = data.data; let user = data.data;
data.data.modelsDetails = data.data.modelsDetails.replace(/<img/g,"<img style='width:100%'"); data.data.modelsDetails = data.data.modelsDetails.replace(/<img/g,"<img style='width:100%'");
data.data.modelParam = JSON.parse(data.data.modelParam ); data.data.modelParam = JSON.parse(data.data.modelParam );
...@@ -128,7 +128,7 @@ ...@@ -128,7 +128,7 @@
if (!user) { if (!user) {
return error({ message: 'User not found', statusCode: 404 }) return error({ message: 'User not found', statusCode: 404 })
} }
let tempBannerData = await axios.get( env.host + '/api/uccn/random/list/app/unauth/get?type=1'); let tempBannerData = await axios.get( '/api/uccn/random/list/app/unauth/get?type=1');
let hot = tempBannerData.data.data; let hot = tempBannerData.data.data;
hot.map(function(item){ hot.map(function(item){
item.link = encodeURI('/vehicleList/' + item.id+'?name='+item.name); item.link = encodeURI('/vehicleList/' + item.id+'?name='+item.name);
...@@ -136,7 +136,7 @@ ...@@ -136,7 +136,7 @@
item.pictureList = item.picture.split(","); item.pictureList = item.picture.split(",");
item.coverPic = item.coverPic?item.coverPic: item.pictureList.length>0?item.pictureList[0]:''; item.coverPic = item.coverPic?item.coverPic: item.pictureList.length>0?item.pictureList[0]:'';
}); });
let noticeData = await axios.get( env.host + '/api/app/cofig/app/unauth/types?types=6'); let noticeData = await axios.get( '/api/app/cofig/app/unauth/types?types=6');
let notice = noticeData.data.data; let notice = noticeData.data.data;
return {detail: user, hotList: hot, notice: notice} return {detail: user, hotList: hot, notice: notice}
}, },
...@@ -188,13 +188,11 @@ ...@@ -188,13 +188,11 @@
width: 30%; width: 30%;
border-left: 1px solid #ccc; border-left: 1px solid #ccc;
border-right: 1px solid #ccc; border-right: 1px solid #ccc;
/*border-bottom: 1px solid #999;*/
padding: 5px 3px; padding: 5px 3px;
} }
.right-item{ .right-item{
width:70%; width:70%;
border-right: 1px solid #ccc; border-right: 1px solid #ccc;
/*border-bottom: 1px solid #999;*/
padding: 5px 3px; padding: 5px 3px;
} }
.modal-item{ .modal-item{
......
import axios from 'axios'
export default axios.create({
baseURL: "https://xxtest.upyuns.com"
})
...@@ -20,6 +20,9 @@ export function formatDate (date, fmt) { ...@@ -20,6 +20,9 @@ export function formatDate (date, fmt) {
} }
return fmt return fmt
} }
export function getBaseUrl(){
return baseUrl = "https://xxtest.upyuns.com";
}
function padLeftZero(str) { function padLeftZero(str) {
return ('00' + str).substr(str.length) return ('00' + str).substr(str.length)
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment