Merge branch 'master' of http://114.215.101.231:8099/anyv/xkeasy

@@ -39,6 +39,15 @@ class OrderController extends WeChatBaseController
                 $where2['indent_id'] = ['eq',$vo['id']];
                 $where2['indent_id'] = ['eq',$vo['id']];
                 $indentGoods = $indentGoodsModel->selectData($where2);
                 $indentGoods = $indentGoodsModel->selectData($where2);
                 $data[$key]['indent_goods'] = $indentGoods;
                 $data[$key]['indent_goods'] = $indentGoods;
+                if($vo['is_courier'] == 1){
+                    if(empty($vo['name'])){
+                        unset($data[$key]);
+                    }
+                }else if($vo['is_courier'] == 2){
+                    if(empty($vo['indent_address'])){
+                        unset($data[$key]);
+                    }
+                }
             }
             }
         }
         }
         $this->assign('data',$data);
         $this->assign('data',$data);

@@ -99,7 +99,7 @@
                                 </a>
                                 </a>
                                 <div class="myorder_bottom2_2 delivery" data-id="{$vo.id}">确认收货</div>
                                 <div class="myorder_bottom2_2 delivery" data-id="{$vo.id}">确认收货</div>
                                 <elseif condition="$vo.state eq 3"/>
                                 <elseif condition="$vo.state eq 3"/>
-                                <div class="myorder_bottom2_2">去评价</div>
+                                <!--<div class="myorder_bottom2_2">去评价</div>-->
                             </if>
                             </if>
                         </div>
                         </div>
                     </div>
                     </div>
@@ -175,7 +175,7 @@
                                     </a>
                                     </a>
                                     <div class="myorder_bottom2_2 delivery" data-id="{$vo.id}">确认收货</div>
                                     <div class="myorder_bottom2_2 delivery" data-id="{$vo.id}">确认收货</div>
                                     <elseif condition="$vo.state eq 3"/>
                                     <elseif condition="$vo.state eq 3"/>
-                                    <div class="myorder_bottom2_2">去评价</div>
+                                    <!--<div class="myorder_bottom2_2">去评价</div>-->
                                 </if>
                                 </if>
                             </div>
                             </div>
                         </div>
                         </div>

@@ -37,8 +37,8 @@
     </a>
     </a>
     <p style="color:white">ta的推广</p>
     <p style="color:white">ta的推广</p>
 </div>
 </div>
-<div class="code_Box">
-<img src="{:cmf_get_image_url($share_image)}"/>
+<div class="code_Box" style="background: #FE3A00;">
+    <img src="{:cmf_get_image_url($share_image)}" style="-webkit-background-size: 100%;background-size: 100%;height: auto;width: 100%;"/>
 </div>
 </div>
 <script src="__TMPL__/public/assets/js/base.js"></script>
 <script src="__TMPL__/public/assets/js/base.js"></script>
 </body>
 </body>