Merge branch 'develop'

src/main/ui/static/commons/templates/order_detail.html

@@ -76,7 +76,7 @@
                     <label class="control-label col-xs-3">IP</label>
                     <div class="col-xs-9">
                         <p class="form-control-static">
-                            {{order.customer_ip}}&nbsp;&nbsp;<a href="#" ng-click="getPayLocation(order.customer_ip)">查询地区</a><span ng-if="pay_location">  : {{pay_location}}</span>
+                            {{order.customer_ip}}&nbsp;&nbsp;<a role="button" ng-click="getPayLocation(order.customer_ip)">查询地区</a><span ng-if="pay_location">  : {{pay_location}}</span>
                         </p>
                     </div>
                 </div>