Merge branch 'master' of https://gitee.com/wangzih/jinzai-cloud-platform.git

src/main/java/com/qlm/controller/jinzai/MobileController.java

@@ -160,14 +160,15 @@ public class MobileController extends Controller{
 				result.set("pinxiang", productName);
 				Record fahuoInfo = new Record();
 				fahuoInfo.set("DeliveryTime", operateDate).set("CustomerName", distributorName);
-				
+
+
 				Record jxsInfo = Db.findFirst("select * from jinzai_jxs_area where jxs = ?",distributorName);
 				
 				if(jxsInfo != null){
 					String saleCity = jxsInfo.getStr("city");
 					String saleProvince = jxsInfo.getStr("province");
 					
-					if(saleCity.equals(compareCity)){
+					if(saleCity!=null&&saleCity.equals(compareCity)){
 						cuan = false;
 					}
 					result.set("saleLocation", saleProvince+saleCity);

src/main/webapp/mobile/index.jsp

@@ -443,7 +443,7 @@
 
 				<div style="display:inline-block;width:30%;text-align: center;position: relative;">
 
-				<img onclick="scanCode()" src="${ctx }/mobile/scan.jpg" style="position: relative;top:20px" width="50%"/>
+				<img onclick="scanCode()" src="${ctx }/mobile/scan.jpg" style="position: relative;top:20px;right:-58px;" width="50%"/>
 				</div>
 			</div>
 			<div>