Эхлэл Бүгдийг харах Тусламж
Нэвтрэх
qmx
/
jy
14
0
Салаа 0
Файлууд Асуудлууд 2 Хуулах хүсэлтүүд 0 Мэдлэгийн сан
Эх сурвалжийг харах

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

xuzhiheng 5 жил өмнө
parent
72fa49a1a2 582944ede5
commit
7b5335c980
5 өөрчлөгдсөн 99 нэмэгдсэн , 12 устгасан
Өөрчлөлтийг ялгаж харах Өөрчлөлтийн статистик харах
  1. 3 1
      src/jfw/modules/subscribepay/src/service/afterPay.go
  2. 43 1
      src/web/staticres/vipsubscribe/css/vip_index.css
  3. 11 3
      src/web/templates/weixin/historypush.html
  4. 1 1
      src/web/templates/weixin/vipsubscribe/messageType.html
  5. 41 6
      src/web/templates/weixin/vipsubscribe/vip_index.html

+ 3 - 1
src/jfw/modules/subscribepay/src/service/afterPay.go
Файл харах 

@@ -227,7 +227,9 @@ func (a *AfterPay) GetUserInfo() error {
 
 				end_m, _ := strconv.Atoi(_end[1])
 
 				end_m_count := end_y*12 + end_m
 
 				start_m_count := start_y*12 + start_m
 
-				cycle = strconv.Itoa((end_m_count-start_m_count)/12) + "年"
 
+				if (end_m_count-start_m_count)/12 != 0 {
 
+					cycle = strconv.Itoa((end_m_count-start_m_count)/12) + "年"
 
+				}
 
 				if (end_m_count-start_m_count)%12 > 0 {
 
 					cycle += strconv.Itoa((end_m_count-start_m_count)%12) + "月"
 
 				}

+ 43 - 1
src/web/staticres/vipsubscribe/css/vip_index.css
Файл харах 

@@ -561,7 +561,7 @@
 
   width: 1.6rem;
 
 }
 
 
-.vip_index .content .subscribe_info .s_info_top .s_i_item span {
 
+.vip_index .content .subscribe_info .s_info_top .s_i_item > span {
 
   flex: 1;
 
 }
 
 
@@ -600,6 +600,48 @@
 
   font-size: .24rem;
 
 }
 
 
+.vip_index .content .subscribe_info .s_info_top .s_i_item .expand-box {
 
+  position: relative;
 
+    top: .04rem;
 
+}
 
+
 
+.vip_index .content .subscribe_info .s_info_top .s_i_item .expand-box ._area,
 
+.vip_index .content .subscribe_info .s_info_top .s_i_item .expand-box ._buyerClass {
 
+  display: -webkit-box;
 
+  height: auto;
 
+  overflow: hidden;
 
+  text-overflow: ellipsis;
 
+  -webkit-line-clamp: 2;
 
+  -webkit-box-orient: vertical;
 
+  min-height: 18px;
 
+  line-height: 18px;
 
+}
 
+
 
+.vip_index .content .subscribe_info .s_info_top .s_i_item .expand-box .icon-arrow {
 
+  position: absolute;
 
+  width: 1.14rem;
 
+  bottom: 0;
 
+  right: .1rem;
 
+  text-align: right;
 
+  font-size: .26rem;
 
+  background: linear-gradient(90deg, rgba(255, 218, 177, 0) 0%, #ffdab1 100%);
 
+  transition: height 0.5s ease;
 
+}
 
+
 
+.vip_index .content .subscribe_info .s_info_top .s_i_item .expand-box .icon-arrow::before {
 
+  display: inline-block;
 
+  transform: rotate(90deg);
 
+  transition: transform 0.2s ease;
 
+}
 
+
 
+.vip_index .content .subscribe_info .s_info_top .s_i_item .expand-box.expanded ._area,
 
+.vip_index .content .subscribe_info .s_info_top .s_i_item .expand-box.expanded ._buyerClass {
 
+  display: block;
 
+}
 
+
 
+.vip_index .content .subscribe_info .s_info_top .s_i_item .expand-box.expanded .icon-arrow::before {
 
+  transform: rotate(-90deg);
 
+}
 
 .vip_index .content .media .media_list {
 
   display: flex;
 
   align-items: center;

+ 11 - 3
src/web/templates/weixin/historypush.html
Файл харах 

@@ -770,6 +770,12 @@
 
 		.subscribe{
 
 			margin-top: 1rem;
 
 		}
 
+		.province_city p:last-child{
 
+			margin-bottom:1rem;
 
+		}
 
+		.province p:last-child{
 
+			margin-bottom:1rem;
 
+		}
 
 	</style>
 
 </head>
 
 <body>
 
@@ -1004,6 +1010,7 @@
 
 			document.querySelector('.screen').addEventListener('touchmove', stopScroll, false);
 
 			document.querySelector('.tab_left').addEventListener('touchmove', stopScroll, false);
 
 			document.querySelector('.tab_right').addEventListener('touchmove', stopScroll, false);
 
+			document.querySelector('.handle_menu').addEventListener('touchmove', stopScroll, false);
 
 			if(firstTime!=""){
 
 				date = formatDate(firstTime/1000,"1");
 
         	}
 
@@ -1064,7 +1071,7 @@
 
 				$(this).find("span").toggleClass("current");
 
             	$('.area_container').slideToggle();
 
             	$('.screen').toggle();
 
-            	$(".subscribe").toggleClass('overClass');
 
+            	//$(".subscribe").toggleClass('overClass');
 
             })
 
             // 地区省份选择的操作
 
             $('.province .p_item').click(function(){
 
@@ -1092,13 +1099,14 @@
 
             })
 
             //
 
             $('.screen').click(function(){
 
+				 $('#showArea').find("span").toggleClass("current");
 
             	$('.area_container').slideUp();
 
-            	$(".subscribe").toggleClass('overClass');
 
+            	//$(".subscribe").toggleClass('overClass');
 
             	$('.screen').hide();
 
             })
 
             // 地区选择确认按钮
 
             $('.enter_btn').click(function (){
 
-            	$(".subscribe").toggleClass('overClass');
 
+            	//$(".subscribe").toggleClass('overClass');
 
             	let cityCount = $('.area_wrap .city input:checked').length;
 
             	$('.area_container').slideUp();
 
             	$('.screen').hide()

+ 1 - 1
src/web/templates/weixin/vipsubscribe/messageType.html
Файл харах 

@@ -188,7 +188,6 @@
 
 				$(".result_name").text("全部");
 
 			}
 
 			
-	        weui.loading().hide();
 
 			$(".result").css("visibility","");
 
           	$(".industry").css("margin-top",$('.result_text').height()+25);
 
 			$(".industry").css("visibility","");
 
@@ -229,6 +228,7 @@
 
                     $('.all span').addClass('active');
 
                 }
 
 				getChecked();
 
