edit

app/mshop/lib/Buy.php

@@ -1443,9 +1443,17 @@ class Buy
 
             if ($info['ps_info']) {
 
-                $pdf->br()->left('发货时间：' . $info['ps_info']['cdate'], 80)->left('配货员：：' . $info['ps_info']['phy'], 70)->left('打包员：' . $info['ps_info']['dby'], 40);
-
-                $pdf->br()->left('包裹重量：' . $info['ps_info']['zl'] . '克', 80)->left('包裹体积：' . $info['ps_info']['tj'] . '立方厘米', 70)->left('包裹数量：' . $info['ps_info']['num'], 40);
+                $pdf->br()->left('发货时间：' . $info['ps_info']['cdate'], 80)->left('配货员：' . $info['ps_info']['phy'], 70)->left('打包员：' . $info['ps_info']['dby'], 40);
+
+                if ($info['ps_info']['zl'] && $info['ps_info']['tj']) {
+                    $pdf->br()->left('包裹重量：' . $info['ps_info']['zl'] . '克', 80)->left('包裹体积：' . $info['ps_info']['tj'] . '立方厘米', 70)->left('包裹数量：' . $info['ps_info']['num'], 40);
+                } elseif (!$info['ps_info']['zl'] && $info['ps_info']['tj']) {
+                    $pdf->br()->left('包裹体积：' . $info['ps_info']['tj'] . '立方厘米', 150)->left('包裹数量：' . $info['ps_info']['num'], 40);
+                } elseif ($info['ps_info']['zl'] && !$info['ps_info']['tj']) {
+                    $pdf->br()->left('包裹重量：' . $info['ps_info']['zl'] . '克', 150)->left('包裹数量：' . $info['ps_info']['num'], 40);
+                } else {
+                    $pdf->left('包裹数量：' . $info['ps_info']['num']);
+                }
 
                 $pdf->br()->left('物流信息：' . $info['ps_info']['service_name'], 40);
 
@@ -1453,7 +1461,9 @@ class Buy
                     $pdf->left('物流单号：' . $info['ps_info']['order_num'], 70);
                 }
 
-                $pdf->left('到货确认时间：' . $info['ps_info']['ydate']);
+                if ($info['ps_info']['ydate']) {
+                    $pdf->left('到货确认时间：' . $info['ps_info']['ydate']);
+                }
 
                 $pdf->hr();
             }

app/store/assets/pc/html/user_edit.html

@@ -24,7 +24,7 @@
 
         <img src="" style="display:none;" class="update_value" id="show_update_avatar_avatar" width="150" />
     	</div>
-        <input type="text" class="update_value form-control layui-input " name="update_avatar" id="update_avatar_avatar" value=""></div></div></div></div>
+        <input type="text" class="update_value form-control layui-input " name="update_avatar" id="update_avatar_avatar" value="" style="display: none;"></div></div></div></div>
           <div class="layui-card-body">
             <div class="layui-form-item">
                 <div id="update_button" submit=""><button type="button" class="btn btn-primary save-data layui-btn layuiadmin-btn-list"><i class="fa fa-save"></i> 提交保存</button>