SpaceOfCheng
/
admin
關註 3
收藏 0
複製 0
程式碼 問題管理 0 合併請求 0 版本發佈 2 Activity
瀏覽代碼

xcx

许成详 6 年之前
父節點
2caae34ceb
當前提交
e3b235afed
共有 8 個文件被更改，包括 40 次插入 和 13 次删除
分割檢視 顯示文件統計
  1. 二進制
      dist.zip
  2. 1
    1
      dist/index.html
  3. 4
    3
      src/pages/system/marketingActivities/activitiesList/index.vue
  4. 16
    8
      src/pages/system/marketingActivities/listOfLotteryActivities/edit.vue
  5. 9
    0
      src/pages/system/marketingActivities/snapUpList/edit.vue
  6. 6
    0
      src/pages/system/systemSet/userManager/index.vue
  7. 3
    1
      src/style/main.css
  8. 1
    0
      src/util/upload.js

二進制
dist.zip 查看文件


+ 1
- 1
dist/index.html 查看文件 

@@ -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.520a7975546ce28e530f07350d9b65f3.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.7400171cad4647bc1f4a.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.8fc51a49b7ed146b2f686bba25437f3d.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.71fd787520fc12b02935.js></script><script type=text/javascript src=./static/js/app.c65c61dbc6d215198c13.js></script></body></html>

+ 4
- 3
src/pages/system/marketingActivities/activitiesList/index.vue 查看文件 

@@ -152,6 +152,7 @@ export default {
152 152 
       if (desc === '') {
153 153 
         return 0
154 154 
       }
155 
+      desc = desc.replace(/\n/g, '')
155 156 
       const descjson = JSON.parse(desc)
156 157 
       return descjson.giftNum
157 158 
     },
 
@@ -162,11 +163,11 @@ export default {
162 163 
       return '未知'
163 164 
     },
