Browse Source

首页链接错误更改

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@7582 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
hejq 9 years ago
parent
commit
708ef4d8f9

+ 2 - 3
src/main/webapp/WEB-INF/views/normal/index.html

@@ -72,14 +72,14 @@
 								<li><a href="#/sale/customer" title="客户资料">客户资料</a></li>
 								<li><a href="#/sale/customer" title="客户资料">客户资料</a></li>
 								<li><a href="#/sale/prodList" title="产品资料">产品资料</a></li>
 								<li><a href="#/sale/prodList" title="产品资料">产品资料</a></li>
 								<li><a href="#/sale/inquiry" title="客户采购询价单">客户采购询价单</a></li>
 								<li><a href="#/sale/inquiry" title="客户采购询价单">客户采购询价单</a></li>
-								<li><a href="#/sale/inquiryMould" title="客户模具询价单">客户模具询价单</a></li>
+								<li><a href="#/sale/mould" title="客户模具询价单">客户模具询价单</a></li>
 								<li><a href="#/sale/quotation/list" title="主动报价单">主动报价单</a></li>
 								<li><a href="#/sale/quotation/list" title="主动报价单">主动报价单</a></li>
 								<li><a href="#/sale/tender" title="客户招投标">客户招投标</a></li>
 								<li><a href="#/sale/tender" title="客户招投标">客户招投标</a></li>
 								<li><a href="#/sale/opentender" title="平台公共招标">平台公共招标</a></li>
 								<li><a href="#/sale/opentender" title="平台公共招标">平台公共招标</a></li>
 								<li><a href="#/sale/order" title="客户采购订单">客户采购订单</a></li>
 								<li><a href="#/sale/order" title="客户采购订单">客户采购订单</a></li>
 								<li><a href="#/sale/change" title="客户采购变更">客户采购变更单</a></li>
 								<li><a href="#/sale/change" title="客户采购变更">客户采购变更单</a></li>
 								<li><a href="#/sale/maketodo/makeorder" title="客户委外单">客户委外单</a></li>
 								<li><a href="#/sale/maketodo/makeorder" title="客户委外单">客户委外单</a></li>
-								<li><a ui-sref="sale.makechange" title="客户委外变更单">委外变更单</a></li>
+								<li><a ui-sref="sale.makechange" title="客户委外变更单">客户委外变更单</a></li>
 								<li><a href="#/sale/notice" title="客户发货提醒">客户发货提醒</a></li>
 								<li><a href="#/sale/notice" title="客户发货提醒">客户发货提醒</a></li>
 								<li><a href="#/sale/send" title="发货单">发货单</a></li>
 								<li><a href="#/sale/send" title="发货单">发货单</a></li>
 								<li><a href="#/sale/sample" title="客户打样申请">客户打样申请</a></li>
 								<li><a href="#/sale/sample" title="客户打样申请">客户打样申请</a></li>
@@ -90,7 +90,6 @@
 								<li><a href="#/sale/accept" title="客户验收单">客户采购验收单</a></li>
 								<li><a href="#/sale/accept" title="客户验收单">客户采购验收单</a></li>
 								<li><a href="#/sale/returns" title="客户验退单">客户采购验退单</a></li>
 								<li><a href="#/sale/returns" title="客户验退单">客户采购验退单</a></li>
 								<li><a href="#/sale/makeaccept" title="客户委外验收单">客户委外验收单</a></li>
 								<li><a href="#/sale/makeaccept" title="客户委外验收单">客户委外验收单</a></li>
-								<li><a href="#/sale/makechange" title="客户委外变更单">客户委外变更单</a></li>
 								<li><a href="#/sale/makereturns" title="客户委外验退单">客户委外验退单</a></li>
 								<li><a href="#/sale/makereturns" title="客户委外验退单">客户委外验退单</a></li>
 								<li><a href="#/cs/" title="客户服务">客户服务</a></li>
 								<li><a href="#/cs/" title="客户服务">客户服务</a></li>
 							</ul>
 							</ul>

