Browse Source

im改为https请求,卖家店铺页面居中处理

yangc 8 years ago
parent
commit
6e9ee5da15

+ 1 - 1
src/main/webapp/resources/js/common/controllers/commonCtrls.js

@@ -1014,7 +1014,7 @@ define([ 'app/app' ], function(app) {
 			ChatBusinessLayer.visitWebChat(chatInfoDto, 'LIST').then(function (gid) {
 			ChatBusinessLayer.visitWebChat(chatInfoDto, 'LIST').then(function (gid) {
 				console.log(gid);
 				console.log(gid);
 				//newTab.location.href = 'http://192.168.253.31:20220/chat/visit?gid=' + gid;
 				//newTab.location.href = 'http://192.168.253.31:20220/chat/visit?gid=' + gid;
-				newTab.location.href = 'http://im.ubtob.com/chat/visit?gid=' + gid;
+				newTab.location.href = 'https://im.ubtob.com/chat/visit?gid=' + gid;
 			}, function (error) {
 			}, function (error) {
 				console.log(error);
 				console.log(error);
 				newTab.close();
 				newTab.close();

+ 1 - 1
src/main/webapp/resources/js/common/module/chat_web_module.js

@@ -175,7 +175,7 @@ define([ 'common/query/chat', 'common/query/enterprise' ], function() {
                     return;
                     return;
                 }
                 }
                 //newTab.location.href = 'http://192.168.253.121:20220/chat/visit?gid=' +  gid;
                 //newTab.location.href = 'http://192.168.253.121:20220/chat/visit?gid=' +  gid;
-                newTab.location.href = 'http://im.ubtob.com/chat/visit?gid=' + gid;
+                newTab.location.href = 'https://im.ubtob.com/chat/visit?gid=' + gid;
             }, function (error) {
             }, function (error) {
                 console.log(error);
                 console.log(error);
                 newTab.close();
                 newTab.close();

+ 1 - 1
src/main/webapp/resources/js/common/query/chat.js

@@ -1,7 +1,7 @@
 define([ 'ngResource' ], function() {
 define([ 'ngResource' ], function() {
 	angular.module('ChatService', [ 'ngResource' ]).factory('Chat', ['$resource', function($resource) {
 	angular.module('ChatService', [ 'ngResource' ]).factory('Chat', ['$resource', function($resource) {
 
 
-		var address = 'http://im.ubtob.com/';
+		var address = 'https://im.ubtob.com/';
 		//var address = 'http://192.168.253.31:20220/';
 		//var address = 'http://192.168.253.31:20220/';
 
 
 		return $resource('api/chat/infos', {}, {
 		return $resource('api/chat/infos', {}, {

+ 460 - 460
src/main/webapp/resources/view/vendor/forstore/vendor_store_maintain.html

@@ -566,561 +566,561 @@
 	}
 	}
 </style>
 </style>
 <!-- 店铺信息 -->
 <!-- 店铺信息 -->
-<div class="container vendor_store_maintain user_right">
-	<div style="margin-bottom: 30px;" class="width120">
-		<div class="row com_row" style="margin-top: 10px;">
-			<div class="col-md-12 custom_col">
-				<div class="row">
-					<div class="col-md-4">
-						<span class="tip_info" ng-if="storeInfo.type == 'ORIGINAL_FACTORY'">您已成功申请原厂店铺</span>
-						<span class="tip_info" ng-if="storeInfo.type == 'AGENCY'">您已成功申请代理商店铺</span>
-						<span class="tip_info" ng-if="storeInfo.type == 'DISTRIBUTION'">您已成功申请经销商店铺</span>
-					</div>
-					<div class="col-md-8" style="text-align: right;">
-						<span class="tip_info" ng-if="store"><a ng-href="{{'store/' + store.uuid}}">进入我的店铺</a></span>
+	<div class="container vendor_store_maintain user_right">
+		<div style="margin-bottom: 30px;" class="width120">
+			<div class="row com_row" style="margin-top: 10px;">
+				<div class="col-md-12 custom_col">
+					<div class="row">
+						<div class="col-md-4">
+							<span class="tip_info" ng-if="storeInfo.type == 'ORIGINAL_FACTORY'">您已成功申请原厂店铺</span>
+							<span class="tip_info" ng-if="storeInfo.type == 'AGENCY'">您已成功申请代理商店铺</span>
+							<span class="tip_info" ng-if="storeInfo.type == 'DISTRIBUTION'">您已成功申请经销商店铺</span>
+						</div>
+						<div class="col-md-8" style="text-align: right;">
+							<span class="tip_info" ng-if="store"><a ng-href="{{'store/' + store.uuid}}">进入我的店铺</a></span>
+						</div>
 					</div>
 					</div>
 				</div>
 				</div>
 			</div>
 			</div>
-		</div>
-		<!-- 企业信息展示 start -->
-		<div class="row com_row title_row">
-			<div class="col-md-12 custom_col">
-				<h2>企业信息</h2>
-			</div>
-		</div>
-		<div class="row com_row">
-			<div class="col-md-2 custom_col">
-				<span>企业名称</span>
-			</div>
-			<div class="col-md-10 custom_col">
-				<span ng-if="enterprise">{{enterprise.enName || '暂无信息'}}</span>
+			<!-- 企业信息展示 start -->
+			<div class="row com_row title_row">
+				<div class="col-md-12 custom_col">
+					<h2>企业信息</h2>
+				</div>
 			</div>
 			</div>
-		</div>
-		<div class="row com_row">
-			<div class="col-md-2 custom_col">
-				<span>注册地址</span>
+			<div class="row com_row">
+				<div class="col-md-2 custom_col">
+					<span>企业名称</span>
+				</div>
+				<div class="col-md-10 custom_col">
+					<span ng-if="enterprise">{{enterprise.enName || '暂无信息'}}</span>
+				</div>
 			</div>
 			</div>
-			<div class="col-md-10 custom_col">
-				<span ng-if="enterprise">{{enterprise.enAddress || '暂无信息'}}</span>
+			<div class="row com_row">
+				<div class="col-md-2 custom_col">
+					<span>注册地址</span>
+				</div>
+				<div class="col-md-10 custom_col">
+					<span ng-if="enterprise">{{enterprise.enAddress || '暂无信息'}}</span>
+				</div>
 			</div>
 			</div>
-		</div>
-		<div class="row com_row" ng-if="enterprise.enBusinessCode.length > 0">
-			<div class="col-md-2 custom_col">
-				<span>注册号</span>
+			<div class="row com_row" ng-if="enterprise.enBusinessCode.length > 0">
+				<div class="col-md-2 custom_col">
+					<span>注册号</span>
+				</div>
+				<div class="col-md-10 custom_col">
+					<span ng-if="enterprise">{{enterprise.enBusinessCode || '暂无信息'}}</span>
+				</div>
 			</div>
 			</div>
-			<div class="col-md-10 custom_col">
-				<span ng-if="enterprise">{{enterprise.enBusinessCode || '暂无信息'}}</span>
+			<div class="row com_row" ng-if="enterprise.enType.length > 0">
+				<div class="col-md-2 custom_col">
+					<span>企业类型</span>
+				</div>
+				<div class="col-md-10 custom_col">
+					<span ng-if="enterprise">{{enterprise.enType ||'暂无信息'}}</span>
+				</div>
 			</div>
 			</div>
-		</div>
-		<div class="row com_row" ng-if="enterprise.enType.length > 0">
-			<div class="col-md-2 custom_col">
-				<span>企业类型</span>
+			<div class="row com_row" style="display: none;">
+				<div class="col-md-2 custom_col">
+					<span>注册资本</span>
+				</div>
+				<div class="col-md-10 custom_col">
+					<span ng-if="enterprise">20000000人民币</span>
+				</div>
 			</div>
 			</div>
-			<div class="col-md-10 custom_col">
-				<span ng-if="enterprise">{{enterprise.enType ||'暂无信息'}}</span>
+			<div class="row com_row" style="display: none;">
+				<div class="col-md-2 custom_col">
+					<span>成立时间</span>
+				</div>
+				<div class="col-md-10 custom_col">
+					<span ng-if="enterprise">{{enterprise.enDate ? (enterprise.enDate | date : 'yyyy-MM-dd') : '暂无信息'}}</span>
+				</div>
 			</div>
 			</div>
+			<div class="row com_row" style="display: none;">
+				<div class="col-md-2 custom_col">
+					<span>管理认证</span>
+				</div>
+				<div class="col-md-10 custom_col">
+					<span ng-if="enterprise">暂无信息</span>
+				</div>
+			</div><!-- 企业信息展示 end -->
 		</div>
 		</div>
-		<div class="row com_row" style="display: none;">
-			<div class="col-md-2 custom_col">
-				<span>注册资本</span>
+		<!-- 店铺基础信息输入 start -->
+		<div style="margin-bottom: 20px;" ng-if="editBasicInfo" class="width120">
+			<div class="row com_row title_row">
+				<div class="col-md-8 custom_col">
+					<h2>请完善以下信息,便于宣传展示</h2>
+				</div>
+				<div class="col-md-4 custom_col">
+					<div>
+						<a href="javascript:void(0)" ng-click="saveModify('BASIC_INFO')">
+							<span class="edit_status_btn">保存</span>
+						</a>
+						<a href="javascript:void(0)" ng-click="undoModify('BASIC_INFO')">
+							<span class="edit_status_btn">取消</span>
+						</a>
+					</div>
+				</div>
 			</div>
 			</div>
-			<div class="col-md-10 custom_col">
-				<span ng-if="enterprise">20000000人民币</span>
+			<div class="row com_row" style="margin-top: 10px;">
+				<div class="col-md-2 custom_col">
+					<span>店铺名称</span>
+				</div>
+				<div class="col-md-10 custom_col">
+					<input type="text" class="form-control" style="border-radius: inherit;" title="storeShortName" ng-model="sampleStore.storeShortName" maxlength="100"/>
+				</div>
 			</div>
 			</div>
-		</div>
-		<div class="row com_row" style="display: none;">
-			<div class="col-md-2 custom_col">
-				<span>成立时间</span>
+			<div class="row com_row">
+				<div class="col-md-2 custom_col">
+					<span>简&nbsp;&nbsp;&nbsp;&nbsp;介<strong class="text-inverse">*</strong></span>
+				</div>
+				<div class="col-md-10 custom_col">
+					<textarea class="form-control" style="border-radius: inherit;resize: none;height: 200px;" title="description" ng-model="sampleStore.description" maxlength="500" required></textarea>
+				</div>
 			</div>
 			</div>
-			<div class="col-md-10 custom_col">
-				<span ng-if="enterprise">{{enterprise.enDate ? (enterprise.enDate | date : 'yyyy-MM-dd') : '暂无信息'}}</span>
+			<div class="row com_row" style="margin-top: 10px;">
+				<div class="col-md-2 custom_col">
+					<span>官网地址<strong class="text-inverse">*</strong></span>
+				</div>
+				<div class="col-md-10 custom_col">
+					<input type="text" class="form-control" style="border-radius: inherit;" title="enUrl" ng-model="sampleStore.enterprise.enUrl" maxlength="50"/>
+				</div>
 			</div>
 			</div>
-		</div>
-		<div class="row com_row" style="display: none;">
-			<div class="col-md-2 custom_col">
-				<span>管理认证</span>
+			<div class="row com_row" style="margin-top: 10px;">
+				<div class="col-md-2 custom_col">
+					<span>地&nbsp;&nbsp;&nbsp;&nbsp;址<strong class="text-inverse">*</strong></span>
+				</div>
+				<div class="col-md-10 custom_col">
+					<input type="text" class="form-control" style="border-radius: inherit;" title="address" ng-model="sampleStore.enterprise.address" maxlength="30"/>
+				</div>
 			</div>
 			</div>
-			<div class="col-md-10 custom_col">
-				<span ng-if="enterprise">暂无信息</span>
+			<div class="row com_row" style="margin-top: 10px;">
+				<div class="col-md-2 custom_col">
+					<span>电&nbsp;&nbsp;&nbsp;&nbsp;话<strong class="text-inverse">*</strong></span>
+				</div>
+				<div class="col-md-10 custom_col">
+					<input type="text" class="form-control" style="border-radius: inherit;" title="enTel"  ng-pattern="/^(\d){8,12}$/" ng-model="sampleStore.enterprise.enTel" maxlength="12"/>
+				</div>
 			</div>
 			</div>
-		</div><!-- 企业信息展示 end -->
-	</div>
-	<!-- 店铺基础信息输入 start -->
-	<div style="margin-bottom: 20px;" ng-if="editBasicInfo" class="width120">
-		<div class="row com_row title_row">
-			<div class="col-md-8 custom_col">
-				<h2>请完善以下信息,便于宣传展示</h2>
+			<div class="row com_row" style="margin-top: 10px;">
+				<div class="col-md-2 custom_col">
+					<span>传&nbsp;&nbsp;&nbsp;&nbsp;真<strong class="text-inverse">*</strong></span>
+				</div>
+				<div class="col-md-10 custom_col">
+					<input type="text" class="form-control" style="border-radius: inherit;" title="enFax" ng-pattern="/^[\d-]{0,20}$/" ng-model="sampleStore.enterprise.enFax" maxlength="20"/>
+				</div>
 			</div>
 			</div>
-			<div class="col-md-4 custom_col">
-				<div>
-					<a href="javascript:void(0)" ng-click="saveModify('BASIC_INFO')">
-						<span class="edit_status_btn">保存</span>
-					</a>
-					<a href="javascript:void(0)" ng-click="undoModify('BASIC_INFO')">
-						<span class="edit_status_btn">取消</span>
+		</div><!-- 店铺基础信息输入 end -->
+		<!-- 店铺基础信息展示 start -->
+		<div style="margin-bottom: 20px;" ng-if="!editBasicInfo" class="width120">
+			<div class="row com_row title_row">
+				<div class="col-md-8 custom_col">
+					<h2>请完善以下信息,便于宣传展示</h2>
+				</div>
+				<div class="col-md-4 custom_col">
+					<a href="javascript:void(0)" ng-click="showEdit('BASIC_INFO')">
+						<span style="text-align: right; color: #999;"><i class="fa fa-pencil" aria-hidden="true" style="font-size: 18px;"></i> 编辑</span>
 					</a>
 					</a>
 				</div>
 				</div>
 			</div>
 			</div>
-		</div>
-		<div class="row com_row" style="margin-top: 10px;">
-			<div class="col-md-2 custom_col">
-				<span>店铺名称</span>
-			</div>
-			<div class="col-md-10 custom_col">
-				<input type="text" class="form-control" style="border-radius: inherit;" title="storeShortName" ng-model="sampleStore.storeShortName" maxlength="100"/>
-			</div>
-		</div>
-		<div class="row com_row">
-			<div class="col-md-2 custom_col">
-				<span>简&nbsp;&nbsp;&nbsp;&nbsp;介<strong class="text-inverse">*</strong></span>
-			</div>
-			<div class="col-md-10 custom_col">
-				<textarea class="form-control" style="border-radius: inherit;resize: none;height: 200px;" title="description" ng-model="sampleStore.description" maxlength="500" required></textarea>
-			</div>
-		</div>
-		<div class="row com_row" style="margin-top: 10px;">
-			<div class="col-md-2 custom_col">
-				<span>官网地址<strong class="text-inverse">*</strong></span>
-			</div>
-			<div class="col-md-10 custom_col">
-				<input type="text" class="form-control" style="border-radius: inherit;" title="enUrl" ng-model="sampleStore.enterprise.enUrl" maxlength="50"/>
+			<div class="row com_row" style="margin-top: 10px;">
+				<div class="col-md-2 custom_col">
+					<span>店铺名称</span>
+				</div>
+				<div class="col-md-10 custom_col show_info">
+					<div>
+						{{sampleStore.storeShortName || '暂无信息'}}
+					</div>
+				</div>
 			</div>
 			</div>
-		</div>
-		<div class="row com_row" style="margin-top: 10px;">
-			<div class="col-md-2 custom_col">
-				<span>地&nbsp;&nbsp;&nbsp;&nbsp;址<strong class="text-inverse">*</strong></span>
+			<div class="row com_row">
+				<div class="col-md-2 custom_col">
+					<span>简&nbsp;&nbsp;&nbsp;&nbsp;介</span>
+				</div>
+				<div class="col-md-10 custom_col show_info">
+					<div style="word-break: break-all;">
+						{{sampleStore.description || '暂无信息'}}
+					</div>
+				</div>
 			</div>
 			</div>
-			<div class="col-md-10 custom_col">
-				<input type="text" class="form-control" style="border-radius: inherit;" title="address" ng-model="sampleStore.enterprise.address" maxlength="30"/>
+			<div class="row com_row" style="margin-top: 10px;">
+				<div class="col-md-2 custom_col">
+					<span>官网地址</span>
+				</div>
+				<div class="col-md-10 custom_col show_info">
+					<div>
+						{{sampleStore.enterprise.enUrl || '暂无信息'}}
+					</div>
+				</div>
 			</div>
 			</div>
-		</div>
-		<div class="row com_row" style="margin-top: 10px;">
-			<div class="col-md-2 custom_col">
-				<span>电&nbsp;&nbsp;&nbsp;&nbsp;话<strong class="text-inverse">*</strong></span>
+			<div class="row com_row" style="margin-top: 10px;">
+				<div class="col-md-2 custom_col">
+					<span>地&nbsp;&nbsp;&nbsp;&nbsp;址</span>
+				</div>
+				<div class="col-md-10 custom_col show_info">
+					<div>
+						{{sampleStore.enterprise.address || '暂无信息'}}
+					</div>
+				</div>
 			</div>
 			</div>
-			<div class="col-md-10 custom_col">
-				<input type="text" class="form-control" style="border-radius: inherit;" title="enTel"  ng-pattern="/^(\d){8,12}$/" ng-model="sampleStore.enterprise.enTel" maxlength="12"/>
+			<div class="row com_row" style="margin-top: 10px;">
+				<div class="col-md-2 custom_col">
+					<span>电&nbsp;&nbsp;&nbsp;&nbsp;话</span>
+				</div>
+				<div class="col-md-10 custom_col show_info">
+					<div>
+						{{sampleStore.enterprise.enTel || '暂无信息'}}
+					</div>
+				</div>
 			</div>
 			</div>
-		</div>
-		<div class="row com_row" style="margin-top: 10px;">
-			<div class="col-md-2 custom_col">
-				<span>传&nbsp;&nbsp;&nbsp;&nbsp;真<strong class="text-inverse">*</strong></span>
+			<div class="row com_row" style="margin-top: 10px;">
+				<div class="col-md-2 custom_col">
+					<span>传&nbsp;&nbsp;&nbsp;&nbsp;真</span>
+				</div>
+				<div class="col-md-10 custom_col show_info">
+					<div>
+						{{sampleStore.enterprise.enFax || '暂无信息'}}
+					</div>
+				</div>
 			</div>
 			</div>
-			<div class="col-md-10 custom_col">
-				<input type="text" class="form-control" style="border-radius: inherit;" title="enFax" ng-pattern="/^[\d-]{0,20}$/" ng-model="sampleStore.enterprise.enFax" maxlength="20"/>
+		</div><!-- 店铺基础信息展示 end -->
+	</div>
+	<!-- 资质证明输入 start -->
+	<div class="container vendor_store_maintain user_right" style="margin-top: 15px;padding: 0 15px;min-height: 280px;" ng-if="editQualifications">
+		<div class="row com_row title_row title_row3">
+			<div class="clearfix">
+				<img src="static/img/vendor/store/bell.png" alt="">
+				<p>您可以在这里上传资质证书、现货照片、公司风采等材料文件,用于展示在您的店铺页面,展现您店铺的公信力。</p>
 			</div>
 			</div>
 		</div>
 		</div>
-	</div><!-- 店铺基础信息输入 end -->
-	<!-- 店铺基础信息展示 start -->
-	<div style="margin-bottom: 20px;" ng-if="!editBasicInfo" class="width120">
-		<div class="row com_row title_row">
+		<div class="row com_row title_row" style="border: none;">
 			<div class="col-md-8 custom_col">
 			<div class="col-md-8 custom_col">
-				<h2>请完善以下信息,便于宣传展示</h2>
+				<h2>资质证明</h2>
 			</div>
 			</div>
 			<div class="col-md-4 custom_col">
 			<div class="col-md-4 custom_col">
-				<a href="javascript:void(0)" ng-click="showEdit('BASIC_INFO')">
-					<span style="text-align: right; color: #999;"><i class="fa fa-pencil" aria-hidden="true" style="font-size: 18px;"></i> 编辑</span>
-				</a>
-			</div>
-		</div>
-		<div class="row com_row" style="margin-top: 10px;">
-			<div class="col-md-2 custom_col">
-				<span>店铺名称</span>
-			</div>
-			<div class="col-md-10 custom_col show_info">
 				<div>
 				<div>
-					{{sampleStore.storeShortName || '暂无信息'}}
-				</div>
-			</div>
-		</div>
-		<div class="row com_row">
-			<div class="col-md-2 custom_col">
-				<span>简&nbsp;&nbsp;&nbsp;&nbsp;介</span>
-			</div>
-			<div class="col-md-10 custom_col show_info">
-				<div style="word-break: break-all;">
-					{{sampleStore.description || '暂无信息'}}
+					<a href="javascript:void(0)" ng-click="saveModify('QUALIFICATIONS')">
+						<span class="edit_status_btn">保存</span>
+					</a>
+					<a href="javascript:void(0)" ng-click="undoModify('QUALIFICATIONS')">
+						<span class="edit_status_btn">取消</span>
+					</a>
 				</div>
 				</div>
 			</div>
 			</div>
 		</div>
 		</div>
-		<div class="row com_row" style="margin-top: 10px;">
-			<div class="col-md-2 custom_col">
-				<span>官网地址</span>
-			</div>
-			<div class="col-md-10 custom_col show_info">
-				<div>
-					{{sampleStore.enterprise.enUrl || '暂无信息'}}
+		<!-- 资质上传 -->
+		<div class="row com_row qualification_upload">
+			<div class="col-md-1"></div>
+
+			<div class="col-md-2 hover-container hover1" ng-repeat="index in [0, 1, 2, 3, 4]">
+				<div class="div_vertical_align_center" style="position: relative;height: 147px;" ng-if="sampleStore.qualifications[$index].isPdf">
+					<img class="previewImage" src="static/img/vendor/store/timg.png" alt="" style="max-width: 124px;max-height: 147px;">
 				</div>
 				</div>
-			</div>
-		</div>
-		<div class="row com_row" style="margin-top: 10px;">
-			<div class="col-md-2 custom_col">
-				<span>地&nbsp;&nbsp;&nbsp;&nbsp;址</span>
-			</div>
-			<div class="col-md-10 custom_col show_info">
-				<div>
-					{{sampleStore.enterprise.address || '暂无信息'}}
+				<div class="div_vertical_align_center" style="position: relative;height: 147px;" ng-if="!sampleStore.qualifications[$index].isPdf">
+					<img class="previewImage" ng-src="{{sampleStore.qualifications[index].resourceUrl || 'static/img/example/upload-apply_1.png'}}"/>
 				</div>
 				</div>
-			</div>
-		</div>
-		<div class="row com_row" style="margin-top: 10px;">
-			<div class="col-md-2 custom_col">
-				<span>电&nbsp;&nbsp;&nbsp;&nbsp;话</span>
-			</div>
-			<div class="col-md-10 custom_col show_info">
-				<div>
-					{{sampleStore.enterprise.enTel || '暂无信息'}}
+				<div image-upload
+					 data-src="static/img/example/upload-apply_1.png"
+					 on-success="onUploadQualification($data, index)"
+					 non-preview="true"
+					 style="width: 124px;height: 147px;position: absolute;background: rgba(105, 99, 99, 0.5); left: -2px; bottom:0;"
+					 ng-if="!sampleStore.qualifications[index].resourceUrl">
 				</div>
 				</div>
-			</div>
-		</div>
-		<div class="row com_row" style="margin-top: 10px;">
-			<div class="col-md-2 custom_col">
-				<span>传&nbsp;&nbsp;&nbsp;&nbsp;真</span>
-			</div>
-			<div class="col-md-10 custom_col show_info">
-				<div>
-					{{sampleStore.enterprise.enFax || '暂无信息'}}
+				<div class="hover-show"
+					 style="width: 124px;height: 147px;position: absolute;background: rgba(105, 99, 99, 0.5); left: -2px;"
+					 ng-if="sampleStore.qualifications[index].resourceUrl">
+					<span class="delete" title="删除" ng-click="showDeleteTipDialog(index)"><i class="fa fa-trash"></i></span>
 				</div>
 				</div>
 			</div>
 			</div>
 		</div>
 		</div>
-	</div><!-- 店铺基础信息展示 end -->
-</div>
-<!-- 资质证明输入 start -->
-<div class="container vendor_store_maintain" style="margin-top: 15px;padding: 0 15px;min-height: 280px;" ng-if="editQualifications">
-	<div class="row com_row title_row title_row3">
-		<div class="clearfix">
-			<img src="static/img/vendor/store/bell.png" alt="">
-			<p>您可以在这里上传资质证书、现货照片、公司风采等材料文件,用于展示在您的店铺页面,展现您店铺的公信力。</p>
-		</div>
-	</div>
-	<div class="row com_row title_row" style="border: none;">
-		<div class="col-md-8 custom_col">
-			<h2>资质证明</h2>
+		<div class="row com_row image_tip" style="padding: 0px 84px;">
+			仅支持JPG、PNG、GIF、PDF格式,每张大小不超过3M,最多可上传五张图片
 		</div>
 		</div>
-		<div class="col-md-4 custom_col">
-			<div>
-				<a href="javascript:void(0)" ng-click="saveModify('QUALIFICATIONS')">
-					<span class="edit_status_btn">保存</span>
-				</a>
-				<a href="javascript:void(0)" ng-click="undoModify('QUALIFICATIONS')">
-					<span class="edit_status_btn">取消</span>
-				</a>
+	</div><!-- 资质证明输入 end -->
+	<!-- 资质证明展示 start -->
+	<div class="container vendor_store_maintain user_right" style="margin-top: 15px;padding: 0 15px;min-height: 280px;" ng-if="!editQualifications">
+		<div class="row com_row title_row title_row3">
+			<div class="clearfix">
+				<img src="static/img/vendor/store/bell.png" alt="">
+				<p>您可以在这里上传资质证书、现货照片、公司风采等材料文件,用于展示在您的店铺页面,展现您店铺的公信力。</p>
 			</div>
 			</div>
 		</div>
 		</div>
-	</div>
-	<!-- 资质上传 -->
-	<div class="row com_row qualification_upload">
-		<div class="col-md-1"></div>
-
-		<div class="col-md-2 hover-container hover1" ng-repeat="index in [0, 1, 2, 3, 4]">
-			<div class="div_vertical_align_center" style="position: relative;height: 147px;" ng-if="sampleStore.qualifications[$index].isPdf">
-				<img class="previewImage" src="static/img/vendor/store/timg.png" alt="" style="max-width: 124px;max-height: 147px;">
-			</div>
-			<div class="div_vertical_align_center" style="position: relative;height: 147px;" ng-if="!sampleStore.qualifications[$index].isPdf">
-				<img class="previewImage" ng-src="{{sampleStore.qualifications[index].resourceUrl || 'static/img/example/upload-apply_1.png'}}"/>
-			</div>
-			<div image-upload
-				 data-src="static/img/example/upload-apply_1.png"
-				 on-success="onUploadQualification($data, index)"
-				 non-preview="true"
-				 style="width: 124px;height: 147px;position: absolute;background: rgba(105, 99, 99, 0.5); left: -2px; bottom:0;"
-				 ng-if="!sampleStore.qualifications[index].resourceUrl">
+		<div class="row com_row title_row" style="border: none;">
+			<div class="col-md-8 custom_col">
+				<h2>资质证明</h2>
 			</div>
 			</div>
-			<div class="hover-show"
-				 style="width: 124px;height: 147px;position: absolute;background: rgba(105, 99, 99, 0.5); left: -2px;"
-				 ng-if="sampleStore.qualifications[index].resourceUrl">
-				<span class="delete" title="删除" ng-click="showDeleteTipDialog(index)"><i class="fa fa-trash"></i></span>
+			<div class="col-md-4 custom_col">
+				<a href="javascript:void(0)" ng-click="showEdit('QUALIFICATIONS')">
+					<span style="text-align: right;color: #999;"><i class="fa fa-pencil" aria-hidden="true" style="font-size: 18px;"></i> 编辑</span>
+				</a>
 			</div>
 			</div>
 		</div>
 		</div>
-	</div>
-	<div class="row com_row image_tip" style="padding: 0px 84px;">
-		仅支持JPG、PNG、GIF、PDF格式,每张大小不超过3M,最多可上传五张图片
-	</div>
-</div><!-- 资质证明输入 end -->
-<!-- 资质证明展示 start -->
-<div class="container vendor_store_maintain" style="margin-top: 15px;padding: 0 15px;min-height: 280px;" ng-if="!editQualifications">
-	<div class="row com_row title_row title_row3">
-		<div class="clearfix">
-			<img src="static/img/vendor/store/bell.png" alt="">
-			<p>您可以在这里上传资质证书、现货照片、公司风采等材料文件,用于展示在您的店铺页面,展现您店铺的公信力。</p>
-		</div>
-	</div>
-	<div class="row com_row title_row" style="border: none;">
-		<div class="col-md-8 custom_col">
-			<h2>资质证明</h2>
-		</div>
-		<div class="col-md-4 custom_col">
-			<a href="javascript:void(0)" ng-click="showEdit('QUALIFICATIONS')">
-				<span style="text-align: right;color: #999;"><i class="fa fa-pencil" aria-hidden="true" style="font-size: 18px;"></i> 编辑</span>
-			</a>
-		</div>
-	</div>
-	<div class="row com_row qualification_upload">
-		<div class="col-md-1"></div>
-		<div class="col-md-2 hover-container" ng-repeat="qualification in sampleStore.qualifications">
-			<!--<img src="static/img/vendor/store/timg.png" alt="">-->
-			<!--<a target="_blank" href="{{sampleStore.qualifications[$index].resourceUrl}}" ng-if="sampleStore.qualifications[$index].isPdf" class="imgs">-->
-			<!---->
-			<!--</a>-->
-			<div ng-if="sampleStore.qualifications[$index].isPdf">
-				<img src="static/img/vendor/store/timg.png" alt="" style="max-width: 124px; max-height: 147px;">
-				<div class="hover-show" ng-if="sampleStore.qualifications[$index].isPdf">
-					<a target="_blank" href="{{sampleStore.qualifications[$index].resourceUrl}}" ng-if="sampleStore.qualifications[$index].isPdf" class="imgs">
-						<span style="height: 147px; line-height: 147px; margin-left: 15px;"><i class="fa fa-search" style=" margin-top: 45px; margin-left: 30px;"></i>查看</span>
-					</a>
+		<div class="row com_row qualification_upload">
+			<div class="col-md-1"></div>
+			<div class="col-md-2 hover-container" ng-repeat="qualification in sampleStore.qualifications">
+				<!--<img src="static/img/vendor/store/timg.png" alt="">-->
+				<!--<a target="_blank" href="{{sampleStore.qualifications[$index].resourceUrl}}" ng-if="sampleStore.qualifications[$index].isPdf" class="imgs">-->
+				<!---->
+				<!--</a>-->
+				<div ng-if="sampleStore.qualifications[$index].isPdf">
+					<img src="static/img/vendor/store/timg.png" alt="" style="max-width: 124px; max-height: 147px;">
+					<div class="hover-show" ng-if="sampleStore.qualifications[$index].isPdf">
+						<a target="_blank" href="{{sampleStore.qualifications[$index].resourceUrl}}" ng-if="sampleStore.qualifications[$index].isPdf" class="imgs">
+							<span style="height: 147px; line-height: 147px; margin-left: 15px;"><i class="fa fa-search" style=" margin-top: 45px; margin-left: 30px;"></i>查看</span>
+						</a>
+					</div>
+				</div>
+				<img ng-if="!sampleStore.qualifications[$index].isPdf" class="previewImage"
+					 ng-src="{{sampleStore.qualifications[$index].resourceUrl || 'static/img/example/upload-apply.png'}}"/>
+				<div class="hover-show" ng-if="!sampleStore.qualifications[$index].isPdf">
+					<span class="view" ng-click="showImg(sampleStore.qualifications[$index].resourceUrl)"><i class="fa fa-search" style="margin-right: 5px;"></i>查看</span>
 				</div>
 				</div>
-			</div>
-			<img ng-if="!sampleStore.qualifications[$index].isPdf" class="previewImage"
-				 ng-src="{{sampleStore.qualifications[$index].resourceUrl || 'static/img/example/upload-apply.png'}}"/>
-			<div class="hover-show" ng-if="!sampleStore.qualifications[$index].isPdf">
-				<span class="view" ng-click="showImg(sampleStore.qualifications[$index].resourceUrl)"><i class="fa fa-search" style="margin-right: 5px;"></i>查看</span>
 			</div>
 			</div>
 		</div>
 		</div>
-	</div>
-	<div class="row com_row image_tip" style="padding: 0 84px;">
-		仅支持JPG、PNG、GIF、PDF格式,每张大小不超过3M,最多可上传五张图片
-	</div>
-</div><!-- 资质证明展示 end -->
-<!-- 图片上传 start -->
-<div class="container vendor_store_maintain" style="margin-top: 15px;padding: 30px 40px;min-height: 330px;" ng-if="editStoreImage">
-	<div class="row" style="padding: 0 40px;">
-		<div style="float: left;width: 174px;">
-			<div class="image_title" style="padding: 0;">
-				<span style="color: #000000;font-size: 16px;">店铺LOGO<strong class="text-inverse">*</strong></span>
-			</div>
-			<div class="image_area logo_image div_vertical_align_center" id="logo_edit" style="position: relative;">
-				<div style="position: relative; width: 174px; height: 155px;">
-					<img class="previewImage" ng-src="{{sampleStore.logoUrl || 'static/img/example/upload-apply_2.png'}}"/>
-					<!--<div class="hover-show hover-show1"  ng-if="sampleStore.logoUrl">-->
-					<!--<span class="delete" title="删除" ng-click="deleteLogo()"><i class="fa fa-trash" ng-click="deleteImg(index)"></i></span>-->
-					<!--</div>-->
-				</div>
-				<div image-upload data-src="static/img/example/upload-apply_2.png" on-success="onUploadLogo($data)" non-preview="true" max-size="512000" error-size-msg="文件大小不超过500kb"
-					 style="width: 174px;height: 155px; border: 1px solid #ddd; left: 0; position: absolute;"></div>
-			</div>
-			<div class="image_tip">
-				仅支持JPG、PNG、GIF格式,大小不超过500kb,建议使用220*220px的图片
-			</div>
+		<div class="row com_row image_tip" style="padding: 0 84px;">
+			仅支持JPG、PNG、GIF、PDF格式,每张大小不超过3M,最多可上传五张图片
 		</div>
 		</div>
-		<div style="margin-left: 200px;width: 720px;">
-			<div class="image_title" style="padding: 0;">
-				<div class="row com_row" style="height: 40px;padding: 0;">
-					<div class="col-md-8">
-						<span style="color: #000000;font-size: 16px;">店铺广告图片<strong class="text-inverse">*</strong></span>
+	</div><!-- 资质证明展示 end -->
+	<!-- 图片上传 start -->
+	<div class="container vendor_store_maintain user_right" style="margin-top: 15px;padding: 30px 40px;min-height: 330px;" ng-if="editStoreImage">
+		<div class="row" style="padding: 0 40px;">
+			<div style="float: left;width: 174px;">
+				<div class="image_title" style="padding: 0;">
+					<span style="color: #000000;font-size: 16px;">店铺LOGO<strong class="text-inverse">*</strong></span>
+				</div>
+				<div class="image_area logo_image div_vertical_align_center" id="logo_edit" style="position: relative;">
+					<div style="position: relative; width: 174px; height: 155px;">
+						<img class="previewImage" ng-src="{{sampleStore.logoUrl || 'static/img/example/upload-apply_2.png'}}"/>
+						<!--<div class="hover-show hover-show1"  ng-if="sampleStore.logoUrl">-->
+						<!--<span class="delete" title="删除" ng-click="deleteLogo()"><i class="fa fa-trash" ng-click="deleteImg(index)"></i></span>-->
+						<!--</div>-->
 					</div>
 					</div>
-					<div class="col-md-4">
-						<div>
-							<a href="javascript:void(0)" ng-click="saveModify('STORE_IMAGE')">
-								<span class="edit_status_btn">保存</span>
-							</a>
-							<a href="javascript:void(0)" ng-click="undoModify('STORE_IMAGE')">
-								<span class="edit_status_btn">取消</span>
-							</a>
+					<div image-upload data-src="static/img/example/upload-apply_2.png" on-success="onUploadLogo($data)" non-preview="true" max-size="512000" error-size-msg="文件大小不超过500kb"
+						 style="width: 174px;height: 155px; border: 1px solid #ddd; left: 0; position: absolute;"></div>
+				</div>
+				<div class="image_tip">
+					仅支持JPG、PNG、GIF格式,大小不超过500kb,建议使用220*220px的图片
+				</div>
+			</div>
+			<div style="margin-left: 200px;width: 720px;">
+				<div class="image_title" style="padding: 0;">
+					<div class="row com_row" style="height: 40px;padding: 0;">
+						<div class="col-md-8">
+							<span style="color: #000000;font-size: 16px;">店铺广告图片<strong class="text-inverse">*</strong></span>
+						</div>
+						<div class="col-md-4">
+							<div>
+								<a href="javascript:void(0)" ng-click="saveModify('STORE_IMAGE')">
+									<span class="edit_status_btn">保存</span>
+								</a>
+								<a href="javascript:void(0)" ng-click="undoModify('STORE_IMAGE')">
+									<span class="edit_status_btn">取消</span>
+								</a>
+							</div>
 						</div>
 						</div>
 					</div>
 					</div>
 				</div>
 				</div>
-			</div>
-			<div class="image_area banner_image div_vertical_align_center" id="banner_edit" style="position: relative;">
-				<div style="position: relative; width: 660px; height: 155px;">
-					<img class="previewImage" ng-src="{{sampleStore.bannerUrl || 'static/img/example/upload-apply_3.png'}}" style="width: 660px; height: 155px;"/>
-					<!--<div class="hover-show hover-show1"  ng-if="sampleStore.bannerUrl">-->
-					<!--<span class="delete" title="删除" ng-click="deleteBanner()"><i class="fa fa-trash" ng-click="deleteImg(index)"></i></span>-->
-					<!--</div>-->
-				</div>
-				<div image-upload data-src="static/img/example/upload-apply_3.png" on-success="onUploadBanner($data)" non-preview="true"
-					 style="width: 660px;height: 155px;  left: 0; position: absolute;"></div>
-			</div>
-			<div class="image_tip">
-				仅支持JPG、PNG、GIF格式,大小不超过3M,建议使用970*220px的图片
-				<a href="javascript:void(0)" class="model-btn" ng-click="showTemplate(true)" >使用提供的模板</a>
-			</div>
+				<div class="image_area banner_image div_vertical_align_center" id="banner_edit" style="position: relative;">
+					<div style="position: relative; width: 660px; height: 155px;">
+						<img class="previewImage" ng-src="{{sampleStore.bannerUrl || 'static/img/example/upload-apply_3.png'}}" style="width: 660px; height: 155px;"/>
+						<!--<div class="hover-show hover-show1"  ng-if="sampleStore.bannerUrl">-->
+						<!--<span class="delete" title="删除" ng-click="deleteBanner()"><i class="fa fa-trash" ng-click="deleteImg(index)"></i></span>-->
+						<!--</div>-->
+					</div>
+					<div image-upload data-src="static/img/example/upload-apply_3.png" on-success="onUploadBanner($data)" non-preview="true"
+						 style="width: 660px;height: 155px;  left: 0; position: absolute;"></div>
+				</div>
+				<div class="image_tip">
+					仅支持JPG、PNG、GIF格式,大小不超过3M,建议使用970*220px的图片
+					<a href="javascript:void(0)" class="model-btn" ng-click="showTemplate(true)" >使用提供的模板</a>
+				</div>
 
 
-		</div>
-	</div>
-</div><!-- 图片上传 end -->
-<!-- 图片上传展示 start -->
-<div class="container vendor_store_maintain" style="margin-top: 15px;padding: 30px 40px;min-height: 330px;" ng-if="!editStoreImage">
-	<div class="row" style="padding: 0 40px;">
-		<div style="float: left;width: 175px;">
-			<div class="image_title" style="padding: 0;">
-				<span style="color: #000000;font-size: 16px;">店铺LOGO</span>
 			</div>
 			</div>
-			<div class="image_area logo_image hover-container" style="width: 174px; height: 155px; display: flex;justify-content: center;align-items: center; position: relative;">
-				<img class="previewImage" ng-src="{{sampleStore.logoUrl || 'static/img/example/upload-apply.png'}}"/>
-				<div class="hover-show">
-					<span class="view" ng-click="showImg(sampleStore.logoUrl)"><i class="fa fa-search" style="margin-right: 5px;"></i>查看</span>
+		</div>
+	</div><!-- 图片上传 end -->
+	<!-- 图片上传展示 start -->
+	<div class="container vendor_store_maintain user_right" style="margin-top: 15px;padding: 30px 40px;min-height: 330px;" ng-if="!editStoreImage">
+		<div class="row" style="padding: 0 40px;">
+			<div style="float: left;width: 175px;">
+				<div class="image_title" style="padding: 0;">
+					<span style="color: #000000;font-size: 16px;">店铺LOGO</span>
+				</div>
+				<div class="image_area logo_image hover-container" style="width: 174px; height: 155px; display: flex;justify-content: center;align-items: center; position: relative;">
+					<img class="previewImage" ng-src="{{sampleStore.logoUrl || 'static/img/example/upload-apply.png'}}"/>
+					<div class="hover-show">
+						<span class="view" ng-click="showImg(sampleStore.logoUrl)"><i class="fa fa-search" style="margin-right: 5px;"></i>查看</span>
+					</div>
+				</div>
+				<div class="image_tip">
+					仅支持JPG、PNG、GIF格式,大小不超过500kb,建议使用220*220px的图片
 				</div>
 				</div>
 			</div>
 			</div>
-			<div class="image_tip">
-				仅支持JPG、PNG、GIF格式,大小不超过500kb,建议使用220*220px的图片
-			</div>
-		</div>
-		<div style="margin-left: 200px;width: 720px;">
-			<div class="image_title" style="padding: 0;">
-				<div class="row com_row" style="height: 40px;padding: 0;">
-					<div class="col-md-8">
-						<span style="color: #000000;font-size: 16px;">店铺广告图片</span>
+			<div style="margin-left: 200px;width: 720px;">
+				<div class="image_title" style="padding: 0;">
+					<div class="row com_row" style="height: 40px;padding: 0;">
+						<div class="col-md-8">
+							<span style="color: #000000;font-size: 16px;">店铺广告图片</span>
+						</div>
+						<div class="col-md-4">
+							<a href="javascript:void(0)" ng-click="showEdit('STORE_IMAGE')">
+								<span style="text-align: right;color: #999;"><i class="fa fa-pencil" aria-hidden="true" style="font-size: 18px;"></i> 编辑</span>
+							</a>
+						</div>
 					</div>
 					</div>
-					<div class="col-md-4">
-						<a href="javascript:void(0)" ng-click="showEdit('STORE_IMAGE')">
-							<span style="text-align: right;color: #999;"><i class="fa fa-pencil" aria-hidden="true" style="font-size: 18px;"></i> 编辑</span>
-						</a>
+				</div>
+				<div class="image_area banner_image hover-container" style="width: 660px;display: flex;justify-content: center;align-items: center; position: relative;">
+					<img class="previewImage" ng-src="{{sampleStore.bannerUrl || 'static/img/example/upload-apply.png'}}" style="width: 660px; height: 155px;"/>
+					<div class="hover-show">
+						<span class="view" ng-click="showImg(sampleStore.bannerUrl)"><i class="fa fa-search" style="margin-right: 5px;"></i>查看</span>
 					</div>
 					</div>
 				</div>
 				</div>
-			</div>
-			<div class="image_area banner_image hover-container" style="width: 660px;display: flex;justify-content: center;align-items: center; position: relative;">
-				<img class="previewImage" ng-src="{{sampleStore.bannerUrl || 'static/img/example/upload-apply.png'}}" style="width: 660px; height: 155px;"/>
-				<div class="hover-show">
-					<span class="view" ng-click="showImg(sampleStore.bannerUrl)"><i class="fa fa-search" style="margin-right: 5px;"></i>查看</span>
+				<div class="image_tip">
+					仅支持JPG、PNG、GIF格式,大小不超过3M,建议使用970*220px的图片
+					<a href="#" class="model-btn" style="display: none;">使用提供的模板</a>
 				</div>
 				</div>
 			</div>
 			</div>
-			<div class="image_tip">
-				仅支持JPG、PNG、GIF格式,大小不超过3M,建议使用970*220px的图片
-				<a href="#" class="model-btn" style="display: none;">使用提供的模板</a>
-			</div>
 		</div>
 		</div>
-	</div>
-</div><!-- 图片上传展示 end -->
-<!--产品推荐 start-->
-<div class="container pro-recommend">
-	<div class="row menu">
-		<div class="fl"><h3>产品推荐</h3></div>
-		<div class="fr">
-			<div ng-if="!canBatchOperation && !canEditProduct"><a ng-click="editRecommendProduct('BATCH_OPERATION', true)">批量操作</a></div>
-			<div ng-if="!canBatchOperation && !canEditProduct"><a ng-click="editRecommendProduct('EDIT_PRODUCTS', true)"><i class="fa fa-pencil"></i>编辑</a></div>
-			<div class="check" ng-if="canBatchOperation">
-				<label class="check-active" ng-if="recommendProducts.length>0">
-					<input type="checkbox" id="isChooseAll" ng-checked="isChooseAll" ng-click="chooseAllProduct(!isChooseAll)" checked="checked">
-					<label for="isChooseAll"></label>
-					<span style="margin-left: 0;">全选</span>
-				</label>
-				<a ng-click="showDeleteProductTipDialog()">删除</a>
-				<a ng-click="cancleProductEdit('BATCH_OPERATION')">取消</a>
-				<a ng-click="saveProducts()">保存</a>
-			</div>
-			<div ng-if="canEditProduct">
-				<a ng-click="chooseRecommendProduct(true)">批量修改</a>
-				<a ng-click="cancleProductEdit('EDIT_PRODUCTS')">取消</a>
-				<a ng-click="saveUploadProducts()">保存</a>
+	</div><!-- 图片上传展示 end -->
+	<!--产品推荐 start-->
+	<div class="container pro-recommend user_right">
+		<div class="row menu">
+			<div class="fl"><h3>产品推荐</h3></div>
+			<div class="fr">
+				<div ng-if="!canBatchOperation && !canEditProduct"><a ng-click="editRecommendProduct('BATCH_OPERATION', true)">批量操作</a></div>
+				<div ng-if="!canBatchOperation && !canEditProduct"><a ng-click="editRecommendProduct('EDIT_PRODUCTS', true)"><i class="fa fa-pencil"></i>编辑</a></div>
+				<div class="check" ng-if="canBatchOperation">
+					<label class="check-active" ng-if="recommendProducts.length>0">
+						<input type="checkbox" id="isChooseAll" ng-checked="isChooseAll" ng-click="chooseAllProduct(!isChooseAll)" checked="checked">
+						<label for="isChooseAll"></label>
+						<span style="margin-left: 0;">全选</span>
+					</label>
+					<a ng-click="showDeleteProductTipDialog()">删除</a>
+					<a ng-click="cancleProductEdit('BATCH_OPERATION')">取消</a>
+					<a ng-click="saveProducts()">保存</a>
+				</div>
+				<div ng-if="canEditProduct">
+					<a ng-click="chooseRecommendProduct(true)">批量修改</a>
+					<a ng-click="cancleProductEdit('EDIT_PRODUCTS')">取消</a>
+					<a ng-click="saveUploadProducts()">保存</a>
+				</div>
 			</div>
 			</div>
 		</div>
 		</div>
-	</div>
-	<div class="row pro-recommend-list">
-		<ul>
-			<li ng-repeat="product in recommendProducts" ng-click="chooseProduct(product)">
-				<!--产品推荐列表-->
-				<div class="pro-list" ng-class="{'select': !canBatchOperation, 'isselect': canBatchOperation && product.isSelect}" ng-if="product.exist">
-					<div class="img"><img ng-src="{{product.comImg}}" /></div>
-					<div class="content">
-						<p ng-bind="product.comCode" title="{{product.comCode}}">MRFE6S9045NF001</p>
-						<p ng-bind="product.brandNameCn">PANFAEFQ</p>
-						<p class="price" ng-if="product.minPriceRMB">¥ {{product.minPriceRMB}}</p>
-						<p class="price" ng-if="product.minPriceUSD && !product.minPriceRMB">$ {{product.minPriceUSD}}</p>
-					</div>
-					<!--选中-->
-					<div ng-class="{'select': canBatchOperation, 'isselect': canBatchOperation && product.isSelect}"></div>
-				</div>
-				<!--产品列表修改-->
-				<div class="pro-list-edit" ng-if="canEditProduct && product.exist">
-					<div class="delete" title="删除" ng-click="deleteProductWhenEdit($index)"><i class="fa fa-trash fa-2x"></i></div>
-					<div class="preview-img">
-						<a ng-click="chooseRecommendProduct(false, product)"><img class="previewImg" src="static/img/example/upload-apply_1.png" alt="器件图片"/></a>
+		<div class="row pro-recommend-list">
+			<ul>
+				<li ng-repeat="product in recommendProducts" ng-click="chooseProduct(product)">
+					<!--产品推荐列表-->
+					<div class="pro-list" ng-class="{'select': !canBatchOperation, 'isselect': canBatchOperation && product.isSelect}" ng-if="product.exist">
+						<div class="img"><img ng-src="{{product.comImg}}" /></div>
+						<div class="content">
+							<p ng-bind="product.comCode" title="{{product.comCode}}">MRFE6S9045NF001</p>
+							<p ng-bind="product.brandNameCn">PANFAEFQ</p>
+							<p class="price" ng-if="product.minPriceRMB">¥ {{product.minPriceRMB}}</p>
+							<p class="price" ng-if="product.minPriceUSD && !product.minPriceRMB">$ {{product.minPriceUSD}}</p>
+						</div>
+						<!--选中-->
+						<div ng-class="{'select': canBatchOperation, 'isselect': canBatchOperation && product.isSelect}"></div>
 					</div>
 					</div>
-					<div class="sort">
+					<!--产品列表修改-->
+					<div class="pro-list-edit" ng-if="canEditProduct && product.exist">
+						<div class="delete" title="删除" ng-click="deleteProductWhenEdit($index)"><i class="fa fa-trash fa-2x"></i></div>
+						<div class="preview-img">
+							<a ng-click="chooseRecommendProduct(false, product)"><img class="previewImg" src="static/img/example/upload-apply_1.png" alt="器件图片"/></a>
+						</div>
+						<div class="sort">
 						<span>
 						<span>
 							<a class="first" ng-if="$index != 0" ng-click="moveRecommendProduct($index, 0)"></a>
 							<a class="first" ng-if="$index != 0" ng-click="moveRecommendProduct($index, 0)"></a>
 							<em ng-if="$index == 0">&nbsp;</em>
 							<em ng-if="$index == 0">&nbsp;</em>
 						</span>
 						</span>
-						<span>
+							<span>
 							<a class="first-1" ng-if="$index != 0" ng-click="moveRecommendProduct($index, $index - 1)"></a>
 							<a class="first-1" ng-if="$index != 0" ng-click="moveRecommendProduct($index, $index - 1)"></a>
 							<em ng-if="$index == 0">&nbsp;</em>
 							<em ng-if="$index == 0">&nbsp;</em>
 						</span>
 						</span>
-						<span>
+							<span>
 							<a class="last-1" ng-if="$index != recommendProducts.length - 1" ng-click="moveRecommendProduct($index, $index + 1)"></a>
 							<a class="last-1" ng-if="$index != recommendProducts.length - 1" ng-click="moveRecommendProduct($index, $index + 1)"></a>
 							<em ng-if="$index == recommendProducts.length - 1">&nbsp;</em>
 							<em ng-if="$index == recommendProducts.length - 1">&nbsp;</em>
 						</span>
 						</span>
-						<span>
+							<span>
 							<a class="last" ng-if="$index != recommendProducts.length - 1" ng-click="moveRecommendProduct($index, recommendProducts.length - 1)"></a>
 							<a class="last" ng-if="$index != recommendProducts.length - 1" ng-click="moveRecommendProduct($index, recommendProducts.length - 1)"></a>
 							<em ng-if="$index == recommendProducts.length - 1">&nbsp;</em>
 							<em ng-if="$index == recommendProducts.length - 1">&nbsp;</em>
 						</span>
 						</span>
+						</div>
 					</div>
 					</div>
-				</div>
-				<!--没有产品推荐-->
-				<div class="preview" ng-if="canEditProduct && !product.exist">
-					<a ng-click="chooseRecommendProduct(false, product)"><img class="previewImage" src="static/img/example/upload-apply.png" alt="器件图片"/></a>
-				</div>
-			</li>
-		</ul>
+					<!--没有产品推荐-->
+					<div class="preview" ng-if="canEditProduct && !product.exist">
+						<a ng-click="chooseRecommendProduct(false, product)"><img class="previewImage" src="static/img/example/upload-apply.png" alt="器件图片"/></a>
+					</div>
+				</li>
+			</ul>
+		</div>
+		<div class="row image_tip">以上产品推荐将会被展示在店铺首页, 马上去推荐,让更多人看到你的产品吧!</div>
 	</div>
 	</div>
-	<div class="row image_tip">以上产品推荐将会被展示在店铺首页, 马上去推荐,让更多人看到你的产品吧!</div>
-</div>
-<div class="row" style="width:100%;display: inline-block;">
-	<!-- Submit button -->
-	<div style="padding: 28px 40px;">
-		<a ng-href="{{'store/' + store.uuid}}"><button type="button" class="btn btn-primary" style="float: right; font-size: 24px; margin-top: 20px; background: #5078cb;">
-			<img src="static/img/example/goto.png" alt="">
-			前往我的店铺</button></a>
-		<div class="clear-fix"></div>
+	<div class="row user_right" style="width:100%;display: inline-block;">
+		<!-- Submit button -->
+		<div style="padding: 28px 40px;">
+			<a ng-href="{{'store/' + store.uuid}}"><button type="button" class="btn btn-primary" style="float: right; font-size: 24px; margin-top: 20px; background: #5078cb;">
+				<img src="static/img/example/goto.png" alt="">
+				前往我的店铺</button></a>
+			<div class="clear-fix"></div>
+		</div>
 	</div>
 	</div>
-</div>
-<!--产品推荐 end-->
-<!--模板选择框-->
-<div class="view-box" ng-if="isShowTemplate">
-	<div class="box">
-		<div class="model-demo container">
-			<div class="delete row"><a href="javascript:void(0)" ng-click="showTemplate(false)"><img src="static/img/common/close.png"/></a></div>
-			<div class="row">
-				<div class="col-md-2">请选择模板 : </div>
-				<div class="col-md-10">
-					<span ng-repeat="template in templates" ng-class="{ 'active': temporaryTemplate == template }" ng-click="chooseTemplate(template)"><img ng-src="{{template.url}}"/></span>
-					<!--<span><img src="http://dfs.ubtob.com/group1/M00/18/3D/CgpkyFj2t86ARHbYAAQplFamS2Y171.jpg" /></span>-->
+	<!--产品推荐 end-->
+	<!--模板选择框-->
+	<div class="view-box" ng-if="isShowTemplate">
+		<div class="box">
+			<div class="model-demo container">
+				<div class="delete row"><a href="javascript:void(0)" ng-click="showTemplate(false)"><img src="static/img/common/close.png"/></a></div>
+				<div class="row">
+					<div class="col-md-2">请选择模板 : </div>
+					<div class="col-md-10">
+						<span ng-repeat="template in templates" ng-class="{ 'active': temporaryTemplate == template }" ng-click="chooseTemplate(template)"><img ng-src="{{template.url}}"/></span>
+						<!--<span><img src="http://dfs.ubtob.com/group1/M00/18/3D/CgpkyFj2t86ARHbYAAQplFamS2Y171.jpg" /></span>-->
+					</div>
 				</div>
 				</div>
-			</div>
-			<div class="row">
-				<div class="choose">
-					<button class="btn btn-success" type="button" ng-click="saveChoose()">确认</button>
-					<button class="btn btn-default" type="button" ng-click="showTemplate(false)">取消</button>
+				<div class="row">
+					<div class="choose">
+						<button class="btn btn-success" type="button" ng-click="saveChoose()">确认</button>
+						<button class="btn btn-default" type="button" ng-click="showTemplate(false)">取消</button>
+					</div>
 				</div>
 				</div>
 			</div>
 			</div>
 		</div>
 		</div>
 	</div>
 	</div>
-</div>
-<div id="image-box" style="display: none">
-	<div class="x-floating-wrap"></div>
-	<div class="x-floating">
-		<div id="item-content">
-			<div class="x-close-wrap"><a href="javascript:void(0);">&times;</a></div>
-			<div class="img"><img/></div>
+	<div id="image-box" style="display: none">
+		<div class="x-floating-wrap"></div>
+		<div class="x-floating">
+			<div id="item-content">
+				<div class="x-close-wrap"><a href="javascript:void(0);">&times;</a></div>
+				<div class="img"><img/></div>
+			</div>
 		</div>
 		</div>
 	</div>
 	</div>
-</div>
-<div class="com-del-box" ng-if="showDeleteTip">
-	<div class="title">
-		<a ng-click="closeDeleteTip()"><i class="fa fa-close fa-lg"></i></a>
-	</div>
-	<div class="content">
-		<p><i class="fa fa-exclamation-circle"></i>确定要删除此张资质证明</p>
-		<div><a ng-click="closeDeleteTip()">取消</a><a ng-click="deleteImg(selectedIndex)">确认</a></div>
-	</div>
-</div>
-<div class="com-del-box" ng-if="showDeleteProductTip">
-	<div class="title">
-		<a ng-click="showDeleteProductTipDialog()"><i class="fa fa-close fa-lg"></i></a>
-	</div>
-	<div class="content">
-		<p><i class="fa fa-exclamation-circle"></i>删除选中的产品</p>
-		<div><a ng-click="cancelDeleteProduct()">取消</a><a ng-click="deleteProduct()">确认</a></div>
+	<div class="com-del-box" ng-if="showDeleteTip">
+		<div class="title">
+			<a ng-click="closeDeleteTip()"><i class="fa fa-close fa-lg"></i></a>
+		</div>
+		<div class="content">
+			<p><i class="fa fa-exclamation-circle"></i>确定要删除此张资质证明</p>
+			<div><a ng-click="closeDeleteTip()">取消</a><a ng-click="deleteImg(selectedIndex)">确认</a></div>
+		</div>
 	</div>
 	</div>
-</div>
-<div class="com-del-box" ng-if="showDeleteOneProductTip">
-	<div class="title">
-		<a ng-click="cancelDeleteOneProduct()"><i class="fa fa-close fa-lg"></i></a>
+	<div class="com-del-box" ng-if="showDeleteProductTip">
+		<div class="title">
+			<a ng-click="showDeleteProductTipDialog()"><i class="fa fa-close fa-lg"></i></a>
+		</div>
+		<div class="content">
+			<p><i class="fa fa-exclamation-circle"></i>删除选中的产品</p>
+			<div><a ng-click="cancelDeleteProduct()">取消</a><a ng-click="deleteProduct()">确认</a></div>
+		</div>
 	</div>
 	</div>
-	<div class="content">
-		<p><i class="fa fa-exclamation-circle"></i>删除选中的产品</p>
-		<div><a ng-click="cancelDeleteOneProduct()">取消</a><a ng-click="confirmDeleteOneProduct()">确认</a></div>
+	<div class="com-del-box" ng-if="showDeleteOneProductTip">
+		<div class="title">
+			<a ng-click="cancelDeleteOneProduct()"><i class="fa fa-close fa-lg"></i></a>
+		</div>
+		<div class="content">
+			<p><i class="fa fa-exclamation-circle"></i>删除选中的产品</p>
+			<div><a ng-click="cancelDeleteOneProduct()">取消</a><a ng-click="confirmDeleteOneProduct()">确认</a></div>
+		</div>
 	</div>
 	</div>
-</div>
 <style>
 <style>
 	.view-box{
 	.view-box{
 		position: fixed;
 		position: fixed;