Merge branch 'dev-mysql' into liusw-account-v1.0.10.19

# Conflicts:
#	src/main/java/com/uas/platform/b2c/common/account/controller/UserController.java
#	src/main/java/com/uas/platform/b2c/common/account/service/UserService.java
#	src/main/java/com/uas/platform/b2c/common/account/service/impl/UserServiceImpl.java
#	src/main/webapp/resources/view/usercenter/forstore/account_manager.html

src/main/java/com/uas/platform/b2c/common/account/controller/EnterpriseController.java

@@ -1,6 +1,11 @@
 package com.uas.platform.b2c.common.account.controller;
 
+import com.uas.account.entity.UserSpaceDetail;
+import com.uas.account.util.AccountUtils;
 import com.uas.platform.b2c.common.account.model.Enterprise;
+import com.uas.platform.b2c.common.account.model.FormEnterprise;
+import com.uas.platform.b2c.common.account.model.User;
+import com.uas.platform.b2c.common.account.model.UserBaseInfo;
 import com.uas.platform.b2c.common.account.service.EnterpriseService;
 import com.uas.platform.b2c.core.support.SystemSession;
 import com.uas.platform.b2c.prod.store.service.StoreInService;
@@ -33,6 +38,20 @@ public class EnterpriseController {
 		return enterpriseService.getEnterpriseInfo(enuu);
 	}
 
+	/**
+	 * 根据UU获取完整企业信息
+	 * @param enuu 企业uu号
+	 * @return 完整的企业信息
+	 */
+	@RequestMapping(value = "/{enuu}/detailInfo", method = RequestMethod.GET)
+	public UserSpaceDetail getUserSpaceDetailByEnuu(@PathVariable Long enuu){
+		try {
+			return AccountUtils.findByBusinessCode(enterpriseService.getEnterpriseInfo(enuu).getEnBussinessCode()) ;
+		}catch (Exception e){
+			return null;
+		}
+	}
+
 	/**
 	 * 修改企业基本资料
 	 *
@@ -68,7 +87,7 @@ public class EnterpriseController {
 	 * @return
 	 */
 	@RequestMapping(value = "/register", method = RequestMethod.POST)
-	public ResultMap registerEnterprise(@RequestBody Enterprise enterprise, String filePath) {
+	public ResultMap registerEnterprise(@RequestBody FormEnterprise enterprise, String filePath) {
 		return enterpriseService.registerEnterprise(enterprise,filePath,SystemSession.getUser());
 	}
 
@@ -90,4 +109,35 @@ public class EnterpriseController {
 		return enterpriseService.validBusinessCode(businessCode);
 	}
 
+
+	/**
+	 * 开通企业卖家功能
+	 *
+	 * @param enUU
+	 */
+	@RequestMapping(value = "/openVendor/{enUU}", method = RequestMethod.POST)
+	public void openVendor(@PathVariable("enUU") long enUU) {
+		enterpriseService.openVendor(enUU,true, true);
+	}
+
+	/**
+	 * 设置卖家中心预开通状态
+	 *
+	 * @param enUU
+	 */
+	@RequestMapping(value = "/openVendorSetRead/{enUU}", method = RequestMethod.POST)
+	public void setOpenVendor(@PathVariable("enUU") long enUU) {
+		enterpriseService.openVendor(enUU,true,false);
+	}
+
+	/**
+	 * 设置卖家中心非预开通状态
+	 *
+	 * @param enUU
+	 */
+	@RequestMapping(value = "/openVendorSetNotRead/{enUU}", method = RequestMethod.POST)
+	public void setOpenNotVendor(@PathVariable("enUU") long enUU) {
+		enterpriseService.openVendor(enUU,false,false);
+	}
+
 }

src/main/java/com/uas/platform/b2c/common/account/controller/UserController.java

@@ -3,6 +3,7 @@ package com.uas.platform.b2c.common.account.controller;
 import com.uas.message.mail.service.MailService;
 import com.uas.message.sms.service.SmsService;
 import com.uas.platform.b2c.common.account.model.User;
+import com.uas.platform.b2c.common.account.model.UserCacheEnterprise;
 import com.uas.platform.b2c.common.account.model.UserInfo;
 import com.uas.platform.b2c.common.account.model.UserQuestion;
 import com.uas.platform.b2c.common.account.service.UserQuestionService;
@@ -675,6 +676,46 @@ public class UserController {
 		}
 	}
 
+	/**
+	 * 设置注册企业的缓存信息
+	 *
+	 * @return
+	 */
+	@RequestMapping(value = "/userCacheEnterprise", method = RequestMethod.POST)
+	public ResponseEntity<Boolean> newUserCacheEnterprise(@RequestBody UserCacheEnterprise userCacheEnterprise) {
+		UserCacheEnterprise userCacheEnterprise1 = userService.saveUserCacheEnterprise(SystemSession.getUser(),userCacheEnterprise);
+		if (userCacheEnterprise1 == null) {
+			throw new IllegalOperatorException("保存失败");
+		} else {
+			HttpHeaders headers = new HttpHeaders();
+			headers.add("Content-Type", "application/text; charset=utf-8");
+			return new ResponseEntity<Boolean>(true, headers,
+					HttpStatus.OK);
+		}
+	}
+
+	/**
+	 * 获取注册企业的缓存信息
+	 *
+	 * @return
+	 */
+	@RequestMapping(value = "/userCacheEnterprise", method = RequestMethod.GET)
+	@ResponseBody
+	public UserCacheEnterprise getUserCacheEnterprise() {
+		return userService.getUserCacheEnterprise(SystemSession.getUser());
+	}
+
+	/**
+	 * 删除注册企业的缓存信息
+	 *
+	 * @return
+	 */
+	@RequestMapping(value = "/userCacheEnterprise", method = RequestMethod.DELETE)
+	@ResponseBody
+	public void deleteUserCacheEnterprise() {
+		userService.deleteUserCacheEnterprise(SystemSession.getUser());
+	}
+
 	/**
 	 * 获取页面token,防止恶意发送手机验证码
 	 * @param request

src/main/java/com/uas/platform/b2c/common/account/dao/UserCacheEnterpriseDao.java

@@ -0,0 +1,13 @@
+package com.uas.platform.b2c.common.account.dao;
+
+import com.uas.platform.b2c.common.account.model.UserCacheEnterprise;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.stereotype.Repository;
+
+/**
+ * Created by wangdy on 2017-08-25.
+ */
+@Repository
+public interface UserCacheEnterpriseDao extends JpaSpecificationExecutor<UserCacheEnterprise>, JpaRepository<UserCacheEnterprise, Long> {
+}

src/main/java/com/uas/platform/b2c/common/account/model/Enterprise.java

