Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/uas/platform/b2c/common/base/service/impl/RestSmsServiceImpl.java

@@ -3,7 +3,6 @@ package com.uas.platform.b2c.common.base.service.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.message.common.domain.Page;
 import com.uas.message.common.domain.SimpleMessage;
-import com.uas.message.mail.domain.MailLog;
 import com.uas.message.sms.domain.SmsLog;
 import com.uas.message.sms.service.SmsService;
 import com.uas.platform.b2c.core.utils.FastjsonUtils;
@@ -17,6 +16,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.client.RestTemplate;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -105,14 +105,17 @@ public class RestSmsServiceImpl implements SmsService {
         headers.setContentType(type);
         headers.add("Accept", MediaType.APPLICATION_JSON.toString());
 
+        List<SmsLog> mailLogs = new ArrayList<>();
         JSONObject object = new JSONObject();
         object.put("templateId", templateId);
-        object.put("receivers", receivers);
         object.put("params", params);
-
-        HttpEntity<String> formEntity = new HttpEntity<String>(object.toJSONString(), headers);
-        ResponseEntity<String> responseEntity = restTemplate.postForEntity(SMS_CONSOLE_HOST + SMS_SEND_MANY_URL, formEntity, String.class);
-        List<SmsLog> mailLogs = FastjsonUtils.fromJsonArray(responseEntity.getBody(), SmsLog.class);
+        for (String receiver : receivers) {
+            object.put("receiver", receiver);
+            HttpEntity<String> formEntity = new HttpEntity<String>(object.toJSONString(), headers);
+            ResponseEntity<String> responseEntity = restTemplate.postForEntity(SMS_CONSOLE_HOST + SMS_SEND_URL, formEntity, String.class);
+            SmsLog smsLog = FastjsonUtils.fromJson(responseEntity.getBody(), SmsLog.class);
+            mailLogs.add(smsLog);
+        }
         return mailLogs;
     }
 

src/main/java/com/uas/platform/b2c/common/base/service/impl/SendMessageServiceImpl.java

@@ -45,7 +45,7 @@ public class SendMessageServiceImpl implements SendMessageService {
 			Set<String> userPhones = new HashSet<>();
 			userPhones.add(userPhone);
 			Object[] obj = {sellername,num};
-			smsService.sendAll("a3c13206-1c0b-4bbb-a7d2-864043792092",userPhones,obj);
+			smsService.sendAll("398ad011-59e4-44d1-88cb-8cdfca3d725c",userPhones,obj);
 			//core中的接口
 			/*SendMessageUtil.sendMessage(context, userPhones, name, type, new Callback<MessageLog>() {
 				@Override

src/main/java/com/uas/platform/b2c/prod/commodity/model/GoodsHistory.java

@@ -415,6 +415,12 @@ public class GoodsHistory {
 	@Column(name = "go_spec", length = 4000)
 	private String spec;
 
+	/**
+	 * 器件的附件URL
+	 */
+	@Column(name = "cmp_attach")
+	private String attach;
+
 	/**
 	 * 分段价格
 	 */
@@ -1186,4 +1192,13 @@ public class GoodsHistory {
 		this.spec = spec;
 		return this;
 	}
+
+	public String getAttach() {
+		return attach;
+	}
+
+	public GoodsHistory setAttach(String attach) {
+		this.attach = attach;
+		return this;
+	}
 }

src/main/java/com/uas/platform/b2c/prod/commodity/model/ProductAttachSubmit.java

@@ -1,22 +1,14 @@
 package com.uas.platform.b2c.prod.commodity.model;
 
-import com.uas.platform.b2c.b2b.model.EnterpriseBaseInfo;
+import com.uas.platform.b2c.common.account.model.Enterprise;
 import com.uas.platform.b2c.common.account.model.UserBaseInfo;
 import com.uas.platform.b2c.core.constant.Status;
 import com.uas.platform.b2c.prod.product.brand.modal.BrandInfo;
 import com.uas.platform.b2c.prod.product.kind.model.KindInfo;
+
+import javax.persistence.*;
 import java.io.Serializable;
 import java.util.Date;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 
 /**
  * 物料规格书申请
@@ -89,7 +81,7 @@ public class ProductAttachSubmit implements Serializable{
      */
     @OneToOne(cascade = { CascadeType.REFRESH })
     @JoinColumn(name = "as_submitenuu", insertable = false, updatable = false)
-    private EnterpriseBaseInfo submitEn;
+    private Enterprise submitEn;
 
     /**
      * 匹配标准器件的uuid
@@ -134,7 +126,7 @@ public class ProductAttachSubmit implements Serializable{
      * 审核企业信息
      */
     @Transient
