合并分支 'wangxiaogang' 到 'master'

补全信息页面



查看合并请求 !85

@@ -9,6 +9,7 @@
 namespace app\portal\controller;
 namespace app\portal\controller;
 
 
 
 
+use app\portal\model\AddressModel;
 use app\portal\model\IndentGoodsModel;
 use app\portal\model\IndentGoodsModel;
 use app\portal\model\IndentModel;
 use app\portal\model\IndentModel;
 use cmf\controller\WeChatBaseController;
 use cmf\controller\WeChatBaseController;
@@ -171,6 +172,11 @@ class OrderSalesmanController extends WeChatBaseController
         }
         }
         $indentGoodsModel = new IndentGoodsModel();
         $indentGoodsModel = new IndentGoodsModel();
         $indent_goods = $indentGoodsModel->selectData(['indent_id'=>$indent['id']]);
         $indent_goods = $indentGoodsModel->selectData(['indent_id'=>$indent['id']]);
+        if(!empty($indent['indent_address'])){
+            $addressModel = new AddressModel();
+            $indent_address = $addressModel->findData(['id'=>$indent['indent_address']]);
+            $indent['indent_address'] = $indent_address;
+        }
         $indent['indent_goods'] = $indent_goods;
         $indent['indent_goods'] = $indent_goods;
         $this->assign('data',$indent);
         $this->assign('data',$indent);
         return $this->fetch();
         return $this->fetch();

@@ -238,7 +238,7 @@
                     <a href="{:url('get_one',array('id'=>$vo['id']))}">
                     <a href="{:url('get_one',array('id'=>$vo['id']))}">
                         <foreach name="$vo.indent_goods" item="i_g">
                         <foreach name="$vo.indent_goods" item="i_g">
                             <div class="log_three_list_center" style="display: flex;justify-content: flex-start;">
                             <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">
+                                <div class="log_three_list_center_left" style="width: 1.44rem;height:1.44rem">
                                     <img src="{:cmf_get_image_url($i_g.thumbnail)}" alt="" style="width: 100%;height: 100%;"/>
                                     <img src="{:cmf_get_image_url($i_g.thumbnail)}" alt="" style="width: 100%;height: 100%;"/>
                                 </div>
                                 </div>
                                 <div class="log_three_list_center_right" style="margin-left: 0.16rem;">
                                 <div class="log_three_list_center_right" style="margin-left: 0.16rem;">
@@ -311,7 +311,7 @@
                     <a href="{:url('get_one',array('id'=>$vo['id']))}">
                     <a href="{:url('get_one',array('id'=>$vo['id']))}">
                         <foreach name="$vo.indent_goods" item="i_g">
                         <foreach name="$vo.indent_goods" item="i_g">
                             <div class="log_three_list_center" style="display: flex;justify-content: flex-start;">
                             <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">
+                                <div class="log_three_list_center_left"  style="width: 1.44rem;height:1.44rem">
                                     <img src="{:cmf_get_image_url($i_g.thumbnail)}" alt="" style="width: 100%;height: 100%;"/>
                                     <img src="{:cmf_get_image_url($i_g.thumbnail)}" alt="" style="width: 100%;height: 100%;"/>
                                 </div>
                                 </div>
                                 <div class="log_three_list_center_right" style="margin-left: 0.16rem;">
                                 <div class="log_three_list_center_right" style="margin-left: 0.16rem;">
@@ -384,7 +384,7 @@
                     <a href="{:url('get_one',array('id'=>$vo['id']))}">
                     <a href="{:url('get_one',array('id'=>$vo['id']))}">
                         <foreach name="$vo.indent_goods" item="i_g">
                         <foreach name="$vo.indent_goods" item="i_g">
                             <div class="log_three_list_center" style="display: flex;justify-content: flex-start;">
                             <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">
