界面优化

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

@@ -697,6 +697,12 @@
 	.oder_list dl .pro_xq a.unstand:hover em{
 		color: #666 !important;
 	}
+
+	.oder01 ul li a {
+		font-size: 13px;
+		font-weight: bold;
+	}
+
 </style>
 <div class="user_right fr">
 	<!--订单中心-->
@@ -705,10 +711,10 @@
 			<ul>
 				<li ng-class="{'active' : status == 'all'}" ng-click="toggleStatus('all')"><a> 所有订单(<em ng-class="{'color-black': !AllOrderInfo['all']}" ng-bind="AllOrderInfo['all'] || 0"></em>)</a></li>
 				<li ng-class="{'active' : status == 'tobepaid'}" ng-click="toggleStatus('tobepaid')"><a>待付款（<em ng-class="{'color-black': !AllOrderInfo['tobepaid']}" ng-bind="AllOrderInfo['tobepaid'] || 0"></em>）</a></li>
-				<li ng-class="{'active' : status == 'tobedeliver'}" ng-click="toggleStatus('tobedeliver')"><a>待发货（<em ng-class="{'color-black': !AllOrderInfo['tobedeliver']}" ng-bind="AllOrderInfo['tobedeliver'] || 0"></em>）</a></li>
+				<li ng-class="{'active' : status == 'tobedeliver'}" ng-click="toggleStatus('tobedeliver')"><a>待卖家发货（<em ng-class="{'color-black': !AllOrderInfo['tobedeliver']}" ng-bind="AllOrderInfo['tobedeliver'] || 0"></em>）</a></li>
 				<li ng-class="{'active' : status == 'tobereceive'}" ng-click="toggleStatus('tobereceive')"><a>待收货（<em ng-class="{'color-black': !AllOrderInfo['tobereceive']}" ng-bind="AllOrderInfo['tobereceive'] || 0"></em>）</a></li>
-				<li ng-class="{'active' : status == 'success'}" ng-click="toggleStatus('success')"><a>交易结束（<em ng-class="{'color-black': !AllOrderInfo['success']}" ng-bind="AllOrderInfo['success'] || 0"></em>）</a></li>
-				<li ng-class="{'active' : status == 'unavailable'}" ng-click="toggleStatus('unavailable')"><a>已取消（<em ng-class="{'color-black': !AllOrderInfo['unavailable']}" ng-bind="AllOrderInfo['unavailable'] || 0"></em>）</a></li>
+				<li ng-class="{'active' : status == 'success'}" ng-click="toggleStatus('success')"><a>成功的订单（<em ng-class="{'color-black': !AllOrderInfo['success']}" ng-bind="AllOrderInfo['success'] || 0"></em>）</a></li>
+				<li ng-class="{'active' : status == 'unavailable'}" ng-click="toggleStatus('unavailable')"><a>取消的订单（<em ng-class="{'color-black': !AllOrderInfo['unavailable']}" ng-bind="AllOrderInfo['unavailable'] || 0"></em>）</a></li>
 				<li ng-class="{'active' : status == 'tobecomment'}" ng-click="toggleStatus('tobecomment')"><a>待评价（<em ng-class="{'color-black': !AllOrderInfo['tobecomment']}" ng-bind="AllOrderInfo['tobecomment'] || 0"></em>）</a></li>
 			</ul>
 		</div>

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

@@ -3,24 +3,24 @@
 <div class="user_right fr">
 	<div class="down-payment">
 		<div class="content">