-    private EnterpriseBaseInfo auditEn;
+    private Enterprise auditEn;
 
     /**
      * 商城类目id
@@ -250,14 +242,6 @@ public class ProductAttachSubmit implements Serializable{
         this.submiter = submiter;
     }
 
-    public EnterpriseBaseInfo getSubmitEn() {
-        return submitEn;
-    }
-
-    public void setSubmitEn(EnterpriseBaseInfo submitEn) {
-        this.submitEn = submitEn;
-    }
-
     public String getUuid() {
         return uuid;
     }
@@ -306,14 +290,6 @@ public class ProductAttachSubmit implements Serializable{
         this.auditer = auditer;
     }
 
-    public EnterpriseBaseInfo getAuditEn() {
-        return auditEn;
-    }
-
-    public void setAuditEn(EnterpriseBaseInfo auditEn) {
-        this.auditEn = auditEn;
-    }
-
     public Long getKindId() {
         return kindId;
     }
@@ -370,6 +346,24 @@ public class ProductAttachSubmit implements Serializable{
         this.reason = reason;
     }
 
+    public Enterprise getAuditEn() {
+        return auditEn;
+    }
+
+    public ProductAttachSubmit setAuditEn(Enterprise auditEn) {
+        this.auditEn = auditEn;
+        return this;
+    }
+
+    public Enterprise getSubmitEn() {
+        return submitEn;
+    }
+
+    public ProductAttachSubmit setSubmitEn(Enterprise submitEn) {
+        this.submitEn = submitEn;
+        return this;
+    }
+
     @Override
     public String toString() {
         return "ProductAttachSubmit{" + "id=" + id + ", productId=" + productId

src/main/java/com/uas/platform/b2c/prod/commodity/model/ReleaseProductByBatch.java

@@ -542,6 +542,12 @@ public class ReleaseProductByBatch implements Serializable {
 	@Column(name = "rel_spec")
 	private String spec;
 
+	/**
+	 * 规格书信息
+	 */
+	@Column(name = "rel_attach")
+	private String attach;
+
 //	private Short repeat;
 
 	@Override
@@ -1793,4 +1799,13 @@ public class ReleaseProductByBatch implements Serializable {
 	public void setThick(String thick) {
 		this.thick = thick;
 	}
+
+	public String getAttach() {
+		return attach;
+	}
+
+	public ReleaseProductByBatch setAttach(String attach) {
+		this.attach = attach;
+		return this;
+	}
 }

src/main/java/com/uas/platform/b2c/prod/commodity/model/V_ProductPerson.java

@@ -274,6 +274,12 @@ public class V_ProductPerson implements Serializable{
     @Column(name = "user_uu")
     private Long ppUserUU;
 
+    /**
+     * 规格书
+     */
+    @Column(name = "pr_attach")
+    private String attach;
+
     @Transient
     private ProductAttachSubmit productAttachSubmit;
 
@@ -619,4 +625,13 @@ public class V_ProductPerson implements Serializable{
         this.productAttachSubmit = productAttachSubmit;
         return this;
     }
+
+    public String getAttach() {
+        return attach;
+    }
+
+    public V_ProductPerson setAttach(String attach) {
+        this.attach = attach;
+        return this;
+    }
 }

src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/GoodsServiceImpl.java

