Merge branch 'dev2.10.4' of http://192.168.3.207:10080/qmx/jy into dev2.10.4

src/jfw/modules/app/src/web/staticres/jyapp/css/layout.css

@@ -300,368 +300,3 @@ ul, li, ol {
     background: #f12c20;
     border-radius: 100%;
 }
-/* -S p13 for v2.10.4 */
-/* -s page 首页*/
-#home_main.p13 .home .home_data .data_list {
-    padding: 0;
-}
-#home_main.p13 .home .home_data .data_list .list_item {
-    padding: .3rem .3rem .36rem .3rem;
-    display: block;
-    transition: background-color 150ms;
-    border: none;
-    position: relative;
-    overflow: hidden;
-}
-#home_main.p13 .home .home_data .data_list .list_item:hover {
-    background: #E6E6E6;
-}
-#home_main.p13 .home .home_data .data_list .list_item::after {
-    content: '';
-    position: absolute;
-    bottom: 0;
-    background: rgba(0, 0, 0, 0.05);
-    width: 100%;
-    height: 1px;
-    -webkit-transform: scaleY(0.5);
-    transform: scaleY(0.5);
-    -webkit-transform-origin: 0 0;
-    transform-origin: 0 0;
-}
-#home_main.p13 .home .home_data .data_list .serial_number {
-    display: none;
-}
-#home_main.p13 .content .keyword {
-    color: #2ABED1;
-}
-#home_main.p13 .home .home_data .data_list .tags > div {
-    color: #5F5E64;
-    font-size: 0.24rem;
-    line-height: 0.32rem;
-    background: #F7F9FA;
-    border: 0.5px solid rgba(0, 0, 0, 0.05);
-    box-sizing: border-box;
-    border-radius: 4px;
-    padding: 1px 0.16rem;
-    height: auto;
-    margin: 0 4px 0 0;
-}
-#home_main.p13 .home .home_data .data_list .list_info {
-
-}
-#home_main.p13 .home .home_data .data_list .tags {
-    padding-left: 0;
-}
-#home_main.p13 .home .home_data .data_list .list_title p {
-    font-size: 0.32rem;
-    line-height: 0.48rem;
-    color: #171826;
-    font-weight: 500;
-}
-
-/* search */
-.p13 #list {
-    padding: 0;
-}
-.p13 #list .tslist {
-    padding: .3rem .3rem .36rem .3rem;
-    display: block;
-    transition: background-color 150ms;
-    border: none;
-    position: relative;
-    overflow: hidden;
-}
-.p13 #list .tslist::after {
-    content: '';
-    position: absolute;
-    bottom: 0;
-    background: rgba(0, 0, 0, 0.05);
-    width: 100%;
-    height: 1px;
-    -webkit-transform: scaleY(0.5);
-    transform: scaleY(0.5);
-    -webkit-transform-origin: 0 0;
-    transform-origin: 0 0;
-}
-.p13 .tslist a.bt {
-    color: #171826 !important;
-    font-size: 0.32rem;
-    line-height: 0.48rem;
-}
-
-/* hover */
-.p13 #list .tslist:hover,
-.p13 #list .tslist.visited:hover {
-    background: #E6E6E6;
-}
-.p13 .tslist:hover a.bt, .p13 .tslist.visited a.bt {
-    color: #9B9CA3 !important;
-}
-.p13 .tslist:hover .restime, .p13 .tslist.visited .restime {
-    color: #9B9CA3;
-}
-.p13 #list .tslist.visited {
-    background: #fff;
-}
-
-.p13 .tslist .keyword {
-    color: #2ABED1;
-}
-.p13 .resnumb .one {
-    display: none;
-}
-.p13 .resnumb .two {
-    padding-left: 0 !important;
-    max-height: 0.97rem;
-}
-.p13 .restime {
-    float: left;
-    width: 100%;
-    margin-top: 0.26rem;
-    color: #5F5E64;
-    position: relative;
-}
-.p13 .restime span i {
-    display: none;
-}
-.p13 .restime span.location, .p13 .restime span.industry, .p13 .restime span.type, .p13 .restime span.buyerclass {
-    color: inherit;
-    font-size: 0.24rem;
-    line-height: 0.32rem;
-    background: #F7F9FA;
-    border: 0.5px solid rgba(0, 0, 0, 0.05);
-    box-sizing: border-box;
-    border-radius: 4px;
-    padding: 1px 0.16rem;
-    height: auto;
-    display: inline-block;
-    margin: 0 4px 0 0;
-}
-.p13 .restime > span:last-child {
-    color: #9B9CA3;
-    float: right;
-    position: absolute;
-    top: 0;
-    right: 0;
-}
-
-/*  全文 */
-#home_main.p13 .detail {
-    padding: 0 !important;
-    margin-top: 0.24rem;
-    font-size: 0.26rem;
-    line-height: 0.4rem;
-    color: #5F5E64;
-}
-
-/* ad */
-.p13 #supersearchPage .adv-appsearch-center, .p13 .adv-wxpush-center {
-    max-height: 1.28rem;
-    overflow: hidden;
-    border-radius: 8px;
-    margin: 0.36rem 0.32rem 0;
-    width: auto;
-}
-.p13 #supersearchPage .adv-appsearch-center::before, .p13 .adv-wxpush-center::before {
-    content: '广告';
-    position: absolute;
-    display: inline-block;
-    border-radius: 2px;
-    background: rgba(0, 0, 0, 0.27);
-    color: #fff;
-    font-size: 0.24rem;
-    line-height: 0.28rem;
-    padding: 1px 4px;
-    top: 0.1rem;
-    left: 0.16rem;
-}
-.p13 #supersearchPage img.closeadv, .p13 .adv-wxpush-center img.closeadv {
-    width: 0.32rem;
-    top: 0.1rem;
-    right: 0.1rem;
-    z-index: 1;
-}
-.p13 #supersearchPage .closeadv-bg, .p13 .adv-wxpush-center .closeadv-bg  {
-    width: 0.32rem;
-    height: 0.32rem;
-    top: 0.1rem;
-    right: 0.1rem;
-    z-index: 1;
-}
-
-/* -e page 首页 */
-.p13 .listcontent {
-    padding: 0;
-}
-
-/* -s page 订阅*/
-.p13 .jymobile-datePicker .weui-half-screen-dialog__ft{
-    padding-left: 0;
-    padding-right: 0;
-}
-.p13 .jymobile-datePicker .weui-picker__indicator:after, .p13 .jymobile-datePicker .weui-picker__indicator:before {
-    content: none;
-}
-.p13 .jymobile-datePicker .weui-picker__item {
-    font-size: 0.3rem;
-}
-.p13 .jymobile-datePicker .weui-picker__item.is-now-select  {
-    color: #2ABED1;
-    font-size: 0.36rem;
-}
-.p13 .jymobile-datePicker .weui-picker__indicator {
-    background: rgba(42, 190, 209, 0.05);
-}
-.p13 .jymobile-datePicker .weui-half-screen-dialog {
-    padding: 0;
-}
-.p13 .jymobile-datePicker .weui-half-screen-dialog__hd {
-    padding: 0 0.32rem;
-    flex-direction: row-reverse;
-}
-.p13 .jymobile-datePicker .weui-half-screen-dialog__hd__side+.weui-half-screen-dialog__hd__main {
-    text-align: left;
-    padding-left: 0;
-}
-.p13 ._header.fix-top {
-    position: fixed;
-    transition: all 0.3s;
-}
-.p13 .filter_tab.is-hide-border {
-    border-bottom-color: transparent;
-}
-.p13 .jymobile-datePicker .weui-half-screen-dialog__title {
-    color: #171826;
-    font-size: 0.4rem;
-    font-weight: 500;
-}
-.p13 .jymobile-datePicker.up .weui-picker {
-    border-radius: 0;
-    z-index: 666;
-    top: 1rem;
-    bottom: initial;
-    bottom: unset;
-    padding-top: 0.8rem;
-    /*max-height: calc(75% - 2.4rem);*/
-}
-@keyframes aa {
-    0% {
-        -webkit-transform: translate3d(0,100%,0);
-        transform: translate3d(0,-100%,0);
-    }
-    100% {
-        -webkit-transform: translateZ(0);
-        transform: translateZ(0);
-    }
-}
-@keyframes bb {
-    0% {
-        -webkit-transform: translateZ(0);
-        transform: translateZ(0);
-    }
-    100% {
-        -webkit-transform: translate3d(0,100%,0);
-        transform: translate3d(0,-100%,0);
-    }
-}
-.p13 .jymobile-datePicker.up .weui-animate-slide-up.weui-animate-slide-down {
-    animation-name: bb;
-    animation-duration: 0.44s;
-}
-.p13 .jymobile-datePicker.up .weui-animate-slide-up {
-    /*animation-direction: reverse;*/
-    animation-duration: 0.44s;
-    animation-name: aa;
-}
-.p13 .jymobile-datePicker.up .weui-half-screen-dialog__hd{
-    display: none;
-}
-.p13 .jymobile-datePicker .weui-mask, .weui-mask_transparent {
-    z-index: 666;
-    top: 0 !important;
-}
-.p13 .jymobile-datePicker .weui-btn_disabled{
-    flex: 1;
-    margin: 0 0.32rem;
-    padding: 0.1rem 0;
-    background: #EDEFF2;
-    border-radius: 8px;
-    color: #5F5E64 !important;
-    font-weight: 500;
-    font-size: 0.32rem;
-    line-height: 0.6rem;
-    width: calc(50% - 0.32rem) !important;
-}
-.p13 .jymobile-datePicker .weui-btn_disabled + .weui-btn_primary{
-    width: calc(50% - 0.32rem) !important;
-}
-.p13 .jymobile-datePicker .weui-btn_primary{
-    flex: 1;
-    margin: 0 0.32rem;
-    height: 0.8rem;
-    box-sizing: border-box;
-    padding: 0.1rem 0;
-    width: auto;
-    background: #2ABED1;
-    border-radius: 8px;
-    color: #F7F9FA !important;
-    font-weight: 500;
-    font-size: 0.32rem;
-    line-height: 0.6rem;
-}
-.p13 .jymobile-datePicker  .weui-half-screen-dialog__ft {
-    padding: 8px 0;
-    border: none;
-    position: relative;
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-
-}
-.p13 .jymobile-datePicker .weui-half-screen-dialog__hd .weui-icon-btn {
-    background: url(/jyapp/images/wxqc.png?v=1429);
-    color: transparent;
-    width: 16px;
-    height: 16px;
-    background-size: 100% 100%;
-    -webkit-mask: none;
-    position: unset;
-    margin-right: -8px;
-    top: unset;
-    -webkit-transform:unset;
-    transform: unset;
-}
-.p13 .filter_tab .area_container .area_wrap .handle_menu {
-    padding: 0.16rem 0;
-    border: none;
-    position: relative;
-    height: 1.12rem;
-}
-.p13 .filter_tab .area_container .area_wrap .handle_menu button.reset_btn {
-    background: #EDEFF2;
-    color: #5F5E64;
-}
-.p13 .filter_tab .area_container .area_wrap .handle_menu button {
-    width: calc(50% - 0.32rem) !important;
-    margin: 0 0.16rem;
-    background: #2ABED1;
-    border-radius: 8px;
-    color: #F7F9FA;
-    font-weight: 500;
-    font-size: 0.36rem;
-    line-height: 0.6rem;
-}
-.p13 .jymobile-datePicker  .weui-half-screen-dialog__ft::before, .p13 .handle_menu::before {
-    content: '';
-    position: absolute;
-    top: 0;
-    background: rgba(0, 0, 0, 0.05);
-    width: 100%;
-    height: 1px;
-    -webkit-transform: scaleY(0.5);
-    transform: scaleY(0.5);
-    -webkit-transform-origin: 0 0;
-    transform-origin: 0 0;
-}
-/* -e page 订阅*/
-/* -E p13 */

src/jfw/modules/app/src/web/staticres/jyapp/css/p13.css

@@ -0,0 +1,392 @@
+/* -S p13 for v2.10.4 */
+/* -s page 首页*/
+.p13 .home .top .home_search.fixed-top .home_search_left {
+    height: 0.8rem;
+}
+.p13 .home .top .home_search.fixed-top {
+    position: fixed;
+    top: 0;
+    left: 0;
+    z-index: 666;
+    background: #fff;
+    margin: 0;
+    padding: 0.14rem 0.32rem;
+    padding-top: 8vw;
+    box-sizing: border-box;
+    border: none;
+    border-radius: 0;
+    height: 1.08rem;
+    min-height: 21.333vw;
+    transform: translateZ(0);
+    -webkit-transform: translateZ(0);
+}
+#home_main.p13 .home .home_data .data_list {
+    padding: 0;
+}
+#home_main.p13 .home .home_data .data_list .list_item {
+    padding: .3rem .3rem .36rem .3rem;
+    display: block;
+    transition: background-color 150ms;
+    border: none;
+    position: relative;
+    overflow: hidden;
+}
+#home_main.p13 .home .home_data .data_list .list_item.hover {
+    background: #E6E6E6;
+}
+#home_main.p13 .home .home_data .data_list .list_item::after {
+    content: '';
+    position: absolute;
+    bottom: 0;
+    background: rgba(0, 0, 0, 0.05);
+    width: 100%;
+    height: 1px;
+    -webkit-transform: scaleY(0.5);
+    transform: scaleY(0.5);
+    -webkit-transform-origin: 0 0;
+    transform-origin: 0 0;
+}
+#home_main.p13 .home .home_data .data_list .serial_number {
+    display: none;
+}
+#home_main.p13 .content .keyword {
+    color: #2ABED1;
+}
+#home_main.p13 .home .home_data .data_list .tags > div {
+    color: #5F5E64;
+    font-size: 0.24rem;
+    line-height: 0.32rem;
+    background: #F7F9FA;
+    border: 0.5px solid rgba(0, 0, 0, 0.05);
+    box-sizing: border-box;
+    border-radius: 4px;
+    padding: 1px 0.16rem;
+    height: auto;
+    margin: 0 4px 0 0;
+}
+#home_main.p13 .home .home_data .data_list .list_info {
+
+}
+#home_main.p13 .home .home_data .data_list .tags {
+    padding-left: 0;
+}
+#home_main.p13 .home .home_data .data_list .list_title p {
+    font-size: 0.32rem;
+    line-height: 0.48rem;
+    color: #171826;
+    font-weight: 500;
+}
+
+/* search */
+.p13 #list {
+    padding: 0;
+}
+.p13 #list .tslist {
+    padding: .3rem .3rem .36rem .3rem;
+    display: block;
+    transition: background-color 150ms;
+    border: none;
+    position: relative;
+    overflow: hidden;
+}
+.p13 #list .tslist::after {
+    content: '';
+    position: absolute;
+    bottom: 0;
+    background: rgba(0, 0, 0, 0.05);
+    width: 100%;
+    height: 1px;
+    -webkit-transform: scaleY(0.5);
+    transform: scaleY(0.5);
+    -webkit-transform-origin: 0 0;
+    transform-origin: 0 0;
+}
+.p13 .tslist a.bt {
+    color: #171826 !important;
+    font-size: 0.32rem;
+    line-height: 0.48rem;
+}
+
+/* hover */
+.p13 #list .tslist.hover,
+.p13 #list .tslist.visited.hover {
+    background: #E6E6E6;
+}
+.p13 .tslist:hover a.bt, .p13 .tslist.visited a.bt {
+    color: #9B9CA3 !important;
+}
+.p13 .tslist:hover .restime, .p13 .tslist.visited .restime {
+    color: #9B9CA3;
+}
+.p13 #list .tslist.visited {
+    background: #fff;
+}
+
+.p13 .tslist .keyword {
+    color: #2ABED1;
+}
+.p13 .resnumb .one {
+    display: none;
+}
+.p13 .resnumb .two {
+    padding-left: 0 !important;
+    max-height: 0.97rem;
+}
+.p13 .restime {
+    float: left;
+    width: 100%;
+    margin-top: 0.26rem;
+    color: #5F5E64;
+    position: relative;
+}
+.p13 .restime span i {
+    display: none;
+}
+.p13 .restime span.location,
+.p13 .restime span.industry,
+.p13 .restime span.bidamount,
+.p13 .restime span.type, .p13 .restime span.buyerclass {
+    color: inherit;
+    font-size: 0.24rem;
+    line-height: 0.32rem;
+    background: #F7F9FA;
+    border: 0.5px solid rgba(0, 0, 0, 0.05);
+    box-sizing: border-box;
+    border-radius: 4px;
+    padding: 1px 0.16rem;
+    height: auto;
+    display: inline-block;
+    margin: 0 4px 0 0;
+}
+.p13 .restime > span:last-child {
+    color: #9B9CA3;
+    float: right;
+    position: absolute;
+    top: 0;
+    right: 0;
+}
+
+/*  全文 */
+#home_main.p13 .detail {
+    padding: 0 !important;
+    margin-top: 0.24rem;
+    font-size: 0.26rem;
+    line-height: 0.4rem;
+    color: #5F5E64;
+}
+
+/* ad */
+.p13 #supersearchPage .adv-appsearch-center, .p13 .adv-wxpush-center {
+    max-height: 1.28rem;
+    overflow: hidden;
+    border-radius: 8px;
+    margin: 0.36rem 0.32rem 0;
+    width: auto;
+}
+.p13 #supersearchPage .adv-appsearch-center::before, .p13 .adv-wxpush-center::before {
+    content: '广告';
+    position: absolute;
+    display: inline-block;
+    border-radius: 2px;
+    background: rgba(0, 0, 0, 0.27);
+    color: #fff;
+    font-size: 0.24rem;
+    line-height: 0.28rem;
+    padding: 1px 4px;
+    top: 0.1rem;
+    left: 0.16rem;
+}
+.p13 #supersearchPage img.closeadv, .p13 .adv-wxpush-center img.closeadv {
+    width: 0.32rem;
+    top: 0.1rem;
+    right: 0.1rem;
+    z-index: 1;
+}
+.p13 #supersearchPage .closeadv-bg, .p13 .adv-wxpush-center .closeadv-bg  {
+    width: 0.32rem;
+    height: 0.32rem;
+    top: 0.1rem;
+    right: 0.1rem;
+    z-index: 1;
+}
+
+/* -e page 首页 */
+.p13 .listcontent {
+    padding: 0;
+}
+
+/* -s page 订阅*/
+.p13 .jymobile-datePicker .weui-half-screen-dialog__ft{
+    padding-left: 0;
+    padding-right: 0;
+}
+.p13 .jymobile-datePicker .weui-btn_primary:not(.weui-btn_disabled):active {
+    background-color: #2ABED1;
+}
+.p13 .jymobile-datePicker .weui-picker__indicator:after, .p13 .jymobile-datePicker .weui-picker__indicator:before {
+    content: none;
+}
+.p13 .jymobile-datePicker .weui-picker__item {
+    font-size: 0.3rem;
+}
+.p13 .jymobile-datePicker .weui-picker__item.is-now-select  {
+    color: #2ABED1;
+    font-size: 0.36rem;
+}
+.p13 .jymobile-datePicker .weui-picker__indicator {
+    background: rgba(42, 190, 209, 0.05);
+}
+.p13 .jymobile-datePicker .weui-half-screen-dialog {
+    padding: 0;
+}
+.p13 .jymobile-datePicker .weui-half-screen-dialog__hd {
+    padding: 0 0.32rem;
+    flex-direction: row-reverse;
+}
+.p13 .jymobile-datePicker .weui-half-screen-dialog__hd__side+.weui-half-screen-dialog__hd__main {
+    text-align: left;
+    padding-left: 0;
+}
+.p13 ._header.fix-top {
+    position: fixed;
+    transition: all 0.3s;
+}
+.p13 .filter_tab.is-hide-border {
+    border-bottom-color: transparent;
+}
+.p13 .jymobile-datePicker .weui-half-screen-dialog__title {
+    color: #171826;
+    font-size: 0.4rem;
+    font-weight: 500;
+}
+.p13 .jymobile-datePicker.up .weui-picker {
+    border-radius: 0;
+    z-index: 666;
+    top: 1rem;
+    bottom: initial;
+    bottom: unset;
+    padding-top: 0.8rem;
+    /*max-height: calc(75% - 2.4rem);*/
+}
+@keyframes aa {
+    0% {
+        -webkit-transform: translate3d(0,100%,0);
+        transform: translate3d(0,-100%,0);
+    }
+    100% {
+        -webkit-transform: translateZ(0);
+        transform: translateZ(0);
+    }
+}
+@keyframes bb {
+    0% {
+        -webkit-transform: translateZ(0);
+        transform: translateZ(0);
+    }
+    100% {
+        -webkit-transform: translate3d(0,100%,0);
+        transform: translate3d(0,-100%,0);
+    }
+}
+.p13 .jymobile-datePicker.up .weui-animate-slide-up.weui-animate-slide-down {
+    animation-name: bb;
+    animation-duration: 0.44s;
+}
+.p13 .jymobile-datePicker.up .weui-animate-slide-up {
+    /*animation-direction: reverse;*/
+    animation-duration: 0.44s;
+    animation-name: aa;
+}
+.p13 .jymobile-datePicker.up .weui-half-screen-dialog__hd{
+    display: none;
+}
+.p13 .jymobile-datePicker .weui-mask, .weui-mask_transparent {
+    z-index: 666;
+    top: 0 !important;
+}
+.p13 .jymobile-datePicker .weui-btn_disabled{
+    flex: 1;
+    margin: 0 0.32rem;
+    padding: 0.1rem 0;
+    background: #EDEFF2;
+    border-radius: 8px;
+    color: #5F5E64 !important;
+    font-weight: 500;
+    font-size: 0.32rem;
+    line-height: 0.6rem;
+    width: calc(50% - 0.32rem) !important;
+}
+.p13 .jymobile-datePicker .weui-btn_disabled + .weui-btn_primary{
+    width: calc(50% - 0.32rem) !important;
+}
+.p13 .jymobile-datePicker .weui-btn_primary{
+    flex: 1;
+    margin: 0 0.32rem;
+    height: 0.8rem;
+    box-sizing: border-box;
+    padding: 0.1rem 0;
+    width: auto;
+    background: #2ABED1;
+    background-color: #2ABED1;
+    border-radius: 8px;
+    color: #F7F9FA !important;
+    font-weight: 500;
+    font-size: 0.32rem;
+    line-height: 0.6rem;
+}
+.p13 .jymobile-datePicker  .weui-half-screen-dialog__ft {
+    padding: 8px 0;
+    border: none;
+    position: relative;
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+
+}
+.p13 .jymobile-datePicker .weui-half-screen-dialog__hd .weui-icon-btn {
+    background: url(/jyapp/images/wxqc.png?v=1429);
+    color: transparent;
+    width: 16px;
+    height: 16px;
+    background-size: 100% 100%;
+    -webkit-mask: none;
+    position: unset;
+    margin-right: -8px;
+    top: unset;
+    -webkit-transform:unset;
+    transform: unset;
+}
+.p13 .filter_tab .area_container .area_wrap .handle_menu {
+    padding: 0.16rem 0;
+    border: none;
+    position: relative;
+    height: 1.12rem;
+}
+.p13 .filter_tab .area_container .area_wrap .handle_menu button.reset_btn {
+    background: #EDEFF2;
+    color: #5F5E64;
+}
+.p13 .filter_tab .area_container .area_wrap .handle_menu button {
+    width: calc(50% - 0.32rem) !important;
+    margin: 0 0.16rem;
+    background: #2ABED1;
+    border-radius: 8px;
+    color: #F7F9FA;
+    font-weight: 500;
+    font-size: 0.36rem;
+    line-height: 0.6rem;
+}
+.p13 .jymobile-datePicker  .weui-half-screen-dialog__ft::before, .p13 .handle_menu::before {
+    content: '';
+    position: absolute;
+    top: 0;
+    background: rgba(0, 0, 0, 0.05);
+    width: 100%;
+    height: 1px;
+    -webkit-transform: scaleY(0.5);
+    transform: scaleY(0.5);
+    -webkit-transform-origin: 0 0;
+    transform-origin: 0 0;
+}
+/* -e page 订阅*/
+/* -E p13 */