-			<div class="common-title margin-top-none">付款账户</div>
-			<div class="payment-style">
-				<ul>
-					<li ng-if="buyAccount">
-						<label class="check-act" style="margin-right: 64px;">
-							<input type="radio" id="1" name="1" checked/>
-							<label for="1"></label>
-							<em class="word-in-10" ng-bind="buyAccount.bankname" title="{{buyAccount.bankname}}"></em>
-						</label>
-						<div ng-bind="buyAccount.filterAccount"></div>
-						<div ng-bind="buyAccount.accountname"></div>
-						<div ng-if="buyAccountInfos.length > 1"><button class="change-count" ng-click="changebuyAccount(buyAccount.id)">更换账户</button></div>
-					</li>
-					<li class="no-count" ng-if="!buyAccount">
-						<span><i class="fa fa-exclamation-circle"></i>暂未设置付款账户，前往  <a href="javascript:void(0)" ng-click="editAccount()">设置付款账户</a></span>
-					</li>
-				</ul>
-			</div>
+			<!--<div class="common-title margin-top-none">付款账户</div>-->
+			<!--<div class="payment-style">-->
+				<!--<ul>-->
+					<!--<li ng-if="buyAccount">-->
+						<!--<label class="check-act" style="margin-right: 64px;">-->
+							<!--<input type="radio" id="1" name="1" checked/>-->
+							<!--<label for="1"></label>-->
+							<!--<em class="word-in-10" ng-bind="buyAccount.bankname" title="{{buyAccount.bankname}}"></em>-->
+						<!--</label>-->
+						<!--<div ng-bind="buyAccount.filterAccount"></div>-->
+						<!--<div ng-bind="buyAccount.accountname"></div>-->
+						<!--<div ng-if="buyAccountInfos.length > 1"><button class="change-count" ng-click="changebuyAccount(buyAccount.id)">更换账户</button></div>-->
+					<!--</li>-->
+					<!--<li class="no-count" ng-if="!buyAccount">-->
+						<!--<span><i class="fa fa-exclamation-circle"></i>暂未设置付款账户，前往  <a href="javascript:void(0)" ng-click="editAccount()">设置付款账户</a></span>-->
+					<!--</li>-->
+				<!--</ul>-->
+			<!--</div>-->
 			<div class="common-title margin-top-8">收款账户</div>
 			<div class="payment-style">
 				<ul class="payment-80">

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

@@ -919,13 +919,13 @@
 							<input type="hidden" name="sign" value={{ysepayRequest.sign}}>
 						</form>
 						<p>
-							<span class="style01" style="width: 220px; margin-left: 610px;">付费方式:
+							<span class="style01" style="width: 220px; margin-left: 610px;">付款方式:
 								<select class="select" ng-model="order.paytype">
 									<option value="1102">在线支付</option>
 									<option value="1103">线下支付</option>
 								</select>
 							</span>
-							<a ng-click="confirmPay()">确认付款</a></p>
+							<a ng-click="confirmPay()">提交订单</a></p>
 					</dd>
 				</dl>
 			</div>

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

@@ -904,7 +904,7 @@
                                             </div>
                                             <ul class="red-text">
                                               <li ng-repeat="re in of.replies">
-                                                  <span ng-bind="re.lapQty">1+</span>
+                                                  <span ng-bind="re.lapQty" title="re.lapQty">1+</span>
                                                   <span title="{{of.currency + re.price | currencyStr}}">{{of.currency + re.price | currencyStr}}</span>
                                               </li>
                                             </ul>

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

@@ -1,7 +1,7 @@
 <style>
-    #left-nav-fragment .user_left a {
-        font-size: 1.1em;
-    }
+    /*#left-nav-fragment .user_left a {*/
+        /*font-size: 1.1em;*/
+    /*}*/
     #left-nav-fragment .user_left p {
         text-align: center;
     }
@@ -38,15 +38,17 @@
                 <li ng-class="{'active' : active == 'buyer_cart'}"><a  ui-sref="buyer_cart">购物车<em>(<span ng-bind="countCart || 0 | number"></span>)</em></a> </li>
                 <div ng-hide="!(userInfo.pwdEnable && userInfo.haveUserQuestion && userInfo.userEmail)">
                     <li ng-class="{'active' : active == 'buyer_order'}"><a  ui-sref="buyer_order">订单中心</a></li>
+                    <li ng-class="{'active' : active == 'seek_purchase'}"><a  ui-sref="buyerSeekPurchase">我的求购</a></li>
                     <li ng-class="{'active' : active == 'pay_center'}"><a  ui-sref="pay_center">支付中心</a></li>
                     <li ng-class="{'active' : active == 'buyer_invoice'}"><a  ui-sref="buyer_invoice">发票管理</a></li>
                 </div>
                 <div ng-hide="userInfo.pwdEnable && userInfo.haveUserQuestion && userInfo.userEmail">
                     <li ng-class="{'active' : active == 'buyer_order'}"><a ng-click="promptUpdate()" class="disabled">订单中心</a></li>
+                    <li ng-class="{'active' : active == 'seek_purchase'}"><a  ng-click="promptUpdate()" class="disabled" >我的求购</a></li>
                     <li ng-class="{'active' : active == 'pay_center'}"><a ng-click="promptUpdate()" class="disabled" >支付中心</a></li>
                     <li ng-class="{'active' : active == 'buyer_invoice'}"><a ng-click="promptUpdate()" class="disabled" >发票管理</a></li>
                 </div>
