git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@847 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/webapp/resources/data/guide.json

@@ -1,23 +1,20 @@
 {
 "2.1": [ {
 	"image" : "static/img/guide/2.1/1.png",
-	"text" : "注册-第一步"
+	"text" : "注册-打开位置"
 }, {
 	"image" : "static/img/guide/2.1/2.png",
-	"text" : "注册-第二步"
+	"text" : "注册-填写资料"
 }, {
 	"image" : "static/img/guide/2.1/3.png",
-	"text" : "注册-第三步"
+	"text" : "注册-等待审核"
 }, {
 	"image" : "static/img/guide/2.1/4.png",
-	"text" : "注册-第四步"
+	"text" : "注册-激活完成"
 } ],
 "2.2": [ {
 	"image" : "static/img/guide/2.2/1.png",
-	"text" : "登录-第一步"
-}, {
-	"image" : "static/img/guide/2.2/2.png",
-	"text" : "登录-第二步"
+	"text" : "登录"
 } ],
 "3.1": [ {
 	"image" : "static/img/guide/3.1/1.png",
@@ -27,15 +24,160 @@
 	"text" : "报价-快捷打开方式"
 }, {
 	"image" : "static/img/guide/3.1/3.png",
-	"text" : "报价-打开客户询价"
+	"text" : "报价-待报价询价单"
 }, {
 	"image" : "static/img/guide/3.1/4.png",
-	"text" : "报价-确认报价"
+	"text" : "报价-报价方式"
 }, {
 	"image" : "static/img/guide/3.1/5.png",
-	"text" : "报价-分段报价"
+	"text" : "报价-报价说明"
 }, {
 	"image" : "static/img/guide/3.1/6.png",
+	"text" : "报价-添加分段"
+}, {
+	"image" : "static/img/guide/3.1/7.png",
 	"text" : "报价-查看采纳结果"
+}  ],
+"3.2": [ {
+	"image" : "static/img/guide/3.2/1.png",
+	"text" : "客户打样-打开方式"
+}, {
+	"image" : "static/img/guide/3.2/2.png",
+	"text" : "客户打样-打印申请单"
+}, {
+	"image" : "static/img/guide/3.2/3.png",
+	"text" : "客户打样-说明"
+}, {
+	"image" : "static/img/guide/3.2/4.png",
+	"text" : "客户打样-送样"
+}, {
+	"image" : "static/img/guide/3.2/5.png",
+	"text" : "客户打样-送样说明"
+}, {
+	"image" : "static/img/guide/3.2/6.png",
+	"text" : "客户打样-查看送样结果"
+}, {
+	"image" : "static/img/guide/3.2/7.png",
+	"text" : "客户打样-查看客户认定结果"
+} ],
+"3.3": [ {
+	"image" : "static/img/guide/3.3/1.png",
+	"text" : "客户采购-打开方式"
+}, {
+	"image" : "static/img/guide/3.3/2.png",
+	"text" : "客户采购-快捷打开方式"
+}, {
+	"image" : "static/img/guide/3.3/3.png",
+	"text" : "客户采购-说明"
+}, {
+	"image" : "static/img/guide/3.3/4.png",
+	"text" : "客户采购-打印"
+}, {
+	"image" : "static/img/guide/3.3/5.png",
+	"text" : "客户采购-待回复列表"
+}, {
+	"image" : "static/img/guide/3.3/6.png",
+	"text" : "客户采购-确认回复"
+}, {
+	"image" : "static/img/guide/3.3/7.png",
+	"text" : "客户采购-批量回复"
+}, {
+	"image" : "static/img/guide/3.3/8.png",
+	"text" : "客户采购-查看结果"
+}, {
+	"image" : "static/img/guide/3.3/9.png",
+	"text" : "客户采购-搜索"
+}, {
+	"image" : "static/img/guide/3.3/10.png",
+	"text" : "客户采购-详细展示页"
+} ],
+"3.4": [ {
+	"image" : "static/img/guide/3.4/1.png",
+	"text" : "客户采购变更-打开方式"
+}, {
+	"image" : "static/img/guide/3.4/2.png",
+	"text" : "客户采购变更-快捷打开方式"
+}, {
+	"image" : "static/img/guide/3.4/3.png",
+	"text" : "客户采购变更-待确认列表"
+}, {
+	"image" : "static/img/guide/3.4/4.png",
+	"text" : "客户采购变更-搜索"
+}, {
+	"image" : "static/img/guide/3.4/5.png",
+	"text" : "客户采购变更-确认回复-第一步"
+}, {
+	"image" : "static/img/guide/3.4/6.png",
+	"text" : "客户采购变更-确认回复-第二步"
+}, {
+	"image" : "static/img/guide/3.4/7.png",
+	"text" : "客户采购变更-说明"
+}, {
+	"image" : "static/img/guide/3.4/8.png",
+	"text" : "客户采购变更-查看结果"
+} ],
+"3.5": [ {
+	"image" : "static/img/guide/3.5/1.png",
+	"text" : "送货-打开方式"
+}, {
+	"image" : "static/img/guide/3.5/2.png",
+	"text" : "送货-快捷打开方式"
+}, {
+	"image" : "static/img/guide/3.5/3.png",
+	"text" : "送货-待发货列表"
+}, {
+	"image" : "static/img/guide/3.5/4.png",
+	"text" : "送货-确认发货"
+}, {
+	"image" : "static/img/guide/3.5/5.png",
+	"text" : "送货-说明"
+}, {
+	"image" : "static/img/guide/3.5/6.png",
+	"text" : "送货-批量送货-第一步"
+}, {
+	"image" : "static/img/guide/3.5/7.png",
+	"text" : "送货-批量送货-第二步"
+}],
+"3.6": [ {
+	"image" : "static/img/guide/3.6/1.png",
+	"text" : "客户验收-打开"
+}, {
+	"image" : "static/img/guide/3.6/2.png",
+	"text" : "客户验收-搜索"
+} ],
+"3.7": [ {
+	"image" : "static/img/guide/3.7/1.png",
+	"text" : "客户退回-打开"
+}, {
+	"image" : "static/img/guide/3.7/2.png",
+	"text" : "客户退回-搜索"
+} ],
+"3.8": [ {
+	"image" : "static/img/guide/3.8/1.png",
+	"text" : "客户不良品入库-打开"
+}, {
+	"image" : "static/img/guide/3.8/2.png",
+	"text" : "客户不良品入库-搜索"
+} ],
+"3.9": [ {
+	"image" : "static/img/guide/3.9/1.png",
+	"text" : "客户不良品出库-打开"
+}, {
+	"image" : "static/img/guide/3.9/2.png",
+	"text" : "客户不良品出库-搜索"
+} ],
+"3.10": [ {
+	"image" : "static/img/guide/3.10/1.png",
+	"text" : "MRB-打开"
+}, {
+	"image" : "static/img/guide/3.10/2.png",
+	"text" : "MRB-搜索"
+} ],
+"3.11": [ {
+	"image" : "static/img/guide/3.11/1.png",
+	"text" : "客户应付发票-打开"
+}, {
+	"image" : "static/img/guide/3.11/2.png",
+	"text" : "客户应付发票-搜索"
 } ]
 }

