Skip to content

M
member
Commit 53733451 by caoyanzhi
Options

Merge branch 'master' into fix：解决会员相册图片被拉伸的bug

parents 7411944d 8dfcc4a6
Showing with 51 additions and 14 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.5d22dd9525a26e2d6355330589e76aec.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.file.myqcloud.com/components/header.2.0.23.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.5cf2eaa8eab913e3e164.js></script><script type=text/javascript src=./static/js/vendor.7596d590a6a8338e7838.js></script><script type=text/javascript src=./static/js/app.5e363b06283047f95f36.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><script type=text/javascript>!function(e,t,n,g,i){e[i]=e[i]||function(){(e[i].q=e[i].q||[]).push(arguments)},n=t.createElement("script"),tag=t.getElementsByTagName("script")[0],n.async=1,n.src=('https:'==document.location.protocol?'https://':'http://')+g,tag.parentNode.insertBefore(n,tag)}(window,document,"script","assets.giocdn.com/2.1/gio.js","gio");
gio('init','8be12240a3749eab', {});
//custom page code begin here
//custom page code end here
gio('send');</script><link href=./static/css/app.ac381858b06677e7bd55ab2b341e48ba.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.file.myqcloud.com/components/header.2.0.23.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.6e332553dbb7ae039995.js></script><script type=text/javascript src=./static/js/vendor.7596d590a6a8338e7838.js></script><script type=text/javascript src=./static/js/app.5e363b06283047f95f36.js></script></body></html>
\ No newline at end of file
dist/static/css/app.5d22dd9525a26e2d6355330589e76aec.css deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/app.ac381858b06677e7bd55ab2b341e48ba.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.5cf2eaa8eab913e3e164.js deleted 100644 → 0
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,t,f){for(var d,o,b,i=0,u=[];i<a.length;i++)o=a[i],n[o]&&u.push(n[o][0]),n[o]=0;for(d in t)Object.prototype.hasOwnProperty.call(t,d)&&(e[d]=t[d]);for(c&&c(a,t,f);u.length;)u.shift()();if(f)for(i=0;i<f.length;i++)b=r(r.s=f[i]);return b};var a={},n={41:0};function r(c){if(a[c])return a[c].exports;var n=a[c]={i:c,l:!1,exports:{}};return e[c].call(n.exports,n,n.exports,r),n.l=!0,n.exports}r.e=function(e){var c=n[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,r){c=n[e]=[a,r]});c[2]=a;var t=document.getElementsByTagName("head")[0],f=document.createElement("script");f.type="text/javascript",f.charset="utf-8",f.async=!0,f.timeout=12e4,r.nc&&f.setAttribute("nonce",r.nc),f.src=r.p+"static/js/"+e+"."+{0:"eeeccd6759536412bec8",1:"d102dfce326eb45c305a",2:"d8c5dcbf3e9efdb187c7",3:"aede376843be64f94d4c",4:"a5aa422d0b2d79ef73a6",5:"695a732f0975076c7793",6:"a9159d5c38776d21405e",7:"8e3e6d78143b8e715265",8:"c4d802af0e995656c25c",9:"5dd14e9efac1a3ca9cc4",10:"a36cda0ecd1ef7931925",11:"feaa29c4f842002f149b",12:"e480f74c2e5e4f543189",13:"ba38bb1089e2bb929c22",14:"ad85e057a43f662343c8",15:"48cb116b1c8ec0652350",16:"dca6caf90d8f1ee04f3a",17:"c73691eb7863b5e9b072",18:"1635129c991ec464a422",19:"ce21399c2e08d77c09b9",20:"f50826a0f9b31f006eeb",21:"b99a62b9635ce594ddd4",22:"9eff837868a2904a446d",23:"36dd87418fdec5061fbc",24:"094f5dfcc5c4a6fdbf94",25:"81a2e36693181a232b77",26:"6379e0b1de98d8150373",27:"1dcc3b00cdb379882d16",28:"789998a6bc6ef3346a80",29:"87cf94b8ed37a8d0904e",30:"d129a88cd2006338a880",31:"708a4f2660930afdc133",32:"69e11e98ec96f1447a9a",33:"5b13f8633393c3239ef8",34:"e2e9d7849b40e302684e",35:"bf2fce7ff9dce17c7a2e",36:"f037883831a26ceaaaa8",37:"b0956b0586a54e6ceac7",38:"44bc1c3d17560ee39b67"}[e]+".js";var d=setTimeout(o,12e4);function o(){f.onerror=f.onload=null,clearTimeout(d);var c=n[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),n[e]=void 0)}return f.onerror=f.onload=o,t.appendChild(f),a},r.m=e,r.c=a,r.d=function(e,c,a){r.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},r.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(c,"a",c),c},r.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},r.p="./",r.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
dist/static/js/manifest.6e332553dbb7ae039995.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={41: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:"9bd2c7db99ee4cdfa000",1:"d102dfce326eb45c305a",2:"d8c5dcbf3e9efdb187c7",3:"aede376843be64f94d4c",4:"a5aa422d0b2d79ef73a6",5:"695a732f0975076c7793",6:"a9159d5c38776d21405e",7:"8e3e6d78143b8e715265",8:"c4d802af0e995656c25c",9:"5dd14e9efac1a3ca9cc4",10:"a36cda0ecd1ef7931925",11:"feaa29c4f842002f149b",12:"e480f74c2e5e4f543189",13:"ba38bb1089e2bb929c22",14:"ad85e057a43f662343c8",15:"48cb116b1c8ec0652350",16:"dca6caf90d8f1ee04f3a",17:"c73691eb7863b5e9b072",18:"1635129c991ec464a422",19:"ce21399c2e08d77c09b9",20:"06f59507208426ce2361",21:"b99a62b9635ce594ddd4",22:"9eff837868a2904a446d",23:"36dd87418fdec5061fbc",24:"094f5dfcc5c4a6fdbf94",25:"81a2e36693181a232b77",26:"12fb9bc19f314d34ac19",27:"1dcc3b00cdb379882d16",28:"789998a6bc6ef3346a80",29:"87cf94b8ed37a8d0904e",30:"d12ba15a910d3ff8dc36",31:"708a4f2660930afdc133",32:"69e11e98ec96f1447a9a",33:"5b13f8633393c3239ef8",34:"e2e9d7849b40e302684e",35:"bf2fce7ff9dce17c7a2e",36:"f037883831a26ceaaaa8",37:"b0956b0586a54e6ceac7",38:"44bc1c3d17560ee39b67"}[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
......@@ -8,7 +8,17 @@
<script src="//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js"></script>
<!-- <script src="./static/js/loginanimate.js"></script> -->
<script src="//web-1251519181.file.myqcloud.com/lib/lodash.min.js"></script>
<title>memberproject</title>
<title>memberproject</title>
<!-- GrowingIO Analytics code version 2.1 -->
<!-- Copyright 2015-2018 GrowingIO, Inc. More info available at http://www.growingio.com -->
<script type='text/javascript'>
!function(e,t,n,g,i){e[i]=e[i]||function(){(e[i].q=e[i].q||[]).push(arguments)},n=t.createElement("script"),tag=t.getElementsByTagName("script")[0],n.async=1,n.src=('https:'==document.location.protocol?'https://':'http://')+g,tag.parentNode.insertBefore(n,tag)}(window,document,"script","assets.giocdn.com/2.1/gio.js","gio");
gio('init','8be12240a3749eab', {});
//custom page code begin here
//custom page code end here
gio('send');
</script>
<!-- End GrowingIO Analytics code version: 2.1 -->
</head>
<body>
<div id="app"></div>
......
src/components/wechatmembers/cardvoucher.vue
......@@ -96,6 +96,15 @@
</template>
</el-table-column>
<el-table-column
prop="receiveTime"
label="核销时间"
width="160px"
>
<template slot-scope="scope">
{{ scope.row.usedTime | formatTime }}
</template>
</el-table-column>
<el-table-column
prop="receiveName"
label="投放渠道"
></el-table-column>
......@@ -137,9 +146,16 @@
label="核销来源"
>
<template slot-scope="scope">
<span v-if="scope.row.checkSource === 0">订单核销</span>
<span v-if="scope.row.checkSource === 1">手动核销</span>
<span v-if="scope.row.checkSource === -1">--</span>
<!-- <div v-if="scope.row.checkSource === 0">
<div>订单核销</div>
<div>{{ scope.row.orderNumber }}</div>
</div>
<span v-if="scope.row.checkSource === 1">手动核销</span> -->
<!-- <span v-if="scope.row.checkSource === -1">--</span> -->
<div>
<div>{{ scope.row.checkSource === 0 ? '订单核销' : scope.row.checkSource === 1 ? '手动核销' : '--' }}</div>
<div v-show="scope.row.orderNumber">{{ scope.row.orderNumber }}</div>
</div>
</template>
</el-table-column>
<el-table-column label="操作">
......@@ -327,7 +343,8 @@ export default {
total: 0
},
cardLogId: "",
checkData: []
checkData: [],
orderNumber: null,
};
},
methods: {
......@@ -474,6 +491,8 @@ export default {
// 选取
choose(opt) {
this.orderId = opt.orderId;
this.orderNumber = opt.orderNumber;
// console.log(this.orderNumber);
},
confirmBtn() {
if (!this.cardLogId) {
......@@ -489,11 +508,13 @@ export default {
doFetch("/api-member/member-card-write-off", {
memberId: this.memberId,
cardLogId: this.cardLogId,
orderId: this.orderId
orderId: this.orderId,
orderNumber: this.orderNumber
})
.then(res => {
if (res.data.errorCode === 0) {
this.checkVisible = false;
this.getMemberCardsPage();
checkSuccess();
} else {
checkFalse(res.data.message);
......
src/components/wechatmembers/total.js
......@@ -615,7 +615,8 @@ export default {
if (Object.keys(val).length > 0) {
if (this.batchValue == "mainstore") {
this.mainstoreForm.mainStoreId = val.storeId;
this.storeName = val.storeName;
// this.storeName = val.storeName;
this.storeName = '选择主门店';
this.mainstoreForm.mainOptType = 4;
}
if (this.batchValue == "store") {
......@@ -856,7 +857,7 @@ export default {
if (this.$refs.mainstoreForm) {
this.$refs.mainstoreForm.resetFields();
}
this.storeName = '';
// this.storeName = '';
return;
} else if (this.batchValue == "store") {
this.dilogSubStoreVisible = true;
......
src/components/wechatmembers/wechatmembers.js
......@@ -524,7 +524,8 @@ export default {
if (Object.keys(val).length > 0) {
if (this.batchValue == "mainstore") {
this.mainstoreForm.mainStoreId = val.storeId;
this.storeName = val.storeName;
// this.storeName = val.storeName;
this.storeName = '选择主门店';
this.mainstoreForm.mainOptType = 4;
}
if (this.batchValue == "store") {
......@@ -763,7 +764,7 @@ export default {
if (this.$refs.mainstoreForm) {
this.$refs.mainstoreForm.resetFields();
}
this.storeName = '';
// this.storeName = '';
return;
} else if (this.batchValue == "store") {
this.dilogSubStoreVisible = 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