diff --git a/miniprogram_npm/@vant/weapp/steps/index.wxml b/miniprogram_npm/@vant/weapp/steps/index.wxml index 6180b41..458ae98 100644 --- a/miniprogram_npm/@vant/weapp/steps/index.wxml +++ b/miniprogram_npm/@vant/weapp/steps/index.wxml @@ -1,54 +1,37 @@ - - - - {{ item.text }} - {{ item.desc }} - - - - - - + + + + {{ item.text }} + + + + + + + + + - - - + + + + - -function get(index, active) { - if (index < active) { - return 'finish'; - } else if (index === active) { - return 'process'; - } + function get(index, active) { + if (index < active) { + return 'finish'; + } else if (index === active) { + return 'process'; + } - return 'inactive'; -} + return 'inactive'; + } -module.exports = get; - + module.exports = get; + \ No newline at end of file diff --git a/miniprogram_npm/@vant/weapp/steps/index.wxss b/miniprogram_npm/@vant/weapp/steps/index.wxss index 48b7665..f82a3ba 100644 --- a/miniprogram_npm/@vant/weapp/steps/index.wxss +++ b/miniprogram_npm/@vant/weapp/steps/index.wxss @@ -1 +1,160 @@ -@import '../common/index.wxss';.van-steps{background-color:var(--steps-background-color,#fff);overflow:hidden}.van-steps--horizontal{padding:10px}.van-steps--horizontal .van-step__wrapper{display:flex;overflow:hidden;position:relative}.van-steps--vertical{padding-left:10px}.van-steps--vertical .van-step__wrapper{padding:0 0 0 20px}.van-step{color:var(--step-text-color,#969799);flex:1;font-size:var(--step-font-size,14px);position:relative}.van-step--finish{color:var(--step-finish-text-color,#323233)}.van-step__circle{background-color:var(--step-circle-color,#969799);border-radius:50%;height:var(--step-circle-size,5px);width:var(--step-circle-size,5px)}.van-step--horizontal{padding-bottom:14px}.van-step--horizontal:first-child .van-step__title{transform:none}.van-step--horizontal:first-child .van-step__circle-container{padding:0 8px 0 0;transform:translate3d(0,50%,0)}.van-step--horizontal:last-child{position:absolute;right:0;width:auto}.van-step--horizontal:last-child .van-step__title{text-align:right;transform:none}.van-step--horizontal:last-child .van-step__circle-container{padding:0 0 0 8px;right:0;transform:translate3d(0,50%,0)}.van-step--horizontal .van-step__circle-container{background-color:#fff;bottom:6px;padding:0 var(--padding-xs,8px);position:absolute;transform:translate3d(-50%,50%,0);z-index:1}.van-step--horizontal .van-step__title{display:inline-block;font-size:var(--step-horizontal-title-font-size,12px);transform:translate3d(-50%,0,0)}.van-step--horizontal .van-step__line{background-color:var(--step-line-color,#ebedf0);bottom:6px;height:1px;left:0;position:absolute;right:0;transform:translate3d(0,50%,0)}.van-step--horizontal.van-step--process{color:var(--step-process-text-color,#323233)}.van-step--horizontal.van-step--process .van-step__icon{display:block;font-size:var(--step-icon-size,12px);line-height:1}.van-step--vertical{line-height:18px;padding:10px 10px 10px 0}.van-step--vertical:after{border-bottom-width:1px}.van-step--vertical:last-child:after{border-bottom-width:none}.van-step--vertical:first-child:before{background-color:#fff;content:"";height:20px;left:-15px;position:absolute;top:0;width:1px;z-index:1}.van-step--vertical .van-step__circle,.van-step--vertical .van-step__icon,.van-step--vertical .van-step__line{left:-14px;position:absolute;top:19px;transform:translate3d(-50%,-50%,0);z-index:2}.van-step--vertical .van-step__icon{font-size:var(--step-icon-size,12px);line-height:1}.van-step--vertical .van-step__line{background-color:var(--step-line-color,#ebedf0);height:100%;transform:translate3d(-50%,0,0);width:1px;z-index:1} \ No newline at end of file +@import '../common/index.wxss'; + +.van-steps { + background-color: var(--steps-background-color, #fff); + overflow: hidden +} + +.van-steps--horizontal { + padding: 10px +} + +.van-steps--horizontal .van-step__wrapper { + display: flex; + overflow: hidden; + position: relative +} + +.van-steps--vertical { + padding-left: 10px +} + +.van-steps--vertical .van-step__wrapper { + padding: 0 0 0 20px +} + +.van-step { + color: var(--step-text-color, #969799); + flex: 1; + font-size: var(--step-font-size, 14px); + position: relative +} + +.van-step--finish { + color: var(--step-finish-text-color, #323233) +} + +.van-step__circle { + background-color: var(--step-circle-color, #969799); + border-radius: 50%; + height: var(--step-circle-size, 5px); + width: var(--step-circle-size, 5px) +} + +.van-step--horizontal { + padding-bottom: 14px +} + +.van-step--horizontal:first-child .van-step__title { + transform: none +} + +.van-step--horizontal:first-child .van-step__circle-container { + padding: 0 8px 0 0; + transform: translate3d(0, 50%, 0) +} + +.van-step--horizontal:last-child { + position: absolute; + right: 0; + width: auto +} + +.van-step--horizontal:last-child .van-step__title { + text-align: right; + transform: none +} + +.van-step--horizontal:last-child .van-step__circle-container { + padding: 0 0 0 8px; + right: 0; + transform: translate3d(0, 50%, 0) +} + +.van-step--horizontal .van-step__circle-container { + background-color: #fff; + bottom: 6px; + padding: 0 var(--padding-xs, 8px); + position: absolute; + transform: translate3d(-50%, 50%, 0); + z-index: 1 +} + +.van-step--horizontal .van-step__title { + display: inline-block; + font-size: var(--step-horizontal-title-font-size, 12px); + transform: translate3d(-50%, 0, 0) +} + +.van-step--horizontal .van-step__line { + background-color: var(--step-line-color, #ebedf0); + bottom: 6px; + height: 1px; + left: 0; + position: absolute; + right: 0; + transform: translate3d(0, 50%, 0) +} + +.van-step--horizontal.van-step--process { + color: var(--step-process-text-color, #323233) +} + +.van-step--horizontal.van-step--process .van-step__icon { + display: block; + font-size: var(--step-icon-size, 12px); + line-height: 1 +} + +.van-step--vertical { + line-height: 18px; + padding: 10px 10px 10px 0 +} + +.van-step--vertical:after { + border-bottom-width: 1px +} + +.van-step--vertical:last-child:after { + border-bottom-width: none +} + +.van-step--vertical:first-child:before { + background-color: #fff; + content: ""; + height: 20px; + left: -15px; + position: absolute; + top: 0; + width: 1px; + z-index: 1 +} + +.van-step--vertical .van-step__circle, +.van-step--vertical .van-step__icon, +.van-step--vertical .van-step__line { + left: -14px; + position: absolute; + top: 19px; + transform: translate3d(-50%, -50%, 0); + z-index: 2 +} + +.van-step--vertical .van-step__icon { + font-size: var(--step-icon-size, 12px); + line-height: 1 +} + +.van-step--vertical .van-step__line { + background-color: var(--step-line-color, #ebedf0); + height: 100%; + transform: translate3d(-50%, 0, 0); + width: 1px; + z-index: 1 +} +.desc-class{ + font-size: 14px; + font-weight: 600; + color: #333333; + margin: 0 32rpx 0 32rpx +} \ No newline at end of file diff --git a/pages/index/Salesranking/Salesranking.wxml b/pages/index/Salesranking/Salesranking.wxml index 1f9e03d..4c60536 100644 --- a/pages/index/Salesranking/Salesranking.wxml +++ b/pages/index/Salesranking/Salesranking.wxml @@ -25,8 +25,6 @@ - fw - diff --git a/pages/insight/pages/brandInsight/weiboInsight/index.js b/pages/insight/pages/brandInsight/weiboInsight/index.js index c0eea57..f597c21 100644 --- a/pages/insight/pages/brandInsight/weiboInsight/index.js +++ b/pages/insight/pages/brandInsight/weiboInsight/index.js @@ -302,7 +302,6 @@ Component({ dPositive.push((ele.value[0].value * 100 / total).toFixed(0)); dNegative.push((ele.value[2].value * 100 / total).toFixed(0)); } - console.log('0000', dName) }); this.setData({ diff --git a/pages/insight/pages/eventInsight/evWeibo/index.wxml b/pages/insight/pages/eventInsight/evWeibo/index.wxml index 84dcb09..a32497a 100644 --- a/pages/insight/pages/eventInsight/evWeibo/index.wxml +++ b/pages/insight/pages/eventInsight/evWeibo/index.wxml @@ -86,7 +86,8 @@ - {{item._source.user_author.length > 7 ? item._source.user_author.slice(0,7)+'...':item._source.user_author}} + + {{item._source.user_author}} 影响力 {{item._source.volume}} diff --git a/pages/insight/pages/eventInsight/evWeibo/index.wxss b/pages/insight/pages/eventInsight/evWeibo/index.wxss index f4012f7..a100c91 100644 --- a/pages/insight/pages/eventInsight/evWeibo/index.wxss +++ b/pages/insight/pages/eventInsight/evWeibo/index.wxss @@ -108,9 +108,14 @@ text-align: center; } .kol-user-name { + width: 100%; + margin: 0 auto; font-size: 12px; font-weight: 400; color: #333333; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; /* line-height: 12px; */ } .kol-value { diff --git a/pages/insight/pages/themeBoard/index.js b/pages/insight/pages/themeBoard/index.js index 1d735c2..e570a98 100644 --- a/pages/insight/pages/themeBoard/index.js +++ b/pages/insight/pages/themeBoard/index.js @@ -117,7 +117,7 @@ Page({ res.forEach(ele => { let obj = { text: ele._source.firsttime+' '+ele._source.category, - desc: ele._source.title + desc: ele._source.title.replace(//g, ''),// .replace(/<\/em>/g,'') }; arr.push(obj); }); diff --git a/pages/mine/pages/myReport/index.wxml b/pages/mine/pages/myReport/index.wxml index 70f946f..8a62dba 100644 --- a/pages/mine/pages/myReport/index.wxml +++ b/pages/mine/pages/myReport/index.wxml @@ -3,8 +3,6 @@ - {{item.Folder}} {{item.AddTime}}