Parcourir la source

Merge branch 'dev4.5' of http://192.168.3.207:8080/qmx/jy into dev4.5

wangshan il y a 4 ans
Parent
commit
762c704737

+ 3 - 1
src/jfw/modules/app/src/web/templates/weixin/search/tabSearch.html

@@ -563,7 +563,9 @@
                                         </div>
                                     </div>
                                     <div class="ent-info-bottom ent-row" v-show="item.status >= 0 || item.address">
-                                        <span class="ent-info-status" v-show="item.status >= 0" :class="'status-' + item.status">@@statusEnum[item.status]@@</span>
+                                        <div class="ent-info-status-box">
+                                            <span class="ent-info-status" v-show="item.status >= 0" :class="'status-' + item.status">@@statusEnum[item.status]@@</span>
+                                        </div>
                                         <div  class="ent-row ent-address"  v-show="item.address">
                                             <div class="van-multi-ellipsis--l2">@@item.address@@</div>
                                             <i class="j-icon base-icon icon-address"></i>

+ 0 - 491
src/web/staticres/common-module/ent-search/ent-search-template.css

@@ -1,491 +0,0 @@
-.v-ent-search-group {
-  display: block !important;
-  background-color: #f5f6f7;
-}
-
-.v-ent-search-group .ent-search-item {
-  margin-top: 8px;
-  display: flex;
-  flex-direction: column;
-  padding: 0.32rem;
-  background-color: #fff;
-}
-
-.v-ent-search-group .ent-search-list {
-  display: flex;
-  flex-direction: column;
-}
-
-.ent-info-head {
-  flex-shrink: 0;
-  position: relative;
-  width: 1.68rem;
-  height: 1.68rem;
-  background: rgba(0, 0, 0, 0.05);
-  border: 0.5px solid rgba(0, 0, 0, 0.05);
-  box-sizing: border-box;
-  border-radius: 0.08rem;
-  font-weight: 500;
-  font-size: 0.48rem;
-  line-height: 0.56rem;
-  text-align: center;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  padding: 0 0.1rem 0 0.2rem;
-  letter-spacing: 0.1rem;
-  color: #fff;
-}
-
-.ent-info-bottom {
-  display: flex;
-  flex-direction: row;
-  margin-top: 0.24rem;
-  justify-content: space-between;
-}
-
-.ent-info-bottom .ent-info-status {
-  background: transparent;
-  border-radius: 0.08rem;
-  font-family: PingFang SC;
-  font-style: normal;
-  font-weight: 500;
-  font-size: 0.24rem;
-  line-height: 0.36rem;
-  color: #2ABED1;
-  border: 0.01rem solid #2ABED1;
-  padding: 0 0.08rem;
-  display: inline-block;
-}
-
-.ent-info-bottom .ent-info-status.status-1 {
-  color: #FB483D;
-  border-color: #FB483D;
-}
-
-.ent-info-bottom .ent-info-status.status-1 {
-  color: #FF9F40;
-  border-color: #FF9F40;
-}
-
-.ent-info-bottom .ent-info-status.status-1 {
-  color: #9B9CA3;
-  border-color: #9B9CA3;
-}
-
-.ent-info-top {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  justify-content: space-between;
-}
-
-.ent-row {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  justify-content: space-between;
-}
-
-.ent-search-list .j-icon {
-  flex-shrink: 0;
-  width: 0.4rem;
-  height: 0.4rem;
-}
-
-.ent-info-keep .ent-name {
-  font-family: PingFang SC;
-  font-style: normal;
-  font-weight: 500;
-  font-size: 0.32rem;
-  line-height: 0.48rem;
-  color: #171826;
-  max-width: 4.3rem;
-}
-
-.ent-info-keep .fill-icon-box {
-  padding: 0.12rem;
-  padding-right: 0;
-}
-
-.ent-info-keep {
-  margin-left: 0.24rem;
-  flex: 1;
-}
-
-.ent-more span {
-  color: #2ABED1;
-  margin-top: 0.08rem;
-}
-
-.ent-more {
-  font-family: PingFang SC;
-  font-style: normal;
-  font-weight: 500;
-  font-size: 0.26rem;
-  line-height: 0.36rem;
-  color: #5F5E64;
-  margin-top: 0.2rem;
-}
-
-.ent-line-box {
-  margin-top: 0.24rem;
-  width: 4.22rem;
-  height: 0.01rem;
-  background: rgba(0, 0, 0, 0.05);
-  border-radius: 0.08rem;
-}
-
-.ent-address > div {
-  font-family: PingFang SC;
-  font-style: normal;
-  font-weight: normal;
-  font-size: 0.22rem;
-  line-height: 0.32rem;
-  color: #5F5E64;
-  max-width: 4.22rem;
-  margin-right: 0.32rem;
-}
-
-.up-button {
-  margin: 0.48rem auto;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  width: 4.98rem;
-  height: 0.64rem;
-  min-height: 0.64rem;
-  border: 1px solid #2ABED1;
-  box-sizing: border-box;
-  border-radius: 0.08rem;
-  font-family: PingFang SC;
-  font-style: normal;
-  font-weight: 500;
-  font-size: 0.26rem;
-  line-height: 0.48rem;
-  color: #2ABED1;
-}
-
-.ent-more-tip .j-icon {
-  margin-right: 0.08rem;
-}
-
-.ent-more-tip {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  justify-content: center;
-  font-family: PingFang SC;
-  font-style: normal;
-  font-weight: 500;
-  font-size: 0.28rem;
-  line-height: 0.4rem;
-  color: #9B9CA3;
-}
-
-.v-ent-search-group .van-tabs__line {
-  opacity: 0 !important;
-}
-
-.v-ent-search-group .an-icon-box {
-  position: relative;
-  width: 0.32rem;
-  height: 0.32rem;
-}
-
-.v-ent-search-group .an-icon-box .j-icon {
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 0.32rem !important;
-  height: 0.32rem !important;
-  transition: all 0.2s;
-  margin-left: 0.04rem;
-}
-
-.v-ent-search-group .an-icon-box .icon-triangle-up {
-  opacity: 0;
-}
-
-.v-ent-search-group .an-icon-box .icon-triangle-down {
-  opacity: 1;
-}
-
-.v-ent-search-group .ent-search-tab-item {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  justify-content: center;
-  font-family: PingFang SC;
-  font-style: normal;
-  font-weight: 500;
-  font-size: 0.28rem;
-  line-height: 0.4rem;
-  color: #5F5E64;
-  padding: 0.24rem 0.38rem;
-}
-
-.v-ent-search-group .ent-search-tab-item .disabled-tag {
-  display: none;
-  width: 0.64rem;
-  height: 0.32rem;
-  border: 0.02rem solid #FB483D;
-  box-sizing: border-box;
-  border-radius: 0.16rem;
-  font-family: PingFang SC;
-  font-style: normal;
-  font-weight: 500;
-  text-align: center;
-  font-size: 0.2rem;
-  line-height: 0.32rem;
-  color: #FB483D;
-  margin: 0 0.04rem;
-}
-
-.v-ent-search-group .ent-search-tab-item.ent-p-disabled {
-  color: #C0C4CC !important;
-}
-
-.v-ent-search-group .ent-search-tab-item.ent-p-disabled .disabled-tag {
-  display: inline-block;
-}
-
-.v-ent-search-group .ent-search-tab-item.ent-p-select {
-  color: #2ABED1 !important;
-}
-
-.v-ent-search-group .ent-search-tab-item.ent-p-hide {
-  display: none;
-}
-
-.v-ent-search-group .van-tabs--line .van-tabs__wrap::after {
-  border-width: 0;
-  border-bottom-width: 1px;
-}
-
-.v-ent-search-group .van-tab--active .ent-search-tab-item {
-  color: #2ABED1;
-}
-
-.v-ent-search-group .van-tab--active .ent-search-tab-item .icon-triangle-up {
-  opacity: 1;
-}
-
-.v-ent-search-group .van-tab--active .ent-search-tab-item .icon-triangle-down {
-  opacity: 0;
-}
-
-.v-ent-search-group .van-tab--active .ent-search-tab-item.ent-p-close {
-  color: #5F5E64;
-}
-
-.v-ent-search-group .van-tab--active .ent-search-tab-item.ent-p-close .icon-triangle-up {
-  opacity: 0;
-}
-
-.v-ent-search-group .van-tab--active .ent-search-tab-item.ent-p-close .icon-triangle-down {
-  opacity: 1;
-}
-
-.v-ent-search-group .ent-search-list {
-  overflow-y: auto;
-  position: relative;
-}
-
-.v-ent-search-group .ent-search-list.stop {
-  overflow: hidden;
-}
-
-.v-ent-search-group .jy-diy-pop {
-  position: absolute;
-  bottom: 0;
-  left: 0;
-  width: 100%;
-  height: unset;
-}
-
-.v-ent-search-group .jy-diy-pop > .van-overlay {
-  position: absolute;
-  z-index: 2020;
-}
-
-.v-ent-search-group .jy-diy-pop > .van-popup {
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 100%;
-  background-color: #fff;
-  z-index: 2021;
-}
-
-.v-ent-search-group .jy-diy-pop .popup-content {
-  max-height: 40vh;
-  overflow-y: auto;
-}
-
-.v-ent-search-group .jy-diy-pop .popup-content .j-footer {
-  display: none;
-}
-
-.v-ent-search-group .jy-diy-pop .popup-content .van-popup .j-footer {
-  display: flex;
-}
-
-.v-ent-search-group .empty-tip-group {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  font-family: PingFang SC;
-  font-style: normal;
-  font-weight: 500;
-  font-size: 0.28rem;
-  line-height: 0.4rem;
-  color: #5F5E64;
-}
-
-.v-ent-search-group .empty-tip-group .img-empty {
-  width: 3.2rem;
-  height: 3.2rem;
-  margin-bottom: 0.24rem;
-  margin-top: 1.76rem;
-}
-
-.v-ent-search-group .wait-buy-tip-group {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  font-family: PingFang SC;
-  font-style: normal;
-  font-weight: 500;
-  padding: 0.96rem 0;
-  border-bottom: 0.5px solid rgba(0, 0, 0, 0.05);
-}
-
-.v-ent-search-group .wait-buy-tip-group h3 {
-  font-size: 0.36rem;
-  line-height: 0.52rem;
-  color: #171826;
-  margin-bottom: 0.16rem;
-}
-
-.v-ent-search-group .wait-buy-tip-group p {
-  font-size: 0.3rem;
-  line-height: 0.44rem;
-  text-align: center;
-  color: #5F5E64;
-}
-
-.v-ent-search-group .condition-select-group {
-  padding-left: 0.32rem;
-}
-
-.v-ent-search-group .condition-select-group.more .condition-select-item .more-icon-box {
-  position: relative;
-  width: 0.48rem;
-  height: 0.48rem;
-}
-
-.v-ent-search-group .condition-select-group.more .condition-select-item .more-icon-box .j-icon {
-  top: 0;
-  left: 0;
-  position: absolute;
-}
-
-.v-ent-search-group .condition-select-group.more .condition-select-item .icon-tick-circle-fill {
-  opacity: 0;
-}
-
-.v-ent-search-group .condition-select-group.more .condition-select-item .icon-tick-circle {
-  opacity: 1;
-}
-
-.v-ent-search-group .condition-select-group.more .condition-select-item.checked .icon-tick-circle-fill {
-  opacity: 1;
-}
-
-.v-ent-search-group .condition-select-group.more .condition-select-item.checked .icon-tick-circle {
-  opacity: 0;
-}
-
-.v-ent-search-group .condition-select-group .condition-select-item {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  justify-content: space-between;
-  padding: 0.24rem 0.32rem;
-  padding-left: 0;
-  border-bottom: 0.5px solid rgba(0, 0, 0, 0.05);
-  font-family: PingFang SC;
-  font-style: normal;
-  font-weight: 500;
-  font-size: 0.28rem;
-  line-height: 0.4rem;
-  color: #5F5E64;
-}
-
-.v-ent-search-group .condition-select-group .condition-select-item .j-icon {
-  opacity: 0;
-  width: 0.48rem;
-  height: 0.48rem;
-  transition: all 0.2s;
-}
-
-.v-ent-search-group .condition-select-group .condition-select-item.checked {
-  color: #2ABED1;
-}
-
-.v-ent-search-group .condition-select-group .condition-select-item.checked .j-icon {
-  opacity: 1;
-}
-
-.v-ent-search-group .pop-bottom {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  justify-content: space-between;
-  padding: 0.16rem 0.32rem;
-}
-
-.v-ent-search-group .pop-bottom > .van-button {
-  flex: 1;
-  font-family: PingFang SC;
-  font-style: normal;
-  font-weight: 500;
-  font-size: 0.32rem;
-  line-height: 0.48rem;
-  color: #5F5E64;
-  background: #EDEFF2;
-  border-radius: 4px;
-}
-
-.v-ent-search-group .pop-bottom > .van-button--primary {
-  color: #fff;
-  border-color: #2ABED1;
-  background-color: #2ABED1;
-}
-
-.v-ent-search-group .pop-bottom > .van-button + .van-button {
-  margin-left: 0.26rem;
-}
-
-.ent-stop-scroll {
-  overflow: hidden !important;
-}
-
-#supersearchPage .app-layout-content-b #wrapper {
-  position: relative;
-}
-
-#date-picker-other-box .van-overlay {
-  z-index: 2050 !important;
-}
-
-#date-picker-other-box .van-popup {
-  z-index: 2051 !important;
-}
-
-/*# sourceMappingURL=ent-search-template.css.map */

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 7
src/web/staticres/common-module/ent-search/ent-search-template.css.map