+                                <div class="log_three_list_center_left" style="width: 1.44rem;height:1.44rem">
                                     <img src="{:cmf_get_image_url($i_g.thumbnail)}" alt="" style="width: 100%;height: 100%;"/>
                                     <img src="{:cmf_get_image_url($i_g.thumbnail)}" alt="" style="width: 100%;height: 100%;"/>
                                 </div>
                                 </div>
                                 <div class="log_three_list_center_right" style="margin-left: 0.16rem;">
                                 <div class="log_three_list_center_right" style="margin-left: 0.16rem;">
@@ -629,11 +629,11 @@
                         var indent_goods_data = result[i].indent_goods;
                         var indent_goods_data = result[i].indent_goods;
                         var indent_goods_html = '';
                         var indent_goods_html = '';
                         for (var i3 = 0; i3 < indent_goods_data.length; i3++) {
                         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=\"{:cmf_get_image_url('')}" + indent_goods_data[i3].thumbnail + "\" alt=\"\"/>\n" +
+                            indent_goods_html += "<div class=\"log_three_list_center\" style=\"display: flex;justify-content: flex-start;\">\n" +
+                                "                            <div class=\"log_three_list_center_left\" style=\"width: 1.44rem;height:1.44rem\">\n" +
+                                "                                <img src=\"" + indent_goods_data[i3].thumbnail + "\" alt=\"\" style=\"width: 100%;height: 100%;\"/>\n" +
                                 "                            </div>\n" +
                                 "                            </div>\n" +
-                                "                            <div class=\"log_three_list_center_right\">\n" +
+                                "                            <div class=\"log_three_list_center_right\" style=\"margin-left: 0.16rem;\">\n" +
                                 "                                <div class=\"log_three_center_one\">\n" +
                                 "                                <div class=\"log_three_center_one\">\n" +
                                 "                                    " + indent_goods_data[i3].book_name + "\n" +
                                 "                                    " + indent_goods_data[i3].book_name + "\n" +
                                 "                                </div>\n" +
                                 "                                </div>\n" +

@@ -123,58 +123,106 @@
     <div class="log_four_input_title" style="margin-bottom: 0.2rem;">
     <div class="log_four_input_title" style="margin-bottom: 0.2rem;">
         地址信息
         地址信息
     </div>
     </div>
-    <div class="log_four_input_one">
-        <div class="log_four_input_one_left">
-            地区
-        </div>
-        <div class="log_four_input_one_center">
-            <div id="city_text">{$data.region}</div>
-        </div>
-        <div class="log_four_input_one_right">
-            <img src="__TMPL__/public/assets/images/29.png" alt=""/>
-        </div>
-    </div>
-    <div class="log_four_input_one">
-        <div class="log_four_input_one_left">
-            学校
-        </div>
-        <div class="log_four_input_one_center">
-            <div id="city_text">{$data.school}</div>
-        </div>
-        <div class="log_four_input_one_right">
-            <img src="__TMPL__/public/assets/images/29.png" alt=""/>
+    <if condition="$data.is_courier eq 2">
+        <div class="log_four_input_one">
+            <div class="log_four_input_one_left">
+                姓名
+            </div>
+            <div class="log_four_input_one_center">
+                <div id="city_text">{$data.indent_address.name}</div>
+            </div>
+            <div class="log_four_input_one_right">
+                <img src="__TMPL__/public/assets/images/29.png" alt=""/>
+            </div>
         </div>
         </div>
-    </div>
-    <div class="log_four_input_one">
-        <div class="log_four_input_one_left">
-            班级
+        <div class="log_four_input_one">
+            <div class="log_four_input_one_left">
+                电话
+            </div>
+            <div class="log_four_input_one_center">
+                <div id="city_text">{$data.indent_address.phone}</div>
+            </div>
+            <div class="log_four_input_one_right">
+                <img src="__TMPL__/public/assets/images/29.png" alt=""/>
+            </div>
         </div>
         </div>
-        <div class="log_four_input_one_center">
-            <div id="city_text">{$data.grade}-{$data.class}</div>
+        <div class="log_four_input_one">
+            <div class="log_four_input_one_left">
+                地址
+            </div>
+            <div class="log_four_input_one_center">
+                <div id="city_text">{$data.indent_address.region}</div>
+            </div>
+            <div class="log_four_input_one_right">
+                <img src="__TMPL__/public/assets/images/29.png" alt=""/>
+            </div>
         </div>
         </div>
-        <div class="log_four_input_one_right">
-            <img src="__TMPL__/public/assets/images/29.png" alt=""/>
+        <div class="log_four_input_one">
+            <div class="log_four_input_one_left">
+                详细地址
+            </div>
+            <div class="log_four_input_one_center">
+                <div id="city_text">{$data.indent_address.detailed}</div>
+            </div>
+            <div class="log_four_input_one_right">
+                <img src="__TMPL__/public/assets/images/29.png" alt=""/>
+            </div>
         </div>
         </div>
-    </div>
-    <div class="log_four_input_one">
-        <div class="log_four_input_one_left">
-            姓名
+        <else />
+        <div class="log_four_input_one">
+            <div class="log_four_input_one_left">
+                地区
+            </div>
+            <div class="log_four_input_one_center">
+                <div id="city_text">{$data.region}</div>
+            </div>
+            <div class="log_four_input_one_right">
+                <img src="__TMPL__/public/assets/images/29.png" alt=""/>
+            </div>
         </div>
         </div>
-        <div class="log_four_input_one_center">
-            <div id="city_text">{$data.name}</div>
+        <div class="log_four_input_one">
+            <div class="log_four_input_one_left">
+                学校
+            </div>
+            <div class="log_four_input_one_center">
+                <div id="city_text">{$data.school}</div>
+            </div>
+            <div class="log_four_input_one_right">
+                <img src="__TMPL__/public/assets/images/29.png" alt=""/>
+            </div>
         </div>
         </div>
-        <div class="log_four_input_one_right">
-            <img src="__TMPL__/public/assets/images/29.png" alt=""/>
+        <div class="log_four_input_one">
+            <div class="log_four_input_one_left">
+                班级
+            </div>
+            <div class="log_four_input_one_center">
+                <div id="city_text">{$data.grade}-{$data.class}</div>
+            </div>
+            <div class="log_four_input_one_right">
+                <img src="__TMPL__/public/assets/images/29.png" alt=""/>
+            </div>
         </div>
         </div>
-    </div>
-    <div class="log_four_input_one">
-        <div class="log_four_input_one_left">
-            手机号
+        <div class="log_four_input_one">
+            <div class="log_four_input_one_left">
+                姓名
+            </div>
+            <div class="log_four_input_one_center">
+                <div id="city_text">{$data.name}</div>
+            </div>
+            <div class="log_four_input_one_right">
+                <img src="__TMPL__/public/assets/images/29.png" alt=""/>
+            </div>
         </div>
         </div>
-        <div class="log_four_input_one_center">
-            <div id="city_text">{$data.phone}</div>
+        <div class="log_four_input_one">
+            <div class="log_four_input_one_left">
+                手机号
+            </div>
+            <div class="log_four_input_one_center">
+                <div id="city_text">{$data.phone}</div>
+            </div>
         </div>
         </div>
-    </div>
+    </if>
+
 
 
 </div>
 </div>
 <!-- 订单信息 -->
 <!-- 订单信息 -->

@@ -204,8 +204,8 @@ class WeChatBaseController extends BaseController
      */
      */
     public function checkWeChatUserLogin()
     public function checkWeChatUserLogin()
     {
     {
-        /*$user = Db::name('user')->where('id',2)->find();
-        cmf_update_current_user($user);*/
+        $user = Db::name('user')->where('id',5)->find();
+        cmf_update_current_user($user);
         $userId = cmf_get_current_user_id();
         $userId = cmf_get_current_user_id();
         if (empty($userId)) {
         if (empty($userId)) {
             $config = [
             $config = [