Browse Source

根据产品对买卖家中心部分样式进行优化

Administrator 7 years ago
parent
commit
48cb45f5ee

+ 2 - 1
src/main/webapp/resources/js/vendor/controllers/forstore/purchasAttendtion_ctrl.js

@@ -33,7 +33,8 @@ define(['app/app'], function (app) {
               Attendtion.getList(param, function(data) {
                 console.log(data.content)
                 params.total(data.totalElements);
-                $scope.totalElements = data.totalElements
+                $scope.totalElements = data.totalElements;
+                $scope.seekListAll = data;
                 $scope.endNumber = data.numberOfElements;
                 $defer.resolve(data.content);
                 $scope.AttendListData = data.content;

+ 1 - 0
src/main/webapp/resources/js/vendor/controllers/forstore/seek_purchase_ctrl.js

@@ -98,6 +98,7 @@ define(['app/app'], function (app) {
                 params.total(data.totalElements);
                 $defer.resolve(data.content);
                 $scope.seekListData = data.content;
+                $scope.seekListAll = data
               }).error(function (response) {
                 toaster.pop('error', response);
               });

+ 2 - 5
src/main/webapp/resources/view/usercenter/forstore/buyer_cart.html

@@ -136,9 +136,6 @@
 		font-size: 12px;
 		color: #5078cb;
 	}
-	#buyer_cart .shopCar .text-center .col-xs-5 p{
-		font-size: 12px;
-	}
 	#buyer_cart .shopCar .text-center .col-xs-5 i{
 		color: #5078cb;
 		font-size: 12px;
@@ -786,8 +783,8 @@
 					<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>
+					<div class="col-xs-5" style="text-align:left">
+						<p class="grey f14">您的购物车空空如也,请先挑选您想要购买的产品吧!</p>
 						<a href=".">马上去逛一逛</a>&nbsp;<i class="fa fa-arrow-right"></i>
 					</div>
 				</div>

+ 41 - 6
src/main/webapp/resources/view/usercenter/forstore/pay_center.html

@@ -61,9 +61,9 @@
 		margin: 20px;
 	}
 	#pay_center .tab .tab-dd .col-xs-4{
-		margin: 42px 0;
+		margin: 42px -25px;
 		line-height: 25px;
-		text-align: center;
+		text-align: left;
 		vertical-align: middle;
 	}
 	#pay_center .tab .tab-dd .col-xs-4 a{
@@ -408,6 +408,33 @@
 	.oder01 ul li.active:after{
 		display: block
 	}
+
+	.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="pay_center">
@@ -452,7 +479,15 @@
 						</tr>
 					</tbody>
 				</table>
-				<div style="text-align: right;margin-right:25px;margin-top:-30px;">
+				<div class="empty" ng-if="accounts.length == 0">
+					<p class="empty-img">
+						<img src="static/img/all/empty-cart.png">
+					</p>
+					<div class="empty-info">
+						<p class="grey f14">暂无账户信息</p>
+					</div>
+				</div>
+				<div style="text-align: right;margin-right:25px;margin-top:-30px;" ng-if="accounts.length !== 0">
 					<span class="count-tip">显示 {{$$bankInfo.start}}-{{$$bankInfo.end}} 条,共 <em ng-bind="$$bankInfo.totalElements" style="color: #5078cb">2506</em> 条</span>
 				</div>
 				<div class="com-mall-del-box" ng-if="showDelete">
@@ -558,17 +593,17 @@
 						<span><em>退款成功</em></span>
 					</dd>-->
 					<dd ng-if="!tradeRecordPage || tradeRecordPage.length == 0" class="tab-dd" style="height: 125px; padding: 30px;">
-						<div class="col-xs-offset-3 col-xs-2">
+						<div class="col-xs-offset-3 col-xs-3">
 							<img src="static/img/all/empty-cart.png">
 						</div>
 						<div class="col-xs-4">
