diff --git a/package-lock.json b/package-lock.json
index 4e87942..e25fed1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2234,8 +2234,7 @@
"big.js": {
"version": "5.2.2",
"resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
- "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
- "dev": true
+ "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ=="
},
"binary-extensions": {
"version": "2.1.0",
@@ -3698,6 +3697,17 @@
"randomfill": "^1.0.3"
}
},
+ "css": {
+ "version": "2.2.4",
+ "resolved": "https://registry.npmjs.org/css/-/css-2.2.4.tgz",
+ "integrity": "sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==",
+ "requires": {
+ "inherits": "^2.0.3",
+ "source-map": "^0.6.1",
+ "source-map-resolve": "^0.5.2",
+ "urix": "^0.1.0"
+ }
+ },
"css-color-names": {
"version": "0.0.4",
"resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz",
@@ -4166,6 +4176,11 @@
"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
"integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
},
+ "decimal.js": {
+ "version": "10.3.1",
+ "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.3.1.tgz",
+ "integrity": "sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ=="
+ },
"decode-uri-component": {
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
@@ -4634,8 +4649,7 @@
"emojis-list": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
- "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
- "dev": true
+ "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q=="
},
"encodeurl": {
"version": "1.0.2",
@@ -5431,8 +5445,7 @@
"extend": {
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
- "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
- "dev": true
+ "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
},
"extend-shallow": {
"version": "3.0.2",
@@ -6404,7 +6417,6 @@
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
"integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
- "dev": true,
"requires": {
"ansi-regex": "^2.0.0"
}
@@ -7494,8 +7506,7 @@
"dependencies": {
"ansi-regex": {
"version": "3.0.0",
- "resolved": "https://registry.npmmirror.com/ansi-regex/-/ansi-regex-3.0.0.tgz",
- "integrity": "sha512-wFUFA5bg5dviipbQQ32yOQhl6gcJaJXiHE7dvR8VYPG97+J/GNC5FKGepKdEDUFeXRzDxPF1X/Btc8L+v7oqIQ==",
+ "resolved": "",
"dev": true
},
"jest-cli": {
@@ -7900,8 +7911,7 @@
"js-base64": {
"version": "2.6.3",
"resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.3.tgz",
- "integrity": "sha512-fiUvdfCaAXoQTHdKMgTvg6IkecXDcVz6V5rlftUTclF9IKBjMizvSdQaCl/z/6TApDeby5NL+axYou3i0mu1Pg==",
- "dev": true
+ "integrity": "sha512-fiUvdfCaAXoQTHdKMgTvg6IkecXDcVz6V5rlftUTclF9IKBjMizvSdQaCl/z/6TApDeby5NL+axYou3i0mu1Pg=="
},
"js-beautify": {
"version": "1.11.0",
@@ -8152,6 +8162,11 @@
"type-check": "~0.3.2"
}
},
+ "lib-flexible": {
+ "version": "0.3.2",
+ "resolved": "https://registry.npmjs.org/lib-flexible/-/lib-flexible-0.3.2.tgz",
+ "integrity": "sha512-9yowMWA70tKhKdCJDaltY0mNQG4OWo7pWKScnTp9aiSxS7s20ZYlwBRE3335nweOf5qKXVC7sDxJwMPM8/MFZg=="
+ },
"linkify-it": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-2.2.0.tgz",
@@ -8233,7 +8248,6 @@
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
"integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
- "dev": true,
"requires": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
@@ -8244,7 +8258,6 @@
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
"integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
- "dev": true,
"requires": {
"minimist": "^1.2.0"
}
@@ -9024,6 +9037,11 @@
}
}
},
+ "natives": {
+ "version": "1.1.6",
+ "resolved": "https://registry.npmjs.org/natives/-/natives-1.1.6.tgz",
+ "integrity": "sha512-6+TDFewD4yxY14ptjKaS63GVdtKiES1pTPyxn9Jb0rBqPMZ7VcCiooEhPNsr+mqHtMGxa/5c/HhcC4uPEUw/nA=="
+ },
"natural-compare": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
@@ -12201,6 +12219,70 @@
}
}
},
+ "postcss-px2rem": {
+ "version": "0.3.0",
+ "resolved": "https://registry.npmjs.org/postcss-px2rem/-/postcss-px2rem-0.3.0.tgz",
+ "integrity": "sha512-ACZRimmOEDma0L/sI5ENREY3BoYB4LNME9iM9VcZU2t598OB9KLEPDYX8JBohNsvwJ+Nvlvk3IcGm0bRqOBC/Q==",
+ "requires": {
+ "postcss": "^5.0.0",
+ "px2rem": "~0.5.0"
+ },
+ "dependencies": {
+ "ansi-styles": {
+ "version": "2.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+ "integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA=="
+ },
+ "chalk": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+ "integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
+ "requires": {
+ "ansi-styles": "^2.2.1",
+ "escape-string-regexp": "^1.0.2",
+ "has-ansi": "^2.0.0",
+ "strip-ansi": "^3.0.0",
+ "supports-color": "^2.0.0"
+ },
+ "dependencies": {
+ "supports-color": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+ "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g=="
+ }
+ }
+ },
+ "has-flag": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+ "integrity": "sha512-DyYHfIYwAJmjAjSSPKANxI8bFY9YtFrgkAfinBojQ8YJTOuOuav64tMUJv584SES4xl74PmuaevIyaLESHdTAA=="
+ },
+ "postcss": {
+ "version": "5.2.18",
+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
+ "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
+ "requires": {
+ "chalk": "^1.1.3",
+ "js-base64": "^2.1.9",
+ "source-map": "^0.5.6",
+ "supports-color": "^3.2.3"
+ }
+ },
+ "source-map": {
+ "version": "0.5.7",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+ "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ=="
+ },
+ "supports-color": {
+ "version": "3.2.3",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+ "integrity": "sha512-Jds2VIYDrlp5ui7t8abHN2bjAu4LV/q4N2KivFPpGH0lrka0BMq/33AmECUXlKPcHigkNaqfXRENFju+rlcy+A==",
+ "requires": {
+ "has-flag": "^1.0.0"
+ }
+ }
+ }
+ },
"postcss-reduce-idents": {
"version": "2.4.0",
"resolved": "https://registry.npmjs.org/postcss-reduce-idents/-/postcss-reduce-idents-2.4.0.tgz",
@@ -12872,6 +12954,111 @@
"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
"integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
},
+ "px2rem": {
+ "version": "0.5.0",
+ "resolved": "https://registry.npmjs.org/px2rem/-/px2rem-0.5.0.tgz",
+ "integrity": "sha512-R+LQj3Evbjbpmglo7D0PBVsnAbKP4WSvZEZUnF8RGIpWkIHFeAT+BlDOxxBxKVyMDecmfv9qdzNLTZLMq32osA==",
+ "requires": {
+ "chalk": "~0.5.1",
+ "commander": "~2.6.0",
+ "css": "~2.2.0",
+ "extend": "~3.0.0",
+ "fs-extra": "~0.16.3"
+ },
+ "dependencies": {
+ "ansi-regex": {
+ "version": "0.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz",
+ "integrity": "sha512-sGwIGMjhYdW26/IhwK2gkWWI8DRCVO6uj3hYgHT+zD+QL1pa37tM3ujhyfcJIYSbsxp7Gxhy7zrRW/1AHm4BmA=="
+ },
+ "ansi-styles": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz",
+ "integrity": "sha512-f2PKUkN5QngiSemowa6Mrk9MPCdtFiOSmibjZ+j1qhLGHHYsqZwmBMRF3IRMVXo8sybDqx2fJl2d/8OphBoWkA=="
+ },
+ "chalk": {
+ "version": "0.5.1",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz",
+ "integrity": "sha512-bIKA54hP8iZhyDT81TOsJiQvR1gW+ZYSXFaZUAvoD4wCHdbHY2actmpTE4x344ZlFqHbvoxKOaESULTZN2gstg==",
+ "requires": {
+ "ansi-styles": "^1.1.0",
+ "escape-string-regexp": "^1.0.0",
+ "has-ansi": "^0.1.0",
+ "strip-ansi": "^0.3.0",
+ "supports-color": "^0.2.0"
+ }
+ },
+ "commander": {
+ "version": "2.6.0",
+ "resolved": "https://registry.npmjs.org/commander/-/commander-2.6.0.tgz",
+ "integrity": "sha512-PhbTMT+ilDXZKqH8xbvuUY2ZEQNef0Q7DKxgoEKb4ccytsdvVVJmYqR0sGbi96nxU6oGrwEIQnclpK2NBZuQlg=="
+ },
+ "fs-extra": {
+ "version": "0.16.5",
+ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.16.5.tgz",
+ "integrity": "sha512-yb7ti8kVH+qboUQWYxUuOPj/qcMUA6lO68ErZoPQOTP+7qroCIN/1gZ1lLk/rs2p0gPFzrvPYujKGnHTu+HHxA==",
+ "requires": {
+ "graceful-fs": "^3.0.5",
+ "jsonfile": "^2.0.0",
+ "rimraf": "^2.2.8"
+ }
+ },
+ "graceful-fs": {
+ "version": "3.0.12",
+ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.12.tgz",
+ "integrity": "sha512-J55gaCS4iTTJfTXIxSVw3EMQckcqkpdRv3IR7gu6sq0+tbC363Zx6KH/SEwXASK9JRbhyZmVjJEVJIOxYsB3Qg==",
+ "requires": {
+ "natives": "^1.1.3"
+ }
+ },
+ "has-ansi": {
+ "version": "0.1.0",
+ "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz",
+ "integrity": "sha512-1YsTg1fk2/6JToQhtZkArMkurq8UoWU1Qe0aR3VUHjgij4nOylSWLWAtBXoZ4/dXOmugfLGm1c+QhuD0JyedFA==",
+ "requires": {
+ "ansi-regex": "^0.2.0"
+ }
+ },
+ "jsonfile": {
+ "version": "2.4.0",
+ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz",
+ "integrity": "sha512-PKllAqbgLgxHaj8TElYymKCAgrASebJrWpTnEkOaTowt23VKXXN0sUeriJ+eh7y6ufb/CC5ap11pz71/cM0hUw==",
+ "requires": {
+ "graceful-fs": "^4.1.6"
+ },
+ "dependencies": {
+ "graceful-fs": {
+ "version": "4.2.10",
+ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
+ "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
+ "optional": true
+ }
+ }
+ },
+ "strip-ansi": {
+ "version": "0.3.0",
+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz",
+ "integrity": "sha512-DerhZL7j6i6/nEnVG0qViKXI0OKouvvpsAiaj7c+LfqZZZxdwZtv8+UiA/w4VUJpT8UzX0pR1dcHOii1GbmruQ==",
+ "requires": {
+ "ansi-regex": "^0.2.1"
+ }
+ },
+ "supports-color": {
+ "version": "0.2.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz",
+ "integrity": "sha512-tdCZ28MnM7k7cJDJc7Eq80A9CsRFAAOZUy41npOZCs++qSjfIy7o5Rh46CBk+Dk5FbKJ33X3Tqg4YrV07N5RaA=="
+ }
+ }
+ },
+ "px2rem-loader": {
+ "version": "0.1.9",
+ "resolved": "https://registry.npmjs.org/px2rem-loader/-/px2rem-loader-0.1.9.tgz",
+ "integrity": "sha512-3Ew8At5W/HHIIUe/KZk+FBRRb20KtgP1N1c/BnMlXk6LNkqrFmUIUF35GF/evzNdj/Q63iWJpkmn/c5qSMplRg==",
+ "requires": {
+ "loader-utils": "^1.1.0",
+ "px2rem": "^0.5.0"
+ }
+ },
"q": {
"version": "1.5.1",
"resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
@@ -14483,8 +14670,7 @@
"source-map": {
"version": "0.6.1",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
- "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
- "dev": true
+ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
},
"source-map-resolve": {
"version": "0.5.3",
@@ -17120,7 +17306,7 @@
},
"webpack-dev-server": {
"version": "2.9.7",
- "resolved": "https://registry.npmmirror.com/webpack-dev-server/-/webpack-dev-server-2.9.7.tgz",
+ "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-2.9.7.tgz",
"integrity": "sha512-Pu7uoQFgQj5RE5wmlfkpYSzihMKxulwEuO2xCsaMnAnyRSApwoVi3B8WCm9XbigyWTHaIMzYGkB90Vr6leAeTQ==",
"requires": {
"ansi-html": "0.0.7",
diff --git a/package.json b/package.json
index 8009627..7ae99dd 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,7 @@
"animate.css": "^3.5.1",
"axios": "^0.27.2",
"classlist-polyfill": "^1.2.0",
+ "decimal.js": "^10.3.1",
"echarts": "^4.9.0",
"element-resize-detector": "^1.2.1",
"element-ui": "^2.13.2",
diff --git a/src/api/discount-coupon/issue.js b/src/api/discount-coupon/issue.js
deleted file mode 100644
index 3fe67ed..0000000
--- a/src/api/discount-coupon/issue.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import {
- service
-} from "../../utils/service";
-
-// 发布
-export function doAdd(data) {
- return service({
- url: "/platformCoupon/add",
- method: "post",
- data
- });
-}
diff --git a/src/api/discount-coupon/management.js b/src/api/discount-coupon/management.js
index 1c9bd0d..ad2ce25 100644
--- a/src/api/discount-coupon/management.js
+++ b/src/api/discount-coupon/management.js
@@ -41,3 +41,11 @@ export function doAudit(data) {
data
});
}
+// 打款
+export function doPay(data) {
+ return service({
+ url: "/platformCoupon/moneyReceipt",
+ method: "post",
+ data
+ });
+}
diff --git a/src/api/discount-coupon/record.js b/src/api/discount-coupon/record.js
new file mode 100644
index 0000000..89daf32
--- /dev/null
+++ b/src/api/discount-coupon/record.js
@@ -0,0 +1,12 @@
+import {
+ service
+} from "../../utils/service";
+
+// 主页查询
+export function getList(params) {
+ return service({
+ url: "/couponShare",
+ method: "get",
+ params
+ });
+}
diff --git a/src/main.js b/src/main.js
index 7ae3dd0..9def1c8 100644
--- a/src/main.js
+++ b/src/main.js
@@ -43,6 +43,12 @@ Vue.use(vueEsign);
import {
thousands
} from '@/utils/index.js'
+// 引入高精度精算
+import {
+ Decimal
+} from 'decimal.js'
+// 全局定义
+Vue.prototype.$Decimal = Decimal
import Vue from "vue";
import Router from "vue-router";
diff --git a/src/pages/discount-coupon/issue/components/complete.vue b/src/pages/discount-coupon/issue/components/complete.vue
index e59fc3e..aa50e28 100644
--- a/src/pages/discount-coupon/issue/components/complete.vue
+++ b/src/pages/discount-coupon/issue/components/complete.vue
@@ -20,7 +20,7 @@ export default {
methods: {
GoOn() {
this.$emit('next', 1, null)
- Bus.$emit('issueComplete')
+ // Bus.$emit('issueComplete')
},
complete() {
this.$router.push('/active/management')
diff --git a/src/pages/discount-coupon/issue/components/edit.vue b/src/pages/discount-coupon/issue/components/edit.vue
index 7c4ea39..0b81d50 100644
--- a/src/pages/discount-coupon/issue/components/edit.vue
+++ b/src/pages/discount-coupon/issue/components/edit.vue
@@ -8,7 +8,7 @@
-
+
@@ -73,14 +73,15 @@
固定提成(元)
单据金额抽成(%)
+ 注:单据金额抽成无需保证金
-
+
-
+
-
+
@@ -217,12 +218,14 @@ export default {
// 单选框发生改变时,清除上一个的校验
handleChange(value, judge) {
if (judge) {
+ // 有效日期发生改变时,将时间数组fixDate拆分为startDate和endDate
this.$refs.form.validateField(value)
let form = Object.assign({}, this.form);
form.startDate = form.fixDate[0]
form.endDate = form.fixDate[1]
this.form = Object.assign({}, form);
}
+ // 单选框切换时,对应输入框的显示和隐藏没有能够将校验去掉,所以得要我自己手动去掉校验
if (value.length > 1) {
value.forEach((item) => {
this.$refs.form.clearValidate([item])
@@ -275,12 +278,16 @@ export default {
handleCalculate() {
let form = Object.assign({}, this.form);
// 固定提成方式:保证金(guaranteeMoney) = 优惠券数量(couponNumber) * 固定提成(元)(fixedAmount)
- // 单据金额抽成:保证金(guaranteeMoney) = 当前默认10000元
if (form.shareCommissionRules === 0) {
if (form.couponNumber && form.fixedAmount) {
- // form.guaranteeMoney =
+ form.guaranteeMoney = new this.$Decimal(form.couponNumber).mul(new this.$Decimal(form.fixedAmount)).toNumber()
}
}
+ // 单据金额抽成:保证金(guaranteeMoney) = 当前默认10000元
+ if (form.shareCommissionRules === 1) {
+ form.guaranteeMoney = 0
+ }
+ this.form = Object.assign({}, form);
}
},
}
diff --git a/src/pages/discount-coupon/issue/components/template.vue b/src/pages/discount-coupon/issue/components/template.vue
index 56f6cef..85cf65c 100644
--- a/src/pages/discount-coupon/issue/components/template.vue
+++ b/src/pages/discount-coupon/issue/components/template.vue
@@ -42,6 +42,7 @@
-
+
+
diff --git a/src/pages/discount-coupon/record/styles/index.css b/src/pages/discount-coupon/record/styles/index.css
new file mode 100644
index 0000000..f02167e
--- /dev/null
+++ b/src/pages/discount-coupon/record/styles/index.css
@@ -0,0 +1,8 @@
+.query-form{
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+}
+.query-form .el-form-item{
+ margin-bottom: 0px;
+}
diff --git a/src/pages/discount-coupon/record/领取消费 b/src/pages/discount-coupon/record/领取消费
new file mode 100644
index 0000000..e69de29
diff --git a/src/router/index.js b/src/router/index.js
index 491c5fc..679fca4 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -4,8 +4,7 @@ import Layout from "../layout/layout.vue";
Vue.use(VueRouter);
const router = new VueRouter({
- routes: [
- {
+ routes: [{
path: "/",
redirect: "/login"
},
@@ -783,6 +782,7 @@ const router = new VueRouter({
index: "memberClass"
}
},
+ // 优惠券开始
{
path: "/couponIssue",
name: "CouponIssue",
@@ -810,6 +810,7 @@ const router = new VueRouter({
index: "couponRecord"
}
},
+ // 优惠券结束
{
path: "/recommend",
component: () => import("../pages/statistics/recommend/index.vue"),