+	        	weui.loading().hide();
 
             })
 
             //
 
             $(".sure").on("click",function(){

+ 41 - 6
src/web/templates/weixin/vipsubscribe/vip_index.html
Файл харах 

@@ -39,15 +39,23 @@
 
             </div>
 
             <div class="subscribe_info">
 
                 <div class="s_info_top">
 
-                    <p class="s_i_item">
 
+                    <p class="s_i_item" style="margin-bottom: .1rem;">
 
                         <label>已购买区域：</label>
 
-                        <span class="_area"></span>
 
+						<span class="expand-box area expanded">
 
+                            <span class="_area"></span>
 
+                            <span class="iconfont icon-arrow"></span>
 
+                        </span>
 
+<!--                        <span class="_area"></span>-->
 
                     </p>
 
-                    <p class="s_i_item">
 
+                    <p class="s_i_item" style="margin-bottom: .1rem;">
 
                         <label>已购买行业：</label>
 
-                        <span class="_buyerClass"></span>
 
+                        <span class="expand-box trade expanded">
 
+                            <span class="_buyerClass"></span>
 
+                            <span class="iconfont icon-arrow"></span>
 
+                        </span>
 
+<!--                        <span class="_buyerClass"></span>-->
 
                     </p>
 
-                    <p class="s_i_item">
 
+                    <p class="s_i_item" style="margin-bottom: .1rem;">
 
                         <label>订阅周期：</label>
 
                         <span class="_cycleCount"></span>
 
                     </p>
 
@@ -90,7 +98,7 @@
 
                         </div>
 
                         <a href="/front/vipsubscribe/toSetPushSetPage" class="media_right" id="pushSet"></a>
 
                     </div>
 
-                    <div class="media_list" style="margin-top:.2rem;" id="auto_renew">
 
+                    <div class="media_list" style="margin-top:.2rem;margin-bottom: .2rem;" id="auto_renew">
 
                         <div class="media_left">
 
                             <img src="/vipsubscribe/image/frame.png?v={{Msg "seo" "version"}}" alt="">
 
                             <span>项目匹配</span>
 
@@ -207,6 +215,33 @@
 
 				$(".tabbar").html('<a style="width: 100%;color: #fff;background: #2CB7CA;" href="/weixin/pay/vipsubscribe_new" class="update_btn">去购买</a>');
 
 				$(".tabbar").show();
 
             })
 
+			// 点击扩大
 
+            // 给两个按钮绑定统一事件
 
+            $('.subscribe_info .expand-box.area .icon-arrow, .subscribe_info .expand-box.trade .icon-arrow').on('click', function() {
 
+                $(this).parent().toggleClass('expanded')
 
+                // 改变isOpen中的this指向，将其指向当前点击的元素，并调用
 
+                // isOpen.apply(this)
 
+            })
 
+            // 改变isOpen中的this指向，将其指向选中的元素，并调用
 
+            isOpen.apply($('.subscribe_info .expand-box.area .icon-arrow'))
 
+            isOpen.apply($('.subscribe_info .expand-box.trade .icon-arrow'))
 
+            function isOpen(){
 
+                // console.log(this)
 
+                let boxHeight = $(this).siblings().height();
 
+                let minHeight = $(this).siblings().css('min-height')  // 18px
 
+
 
+                let rows = Math.ceil(Math.round(boxHeight)/ parseFloat(minHeight));
 
+                
+                console.log(`高度：${boxHeight}，最小高度：${minHeight}，行数：${rows}`);
 
+                
+                if (rows > 2) {
 
+                    $(this).parent().removeClass('expanded')
 
+                    $(this).show()
 
+                } else {
 
+                    $(this).parent().addClass('expanded')
 
+                    $(this).hide()
 
+                }
 
+            }
 
         })
 
 		//
 
 		function getuserinfo(){