Merge branch 'master' into crm_16.2

src/views/rai_manage/cygxManage/applyUserList.vue

@@ -65,7 +65,8 @@
         </el-table-column>
         <el-table-column prop="Title" label="申请内容" min-width="130" align="center">
           <template slot-scope="scope">
-            <span class="editsty" @click="applicationContent(scope.row)">{{ scope.row.Title }}</span>
+            <span v-if="scope.row.IsGray">{{ scope.row.Title }}</span>
+            <span v-else class="editsty" @click="applicationContent(scope.row)">{{ scope.row.Title }}</span>
           </template>
         </el-table-column>
         <el-table-column label="操作" align="center" min-width="110">
@@ -196,7 +197,6 @@ export default {
     // 申请内容
     applicationContent(item) {
       window.open(item.HttpUrl, "_blank");
-      console.log(item);
     },
   },
   created() {},

src/views/rai_manage/reportManage/appletsReport.vue

@@ -549,8 +549,7 @@ export default {
     //文章详情
     async lookDetail(item) {
       if (item.PublishStatus === 1) {
-        let href = `${process.env.CYGX_WEB}/material/info/${item.ArticleId}`;
-        window.open(href, "_blank");
+        window.open(item.HttpUrl, "_blank");
       } else {
         const res = await raiInterface.reportArticleDetail({ ArticleId: item.ArticleId });
         if (res.Ret === 200) {