+ 22 - 13
src/web/staticres/common-module/ent-search/ent-search-template.prefixer.css

@@ -37,15 +37,15 @@
     -webkit-flex-shrink: 0;
     flex-shrink: 0;
     position: relative;
-    width: 1.68rem;
-    height: 1.68rem;
+    width: 1.28rem;
+    height: 1.28rem;
     background: rgba(0, 0, 0, 0.05);
     border: 0.5px solid rgba(0, 0, 0, 0.05);
     box-sizing: border-box;
     border-radius: 0.08rem;
     font-weight: 500;
-    font-size: 0.48rem;
-    line-height: 0.56rem;
+    font-size: 0.32rem;
+    line-height: 0.36rem;
     text-align: center;
     display: -webkit-box;
     display: -webkit-flex;
@@ -60,12 +60,12 @@
     -webkit-box-pack: center;
     -webkit-justify-content: center;
     justify-content: center;
-    padding: 0 0.1rem 0 0.2rem;
-    letter-spacing: 0.1rem;
+    padding: 0 0.16rem 0 0.2rem;
+    letter-spacing: 0.04rem;
     color: #fff;
 }
 
-.ent-info-bottom {
+.ent-info-bottom.ent-row {
     display: -webkit-box;
     display: -webkit-flex;
     display: flex;
@@ -79,6 +79,15 @@
     justify-content: space-between;
 }
 
+.ent-info-bottom .ent-address {
+    margin-left: 0.24rem;
+    -webkit-box-flex: 1;
+    -webkit-flex: 1;
+    flex: 1;
+}
+.ent-info-bottom .ent-info-status-box {
+    width: 1.28rem;
+}
 .ent-info-bottom .ent-info-status {
     background: transparent;
     border-radius: 0.08rem;
@@ -116,9 +125,9 @@
     -webkit-box-direction: normal;
     -webkit-flex-direction: row;
     flex-direction: row;
-    -webkit-box-align: center;
-    -webkit-align-items: center;
-    align-items: center;
+    -webkit-box-align: start;
+    -webkit-align-items: flex-start;
+    align-items: flex-start;
     -webkit-box-pack: justify;
     -webkit-justify-content: space-between;
     justify-content: space-between;
@@ -181,12 +190,12 @@
     font-size: 0.26rem;
     line-height: 0.36rem;
     color: #5F5E64;
-    margin-top: 0.2rem;
+    margin-top: 0.08rem;
 }
 
 .ent-line-box {
     margin-top: 0.24rem;
-    width: 4.22rem;
+    width: 4.62rem;
     height: 0.01rem;
     background: rgba(0, 0, 0, 0.05);
     border-radius: 0.08rem;
@@ -199,7 +208,7 @@
     font-size: 0.22rem;
     line-height: 0.32rem;
     color: #5F5E64;
-    max-width: 4.22rem;
+    max-width: 4.62rem;
     margin-right: 0.32rem;
 }
 

+ 0 - 445
src/web/staticres/common-module/ent-search/ent-search-template.scss

@@ -1,445 +0,0 @@
-.v-ent-search-group {
-  display: block !important;
-  background-color: #f5f6f7;
-}
-.v-ent-search-group .ent-search-item {
-  margin-top: 8px;
-  display: flex;
-  flex-direction: column;
-  padding: 0.32rem;
-  background-color: #fff;
-}
-.v-ent-search-group .ent-search-list {
-  display: flex;
-  flex-direction: column;
-}
-.ent-info-head {
-  flex-shrink: 0;
-  position: relative;
-  width: 1.68rem;
-  height: 1.68rem;
-  background: rgba(0, 0, 0, 0.05);
-  border: 0.5px solid rgba(0, 0, 0, 0.05);
-  box-sizing: border-box;
-  border-radius: 0.08rem;
-  font-weight: 500;
-  font-size: 0.48rem;
-  line-height: 0.56rem;
-  text-align: center;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  padding: 0 0.1rem 0 0.2rem;
-  letter-spacing: 0.1rem;
-  color: #fff;
-}
-.ent-info-bottom {
-  display: flex;
-  flex-direction: row;
-  margin-top: 0.24rem;
-  justify-content: space-between;
-  .ent-info-status {
-    background: transparent;
-    border-radius: 0.08rem;
-    font-family: PingFang SC;
-    font-style: normal;
-    font-weight: 500;
-    font-size: 0.24rem;
-    line-height: 0.36rem;
-    color: #2ABED1;
-    border: 0.01rem solid #2ABED1;
-    padding: 0 0.08rem;
-    display: inline-block;
-    &.status-1 {
-      color: #FB483D;
-      border-color: #FB483D;
-    }
-    &.status-1 {
-      color: #FF9F40;
-      border-color: #FF9F40;
-    }
-    &.status-1 {
-      color: #9B9CA3;
-      border-color: #9B9CA3;
-    }
-  }
-}
-
-.ent-info-top {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  justify-content: space-between;
-}
-.ent-row {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  justify-content: space-between;
-}
-.ent-search-list .j-icon {
-  flex-shrink: 0;
-  width: 0.4rem;
-  height: 0.4rem;
-}
-.ent-info-keep .ent-name {
-  font-family: PingFang SC;
-  font-style: normal;
-  font-weight: 500;
-  font-size: 0.32rem;
-  line-height: 0.48rem;
-  color: #171826;
-  max-width: 4.3rem;
-}
-.ent-info-keep .fill-icon-box {
-  padding: 0.12rem;
-  padding-right: 0;
-}
-.ent-info-keep {
-  margin-left: 0.24rem;
-  flex: 1;
-}
-.ent-more span {
-  color: #2ABED1;
-  margin-top: 0.08rem;
-}
-.ent-more {
-  font-family: PingFang SC;
-  font-style: normal;
-  font-weight: 500;
-  font-size: 0.26rem;
-  line-height: 0.36rem;
-  color: #5F5E64;
-  margin-top: 0.2rem;
-}
-.ent-line-box {
-  margin-top: 0.24rem;
-  width: 4.22rem;
-  height: 0.01rem;
-  background: rgba(0, 0, 0, 0.05);
-  border-radius: 0.08rem;
-}
-.ent-address > div{
-  font-family: PingFang SC;
-  font-style: normal;
-  font-weight: normal;
-  font-size: 0.22rem;
-  line-height: 0.32rem;
-  color: #5F5E64;
-  max-width: 4.22rem;
-  margin-right: 0.32rem;
-}
-.up-button {
-  margin: 0.48rem auto;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  width: 4.98rem;
-  height: 0.64rem;
-  min-height: 0.64rem;
-  border: 1px solid #2ABED1;
-  box-sizing: border-box;
-  border-radius: 0.08rem;
-
-  font-family: PingFang SC;
-  font-style: normal;
-  font-weight: 500;
-  font-size: 0.26rem;
-  line-height: 0.48rem;
-  color: #2ABED1;
-
-}
-.ent-more-tip .j-icon {
-  margin-right: 0.08rem;
-}
-.ent-more-tip {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  justify-content: center;
-  font-family: PingFang SC;
-  font-style: normal;
-  font-weight: 500;
-  font-size: 0.28rem;
-  line-height: 0.4rem;
-  color: #9B9CA3;
-}
-
-.v-ent-search-group {
-  .van-tabs__line {
-    opacity: 0 !important;
-  }
-  .an-icon-box {
-    position: relative;
-    width: 0.32rem;
-    height: 0.32rem;
-    .j-icon {
-      position: absolute;
-      top: 0;
-      left: 0;
-      width: 0.32rem !important;
-      height: 0.32rem !important;
-      transition: all 0.2s;
-      margin-left: 0.04rem;
-    }
-    .icon-triangle-up {
-      opacity: 0;
-    }
-    .icon-triangle-down {
-      opacity: 1;
-    }
-  }
-  .ent-search-tab-item {
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    justify-content: center;
-    font-family: PingFang SC;
-    font-style: normal;
-    font-weight: 500;
-    font-size: 0.28rem;
-    line-height: 0.4rem;
-    color: #5F5E64;
-    padding: 0.24rem 0.38rem;
-    .disabled-tag {
-      display: none;
-      width: 0.64rem;
-      height: 0.32rem;
-      border: 0.02rem solid #FB483D;
-      box-sizing: border-box;
-      border-radius: 0.16rem;
-      font-family: PingFang SC;
-      font-style: normal;
-      font-weight: 500;
-      text-align: center;
-      font-size: 0.2rem;
-      line-height: 0.32rem;
-      color: #FB483D;
-      margin: 0 0.04rem;
-    }
-    &.ent-p-disabled {
-      color: #C0C4CC !important;
-      .disabled-tag {
-        display: inline-block;
-      }
-    }
-    &.ent-p-select {
-      color: #2ABED1 !important;
-    }
-    &.ent-p-hide {
-      display: none;
-    }
-  }
-  .van-tabs--line .van-tabs__wrap::after {
-    border-width: 0;
-    border-bottom-width: 1px;
-  }
-
-  .van-tab--active {
-    .ent-search-tab-item {
-      color: #2ABED1;
-      .icon-triangle-up {
-        opacity: 1;
-      }
-      .icon-triangle-down {
-        opacity: 0;
-      }
-      &.ent-p-close {
-        color: #5F5E64;
-        .icon-triangle-up {
-          opacity: 0;
-        }
-        .icon-triangle-down {
-          opacity: 1;
-        }
-      }
-    }
-  }
-  .ent-search-list {
-    overflow-y: auto;
-    position: relative;
-    &.stop {
-      overflow: hidden;
-    }
-  }
-  .jy-diy-pop {
-    position: absolute;
-    bottom: 0;
-    left: 0;
-    width: 100%;
-    height: unset;
-    > .van-overlay {
-      position: absolute;
-      z-index: 2020;
-    }
-    > .van-popup {
-      position: absolute;
-      top: 0;
-      left: 0;
-      width: 100%;
-      background-color: #fff;
-      z-index: 2021;
-    }
-    .popup-content {
-      max-height: 40vh;
-      overflow-y: auto;
-      .j-footer {
-        display: none;
-      }
-      .van-popup .j-footer {
-        display: flex;
-      }
-    }
-  }
-
-  .empty-tip-group {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    font-family: PingFang SC;
-    font-style: normal;
-    font-weight: 500;
-    font-size: 0.28rem;
-    line-height: 0.4rem;
-    color: #5F5E64;
-    .img-empty {
-      width: 3.2rem;
-      height: 3.2rem;
-      margin-bottom: 0.24rem;
-      margin-top: 1.76rem;
-    }
-  }
-
-  .wait-buy-tip-group {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    font-family: PingFang SC;
-    font-style: normal;
-    font-weight: 500;
-    padding: 0.96rem 0;
-    border-bottom: 0.5px solid rgba(0, 0, 0, 0.05);
-    h3 {
-      font-size: 0.36rem;
-      line-height: 0.52rem;
-      color: #171826;
-      margin-bottom: 0.16rem;
-    }
-    p {
-      font-size: 0.3rem;
-      line-height: 0.44rem;
-      text-align: center;
-      color: #5F5E64;
-    }
-  }
-
-  .condition-select-group {
-    padding-left: 0.32rem;
-    &.more {
-      .condition-select-item {
-        .more-icon-box {
-          position: relative;
-          width: 0.48rem;
-          height: 0.48rem;
-          .j-icon {
-            top: 0;
-            left: 0;
-            position: absolute;
-          }
-        }
-        .icon-tick-circle-fill {
-          opacity: 0;
-        }
-        .icon-tick-circle {
-          opacity: 1;
-        }
-        &.checked {
-          .icon-tick-circle-fill {
-            opacity: 1;
-          }
-          .icon-tick-circle {
-            opacity: 0;
-          }
-        }
-      }
-    }
-    .condition-select-item {
-      display: flex;
-      flex-direction: row;
-      align-items: center;
-      justify-content: space-between;
-      padding: 0.24rem 0.32rem;
-      padding-left: 0;
-      border-bottom: 0.5px solid rgba(0, 0, 0, 0.05);
-      font-family: PingFang SC;
-      font-style: normal;
-      font-weight: 500;
-      font-size: 0.28rem;
-      line-height: 0.4rem;
-      color: #5F5E64;
-      .j-icon {
-        opacity: 0;
-        width: 0.48rem;
-        height: 0.48rem;
-        transition: all 0.2s;
-      }
-      &.checked {
-        color: #2ABED1;
-        .j-icon {
-          opacity: 1;
-        }
-      }
-    }
-  }
-
-  .pop-bottom {
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    justify-content: space-between;
-    padding: 0.16rem 0.32rem;
-    > .van-button {
-      flex: 1;
-
-      font-family: PingFang SC;
-      font-style: normal;
-      font-weight: 500;
-      font-size: 0.32rem;
-      line-height: 0.48rem;
-      color: #5F5E64;
-      background: #EDEFF2;
-      border-radius: 4px;
-      &--primary {
-        color: #fff;
-        border-color: #2ABED1;
-        background-color: #2ABED1;
-      }
-
-
-      & + .van-button {
-        margin-left: 0.26rem;
-      }
-    }
-  }
-}
-
-.ent-stop-scroll {
-  overflow: hidden !important;
-}
-
-#supersearchPage .app-layout-content-b #wrapper {
-  position: relative;
-}
-
-#date-picker-other-box {
-  .van-overlay {
-    z-index: 2050 !important;
-  }
-  .van-popup {
-    z-index: 2051 !important;
-  }
-}

