Administrator 4 lat temu
rodzic
commit
bd6649c66c

+ 9 - 1
src/main/resources/static/css/flea-market/form.css

@@ -102,7 +102,7 @@ body{background: #fff}
      #shoplogoTwo {height: 36px;margin-top: 2.7vw;}
      .login-form input[type="text"] {width: 100% !important;height: 9.6vw;background-color: #ffffff;border-radius: .53vw;border: solid 1px #b8bfca;padding-left: 2.7vw;color: #9aa5b5;box-sizing: border-box}
      input[type="text"]::placeholder, textarea::placeholder {color: #9aa5b5;;}
-     .shrink-spacing {margin: 20px 0;}
+     .shrink-spacing {margin: 20px 0;position: relative;}
      .red-color {color: #f94b4b;}
      .address-input {width: 28.5vw;height: 10.7vw;background-color: #ffffff;border-radius: .53vw;border: solid 1px #b8bfca;padding-left: 6.7vw;color: #9aa5b5}
      .address-item i{position: relative;}
@@ -158,4 +158,12 @@ body{background: #fff}
      .paybtn .thegopay {border: 1px solid #E0E0E0;height: 8.5vw;line-height: 8.5vw;border-radius: .53vw;color: #333333;padding: 0 1.3vw 0 1.3vw}
      .gosecond {color: #1683E1;border-right: .27vw solid #F2F2F2;}
      .close {position: absolute;right: 0;top: 0;width: 10.7vw;height: 10.7vw;line-height: 10.7vw;text-align: center;cursor: pointer;font-size: 6.4vw;}
+    .selected.mIcon:before{
+    width: 5.3vw;
+    height: 5.3vw;
+    background-position: -51.2vw -.27vw;
+    position: absolute;
+    top: 9vw;
+    right: 2.7vw
+}
  }

+ 2 - 2
src/main/resources/static/css/supplier-center/shop/decoration.css

@@ -54,9 +54,9 @@
   .banner-title{vertical-align: middle;overflow: hidden;text-overflow: ellipsis;width: 100%;color: #22272e;font-size: 3.4vw;white-space: nowrap}
   .advertisement-pic{width: 20vw;height: 20vw}
   .operate div{width: 22.4vw;height:9.6vw;background-color: #e0f1ff;border-radius: 4.8vw;border: solid 1px #1890f9;line-height: 9.6vw;text-align: center;color: #1890f9;cursor: pointer;display: inline-block;margin-right: 2.7vw;}
-  .title-list{padding-top: 2.7vw;background: #fff;padding-left: 3.3vw;color: #9aa5b5}
+  .title-list{padding-top: 2.7vw;background: #fff;color: #9aa5b5}
   .shopBanner ul  .title-color{color: #9aa5b5;}
-  .title-list span{display: inline-block;width: 21%}
+  .title-list span{display: inline-block;width: 23%}
   .shopBanner ul{background: #fff;margin-bottom: 1.3vw;padding: 0 3.3vw 3.3vw;overflow: hidden}
   .shopBanner ul li{list-style: none;display: inline-block;padding-top: 10px;color: #22272e;width: 75%;float: left}
   .shopBanner ul li:nth-child(1){}

+ 19 - 2
src/main/resources/static/css/supplier-center/shop/release.css

@@ -153,12 +153,12 @@ input::placeholder{color: #9aa5b5}
  input::placeholder{color: #9aa5b5;}
 .release-from{margin-bottom: 4vw;line-height: 8.5vw}
 .release-from .text{line-height: 6.4vw;color: #e15616;width: 87vw;margin: auto;font-size: 3.1vw}
-.release-from .select-main .select{border: .27vw solid rgba(184,191,202,.5);height: 11.7vw;width: -webkit-fill-available;margin-bottom: 2.7vw;padding-left: 2.7vw;color: #9aa5b5;}
+.release-from .select-main .select{border: .27vw solid rgba(184,191,202,.5);height: 11.7vw;width: -webkit-fill-available;padding-left: 2.7vw;color: #9aa5b5;}
 .release-from .release-input .input.tags{width: 52vw;height: 11.7vw;}
 .release-from .release-input .add-btn{width: 33.4vw;border-radius: .53vw;border: .27vw solid #e15616;display: inline-block;margin-left:2.7vw;text-align: center;line-height: 11.7vw;background-color: #ffe6dc;color: #e15616;}
 .release-from .release-input .input.keyword{margin-bottom: 2.7vw;}
 .release-from .p{width: 22.4vw;height: 7.2vw;line-height: 7.2vw;text-align: center;font-size: 12px;color: #e15616;border: .27vw solid #e15616;background: #ffe6dc;display: block;border-radius: 4.8vw;margin: 2.7vw auto;}
-.release-from .release-input .release-param{width: 100%;height: auto;border: 1px solid rgba(184,191,202,.5);margin-bottom: 2.7vw;}
+.release-from .release-input .release-param{ position: relative;width: 100%;height: auto;border: 1px solid rgba(184,191,202,.5);margin-bottom: 2.7vw;}
 .release-from .release-input .release-param .param-input:first-child {border-bottom: 1px solid #f0f3f7;}
 .release-from .release-input .release-param .param-input{width: -webkit-fill-available;border-radius: .27vw;padding-left: 2.7vw;height: 11.8vw;border: none;}
 .release-from .release-input .add{width: 22.4vw;height: 7.2vw;line-height: 7.2vw;text-align: center;font-size: 12px;color: #e15616;border: .27vw solid #e15616;background: #ffe6dc;display: block;border-radius: 4.8vw;margin: 2.7vw auto;}
@@ -222,4 +222,21 @@ input[type="radio"]{opacity:0;}
 .release-from .secondbtn .btn.next{width: 25.2vw}
 .release-from .tags-main .item-tags {padding: 0 2.7vw;line-height: 8vw;background: #ffe6dc;text-align: center;font-size: 3.2vw;color: #e15616;margin: 1.3vw;border-radius: .53vw;float: left;position: relative;}
 .mIcon.del-tags:before{width: 4.3vw;height: 4.3vw;background-position: -26.4vw -9vw;position: absolute;top: -2vw;}
+.mIcon.del-btn:before{width: 5.3vw;background-position: -98.4vw -9.3vw;height: 5.3vw;position: absolute;top: 0;right: 0}
+.select-main {margin-bottom: 2.7vw; position: relative}
+.select-main  .option-main{
+    border: .27vw solid rgba(184,191,202,.5)
+}
+.select-main  .option-main  .option{
+        padding:0 2.7vw;
+        color: #9aa5b5
+}
+.selected.mIcon:before{
+    width: 5.3vw;
+    height: 5.3vw;
+    background-position: -51.2vw -.27vw;
+    position: absolute;
+    top: 4vw;
+    right: 2.7vw
+}
 }

+ 10 - 7
src/main/resources/static/css/user-center/setting/information.css

@@ -7,8 +7,8 @@ li{list-style:none}
 .container{width: 100%;min-height:900px;box-sizing: border-box;padding: 20px 236px;background-color: #FFF;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);}
 .container .title{width: 100%;height: 54px;line-height: 54px;text-align: left;font-size: 24px;color: #22272e;float: left;}
 .container .formLine p span.mm{color: #22272e;}
-.subLine{margin-top: 20px;float: left;}
-.subLine .btn-upgrade {cursor: pointer;display: block;width: 232px;height: 50px;line-height: 50px;background-color: #e15616;border-radius: 2px;text-align: center;font-size: 18px;color: #FFF;float: left;margin-right: 15px;}
+.subLine{margin-top: 20px;float: left; width: 100%;}
+.subLine .btn-upgrade {cursor: pointer;display: block;width: 232px;height: 50px;line-height: 50px;background-color: #e15616;border-radius: 2px;text-align: center;font-size: 18px;color: #FFF;margin: auto;}
 .subLine .btn-upgrade.none{border: 1px solid #E15616;background-color: #ffe6dc;box-shadow: 0px 3px 6px 0px rgba(249, 75, 75, 0.17);color: #e15616;}
 .subLine .btn-upgrade.disabled{background-color: #999999;}
 .formLine{width: 100%;float: left;margin-bottom: 10px;}
@@ -22,21 +22,24 @@ li{list-style:none}
 .formLine .form-upload-tips:hover .wen-tips{display: block;}
 .formLine .file{width: 128px;height: 90px;opacity: 0;position: absolute;top: 0;left: 0;z-index: 999;cursor: pointer;}
 .formLine .formLine-file .icon{width: 128px;height: 90px;display: block;}
-.formLine .formLine-file .file-biss{background: url("/img/account/icon-bisse.png") no-repeat;}
-.formLine .formLine-file .file-door{background: url("/img/account/icon-door.png") no-repeat;}
-.formLine .formLine-file .file-zizhi{background: url("/img/account/icon-zizhi.png") no-repeat;}
+.formLine .formLine-file .file-biss{background: url("/img/account/icon-business.png") no-repeat;}
+.formLine .formLine-file .file-door{background: url("/img/account/icon-door.svg") no-repeat;}
+.formLine .formLine-file .file-zizhi{background: url("/img/account/icon-zizhi.svg") no-repeat;}
 .formLine .form-upload-image{width: 128px;height: 90px;position: relative;}
 .formLine .form-upload-image .upload-img{width: 128px;height: 90px;display: block;}
 .formLine .form-upload-image .icon{width: 20px;height: 20px;display: block;position: absolute;right: 0;top: 0;cursor: pointer;}
-.formLine .form-upload-image .icon:before{width: 20px;height: 20px;background-position: -116px -140px;}
+.formLine .form-upload-image .icon:before{width: 20px;height: 20px;background-position: -114px -140px;}
 .formLine .business{height:auto;position:relative}
 .formLine .business input[type="text"] {width: 324px;display: block;float: left;margin-right: 15px;}
 .formLine .business a {display: block;float: left; width: 92px;height: 32px;line-height: 34px;font-size: 14px;color: #e15616;background-color: #ffe6dc;border-radius: 2px;border: solid 1px #e15616;text-align: center;}
 .formLine p{color: #627386}
 input::placeholder,textarea::placeholder{color: #9aa5b5}
-
+  .formLine .errTips.show{display: block}
+  .formLine .errTips{display: none}
+  .formLine .address.info textarea{margin-top: 0}
 }
 
+
 /**
 * 移动端
 */

+ 0 - 1
src/main/resources/static/css/user-center/setting/upgrade.css

@@ -44,7 +44,6 @@ li{list-style:none}
 
 
 
-
 }
 
 /**

+ 11 - 0
src/main/resources/static/img/account/icon-door.svg

@@ -0,0 +1,11 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="128" height="90" viewBox="0 0 128 90">
+  <g id="组_5793" data-name="组 5793" transform="translate(-964 -753)">
+    <g id="矩形_4466" data-name="矩形 4466" transform="translate(964 753)" fill="#fff" stroke="#b8bfca" stroke-width="1">
+      <rect width="128" height="90" rx="2" stroke="none"/>
+      <rect x="0.5" y="0.5" width="127" height="89" rx="1.5" fill="none"/>
+    </g>
+    <text id="门头拍照" transform="translate(999 820.563)" fill="#9aa5b5" font-size="14" font-family="MicrosoftYaHei, Microsoft YaHei" letter-spacing="0.048em"><tspan x="0" y="0">门头拍照</tspan></text>
+    <rect id="矩形_5635" data-name="矩形 5635" width="4" height="24" rx="2" transform="translate(1026 771)" fill="#b8bfca"/>
+    <rect id="矩形_5636" data-name="矩形 5636" width="4" height="24" rx="2" transform="translate(1040 781) rotate(90)" fill="#b8bfca"/>
+  </g>
+</svg>

+ 11 - 0
src/main/resources/static/img/account/icon-zizhi.svg

@@ -0,0 +1,11 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="128" height="90" viewBox="0 0 128 90">
+  <g id="组_5793" data-name="组 5793" transform="translate(-964 -753)">
+    <g id="矩形_4466" data-name="矩形 4466" transform="translate(964 753)" fill="#fff" stroke="#b8bfca" stroke-width="1">
+      <rect width="128" height="90" rx="2" stroke="none"/>
+      <rect x="0.5" y="0.5" width="127" height="89" rx="1.5" fill="none"/>
+    </g>
+    <text id="医疗执业许可证" transform="translate(977 820.563)" fill="#9aa5b5" font-size="14" font-family="MicrosoftYaHei, Microsoft YaHei" letter-spacing="0.048em"><tspan x="0" y="0">医疗执业许可证</tspan></text>
+    <rect id="矩形_5635" data-name="矩形 5635" width="4" height="24" rx="2" transform="translate(1026 771)" fill="#b8bfca"/>
+    <rect id="矩形_5636" data-name="矩形 5636" width="4" height="24" rx="2" transform="translate(1040 781) rotate(90)" fill="#b8bfca"/>
+  </g>
+</svg>

+ 1 - 1
src/main/resources/templates/flea-market/form.html

@@ -44,7 +44,7 @@
                     </div>
                     <div class="unlogin-item input-item shrink-spacing">
                         <div class="unlogin-label spacing" style="letter-spacing: 1px;"><span class="red-color">*</span>商品品牌:</div>
-                        <i class="icon selected"></i>
+                        <i class="icon selected mIcon"></i>
                         <div class="select" @click="showBrand">
                             <span class="placeholder" >{{brandname}}</span>
                             <ul v-show="selectBrand">

+ 1 - 1
src/main/resources/templates/index.html

@@ -75,7 +75,7 @@
                                             </div>
                                         </template>
                                         <template v-else>
-                                            <template v-if="p.priceFlag==0 || p.userIdentity==2 || (p.userIdentity==3 && p.supplierId==GLOBAL_SHOP_ID)">
+                                            <template v-if="p.priceFlag==0 && p.userIdentity==2 || (p.userIdentity==3 && p.supplierId==GLOBAL_SHOP_ID)">
                                                 <em class="p" v-text="'¥'+parseFloat(p.price).toFixed(2)"></em>
                                                 <span class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</span>
                                             </template>

+ 5 - 1
src/main/resources/templates/supplier-center/shop/release.html

@@ -66,18 +66,21 @@
                                 <div class="release-input">
                                     <div class="select-main" :class="[isSelectActive == 1 ? 'border' : '']">
                                         <input class="select" v-model="selectText.bigTypeID" type="text" readonly="readonly" placeholder="请选择分类" @click.stop.prevent="showOption('first')">
+                                        <i class="mIcon selected"></i>
                                         <div class="option-main" v-if="isSelectActive == 1">
                                             <div class="option" v-for="x in classificationFirstList" :key="x.bigTypeID" @click="ChangeClassificationFirst(x)">{{x.name}}</div>
                                         </div>
                                     </div>
                                     <div class="select-main" :class="[isSelectActive == 2 ? 'border' : '']">
                                         <input class="select" v-model="selectText.smallTypeID" type="text" readonly="readonly" placeholder="请选择分类" @click.stop.prevent="showOption('two')">
+                                         <i class="mIcon selected"></i>
                                         <div class="option-main" v-if="isSelectActive == 2">
                                             <div class="option" v-for="x in classificationTwoList" :key="x.value" @click="ChangeClassificationTwo(x)">{{x.name}}</div>
                                         </div>
                                     </div>
                                     <div class="select-main" :class="[isSelectActive == 3 ? 'border' : '']">
                                         <input class="select" v-model="selectText.tinyTypeID" type="text" readonly="readonly" placeholder="请选择分类" @click.stop.prevent="showOption('three')">
+                                         <i class="mIcon selected"></i>
                                         <div class="option-main" v-if="isSelectActive == 3">
                                             <div class="option" v-for="x in classificationThreeList" :key="x.value" @click="ChangeClassificationThree(x)">{{x.name}}</div>
                                         </div>
@@ -132,6 +135,7 @@
                                 <div class="release-input">
                                     <div class="select-main" :class="[isSelectActive == 4 ? 'border' : '']">
                                         <input class="select" v-model="selectText.goodsType" type="text" readonly="readonly" placeholder="请选择商品类型" @click.stop.prevent="showOption('type')">
+                                         <i class="mIcon selected"></i>
                                         <div class="option-main" v-if="isSelectActive == 4">
                                             <div class="option" v-for="x in goodsTypeList" :key="x.value" @click="SelectChangeTypeFn(x)">{{x.name}}</div>
                                         </div>
@@ -203,7 +207,7 @@
                                     <div class="release-param" v-for="(item, index) in paramKeyList" :key="index">
                                         <input class="param-input" v-model="paramKeyList[index].paramsName" type="text" placeholder="参数名称" maxlength="10">
                                         <input class="param-input" v-model="paramKeyList[index].paramsContent" type="text" placeholder="参数信息" maxlength="50">
-                                        <a href="javascript: void(0);" class="del-btn icon" v-show="index>0" @click="removeParamsFn"></a>
+                                        <a href="javascript: void(0);" class="del-btn icon mIcon" v-show="index>0" @click="removeParamsFn"></a>
                                     </div>
                                     <a href="javascript: void(0);" class="add" @click="addParamsFn" v-if="isPC">添加参数<span>+</span></a>
                                      <a href="javascript: void(0);" class="add" @click="addParamsFn" V-else>添加参数</a>

+ 1 - 1
src/main/resources/templates/user-center/setting/information.html

@@ -186,7 +186,7 @@
                         </div>
                         <div class="formLine">
                             <p>公司介绍:</p>
-                            <div class="address">
+                            <div class="address info">
                                 <textarea placeholder="请输入公司的简介,最多500字!" maxlength="500"  v-model="clubUpgradeUser.info"></textarea>
                             </div>
                         </div>