6 Коміти bccb1e663c ... d9461e7b55

Автор SHA1 Опис Дата
  bding d9461e7b55 Merge branch 'xqc_1017' into debug 1 тиждень тому
  bding 1e1bceccbd 1017需求池 1 тиждень тому
  bding 18b7509c2d merge 修改报告 1 тиждень тому
  bding ca9c26fe89 报告路径修改 1 тиждень тому
  bding 75b47ce6a6 Merge branch 'master' into 14.1 1 тиждень тому
  bding 59e6af9599 14.1 ok 1 тиждень тому

+ 32 - 26
activityPages/activityDetail/activityDetail.vue

@@ -221,7 +221,11 @@
                   </view>
                   </view>
                   <blcok v-else>
                   <blcok v-else>
                     <text class="default text_zoom" :style="{ color: detailData.IsZoom != 1 ? '#376cbb' : '#333' }">{{ detailData.LinkParticipants }}</text>
                     <text class="default text_zoom" :style="{ color: detailData.IsZoom != 1 ? '#376cbb' : '#333' }">{{ detailData.LinkParticipants }}</text>
-                    <view class="click-copy"> 点击<view class="default copy-link copy-zoom" @click="copyLink(1)">复制链接</view> <view>在手机浏览器打开</view> </view>
+                    <view class="click-copy">
+                      点击
+                      <view :class="['dustrial-li', 'dustrial-item','copy-link']" @click="copyLink(1)">复制链接 </view>
+                      <view>在手机浏览器打开</view>
+                    </view>
                   </blcok>
                   </blcok>
                 </view>
                 </view>
               </view>
               </view>
@@ -237,7 +241,7 @@
               <view class="item-right">{{ detailData.ActivityTypeName == "公司调研电话会" && detailData.IsLimitPeople && !detailData.IsSignup ? "请报名获取" : detailData.MeetingId }}</view>
               <view class="item-right">{{ detailData.ActivityTypeName == "公司调研电话会" && detailData.IsLimitPeople && !detailData.IsSignup ? "请报名获取" : detailData.MeetingId }}</view>
             </view>
             </view>
             <view v-if="detailData.ConferencePassword && isUserBindingPhoneNumber && haveAuth == 1" class="content-item">
             <view v-if="detailData.ConferencePassword && isUserBindingPhoneNumber && haveAuth == 1" class="content-item">
-              <view class="item-left">{{detailData.IsZoom == 1?'会议密码' :'拨入密码'}}:</view>
+              <view class="item-left">{{ detailData.IsZoom == 1 ? "会议密码" : "拨入密码" }}:</view>
               <view class="item-right">{{ detailData.ActivityTypeName == "公司调研电话会" && detailData.IsLimitPeople && !detailData.IsSignup ? "请报名获取" : detailData.ConferencePassword }}</view>
               <view class="item-right">{{ detailData.ActivityTypeName == "公司调研电话会" && detailData.IsLimitPeople && !detailData.IsSignup ? "请报名获取" : detailData.ConferencePassword }}</view>
             </view>
             </view>
             <view v-if="detailData.Address && isUserBindingPhoneNumber && haveAuth == 1" class="content-item">
             <view v-if="detailData.Address && isUserBindingPhoneNumber && haveAuth == 1" class="content-item">
@@ -690,8 +694,6 @@ export default {
 
 
     // 复制的操作
     // 复制的操作
     copyLink(type) {
     copyLink(type) {
-      console.log(11);
-      
       uni.setClipboardData({
       uni.setClipboardData({
         data: type == 1 ? this.detailData.LinkParticipants || this.detailData.OnlineParticipation : this.detailData.TencentConferenceNumber,
         data: type == 1 ? this.detailData.LinkParticipants || this.detailData.OnlineParticipation : this.detailData.TencentConferenceNumber,
         success: function () {
         success: function () {
@@ -700,7 +702,7 @@ export default {
             icon: "none",
             icon: "none",
             duration: 2000,
             duration: 2000,
           });
           });
-        },
+        }
       });
       });
     },
     },
     // 跳转产业标签
     // 跳转产业标签
@@ -860,8 +862,6 @@ export default {
     this.id = option.id || "";
     this.id = option.id || "";
     this.isSendWx = option.IsSendWx || "";
     this.isSendWx = option.IsSendWx || "";
     this.sourceType = option.sourceType || "";
     this.sourceType = option.sourceType || "";
-    console.log(option.detailDataShare);
-
     this.detailDataShare = option.detailDataShare ? JSON.parse(decodeURIComponent(option.detailDataShare) || {}) : "";
     this.detailDataShare = option.detailDataShare ? JSON.parse(decodeURIComponent(option.detailDataShare) || {}) : "";
     // 详情页面不写路径
     // 详情页面不写路径
   },
   },
@@ -897,8 +897,6 @@ export default {
       theme: this.detailData.ThemeText,
       theme: this.detailData.ThemeText,
     };
     };
     let detailDataShare = JSON.stringify(shaerObj).replace(/%/g, "%25");
     let detailDataShare = JSON.stringify(shaerObj).replace(/%/g, "%25");
