Skip to content

M
marketing
Commit b1368acb by caoyanzhi
Options

Merge branch 'feature/8月-奥莱定制' into dev 

# Conflicts:
#	dist/index.html
#	dist/static/css/main.12d11ef22aaea1a4890a3636db530bbb.css
#	dist/static/css/main.488e27612d0ea2441885f81b4bd425fd.css
#	dist/static/css/main.5653237ff7a722b06e06f2571bb47f16.css
#	dist/static/js/16.3b17d743d502b83d338f.js
#	dist/static/js/16.bea1e19a292b8b599704.js
#	dist/static/js/16.dd1cdb4b3a82c25a3526.js
#	dist/static/js/18.65f42a7dbc2b1236e85b.js
#	dist/static/js/card.4dfada83fbc79659c638.js
#	dist/static/js/ecm.641309d1a2f2fdcecdaa.js
#	dist/static/js/ecm.763c5b056cf0a48875b2.js
#	dist/static/js/ecm.ecc8d90767737556b435.js
#	dist/static/js/evaluation.0756ab734cd7ddc9e1b3.js
#	dist/static/js/evaluation.a5b854bbbee63abccbb4.js
#	dist/static/js/evaluation.d218fe24b42b81fa0acf.js
#	dist/static/js/msg.0da42538485540d84757.js
#	dist/static/js/msg.200e6bfe2fb2f86c8231.js
#	dist/static/js/msg.4ce8a21b87223c7d3c64.js
#	dist/static/js/popup.d9cfb7b96562f9ebe366.js
#	dist/static/js/signIn.d26bee1b38e9066d3bb4.js
parents f95b6aaa f753474f
Showing with 20 additions and 3 deletions
dist/index.html
<<<<<<< HEAD
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" href=./static/img/favicon.ico><title></title><link rel=stylesheet type=text/css href=static/css/common.css><link rel=stylesheet href=//at.alicdn.com/t/font_688955_2dxzdzrb3a7.css><script src=//at.alicdn.com/t/font_688955_2dxzdzrb3a7.js></script><link rel=stylesheet href=//at.alicdn.com/t/c/font_3229694_yzk6z4765g.css><script src=//at.alicdn.com/t/font_3229694_yzk6z4765g.js></script><link rel=stylesheet href=//at.alicdn.com/t/c/font_3380872_b9qubgdi1ic.css><link rel=stylesheet href=//at.alicdn.com/t/c/font_3229694_yzk6z4765g.css><script src=//at.alicdn.com/t/c/font_3229694_yzk6z4765g.js></script><link src=//at.alicdn.com/t/font_2859043_udehp133w1.css><script src=//at.alicdn.com/t/font_2859043_udehp133w1.js></script><link rel=stylesheet href=//at.alicdn.com/t/font_2996579_dv9vctk5vdt.css><script src=//at.alicdn.com/t/font_2996579_dv9vctk5vdt.js></script><link rel=stylesheet href=//at.alicdn.com/t/c/font_3380872_hsi60jw7bi7.css><script src=//at.alicdn.com/t/c/font_3380872_hsi60jw7bi7.js></script><link href=/marketing/static/css/main.12d11ef22aaea1a4890a3636db530bbb.css rel=stylesheet></head><body><div id=app><div class=el-loading-spinner style="width: 98%;"><svg viewBox="25 25 50 50" class=circular><circle cx=50 cy=50 r=20 fill=none class=path></circle></svg></div></div><script>(function() {
=======
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" href=./static/img/favicon.ico><title></title><link rel=stylesheet type=text/css href=static/css/common.css><link rel=stylesheet href=//at.alicdn.com/t/font_688955_2dxzdzrb3a7.css><script src=//at.alicdn.com/t/font_688955_2dxzdzrb3a7.js></script><link rel=stylesheet href=//at.alicdn.com/t/c/font_3380872_b9qubgdi1ic.css><link src=//at.alicdn.com/t/font_2859043_udehp133w1.css><script src=//at.alicdn.com/t/font_2859043_udehp133w1.js></script><link rel=stylesheet href=//at.alicdn.com/t/font_2996579_dv9vctk5vdt.css><script src=//at.alicdn.com/t/font_2996579_dv9vctk5vdt.js></script><link href=/marketing/static/css/main.5653237ff7a722b06e06f2571bb47f16.css rel=stylesheet></head><body><div id=app><div class=el-loading-spinner style="width: 98%;"><svg viewBox="25 25 50 50" class=circular><circle cx=50 cy=50 r=20 fill=none class=path></circle></svg></div></div><script>(function() {
>>>>>>> feature/8月-奥莱定制
var src = '/component/static/import-component.js?timestrap=' + new Date().getTime();
var host = window.location.host;
host = host.indexOf('localhost') > -1 || host.indexOf('192.168') > -1 ? 'www.gicdev.com' : host;
document.write('<script src="//' + host + src + '"><\/script>');
})();</script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script src=//web-1251519181.file.myqcloud.com/components/track.1.0.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/upload-file.1.0.10.js></script><script type=text/javascript src=/marketing/static/js/manifest.e1d3aedec778a867374b.js></script><script type=text/javascript src=/marketing/static/js/vendor.24a60bdab11def7b4f96.js></script><script type=text/javascript src=/marketing/static/js/main.f72ccc183e1f63386180.js></script></body></html>
\ No newline at end of file
<<<<<<< HEAD
})();</script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script src=//web-1251519181.file.myqcloud.com/components/track.1.0.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/upload-file.1.0.10.js></script><script type=text/javascript src=/marketing/static/js/manifest.e1d3aedec778a867374b.js></script><script type=text/javascript src=/marketing/static/js/vendor.24a60bdab11def7b4f96.js></script><script type=text/javascript src=/marketing/static/js/main.f72ccc183e1f63386180.js></script></body></html>
=======
})();</script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script src=//web-1251519181.file.myqcloud.com/components/track.1.0.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/upload-file.1.0.10.js></script><script type=text/javascript src=/marketing/static/js/manifest.48365d63ec3989114046.js></script><script type=text/javascript src=/marketing/static/js/vendor.e0ebad0c4fec1c8f90bf.js></script><script type=text/javascript src=/marketing/static/js/main.853bac7c5aa25c5ba330.js></script></body></html>
>>>>>>> feature/8月-奥莱定制
dist/static/css/main.12d11ef22aaea1a4890a3636db530bbb.css
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/main.5653237ff7a722b06e06f2571bb47f16.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/16.3b17d743d502b83d338f.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/16.dd1cdb4b3a82c25a3526.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/card.4dfada83fbc79659c638.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/ecm.641309d1a2f2fdcecdaa.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/ecm.763c5b056cf0a48875b2.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/evaluation.0756ab734cd7ddc9e1b3.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/evaluation.d218fe24b42b81fa0acf.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/game.44997340a26f1bb9598e.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.48365d63ec3989114046.js 0 → 100644
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,a,o){for(var f,d,b,i=0,u=[];i<r.length;i++)d=r[i],t[d]&&u.push(t[d][0]),t[d]=0;for(f in a)Object.prototype.hasOwnProperty.call(a,f)&&(e[f]=a[f]);for(n&&n(r,a,o);u.length;)u.shift()();if(o)for(i=0;i<o.length;i++)b=c(c.s=o[i]);return b};var r={},t={25:0};function c(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,c),t.l=!0,t.exports}c.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,c){n=t[e]=[r,c]});n[2]=r;var a=document.getElementsByTagName("head")[0],o=document.createElement("script");o.type="text/javascript",o.charset="utf-8",o.async=!0,o.timeout=12e4,c.nc&&o.setAttribute("nonce",c.nc),o.src=c.p+"static/js/"+({0:"card",1:"game",2:"wechat",3:"ecm",4:"message",5:"ewash",6:"scan",7:"recharge",8:"activity",9:"signIn",10:"evaluation",11:"cdKey",12:"popup",13:"msg",15:"calllog"}[e]||e)+"."+{0:"4dfada83fbc79659c638",1:"44997340a26f1bb9598e",2:"78a893a3285592901952",3:"763c5b056cf0a48875b2",4:"a11ede89dfa4f6dd621b",5:"feb0ffd2cfb795f0d746",6:"952dd795058a8320af99",7:"fed72fe4c42bb8d8d839",8:"442031faa4ebb0041149",9:"d26bee1b38e9066d3bb4",10:"0756ab734cd7ddc9e1b3",11:"36bc033917d312cfde67",12:"6a8939e0f905f5d7ace1",13:"200e6bfe2fb2f86c8231",14:"bbf5c3d415a5621fbc43",15:"7e607494d8968aef74ab",16:"3b17d743d502b83d338f",17:"3fcc0f820b45cd11895c",18:"65f42a7dbc2b1236e85b",19:"b8285d77cccf8c2e77b3",20:"4b7d606aea3710914c5d",21:"3b70c426e7cb5384d238",22:"67ff09408b92aef14903"}[e]+".js";var f=setTimeout(d,12e4);function d(){o.onerror=o.onload=null,clearTimeout(f);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return o.onerror=o.onload=d,a.appendChild(o),r},c.m=e,c.c=r,c.d=function(e,n,r){c.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},c.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return c.d(n,"a",n),n},c.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},c.p="/marketing/",c.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
dist/static/js/message.a11ede89dfa4f6dd621b.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/msg.200e6bfe2fb2f86c8231.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/msg.4ce8a21b87223c7d3c64.js
<<<<<<< HEAD:dist/static/js/msg.4ce8a21b87223c7d3c64.js
webpackJsonp_marketing([13],{"+66z":function(e,t){var n=Object.prototype.toString;e.exports=function(e){return n.call(e)}},"1dWh":function(e,t){var n=/\s/;e.exports=function(e){for(var t=e.length;t--&&n.test(e.charAt(t)););return t}},"1oyr":function(e,t){e.exports=function(e){return function(){return e}}},"3T7U":function(e,t){e.exports=function(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")},e.exports.__esModule=!0,e.exports.default=e.exports},"5Zxu":function(e,t,n){var i=n("sBat");e.exports=function(e){var t=i(e),n=t%1;return t==t?n?t-n:t:0}},"6MiT":function(e,t,n){var i=n("aCM0"),s=n("UnEC"),r="[object Symbol]";e.exports=function(e){return"symbol"==typeof e||s(e)&&i(e)==r}},"7UU1":function(e,t){e.exports=function(e){if(Array.isArray(e))return e},e.exports.__esModule=!0,e.exports.default=e.exports},Biqn:function(e,t,n){var i=n("fKPv");e.exports=function(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?Object(arguments[t]):{},s=Object.keys(n);"function"==typeof Object.getOwnPropertySymbols&&s.push.apply(s,Object.getOwnPropertySymbols(n).filter(function(e){return Object.getOwnPropertyDescriptor(n,e).enumerable})),s.forEach(function(t){i(e,t,n[t])})}return e},e.exports.__esModule=!0,e.exports.default=e.exports},FCnq:function(e,t){},GXH0:function(e,t,n){
=======
webpackJsonp([13],{"+66z":function(e,t){var n=Object.prototype.toString;e.exports=function(e){return n.call(e)}},"1dWh":function(e,t){var n=/\s/;e.exports=function(e){for(var t=e.length;t--&&n.test(e.charAt(t)););return t}},"1oyr":function(e,t){e.exports=function(e){return function(){return e}}},"3T7U":function(e,t){e.exports=function(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")},e.exports.__esModule=!0,e.exports.default=e.exports},"5Zxu":function(e,t,n){var i=n("sBat");e.exports=function(e){var t=i(e),n=t%1;return t==t?n?t-n:t:0}},"6MiT":function(e,t,n){var i=n("aCM0"),s=n("UnEC"),r="[object Symbol]";e.exports=function(e){return"symbol"==typeof e||s(e)&&i(e)==r}},"7UU1":function(e,t){e.exports=function(e){if(Array.isArray(e))return e},e.exports.__esModule=!0,e.exports.default=e.exports},Biqn:function(e,t,n){var i=n("fKPv");e.exports=function(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?Object(arguments[t]):{},s=Object.keys(n);"function"==typeof Object.getOwnPropertySymbols&&s.push.apply(s,Object.getOwnPropertySymbols(n).filter(function(e){return Object.getOwnPropertyDescriptor(n,e).enumerable})),s.forEach(function(t){i(e,t,n[t])})}return e},e.exports.__esModule=!0,e.exports.default=e.exports},FCnq:function(e,t){},GXH0:function(e,t,n){
>>>>>>> feature/8月-奥莱定制:dist/static/js/msg.200e6bfe2fb2f86c8231.js
/*!
* vue-treeselect v0.0.36 | (c) 2017-2018 Riophae Lee
* Released under the MIT License.
......
dist/static/js/popup.6a8939e0f905f5d7ace1.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/scan.952dd795058a8320af99.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
package.json
......@@ -33,6 +33,7 @@
"vue-qr": "^1.3.8",
"vue-router": "^3.3.4",
"vue-ueditor-wrap": "^1.3.4",
"vue-virtual-scroller": "^1.0.10",
"vue2-editor": "^2.5.0",
"vuedraggable": "^2.24.0",
"vuex": "^3.5.1"
......
src/assets/theme/index.css
......@@ -40946,7 +40946,7 @@
transform: translate3d(-50%, -50%, 0) scale(0.8); }
.el-color-picker__mask {
height: 38px;
width: 38px;
width: 60px;
border-radius: 4px;
position: absolute;
top: 1px;
src/service/api/cardApi.js
......@@ -209,3 +209,6 @@ export const addStore = params => requests(PREFIX + 'save-write-off-store', para
export const setStraff = params => requests(PREFIX + 'save-write-off-staff', params);
// 查询手机号是否重复
export const searchRePhone = params => requests(PREFIX + '', params);
export const getStoreWidgetStore = params => requests('/api-plug/get-store-widget-store', params);
export const importCostStore = params => requests('/api-marketing/import-cost-store', params, true);
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