SpaceOfCheng
/
admin
Watch 3
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 2 Activity
Browse Source

xcx

许成详 6 years ago
parent
cf388ef90a
commit
437d1d36a1
3 changed files with 12 additions and 14 deletions
Split View Show Diff Stats
  1. 1
    1
      dist/index.html
  2. 9
    11
      src/pages/system/marketingActivities/listOfLotteryActivities/edit.vue
  3. 2
    2
      src/pages/system/marketingActivities/snapUpList/edit.vue

+ 1
- 1
dist/index.html View File 

@@ -1 +1 @@
1 
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet href=//at.alicdn.com/t/font_775069_dwqa9wy3lkh.css><link rel="shortcut icon" href=favorite.ico><title>城的空间后台管理系统</title><link href=./static/css/app.7ae662357ff8bb56a7307deb096d3262.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.3c9a16350e1e47228e4f.js></script><script type=text/javascript src=./static/js/app.0218d1b19ea99df78e77.js></script></body></html>
1 
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet href=//at.alicdn.com/t/font_775069_dwqa9wy3lkh.css><link rel="shortcut icon" href=favorite.ico><title>城的空间后台管理系统</title><link href=./static/css/app.dfa2b32e7157d9e9486ed21f5c5323e4.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.3c9a16350e1e47228e4f.js></script><script type=text/javascript src=./static/js/app.0ca2d6b1edbec6107881.js></script></body></html>

+ 9
- 11
src/pages/system/marketingActivities/listOfLotteryActivities/edit.vue View File 

@@ -817,7 +817,7 @@ export default {
817 817 
       if (this.postData.IsInternalDefault) {
818 818 
         var bool = true
819 819 
         for (var a = 0; a < this.postData.Prizes.length; a++) {
820 
-          if (this.postData.Prizes[a].Defaults.length) {
820 
+          if (this.postData.Prizes[a].Defaults && this.postData.Prizes[a].Defaults.length) {
821 821 
             bool = false
822 822 
           }
823 823 
         }
 
@@ -846,10 +846,16 @@ export default {
846 846 
         }
847 847 
       }
848 848 
       for (var a = 0; a < this.postData.Prizes.length; a++) {
849 
-        if (this.postData.Prizes[a].VerificationStart === '') {
849 
+        if (this.postData.Prizes[a].IsReality) {
850 
+          if (this.postData.Prizes[a].VerificationStart === '') {
851 
+            delete this.postData.Prizes[a].VerificationStart
852 
+            delete this.postData.Prizes[a].VerificationEnd
853 
+          } else {
854 
+            delete this.postData.Prizes[a].ValidDays
855 
+          }
856 
+        } else {
850 857 
           delete this.postData.Prizes[a].VerificationStart
851 858 
           delete this.postData.Prizes[a].VerificationEnd
852 
-        } else {
853 859 
           delete this.postData.Prizes[a].ValidDays
854 860 
         }
855 861 
       }
 
@@ -1044,14 +1050,6 @@ export default {
1044 1050 
       } else {
1045 1051 
         this.postData.Prizes.push({ ...this.addPrizeInfo, Defaults: [] })
1046 1052 
       }
1047 
-      // for (var n = 0; n < this.postData.Prizes.length; n++) {
1048 
-      //   if (this.postData.Prizes[n].VerificationStart === '') {
1049 
-      //     delete this.postData.Prizes[n].VerificationStart
1050 
-      //     delete this.postData.Prizes[n].VerificationEnd
1051 
-      //   } else {
1052 
-      //     delete this.postData.Prizes[n].ValidDays
1053 
-      //   }
1054 
-      // }
1055 1053 
       this.closeAddPrize()
1056 1054 
       this.prizeTypeChange()
1057 1055 
       // console.log(JSON.stringify(this.postData.Prizes))

+ 2
- 2
src/pages/system/marketingActivities/snapUpList/edit.vue View File 

@@ -286,10 +286,10 @@ export default {
286 286 
         })
287 287 
         return false
288 288 
       }
289 
-      if (this.postData.FlashBuyMaxAttendant === '') {
289 
+      if (this.postData.FlashBuyMaxAttendant === '' || this.postData.FlashBuyMaxAttendant - 0 <= 0 || (this.postData.FlashBuyMaxAttendant - 0) % 1 !== 0) {
290 290 
         this.$message({
291 291 
           type: 'error',
292 
-          message: '活动名额不能为空'
292 
+          message: '活动名额须为大于0正整数'
293 293 
         })
294 294 
         return false
295 295 
       }