-    console.log(detailDataShare, "--");
-
     return {
     return {
       title: this.detailData.ActivityName,
       title: this.detailData.ActivityName,
       query: "id=" + this.id + "&sourceType=微信分享&shareImag=" + this.detailData.MomentsImg + "&detailDataShare=" + encodeURIComponent(detailDataShare),
       query: "id=" + this.id + "&sourceType=微信分享&shareImag=" + this.detailData.MomentsImg + "&detailDataShare=" + encodeURIComponent(detailDataShare),
@@ -1040,23 +1038,6 @@ export default {
           padding-left: 0;
           padding-left: 0;
           margin-left: 0;
           margin-left: 0;
         }
         }
-        .dustrial-li {
-          display: flex;
-          align-items: center;
-          font-size: 22rpx;
-          height: 40rpx;
-          padding: 0 13rpx;
-          margin: 0 20rpx 10rpx 0;
-          background-color: #f0f1f3;
-        }
-        .dustrial-item {
-          padding: 0 20rpx;
-          background: #e5efff;
-          border-radius: 4rpx;
-          color: $uni-color-new;
-          border-radius: 4rpx;
-          font-weight: 600;
-        }
       }
       }
       .content-item-link {
       .content-item-link {
         display: flex;
         display: flex;
@@ -1134,6 +1115,23 @@ export default {
     overflow: hidden;
     overflow: hidden;
   }
   }
 }
 }
+.dustrial-li {
+  display: flex;
+  align-items: center;
+  font-size: 22rpx;
+  height: 40rpx;
+  padding: 0 13rpx;
+  margin: 0 20rpx 10rpx 0;
+  background-color: #f0f1f3;
+}
+.dustrial-item {
+  padding: 0 20rpx;
+  background: #e5efff;
+  border-radius: 4rpx;
+  color: $uni-color-new;
+  border-radius: 4rpx;
+  font-weight: 600;
+}
 .product-introduction-box {
 .product-introduction-box {
   background-color: #f7f7f7;
   background-color: #f7f7f7;
   padding: 10rpx 0;
   padding: 10rpx 0;
@@ -1268,5 +1266,13 @@ export default {
     margin-left: 10rpx;
     margin-left: 10rpx;
     display: inline-block !important;
     display: inline-block !important;
   }
   }
+  .copy-link {
+    margin-right: 0;
+  }
+}
+.text_zoom {
+  max-width: 80%;
+  word-wrap: break-word; /* 强制英文数字在边界处换行 */
+  overflow-wrap: break-word; /* 对于兼容性更好的情况 */
 }
 }
 </style>
 </style>

+ 11 - 6
pages.json

@@ -271,12 +271,17 @@
           }
           }
         },
         },
         {
         {
-        	"path" : "pushrules/pushrules",
-        	"style" : 
-        	{
-        		"navigationBarTitleText" : "推送规则",
-        		"enablePullDownRefresh" : false
-        	}
+          "path": "pushrules/pushrules",
+          "style": {
+            "navigationBarTitleText": "推送规则"
+          }
+        },
+        {
+          "path": "otherReport/otherReport",
+          "style": {
+            "navigationBarTitleText": "报告",
+            "enablePullDownRefresh": false
+          }
         }
         }
       ]
       ]
     },
     },

+ 1 - 1
pages/reportForm/components/strategy.vue

@@ -9,7 +9,7 @@
             >{{ item.Title }}
             >{{ item.Title }}
             <text class="reg-text" v-if="item.IsRed"></text>
             <text class="reg-text" v-if="item.IsRed"></text>
           </text>
           </text>
-          <view style="margin-top: 10rpx" v-if="matchTypeName == '每日复盘'" :class="threeFour ? 'text-threeFour' : 'text_one'">
+          <view style="margin-top: 10rpx" v-if="matchTypeName == '每日复盘' || item.IsShowAbstract" :class="threeFour ? 'text-threeFour' : 'text_one'">
             <!-- <mp-html :content="'摘要:' + item.Abstract" /> -->
             <!-- <mp-html :content="'摘要:' + item.Abstract" /> -->
             摘要:{{ item.Abstract }}
             摘要:{{ item.Abstract }}
           </view>
           </view>

+ 48 - 0
reportPages/otherReport/otherReport.vue

@@ -0,0 +1,48 @@
+<template>
+  <block>
+    <view class="container reportDetail-container">
+      <web-view :src="linkUrl">
+        <cover-view class="search-view"> </cover-view>
+      </web-view>
+    </view>
+  </block>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      linkUrl: "",
+    };
+  },
+
+  methods: {},
+  onLoad(option) {
+    this.linkUrl = decodeURIComponent(option.reportUrl) || "";
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.reportDetail-container {
+  background-color: #fff;
+  padding-bottom: 200rpx;
+  padding-bottom: calc(200rpx + constant(safe-area-inset-bottom));
+  padding-bottom: calc(200rpx + env(safe-area-inset-bottom));
+  .search-view {
+    position: fixed;
+    width: 100%;
+    height: 100rpx;
+    background: #fff;
+    z-index: 99999;
+    font-size: 24rpx;
+    box-sizing: border-box;
+    .search-icon {
+      width: 147rpx;
+      height: 40rpx;
+      margin: 0 15rpx;
+      z-index: 99999;
+    }
+  }
+}
+</style>