@@ -90,6 +90,13 @@ public class Enterprise implements Serializable {
 	 */
 	@Column(name = "en_businesscode")
 	private String enBussinessCode;
+
+	/**
+	 * 商业登记证图片
+	 */
+	@Column(name = "en_businesscodeimg")
+	private String enBussinessCodeImage;
+
 	/**
 	 * 公司主页地址
 	 */
@@ -131,6 +138,12 @@ public class Enterprise implements Serializable {
 	@Column(name = "en_saasstatus")
 	private Short enSaasStatus;
 
+	/**
+	 * 是否开通卖家中心状态
+	 */
+	@Column(name = "en_mallvendorstatus")
+	private Short enMallVendorStatus;
+
 	/**
 	 * enIsErp
 	 */
@@ -316,6 +329,14 @@ public class Enterprise implements Serializable {
 		this.enSaasStatus = enSaasStatus;
 	}
 
+	public Short getEnMallVendorStatus() {
+		return enMallVendorStatus;
+	}
+
+	public void setEnMallVendorStatus(Short enMallVendorStatus) {
+		this.enMallVendorStatus = enMallVendorStatus;
+	}
+
 	public Integer getReceiptStatus() {
 		return receiptStatus;
 	}
@@ -369,6 +390,14 @@ public class Enterprise implements Serializable {
 		this.enLogoUrl = enLogoUrl;
 	}
 
+	public String getEnBussinessCodeImage() {
+		return enBussinessCodeImage;
+	}
+
+	public void setEnBussinessCodeImage(String enBussinessCodeImage) {
+		this.enBussinessCodeImage = enBussinessCodeImage;
+	}
+
 	/**
 	 * saas用户
 	 * 
@@ -378,4 +407,13 @@ public class Enterprise implements Serializable {
 		return this.enSaasStatus != null && Status.ENABLED.value() == this.enSaasStatus;
 	}
 
+	/**
+	 * 是否开通卖家中心
+	 *
+	 * @return
+	 */
+	public boolean isMallVendor() {
+		return this.enMallVendorStatus != null && Status.ENABLED.value() == this.enMallVendorStatus;
+	}
+
 }

src/main/java/com/uas/platform/b2c/common/account/model/FormEnterprise.java

@@ -0,0 +1,125 @@
+package com.uas.platform.b2c.common.account.model;
+
+/**
+ * Created by wangdy on 2017-09-13.
+ */
+public class FormEnterprise {
+
+    private String name;
+    private String lawPerson;
+    private String url;
+    private String licenceId;
+    private String address;
+    private String linkman;
+    private String phone;
+    private String email;
+    private String fax;
+    private String website;
+    private String profession;
+    private String logoUrl;
+    private String[] tagsData;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getLawPerson() {
+        return lawPerson;
+    }
+
+    public void setLawPerson(String lawPerson) {
+        this.lawPerson = lawPerson;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public String getLicenceId() {
+        return licenceId;
+    }
+
+    public void setLicenceId(String licenceId) {
+        this.licenceId = licenceId;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getLinkman() {
+        return linkman;
+    }
+
+    public void setLinkman(String linkman) {
+        this.linkman = linkman;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public String getFax() {
+        return fax;
+    }
+
+    public void setFax(String fax) {
+        this.fax = fax;
+    }
+
+    public String getWebsite() {
+        return website;
+    }
+
+    public void setWebsite(String website) {
+        this.website = website;
+    }
+
+    public String getProfession() {
+        return profession;
+    }
+
+    public void setProfession(String profession) {
+        this.profession = profession;
+    }
+
+    public String getLogoUrl() {
+        return logoUrl;
+    }
+
+    public void setLogoUrl(String logoUrl) {
+        this.logoUrl = logoUrl;
+    }
+
+    public String[] getTagsData() {
+        return tagsData;
+    }
+
+    public void setTagsData(String[] tagsData) {
+        this.tagsData = tagsData;
+    }
+}

src/main/java/com/uas/platform/b2c/common/account/model/UsageLog.java

@@ -38,7 +38,6 @@ public class UsageLog extends BufferedLogable implements Serializable {
 	@JoinColumn(name = "log_useruu", insertable = false, updatable = false)
 	private UserBaseInfo user;
 
-	@NotNull
 	@Column(name = "log_useruu")
 	private Long userUU;
 
@@ -268,9 +267,10 @@ public class UsageLog extends BufferedLogable implements Serializable {
 		if (strArray.length == 9) {
 			this.time = Long.parseLong(strArray[0]);
 			this.ip = strArray[1];
-			if (!strArray[2].equals("null"))
+			if (!"null".equals(strArray[2]))
 				this.enUU = Long.parseLong(strArray[2]);
-			this.userUU = Long.parseLong(strArray[3]);
+			if (!"null".equals(strArray[3]))
+				this.userUU = Long.parseLong(strArray[3]);
 			this.title = strArray[4];
 			this.message = strArray[5];
 			this.detail = StringUtils.hasText(strArray[6]) ? strArray[6] : null;

src/main/java/com/uas/platform/b2c/common/account/model/User.java

@@ -44,7 +44,6 @@ public class User implements Serializable {
 	 * uu号，ID
 	 */
 	@Id
-	@GeneratedValue
 	@Column(name = "user_uu")
 	private Long userUU;
 
@@ -64,7 +63,6 @@ public class User implements Serializable {
 	 * 邮箱
 	 */
 	@Column(name = "user_email", length = 50)
-	@NotNull
 	private String userEmail;
 
 	/**

src/main/java/com/uas/platform/b2c/common/account/model/UserCacheEnterprise.java

@@ -0,0 +1,186 @@
+package com.uas.platform.b2c.common.account.model;
+
+import javax.persistence.*;
+
+/**
+ * Created by wangdy on 2017-08-25.
+ */
+@Entity
+@Table(name = "sec$user_cache_enterprise")
+public class UserCacheEnterprise {
+    /**
+     * uu号，ID
+     */
+    @Id
+    @Column(name = "user_uu")
+    private Long userUU;
+
+
+
+    @Column(name = "name")
+    private String name;
+
+    @Column(name = "lawPerson")
+    private String lawPerson;
+
+    @Column(name = "url")
+    private String url;
+
+    @Column(name = "licenceId")
+    private String licenceId;
+
+    @Column(name = "address")
+    private String address;
+
+    @Column(name = "linkman")
+    private String linkman;
+
+    @Column(name = "phone")
+    private String phone;
+
+    @Column(name = "email")
+    private String email;
+
+    @Column(name = "fax")
+    private String fax;
+
+    @Column(name = "website")
+    private String website;
+
+    @Column(name = "profession")
+    private String profession;
+
+    @Column(name = "logoUrl")
+    private String logoUrl;
+
+    @Column(name = "tagsData")
+    private String[] tagsData;
+
+
+    /**
+     * 是否阅读开店协议
+     */
+    @Column(name = "en_isread")
+    private boolean enIsRead;
+
+
+    public Long getUserUU() {
+        return userUU;
+    }
+
+    public void setUserUU(Long userUU) {
+        this.userUU = userUU;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getLawPerson() {
+        return lawPerson;
+    }
+
+    public void setLawPerson(String lawPerson) {
+        this.lawPerson = lawPerson;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public String getLicenceId() {
+        return licenceId;
+    }
+
+    public void setLicenceId(String licenceId) {
+        this.licenceId = licenceId;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getLinkman() {
+        return linkman;
+    }
+
+    public void setLinkman(String linkman) {
+        this.linkman = linkman;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public String getFax() {
+        return fax;
+    }
+
+    public void setFax(String fax) {
+        this.fax = fax;
+    }
+
+    public String getWebsite() {
+        return website;
+    }
+
+    public void setWebsite(String website) {
+        this.website = website;
+    }
+
+    public String getProfession() {
+        return profession;
+    }
+
+    public void setProfession(String profession) {
+        this.profession = profession;
+    }
+
+    public String getLogoUrl() {
+        return logoUrl;
+    }
+
+    public void setLogoUrl(String logoUrl) {
+        this.logoUrl = logoUrl;
+    }
+
+    public String[] getTagsData() {
+        return tagsData;
+    }
+
+    public void setTagsData(String[] tagsData) {
+        this.tagsData = tagsData;
+    }
+
+    public boolean isEnIsRead() {
+        return enIsRead;
+    }
+
+    public void setEnIsRead(boolean enIsRead) {
+        this.enIsRead = enIsRead;
+    }
+}

src/main/java/com/uas/platform/b2c/common/account/model/UserInfo.java

@@ -42,11 +42,13 @@ public class UserInfo {
 				Map<String, Object> map = new HashMap<String, Object>();
 				map.put("enName", enterprise.getEnName());
 				map.put("uu", enterprise.getUu());
+				map.put("isVendor",enterprise.getEnMallVendorStatus());
 				if(enterprise.getEnSaasStatus() != null && enterprise.getEnSaasStatus() == Status.ENABLED.value()) {
 					map.put("enSaasUrl", enterprise.getEnSaasUrl());
 				}
-				if (enterprise.equals(current))
+				if (enterprise.equals(current)){
 					map.put("current", true);
+				}
 				list.add(map);
 			}
 			this.enterprises = list;

src/main/java/com/uas/platform/b2c/common/account/service/EnterpriseService.java

@@ -1,6 +1,8 @@
 package com.uas.platform.b2c.common.account.service;
 
+import com.uas.platform.b2c.common.account.controller.EnterpriseController;
 import com.uas.platform.b2c.common.account.model.Enterprise;
+import com.uas.platform.b2c.common.account.model.FormEnterprise;
 import com.uas.platform.b2c.common.account.model.User;
 import com.uas.platform.b2c.trade.support.ResultMap;
 
@@ -38,7 +40,7 @@ public interface EnterpriseService {
 	 * 个人用户注册企业信息
 	 * @return 店铺信息
 	 */
-	ResultMap registerEnterprise(Enterprise enterprise, String filePath,User user);
+	ResultMap registerEnterprise(FormEnterprise enterprise, String filepath, User user);
 
 	/**
 	 * 个人用户注册企业信息(验证名称)
@@ -51,4 +53,10 @@ public interface EnterpriseService {
 	 * @return 店铺信息
 	 */
 	ResultMap validBusinessCode(String businessCode);
+
+	/**
+	 * 开启企业卖家功能
+	 * @return 企业
+	 */
+	Enterprise openVendor(Long enUU , boolean isRead , boolean isOpen);
 }

src/main/java/com/uas/platform/b2c/common/account/service/UserService.java

@@ -2,6 +2,7 @@ package com.uas.platform.b2c.common.account.service;
 
 
 import com.uas.platform.b2c.common.account.model.User;
+import com.uas.platform.b2c.common.account.model.UserCacheEnterprise;
 import com.uas.platform.b2c.common.account.model.UserInfo;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
@@ -101,15 +102,31 @@ public interface UserService {
 	 * @param user 用户
 	 * @param request 请求
 	 */
-	public User addUser(User user, HttpServletRequest request) ;
+	User addUser(User user, HttpServletRequest request) ;
 
-	public UserInfo findUserByKeyWord(String keyWord);
+	UserInfo findUserByKeyWord(String keyWord);
 
-	public void bindUserToMyEnterprise(Long userUU);
+	void bindUserToMyEnterprise(Long userUU);
 
-	public void removeUser(Long uu);
-	public boolean isEmailUseable(String email);
-	public boolean isTelUseable(String tel);
+	void removeUser(Long uu);
+
+	boolean isEmailUseable(String email);
+
+	boolean isTelUseable(String tel);
+	/**
+	 * 新增用户注册企业时的缓存数据
+	 */
+	UserCacheEnterprise saveUserCacheEnterprise(User user , UserCacheEnterprise userCacheEnterprise);
+
+	/**
+	 * 查询用户注册企业时的缓存数据
+	 */
+	UserCacheEnterprise getUserCacheEnterprise(User user);
+
+	/**
+	 * 删除用户注册企业时的缓存数据
+	 */
+	void deleteUserCacheEnterprise(User user);
 
 	/**
 	 * 修改用户支付密码

src/main/java/com/uas/platform/b2c/common/account/service/impl/EnterpriseServiceImpl.java

@@ -6,6 +6,7 @@ import com.uas.account.util.AccountUtils;
 import com.uas.platform.b2c.common.account.dao.EnterpriseDao;
 import com.uas.platform.b2c.common.account.dao.UserBaseInfoDao;
 import com.uas.platform.b2c.common.account.model.Enterprise;
+import com.uas.platform.b2c.common.account.model.FormEnterprise;
 import com.uas.platform.b2c.common.account.model.User;
 import com.uas.platform.b2c.common.account.model.UserBaseInfo;
 import com.uas.platform.b2c.common.account.service.EnterpriseService;
@@ -21,6 +22,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
+import java.lang.reflect.Array;
+import java.util.Arrays;
 import java.util.List;
 
 @Service
@@ -129,18 +132,32 @@ public class EnterpriseServiceImpl implements EnterpriseService{
 	}
 
 	@Override
-	public ResultMap registerEnterprise(Enterprise enterprise, String filePath, User user) {
+	public ResultMap registerEnterprise(FormEnterprise enterprise, String filePath,  User user) {
 		UserSpaceDetail detail = new UserSpaceDetail();
-		detail.setName(enterprise.getEnName());
-		detail.setShortName(enterprise.getEnShortname());
-		detail.setBusinessCode(enterprise.getEnBussinessCode());
-		detail.setBusinessCodeImage(filePath);
-		if (null == detail.getName()|| null == detail.getShortName() || null==detail.getBusinessCode() || null==detail.getBusinessCodeImage()){
+		detail.setName(enterprise.getName());
+		detail.setShortName(null);
+		detail.setBusinessCode(enterprise.getLicenceId());
+		detail.setBusinessCodeImage(enterprise.getUrl());
+		if (null == detail.getName()|| null==detail.getBusinessCode() || null==detail.getBusinessCodeImage()){
 			return new ResultMap(CodeType.SYSTEM_NOT_EXIST, "参数不能为空");
 		}
 		detail.setArea("中国大陆");
-		detail.setAddress(enterprise.getEnAddress());
-		detail.setUrl(enterprise.getEnUrl());
+		detail.setCorporation(enterprise.getLawPerson());
+		detail.setAddress(enterprise.getAddress());
+		detail.setUrl(enterprise.getWebsite());
+		detail.setContactMan(enterprise.getLinkman());
+		detail.setContactTel(enterprise.getPhone());
+		detail.setContactEmail(enterprise.getEmail());
+		detail.setFax(enterprise.getFax());
+        detail.setLogoImage(enterprise.getLogoUrl());
+		detail.setProfession(enterprise.getProfession());
+		if (null != enterprise.getTagsData() || enterprise.getTagsData().length>0){
+			String str = Arrays.toString(enterprise.getTagsData());
+			str = str.substring(1, str.length()-1);
+			detail.setTags(str);
+		} else {
+			detail.setTags(null);
+		}
 		detail.setAdminName(user.getUserName());
 		detail.setAdminEmail(user.getUserEmail());
 		detail.setAdminTel(user.getUserTel());
@@ -161,6 +178,9 @@ public class EnterpriseServiceImpl implements EnterpriseService{
 	public ResultMap validName(String name) {
 		try {
 			String result = AccountUtils.validName(name);
+			if ("connect timed out".equals(result) || "Read timed out".equals(result)){
+				return new ResultMap(CodeType.TIME_OUT, "请求超时");
+			}
 			JSONObject resultJSON = JSONObject.parseObject(result);
 			if (true == (boolean)resultJSON.get("inCloud") || true == (boolean)resultJSON.get("hasCreate")){
 				return new ResultMap(CodeType.SYSTEM_ERROR, "校验失败");
@@ -168,7 +188,7 @@ public class EnterpriseServiceImpl implements EnterpriseService{
 				return ResultMap.success("校验成功");
 			}
 		}catch (Exception e){
-			return new ResultMap(CodeType.SYSTEM_ERROR, "校验失败");
+			return new ResultMap(CodeType.TIME_OUT, "请求超时");
 		}
 	}
 
@@ -176,6 +196,9 @@ public class EnterpriseServiceImpl implements EnterpriseService{
 	public ResultMap validBusinessCode(String businessCode) {
 		try {
 			String result = AccountUtils.validBusinessCode(businessCode);
+			if ("connect timed out".equals(result) || "Read timed out".equals(result)){
+				return new ResultMap(CodeType.TIME_OUT, "请求超时");
+			}
 			JSONObject resultJSON = JSONObject.parseObject(result);
 			if (true == (boolean)resultJSON.get("inCloud") || true == (boolean)resultJSON.get("hasCreate")){
 				return new ResultMap(CodeType.SYSTEM_ERROR, "校验失败");
@@ -183,7 +206,24 @@ public class EnterpriseServiceImpl implements EnterpriseService{
 				return ResultMap.success("校验成功");
 			}
 		}catch (Exception e){
-			return new ResultMap(CodeType.SYSTEM_ERROR, "校验失败");
+			return new ResultMap(CodeType.TIME_OUT, "请求超时");
+		}
+	}
+
+	@Override
+	public Enterprise openVendor(Long enUU , boolean isRead , boolean isOpen) {
+		Enterprise existEnterprise = enterpriseDao.findOne(enUU);
+		if (isOpen){
+			existEnterprise.setEnMallVendorStatus((short) Status.ENABLED.value());
+			Enterprise enterprise = enterpriseDao.save(existEnterprise);
+			return null;
+		}
+		if (isRead) {
+			existEnterprise.setEnMallVendorStatus((short) Status.ISREAD.value());
+		}else{
+			existEnterprise.setEnMallVendorStatus(null);
 		}
+		Enterprise enterprise = enterpriseDao.save(existEnterprise);
+		return null;
 	}
 }

src/main/java/com/uas/platform/b2c/common/account/service/impl/UserServiceImpl.java

@@ -3,11 +3,9 @@ package com.uas.platform.b2c.common.account.service.impl;
 import com.uas.account.entity.UserDetail;
 import com.uas.account.util.AccountUtils;
 import com.uas.message.mail.service.MailService;
+import com.uas.platform.b2c.common.account.dao.UserCacheEnterpriseDao;
 import com.uas.platform.b2c.common.account.dao.UserDao;
-import com.uas.platform.b2c.common.account.model.Enterprise;
-import com.uas.platform.b2c.common.account.model.Role;
-import com.uas.platform.b2c.common.account.model.User;
-import com.uas.platform.b2c.common.account.model.UserInfo;
+import com.uas.platform.b2c.common.account.model.*;
 import com.uas.platform.b2c.common.account.service.UserService;
 import com.uas.platform.b2c.common.base.dao.CommonDao;
 import com.uas.platform.b2c.core.config.MessageConf;
@@ -63,6 +61,9 @@ public class UserServiceImpl implements UserService {
 	@Autowired
 	private CommonDao commonDao;
 
+	@Autowired
+	private UserCacheEnterpriseDao userCacheEnterpriseDao;
+
 	@Autowired
 	private MailService mailService;
 	@Autowired
@@ -385,6 +386,27 @@ public class UserServiceImpl implements UserService {
 		}
 	}
 
+	@Override
+	public UserCacheEnterprise saveUserCacheEnterprise(User user, UserCacheEnterprise userCacheEnterprise) {
+		userCacheEnterprise.setUserUU(user.getUserUU());
+		if (null != userCacheEnterpriseDao.findOne(user.getUserUU())){
+			userCacheEnterpriseDao.delete(user.getUserUU());
+			return userCacheEnterpriseDao.save(userCacheEnterprise);
+		}else{
+			return userCacheEnterpriseDao.save(userCacheEnterprise);
+		}
+	}
+
+	@Override
+	public UserCacheEnterprise getUserCacheEnterprise(User user) {
+		return userCacheEnterpriseDao.findOne(user.getUserUU());
+	}
+
+	@Override
+	public void deleteUserCacheEnterprise(User user) {
+		userCacheEnterpriseDao.delete(userCacheEnterpriseDao.findOne(user.getUserUU()));
+        userCacheEnterpriseDao.flush();
+	}
 	@Override
 	public User updateUserPay(User user, String userPay, String newUserPay) {
 		boolean result =false;

src/main/java/com/uas/platform/b2c/common/account/v2/service/impl/UserServiceImpl.java

@@ -11,6 +11,7 @@ import com.uas.platform.core.model.Status;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
 
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -31,17 +32,52 @@ public class UserServiceImpl implements UserService {
 
     @Override
     public void save(User user) {
-        com.uas.platform.b2c.common.account.model.User u = userDao.findOne(Long.parseLong(user.getDialectUID()));
+        com.uas.platform.b2c.common.account.model.User u = null;
+        if (!StringUtils.isEmpty(user.getDialectUID())) {
+            u = userDao.findOne(Long.parseLong(user.getDialectUID()));
+        }
+        if (u == null && !StringUtils.isEmpty(user.getUid()) ){
+            List<com.uas.platform.b2c.common.account.model.User> users = userDao.findUserByUserTel(user.getUid());
+            if (!CollectionUtils.isEmpty(users)){
+                if (users.size() != 1 || !users.get(0).getUserUU().equals(user.getDialectUID())) {
+                    userDao.delete(users);
+                }else{
+                    u = users.get(0);
+                }
+            }
+        }
         if (null == u) {
             u = new com.uas.platform.b2c.common.account.model.User();
         }
+        oneSave(user,u);
+//        if (null == user.getDialectUID() || "".equals(user.getDialectUID())){
+//            List<com.uas.platform.b2c.common.account.model.User> users = userDao.findUserByUserTel(user.getUid());
+//            if (!CollectionUtils.isEmpty(users)){
+//                for (com.uas.platform.b2c.common.account.model.User u:users){
+//                    oneSave(user,u);
+//                }
+//            }
+//        }else {
+//            com.uas.platform.b2c.common.account.model.User u = userDao.findOne(Long.parseLong(user.getDialectUID()));
+//            if (null == u) {
+//                u = new com.uas.platform.b2c.common.account.model.User();
+//                oneSave(user,u);
+//            }
+//        }
+
+    }
+    private void oneSave(User user , com.uas.platform.b2c.common.account.model.User u){
         u.setUserPwd(user.getPassword());
         u.setUserName(user.getName());
         u.setUserTel(user.getUid());
         u.setEnable((short) 1);
         u.setUserEmail(user.getSecondUID());
         u.setUserUU(Long.valueOf(user.getDialectUID()));
-        Enterprise enterprise = enterpriseDao.findByUu(Long.valueOf(user.getSpaceDialectUID()));
+
+        Enterprise enterprise = null;
+        if(user.getSpaceDialectUID()!=null){
+            enterprise = enterpriseDao.findByUu(Long.valueOf(user.getSpaceDialectUID()));
+        }
         if (null != enterprise) {
             u.setEnterprise(enterprise);
             if (null == enterprise.getEnAdminuu()) {
@@ -50,7 +86,6 @@ public class UserServiceImpl implements UserService {
                 logger.log("设置管理员", enterprise.getEnName() + ":" + enterprise.getUu() + ";" + u.getUserName() + ":" + u.getUserUU());
             }
         }
-
         boolean isMember = false;
         //将该成员添加至企业
         Set<Enterprise> ens = u.getEnterprises();
@@ -62,7 +97,6 @@ public class UserServiceImpl implements UserService {
                 }
             }
         }
-
         if (!isMember) {
             Set<Enterprise> enterprises = null;
             if (null == u.getEnterprises()) {
@@ -79,11 +113,10 @@ public class UserServiceImpl implements UserService {
         List<com.uas.platform.b2c.common.account.model.User> oldUsers = userDao.findUserByUserUU(u.getUserUU());
         userDao.save(u);
         if (oldUsers.size() > 0) {
-            logger.log("更新用户信息", user.getDialectUID() + "" + enterprise.getUu());
+            logger.log("更新用户信息", user.getDialectUID() + "" + (enterprise==null?"":enterprise.getUu()));
         } else {
-            logger.log("新增用户信息", user.getDialectUID() + ", " + enterprise.getUu());
+            logger.log("新增用户信息", user.getDialectUID() + ", " + (enterprise==null?"":enterprise.getUu()) );
         }
-
     }
 
     @Override

src/main/java/com/uas/platform/b2c/prod/product/common/CommonTask.java

@@ -29,7 +29,7 @@ public class CommonTask {
     public void updateCount() {
         List<CommonCount> commonCounts = commonCountDao.findByStatus((short) 1);
         for (CommonCount commonCount : commonCounts) {
-            commonCount.setCount(jdbcTemplate.queryForLong(commonCount.getSql()));
+            commonCount.setCount(jdbcTemplate.queryForObject(commonCount.getSql(), Double.class));
         }
         commonCountDao.save(commonCounts);
     }

src/main/java/com/uas/platform/b2c/prod/product/common/api/CommonCountController.java

@@ -10,6 +10,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -55,11 +56,22 @@ public class CommonCountController {
      * @return
      */
     @RequestMapping(value ="/{id}/count", method = RequestMethod.GET)
-    public Long findCountById(@PathVariable("id") Long id) {
+    public String findCountById(@PathVariable("id") Long id) {
         CommonCount commonCount = commonCountService.findById(id);
-        if(commonCount == null)
+        if(commonCount == null && commonCount.getCount() != null)
             throw new IllegalArgumentException("参数ID错误，数据不存在");
-        return commonCount.getCount();
+
+        String result = "";
+        Double countdb = commonCount.getCount();
+        if (countdb % 1.0 == 0) {
+            result = String.valueOf(countdb.longValue());
+        } else {
+            BigDecimal count = new BigDecimal(countdb);
+            BigDecimal dividenum = new BigDecimal(1);
+            result = count.divide(dividenum, 3, BigDecimal.ROUND_HALF_UP).toString();
+        }
+
+        return result;
     }
 
 }

src/main/java/com/uas/platform/b2c/prod/product/common/model/CommonCount.java

@@ -46,7 +46,7 @@ public class CommonCount implements Serializable{
      * 数量
      */
     @Column(name = "cc_count")
-    private Long count;
+    private Double count;
 
     /**
      * 应用
@@ -92,11 +92,11 @@ public class CommonCount implements Serializable{
         this.sql = sql;
     }
 
-    public Long getCount() {
+    public Double getCount() {
         return count;
     }
 
-    public void setCount(Long count) {
+    public void setCount(Double count) {
         this.count = count;
     }
 

src/main/java/com/uas/platform/b2c/trade/order/service/impl/PurchaseServiceImpl.java

@@ -34,7 +34,9 @@ import com.uas.platform.b2c.prod.commodity.model.Goods;
 import com.uas.platform.b2c.prod.commodity.model.GoodsHistory;
 import com.uas.platform.b2c.prod.commodity.service.GoodsService;
 import com.uas.platform.b2c.prod.product.common.service.CreateNumberService;
+import com.uas.platform.b2c.prod.store.dao.StoreApplyDao;
 import com.uas.platform.b2c.prod.store.dao.StoreInDao;
+import com.uas.platform.b2c.prod.store.model.StoreApply;
 import com.uas.platform.b2c.prod.store.model.StoreIn;
 import com.uas.platform.b2c.trade.aftersale.model.AfterSaleStatus;
 import com.uas.platform.b2c.trade.order.dao.*;
@@ -137,6 +139,8 @@ public class PurchaseServiceImpl implements PurchaseService {
 	@Autowired
 	private StoreInDao storeInDao;
 	@Autowired
+	private StoreApplyDao storeApplyDao;
+	@Autowired
 	private UserDao userDao;
 	@Autowired
     private PurchaseModifyingHistoryDao purchaseModifyingHistoryDao;
@@ -1163,7 +1167,10 @@ public class PurchaseServiceImpl implements PurchaseService {
 		} else {
 			List<StoreIn> storeInfos = storeInDao.findByEnUU(uu);
 			if (CollectionUtils.isEmpty(storeInfos)) {
-				throw new IllegalOperatorException("您还没有开店铺，请先前往开店.");
+				if (CollectionUtils.isEmpty(storeApplyDao.findByEnUUAndStatusOrderByAuthTimeDesc(uu, StoreApply.ApplyStatus.PASS))){
+					throw new IllegalOperatorException("您还没有开店铺，请先前往开店.");
+				}
+				throw new IllegalOperatorException("请前往我的店铺，完善店铺信息。");
 			} else {
 				storeid = storeInfos.get(0).getUuid();
 			}

src/main/java/com/uas/platform/b2c/trade/support/CodeType.java

@@ -53,7 +53,12 @@ public enum CodeType {
 	/**
 	 * 信息不一致
 	 */
-	INFO_UPDATE(11, "信息不一致");
+	INFO_UPDATE(11, "信息不一致"),
+
+	/**
+	 * 超时请求
+	 */
+	TIME_OUT(12, "TIME_OUT");
 
 	private int code;
 

src/main/resources/prod/account.properties

@@ -11,7 +11,7 @@ sso.cookie.secure=true
 sso.cookie.httponly=true
 sso.login.url=https://account.ubtob.com/sso/login
 sso.logout.url=https://account.ubtob.com/sso/logout
-sso.register.url=http://account.ubtob.com/sso/register
+sso.register.url=http://account.ubtob.com/sso/register_p
 
 #cross domain
 sso.ask.url=https://account.ubtob.com/sso/login/ask

src/main/resources/test/account.properties

@@ -9,7 +9,7 @@ sso.secretkey=0taQcW073Z7G628g5H
 sso.cookie.secure=false
 sso.login.url=http://113.105.74.135:8001/sso/login
 sso.logout.url=http://113.105.74.135:8001/sso/logout
-sso.register.url=http://113.105.74.135:8001/sso/register
+sso.register.url=http://113.105.74.135:8001/sso/register_p
 
 #cross domain
 sso.ask.url=http://113.105.74.135:8001/sso/login/ask

src/main/webapp/resources/js/common/controllers/commonCtrls.js

@@ -105,7 +105,7 @@ define([ 'app/app' ], function(app) {
 				return AuthenticationService.getAuthentication().success(function(data) {
 					if(data && data.enterprises) {
 						//data.enterprise = data.enterprises[data.enterprises.length - 1];
-						if(data.enterprises.length > 1) {
+						if(data.enterprises.length > 0) {
 							var enSelect = [];
 							angular.forEach(data.enterprises, function(e){
 								if(e.current)

src/main/webapp/resources/js/common/query/enterprise.js

@@ -149,6 +149,10 @@ define([ 'angular', 'ui-bootstrap', 'ngResource' ], function(angular) {
 				url : 'basic/enterprise/:enuu/info',
 				method : 'GET'
 			},
+            getEnterpriseDetailInfo : {
+                url : 'basic/enterprise/:enuu/detailInfo',
+                method : 'GET'
+            },
 			getAllUsersByEnuu : {
 				url : 'basic/user/enterprise/info',
 				method : 'GET'

src/main/webapp/resources/js/vendor/app.js

@@ -886,8 +886,18 @@ define([ 'angularAMD', 'ngLocal', 'common/services', 'common/directives', 'commo
 	/**
 	 * 卖家中心菜单控制器
 	 */
-	app.controller('VendorMenuCtrl', ['$scope', 'StoreInfo', function ($scope, StoreInfo) {
-
+	app.controller('VendorMenuCtrl', ['$scope', 'StoreInfo','$rootScope', function ($scope, StoreInfo,$rootScope) {
+        //是寄售店铺
+        $scope.isCONSIGNMENT = false;
+
+        StoreInfo.findShopOwnerApplyByNormalStatus({}, {}, function (result) {
+            if (!result.data) {
+                $scope.isCONSIGNMENT = true;
+            }else if (result.data.type == 'CONSIGNMENT' || result.data.status == 'PREPARE'){
+            $scope.isCONSIGNMENT = true;
+       		 }}, function (error) {
+
+        });
 	}]);
 
 

src/main/webapp/resources/js/vendor/controllers/forstore/vendor_index_ctrl.js

@@ -6,6 +6,10 @@ define(['app/app', 'calendar'], function(app) {
     'use strict';
     app.register.controller('vendorIndexCtrl', ['$scope', 'toaster', 'VendorService', '$rootScope', 'News', '$filter','$modal', function($scope, toaster, VendorService, $rootScope, News, $filter,$modal) {
         $rootScope.active = 'index';
+        //个人账户
+        if (!$rootScope.userInfo.enterprise){
+            window.location.href = './register-saler';
+        }
         VendorService.getVendorInfo(null, function(data){
             $scope.vendor = data;
         }, function(response) {

src/main/webapp/resources/js/vendor/controllers/forstore/vendor_logistics_ctrl.js

@@ -3,14 +3,24 @@
  */
 define(['app/app', 'calendar'], function (app) {
 	"use strict";
-	app.register.controller('vendorLogisticsCtrl', ['$scope', '$rootScope', '$http', 'ngTableParams', 'BaseService', 'ShippingAddress', 'toaster', 'SmoothScroll', '$modal','$stateParams','Purchase','Logistics','KdnLogistics','$filter', function($scope, $rootScope, $http, ngTableParams, BaseService, ShippingAddress, toaster, SmoothScroll, $modal, $stateParams, Purchase, Logistics, KdnLogistics, $filter) {
+	app.register.controller('vendorLogisticsCtrl', ['$scope', '$rootScope', '$http', 'ngTableParams', 'BaseService', 'ShippingAddress', 'toaster', 'SmoothScroll', '$modal','$stateParams','Purchase','Logistics','KdnLogistics','$filter','StoreInfo', function($scope, $rootScope, $http, ngTableParams, BaseService, ShippingAddress, toaster, SmoothScroll, $modal, $stateParams, Purchase, Logistics, KdnLogistics, $filter, StoreInfo) {
 		// 加密过滤器
 		var enIdFilter = $filter('EncryptionFilter');
 		document.title = '发货地址-优软商城';
 		$rootScope.active = 'vendor_logistics';
 		$scope.tab = 'logistic';
 		$scope.canAddTotal = 20;
-
+        //是寄售店铺
+        $scope.isCONSIGNMENT = false;
+        StoreInfo.findShopOwnerApplyByNormalStatus({}, {}, function (result) {
+            if (!result.data) {
+                $scope.isCONSIGNMENT = true;
+                $scope.storeType = 'mall';
+            }else if (result.data.type == 'CONSIGNMENT' || result.data.status == 'PREPARE'){
+                $scope.isCONSIGNMENT = true;
+            }}, function (error) {
+
+        });
 		$scope.addressEx = {};
 
 		//地址的条数是否超过5条

src/main/webapp/resources/js/vendor/controllers/forstore/vendor_order_ctrl.js

@@ -4,7 +4,7 @@
  */
 define(['app/app'], function (app) {
     "use strict";
-    app.register.controller('vendorOrderCtrl', ['$scope', '$rootScope', 'Purchase', 'ngTableParams', 'BaseService', 'toaster', '$state', '$filter', 'Return', 'Change', '$modal', 'PuExProcess', 'Recommendation', 'DateUtil', 'Loading', 'bankInfoService', 'Logistics', 'Distributor', 'SessionService','Rate', function ($scope, $rootScope, Purchase, ngTableParams, BaseService, toaster, $state, $filter, Return, Change, $modal, PuExProcess, Recommendation, DateUtil, Loading, bankInfoService, Logistics, Distributor, SessionService, Rate) {
+    app.register.controller('vendorOrderCtrl', ['$scope', '$rootScope', 'Purchase', 'ngTableParams', 'BaseService', 'toaster', '$state', '$filter', 'Return', 'Change', '$modal', 'PuExProcess', 'Recommendation', 'DateUtil', 'Loading', 'bankInfoService', 'Logistics', 'Distributor', 'SessionService','Rate','StoreInfo', function ($scope, $rootScope, Purchase, ngTableParams, BaseService, toaster, $state, $filter, Return, Change, $modal, PuExProcess, Recommendation, DateUtil, Loading, bankInfoService, Logistics, Distributor, SessionService, Rate, StoreInfo) {
         $rootScope.active = 'vendor_order';
         document.title = '已卖出的产品-优软商城';
         // 加密过滤器
@@ -30,6 +30,8 @@ define(['app/app'], function (app) {
         $scope.canEnsureRec = false;
         //是商城管理员的公司
         $scope.isYrscStore = false;
+        //是寄售店铺
+        $scope.isCONSIGNMENT = false;
         //分页参数
         $scope.tableParams = {
             page: 1,
@@ -52,6 +54,15 @@ define(['app/app'], function (app) {
         if ($rootScope.store && ($scope.yrscStore == $rootScope.store.uuid)) {
             $scope.isYrscStore = true;
         }
+        StoreInfo.findShopOwnerApplyByNormalStatus({}, {}, function (result) {
+            if (!result.data) {
+                $scope.isCONSIGNMENT = true;
+                $scope.storeType = 'mall';
+            }else if (result.data.type == 'CONSIGNMENT' || result.data.status == 'PREPARE'){
+                $scope.isCONSIGNMENT = true;
+                $scope.storeType = 'mall';
+            }}, function (error) {
+        });
 
         var unavailableReasons = {
             315: '已注销',

src/main/webapp/resources/js/vendor/controllers/forstore/vendor_store_apply_ctrl.js

@@ -57,6 +57,11 @@ define(['app/app', 'jquery-uploadify'], function (app) {
 							angular.forEach(result.qualifications, function (qualification) {
 								$scope.qualifications[qualification.type] = qualification;
 							});
+						}else {
+							Enterprise.getEnterpriseDetailInfo({ enuu : enterprise.uu},{},function (enterpriseDetail) {
+								$scope.enBuinesssCode = enterpriseDetail.businessCodeImage;
+                                $scope.qualifications[$scope.qType.businessLicense] = generateQualification($scope.enBuinesssCode, $scope.qType.businessLicense);;
+                            });
 						}
 						if (result.brands) {
 							$scope.brands = [];

src/main/webapp/resources/view/common/site-nav.html

@@ -163,14 +163,15 @@
                         <a href="javascript:void(0)"><span ng-bind="userInfo.userName"></span><span>（个人账户）</span></a>
                     </li>-->
                     <li style="line-height: 30px;">
-                        <a href="javascript:void(0)" ng-click="switchto('0')"><span ng-bind="userInfo.userName"></span><span>（个人账户）</span></a>
+                        <a href="javascript:void(0)" ng-click="switchto('0')" ng-if="userInfo.enterprise"><span ng-bind="userInfo.userName"></span><span>（个人账户）</span></a>
                     </li>
                 </ul>
             </div>
         </li>
         <li><a href=".">商城首页</a></li>
         <li ng-if="userInfo"><a href="user#/home">买家中心</a></li>
-        <li ng-if="userInfo.enterprise.uu"><a href="vendor#/index">卖家中心</a></li>
+        <li ng-if="userInfo.enterprise && userInfo.enterprise.isVendor == 313"><a href="vendor">卖家中心</a></li>
+        <li ng-if="!userInfo.enterprise || userInfo.enterprise.isVendor != 313"><a href="./register-saler">卖家中心</a></li>
         <li><a href="help/home" target="_blank">帮助中心</a></li>
         <!-- <li><a href="http://wpa.qq.com/msgrd?v=3&uin=3432892085&site=www.ubtoc.com&menu=yes" target="_blank">在线客服</a></li> -->
        <!-- <li><a href="javascript:void(0)">服务电话:400-830-1818</a></li>-->

src/main/webapp/resources/view/store/default/goodslist.html

@@ -355,14 +355,14 @@
 					</td>
 				</tr>
 				<tr ng-if="$data.length == 0">
-					<td colspan="10">
-						<div class="text-center">
-							<div class="col-xs-offset-3 col-xs-2">
+					<td colspan="12">
+						<div class="empty">
+							<p class="empty-img">
 								<img src="static/img/all/empty-cart.png">
-							</div>
-							<div class="col-xs-4 txt-info">
-								<p class="grey f16">暂无器件信息</p>
-								<i class="fa fa-mail-reply fa-xs"></i>&nbsp;<a href=".">返回首页</a>
+							</p>
+							<div class="empty-info">
+								<p class="grey"> 暂无器件信息 </p>
+								<a href="/">马上去逛一逛</a>
 							</div>
 						</div>
 					</td>
@@ -372,3 +372,32 @@
 		</div>
 	</div>
 </div>
+<style>
+	/**/
+	.goodslist .empty{
+		overflow: hidden;
+		margin: 0!important;
+		width:100%;
+		display:inline-flex;
+		justify-content:center;
+		align-items: center;
+		height:200px;
+	}
+	.goodslist .empty-info{
+		line-height: 14px;
+		padding-top:10px;
+		margin-left:10px;
+		text-align:left;
+	}
+	.goodslist .empty-info .grey{
+		color: #999;
+		font-size: 14px;
+	}
+	.goodslist .empty .empty-info>a{
+		display: block;
+		font-size: 14px;
+		color: #5078cb;
+		background: url(static/img/all/icon_nianxian.jpg)no-repeat;
+		padding-left: 25px;
+	}
+</style>

src/main/webapp/resources/view/usercenter/componentStore.html

@@ -138,15 +138,6 @@ td {
 	cursor : pointer!important;
 	color : #5078cb;
 }
-.no-collect{
- 	height: 60px;
-	text-align: center;
-    background: white;  
-}
-.no-collect span{
-	line-height: 60px; 
-	font-size: 18px;
-}
 .com-del-box{
 	position: fixed;
 	z-index: 2;
@@ -235,6 +226,29 @@ td {
 	background: #fff;
 	padding: 0 5px;
 }
+
+.no-collect{
+	height: 255px;
+	width:100%;
+	display:inline-flex;
+	justify-content: center;
+	align-items: center;
+	background: white;
+}
+.no-collect p{
+	padding-top:10px;
+	font-size: 14px;
+	color: #999;
+	margin-left:15px;
+	line-height: 28px;
+}
+.no-collect p a{
+	color: #5078cb;
+	display: block;
+	background: url(static/img/all/icon_nianxian.jpg)no-repeat;
+	background-position: 0px 7px;
+	padding-left: 25px;
+}
 </style>
 <div class="user_right fr">
 	<div class="rt_menu">
@@ -278,7 +292,12 @@ td {
 	</div>
 	
 	<div class="no-collect" ng-if="collectInfo.length == 0">
-		<span><i class="fa fa-smile-o fa-lg"></i>  亲！您还没有收藏产品,赶快去收藏吧！</span>
+		<img src="static/img/all/empty-cart.png">
+		<p>
+			<span>暂无产品收藏</span>
+			<br>
+			<a href="/">马上去逛一逛</a>
+		</p>
 	</div>
 	
 	<!-- <table ng-table="componentTableParams"

src/main/webapp/resources/view/usercenter/forstore/account_manager.html

@@ -111,6 +111,33 @@
 	.count01 ul li span h5 {
 		width: 30px;
 	}
+	/**/
+	 .empty{
+		width:100%;
+		overflow: hidden;
+		height:100px;
+		margin: 0!important;
+		display:inline-flex;
+		justify-content: center;
+		 align-items: center;
+	}
+	.empty-info{
+		line-height: 28px;
+		padding-top:10px;
+		margin-left:10px;
+		text-align: left;
+	}
+	.empty-info .grey{
+		color: #999;
+		font-size: 14px;
+	}
+	.empty .empty-info>a{
+		font-size: 14px;
+		color: #5078cb;
+	}
+	 .empty .empty-info i{
+		margin-right:5px;
+	}
 </style>
 <!--右侧主体部分-->
 <div class="user_right fr" id="account_manager">
@@ -151,7 +178,7 @@
 		<div class="rt_menu">
 			<span>您的个人信息</span>
 			<span class="fr" >
-				<button ng-if=" !updateState"  ng-click="changeToUpdate(true)">修改</button>
+				<!--<button ng-if=" !updateState"  ng-click="changeToUpdate(true)">修改</button>-->
 				<button ng-if=" updateState"  ng-click="saveUpdate()">保存</button>
 				<button ng-if="updateState" ng-click="changeToUpdate(false)" style="color: #f00">取消</button>
 			</span>
@@ -261,7 +288,7 @@
 		<div class="menu-title row">现有收货地址<span>&nbsp;已保存<em>{{total}}</em>条，还能新增<em>{{canAddTotal-total}}</em>条地址</span></div>
 		<div class="add-log row" ng-if="total < canAddTotal"><button ng-click="modifyAddress()"><i class="fa fa-plus-square"></i>新增收货地址</button></div>
 		<div class="log-tab">
-			<table class="table">
+			<table class="table" style="table-layout: auto">
 				<thead>
 				<tr>
 					<th class="text-left" width="200">联系人</th>
@@ -287,6 +314,15 @@
 				</tr>
 				</tbody>
 			</table>
+			<div class="empty" ng-if="addressList.length <= 0 || !addressList">
+				<p class="empty-img">
+					<img src="static/img/all/empty-cart.png">
+				</p>
+				<div class="empty-info">
+					<p class="grey">暂无收货地址，赶快去新增吧</p>
+					<!--<a href="user#/home"><i class="fa fa-mail-reply fa-xs"></i>返回上一页</a>-->
+				</div>
+			</div>
 		</div>
 	</div>
 </div>

src/main/webapp/resources/view/usercenter/forstore/browsing_history.html

@@ -361,19 +361,32 @@
        border-bottom-left-radius: 4px;
        box-shadow: inset 0 1px 1px rgba(0,0,0,.075);
        transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s;
-   }
-    .no-store{
-        background: #fff;
-        height: 60px;
-        text-align: center;
-    }
-   .no-store span{
-       line-height: 60px;
-       font-size: 16px;
    }
     .history-list01 ul li a.delete:hover{
         color : #5078cb;
     }
+   .no-store{
+       height: 255px;
+       width:100%;
+       display:inline-flex;
+       justify-content: center;
+       align-items: center;
+       background: white;
+   }
+   .no-store p{
+       padding-top:10px;
+       font-size: 14px;
+       color: #999;
+       margin-left:15px;
+       line-height: 28px;
+   }
+   .no-store p a{
+       color: #5078cb;
+       display: block;
+       background: url(static/img/all/icon_nianxian.jpg)no-repeat;
+       background-position: 0px 7px;
+       padding-left: 25px;
+   }
 </style>
 <div class="history user_right fr">
     <div class="rt_menu">
@@ -446,7 +459,12 @@
         </div>
     </div>
     <div class="no-store" ng-if="history.length == 0">
-        <span><i class="fa fa-smile-o fa-lg"></i>  暂无浏览历史</span>
+        <img src="static/img/all/empty-cart.png">
+        <p>
+            <span>暂无浏览历史</span>
+            <br>
+            <a href="/">马上去逛一逛</a>
+        </p>
     </div>
    <!-- <p class="height16" style="background: #f5f5f5;">&nbsp</p>-->
    <!-- <div class="history-list02">

src/main/webapp/resources/view/usercenter/forstore/buyer_cart.html

@@ -498,6 +498,16 @@
 	.sure_oder select:disabled.select:hover{
 		cursor: not-allowed;
 	}
+	.com-del-box {
+		top: 101%!important ;
+		left: 24%!important ;
+	}
+	.com-del-box .title{
+		width: 100%!important ;
+	}
+	.com-del-box .title i{
+		background: none;
+	}
 </style>
 <div class="user_right fr" id="buyer_cart">
 	<!--订单中心-->
@@ -685,14 +695,13 @@
 						</dd>
 					</div>
 				</div>
-				<div class="text-center row"ng-if="cartIsEmpty">
-					<div class="col-xs-offset-3 col-xs-2">
-						<img src="static/img/all/empty-cart.png">
-					</div>
-					<div class="col-xs-5">
-						<p class="grey f16">您的购物车空空如也，请先挑选您想要购买的产品吧！</p>
-						<a href=".">马上去逛一逛</a>&nbsp;<i class="fa fa-arrow-right"></i>
-					</div>
+				<div class="no-store" ng-if="cartIsEmpty">
+					<img src="static/img/all/empty-cart.png">
+					<p>
+						您的购物车空空如也，请先挑选您想要购买的产品吧！
+						<br>
+						<a href="/">马上去逛一逛</a>
+					</p>
 				</div>
 				<p class="height16" ng-if="!cartIsEmpty">&nbsp</p>
 				<dd class="all_price fixed-bottom" ng-if="!cartIsEmpty && countByPage > 4">
@@ -748,6 +757,31 @@
 		</ul>
 	</div>-->
 </div>
+
+<style>
+	.no-store{
+		height: 255px;
+		width:100%;
+		display:inline-flex;
+		justify-content: center;
+		align-items: center;
+		background: white;
+	}
+	.no-store p{
+		padding-top:10px;
+		font-size: 14px;
+		color: #999;
+		margin-left:15px;
+		line-height: 28px;
+	}
+	.no-store p a{
+		color: #5078cb;
+		display: block;
+		background: url(static/img/all/icon_nianxian.jpg)no-repeat;
+		background-position: 0px 7px;
+		padding-left: 25px;
+	}
+</style>
 <script>
 	$(function(){
 		$(window).bind("scroll",function() {

src/main/webapp/resources/view/usercenter/forstore/buyer_invoice.html

@@ -446,6 +446,32 @@
         -webkit-transition: color 99999s ease-out, background-color 99999s ease-out;
        /* -webkit-box-shadow: 0 0 0px 1000px white inset;*/
     }
+    .ticket_record .empty{
+        overflow: hidden;
+        margin: 0!important;
+        display:inline-flex;
+        align-items: center;
+        width: 100%;
+        justify-content: center;
+        height: 200px;
+    }
+    .ticket_record .empty-info{
+        line-height: 28px;
+        width: 143px;
+        text-align: left;
+        margin-left:10px;
+    }
+    .ticket_record .empty-info .grey{
+        color: #999;
+        font-size: 14px;
+    }
+    .ticket_record .empty .empty-info>a{
+        font-size: 14px;
+        color: #5078cb;
+    }
+    .ticket_record .empty .empty-info i{
+        margin-right:5px;
+    }
 </style>
 <!--右侧主体部分-->
 <div class="user_right fr u_c_invoice">
@@ -499,11 +525,23 @@
                             <a  ng-click="deleteInvoice(invoice)">删除</a>
                         </span>
                     </dd>
-                    <dd ng-if="invoices.length == 0 || !invoices" class="text-center invoice-box" style="font-size: 12px;line-height: 200px;height: 200px; border: none!important;">
-                        <img src="static/img/all/empty-cart.png">
-                        <span style="width: auto;float: right;line-height: 200px;color: #999;position: relative;right: 400px;font-size: 12px">暂无开票信息</span>
-                    </dd>
+                    <!--<dd ng-if="invoices.length == 0 || !invoices" class="text-center invoice-box" style="font-size: 12px;line-height: 200px;height: 200px; border: none!important;">-->
+                        <!--<img src="static/img/all/empty-cart.png">-->
+                        <!--<span style="width: auto;float: right;line-height: 200px;color: #999;position: relative;right: 390px;font-size: 12px">暂无开票-->
+                            <!--<a href="javascript:history.go(-1)" style="margin-left:20px;font-size: 14px;color:#5078cb"><i class="fa fa-mail-reply"></i>&nbsp;返回上一级</a>-->
+                        <!--</span>-->
+
+                    <!--</dd>-->
                 </dl>
+                <div class="empty" ng-if="invoices.length == 0 || !invoices">
+                    <p class="empty-img">
+                        <img src="static/img/all/empty-cart.png">
+                    </p>
+                    <div class="empty-info">
+                        <p class="grey"> 暂无发票信息 </p>
+                        <!--<a href="user#/home"><i class="fa fa-mail-reply fa-xs"></i>返回上一页</a>-->
+                    </div>
+                </div>
             </div>
         </div>
         <!--新增发票 -->

src/main/webapp/resources/view/usercenter/forstore/buyer_invoice_record.html

@@ -193,7 +193,7 @@
                     </tbody>
                     <tbody class="no-record-list" ng-if="billData.length <= 0 || !billData">
                     <tr class="height200">
-                    <td colspan="9" style="border: #fff 1px solid"><img src="static/img/all/empty-cart.png"><span>暂无开票记录</span></td>
+                    <td colspan="9" style="border: #fff 1px solid"><img src="static/img/all/empty-cart.png"><span class="f14">暂无开票记录</span></td>
                     </tr>
                     </tbody>
                 </table>

src/main/webapp/resources/view/usercenter/forstore/buyer_logistics.html

@@ -102,7 +102,10 @@
 							<dl ng-if="logisticsInfo.length != 0">
 								<dd ng-if="logisticsInfo.length != 0" ng-repeat="info in logisticsInfo"><em></em><span ng-bind="info.AcceptTime"></span><span ng-bind="info.AcceptStation"></span></dd>
 							</dl>
-							<div class="text-center f14 margin-top-15 padding-top-15 margin-bottom-15" ng-if="logisticsInfo.length == 0">暂时获取不到您订单的的物流信息</div>
+							<div class="text-center f14 margin-top-15 padding-top-15 margin-bottom-15" ng-if="logisticsInfo.length == 0">
+								暂时获取不到您订单的的物流信息
+								<a href="javascript:history.go(-1)" style="margin-left:20px;font-size: 14px;"><i class="fa fa-mail-reply"></i>&nbsp;返回上一级</a>
+							</div>
 						</div>
 					</div>
 					<div class="logistics_banner02">

src/main/webapp/resources/view/usercenter/forstore/buyer_no_invoice.html

@@ -156,6 +156,31 @@ body div.ng-table-pager a.page-a {
     #checkAll[disabled] + label {
         cursor: not-allowed;
     }
+}
+/**/
+.no-invoice .no-invoice-content .empty{
+    width:100%;
+    overflow: hidden;
+    margin: 0!important;
+    display:inline-flex;
+    align-items: center;
+}
+.no-invoice .no-invoice-content .empty .empty-info{
+    line-height: 28px;
+    width: 143px;
+    text-align: left;
+}
+.no-invoice .no-invoice-content .empty .empty-info .grey{
+    color: #999;
+    font-size: 14px;
+}
+.no-invoice .no-invoice-content .empty .empty-info>a{
+    font-size: 14px;
+    color: #5078cb;
+}
+.no-invoice .no-invoice-content .empty .empty-info i{
+    margin-right:5px;
+}
 </style>
 <!--右侧主体部分-->
 <div class="user_right fr u_c_invoice">
@@ -218,12 +243,16 @@ body div.ng-table-pager a.page-a {
                             </td>
                         </tr>
                     </tbody>
-                    <tbody class="no-record-list" ng-if="orderData.length <= 0 || !orderData">
-                        <tr class="height200">
-                            <td colspan="4" style="border: #fff 1px solid"><img src="static/img/all/empty-cart.png"><span>暂无未开票订单</span></td>
-                        </tr>
-                    </tbody>
                 </table>
+                <div class="empty" ng-if="orderData.length <= 0 || !orderData" style="width:100%;overflow: hidden;margin:0!important;display:inline-flex;align-items: center;justify-content: center;height:200px;">
+                    <p class="empty-img">
+                        <img src="static/img/all/empty-cart.png">
+                    </p>
+                    <div class="empty-info" style="margin-left:10px;">
+                        <p class="grey">暂无可开票订单</p>
+                        <!--<a href="user#/home"><i class="fa fa-mail-reply fa-xs"></i>返回上一页</a>-->
+                    </div>
+                </div>
             </div>
             <div class="apply-btn" ng-style="$$kdnData.totalElements>10?'margin-top: 100px':''" ng-if="orderData.length > 0">
                 <button ng-click="applyInvoice()">申请开票</button>

src/main/webapp/resources/view/usercenter/forstore/buyer_order.html

@@ -948,8 +948,8 @@
 						<img src="static/img/all/empty-cart.png">
 					</div>
 					<div class="col-xs-3">
-						<p class="grey f16">暂无订单信息，快去下单吧 </p>
-						<a ng-click="reload()">点击重新加载</a>&nbsp;<i class="fa fa-refresh"></i>
+						<p class="grey f16" style="font-size: 14px;">暂无订单信息，快去下单吧 </p>
+						<a ng-click="reload()" style="font-size: 14px;">点击重新加载</a>&nbsp;<i class="fa fa-refresh"></i>
 					</div>
 				</div>
 				<!--<p class="height16" style="background: #f5f5f5;" ng-if="currenctOrders.length != 0">&nbsp</p>-->

src/main/webapp/resources/view/usercenter/forstore/query_logistics.html

@@ -161,6 +161,31 @@
         font-size: 14px;
         color: #fff;
     }
+    /**/
+    .logistics_list_xq .empty{
+        overflow: hidden;
+        margin: 0!important;
+        width:100%;
+        display:inline-flex;
+        justify-content:center;
+        align-items: center;
+    }
+    .logistics_list_xq .empty-info{
+        line-height: 28px;
+        padding-top:10px;
+        margin-left:10px;
+    }
+    .logistics_list_xq .empty-info .grey{
+        color: #999;
+        font-size: 14px;
+    }
+    .logistics_list_xq .empty .empty-info>a{
+        font-size: 14px;
+        color: #5078cb;
+    }
+    .logistics_list_xq .empty .empty-info i{
+        margin-right:5px;
+    }
 </style>
 <!--右侧主体部分-->
 <div class="user_right fr">
@@ -236,7 +261,15 @@
                             <dl ng-if="logisticsInfo.length != 0">
                                 <dd ng-if="logisticsInfo.length != 0" ng-repeat="info in logisticsInfo"><em ng-class="{ active : $index ==logisticsInfo.length - 1}"></em><span ng-bind="info.AcceptTime"></span><span ng-bind="info.AcceptStation"></span></dd>
                             </dl>
-                            <div class="no-record text-center f14" ng-if="logisticsInfo.length == 0">暂时获取不到您订单的的物流信息</div>
+                            <div class="empty">
+                                <p class="empty-img">
+                                    <img src="static/img/all/empty-cart.png">
+                                </p>
+                                <div class="empty-info">
+                                    <p class="grey"> 暂时获取不到订单的物流信息 </p>
+                                    <!--<a href="user#/order"><i class="fa fa-mail-reply fa-xs"></i>返回上一页</a>-->
+                                </div>
+                            </div>
                         </div>
                     </div>
                     <!-- <div class="logistics_banner02">

src/main/webapp/resources/view/usercenter/forstore/store_focus.html

@@ -324,6 +324,30 @@
 		font-size: 14px;
 		color: #fff;
 	}
+	.no-store{
+		height: 215px;
+		width:100%;
+		display:inline-flex;
+		justify-content: center;
+		align-items: center;
+		background: white;
+	}
+	.no-store p{
+		padding-top:10px;
+		font-size: 14px;
+		color: #999;
+		margin-left:15px;
+		line-height: 25px;
+		text-align: left;
+	}
+	.no-store p a{
+		color: #5078cb;
+		display: block;
+		background: url(static/img/all/icon_nianxian.jpg)no-repeat;
+		background-position: 0px 7px;
+		padding-left: 25px;
+	}
+
 </style>
 <div class="user_right fr">
 	<div class="rt_menu" style="background-color:white">
@@ -353,7 +377,7 @@
 					<div class="img-div" ng-click="setActive(item)" ng-class="{'isSelected-background': isBatch &&item.active}">
 						<a name="imgDetail" href="store/{{item.storeInfo.uuid}}">
 							<img src="{{item.storeInfo.logoUrl}}" class="store-img"/>
-						</a>	
+						</a>
 						<div class="img-background-div" ng-class="{'notSelected': isBatch && !item.active, 'isSelected':  isBatch &&item.active}"></div>
 					</div>
 					<div style="width:760px;">
@@ -386,7 +410,7 @@
 							<div>公司介绍：
 								<span ng-bind="item.storeInfo.description"></span>
 							</div>
-						</div>	
+						</div>
 					</div>
 				</li>
 			</ul>
@@ -409,10 +433,16 @@
 				</div>
 			</div>
 		</div>
+		<!--<div class="no-store" ng-if="store.length == 0">-->
+			<!--<span><i class="fa fa-smile-o fa-lg"></i>  亲！您还没有关注店铺,赶快去关注吧！</span>-->
+		<!--</div>-->
 		<div class="no-store" ng-if="store.length == 0">
-			<span><i class="fa fa-smile-o fa-lg"></i>  亲！您还没有关注店铺,赶快去关注吧！</span>
+			<img src="static/img/all/empty-cart.png">
+			<p>
+				暂无店铺关注
+				<a href="/">马上去逛一逛</a>
+			</p>
 		</div>
-		
 	</div>
 </div>
 <div class="com-del-box" ng-if="deleteDiv">

src/main/webapp/resources/view/vendor/forstore/purchase_detail.html

@@ -856,7 +856,7 @@
 		<!--物流信息-->
 		<div class="logistics_list01" ng-if="purchase.status != 602 && purchase.status != 603 && purchase.status != 604 && purchase.status != 605 && purchase.status != 606 && purchase.status != 315">
 			<div class="log_menu">
-				<span>物流信息<em ng-hide="hasInfo" ng-if="purchase.status == 501 || purchase.status == 502 || purchase.status == 504 || purchase.status == 406 || purchase.status == 603" class="color666">（暂无物流信息）</em>
+				<span>物流信息
 					<b ng-if="logistics.companyName">物流公司：{{logistics.companyName || '空'}}&nbsp;&nbsp;&nbsp;物流单号：{{logistics.number || '空'}}</b>
 				</span>
 			</div>
@@ -865,15 +865,19 @@
 					<dd ng-repeat="info in logisticsInfo"><em></em><span ng-bind="info.AcceptTime"></span><span ng-bind="info.AcceptStation"></span></dd>
 				</dl>
 			</div>
-			<!--<div class="logistics_list_xq" ng-if="!hasInfo&&(purchase.status != 501 && purchase.status != 502 && purchase.status != 504 && purchase.status != 406)">-->
-			<div class="logistics_list_xq" ng-if="!hasInfo && !noLogisticInfoArray[purchase.status]">
-				<div ng-if="canShowInfo" style="text-align:center;height: 50px;line-height: 50px;font-size: 14px;">{{purchase.status | noLogisticFilter}}</div>
-				<div ng-if="!canShowInfo" style="text-align:center;height: 50px;line-height: 50px;font-size: 14px; color: #b0b0b0;">系统无法提供此物流信息，请根据物流单号到相应的官网查询。</div>
+			<div class="logistics_list_xq" ng-if="!hasInfo&&(purchase.status != 501 && purchase.status != 502 && purchase.status != 504 && purchase.status != 406)">
+				<div class="logistics_list_xq" ng-if="!hasInfo && !noLogisticInfoArray[purchase.status]">
+					<div ng-if="canShowInfo" style="text-align:center;height: 50px;line-height: 50px;font-size: 14px;">{{purchase.status | noLogisticFilter}}</div>
+					<div ng-if="!canShowInfo" style="text-align:center;height: 50px;line-height: 50px;font-size: 14px; color: #b0b0b0;">系统无法提供此物流信息，请根据物流单号到相应的官网查询。</div>
+				</div>
+			</div>
+			<div style="width:100%;text-align: center;" ng-hide="hasInfo" ng-if="purchase.status == 501 || purchase.status == 502 || purchase.status == 504 || purchase.status == 406 || purchase.status == 603">
+				<em style="font-size: 14px; color:#999;line-height: 70px;">暂无物流信息</em>
 			</div>
 		</div>
 		<!--订单信息-->
 		<div class="logistics_list01">
-			<div class="log_menu"><span>发票信息<em ng-if="purchase.invoicetype==1207" class="color666">（暂不开票）</em></span></div>
+			<div class="log_menu"><span>发票信息</span></div>
 			<div class="oder_xq clearfix" style="padding-bottom: 20px;" ng-if="purchase.invoicetype==1205 || purchase.invoicetype == 1206">
 				<p>
 					<b>发票类型：</b>
@@ -918,6 +922,9 @@
 					<span ng-if="!purchase.invoiceInfo.area">空</span>
 				</p>
 			</div>
+			<div style="width:100%;text-align: center;" ng-if="purchase.invoicetype==1207">
+				<em style="font-size: 14px; color:#999;line-height: 70px;">暂不开票</em>
+			</div>
 		</div>
 	</div>
 </div>

src/main/webapp/resources/view/vendor/forstore/query_logistics.html

@@ -160,6 +160,34 @@
         font-size: 14px;
         color: #fff;
     }
+
+
+    /**/
+   #empty{
+        overflow: hidden;
+        width:100%;
+        display:inline-flex;
+        justify-content:center;
+        align-items: center;
+       height: 135px;
+    }
+    #empty .empty-info{
+        line-height: 28px;
+        padding-top:10px;
+        margin-left:10px;
+        text-align: left;
+    }
+    #empty .empty-info .grey{
+        color: #999;
+        font-size: 14px;
+    }
+    #empty .empty-info>a{
+        font-size: 14px;
+        color: #5078cb;
+    }
+    #empty .empty-info i{
+        margin-right:5px;
+    }
 </style>
 <!--右侧主体部分-->
 <div class="user_right fr">
@@ -231,7 +259,21 @@
                             <dl ng-if="logisticsInfo.length != 0">
                                 <dd ng-if="logisticsInfo.length != 0" ng-repeat="info in logisticsInfo"><em ng-class="{ active : $index==logisticsInfo.length - 1}"></em><span ng-bind="info.AcceptTime"></span><span ng-bind="info.AcceptStation"></span></dd>
                             </dl>
-                            <div class="no-record text-center f14" ng-if="logisticsInfo.length == 0">暂时获取不到您订单的的物流信息</div>
+                            <!--<div class="no-record text-center f14" ng-if="logisticsInfo.length == 0">-->
+                                <!--暂时获取不到您订单的的物流信息-->
+                                <!--<a href="javascript:history.go(-1)" style="margin-left:20px;font-size: 14px;"><i class="fa fa-mail-reply"></i>&nbsp;返回上一级</a>-->
+                            <!--</div>-->
+                            <div class="no-record text-center f14" ng-if="logisticsInfo.length == 0">
+                                <div id="empty" >
+                                    <p class="empty-img">
+                                        <img src="static/img/all/empty-cart.png">
+                                    </p>
+                                    <div class="empty-info">
+                                        <p class="grey"> 暂时获取不到订单的的物流信息 </p>
+                                        <!--<a href="javascript:history.go(-1)"><i class="fa fa-mail-reply fa-xs"></i>返回上一页</a>-->
+                                    </div>
+                                </div>
+                            </div>
                         </div>
                     </div>
                     <!-- <div class="logistics_banner02">

src/main/webapp/resources/view/vendor/forstore/vendor-invoice.html

@@ -330,8 +330,8 @@
                     </tr>
                 </tbody>
                 <tbody class="no-record-list" ng-if="!billData || billData.length<=0">
-                <tr class="height200">
-                <td colspan="10" style="border: #fff 1px solid"><img src="static/img/all/empty-cart.png"><span>暂无开票申请</span></td>
+                <tr style="height:267px!important;">
+                <td colspan="10" style="border: #fff 1px solid"><img src="static/img/all/empty-cart.png"><span class="f14">暂无开票申请</span></td>
                 </tr>
                 </tbody>
             </table>
@@ -391,8 +391,8 @@
                 </tr>
                 </tbody>
                 <tbody class="no-record-list" ng-if="!billData || billData.length<=0">
-                <tr class="height200">
-                <td style="border: #fff 1px solid" colspan="10"><img src="static/img/all/empty-cart.png"><span>暂无开票记录</span></td>
+                <tr style="height:401px!important;">
+                <td style="border: #fff 1px solid" colspan="10"><img src="static/img/all/empty-cart.png"><span class="f14">暂无开票记录</span></td>
                 </tr>
                 </tbody>
             </table>

src/main/webapp/resources/view/vendor/forstore/vendor_brand_apply_list.html

@@ -33,6 +33,39 @@
         background: #fff;
         display: inline-block;
     }
+    /**/
+    .wanted_list01 .empty{
+        overflow: hidden;
+        margin: 0!important;
+        width:100%;
+        display:inline-flex;
+        justify-content:center;
+        align-items: center;
+        height:435px;
+    }
+    .wanted_list01 .empty-info{
+        line-height: 28px;
+        padding-top:10px;
+        margin-left:10px;
+        text-align:left;
+    }
+    .wanted_list01 .empty-info .grey{
+        color: #999;
+        font-size: 14px;
+    }
+    .wanted_list01 .empty .empty-info>a{
+        font-size: 14px;
+        color: #5078cb;
+    }
+    .wanted_list01 .empty .empty-info i{
+        display: inline-block;
+        width: 18px;
+        height: 18px;
+        margin-right: 5px;
+        background: url('static/img/vendor/images/upload-icon.png')no-repeat 0px 0px;
+        position: relative;
+        top: 7px;
+    }
 </style>
 <div class="user_right fr">
     <div class="brand wanted">
@@ -100,19 +133,17 @@
                             </div>
                         </td>
                     </tr>
-                    <tr ng-if="$data.length == 0">
-                        <td colspan="10" class="text-center"
-                            style="line-height: 40px; font-size: 20px; padding: 59px 0; border-bottom: none">
-                            <div class="col-xs-offset-3 col-xs-2">
-                                <img src="static/img/all/empty-cart.png">
-                            </div>
-                            <div class="col-xs-4">
-                                <p class="grey f16">您还没有申请过品牌资料</p>
-                            </div>
-                        </td>
-                    </tr>
                     </tbody>
                 </table>
+                <div class="empty">
+                    <p class="empty-img">
+                        <img src="static/img/all/empty-cart.png">
+                    </p>
+                    <div class="empty-info">
+                        <p class="grey"> 暂无品牌申请记录 </p>
+                        <a href="/vendor#/brand/apply/"><i></i>马上去申请</a>
+                    </div>
+                </div>
             </div>
         </div>
     </div>

src/main/webapp/resources/view/vendor/forstore/vendor_component_applylist.html

@@ -103,12 +103,23 @@
                             </td>
                         </tr>
                         <tr ng-if="$data.length == 0">
-                            <td colspan="10" class="text-center" style="line-height: 180px; border-bottom: none">
-                                <div class="col-xs-offset-3 col-xs-2">
-                                    <img src="static/img/all/empty-cart.png">
-                                </div>
-                                <div class="col-xs-4">
-                                    <p class="grey f16">您还没有申请过标准器件资料</p>
+                            <td colspan="12">
+                                <!--<div class="col-xs-offset-3 col-xs-2">-->
+                                    <!--<img src="static/img/all/empty-cart.png">-->
+                                <!--</div>-->
+                                <!--<div class="col-xs-4 text-right">-->
+                                    <!--<p class="grey f14">暂无器件申请记录-->
+                                        <!--<a href="vendor#/component/apply" style="margin-left:20px;font-size: 14px;color:#5078cb"><i class="fa fa-mail-reply"></i>&nbsp;马上去上传</a></p>-->
+                                    <!--</p>-->
+                                <!--</div>-->
+                                <div class="empty">
+                                    <p class="empty-img">
+                                        <img src="static/img/all/empty-cart.png">
+                                    </p>
+                                    <div class="empty-info">
+                                        <p class="grey"> 暂无器件申请记录 </p>
+                                        <a href="/vendor#/component/apply"><i></i>马上去申请</a>
+                                    </div>
                                 </div>
                             </td>
                         </tr>
@@ -118,4 +129,39 @@
             </div>
         </div>
     </div>
-</div>
+</div>
+<style>
+    /**/
+    .wanted_list01 .empty{
+        overflow: hidden;
+        margin: 0!important;
+        width:100%;
+        display:inline-flex;
+        justify-content:center;
+        align-items: center;
+        height:380px;
+    }
+    .wanted_list01 .empty-info{
+        line-height: 28px;
+        padding-top:10px;
+        margin-left:10px;
+        text-align:left;
+    }
+    .wanted_list01 .empty-info .grey{
+        color: #999;
+        font-size: 14px;
+    }
+    .wanted_list01 .empty .empty-info>a{
+        font-size: 14px;
+        color: #5078cb;
+    }
+    .wanted_list01 .empty .empty-info i{
+        display: inline-block;
+        width: 18px;
+        height: 18px;
+        margin-right: 5px;
+        background: url('static/img/vendor/images/upload-icon.png')no-repeat 0px 0px;
+        position: relative;
+        top: 7px;
+    }
+</style>

src/main/webapp/resources/view/vendor/forstore/vendor_component_batchapplylist.html

@@ -95,20 +95,54 @@
                                 <!--</div>-->
                             </td>
                         </tr>
-                        <tr ng-if="$data.length == 0">
-                            <td colspan="10" class="text-center" style="line-height: 180px; border-bottom: none">
-                                <div class="col-xs-offset-3 col-xs-2">
-                                    <img src="static/img/all/empty-cart.png"  style="margin-left: 55px;">
-                                </div>
-                                <div class="col-xs-4">
-                                    <p class="grey f12">您没有申请过标准器件资料</p>
-                                </div>
-                            </td>
-                        </tr>
                         </tbody>
                     </table>
+                    <div class="empty">
+                        <p class="empty-img">
+                            <img src="static/img/all/empty-cart.png">
+                        </p>
+                        <div class="empty-info">
+                            <p class="grey"> 暂无器件申请记录 </p>
+                            <a href="/vendor#/component/apply"><i></i>马上去申请</a>
+                        </div>
+                    </div>
                 </div>
             </div>
         </div>
     </div>
-</div>
+</div>
+<style>
+    /**/
+    .wanted_list01 .empty{
+        overflow: hidden;
+        margin: 0!important;
+        width:100%;
+        display:inline-flex;
+        justify-content:center;
+        align-items: center;
+        height:360px;
+    }
+    .wanted_list01 .empty-info{
+        line-height: 28px;
+        padding-top:10px;
+        margin-left:10px;
+        text-align:left;
+    }
+    .wanted_list01 .empty-info .grey{
+        color: #999;
+        font-size: 14px;
+    }
+    .wanted_list01 .empty .empty-info>a{
+        font-size: 14px;
+        color: #5078cb;
+    }
+    .wanted_list01 .empty .empty-info i{
+        display: inline-block;
+        width: 18px;
+        height: 18px;
+        margin-right: 5px;
+        background: url('static/img/vendor/images/upload-icon.png')no-repeat 0px 0px;
+        position: relative;
+        top: 7px;
+    }
+</style>

src/main/webapp/resources/view/vendor/forstore/vendor_delivery_rule.html

@@ -210,6 +210,37 @@
 	.ng-table-pager{
 		margin-right: 0 !important;
 	}
+	/**/
+	.no-record-list .empty{
+		overflow: hidden;
+		margin: 0!important;
+		width:100%;
+		height:350px;
+		display:inline-flex;
+		justify-content:center;
+		align-items: center;
+	}
+	.no-record-list .empty p.empty-img img{
+		position: relative;
+		bottom:0;
+	}
+	.no-record-list .empty-info{
+		line-height: 28px;
+		padding-top:10px;
+		margin-left:10px;
+		text-align: left;
+	}
+	.no-record-list .empty-info .grey{
+		color: #999;
+		font-size: 14px;
+	}
+	.no-record-list .empty .empty-info>a{
+		font-size: 14px;
+		color: #5078cb;
+	}
+	.no-record-list .empty .empty-info i{
+		margin-right:5px;
+	}
 </style>
 <!--右侧主体部分-->
 <div class="count user_right fr">
@@ -251,36 +282,46 @@
 					</tr>
 					</thead>
 					<tbody>
-					<tr ng-repeat="rule in $data">
-						<td ng-bind="rule.num">22</td>
-						<td ng-bind="deliveryMethod[rule.shippingMethod]">第三方配送</td>
-						<td ng-bind="rule.ruleName">深圳市内满100元包邮，不满1000元邮费20元不满1000元</td>
-						<td>
-							<p class="switch">
+				<tr ng-repeat="rule in $data">
+					<td ng-bind="rule.num">22</td>
+					<td ng-bind="deliveryMethod[rule.shippingMethod]">第三方配送</td>
+					<td ng-bind="rule.ruleName">深圳市内满100元包邮，不满1000元邮费20元不满1000元</td>
+					<td>
+						<p class="switch">
 								<span class="checkbox" ng-click="changeActive(rule.id, true)" ng-if="rule.active == 0">
 									<span><em></em></span>
 								</span>
-								<span class="checkbox active" ng-click="changeActive(rule.id, false)" ng-if="rule.active == 1">
+							<span class="checkbox active" ng-click="changeActive(rule.id, false)" ng-if="rule.active == 1">
 										<span><em></em></span>
 								</span>
-							</p>
-						</td>
-						<td>
-							<!--ui-sref="vendor_deliveryRule_add({ruleModify:{{turnToJson(rule)}}})"-->
-							<a ng-click="editRule(rule)">修改</a> | <a ng-click="showDeleteFrame(rule)">删除</a>
-						</td>
-					</tr>
+						</p>
+					</td>
+					<td>
+						<!--ui-sref="vendor_deliveryRule_add({ruleModify:{{turnToJson(rule)}}})"-->
+						<a ng-click="editRule(rule)">修改</a> | <a ng-click="showDeleteFrame(rule)">删除</a>
+					</td>
+				</tr>
 
-					<tr class="record-num" ng-if="$data">
-						<td colspan="5">
-							<span class="count-tip">显示 1-10 条,共 <em ng-bind="$data.length" style="color: #5078cb">2506</em> 条</span>
-						</td>
-					</tr>
-					</tbody>
-					<tbody class="no-record-list" ng-if="rules.length == 0">
-					<tr class="height200">
-						<td colspan="10"><img src="static/img/all/empty-cart.png"><span>暂无配送规则信息！</span></td>
-					</tr>
+				<tr class="record-num" ng-if="$data">
+					<td colspan="5">
+						<span class="count-tip">显示 1-10 条,共 <em ng-bind="$data.length" style="color: #5078cb">2506</em> 条</span>
+					</td>
+				</tr>
+				</tbody>
+					<tbody class="no-record-list" ng-if="$data.length == 0">
+						<tr>
+							<td colspan="12">
+								<div class="empty">
+									<p class="empty-img">
+										<img src="static/img/all/empty-cart.png">
+									</p>
+									<div class="empty-info">
+										<p class="grey"> 暂无配送规则,赶快去新增吧 </p>
+										<!--<a href="vendor#/index"><i class="fa fa-mail-reply fa-xs"></i>返回上一页</a>-->
+									</div>
+								</div>
+							</td>
+						</tr>
 					</tbody>
 				</table>
 			</div>

src/main/webapp/resources/view/vendor/forstore/vendor_distributor.html

@@ -71,7 +71,7 @@
 	.distributor-content {
 		width: 100%;
 		margin: 0 auto;
-		min-height: 489px;
+		min-height: 505px;
 		background: #fff;
 		padding-top: 25px;
 	}
@@ -146,6 +146,31 @@
 		position: relative;
 		top: -2px;
 	}
+	/**/
+	.distributor-content .empty{
+		overflow: hidden;
+		width:100%;
+		display:inline-flex;
+		justify-content:center;
+		align-items: center;
+		margin-top:150px;
+	}
+	.distributor-content .empty-info{
+		line-height: 28px;
+		padding-top:10px;
+		margin-left:10px;
+	}
+	.distributor-content .empty-info .grey{
+		color: #999;
+		font-size: 14px;
+	}
+	.distributor-content .empty .empty-info>a{
+		font-size: 14px;
+		color: #5078cb;
+	}
+	.distributor-content .empty .empty-info i{
+		margin-right:5px;
+	}
 </style>
 <!--右侧主体部分-->
 <div class="count user_right fr">
@@ -170,6 +195,15 @@
 					<i class="fa fa-minus-circle" ng-if="data.isOpen" ng-click="delete_distributor(data)"></i>
 				</li>
 			</ul>
+			<div class="empty" ng-if="data_list.length == 0">
+				<p class="empty-img">
+					<img src="static/img/all/empty-cart.png">
+				</p>
+				<div class="empty-info">
+					<p class="grey"> 暂无配送商,赶快去新增吧 </p>
+					<!--<a href="vendor#/index"><i class="fa fa-mail-reply fa-xs"></i>返回上一页</a>-->
+				</div>
+			</div>
 		</div>
 	</div>
 	<!--防误删-->

src/main/webapp/resources/view/vendor/forstore/vendor_logistics.html

@@ -11,15 +11,42 @@
 		position: relative;
 		top: 1px;
 	}
+	/**/
+	.logistic-content .empty{
+		overflow: hidden;
+		margin: 0!important;
+		width:100%;
+		display:inline-flex;
+		justify-content:center;
+		align-items: center;
+		height:340px;
+	}
+	.logistic-content .empty-info{
+		line-height: 28px;
+		padding-top:10px;
+		margin-left:10px;
+		text-align:left;
+	}
+	.logistic-content .empty-info .grey{
+		color: #999;
+		font-size: 14px;
+	}
+	.logistic-content .empty .empty-info>a{
+		font-size: 14px;
+		color: #5078cb;
+	}
+	.logistic-content .empty .empty-info i{
+		margin-right:5px;
+	}
 </style>
 <!--右侧主体部分-->
 <div class="count user_right fr">
 	<div class="count_center">
 		<div class="com_tab">
 			<ul class="fl">
-				<li ng-class="{'active': tab=='deliverRule'}"><a ui-sref="vendor_deliveryRule">配送规则</a></li>
-				<li ng-class="{'active': tab=='distributor'}"><a ui-sref="vendor_distributor">配送商</a></li>
-				<li ng-class="{'active': tab=='takeSelf'}"><a ui-sref="vendor_takeSelf">自提点</a></li>
+				<li ng-class="{'active': tab=='deliverRule'}" ng-if="!isCONSIGNMENT"><a ui-sref="vendor_deliveryRule">配送规则</a></li>
+				<li ng-class="{'active': tab=='distributor'}" ng-if="!isCONSIGNMENT"><a ui-sref="vendor_distributor">配送商</a></li>
+				<li ng-class="{'active': tab=='takeSelf'}" ng-if="!isCONSIGNMENT"><a ui-sref="vendor_takeSelf">自提点</a></li>
 				<li ng-class="{'active': tab=='logistic'}"><a ui-sref="vendor_logistics">发货地址</a></li>
 			</ul>
 		</div>
@@ -38,7 +65,7 @@
 						<th width="100"></th>
 					</tr>
 					</thead>
-					<tbody>
+					<tbody ng-if="addressList">
 					<tr ng-repeat="address in addressList">
 						<td class="text-left" title="{{address.name}}">{{address.name}}</td>
 						<td class="text-left">
@@ -54,6 +81,15 @@
 					</tr>
 					</tbody>
 				</table>
+				<div class="empty" ng-if="addressList.length == 0">
+					<p class="empty-img">
+						<img src="static/img/all/empty-cart.png">
+					</p>
+					<div class="empty-info">
+						<p class="grey"> 暂无发货地址,赶快去新增吧 </p>
+						<!--<a href="vendor#/index"><i class="fa fa-mail-reply fa-xs"></i>返回上一页</a>-->
+					</div>
+				</div>
 			</div>
 		</div>
 	</div>

src/main/webapp/resources/view/vendor/forstore/vendor_material.html

@@ -470,7 +470,7 @@
 		<div class="wanted_list01">
 			<!--在售产品-->
 			<div class="tab">
-				<table class="public-tab table">
+				<table class="public-tab table" style="table-layout: auto">
 					<thead>
 					<tr>
 						<th width="80">序号</th>
@@ -620,19 +620,16 @@
 						</td>
 					</tr>
 					</tbody>
-					<tbody ng-if="currenctMaterial.length == 0">
-					<tr style="height: 190px;">
-						<td colspan="7" style="border-bottom: none;">
-							<div class="col-xs-2"  style="margin-left: 34%; margin-top: 65px;">
-								<img src="static/img/all/empty-cart.png">
-							</div>
-							<div class="col-xs-4">
-								<p class="grey f16" style="line-height: 80px; text-align: left; margin-top: 70px;">暂无物料资料记录</p>
-							</div>
-						</td>
-					</tr>
-					</tbody>
 				</table>
+				<div class="empty" ng-if="currenctMaterial.length == 0">
+					<p class="empty-img">
+						<img src="static/img/all/empty-cart.png">
+					</p>
+					<div class="empty-info">
+						<p class="grey"> 暂无产品信息，赶快上传让更多人看到你的产品吧 </p>
+						<a href="/vendor#/vendor_upload"><i></i>马上去上传</a>
+					</div>
+				</div>
 				<div class="record-line text-right" ng-if="currenctMaterial.length != 0">
 					<div class="prompt" ng-show="standard_tab == 'unstandard'">
 						<strong class="text-inverse">*</strong>商城暂未收录的 品牌/器件，”原厂型号“将会显示为空且不可上架售卖，<br/>
@@ -669,3 +666,37 @@
 		<div><a ng-click="cancleDelete()">取消</a><a ng-click="confirmDelete()">确认</a></div>
 	</div>
 </div>
+<style>
+	/**/
+	.wanted_list01 .empty{
+		overflow: hidden;
+		width:100%;
+		display:inline-flex;
+		justify-content:center;
+		align-items: center;
+		height:305px;
+	}
+	.wanted_list01 .empty-info{
+		line-height: 28px;
+		padding-top:10px;
+		margin-left:10px;
+		text-align:left;
+	}
+	.wanted_list01 .empty-info .grey{
+		color: #999;
+		font-size: 14px;
+	}
+	.wanted_list01 .empty .empty-info>a{
+		font-size: 14px;
+		color: #5078cb;
+	}
+	.wanted_list01 .empty .empty-info i{
+		display: inline-block;
+		width: 18px;
+		height: 18px;
+		margin-right: 5px;
+		background: url('static/img/vendor/images/upload-icon.png')no-repeat 0px 0px;
+		position: relative;
+		top: 7px;
+	}
+</style>

src/main/webapp/resources/view/vendor/forstore/vendor_onSale.html

@@ -795,16 +795,30 @@
                     </tbody>
                     <tbody ng-if="!currenctGoods || currenctGoods.length <= 0">
                     <tr style="height: 252px;">
-                        <td colspan="10" style="padding: 74px 0;">
-                            <div style="line-height: 106px;">
-                                <div class="col-xs-2" style="margin-left: 35%;">
+                        <td colspan="12">
+                            <div class="empty">
+                                <p class="empty-img">
                                     <img src="static/img/all/empty-cart.png">
-                                </div>
-                                <div class="col-xs-4" style="line-height: 124px;">
-                                    <p class="grey f16">暂无在售产品信息</p>
+                                </p>
+                                <div class="empty-info">
+                                    <p class="grey"> 暂无产品信息，赶快上传让更多人看到你的产品吧 </p>
+                                    <a href="/vendor#/vendor_upload"><i></i>马上去上传</a>
                                 </div>
                             </div>
                         </td>
+                        <!--<td colspan="10" style="padding: 74px 0;">-->
+                            <!--<div style="line-height: 106px;">-->
+                                <!--<div class="col-xs-2" style="margin-left: 35%;">-->
+                                    <!--<img src="static/img/all/empty-cart.png">-->
+                                <!--</div>-->
+                                <!--<div class="col-xs-4 text-right" style="line-height: 124px;">-->
+                                    <!--<p class="grey f14">-->
+                                        <!--暂无产品信息，赶快上传让更多人看到你的产品吧！-->
+                                        <!--<a href="vendor#/vendor_upload" style="margin-left:20px;font-size: 14px;color:#5078cb"><i class="fa fa-mail-reply"></i>&nbsp;马上去上传</a>-->
+                                    <!--</p>-->
+                                <!--</div>-->
+                            <!--</div>-->
+                        <!--</td>-->
                     </tr>
                     </tbody>
                 </table>
@@ -849,4 +863,38 @@
             <div class="img"><img/></div>
         </div>
     </div>
-</div>
+</div>
+<style>
+    /**/
+    .wanted_list01 .empty{
+        overflow: hidden;
+        width:100%;
+        display:inline-flex;
+        justify-content:center;
+        align-items: center;
+        height:360px;
+    }
+    .wanted_list01 .empty-info{
+        line-height: 28px;
+        padding-top:10px;
+        margin-left:10px;
+        text-align:left;
+    }
+    .wanted_list01 .empty-info .grey{
+        color: #999;
+        font-size: 14px;
+    }
+    .wanted_list01 .empty .empty-info>a{
+        font-size: 14px;
+        color: #5078cb;
+    }
+    .wanted_list01 .empty .empty-info i{
+        display: inline-block;
+        width: 18px;
+        height: 18px;
+        margin-right: 5px;
+        background: url('static/img/vendor/images/upload-icon.png')no-repeat 0px 0px;
+        position: relative;
+        top: 7px;
+    }
+</style>

src/main/webapp/resources/view/vendor/forstore/vendor_order.html

@@ -1064,13 +1064,38 @@
 	.sellOder .reply-box .vendor-modal-header .modal-first-rate .check-act .rate-radio-label.active {
 		background-position: -12px 3px;
 	}
+
+	/**/
+	#sellOder .oder_list dl.all_oder .no-price{
+		width:100%;
+		height:342px;
+		display:inline-flex;
+		justify-content: center;
+		align-items: center;
+		background: white;
+	}
+	#sellOder .oder_list dl.all_oder .no-price p{
+		padding-top:10px;
+		font-size: 14px;
+		color: #999;
+		margin-left:15px;
+		line-height: 28px;
+		width:200px;
+	}
+	#sellOder .oder_list dl.all_oder .no-price p a{
+		color: #5078cb;
+		display: block;
+		background: url(static/img/all/icon_nianxian.jpg)no-repeat;
+		background-position: 0px 7px;
+		padding-left: 25px;
+	}
 </style>
 <div class="user_right fr">
 	<!--订单中心-->
 	<div class="sellOder oder" id="sellOder">
 		<div class="com_tab">
 			<ul class="fl" style="width: 100%">
-				<li ng-class="{'active': storeType=='other'}" ng-if="!isYrscStore"><a ng-click="setStoreType('other')">自营店铺</a></li>
+				<li ng-class="{'active': storeType=='other'}" ng-if="!isYrscStore && !isCONSIGNMENT"><a ng-click="setStoreType('other')">自营店铺</a></li>
 				<li ng-class="{'active': storeType=='mall'}"><a ng-click="setStoreType('mall')">库存寄售</a></li>
 				<li class="down-purchase">
                     <span ng-click="downPurchase()">
@@ -1361,13 +1386,21 @@
 						</div>
 					</div>
 				</div>
-				<div ng-if="purchases.length == 0 || !purchases" class="text-center" style="font-size: 14px;height: 180px;line-height: 50px; padding: 35px 0;">
-					<div class="col-xs-offset-3 col-xs-2">
-						<img src="static/img/all/empty-cart.png">
-					</div>
-					<div class="col-xs-4">
-						<p class="grey f16">暂无订单信息</p>
-					</div>
+				<!--<div ng-if="purchases.length == 0 || !purchases" class="text-center" style="font-size: 14px;height: 180px;line-height: 50px; padding: 35px 0;">-->
+					<!--<div class="col-xs-offset-3 col-xs-2">-->
+						<!--<img src="static/img/all/empty-cart.png">-->
+					<!--</div>-->
+					<!--<div class="col-xs-4">-->
+						<!--<p class="grey f16">暂无订单信息2131</p>-->
+					<!--</div>-->
+				<!--</div>-->
+				<div class="no-price" ng-if="purchases.length == 0 || !purchases">
+					<img src="static/img/all/empty-cart.png">
+					<p>
+						暂无订单信息
+						<br>
+						<a href="/">马上去逛一逛</a>
+					</p>
 				</div>
 				<!--<p class="height16" style="background: #f5f5f5;">&nbsp</p>-->
 				<div class="ng-cloak ng-table-pager" style="float: right;margin-right: 60px;" ng-if="AllOrderInfo.totalPages>1">

src/main/webapp/resources/view/vendor/forstore/vendor_take_self.html

@@ -32,6 +32,7 @@
 		width: 1000px;
 		margin: 0 auto;
 		text-align: center;
+		padding-bottom:20px;
 	}
 	.takeSelf .content-body table{
 		box-sizing: border-box;
@@ -207,6 +208,33 @@
 		background: #3f7ae3;
 		color: #fff;
 	}
+	/**/
+	.takeSelf .empty{
+		overflow: hidden;
+		margin: 0!important;
+		width:100%;
+		display:inline-flex;
+		justify-content:center;
+		align-items: center;
+		height:370px;
+	}
+	.takeSelf .empty-info{
+		line-height: 28px;
+		padding-top:10px;
+		margin-left:10px;
+		text-align: left;
+	}
+	.takeSelf .empty-info .grey{
+		color: #999;
+		font-size: 14px;
+	}
+	.takeSelf .empty .empty-info>a{
+		font-size: 14px;
+		color: #5078cb;
+	}
+	.takeSelf .empty .empty-info i{
+		margin-right:5px;
+	}
 </style>
 <!--右侧主体部分-->
 <div class="count user_right fr">
@@ -237,7 +265,7 @@
 							<th width="95">操作</th>
 						</tr>
 					</thead>
-					<tbody>
+					<tbody ng-if="$data">
 						<tr ng-repeat="takeSelf in $data">
 							<td>{{$index + 1}}</td>
 							<td class="takeSelfName" ng-bind="takeSelf.takename">深圳市南山区科技园店</td>
@@ -257,13 +285,22 @@
 								<a ng-click="editTakeSelf(takeSelf)">修改</a>|<a ng-click="showDeleteFrame(takeSelf)">删除</a>
 							</td>
 						</tr>
-						<tr class="record-num">
+						<tr class="record-num" ng-if="$$takeSelf.totalElements != 0">
 							<td colspan="6">
 								<span class="count-tip">显示<span ng-bind="$$takeSelf.start">23</span>-<span ng-bind="$$takeSelf.end">10</span>，共：<span ng-bind="$$takeSelf.totalElements" style="color: #5078cb;">23</span>个</span>
 							</td>
 						</tr>
 					</tbody>
 				</table>
+				<div class="empty" ng-if="$$takeSelf.totalElements == 0">
+					<p class="empty-img">
+						<img src="static/img/all/empty-cart.png">
+					</p>
+					<div class="empty-info">
+						<p class="grey"> 暂无自提点,赶快去新增吧 </p>
+						<!--<a href="javascript:history.go(-1)"><i class="fa fa-mail-reply fa-xs"></i>返回上一页</a>-->
+					</div>
+				</div>
 			</div>
 		</div>
 	</div>

src/main/webapp/resources/view/vendor/forstore/vendor_undercarriage.html

@@ -706,23 +706,9 @@
                         </td>
                     </tr>
                     </tbody>
-                   <!-- <tbody>
-                    <tr style="height: 252px;" ng-if="!currenctGoods || currenctGoods.length <= 0">
-                        <td colspan="10" style="padding: 74px 0;">
-                            <div style="line-height: 106px;">
-                                <div class="col-xs-2" style="margin-left: 35%;">
-                                    <img src="static/img/all/empty-cart.png">
-                                </div>
-                                <div class="col-xs-4" style="line-height: 124px;">
-                                    <p class="grey f16">暂无下架产品信息</p>
-                                </div>
-                            </div>
-                        </td>
-                    </tr>
-                    </tbody>-->
                     <tbody class="no-record-list" ng-if="!currenctGoods || currenctGoods.length <= 0">
-                        <tr class="height200">
-                            <td colspan="10"><img src="static/img/all/empty-cart.png"><span>暂无下架产品信息！</span></td>
+                        <tr style="height:378px!important;">
+                            <td colspan="10"><img src="static/img/all/empty-cart.png"><span class="f14">暂无下架产品信息</span></td>
                         </tr>
                     </tbody>
                 </table>

src/main/webapp/resources/view/vendor/forstore/vendor_upload.html

@@ -427,7 +427,7 @@
                             </tbody>
                             <tbody class="no-record-list" ng-if="!pageParams || !pageParams.content || pageParams.content.length == 0">
                                 <tr class="height200">
-                                    <td colspan="7" style="background: #fff;"><img src="static/img/all/empty-cart.png"><span>请上传需要发布的库存！</span></td>
+                                    <td colspan="7" style="background: #fff;"><img src="static/img/all/empty-cart.png"><span class="f14">暂无产品信息，赶快上传让更多人看到你的产品吧</span></td>
                                 </tr>
                             </tbody>
                         </table>

src/main/webapp/resources/view/vendor/left_nav.html

@@ -23,7 +23,10 @@
 	<ul>
 		<div ng-hide="!(userInfo.pwdEnable && userInfo.haveUserQuestion && (userInfo.userEmail==null?false:true))">
 		<li ng-class="{'active' : active == 'vendor_order'}"><a href="javascript:void(0)" ui-sref="vendor_order">订单中心</a></li>
-		<li ng-class="{'active' : active == 'vendor_logistics'}"><a href="javascript:void(0)" ui-sref="vendor_deliveryRule">物流管理</a></li>
+		<li ng-class="{'active' : active == 'vendor_logistics'}">
+			<a href="javascript:void(0)" ui-sref="vendor_logistics" ng-hide="store && (!store.status || store.status === 'OPENED')">物流管理</a>
+			<a href="javascript:void(0)" ui-sref="vendor_deliveryRule" ng-if="store && (!store.status || store.status === 'OPENED')">物流管理</a>
+		</li>
 		<li ng-class="{'active' : active == 'vendor_invoice'}"><a href="javascript:void(0)" ui-sref="vendorInvoice">发票管理</a></li>
 	<!--	<li ng-class="{'active' : active == 'vendor_logistics'}"><a href="javascript:void(0)" ui-sref="vendor_logistics">物流管理</a></li>-->
 		<li ng-class="{'active' : active == 'pay_center'}"><a href="javascript:void(0)" ui-sref="pay_center">结算中心</a></li>