anyv / xkeasy · 提交

转到一个项目

作者 王晓刚
提交 1f7a207f8f16ccd0db8416f035c3da6acb6dcdcf 2 个父辈 9f4e48c8 62a1ae75
1 个管道 的构建 通过 耗费 0 秒

合并分支 'wangxiaogang' 到 'master' 

补全信息页面



查看合并请求 !85
内嵌 并排对比
正在显示 4 个修改的文件 包含 63 行增加 和 9 行删除
@@ -9,6 +9,7 @@ @@ -9,6 +9,7 @@
9 namespace app\portal\controller; 9 namespace app\portal\controller;
10 10
11 11
  12 +use app\portal\model\AddressModel;
12 use app\portal\model\IndentGoodsModel; 13 use app\portal\model\IndentGoodsModel;
13 use app\portal\model\IndentModel; 14 use app\portal\model\IndentModel;
14 use cmf\controller\WeChatBaseController; 15 use cmf\controller\WeChatBaseController;
@@ -171,6 +172,11 @@ class OrderSalesmanController extends WeChatBaseController @@ -171,6 +172,11 @@ class OrderSalesmanController extends WeChatBaseController
171 } 172 }
172 $indentGoodsModel = new IndentGoodsModel(); 173 $indentGoodsModel = new IndentGoodsModel();
173 $indent_goods = $indentGoodsModel->selectData(['indent_id'=>$indent['id']]); 174 $indent_goods = $indentGoodsModel->selectData(['indent_id'=>$indent['id']]);
  175 + if(!empty($indent['indent_address'])){
  176 + $addressModel = new AddressModel();
  177 + $indent_address = $addressModel->findData(['id'=>$indent['indent_address']]);
  178 + $indent['indent_address'] = $indent_address;
  179 + }