+ 6 - 6
src/web/staticres/js/superSearch.js

@@ -362,7 +362,7 @@ function appendDatas(datas,flag,isNew,onlyUpdateTable){
       if (selectType == "title") {
         listHtml += '<input class="custom-checkbox title-text-checkbox" name="bid-list" type="checkbox" dataid="'+datas[i]._id+'" />'
         listHtml +='<div class="luce-left"><em>'+index+'.</em>'
-						+'<div class="left-title" style="width:650px;">'
+						+'<div class="left-title" style="width:700px;">'
 						+'<a onclick="noIn(this)" dataid="'+datas[i]._id+'" dataindustry="'+datas[i].industry+'" target="_blank"> '+title+'</a>'
 						+'</div>'
       }
@@ -396,11 +396,11 @@ function appendDatas(datas,flag,isNew,onlyUpdateTable){
 				listHtml += '<a href="javascript:volid(0);" style="display:none;"></a>';
       }
       // vipState付费用户显示采购单位类型 免费用户不显示
-      if(typeof(datas[i].buyerclass) != "undefined" && datas[i].buyerclass != null && datas[i].buyerclass != "" && vipState){
-				listHtml += '<a href="javascript:;">'+datas[i].buyerclass+'</a>';
-			}else{
-				listHtml += '<a href="javascript:volid(0);" style="display:none;"></a>';
-			}
+      // if(typeof(datas[i].buyerclass) != "undefined" && datas[i].buyerclass != null && datas[i].buyerclass != "" && vipState){
+			// 	listHtml += '<a href="javascript:;">'+datas[i].buyerclass+'</a>';
+			// }else{
+			// 	listHtml += '<a href="javascript:volid(0);" style="display:none;"></a>';
+			// }
 
 			var amount= getacount(datas[i].bidamount,datas[i].budget)
 			if(amount!=""){

+ 3 - 1
src/web/templates/weixin/search/tabSearch.html

@@ -571,7 +571,9 @@
                                         </div>
                                     </div>
                                     <div class="ent-info-bottom ent-row" v-show="item.status >= 0 || item.address">
-                                        <span class="ent-info-status" v-show="item.status >= 0" :class="'status-' + item.status">@@statusEnum[item.status]@@</span>
+                                        <div class="ent-info-status-box">
+                                            <span class="ent-info-status" v-show="item.status >= 0" :class="'status-' + item.status">@@statusEnum[item.status]@@</span>
+                                        </div>
                                         <div  class="ent-row ent-address"  v-show="item.address">
                                             <div class="van-multi-ellipsis--l2">@@item.address@@</div>
                                             <i class="j-icon base-icon icon-address"></i>

Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff