SpaceOfCheng
/
admin
Наблюдаван 3
Харесван 0
Разклонения 0
Код Задачи 0 Заявки за сливане 0 Версии 2 Activity
Преглед на файлове

xcx

许成详 преди 6 години
родител
11cf976e78
ревизия
2caae34ceb
променени са 7 файла, в които са добавени 35 реда и са изтрити 8 реда
Разделен изглед Покажи статистика за разликите
  1. 1
    1
      dist/index.html
  2. 15
    4
      package-lock.json
  3. 2
    0
      package.json
  4. 14
    0
      src/pages/system/marketingActivities/listOfLotteryActivities/edit.vue
  5. 1
    1
      src/pages/system/marketingActivities/listOfLotteryActivities/page.scss
  6. 1
    1
      src/pages/system/marketingActivities/snapUpList/page.scss
  7. 1
    1
      src/util/ajax.js

+ 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.ee89fb0019a07dfb9399a5a73bab0752.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.bb25f2ba0fa9270e8761.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.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>

+ 15
- 4
package-lock.json Целия файл 

@@ -7070,7 +7070,6 @@
7070 7070 
       "version": "2.2.4",
7071 7071 
       "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
7072 7072 
       "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
7073 
-      "dev": true,
7074 7073 
       "requires": {
7075 7074 
         "loose-envify": "1.4.0"
7076 7075 
       }
 
@@ -8382,8 +8381,7 @@
8382 8381 
     "js-tokens": {
8383 8382 
       "version": "3.0.2",
8384 8383 
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
8385 
-      "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
8386 
-      "dev": true
8384 
+      "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls="
8387 8385 
     },
8388 8386 
     "js-yaml": {
8389 8387 
       "version": "3.7.0",
 
@@ -8937,7 +8935,6 @@
8937 8935 
       "version": "1.4.0",
8938 8936 
       "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
8939 8937 
       "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
8940 
-      "dev": true,
8941 8938 
       "requires": {
8942 8939 
         "js-tokens": "3.0.2"
8943 8940 
       }
 
@@ -12797,6 +12794,20 @@
12797 12794 
         "fast-diff": "1.1.2"
12798 12795 
       }
12799 12796 
     },
12797 
+    "quill-image-extend-module": {
12798 
+      "version": "1.1.2",
12799 
+      "resolved": "https://registry.npmjs.org/quill-image-extend-module/-/quill-image-extend-module-1.1.2.tgz",
12800 
+      "integrity": "sha512-yHJWZWlTjNZzV34zuT4H55ttDwMxmVJ7JUgKnt/Wd3ejUNcaPOV57/sKG8VEMU5mL7bKZPIKmBdb3weM0M5UeA==",
12801 
+      "dev": true
12802 
+    },
12803 
+    "quill-plugin-image": {
12804 
+      "version": "0.0.6",
12805 
+      "resolved": "https://registry.npmjs.org/quill-plugin-image/-/quill-plugin-image-0.0.6.tgz",
12806 
+      "integrity": "sha512-SfjJZLik06fkHZE2aJ9bpYibUotOlHKboeNa/2uGD6YUdw4eGkZnqfdMRvFm3sq0BILO5J7HCIOIzIdBHKgj8g==",
12807 
+      "requires": {
12808 
+        "invariant": "2.2.4"
12809 
+      }
12810 
+    },
12800 12811 
     "randomatic": {
12801 12812 
       "version": "3.0.0",
12802 12813 
       "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.0.0.tgz",

+ 2
- 0
package.json Целия файл 

@@ -22,6 +22,7 @@
22 22 
     "g2-vue": "^1.0.1",
23 23 
     "js-base64": "^2.4.8",
24 24 
     "js-md5": "^0.7.3",
25 
+    "quill-plugin-image": "0.0.6",
25 26 
     "vue": "^2.5.2",
26 27 
     "vue-amap": "^0.5.8",
27 28 
     "vue-cookie": "^1.1.4",
 
@@ -80,6 +81,7 @@
80 81 
     "postcss-import": "^11.0.0",
81 82 
     "postcss-loader": "^2.0.8",
82 83 
     "postcss-url": "^7.2.1",
84 
+    "quill-image-extend-module": "^1.1.2",
83 85 
     "rimraf": "^2.6.0",
84 86 
     "sass-loader": "^7.1.0",
85 87 
     "sass-resources-loader": "^1.3.3",

+ 14
- 0
src/pages/system/marketingActivities/listOfLotteryActivities/edit.vue Целия файл 

@@ -548,11 +548,13 @@
548 548 
       <div style="text-align:center;padding-bottom:20px;">
549 549 
       </div>
550 550 
     </el-dialog>
551 
+    <div id="hiddenRule" style="display:none;"></div>
551 552 
   </div>
552 553 
 </template>
553 554 
 <script>
554 555 
 import { mapState, createNamespacedHelpers } from 'vuex'
555 556 
 import { quillEditor } from 'vue-quill-editor'
557 
+import uploadImage from 'quill-plugin-image'
556 558 
 const { mapState: mapActivityLuckDrawState, mapActions: mapActivityLuckDrawActions } = createNamespacedHelpers('activityLuckDraw')
557 559 
 const { mapActions: mapCardActions } = createNamespacedHelpers('card')
558 560 
 const { mapActions: mapCouponActions } = createNamespacedHelpers('coupon')
 
@@ -655,6 +657,15 @@ export default {
655 657 
   components: {
656 658 
     quillEditor,
657 659 
   },
660 
+  mounted () {
661 
+    uploadImage(this.$refs.myQuillEditor.quill, file => {
662 
+      console.log(file)
663 
+      return this.toolClass.upload(file).then(data => {
664 
+        const url = data.result.url
665 
+        return { src: url, alt: '' }
666 
+      })
667 
+    })
668 
+  },
658 669 
   created () {
659 670 
     if (this.$route.query.isread) {
660 671 
       this.isread = true
 
@@ -848,6 +859,9 @@ export default {
848 859 
       this.$router.push({ name: 'listOfLotteryActivities' })
849 860 
     },
850 861 
     submitLuckdrawData () { // 提交活动信息
862 
+      // document.getElementById('hiddenRule').innerHTML = this.postData.LuckdrawRule
863 
+      // var imgArr = document.getElementById('hiddenRule').getElementsByTagName('img')
864 
+      // console.log(imgArr)
851 865 
       if (!this.checkData()) {
852 866 
         return false
853 867 
       }

+ 1
- 1
src/pages/system/marketingActivities/listOfLotteryActivities/page.scss Целия файл 

@@ -2,7 +2,7 @@
2 2 
   .img{
3 3 
     width: 300px;
4 4 
     position: relative;
5 
-    overflow: hidden;
5 
+    overflow: auto;
6 6 
     margin: 20px;
7 7 
     margin-right: 0;
8 8 
     img{

+ 1
- 1
src/pages/system/marketingActivities/snapUpList/page.scss Целия файл 

@@ -2,7 +2,7 @@
2 2 
   .img{
3 3 
     width: 300px;
4 4 
     position: relative;
5 
-    overflow: hidden;
5 
+    overflow: auto;
6 6 
     margin: 20px;
7 7 
     margin-right: 0;
8 8 
     img{

+ 1
- 1
src/util/ajax.js Целия файл 

@@ -3,7 +3,7 @@ import qs from 'qs'
3 3 
 import router from '../router'
4 4 
 import { Message } from 'element-ui'
5 5
6 
-const token = function (headers) {
6 
+export function token (headers) {
7 7 
   let JWT
8 8 
   if (headers) {
9 9 
     localStorage.setItem('JWT', headers.authorization)