12.0

pages-purchaser/columnDetail/columnDetail.vue

@@ -1,8 +1,8 @@
 <template>
   <view class="container column-detail">
-    <view :class="['position-regular', scrollTopNumber != 0 && 'position-content-bg']" :style="{ 'background-image': scrollTopNumber == 0 ? `url(${authorDetail.BgImg})` : '' }">
+    <view :class="['position-regular', scrollTopNumber != 0 && 'position-content-bg']" :style="{ 'background-image': scrollTopNumber <= 0 ? `url(${authorDetail.BgImg})` : '' }">
       <view class="nav-bar-wrap" :style="{ height: navBarStyle.height, paddingTop: navBarStyle.paddingTop, paddingBottom: navBarStyle.paddingBottom }">
-        <view class="content-box" :style="{ color: scrollTopNumber == 0 ? '#fff' : '#333' }">
+        <view class="content-box" :style="{ color: scrollTopNumber <= 0 ? '#fff' : '#333' }">
           <text v-if="scrollTopNumber != 0">专栏详情</text>
           <view class="arrow-left-icon">
             <van-icon name="arrow-left" size="20px" @click="goHandler" />
@@ -16,7 +16,7 @@
           </view>
           <view class="set-btn" @click="followAuthor">{{ authorDetail.IsFollow == 1 ? "取消关注" : "+ 关注" }}</view>
         </view>
-        <view class="name-box" :style="{ color: scrollTopNumber == 0 ? '#fff' : '#333' }">
+        <view class="name-box" :style="{ color: scrollTopNumber <= 0 ? '#fff' : '#333' }">
           <text>{{ authorDetail.SpecialName }}</text>
           <text>{{ authorDetail.NickName }}</text>
         </view>
@@ -39,6 +39,10 @@
     <view class="column-list-content" v-if="specialList && specialList.length > 0">
       <column-list-content :authorDetail="authorDetail" :mySpecialList="specialList" @upDateCollectHandler="upDateCollectHandler" />
     </view>
+    <view class="nodata" v-else>
+      <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/act_search.png" mode="" class="nodata_ico"></image>
+      <text>还没有发布过内容</text>
+    </view>
     <Loading />
   </view>
 </template>
@@ -274,7 +278,7 @@ export default {
       }
     }
     .info-card-fans {
-      margin-top: 20rpx;
+      padding-top: 20rpx;
       display: flex;
       align-items: center;
       text:nth-child(2n + 1) {

pages-purchaser/components/columnListContent.vue

@@ -14,7 +14,7 @@
           <view class="look-all" @click="goDetail(item)"> 查看全文 </view>
         </view>
         <block v-if="item.Docs && item.Docs.length > 0">
-          <view @click="goFilePages(key)" class="file-item" v-for="(key, index) in item.Docs" :key="index"> <image :src="key.DocIcon"></image>{{ key.DocName }}.{{ key.DocSuffix }} </view>
+          <view @click="goFilePages(key)" class="file-item text_oneLine" v-for="(key, index) in item.Docs" :key="index"> <image :src="key.DocIcon"></image>{{ key.DocName }}.{{ key.DocSuffix }} </view>
         </block>
         <view class="image-conten">
           <image v-for="key in dataProcessing(item.ImgUrl)" :key="key" :src="key" @click="previewImageMediahandler(key)"></image>

pages-purchaser/contentAllPage/contentAllPage.vue

@@ -65,7 +65,7 @@ export default {
 
     // 点击了修改
     modifyHandler(item) {
-      if (1 == 1) {
+      if (item.ContentHasStyle) {
         uni.showModal({
           content: "此内容包含较多文本格式或文档，请前往网页版编辑",
           confirmColor: "#3385FF",

pages-purchaser/writeNote/writeNote.vue

@@ -154,7 +154,7 @@ export default {
     // 创建标签公司Lable
     addCompanyLableHandler() {
       if (!this.columnName) return;
-      if (this.companySelectedLable.includes(this.columnName.replace(/\s+/g, ""))) return;
+      if (this.companySelectedLable.includes(this.columnName.replace(/\s+/g, ""))) return this.$util.toast("标签已存在");
       this.companySelectedLable.push(this.columnName.replace(/\s+/g, ""));
     },
     // 行业公司标签的点击事件
@@ -204,7 +204,9 @@ export default {
         Content: this.advice_content,
         Title: this.articleTitle,
         Type: this.topLableActive,
-        Tags: this.industryCompanyLable.join(","),
+        // Tags: this.industryCompanyLable.join(","),
+        IndustryTags: this.selectedLableList.join(","),
+        CompanyTags: this.companySelectedLable.join(","),
         ImgUrl: this.fileList.join(","),
         DoType: 1,
         Id: this.detailId,
@@ -238,7 +240,8 @@ export default {
                 Content: this.advice_content,
                 Title: this.articleTitle,
                 Type: this.topLableActive,
-                Tags: this.industryCompanyLable.join(","),
+                TIndustryTags: this.selectedLableList.join(","),
+                CompanyTags: this.companySelectedLable.join(","),
                 ImgUrl: this.fileList.join(","),
                 DoType: 2,
                 Id: this.detailId,
@@ -278,7 +281,8 @@ export default {
               Content: this.advice_content,
               Title: this.articleTitle,
               Type: this.topLableActive,
-              Tags: this.industryCompanyLable.join(","),
+              IndustryTags: this.selectedLableList.join(","),
+              CompanyTags: this.companySelectedLable.join(","),
               ImgUrl: this.fileList.join(","),
               DoType: 1,
               Id: this.detailId,
@@ -342,7 +346,9 @@ export default {
         this.detailDataForm = res.Data;
         this.articleTitle = this.detailDataForm.Title;
         this.advice_content = this.detailDataForm.Content;
-
+        this.selectedLableList = this.detailDataForm.IndustryTags;
+        this.companySelectedLable = this.detailDataForm.CompanyTags;
+        this.industryCompanyLable = [...this.selectedLableList, ...this.companySelectedLable];
         setTimeout(() => {
           this.editorCtx.setContents({
             html: this.detailDataForm.Content, //this.EditGoodsDetail.content为赋值内容。
@@ -351,14 +357,14 @@ export default {
 
         this.fileList = this.detailDataForm.ImgUrl ? this.detailDataForm.ImgUrl.split(",") : [];
 
-        this.industryCompanyLable = this.detailDataForm.Tags ? this.detailDataForm.Tags.split(",") : [];
-        this.industryCompanyLable.forEach((item) => {
-          if (this.industryLabel.includes(item)) {
-            this.selectedLableList.push(item);
-          } else {
-            this.companySelectedLable.push(item);
-          }
-        });
+        // this.industryCompanyLable = this.detailDataForm.Tags ? this.detailDataForm.Tags.split(",") : [];
+        // this.industryCompanyLable.forEach((item) => {
+        //   if (this.industryLabel.includes(item)) {
+        //     this.selectedLableList.push(item);
+        //   } else {
+        //     this.companySelectedLable.push(item);
+        //   }
+        // });
       }
     },
     editorFocus() {