Compare commits

..

No commits in common. 'bfe24d51616505d628b482367e04d8160b492043' and '32af3e0fa5b96c4cd5e5c5b82f2c06a0da8d56d4' have entirely different histories.

  1. 7
      pages/info/info.vue
  2. 5
      pages/person/person.vue
  3. BIN
      static/image/info.png
  4. BIN
      static/image/person26.png
  5. BIN
      static/image/person27.png
  6. 20
      team/article/article.vue

@ -1,10 +1,10 @@
<template>
<view>
<view class="search-wrap">
<image class="bg" src="@/static/image/info.png"></image>
<image class="bg" src="@/static/image/info-bg.jpg"></image>
<view class="info">
<!-- <view class="text">行业资讯与活动</view>
<view class="text">速览</view> -->
<view class="text">行业资讯与活动</view>
<view class="text">速览</view>
<uni-search-bar class="search" radius="30" placeholder="请输入文章名称,标签" v-model="keyword" clearButton="auto" cancelButton="none" bgColor="#fff" />
</view>
</view>
@ -191,7 +191,6 @@
}
.info {
position: relative;
margin-top: 160rpx;
}
.text {
margin: 0 10px 10rpx;

@ -41,15 +41,14 @@
</view> -->
<view v-if="auth('我的:市场服务费')" class="item">
<view class="left">
<image class="icon" src="@/static/image/person26.png" mode=""></image>
<image class="icon" src="@/static/image/person6.png" mode=""></image>
<text class="name">市场服务费</text>
</view>
<text class="val">{{ my.teamInfo.annualMarketingFee ? '项目抽成' + my.teamInfo.annualMarketingFee + '%' :'-' }}</text>
</view>
<view v-if="auth('我的:团队年费')" class="item">
<view class="left">
<image class="icon" src="@/static/image/person27.png" mode=""></image>
<image class="icon" src="@/static/image/person7.png" mode=""></image>
<text class="name">团队年费</text>
</view>
<text class="val">{{ my.teamInfo.annualTeamFee ? '固定年费' + my.teamInfo.annualTeamFee + 'w' : '-' }}</text>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 82 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 640 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 969 B

@ -65,9 +65,9 @@
const newStyle = 'width: 85% !important; height: auto;';
const regex = /(<img[^>]*?\s+style=")([^"]*)("[^>]*?>)/g;
const newStr = str.replace(regex, `$1${newStyle}$3`);
const videoStr = this.replaceAllVideoTagStyles(str, "width: 95%; height: 450rpx;display: block;margin:0 auto")
// const imgStr = videoStr.replace(regex, `$1${newStyle}$3`);
const imgStr = this.addImgStyle(videoStr)
// const brStr = str.replace(/\r\n/g,"<br />")
const videoStr = this.replaceAllVideoTagStyles(newStr, "width: 95%; height: 450rpx;display: block;margin:0 auto")
const imgStr = videoStr.replace(regex, `$1${newStyle}$3`);
message.mainBody = imgStr
this.form = message
uni.hideLoading()
@ -103,17 +103,6 @@
}
return newStr;
},
addImgStyle(str) {
      return str.replace(/<(img).*?(\/>|<\/img>)/g, function (a) {
        if (a.indexOf('style') < 0) {
          // style
          return a.replace(/<\s*img/, '< img style="width:100%"');
        } else {
          // style
          return a.replace(/style=("|')/, 'style=$1width: 85% !important; height: auto;')
        }
      });
    },
//
download(item) {
this.$util.to(`../send/send?url=${item.filePath}&copyWriting=${item.fileName}`)
@ -199,9 +188,6 @@
img,image{
width: 100% !important;
}
/deep/ image,img {
margin: 0 auto;
}
}
.files {
margin-top: 20rpx;

Loading…
Cancel
Save