fix一部分

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

src/components/service-info/service-info.vue

@@ -44,7 +44,9 @@
         <p class="des_p">{{ data.descript }}</p>
         <div class="jiage_d">
           <div class="dbn_wkdn">
-            <span class="gnekg_fwf"><span style="margin-right: 30px;">价</span>格：</span><span class="ndwa_indowa">
+            <span class="gnekg_fwf"
+              ><span style="margin-right: 30px">价</span>格：</span
+            ><span class="ndwa_indowa">
               {{
                 specification && specification.money
                   ? specification.money * (showTime ? duration : 1)
@@ -54,8 +56,11 @@
             <span class="kfdf_jffa">金币</span>
           </div>
           <div class="nmd_kwd">
-            <span class="bgnerighur">月售：<span class="ndwa_dn">{{ data.month_sale }} 笔 </span
-            ></span>
+            <span class="bgnerighur"
+              >月售：<span class="ndwa_dn"
+                >{{ data.month_sale }} 笔
+              </span></span
+            >
             <img src="@/assets/imgs/shop_ic_star.png" class="dwin_diwa" />
             <span class="dn_wjd">{{ data.scoreDetail.avgScore }}</span>
           </div>
@@ -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
+              : ""
           }}
         </div>
-        <div
-          class="commodity_information"
-        >
+        <div class="commodity_information">
           <span class="guige_title">时长收费：</span>
           <span
             v-if="