174 $indent['indent_goods'] = $indent_goods; 180 $indent['indent_goods'] = $indent_goods;
175 $this->assign('data',$indent); 181 $this->assign('data',$indent);
176 return $this->fetch(); 182 return $this->fetch();
@@ -238,7 +238,7 @@ @@ -238,7 +238,7 @@
238 <a href="{:url('get_one',array('id'=>$vo['id']))}"> 238 <a href="{:url('get_one',array('id'=>$vo['id']))}">
239 <foreach name="$vo.indent_goods" item="i_g"> 239 <foreach name="$vo.indent_goods" item="i_g">
240 <div class="log_three_list_center" style="display: flex;justify-content: flex-start;"> 240 <div class="log_three_list_center" style="display: flex;justify-content: flex-start;">
241 - <div class="log_three_list_center_left" style="width: 1.44rem;hieght:1.44rem"> 241 + <div class="log_three_list_center_left" style="width: 1.44rem;height:1.44rem">
242 <img src="{:cmf_get_image_url($i_g.thumbnail)}" alt="" style="width: 100%;height: 100%;"/> 242 <img src="{:cmf_get_image_url($i_g.thumbnail)}" alt="" style="width: 100%;height: 100%;"/>
243 </div> 243 </div>
244 <div class="log_three_list_center_right" style="margin-left: 0.16rem;"> 244 <div class="log_three_list_center_right" style="margin-left: 0.16rem;">
@@ -311,7 +311,7 @@ @@ -311,7 +311,7 @@
311 <a href="{:url('get_one',array('id'=>$vo['id']))}"> 311 <a href="{:url('get_one',array('id'=>$vo['id']))}">
312 <foreach name="$vo.indent_goods" item="i_g"> 312 <foreach name="$vo.indent_goods" item="i_g">
313 <div class="log_three_list_center" style="display: flex;justify-content: flex-start;"> 313 <div class="log_three_list_center" style="display: flex;justify-content: flex-start;">
314 - <div class="log_three_list_center_left" style="width: 1.44rem;hieght:1.44rem"> 314 + <div class="log_three_list_center_left" style="width: 1.44rem;height:1.44rem">
315 <img src="{:cmf_get_image_url($i_g.thumbnail)}" alt="" style="width: 100%;height: 100%;"/> 315 <img src="{:cmf_get_image_url($i_g.thumbnail)}" alt="" style="width: 100%;height: 100%;"/>
316 </div> 316 </div>
317 <div class="log_three_list_center_right" style="margin-left: 0.16rem;"> 317 <div class="log_three_list_center_right" style="margin-left: 0.16rem;">
@@ -384,7 +384,7 @@ @@ -384,7 +384,7 @@
384 <a href="{:url('get_one',array('id'=>$vo['id']))}"> 384 <a href="{:url('get_one',array('id'=>$vo['id']))}">
385 <foreach name="$vo.indent_goods" item="i_g"> 385 <foreach name="$vo.indent_goods" item="i_g">
386 <div class="log_three_list_center" style="display: flex;justify-content: flex-start;"> 386 <div class="log_three_list_center" style="display: flex;justify-content: flex-start;">
387 - <div class="log_three_list_center_left" style="width: 1.44rem;hieght:1.44rem"> 387 + <div class="log_three_list_center_left" style="width: 1.44rem;height:1.44rem">
388 <img src="{:cmf_get_image_url($i_g.thumbnail)}" alt="" style="width: 100%;height: 100%;"/> 388 <img src="{:cmf_get_image_url($i_g.thumbnail)}" alt="" style="width: 100%;height: 100%;"/>
389 </div> 389 </div>
390 <div class="log_three_list_center_right" style="margin-left: 0.16rem;"> 390 <div class="log_three_list_center_right" style="margin-left: 0.16rem;">
@@ -629,11 +629,11 @@ @@ -629,11 +629,11 @@
629 var indent_goods_data = result[i].indent_goods; 629 var indent_goods_data = result[i].indent_goods;
630 var indent_goods_html = ''; 630 var indent_goods_html = '';
631 for (var i3 = 0; i3 < indent_goods_data.length; i3++) { 631 for (var i3 = 0; i3 < indent_goods_data.length; i3++) {
632 - indent_goods_html += "<div class=\"log_three_list_center\">\n" +  
633 - " <div class=\"log_three_list_center_left\">\n" +  
634 - " <img src=\"{:cmf_get_image_url('')}" + indent_goods_data[i3].thumbnail + "\" alt=\"\"/>\n" + 632 + indent_goods_html += "<div class=\"log_three_list_center\" style=\"display: flex;justify-content: flex-start;\">\n" +
  633 + " <div class=\"log_three_list_center_left\" style=\"width: 1.44rem;height:1.44rem\">\n" +
  634 + " <img src=\"" + indent_goods_data[i3].thumbnail + "\" alt=\"\" style=\"width: 100%;height: 100%;\"/>\n" +
635 " </div>\n" + 635 " </div>\n" +
636 - " <div class=\"log_three_list_center_right\">\n" + 636 + " <div class=\"log_three_list_center_right\" style=\"margin-left: 0.16rem;\">\n" +
637 " <div class=\"log_three_center_one\">\n" + 637 " <div class=\"log_three_center_one\">\n" +
638 " " + indent_goods_data[i3].book_name + "\n" + 638 " " + indent_goods_data[i3].book_name + "\n" +
639 " </div>\n" + 639 " </div>\n" +
@@ -123,6 +123,52 @@ @@ -123,6 +123,52 @@
123 <div class="log_four_input_title" style="margin-bottom: 0.2rem;"> 123 <div class="log_four_input_title" style="margin-bottom: 0.2rem;">
124 地址信息 124 地址信息
125 </div> 125 </div>
  126 + <if condition="$data.is_courier eq 2">
  127 + <div class="log_four_input_one">
  128 + <div class="log_four_input_one_left">
  129 + 姓名
  130 + </div>
  131 + <div class="log_four_input_one_center">
  132 + <div id="city_text">{$data.indent_address.name}</div>
  133 + </div>
  134 + <div class="log_four_input_one_right">
  135 + <img src="__TMPL__/public/assets/images/29.png" alt=""/>
  136 + </div>
  137 + </div>
  138 + <div class="log_four_input_one">
  139 + <div class="log_four_input_one_left">
  140 + 电话
  141 + </div>
  142 + <div class="log_four_input_one_center">
  143 + <div id="city_text">{$data.indent_address.phone}</div>
  144 + </div>
  145 + <div class="log_four_input_one_right">
  146 + <img src="__TMPL__/public/assets/images/29.png" alt=""/>
  147 + </div>
  148 + </div>
  149 + <div class="log_four_input_one">
  150 + <div class="log_four_input_one_left">
  151 + 地址
  152 + </div>
  153 + <div class="log_four_input_one_center">
  154 + <div id="city_text">{$data.indent_address.region}</div>
  155 + </div>
  156 + <div class="log_four_input_one_right">
  157 + <img src="__TMPL__/public/assets/images/29.png" alt=""/>
  158 + </div>
  159 + </div>
  160 + <div class="log_four_input_one">
  161 + <div class="log_four_input_one_left">
  162 + 详细地址
  163 + </div>
  164 + <div class="log_four_input_one_center">
  165 + <div id="city_text">{$data.indent_address.detailed}</div>
  166 + </div>
  167 + <div class="log_four_input_one_right">
  168 + <img src="__TMPL__/public/assets/images/29.png" alt=""/>
  169 + </div>
  170 + </div>
  171 + <else />
126 <div class="log_four_input_one"> 172 <div class="log_four_input_one">
127 <div class="log_four_input_one_left"> 173 <div class="log_four_input_one_left">
128 地区 174 地区
@@ -175,6 +221,8 @@ @@ -175,6 +221,8 @@
175 <div id="city_text">{$data.phone}</div> 221 <div id="city_text">{$data.phone}</div>
176 </div> 222 </div>
177 </div> 223 </div>
  224 + </if>
  225 +
178 226
179 </div> 227 </div>
180 <!-- 订单信息 --> 228 <!-- 订单信息 -->
@@ -204,8 +204,8 @@ class WeChatBaseController extends BaseController @@ -204,8 +204,8 @@ class WeChatBaseController extends BaseController
204 */ 204 */
205 public function checkWeChatUserLogin() 205 public function checkWeChatUserLogin()
206 { 206 {
207 - /*$user = Db::name('user')->where('id',2)->find();  
208 - cmf_update_current_user($user);*/ 207 + $user = Db::name('user')->where('id',5)->find();
  208 + cmf_update_current_user($user);
209 $userId = cmf_get_current_user_id(); 209 $userId = cmf_get_current_user_id();
210 if (empty($userId)) { 210 if (empty($userId)) {
211 $config = [ 211 $config = [