正在显示
11 个修改的文件
包含
9 行增加
和
63 行删除
| @@ -50,7 +50,6 @@ class PlatformordersController extends AdminBaseController{ | @@ -50,7 +50,6 @@ class PlatformordersController extends AdminBaseController{ | ||
| 50 | //地址查询 | 50 | //地址查询 |
| 51 | $address = Db::name('address') -> where("id",$data_in['indent_address']) -> find(); | 51 | $address = Db::name('address') -> where("id",$data_in['indent_address']) -> find(); |
| 52 | if(!empty($address)){ | 52 | if(!empty($address)){ |
| 53 | - $address['detailed'] = explode(',',$address['detailed']); | ||
| 54 | $this -> assign('address',$address); | 53 | $this -> assign('address',$address); |
| 55 | }else{ | 54 | }else{ |
| 56 | $this -> assign('address',null); | 55 | $this -> assign('address',null); |
| @@ -79,8 +79,7 @@ class SalesmanorderController extends AdminBaseController{ | @@ -79,8 +79,7 @@ class SalesmanorderController extends AdminBaseController{ | ||
| 79 | $data = Db::name('indent') -> where('id',$id['id']) -> find(); | 79 | $data = Db::name('indent') -> where('id',$id['id']) -> find(); |
| 80 | if(!empty($data['indent_address'])){ | 80 | if(!empty($data['indent_address'])){ |
| 81 | $address = Db::name('address') -> where("id",$data['indent_address']) -> find(); | 81 | $address = Db::name('address') -> where("id",$data['indent_address']) -> find(); |
| 82 | - $address_detailed = explode(',',$address['detailed']); | ||
| 83 | - $address_region = $address['region'].$address_detailed[0].$address_detailed[1]; | 82 | + $address_region = $address['region'].$address['detailed']; |
| 84 | }else{ | 83 | }else{ |
| 85 | $address_region = ''; | 84 | $address_region = ''; |
| 86 | } | 85 | } |
| @@ -270,12 +270,6 @@ class OrderpageController extends WeChatBaseController{ | @@ -270,12 +270,6 @@ class OrderpageController extends WeChatBaseController{ | ||
| 270 | $indent_id = $this -> request -> param(); | 270 | $indent_id = $this -> request -> param(); |
| 271 | $uid = cmf_get_current_user_id(); | 271 | $uid = cmf_get_current_user_id(); |
| 272 | $data = Db::name('address') -> where("delete_time = 0 and uid =".$uid) -> select() -> toArray(); | 272 | $data = Db::name('address') -> where("delete_time = 0 and uid =".$uid) -> select() -> toArray(); |
| 273 | - if(!empty($data)){ | ||
| 274 | - foreach($data as $key => $val){ | ||
| 275 | - $detailed = explode(',',$val['detailed']); | ||
| 276 | - $data[$key]['detailed'] = $detailed[0].$detailed[1]; | ||
| 277 | - } | ||
| 278 | - } | ||
| 279 | $this -> assign('indent_id',$indent_id['indet_id']); | 273 | $this -> assign('indent_id',$indent_id['indet_id']); |
| 280 | $this -> assign('data',$data); | 274 | $this -> assign('data',$data); |
| 281 | return $this -> fetch(); | 275 | return $this -> fetch(); |
| @@ -333,9 +327,6 @@ class OrderpageController extends WeChatBaseController{ | @@ -333,9 +327,6 @@ class OrderpageController extends WeChatBaseController{ | ||
| 333 | }else{ | 327 | }else{ |
| 334 | $id = $this -> request -> param(); | 328 | $id = $this -> request -> param(); |
| 335 | $data = Db::name('address') -> where('id',$id['id']) -> find(); | 329 | $data = Db::name('address') -> where('id',$id['id']) -> find(); |
| 336 | - $detailed = explode(',',$data['detailed']); | ||
| 337 | - $data['detailed0'] = $detailed[0]; | ||
| 338 | - $data['detailed1'] = $detailed[1]; | ||
| 339 | $this -> assign('data',$data); | 330 | $this -> assign('data',$data); |
| 340 | $this -> assign('indent_id',$id['indet_id']); | 331 | $this -> assign('indent_id',$id['indet_id']); |
| 341 | return $this -> fetch(); | 332 | return $this -> fetch(); |
| @@ -206,12 +206,6 @@ class PersonalcenterController extends WeChatBaseController{ | @@ -206,12 +206,6 @@ class PersonalcenterController extends WeChatBaseController{ | ||
| 206 | 206 | ||
| 207 | $uid = cmf_get_current_user_id(); | 207 | $uid = cmf_get_current_user_id(); |
| 208 | $data = Db::name('address') -> where("delete_time = 0 and uid =".$uid) -> select() -> toArray(); | 208 | $data = Db::name('address') -> where("delete_time = 0 and uid =".$uid) -> select() -> toArray(); |
| 209 | - if(!empty($data)){ | ||
| 210 | - foreach($data as $key => $val){ | ||
| 211 | - $detailed = explode(',',$val['detailed']); | ||
| 212 | - $data[$key]['detailed'] = $detailed[0].$detailed[1]; | ||
| 213 | - } | ||
| 214 | - } | ||
| 215 | $this -> assign('data',$data); | 209 | $this -> assign('data',$data); |
| 216 | return $this -> fetch(); | 210 | return $this -> fetch(); |
| 217 | 211 | ||
| @@ -283,9 +277,6 @@ class PersonalcenterController extends WeChatBaseController{ | @@ -283,9 +277,6 @@ class PersonalcenterController extends WeChatBaseController{ | ||
| 283 | }else{ | 277 | }else{ |
| 284 | $id = $this -> request -> param(); | 278 | $id = $this -> request -> param(); |
| 285 | $data = Db::name('address') -> where('id',$id['id']) -> find(); | 279 | $data = Db::name('address') -> where('id',$id['id']) -> find(); |
| 286 | - $detailed = explode(',',$data['detailed']); | ||
| 287 | - $data['detailed0'] = $detailed[0]; | ||
| 288 | - $data['detailed1'] = $detailed[1]; | ||
| 289 | $this -> assign('data',$data); | 280 | $this -> assign('data',$data); |
| 290 | return $this -> fetch(); | 281 | return $this -> fetch(); |
| 291 | } | 282 | } |
| @@ -18,7 +18,7 @@ | @@ -18,7 +18,7 @@ | ||
| 18 | <h4>姓名：{$data_in.name}</h4> | 18 | <h4>姓名：{$data_in.name}</h4> |
| 19 | <h4>手机号：{$data_in.phone}</h4> | 19 | <h4>手机号：{$data_in.phone}</h4> |
| 20 | <h4>买家留言：{$data_in.leave_word}</h4> | 20 | <h4>买家留言：{$data_in.leave_word}</h4> |
| 21 | - <h4>收货地址：{$address.region}{$address.detailed[0]}{$address.detailed[1]}</h4> | 21 | + <h4>收货地址：{$address.region}{$address.detailed}</h4> |
| 22 | </div> | 22 | </div> |
| 23 | </div> | 23 | </div> |
| 24 | </body> | 24 | </body> |
| @@ -138,7 +138,7 @@ | @@ -138,7 +138,7 @@ | ||
| 138 | <li id="saved-image{$key}"> | 138 | <li id="saved-image{$key}"> |
| 139 | <input id="photo-{$key}" type="hidden" name="det_img[]" | 139 | <input id="photo-{$key}" type="hidden" name="det_img[]" |
| 140 | value="{$vo.url}"> | 140 | value="{$vo.url}"> |
| 141 | - <input class="form-control" id="photo-{$key}-name" type="text" | 141 | + <input class="form-control" id="photo-{$key}-name" type="hidden" |
| 142 | name="det_name[]" | 142 | name="det_name[]" |
| 143 | value="{$vo.name|default=''}" style="width: 200px;" title="图片名称"> | 143 | value="{$vo.name|default=''}" style="width: 200px;" title="图片名称"> |
| 144 | <img id="photo-{$key}-preview" | 144 | <img id="photo-{$key}-preview" |
| @@ -49,9 +49,6 @@ | @@ -49,9 +49,6 @@ | ||
| 49 | <input type="text" placeholder="街道、小区、门牌号码" id="address_content"> | 49 | <input type="text" placeholder="街道、小区、门牌号码" id="address_content"> |
| 50 | </li> | 50 | </li> |
| 51 | </ul> | 51 | </ul> |
| 52 | - <div class="add_detailAddress"> | ||
| 53 | - <textarea placeholder="请输入详细地址，不少于15字" maxlength="200" id="address_content_con"></textarea> | ||
| 54 | - </div> | ||
| 55 | </div> | 52 | </div> |
| 56 | </div> | 53 | </div> |
| 57 | <script src="__TMPL__/public/assets/js/jquery.js"></script> | 54 | <script src="__TMPL__/public/assets/js/jquery.js"></script> |
| @@ -78,7 +75,7 @@ | @@ -78,7 +75,7 @@ | ||
| 78 | region = $('#city_text').text(); | 75 | region = $('#city_text').text(); |
| 79 | address_content = $('#address_content').val(); | 76 | address_content = $('#address_content').val(); |
| 80 | address_content_con = $('#address_content_con').val(); | 77 | address_content_con = $('#address_content_con').val(); |
| 81 | - detailed = address_content+','+address_content_con; | 78 | + detailed = address_content; |
| 82 | $.post("{:url('Orderpage/add_shop_address')}",{name:name,phone:phone,region:region,detailed:detailed},function(data){ | 79 | $.post("{:url('Orderpage/add_shop_address')}",{name:name,phone:phone,region:region,detailed:detailed},function(data){ |
| 83 | if(data){ | 80 | if(data){ |
| 84 | window.location.href = "{:url('Orderpage/go_add_address',array('indet_id'=>$indent_id))}"; | 81 | window.location.href = "{:url('Orderpage/go_add_address',array('indet_id'=>$indent_id))}"; |
| @@ -47,12 +47,9 @@ | @@ -47,12 +47,9 @@ | ||
| 47 | <input type="hidden" name="id" value="{$data.id}" id="id"> | 47 | <input type="hidden" name="id" value="{$data.id}" id="id"> |
| 48 | <li> | 48 | <li> |
| 49 | <label for="">详细地址</label> | 49 | <label for="">详细地址</label> |
| 50 | - <input type="text" placeholder="街道、小区、门牌号码" id="address_content" value="{$data.detailed0}"> | 50 | + <input type="text" placeholder="街道、小区、门牌号码" id="address_content" value="{$data.detailed}"> |
| 51 | </li> | 51 | </li> |
| 52 | </ul> | 52 | </ul> |
| 53 | - <div class="add_detailAddress"> | ||
| 54 | - <textarea placeholder="请输入详细地址，不少于15字" maxlength="200" id="address_content_con">{$data.detailed1}</textarea> | ||
| 55 | - </div> | ||
| 56 | </div> | 53 | </div> |
| 57 | </div> | 54 | </div> |
| 58 | <script src="__TMPL__/public/assets/js/jquery.js"></script> | 55 | <script src="__TMPL__/public/assets/js/jquery.js"></script> |
| @@ -80,7 +77,7 @@ | @@ -80,7 +77,7 @@ | ||
| 80 | region = $('#city_text').text(); | 77 | region = $('#city_text').text(); |
| 81 | address_content = $('#address_content').val(); | 78 | address_content = $('#address_content').val(); |
| 82 | address_content_con = $('#address_content_con').val(); | 79 | address_content_con = $('#address_content_con').val(); |
| 83 | - detailed = address_content+','+address_content_con; | 80 | + detailed = address_content; |
| 84 | $.post("{:url('Orderpage/address_edit')}",{id:id,name:name,phone:phone,region:region,detailed:detailed},function(data){ | 81 | $.post("{:url('Orderpage/address_edit')}",{id:id,name:name,phone:phone,region:region,detailed:detailed},function(data){ |
| 85 | if(data){ | 82 | if(data){ |
| 86 | window.location.href = "{:url('Orderpage/go_add_address',array('indet_id'=>$indent_id))}"; | 83 | window.location.href = "{:url('Orderpage/go_add_address',array('indet_id'=>$indent_id))}"; |
| @@ -30,28 +30,6 @@ | @@ -30,28 +30,6 @@ | ||
| 30 | <!-- 内容 --> | 30 | <!-- 内容 --> |
| 31 | <div class="ad_content"> | 31 | <div class="ad_content"> |
| 32 | <ul id="ad_contentUl"> | 32 | <ul id="ad_contentUl"> |
| 33 | - <!--<volist name="data" id="vo"> | ||
| 34 | - <li ontouchstart="fors()"> | ||
| 35 | - <div class="ad_conBox"> | ||
| 36 | - <div class="ad_con1"> | ||
| 37 | - <p class="ad_conName">{$vo.name}</p> | ||
| 38 | - <if condition="$vo.default_address eq 1"> | ||
| 39 | - <p class="ad_conMo" style="display:block;">默认</p> | ||
| 40 | - <else/> | ||
| 41 | - <p class="ad_conMo">默认</p> | ||
| 42 | - </if> | ||
| 43 | - | ||
| 44 | - <p class="ad_conPhone">{$vo.phone}</p> | ||
| 45 | - <img class="ad_conImg" src="__TMPL__/public/assets/images/35.png" ontouchstart="address_edit({$vo.id})" alt=""> | ||
| 46 | - </div> | ||
| 47 | - </div> | ||
| 48 | - <p class="ad_conAddress">收货地址：{$vo.region}{$vo.detailed}</p> | ||
| 49 | - <div class="ad_MoRemove"> | ||
| 50 | - <div class="ad_mo" ontouchstart="set_default({$vo.id})">设为默认</div> | ||
| 51 | - <div class="ad_move" ontouchstart="address_del({$vo.id})">删除</div> | ||
| 52 | - </div> | ||
| 53 | - </li> | ||
| 54 | - </volist>--> | ||
| 55 | <volist name="data" id="vo"> | 33 | <volist name="data" id="vo"> |
| 56 | <li> | 34 | <li> |
| 57 | <div class="" style="display: flex;justify-content: flex-start;align-items: center;"> | 35 | <div class="" style="display: flex;justify-content: flex-start;align-items: center;"> |
| @@ -49,9 +49,6 @@ | @@ -49,9 +49,6 @@ | ||
| 49 | <input type="text" placeholder="街道、小区、门牌号码" id="address_content"> | 49 | <input type="text" placeholder="街道、小区、门牌号码" id="address_content"> |
| 50 | </li> | 50 | </li> |
| 51 | </ul> | 51 | </ul> |
| 52 | - <div class="add_detailAddress"> | ||
| 53 | - <textarea placeholder="请输入详细地址，不少于15字" maxlength="200" id="address_content_con"></textarea> | ||
| 54 | - </div> | ||
| 55 | </div> | 52 | </div> |
| 56 | </div> | 53 | </div> |
| 57 | <script src="__TMPL__/public/assets/js/jquery.js"></script> | 54 | <script src="__TMPL__/public/assets/js/jquery.js"></script> |
| @@ -78,7 +75,7 @@ | @@ -78,7 +75,7 @@ | ||
| 78 | region = $('#city_text').text(); | 75 | region = $('#city_text').text(); |
| 79 | address_content = $('#address_content').val(); | 76 | address_content = $('#address_content').val(); |
| 80 | address_content_con = $('#address_content_con').val(); | 77 | address_content_con = $('#address_content_con').val(); |
| 81 | - detailed = address_content+','+address_content_con; | 78 | + detailed = address_content; |
| 82 | $.post("{:url('Personalcenter/add_shop_address')}",{name:name,phone:phone,region:region,detailed:detailed},function(data){ | 79 | $.post("{:url('Personalcenter/add_shop_address')}",{name:name,phone:phone,region:region,detailed:detailed},function(data){ |
| 83 | if(data){ | 80 | if(data){ |
| 84 | window.location.href = "{:url('Personalcenter/shop_address')}"; | 81 | window.location.href = "{:url('Personalcenter/shop_address')}"; |
| @@ -47,12 +47,9 @@ | @@ -47,12 +47,9 @@ | ||
| 47 | <input type="hidden" name="id" value="{$data.id}" id="id"> | 47 | <input type="hidden" name="id" value="{$data.id}" id="id"> |
| 48 | <li> | 48 | <li> |
| 49 | <label for="">详细地址</label> | 49 | <label for="">详细地址</label> |
| 50 | - <input type="text" placeholder="街道、小区、门牌号码" id="address_content" value="{$data.detailed0}"> | 50 | + <input type="text" placeholder="街道、小区、门牌号码" id="address_content" value="{$data.detailed}"> |
| 51 | </li> | 51 | </li> |
| 52 | </ul> | 52 | </ul> |
| 53 | - <div class="add_detailAddress"> | ||
| 54 | - <textarea placeholder="请输入详细地址，不少于15字" maxlength="200" id="address_content_con">{$data.detailed1}</textarea> | ||
| 55 | - </div> | ||
| 56 | </div> | 53 | </div> |
| 57 | </div> | 54 | </div> |
| 58 | <script src="__TMPL__/public/assets/js/jquery.js"></script> | 55 | <script src="__TMPL__/public/assets/js/jquery.js"></script> |
| @@ -80,7 +77,7 @@ | @@ -80,7 +77,7 @@ | ||
| 80 | region = $('#city_text').text(); | 77 | region = $('#city_text').text(); |
| 81 | address_content = $('#address_content').val(); | 78 | address_content = $('#address_content').val(); |
| 82 | address_content_con = $('#address_content_con').val(); | 79 | address_content_con = $('#address_content_con').val(); |
| 83 | - detailed = address_content+','+address_content_con; | 80 | + detailed = address_content; |
| 84 | $.post("{:url('Personalcenter/address_edit')}",{id:id,name:name,phone:phone,region:region,detailed:detailed},function(data){ | 81 | $.post("{:url('Personalcenter/address_edit')}",{id:id,name:name,phone:phone,region:region,detailed:detailed},function(data){ |
| 85 | if(data){ | 82 | if(data){ |
| 86 | window.location.href = "{:url('Personalcenter/shop_address')}"; | 83 | window.location.href = "{:url('Personalcenter/shop_address')}"; |
-
请 注册 或 登录 后发表评论