diff --git a/src/App.vue b/src/App.vue
index 659e056c042a00628dfb9346e6331636912c7ede..fdc10ee4ff11f591031aa2c4855149f28105a563 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,5 +1,39 @@
+
+
+
+ ![]()
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/header/head.vue b/src/components/header/head.vue
index 52cd8adc52b099fe44cd21a3836a342844adbb87..8fb1242cb389039c73a5270ac8f5b2e4615448a1 100644
--- a/src/components/header/head.vue
+++ b/src/components/header/head.vue
@@ -1,9 +1,17 @@
-
+
+
登陆|注册
- {{headTitle}}
+
+
@@ -40,23 +48,29 @@
#head_top{
background-color: $blue;
position: fixed;
+ z-index: 999999999999;
left: 0;
top: 0;
@include wh(100%, 1.95rem);
}
.head_goback{
left: 0.4rem;
- @include wh(0.375rem, 0.7rem);
- @include center-top;
- @include backimg('../../images/icon_back.png');
+ @include wh(0.6rem, 0.8rem);
+ @include ct;
}
.head_login{
right: 0.55rem;
- @include sizecolor(0.6rem, #fff);
- @include center-top;
+ @include sc(0.65rem, #fff);
+ @include ct;
}
.title_head{
- @include sizecolor(0.7rem, #fff);
@include center;
+ width: 50%;
+ color: #fff;
+ text-align: center;
+ .title_text{
+ @include sc(0.8rem, #fff);
+ text-align: center;
+ }
}
diff --git a/src/config/ajax.js b/src/config/ajax.js
deleted file mode 100644
index bb21eeca0a271a2cbc1044dc669796696fd57e53..0000000000000000000000000000000000000000
--- a/src/config/ajax.js
+++ /dev/null
@@ -1,49 +0,0 @@
-import {baseUrl} from './env'
-
-export default (type = 'GET', url = '', data = {}, async = true) => {
- return new Promise((resolve, reject) => { //定义一个promise
- type = type.toUpperCase();
- url = baseUrl + url;
-
- let requestObj;
- if (window.XMLHttpRequest) {
- requestObj = new XMLHttpRequest();
- } else {
- requestObj = new ActiveXObject;
- }
-
- if (type == 'GET') {
- let dataStr = ''; //数据拼接字符串
- Object.keys(data).forEach(key => {
- dataStr += key + '=' + data[key] + '&';
- })
- if (dataStr !== '') {
- dataStr = dataStr.substr(0, dataStr.lastIndexOf('&'));
- url = url + '?' + dataStr;
- }
- requestObj.open(type, url, async);
- requestObj.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
- requestObj.send();
- }else if (type == 'POST') {
- requestObj.open(type, url, async);
- requestObj.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
- requestObj.send(JSON.stringify(data));
- }else {
- reject('error type');
- }
-
- requestObj.onreadystatechange = () => {
- if (requestObj.readyState == 4) {
- if (requestObj.status == 200) {
- let obj = requestObj.response
- if (typeof obj !== 'object') {
- obj = JSON.parse(obj);
- }
- resolve(obj);
- }else {
- reject(requestObj);
- }
- }
- }
- })
-}
\ No newline at end of file
diff --git a/src/config/env.js b/src/config/env.js
index 33e4c07a68f572818e11a29967866d8f11c165b4..a84a75a9a7de5298a68071ea58bf576b3f447732 100644
--- a/src/config/env.js
+++ b/src/config/env.js
@@ -1,17 +1,21 @@
/**
* 配置编译环境和线上环境之间的切换
*
- * baseUrl : 路由地址域名
+ * baseUrl: 域名地址
+ * routerMode: 路由模式
+ * imgBaseUrl: 图片所在域名地址
*
*/
-let baseUrl;
-let routerMode;
+let baseUrl;
+let routerMode;
+const imgBaseUrl = 'https://fuss10.elemecdn.com';
+
if (process.env.NODE_ENV == 'development') {
baseUrl = '';
- routerMode = 'history'
+ routerMode = 'hash'
}else{
baseUrl = 'https://mainsite-restapi.ele.me';
routerMode = 'hash'
}
-export {baseUrl, routerMode}
\ No newline at end of file
+export {baseUrl, routerMode, imgBaseUrl}
\ No newline at end of file
diff --git a/src/config/fetch.js b/src/config/fetch.js
index fb47d76f6988e7c514073967f4c247bcb3ba0da3..b90be9d2352d922df5e6e1ced17c7f436f380e72 100644
--- a/src/config/fetch.js
+++ b/src/config/fetch.js
@@ -1,47 +1,76 @@
import {baseUrl} from './env'
-export default (type = 'GET', url = '', data = {}) => {
- return new Promise((resolve, reject) => { //返回一个promise
- type = type.toUpperCase();
- url = baseUrl + url
- let requestObj = {
+export default async (type = 'GET', url = '', data = {}) => {
+ type = type.toUpperCase();
+ url = baseUrl + url;
+
+ if (type == 'GET') {
+ let dataStr = ''; //数据拼接字符串
+ Object.keys(data).forEach(key => {
+ dataStr += key + '=' + data[key] + '&';
+ })
+
+ if (dataStr !== '') {
+ dataStr = dataStr.substr(0, dataStr.lastIndexOf('&'));
+ url = url + '?' + dataStr;
+ }
+ }
+
+ if (window.fetch) {
+ let requestConfig = {
credentials: 'include',
method: type,
headers: {
'Accept': 'application/json',
- 'Content-Type': 'application/json'
+ 'Content-Type': 'application/json'
},
- mode: "no-cors",
+ mode: "cors",
+ cache: "only-if-cached"
}
- if (type == 'GET') {
- let dataStr = ''; //数据拼接字符串
- Object.keys(data).forEach(key => {
- dataStr += key + '=' + data[key] + '&';
- })
-
- if (dataStr !== '') {
- dataStr = dataStr.substr(0, dataStr.lastIndexOf('&'));
- url = url + '?' + dataStr;
- }
- }else if (type == 'POST') {
- Object.defineProperty(requestObj, 'body', {
+ if (type == 'POST') {
+ Object.defineProperty(requestConfig, 'body', {
value: JSON.stringify(data)
})
- }else {
- reject('error type')
+ }
+
+ try {
+ var response = await fetch(url, requestConfig);
+ var responseJson = await response.json();
+ }catch (error){
+ throw new Error(error)
}
- fetch(url, requestObj).then(res => {
- if (res.status == 200) {
- return res.json()
- } else {
- return reject(res)
- }
- }).then(data => {
- resolve(data);
- }).catch(err => {
- reject(err);
- });
- })
+ return responseJson
+ }else{
+ let requestObj;
+ if (window.XMLHttpRequest) {
+ requestObj = new XMLHttpRequest();
+ } else {
+ requestObj = new ActiveXObject;
+ }
+
+ let sendData = '';
+ if (type == 'POST') {
+ sendData = JSON.stringify(data);
+ }
+
+ requestObj.open(type, url, true);
+ requestObj.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
+ requestObj.send(sendData);
+
+ requestObj.onreadystatechange = () => {
+ if (requestObj.readyState == 4) {
+ if (requestObj.status == 200) {
+ let obj = requestObj.response
+ if (typeof obj !== 'object') {
+ obj = JSON.parse(obj);
+ }
+ return obj
+ }else {
+ throw new Error(requestObj)
+ }
+ }
+ }
+ }
}
\ No newline at end of file
diff --git a/src/images/head-logo.jpg b/src/images/head-logo.jpg
deleted file mode 100644
index 33b2effe04213d3ba415454e7882b2c41f5124c0..0000000000000000000000000000000000000000
Binary files a/src/images/head-logo.jpg and /dev/null differ
diff --git a/src/images/icon.svg b/src/images/icon.svg
new file mode 100644
index 0000000000000000000000000000000000000000..5004507bbf7951b9e31a743d5daddc6330c0ee9a
--- /dev/null
+++ b/src/images/icon.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/images/icon_back.png b/src/images/icon_back.png
deleted file mode 100644
index cb25d10ff74d392c656a53b11dafd88a98575585..0000000000000000000000000000000000000000
Binary files a/src/images/icon_back.png and /dev/null differ
diff --git a/src/page/city/city.vue b/src/page/city/city.vue
index ea5bc5483e3c6a9f323461950d660f159f6d99ef..c84614934ab12067839acb179ad60b89cb454895 100644
--- a/src/page/city/city.vue
+++ b/src/page/city/city.vue
@@ -11,9 +11,7 @@
-
-
-
+
-
{{item.name}}
@@ -32,22 +30,23 @@
export default {
data(){
return{
- inputVaule:'',
- cityid:'',
- cityname:'',
- placelist:[],
- placeHistory:[],
- historytitle: true,
- placeNone: false,
+ inputVaule:'', // 搜索地址
+ cityid:'', // 当前城市id
+ cityname:'', // 当前城市名字
+ placelist:[], // 搜索城市列表
+ placeHistory:[], // 历史搜索记录
+ historytitle: true, // 默认显示搜索历史头部，点击搜索后隐藏
+ placeNone: false, // 搜索无结果，显示提示信息
}
},
- created(){
+ mounted(){
this.cityid = this.$route.params.cityid;
+ //获取当前城市名字
currentcity(this.cityid).then(res => {
this.cityname = res.name;
})
-
+ //获取搜索历史记录
if (Tool.getStore('placeHistory')) {
this.placelist = JSON.parse(Tool.getStore('placeHistory'));
}
@@ -62,7 +61,9 @@
},
methods:{
+ //发送搜索信息inputVaule
postpois(){
+ //输入值不为空时才发送信息
if (this.inputVaule) {
searchplace(this.cityid, this.inputVaule).then(res => {
this.historytitle = false;
@@ -71,10 +72,14 @@
})
}
},
+ /**
+ * 点击搜索结果进入下一页面时进行判断是否已经有一样的历史记录
+ * 如果没有则新增，如果有则不做重复储存，判断完成后进入下一页
+ */
nextpage(index, geohash){
let history = Tool.getStore('placeHistory');
let choosePlace = this.placelist[index];
- if (history) {
+ if (history) {
let checkrepeat = false;
this.placeHistory = JSON.parse(history);
this.placeHistory.forEach(item => {
@@ -103,13 +108,13 @@
}
.change_city{
right: 0.4rem;
- @include sizecolor(0.6rem, #fff);
- @include center-top;
+ @include sc(0.6rem, #fff);
+ @include ct;
}
.city_form{
background-color: #fff;
- border-top: 1px solid $bordercolor;
- border-bottom: 1px solid $bordercolor;
+ border-top: 1px solid $bc;
+ border-bottom: 1px solid $bc;
padding-top: 0.4rem;
div{
width: 90%;
@@ -121,38 +126,38 @@
@include wh(100%, 1.4rem);
}
.city_input{
- border: 1px solid $bordercolor;
+ border: 1px solid $bc;
padding: 0 0.3rem;
- @include sizecolor(0.65rem, #333);
+ @include sc(0.65rem, #333);
}
.city_submit{
background-color: $blue;
- @include sizecolor(0.65rem, #fff);
+ @include sc(0.65rem, #fff);
}
}
}
.pois_search_history{
- border-top: 1px solid $bordercolor;
- border-bottom: 1px solid $bordercolor;
+ border-top: 1px solid $bc;
+ border-bottom: 1px solid $bc;
padding-left: 0.5rem;
@include font(0.475rem, 0.8rem);
}
.getpois_ul{
background-color: #fff;
- border-top: 1px solid $bordercolor;
+ border-top: 1px solid $bc;
li{
margin: 0 auto;
padding-top: 0.65rem;
- border-bottom: 1px solid $bordercolor;
+ border-bottom: 1px solid $bc;
.pois_name{
margin: 0 auto 0.35rem;
width: 90%;
- @include sizecolor(0.65rem, #333);
+ @include sc(0.65rem, #333);
}
.pois_address{
width: 90%;
margin: 0 auto 0.55rem;
- @include sizecolor(0.45rem, #999);
+ @include sc(0.45rem, #999);
}
}
}
diff --git a/src/page/msite/food/food.vue b/src/page/food/food.vue
similarity index 100%
rename from src/page/msite/food/food.vue
rename to src/page/food/food.vue
diff --git a/src/page/home/home.vue b/src/page/home/home.vue
index c5b5a93d9dae0b76ef8399f7538c75863f75e263..2216d73c2cf800c1a52cd25d75d4794ee3e14ecc 100644
--- a/src/page/home/home.vue
+++ b/src/page/home/home.vue
@@ -13,15 +13,15 @@
>
-
-
+
+
-
{{key}}
@@ -35,7 +35,7 @@
- {{abc}}
+
+
+
+
+
+
+ {{msietTitle}}
+
+
+
+
+
+
+
+