许成详 6 years ago
parent
commit
437d1d36a1

+ 1
- 1
dist/index.html View File

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
       if (this.postData.IsInternalDefault) {
817
       if (this.postData.IsInternalDefault) {
818
         var bool = true
818
         var bool = true
819
         for (var a = 0; a < this.postData.Prizes.length; a++) {
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
             bool = false
821
             bool = false
822
           }
822
           }
823
         }
823
         }
846
         }
846
         }
847
       }
847
       }
848
       for (var a = 0; a < this.postData.Prizes.length; a++) {
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
           delete this.postData.Prizes[a].VerificationStart
857
           delete this.postData.Prizes[a].VerificationStart
851
           delete this.postData.Prizes[a].VerificationEnd
858
           delete this.postData.Prizes[a].VerificationEnd
852
-        } else {
853
           delete this.postData.Prizes[a].ValidDays
859
           delete this.postData.Prizes[a].ValidDays
854
         }
860
         }
855
       }
861
       }
1044
       } else {
1050
       } else {
1045
         this.postData.Prizes.push({ ...this.addPrizeInfo, Defaults: [] })
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
       this.closeAddPrize()
1053
       this.closeAddPrize()
1056
       this.prizeTypeChange()
1054
       this.prizeTypeChange()
1057
       // console.log(JSON.stringify(this.postData.Prizes))
1055
       // console.log(JSON.stringify(this.postData.Prizes))

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

286
         })
286
         })
287
         return false
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
         this.$message({
290
         this.$message({
291
           type: 'error',
291
           type: 'error',
292
-          message: '活动名额不能为空'
292
+          message: '活动名额须为大于0正整数'
293
         })
293
         })
294
         return false
294
         return false
295
       }
295
       }