src/jfw/modules/app/src/web/staticres/jyapp/css/searchindex.css

@@ -3522,6 +3522,9 @@ body{
     overflow-y: scroll;
     height: 100%;
 }
+.p13 .home .top .home_search.fixed-top .home_search_left {
+    height: 0.8rem;
+}
 .p13 .home .top .home_search.fixed-top {
     position: fixed;
     top: 0;
@@ -3530,10 +3533,12 @@ body{
     background: #fff;
     margin: 0;
     padding: 0.14rem 0.32rem;
+    padding-top: 8vw;
     box-sizing: border-box;
     border: none;
     border-radius: 0;
     height: 1.08rem;
+    min-height: 21.333vw;
 }
 .p13 .home .top .home_search.fixed-top .home_search_left {
     border: 0.5px solid rgba(0, 0, 0, 0.05);

src/jfw/modules/app/src/web/staticres/jyapp/css/subscribe.css

@@ -51,10 +51,10 @@ img{
 	border: 1px solid #ccc;
 	border-radius: 4px;
 	padding-left: 10px;
-	padding-right: 0px; 
+	padding-right: 0px;
 }
 [type='text'],textarea{
-	box-shadow: 0px 0px 0px rgba(0,0,0,0);  
+	box-shadow: 0px 0px 0px rgba(0,0,0,0);
     -webkit-appearance: none;
 }
 .hide{
@@ -158,7 +158,7 @@ img{
 	top: 1px;
 }
 .restime{
-	float:right; 
+	float:right;
 	color:#999;
 	margin-top:10px;
 	font-size: 14px;
@@ -1008,6 +1008,8 @@ display: flex;
 
 .filter_tab .area_container .area_wrap .area_data .checkbox:checked {
   border: 0;
+  border: none;
+  outline: none;
   background: url(/jyapp/vipsubscribe/image/xuanzhong.png) no-repeat center center;
   background-size: 100% 100%;
 }
@@ -1367,8 +1369,8 @@ display: flex;
   content: "\BB";
 }
 /*********************************************/
-.filter_tab .screen, .filter_tab .area_container  { 
-	left: 0; 
+.filter_tab .screen, .filter_tab .area_container  {
+	left: 0;
 	right: 0;
 	margin-left:0;
 }
@@ -1702,7 +1704,7 @@ html, body {
     margin-left: -50%;
 }
 .close{
-    position: absolute;                                                                                                                                                                                                                                                                                 
+    position: absolute;
     width: .56rem;
     height: .56rem;
     top: -.38rem;
@@ -1756,4 +1758,4 @@ html, body {
 }
 .jy-alert-other .weui-dialog__ft{
   	text-align:center !important;
-}
+}

src/jfw/modules/app/src/web/staticres/jyapp/js/searchindex.js

@@ -69,7 +69,7 @@ var MoneyUnit = {
 		return this.test(num, type, lv + 1);
 	} else {
 		if (type === 'string') {
-			return result.toFixed(2).replace('.00', '') + this.levelArr[lv];
+			return String(Math.floor(result * 100) / 100).replace('.00', '') + this.levelArr[lv];
 		}
 
 		if (type === 'lv') {
@@ -81,7 +81,7 @@ var MoneyUnit = {
 		}
 
 		if (type === 'number') {
-			return result.toFixed(2).replace('.00', '');
+			return String(Math.floor(result * 100) / 100).replace('.00', '');
 		}
 	}
 }
@@ -1370,10 +1370,10 @@ var SuperSearch = {
 			// 金额标签
 			var moneyTag = '';
 			if(typeof(list[i].budget) != "undefined" && list[i].budget != null && list[i].budget != ""){
-				moneyTag = '<span class="industry">'+MoneyUnit.test(list[i].budget)+'</span>';
+				moneyTag = '<span class="bidamount">'+MoneyUnit.test(list[i].budget)+'</span>';
 			}
 			if(typeof(list[i].bidamount) != "undefined" && list[i].bidamount != null && list[i].bidamount != ""){
-				moneyTag = '<span class="industry">'+MoneyUnit.test(list[i].bidamount)+'</span>';
+				moneyTag = '<span class="bidamount">'+MoneyUnit.test(list[i].bidamount)+'</span>';
 			}
 			if(i==3&&pageNum==1){
 				ListHtml += '<div class="tslist" style="border-bottom-width:0px;">'
@@ -2285,10 +2285,10 @@ var SuperSearch = {
 				var moneyTag = ''
 				// 金额标签
 				if(typeof(_list.budget) != "undefined" && _list.budget != null && _list.budget != ""){
-					moneyTag = '<div class="industry">'+MoneyUnit.test(_list.budget)+'</div>';
+					moneyTag = '<div class="bidamount">'+MoneyUnit.test(_list.budget)+'</div>';
 				}
 				if(typeof(_list.bidamount) != "undefined" && _list.bidamount != null && _list.bidamount != ""){
-					moneyTag = '<div class="industry">'+MoneyUnit.test(_list.bidamount)+'</div>';
+					moneyTag = '<div class="bidamount">'+MoneyUnit.test(_list.bidamount)+'</div>';
 				}
 				homeListHtml += moneyTag
 				//时间

src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/css/subscribe_list.css

@@ -313,6 +313,8 @@ display: flex;
 
 .filter_tab .area_container .area_wrap .area_data .checkbox:checked {
   border: 0;
+  border: none;
+  outline: none;
   background: url(../image/xuanzhong.png) no-repeat center center;
   background-size: 100% 100%;
 }
@@ -562,4 +564,4 @@ display: flex;
 }
 ._renew_toast > div {
   background-color: #FE737A;
-}
+}

src/jfw/modules/app/src/web/templates/dataExport/dataExport.html

@@ -12,6 +12,7 @@
     <link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/jyapp/css/appbutton.css?v={{Msg "seo" "version"}}1" >
 	<link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/jyapp/css/layout.css?v={{Msg "seo" "version"}}" />
     <link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/jyapp/css/font.css?v={{Msg "seo" "version"}}" />
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/css/p13.css?v={{Msg "seo" "version"}}"/>
     <script src="{{Msg "seo" "cdn"}}/jyapp/js/jquery.js?v={{Msg "seo" "version"}}"></script>
     <script src="{{Msg "seo" "cdn"}}/jyapp/vipsubscribe/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
 	{{include "/common/js.html"}}
@@ -254,7 +255,7 @@
             <button class="saveData j-button">确 认</button>
         </div>
         <div class="resetOne j-button-group">
-            <button class="reset j-button-cancel">重置</button>
+            <button class="reset j-button-cancel" style="margin-right: 0.2rem">重置</button>
             <button class="saveData j-button-confirm">确认</button>
         </div>
 

src/jfw/modules/app/src/web/templates/vipsubscribe/vip_introduce.html

@@ -154,9 +154,10 @@
               }else{
                 var html = "";
                 {{if not .T.notShowTrial}}
-                  html += '<div class="j-button-group"><a onclick="window.location.replace(\'/jyapp/vipsubscribe/trialInfo\')" class="try_btn j-button-cancel1">试用7天</a><a onclick="window.location.replace('/jyapp/vipsubscribe/vipsubscribe_new')" class="subscribe_btn j-button-confirm1">去订阅</a> </div>';
+                  html += '<div class="j-button-group"><a onclick="window.location.replace(\'/jyapp/vipsubscribe/trialInfo\')" class="try_btn j-button-cancel1">试用7天</a><a onclick="window.location.replace(\'/jyapp/vipsubscribe/vipsubscribe_new\')" class="subscribe_btn j-button-confirm1">去订阅</a> </div>';
+                {{else}}
+                  html += '<div class="j-footer" style="width: 100%;"><a onclick="window.location.replace(\'/jyapp/vipsubscribe/vipsubscribe_new\')" class="subscribe_btn j-button">去订阅</a></div>';
                 {{end}}
-                html += '<div class="j-footer" style="width: 100%;"><a onclick="window.location.replace(\'/jyapp/vipsubscribe/vipsubscribe_new\')" class="subscribe_btn j-button">去订阅</a></div>';
                 document.write(html);
               }
             </script>

src/jfw/modules/app/src/web/templates/weixin/follow/set.html

@@ -6,6 +6,7 @@
 <link href="{{Msg "seo" "cdn"}}/jyapp/css/follow.css?v={{Msg "seo" "version"}}" rel="stylesheet">
 <script src="{{Msg "seo" "cdn"}}/jyapp/js/jquery.js?v={{Msg "seo" "version"}}"></script>
 <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/vipsubscribe/css/weui.min.css?v={{Msg "seo" "version"}}"/>
+<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/css/p13.css?v={{Msg "seo" "version"}}"/>
 <script src="{{Msg "seo" "cdn"}}/jyapp/vipsubscribe/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
 {{include "/common/js.html"}}
 <script src="{{Msg "seo" "cdn"}}/jyapp/js/fastclick.js?v={{Msg "seo" "version"}}"></script>

src/jfw/modules/app/src/web/templates/weixin/historypush.html

@@ -10,6 +10,7 @@
     <script src="{{Msg "seo" "cdn"}}/jyapp/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}"></script>
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/vipsubscribe/css/weui.min.css?v={{Msg "seo" "version"}}"/>
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/vipsubscribe/iconfont/iconfont.css?v={{Msg "seo" "version"}}"/>
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/css/p13.css?v={{Msg "seo" "version"}}"/>
     <style>
         .merge-dialog{
             z-index: 99999;
@@ -74,7 +75,7 @@
                     return this.test(num, type, lv + 1);
                 } else {
                     if (type === 'string') {
-                        return result.toFixed(2).replace('.00', '') + this.levelArr[lv];
+                        return String(Math.floor(result * 100) / 100).replace('.00', '') + this.levelArr[lv];
                     }
 
                     if (type === 'lv') {
@@ -86,7 +87,7 @@
                     }
 
                     if (type === 'number') {
-                        return result.toFixed(2).replace('.00', '');
+                        return String(Math.floor(result * 100) / 100).replace('.00', '');
                     }
                 }
             }
@@ -596,10 +597,10 @@
                 // 预算：budget；中标：bidamount
                 var moneyList = "";
                 if (obj.budget != null && obj.budget != "") {
-                    moneyList = '<span class="industry money">' + MoneyUnit.test(obj.budget) + '</span>';
+                    moneyList = '<span class="bidamount">' + MoneyUnit.test(obj.budget) + '</span>';
                 }
                 if (obj.bidamount != null && obj.bidamount != "") {
-                    moneyList = '<span class="industry money">' + MoneyUnit.test(obj.bidamount) + '</span>';
+                    moneyList = '<span class="bidamount">' + MoneyUnit.test(obj.bidamount) + '</span>';
                 }
                 //时间
                 var showdateList = ""
@@ -1368,6 +1369,12 @@
 
     //
     $(function () {
+        $('#list').on('tap longTap', '.tslist',function(e){
+            var tempS = $(this).addClass("hover")
+            setTimeout(function () {
+                tempS.removeClass('hover')
+            }, 50)
+        })
         document.querySelector('.screen').addEventListener('touchmove', stopScroll, {passive: false});
         document.querySelector('.tab_left').addEventListener('touchmove', stopScroll, {passive: false});
         document.querySelector('.tab_right').addEventListener('touchmove', stopScroll, {passive: false});
@@ -1409,6 +1416,7 @@
                     id: 'up',
                     start: 2000,
                     title: '选择时间',
+                    container: '.app-content',
                     end: new Date(),
                     defaultValue: date.split('-'),
                     className: 'jymobile-datePicker up',

src/jfw/modules/app/src/web/templates/weixin/search/mainSearch.html

@@ -1,1164 +1,1216 @@
-<html>
-<head>
-{{include "/common/meta.html"}}
-<link href="{{Msg "seo" "cdn"}}/jyapp/css/searchindex.css?v={{Msg "seo" "version"}}" rel="stylesheet">
-<link href="{{Msg "seo" "cdn"}}/jyapp/css/appbutton.css?v={{Msg "seo" "version"}}" rel="stylesheet">
-<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/vipsubscribe/iconfont/iconfont.css?v={{Msg "seo" "version"}}"/>
-<script src="{{Msg "seo" "cdn"}}/jyapp/js/jquery-3.2.1.min.js?v={{Msg "seo" "version"}}"></script>
-{{include "/common/js.html"}}
-<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/vipsubscribe/css/weui.min.css?v={{Msg "seo" "version"}}"/>
-<script src="{{Msg "seo" "cdn"}}/jyapp/js/dropload.js?v={{Msg "seo" "version"}}"></script>
-<script type="text/javascript" src="{{Msg "seo" "cdn"}}/jyapp/js/searchindex.js?v=121111{{Msg "seo" "version"}}"></script>
-<title>搜索</title>
-<script type="text/javascript">
-	//
-	if(sessionStorage&&sessionStorage.reloadHomePage){
-		sessionStorage.removeItem("reloadHomePage");
-		window.location.reload();
-	}
-	var userId = {{session "userId"}};
-	var pageSize = {{.T.pageSize}};
-	var encode = "DB4WER4VWyoaAw9GWwgMGU1wEQ4CDQ1b";
-	SuperSearch.industry = {{.T.industry}};
-	SuperSearch.sortArray = {{.T.sortArray}};
-	var CDN = {{Msg "seo" "cdn"}};
-	var VERSION = {{Msg "seo" "version"}};
-  var isExaminePhone={{session "s_phone"}}=="18613717801";
-  if(mySysIsIos()&&(userId==null||userId==""||isExaminePhone)){
-    localStorage.setItem("Active_Vip_Invite",new Date().getTime());
-  }
-</script>
-</head>
-<body id="home_main" class="p13">
-<style>
-	#dqbtn{
-		width: 5.5em !important;
-	}
-	html,body{
-		background: #fff;
-	}
-	body .loading_,body .loading_Top{
-		margin-top:0px;
-	}
-</style>
-
-<div class="loading_Top" style="display: none;">
-    <p><span></span></p>
-</div>
-<!--主题内容-->
-<!--头部-->
-<div class="jy_header" style="display:none;">
-    <div class="jy_header_box">
-        <span></span>
-        <h3>剑鱼标讯</h3>
-		<div class="jy_sprite_main sprite_home_search_t"></div>
-<!--        <img src="{{Msg "seo" "cdn"}}/jyapp/images/home_search.png?v={{Msg "seo" "version"}}" alt="">-->
-    </div>
-</div>
-<section id="searchIndex" class="hidden">
-	<section class="content">
-		<!--2.8.5 start-->
-		<div class="home">
-	        <div class="top">
-				<div class="top-bg-box">
-					<div class="top-bg-right"></div>
-					<div class="top-bg-left"></div>
-				</div>
-				<div class="top-title">剑鱼标讯</div>
-	            <div class="home_search">
-<!--					<input class="inp-search" type="text" name="" value="" maxlength="50" placeholder="示例：税务局 软件" readonly="">-->
-	                <div class="home_search_left inp-search">
-						<div class="jy_sprite_main sprite_home_search icon_search"></div>
-<!--	                    <img class="icon_search" src="{{Msg "seo" "cdn"}}/jyapp/images/search/home_search.png?v={{Msg "seo" "version"}}" alt="">-->
-	                    <span>示例：税务局 软件</span>
-	                </div>
-<!--	                <div class="home_search_right">-->
-<!--						<div class="jy_sprite_main sprite_home_question icon_question"></div>-->
-<!--&lt;!&ndash;	                    <img class="icon_question" src="{{Msg "seo" "cdn"}}/jyapp/images/search/home_question.png?v={{Msg "seo" "version"}}" alt="">&ndash;&gt;-->
-<!--	                </div>-->
-	            </div>
-	            <div class="home_banner">
-	                <div class="swiper-container lunbo" id="swiper1">
-	                    <div class="swiper-wrapper">
-							<!--轮播广告-->
-							<div class="placeholder-div"></div>
-	                    </div>
-	                    <div class="swiper-pagination custorm_dot"></div>
-	                </div>
-	            </div>
-	        </div>
-	        <!-- 导航菜单 -->
-	        <div class="home_tab">
-	            <div class="tab_container">
-	                <a class="tab_item">
-<!--						<div class="jy_sprite_main sprite_home_tab_1"></div>-->
-	                    <img src="{{Msg "seo" "cdn"}}/jyapp/images/search/home_tab_1.png?v={{Msg "seo" "version"}}" alt="">
-	                    <span>搜中标企业</span>
-	                </a>
-	                <a class="tab_item">
-<!--						<div class="jy_sprite_main sprite_home_tab_2"></div>-->
-	                    <img src="{{Msg "seo" "cdn"}}/jyapp/images/search/home_tab_2.png?v={{Msg "seo" "version"}}" alt="">
-	                    <span>数据导出</span>
-	                </a>
-	                <a class="tab_item">
-<!--						<div class="jy_sprite_main sprite_home_tab_light"></div>-->
-	                    <img src="{{Msg "seo" "cdn"}}/jyapp/images/search/home_tab_3.png?v={{Msg "seo" "version"}}" alt="">
-	                    <span>商机管理</span>
-	                </a>
-					<!--
-	                <a class="tab_item">
-	                    <img src="/jyapp/images/search/home_tab_3.png" alt="">
-	                    <span>标讯订阅</span>
-	                </a>-->
-	                <a class="tab_item">
-						<!--TODO-->
-	                    <img src="{{Msg "seo" "cdn"}}/jyapp/course/image/course_book.png?v={{Msg "seo" "version"}}" alt="">
-	                    <span>招投标课程</span>
-	                </a>
-	                <!-- 微信端展示APP下载
-	                <a class="tab_item">
-	                    <img src="/jyapp/images/search/home_tab_4.png" alt="">
-	                    <span>APP下载</span>
-	                </a> -->
-	            </div>
-	        </div>
-	        <!-- 最新标讯 -->
-	        <div class="home_data">
-	            <h3 class="data_nav">最新标讯</h3>
-	            <div class="data_list">
-					<!--首页列表-->
-	            </div>
-	            <div class="no_data" style="display: none;">
-					<div class="jy_sprite_main sprite_nothing"></div>
-<!--	                <img src="{{Msg "seo" "cdn"}}/jyapp/images/search/nothing.png?v={{Msg "seo" "version"}}" alt="">-->
-	                <p>为了使您接收更多信息，可对关键词进行新增或修改。</p>
-	                <a class="home_toset">去设置</a>
-	            </div>
-	        </div>
-	        <div class="tips">
-	            <p class="tips_text home_1" style="display: none;">设置订阅关键词，随时接收最新招标信息</p>
-	            <p class="tips_text home_2" style="display: none;">为了使您接收更多信息，可对关键词进行新增或修改。</p>
-	            <p class="tips_text home_3" style="display: none;">您未设置关键词，设置后接收信息更精准!</p>
-	            <p class="tips_text home_4" style="display: none;">免费试用VIP订阅，商机获取能力提升30倍</p>
-	            <p class="tips_all" style="display: none;"><a class="GetAll">查看全部</a></p>
-	            <div class="tips_btn home_toset" style="display: none;">
-	                <a class="home_toset" >去设置</a>
-	            </div>
-	            <div class="tips_btn home_todetails" style="display: none;">
-	                <a class="home_todetails" >了解详情</a>
-	            </div>
-	        </div>
-	    </div>
-
-	</section>
-</section>
-
-<!--超级搜索页面-->
-<section id="supersearchPage" class="hidden">
-	<div class="app-layout-header">
-		<span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span>
-		招标搜索
-	</div>
-	<div class="loading_" style="display: none;">
-    <p><span></span></p>
-  </div>
-	<div class="app-layout-content-b">
-		<form class="wxhead" action="">
-			<div class="searchhead">
-				<input class="form-control searchinput" name="super_searchinput" maxlength="50"  placeholder="示例：税务局 软件"/>
-        		<div class="inputDiv hidden">
-					<div class="inpTitle_history">
-						<div class="jy_sprite_main sprite_history"></div>
-<!--						<img src="{{Msg "seo" "cdn"}}/jyapp/images/search/history.png?v={{Msg "seo" "version"}}">-->
-						<span>历史搜索</span>
-						<div id="del_history" class="jy_sprite_main sprite_history_clean"></div>
-<!--						<img id="del_history" src="{{Msg "seo" "cdn"}}/jyapp/images/search/history_clean.png?v={{Msg "seo" "version"}}">-->
-						<div style="clear: both"></div>
-					</div>
-					<div>
-						<ul class="history"></ul>
-					</div>
-					<div style="clear: both"></div>
-<!--					<div class="inpTitle_msgset"><img src="/jyapp/images/search/msgset.png"><span>我订阅的关键词</span></div>
-					<div>
-						<ul class="myMsgset"></ul>
-					</div>-->
-				</div>
-				<span class="screen text-center">筛选</span>
-				<span class="query hidden">
-					<div class="jy_sprite_main sprite_jywxjs"></div>
-<!--					<img src="{{Msg "seo" "cdn"}}/jyapp/images/wx/jywxjs.png?v={{Msg "seo" "version"}}">-->
-				</span>
-				<span class="clearInpt hidden">
-					<div class="jy_sprite_main sprite_jyqingchu"></div>
-<!--					<img src="{{Msg "seo" "cdn"}}/jyapp/images/wx/jyqingchu.png?v={{Msg "seo" "version"}}">-->
-				</span>
-			</div>
-		</form>
-		<div>
-			<div class="selLable hidden" id="selLable">
-				<div class="selected-export-box">
-	                <div class="selected-export">
-	                    <div class="options">
-	                        <span class="search-title active" index="1">
-	                            <em>标题搜索</em>
-	                            <i class="jyapp-icon jyapp-icon-zhankai"></i>
-	                        </span>
-	                        <span class="show-list active" index="2">
-	                            <em>列表显示</em>
-	                            <!-- jyapp-icon-shouqi -->
-	                            <i class="jyapp-icon jyapp-icon-zhankai"></i>
-	                        </span>
-	                    </div>
-	                    <div class="export">
-	                        <span style="padding: 3px 8px 3px;border-radius: 10px;background: rgba(44,183,202, 0.1);">
-	                            <i class="jyapp-icon jyapp-icon-shujudaochu"></i>
-	                            <em>数据导出</em>
-	                        </span>
-	                    </div>
-	                </div>
-	                <div class="newdialog">
-	                    <div class="tab-box">
-	                        <ul class="sub-tab sub-search-title" index="1"  style="display: none">
-	                            <li class="active" dataVal="searchtitle">
-	                                <span>标题搜索</span>
-	                                <i class="jyapp-icon jyapp-icon-xuanzhong"></i>
-	                            </li>
-	                            <li dataVal="searchall">
-	                                <span>全文搜索</span>
-	                                <i class="jyapp-icon jyapp-icon-xuanzhong"></i>
-	                            </li>
-	                        </ul>
-	                        <ul class="sub-tab sub-show-list" index="2" style="display: none">
-	                            <li class="active" dataVal="showlist">
-	                                <span>列表显示</span>
-	                                <i class="jyapp-icon jyapp-icon-xuanzhong"></i>
-	                            </li>
-	                            <li dataVal="showtable">
-	                                <span>表格显示</span>
-	                                <i class="jyapp-icon jyapp-icon-xuanzhong"></i>
-	                            </li>
-	                        </ul>
-	                    </div>
-	                </div>
-	            </div>
-	            <div class="weui-mask" style="display: none"></div>
-
-				<div class="com-title" style="display:none;"><!--height:30px; margin-top:20px;-->
-					<span id="search_title" class="on">标题搜索</span><!--<span style="float:left;">|</span>--><span id="search_all">全文搜索</span>
-				</div>
-				<div class="line-vertical" style="display:none;">
-				</div>
-				<div class="showType" style="display:none;">
-					<div class="showlist on">列表</div>
-					<div class="showtable">表格</div>
-				</div>
-			</div>
-			<div id="intercept" class="hidden">
-				<div class="jy_sprite_main sprite_tip"></div>
-<!--				<img src="{{Msg "seo" "cdn"}}/jyapp/images/tip.png?v={{Msg "seo" "version"}}">-->
-				<font>“的方式”</font>及其后面的字词均被忽略，因为剑鱼标讯的查询限制在20个汉字以内。
-			</div>
-			<div class="wxsearch hidden" id="super_search">
-				<div class="jysstj">
-					<div class="jyshaxuan">
-						<div class="shaixIndustry shaixcl">行业</div>
-						<div class="shaixMoney">金额</div>
-						<div class="shaixpt">时间</div>
-						<div class="shaixone">地区</div>
-						<div class="shaixtwo">类型</div>
-					</div>
-					<div class="industry-dialog">
-						<div class="dialog-content contentthree">
-
-						</div>
-					</div>
-					<!--金额-->
-					<div class="money-dialog hidden"  style="overflow-y: scroll;height: 150px;">
-						<ul style="height: 180px;">
-							<li><button data-value="all" class="btn active">全部</button></li>
-							<li>价格区间</li>
-							<li class="money-inp" data-value="">
-								<div class="min-price">
-									<input class="form-control minMrice" type="text"/>
-									<span class="min-unit">万元</span>
-									<span class="fgx"></span>
-								</div>
-								<div class="max-price">
-									<input class="form-control maxMrice"  type="text"/>
-									<span class="max-unit">万元</span>
-								</div>
-							</li>
-						</ul>
-					</div>
-					<div class="jypt-dialog hidden">
-						<div class="jypt-pt">
-							<button type="button" data-value="" class="btn jypt-active">全部</button>
-							<button type="button" data-value="lately-7" class="btn">最近7天</button>
-							<button type="button" data-value="lately-30" class="btn">最近30天</button>
-							<button type="button" data-value="thisyear" class="btn">去年</button>
-						</div>
-						<div class="jypt-timeinputs">
-							<input type="text" name="starttime" readonly="readonly" id="starttime" data-value="">
-							<div class="jypt-fg">
-								<span></span>
-							</div>
-							<input type="text" name="endtime" readonly="readonly" id="endtime" data-value="">
-						</div>
-					</div>
-					<div class="jydq-dialog hidden">
-						<div class="dialog-content contentone">
-							<ul>
-								<li>
-									<button class="btn active">全国</button>
-								</li>
-								<li>
-									<span>A</span>
-									<button class="btn">安徽</button>
-									<button class="btn">澳门</button>
-								</li>
-								<li>
-									<span>B</span>
-									<button class="btn">北京</button>
-								</li>
-								<li>
-									<span>C</span>
-									<button class="btn">重庆</button>
-								</li>
-								<li>
-									<span>F</span>
-									<button class="btn">福建</button>
-								</li>
-								<li>
-									<span>G</span>
-									<button class="btn">广东</button>
-									<button class="btn">广西</button>
-									<button class="btn">贵州</button>
-									<button class="btn">甘肃</button>
-								</li>
-								<li>
-									<span>H</span>
-									<button class="btn">河北</button>
-									<button class="btn">湖北</button>
-									<button class="btn">黑龙江</button>
-									<button class="btn">海南</button>
-									<button class="btn">河南</button>
-									<button class="btn">湖南</button>
-								</li>
-								<li>
-									<span>J</span>
-									<button class="btn">吉林</button>
-									<button class="btn">江苏</button>
-									<button class="btn">江西</button>
-								</li>
-								<li>
-									<span>L</span>
-									<button class="btn">辽宁</button>
-								</li>
-								<li>
-									<span>N</span>
-									<button class="btn">内蒙古</button>
-									<button class="btn">宁夏</button>
-								</li>
-								<li>
-									<span>Q</span>
-									<button class="btn">青海</button>
-								</li>
-								<li>
-									<span>S</span>
-									<button class="btn">山西</button>
-									<button class="btn">陕西</button>
-									<button class="btn">上海</button>
-									<button class="btn">山东</button>
-									<button class="btn">四川</button>
-								</li>
-								<li>
-									<span>T</span>
-									<button class="btn">天津</button>
-									<button class="btn">台湾</button>
-								</li>
-								<li>
-									<span>X</span>
-									<button class="btn">西藏</button>
-									<button class="btn">新疆</button>
-									<button class="btn">香港</button>
-								</li>
-								<li>
-									<span>Y</span>
-									<button class="btn">云南</button>
-								</li>
-								<li>
-									<span>Z</span>
-									<button class="btn">浙江</button>
-								</li>
-							</ul>
-						</div>
-					</div>
-					<div class="jytype-dialog hidden">
-						<div class="dialog-content contenttwo">
-							<ul>
-								<li>
-									<button class="btn active">全部</button>
-								</li>
-								<li>
-									<div id="dqbtn" style="width:7em;position:relative;float:left;" data-value="拟建">拟建项目</div>
-									<div class="jy_sprite_main sprite_q-mark q-mark" style="float:left;"></div>
-<!--									<img style="float:left;" class="q-mark" src="{{Msg "seo" "cdn"}}/jyapp/images/wx/q-mark.png?v={{Msg "seo" "version"}}"/>-->
-									<button class="btn hidden" style="clear:both;">拟建</button>
-								</li>
-								<li>
-									<div id="dqbtn" style="width:7em" data-value="预告">招标预告</div>
-									<button class="btn hidden">预告</button>
-								</li>
-								<li>
-									<div id="dqbtn" style="width:7em" data-value="招标">招标公告</div>
-									<button class="btn">招标</button>
-									<button class="btn">邀标</button>
-									<button class="btn">询价</button>
-									<button class="btn">竞谈</button>
-									<button class="btn">单一</button>
-									<button class="btn">竞价</button>
-									<button class="btn">变更</button>
-									<button class="btn">其他</button>
-								</li>
-								<li>
-									<div id="dqbtn" style="width:5.6em" data-value="结果">招标结果</div>
-									<button class="btn">中标</button>
-									<button class="btn">成交</button>
-									<button class="btn">废标</button>
-									<button class="btn">流标</button>
-								</li>
-								<li>
-									<div id="dqbtn" style="width:7.5em !important; " data-value="其它">招标信用信息</div>
-									<button class="btn">合同</button>
-									<button class="btn">验收</button>
-									<button class="btn">违规</button>
-								</li>
-							</ul>
-						</div>
-					</div>
-				</div>
-				<div class="jyshxbottom sl-jyshxbottom">
-					<ul class="text-center j-button-group">
-						<li class="jydqreset j-button-cancel">重置</li>
-						<li class="jydqsure j-button-confirm">确定</li>
-					</ul>
-				</div>
-			</div>
-			<div id="wrapper" class="hidden">
-				<div id="list" ></div>
-				<div id="table" class="hidden">
-					<div class="data">
-	                    <table class="content">
-	                        <!--
-	                        <tr>
-	                            <td><div>序号</div></td>
-	                            <td><div>发布时间</div></td>
-	                            <td><div>公告类型</div></td>
-	                            <td><div>招标单位</div></td>
-	                            <td><div>项目名称</div></td>
-	                            <td><div>预算<br>（万元）</div></td>
-	                            <td><div>开标时间</div></td>
-	                            <td><div>中标单位</div></td>
-	                            <td><div>中标金额<br>（万元）</div></td>
-	                        </tr>
-	                        -->
-	                    </table>
-	                </div>
-					<div class="TableTip" id="TableTip" style="display:none;">
-						<div class="jy_sprite_main sprite_table_close tableclose"></div>
-<!--						<img class="tableclose" src="{{Msg "seo" "cdn"}}/jyapp/images/table_close.png?v={{Msg "seo" "version"}}">-->
-						<div class="TableText">推荐使用电脑浏览器访问剑鱼标讯网站<br>jianyu360.com查看数据表格，体验更佳。</div></div>
-				</div>
-		        <div class="shade_table">
-		        	<div class="more">查看更多</div>
-		      	</div>
-			</div>
-		</div>
-		<div id="working" class="hidden" style="text-align: center;position: absolute;top: 50%;left: 50%;margin-left: -81px;margin-top: -50px;">
-			<!--<img style="width:163px;" src="{{Msg "seo" "cdn"}}/jyapp/images/wx/working.gif?v={{Msg "seo" "version"}}">
-			<div style="font-size:16px;">剑鱼标讯正在努力工作中···</div>-->
-    </div>
-		<div class="nullcontent text-center  hidden">
-			<div>
-				<div style="width:163px;margin:60px 0px 50px 0px;" class="jy_sprite_main sprite_jysorry_1_wx"></div>
-<!--				<img style="width:163px;margin:60px 0px 50px 0px;" src="{{Msg "seo" "cdn"}}/jyapp/images/wx/jysorry_1.png?v={{Msg "seo" "version"}}">-->
-			</div>
-			<div style="font-size:16px;color:#1d1d1d;">
-				<span id="hasNoData_tiptext">
-					<font>没有找到和该关键词匹配的信息</font>
-					<font style="display: none;">抱歉！由于系统繁忙暂时无法进行搜索，请1分钟后再试！</font>
-					<font style="display: none;">抱歉！由于系统繁忙暂时无法进行搜索，请稍后再试！</font>
-				</span><br>
-				<div id="allSearchModel">试试<span style="color:#2cb7ca;text-decoration:underline;line-height: 30px">全文搜索</span></div>
-			</div>
-			<div style="width:100%;" class="text-center" id="feedback">
-				<div style="transform: scale(1.21);margin-top: 15px;" class="jy_sprite_main sprite_jyyjfk"></div>
-<!--				<img style="width: 200px;margin-top: 15px;" src="{{Msg "seo" "cdn"}}/jyapp/images/wx/jyyjfk.png?v={{Msg "seo" "version"}}">-->
-			</div>
-		</div>
-		<div class="easypopup" id="nijianTip">
-			<div class="easypopup-alert">
-				<div class="easypopup-content">
-					“拟建项目”是指那些处于前期立项、审批阶段的项目。供应商应在立项阶段掌握项目信息，做到早介入，稳拿单。
-				</div>
-				<div class="easypopup-footer">
-					<span onclick="SuperSearch.njTipEasyPopup.hide();">我知道了</span>
-				</div>
-			</div>
-		</div>
-		<div id="tempDiv" style="display:none;"></div>
-	</div>
-<!--  	<div class="resbm hidden" id="resbm">
-		<div class="rests"></div>
-		<div class="resdy" id="zjdy">直接订阅
-			<div class="jy_sprite_main sprite_jydyyou"></div>
-		</div>
-		<div class="dy_close">
-			<div class="jy_sprite_main sprite_dy_close"></div>
-		</div>
-		<div style="clear:both"></div>
-	</div>-->
-
-    <div class="resbm hidden" id="resbm">
-		<div class="resbm0">
-	        <div>
-	            <i class="icon iconfont" id="close_set">&#xe61a;</i>
-	            <span>如果您对以上结果满意可【直接订阅】<br>更有VIP订阅等你试用。</span>
-	            <a id="zjdy" style="text-decoration: none;">直接订阅</a>
-	        </div>
-		</div>
-    </div>
-</section>
-<!--企业搜索页面-->
-<section id="entsearchPage" class="hidden">
-	<div class="app-layout-header">
-		<span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span>
-		招标搜索
-	</div>
-	<div class="app-layout-content-b">
-		<form class="wxhead" action="">
-			<div class="entsearch_head searchhead">
-				<input class="form-control searchinput" id="ent_searchinput" maxlength ="50" value="" placeholder="中标企业名称"/>
-
-				<input type="hidden" name="money" value="">
-				<input type="hidden" name="money_from" value="">
-				<input type="hidden" name="money_to" value="">
-				<input type="hidden" name="scope" value="">
-
-				<div id="recList" style="display: none"></div>
-				<span class="query hidden">
-					<div class="jy_sprite_main sprite_jywxjs"></div>
-<!--					<img src="{{Msg "seo" "cdn"}}/jyapp/images/entsearch/jywxjs.png?v={{Msg "seo" "version"}}"/>-->
-				</span>
-				<span class="clearInpt hidden">
-					<div class="jy_sprite_main sprite_jyqingchu"></div>
-<!--					<img src="{{Msg "seo" "cdn"}}/jyapp/images/entsearch/jyqingchu.png?v={{Msg "seo" "version"}}"/>-->
-				</span>
-				<span class="screen">筛选</span>
-			</div>
-		</form>
-		<!--过滤搜索-->
-		<div id="set_search" class="hidden">
-			<div class="select">
-				<ul>
-					<li>金额
-						<div class="jy_sprite_main sprite_sys-jt-bottom2"></div>
-<!--						<img src="{{Msg "seo" "cdn"}}/jyapp/images/entsearch/sys-jt-bottom2.png?v={{Msg "seo" "version"}}">-->
-					</li>
-					<li class="shuxian"></li>
-					<li>地区
-						<div class="jy_sprite_main sprite_sys-jt-bottom"></div>
-<!--						<img src="{{Msg "seo" "cdn"}}/jyapp/images/entsearch/sys-jt-bottom.png?v={{Msg "seo" "version"}}">-->
-					</li>
-				</ul>
-			</div>
-			<div class="wxsearch">
-				<div>
-					<div class="money" style="font-size: 14px;padding: 13px 10px 10px 10px;overflow-y: scroll;height: 170px;">
-						<ul style="height: 180px;">
-							<li><button class="btn active_m">全部</button></li>
-							<li>价格区间</li>
-							<li class="money-inp">
-								<div class="min-price">
-									<input class="form-control money-input" id="money_from"  placeholder="" type="text"/>
-									<span class="min-unit">万元</span>
-									<span class="fgx"></span>
-								</div>
-								<div class="max-price">
-									<input class="form-control money-input"  id="money_to" placeholder="" type="text"/>
-									<span class="max-unit">万元</span>
-								</div>
-							</li>
-						</ul>
-					</div>
-
-					<div class="jydq-dialog hidden">
-						<div class="dialog-content contentone">
-							<ul>
-								<li>
-									<button class="btn active">全国</button>
-								</li>
-								<li>
-									<span>A</span>
-									<button class="btn">安徽</button>
-									<button class="btn">澳门</button>
-								</li>
-								<li>
-									<span>B</span>
-									<button class="btn">北京</button>
-								</li>
-								<li>
-									<span>C</span>
-									<button class="btn">重庆</button>
-								</li>
-								<li>
-									<span>F</span>
-									<button class="btn">福建</button>
-								</li>
-								<li>
-									<span>G</span>
-									<button class="btn">广东</button>
-									<button class="btn">广西</button>
-									<button class="btn">贵州</button>
-									<button class="btn">甘肃</button>
-								</li>
-								<li>
-									<span>H</span>
-									<button class="btn">河北</button>
-									<button class="btn">湖北</button>
-									<button class="btn">黑龙江</button>
-									<button class="btn">海南</button>
-									<button class="btn">河南</button>
-									<button class="btn">湖南</button>
-								</li>
-								<li>
-									<span>J</span>
-									<button class="btn">吉林</button>
-									<button class="btn">江苏</button>
-									<button class="btn">江西</button>
-								</li>
-								<li>
-									<span>L</span>
-									<button class="btn">辽宁</button>
-								</li>
-								<li>
-									<span>N</span>
-									<button class="btn">内蒙古</button>
-									<button class="btn">宁夏</button>
-								</li>
-								<li>
-									<span>Q</span>
-									<button class="btn">青海</button>
-								</li>
-								<li>
-									<span>S</span>
-									<button class="btn">山西</button>
-									<button class="btn">陕西</button>
-									<button class="btn">上海</button>
-									<button class="btn">山东</button>
-									<button class="btn">四川</button>
-								</li>
-								<li>
-									<span>T</span>
-									<button class="btn">天津</button>
-									<button class="btn">台湾</button>
-								</li>
-								<li>
-									<span>X</span>
-									<button class="btn">西藏</button>
-									<button class="btn">新疆</button>
-									<button class="btn">香港</button>
-								</li>
-								<li>
-									<span>Y</span>
-									<button class="btn">云南</button>
-								</li>
-								<li>
-									<span>Z</span>
-									<button class="btn">浙江</button>
-								</li>
-							</ul>
-						</div>
-					</div>
-				</div>
-			</div>
-			<div class="bottom_btn">
-				<ul class="j-button-group">
-					<li class="jydqreset j-button-cancel reset">重置</li>
-					<li class="jydqsure j-button-confirm sure">确定</li>
-				</ul>
-			</div>
-		</div>
-		<!--数据列表-->
-		<div id="wrapper" style="margin-top:.2rem;border-top: 1px solid #E0E0E0;" class="hidden">
-			<div>
-				<section id="jytables">
-				<table>
-					<thead>
-					<tr>
-						<td width="12%">序号</td>
-						<td width="20%">中标日期</td>
-						<td width="48%">项目名称</td>
-						<td width="20%">中标金额<br>(万元)</td>
-					</tr>
-					</thead>
-					<tbody>
-					</tbody>
-				</table>
-			</section>
-			</div>
-			<!--tip-->
-			<div class="tip_m">提示：为了获得更佳的体验，推荐使用电脑浏览器访问剑鱼标讯网站jianyu360.com查看数据表格。</div>
-		</div>
-		<!--no data-->
-		<div class="nullcontent text-center hidden">
-			<div >
-				<div class="jy_sprite_main sprite_jysorry_1"></div>
-<!--				<img style="width:150px;margin:0px 0 50px 0;" src="{{Msg "seo" "cdn"}}/jyapp/images/entsearch/jysorry_1.png?v={{Msg "seo" "version"}}">-->
-			</div>
-			<div style="margin-top:30px;font-size:16px;color:#1d1d1d;">没有找到和该关键词匹配的信息</div>
-			<div style="width:100%;padding-top: 25px;" class="text-center" id="feedback">
-				<div class="jy_sprite_main sprite_jyyjfk"></div>
-<!--				<img style="width: 200px;margin-top: 25px;" src="{{Msg "seo" "cdn"}}/jyapp/images/entsearch/jyyjfk.png?v={{Msg "seo" "version"}}">-->
-			</div>
-		</div>
-	</div>
-</section>
-<!--{{include "/common/footer.html"}}-->
-<div id="advertscript" class="hidden"></div>
-<script src="{{Msg "seo" "cdn"}}/jyapp/vipsubscribe/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
-<script type="text/javascript">
-	$(function() {
-  	SuperSearch.getHomeList("",1);//获取数据
-	// 监听banner高度变化
-	var GolBalTime;
-	function listenerBannerHeight () {
-		var tTop = $('.home_banner').offset().top
-		// console.log('delayed', tTop)
-		if (tTop <= 72) {
-			$('.home_search').addClass('fixed-top')
-		} else {
-			$('.home_search').removeClass('fixed-top')
-		}
-		GolBalTime = requestAnimationFrame(listenerBannerHeight)
-	}
-	listenerBannerHeight()
-    setTimeout(function(){
-      loadJS("{{Msg "seo" "cdn"}}/jyapp/js/fastclick.js?v={{Msg "seo" "version"}}",function(){
-        // 解决ios系统click 事件300毫秒的延迟
-        FastClick.attach(document.body);
-      });
-      loadJS("https://cdn.bootcdn.net/ajax/libs/vConsole/3.3.4/vconsole.min.js");
-      //working gif
-      $("#working").html('<img style="width:163px;" src="{{Msg "seo" "cdn"}}/jyapp/images/wx/working.gif?v={{Msg "seo" "version"}}"><div style="font-size:16px;">剑鱼标讯正在努力工作中···</div>')
-    },500);
-    // 搜索选择的显示隐藏
-    $('.selected-export .options').on('tap', 'span',function(e){
-      var index = $(this).attr('index')  // index可以表示当前点击的是哪个按钮
-      var $this = $(this)
-      // 如果已经显示，则判断点击的是否和上次相同
-      if ($('.weui-mask').css('display') !== 'none') {
-        // 点击按钮的时候dialog显示了,显示的如果和这次的相同，则隐藏
-        // 找到显示的sub-tab的index
-        var showArr = []
-        $('.newdialog .tab-box ul.sub-tab').each(function (i, dom){
-          if ($(dom).css('display') !== 'none') {
-            showArr.push($(dom).attr('index'))
-          }
-        })
-        if (showArr.length === 1 && showArr[0] === index) {
-          // 和上次点击的相同，则关闭tab栏
-          hideTab()
-
-          $(this).find('i').removeClass('jyapp-icon-shouqi').addClass('jyapp-icon-zhankai')
-          return // 直接结束函数
-        }
-
-        // 如果已经显示，则tab切换不需要动画
-        $('.newdialog .tab-box ul.sub-tab').each(function (i, dom){
-          if ($(dom).attr('index') === index) {
-            $(dom).show().siblings().hide()
-
-            // 切换上下三角
-            $this.find('i').removeClass('jyapp-icon-zhankai').removeClass('jyapp-icon-shouqi').addClass('jyapp-icon-shouqi')
-            $this.siblings().find('i').removeClass('jyapp-icon-shouqi').addClass('jyapp-icon-zhankai')
-            return false
-          }
-        })
-        $('.weui-mask').show();
-	      $('.app-layout-content-b').css({"overflow":"hidden"});
-        return
-      }
-
-      // tab切换
-      $('.newdialog .tab-box ul.sub-tab').each(function (i, dom){
-          if ($(dom).attr('index') === index) {
-              // $(dom).show().siblings().hide()
-              $(dom).slideDown('fast').siblings().hide()
-
-              // 切换上下三角
-              $this.find('i').removeClass('jyapp-icon-zhankai').removeClass('jyapp-icon-shouqi').addClass('jyapp-icon-shouqi')
-              $this.siblings().find('i').removeClass('jyapp-icon-shouqi').addClass('jyapp-icon-zhankai')
-              return false
-          }
-      })
-      $('.weui-mask').show();
-		  $('.app-layout-content-b').css({"overflow":"hidden"});
-    })
-
-    // tab内容的选择
-    $('.newdialog .tab-box .sub-tab').on('tap', 'li',function () {
-      var text = $(this).find('span').text();
-      var index = $(this).parent().attr('index');
-      var dataVal = $(this).attr('dataVal');
-      var $optionsDOM = $(this).parents('.newdialog').siblings().find('.options span');
-      var reqFlag = true;
-      $optionsDOM.each(function(i,dom){
-        if ($(dom).attr('index') === index) {
-					if($(dom).find('em').text()==text){
-						reqFlag = false;
-					}else{
-            $(dom).find('em').text(text);
-			    }
-        }
-        $(dom).find('i').removeClass('jyapp-icon-zhankai').removeClass('jyapp-icon-shouqi').addClass('jyapp-icon-zhankai');
-      })
-      $(this).addClass('active')
-      $(this).siblings().removeClass('active')
-      hideTab()
-			if (reqFlag){
-				if (dataVal=="searchtitle"){//标题搜索
-					SuperSearch.titleSearch();
-				}else if(dataVal=="searchall"){//全文搜索
-					SuperSearch.allSearch();
-				}else if(dataVal=="showlist"){//列表显示
-					SuperSearch.showlist();
-				}else if(dataVal=="showtable"){//表格显示
-					SuperSearch.showTable();
-				}
-			}
-    })
-
-    $('.weui-mask').on('tap', function(){
-        hideTab()
-        $('.selected-export .options').find('i').removeClass('jyapp-icon-shouqi').addClass('jyapp-icon-zhankai')
-    })
-		//
-		$(".export").on("tap",function(){
-			toSearchExport();
-		})
-	});
- 	sessionStorage.removeItem("readClause");
-	if(sessionStorage.onceTipUpdate != "1"){
-		localStorage.removeItem("onceTipUpdate");
-	}
-	if(sessionStorage&&sessionStorage.mainSearchReload=="1"){
-		sessionStorage.removeItem("mainSearchReload");
-		SuperSearch.clearSessionStorage();
-		EntSearch.clearSessionStorage();
-	}
-	window.onunload = function(e){
-		if(SuperSearch.isMyPage){
-			SuperSearch.setSessionStorage();
-		}else if(EntSearch.isMyPage){
-			EntSearch.setSessionStorage();
-		}
-	}
-  //回车事件
-  document.onkeydown = function () {
-    if(window.event && window.event.keyCode == 13) {
-      window.event.returnValue = false;
-		  //超级搜索
-			if(SuperSearch.isMyPage){
-				var max=$("#supersearchPage .maxMrice").val(),min=$("#supersearchPage .minMrice").val();
-        if(Number(max)<Number(min)&&max!=""&&min!=""){
-          $("#supersearchPage .maxMrice").val(min);
-          $("#supersearchPage .minMrice").val(max);
-		    }
-				SuperSearch.formSubmit("N");
-			}else if(EntSearch.isMyPage){//企业搜索
-				var money_from = $.trim($("#entsearchPage #money_from").val());
-        var money_to = $.trim($("#entsearchPage #money_to").val());
-        var from = parseFloat(money_from);
-        var to = parseFloat(money_to);
-        if(from>to){
-          $("#entsearchPage #money_from").val(money_to);
-          $("#entsearchPage #money_to").val(money_from);
-				}
-	      EntSearch.formSubmit();
-			}
-    }
-  }
-	$(function(){
-		sessionStorage.removeItem("ischecked");
-		//提前加载好历史搜索记录和关键词
-		//SuperSearch.loadTipMsg();
-		$("#navbar-search").addClass("active");
-		$("#searchIndex").removeClass("hidden");
-		//点击帮助
-    $(".rightHref").unbind("click").on("click",function(){
-		  JyObj.openExternalLink('http://mp.weixin.qq.com/mp/homepage?__biz=MzIyNTM1NDUyNw==&hid=3&sn=badf2d7da08654c58b58169e773f58f0#wechat_redirect','使用帮助')
-    });
-	  //查询是否开通超级搜索和中标企业搜索
-    $.post("/jyapp/free/searchIndex?t="+new Date().getTime(),{
-      "ad_name":"jyapp-wxsearch-middle,jy-appsearch-home-top",
-      "ad_index":"-1,-1"
-    },function(result){
-  		$("#searchIndex .inp-search").unbind("click").on("click",function () {
-  	    SuperSearch.init(true,true,true);
-  	  });
-  		userId = result.userId;
-  		SuperSearch.openTablepro=result.tablepro;
-		  //中标企业搜索跳转
-	    $(".tab_container a:eq(0)").unbind("tap").on("tap",function(){
-				EntSearch.clearSessionStorage();
-				EntSearch.init(true,true,true);
-	    });
-      //加载广告
-      addCssByLink("{{Msg "seo" "cdn"}}/jyapp/swiper/swiper.min.css?v={{Msg "seo" "version"}}");
-      loadJS("{{Msg "seo" "cdn"}}/jyapp/swiper/swiper.min.js?v={{Msg "seo" "version"}}",function(){
-        loadAD(result);
-      })
-    });
-		backThisPage();
-		//点击帮助
-    $(".home_search_right").click(function(){
-      JyObj.openExternalLink('https://mp.weixin.qq.com/mp/homepage?__biz=MzIyNTM1NDUyNw==&hid=3&sn=badf2d7da08654c58b58169e773f58f0#wechat_redirect','使用帮助')
-		  event.stopPropagation();
-    });
-    //数据导出页面
-    $(".tab_container  a:eq(1)").on('click', function () {
-		  event.stopPropagation();
-			setTimeout(function(){
-				if(userId==""){
-					window.location.href='/jyapp/free/login?back=index';
-				}else{
-					window.location.href='/jyapp/front/dataExport/toSieve';
-				}
-			},300);
-    });
-    //剑鱼标讯
-    $(".tab_container a:eq(2)").on('click', function () {
-			setTimeout(function(){
-				if(userId==""){
-					window.location.href='/jyapp/free/login?back=index';
-				}else{
-					//window.location.href='/jyloanweb/index.html?v='+(new Date()).valueOf();
-					//查询是否是否开通商机管理
-					$.post("/entniche/buy/whetherbuy",{},function(res){
-						if (res.error_code === 0) {
-							if (res.data.status === 2) {
-								// 跳转到商机管理使用页面
-								location.href = '/page_entniche/home'
-							} else {
-								// 跳转到创建企业页面
-								location.href = '/page_entniche/page/introduce_page.html'
-							}
-						}
-					});
-				}
-			},300);
-    });
-    //招投标课程
-    $(".tab_container  a:eq(3)").on('click', function () {
-			event.stopPropagation();
-			setTimeout(function(){
-				if(userId==""){
-					window.location.href='/jyapp/free/login?back=index';
-				}else{
-					window.location.href='/jyapp/course/list';
-				}
-			},300);
-    });
-		$(".jy_header_box .sprite_home_search_t").unbind("click").on("click",function () {
-			$('.jy_header').hide();
-	    SuperSearch.init(true,true,true);
-	  });
-	});
-	function backThisPage(){
-		if(!sessionStorage){
-			return
-		}
-		//登录返回之后，更新历史记录，获取userId
-		if(sessionStorage.searchpageName == "superSearch"){
-			SuperSearch.init(false,false,true);
-		}else if(sessionStorage.searchpageName == "superSearch_back"){
-			SuperSearch.init(true,false,true);
-		}else if(sessionStorage.searchpageName == "entSearch"){
-			EntSearch.init(false,false,true);
-		}else if(sessionStorage.searchpageName == "entSearch_back"){
-			EntSearch.init(true,false,true);
-		}else if(sessionStorage.searchpageName == "lab_search_back"){
-			SuperSearch.init(true,false,false);
-		}else if(sessionStorage.searchpageName == "lab_ent_back"){
-			EntSearch.init(true,false,false);
-		}else{
-			localStorage.removeItem("superSearch_showType");
-			if(localStorage.reLogin=="1"){
-				localStorage.removeItem("reLogin");
-				prohibitBack();
-			}
-		}
-	}
-	function afterJyObjInit(){
-		redSpotOnMenu();
-	}
-	function afterClickBack(){
-		SuperSearch.isMyPage = false;
-		EntSearch.isMyPage = false;
-		SuperSearch.resetPage(false);
-		EntSearch.resetPage(false);
-		$("#searchIndex").removeClass("hidden");
-		$("#supersearchPage,#entsearchPage").addClass("hidden");
-    	$("body").css("background-color","#f5f4f9");
-    	$(".jymobile-datePicker .weui-mask").trigger('click')
-    	$(".jymobile-datePicker .weui-mask").click()
-		SuperSearch.inputBlur();
-		EntSearch.inputBlur();
-		JyObj.hiddenBottom("1");
-	}
-	function AdClick(e,isExternal,link,title){
-    //不登录点击广告位跳转登录页面
-    if(!userId){
-  		window.location.href = "/jyapp/free/login?to=back";
-  		return;
-  	}
-    var adv_name = $(e).parent().attr("adv_name");
-    if((localStorage.loginPhone=="18613717801"||isExaminePhone)&&adv_name&&adv_name.indexOf("APP搜索页轮播图")>-1){
-      return
-    }
-		//百度统计
-		var ce = $(e).parent();
- // if (ce.attr("adv_name")!="APP搜索列表页-中部"){
-	  adv_statistics(ce);
- // }
-    if(isExternal){
-    	if(!title){
-      	title="剑鱼标讯"
-    	}
-	    //清除页面数据
-	    SuperSearch.clearSessionStorage();
-	    JyObj.openExternalLink(link,title)
-    }else{
-      window.location.href = link;
-    }
-	}
-  function loadAD(r){
-    //jyapp-wxsearch-middle
-  	var ADList=r["jyapp-wxsearch-middle"];
-    if(ADList!=null){
-      var random=Math.floor(Math.random()*ADList.length)
-    	var AD=ADList[random]
-    	var ADHtml="<span class=\"closeadv-bg\"></span>"
-    	  +"<img src=\"{{Msg "seo" "cdn"}}/jyapp/images/wxqc.png?v={{Msg "seo" "version"}}\" class=\"closeadv\" onclick=\"SuperSearch.closeadv(this)\">";
-    	if(AD.s_pic){
-    		if(AD.s_link){
-    			var ADtitle = "";
-    			if(AD.o_extend!=undefined&&AD.o_extend.title!=undefined){
-    				ADtitle=AD.o_extend.title;
-    			}
-        	if(AD.o_extend!=undefined&&AD.o_extend.linktype=="within"){
-          	ADHtml+="<a onclick=\"AdClick(this,"+false+",'"+AD.s_link+"')\"><img src='"+AD.s_pic+"'/></a>"
-        	}else{
-          	ADHtml+="<a onclick=\"AdClick(this,"+true+",'"+AD.s_link+"','"+ADtitle+"')\"><img src='"+AD.s_pic+"'/></a>"
-        	}
-    		}else{
-    			ADHtml+="<img src='"+AD.s_pic+"'/>"
-    		}
-    	}else{
-    		ADHtml+=AD.s_script
-    	}
-      $("#advertscript").html(ADHtml);
-    }
-    //jy-appsearch-home-top
-	  var ADTopList=r["jy-appsearch-home-top"];
-		if (ADTopList!=null){
-			var adhtml = '';
-			for(var i=0;i<ADTopList.length;i++){
-				var ADtitle = "";
-				if(ADTopList[i]["o_extend"]!=undefined&&ADTopList[i]["o_extend"].title!=undefined){
-					ADtitle=ADTopList[i]["o_extend"].title;
-				}
-		    var num = i+1;
-				adhtml+='<div class="swiper-slide" adv_name="APP搜索页轮播图'+ num +'">'
-				if(ADTopList[i]["o_extend"]!=undefined&&ADTopList[i]["o_extend"].linktype=="within"){
-				  adhtml+="<a onclick=\"AdClick(this,"+false+",'"+ADTopList[i]["s_link"]+"')\"><img  src='"+ADTopList[i]["s_pic"]+"'/></a>"
-				}else{
-				  adhtml+="<a onclick=\"AdClick(this,"+true+",'"+ADTopList[i]["s_link"]+"','"+ADtitle+"')\"><img src='"+ADTopList[i]["s_pic"]+"'/></a>"
-				}
-				adhtml+='</div>'
-		  }
-			if(ADTopList.length==1){
-				$(".swiper-pagination").hide();
-			}
-			if(adhtml!=""){
-				$(".home_banner .swiper-wrapper").html(adhtml);
-			}
-  		$("#swiper1 .swiper-wrapper").ready(function () {
-  			var swiper1 = new Swiper('#swiper1',{
-  				slidesPerView: 1,
-  				spaceBetween: 20,
-  				centeredSlides: true,
-  				speed:800,
-  				autoplay: {
-  					delay: 4000,
-  					disableOnInteraction: false
-  				},
-  				pagination: {
-  					el: '.swiper-pagination',
-  					clickable: true
-  				},
-  				loop: true,
-  			});
-  			swiper1.init();
-  		})
-    }
-  }
-	function toSearchExport(){
-		$(".loading_").show();
-		SuperSearch.setSessionStorage();
-		if(userId == ""||userId==null){
-			window.location.href = "/jyapp/free/login?to=back";
-		}else{
-			//判断 是标题搜索还是全文搜索
-			var em_selectType=$(".options").children(".search-title").children("em").html();
-			console.log(em_selectType)
-			if(em_selectType=="全文搜索"){
-				SuperSearch.reqParam.selectType="all";
-			}else if(em_selectType=="标题搜索"){
-				SuperSearch.reqParam.selectType="title";
-			}
-			$.ajax({
-				type: "post",
-				url: "/jyapp/front/dataExport/searchExport",
-				data: SuperSearch.reqParam,
-				dataType: "json",
-				success: function(data){
-					$(".loading_").hide();
-					if(data._id!=""){
-						window.location.href="/jyapp/front/dataExport/toCreateOrderPage?id="+data._id+"&source=d"
-					}
-				},
-				error:function(e){
-					$(".loading_").hide();
-					window.location.href="/jyapp/free/login"
-				}
-			})
-		}
-	}
-  // 动画隐藏tab栏
-  function hideTab () {
-    $('.newdialog .tab-box .sub-search-title').slideUp('fast');
-    $('.newdialog .tab-box .sub-show-list').slideUp('fast');
-  	// 切换上下三角
- 		$('.selected-export .options .search-title').find('i').removeClass('jyapp-icon-zhankai').removeClass('jyapp-icon-shouqi').addClass('jyapp-icon-zhankai');
- 		$('.selected-export .options .show-list').find('i').removeClass('jyapp-icon-zhankai').removeClass('jyapp-icon-shouqi').addClass('jyapp-icon-zhankai');
-      $('.weui-mask').hide();
-	  $('.app-layout-content-b').css({"overflow":"auto"});
-  }
-</script>
-<!--百度统计end-->
-{{include "/common/baiducc.html"}}
-</body>
-</html>
+<html>
+<head>
+{{include "/common/meta.html"}}
+<link href="{{Msg "seo" "cdn"}}/jyapp/css/searchindex.css?v={{Msg "seo" "version"}}" rel="stylesheet">
+<link href="{{Msg "seo" "cdn"}}/jyapp/css/appbutton.css?v={{Msg "seo" "version"}}" rel="stylesheet">
+<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/vipsubscribe/iconfont/iconfont.css?v={{Msg "seo" "version"}}"/>
+<script src="{{Msg "seo" "cdn"}}/jyapp/js/jquery-3.2.1.min.js?v={{Msg "seo" "version"}}"></script>
+{{include "/common/js.html"}}
+<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/vipsubscribe/css/weui.min.css?v={{Msg "seo" "version"}}"/>
+<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/css/p13.css?v={{Msg "seo" "version"}}"/>
+<script src="{{Msg "seo" "cdn"}}/jyapp/js/dropload.js?v={{Msg "seo" "version"}}"></script>
+<script type="text/javascript" src="{{Msg "seo" "cdn"}}/jyapp/js/searchindex.js?v=121111{{Msg "seo" "version"}}"></script>
+	<title>搜索</title>
+<script type="text/javascript">
+	//
+	if(sessionStorage&&sessionStorage.reloadHomePage){
+		sessionStorage.removeItem("reloadHomePage");
+		window.location.reload();
+	}
+	var userId = {{session "userId"}};
+	var pageSize = {{.T.pageSize}};
+	var encode = "DB4WER4VWyoaAw9GWwgMGU1wEQ4CDQ1b";
+	SuperSearch.industry = {{.T.industry}};
+	SuperSearch.sortArray = {{.T.sortArray}};
+	var CDN = {{Msg "seo" "cdn"}};
+	var VERSION = {{Msg "seo" "version"}};
+  var isExaminePhone={{session "s_phone"}}=="18613717801";
+  if(mySysIsIos()&&(userId==null||userId==""||isExaminePhone)){
+    localStorage.setItem("Active_Vip_Invite",new Date().getTime());
+  }
+</script>
+</head>
+<body id="home_main" class="p13">
+<style>
+	#dqbtn{
+		width: 5.5em !important;
+	}
+	html,body{
+		background: #fff;
+	}
+	body .loading_,body .loading_Top{
+		margin-top:0px;
+	}
+</style>
+
+<div class="loading_Top" style="display: none;">
+    <p><span></span></p>
+</div>
+<!--主题内容-->
+<!--头部-->
+<div class="jy_header" style="display:none;">
+    <div class="jy_header_box">
+        <span></span>
+        <h3>剑鱼标讯</h3>
+		<div class="jy_sprite_main sprite_home_search_t"></div>
+<!--        <img src="{{Msg "seo" "cdn"}}/jyapp/images/home_search.png?v={{Msg "seo" "version"}}" alt="">-->
+    </div>
+</div>
+<!--S p13 头部-->
+<div id="top-search" class="fixed-top-input-box home" style="min-height: auto;display: none;">
+	<div class="top">
+		<div class="home_search fixed-top">
+			<div class="home_search_left inp-search">
+				<div class="jy_sprite_main sprite_home_search icon_search"></div>
+				<span>示例：税务局 软件</span>
+			</div>
+		</div>
+	</div>
+</div>
+<!--E p13 头部-->
+<section id="searchIndex" class="hidden">
+	<section class="content">
+		<!--2.8.5 start-->
+		<div class="home">
+	        <div class="top">
+				<div class="top-bg-box">
+					<div class="top-bg-right"></div>
+					<div class="top-bg-left"></div>
+				</div>
+				<div class="top-title">剑鱼标讯</div>
+	            <div class="home_search">
+<!--					<input class="inp-search" type="text" name="" value="" maxlength="50" placeholder="示例：税务局 软件" readonly="">-->
+	                <div class="home_search_left inp-search">
+						<div class="jy_sprite_main sprite_home_search icon_search"></div>
+<!--	                    <img class="icon_search" src="{{Msg "seo" "cdn"}}/jyapp/images/search/home_search.png?v={{Msg "seo" "version"}}" alt="">-->
+	                    <span>示例：税务局 软件</span>
+	                </div>
+<!--	                <div class="home_search_right">-->
+<!--						<div class="jy_sprite_main sprite_home_question icon_question"></div>-->
+<!--&lt;!&ndash;	                    <img class="icon_question" src="{{Msg "seo" "cdn"}}/jyapp/images/search/home_question.png?v={{Msg "seo" "version"}}" alt="">&ndash;&gt;-->
+<!--	                </div>-->
+	            </div>
+	            <div class="home_banner">
+	                <div class="swiper-container lunbo" id="swiper1">
+	                    <div class="swiper-wrapper">
+							<!--轮播广告-->
+							<div class="placeholder-div"></div>
+	                    </div>
+	                    <div class="swiper-pagination custorm_dot"></div>
+	                </div>
+	            </div>
+	        </div>
+	        <!-- 导航菜单 -->
+	        <div class="home_tab">
+	            <div class="tab_container">
+	                <a class="tab_item">
+<!--						<div class="jy_sprite_main sprite_home_tab_1"></div>-->
+	                    <img src="{{Msg "seo" "cdn"}}/jyapp/images/search/home_tab_1.png?v={{Msg "seo" "version"}}" alt="">
+	                    <span>搜中标企业</span>
+	                </a>
+	                <a class="tab_item">
+<!--						<div class="jy_sprite_main sprite_home_tab_2"></div>-->
+	                    <img src="{{Msg "seo" "cdn"}}/jyapp/images/search/home_tab_2.png?v={{Msg "seo" "version"}}" alt="">
+	                    <span>数据导出</span>
+	                </a>
+	                <a class="tab_item">
+<!--						<div class="jy_sprite_main sprite_home_tab_light"></div>-->
+	                    <img src="{{Msg "seo" "cdn"}}/jyapp/images/search/home_tab_3.png?v={{Msg "seo" "version"}}" alt="">
+	                    <span>商机管理</span>
+	                </a>
+					<!--
+	                <a class="tab_item">
+	                    <img src="/jyapp/images/search/home_tab_3.png" alt="">
+	                    <span>标讯订阅</span>
+	                </a>-->
+	                <a class="tab_item">
+						<!--TODO-->
+	                    <img src="{{Msg "seo" "cdn"}}/jyapp/course/image/course_book.png?v={{Msg "seo" "version"}}" alt="">
+	                    <span>招投标课程</span>
+	                </a>
+	                <!-- 微信端展示APP下载
+	                <a class="tab_item">
+	                    <img src="/jyapp/images/search/home_tab_4.png" alt="">
+	                    <span>APP下载</span>
+	                </a> -->
+	            </div>
+	        </div>
+	        <!-- 最新标讯 -->
+	        <div class="home_data">
+	            <h3 class="data_nav">最新标讯</h3>
+	            <div class="data_list">
+					<!--首页列表-->
+	            </div>
+	            <div class="no_data" style="display: none;">
+					<div class="jy_sprite_main sprite_nothing"></div>
+<!--	                <img src="{{Msg "seo" "cdn"}}/jyapp/images/search/nothing.png?v={{Msg "seo" "version"}}" alt="">-->
+	                <p>为了使您接收更多信息，可对关键词进行新增或修改。</p>
+	                <a class="home_toset">去设置</a>
+	            </div>
+	        </div>
+	        <div class="tips">
+	            <p class="tips_text home_1" style="display: none;">设置订阅关键词，随时接收最新招标信息</p>
+	            <p class="tips_text home_2" style="display: none;">为了使您接收更多信息，可对关键词进行新增或修改。</p>
+	            <p class="tips_text home_3" style="display: none;">您未设置关键词，设置后接收信息更精准!</p>
+	            <p class="tips_text home_4" style="display: none;">免费试用VIP订阅，商机获取能力提升30倍</p>
+	            <p class="tips_all" style="display: none;"><a class="GetAll">查看全部</a></p>
+	            <div class="tips_btn home_toset" style="display: none;">
+	                <a class="home_toset" >去设置</a>
+	            </div>
+	            <div class="tips_btn home_todetails" style="display: none;">
+	                <a class="home_todetails" >了解详情</a>
+	            </div>
+	        </div>
+	    </div>
+
+	</section>
+</section>
+
+<!--超级搜索页面-->
+<section id="supersearchPage" class="hidden">
+	<div class="app-layout-header">
+		<span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span>
+		招标搜索
+	</div>
+	<div class="loading_" style="display: none;">
+    <p><span></span></p>
+  </div>
+	<div class="app-layout-content-b">
+		<form class="wxhead" action="">
+			<div class="searchhead">
+				<input class="form-control searchinput" name="super_searchinput" maxlength="50"  placeholder="示例：税务局 软件"/>
+        		<div class="inputDiv hidden">
+					<div class="inpTitle_history">
+						<div class="jy_sprite_main sprite_history"></div>
+<!--						<img src="{{Msg "seo" "cdn"}}/jyapp/images/search/history.png?v={{Msg "seo" "version"}}">-->
+						<span>历史搜索</span>
+						<div id="del_history" class="jy_sprite_main sprite_history_clean"></div>
+<!--						<img id="del_history" src="{{Msg "seo" "cdn"}}/jyapp/images/search/history_clean.png?v={{Msg "seo" "version"}}">-->
+						<div style="clear: both"></div>
+					</div>
+					<div>
+						<ul class="history"></ul>
+					</div>
+					<div style="clear: both"></div>
+<!--					<div class="inpTitle_msgset"><img src="/jyapp/images/search/msgset.png"><span>我订阅的关键词</span></div>
+					<div>
+						<ul class="myMsgset"></ul>
+					</div>-->
+				</div>
+				<span class="screen text-center">筛选</span>
+				<span class="query hidden">
+					<div class="jy_sprite_main sprite_jywxjs"></div>
+<!--					<img src="{{Msg "seo" "cdn"}}/jyapp/images/wx/jywxjs.png?v={{Msg "seo" "version"}}">-->
+				</span>
+				<span class="clearInpt hidden">
+					<div class="jy_sprite_main sprite_jyqingchu"></div>
+<!--					<img src="{{Msg "seo" "cdn"}}/jyapp/images/wx/jyqingchu.png?v={{Msg "seo" "version"}}">-->
+				</span>
+			</div>
+		</form>
+		<div>
+			<div class="selLable hidden" id="selLable">
+				<div class="selected-export-box">
+	                <div class="selected-export">
+	                    <div class="options">
+	                        <span class="search-title active" index="1">
+	                            <em>标题搜索</em>
+	                            <i class="jyapp-icon jyapp-icon-zhankai"></i>
+	                        </span>
+	                        <span class="show-list active" index="2">
+	                            <em>列表显示</em>
+	                            <!-- jyapp-icon-shouqi -->
+	                            <i class="jyapp-icon jyapp-icon-zhankai"></i>
+	                        </span>
+	                    </div>
+	                    <div class="export">
+	                        <span style="padding: 3px 8px 3px;border-radius: 10px;background: rgba(44,183,202, 0.1);">
+	                            <i class="jyapp-icon jyapp-icon-shujudaochu"></i>
+	                            <em>数据导出</em>
+	                        </span>
+	                    </div>
+	                </div>
+	                <div class="newdialog">
+	                    <div class="tab-box">
+	                        <ul class="sub-tab sub-search-title" index="1"  style="display: none">
+	                            <li class="active" dataVal="searchtitle">
+	                                <span>标题搜索</span>
+	                                <i class="jyapp-icon jyapp-icon-xuanzhong"></i>
+	                            </li>
+	                            <li dataVal="searchall">
+	                                <span>全文搜索</span>
+	                                <i class="jyapp-icon jyapp-icon-xuanzhong"></i>
+	                            </li>
+	                        </ul>
+	                        <ul class="sub-tab sub-show-list" index="2" style="display: none">
+	                            <li class="active" dataVal="showlist">
+	                                <span>列表显示</span>
+	                                <i class="jyapp-icon jyapp-icon-xuanzhong"></i>
+	                            </li>
+	                            <li dataVal="showtable">
+	                                <span>表格显示</span>
+	                                <i class="jyapp-icon jyapp-icon-xuanzhong"></i>
+	                            </li>
+	                        </ul>
+	                    </div>
+	                </div>
+	            </div>
+	            <div class="weui-mask" style="display: none"></div>
+
+				<div class="com-title" style="display:none;"><!--height:30px; margin-top:20px;-->
+					<span id="search_title" class="on">标题搜索</span><!--<span style="float:left;">|</span>--><span id="search_all">全文搜索</span>
+				</div>
+				<div class="line-vertical" style="display:none;">
+				</div>
+				<div class="showType" style="display:none;">
+					<div class="showlist on">列表</div>
+					<div class="showtable">表格</div>
+				</div>
+			</div>
+			<div id="intercept" class="hidden">
+				<div class="jy_sprite_main sprite_tip"></div>
+<!--				<img src="{{Msg "seo" "cdn"}}/jyapp/images/tip.png?v={{Msg "seo" "version"}}">-->
+				<font>“的方式”</font>及其后面的字词均被忽略，因为剑鱼标讯的查询限制在20个汉字以内。
+			</div>
+			<div class="wxsearch hidden" id="super_search">
+				<div class="jysstj">
+					<div class="jyshaxuan">
+						<div class="shaixIndustry shaixcl">行业</div>
+						<div class="shaixMoney">金额</div>
+						<div class="shaixpt">时间</div>
+						<div class="shaixone">地区</div>
+						<div class="shaixtwo">类型</div>
+					</div>
+					<div class="industry-dialog">
+						<div class="dialog-content contentthree">
+
+						</div>
+					</div>
+					<!--金额-->
+					<div class="money-dialog hidden"  style="overflow-y: scroll;height: 150px;">
+						<ul style="height: 180px;">
+							<li><button data-value="all" class="btn active">全部</button></li>
+							<li>价格区间</li>
+							<li class="money-inp" data-value="">
+								<div class="min-price">
+									<input class="form-control minMrice" type="text"/>
+									<span class="min-unit">万元</span>
+									<span class="fgx"></span>
+								</div>
+								<div class="max-price">
+									<input class="form-control maxMrice"  type="text"/>
+									<span class="max-unit">万元</span>
+								</div>
+							</li>
+						</ul>
+					</div>
+					<div class="jypt-dialog hidden">
+						<div class="jypt-pt">
+							<button type="button" data-value="" class="btn jypt-active">全部</button>
+							<button type="button" data-value="lately-7" class="btn">最近7天</button>
+							<button type="button" data-value="lately-30" class="btn">最近30天</button>
+							<button type="button" data-value="thisyear" class="btn">去年</button>
+						</div>
+						<div class="jypt-timeinputs">
+							<input type="text" name="starttime" readonly="readonly" id="starttime" data-value="">
+							<div class="jypt-fg">
+								<span></span>
+							</div>
+							<input type="text" name="endtime" readonly="readonly" id="endtime" data-value="">
+						</div>
+					</div>
+					<div class="jydq-dialog hidden">
+						<div class="dialog-content contentone">
+							<ul>
+								<li>
+									<button class="btn active">全国</button>
+								</li>
+								<li>
+									<span>A</span>
+									<button class="btn">安徽</button>
+									<button class="btn">澳门</button>
+								</li>
+								<li>
+									<span>B</span>
+									<button class="btn">北京</button>
+								</li>
+								<li>
+									<span>C</span>
+									<button class="btn">重庆</button>
+								</li>
+								<li>
+									<span>F</span>
+									<button class="btn">福建</button>
+								</li>
+								<li>
+									<span>G</span>
+									<button class="btn">广东</button>
+									<button class="btn">广西</button>
+									<button class="btn">贵州</button>
+									<button class="btn">甘肃</button>
+								</li>
+								<li>
+									<span>H</span>
+									<button class="btn">河北</button>
+									<button class="btn">湖北</button>
+									<button class="btn">黑龙江</button>
+									<button class="btn">海南</button>
+									<button class="btn">河南</button>
+									<button class="btn">湖南</button>
+								</li>
+								<li>
+									<span>J</span>
+									<button class="btn">吉林</button>
+									<button class="btn">江苏</button>
+									<button class="btn">江西</button>
+								</li>
+								<li>
+									<span>L</span>
+									<button class="btn">辽宁</button>
+								</li>
+								<li>
+									<span>N</span>
+									<button class="btn">内蒙古</button>
+									<button class="btn">宁夏</button>
+								</li>
+								<li>
+									<span>Q</span>
+									<button class="btn">青海</button>
+								</li>
+								<li>
+									<span>S</span>
+									<button class="btn">山西</button>
+									<button class="btn">陕西</button>
+									<button class="btn">上海</button>
+									<button class="btn">山东</button>
+									<button class="btn">四川</button>
+								</li>
+								<li>
+									<span>T</span>
+									<button class="btn">天津</button>
+									<button class="btn">台湾</button>
+								</li>
+								<li>
+									<span>X</span>
+									<button class="btn">西藏</button>
+									<button class="btn">新疆</button>
+									<button class="btn">香港</button>
+								</li>
+								<li>
+									<span>Y</span>
+									<button class="btn">云南</button>
+								</li>
+								<li>
+									<span>Z</span>
+									<button class="btn">浙江</button>
+								</li>
+							</ul>
+						</div>
+					</div>
+					<div class="jytype-dialog hidden">
+						<div class="dialog-content contenttwo">
+							<ul>
+								<li>
+									<button class="btn active">全部</button>
+								</li>
+								<li>
+									<div id="dqbtn" style="width:7em;position:relative;float:left;" data-value="拟建">拟建项目</div>
+									<div class="jy_sprite_main sprite_q-mark q-mark" style="float:left;"></div>
+<!--									<img style="float:left;" class="q-mark" src="{{Msg "seo" "cdn"}}/jyapp/images/wx/q-mark.png?v={{Msg "seo" "version"}}"/>-->
+									<button class="btn hidden" style="clear:both;">拟建</button>
+								</li>
+								<li>
+									<div id="dqbtn" style="width:7em" data-value="预告">招标预告</div>
+									<button class="btn hidden">预告</button>
+								</li>
+								<li>
+									<div id="dqbtn" style="width:7em" data-value="招标">招标公告</div>
+									<button class="btn">招标</button>
+									<button class="btn">邀标</button>
+									<button class="btn">询价</button>
+									<button class="btn">竞谈</button>
+									<button class="btn">单一</button>
+									<button class="btn">竞价</button>
+									<button class="btn">变更</button>
+									<button class="btn">其他</button>
+								</li>
+								<li>
+									<div id="dqbtn" style="width:5.6em" data-value="结果">招标结果</div>
+									<button class="btn">中标</button>
+									<button class="btn">成交</button>
+									<button class="btn">废标</button>
+									<button class="btn">流标</button>
+								</li>
+								<li>
+									<div id="dqbtn" style="width:7.5em !important; " data-value="其它">招标信用信息</div>
+									<button class="btn">合同</button>
+									<button class="btn">验收</button>
+									<button class="btn">违规</button>
+								</li>
+							</ul>
+						</div>
+					</div>
+				</div>
+				<div class="jyshxbottom sl-jyshxbottom">
+					<ul class="text-center j-button-group">
+						<li class="jydqreset j-button-cancel">重置</li>
+						<li class="jydqsure j-button-confirm">确定</li>
+					</ul>
+				</div>
+			</div>
+			<div id="wrapper" class="hidden">
+				<div id="list" ></div>
+				<div id="table" class="hidden">
+					<div class="data">
+	                    <table class="content">
+	                        <!--
+	                        <tr>
+	                            <td><div>序号</div></td>
+	                            <td><div>发布时间</div></td>
+	                            <td><div>公告类型</div></td>
+	                            <td><div>招标单位</div></td>
+	                            <td><div>项目名称</div></td>
+	                            <td><div>预算<br>（万元）</div></td>
+	                            <td><div>开标时间</div></td>
+	                            <td><div>中标单位</div></td>
+	                            <td><div>中标金额<br>（万元）</div></td>
+	                        </tr>
+	                        -->
+	                    </table>
+	                </div>
+					<div class="TableTip" id="TableTip" style="display:none;">
+						<div class="jy_sprite_main sprite_table_close tableclose"></div>
+<!--						<img class="tableclose" src="{{Msg "seo" "cdn"}}/jyapp/images/table_close.png?v={{Msg "seo" "version"}}">-->
+						<div class="TableText">推荐使用电脑浏览器访问剑鱼标讯网站<br>jianyu360.com查看数据表格，体验更佳。</div></div>
+				</div>
+		        <div class="shade_table">
+		        	<div class="more">查看更多</div>
+		      	</div>
+			</div>
+		</div>
+		<div id="working" class="hidden" style="text-align: center;position: absolute;top: 50%;left: 50%;margin-left: -81px;margin-top: -50px;">
+			<!--<img style="width:163px;" src="{{Msg "seo" "cdn"}}/jyapp/images/wx/working.gif?v={{Msg "seo" "version"}}">
+			<div style="font-size:16px;">剑鱼标讯正在努力工作中···</div>-->
+    </div>
+		<div class="nullcontent text-center  hidden">
+			<div>
+				<div style="width:163px;margin:60px 0px 50px 0px;" class="jy_sprite_main sprite_jysorry_1_wx"></div>
+<!--				<img style="width:163px;margin:60px 0px 50px 0px;" src="{{Msg "seo" "cdn"}}/jyapp/images/wx/jysorry_1.png?v={{Msg "seo" "version"}}">-->
+			</div>
+			<div style="font-size:16px;color:#1d1d1d;">
+				<span id="hasNoData_tiptext">
+					<font>没有找到和该关键词匹配的信息</font>
+					<font style="display: none;">抱歉！由于系统繁忙暂时无法进行搜索，请1分钟后再试！</font>
+					<font style="display: none;">抱歉！由于系统繁忙暂时无法进行搜索，请稍后再试！</font>
+				</span><br>
+				<div id="allSearchModel">试试<span style="color:#2cb7ca;text-decoration:underline;line-height: 30px">全文搜索</span></div>
+			</div>
+			<div style="width:100%;" class="text-center" id="feedback">
+				<div style="transform: scale(1.21);margin-top: 15px;" class="jy_sprite_main sprite_jyyjfk"></div>
+<!--				<img style="width: 200px;margin-top: 15px;" src="{{Msg "seo" "cdn"}}/jyapp/images/wx/jyyjfk.png?v={{Msg "seo" "version"}}">-->
+			</div>
+		</div>
+		<div class="easypopup" id="nijianTip">
+			<div class="easypopup-alert">
+				<div class="easypopup-content">
+					“拟建项目”是指那些处于前期立项、审批阶段的项目。供应商应在立项阶段掌握项目信息，做到早介入，稳拿单。
+				</div>
+				<div class="easypopup-footer">
+					<span onclick="SuperSearch.njTipEasyPopup.hide();">我知道了</span>
+				</div>
+			</div>
+		</div>
+		<div id="tempDiv" style="display:none;"></div>
+	</div>
+<!--  	<div class="resbm hidden" id="resbm">
+		<div class="rests"></div>
+		<div class="resdy" id="zjdy">直接订阅
+			<div class="jy_sprite_main sprite_jydyyou"></div>
+		</div>
+		<div class="dy_close">
+			<div class="jy_sprite_main sprite_dy_close"></div>
+		</div>
+		<div style="clear:both"></div>
+	</div>-->
+
+    <div class="resbm hidden" id="resbm">
+		<div class="resbm0">
+	        <div>
+	            <i class="icon iconfont" id="close_set">&#xe61a;</i>
+	            <span>如果您对以上结果满意可【直接订阅】<br>更有VIP订阅等你试用。</span>
+	            <a id="zjdy" style="text-decoration: none;">直接订阅</a>
+	        </div>
+		</div>
+    </div>
+</section>
+<!--企业搜索页面-->
+<section id="entsearchPage" class="hidden">
+	<div class="app-layout-header">
+		<span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span>
+		招标搜索
+	</div>
+	<div class="app-layout-content-b">
+		<form class="wxhead" action="">
+			<div class="entsearch_head searchhead">
+				<input class="form-control searchinput" id="ent_searchinput" maxlength ="50" value="" placeholder="中标企业名称"/>
+
+				<input type="hidden" name="money" value="">
+				<input type="hidden" name="money_from" value="">
+				<input type="hidden" name="money_to" value="">
+				<input type="hidden" name="scope" value="">
+
+				<div id="recList" style="display: none"></div>
+				<span class="query hidden">
+					<div class="jy_sprite_main sprite_jywxjs"></div>
+<!--					<img src="{{Msg "seo" "cdn"}}/jyapp/images/entsearch/jywxjs.png?v={{Msg "seo" "version"}}"/>-->
+				</span>
+				<span class="clearInpt hidden">
+					<div class="jy_sprite_main sprite_jyqingchu"></div>
+<!--					<img src="{{Msg "seo" "cdn"}}/jyapp/images/entsearch/jyqingchu.png?v={{Msg "seo" "version"}}"/>-->
+				</span>
+				<span class="screen">筛选</span>
+			</div>
+		</form>
+		<!--过滤搜索-->
+		<div id="set_search" class="hidden">
+			<div class="select">
+				<ul>
+					<li>金额
+						<div class="jy_sprite_main sprite_sys-jt-bottom2"></div>
+<!--						<img src="{{Msg "seo" "cdn"}}/jyapp/images/entsearch/sys-jt-bottom2.png?v={{Msg "seo" "version"}}">-->
+					</li>
+					<li class="shuxian"></li>
+					<li>地区
+						<div class="jy_sprite_main sprite_sys-jt-bottom"></div>
+<!--						<img src="{{Msg "seo" "cdn"}}/jyapp/images/entsearch/sys-jt-bottom.png?v={{Msg "seo" "version"}}">-->
+					</li>
+				</ul>
+			</div>
+			<div class="wxsearch">
+				<div>
+					<div class="money" style="font-size: 14px;padding: 13px 10px 10px 10px;overflow-y: scroll;height: 170px;">
+						<ul style="height: 180px;">
+							<li><button class="btn active_m">全部</button></li>
+							<li>价格区间</li>
+							<li class="money-inp">
+								<div class="min-price">
+									<input class="form-control money-input" id="money_from"  placeholder="" type="text"/>
+									<span class="min-unit">万元</span>
+									<span class="fgx"></span>
+								</div>
+								<div class="max-price">
+									<input class="form-control money-input"  id="money_to" placeholder="" type="text"/>
+									<span class="max-unit">万元</span>
+								</div>
+							</li>
+						</ul>
+					</div>
+
+					<div class="jydq-dialog hidden">
+						<div class="dialog-content contentone">
+							<ul>
+								<li>
+									<button class="btn active">全国</button>
+								</li>
+								<li>
+									<span>A</span>
+									<button class="btn">安徽</button>
+									<button class="btn">澳门</button>
+								</li>
+								<li>
+									<span>B</span>
+									<button class="btn">北京</button>
+								</li>
+								<li>
+									<span>C</span>
+									<button class="btn">重庆</button>
+								</li>
+								<li>
+									<span>F</span>
+									<button class="btn">福建</button>
+								</li>
+								<li>
+									<span>G</span>
+									<button class="btn">广东</button>
+									<button class="btn">广西</button>
+									<button class="btn">贵州</button>
+									<button class="btn">甘肃</button>
+								</li>
+								<li>
+									<span>H</span>
+									<button class="btn">河北</button>
+									<button class="btn">湖北</button>
+									<button class="btn">黑龙江</button>
+									<button class="btn">海南</button>
+									<button class="btn">河南</button>
+									<button class="btn">湖南</button>
+								</li>
+								<li>
+									<span>J</span>
+									<button class="btn">吉林</button>
+									<button class="btn">江苏</button>
+									<button class="btn">江西</button>
+								</li>
+								<li>
+									<span>L</span>
+									<button class="btn">辽宁</button>
+								</li>
+								<li>
+									<span>N</span>
+									<button class="btn">内蒙古</button>
+									<button class="btn">宁夏</button>
+								</li>
+								<li>
+									<span>Q</span>
+									<button class="btn">青海</button>
+								</li>
+								<li>
+									<span>S</span>
+									<button class="btn">山西</button>
+									<button class="btn">陕西</button>
+									<button class="btn">上海</button>
+									<button class="btn">山东</button>
+									<button class="btn">四川</button>
+								</li>
+								<li>
+									<span>T</span>
+									<button class="btn">天津</button>
+									<button class="btn">台湾</button>
+								</li>
+								<li>
+									<span>X</span>
+									<button class="btn">西藏</button>
+									<button class="btn">新疆</button>
+									<button class="btn">香港</button>
+								</li>
+								<li>
+									<span>Y</span>
+									<button class="btn">云南</button>
+								</li>
+								<li>
+									<span>Z</span>
+									<button class="btn">浙江</button>
+								</li>
+							</ul>
+						</div>
+					</div>
+				</div>
+			</div>
+			<div class="bottom_btn">
+				<ul class="j-button-group">
+					<li class="jydqreset j-button-cancel reset">重置</li>
+					<li class="jydqsure j-button-confirm sure">确定</li>
+				</ul>
+			</div>
+		</div>
+		<!--数据列表-->
+		<div id="wrapper" style="margin-top:.2rem;border-top: 1px solid #E0E0E0;" class="hidden">
+			<div>
+				<section id="jytables">
+				<table>
+					<thead>
+					<tr>
+						<td width="12%">序号</td>
+						<td width="20%">中标日期</td>
+						<td width="48%">项目名称</td>
+						<td width="20%">中标金额<br>(万元)</td>
+					</tr>
+					</thead>
+					<tbody>
+					</tbody>
+				</table>
+			</section>
+			</div>
+			<!--tip-->
+			<div class="tip_m">提示：为了获得更佳的体验，推荐使用电脑浏览器访问剑鱼标讯网站jianyu360.com查看数据表格。</div>
+		</div>
+		<!--no data-->
+		<div class="nullcontent text-center hidden">
+			<div >
+				<div class="jy_sprite_main sprite_jysorry_1"></div>
+<!--				<img style="width:150px;margin:0px 0 50px 0;" src="{{Msg "seo" "cdn"}}/jyapp/images/entsearch/jysorry_1.png?v={{Msg "seo" "version"}}">-->
+			</div>
+			<div style="margin-top:30px;font-size:16px;color:#1d1d1d;">没有找到和该关键词匹配的信息</div>
+			<div style="width:100%;padding-top: 25px;" class="text-center" id="feedback">
+				<div class="jy_sprite_main sprite_jyyjfk"></div>
+<!--				<img style="width: 200px;margin-top: 25px;" src="{{Msg "seo" "cdn"}}/jyapp/images/entsearch/jyyjfk.png?v={{Msg "seo" "version"}}">-->
+			</div>
+		</div>
+	</div>
+</section>
+<!--{{include "/common/footer.html"}}-->
+<div id="advertscript" class="hidden"></div>
+<script src="{{Msg "seo" "cdn"}}/jyapp/vipsubscribe/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
+<script type="text/javascript">
+	$(function() {
+  	SuperSearch.getHomeList("",1);//获取数据
+	// 监听banner高度变化
+	var GolBalTime;
+	function listenerBannerHeight () {
+		if (!$("#searchIndex").hasClass('hidden')) {
+			var baseHeight = $(".top-title").offset().top + $(".top-title").height()
+			if (baseHeight <= 0) {
+				$("#searchIndex .home_search").css('opacity', '0')
+				$('#top-search').addClass('fixed-top').show()
+			} else {
+				$('#top-search').removeClass('fixed-top').hide()
+				$("#searchIndex .home_search").css('opacity', '1')
+			}
+		}
+		GolBalTime = requestAnimationFrame(listenerBannerHeight)
+	}
+		/*滚动显示导航栏*/
+		setTimeout(function(){
+			function change() {
+				//console.log(scrollTop)
+				if (!$("#searchIndex").hasClass('hidden')) {
+					var baseHeight = $(".top-title").offset().top + $(".top-title").height()
+					if (baseHeight <= 0) {
+						$("#searchIndex .home_search").css('opacity', '0')
+						$('#top-search').addClass('fixed-top').show()
+					} else {
+						$('#top-search').removeClass('fixed-top').hide()
+						$("#searchIndex .home_search").css('opacity', '1')
+					}
+				}
+			}
+			var UA = navigator.userAgent;
+			//console.log(UA)
+			if (UA.match(/iPad/) || UA.match(/iPhone/) || UA.match(/iPod/)) {
+				document.getElementById('home_main').addEventListener('touchmove', change)
+			}
+			document.getElementById('home_main').addEventListener('scroll', change)
+		})
+	listenerBannerHeight()
+	$('#searchIndex .home').on('tap longTap', '.list_item',function(e){
+		var tempS = $(this).addClass("hover")
+		setTimeout(function () {
+			tempS.removeClass('hover')
+		}, 50)
+	})
+	$('#list').on('tap longTap', '.tslist',function(e){
+		var tempS = $(this).addClass("hover")
+		setTimeout(function () {
+			tempS.removeClass('hover')
+		}, 50)
+	})
+    setTimeout(function(){
+      loadJS("{{Msg "seo" "cdn"}}/jyapp/js/fastclick.js?v={{Msg "seo" "version"}}",function(){
+        // 解决ios系统click 事件300毫秒的延迟
+        FastClick.attach(document.body);
+      });
+      loadJS("https://cdn.bootcdn.net/ajax/libs/vConsole/3.3.4/vconsole.min.js");
+      //working gif
+      $("#working").html('<img style="width:163px;" src="{{Msg "seo" "cdn"}}/jyapp/images/wx/working.gif?v={{Msg "seo" "version"}}"><div style="font-size:16px;">剑鱼标讯正在努力工作中···</div>')
+    },500);
+    // 搜索选择的显示隐藏
+    $('.selected-export .options').on('tap', 'span',function(e){
+      var index = $(this).attr('index')  // index可以表示当前点击的是哪个按钮
+      var $this = $(this)
+      // 如果已经显示，则判断点击的是否和上次相同
+      if ($('.weui-mask').css('display') !== 'none') {
+        // 点击按钮的时候dialog显示了,显示的如果和这次的相同，则隐藏
+        // 找到显示的sub-tab的index
+        var showArr = []
+        $('.newdialog .tab-box ul.sub-tab').each(function (i, dom){
+          if ($(dom).css('display') !== 'none') {
+            showArr.push($(dom).attr('index'))
+          }
+        })
+        if (showArr.length === 1 && showArr[0] === index) {
+          // 和上次点击的相同，则关闭tab栏
+          hideTab()
+
+          $(this).find('i').removeClass('jyapp-icon-shouqi').addClass('jyapp-icon-zhankai')
+          return // 直接结束函数
+        }
+
+        // 如果已经显示，则tab切换不需要动画
+        $('.newdialog .tab-box ul.sub-tab').each(function (i, dom){
+          if ($(dom).attr('index') === index) {
+            $(dom).show().siblings().hide()
+
+            // 切换上下三角
+            $this.find('i').removeClass('jyapp-icon-zhankai').removeClass('jyapp-icon-shouqi').addClass('jyapp-icon-shouqi')
+            $this.siblings().find('i').removeClass('jyapp-icon-shouqi').addClass('jyapp-icon-zhankai')
+            return false
+          }
+        })
+        $('.weui-mask').show();
+	      $('.app-layout-content-b').css({"overflow":"hidden"});
+        return
+      }
+
+      // tab切换
+      $('.newdialog .tab-box ul.sub-tab').each(function (i, dom){
+          if ($(dom).attr('index') === index) {
+              // $(dom).show().siblings().hide()
+              $(dom).slideDown('fast').siblings().hide()
+
+              // 切换上下三角
+              $this.find('i').removeClass('jyapp-icon-zhankai').removeClass('jyapp-icon-shouqi').addClass('jyapp-icon-shouqi')
+              $this.siblings().find('i').removeClass('jyapp-icon-shouqi').addClass('jyapp-icon-zhankai')
+              return false
+          }
+      })
+      $('.weui-mask').show();
+		  $('.app-layout-content-b').css({"overflow":"hidden"});
+    })
+
+    // tab内容的选择
+    $('.newdialog .tab-box .sub-tab').on('tap', 'li',function () {
+      var text = $(this).find('span').text();
+      var index = $(this).parent().attr('index');
+      var dataVal = $(this).attr('dataVal');
+      var $optionsDOM = $(this).parents('.newdialog').siblings().find('.options span');
+      var reqFlag = true;
+      $optionsDOM.each(function(i,dom){
+        if ($(dom).attr('index') === index) {
+					if($(dom).find('em').text()==text){
+						reqFlag = false;
+					}else{
+            $(dom).find('em').text(text);
+			    }
+        }
+        $(dom).find('i').removeClass('jyapp-icon-zhankai').removeClass('jyapp-icon-shouqi').addClass('jyapp-icon-zhankai');
+      })
+      $(this).addClass('active')
+      $(this).siblings().removeClass('active')
+      hideTab()
+			if (reqFlag){
+				if (dataVal=="searchtitle"){//标题搜索
+					SuperSearch.titleSearch();
+				}else if(dataVal=="searchall"){//全文搜索
+					SuperSearch.allSearch();
+				}else if(dataVal=="showlist"){//列表显示
+					SuperSearch.showlist();
+				}else if(dataVal=="showtable"){//表格显示
+					SuperSearch.showTable();
+				}
+			}
+    })
+
+    $('.weui-mask').on('tap', function(){
+        hideTab()
+        $('.selected-export .options').find('i').removeClass('jyapp-icon-shouqi').addClass('jyapp-icon-zhankai')
+    })
+		//
+		$(".export").on("tap",function(){
+			toSearchExport();
+		})
+	});
+ 	sessionStorage.removeItem("readClause");
+	if(sessionStorage.onceTipUpdate != "1"){
+		localStorage.removeItem("onceTipUpdate");
+	}
+	if(sessionStorage&&sessionStorage.mainSearchReload=="1"){
+		sessionStorage.removeItem("mainSearchReload");
+		SuperSearch.clearSessionStorage();
+		EntSearch.clearSessionStorage();
+	}
+	window.onunload = function(e){
+		if(SuperSearch.isMyPage){
+			SuperSearch.setSessionStorage();
+		}else if(EntSearch.isMyPage){
+			EntSearch.setSessionStorage();
+		}
+	}
+  //回车事件
+  document.onkeydown = function () {
+    if(window.event && window.event.keyCode == 13) {
+      window.event.returnValue = false;
+		  //超级搜索
+			if(SuperSearch.isMyPage){
+				var max=$("#supersearchPage .maxMrice").val(),min=$("#supersearchPage .minMrice").val();
+        if(Number(max)<Number(min)&&max!=""&&min!=""){
+          $("#supersearchPage .maxMrice").val(min);
+          $("#supersearchPage .minMrice").val(max);
+		    }
+				SuperSearch.formSubmit("N");
+			}else if(EntSearch.isMyPage){//企业搜索
+				var money_from = $.trim($("#entsearchPage #money_from").val());
+        var money_to = $.trim($("#entsearchPage #money_to").val());
+        var from = parseFloat(money_from);
+        var to = parseFloat(money_to);
+        if(from>to){
+          $("#entsearchPage #money_from").val(money_to);
+          $("#entsearchPage #money_to").val(money_from);
+				}
+	      EntSearch.formSubmit();
+			}
+    }
+  }
+	$(function(){
+		sessionStorage.removeItem("ischecked");
+		//提前加载好历史搜索记录和关键词
+		//SuperSearch.loadTipMsg();
+		$("#navbar-search").addClass("active");
+		$("#searchIndex").removeClass("hidden");
+		//点击帮助
+    $(".rightHref").unbind("click").on("click",function(){
+		  JyObj.openExternalLink('http://mp.weixin.qq.com/mp/homepage?__biz=MzIyNTM1NDUyNw==&hid=3&sn=badf2d7da08654c58b58169e773f58f0#wechat_redirect','使用帮助')
+    });
+	  //查询是否开通超级搜索和中标企业搜索
+    $.post("/jyapp/free/searchIndex?t="+new Date().getTime(),{
+      "ad_name":"jyapp-wxsearch-middle,jy-appsearch-home-top",
+      "ad_index":"-1,-1"
+    },function(result){
+  		$("#searchIndex .inp-search").unbind("click").on("click",function () {
+			$('#top-search').hide();
+  	    SuperSearch.init(true,true,true);
+  	  });
+  		userId = result.userId;
+  		SuperSearch.openTablepro=result.tablepro;
+		  //中标企业搜索跳转
+	    $(".tab_container a:eq(0)").unbind("tap").on("tap",function(){
+				$('#top-search').hide();
+				EntSearch.clearSessionStorage();
+				EntSearch.init(true,true,true);
+	    });
+      //加载广告
+      addCssByLink("{{Msg "seo" "cdn"}}/jyapp/swiper/swiper.min.css?v={{Msg "seo" "version"}}");
+      loadJS("{{Msg "seo" "cdn"}}/jyapp/swiper/swiper.min.js?v={{Msg "seo" "version"}}",function(){
+        loadAD(result);
+      })
+    });
+		backThisPage();
+		//点击帮助
+    $(".home_search_right").click(function(){
+      JyObj.openExternalLink('https://mp.weixin.qq.com/mp/homepage?__biz=MzIyNTM1NDUyNw==&hid=3&sn=badf2d7da08654c58b58169e773f58f0#wechat_redirect','使用帮助')
+		  event.stopPropagation();
+    });
+    //数据导出页面
+    $(".tab_container  a:eq(1)").on('click', function () {
+		  event.stopPropagation();
+			setTimeout(function(){
+				if(userId==""){
+					window.location.href='/jyapp/free/login?back=index';
+				}else{
+					window.location.href='/jyapp/front/dataExport/toSieve';
+				}
+			},300);
+    });
+    //剑鱼标讯
+    $(".tab_container a:eq(2)").on('click', function () {
+			setTimeout(function(){
+				if(userId==""){
+					window.location.href='/jyapp/free/login?back=index';
+				}else{
+					//window.location.href='/jyloanweb/index.html?v='+(new Date()).valueOf();
+					//查询是否是否开通商机管理
+					$.post("/entniche/buy/whetherbuy",{},function(res){
+						if (res.error_code === 0) {
+							if (res.data.status === 2) {
+								// 跳转到商机管理使用页面
+								location.href = '/page_entniche/home'
+							} else {
+								// 跳转到创建企业页面
+								location.href = '/page_entniche/page/introduce_page.html'
+							}
+						}
+					});
+				}
+			},300);
+    });
+    //招投标课程
+    $(".tab_container  a:eq(3)").on('click', function () {
+			event.stopPropagation();
+			setTimeout(function(){
+				if(userId==""){
+					window.location.href='/jyapp/free/login?back=index';
+				}else{
+					window.location.href='/jyapp/course/list';
+				}
+			},300);
+    });
+		$("#top-search").unbind("click").on("click",function () {
+			$('#top-search').hide();
+	    SuperSearch.init(true,true,true);
+	  });
+	});
+	function backThisPage(){
+		if(!sessionStorage){
+			return
+		}
+		//登录返回之后，更新历史记录，获取userId
+		if(sessionStorage.searchpageName == "superSearch"){
+			SuperSearch.init(false,false,true);
+		}else if(sessionStorage.searchpageName == "superSearch_back"){
+			SuperSearch.init(true,false,true);
+		}else if(sessionStorage.searchpageName == "entSearch"){
+			EntSearch.init(false,false,true);
+		}else if(sessionStorage.searchpageName == "entSearch_back"){
+			EntSearch.init(true,false,true);
+		}else if(sessionStorage.searchpageName == "lab_search_back"){
+			SuperSearch.init(true,false,false);
+		}else if(sessionStorage.searchpageName == "lab_ent_back"){
+			EntSearch.init(true,false,false);
+		}else{
+			localStorage.removeItem("superSearch_showType");
+			if(localStorage.reLogin=="1"){
+				localStorage.removeItem("reLogin");
+				prohibitBack();
+			}
+		}
+	}
+	function afterJyObjInit(){
+		redSpotOnMenu();
+	}
+	function afterClickBack(){
+		SuperSearch.isMyPage = false;
+		EntSearch.isMyPage = false;
+		SuperSearch.resetPage(false);
+		EntSearch.resetPage(false);
+		$("#searchIndex").removeClass("hidden");
+		$("#supersearchPage,#entsearchPage").addClass("hidden");
+    	$("body").css("background-color","#f5f4f9");
+    	$(".jymobile-datePicker .weui-mask").trigger('click')
+    	$(".jymobile-datePicker .weui-mask").click()
+		SuperSearch.inputBlur();
+		EntSearch.inputBlur();
+		JyObj.hiddenBottom("1");
+	}
+	function AdClick(e,isExternal,link,title){
+    //不登录点击广告位跳转登录页面
+    if(!userId){
+  		window.location.href = "/jyapp/free/login?to=back";
+  		return;
+  	}
+    var adv_name = $(e).parent().attr("adv_name");
+    if((localStorage.loginPhone=="18613717801"||isExaminePhone)&&adv_name&&adv_name.indexOf("APP搜索页轮播图")>-1){
+      return
+    }
+		//百度统计
+		var ce = $(e).parent();
+ // if (ce.attr("adv_name")!="APP搜索列表页-中部"){
+	  adv_statistics(ce);
+ // }
+    if(isExternal){
+    	if(!title){
+      	title="剑鱼标讯"
+    	}
+	    //清除页面数据
+	    SuperSearch.clearSessionStorage();
+	    JyObj.openExternalLink(link,title)
+    }else{
+      window.location.href = link;
+    }
+	}
+  function loadAD(r){
+    //jyapp-wxsearch-middle
+  	var ADList=r["jyapp-wxsearch-middle"];
+    if(ADList!=null){
+      var random=Math.floor(Math.random()*ADList.length)
+    	var AD=ADList[random]
+    	var ADHtml="<span class=\"closeadv-bg\"></span>"
+    	  +"<img src=\"{{Msg "seo" "cdn"}}/jyapp/images/wxqc.png?v={{Msg "seo" "version"}}\" class=\"closeadv\" onclick=\"SuperSearch.closeadv(this)\">";
+    	if(AD.s_pic){
+    		if(AD.s_link){
+    			var ADtitle = "";
+    			if(AD.o_extend!=undefined&&AD.o_extend.title!=undefined){
+    				ADtitle=AD.o_extend.title;
+    			}
+        	if(AD.o_extend!=undefined&&AD.o_extend.linktype=="within"){
+          	ADHtml+="<a onclick=\"AdClick(this,"+false+",'"+AD.s_link+"')\"><img src='"+AD.s_pic+"'/></a>"
+        	}else{
+          	ADHtml+="<a onclick=\"AdClick(this,"+true+",'"+AD.s_link+"','"+ADtitle+"')\"><img src='"+AD.s_pic+"'/></a>"
+        	}
+    		}else{
+    			ADHtml+="<img src='"+AD.s_pic+"'/>"
+    		}
+    	}else{
+    		ADHtml+=AD.s_script
+    	}
+      $("#advertscript").html(ADHtml);
+    }
+    //jy-appsearch-home-top
+	  var ADTopList=r["jy-appsearch-home-top"];
+		if (ADTopList!=null){
+			var adhtml = '';
+			for(var i=0;i<ADTopList.length;i++){
+				var ADtitle = "";
+				if(ADTopList[i]["o_extend"]!=undefined&&ADTopList[i]["o_extend"].title!=undefined){
+					ADtitle=ADTopList[i]["o_extend"].title;
+				}
+		    var num = i+1;
+				adhtml+='<div class="swiper-slide" adv_name="APP搜索页轮播图'+ num +'">'
+				if(ADTopList[i]["o_extend"]!=undefined&&ADTopList[i]["o_extend"].linktype=="within"){
+				  adhtml+="<a onclick=\"AdClick(this,"+false+",'"+ADTopList[i]["s_link"]+"')\"><img  src='"+ADTopList[i]["s_pic"]+"'/></a>"
+				}else{
+				  adhtml+="<a onclick=\"AdClick(this,"+true+",'"+ADTopList[i]["s_link"]+"','"+ADtitle+"')\"><img src='"+ADTopList[i]["s_pic"]+"'/></a>"
+				}
+				adhtml+='</div>'
+		  }
+			if(ADTopList.length==1){
+				$(".swiper-pagination").hide();
+			}
+			if(adhtml!=""){
+				$(".home_banner .swiper-wrapper").html(adhtml);
+			}
+  		$("#swiper1 .swiper-wrapper").ready(function () {
+  			var swiper1 = new Swiper('#swiper1',{
+  				slidesPerView: 1,
+  				spaceBetween: 20,
+  				centeredSlides: true,
+  				speed:800,
+  				autoplay: {
+  					delay: 4000,
+  					disableOnInteraction: false
+  				},
+  				pagination: {
+  					el: '.swiper-pagination',
+  					clickable: true
+  				},
+  				loop: true,
+  			});
+  			swiper1.init();
+  		})
+    }
+  }
+	function toSearchExport(){
+		$(".loading_").show();
+		SuperSearch.setSessionStorage();
+		if(userId == ""||userId==null){
+			window.location.href = "/jyapp/free/login?to=back";
+		}else{
+			//判断 是标题搜索还是全文搜索
+			var em_selectType=$(".options").children(".search-title").children("em").html();
+			console.log(em_selectType)
+			if(em_selectType=="全文搜索"){
+				SuperSearch.reqParam.selectType="all";
+			}else if(em_selectType=="标题搜索"){
+				SuperSearch.reqParam.selectType="title";
+			}
+			$.ajax({
+				type: "post",
+				url: "/jyapp/front/dataExport/searchExport",
+				data: SuperSearch.reqParam,
+				dataType: "json",
+				success: function(data){
+					$(".loading_").hide();
+					if(data._id!=""){
+						window.location.href="/jyapp/front/dataExport/toCreateOrderPage?id="+data._id+"&source=d"
+					}
+				},
+				error:function(e){
+					$(".loading_").hide();
+					window.location.href="/jyapp/free/login"
+				}
+			})
+		}
+	}
+  // 动画隐藏tab栏
+  function hideTab () {
+    $('.newdialog .tab-box .sub-search-title').slideUp('fast');
+    $('.newdialog .tab-box .sub-show-list').slideUp('fast');
+  	// 切换上下三角
+ 		$('.selected-export .options .search-title').find('i').removeClass('jyapp-icon-zhankai').removeClass('jyapp-icon-shouqi').addClass('jyapp-icon-zhankai');
+ 		$('.selected-export .options .show-list').find('i').removeClass('jyapp-icon-zhankai').removeClass('jyapp-icon-shouqi').addClass('jyapp-icon-zhankai');
+      $('.weui-mask').hide();
+	  $('.app-layout-content-b').css({"overflow":"auto"});
+  }
+</script>
+<!--百度统计end-->
+{{include "/common/baiducc.html"}}
+</body>
+</html>

src/jfw/modules/app/src/web/templates/weixin/wxinfocontent.html

@@ -8,7 +8,7 @@
 <script src="{{Msg "seo" "cdn"}}/jyapp/js/fastclick.js?v={{Msg "seo" "version"}}"></script>
 <script src="{{Msg "seo" "cdn"}}/jyapp/js/jquery.cookie.js?v={{Msg "seo" "version"}}"></script>
 <script src="{{Msg "seo" "cdn"}}/jyapp/js/bootstrap.min.js?v={{Msg "seo" "version"}}"></script>
-{{include "/common/js.html"}}
+	{{include "/common/js.html"}}
 <style type="text/css">
 /* forceShare start */
 .sharel , .toShare{
@@ -160,30 +160,6 @@ pre {
     line-height: 0.40rem;
 	display: inline-block;
 }
-.type{
-	padding: 1px 8px;
-	color: #5F5E64;
-    background-color: #F7F9FA;
-    border-radius: 4px;
-    margin-right: 4px;
-    float: left;
-	font-size: 12px;
-    height: 0.40rem;
-    line-height: 0.40rem;
-	display: inline-block;
-}
-.industry{
-	padding: 1px 8px;
-	color: #5F5E64;
-    background-color: #F7F9FA;
-    border-radius: 4px;
-    margin-right: 4px;
-    float: left;
-	font-size: 12px;
-    height: 0.40rem;
-    line-height: 0.40rem;
-	display: inline-block;
-}
 .guide{
 	text-align: center;
 	position: absolute;
@@ -303,7 +279,7 @@ pre {
 	margin-top: -13px;
     width: 20%;
     font-size: 18px;
-    color: #686868;	
+    color: #686868;
 }
 .sion-right{
 	height: 1px;
@@ -450,13 +426,13 @@ pre {
 	right: 10px;
 	left: 10px;
 }
-.dot-top{  
-    border-width: 13px;  
-    border-color: #fff;  
-    border-top-width: 0;  
-    border-style: dashed;  
-    border-bottom-style: solid;  
-    border-left-color: transparent;  
+.dot-top{
+    border-width: 13px;
+    border-color: #fff;
+    border-top-width: 0;
+    border-style: dashed;
+    border-bottom-style: solid;
+    border-left-color: transparent;
     border-right-color: transparent;
 	position: absolute;
 	right: 0px;
@@ -554,31 +530,25 @@ pre {
     clear: both;
     display: table;
 }
-.buyerclass{
-    padding: 1px 8px;
-	color: #5F5E64;
-    background-color: #F7F9FA;
-    border-radius: 4px;
-    margin-right: 4px;
-    float: left;
-	font-size: 12px;
-    height: 0.40rem;
-    line-height: 0.40rem;
-	display: inline-block;
-}
 
-.projectMatch{
-	padding: 1px 8px;
-	color: #5F5E64;
-    background-color: #F7F9FA;
-    border-radius: 4px;
-    margin-right: 4px;
-    float: left;
-	font-size: 12px;
-    height: 0.40rem;
-    line-height: 0.40rem;
-	display: inline-block;
-}
+.tag {
+  display: inline-block;
+  padding: 1px 8px;
+  height: 0.40rem;
+  color: #5F5E64;
+  background-color: #F7F9FA;
+  margin-right: 4px;
+  border-radius: 4px;
+  font-size: 12px;
+  line-height: 0.40rem;
+}
+.buyerclass{}
+
+.type{}
+
+.industry{}
+
+.projectMatch{}
 
 .time_label{
 	margin-top:10px;
@@ -630,12 +600,63 @@ pre {
 <div class="app-layout-content-b">
 	<div class="mask"></div>
 	<div class="info">
-		<div class="title myfollow" id="title">{{.T.obj.title}}</div>
+    <div class="title myfollow" id="title">{{.T.obj.title}}</div>
+    <script>
+      var MoneyUnit = {
+        levelArr: ['元', '万元', '亿元', '万亿元'],
+        test: function (num, type, lv) {
+          if (type === void 0) {
+              type = 'string';
+          }
+          if (lv === void 0) {
+              lv = 0;
+          }
+          if (num === 0) {
+              if (type === 'string') {
+                  return '0';
+              }
+
+              if (type === 'lv') {
+                  return this.levelArr[lv];
+              }
+
+              if (type === 'number') {
+                  return 0;
+              }
+
+              if (type === 'index') {
+                  return lv;
+              }
+          }
+
+          var result = num / Math.pow(10000, lv);
+          if (result > 10000 && lv < 2) {
+              return this.test(num, type, lv + 1);
+          } else {
+              if (type === 'string') {
+                  return String(Math.floor(result * 100) / 100).replace('.00', '') + this.levelArr[lv];
+              }
+
+              if (type === 'lv') {
+                  return this.levelArr[lv];
+              }
+
+              if (type === 'index') {
+                  return lv;
+              }
+
+              if (type === 'number') {
+                  return String(Math.floor(result * 100) / 100).replace('.00', '');
+              }
+          }
+        }
+      }
+    </script>
 		<div class="toolbar">
 			{{if .T.isVip}}
 		<!--VIP-->
 		<div class="type_label clearfix">
-			<script>var area="{{.T.obj.area}}"; if(area!="A" && area.replace(/\s+/g,"")!=""){document.write('<span class="area">'+area+'</span>');}</script>
+			<script>var area="{{.T.obj.area}}"; if(area!="A" && area.replace(/\s+/g,"")!=""){document.write('<span class="tag area">'+area+'</span>');}</script>
 			<script>
 				var type = "";
 				if ({{.T.obj.subtype}} !=""){
@@ -653,28 +674,44 @@ pre {
 					}
 				}
 				if(type != ""){
-					document.write("<span class='type'>"+type+"</span>");
+					document.write("<span class='tag type'>"+type+"</span>");
 				}
-	
-				var industry = {{.T.obj.industry}};
-				var subscopeclass = {{.T.obj.s_subscopeclass}};
+
+        var industry = {{.T.obj.industry}};
+        var subscopeclass = {{.T.obj.s_subscopeclass}};
+        // 金额标签数据
+        var moneyTag = {
+          content: '',
+          bidamount: {{.T.obj.bidamount}},
+          budget: {{.T.obj.budget}}
+        }
 				//vip用户显示与普通用户不同
 				var buyerclass={{.T.obj.buyerclass}};
 				if(industry){
-	                document.write("<span class='industry'>"+industry+"</span>");
+	          document.write("<span class='tag industry'>"+industry+"</span>");
 				}else if(subscopeclass){
 					var suclass = subscopeclass.split(",")[0];
-					document.write("<span class='industry'>"+ suclass.split("_")[0]+"</span>");
+					document.write("<span class='tag industry'>"+ suclass.split("_")[0]+"</span>");
 				}
 				if(buyerclass){
-					document.write("<span class='buyerclass'>"+ buyerclass+"</span>");
-				}
+					document.write("<span class='tag buyerclass'>"+ buyerclass+"</span>");
+        }
+
+        // 金额标签处理
+        if(typeof(moneyTag.budget) != "undefined" && moneyTag.budget != null && moneyTag.budget != ""){
+          moneyTag.content = MoneyUnit.test(moneyTag.budget);
+        }
+        if(typeof(moneyTag.bidamount) != "undefined" && moneyTag.bidamount != null && moneyTag.bidamount != ""){
+          moneyTag.content = MoneyUnit.test(moneyTag.bidamount);
+        }
+        if(moneyTag.content){
+					document.write("<span class='tag budget'>"+ moneyTag.content+"</span>");
+        }
 				//项目匹配
 				var projectMatch=getParam("projectMatch");
 				if (projectMatch){
-					document.write("<span class='projectMatch'>"+projectMatch+"</span>")
-				}
-				
+					document.write("<span class='tag projectMatch'>"+projectMatch+"</span>")
+        }
 			</script>
 		</div>
 		<div class="time_label">
@@ -688,13 +725,13 @@ pre {
 						}
 					}
 			</script>
-		
+
 		{{if .T.obj.hasSession}}{{if or .T.obj.projectname .T.obj.projectcode}}<div class="follow" style="top:1px !important">{{if .T.obj.followFlag}}<i class="glyphicon yiguanzhu"></i>已关注{{else}}<i class="glyphicon weiguanzhu"></i>关注项目{{end}}</div>{{end}}{{else}}<!--<a href="/swordfish/share/-1" style="text-decoration: none;color:#24C0D7;"><span class="follow"><i class="glyphicon weiguanzhu"></i></span>关注项目</a>-->{{end}}
 		</div>
 		{{else}}
 		<!--非VIP-->
 		<div class="tool_top">
-			<script>var area="{{.T.obj.area}}"; if(area!="A" && area.replace(/\s+/g,"")!=""){document.write('<span class="area">'+area+'</span>');}</script>
+			<script>var area="{{.T.obj.area}}"; if(area!="A" && area.replace(/\s+/g,"")!=""){document.write('<span class="tag area">'+area+'</span>');}</script>
 			<script>
 				var type = "";
 				if ({{.T.obj.subtype}} !=""){
@@ -712,7 +749,7 @@ pre {
 					}
 				}
 				if(type != ""){
-					document.write("<span class='type'>"+type+"</span>");
+					document.write("<span class='tag type'>"+type+"</span>");
 				}
 
 				var industry = {{.T.obj.industry}};
@@ -720,16 +757,32 @@ pre {
 				//vip用户显示与普通用户不同
 				var buyerclass={{.T.obj.buyerclass}};
 				if(industry){
-					document.write("<span class='industry'>"+industry+"</span>");
+					document.write("<span class='tag industry'>"+industry+"</span>");
 				}else if(subscopeclass){
 					var suclass = subscopeclass.split(",")[0];
-					document.write("<span class='industry'>"+ suclass.split("_")[0]+"</span>");
+					document.write("<span class='tag industry'>"+ suclass.split("_")[0]+"</span>");
+				}
+				// 金额标签数据
+				var moneyTag = {
+					content: '',
+					bidamount: {{.T.obj.bidamount}},
+					budget: {{.T.obj.budget}}
+				}
+				// 金额标签处理
+				if(typeof(moneyTag.budget) != "undefined" && moneyTag.budget != null && moneyTag.budget != ""){
+					moneyTag.content = MoneyUnit.test(moneyTag.budget);
+				}
+				if(typeof(moneyTag.bidamount) != "undefined" && moneyTag.bidamount != null && moneyTag.bidamount != ""){
+					moneyTag.content = MoneyUnit.test(moneyTag.bidamount);
+				}
+				if(moneyTag.content){
+					document.write("<span class='tag budget'>"+ moneyTag.content+"</span>");
 				}
 				//projectMatch=getParam("projectMatch");
 				//if (projectMatch){
-				//	document.write("<span class='projectMatch'>"+projectMatch+"</span>")
+				//	document.write("<span class='tag projectMatch'>"+projectMatch+"</span>")
 				//}
-				
+
 			</script>
 		</div>
 		<div class="tool_bottom">
@@ -816,7 +869,7 @@ pre {
 		{{if .T.obj.projectinfo.attachments}}
 			<div class="pre-enclosure hidden"><img src="{{Msg "seo" "cdn"}}/jyapp/images/wx/enclosure.png?v={{Msg "seo" "version"}}"/>附件(1个)</div>
 			<div class="pre-dow hidden">
-			
+
 			</div>
 		{{end}}
 		<div class="abs">
@@ -826,7 +879,7 @@ pre {
 			{{end}}
 			<div style="clear:both;"></div>
 		</div>
-		
+
 		<div class="hidden">
 			{{if .T.obj.hasSession}}
 			<div class="interaction">
@@ -880,7 +933,7 @@ pre {
 							}
 						}else{
 							ADHtml="<img src='"+AD.s_pic+"'/>"
-						}	
+						}
 					}else{
 						ADHtml=AD.s_script
 					}
@@ -934,7 +987,7 @@ function execShare(thisIndex){
 	var shareType = thisIndex + 1;
 	var content = "您的好友";
 	if(shareType !=2 && {{session "i_type"}} == 2){
-		content += {{session "s_nickname"}};	
+		content += {{session "s_nickname"}};
 	}
 	content += "向您推荐了剑鱼标讯";
 	var link = "{{Msg "seo" "jyDomain"}}/swordfish/about?source=app_infocontentshare";
@@ -1031,7 +1084,7 @@ var upordown = function(type){
 				upno = Number(upno)+1;
 				$(".jyuseful span").html(upno);
 				aosup = 1;
-				praflag = true;	
+				praflag = true;
 				$(".jyuseful").addClass("hidden");
 				$(".jyuseful span").css("color","#2cb7ca");
 				$(".jyuseless").removeClass("hidden");
@@ -1082,7 +1135,7 @@ var upordown = function(type){
 		        url:'/jyapp/swordfish/praise',
 		        data:{type:type,aosup:aosup,aosdown:aosdown,id:{{.T.obj._id}}},
 		        cache:false,
-		        dataType:'json', 
+		        dataType:'json',
 		        success:function(data){
 					//EasyAlert.show("谢谢您的支持与关注!");
 					if (data.flag == "T"){
@@ -1093,9 +1146,9 @@ var upordown = function(type){
 						}
 						praflag = false;
 					}
-		        }    
+		        }
 		       });
-		
+
 		}
 	}else{
 		cookieup = "F";
@@ -1130,7 +1183,7 @@ var upordown = function(type){
 		        url:'/jyapp/swordfish/praise',
 		        data:{type:type,aosup:aosup,aosdown:aosdown,id:{{.T.obj._id}}},
 		        cache:false,
-		        dataType:'json', 
+		        dataType:'json',
 		        success:function(data){
 					//EasyAlert.show("谢谢您的支持与关注!");
 					if (data.flag == "T"){
@@ -1141,11 +1194,11 @@ var upordown = function(type){
 						}
 						praflag = false;
 					}
-		        }    
+		        }
 		    });
 		}
 	}
-		
+
 };
 
 function unLoginClick(){
@@ -1165,17 +1218,17 @@ function myinter(){
 		myflag = true;
 		$("html,body").scrollTop(document.documentElement.offsetHeight-10);
 	}
-function getParameter(param) { 
-	var query = window.location.search||parent.location.search; 
-	var iLen = param.length; 
-	var iStart = query.indexOf(param); 
-	if (iStart == -1) 
-	   return ""; 
-	iStart += iLen + 1; 
-	var iEnd = query.indexOf("&", iStart); 
-	if (iEnd == -1) 
-	   return query.substring(iStart); 
-	return query.substring(iStart, iEnd); 
+function getParameter(param) {
+	var query = window.location.search||parent.location.search;
+	var iLen = param.length;
+	var iStart = query.indexOf(param);
+	if (iStart == -1)
+	   return "";
+	iStart += iLen + 1;
+	var iEnd = query.indexOf("&", iStart);
+	if (iEnd == -1)
+	   return query.substring(iStart);
+	return query.substring(iStart, iEnd);
 }
 
 $(function(){
@@ -1426,6 +1479,7 @@ $(function(){
 					jumpFlag = false;
 					$(".follow").removeClass('follow_vip')
 					$(".follow").html('<i class="glyphicon weiguanzhu"></i>关注项目');
+					$('.follow').css({'color':'#9B9CA3'})
 				}else{
 					EasyAlert.show("取消关注失败！");
 				}
@@ -1442,6 +1496,7 @@ $(function(){
 					jumpFlag = true;
 					$(".follow").html('<i class="glyphicon yiguanzhu"></i>已关注');
 					$(".follow").addClass('follow_vip')
+					$('.follow').css({'color':'#ffba00'})
 				}else if(r.status == "m"){
 					EasyAlert.show("最多可关注<br>10个项目！");
 					$(".jycontbottom").toggleClass("hidden");
@@ -1515,7 +1570,7 @@ $(function(){
 			}
 			});
 		}
-		
+
 	});
 	$(".upclose").click(function(){
 		$(".ups").addClass("hidden");
@@ -1534,10 +1589,12 @@ function isFollow(){
 			jumpFlag = true;
 			followId = fd.followid
 			$(".follow").html('<i class="glyphicon yiguanzhu"></i>已关注');
+			$('.follow').css({'color':'#ffba00'})
 		}else{
 			followFlag = false;
 			jumpFlag = false;
 			$(".follow").html('<i class="glyphicon weiguanzhu"></i>关注项目');
+			$('.follow').css({'color':'#9B9CA3'})
 		}
 	});
 }
@@ -1570,4 +1627,4 @@ function toShare(){
 </script>
 {{include "/common/baiducc.html"}}
 </body>
-</html>
+</html>

src/jfw/modules/pushsubscribe/src/push/config.json

@@ -53,12 +53,12 @@
 	"appPushServiceRpc":"127.0.0.1:5566",
 	"pcHelper":"127.0.0.1:8082",
 	"freePushTime":"08:00",
-	"WxPushDuration":120,
-	"AppPushDuration":40,
+	"wxPushDuration":120,
+	"appPushDuration":40,
 	"oncePushTime":"09:00",
 	"startPushTime":"7:59",
 	"endPushTime":"22:00",
-	"projectPushTime":"19:00",
+	"projectPushTime":"22:05",
 	"vipPushDay":14,
 	"vipPushWeek":"Friday",
 	"savePoolSize":50,

src/jfw/modules/pushsubscribe/src/push/job/jobs.go

@@ -1,17 +1,11 @@
 package job
 
-import (
-	"sync"
-)
-
 var Jobs = struct {
 	Push        *PushJob
 	ProjectPush *ProjectPushJob
 	NothingPush *NothingJob
 }{
-	Push: &PushJob{
-		lock: &sync.Mutex{},
-	},
+	Push:        &PushJob{},
 	ProjectPush: &ProjectPushJob{},
 	NothingPush: &NothingJob{},
 }

src/jfw/modules/pushsubscribe/src/push/job/projectjob.go

@@ -21,8 +21,6 @@ type ProjectPushJob struct {
 }
 
 func (p *ProjectPushJob) Execute() {
-	Jobs.Push.lock.Lock()
-	defer Jobs.Push.lock.Unlock()
 	logger.Info("开始关联项目推送任务。。。")
 	unix := time.Now().Unix()
 	projects := p.loadProject()
@@ -50,11 +48,16 @@ func (p *ProjectPushJob) Execute() {
 				var u map[string]interface{}
 				sess.DB(Config.Mongodb.DbName).C(User).FindId(bson.ObjectIdHex(userId)).Select(map[string]interface{}{
 					"o_vipjy.i_projectmatch": 1,
+					"i_vip_status":           1,
 				}).One(&u)
 				if u == nil || len(u) == 0 {
 					logger.Error(userId, "没有找到该用户信息")
 					p.Delete(userId)
 					return
+				} else if util.IntAll(u["i_vip_status"]) <= 0 {
+					logger.Error(userId, "已经不再是vip")
+					p.Delete(userId)
+					return
 				}
 				o_vipjy, _ := u["o_vipjy"].(map[string]interface{})
 				if util.IntAll(o_vipjy["i_projectmatch"]) == 0 {

src/jfw/modules/pushsubscribe/src/push/job/pushjob.go

@@ -30,7 +30,6 @@ func init() {
 }
 
 type PushJob struct {
-	lock                    *sync.Mutex
 	minutePushPool          chan bool
 	fastigiumMinutePushPool chan bool
 }
@@ -39,8 +38,6 @@ type PushJob struct {
 func (p *PushJob) Execute(taskType int) {
 	MyLock.Lock(MatchLock)
 	defer MyLock.UnLock(PushLock, MatchLock)
-	p.lock.Lock()
-	defer p.lock.Unlock()
 	p.beforePush(taskType)
 	//每天九点以后，推送每周每月的用户
 	if taskType == 2 {

src/jfw/modules/pushsubscribe/src/push/job/timetask.go

@@ -11,6 +11,11 @@ import (
 	"github.com/donnie4w/go-logger/logger"
 )
 
+var (
+	appPushing bool
+	wxPushing  bool
+)
+
 type TimeTask struct{}
 
 func (t *TimeTask) Run() {
@@ -36,7 +41,15 @@ func (t *TimeTask) push() {
 	// 	Jobs.Push.Execute(6)
 	// })
 	go t.crontab(Config.ProjectPushTime, func() {
-		Jobs.ProjectPush.Execute()
+		for {
+			if !wxPushing && !appPushing {
+				Jobs.ProjectPush.Execute()
+				break
+			} else {
+				logger.Info("微信或app正在推送，休眠1分钟")
+				time.Sleep(time.Minute)
+			}
+		}
 	})
 	//每天九点推送
 	go t.crontab(Config.OncePushTime, func() {
@@ -71,8 +84,9 @@ func (t *TimeTask) weixinPush() {
 	end_time := strings.Split(Config.EndPushTime, ":")
 	d := time.Duration(Config.WxPushDuration) * time.Minute
 	logger.Info("weixinpush", d)
+	wxPushing = true
 	Jobs.Push.Execute(7)
-
+	wxPushing = false
 	time.AfterFunc(d, func() {
 		if putil.IsEnd(end_time) {
 			logger.Info("当前时间超过", Config.EndPushTime, ",微信结束推送")
@@ -80,14 +94,15 @@ func (t *TimeTask) weixinPush() {
 		}
 		t.weixinPush()
 	})
-
 }
 
 func (t *TimeTask) appPush() {
 	end_time := strings.Split(Config.EndPushTime, ":")
 	d := time.Duration(Config.AppPushDuration) * time.Minute
 	logger.Info("apppush", d)
+	appPushing = true
 	Jobs.Push.Execute(8)
+	appPushing = false
 	time.AfterFunc(d, func() {
 		if putil.IsEnd(end_time) {
 			logger.Info("当前时间超过", Config.EndPushTime, ",APP结束推送")
@@ -95,7 +110,6 @@ func (t *TimeTask) appPush() {
 		}
 		t.appPush()
 	})
-
 }
 
 //判断启动时间是工作时间还是休息时间

src/jfw/modules/pushsubscribe/src/push/pusher/normalpush.go

@@ -1,7 +1,6 @@
 package pusher
 
 import (
-	"log"
 	. "public"
 	. "push/config"
 	putil "push/util"
@@ -68,7 +67,6 @@ func (n *NormalPush) OncePushBatch(taskType, batchIndex int, startId *string) (b
 			"$gt": bson.ObjectIdHex(*startId),
 		}
 	}
-	log.Println("query:", query)
 	return putil.GetPushDatas(taskType, batchIndex, Pushspace, startId, query)
 }
 

src/web/staticres/js/wxSupersearch.js

@@ -14,6 +14,12 @@ $(function () {
 		GolBalTime = requestAnimationFrame(listenerBannerHeight)
 	}
 	listenerBannerHeight()
+	$("body").on('tap longTap', '.tslist', function () {
+		var tempS = $(this).addClass('hover')
+		setTimeout(function() {
+			tempS.removeClass('hover')
+		}, 50)
+	})
 })
 
 /*
@@ -22,55 +28,55 @@ $(function () {
 var MoneyUnit = {
 	levelArr: ['元', '万元', '亿元', '万亿元'],
 	test: function (num, type, lv) {
-	if (type === void 0) {
-		type = 'string';
-	}
-
-	if (lv === void 0) {
-		lv = 0;
-	}
-
-	if (num === 0) {
-		if (type === 'string') {
-			return '0';
+		if (type === void 0) {
+			type = 'string';
 		}
 
-		if (type === 'lv') {
-			return this.levelArr[lv];
+		if (lv === void 0) {
+			lv = 0;
 		}
 
-		if (type === 'number') {
-			return 0;
-		}
+		if (num === 0) {
+			if (type === 'string') {
+				return '0';
+			}
 
-		if (type === 'index') {
-			return lv;
-		}
-	}
+			if (type === 'lv') {
+				return this.levelArr[lv];
+			}
 
-	var result = num / Math.pow(10000, lv);
+			if (type === 'number') {
+				return 0;
+			}
 
-	if (result > 10000 && lv < 2) {
-		return this.test(num, type, lv + 1);
-	} else {
-		if (type === 'string') {
-			return result.toFixed(2).replace('.00', '') + this.levelArr[lv];
+			if (type === 'index') {
+				return lv;
+			}
 		}
 
-		if (type === 'lv') {
-			return this.levelArr[lv];
-		}
+		var result = num / Math.pow(10000, lv);
 
-		if (type === 'index') {
-			return lv;
-		}
+		if (result > 10000 && lv < 2) {
+			return this.test(num, type, lv + 1);
+		} else {
+			if (type === 'string') {
+				return String(Math.floor(result * 100) / 100).replace('.00', '') + this.levelArr[lv];
+			}
+
+			if (type === 'lv') {
+				return this.levelArr[lv];
+			}
+
+			if (type === 'index') {
+				return lv;
+			}
 
-		if (type === 'number') {
-			return result.toFixed(2).replace('.00', '');
+			if (type === 'number') {
+				return String(Math.floor(result * 100) / 100).replace('.00', '');
+			}
 		}
 	}
 }
-}
 var SuperSearch = {
 	secondFlag:"",
 	secondList:"",
@@ -1301,10 +1307,10 @@ var SuperSearch = {
 			// 金额标签
 			var moneyTag = '';
 			if(typeof(list[i].budget) != "undefined" && list[i].budget != null && list[i].budget != ""){
-				moneyTag = '<span class="industry">'+MoneyUnit.test(list[i].budget)+'</span>';
+				moneyTag = '<span class="bidamount">'+MoneyUnit.test(list[i].budget)+'</span>';
 			}
 			if(typeof(list[i].bidamount) != "undefined" && list[i].bidamount != null && list[i].bidamount != ""){
-				moneyTag = '<span class="industry">'+MoneyUnit.test(list[i].bidamount)+'</span>';
+				moneyTag = '<span class="bidamount">'+MoneyUnit.test(list[i].bidamount)+'</span>';
 			}
 			if(i==3&&pageNum==1){
 				ListHtml += '<div class="tslist" style="border-bottom-width:0px;">'

src/web/staticres/vipsubscribe/css/weui.min.css

@@ -18,7 +18,7 @@
     position: relative;
     overflow: hidden;
 }
-.p13 .home .home_data .data_list .list_item:hover {
+.p13 .home .home_data .data_list .list_item.hover {
     background: #E6E6E6;
 }
 .p13 .home .home_data .data_list .list_item::after {
@@ -99,14 +99,14 @@
 }
 
 /* hover */
-.p13 #list .tslist:hover,
-.p13 #list .tslist.visited:hover {
+.p13 #list .tslist.hover,
+.p13 #list .tslist.visited.hover {
     background: #E6E6E6;
 }
-.p13 .tslist:hover a.bt, .p13 .tslist.visited a.bt {
+.p13 .tslist.hover a.bt, .p13 .tslist.visited a.bt {
     color: #9B9CA3 !important;
 }
-.p13 .tslist:hover .restime, .p13 .tslist.visited .restime {
+.p13 .tslist.hover .restime, .p13 .tslist.visited .restime {
     color: #9B9CA3;
 }
 .p13 #list .tslist.visited {
@@ -133,7 +133,10 @@
 .p13 .restime span i {
     display: none;
 }
-.p13 .restime span.location, .p13 .restime span.industry, .p13 .restime span.type, .p13 .restime span.buyerclass {
+.p13 .restime span.location,
+.p13 .restime span.industry,
+.p13 .restime span.bidamount,
+.p13 .restime span.type, .p13 .restime span.buyerclass {
     color: inherit;
     font-size: 0.24rem;
     line-height: 0.32rem;
@@ -300,6 +303,7 @@
     margin: 0 0.32rem;
     padding: 0.1rem 0;
     background: #EDEFF2;
+    border: none;
     border-radius: 8px;
     color: #5F5E64 !important;
     font-weight: 500;
@@ -307,6 +311,10 @@
     line-height: 0.6rem;
     width: calc(50% - 0.32rem) !important;
 }
+.p13 .jymobile-datePicker .weui-btn_disabled::after,
+.p13 .jymobile-datePicker .weui-btn_primary::after {
+    content: none;
+}
 .p13 .jymobile-datePicker .weui-btn_disabled + .weui-btn_primary{
     width: calc(50% - 0.32rem) !important;
 }
@@ -322,6 +330,7 @@
     color: #F7F9FA !important;
     font-weight: 500;
     font-size: 0.32rem;
+    border: none;
     line-height: 0.6rem;
 }
 .p13 .jymobile-datePicker  .weui-half-screen-dialog__ft {

src/web/staticres/wx_dataExport/css/dataExport.css

@@ -11,7 +11,6 @@ html .page {
 html .page .main{
   flex: 1;
   overflow-y: scroll;
-  margin-bottom:1rem;
 }
 html .page .progress {
   display: -webkit-box;

src/web/templates/weixin/dataExport/dataExport.html

@@ -9,10 +9,9 @@
     <title>数据导出</title>
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/base.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/dataExport.css?v={{Msg "seo" "version"}}14">
 <!--    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/weui.min.css">-->
-    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/css/wxbutton.css?v={{Msg "seo" "version"}}1">
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/dataExport.css?v={{Msg "seo" "version"}}5">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/css/wxbutton.css?v={{Msg "seo" "version"}}1">
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/weui.min.css">
     <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
     {{include "/common/weixin.html"}}
@@ -45,10 +44,6 @@
     box-shadow: 0px -2Px 8Px rgba(54, 147, 179, 0.051);
   }
 
-	.confirm{
-		height: 0.94rem;
-    	width: 100%;
-	}
     .mbsc-ios .dwbc{
         border-color: #ddd;
     }
@@ -80,17 +75,13 @@
     html .page .chooseTime .dateMake input {
         display: inline-block;
         width: 3.05rem;
-        /*height: .72rem;
-        line-height: .72rem;*/
         font-size: .28rem;
         border: 1px solid #CECECE;
         margin: .16rem .13rem;
         border-radius: 0.02rem;
-         /*text-align: center;
-		padding-right: 0.15rem;*/
-		padding-top: 0.14rem;
-    	padding-bottom: 0.14rem;
-		padding-left: 0.68rem;
+		    padding-top: 0.14rem;
+    	  padding-bottom: 0.14rem;
+		    padding-left: 0.68rem;
     }
     html .page .chooseTime > i{
         position: relative;
@@ -121,11 +112,9 @@
 		color: #999;
 	}
     .resetOne {
-        width: 100%;
-        border-top: 1px solid #F4F4F9;
-        display: none;
-		position: fixed;
-    	bottom: 0px;
+      width: 100%;
+      border-top: 1px solid #F4F4F9;
+      display: none;
     }
     .resetOne button:first-child {
         background: #fff;
@@ -184,7 +173,7 @@
   }
   .helpwhat{
     border: 1px solid #E8E8E8;
-    width: 175px;
+    width: 3.6rem;
     margin: 0 auto;
     border-radius: 10px;
     padding-left: 7px;
@@ -313,50 +302,49 @@
            </div>
         </div>
         <!-- elseChooseEnd -->
-
-        <!-- btn -->
-        <div class="confirm j-footer">
-            <button class="saveData j-button">确认</button>
         </div>
-        <div class="resetOne j-button-group">
-            <button class="reset j-button-cancel">重置</button>
-            <button class="saveData j-button-confirm">确认</button>
-        </div>
-        <div class="js_dialog match_way" id="match_way" style="display: none;">
-            <div class="weui-mask"></div>
-            <div class="box">
-                <div class="box_hd">
-                    <!-- <span></span> -->
-                    <h3>关键词匹配方式</h3>
-                    <span class="cancel">取消</span>
-                </div>
-                <div class="box_bd">
-                    <div class="weui-cells weui-cells_checkbox choose-form">
-                        <label class="weui-cell weui-check__label cont_label" for="cont_way">
-                            <div class="weui-cell__bd read">
-                                <p>按全文匹配</p>
-                            </div>
-                            <div class="weui-cell__hd">
-                                <input type="radio" class="weui-check" name="way" value="按全文匹配" id="cont_way" checked />
-                                <i class="weui-icon-checked"></i>
-                            </div>
-                        </label>
-                        <label class="weui-cell weui-check__label title_label" for="title_way">
-                            <div class="weui-cell__bd read">
-                                <p>按标题匹配</p>
-                            </div>
-                            <div class="weui-cell__hd">
-                                <input type="radio" class="weui-check" name="way" value="按标题匹配" id="title_way" />
-                                <i class="weui-icon-checked"></i>
-                            </div>
-                        </label>
-                    </div>
+      </div>
+      <!-- btn -->
+      <div class="confirm j-footer">
+          <button class="saveData j-button">确认</button>
+      </div>
+      <div class="resetOne j-button-group">
+          <button class="reset j-button-cancel">重置</button>
+          <button class="saveData j-button-confirm">确认</button>
+      </div>
+    </div>
+    <div class="js_dialog match_way" id="match_way" style="display: none;">
+        <div class="weui-mask"></div>
+        <div class="box">
+            <div class="box_hd">
+                <!-- <span></span> -->
+                <h3>关键词匹配方式</h3>
+                <span class="cancel">取消</span>
+            </div>
+            <div class="box_bd">
+                <div class="weui-cells weui-cells_checkbox choose-form">
+                    <label class="weui-cell weui-check__label cont_label" for="cont_way">
+                        <div class="weui-cell__bd read">
+                            <p>按全文匹配</p>
+                        </div>
+                        <div class="weui-cell__hd">
+                            <input type="radio" class="weui-check" name="way" value="按全文匹配" id="cont_way" checked />
+                            <i class="weui-icon-checked"></i>
+                        </div>
+                    </label>
+                    <label class="weui-cell weui-check__label title_label" for="title_way">
+                        <div class="weui-cell__bd read">
+                            <p>按标题匹配</p>
+                        </div>
+                        <div class="weui-cell__hd">
+                            <input type="radio" class="weui-check" name="way" value="按标题匹配" id="title_way" />
+                            <i class="weui-icon-checked"></i>
+                        </div>
+                    </label>
                 </div>
             </div>
         </div>
     </div>
-      </div>
-    </div>
 <script>
     initShare({{.T.signature}},{{.T.openid}},2,"jy_wxmyorder",{{.T.nickname}},{{.T.avatar}});
     $(function(){

src/web/templates/weixin/historypush.html

@@ -20,7 +20,6 @@
     <script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v=0{{Msg "seo" "version"}}"></script>
     <script src="{{Msg "seo" "cdn"}}/js/dropload.js?v={{Msg "seo" "version"}}"></script>
     <script src="{{Msg "seo" "cdn"}}/js/fastclick.js?v={{Msg "seo" "version"}}"></script>
-    // <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/mobiscroll/mobiscroll.min.css">
     <!--<script src="{{Msg "seo" "cdn"}}/mobiscroll/mobiscroll.min.js"></script>-->
     <!-- 2.8.5 -->
     <script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/rem.js"></script>
@@ -70,7 +69,7 @@
                     return this.test(num, type, lv + 1);
                 } else {
                     if (type === 'string') {
-                        return result.toFixed(2).replace('.00', '') + this.levelArr[lv];
+                        return String(Math.floor(result * 100) / 100).replace('.00', '') + this.levelArr[lv];
                     }
 
                     if (type === 'lv') {
@@ -82,7 +81,7 @@
                     }
 
                     if (type === 'number') {
-                        return result.toFixed(2).replace('.00', '');
+                        return String(Math.floor(result * 100) / 100).replace('.00', '');
                     }
                 }
             }
@@ -131,6 +130,11 @@
                 setSessionStorage();
                 window.location.href = '/wxkeyset/keyset/index';
             });
+            // TODO 缺陷疑问
+            $(".wx_header_right .sub_manager").click(function () {
+                setSessionStorage();
+                window.location.href = '/wxkeyset/keyset/index';
+            });
             //
             $(window).scroll(function () {
                 scrollTop = $(this).scrollTop();
@@ -501,10 +505,10 @@
                 // 预算：budget；中标：bidamount
                 var moneyList = "";
                 if (obj.budget != null && obj.budget != "") {
-                    moneyList = '<span class="industry money">' + MoneyUnit.test(obj.budget) + '</span>';
+                    moneyList = '<span class="bidamount">' + MoneyUnit.test(obj.budget) + '</span>';
                 }
                 if (obj.bidamount != null && obj.bidamount != "") {
-                    moneyList = '<span class="industry money">' + MoneyUnit.test(obj.bidamount) + '</span>';
+                    moneyList = '<span class="bidamount">' + MoneyUnit.test(obj.bidamount) + '</span>';
                 }
                 //时间
                 var showdateList = ""
@@ -1676,6 +1680,12 @@
     }
     //
     $(function () {
+        $("body").on('tap longTap', '.tslist', function () {
+            var tempS = $(this).addClass('hover')
+            setTimeout(function() {
+                tempS.removeClass('hover')
+            }, 50)
+        })
         userMergeQuery();
         document.querySelector('.screen').addEventListener('touchmove', stopScroll, {passive: false});
         document.querySelector('.tab_left').addEventListener('touchmove', stopScroll, {passive: false});

src/web/templates/weixin/vipsubscribe/vip_introduce.html

@@ -144,9 +144,10 @@
                 }else{
                   var html = "";
                   {{if not .T.notShowTrial}}
-                    html += '<div class="j-button-group"><a onclick="window.location.replace(\'/front/vipsubscribe/trialInfo\')" class="try_btn j-button-cancel1">试用7天</a><a onclick="window.location.replace('/weixin/pay/vipsubscribe_new')" class="subscribe_btn j-button-confirm1">去订阅</a> </div>';
+                    html += '<div class="j-button-group"><a onclick="window.location.replace(\'/front/vipsubscribe/trialInfo\')" class="try_btn j-button-cancel1">试用7天</a><a onclick="window.location.replace(\'/weixin/pay/vipsubscribe_new\')" class="subscribe_btn j-button-confirm1">去订阅</a> </div>';
+                  {{else}}
+                    html += '<div class="j-footer" style="width: 100%;"><a onclick="window.location.replace(\'/weixin/pay/vipsubscribe_new\')" class="subscribe_btn j-button">去订阅</a></div>';
                   {{end}}
-                  html += '<div class="j-footer" style="width: 100%;"><a onclick="window.location.replace(\'/weixin/pay/vipsubscribe_new\')" class="subscribe_btn j-button">去订阅</a></div>';
                   document.write(html);
                 }
             </script>