Merge branch 'master' of http://git.huoxingkandiqiu.com:3000/scms/wonderful

h5/assets/mobile/article.html

@@ -32,7 +32,7 @@
         <{loop($content):}>
         <{if($v['type'] == 1):}>
         <{if(isset($v['content'])):}>
-        <{$v['content']}>
+        <{str_replace(array('width', 'height'), array('widths', 'heights'), $v['content'])}>
         <{endif}>
 
         <{elseif($v['type'] == 2):}>

h5/assets/mobile/feature.html

@@ -17,7 +17,7 @@
       <div class="rich-wrapper">
         <{loop($content):}>
         <{if($v['type'] == 1):}>
-        <{$v['content']}>
+        <{str_replace(array('width', 'height'), array('widths', 'heights'), $v['content'])}>
 
         <{elseif($v['type'] == 2):}>
           <!--视频-->

main/assets/mobile/content.html

@@ -12,7 +12,7 @@
         <{loop($content):}>  
 
         <{if($v['type'] == 1):}>
-        <{$v['content']}>
+        <{str_replace(array('width', 'height'), array('widths', 'heights'), $v['content'])}>
 
         <{elseif($v['type'] == 2):}>
 

main/src/View.php

@@ -76,7 +76,7 @@ class View extends Core
         }
         */
 
-        if ($this->source_type == 'ios') {
+        if ($this->source_type == 'ioss') {
             $source = Dever::db('source/info')->one(1);
             $this->data['info']['share_link'] = $source['code'];
         } else {