From cf6f5727dd5cf905d1ededc5456297226cfa3678 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=AE=BF=E6=98=95?= Date: Thu, 17 Dec 2020 18:39:45 +0800 Subject: [PATCH] =?UTF-8?q?fix=E4=B8=80=E9=83=A8=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/css/index.css | 30 +++++++ src/components/service-info/service-info.vue | 79 ++++++++++++------- .../service-list/commodity-card-new.vue | 4 +- .../service-list/commodity-cell-new.vue | 8 +- .../service-list/service_shop_menu-new.vue | 2 +- src/components/service-tabs/service-tabs.vue | 2 +- src/components/shop-cloud/shop-cloud-new.vue | 33 +++++--- src/pages/user/user_info.vue | 4 +- src/pages/workbench/fwgl/serviceEdit.vue | 2 +- 9 files changed, 112 insertions(+), 52 deletions(-) diff --git a/src/assets/css/index.css b/src/assets/css/index.css index 2ec7406..dede9d1 100644 --- a/src/assets/css/index.css +++ b/src/assets/css/index.css @@ -1197,4 +1197,34 @@ border-radius:8px; } .el-date-editor .el-range-input { width: 36%; +} + + +.el-input__inner:focus { + border-color: #515fe7; +} +.el-textarea__inner:focus { + border-color: #515fe7; +} +.el-select .el-input .el-select__caret { + color: #515fe7; +} +.el-input-number__decrease, .el-input-number__increase { + color: #515fe7; +} +.el-input__inner::-webkit-input-placeholder, +.el-textarea__inner::-webkit-input-placeholder { + color: #a9aec0; +} +.el-input__inner:-moz-placeholder, +.el-textarea__inner:-moz-placeholder {/* Firefox 18- */ + color: #a9aec0; +} +.el-input__inner::-moz-placeholder, +.el-textarea__inner::-moz-placeholder {/* Firefox 19+ */ + color: #a9aec0; +} +.el-input__inner:-ms-input-placeholder, +.el-textarea__inner:-ms-input-placeholder { + color: #a9aec0; } \ No newline at end of file diff --git a/src/components/service-info/service-info.vue b/src/components/service-info/service-info.vue index efc7183..3868215 100644 --- a/src/components/service-info/service-info.vue +++ b/src/components/service-info/service-info.vue @@ -44,7 +44,9 @@

{{ data.descript }}

- 价格： + 价格： {{ specification && specification.money ? specification.money * (showTime ? duration : 1) @@ -54,8 +56,11 @@ 金币
- 月售：{{ data.month_sale }} 笔 + 月售：{{ data.month_sale }} 笔 + {{ data.scoreDetail.avgScore }}
@@ -94,12 +99,13 @@ {{ specification && specification.spcs_type == 1 ? specification.descript - : data.serviceRequestSpcs.spcs_type_1 && data.serviceRequestSpcs.spcs_type_1.length != 0 ? data.serviceRequestSpcs.spcs_type_1[0].descript : "" + : data.serviceRequestSpcs.spcs_type_1 && + data.serviceRequestSpcs.spcs_type_1.length != 0 + ? data.serviceRequestSpcs.spcs_type_1[0].descript + : "" }}
-
+
时长收费： "服务机构及规格信息", }, commentsTitle: { type: String, diff --git a/src/components/shop-cloud/shop-cloud-new.vue b/src/components/shop-cloud/shop-cloud-new.vue index f1388e8..fbb1fc8 100644 --- a/src/components/shop-cloud/shop-cloud-new.vue +++ b/src/components/shop-cloud/shop-cloud-new.vue @@ -4,7 +4,7 @@ 服务超市 {{ name }} - + - + @@ -609,7 +609,7 @@ - +

@@ -951,7 +951,7 @@

-
+
取消 确定提交
@@ -1181,13 +1181,13 @@ export default { formNew: { handler() { if (this.formNew.containerGroup % 1 != 0) { - this.formNew.containerGroup = Math.floor(this.formNew.containerGroup) + this.formNew.containerGroup = Math.floor(this.formNew.containerGroup); } if (this.formNew.dataDisk % 1 != 0) { - this.formNew.dataDisk = Math.floor(this.formNew.dataDisk) + this.formNew.dataDisk = Math.floor(this.formNew.dataDisk); } if (this.formNew.appDuration % 1 != 0) { - this.formNew.appDuration = Math.floor(this.formNew.appDuration) + this.formNew.appDuration = Math.floor(this.formNew.appDuration); } }, deep: true, @@ -1195,17 +1195,17 @@ export default { formOld: { handler() { if (this.formOld.containerGroup % 1 != 0) { - this.formOld.containerGroup = Math.floor(this.formOld.containerGroup) + this.formOld.containerGroup = Math.floor(this.formOld.containerGroup); } if (this.formOld.dataDisk % 1 != 0) { - this.formOld.dataDisk = Math.floor(this.formOld.dataDisk) + this.formOld.dataDisk = Math.floor(this.formOld.dataDisk); } if (this.formOld.appDuration % 1 != 0) { - this.formOld.appDuration = Math.floor(this.formOld.appDuration) + this.formOld.appDuration = Math.floor(this.formOld.appDuration); } }, deep: true, - } + }, }, data() { var checkName = (rule, value, callback) => { @@ -2015,6 +2015,8 @@ export default { .btn_footer { display: flex; justify-content: flex-end; +} +.acc { margin: 0 20px; } .btn_footer .submit { @@ -2022,6 +2024,9 @@ export default { background-color: #e56600; color: #f8f9fd; } +.btn_footer .submit:focus { + border: #d93d00 1px solid; +} .btn_footer .nosubmit { width: 220px; background-color: #a9aec0; @@ -2125,7 +2130,7 @@ export default { } .ckfymx_qian { display: inline-block; - margin-left: 20px; + margin-left: 30px; position: relative; } .ckfymx_qian::after { @@ -2134,7 +2139,7 @@ export default { width: 1px; height: 16px; background: #bcc1d0; - left: -10px; + left: -16px; top: 2px; } .yebz { @@ -2274,6 +2279,8 @@ export default { background-color: #f7f8f9; border-radius: 6px; color: #242c43; + font-size: inherit; + font-family: Microsoft YaHei, sans-serif; } .form_item .el-form-item__content { width: 100%; diff --git a/src/pages/user/user_info.vue b/src/pages/user/user_info.vue index c75d559..6410988 100644 --- a/src/pages/user/user_info.vue +++ b/src/pages/user/user_info.vue @@ -567,9 +567,9 @@ export default { }, delIp(index, type) { if (type == "white") { - this.ruleForm_1.ip_white.splice(index, 1); + this.formBusiness.ip_white.splice(index, 1); } else if (type == "black") { - this.ruleForm_1.ip_black.splice(index, 1); + this.formBusiness.ip_black.splice(index, 1); } }, addIp(type) { diff --git a/src/pages/workbench/fwgl/serviceEdit.vue b/src/pages/workbench/fwgl/serviceEdit.vue index 6985029..3d0ac54 100644 --- a/src/pages/workbench/fwgl/serviceEdit.vue +++ b/src/pages/workbench/fwgl/serviceEdit.vue @@ -289,7 +289,7 @@ export default { this.$set(this.form,'code',data.encode_method) this.$set(this.form,'people',data.register_user_info?data.register_user_info.user_name:data.register_user_info) this.$set(this.form,'phone',data.register_user_info?data.register_user_info.phone:data.register_user_info) - this.$set(this.form,'resource',data.openness) + this.$set(this.form,'resource',data.openness_name == "共享" ? 1 : data.openness_name == "受限" ? 2 : 3) this.$set(this.form,'fileList',data.cover) this.imgList = data.cover.split(';') this.open = data.service_safe_config?data.service_safe_config.fusing:data.service_safe_config -- 2.26.0