@@ -2553,7 +2553,8 @@ public class GoodsServiceImpl implements GoodsService {
         if (StringUtils.isEmpty(storeid)) {
             return null;
         }
-        pageInfo.expression(PredicateUtils.or(new SimpleExpression[]{PredicateUtils.eq("status", 601, true), PredicateUtils.eq("status", 602, true)}));
+        // pageInfo.expression(PredicateUtils.or(new SimpleExpression[]{PredicateUtils.eq("status", 601, true), PredicateUtils.eq("status", 602, true)}));
+        pageInfo.expression(PredicateUtils.eq("status", 601, true));
         pageInfo.sorting(Sort.Direction.DESC, "updateDate");
         pageInfo.expression(PredicateUtils.eq("storeid", storeid, false));
         if (StringUtils.hasText(kindUuid)) {

src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/ProductAttachServiceImpl.java

@@ -1,8 +1,8 @@
 package com.uas.platform.b2c.prod.commodity.service.impl;
 
-import com.uas.platform.b2c.b2b.dao.EnterpriseBaseInfoDao;
-import com.uas.platform.b2c.b2b.model.EnterpriseBaseInfo;
+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.UserBaseInfo;
 import com.uas.platform.b2c.core.constant.Status;
 import com.uas.platform.b2c.core.support.SystemSession;
@@ -44,10 +44,7 @@ import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * Created by wangyc on 2018/6/26.
@@ -71,7 +68,7 @@ public class ProductAttachServiceImpl implements ProductAttachService {
 
     private final KindDao kindDao;
 
-    private final EnterpriseBaseInfoDao enterpriseBaseInfoDao;
+    private final EnterpriseDao enterpriseDao;
 
     private final UserBaseInfoDao userBaseInfoDao;
 
@@ -80,7 +77,7 @@ public class ProductAttachServiceImpl implements ProductAttachService {
 
     @Autowired
     public ProductAttachServiceImpl(ProductDao productDao, ProductAttachSubmitDao productAttachSubmitDao,
-        ComponentDao componentDao, BrandInfoDao brandInfoDao, KindInfoDao kindInfoDao, ComponentService componentService, KindDao kindDao, EnterpriseBaseInfoDao enterpriseBaseInfoDao, UserBaseInfoDao userBaseInfoDao) {
+                                    ComponentDao componentDao, BrandInfoDao brandInfoDao, KindInfoDao kindInfoDao, ComponentService componentService, KindDao kindDao, EnterpriseDao enterpriseDao, UserBaseInfoDao userBaseInfoDao) {
         this.productDao = productDao;
         this.productAttachSubmitDao = productAttachSubmitDao;
         this.componentDao = componentDao;
@@ -88,7 +85,7 @@ public class ProductAttachServiceImpl implements ProductAttachService {
         this.kindInfoDao = kindInfoDao;
         this.componentService = componentService;
         this.kindDao = kindDao;
-        this.enterpriseBaseInfoDao = enterpriseBaseInfoDao;
+        this.enterpriseDao = enterpriseDao;
         this.userBaseInfoDao = userBaseInfoDao;
     }
 
@@ -156,9 +153,9 @@ public class ProductAttachServiceImpl implements ProductAttachService {
      */
     private ProductAttachSubmit completeReturnSubmit(ProductAttachSubmit submit) {
         if (submit.getAuditEnuu() != null) {
-            EnterpriseBaseInfo enterpriseBaseInfo = enterpriseBaseInfoDao.findOne(submit.getAuditEnuu());
-            if (enterpriseBaseInfo != null) {
-                submit.setAuditEn(enterpriseBaseInfo);
+            Enterprise enterprise = enterpriseDao.findOne(submit.getAuditEnuu());
+            if (enterprise != null) {
+                submit.setAuditEn(enterprise);
             }
         }
 
@@ -241,6 +238,8 @@ public class ProductAttachServiceImpl implements ProductAttachService {
             Component component = componentDao.findByUuid(product.getCmpUuId());
             if (component != null) {
                 submit.setUuid(product.getCmpUuId());
+                submit.setKindId(component.getKindid());
+                submit.setBrandId(component.getBrandid());
             }
         }
         return submit;
@@ -255,7 +254,11 @@ public class ProductAttachServiceImpl implements ProductAttachService {
      */
     @Override
     public List<ProductAttachSubmit> findByProductidsAndStatus(List<Long> productids, Integer status) {
-        return productAttachSubmitDao.findByProductIdsAndStatus(productids, status);
+        if (CollectionUtils.isNotEmpty(productids) || status == null) {
+            return productAttachSubmitDao.findByProductIdsAndStatus(productids, status);
+        } else {
+            return Collections.emptyList();
+        }
     }
 
     @Override

src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/ProductServiceImpl.java

@@ -1966,8 +1966,10 @@ public class ProductServiceImpl implements ProductService {
                                     return resultMap;
                                 } else {
                                     persistProduct.setPbranden(brand);
+                                    persistProduct.setBrand(brand);
                                     persistProduct.setPbrand(brand);
                                     persistProduct.setPcmpcode(code);
+                                    persistProduct.setCmpCode(code);
                                     Product product1 = productDao.save(persistProduct);
                                     goodsService.updateGoodsByProduct(product1);
                                     return ResultMap.success(product1);

src/main/webapp/resources/js/admin/controllers/AuditRegulpicListCtrl.js

@@ -195,10 +195,11 @@ define([ 'app/app' ], function(app) {
     $scope.dismiss = dismiss;
     $scope.BrandList = []
     $scope.reason = null;
-    $scope.keyword = ''
     $scope.spec = ''
-    $scope.item = item
-    /**
+    $scope.item = item;
+    $scope.keyword = item.brand ? item.brand.nameEn : '';
+    $scope.kindId = item.kind ? item.kind.nameCn : '';
+        /**
      * 品牌联想词
      */
     $scope.onBrandChange = function(name) {
@@ -227,32 +228,38 @@ define([ 'app/app' ], function(app) {
      */
     function saveReason() {
       var info = ''
-      if (!$scope.keyword || $scope.keyword === '') {
-        toaster.pop('error', '品牌为必填项');
-        return ;
-      }
-      if ($scope.kindPojo.first === '请选择一级类目') {
-        toaster.pop('error', '商城类目未选择');
-        return ;
-      }
-      if ($scope.kindPojo.second === '请选择二级类目' && $scope.kindInfo[$scope.kindPojo.first].children) {
-        toaster.pop('error', '商城类目未选择');
-        return ;
-      }
-      if ($scope.kindPojo.third === '请选择三级类目' && $scope.kindInfo[$scope.kindPojo.first].children[$scope.kindPojo.second].children) {
-        toaster.pop('error', '商城类目未选择');
-        return ;
-      }
-      if ($scope.kindPojo.third !== '请选择三级类目') {
-        info = $scope.kindPojo.third
-      } else if ($scope.kindPojo.second !== '请选择二级类目') {
-        info = $scope.kindPojo.second
+      if ($scope.kindId === '') {
+        if (!$scope.keyword || $scope.keyword === '') {
+          toaster.pop('error', '品牌为必填项');
+          return;
+        }
+        if ($scope.kindPojo.first === '请选择一级类目') {
+          toaster.pop('error', '商城一级类目未选择');
+          return;
+        }
+        if ($scope.kindPojo.second === ''
+            && $scope.kindInfo[$scope.kindPojo.first].children) {
+          toaster.pop('error', '商城二级类目未选择');
+          return;
+        }
+        if ($scope.kindPojo.third === ''
+            && $scope.kindInfo[$scope.kindPojo.first].children[$scope.kindPojo.second].children) {
+          toaster.pop('error', '商城三级类目未选择');
+          return;
+        }
+        if ($scope.kindPojo.third !== '') {
+          info = $scope.kindPojo.third
+        } else if ($scope.kindPojo.second !== '') {
+          info = $scope.kindPojo.second
+        } else if ($scope.kindPojo.first !== '') {
+          info = $scope.kindPojo.first
+        }
+        $scope.item.kindId = info.id
+        $scope.item.brandId = $scope.brandId
       }
-      $scope.item.kindId = info.id
-      $scope.item.brandId = $scope.brandId
       $scope.item.spec = $scope.spec !== '' ? $scope.spec : $scope.item.product.spec
+      toaster.pop('success', '提示',  '已提交，请稍等');
       StoreAdminListInformation.auditSuccess({}, $scope.item, function(data) {
-        console.log(data)
         if (data.success) {
           $modalInstance.close(data);
         } else {
@@ -320,6 +327,7 @@ define([ 'app/app' ], function(app) {
       } else {
         chooseAttach = responseData.data.uploadAttach
       }
+      toaster.pop('success', '提示',  '已提交，请稍等');
       StoreAdminListInformation.chooseAttach({}, {chooseAttach: chooseAttach, submit: item}, function(data) {
         $modalInstance.close(data);
       })

src/main/webapp/resources/js/common/directives.js

@@ -878,7 +878,7 @@ define(['angular', 'showdown', 'angular-toaster'], function(angular) {
 
 						if (_accept) {
 							// 如果有，则先处理pdf
-              if (!/\/(pdf)$/.test(file.type)) {
+              if (!/\/(pdf)$/.test(file.files[0].type)) {
                 alert('请上传可支持的格式');
                 return false;
               }

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

@@ -1138,9 +1138,10 @@ define([ 'angularAMD', 'ngLocal', 'common/services', 'common/directives', 'commo
 	}]);
 
   // 上传规格书
-  app.controller('editRegulationCtrl', ['$scope', 'Regulpic', '$modalInstance','showAction', 'Search', 'ChooseItem', function ($scope, Regulpic, $modalInstance, showAction, Search, ChooseItem) {
+  app.controller('editRegulationCtrl', ['$scope', 'Regulpic', '$modalInstance','showAction', 'Search', 'ChooseItem', 'toaster', function ($scope, Regulpic, $modalInstance, showAction, Search, ChooseItem, toaster) {
     $scope.iniUrlImg = 'static/img/vendor/images/upload_file_icon.png'
-    $scope.Regulpic = Regulpic;
+    $scope.Regulpic = Regulpic; // 图片
+    $scope.Ischange = (ChooseItem.productAttachSubmit && ChooseItem.productAttachSubmit.uploadAttach || ChooseItem.attach) ? true : false
     $scope.showAction = showAction || false  // 个人产品库和企业产品 还是在售产品
 	  $scope.IsLookOrUpdate = ChooseItem.standard === 1 ? 'look' : 'update' // 编辑还是查看
     $scope.brandcode = ChooseItem.pbranden || ChooseItem.pbrand || ($scope.IsLookOrUpdate === 'update' ? '' : '-') // 品牌
@@ -1149,8 +1150,8 @@ define([ 'angularAMD', 'ngLocal', 'common/services', 'common/directives', 'commo
     $scope.spec = ChooseItem.spec || '' // 规格
     $scope.cmpcode = ChooseItem.pcmpcode || ($scope.IsLookOrUpdate === 'update' ? '' : '-') // 型号
     $scope.CodeList = [] // 型号数组
-	  $scope.RegulChange = true // 规格书是否可以编辑
-	  $scope.RegulpicUrl = ChooseItem.Regulpic
+	  $scope.RegulChange = (ChooseItem.standard === 1 && $scope.Ischange) ? false : true // 规格书是否可以编辑
+	  // $scope.RegulpicUrl = ChooseItem.Regulpic
     $scope.cancel = function () {
       $modalInstance.close();
     };
@@ -1172,7 +1173,7 @@ define([ 'angularAMD', 'ngLocal', 'common/services', 'common/directives', 'commo
         pbranden: $scope.brandcode,
         kind: $scope.kind,
         pcmpcode: $scope.cmpcode,
-        url: $scope.Regulpic === $scope.iniUrlImg ? '' : $scope.Regulpic,
+        url: ($scope.Regulpic === $scope.iniUrlImg || $scope.Regulpic === Regulpic) ? '' : $scope.Regulpic,
         spec: $scope.spec,
 	      id: ChooseItem.id
       }
@@ -1188,6 +1189,7 @@ define([ 'angularAMD', 'ngLocal', 'common/services', 'common/directives', 'commo
     // 图片上传成功之后
     $scope.onUploadSuccess = function(data){
       $scope.Regulpic = data.path;
+      $scope.Ischange = true
     };
 
 

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

@@ -1565,13 +1565,17 @@ define([ 'app/app' ], function(app) {
                 return false
               },
               ChooseItem: function() {
-                  return {}
+                commodity.standard = !commodity.uuid ? 0 : 1
+                commodity.pbranden = commodity.brandNameEn
+                commodity.kind = commodity.kindNameCn
+                commodity.pcmpcode = commodity.code
+                return commodity
               }
             }
           });
           modalInstance.result.then(function (Regulpic) {
             if(Regulpic) {
-              commodity.attach = Regulpic;
+              commodity.attach = Regulpic.url;
             }
           }, function() {
 

src/main/webapp/resources/view/admin/modal/auditRegulpicpass_modal.html

@@ -81,7 +81,7 @@
     </div>
     <div class="form-group">
       <div class="col-sm-3 name"><em style="color: #ea0e0e">*</em>品牌：</div>
-      <div class="col-sm-9" style="position: relative;">
+      <div class="col-sm-9" style="position: relative;" ng-if="!item.brandId">
         <input type="text" ng-blur="onBrandBlur(keyword)"  ng-change="onBrandChange(keyword)" placeholder="请输入品牌名字" ng-model="keyword" class="form-control" style="width: 240px;height: 28px" />
         <ul class="listUl" ng-if="BrandList.value.length > 0">
           <li ng-repeat="item in BrandList.value" ng-click="setBrand(item.nameEn,item.id)">
@@ -89,10 +89,13 @@
           </li>
         </ul>
       </div>
+      <div class="col-sm-9" style="position: relative;" ng-if="item.brandId">
+        {{item.brand.nameEn}}
+      </div>
     </div>
     <div class="form-group">
       <div class="col-sm-3 name"><em style="color: #ea0e0e">*</em>商城类目：</div>
-      <div class="col-sm-9" >
+      <div class="col-sm-9" ng-if="!item.kindId">
         <div class="col-sm-4" style="padding: 0px;">
           <select class="form-control"
                   ng-model="kindPojo.first"
@@ -117,6 +120,9 @@
           </select>
         </div>
       </div>
+      <div class="col-sm-9" ng-if="item.kindId">
+        {{item.kind.nameCn}}
+      </div>
     </div>
     <div class="form-group">
       <div class="col-sm-3 name">规格：</div>

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

@@ -2101,19 +2101,19 @@
 							<span ng-bind="material.spec || '-'" title="{{material.spec || '-'}}"></span>
 						</td>
 						<td style="overflow: initial;">
-							<div class="Regulpic">
-								<a href="{{material.productAttachSubmit.uploadAttach}}" target="_blank" ng-if="material.productAttachSubmit" class="Regulpica">
+							<div class="Regulpic" ng-if="material.productAttachSubmit || material.attach">
+								<a href="{{material.productAttachSubmit.uploadAttach || material.attach}}" target="_blank"  class="Regulpica">
 									<span style="cursor: pointer;">
 										<img style="width:24px;height:26px;border: 0px" src="static/img/vendor/images/pdf.png"/>
-										<div style="position: relative;display: inline-block" class="ToforAdminLook" ng-if="">
+										<div style="position: relative;display: inline-block" class="ToforAdminLook" ng-if="material.productAttachSubmit.uploadAttach">
 											<img src="static/img/vendor/images/fireinfo_icon.png" width="18" height="18" style="width:18px;height:18px;border: 0px;margin-left:5px;"/>
 											<div class="forAdminLook">待审核</div>
 										</div>
 									</span>
 								</a>
-								<div ng-if="material.productAttachSubmit && !material.productAttachSubmit.uploadAttach">
-									-
-								</div>
+							</div>
+							<div ng-if="!material.attach && !material.productAttachSubmit.uploadAttach">
+							 -
 							</div>
 						</td>
 						<td ng-bind="material.unit || 'PCS'" title="{{material.unit  || 'PCS'}}"></td>
@@ -2126,7 +2126,7 @@
 								<!--<span>查看</span></span>/<span ng-click="setActiveIndex($index,material)"><span>编辑可替代型号</span>-->
 						  </span>
 							<span name="delete-material" ng-show="!isBatch && !material.exPandOper && !material.addGoodsOper" ng-click="deleteMaterial(material)"><span>删除</span></span>
-							<span ng-click="editRegulPicture(material.productAttachSubmit.uploadAttach || 'static/img/vendor/images/upload_file_icon.png', material)">
+							<span ng-click="editRegulPicture(material.productAttachSubmit.uploadAttach || material.attach || 'static/img/vendor/images/upload_file_icon.png', material)">
 								<span>编辑物料</span>
 							</span>
 							<!---->

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

@@ -1916,19 +1916,19 @@
 						</td>
 						<!-- 新增规格书字段 -->
 						<td style="overflow: initial;">
-							<div class="Regulpic">
-								<a href="{{material.productAttachSubmit.uploadAttach}}" target="_blank" ng-if="material.productAttachSubmit" class="Regulpica">
+							<div class="Regulpic" ng-if="material.productAttachSubmit || material.attach">
+								<a href="{{material.productAttachSubmit.uploadAttach || material.attach}}" target="_blank"  class="Regulpica">
 									<span style="cursor: pointer;">
 										<img style="width:24px;height:26px;border: 0px" src="static/img/vendor/images/pdf.png"/>
-										<div style="position: relative;display: inline-block" class="ToforAdminLook" ng-if="">
+										<div style="position: relative;display: inline-block" class="ToforAdminLook" ng-if="material.productAttachSubmit.uploadAttach">
 											<img src="static/img/vendor/images/fireinfo_icon.png" width="18" height="18" style="width:18px;height:18px;border: 0px;margin-left:5px;"/>
 											<div class="forAdminLook">待审核</div>
 										</div>
 									</span>
 								</a>
-								<div ng-if="material.productAttachSubmit && !material.productAttachSubmit.uploadAttach">
-									-
-								</div>
+							</div>
+							<div ng-if="!material.attach && !material.productAttachSubmit.uploadAttach">
+								-
 							</div>
 						</td>
 						<!-- /end 新增规格书字段 -->

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

@@ -981,7 +981,7 @@
         background: #fff;
         display: none
     }
-    .ToforAdminLook:hover .forAdminLook {
+    .ToforAdminLook .nopass:hover ~.forAdminLook {
         display: block;
     }
 
@@ -1192,13 +1192,14 @@
                             <div class="Regulpic">
                                 <span>规格书:</span>
                                 <!--<span ng-if="!commodity.Regulpic">-</span>-->
-                                <div style="position: relative;display: inline-block;width: auto;margin-top: 0px" class="ToforAdminLook">
-                                    <a style="text-decoration: none;margin: 0px;border-bottom:0px" target="_blank" href="{{commodity.Regulpic}}" class="Regulpica">
+                                <div ng-if="commodity.attach || commodity.productAttachSubmit" style="position: relative;display: inline-block;width: auto;margin-top: 0px" class="ToforAdminLook">
+                                    <a style="text-decoration: none;margin: 0px;border-bottom:0px" target="_blank" href="{{commodity.attach || commodity.productAttachSubmit.uploadAttach}}" class="Regulpica">
                                         <img style="width:24px;height:26px" src="static/img/vendor/images/pdf.png"/>
                                     </a>
-                                    <img src="static/img/vendor/images/fireinfo_icon.png" width="18" height="18" style="width:18px;height:18px;border: 0px;margin-left:5px;"/>
+                                    <img ng-if="commodity.productAttachSubmit.uploadAttach" src="static/img/vendor/images/fireinfo_icon.png" width="18" height="18" style="width:18px;height:18px;border: 0px;margin-left:5px;" class="nopass"/>
                                     <div class="forAdminLook">待审核</div>
                                 </div>
+                                <div style="position: relative;display: inline-block;width: auto;margin-top: 0px" ng-if="!commodity.attach && !commodity.productAttachSubmit">-</div>
                                 <!--<div class="forAdminLook" style="margin-left: 35px;">待审核</div>-->
                             </div>
                         </td>
@@ -1347,10 +1348,13 @@
                                     <div class="Regulpic">
                                         <span>规格书:</span>
                                         <div style="position: relative;display: inline-block;width: auto;margin-top: 0px" class="ToforAdminLook">
-                                            <a style="text-decoration: none;margin: 0px" target="_blank" ng-click="editRegulPicture(commodity.Regulpic || 'static/img/store/common/default.png', commodity)" class="Regulpica">
+                                            <a style="text-decoration: none;margin: 0px;border-bottom:0px" target="_blank" href="{{commodity.attach}}" class="Regulpica" ng-if="commodity.attach">
                                                 <img style="width:24px;height:26px" src="static/img/vendor/images/pdf.png"/>
                                             </a>
-                                            <img src="static/img/vendor/images/fireinfo_icon.png" width="18" height="18" style="width:18px;height:18px;border: 0px;margin-left:5px;"/>
+                                            <a class="Regulpica" ng-click="editRegulPicture(commodity.productAttachSubmit.uploadAttach || 'static/img/vendor/images/upload_file_icon.png', commodity)" ng-if="!commodity.attach">
+                                                <img style="width:24px;height:26px" src="static/img/vendor/images/pdf.png"/>
+                                            </a>
+                                            <img ng-if="commodity.productAttachSubmit.uploadAttach" src="static/img/vendor/images/fireinfo_icon.png" width="18" height="18" style="width:18px;height:18px;border: 0px;margin-left:5px;" class="nopass"/>
                                             <div class="forAdminLook">待审核</div>
                                         </div>
                                     </div>

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

@@ -853,7 +853,7 @@
 					</div>
 				</div>
 				<div class="image_tip">
-					仅支持JPG、PNG、GIF格式，大小不超过3M，建议使用970*220px的图片
+					仅支持JPG、PNG、GIF格式，大小不超过3M，建议使用970*280px的图片
 					<a href="javascript:void(0)" class="model-btn" ng-click="showTemplate(true)" ng-if="canChooseTempalte">使用提供的模板</a>
 				</div>
 			</div>

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

@@ -1061,7 +1061,7 @@
 						 style="width: 660px;height: 155px;  left: 0; position: absolute;"></div>
 				</div>
 				<div class="image_tip">
-					仅支持JPG、PNG、GIF格式，大小不超过3M，建议使用970*220px的图片
+					仅支持JPG、PNG、GIF格式，大小不超过3M，建议使用970*280px的图片
 					<a href="javascript:void(0)" class="model-btn" ng-click="showTemplate(true)" >使用提供的模板</a>
 				</div>
 
@@ -1105,7 +1105,7 @@
 					</div>
 				</div>
 				<div class="image_tip">
-					仅支持JPG、PNG、GIF格式，大小不超过3M，建议使用970*220px的图片
+					仅支持JPG、PNG、GIF格式，大小不超过3M，建议使用970*280px的图片
 					<a href="#" class="model-btn" style="display: none;">使用提供的模板</a>
 				</div>
 			</div>

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

@@ -58,9 +58,9 @@
 				<!-- 店铺申请中 !store && applyStatus == 'PREPARE' -->
 				<span  ui-sref="vendor_store_wait" ng-if="!store && applyStatus == 'PREPARE'">开店申请</span>
 				<!-- 我的店铺 !store && applyStatus == 'PASS' -->
-				<span  ui-sref="vendor_store_info" ng-if="!store && applyStatus == 'PASS'">店铺管理</span>
+				<span  ui-sref="vendor_store_info" ng-if="!store && applyStatus == 'PASS'">店铺维护</span>
 				<!-- 我的店铺 store -->
-				<span  ui-sref="vendor_store_maintain" ng-if="store && (!store.status || store.status === 'OPENED')">店铺管理</span>
+				<span  ui-sref="vendor_store_maintain" ng-if="store && (!store.status || store.status === 'OPENED')">店铺维护</span>
 				<!-- 我的店铺申述 store -->
 				<span  ui-sref="vendor_store_maintain" ng-if="store && store.status && store.status !== 'OPENED'">我的店铺</span>
 			</li>

src/main/webapp/resources/view/vendor/modal/edit_regul_modal.html

@@ -26,8 +26,8 @@
     position: relative;
   }
   .update-img .update-big-img .previewImage img{
-    width: 256px;
-    height: 256px;
+    width: 100%;
+    height: 100%;
   }
   .update-img .update-file-btn{
     width: 244px;
@@ -88,7 +88,7 @@
   }
   .uploadImage{
     width: 100%;
-    height: 30px;
+    height:100%;
     z-index: 10;
     position: absolute;
     left: 0;
@@ -311,11 +311,11 @@
         <li class="wuliao_list clearboth">
           <div class="name pull-left" style="width: 60px">规格书：</div>
           <div ng-show="RegulChange" style="line-height: 30px;position: relative;height: 30px;width: 60px;text-align: center;" class="pull-left">
-            <input type="file" image-upload class="uploadImage"  on-success="onUploadSuccess($data, $file)" non-preview="true" maxSize="20971520" errorSizeMsg="'文件大小不能超过20M'">
+            <input type="file" image-upload class="uploadImage" accept=".pdf"   on-success="onUploadSuccess($data, $file)" maxSize="20971520" errorSizeMsg="'文件大小不能超过20M'">
             <span style="color: #5078cb;cursor: pointer;">点击上传</span>
           </div>
           <div ng-show="!RegulChange">
-            <a href="{{RegulpicUrl}}">
+            <a href="{{Regulpic}}" target="_blank">
               <img src="static/img/vendor/images/pdf.png" style="width:31px;height:35px;" />
             </a>
           </div>
@@ -324,8 +324,10 @@
       <div ng-if="showAction && RegulChange" class="clearboth">
         <div class="update-big-img" style="margin-top: 0px;width: 197px;">
           <div class="previewImage" style="height: 197px;width: 197px;line-height: 197px;text-align: center">
-            <img ng-src="{{Regulpic}}" alt="商品图片" style="height: 159px;width: 130px;">
-            <img ng-src="{{Regulpic}}" alt="商品图片" ng-if="!Regulpic" style="height: 197px;line-height: 197px;width: 197px;">
+            <!--<img ng-if="Regulpic" ng-src="static/img/vendor/images/pdf.png" alt="商品图片"  style="height: 197px;line-height: 197px;width: 197px;">-->
+            <input type="file" image-upload class="uploadImage" accept=".pdf"   on-success="onUploadSuccess($data, $file)" maxSize="20971520" errorSizeMsg="'文件大小不能超过20M'">
+            <img ng-src="{{Ischange ? 'static/img/vendor/images/pdf.png' : Regulpic}}" alt="商品图片" style="height: 159px;width: 130px;">
+            <!--<img ng-src="{{Regulpic}}" alt="商品图片" ng-if="!Ischange" style="height: 197px;line-height: 197px;width: 197px;">-->
             <div class="cover" style="background: rgba(0,0,0,0)">
               <i class="fa fa-trash" style="z-index: 98" ng-click="deleteImg()"></i>
             </div>
@@ -369,13 +371,15 @@
       <!-- 在售产品 -->
       <div ng-if="!showAction" class="clearboth">
         <div class="update-big-img">
-          <div class="previewImage">
-            <img ng-src="{{Regulpic}}" alt="商品图片">
-            <img ng-src="{{Regulpic}}" alt="商品图片" ng-if="!Regulpic">
+          <div class="previewImage" style="text-align: center">
+            <input type="file" image-upload class="uploadImage" accept=".pdf"   on-success="onUploadSuccess($data, $file)" maxSize="20971520" errorSizeMsg="'文件大小不能超过20M'">
+            <img ng-src="{{Ischange ? 'static/img/vendor/images/pdf.png' : Regulpic}}" alt="商品图片" style="height: 159px;width: 130px;">
+            <!--<img ng-if="Regulpic" ng-src="static/img/vendor/images/pdf.png" alt="商品图片">-->
+            <!--<img ng-src="{{Regulpic}}" alt="商品图片" ng-if="!Regulpic">-->
             <!--<div class="cover" style="background: rgba(0,0,0,0)">-->
               <!--<i class="fa fa-trash" style="z-index: 98" ng-click="deleteImg()"></i>-->
             <!--</div>-->
-            <a href="{{Regulpic}}" target="_blank" ng-if="Regulpic != 'static/img/store/common/default.png'">
+            <a href="{{Regulpic}}" target="_blank" ng-if="Regulpic != iniUrlImg">
               <div class="cover">
                 <div class="look"><i class="fa fa-search"></i>查看</div>
               </div>
@@ -394,7 +398,7 @@
           </div>
           <p>
                           <span style="left:40px;">
-                              <input maxSize="20971520" type="file" image-upload class="uploadImage" accept=".pdf" on-success="onUploadSuccess($data, $file)" non-preview="true" errorSizeMsg="'文件大小不能超过20M'">
+                              <input maxSize="20971520" type="file" image-upload class="uploadImage" accept=".pdf" on-success="onUploadSuccess($data, $file)"  errorSizeMsg="'文件大小不能超过20M'">
                               <span>选择文件</span>
                           </span>
             <a ng-click="confirm()" class="ok">确定</a>