@@ -389,8 +395,8 @@ export default {
 }
 .service_title > .service_type {
   flex-shrink: 0;
-  height: 24px;
-  padding: 0 12px;
+  height: 22px;
+  padding: 0 7px;
   border: 1px solid #5362ee;
   background-color: #5362ee;
   border-radius: 4px;
@@ -542,7 +548,7 @@ export default {
   position: absolute;
   width: 1px;
   height: 14px;
-  background-color:#eccb8a;
+  background-color: #eccb8a;
   top: 8px;
   left: -44px;
 }
@@ -563,16 +569,16 @@ export default {
   border-radius: 6px;
   color: #fcefd6;
   font-size: 16px;
-  margin-right: 24px;
+  margin-right: 14px;
 }
 .tags {
   display: inline-block;
   margin-left: 8px;
-  height: 24px;
-  padding: 0 12px;
+  height: 22px;
+  padding: 0 7px;
   font-size: 12px;
   font-weight: 500;
-  line-height: 24px;
+  line-height: 22px;
   border-radius: 4px;
   position: relative;
   top: 1px;
@@ -622,7 +628,7 @@ export default {
 .spec_des {
   margin-left: 128px;
   color: rgba(88, 97, 122, 0.5);
-  font-size: 14px;
+  font-size: 12px;
   line-height: 14px;
   margin-top: 8px;
 }
@@ -639,25 +645,42 @@ export default {
   border-color: #515fe7;
 }
 .service_info .el-input-number .el-input-number__decrease {
-  top: 2px;
-  left: 2px;
-  width: 38px;
-  line-height: 36px;
-  border-radius: 8px 0 0 8px;
-  border-right-width: 2px;
+  top: 1px;
+  left: 1px;
+  line-height: 34px;
+  border-radius: 5px 0 0 5px;
+  border-right-width: 1px;
 }
 .service_info .el-input-number .el-input-number__increase {
-  top: 2px;
-  right: 2px;
-  width: 38px;
-  line-height: 36px;
-  border-radius: 0 8px 8px 0;
-  border-left-width: 2px;
+  top: 1px;
+  right: 1px;
+  line-height: 34px;
+  border-radius: 0 5px 5px 0;
+  border-left-width: 1px;
 }
 .service_info .el-input-number .el-input__inner {
-  border-width: 2px;
+  border-width: 1px;
+  height: 36px;
+  line-height: 36px;
 }
 .service_info .el-input-number {
   width: 128px;
+  line-height: 36px;
+}
+.service_info
+  .el-input-number__decrease:hover:not(.is-disabled)
+  ~ .el-input
+  .el-input__inner:not(.is-disabled),
+.el-input-number__increase:hover:not(.is-disabled)
+  ~ .el-input
+  .el-input__inner:not(.is-disabled) {
+  border-color: #515fe7;
+}
+.service_info .el-input__inner:focus {
+  border-color: #515fe7;
+}
+.service_info .el-input-number__decrease:hover,
+.el-input-number__increase:hover {
+  color: #515fe7;
 }
 </style>

src/components/service-list/commodity-card-new.vue

@@ -158,13 +158,13 @@ export default {
 .tags {
   display: inline-block;
   margin-left: 8px;
-  padding: 2px 8px 3px;
+  padding: 3px 8px 3px;
   font-size: 12px;
   font-weight: 500;
   line-height: 12px;
   border-radius: 4px;
   position: relative;
-  top: 1px;
+  top: 0px;
 }
 .map_service {
   background-color: #626de9;

src/components/service-list/commodity-cell-new.vue

@@ -98,14 +98,14 @@ export default {
   height: 208px;
   background-color: #ffffff;
   box-shadow: 0px 3px 6px 0px rgba(15, 19, 65, 0.04);
-  border-radius: 12px 12px 8px 8px;
+  border-radius: 8px 8px 8px 8px;
   border: solid 1px #e3e4ef;
   margin-bottom: 24px;
 }
 .com_cell_up {
   height: 88px;
   background-color: #f9fafc;
-  border-radius: 12px 12px 0px 0px;
+  border-radius: 8px 8px 0px 0px;
   padding: 16px;
   display: flex;
   position: relative;
@@ -169,13 +169,13 @@ export default {
 .tags {
   display: inline-block;
   margin-left: 8px;
-  padding: 2px 8px 3px;
+  padding: 3px 8px 3px;
   font-size: 12px;
   font-weight: 500;
   line-height: 12px;
   border-radius: 4px;
   position: relative;
-  top: 1px;
+  top: 0px;
 }
 .map_service {
   background-color: #626de9;

src/components/service-list/service_shop_menu-new.vue

@@ -138,7 +138,7 @@ export default {
   color: #515fe7;
 }
 .menu_img {
-  width: 24px;
+  /* width: 24px; */
   margin-right: 6px;
 }
 .menu_item {

src/components/service-tabs/service-tabs.vue

@@ -58,7 +58,7 @@ export default {
     },
     providerTitle: {
       type: String,
-      default: () => "提供组织",
+      default: () => "服务机构及规格信息",
     },
     commentsTitle: {
       type: String,

src/components/shop-cloud/shop-cloud-new.vue

@@ -4,7 +4,7 @@
       <el-breadcrumb-item :to="{ path: '/shop' }">服务超市</el-breadcrumb-item>
       <el-breadcrumb-item>{{ name }}</el-breadcrumb-item>
     </el-breadcrumb>
-    <block-radius :paddingNum="24">
+    <block-radius :borRadius="8" :paddingNum="24">
       <el-form
         ref="form"
         :inline="true"
@@ -44,7 +44,7 @@
         </el-row>
       </el-form>
     </block-radius>
-    <block-radius :paddingNum="24">
+    <block-radius :borRadius="8" :paddingNum="24">
       <el-tabs v-model="activeName" class="cloud_form" @tab-click="tabClick">
         <el-tab-pane label="申请新的工作区域" name="0">
           <el-form ref="formNew" :model="formNew" :rules="ruleNew">
@@ -609,7 +609,7 @@
         </el-tab-pane>
       </el-tabs>
     </block-radius>
-    <block-radius v-if="!(activeName == 1 && !formShow)">
+    <block-radius :borRadius="8" v-if="!(activeName == 1 && !formShow)">
       <div class="btn_footer fyzj_item">
         <div class="fyzj">
           <p class="fyzj_p">
@@ -951,7 +951,7 @@
         </div>
         <div class="clear_xxx"></div>
       </div>
-      <div class="btn_footer">
+      <div class="btn_footer acc">
         <el-button class="cancel" @click="cancel">取消</el-button>
         <el-button class="submit1" @click="determineSubmit">确定提交</el-button>
       </div>
@@ -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%;

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) {

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