wupengfei 1 yıl önce
ebeveyn
işleme
a8a76a6964

+ 2 - 3
.idea/workspace.xml

@@ -2,10 +2,9 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/application/synth/view/bill_apply/express.html" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/application/synth/controller/BillApply.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/synth/controller/BillApply.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/synth/view/bill_apply/form.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/synth/view/bill_apply/form.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/synth/view/bill_apply/express.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/synth/view/bill_apply/express.html" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -329,7 +328,7 @@
       <workItem from="1684543423796" duration="10653000" />
       <workItem from="1684716593546" duration="15730000" />
       <workItem from="1684743465298" duration="6526000" />
-      <workItem from="1684802887863" duration="8725000" />
+      <workItem from="1684802887863" duration="8801000" />
     </task>
     <servers />
   </component>

+ 1 - 1
application/synth/controller/BillApply.php

@@ -116,7 +116,7 @@ class BillApply extends Controller
             $this->expressList = Db::name('express_company')->where($where)->order('sort desc,id desc')->select();
             $info = \app\common\model\BillApply::where('id',input('id'))->find();
             if($info['address_info']) $info['address_info'] = json_decode($info['address_info'],true);
-            $this->vo = $info['address_info'];
+            $this->vo = $info;
         }
         $this->_form($this->table);
     }

+ 3 - 3
application/synth/view/bill_apply/express.html

@@ -6,21 +6,21 @@
             <div class="layui-form-item">
                 <label style='width:50px' class="layui-form-label">收货姓名</label>
                 <div class="layui-input-block" style="margin-left:80px">
-                    <input name="name" required value='{$vo.name|default=""}' placeholder="请输入收货姓名" class="layui-input">
+                    <input name="name" required value='{$vo.address_info.name|default=""}' placeholder="请输入收货姓名" class="layui-input">
                 </div>
             </div>
 
             <div class="layui-form-item">
                 <label style='width:50px' class="layui-form-label">收货手机</label>
                 <div class="layui-input-block" style="margin-left:80px">
-                    <input name="phone" required value='{$vo.phone|default=""}' placeholder="请输入收货手机" class="layui-input">
+                    <input name="phone" required value='{$vo.address_info.phone|default=""}' placeholder="请输入收货手机" class="layui-input">
                 </div>
             </div>
 
             <div class="layui-form-item">
                 <label style='width:50px' class="layui-form-label label-required">收货地址</label>
                 <div class="layui-input-block" style="margin-left:80px">
-                    <div class="color-blue" style="line-height:38px;">{$vo.pro_name|default='--'} {$vo.city_name} {$vo.county_name}{$vo.detail}</div>
+                    <div class="color-blue" style="line-height:38px;">{$vo.address_info.pro_name|default='--'} {$vo.address_info.city_name} {$vo.address_info.county_name}{$vo.address_info.detail}</div>
                 </div>
             </div>
         </fieldset>