Merge branch 'dev-mysql' into liusw-addProductUser-v1.0.3.29

src/main/resources/dev/sys.properties

@@ -32,7 +32,7 @@ floorMicroServiceIp=10.10.100.23
 carouselMicroServiceIp=10.10.100.23
 storecmsMicroServiceIp=192.168.253.12
 endpointUri=10.10.100.23
-recommendPort=20100
+recommendPort=20102
 # upload file
 uploadFileUrl = http://10.10.100.200:9999
 # search file

src/main/resources/test/sys.properties

@@ -32,7 +32,7 @@ floorMicroServiceIp=10.10.100.23
 carouselMicroServiceIp=10.10.100.23
 storecmsMicroServiceIp=192.168.253.12
 endpointUri=10.10.100.23
-recommendPort=20100
+recommendPort=20102
 # upload file
 uploadFileUrl = http://10.10.100.200:9999
 # search file

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

@@ -962,18 +962,18 @@ define([ 'app/app' ], function(app) {
 	}]);
 
 	// 我的店铺侧边栏的Controller
-  app.controller('goCartCtrl', ['$scope', 'StoreInfo', function($scope, StoreInfo) {
-    $scope.uuid = false
-		console.log(111)
-    StoreInfo.existStore({}, {}, function (result) {
-    	$scope.uuid = result.uuid
-			console.log($scope.uuid)
-		})
-    $scope.openMystore = function(){
-    	var uuid = $scope.uuid
-      window.open('store/' + uuid, '_self');
+	app.controller('goCartCtrl', ['$scope', 'StoreInfo', 'AuthenticationService', function($scope, StoreInfo, AuthenticationService) {
+		$scope.uuid = false;
+    if(AuthenticationService.isAuthed()) {
+      StoreInfo.existStore({}, {}, function (result) {
+        $scope.uuid = result.uuid;
+      })
+    }
+		$scope.openMystore = function(){
+			var uuid = $scope.uuid;
+			window.open('store/' + uuid, '_self');
 		}
-  }])
+	}])
 
 
 	// Web Chat侧边栏的Controller

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

@@ -458,12 +458,12 @@
         padding-right: 15px;
         margin: 20px 0 12px 0;
     }
-    .seek-purchase .seek-purchase-content >table >tbody tr.empty td div {
+    .seek-purchase tr.empty td div {
         text-align: center;
         height: 200px;
         line-height: 200px;
     }
-    .seek-purchase .seek-purchase-content >table >tbody tr.empty td div span {
+    .seek-purchase tr.empty td div span {
         color: #999;
         margin-left: 10px;
     }
@@ -535,6 +535,11 @@
         vertical-align: middle;
         margin: 0 0 0 21px;
     }
+    .seek-purchase .bom-manage tr.empty div{
+        line-height: 200px;
+        display: block;
+        margin: 0;
+    }
     .seek-purchase .bom-manage > table tbody tr td > div p {
         font-size: 14px;
         font-weight: bold;
@@ -1017,6 +1022,14 @@
                     <a href="user#/bomDetail/{{bom.id}}" class="fr">查看详情</a>
                 </td>
             </tr>
+            <tr ng-if="!$data.length" class="empty">
+                <td>
+                    <div>
+                        <img src="static/img/all/empty-cart.png">
+                        <span>暂无求购信息</span>
+                    </div>
+                </td>
+            </tr>
             </tbody>
         </table>
     </div>