Browse Source

修改寄售协议的样式和交互操作

huxz 8 years ago
parent
commit
7aab8d0fb3

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

@@ -37,7 +37,7 @@ define([ 'ngResource', 'common/query/storeViolations', 'ngTable', 'ngSanitize',
 			StoreInfo.findByUuid({ uuid: $scope.storeUuid }, {}, function (store) {
 				if (store && store.uuid) {
 					$scope.store = store;
-					$scope.store.auditInfo = JSON.parse(store.enQualification);
+					$scope.store.auditInfo = JSON.parse(store.enQualification || "{}");
 					if (store.qualifications && store.qualifications.length > 0) {
 						$scope.qualifications = store.qualifications.filter(function (qualification) {
 							return qualification.type === 'APTITUDE' && qualification.resourceUrl && qualification.resourceUrl !== '';

+ 3 - 2
src/main/webapp/resources/js/vendor/controllers/forstore/vendor_standard_putOn_ctrl.js

@@ -357,11 +357,12 @@ define(['app/app'], function (app) {
 				        // 弹出寄售协议弹窗
 						$modal.open({
 							templateUrl : 'static/view/vendor/modal/confirm_consignment_agreement.html',
-							controller : 'ConfirmConsignmentAgreement',
-                            size: 'lg'
+							controller : 'ConfirmConsignmentAgreement'
 						}).result.then(function(){
 							toaster.pop('success', '操作成功');
 						}, function(){
+							standard.editSelfSaleNum = 1;
+							standard.editIsSelfSale = standard.editSelfSaleNum === 1;
 						});
                     }
 				}, function (error) {

+ 2 - 2
src/main/webapp/resources/view/admin/store/fragments/enterprise_info.html

@@ -302,8 +302,8 @@
 		</div>
 	</div>
 </div>
-<!--推荐相关内容-->
-<div class="recommend">
+<!--推荐相关内容 TODO huxz 暂时隐藏 -->
+<div class="recommend" style="display: none;">
 	<div class="recommend-list hot-icon">推荐成为:
 		<label>
 			<i class="hot"></i>热销

+ 1 - 0
src/main/webapp/resources/view/vendor/modal/confirm_consignment_agreement.html

@@ -5,6 +5,7 @@
 		left: 50%;
 		margin-left: -425px;
 		margin-top: -290px;
+		width: 850px;
 	}
 	.modal-dialog{
 		width: 850px;