-							<p class="grey" style="font-size: 12px">暂无支付记录,请下单购买商品吧!</p>
+							<p class="grey" style="font-size:14px">暂无支付记录,请下单购买商品吧!</p>
 							<a href=".">马上去逛一逛</a>&nbsp;<i class="fa fa-arrow-right"></i>
 						</div>
 					</dd>
 
 				</dl>
-				<div style="text-align: right;margin-right:20px;margin-top:10px;">
+				<div style="text-align: right;margin-right:20px;margin-top:10px;" ng-if="tradeRecordPage.length != 0">
 					<span class="count-tip">显示 {{$$record.start}}-{{$$record.end}} 条,共 <em ng-bind="$$record.totalElements" style="color: #5078cb">2506</em> 条</span>
 				</div>
                 <!--<p class="height16">&nbsp</p>-->

+ 4 - 4
src/main/webapp/resources/view/usercenter/forstore/seekPurchase.html

@@ -1052,7 +1052,7 @@
                     </div>
                 </div>
                 <div class="sreach-input fr">
-                    <input type="search" placeholder="品牌/型号" class="form-control" ng-model="keyWord" ng-search="onSearch()"/>
+                    <input type="search" placeholder="品牌/类目/型号" class="form-control" ng-model="keyWord" ng-search="onSearch()"/>
                     <a class="seek" href="javascript:void(0)" ng-click="onSearch()">搜索</a>
                 </div>
             </div>
@@ -1338,7 +1338,7 @@
                 <tr class="pager-row" ng-if="seekListData.totalElements > 0">
                 <td colspan="10">
                     <div>
-                        显示&nbsp;{{(seekListData.number - 1 ) * seekListData.size + 1}}-{{seekListData.number * seekListData.size}}&nbsp;条,共&nbsp;{{seekListData.totalElements}}&nbsp;条
+                        显示&nbsp;{{(seekListData.number - 1 ) * seekListData.size + 1}}-{{seekListData.totalElements >= 10 ? seekListData.number * seekListData.size : seekListData.totalElements}}&nbsp;条,共&nbsp;{{seekListData.totalElements}}&nbsp;条
                     </div>
                 </td>
             </tr>
@@ -1346,7 +1346,7 @@
                 <td colspan="10">
                     <div>
                         <img src="static/img/all/empty-cart.png">
-                        <span>暂无求购信息</span>
+                        <span class="f14">暂无求购信息</span>
                     </div>
                 </td>
             </tr>
@@ -1418,7 +1418,7 @@
                 <td>
                     <div>
                         <img src="static/img/all/empty-cart.png">
-                        <span>暂无求购信息</span>
+                        <span class="f14">暂无求购信息</span>
                     </div>
                 </td>
             </tr>

+ 2 - 2
src/main/webapp/resources/view/usercenter/forstore/store_focus.html

@@ -376,13 +376,13 @@
 			<ul>
 				<li ng-repeat="item in store" class="store-item">
 					<div class="img-div" ng-click="setActive(item)" ng-class="{'isSelected-background': isBatch &&item.active}">
-						<a name="imgDetail" href="store/{{item.storeInfo.uuid}}">
+						<a name="imgDetail" href="store/{{item.storeInfo.uuid}}" target="_blank">
 							<img src="{{item.storeInfo.logoUrl}}" class="store-img"/>
 						</a>
 						<div class="img-background-div" ng-class="{'notSelected': isBatch && !item.active, 'isSelected':  isBatch &&item.active}"></div>
 					</div>
 					<div style="width:760px;">
-						<a name="nameDetail" href="store/{{item.storeInfo.uuid}}">
+						<a name="nameDetail" href="store/{{item.storeInfo.uuid}}" target="_blank">
 							<div ng-bind=item.storeName class="item-storeName"></div>
 						</a>
 						<i class="fa fa-trash fa-2x item-delete" ng-click="deleteById(item.id)" ng-hide="isBatch" title="取消关注" style="cursor: pointer"></i>