+ 12 - 1
src/main/webapp/resources/tpl/index/baseInfo/newProdInfo.html

@@ -69,6 +69,11 @@
 #image-box .x-close-wrap:hover {
 #image-box .x-close-wrap:hover {
 	opacity: .7
 	opacity: .7
 }
 }
+.well{
+	width: 240px;
+	background: #fff;
+	border-radius: 0;
+}
 </style>
 </style>
 <div class="wrap">
 <div class="wrap">
 	<div class="content">
 	<div class="content">
@@ -134,7 +139,13 @@
                         <span><input ng-file-select  ng-model="myFiles" type="file" ng-multiple="false" id="enImage" name="enImage" placeholder="图片或PDF文件"></span>
                         <span><input ng-file-select  ng-model="myFiles" type="file" ng-multiple="false" id="enImage" name="enImage" placeholder="图片或PDF文件"></span>
                        <!--  <input type="text" id="proText"> -->
                        <!--  <input type="text" id="proText"> -->
                         <i>提示:图片尺寸在750*750像素以上,图片请避免全文字</i>
                         <i>提示:图片尺寸在750*750像素以上,图片请避免全文字</i>
-                        <div class="well margin-b-0" >
+                        
+                    </div>
+                </dd>
+                <dd ng-show="previewShow">
+                	<div class="fl">&nbsp;</div>
+                    <div class="fr">
+                    <div class="well margin-b-0" >
 				      		<div ng-show="previewShow">
 				      		<div ng-show="previewShow">
 				      			<img ng-show="previewShow" alt="营业执照复印件" src="{{imgPreview}}" width="200px" height="100px">
 				      			<img ng-show="previewShow" alt="营业执照复印件" src="{{imgPreview}}" width="200px" height="100px">
 				      			<div>
 				      			<div>

+ 26 - 0
src/main/webapp/resources/tpl/index/baseInfo/productDetail.html

@@ -69,6 +69,12 @@
 #image-box .x-close-wrap:hover {
 #image-box .x-close-wrap:hover {
 	opacity: .7
 	opacity: .7
 }
 }
+
+.well{
+	width: 240px;
+	background: #fff;
+	border-radius: 0;
+}
 </style>
 </style>
 <div class="wrap">
 <div class="wrap">
 	<div class="content">
 	<div class="content">
@@ -135,6 +141,26 @@
                         <i>提示:图片尺寸在750*750像素以上,图片请避免全文字</i>
                         <i>提示:图片尺寸在750*750像素以上,图片请避免全文字</i>
                     </div>
                     </div>
                 </dd>
                 </dd>
+                 <dd ng-show="previewShow">
+                	<div class="fl">&nbsp;</div>
+                    <div class="fr">
+                    <div class="well margin-b-0" >
+				      		<div ng-show="previewShow">
+				      			<img ng-show="previewShow" alt="营业执照复印件" src="{{imgPreview}}" width="200px" height="100px">
+				      			<div>
+					      			&nbsp;&nbsp;<span class="text-primary"><b>{{imgPreviewName}}</b></span>
+					      		</div>
+				      		</div>
+				      		<div ng-show="pdfShow">
+				      			<img ng-show="pdfShow" src="static/img/all/pdf.jpg" alt="PDF文件" width="30px" height="40px">
+					      		&nbsp;&nbsp;<span class="text-primary"><b>{{imgPreviewName}}</b></span>
+				      		</div>
+				      		<div ng-show="noneFileShow">
+				      			<span class="text-warning">请上传清晰照片的图片文件或PDF文件</span>
+				      		</div>
+				      	</div>
+                    </div>
+                </dd>
            <!--      <dd class="text-detail">
            <!--      <dd class="text-detail">
                     <div class="fl">详细描述:</div>
                     <div class="fl">详细描述:</div>
                     <div class="fr">
                     <div class="fr">