src/main/webapp/resources/tpl/index/sale/accept.html

@@ -109,15 +109,7 @@
 </div>
 <div class="condition block">
 		<div class="row">
-			<div class="col-xs-4">
-				<div class="btn-group btn-group-sm btn-group-justified">
-					<div class="btn-group btn-group-sm">
-						<button type="button" class="btn btn-default btn-line"
-							ng-class="{'btn-info':active=='all'}" ng-click="setActive('all')">全部</button>
-					</div>
-				</div>
-			</div>
-			<div class="col-xs-6">
+			<div class="col-xs-10">
 				<div class="search">
 					<div class="form-group form-group-sm has-feedback">
 						<input type="search" class="form-control input-sm" placeholder="输入商品、客户名称或单据流水号搜索" /><span

src/main/webapp/resources/tpl/index/sale/approval.html

@@ -131,15 +131,7 @@
 </div>
 <div class="condition block">
 		<div class="row">
-			<div class="col-xs-4">
-				<div class="btn-group btn-group-sm btn-group-justified">
-					<div class="btn-group btn-group-sm">
-						<button type="button" class="btn btn-default btn-line"
-							ng-class="{'btn-info':active=='all'}" ng-click="setActive('all')">全部</button>
-					</div>
-				</div>
-			</div>
-			<div class="col-xs-6">
+			<div class="col-xs-10">
 				<div class="search">
 					<div class="form-group form-group-sm has-feedback">
 						<input type="search" class="form-control input-sm" placeholder="输入商品、客户名称或单据流水号搜索" /><span

src/main/webapp/resources/tpl/index/sale/forecast.html

@@ -109,15 +109,7 @@
 </div>
 <div class="condition block">
 		<div class="row">
-			<div class="col-xs-4">
-				<div class="btn-group btn-group-sm btn-group-justified">
-					<div class="btn-group btn-group-sm">
-						<button type="button" class="btn btn-default btn-line"
-							ng-class="{'btn-info':active=='all'}" ng-click="setActive('all')">全部</button>
-					</div>
-				</div>
-			</div>
-			<div class="col-xs-6">
+			<div class="col-xs-10">
 				<div class="search">
 					<div class="form-group form-group-sm has-feedback">
 						<input type="search" class="form-control input-sm" placeholder="输入商品、客户名称或单据流水号搜索" /><span

src/main/webapp/resources/tpl/index/sale/returns.html

