Merge remote-tracking branch 'origin/master'

application/common/LatexContent.php

@@ -202,6 +202,7 @@ page={{stage_page}},%号
             $sImagePath = trim($this->sSubmissionUrl,'/').$this->sArticleIcon.'/'.$sIcon;
             $aImageInfo = $this->getImage($sImagePath,$aProductionArticle['p_article_id']);
             if(!empty($aImageInfo['data'])){
+                $aImageInfo['data'] = './image/'.basename($aImageInfo['data']);
                 $sIcon = '\KeywordImage{'.$aImageInfo['data'].'}'; 
             }else{
                 $sIcon = '';
@@ -269,7 +270,6 @@ page={{stage_page}},%号
             //数据处理
             $iStart = 0;
             $sMain = '';
-            $oLatexTable = new LaTeXTable;
             //字符串处理
             $oProduction = new \app\api\controller\Production;
             foreach ($aArticleMain as $key => $value) {
@@ -605,6 +605,9 @@ page={{stage_page}},%号
         return ['status' => 1,'msg' => 'success','data' => $sImagePath];
 
     }
+    /**
+     * @title curl 图片Latex代码封装
+     */
     /**
      * @title curl 图片Latex代码封装
      */
@@ -630,6 +633,7 @@ page={{stage_page}},%号
         $isWideImage = $imageWidth > $wideImageThreshold;
 
         // 生成LaTeX图片代码
+        $sImageUrl = './image/'.basename($sImageUrl);
         if ($isWideImage) {
             $latexLines[] = "\\begin{figure*}[htbp]";  // 使用figure*环境实现两栏
             $latexLines[] = "    \\centering";