diff --git a/app.js b/app.js index c39e1e748aa3d0876d95dffca81174232165a3b4..7f559581540e716727d897de4ed59dce78464b54 100644 --- a/app.js +++ b/app.js @@ -16,7 +16,7 @@ App(Object.assign({ prevRoute: "", _aid: 7, official: [ 101153775 ], - baseIconUrl: "https://yit-prod.oss-cn-hangzhou.aliyuncs.com/xcx/icon/house/", + baseIconUrl: "https://xiaoju-prod.oss-cn-hangzhou.aliyuncs.com/xcx/icon/house/", //baseUrl: "https://taobaoquan1688.com/poetry/", baseUrl: "http://localhost:8081", baseName:"小橘诗歌" diff --git a/app.wxss b/app.wxss index e22864a8929ab8df74d8b488583360ef9e18f044..c9f918d48a2fd2a459f7772619d09c994f2c3c78 100644 --- a/app.wxss +++ b/app.wxss @@ -213,7 +213,7 @@ button.reset { bottom: -1%; width: 40%; height: 40%; - background: url('https://yit-prod.oss-cn-hangzhou.aliyuncs.com/xcx/icon/house/hs_icon_69.png') no-repeat center/cover; + background: url('https://xiaoju-prod.oss-cn-hangzhou.aliyuncs.com/xcx/icon/house/hs_icon_69.png') no-repeat center/cover; color: #fff; z-index: 20; } diff --git a/component/Btn/Btn.js b/component/Btn/Btn.js index a37f511157f8ac89901e07554d7791d761fa5056..2772633ff1dfd00e8078707c70b934ef8dd67a70 100644 --- a/component/Btn/Btn.js +++ b/component/Btn/Btn.js @@ -18,7 +18,7 @@ Component({ } }, data: { - sizeClass: "yit-btn-default" + sizeClass: "xiaoju-btn-default" }, attached: function() { this.data.size, this.data.sizeClass, this.data.disabled; diff --git a/component/Btn/Btn.wxml b/component/Btn/Btn.wxml index a546e6fda06ebe0d4205516c8281e5698c596cd5..a74b46b92626acdc2960b8ce448f06705316167d 100644 --- a/component/Btn/Btn.wxml +++ b/component/Btn/Btn.wxml @@ -1,9 +1,9 @@ - + - + - + diff --git a/component/Btn/Btn.wxss b/component/Btn/Btn.wxss index e6b3d0d8458c8530361fbdc0b060635dd3bed2b5..7e788a10f9287a19eb5ba40c9e648c15599f28da 100644 --- a/component/Btn/Btn.wxss +++ b/component/Btn/Btn.wxss @@ -1,4 +1,4 @@ -.yit-btn { +.xiaoju-btn { display: inline-flex; align-items: center; justify-content: center; @@ -9,11 +9,11 @@ box-sizing: border-box; } -.yit-btn-adaptive { +.xiaoju-btn-adaptive { display: flex; } -.yit-btn-line { +.xiaoju-btn-line { display: inline-flex; align-items: center; justify-content: center; @@ -24,7 +24,7 @@ box-sizing: border-box; } -.yit-btn-special { +.xiaoju-btn-special { display: inline-flex; align-items: center; justify-content: center; @@ -36,26 +36,26 @@ box-sizing: border-box; } -.yit-btn-hover-class { +.xiaoju-btn-hover-class { background-color: #781818; border: 2rpx solid #781818; } -.yit-btn-line-hover-class { +.xiaoju-btn-line-hover-class { color: #781818; border: 2rpx solid #781818; } -.yit-btn-special-hover-class { +.xiaoju-btn-special-hover-class { background-color: #333; } -.yit-btn-disabled { +.xiaoju-btn-disabled { background-color: #dedede; border: 2rpx solid #dedede; } -.yit-btn-default,.yit-btn-small { +.xiaoju-btn-default,.xiaoju-btn-small { min-width: 110rpx; height: 50rpx; padding: 0 20rpx; @@ -63,7 +63,7 @@ border-radius: 6rpx; } -.yit-btn-middle { +.xiaoju-btn-middle { min-width: 140rpx; height: 60rpx; padding: 0 30rpx; @@ -71,7 +71,7 @@ border-radius: 9rpx; } -.yit-btn-large { +.xiaoju-btn-large { min-width: 140rpx; height: 88rpx; font-size: 32rpx; diff --git a/component/Modal/Modal.wxml b/component/Modal/Modal.wxml index 89148cba668ffa0080360f8180440c89d775a7c5..a22c960b22499befc7a675f31c82848c815ac165 100644 --- a/component/Modal/Modal.wxml +++ b/component/Modal/Modal.wxml @@ -1,23 +1,23 @@ - - - - {{modalData.title}} - - {{item}} + + + + {{modalData.title}} + + {{item}} - - + + {{item.text}} - - - + + diff --git a/component/Modal/Modal.wxss b/component/Modal/Modal.wxss index b3d9f89ec0282aee47138e96d743fab5523186c3..b45acde90a0fb2cd283c9e9cf54052e2e00a6941 100644 --- a/component/Modal/Modal.wxss +++ b/component/Modal/Modal.wxss @@ -1,4 +1,4 @@ -.yit-modal-mask { +.xiaoju-modal-mask { z-index: 99999; overflow: hidden; position: fixed; @@ -8,7 +8,7 @@ background: rgba(0,0,0,.5); } -.yit-modal-wrapper { +.xiaoju-modal-wrapper { position: absolute; top: 50%; left: 50%; @@ -19,7 +19,7 @@ animation: showModal 150ms ease-in-out forwards; } -.yit-modal-wrapper.hide { +.xiaoju-modal-wrapper.hide { animation: hideModal 150ms ease-in-out forwards; } @@ -71,13 +71,13 @@ } } -.yit-modal-content { +.xiaoju-modal-content { width: 100%; padding: 22rpx 30rpx 40rpx; box-sizing: border-box; } -.yit-modal-title { +.xiaoju-modal-title { overflow: hidden; line-height: 34rpx; margin-bottom: 14rpx; @@ -88,11 +88,11 @@ white-space: nowrap; } -.yit-modal-title.none { +.xiaoju-modal-title.none { margin: 0; } -.yit-modal-desc { +.xiaoju-modal-desc { display: flex; justify-content: center; line-height: 40rpx; @@ -101,7 +101,7 @@ text-align: center; } -.yit-modal-options { +.xiaoju-modal-options { display: flex; align-items: center; width: 100%; @@ -110,7 +110,7 @@ box-sizing: border-box; } -.yit-modal-option { +.xiaoju-modal-option { flex-grow: 1; display: flex; align-items: center; @@ -123,11 +123,11 @@ box-sizing: border-box; } -.yit-modal-option.option-first { +.xiaoju-modal-option.option-first { border: none; } -.yit-modal-btn-options-share { +.xiaoju-modal-btn-options-share { display: flex; align-items: center; justify-content: center; @@ -142,11 +142,11 @@ background: transparent; } -.yit-modal-btn-options-share:before,.yit-modal-btn-options-share:after { +.xiaoju-modal-btn-options-share:before,.xiaoju-modal-btn-options-share:after { border: none; } -.yit-modal-close { +.xiaoju-modal-close { position: absolute; top: 0; right: 0; @@ -155,7 +155,7 @@ overflow: hidden; } -.yit-modal-icon-close { +.xiaoju-modal-icon-close { position: absolute; left: 0; bottom: 0; @@ -164,7 +164,7 @@ overflow: hidden; } -.yit-modal-icon-close::before,.yit-modal-icon-close::after { +.xiaoju-modal-icon-close::before,.xiaoju-modal-icon-close::after { content: ''; position: absolute; height: 3rpx; @@ -175,10 +175,10 @@ background: #000; } -.yit-modal-icon-close::before { +.xiaoju-modal-icon-close::before { transform: rotate(45deg); } -.yit-modal-icon-close::after { +.xiaoju-modal-icon-close::after { transform: rotate(-45deg); } \ No newline at end of file diff --git a/component/SharePosterImage/SharePosterImage.js b/component/SharePosterImage/SharePosterImage.js index e511725a1adcff2e0ea4877ef4ceb29c51184191..5c85ea003f17d95f75dbdfafe3f2685561142a5c 100644 --- a/component/SharePosterImage/SharePosterImage.js +++ b/component/SharePosterImage/SharePosterImage.js @@ -106,7 +106,7 @@ Component({ title: "保存成功", icon: "none" }); - a.downloadFiles([ this.data.shareInfo.thumb.url + "?x-oss-process=image/resize,w_1000", this.data.ecodePath + "?x-oss-process=image/resize,w_300", this.data.shareInfo.userAvatar, "https://yit-prod.oss-cn-hangzhou.aliyuncs.com/xcx/icon/house/hs_icon_61.jpg" ]).then(function(t) { + a.downloadFiles([ this.data.shareInfo.thumb.url + "?x-oss-process=image/resize,w_1000", this.data.ecodePath + "?x-oss-process=image/resize,w_300", this.data.shareInfo.userAvatar, "https://xiaoju-prod.oss-cn-hangzhou.aliyuncs.com/xcx/icon/house/hs_icon_61.jpg" ]).then(function(t) { return a.getImageListInfo([ t[0].tempFilePath, t[1].tempFilePath, t[2].tempFilePath, t[3].tempFilePath ]); }).then(function(e) { t.drawImage(e); @@ -202,7 +202,7 @@ Component({ }, fomartPost: function(t) { if (t.thumb) { - var e = t.thumb, a = t.userBrief.name, n = t.userBrief.avatar || "https://yit-prod.oss-cn-hangzhou.aliyuncs.com/xcx/icon/house/hs_icon_52.png", s = t.subTitle; + var e = t.thumb, a = t.userBrief.name, n = t.userBrief.avatar || "https://xiaoju-prod.oss-cn-hangzhou.aliyuncs.com/xcx/icon/house/hs_icon_52.png", s = t.subTitle; "IMAGES" == t.type ? s = t.imagePostEntity.mainBody : "VIDEO" == t.type && (s = t.videoPostEntity.mainBody), this.setData({ shareInfo: { diff --git a/component/SharePosterImage/SharePosterImage.wxml b/component/SharePosterImage/SharePosterImage.wxml index 508434117b3b66e2d7c013a537756dbb9cc87c63..44dd9d3610fb0ece7d565dd8f343380e54c01c2a 100644 --- a/component/SharePosterImage/SharePosterImage.wxml +++ b/component/SharePosterImage/SharePosterImage.wxml @@ -8,13 +8,13 @@ 关注 - + 消息 - - + + {{newsNum}} - + {{newsNum}} - + 99+ @@ -28,7 +28,7 @@ - + diff --git a/component/TabBarOld/TabBar.wxss b/component/TabBarOld/TabBar.wxss index 7bfb5af5237f64e5b0bf8ed87ef18a7bfe5f4d01..94e4f7d5a625a2eb916386bacade0b9ea0312265 100644 --- a/component/TabBarOld/TabBar.wxss +++ b/component/TabBarOld/TabBar.wxss @@ -83,7 +83,7 @@ view { .imgemptywei { width: 10rpx; height: 10rpx; - background: url('https://yit-prod.oss-cn-hangzhou.aliyuncs.com/xcx/icon/house/hs_icon_66.png') no-repeat; + background: url('https://xiaoju-prod.oss-cn-hangzhou.aliyuncs.com/xcx/icon/house/hs_icon_66.png') no-repeat; background-size: 100%; line-height: 20rpx; font-size: 16rpx; diff --git a/component/Waterfall/Waterfall.wxml b/component/Waterfall/Waterfall.wxml index 4fa9f2202f279f2943d6d8613ac39c843913ad14..77c6238579818804a4b54fa516bb89e934d91c1e 100644 --- a/component/Waterfall/Waterfall.wxml +++ b/component/Waterfall/Waterfall.wxml @@ -5,12 +5,12 @@ 精选 - 示范{{desc}} + 示范{{desc}} - + {{userBrief.name}} @@ -28,7 +28,7 @@ - 推荐{{item.title}} + 推荐{{item.title}} diff --git a/component/Waterfall/Waterfall.wxss b/component/Waterfall/Waterfall.wxss index 5cfc05ad120fbdbdeda1cefde36b34beb74925fb..ab21177539e429f406ff4a75f3f3366a9dc6676f 100644 --- a/component/Waterfall/Waterfall.wxss +++ b/component/Waterfall/Waterfall.wxss @@ -167,11 +167,11 @@ page::-webkit-scrollbar { width: 24rpx; height: 21rpx; margin-right: 5rpx; - background: url('https://yit-prod.oss-cn-hangzhou.aliyuncs.com/xcx/icon/house/hs_icon_85.png') no-repeat center/100% 100%; + background: url('https://xiaoju-prod.oss-cn-hangzhou.aliyuncs.com/xcx/icon/house/hs_icon_85.png') no-repeat center/100% 100%; } .ax-icon.active { - background-image: url('https://yit-prod.oss-cn-hangzhou.aliyuncs.com/xcx/icon/house/hs_icon_86.png'); + background-image: url('https://xiaoju-prod.oss-cn-hangzhou.aliyuncs.com/xcx/icon/house/hs_icon_86.png'); } .ax-count { @@ -237,7 +237,7 @@ page::-webkit-scrollbar { bottom: -1%; width: 40%; height: 40%; - background: url('https://yit-prod.oss-cn-hangzhou.aliyuncs.com/xcx/icon/house/hs_icon_69.png') no-repeat center/cover; + background: url('https://xiaoju-prod.oss-cn-hangzhou.aliyuncs.com/xcx/icon/house/hs_icon_69.png') no-repeat center/cover; color: #fff; z-index: 20; } @@ -249,7 +249,7 @@ page::-webkit-scrollbar { .botton-loading .loading-gif { width: 80rpx; height: 80rpx; - background: url('https://yit-prod.oss-cn-hangzhou.aliyuncs.com/xcx/icon/house/loading.gif') no-repeat center/cover; + background: url('https://xiaoju-prod.oss-cn-hangzhou.aliyuncs.com/xcx/icon/house/loading.gif') no-repeat center/cover; } .botton-loading .loaded { diff --git a/component/YitCard/YitCard.wxml b/component/YitCard/YitCard.wxml index 8731be9f552f3d2bf9161e98db70a756b91cc6aa..26f85102449b9602f6ca87ca2090cd2c3848c4c1 100644 --- a/component/YitCard/YitCard.wxml +++ b/component/YitCard/YitCard.wxml @@ -1,37 +1,37 @@ - - {{item.title}} - - {{item.description}} - 查看详情 + + {{item.title}} + + {{item.description}} + 查看详情 - - {{item.title}} - - - - {{item.content||item.description}} - 点击查看 + + {{item.title}} + + + + {{item.content||item.description}} + 点击查看 - - {{item.title}} - - {{item.description}} - 查看详情 + + {{item.title}} + + {{item.description}} + 查看详情 - - {{item.title}} - - - - {{item.content||item.description}} - 点击查看 + + {{item.title}} + + + + {{item.content||item.description}} + 点击查看 -你于{{item.shieldTime}}发布的帖子已被社区管理员屏蔽,原因:{{item.shieldReason}} +你于{{item.shieldTime}}发布的帖子已被社区管理员屏蔽,原因:{{item.shieldReason}} diff --git a/component/YitCard/YitCard.wxss b/component/YitCard/YitCard.wxss index 12440392f56f13a98627d1352d39a2132861befc..afe366d436b50e7192cc52422791822b925f4501 100644 --- a/component/YitCard/YitCard.wxss +++ b/component/YitCard/YitCard.wxss @@ -1,4 +1,4 @@ -.yit-card { +.xiaoju-card { display: flex; flex-direction: column; width: 100%; @@ -8,19 +8,19 @@ border-radius: 10rpx; } -.yit-card-title { +.xiaoju-card-title { padding: 35rpx 0; font-family: PingFangSC-Light; font-size: 30rpx; color: #000; } -.yit-card-img { +.xiaoju-card-img { width: 100%; border-radius: 10rpx; } -.yit-card-desc { +.xiaoju-card-desc { display: inline-block; margin-top: 27rpx; font-family: PingFangSC-Light; @@ -29,7 +29,7 @@ line-height: 36rpx; } -.yit-card-detail { +.xiaoju-card-detail { display: flex; align-self: flex-end; margin: 20rpx 16rpx 0 0; @@ -38,7 +38,7 @@ color: #999; } -.yit-card-post { +.xiaoju-card-post { display: flex; flex-direction: column; width: 100%; @@ -48,24 +48,24 @@ border-radius: 10rpx; } -.yit-card-post-title { +.xiaoju-card-post-title { padding: 20rpx 0; font-family: PingFangSC-Light; font-size: 30rpx; color: #000; } -.yit-card-post-content { +.xiaoju-card-post-content { display: flex; width: 100%; } -.yit-card-post-img { +.xiaoju-card-post-img { width: 160rpx; height: 160rpx; } -.yit-card-post-detail { +.xiaoju-card-post-detail { display: flex; flex-direction: column; justify-content: space-between; @@ -74,7 +74,7 @@ background-color: #f7f7f7; } -.yit-card-post-desc { +.xiaoju-card-post-desc { display: -webkit-box; overflow: hidden; text-overflow: ellipsis; @@ -88,7 +88,7 @@ line-height: 36rpx; } -.yit-card-post-select { +.xiaoju-card-post-select { display: flex; align-items: center; font-family: PingFangSC-Light; @@ -96,7 +96,7 @@ color: #999; } -.yit-card-post-select::after { +.xiaoju-card-post-select::after { display: inline-block; content: ''; width: 12rpx; @@ -107,7 +107,7 @@ transform: rotate(45deg); } -.yit-card-message { +.xiaoju-card-message { padding: 25rpx 20rpx; background-color: #fff; border-radius: 10rpx; diff --git a/component/YitEmptyCard/YitEmptyCard.wxml b/component/YitEmptyCard/YitEmptyCard.wxml index 0c286d34058781b28e564cc17225258cd69725de..dc6afe813fb9f23ddd0b08a3d96cf707b2b03a73 100644 --- a/component/YitEmptyCard/YitEmptyCard.wxml +++ b/component/YitEmptyCard/YitEmptyCard.wxml @@ -1,5 +1,5 @@ - - + + {{desc}} diff --git a/component/YitEmptyCard/YitEmptyCard.wxss b/component/YitEmptyCard/YitEmptyCard.wxss index 960a24f5433f826521285f987d55c938a82ec315..627d8f21a076165fee4407bfaeae6bc526cb2496 100644 --- a/component/YitEmptyCard/YitEmptyCard.wxss +++ b/component/YitEmptyCard/YitEmptyCard.wxss @@ -1,4 +1,4 @@ -.yit-empty-card { +.xiaoju-empty-card { display: flex; justify-content: center; align-items: center; @@ -7,7 +7,7 @@ background-color: #fff; } -.yit-empty-card-content { +.xiaoju-empty-card-content { display: flex; flex-direction: column; justify-content: center; @@ -15,37 +15,37 @@ transform: translateY(-50%); } -.yit-empty-card-content .img { +.xiaoju-empty-card-content .img { display: block; width: 224rpx; height: 171rpx; } -.yit-empty-card-content .empty_active_list_img { +.xiaoju-empty-card-content .empty_active_list_img { display: block; width: 123rpx; height: 136rpx; } -.yit-empty-card-content .empty_news_fans_img { +.xiaoju-empty-card-content .empty_news_fans_img { display: block; width: 126rpx; height: 134rpx; } -.yit-empty-card-content .empty_news_comment_img { +.xiaoju-empty-card-content .empty_news_comment_img { display: block; width: 155rpx; height: 140rpx; } -.yit-empty-card-content .empty_new_favourite_img { +.xiaoju-empty-card-content .empty_new_favourite_img { display: block; width: 177rpx; height: 147rpx; } -.yit-empty-card-content .desc { +.xiaoju-empty-card-content .desc { margin-top: 80rpx; font-family: PingFangSC-Medium; font-size: 30rpx; diff --git a/component/public/card/author/author.wxml b/component/public/card/author/author.wxml index cf9cf8d1536875cf61ee4fc2a109ef66ad21b592..8c341731ae7ea9da9cf1eae8d76a1fd908824de0 100644 --- a/component/public/card/author/author.wxml +++ b/component/public/card/author/author.wxml @@ -1,7 +1,7 @@