Merge branch 'tx-cloud-0919-yc' into hotfix-txcloud-0919

# Conflicts:
#	src/main/webapp/resources/js/common/query/storeInfo.js
#	src/main/webapp/resources/view/activity/business.html
#	src/main/webapp/resources/view/admin/store/fragments/enterprise_info.html
#	src/main/webapp/resources/view/admin/store_qualification_maintenance.html
#	src/main/webapp/resources/view/common/advert.html
#	src/main/webapp/resources/view/common/footer.html
#	src/main/webapp/resources/view/vendor/forstore/vendor_store_info.html

src/main/webapp/resources/js/common/query/seekPurchase.js

@@ -23,7 +23,7 @@ define([ 'ngResource' ], function() {
                 method: 'POST'
             },
             saveOffer: {
-                url: 'http://218.17.158.219:24000//inquiry/sale/item/saveQuote',
+                url: 'http://218.17.158.219:24000/inquiry/sale/item/saveQuote',
                 method: 'POST'
             },
             saveOfferProd: {

src/main/webapp/resources/js/common/query/storeInfo.js

@@ -212,7 +212,7 @@ define([ 'ngResource' ], function() {
 			 * 用户自营转寄售时，获取寄售协议
 			 */
 			obtainAConsignmentAgreement: {
-				url: 'http://mall.usoftchina.com/api/help-service/issues/16',
+				url: 'https://mall.usoftchina.com/api/help-service/issues/16',
 				method: 'GET'
 			},
 			/**

src/main/webapp/resources/view/activity/business.html

@@ -12,7 +12,7 @@
                 我们严格把关供应商资质，从源头上杜绝虚假信息，做到付款交期如实，借助物流仓储的一站式服务帮您实现交易高效、库存无忧。<br/>
             </div>
             <div class="join">
-                <a href="http://account.ubtob.com/sso/register?returnURL=http%253A%252F%252Fmall.usoftchina.com%252Flogin%252Fproxy&appId=mall" target="_blank">立即入驻</a>
+                <a href="https://account.ubtob.com/sso/register/enterpriseRegistration?returnURL=http%253A%252F%252Fmall.usoftchina.com%252Flogin%252Fproxy&appId=mall" target="_blank">立即入驻</a>
             </div>
         </div>
     </div>
@@ -48,7 +48,7 @@
                 </ul>
             </div>
             <div class="join">
-                <a href="http://account.ubtob.com/sso/register?returnURL=http%253A%252F%252Fmall.usoftchina.com%252Flogin%252Fproxy&appId=mall" target="_blank">立即入驻</a>
+                <a href="http://account.ubtob.com/sso/register/enterpriseRegistration?returnURL=http%253A%252F%252Fmall.usoftchina.com%252Flogin%252Fproxy&appId=mall" target="_blank">立即入驻</a>
             </div>
         </div>
     </div>
@@ -92,7 +92,7 @@
                 </ul>
             </div>
             <div class="join">
-                <a href="http://account.ubtob.com/sso/register?returnURL=http%253A%252F%252Fmall.usoftchina.com%252Flogin%252Fproxy&appId=mall" target="_blank">立即入驻</a>
+                <a href="http://account.ubtob.com/sso/register/enterpriseRegistration?returnURL=http%253A%252F%252Fmall.usoftchina.com%252Flogin%252Fproxy&appId=mall" target="_blank">立即入驻</a>
             </div>
         </div>
     </div>
@@ -114,7 +114,7 @@
                 </div>
             </div>
             <div class="join">
-                <a href="http://account.ubtob.com/sso/register?returnURL=http%253A%252F%252Fmall.usoftchina.com%252Flogin%252Fproxy&appId=mall" target="_blank">立即入驻</a>
+                <a href="http://account.ubtob.com/sso/register/enterpriseRegistration?returnURL=http%253A%252F%252Fmall.usoftchina.com%252Flogin%252Fproxy&appId=mall" target="_blank">立即入驻</a>
             </div>
         </div>
     </div>

src/main/webapp/resources/view/admin/store_qualification_maintenance.html

@@ -635,7 +635,7 @@
 										<h5>商城品牌信息</h5>
 										<p>英文名称：<span ng-bind="brand.nameEn">LJHJNGHBFGVGHVHGH</span></p>
 										<p>中文名称：<span ng-bind="brand.nameCn">这个是中文名称</span></p>
-										<p>官方网址：<span ng-bind="brand.website || '暂无'">http://mall.usoftchina.com</span></p>
+										<p>官方网址：<span ng-bind="brand.website || '暂无'"></span></p>
 									</div>
 								</div>
 							</div>
@@ -732,7 +732,7 @@
 										<h5>商城品牌信息</h5>
 										<p>英文名称：<span ng-bind="brand.nameEn">LJHJNGHBFGVGHVHGH</span></p>
 										<p>中文名称：<span ng-bind="brand.nameCn">这个是中文名称</span></p>
-										<p>官方网址：<span ng-bind="brand.website || '暂无'">http://mall.usoftchina.com</span></p>
+										<p>官方网址：<span ng-bind="brand.website || '暂无'"></span></p>
 									</div>
 								</div>
 							</div>

src/main/webapp/resources/view/common/advert.html

@@ -38,57 +38,57 @@
         <div class="innerElem">
             <ul>
                 <li>
-                    <a href="http://mall.usoftchina.com/store/worldshine#/home" target="_blank" title="深圳市华商龙商务互联科技有限公司">
+                    <a href="https://mall.usoftchina.com/store/worldshine#/home" target="_blank" title="深圳市华商龙商务互联科技有限公司">
                         <img src="static/img/index/adv01.jpg" alt=""/>
                     </a>
                 </li>
                 <li>
-                    <a href="http://mall.usoftchina.com/store/adtracon#/home" target="_blank" title="贝尔（深圳）新材料有限公司">
+                    <a href="https://mall.usoftchina.com/store/adtracon#/home" target="_blank" title="贝尔（深圳）新材料有限公司">
                         <img src="static/img/index/adv02.jpg" alt=""/>
                     </a>
                 </li>
                 <li>
-                    <a href="http://mall.usoftchina.com/store/compa#/home" target="_blank" title="上海康帕科贸有限公司">
+                    <a href="https://mall.usoftchina.com/store/compa#/home" target="_blank" title="上海康帕科贸有限公司">
                     <img src="static/img/index/adv03.jpg" alt=""/>
                     </a>
                 </li>
                 <li>
-                    <a href="http://mall.usoftchina.com/store/corestaff#/home" target="_blank" title="CoreStaff Hong Kong Limited">
+                    <a href="https://mall.usoftchina.com/store/corestaff#/home" target="_blank" title="CoreStaff Hong Kong Limited">
                         <img src="static/img/index/adv04.jpg" alt=""/>
                     </a>
                 </li>
                 <li>
-                    <a href="http://mall.usoftchina.com/store/chipled#/home" target="_blank" title="深圳市光台光电子有限公司">
+                    <a href="https://mall.usoftchina.com/store/chipled#/home" target="_blank" title="深圳市光台光电子有限公司">
                         <img src="static/img/index/adv05.jpg" alt=""/>
                     </a>
                 </li>
                 <li>
-                    <a href="http://mall.usoftchina.com/store/opd#/home" target="_blank" title="深圳市欧睿达电子有限公司">
+                    <a href="https://mall.usoftchina.com/store/opd#/home" target="_blank" title="深圳市欧睿达电子有限公司">
                         <img src="static/img/index/adv06.jpg" alt=""/>
                     </a>
                 </li>
                 <li>
-                    <a href="http://mall.usoftchina.com/store/jrxy#/home" target="_blank" title="深圳市景瑞兴业科技有限公司">
+                    <a href="https://mall.usoftchina.com/store/jrxy#/home" target="_blank" title="深圳市景瑞兴业科技有限公司">
                         <img src="static/img/index/adv07.jpg" alt=""/>
                     </a>
                 </li>
                 <li>
-                    <a href="http://mall.usoftchina.com/store/hbt#/home" target="_blank" title="深圳市宏博通电子有限公司">
+                    <a href="https://mall.usoftchina.com/store/hbt#/home" target="_blank" title="深圳市宏博通电子有限公司">
                         <img src="static/img/index/adv08.jpg" alt=""/>
                     </a>
                 </li>
                 <li>
-                    <a href="http://mall.usoftchina.com/store/yjycoin#/home" target="_blank" title="深圳市益嘉源电子有限公司">
+                    <a href="https://mall.usoftchina.com/store/yjycoin#/home" target="_blank" title="深圳市益嘉源电子有限公司">
                         <img src="static/img/index/adv09.jpg" alt=""/>
                     </a>
                 </li>
                 <li>
-                    <a href="http://mall.usoftchina.com/store/d3567635164a4811a5ba9e9adbcdcc87#/home" target="_blank" title="张家港恒芯电子有限公司">
+                    <a href="https://mall.usoftchina.com/store/d3567635164a4811a5ba9e9adbcdcc87#/home" target="_blank" title="张家港恒芯电子有限公司">
                         <img src="static/img/index/adv10.jpg" alt=""/>
                     </a>
                 </li>
                 <li>
-                    <a href="http://mall.usoftchina.com/store/winsen#/home" target="_blank" title="郑州炜盛电子科技有限公司">
+                    <a href="https://mall.usoftchina.com/store/winsen#/home" target="_blank" title="郑州炜盛电子科技有限公司">
                         <img src="static/img/index/adv11.jpg" alt=""/>
                     </a>
                 </li>

src/main/webapp/resources/view/common/footer.html

@@ -85,9 +85,9 @@ a:hover {
 		<li>
 			<h3>用户指南</h3>
 			<ul class="list-unstyled">
-				<li><a href="http://mall.usoftchina.com/help#/issue/50" target="_blank">服务条款</a></li>
-				<li><a href="http://mall.usoftchina.com/help#/issue/16" target="_blank">买卖条例</a></li>
-				<li><a href="http://mall.usoftchina.com/help#/issue/51" target="_blank">代收代付协议</a></li>
+				<li><a href="https://mall.usoftchina.com/help#/issue/50" target="_blank">服务条款</a></li>
+				<li><a href="https://mall.usoftchina.com/help#/issue/16" target="_blank">买卖条例</a></li>
+				<li><a href="https://mall.usoftchina.com/help#/issue/51" target="_blank">代收代付协议</a></li>
 			</ul>
 		</li>
 		<!--<li>
@@ -101,9 +101,9 @@ a:hover {
 		<li>
 			<h3>关于我们</h3>
 			<ul class="list-unstyled">
-				<li><a href="http://mall.usoftchina.com/help#/issue/1" target="_blank">公司简介</a></li>
-				<li><a href="http://mall.usoftchina.com/help#/issue/28" target="_blank">公司地址</a></li>
-				<li><a href="http://mall.usoftchina.com/help#/issue/1" target="_blank">联系我们</a></li>
+				<li><a href="https://mall.usoftchina.com/help#/issue/1" target="_blank">公司简介</a></li>
+				<li><a href="https://mall.usoftchina.com/help#/issue/28" target="_blank">公司地址</a></li>
+				<li><a href="https://mall.usoftchina.com/help#/issue/1" target="_blank">联系我们</a></li>
 			</ul>
 		</li>
 		<li>

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

@@ -678,7 +678,7 @@
 				<div class="col-md-10 custom_col">
 					<input type="text" class="form-control" style="border-radius: inherit;padding-left: 243px;" title="storeUuid" ng-model="storeUuid"
 						   ng-change="changeInfo('STORE_UUID', storeUuid)" placeholder="ubtob" maxlength="30"/>
-					<span style="position: absolute;display: block;top: 0;z-index: 2;padding-left: 12px;">http://mall.usoftchina.com/store/</span>
+					<span style="position: absolute;display: block;top: 0;z-index: 2;padding-left: 12px;">https://mall.usoftchina.com/store/</span>
 				</div>
 			</div>
 			<div class="row com_row" style="margin-top: 10px;">