产品导入提示框逻辑

pom.xml

@@ -452,6 +452,11 @@
 			<artifactId>ps-entity</artifactId>
 			<version>0.0.1-SNAPSHOT</version>
 		</dependency>
+		<dependency>
+			<groupId>com.uas.ps</groupId>
+			<artifactId>ps-entity</artifactId>
+			<version>0.0.1-SNAPSHOT</version>
+		</dependency>
 		<!--Hutool POI工具类（对MS Office操作）-->
 		<!--<dependency>
 			<groupId>org.apache.poi</groupId>

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

@@ -53,7 +53,10 @@ define([ 'app/app' ], function(app) {
 		// 自营店铺选择寄售提示框
 		$scope.showSelfSellRemindBox = false;
 
-		$scope.setShowSelfSellRemindBox = function (flag) {
+		$scope.setShowSelfSellRemindBox = function (flag, type) {
+			if (type && type == 'no') {
+				$scope.sellType('self');
+			}
 			$scope.showSelfSellRemindBox = flag;
 		}
 

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

@@ -423,14 +423,31 @@
         text-align: center;
     }
     .type-remind-box .operate a {
-        padding: 5px 18px;
+        display: inline-block;
+        width: 90px;
+        height: 28px;
+        line-height: 28px;
+        text-align: center;
         background: #5078cb;
         color: #fff;
         font-size: 14px;
+        vertical-align: middle;
+    }
+    .type-remind-box .operate a:first-child {
+        margin-right: 10px;
     }
-    .type-remind-box .operate a:hover {
+    .type-remind-box .operate a:last-child {
+        background: #fff;
+        color: #5078cb;
+        border: 1px solid #5078cb;
+    }
+    .type-remind-box .operate a:first-child:hover {
         color: #fff !important;
     }
+    .type-remind-box .operate a:last-child:hover{
+        border-bottom: 1px solid #5078cb !important;
+        color: #5078cb !important;
+    }
 </style>
 <div class="user_right fr">
     <!--货品管理-->
@@ -471,11 +488,11 @@
                                 <label for="sellbyself" ng-disabled="!batch.selfSellEabled"></label>
                                 <span ng-disabled="!batch.selfSellEabled">店铺自营</span>
                             </label>-->
-                            <a href="">
+                            <a>
                                 <img ng-show="batch.sellType == 'self'" src="static/img/upload/daishou-default.png" alt="" ng-click="sellType('UAS')">
                                 <img ng-show="batch.sellType == 'UAS'" src="static/img/upload/daishou-active.png" alt="">
                             </a>
-                            <a href="" ng-disabled="!batch.selfSellEabled">
+                            <a ng-disabled="!batch.selfSellEabled">
                                 <img ng-show="batch.sellType == 'UAS'" src="static/img/upload/ziying-default.png" alt="" ng-click="sellType('self')">
                                 <img ng-show="batch.sellType == 'self'" src="static/img/upload/ziying-active.png" alt="">
                             </a>
@@ -628,11 +645,12 @@
                 <div class="com-modal-wrap" ng-if="showSelfSellRemindBox">
                     <div class="type-remind-box com-mall-del-box">
                         <div class="title">
-                            <i ng-click="setShowSelfSellRemindBox(false)"></i>
+                            <i ng-click="setShowSelfSellRemindBox(false, 'no')"></i>
                         </div>
                         <div class="result"><span>选择寄售，</span>产品将由优软统一售卖，不会出现在您的自营店铺。</div>
                         <div class="operate">
-                            <a href="javascript:void(0)" ng-click="setShowSelfSellRemindBox(false)">我知道了</a>
+                            <a href="javascript:void(0)" ng-click="setShowSelfSellRemindBox(false)">是</a>
+                            <a href="javascript:void(0)" ng-click="setShowSelfSellRemindBox(false, 'no')">否</a>
                         </div>
                     </div>
                 </div>