合并分支 'wangxiaogang' 到 'master'

补全信息页面



查看合并请求 !84

@@ -89,44 +89,6 @@
         </div>
     </div>
 </div>
-<!-- 弹窗 -->
-<!--<div class="tx_mask">-->
-<!--<div class="tx_maskCon">-->
-<!--<div class="tx_maskConImg">-->
-<!--<img src="__TMPL__/public/assets/images/90.png" alt=""/>-->
-<!--</div>-->
-<!--<div class="tx_maskCon2">-->
-<!--<div class="log_three_model">-->
-<!--<div class="log_three_model_one time">-->
-<!--<div class="log_three_model_left">配送时间</div>-->
-<!--<div class="log_psong">-->
-<!--<input type="text" value="" placeholder="请输入开始配送时间"/>-->
-<!--</div>-->
-<!--</div>-->
-<!--<div class="log_three_model_one time">-->
-<!--<div class="log_three_model_left">配送时间</div>-->
-<!--<div class="log_psong">-->
-<!--<input type="text" value="" placeholder="请输入结束配送时间"/>-->
-<!--</div>-->
-<!--</div>-->
-<!--<div class="log_three_model_one time">-->
-<!--<div class="log_three_model_left">快递公司</div>-->
-<!--<div class="log_psong">-->
-<!--<input type="text" value="" placeholder="请输入快递公司"/>-->
-<!--</div>-->
-<!--</div>-->
-<!--<div class="log_three_model_one time">-->
-<!--<div class="log_three_model_left">快递单号</div>-->
-<!--<div class="log_psong">-->
-<!--<input type="text" value="" placeholder="请输入快递单号"/>-->
-<!--</div>-->
-<!--</div>-->
-<!--</div>-->
-<!--&lt;!&ndash; 确定 &ndash;&gt;-->
-<!--<div class="tx_maskOk confirm" data-id="">确定</div>-->
-<!--</div>-->
-<!--</div>-->
-<!--</div>-->
 <div class="tx_masktwo" style="display: none;">
     <div class="tx_maskCon">
         <div class="tx_maskConImg">
@@ -275,11 +237,11 @@
                     </div>
                     <a href="{:url('get_one',array('id'=>$vo['id']))}">
                         <foreach name="$vo.indent_goods" item="i_g">
-                            <div class="log_three_list_center">
-                                <div class="log_three_list_center_left">
-                                    <img src="{:cmf_get_image_url($i_g.thumbnail)}" alt=""/>
+                            <div class="log_three_list_center" style="display: flex;justify-content: flex-start;">
+                                <div class="log_three_list_center_left" style="width: 1.44rem;hieght:1.44rem">
+                                    <img src="{:cmf_get_image_url($i_g.thumbnail)}" alt="" style="width: 100%;height: 100%;"/>
                                 </div>
-                                <div class="log_three_list_center_right">
+                                <div class="log_three_list_center_right" style="margin-left: 0.16rem;">
                                     <div class="log_three_center_one">
                                         {$i_g.book_name}
                                     </div>
@@ -348,11 +310,11 @@
                     </div>
                     <a href="{:url('get_one',array('id'=>$vo['id']))}">
                         <foreach name="$vo.indent_goods" item="i_g">
-                            <div class="log_three_list_center">
-                                <div class="log_three_list_center_left">
-                                    <img src="{:cmf_get_image_url($i_g.thumbnail)}" alt=""/>
+                            <div class="log_three_list_center" style="display: flex;justify-content: flex-start;">
+                                <div class="log_three_list_center_left"  style="width: 1.44rem;hieght:1.44rem">
+                                    <img src="{:cmf_get_image_url($i_g.thumbnail)}" alt="" style="width: 100%;height: 100%;"/>
                                 </div>
-                                <div class="log_three_list_center_right">
+                                <div class="log_three_list_center_right" style="margin-left: 0.16rem;">
                                     <div class="log_three_center_one">
                                         {$i_g.book_name}
                                     </div>
@@ -421,11 +383,11 @@
                     </div>
                     <a href="{:url('get_one',array('id'=>$vo['id']))}">
                         <foreach name="$vo.indent_goods" item="i_g">
-                            <div class="log_three_list_center">
-                                <div class="log_three_list_center_left">
-                                    <img src="{:cmf_get_image_url($i_g.thumbnail)}" alt=""/>
+                            <div class="log_three_list_center" style="display: flex;justify-content: flex-start;">
+                                <div class="log_three_list_center_left" style="width: 1.44rem;hieght:1.44rem">
+                                    <img src="{:cmf_get_image_url($i_g.thumbnail)}" alt="" style="width: 100%;height: 100%;"/>
                                 </div>
-                                <div class="log_three_list_center_right">
+                                <div class="log_three_list_center_right" style="margin-left: 0.16rem;">
                                     <div class="log_three_center_one">
                                         {$i_g.book_name}
                                     </div>
@@ -669,7 +631,7 @@
                         for (var i3 = 0; i3 < indent_goods_data.length; i3++) {
                             indent_goods_html += "<div class=\"log_three_list_center\">\n" +
                                 "                            <div class=\"log_three_list_center_left\">\n" +
-                                "                                <img src=\"" + indent_goods_data[i3].thumbnail + "\" alt=\"\"/>\n" +
+                                "                                <img src=\"{:cmf_get_image_url('')}" + indent_goods_data[i3].thumbnail + "\" alt=\"\"/>\n" +
                                 "                            </div>\n" +
                                 "                            <div class=\"log_three_list_center_right\">\n" +
                                 "                                <div class=\"log_three_center_one\">\n" +
@@ -724,6 +686,7 @@
                                 "\t\t\t\t\t\t" + html_bottom + "</div>";
                         }
                     }
+
                     $('.log_three_list_contant').eq(index).html(html);
                     update();
                 } else {