Преглед изворни кода

评价 模块样式调整2

wangdy пре 8 година
родитељ
комит
314c8e9065

+ 23 - 3
src/main/webapp/resources/js/vendor/controllers/forstore/show_rate_ctrl.js

@@ -109,7 +109,8 @@ define(['app/app'], function(app) {
         $scope.setShowRateBoxFlag = function (flag) {
             $scope.showRateBoxFlag = flag;
             if (!flag){
-                $scope.boxStatus = 1;
+                $scope.rateContent.level = 1;
+                $scope.boxStatus = 2;
                 $scope.modalTempData.rateContent = '';
                 $scope.modalTempData.modalTitle = '';
             }
@@ -129,12 +130,31 @@ define(['app/app'], function(app) {
          * 3:新增模板
          * 4:修改模板
          * ***/
-        $scope.boxStatus = 1;
+        $scope.boxStatus = 2;
+
+
+        $scope.returnStep1 = function () {
+            $scope.setBoxStatus(1);
+            $scope.modalTempData.rateContent = $scope.rateContentTemp;
+            $scope.modalTempData.modalTitle  = $scope.modalTitleTemp;
+        }
 
         $scope.setBoxStatus = function (boxStatus) {
+            if (boxStatus == 3 || boxStatus == 4){
+                $scope.rateContentTemp = angular.copy($scope.modalTempData.rateContent);
+                $scope.modalTitleTemp = angular.copy($scope.modalTempData.modalTitle);
+            }
             $scope.boxStatus = boxStatus;
         }
 
+        $scope.setGo = function(){
+            if ( $scope.boxStatus == 1 ){
+                $scope.modalTempData.rateContent = '';
+                $scope.modalTempData.modalTitle = '';
+            }
+            $scope.setBoxStatus($scope.boxStatus == 1?2:1);
+        }
+
         //控制模板列表显示
         $scope.showModalListFlag = false;
 
@@ -152,8 +172,8 @@ define(['app/app'], function(app) {
 
         $scope.addModal = function () {
             $scope.showModalListFlag = false;
-            $scope.modalTempData = {};
             $scope.setBoxStatus(3);
+            $scope.modalTempData = {};
         }
 
         //选择模板

+ 23 - 3
src/main/webapp/resources/js/vendor/controllers/forstore/vendor_order_ctrl.js

@@ -1061,7 +1061,8 @@ define(['app/app'], function (app) {
         $scope.setShowRateBoxFlag = function (flag) {
             $scope.showRateBoxFlag = flag;
             if (!flag){
-                $scope.boxStatus = 1;
+                $scope.boxStatus = 2;
+                $scope.rateContent.level = 1;
                 $scope.modalTempData.rateContent = '';
                 $scope.modalTempData.modalTitle = '';
             }
@@ -1089,12 +1090,31 @@ define(['app/app'], function (app) {
          * 3:新增模板
          * 4:修改模板
          * ***/
-        $scope.boxStatus = 1;
+        $scope.boxStatus = 2;
+
+
+        $scope.returnStep1 = function () {
+            $scope.setBoxStatus(1);
+            $scope.modalTempData.rateContent = $scope.rateContentTemp;
+            $scope.modalTempData.modalTitle  = $scope.modalTitleTemp;
+        }
 
         $scope.setBoxStatus = function (boxStatus) {
+            if (boxStatus == 3 || boxStatus == 4){
+                $scope.rateContentTemp = angular.copy($scope.modalTempData.rateContent);
+                $scope.modalTitleTemp = angular.copy($scope.modalTempData.modalTitle);
+            }
             $scope.boxStatus = boxStatus;
         }
 
+        $scope.setGo = function(){
+            if ( $scope.boxStatus == 1 ){
+                $scope.modalTempData.rateContent = '';
+                $scope.modalTempData.modalTitle = '';
+            }
+            $scope.setBoxStatus($scope.boxStatus == 1?2:1);
+        }
+
         //控制模板列表显示
         $scope.showModalListFlag = false;
 
@@ -1112,8 +1132,8 @@ define(['app/app'], function (app) {
 
         $scope.addModal = function () {
             $scope.showModalListFlag = false;
-            $scope.modalTempData = {};
             $scope.setBoxStatus(3);
+            $scope.modalTempData = {};
         }
 
         //选择模板

+ 2 - 2
src/main/webapp/resources/view/vendor/forstore/showRate.html

@@ -478,7 +478,7 @@
         <img src="static/img/vendor/images/rate-box-del.png" ng-click="setShowRateBoxFlag(false)" alt="">
         <div style="position: relative;" ng-show="boxStatus == 1 || boxStatus == 2">
             <label class="check-active">
-                <input type="checkbox" id="check-act" ng-click="setBoxStatus(boxStatus == 1?2:1)" ng-checked="boxStatus == 1" class="ng-pristine ng-untouched ng-valid">
+                <input type="checkbox" id="check-act" ng-click="setGo()" ng-checked="boxStatus == 1" class="ng-pristine ng-untouched ng-valid">
                 <label for="check-act"></label>
                 <span style="font-size: 14px; color: black; font-weight: normal">使用模板</span>
             </label>
@@ -503,7 +503,7 @@
         <div class="reply-box-btn">
             <span class="modal-btn modify-modal" ng-click="setBoxStatus(4)" ng-show="boxStatus == 1 && modalTempData.modalTitle">修改模板</span>
             <span class="modal-btn cancel-modal" ng-click="setShowRateBoxFlag(false)" ng-show="boxStatus == 1 || boxStatus == 2">取消</span>
-            <span class="modal-btn cancel-modal" ng-click="setBoxStatus(1)" ng-show="boxStatus == 3 || boxStatus == 4">返回上一步</span>
+            <span class="modal-btn cancel-modal" ng-click="returnStep1()" ng-show="boxStatus == 3 || boxStatus == 4">返回上一步</span>
             <span class="modal-btn submit-modal" ng-show="boxStatus == 3 || boxStatus == 4" ng-click="saveModal()">保存</span>
             <span ng-class="!modalTempData.rateContent || modalTempData.rateContent == ''?'modal-btn cancel-modal':'modal-btn submit-modal'" ng-show="boxStatus == 1 || boxStatus == 2" ng-click="!modalTempData.rateContent || modalTempData.rateContent == ''?'':submitRate()">提交</span>
         </div>

+ 2 - 2
src/main/webapp/resources/view/vendor/forstore/vendor_order.html

@@ -1127,7 +1127,7 @@
 			<div class="vendor-modal-content">
 				<div style="position: relative;height: 30px;line-height: 30px;" ng-show="boxStatus == 1 || boxStatus == 2">
 					<label class="check-active">
-						<input type="checkbox" id="check-act" ng-click="setBoxStatus(boxStatus == 1?2:1)" ng-checked="boxStatus == 1" class="ng-pristine ng-untouched ng-valid">
+						<input type="checkbox" id="check-act" ng-click="setGo()" ng-checked="boxStatus == 1" class="ng-pristine ng-untouched ng-valid">
 						<label for="check-act"></label>
 						<span style="font-size: 14px; color: black; font-weight: normal" >使用模板</span>
 					</label>
@@ -1152,7 +1152,7 @@
 				<div class="reply-box-btn">
 					<span class="modal-btn modify-modal" ng-click="setBoxStatus(4)" ng-show="boxStatus == 1 && modalTempData.modalTitle">修改模板</span>
 					<span class="modal-btn cancel-modal" ng-click="setShowRateBoxFlag(false)" ng-show="boxStatus == 1 || boxStatus == 2">取消</span>
-					<span class="modal-btn cancel-modal" ng-click="setBoxStatus(1)" ng-show="boxStatus == 3 || boxStatus == 4">返回上一步</span>
+					<span class="modal-btn cancel-modal" ng-click="returnStep1()" ng-show="boxStatus == 3 || boxStatus == 4">返回上一步</span>
 					<span class="modal-btn submit-modal" ng-show="boxStatus == 3 || boxStatus == 4" ng-click="saveModal()">保存</span>
 					<span ng-class="!modalTempData.rateContent || modalTempData.rateContent == ''?'modal-btn cancel-modal':'modal-btn submit-modal'" ng-show="boxStatus == 1 || boxStatus == 2" ng-click="!modalTempData.rateContent || modalTempData.rateContent == ''?'':submitRate()">提交</span>
 				</div>