Skip to content

B
beyond-clouds-frontM
Commit 61475ae1 by yanju
Options

修复已知问题

parent 1ad54ef8
Showing with 248 additions and 57 deletions
assets/article.css 0 → 100644
.hljs{display:block;overflow-x:auto;padding:.5em;background:#F0F0F0}.hljs,.hljs-subst{color:#444}.hljs-comment{color:#888888}.hljs-keyword,.hljs-attribute,.hljs-selector-tag,.hljs-meta-keyword,.hljs-doctag,.hljs-name{font-weight:bold}.hljs-type,.hljs-string,.hljs-number,.hljs-selector-id,.hljs-selector-class,.hljs-quote,.hljs-template-tag,.hljs-deletion{color:#880000}.hljs-title,.hljs-section{color:#880000;font-weight:bold}.hljs-regexp,.hljs-symbol,.hljs-variable,.hljs-template-variable,.hljs-link,.hljs-selector-attr,.hljs-selector-pseudo{color:#BC6060}.hljs-literal{color:#78A960}.hljs-built_in,.hljs-bullet,.hljs-code,.hljs-addition{color:#397300}.hljs-meta{color:#1f7199}.hljs-meta-string{color:#4d99bf}.hljs-emphasis{font-style:italic}.hljs-strong{font-weight:bold}
\ No newline at end of file
assets/svg/0324svg/header_close.svg 0 → 100644
<svg xmlns="http://www.w3.org/2000/svg" width="56" height="56" viewBox="0 0 56 56">
<g id="组_5535" data-name="组 5535" transform="translate(1332 -533)">
<rect id="矩形_5414" data-name="矩形 5414" width="56" height="56" transform="translate(-1332 533)" fill="rgba(0,170,230,0)"/>
<path id="联合_2" data-name="联合 2" d="M180.072-130.816l-8.45-8.45-8.45,8.45a1.493,1.493,0,0,1-2.112,0,1.494,1.494,0,0,1,0-2.112l8.45-8.45-8.45-8.45a1.494,1.494,0,0,1,0-2.112,1.493,1.493,0,0,1,2.112,0l8.45,8.45,8.45-8.45a1.5,1.5,0,0,1,2.113,0,1.5,1.5,0,0,1,0,2.112l-8.45,8.45,8.45,8.45a1.5,1.5,0,0,1,0,2.112,1.49,1.49,0,0,1-1.057.438A1.487,1.487,0,0,1,180.072-130.816Z" transform="translate(-1475.621 702.378)" fill="#00aae6"/>
</g>
</svg>
assets/svg/0324svg/header_menu.svg 0 → 100644
<svg xmlns="http://www.w3.org/2000/svg" width="56" height="56" viewBox="0 0 56 56">
<g id="组_5533" data-name="组 5533" transform="translate(1524 -533)">
<rect id="矩形_5412" data-name="矩形 5412" width="56" height="56" transform="translate(-1524 533)" fill="rgba(0,170,230,0)"/>
<path id="align-center-alt" d="M6.5,7h21a1.5,1.5,0,0,0,0-3H6.5a1.5,1.5,0,0,0,0,3Zm24,6.5H3.5a1.5,1.5,0,0,0,0,3h27a1.5,1.5,0,0,0,0-3Zm-3,9.5H6.5a1.5,1.5,0,0,0,0,3h21a1.5,1.5,0,0,0,0-3Z" transform="translate(-1513 546)" fill="#00aae6"/>
</g>
</svg>
assets/svg/0324svg/header_search.svg 0 → 100644
<svg xmlns="http://www.w3.org/2000/svg" width="56" height="56" viewBox="0 0 56 56">
<g id="组_5532" data-name="组 5532" transform="translate(1620 -533)">
<rect id="矩形_5411" data-name="矩形 5411" width="56" height="56" transform="translate(-1620 533)" fill="rgba(0,170,230,0)"/>
<path id="search" d="M22.195,24.655a12.6,12.6,0,1,1,2.46-2.46L29.49,27.03a1.74,1.74,0,0,1-2.46,2.46l-4.836-4.836ZM14.6,24.4a9.8,9.8,0,1,0-9.8-9.8A9.8,9.8,0,0,0,14.6,24.4Z" transform="translate(-1608 545)" fill="#00aae6"/>
</g>
</svg>
assets/svg/0324svg/header_user.svg 0 → 100644
<svg xmlns="http://www.w3.org/2000/svg" width="56" height="56" viewBox="0 0 56 56">
<g id="组_5534" data-name="组 5534" transform="translate(1428 -533)">
<rect id="矩形_5413" data-name="矩形 5413" width="56" height="56" transform="translate(-1428 533)" fill="rgba(0,170,230,0)"/>
<g id="组_5531" data-name="组 5531" transform="translate(-1419 544)">
<path id="路径_5440" data-name="路径 5440" d="M21,5a6,6,0,1,1-6,6,6.007,6.007,0,0,1,6-6m0-3a9,9,0,1,0,9,9,9,9,0,0,0-9-9Z" transform="translate(-2 0)" fill="#00aae6"/>
<path id="路径_5441" data-name="路径 5441" d="M25.75,31a5.259,5.259,0,0,1,5.2,4.5H7.053a5.259,5.259,0,0,1,5.2-4.5h13.5m0-3H12.25A8.25,8.25,0,0,0,4,36.25H4A2.25,2.25,0,0,0,6.25,38.5h25.5A2.25,2.25,0,0,0,34,36.25h0A8.25,8.25,0,0,0,25.75,28Z" transform="translate(0 -6.5)" fill="#00aae6"/>
</g>
</g>
</svg>
assets/svg/0324svg/index.js 0 → 100644
import Close from './header_close.svg'
import Menu from './header_menu.svg'
import Search from './header_search.svg'
import User from './header_user.svg'
import LogoHome from './logo_home.svg'
import LogoProject from './logo_project.svg'
import LogoBlog from './logo_blog.svg'
import LogoTopic from './logo_topic.svg'
import LogoNews from './logo_news.svg'
import LogoDynamic from './logo_dynamic.svg'
import LogoAnswer from './logo_answer.svg'
import LogoDownload from './logo_download.svg'
export {Close,Menu,Search,User,LogoHome,LogoProject,LogoBlog,LogoTopic,LogoNews,LogoDynamic,LogoAnswer,LogoDownload}
assets/svg/0324svg/logo_answer.svg 0 → 100644
<svg xmlns="http://www.w3.org/2000/svg" width="72" height="72" viewBox="0 0 72 72">
<g id="组_5527" data-name="组 5527" transform="translate(1620 -249)">
<rect id="矩形_5399" data-name="矩形 5399" width="72" height="72" transform="translate(-1620 249)" fill="rgba(0,170,230,0)"/>
<g id="组_5526" data-name="组 5526" transform="translate(-1605 264)">
<path id="减去_5" data-name="减去 5" d="M19,38A19,19,0,0,1,11.6,1.493,19,19,0,0,1,26.4,36.507,18.881,18.881,0,0,1,19,38Zm-.042-13.867a1.774,1.774,0,0,0-1.295.478,1.907,1.907,0,0,0,0,2.546,1.991,1.991,0,0,0,2.591,0,1.9,1.9,0,0,0,0-2.546A1.775,1.775,0,0,0,18.958,24.133Zm-.145-11.326a2.034,2.034,0,0,1,2.218,2.139,2.086,2.086,0,0,1-.342,1.221,6.358,6.358,0,0,1-1.047,1.1l-.518.489a4.213,4.213,0,0,0-1.16,1.8,9.341,9.341,0,0,0-.332,2.76H20.2a5.006,5.006,0,0,1,.249-1.72,3.032,3.032,0,0,1,.808-1.171c.738-.657,1.3-1.191,1.669-1.589a5.1,5.1,0,0,0,.9-1.365,4.352,4.352,0,0,0,.352-1.813,3.926,3.926,0,0,0-.653-2.221,4.386,4.386,0,0,0-1.823-1.527,6.229,6.229,0,0,0-2.664-.55,6.117,6.117,0,0,0-3.419.876,4.381,4.381,0,0,0-1.8,2.525l2.446,1.12A2.474,2.474,0,0,1,18.814,12.808Z" transform="translate(2 2)" fill="#00aae6"/>
</g>
</g>
</svg>
assets/svg/0324svg/logo_blog.svg 0 → 100644
<svg xmlns="http://www.w3.org/2000/svg" width="72" height="72" viewBox="0 0 72 72">
<g id="组_5522" data-name="组 5522" transform="translate(1376 -127)">
<rect id="矩形_5396" data-name="矩形 5396" width="72" height="72" transform="translate(-1376 127)" fill="rgba(0,170,230,0)"/>
<path id="减去_15" data-name="减去 15" d="M866,1468H844a4,4,0,0,1-4-4v-26a4,4,0,0,1,4-4h22a4,4,0,0,1,4,4v26A4,4,0,0,1,866,1468Zm-17.3-10.6a1.7,1.7,0,1,0,0,3.4h5.6a1.7,1.7,0,1,0,0-3.4Zm0-8.4a1.7,1.7,0,0,0,0,3.4h9.6a1.7,1.7,0,1,0,0-3.4Zm0-8.4a1.7,1.7,0,1,0,0,3.4h12.6a1.7,1.7,0,1,0,0-3.4Z" transform="translate(-2195 -1288)" fill="#00aae6"/>
</g>
</svg>
assets/svg/0324svg/logo_download.svg 0 → 100644
<svg xmlns="http://www.w3.org/2000/svg" width="72" height="72" viewBox="0 0 72 72">
<g id="组_5530" data-name="组 5530" transform="translate(1376 -249)">
<rect id="矩形_5401" data-name="矩形 5401" width="72" height="72" transform="translate(-1376 249)" fill="rgba(0,170,230,0)"/>
<g id="组_5529" data-name="组 5529" transform="translate(-1361 264)">
<path id="减去_4" data-name="减去 4" d="M19,38A19,19,0,0,1,11.6,1.493,19,19,0,0,1,26.4,36.507,18.88,18.88,0,0,1,19,38ZM9.626,21.022A.644.644,0,0,0,9,21.681v6.661a.666.666,0,0,0,.193.477.6.6,0,0,0,.43.182H28.375A.643.643,0,0,0,29,28.342V21.681a.643.643,0,0,0-.625-.659h-1.25a.643.643,0,0,0-.625.659v4.661h-15V21.681a.644.644,0,0,0-.626-.659Zm4.02-4.123a.383.383,0,0,0-.369.289.41.41,0,0,0,.091.382l5.175,5.616a.634.634,0,0,0,.463.205.6.6,0,0,0,.42-.172.127.127,0,0,0,.018-.019l0-.006,5.178-5.618a.418.418,0,0,0,.061-.481.372.372,0,0,0-.324-.2H20.648V9.659A.643.643,0,0,0,20.023,9H17.975a.643.643,0,0,0-.625.659V16.9Z" transform="translate(2 2)" fill="#00aae6"/>
</g>
</g>
</svg>
assets/svg/0324svg/logo_dynamic.svg 0 → 100644
<svg xmlns="http://www.w3.org/2000/svg" width="72" height="72" viewBox="0 0 72 72">
<g id="组_5524" data-name="组 5524" transform="translate(1254 -127)">
<rect id="矩形_5397" data-name="矩形 5397" width="72" height="72" transform="translate(-1254 127)" fill="rgba(0,170,230,0)"/>
<g id="组_5523" data-name="组 5523" transform="translate(-1239 142)">
<path id="减去_4" data-name="减去 4" d="M19,38A19,19,0,0,1,11.6,1.493,19,19,0,0,1,26.4,36.507,18.882,18.882,0,0,1,19,38Zm8.636-27.636L15.545,15.545,10.364,27.637l12.09-5.182,5.182-12.09ZM19,20.728A1.727,1.727,0,1,1,20.727,19,1.729,1.729,0,0,1,19,20.728Z" transform="translate(2 2)" fill="#00aae6"/>
</g>
</g>
</svg>
assets/svg/0324svg/logo_home.svg 0 → 100644
<svg xmlns="http://www.w3.org/2000/svg" width="72" height="72" viewBox="0 0 72 72">
<g id="组_5519" data-name="组 5519" transform="translate(1261 -199)">
<rect id="矩形_5393" data-name="矩形 5393" width="72" height="72" transform="translate(-1261 199)" fill="rgba(0,170,230,0)"/>
<path id="减去_14" data-name="减去 14" d="M870.762,35.789H843.238A3.305,3.305,0,0,1,840,32.428V13.15a3.408,3.408,0,0,1,1.356-2.735L854.116.954a4.835,4.835,0,0,1,5.767,0l12.76,9.461A3.41,3.41,0,0,1,874,13.15V32.428A3.305,3.305,0,0,1,870.762,35.789ZM857,14.315a1.792,1.792,0,0,0-1.789,1.79v8.947a1.789,1.789,0,1,0,3.578,0V16.106A1.792,1.792,0,0,0,857,14.315Z" transform="translate(-2082 217)" fill="#00aae6"/>
</g>
</svg>
assets/svg/0324svg/logo_news.svg 0 → 100644
<svg xmlns="http://www.w3.org/2000/svg" width="72" height="72" viewBox="0 0 72 72">
<g id="组_5528" data-name="组 5528" transform="translate(1498 -249)">
<rect id="矩形_5400" data-name="矩形 5400" width="72" height="72" transform="translate(-1498 249)" fill="rgba(0,170,230,0)"/>
<path id="减去_17" data-name="减去 17" d="M866,1468H844a4,4,0,0,1-4-4v-26a4,4,0,0,1,4-4h22a4,4,0,0,1,4,4v26A4,4,0,0,1,866,1468Zm-18.8-8a1.2,1.2,0,0,0,0,2.4h14.6a1.2,1.2,0,0,0,0-2.4Zm0-8a1.2,1.2,0,0,0,0,2.4h14.6a1.2,1.2,0,0,0,0-2.4Zm9-8a1.2,1.2,0,0,0,0,2.4h5.6a1.2,1.2,0,0,0,0-2.4Zm-9.2-3.6a1,1,0,0,0-1,1v4a1,1,0,0,0,1,1h4a1,1,0,0,0,1-1v-4a1,1,0,0,0-1-1Z" transform="translate(-2317 -1166)" fill="#00aae6"/>
</g>
</svg>
assets/svg/0324svg/logo_project.svg 0 → 100644
<svg xmlns="http://www.w3.org/2000/svg" width="72" height="72" viewBox="0 0 72 72">
<g id="组_5521" data-name="组 5521" transform="translate(1498 -127)">
<rect id="矩形_5395" data-name="矩形 5395" width="72" height="72" transform="translate(-1498 127)" fill="rgba(0,170,230,0)"/>
<g id="组_5520" data-name="组 5520" transform="translate(-1690.75 -1105.5)">
<path id="减去_3" data-name="减去 3" d="M28,35H3.5A3.5,3.5,0,0,1,0,31.5V3.5A3.5,3.5,0,0,1,3.5,0h6.754a3.507,3.507,0,0,1,2.6,1.158l1.851,2.058a3.508,3.508,0,0,0,2.6,1.158H28a3.5,3.5,0,0,1,3.5,3.5V31.5A3.5,3.5,0,0,1,28,35ZM11.375,21.875a1.75,1.75,0,0,0,0,3.5h8.75a1.75,1.75,0,1,0,0-3.5Zm0-8a1.75,1.75,0,1,0,0,3.5h8.75a1.75,1.75,0,1,0,0-3.5Z" transform="translate(213 1251)" fill="#00aae6"/>
</g>
</g>
</svg>
assets/svg/0324svg/logo_topic.svg 0 → 100644
<svg xmlns="http://www.w3.org/2000/svg" width="72" height="72" viewBox="0 0 72 72">
<g id="组_5525" data-name="组 5525" transform="translate(1132 -127)">
<rect id="矩形_5398" data-name="矩形 5398" width="72" height="72" transform="translate(-1132 127)" fill="rgba(0,170,230,0)"/>
<path id="减去_16" data-name="减去 16" d="M-3341,38h0a18.871,18.871,0,0,1-13.431-5.564A18.88,18.88,0,0,1-3360,19.005a18.879,18.879,0,0,1,5.562-13.437A18.865,18.865,0,0,1-3341.01,0h.006a19.068,19.068,0,0,1,8.966,2.249,18.878,18.878,0,0,1,9.215,11.248,18.882,18.882,0,0,1-1.435,14.471c-.166.308-.5.892-.972,1.689l1.266,4.644a1.417,1.417,0,0,1,0,.751,1.428,1.428,0,0,1-1.373,1.05,1.434,1.434,0,0,1-.377-.051l-4.648-1.268c-.328.191-.613.357-.893.524A19.011,19.011,0,0,1-3341,38Zm-2.216-14.926h1.487a.846.846,0,0,1,.684.343.851.851,0,0,1,.136.757l-.6,2.038a.851.851,0,0,0,.136.756.848.848,0,0,0,.686.344h.621a.861.861,0,0,0,.821-.616l.883-3.006a.858.858,0,0,1,.821-.616h1.557a.858.858,0,0,0,.856-.857.858.858,0,0,0-.856-.857h-.542a.848.848,0,0,1-.684-.342.854.854,0,0,1-.137-.757l.876-2.986a.86.86,0,0,1,.821-.616h1.5a.858.858,0,0,0,.856-.857.858.858,0,0,0-.856-.858h-.489a.849.849,0,0,1-.685-.343.85.85,0,0,1-.136-.756l.6-2.059a.851.851,0,0,0-.135-.756.848.848,0,0,0-.685-.343h-.6a.861.861,0,0,0-.82.611l-.906,3.034a.86.86,0,0,1-.819.611h-1.484a.847.847,0,0,1-.686-.345.848.848,0,0,1-.134-.757l.611-2.052a.851.851,0,0,0-.135-.759.848.848,0,0,0-.685-.344h-.592a.858.858,0,0,0-.82.611l-.907,3.034a.859.859,0,0,1-.819.611H-3346a.858.858,0,0,0-.855.858.857.857,0,0,0,.855.857h.538a.848.848,0,0,1,.687.345.851.851,0,0,1,.134.759l-.9,2.986a.863.863,0,0,1-.819.611h-1.509a.857.857,0,0,0-.855.857.857.857,0,0,0,.855.857h.488a.846.846,0,0,1,.685.343.85.85,0,0,1,.136.757l-.6,2.038a.853.853,0,0,0,.136.757.848.848,0,0,0,.684.343h.6a.863.863,0,0,0,.82-.616l.883-3.006A.848.848,0,0,1-3343.216,23.075Zm2.507-1.714h-1.487a.846.846,0,0,1-.685-.344.852.852,0,0,1-.134-.761l.9-2.986a.862.862,0,0,1,.82-.61h1.485a.848.848,0,0,1,.686.345.85.85,0,0,1,.134.759l-.892,2.986A.852.852,0,0,1-3340.709,21.361Z" transform="translate(2245 144)" fill="#00aae6"/>
</g>
</svg>
components/common/input/src/main.vue
......@@ -36,10 +36,15 @@
:ske-w="56"
:no-flex-shrink="true"
:show-ske="false"
:font-style="[28,56,500,'#00AAE6','center']"
:flex-v="['row','center','center']"
bg-color-v="#F4F8FA"
>
<yun-icon name="search" :size="28" color="#00AAE6"></yun-icon>
<yun-img
:width-v="50"
height-v="auto"
:src="SearchIcon"
:show-ske="false"
></yun-img>
</yun-div>
<yun-div
......@@ -106,6 +111,7 @@
<script>
import {Search} from '../../../../assets/svg/0324svg'
import commonMixin from "../../../moblie/commonMixin";
export default {
mixins:[commonMixin],
......@@ -160,7 +166,8 @@
return{
regexAlert:false,
alertWord:'',
borderColor: '#fff'
borderColor: '#fff',
SearchIcon:Search,
}
},
......
components/moblie/banner.vue
......@@ -11,11 +11,10 @@
v-swiperight="clickToGetPrePic"
v-if="bannerType===1"
>
<a :href="linkArr[currentImg]" target="_blank" style="width:100%;height:100%">
<yun-img :width-v="750"
v-tap="()=>changeRoute3(linkArr[currentImg])"
height-v="auto" :ske-h="300" :ske-w="750" :src="imgArr[currentImg]" :style="{opacity:imgOpacity}" alt="" >
</yun-img>
</a>
<yun-div
:extend-style="{
......
components/moblie/commentCard.vue
......@@ -114,7 +114,7 @@
>
<yun-icon name="like1"
:size="20"
color="#ccc"></yun-icon>
:color="praised1?'#FF7474':'#ccc'"></yun-icon>
</yun-div>
<yun-div
:font-style="[20,25,400,praised1?'#FF7474':'#999','center']"
......@@ -197,6 +197,9 @@
commentNumber(val){
this.commentNumber1 = val;
},
praised(val){
this.praised1 = val
},
cardType(val){
this.handleCardType(val);
}
......@@ -238,6 +241,7 @@
}
},
clickToPraise(){
console.log('woc')
if(this.praised1){
this.dataDeletePraise();
}else{
......@@ -265,6 +269,8 @@
url = config.api.post.QuestionPraise.praise+this.cardId+'/praise'
}
console.log('niubi')
this.$axios.$post(url).then((response)=>{
if(response.code===0){
......@@ -272,7 +278,6 @@
type:'success',
message:'点赞成功'
})
this.dataGetPraiseList();
this.praised1 = true;
this.praiseNum1 = this.praiseNum1 +1;
}else if(response.code===1000){
......@@ -289,14 +294,23 @@
})
return false;
}
let url;
if(this.cardType==='blog'){
url = config.api.post.BlogPraise.praise+this.cardId+'/praise'
}
if(this.cardType==='project'){
url = config.api.post.ProjectPraise.praise+this.cardId+'/praise'
}
if(this.cardType==='answer'){
url = config.api.post.QuestionPraise.praise+this.cardId+'/praise'
}
this.$axios.$delete(config.api.delete.BlogPraise.praise+this.cardId+'/praise').then((response)=>{
this.$axios.$delete(url).then((response)=>{
if(response.code===0){
this.$message({
type:'success',
message:'取消点赞'
})
this.dataGetPraiseList();
this.praised1 = false;
this.praiseNum1 = this.praiseNum1 - 1;
}else if(response.code===1000){
......
components/moblie/containerCard.vue
......@@ -11,7 +11,7 @@
<yun-div :width-v="4" :height-v="16" bg-color-v="#00AAE6" :border-r="[0,2,2,0]" :margin-v="[0,13,0,0]"></yun-div>
<p>{{title}}</p>
</yun-div>
<yun-div :font-style="[24,32,500,'#999','left']">换一换</yun-div>
<yun-div :font-style="[24,32,500,'#999','left']"></yun-div>
</yun-div>
<slot></slot>
<yun-div v-if="showMore" :show-ske="false" width-v="100%" :font-style="[24,104,500,'#999','center']" bg-color-v="#fff">
......
components/moblie/dataCard.vue
......@@ -13,7 +13,6 @@
:ske-w="120"
:font-style="[30,36,400,'black','left']"
v-tap="clickToChange"
>
{{title}}
</yun-div>
......@@ -154,6 +153,10 @@
right:[String,Number],
userAvatar:String,
fields:String,
edit:{
default:false,
type:Boolean
}
},
data(){
return{
......@@ -248,6 +251,10 @@
clickToChange(){
if(!this.edit){
return false;
}
if(this.fields==='userAvatar'){
}
......
components/moblie/pageHeader.vue
......@@ -46,13 +46,18 @@
:ske-h="56"
:ske-w="56"
:show-ske="false"
:font-style="[28,56,500,'#00AAE6','center']"
:flex-v="['row','center','center']"
bg-color-v="#F4F8FA"
:border-v="[1,'solid',commonReturnPrimaryColor(0.2)]"
>
<yun-icon name="user"
v-tap="()=>navTapToChangeRoute1(routesObject.login)"
:size="28" v-if="!$store.state.userProfile.userId"></yun-icon>
<yun-img
v-tap="()=>navTapToChangeRoute1(routesObject.login)"
:width-v="50"
:src="headerUser"
:show-ske="false"
v-if="!$store.state.userProfile.userId"
>
</yun-img>
<yun-img
v-tap="()=>navTapToChangeRoute1(routesObject.personalCenter.index)"
:height-v="56"
......@@ -69,11 +74,17 @@
:ske-h="56"
:ske-w="56"
:show-ske="false"
:font-style="[28,56,500,'#00AAE6','center']"
:flex-v="['row','center','center']"
bg-color-v="#F4F8FA"
:border-v="[1,'solid',commonReturnPrimaryColor(0.2)]"
>
<yun-icon :name="showMenu?'close1':'menu'" v-tap="openMenu" :size="28" color="#00AAE6"></yun-icon>
<yun-img
v-tap="openMenu"
:width-v="50"
:show-ske="false"
:src="showMenu?headerClose:headerMenu"
>
</yun-img>
</yun-div>
</yun-div>
</yun-div>
......@@ -114,18 +125,19 @@
:height-v="72"
:border-r="[36]"
:border-v="[1,'solid',commonReturnPrimaryColor(0.2)]"
:font-style="[24,72,undefined,undefined,'center']"
:flex-v="['column','center','center']"
:show-ske="false"
:extend-style="{
boxSizing:'border-box'
}"
>
<yun-icon
:name="val.icon"
:color="commonReturnPrimaryColor(1)"
:size="30"
<yun-img
:width-v="65"
:show-ske="false"
:src="val.icon"
>
</yun-icon>
</yun-img>
</yun-div>
......@@ -229,6 +241,7 @@
import commonMixin from "./commonMixin";
import pageConfig from '../../action/page-config'
import pageFooter from "./pageFooter";
import {Close,Menu,Search,User,LogoHome,LogoProject,LogoBlog,LogoTopic,LogoNews,LogoDynamic,LogoAnswer,LogoDownload} from '../../assets/svg/0324svg'
export default {
mixins:[commonMixin],
components:{
......@@ -238,15 +251,18 @@
return{
showMenu:false,
menuArr:[
{name:'首页',icon:'logo_home',route:pageConfig.routes.home},
{name:'项目',icon:'logo_project',route:pageConfig.routes.project.index},
{name:'博客',icon:'logo_blog',route:pageConfig.routes.blog.index},
{name:'动态',icon:'logo_dynamic',route:pageConfig.routes.dynamic.index},
{name:'话题',icon:'logo_topic',route:pageConfig.routes.topic.index},
{name:'问答',icon:'logo_answer',route:pageConfig.routes.answer.index},
{name:'资讯',icon:'logo_news',route:pageConfig.routes.news.index},
{name:'下载',icon:'logo_download',route:pageConfig.routes.downLoad},
{name:'首页',icon:LogoHome,route:pageConfig.routes.home},
{name:'项目',icon:LogoProject,route:pageConfig.routes.project.index},
{name:'博客',icon:LogoBlog,route:pageConfig.routes.blog.index},
{name:'动态',icon:LogoDynamic,route:pageConfig.routes.dynamic.index},
{name:'话题',icon:LogoTopic,route:pageConfig.routes.topic.index},
{name:'问答',icon:LogoAnswer,route:pageConfig.routes.answer.index},
{name:'资讯',icon:LogoNews,route:pageConfig.routes.news.index},
{name:'下载',icon:LogoDownload,route:pageConfig.routes.downLoad},
],
headerUser:User,
headerClose:Close,
headerMenu:Menu,
searchValue:'',
route:'home',
BCLogo:null,
......
components/moblie/scrollLoading.vue
......@@ -29,7 +29,7 @@
:flex-v="['row','center','center']"
:show-ske="false"
>
我是有底线的~
没有更多啦~
</yun-div>
<empty-card v-if="loadState===4"></empty-card>
<div ref="bottom" class="ref-bottom"></div>
......@@ -115,6 +115,23 @@
},100)
},
clickToGetMore(){
if(this.pages===0){
this.loadState = 4
}
if(this.pages===1){
this.loadState = 3
}
if(this.currentPage>=this.pages){
this.loadState = 3
}else{
this.currentPage = this.currentPage +1;
this.loadState = 2;
clearTimeout(this.scrollTimer)
}
},
getOffsetTop(){
clearTimeout(this.scrollTimer)
this.scrollTimer = setTimeout(()=>{
......
components/moblie/userCardBig.vue
<template>
<yun-div
:width-v="750"
:height-v="314"
:margin-v="[0,'auto']"
:padding-v="[34,0,40]"
bg-color-v="#fff"
......@@ -27,11 +26,19 @@
></yun-img>
<yun-div
:style="{marginLeft: commonReturnFlexedLength(25)}"
:height-v="102"
:flex-v="['column','space-between','flex-start']"
>
<yun-div :font-style="[36,50]" :ske-w="150" :ske-h="50">{{nickName}}</yun-div>
<yun-div :font-style="[24,36,400,'#999999']" :width-v="400" :no-wrap="true" :ske-h="40">{{signature}}</yun-div>
<yun-div :font-style="[36,50]" :width-v="400" :ske-w="150" :ske-h="50">{{nickName}}
<span
v-tap="clickToFollow"
v-if="userId1!==$store.state.userProfile.userId&&!followedUser"
class="follow">+关注</span>
<span
v-tap="clickToFollow"
v-if="userId1!==$store.state.userProfile.userId&&followedUser"
class="follow__cancel">取消关注</span>
</yun-div>
<yun-div :font-style="[24,36,400,'#999999']" :margin-v="[14,0,0]" :width-v="400" :ske-h="40">{{signature}}</yun-div>
</yun-div>
</yun-div>
<yun-div
......@@ -59,6 +66,7 @@
</yun-div>
<yun-div
:width-v="704"
:margin-v="[60,0,0]"
:flex-v="['row','space-around','flex-start']"
>
<yun-div
......@@ -227,6 +235,14 @@
this.followedUser = data.followedUser;
},
clickToFollow(){
if(this.followedUser){
this.dataPostToCancelFollow();
}else{
this.dataPostToFollow();
}
},
dataPostToFollow(){
if(!this.$store.state.userProfile.userId){
......@@ -293,6 +309,16 @@
}
</script>
<style scoped>
<style lang="scss" scoped>
.follow{
color: #55B946;
font-size: 24*$font-size;
margin-left:20*$length
}
.follow__cancel{
color:#999;
font-size: 24*$font-size;
margin-left:20*$length
}
</style>
package-lock.json
......@@ -12637,11 +12637,6 @@
"resolved": "https://registry.npmjs.org/vue-no-ssr/-/vue-no-ssr-1.1.1.tgz",
"integrity": "sha512-ZMjqRpWabMPqPc7gIrG0Nw6vRf1+itwf0Itft7LbMXs2g3Zs/NFmevjZGN1x7K3Q95GmIjWbQZTVerxiBxI+0g=="
},
"vue-pickers": {
"version": "2.3.1",
"resolved": "https://registry.npmjs.org/vue-pickers/-/vue-pickers-2.3.1.tgz",
"integrity": "sha512-J5m+koloU/lNAUu8SdFQDAqB49Q3CdpG9p8HGFV1yLvRuFFoiYBaisBaq6n2UaHrgHaq7fiArgrn/cahAy82kA=="
},
"vue-router": {
"version": "3.1.6",
"resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.1.6.tgz",
......
package.json
......@@ -22,7 +22,6 @@
"nuxt": "^2.0.0",
"postcss-pxtorem": "^5.1.1",
"sass-loader": "^8.0.2",
"vue-pickers": "^2.3.1",
"vue-socket.io": "^3.0.7",
"vue-touch": "^2.0.0-beta.4"
},
......
pages/index.vue
......@@ -126,7 +126,7 @@ export default {
params: {
page: 1,
size: 5,
type: 0
type: 1
}
})
this.newsList = dataList.data.dataList
......
pages/personal-center/account.vue
......@@ -6,27 +6,27 @@
:margin-v="[0,'auto']"
:border-v="[1,'solid','#EFEFEF','bottom']"></yun-div>
<yun-div>
<user-info :cardType="2" title="头像" :user-avatar='userAvatar' fields="userAvatar" @reGet="getDataUserInfo"></user-info>
<user-info title="昵称" :right=nickName fields="nickName" @reGet="getDataUserInfo"></user-info>
<user-info title="性别" :right=gender fields="gender" @reGet="getDataUserInfo"></user-info>
<user-info title="生日" :right=birthday fields="birthday" @reGet="getDataUserInfo"></user-info>
<user-info :edit="true" :cardType="2" title="头像" :user-avatar='userAvatar' fields="userAvatar" @reGet="getDataUserInfo"></user-info>
<user-info :edit="true" title="昵称" :right=nickName fields="nickName" @reGet="getDataUserInfo"></user-info>
<user-info :edit="true" title="性别" :right=gender fields="gender" @reGet="getDataUserInfo"></user-info>
<user-info :edit="true" title="生日" :right=birthday fields="birthday" @reGet="getDataUserInfo"></user-info>
</yun-div>
<yun-div
:margin-v="[15,0,15,0]"
>
<user-info title="签名" :right=signature fields="signature" @reGet="getDataUserInfo"></user-info>
<user-info :edit="true" title="签名" :right=signature fields="signature" @reGet="getDataUserInfo"></user-info>
</yun-div>
<yun-div
:margin-v="[15,0,0,0]"
>
<user-info title="手机号" :right=mobile fields="mobile" @reGet="getDataUserInfo"></user-info>
<user-info title="微信号" :right=wxNumber fields="wxNumber" @reGet="getDataUserInfo"></user-info>
<user-info title="QQ号" :right=qqNumber fields="qqNumber" @reGet="getDataUserInfo"></user-info>
<user-info :edit="true" title="手机号" :right=mobile fields="mobile" @reGet="getDataUserInfo"></user-info>
<user-info :edit="true" title="微信号" :right=wxNumber fields="wxNumber" @reGet="getDataUserInfo"></user-info>
<user-info :edit="true" title="QQ号" :right=qqNumber fields="qqNumber" @reGet="getDataUserInfo"></user-info>
</yun-div>
<yun-div
:margin-v="[15,0,15,0]"
>
<user-info title="密码" right="去修改" fields="password" ></user-info>
<user-info :edit="true" title="密码" right="去修改" fields="password" ></user-info>
</yun-div>
</yun-div>
......
pages/search.vue
......@@ -261,12 +261,23 @@
params:params
}).then((response)=>{
if(response.code===0){
this.resultList = response.data.dataList;
this.pages = response.data.totalPage;
this.total = response.data.totalRecords;
this.handleResponse(response)
}
})
},
handleResponse(currentPage,response){
if(currentPage===1){
this.resultList=response.data.dataList;
this.pages = response.data.totalPage;
}else{
response.data.dataList.map((val,index)=>{
this.resultList.push(val)
});
this.pages = response.data.totalPage;
}
},
changePage(currentPage){
//返回页数 请求新的数据
this.dataGetSearch(currentPage);
......
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