Skip to content

M
member
Commit 6ebd5403 by caoyanzhi
Options

Merge branch 'master' into dev 

# Conflicts:
#	dist/index.html
#	dist/static/js/6.f58f1e50684eefedb5d2.js
#	index.html
parents 8c67f967 c279e80c
Showing with 18 additions and 5 deletions
dist/index.html
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./static/img/favicon.ico><script src=//web-1251519181.cos.ap-shanghai.myqcloud.com/lib/vue/2.5.5/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/lodash.min.js></script><title>memberproject</title><link href=./static/css/app.2fefbbffa1f2d6fd0880dab9e8219ac4.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.cos.ap-shanghai.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.cos.ap-shanghai.myqcloud.com/components/header.2.0.20.js></script><script src=//web-1251519181.cos.ap-shanghai.myqcloud.com/components/people.2.0.31.js></script><script src=//web-1251519181.cos.ap-shanghai.myqcloud.com/components/aside-menu.2.0.05.js></script><script src=//web-1251519181.cos.ap-shanghai.myqcloud.com/components/footer.2.0.02.js></script><script src=//web-1251519181.cos.ap-shanghai.myqcloud.com/components/store.2.0.00.js></script><script src=//web-1251519181.cos.ap-shanghai.myqcloud.com/components/card.2.0.01.js></script><script src=//web-1251519181.cos.ap-shanghai.myqcloud.com/components/selector.1.1.33.js></script><script src=//web-1251519181.file.myqcloud.com/components/space.2.0.02.js></script><script type=text/javascript src=./static/js/manifest.72cd4bce979019011ab8.js></script><script type=text/javascript src=./static/js/vendor.f8094a2c76c92905e576.js></script><script type=text/javascript src=./static/js/app.25d562f8ddce0f24c9c7.js></script></body></html>
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./static/img/favicon.ico><script src=//web-1251519181.cos.ap-shanghai.myqcloud.com/lib/vue/2.5.5/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/lodash.min.js></script><title>memberproject</title><link href=./static/css/app.67f96b5b3af52ac41488f616e49150a9.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.cos.ap-shanghai.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.cos.ap-shanghai.myqcloud.com/components/header.2.0.22.js></script><script src=//web-1251519181.cos.ap-shanghai.myqcloud.com/components/people.2.0.31.js></script><script src=//web-1251519181.cos.ap-shanghai.myqcloud.com/components/aside-menu.2.0.05.js></script><script src=//web-1251519181.cos.ap-shanghai.myqcloud.com/components/footer.2.0.02.js></script><script src=//web-1251519181.cos.ap-shanghai.myqcloud.com/components/store.2.0.00.js></script><script src=//web-1251519181.cos.ap-shanghai.myqcloud.com/components/card.2.0.02.js></script><script src=//web-1251519181.cos.ap-shanghai.myqcloud.com/components/selector.1.1.33.js></script><script src=//web-1251519181.file.myqcloud.com/components/space.2.0.02.js></script><script type=text/javascript src=./static/js/manifest.16e1d7967b1af784955b.js></script><script type=text/javascript src=./static/js/vendor.026489098e988d3da7ca.js></script><script type=text/javascript src=./static/js/app.ddb4fee07c4ec0c5d88c.js></script></body></html>
\ No newline at end of file
dist/static/js/manifest.16e1d7967b1af784955b.js 0 → 100644
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,r,t){for(var d,o,b,i=0,u=[];i<a.length;i++)o=a[i],f[o]&&u.push(f[o][0]),f[o]=0;for(d in r)Object.prototype.hasOwnProperty.call(r,d)&&(e[d]=r[d]);for(c&&c(a,r,t);u.length;)u.shift()();if(t)for(i=0;i<t.length;i++)b=n(n.s=t[i]);return b};var a={},f={39:0};function n(c){if(a[c])return a[c].exports;var f=a[c]={i:c,l:!1,exports:{}};return e[c].call(f.exports,f,f.exports,n),f.l=!0,f.exports}n.e=function(e){var c=f[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,n){c=f[e]=[a,n]});c[2]=a;var r=document.getElementsByTagName("head")[0],t=document.createElement("script");t.type="text/javascript",t.charset="utf-8",t.async=!0,t.timeout=12e4,n.nc&&t.setAttribute("nonce",n.nc),t.src=n.p+"static/js/"+e+"."+{0:"2cfae686dc73b70f8cf2",1:"b425b5fcf968b1d75642",2:"d8c5dcbf3e9efdb187c7",3:"3098b66e52f1e38e92a8",4:"5da1601958f4eca41c01",5:"81a74adb7ffb08d48458",6:"5b9ae112837884ee6e32",7:"1fc8ea489b64c951ffd3",8:"d7183a464719000779e7",9:"faebd09f05068f2097e5",10:"a36cda0ecd1ef7931925",11:"39cd90bfb2a31a7f5983",12:"25f72d053867cf563dae",13:"b39d13281afce32aa884",14:"ad85e057a43f662343c8",15:"48cb116b1c8ec0652350",16:"dca6caf90d8f1ee04f3a",17:"17784797287c3a959c07",18:"9fd534e8bf4dd5b8c5af",19:"3fcad0158af685c50488",20:"0bed539c016fe5ec0c87",21:"d3703b59790fbeebac0c",22:"36ff05d1e5a02db1f13b",23:"3b3044f9a1d312087ee1",24:"4d7af7897480384ddf20",25:"9e1262c9afe9e3254e19",26:"7a21eb4d5ed5a84db02b",27:"9aa2448d0b2838abeee8",28:"ee5aadf86d94e8e1c21b",29:"704f26e2801f48fde832",30:"1dc5b5848ad8bff185fc",31:"cdc7cb45e9d71d03b029",32:"2fc84d3eacba0d398383",33:"67778cccc6b1b8ac6469",34:"c244c8063096e0d1a828",35:"19f6863979247acbd6a6",36:"ceef22981a897f3d62bb"}[e]+".js";var d=setTimeout(o,12e4);function o(){t.onerror=t.onload=null,clearTimeout(d);var c=f[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return t.onerror=t.onload=o,r.appendChild(t),a},n.m=e,n.c=a,n.d=function(e,c,a){n.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},n.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(c,"a",c),c},n.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},n.p="./",n.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
index.html
......@@ -14,12 +14,12 @@
<div id="app"></div>
<!-- built files will be auto injected -->
<script src="//web-1251519181.cos.ap-shanghai.myqcloud.com/lib/elementUI/index.2.5.4.js"></script>
<script src="//web-1251519181.cos.ap-shanghai.myqcloud.com/components/header.2.0.20.js"></script>
<script src="//web-1251519181.cos.ap-shanghai.myqcloud.com/components/header.2.0.22.js"></script>
<script src="//web-1251519181.cos.ap-shanghai.myqcloud.com/components/people.2.0.31.js"></script>
<script src="//web-1251519181.cos.ap-shanghai.myqcloud.com/components/aside-menu.2.0.05.js"></script>
<script src="//web-1251519181.cos.ap-shanghai.myqcloud.com/components/footer.2.0.02.js"></script>
<script src="//web-1251519181.cos.ap-shanghai.myqcloud.com/components/store.2.0.00.js"></script>
<script src="//web-1251519181.cos.ap-shanghai.myqcloud.com/components/card.2.0.01.js"></script>
<script src="//web-1251519181.cos.ap-shanghai.myqcloud.com/components/card.2.0.02.js"></script>
<script src="//web-1251519181.cos.ap-shanghai.myqcloud.com/components/selector.1.1.33.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/space.2.0.02.js"></script>
</body>
......
src/components/posmembers/posmembers.js
......@@ -823,12 +823,14 @@ export default {
if (this.$refs.IntegralForm) {
this.$refs.IntegralForm.resetFields();
}
return;
} else if (this.batchValue == "grade") {
this.dialogGradeVisible = true;
this.getGradeList();
if (this.$refs.gradeForm) {
this.$refs.gradeForm.resetFields();
}
return;
} else if (this.batchValue == "mainstore") {
this.dialogMainstoreVisible = true;
this.selectStore(val);
......@@ -836,12 +838,14 @@ export default {
this.$refs.mainstoreForm.resetFields();
}
this.storeName = '';
return;
} else if (this.batchValue == "store") {
this.dialogSubStoreVisible = true;
if (this.$refs.storeForm) {
this.$refs.storeForm.resetFields();
}
this.getSubStoreList();
return;
}
this.batchValue = '';
},
......
src/components/wechatmembers/total.js
......@@ -843,11 +843,13 @@ export default {
if (this.$refs.IntegralForm) {
this.$refs.IntegralForm.resetFields();
}
return;
} else if (this.batchValue == "grade") {
this.dilogGradeVisible = true;
if (this.$refs.gradeForm) {
this.$refs.gradeForm.resetFields();
}
return;
} else if (this.batchValue == "mainstore") {
this.dilogMainstoreVisible = true;
this.selectStore(val);
......@@ -855,12 +857,14 @@ export default {
this.$refs.mainstoreForm.resetFields();
}
this.storeName = '';
return;
} else if (this.batchValue == "store") {
this.dilogSubStoreVisible = true;
if (this.$refs.storeForm) {
this.$refs.storeForm.resetFields();
}
this.getSubStoreList();
return;
}
},
selectAllmultipleList() {
......
src/components/wechatmembers/wechatmembers.js
......@@ -521,7 +521,6 @@ export default {
this.showStoreDialog = true;
},
selectStore(val) {
console.log(val);
if (Object.keys(val).length > 0) {
if (this.batchValue == "mainstore") {
this.mainstoreForm.mainStoreId = val.storeId;
......@@ -751,11 +750,13 @@ export default {
if (this.$refs.IntegralForm) {
this.$refs.IntegralForm.resetFields();
}
return;
} else if (this.batchValue == "grade") {
this.dilogGradeVisible = true;
if (this.$refs.gradeForm) {
this.$refs.gradeForm.resetFields();
}
return;
} else if (this.batchValue == "mainstore") {
this.dilogMainstoreVisible = true;
this.selectStore(val);
......@@ -763,12 +764,14 @@ export default {
this.$refs.mainstoreForm.resetFields();
}
this.storeName = '';
return;
} else if (this.batchValue == "store") {
this.dilogSubStoreVisible = true;
if (this.$refs.storeForm) {
this.$refs.storeForm.resetFields();
}
this.getSubStoreList();
return;
}
},
selectAllmultipleList() {
......
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