合并主分支

pages/pcWebViev/pcWebViev.vue

@@ -62,8 +62,8 @@ export default {
         "chartPage",
         "specialDetail",
         "specialResearchPage",
-        'purchaser',
-        'IndustryReport',
+        "purchaser",
+        "IndustryReport",
       ];
       if (JSON.stringify(optios) !== "{}" && optios.path) {
         let pathUrl = optios.path.split("/")[2];

pages/reportForm/reportForm.vue

@@ -98,8 +98,13 @@
               </view>
             </view>
           </view>
+          <<<<<<< HEAD
           <!-- 多于6个时 取消展开/收起 的交互 全部显示 ------- 查研观向 8.4 -->
           <!--          <view class="content-box" v-if="item.IndustrialSubjectList.length > 6">
+=======
+		  <!-- 多于6个时 取消展开/收起 的交互 全部显示 ------- 查研观向 8.4 -->
+          <!--          <view class="content-box" v-if="item.IndustrialSubjectList.length > 6">
+>>>>>>> master
             <u-read-more :toggle="true" :show-height="item.IndustrialSubjectList.length > 6 ? 140 : 150" :shadow-style="shadowStyle" close-text="展开" color="#D1D1D1">
               <view class="read-more">
                 <view v-for="val in item.IndustrialSubjectList" :key="val.IndustrialSubjectId" @click="goIndustryReport(item.IndustrialManagementId)" class="text-box">
@@ -152,9 +157,15 @@
       </view>
     </u-modal>
     <freeCharge class="free-charge" :isShowFreeBtn="isShowFree" />
+    <<<<<<< HEAD
+    <!-- 视频模块 -->
+    <videoModule :showVideoPop="showVideoPop" :videoPopList="videoPopList" />
+    <modalDialog :isShowhasPermission="isShowhasPermission" :applyForIsShow="applyForIsShow" :jurisdictionList="jurisdictionList" :hasPermission="hasPermission" />
+    =======
     <!-- 视频模块 -->
     <videoModule :showVideoPop="showVideoPop" :videoPopList="videoPopList" />
     <modalDialog :isShowhasPermission="isShowhasPermission" :applyForIsShow="applyForIsShow" :jurisdictionList="jurisdictionList" :hasPermission="hasPermission" />
+    >>>>>>> master
     <suspenButton v-if="wholeShowListData.IsShow" />
   </view>
 </template>