Commit 571c048c authored by wanggao's avatar wanggao

fix(home): 限制特定景点跳转并提示开发中

style: 移除多个页面的多余空行和冗余代码

chore: 更新manifest版本号至1.2.1

refactor(request): 调整API基础地址配置

build: 清理项目配置文件和优化构建设置
parent d6c78fae
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
"name" : "xqg-guild-uni", "name" : "xqg-guild-uni",
"appid" : "__UNI__BD498FC", "appid" : "__UNI__BD498FC",
"description" : "", "description" : "",
"versionName" : "1.0.0", "versionName" : "1.2.1",
"versionCode" : "100", "versionCode" : "100",
"transformPx" : false, "transformPx" : false,
/* 5+App特有相关 */ /* 5+App特有相关 */
......
...@@ -39,9 +39,22 @@ ...@@ -39,9 +39,22 @@
}) })
}, },
toMap(item) { toMap(item) {
const restrictedPoints = [
'蒙顶山水·儒雅乡村',
'荔港门户·蓬莱海岛'
];
if (restrictedPoints.includes(item.pointName)) {
uni.showToast({
title: '正在开发中,暂未开放',
icon: 'none',
duration: 2000
});
return;
}
uni.navigateTo({ uni.navigateTo({
url: 'map?id=' + item.id + '&title=' + item.pointName url: 'map?id=' + item.id + '&title=' + item.pointName
}) });
} }
}, },
onLoad() { onLoad() {
......
This diff is collapsed.
...@@ -25,6 +25,13 @@ ...@@ -25,6 +25,13 @@
/* 透明度 */ /* 透明度 */
/* 文章场景相关 */ /* 文章场景相关 */
.u-line-1 { .u-line-1 {
display: -webkit-box !important; display: -webkit-box !important;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
...@@ -33,6 +40,13 @@ ...@@ -33,6 +40,13 @@
-webkit-box-orient: vertical !important; -webkit-box-orient: vertical !important;
} }
.u-line-2 { .u-line-2 {
display: -webkit-box !important; display: -webkit-box !important;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
...@@ -41,6 +55,13 @@ ...@@ -41,6 +55,13 @@
-webkit-box-orient: vertical !important; -webkit-box-orient: vertical !important;
} }
.u-line-3 { .u-line-3 {
display: -webkit-box !important; display: -webkit-box !important;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
...@@ -49,6 +70,13 @@ ...@@ -49,6 +70,13 @@
-webkit-box-orient: vertical !important; -webkit-box-orient: vertical !important;
} }
.u-line-4 { .u-line-4 {
display: -webkit-box !important; display: -webkit-box !important;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
...@@ -57,6 +85,13 @@ ...@@ -57,6 +85,13 @@
-webkit-box-orient: vertical !important; -webkit-box-orient: vertical !important;
} }
.u-line-5 { .u-line-5 {
display: -webkit-box !important; display: -webkit-box !important;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
...@@ -99,6 +134,7 @@ ...@@ -99,6 +134,7 @@
.u-reset-button { .u-reset-button {
padding: 0; padding: 0;
background-color: transparent; background-color: transparent;
font-size: inherit; font-size: inherit;
line-height: inherit; line-height: inherit;
color: inherit; color: inherit;
...@@ -254,4 +290,3 @@ ...@@ -254,4 +290,3 @@
background: transparent; background: transparent;
} }
/*每个页面公共css */ /*每个页面公共css */
...@@ -104,46 +104,7 @@ ...@@ -104,46 +104,7 @@
/******/ var promises = []; /******/ var promises = [];
/******/ /******/
/******/ /******/
/******/ // mini-css-extract-plugin CSS loading
/******/ var cssChunks = {"components/imt-audio/imt-audio":1,"uni_modules/uview-ui/components/u-swiper/u-swiper":1,"uni_modules/uview-ui/components/u-loading-icon/u-loading-icon":1,"uni_modules/uview-ui/components/u-swiper-indicator/u-swiper-indicator":1};
/******/ if(installedCssChunks[chunkId]) promises.push(installedCssChunks[chunkId]);
/******/ else if(installedCssChunks[chunkId] !== 0 && cssChunks[chunkId]) {
/******/ promises.push(installedCssChunks[chunkId] = new Promise(function(resolve, reject) {
/******/ var href = "" + ({"components/imt-audio/imt-audio":"components/imt-audio/imt-audio","uni_modules/uview-ui/components/u-swiper/u-swiper":"uni_modules/uview-ui/components/u-swiper/u-swiper","uni_modules/uview-ui/components/u-loading-icon/u-loading-icon":"uni_modules/uview-ui/components/u-loading-icon/u-loading-icon","uni_modules/uview-ui/components/u-swiper-indicator/u-swiper-indicator":"uni_modules/uview-ui/components/u-swiper-indicator/u-swiper-indicator"}[chunkId]||chunkId) + ".wxss";
/******/ var fullhref = __webpack_require__.p + href;
/******/ var existingLinkTags = document.getElementsByTagName("link");
/******/ for(var i = 0; i < existingLinkTags.length; i++) {
/******/ var tag = existingLinkTags[i];
/******/ var dataHref = tag.getAttribute("data-href") || tag.getAttribute("href");
/******/ if(tag.rel === "stylesheet" && (dataHref === href || dataHref === fullhref)) return resolve();
/******/ }
/******/ var existingStyleTags = document.getElementsByTagName("style");
/******/ for(var i = 0; i < existingStyleTags.length; i++) {
/******/ var tag = existingStyleTags[i];
/******/ var dataHref = tag.getAttribute("data-href");
/******/ if(dataHref === href || dataHref === fullhref) return resolve();
/******/ }
/******/ var linkTag = document.createElement("link");
/******/ linkTag.rel = "stylesheet";
/******/ linkTag.type = "text/css";
/******/ linkTag.onload = resolve;
/******/ linkTag.onerror = function(event) {
/******/ var request = event && event.target && event.target.src || fullhref;
/******/ var err = new Error("Loading CSS chunk " + chunkId + " failed.\n(" + request + ")");
/******/ err.code = "CSS_CHUNK_LOAD_FAILED";
/******/ err.request = request;
/******/ delete installedCssChunks[chunkId]
/******/ linkTag.parentNode.removeChild(linkTag)
/******/ reject(err);
/******/ };
/******/ linkTag.href = fullhref;
/******/ /******/
/******/ var head = document.getElementsByTagName("head")[0];
/******/ head.appendChild(linkTag);
/******/ }).then(function() {
/******/ installedCssChunks[chunkId] = 0;
/******/ }));
/******/ }
/******/ /******/
/******/ // JSONP chunk loading for javascript /******/ // JSONP chunk loading for javascript
/******/ /******/
......
...@@ -158,4 +158,3 @@ ...@@ -158,4 +158,3 @@
text-align: center; text-align: center;
line-height: 50rpx; line-height: 50rpx;
} }
...@@ -28,4 +28,3 @@ ...@@ -28,4 +28,3 @@
height: 100vh; height: 100vh;
width: 100%; width: 100%;
} }
This diff is collapsed.
...@@ -27,4 +27,3 @@ ...@@ -27,4 +27,3 @@
.brief.data-v-7981325e { .brief.data-v-7981325e {
padding-top: 150rpx; padding-top: 150rpx;
} }
...@@ -37,4 +37,3 @@ ...@@ -37,4 +37,3 @@
width: 100%; width: 100%;
margin: 20rpx auto; margin: 20rpx auto;
} }
This diff is collapsed.
...@@ -67,4 +67,3 @@ ...@@ -67,4 +67,3 @@
.home .map-list .map-item ._name.data-v-86d91950 { .home .map-list .map-item ._name.data-v-86d91950 {
white-space: nowrap; white-space: nowrap;
} }
This diff is collapsed.
...@@ -104,4 +104,3 @@ ...@@ -104,4 +104,3 @@
height: 30rpx; height: 30rpx;
width: 30rpx; width: 30rpx;
} }
...@@ -59,4 +59,3 @@ ...@@ -59,4 +59,3 @@
background-color: #f1f7ef; background-color: #f1f7ef;
border-radius: 7rpx; border-radius: 7rpx;
} }
{ {
"description": "项目配置文件。", "description": "项目配置文件。",
"packOptions": { "packOptions": {
"ignore": [], "ignore": []
"include": []
}, },
"setting": { "setting": {
"urlCheck": false, "urlCheck": false,
...@@ -10,20 +9,28 @@ ...@@ -10,20 +9,28 @@
"postcss": false, "postcss": false,
"minified": true, "minified": true,
"newFeature": true, "newFeature": true,
"bigPackageSizeSupport": true, "bigPackageSizeSupport": true
"babelSetting": {
"ignore": [],
"disablePlugins": [],
"outputPath": ""
}
}, },
"compileType": "miniprogram", "compileType": "miniprogram",
"libVersion": "3.1.4", "libVersion": "",
"appid": "wx839f4e52892430bb", "appid": "wx839f4e52892430bb",
"projectname": "xqg-guild-uni", "projectname": "xqg-guild-uni",
"condition": {}, "condition": {
"editorSetting": { "search": {
"tabIndent": "insertSpaces", "current": -1,
"tabSize": 2 "list": []
},
"conversation": {
"current": -1,
"list": []
},
"game": {
"current": -1,
"list": []
},
"miniprogram": {
"current": -1,
"list": []
}
} }
} }
\ No newline at end of file
{
"desc": "关于本文件的更多信息,请参考文档 https://developers.weixin.qq.com/miniprogram/dev/framework/sitemap.html",
"rules": [{
"action": "allow",
"page": "*"
}]
}
\ No newline at end of file
...@@ -190,4 +190,3 @@ to { ...@@ -190,4 +190,3 @@ to {
transform: rotate(1turn); transform: rotate(1turn);
} }
} }
...@@ -34,7 +34,9 @@ view.data-v-56090129, scroll-view.data-v-56090129, swiper-item.data-v-56090129 { ...@@ -34,7 +34,9 @@ view.data-v-56090129, scroll-view.data-v-56090129, swiper-item.data-v-56090129 {
align-content: flex-start; align-content: flex-start;
} }
.u-swiper-indicator__wrapper.data-v-56090129 { .u-swiper-indicator__wrapper.data-v-56090129 {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
} }
.u-swiper-indicator__wrapper--line.data-v-56090129 { .u-swiper-indicator__wrapper--line.data-v-56090129 {
...@@ -59,4 +61,3 @@ view.data-v-56090129, scroll-view.data-v-56090129, swiper-item.data-v-56090129 { ...@@ -59,4 +61,3 @@ view.data-v-56090129, scroll-view.data-v-56090129, swiper-item.data-v-56090129 {
.u-swiper-indicator__wrapper__dot--active.data-v-56090129 { .u-swiper-indicator__wrapper__dot--active.data-v-56090129 {
width: 12px; width: 12px;
} }
...@@ -34,7 +34,9 @@ view.data-v-6b019429, scroll-view.data-v-6b019429, swiper-item.data-v-6b019429 { ...@@ -34,7 +34,9 @@ view.data-v-6b019429, scroll-view.data-v-6b019429, swiper-item.data-v-6b019429 {
align-content: flex-start; align-content: flex-start;
} }
.u-swiper.data-v-6b019429 { .u-swiper.data-v-6b019429 {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
...@@ -48,7 +50,9 @@ view.data-v-6b019429, scroll-view.data-v-6b019429, swiper-item.data-v-6b019429 { ...@@ -48,7 +50,9 @@ view.data-v-6b019429, scroll-view.data-v-6b019429, swiper-item.data-v-6b019429 {
flex: 1; flex: 1;
} }
.u-swiper__wrapper__item__wrapper.data-v-6b019429 { .u-swiper__wrapper__item__wrapper.data-v-6b019429 {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
position: relative; position: relative;
overflow: hidden; overflow: hidden;
...@@ -78,4 +82,3 @@ view.data-v-6b019429, scroll-view.data-v-6b019429, swiper-item.data-v-6b019429 { ...@@ -78,4 +82,3 @@ view.data-v-6b019429, scroll-view.data-v-6b019429, swiper-item.data-v-6b019429 {
position: absolute; position: absolute;
bottom: 10px; bottom: 10px;
} }
...@@ -6,7 +6,7 @@ const requestAfter = Symbol('requestAfter') ...@@ -6,7 +6,7 @@ const requestAfter = Symbol('requestAfter')
class MinRequest { class MinRequest {
[config] = { [config] = {
baseURL: 'https://xqg.xswlsq.cn/hmit-api', // '', baseURL: 'https://xqg.xswlsq.cn/hmit-api', // '',
// baseURL: 'http://192.168.10.5:18001/hmit-api', // '', // baseURL: 'http://192.168.10.3:18001/hmit-api', // '',
header: { header: {
'content-type': 'application/json' 'content-type': 'application/json'
}, },
......
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