-                <li ng-class="{'active' : active == 'seek_purchase'}"><a  ui-sref="buyerSeekPurchase">我的求购</a></li>
+
 
 
                 <!--<li ng-class="{'active' : active == 'my_wallet'}" class="undo">-->

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

@@ -1111,6 +1111,11 @@
 	.oder_list dl b.total{
 		margin-right: 0;
 	}
+
+	.oder01 ul li a {
+		font-size: 13px;
+		font-weight: bold;
+	}
 </style>
 <div class="user_right fr">
 	<!--订单中心-->
@@ -1132,12 +1137,12 @@
 		<div class="oder01">
 			<ul>
 				<li ng-class="{'active': status=='all'}" ng-click="setActive('all')"><a> 所有订单(<em ng-class="{'color-black': !counts['all']}" ng-bind="counts['all'] || 0"></em>)</a></li>
-				<li ng-class="{'active': status=='tobeconfirmed'}" ng-click="setActive('tobeconfirmed')"><a>待付款（<em ng-class="{'color-black': !counts['tobeconfirmed']}" ng-bind="counts['tobeconfirmed'] || 0"></em>）</a></li>
-				<li ng-class="{'active': status=='comfirmed'}" ng-click="setActive('comfirmed')"><a>待发货（<em ng-class="{'color-black': !counts['comfirmed']}" ng-bind="counts['comfirmed'] || 0"></em>）</a></li>
+				<li ng-class="{'active': status=='tobeconfirmed'}" ng-click="setActive('tobeconfirmed')"><a>待买家付款（<em ng-class="{'color-black': !counts['tobeconfirmed']}" ng-bind="counts['tobeconfirmed'] || 0"></em>）</a></li>
+				<li ng-class="{'active': status=='comfirmed'}" ng-click="setActive('comfirmed')"><a>待买家收货（<em ng-class="{'color-black': !counts['comfirmed']}" ng-bind="counts['comfirmed'] || 0"></em>）</a></li>
 				<li ng-class="{'active': status=='inbound'}" ng-click="setActive('inbound')"><a>待收货（<em ng-class="{'color-black': !counts['inbound']}" ng-bind="counts['inbound'] || 0"></em>）</a></li>
 				<li ng-class="{'active': status=='tobepaid'}" ng-click="setActive('tobepaid')"><a>待收款（<em ng-class="{'color-black': !counts['tobepaid']}" ng-bind="counts['tobepaid'] || 0"></em>）</a></li>
-				<li ng-class="{'active': status=='completed'}" ng-click="setActive('completed')"><a>交易结束（<em ng-class="{'color-black': !counts['completed']}" ng-bind="counts['completed'] || 0"></em>）</a></li>
-				<li ng-class="{'active': status=='unavailable'}" ng-click="setActive('unavailable')"><a>已取消（<em ng-class="{'color-black': !counts['unavailable']}" ng-bind="counts['unavailable'] || 0"></em>）</a></li>
+				<li ng-class="{'active': status=='completed'}" ng-click="setActive('completed')"><a>成功的订单（<em ng-class="{'color-black': !counts['completed']}" ng-bind="counts['completed'] || 0"></em>）</a></li>
+				<li ng-class="{'active': status=='unavailable'}" ng-click="setActive('unavailable')"><a>取消的订单（<em ng-class="{'color-black': !counts['unavailable']}" ng-bind="counts['unavailable'] || 0"></em>）</a></li>
 				<li ng-class="{'active': status=='toBeReviewed'}" ng-click="setActive('toBeReviewed')"><a>售后中（<em ng-class="{'color-black': !counts['toBeReviewed']}" ng-bind="counts['toBeReviewed'] || 0"></em>）</a></li>
 			</ul>
 		</div>

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

@@ -32,6 +32,13 @@
 		color: #6183CF;
 	}
 
