Skip to content

S
shareConfig
Commit 8ad3b1a6 by 无尘
Options

fix: 修改bug

parent d3505ad3
Showing with 38 additions and 20 deletions
dist/index.html
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>分享有礼</title><link href=./static/css/app.1585da8c2edb53e311f318c5839c336a.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.6.6/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.33.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.03.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.29.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.14.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.38.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.11.js></script><script src=//web-1251519181.file.myqcloud.com/components/area-ab.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/selector.1.1.91.js></script><script type=text/javascript src=./static/js/manifest.806f186705095a049247.js></script><script type=text/javascript src=./static/js/vendor.8455def81090347f10ce.js></script><script type=text/javascript src=./static/js/app.26aea858da03f4acab73.js></script></body></html> <!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>分享有礼</title><link href=./static/css/app.c555e251d0b303b9aa9ecb804f1011be.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.6.6/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.33.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.03.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.29.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.14.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.38.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.11.js></script><script src=//web-1251519181.file.myqcloud.com/components/area-ab.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/selector.1.1.91.js></script><script type=text/javascript src=./static/js/manifest.29b3477ea05903df6bad.js></script><script type=text/javascript src=./static/js/vendor.8455def81090347f10ce.js></script><script type=text/javascript src=./static/js/app.628bffee7ba6830e8e1f.js></script></body></html>
\ No newline at end of file \ No newline at end of file
dist/static/js/2.b7275c090d9d42b3dcfc.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/2.f994b449949deef46bcb.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.806f186705095a049247.js → dist/static/js/manifest.29b3477ea05903df6bad.js
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,c,a){for(var f,i,u,d=0,s=[];d<r.length;d++)i=r[d],t[i]&&s.push(t[i][0]),t[i]=0;for(f in c)Object.prototype.hasOwnProperty.call(c,f)&&(e[f]=c[f]);for(n&&n(r,c,a);s.length;)s.shift()();if(a)for(d=0;d<a.length;d++)u=o(o.s=a[d]);return u};var r={},t={15:0};function o(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,o){n=t[e]=[r,o]});n[2]=r;var c=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,o.nc&&a.setAttribute("nonce",o.nc),a.src=o.p+"static/js/"+e+"."+{0:"acd984b18aa7925b3036",1:"cd8911fae63b93bb26df",2:"b7275c090d9d42b3dcfc",3:"0b835c30a0d0cbdca583",4:"4e4a73089e411fcc4956",5:"cf18de8ec97605087978",6:"a7f8a076881c826bf057",7:"d2ca391d27760dce0507",8:"6278b7fbcae037415120",9:"b3295d4914390befbf99",10:"df35ee9de62c50cdc6eb",11:"d0725b11939656aef083",12:"7213ac9b1784cc20392d"}[e]+".js";var f=setTimeout(i,12e4);function i(){a.onerror=a.onload=null,clearTimeout(f);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return a.onerror=a.onload=i,c.appendChild(a),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="./",o.oe=function(e){throw console.error(e),e}}([]); !function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,c,a){for(var f,i,u,d=0,b=[];d<r.length;d++)i=r[d],t[i]&&b.push(t[i][0]),t[i]=0;for(f in c)Object.prototype.hasOwnProperty.call(c,f)&&(e[f]=c[f]);for(n&&n(r,c,a);b.length;)b.shift()();if(a)for(d=0;d<a.length;d++)u=o(o.s=a[d]);return u};var r={},t={15:0};function o(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,o){n=t[e]=[r,o]});n[2]=r;var c=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,o.nc&&a.setAttribute("nonce",o.nc),a.src=o.p+"static/js/"+e+"."+{0:"acd984b18aa7925b3036",1:"cd8911fae63b93bb26df",2:"f994b449949deef46bcb",3:"0b835c30a0d0cbdca583",4:"4e4a73089e411fcc4956",5:"cf18de8ec97605087978",6:"a7f8a076881c826bf057",7:"d2ca391d27760dce0507",8:"6278b7fbcae037415120",9:"b3295d4914390befbf99",10:"df35ee9de62c50cdc6eb",11:"d0725b11939656aef083",12:"7213ac9b1784cc20392d"}[e]+".js";var f=setTimeout(i,12e4);function i(){a.onerror=a.onload=null,clearTimeout(f);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return a.onerror=a.onload=i,c.appendChild(a),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="./",o.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file \ No newline at end of file
package.json
...@@ -13,13 +13,14 @@ ...@@ -13,13 +13,14 @@
"version": "conventional-changelog -p angular -i changelog.md -s -r 0 && git add changelog.md" "version": "conventional-changelog -p angular -i changelog.md -s -r 0 && git add changelog.md"
}, },
"dependencies": { "dependencies": {
"@chenfengyuan/vue-qrcode": "^1.0.1",
"clipboard": "^2.0.4", "clipboard": "^2.0.4",
"echarts": "^4.4.0", "echarts": "^4.4.0",
"element-ui": "^2.12.0", "element-ui": "^2.12.0",
"file-saver": "^1.3.8", "file-saver": "^1.3.8",
"tinymce": "^4.9.6", "tinymce": "^4.9.6",
"v-charts": "^1.19.0", "v-charts": "^1.19.0",
"vue": "^2.6.10", "vue": "^2.6.11",
"vue-clipboard2": "^0.2.1", "vue-clipboard2": "^0.2.1",
"vue-loader": "^13.7.3", "vue-loader": "^13.7.3",
"vue-qr": "^2.2.1", "vue-qr": "^2.2.1",
...@@ -80,7 +81,7 @@ ...@@ -80,7 +81,7 @@
"vue-axios": "^2.1.1", "vue-axios": "^2.1.1",
"vue-loader": "^13.3.0", "vue-loader": "^13.3.0",
"vue-style-loader": "^3.0.1", "vue-style-loader": "^3.0.1",
"vue-template-compiler": "^2.6.10", "vue-template-compiler": "^2.6.11",
"vuedraggable": "^2.16.0", "vuedraggable": "^2.16.0",
"vuex": "^3.0.1", "vuex": "^3.0.1",
"webpack": "^3.6.0", "webpack": "^3.6.0",
......
src/components/active-config/poster-config.vue
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2019-11-18 10:37:02 * @Date: 2019-11-18 10:37:02
* @LastEditors: 无尘 * @LastEditors: 无尘
* @LastEditTime: 2019-12-15 14:39:32 * @LastEditTime: 2019-12-18 16:42:33
--> -->
<!-- <!--
<poster-config @submitBack="submitBack" @submitNext="submitNext"></poster-config> <poster-config @submitBack="submitBack" @submitNext="submitNext"></poster-config>
...@@ -126,11 +126,11 @@ import posterConfig from '@/components/active-config/poster-config.vue'; ...@@ -126,11 +126,11 @@ import posterConfig from '@/components/active-config/poster-config.vue';
<span class="color-wrap flex flex-pack-center flex-space-between border-box">前景色<el-color-picker <span class="color-wrap flex flex-pack-center flex-space-between border-box">前景色<el-color-picker
v-model="activeInfoData.qrcodeFrontColor" v-model="activeInfoData.qrcodeFrontColor"
:disabled="$route.query.editFlag" :disabled="$route.query.editFlag"
@change="changeFront" @change="changeQrcode"
></el-color-picker></span><span class="color-wrap flex flex-space-between flex-pack-center border-box">背景色<el-color-picker ></el-color-picker></span><span class="color-wrap flex flex-space-between flex-pack-center border-box">背景色<el-color-picker
v-model="activeInfoData.qrcodeBackColor" v-model="activeInfoData.qrcodeBackColor"
:disabled="$route.query.editFlag" :disabled="$route.query.editFlag"
@change="changeBg" @change="changeQrcode"
></el-color-picker></span> ></el-color-picker></span>
<span class="font-14 color-606266 p-l-20">内边距</span> <span class="font-14 color-606266 p-l-20">内边距</span>
<el-input-number <el-input-number
...@@ -138,7 +138,7 @@ import posterConfig from '@/components/active-config/poster-config.vue'; ...@@ -138,7 +138,7 @@ import posterConfig from '@/components/active-config/poster-config.vue';
class="w-90 m-l-20" class="w-90 m-l-20"
v-model="activeInfoData.qrcodePadding" v-model="activeInfoData.qrcodePadding"
controls-position="right" controls-position="right"
@change="changePadding" @change="changeQrcode"
:step="1" :step="1"
:step-strictly="true" :step-strictly="true"
:min="1" :min="1"
...@@ -167,7 +167,7 @@ import posterConfig from '@/components/active-config/poster-config.vue'; ...@@ -167,7 +167,7 @@ import posterConfig from '@/components/active-config/poster-config.vue';
<ul> <ul>
<li :class="['border-box', activeInfoData.templateType == 1 ? 'text-center':'', activeInfoData.templateType == 2 ? 'flex flex-align-center flex-pack-center' : activeInfoData.templateType == 3 ? 'flex flex-align-end flex-pack-center' : activeInfoData.templateType == 4 ? 'flex flex-align-end flex-pack-end li-50' : '']"> <li :class="['border-box', activeInfoData.templateType == 1 ? 'text-center':'', activeInfoData.templateType == 2 ? 'flex flex-align-center flex-pack-center' : activeInfoData.templateType == 3 ? 'flex flex-align-end flex-pack-center' : activeInfoData.templateType == 4 ? 'flex flex-align-end flex-pack-end li-50' : '']">
<!-- <img src="../../assets/images/templete-null.png" alt="" /> --> <!-- <img src="../../assets/images/templete-null.png" alt="" /> -->
<vue-qr <!-- <vue-qr
text="123456" text="123456"
:margin="activeInfoData.qrcodePadding" :margin="activeInfoData.qrcodePadding"
:correctLevel="3" :correctLevel="3"
...@@ -176,7 +176,11 @@ import posterConfig from '@/components/active-config/poster-config.vue'; ...@@ -176,7 +176,11 @@ import posterConfig from '@/components/active-config/poster-config.vue';
:backgroundColor="activeInfoData.qrcodeBackColor" :backgroundColor="activeInfoData.qrcodeBackColor"
:logoSrc="''" :logoSrc="''"
:size="100" :size="100"
></vue-qr> ></vue-qr> -->
<qrcode
value="123456"
:options="qrcodeOption"
></qrcode>
</li> </li>
</ul> </ul>
</div> </div>
...@@ -186,7 +190,8 @@ import posterConfig from '@/components/active-config/poster-config.vue'; ...@@ -186,7 +190,8 @@ import posterConfig from '@/components/active-config/poster-config.vue';
</template> </template>
<script> <script>
import postUpload from '@/components/post-upload.vue'; import postUpload from '@/components/post-upload.vue';
import VueQr from 'vue-qr'; // import VueQr from 'vue-qr';
import VueQrcode from '@chenfengyuan/vue-qrcode';
// import showMsg from '@/common/js/showmsg'; // import showMsg from '@/common/js/showmsg';
import errMsg from '@/common/js/error'; import errMsg from '@/common/js/error';
import { _debounce } from '@/common/js/public'; import { _debounce } from '@/common/js/public';
...@@ -196,7 +201,8 @@ export default { ...@@ -196,7 +201,8 @@ export default {
props: {}, props: {},
components: { components: {
postUpload, postUpload,
VueQr // VueQr
qrcode: VueQrcode
}, },
data() { data() {
return { return {
...@@ -210,10 +216,22 @@ export default { ...@@ -210,10 +216,22 @@ export default {
}, },
rules: { rules: {
playBillUrl: [{ required: true, message: '请上传海报图片', trigger: 'blur' }] playBillUrl: [{ required: true, message: '请上传海报图片', trigger: 'blur' }]
} },
qrcodeOption: { width: 100, margin: 0.5, color: { dark: '#000000',light: '#ffffff' }}
}; };
}, },
methods: { methods: {
changeQrcode() {
const that = this;
that.qrcodeOption = {
width: 100,
margin: that.activeInfoData.qrcodePadding/2,
color: {
dark: that.activeInfoData.qrcodeFrontColor,
light: that.activeInfoData.qrcodeBackColor
}
}
},
/** /**
* 选择模板 * 选择模板
*/ */
......
src/main.js
...@@ -4,16 +4,14 @@ ...@@ -4,16 +4,14 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2019-11-12 10:18:29 * @Date: 2019-11-12 10:18:29
* @LastEditors: 无尘 * @LastEditors: 无尘
* @LastEditTime: 2019-12-03 18:20:07 * @LastEditTime: 2019-12-18 16:28:42
*/ */
import promise from 'es6-promise'; import promise from 'es6-promise';
promise.polyfill(); promise.polyfill();
// import Vue from 'vue'; // import Vue from 'vue';
import App from './App'; import App from './App';
import router from './router'; import router from './router';
import { import { Message } from 'element-ui';
Message
} from 'element-ui';
import VueAxios from 'vue-axios'; import VueAxios from 'vue-axios';
import axios from 'axios'; import axios from 'axios';
import store from './store/store'; import store from './store/store';
...@@ -45,7 +43,8 @@ Vue.axios.interceptors.request.use( ...@@ -45,7 +43,8 @@ Vue.axios.interceptors.request.use(
); );
Vue.axios.interceptors.response.use( Vue.axios.interceptors.response.use(
response => { response => {
if (response.status == 200 && response.data.errorCode == 1) {} if (response.status == 200 && response.data.errorCode == 1) {
}
return response; return response;
}, },
error => { error => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment