diff --git a/api/public.js b/api/public.js index b34f64b..b4bde62 100644 --- a/api/public.js +++ b/api/public.js @@ -8,6 +8,14 @@ export function getHomeData() { return request.get("index", {}, { login: false }); } +/** + * 首页 + * @returns {*} + */ +export function getCanvas() { + return request.get("/getCanvas?terminal=3", {}, { login: false }); +} + /** * 文章 轮播列表 * @returns {*} diff --git a/config/index.js b/config/index.js index 8629e6a..ade4699 100644 --- a/config/index.js +++ b/config/index.js @@ -2,7 +2,8 @@ // export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api'; // export const VUE_APP_API_URL = 'https://wxapi.yixiang.co/api'; // export const VUE_APP_API_URL = 'http://192.168.31.223:8008/api'; - export const VUE_APP_API_URL = 'https://tapi.xinxintuan.co/api'; + export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api'; + // export const VUE_APP_API_URL = 'https://tapi.xinxintuan.co/api'; // export const VUE_APP_API_URL = 'https://h5api.xinxintuan.co/api'; // export const VUE_APP_API_URL = 'https://h5api.xinxintuan.co/api'; export const VUE_APP_RESOURCES_URL = 'https://wx.yixiang.co/static'; diff --git a/package-lock.json b/package-lock.json index 4acba4f..a1f2da4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -287,6 +287,11 @@ "resolved": "https://registry.npm.taobao.org/ms/download/ms-2.1.2.tgz", "integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=" }, + "mutation-observer": { + "version": "1.0.3", + "resolved": "http://192.168.1.56:8081/repository/npm-public/mutation-observer/-/mutation-observer-1.0.3.tgz", + "integrity": "sha1-QukiKxAbyoLlup1aes9KFMDyY9A=" + }, "normalize-url": { "version": "4.5.0", "resolved": "https://registry.npm.taobao.org/normalize-url/download/normalize-url-4.5.0.tgz?cache=0&sync_timestamp=1596373090568&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fnormalize-url%2Fdownload%2Fnormalize-url-4.5.0.tgz", @@ -399,6 +404,11 @@ "resolved": "https://registry.npm.taobao.org/to-readable-stream/download/to-readable-stream-1.0.0.tgz", "integrity": "sha1-zgqgwvPfat+FLvtASng+d8BHV3E=" }, + "transitionEnd": { + "version": "1.0.2", + "resolved": "http://192.168.1.56:8081/repository/npm-public/transitionEnd/-/transitionEnd-1.0.2.tgz", + "integrity": "sha1-GRTbW0Wn79w0oBr2koWjppOHFjM=" + }, "url-parse-lax": { "version": "3.0.0", "resolved": "https://registry.npm.taobao.org/url-parse-lax/download/url-parse-lax-3.0.0.tgz", @@ -407,6 +417,15 @@ "prepend-http": "^2.0.0" } }, + "vconsole": { + "version": "3.4.0", + "resolved": "http://192.168.1.56:8081/repository/npm-public/vconsole/-/vconsole-3.4.0.tgz", + "integrity": "sha1-LPL/qobNerc2mXoitj0FYnxqtWc=", + "requires": { + "mutation-observer": "^1.0.3", + "transitionEnd": "^1.0.2" + } + }, "vue": { "version": "2.6.12", "resolved": "https://registry.npm.taobao.org/vue/download/vue-2.6.12.tgz", diff --git a/package.json b/package.json index 7db4ceb..297db34 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "jweixin-module": "^1.6.0", "miniapp-color-thief": "^1.0.5", "vue-ydui": "^1.2.6", - "vconsole": "^3.3.4", + "vconsole": "^3.3.4", "wechat-jssdk": "^5.0.4" }, "devDependencies": { diff --git a/pages/home/index.vue b/pages/home/index.vue index ebe34dc..556b47e 100644 --- a/pages/home/index.vue +++ b/pages/home/index.vue @@ -1,470 +1,447 @@ + .nav-title { + margin-left: 20rpx; + line-height: 40px; + } +