+	div.vendor_store_maintain .custom_col .tip_info a {
+		background: #ed103f;
+		color: #fff;
+		font-size: 14px;
+		padding: 5px;
+	}
+
 	div.vendor_store_maintain .row h2 {
 		padding: 0;
 		font-size: 16px;

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

@@ -45,67 +45,72 @@
 	<ul>
 		<div ng-hide="!(userInfo.pwdEnable && userInfo.haveUserQuestion && userInfo.userEmail)">
 		<li ng-class="{'active' : active == 'vendor_order'}"><span  ui-sref="vendor_order">订单中心</span></li>
+			<!--	<li ng-class="{'active' : active == 'vendor_productOn'}"><span  ui-sref="vendor_productOn">产品导入</span></li>-->
+			<li ng-class="{'active' : active == 'vendor_productOn'}"><span  ui-sref="vendor_upload">产品导入</span></li>
+			<li ng-class="{'active' : active == 'vendor_material'}"><span  ui-sref="vendor_material">产品管理</span></li>
+			<li ng-class="{'active' : active == 'vendor_store'}">
+				<!-- 我要开店 !store && applyStatus == 'NONE' -->
+				<span  ui-sref="vendor_store_apply" ng-if="!store && applyStatus == 'NONE'">开店申请</span>
+				<!-- 店铺申请中 !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>
+				<!-- 我的店铺 store -->
+				<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>
+			<li ng-class="{'active' : active == 'vendor_seek_purchase'}"><a  ui-sref="vendorSeekPurchase">求购询价</a></li>
 		<li ng-class="{'active' : active == 'vendor_logistics'}">
 			<span  ui-sref="vendor_logistics" ng-hide="store && (!store.status || store.status === 'OPENED')">物流管理</span>
 			<span  ui-sref="vendor_deliveryRule" ng-if="store && (!store.status || store.status === 'OPENED')">物流管理</span>
 		</li>
-      <li ng-class="{'active' : active == 'vendor_seek_purchase'}"><a  ui-sref="vendorSeekPurchase">求购询价</a></li>
+
 		<li ng-class="{'active' : active == 'vendor_invoice'}"><span  ui-sref="vendorInvoice">发票管理</span></li>
 	<!--	<li ng-class="{'active' : active == 'vendor_logistics'}"><span  ui-sref="vendor_logistics">物流管理</span></li>-->
 		<li ng-class="{'active' : active == 'pay_center'}"><span  ui-sref="pay_center">结算中心</span></li>
 		<li ng-class="{'active' : active == 'vendor_brand_apply'}"><span  ui-sref="vendor_brand_apply">品牌申请</span></li>
 		<li ng-class="{'active' : active == 'vendor_component_apply'}"><span  ui-sref="vendor_component_apply">器件申请</span></li>
-	<!--	<li ng-class="{'active' : active == 'vendor_productOn'}"><span  ui-sref="vendor_productOn">产品导入</span></li>-->
-		<li ng-class="{'active' : active == 'vendor_productOn'}"><span  ui-sref="vendor_upload">产品导入</span></li>
+
 		<!--<li ng-class="{'active' : active == 'vendor_repository'}"><span  ui-sref="vendor_repository">仓库管理</span></li>-->
-		<li ng-class="{'active' : active == 'vendor_material'}"><span  ui-sref="vendor_material">产品管理</span></li>
 		<!--<li ng-class="{'active' : active == 'vendor_after_sale'}" class="undo">-->
 		<!--&lt;!&ndash;<span  ui-sref="vendor_after_sale">售后处理</span>&ndash;&gt;-->
 		<!--售后处理-->
 		<!--</li>-->
 		<!--<li ng-class="{'active' : active == 'vendor_manufacture'}"><span  ui-sref="vendor_manufacture">原厂认证</span></li>-->
-		<li ng-class="{'active' : active == 'vendor_store'}">
-			<!-- 我要开店 !store && applyStatus == 'NONE' -->
-			<span  ui-sref="vendor_store_apply" ng-if="!store && applyStatus == 'NONE'">开店申请</span>
-			<!-- 店铺申请中 !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>
-			<!-- 我的店铺 store -->
-			<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>
 		</div>
 		<div ng-hide="userInfo.pwdEnable && userInfo.haveUserQuestion && userInfo.userEmail">
 			<li ng-class="{'active' : active == 'vendor_order'}"><span ng-click="promptUpdate()" class="disabled">订单中心</span></li>
-			<li ng-class="{'active' : active == 'vendor_logistics'}"><span ng-click="promptUpdate()" class="disabled">物流管理</span></li>
-			<li ng-class="{'active' : active == 'vendor_invoice'}"><span ng-click="promptUpdate()" class="disabled" >发票管理</span></li>
-			<!--	<li ng-class="{'active' : active == 'vendor_logistics'}"><span  ui-sref="vendor_logistics">物流管理</span></li>-->
-			<li ng-class="{'active' : active == 'pay_center'}"><span ng-click="promptUpdate()" class="disabled" >结算中心</span></li>
-			<li ng-class="{'active' : active == 'vendor_brand_apply'}"><span ng-click="promptUpdate()" class="disabled" >品牌申请</span></li>
-			<li ng-class="{'active' : active == 'vendor_component_apply'}"><span ng-click="promptUpdate()" class="disabled" >器件申请</span></li>
 			<!--	<li ng-class="{'active' : active == 'vendor_productOn'}"><span  ui-sref="vendor_productOn">产品导入</span></li>-->
 			<li ng-class="{'active' : active == 'vendor_productOn'}"><span ng-click="promptUpdate()" class="disabled" >产品导入</span></li>
-			<!--<li ng-class="{'active' : active == 'vendor_repository'}"><span  ui-sref="vendor_repository">仓库管理</span></li>-->
 			<li ng-class="{'active' : active == 'vendor_material'}"><span ng-click="promptUpdate()" class="disabled" >产品管理</span></li>
-			<!--<li ng-class="{'active' : active == 'vendor_after_sale'}" class="undo">-->
-			<!--&lt;!&ndash;<span  ui-sref="vendor_after_sale">售后处理</span>&ndash;&gt;-->
-			<!--售后处理-->
-			<!--</li>-->
-			<!--<li ng-class="{'active' : active == 'vendor_manufacture'}"><span  ui-sref="vendor_manufacture">原厂认证</span></li>-->
 			<li ng-class="{'active' : active == 'vendor_store'}">
 				<!-- 我要开店 !store && applyStatus == 'NONE' -->
 				<span ng-click="promptUpdate()" class="disabled"  ng-if="!store && applyStatus == 'NONE'">开店申请</span>
 				<!-- 店铺申请中 !store && applyStatus == 'PREPARE' -->
 				<span ng-click="promptUpdate()" class="disabled"  ng-if="!store && applyStatus == 'PREPARE'">开店申请</span>
 				<!-- 我的店铺 !store && applyStatus == 'PASS' -->
-				<span ng-click="promptUpdate()" class="disabled"  ng-if="!store && applyStatus == 'PASS'">我的店铺</span>
+				<span ng-click="promptUpdate()" class="disabled"  ng-if="!store && applyStatus == 'PASS'">店铺管理</span>
 				<!-- 我的店铺 store -->
-				<span ng-click="promptUpdate()" class="disabled"  ng-if="store && (!store.status || store.status === 'OPENED')">我的店铺</span>
+				<span ng-click="promptUpdate()" class="disabled"  ng-if="store && (!store.status || store.status === 'OPENED')">店铺管理</span>
 				<!-- 我的店铺申述 store -->
-				<span ng-click="promptUpdate()" class="disabled"  ng-if="store && store.status && store.status !== 'OPENED'">我的店铺</span>
+				<span ng-click="promptUpdate()" class="disabled"  ng-if="store && store.status && store.status !== 'OPENED'">店铺管理</span>
 			</li>
+			<li ng-class="{'active' : active == 'vendor_seek_purchase'}"><a ng-click="promptUpdate()" class="disabled">求购询价</a></li>
+			<li ng-class="{'active' : active == 'vendor_logistics'}"><span ng-click="promptUpdate()" class="disabled">物流管理</span></li>
+			<li ng-class="{'active' : active == 'vendor_invoice'}"><span ng-click="promptUpdate()" class="disabled" >发票管理</span></li>
+			<!--	<li ng-class="{'active' : active == 'vendor_logistics'}"><span  ui-sref="vendor_logistics">物流管理</span></li>-->
+			<li ng-class="{'active' : active == 'pay_center'}"><span ng-click="promptUpdate()" class="disabled" >结算中心</span></li>
+			<li ng-class="{'active' : active == 'vendor_brand_apply'}"><span ng-click="promptUpdate()" class="disabled" >品牌申请</span></li>
+			<li ng-class="{'active' : active == 'vendor_component_apply'}"><span ng-click="promptUpdate()" class="disabled" >器件申请</span></li>
+			<!--<li ng-class="{'active' : active == 'vendor_repository'}"><span  ui-sref="vendor_repository">仓库管理</span></li>-->
+
+			<!--<li ng-class="{'active' : active == 'vendor_after_sale'}" class="undo">-->
+			<!--&lt;!&ndash;<span  ui-sref="vendor_after_sale">售后处理</span>&ndash;&gt;-->
+			<!--售后处理-->
+			<!--</li>-->
+			<!--<li ng-class="{'active' : active == 'vendor_manufacture'}"><span  ui-sref="vendor_manufacture">原厂认证</span></li>-->
+
 
 		</div>
 		<li ng-class="{'active' : active == 'vendor_account_management'}"><span  ui-sref="vendor_account_management">账户管理</span></li>