164 165 
     getGiftLabel (desc) {
165 
-      if (desc === '') {
166 
+      if (desc === '' || desc === null) {
166 167 
         return '未知卡券'
167 168 
       }
168 
-      const descjson = JSON.parse(desc)
169 
-      return descjson.giftLabel
169 
+      desc = desc.replace(/\n/g, '')
170 
+      return JSON.parse(desc).giftLabel
170 171 
     },
171 172 
     handleSizeChange (val) {
172 173 
       // console.log(`每页 ${val} 条`)

+ 16
- 8
src/pages/system/marketingActivities/listOfLotteryActivities/edit.vue 查看文件 

@@ -453,7 +453,7 @@
453 453 
                 <div style="display: inline-block;">
454 454 
                   <el-date-picker
455 455 
                     :disabled="!editAll || isread"
456 
-                    value-format="yyyy-MM-ddT00:00:00+08:00"
456 
+                    value-format="yyyy-MM-ddT23:59:59+08:00"
457 457 
                     v-model="addPrizeInfo.VerificationEnd"
458 458 
                     type="date"
459 459 
                     placeholder="选择截止日期">
 
@@ -659,8 +659,7 @@ export default {
659 659 
   },
660 660 
   mounted () {
661 661 
     uploadImage(this.$refs.myQuillEditor.quill, file => {
662 
-      console.log(file)
663 
-      return this.toolClass.upload(file).then(data => {
662 
+      return this.toolClass.upload({ file }).then(data => {
664 663 
         const url = data.result.url
665 664 
         return { src: url, alt: '' }
666 665 
       })
 
@@ -876,12 +875,13 @@ export default {
876 875 
         }
877 876 
         for (var a = 0; a < this.postData.Prizes.length; a++) {
878 877 
           if (this.postData.Prizes[a].IsReality) {
879 
-            if (this.postData.Prizes[a].VerificationStart === '') {
878 
+            if (this.postData.Prizes[a].ValidDays === '') {
879 
+              delete this.postData.Prizes[a].ValidDays
880 
+            }
881 
+            if (this.postData.Prizes[a].VerificationStart === '' || this.postData.Prizes[a].VerificationEnd === '') {
880 882 
               delete this.postData.Prizes[a].VerificationStart
881 883 
               delete this.postData.Prizes[a].VerificationEnd
882 884 
               this.postData.Prizes[a].ValidDays = this.postData.Prizes[a].ValidDays - 0
883 
-            } else {
884 
-              delete this.postData.Prizes[a].ValidDays
885 885 
             }
886 886 
           } else {
887 887 
             delete this.postData.Prizes[a].VerificationStart
 
@@ -922,8 +922,16 @@ export default {
922 922 
       this.addPhoneTableData.splice(index, 1)
923 923 
       this.postData.Prizes[this.editPrizePhoneIndex].Defaults.splice(index, 1)
924 924 
     },
925 
+    findSamePhone (num) { // 验重手机号
926 
+      for (var n = 0; n < this.addPhoneTableData.length; n++) {
927 
+        if (this.addPhoneTableData[n].Tel === num) {
928 
+          return false
929 
+        }
930 
+      }
931 
+      return true
932 
+    },
925 933 
     addPhoneInPrize () { // 添加内定奖品手机号
926 
-      if (this.checkPhone(this.addPhoneNum) && this.addPhoneNum !== '') {
934 
+      if (this.checkPhone(this.addPhoneNum) && this.addPhoneNum !== '' && this.findSamePhone(this.addPhoneNum)) {
927 935 
         this.addPhoneTableData.push({
928 936 
           Tel: this.addPhoneNum,
929 937 
         })
 
@@ -1048,7 +1056,7 @@ export default {
1048 1056 
           return false
1049 1057 
         }
1050 1058 
         if (this.verificationType === 1 && this.addPrizeInfo.IsReality) {
1051 
-          if (this.addPrizeInfo.ValidDays === '' || (this.addPrizeInfo.ValidDays - 0) % 1 !== 0 || (this.addPrizeInfo.ValidDays - 0) <= 0) {
1059 
+          if (!this.addPrizeInfo.ValidDays || (this.addPrizeInfo.ValidDays - 0) % 1 !== 0 || (this.addPrizeInfo.ValidDays - 0) <= 0) {
1052 1060 
             this.$message({
1053 1061 
               type: 'error',
1054 1062 
               message: '有效期须为大于0正整数'

+ 9
- 0
src/pages/system/marketingActivities/snapUpList/edit.vue 查看文件 

@@ -162,6 +162,7 @@
162 162 
 </template>
163 163 
 <script>
164 164 
 import { quillEditor } from 'vue-quill-editor'
165 
+import uploadImage from 'quill-plugin-image'
165 166 
 import { mapState, createNamespacedHelpers } from 'vuex'
166 167 
 const { mapActions: mapActivityFlashbuyActions } = createNamespacedHelpers('activityFlashbuy')
167 168 
 export default {
 
@@ -207,6 +208,14 @@ export default {
207 208 
       }
208 209 
     }
209 210 
   },
211 
+  mounted () {
212 
+    uploadImage(this.$refs.myQuillEditor.quill, file => {
213 
+      return this.toolClass.upload({ file }).then(data => {
214 
+        const url = data.result.url
215 
+        return { src: url, alt: '' }
216 
+      })
217 
+    })
218 
+  },
210 219 
   created () {
211 220 
     if (this.$route.query.isread) {
212 221 
       this.isread = true

+ 6
- 0
src/pages/system/systemSet/userManager/index.vue 查看文件 

@@ -57,6 +57,12 @@
57 57 
         :data="currentList"
58 58 
         stripe
59 59 
         style="width: 100%">
60 
+        <el-table-column
61 
+          fixed
62 
+          prop="CaseName"
63 
+          label="案场"
64 
+          width="150">
65 
+        </el-table-column>
60 66 
         <el-table-column
61 67 
           fixed
62 68 
           prop="UserName"

+ 3
- 1
src/style/main.css 查看文件 

@@ -414,7 +414,9 @@ select:focus {
414 414 
   color: red;
415 415 
 }
416 416
417 
-
417 
+.ql-editor p{
418 
+  min-height: 200px;
419 
+}
418 420
419 421
420 422

+ 1
- 0
src/util/upload.js 查看文件 

@@ -2,6 +2,7 @@ import api from './api'
2 2 
 import ajax from './ajax'
3 3
4 4 
 export default function upload (file) {
5 
+  console.log(file)
5 6 
   return new Promise((resolve, reject) => {
6 7 
     ajax({
7 8 
       ...api.file.image,