优化规格书弹窗

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

@@ -1140,7 +1140,7 @@ define([ 'angularAMD', 'ngLocal', 'common/services', 'common/directives', 'commo
   // 上传规格书
   app.controller('editRegulationCtrl', ['$scope', 'Regulpic', '$modalInstance','showAction', function ($scope, Regulpic, $modalInstance, showAction) {
     $scope.Regulpic = Regulpic;
-    $scope.showAction = showAction
+    $scope.showAction = showAction || false
     $scope.cancel = function () {
       $modalInstance.close();
     };

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

@@ -1560,6 +1560,9 @@ define([ 'app/app' ], function(app) {
             resolve : {
               Regulpic : function() {
                 return Regulpic;
+              },
+              showAction: function() {
+                return false
               }
             }
           });
@@ -1910,8 +1913,9 @@ define([ 'app/app' ], function(app) {
     }]);
 
     // 上传规格书
-    app.register.controller('editRegulationCtrl', ['$scope', 'Regulpic', '$modalInstance', function ($scope, Regulpic, $modalInstance) {
+    app.register.controller('editRegulationCtrl', ['$scope', 'Regulpic', '$modalInstance', 'showAction', function ($scope, Regulpic, $modalInstance, showAction) {
       $scope.Regulpic = Regulpic;
+      $scope.showAction = showAction || false
       $scope.cancel = function () {
         $modalInstance.close();
       };

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

@@ -760,8 +760,9 @@
         transform: rotateZ(180deg);
         color: #5078cb !important;
     }
-    .modal-backdrop {
-        background-color: transparent ;
+    .modal-open {
+        overflow-y: auto;
+        overflow-x: hidden;
     }
     .device .wanted_list01 a:hover {
         border-bottom: 1px solid #ddd !important ;
@@ -1330,7 +1331,7 @@
                                     <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" href="{{commodity.Regulpic}}" class="Regulpica">
+                                            <a style="text-decoration: none;margin: 0px" target="_blank" ng-click="editRegulPicture(commodity.Regulpic || 'static/img/store/common/default.png', commodity)" 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;"/>

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

@@ -179,11 +179,46 @@
   <div class="view-box">
     <div class="update-img">
       <a ng-click="cancel()" class="close">&times;</a>
+      <!--企业产品库 --- 这里加上品牌类目型号规格编辑 -->
       <div ng-if="showAction">
-        <!-- 这里加上品牌类目型号规格编辑 -->
+
         <div>品牌类目型号</div>
+        <div class="update-big-img">
+          <p>规格书上传</p>
+          <div class="previewImage">
+            <img ng-src="{{Regulpic}}" 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'">
+              <div class="cover">
+                <div class="look"><i class="fa fa-search"></i>查看</div>
+              </div>
+            </a>
+          </div>
+          <span class="prompt"><em style="color: #f00;">*</em>仅允许上传PDF格式文件，大小不超过20M</span>
+        </div>
+        <div class="update-file-btn">
+          <div class="file-text">
+            <h3>规格书上传须知</h3>
+            <div>1、规格书上传后，商城会在两个工作日内进行审核，审核通过后规格书将会被展示在在售产品中；<br/>
+              2、当规格书处于<span>待审核</span>状态时，再次上传规格书，则前份规格书失效，需重新等待审核；<br/>
+              3、如审核不通过，将会以小心的形式通知您；<br/>
+              4、商城已收录规格书的器件暂不开放上传<br/>
+            </div>
+          </div>
+          <p>
+                        <span style="left:40px;">
+                            <input type="file" image-upload class="uploadImage" accept=".pdf" on-success="onUploadSuccess($data, $file)" non-preview="true">
+                            <span>选择文件</span>
+                        </span>
+            <a ng-click="confirm()" class="ok">确定</a>
+          </p>
+        </div>
       </div>
-      <div class="update-big-img">
+      <!--企业产品库 --- /end 这里加上品牌类目型号规格编辑 -->
+      <div class="update-big-img" ng-if="!showAction">
         <p>规格书上传</p>
         <div class="previewImage">
           <img ng-src="{{Regulpic}}" alt="商品图片">
@@ -199,7 +234,7 @@
         </div>
         <span class="prompt"><em style="color: #f00;">*</em>仅允许上传PDF格式文件，大小不超过20M</span>
       </div>
-      <div class="update-file-btn">
+      <div class="update-file-btn" ng-if="!showAction">
         <div class="file-text">
           <h3>规格书上传须知</h3>
           <div>1、规格书上传后，商城会在两个工作日内进行审核，审核通过后规格书将会被展示在在售产品中；<br/>