+ 3 - 3
src/main/webapp/resources/view/vendor/forstore/purchasAttendtion.html

@@ -195,7 +195,7 @@
       <tbody ng-if="totalElements > 0">
         <tr ng-repeat="item in AttendListData">
           <th ng-click="onCheckBoxOnce(item, $index)"><input type="checkbox" class="checkbox" ng-checked="item.checkBox === true"></th>
-          <th>{{$index + 1}}</th>
+          <th>{{$index + 1 + (seekListAll.number - 1) * seekListAll.size}}</th>
           <th>{{item.nameCn}}</th>
           <th class="Attend_btn"><a ng-click="addAttendTionmodify(item)">{{item.status === 1 ? '取消关注' : '关注'}}</a></th>
         </tr>
@@ -209,8 +209,8 @@
         <a ng-click="toggleAttend('isAttend')" >马上去逛一逛</a>
       </p>
     </div>
-    <div class="record-line text-right ng-binding ng-scope" ng-if="totalElements > 0">显示 1-
-      <span ng-bind="endNumber" class="ng-binding">10</span>, 共: <span style="color: #5078cb;" class="ng-binding">{{totalElements}}</span> 个
+    <div class="record-line text-right ng-binding ng-scope" ng-if="totalElements > 0">
+      显示&nbsp;{{(seekListAll.number - 1 ) * seekListAll.size + 1}}-{{seekListAll.totalElements >=10 ? seekListAll.number * seekListAll.size : seekListAll.totalElements}}&nbsp;条,共&nbsp;{{seekListAll.totalElements}}&nbsp;条
     </div>
   </div>
 </div>

+ 5 - 1
src/main/webapp/resources/view/vendor/forstore/seekPurchase.html

@@ -3,7 +3,7 @@
         margin: 10px 0 0 0;
         padding: 20px 0;
         background: #fff;
-        padding-bottom:50px;
+        padding-bottom:100px;
     }
     /*搜索时间筛选 start*/
     .seek-purchase .seek-purchase-content .screen {
@@ -85,6 +85,7 @@
     }
     .seek-purchase .seek-purchase-content >table {
         width: 1000px;
+        margin-bottom:40px;
     }
     /*搜索时间筛选 end*/
     .seek-purchase .seek-purchase-content >table thead {
@@ -950,6 +951,9 @@
                 </tr>
             </tbody>
         </table>
+        <div style="text-align: right;margin-right: 20px;margin-top: -25px;" ng-if="seekListData.length != 0">
+            显示&nbsp;{{(seekListAll.number - 1 ) * seekListAll.size + 1}}-{{seekListAll.totalElements >=10 ? seekListAll.number * seekListAll.size : seekListAll.totalElements}}&nbsp;条,共&nbsp;{{seekListAll.totalElements}}&nbsp;条
+        </div>
     </div>
     <div class="com-modal-wrap" ng-show="isShowSayPriceBox">
         <div class="say-price-box">

+ 3 - 1
src/main/webapp/resources/view/vendor/forstore/vendor_delivery_rule.html

@@ -555,7 +555,9 @@
 
 				<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>
+						<span class="count-tip">
+							显示&nbsp;{{$$rule.start}}-{{$$rule.end}}&nbsp;条,共&nbsp;{{$$rule.totalElements}}&nbsp;条
+						</span>
 					</td>
 				</tr>
 				</tbody>

+ 6 - 0
src/main/webapp/resources/view/vendor/forstore/vendor_order.html

@@ -630,7 +630,13 @@
 	.operate-height{
 		position: relative;
 		color: #333 !important;
+		cursor:auto;
 	}
+
+	.operate-height .ship-btn{
+		cursor:pointer;
+	}
+
 	.operate-height .ship-btn:hover + .ship-content,.operate-height .ship-btn:hover + .pay{
 		display: inline-block !important;
 	}