diff --git a/stdiet-ui/package.json b/stdiet-ui/package.json index e9357aaf0..76287eff4 100644 --- a/stdiet-ui/package.json +++ b/stdiet-ui/package.json @@ -64,6 +64,7 @@ "vue": "2.6.10", "vue-count-to": "1.0.13", "vue-cropper": "0.4.9", + "vue-qr": "^2.3.0", "vue-router": "3.0.2", "vue-scrollto": "^2.20.0", "vue-splitpane": "1.0.4", diff --git a/stdiet-ui/src/components/ContractDrawer/index.vue b/stdiet-ui/src/components/ContractDrawer/index.vue index 2facf1ccf..c315d1e20 100644 --- a/stdiet-ui/src/components/ContractDrawer/index.vue +++ b/stdiet-ui/src/components/ContractDrawer/index.vue @@ -50,21 +50,27 @@ width="200" /> - + @@ -108,15 +114,18 @@ import { delContract, listContract } from "@/api/custom/contract"; import ContractDetail from "@/components/ContractDetail"; import Clipboard from "clipboard"; import ContractAdd from "@/components/ContractAdd"; - +import VueQr from "vue-qr"; +const logo = require("@/assets/logo/logo_b.png"); export default { name: "CustomerContractDrawer", components: { "contract-detail": ContractDetail, "add-contract": ContractAdd, + VueQr, }, data() { return { + logo, visible: false, title: "", data: undefined, diff --git a/stdiet-ui/src/components/HeatStatisticsDrawer/index.vue b/stdiet-ui/src/components/HeatStatisticsDrawer/index.vue index 2f050501e..1e0b4b929 100644 --- a/stdiet-ui/src/components/HeatStatisticsDrawer/index.vue +++ b/stdiet-ui/src/components/HeatStatisticsDrawer/index.vue @@ -10,16 +10,34 @@
- 外食计算器 + 外食计算器 + + + 二维码 + - - + + - - + - + - - - + +
diff --git a/stdiet-ui/src/components/PhysicalSignsDialog/index.vue b/stdiet-ui/src/components/PhysicalSignsDialog/index.vue index d7702d4dd..5c237474e 100644 --- a/stdiet-ui/src/components/PhysicalSignsDialog/index.vue +++ b/stdiet-ui/src/components/PhysicalSignsDialog/index.vue @@ -1,112 +1,267 @@ diff --git a/stdiet-ui/src/views/custom/contract/index.vue b/stdiet-ui/src/views/custom/contract/index.vue index 7e3551c29..ed75d8fb0 100644 --- a/stdiet-ui/src/views/custom/contract/index.vue +++ b/stdiet-ui/src/views/custom/contract/index.vue @@ -187,7 +187,7 @@ prop="updateTime" width="180" /> - + @@ -320,9 +330,14 @@ import { addContract, delContract, listContract } from "@/api/custom/contract"; import Clipboard from "clipboard"; import { mapGetters } from "vuex"; +import VueQr from "vue-qr"; +const logo = require("@/assets/logo/logo_b.png"); export default { name: "Contract", + components: { + VueQr, + }, data() { const checkServePromise = (rule, value, callback) => { if (this.form.projectId == 0 && !value) { @@ -331,6 +346,7 @@ export default { callback(); }; return { + logo, // 遮罩层 loading: true, // 选中数组