@@ -109,15 +109,7 @@
 </div>
 <div class="condition block">
 		<div class="row">
-			<div class="col-xs-4">
-				<div class="btn-group btn-group-sm btn-group-justified">
-					<div class="btn-group btn-group-sm">
-						<button type="button" class="btn btn-default btn-line"
-							ng-class="{'btn-info':active=='all'}" ng-click="setActive('all')">全部</button>
-					</div>
-				</div>
-			</div>
-			<div class="col-xs-6">
+			<div class="col-xs-10">
 				<div class="search">
 					<div class="form-group form-group-sm has-feedback">
 						<input type="search" class="form-control input-sm" placeholder="输入商品、客户名称或单据流水号搜索" /><span

src/main/webapp/resources/tpl/index/sale/sample.html

@@ -131,15 +131,7 @@
 </div>
 <div class="condition block">
 		<div class="row">
-			<div class="col-xs-4">
-				<div class="btn-group btn-group-sm btn-group-justified">
-					<div class="btn-group btn-group-sm">
-						<button type="button" class="btn btn-default btn-line"
-							ng-class="{'btn-info':active=='all'}" ng-click="setActive('all')">全部</button>
-					</div>
-				</div>
-			</div>
-			<div class="col-xs-6">
+			<div class="col-xs-10">
 				<div class="search">
 					<div class="form-group form-group-sm has-feedback">
 						<input type="search" class="form-control input-sm" placeholder="输入商品、客户名称或单据流水号搜索" /><span

src/main/webapp/resources/tpl/index/sale/send.html

@@ -113,15 +113,7 @@
 </div>
 <div class="condition block">
 		<div class="row">
-			<div class="col-xs-4">
-				<div class="btn-group btn-group-sm btn-group-justified">
-					<div class="btn-group btn-group-sm">
-						<button type="button" class="btn btn-default btn-line"
-							ng-class="{'btn-info':active=='all'}" ng-click="setActive('all')">全部</button>
-					</div>
-				</div>
-			</div>
-			<div class="col-xs-6">
+			<div class="col-xs-10">
 				<div class="search">
 					<div class="form-group form-group-sm has-feedback">
 						<input type="search" class="form-control input-sm" placeholder="输入商品、客户名称或单据流水号搜索" /><span

src/main/webapp/resources/tpl/serve/new.html

@@ -23,17 +23,17 @@
 			<i></i>新卖家
 		</div>
 		<ul class="list-unstyled">
-			<li><a ui-sref="new.guide({id:'3.1'})">报价</a></li>
-			<li><a ui-sref="new.guide({id:'3.2'})">送样</a></li>
-			<li><a ui-sref="new.guide({id:'3.3'})">客户采购</a></li>
-			<li><a ui-sref="new.guide({id:'3.4'})">客户采购变更</a></li>
-			<li><a ui-sref="new.guide({id:'3.5'})">出货</a></li>
-			<li><a ui-sref="new.guide({id:'3.6'})">客户采购验收</a></li>
-			<li><a ui-sref="new.guide({id:'3.7'})">客户采购验退</a></li>
-			<li><a ui-sref="new.guide({id:'3.8'})">客户不良品入库</a></li>
-			<li><a ui-sref="new.guide({id:'3.9'})">客户不良品出库</a></li>
-			<li><a ui-sref="new.guide({id:'3.10'})">客户MRB</a></li>
-			<li><a ui-sref="new.guide({id:'3.11'})">客户应付发票</a></li>
+			<li ui-sref-active="active"><a ui-sref="new.guide({id:'3.1'})">报价</a></li>
+			<li ui-sref-active="active"><a ui-sref="new.guide({id:'3.2'})">送样</a></li>
+			<li ui-sref-active="active"><a ui-sref="new.guide({id:'3.3'})">客户采购</a></li>
+			<li ui-sref-active="active"><a ui-sref="new.guide({id:'3.4'})">客户采购变更</a></li>
+			<li ui-sref-active="active"><a ui-sref="new.guide({id:'3.5'})">出货</a></li>
+			<li ui-sref-active="active"><a ui-sref="new.guide({id:'3.6'})">客户采购验收</a></li>
+			<li ui-sref-active="active"><a ui-sref="new.guide({id:'3.7'})">客户采购验退</a></li>
+			<li ui-sref-active="active"><a ui-sref="new.guide({id:'3.8'})">客户不良品入库</a></li>
+			<li ui-sref-active="active"><a ui-sref="new.guide({id:'3.9'})">客户不良品出库</a></li>
+			<li ui-sref-active="active"><a ui-sref="new.guide({id:'3.10'})">客户MRB</a></li>
+			<li ui-sref-active="active"><a ui-sref="new.guide({id:'3.11'})">客户应付发票</a></li>
 		</ul>
 	</div>
 </div>