Merge branch 'develop' of zhengxifeng/zc100 into master

template/pc/components/index/step.htm

                                     <div class="col-sm-6 col-xs-6" style="padding-left:0px;padding-right:3px;">
                                         <select class="form-control" id="choose11" name="szsf">
                                             <option value="0">选择省份</option> <!--您所在-->
-                                            {eyou:sql sql="select id,name from ey_citysite where status=1 and level=1" cachetime='3600' empty='' id='field'}
+                                            {eyou:sql sql="select id,name from ey_citysite where level=1" cachetime='3600' empty='' id='field'}
                                             <option value="{$field.id}">{$field.name}</option>
                                             {/eyou:sql}
                                         </select>