Bläddra i källkod

修改折叠城市

wangkaiyue 5 år sedan
förälder
incheckning
d4fe0852f4

+ 1 - 24
src/config.json

@@ -212,30 +212,7 @@
     "advertUrl": "/swordfish/about",
     "wxJianyu": {
         "appid": "wx5b1c6e7cc4dac0e4",
-        "appsecret": "b026103ffebd2291b3edb7a269612112",
-        "pay": {
-            "mchid": "1418321102",
-            "key": "topnet2016topnet2016topnet2016ab",
-            "attachmsg": "剑鱼标讯打赏",
-            "bodymsg": "剑鱼标讯-招标信息打赏",
-            "detailmsg": "招标推送信息[%s] 打赏%s元钱",
-            "sjdc_attachmsg": "剑鱼标讯-历史数据",
-            "sjdc_bodymsg": "剑鱼标讯-历史数据",
-            "sjdc_detailmsg": "剑鱼标讯-历史数据",
-            "sjbd_msg": "剑鱼标讯-数据报告",
-            "subvip_msg":"剑鱼标讯-vip订阅"
-        },
-        "openidSwitch": {
-            "oIMvJvrVXG89597EFmYiSiznbyyY": "oHwE_wEQlEBvjZJOyZeNnQcgKQMo",
-            "ouCYjw4BJMbpdMRYrTTLb9nFi2RE": "oHwE_wNA1V0DURDO0h7wAriz0qIY"
-        }
-    },
-    "aliPay": {
-        "appid": "2016092900620854",
-        "reqUrl": "https://openapi.alipaydev.com/gateway.do",
-        "Subject": "剑鱼数据导出",
-        "privateKey": "-----BEGIN RSA PRIVATE KEY-----\nMIIEogIBAAKCAQEAtO7CU4hpdcMmV43MEA8bqQJYYx+f6yvYkP0nFc/oCvU24bU6zAdK/H2H56quEwD8Dh5YtVTfUCcKqpcG9HXY11TXWKCEUQiK1tkb0o7oSSURwk6h1DdDbg8m1+H8s+k+mvMvcqVCYKYi03PIPQyJCuHmzx/vcaALXRr2HOrEFaFFA8WYST1rywiKeyrC9PCNX1aJjGADhCs3cGrdZEJc4k+2tIHTYJccx+mJ96QiEkzFhJTqEmSFPcNqNUX9uCPgeVhfHW2pRNyffvrhoEyeSr1QoOpaYyn0I5JD2axnypBFCbk6P69LY3eGNKtOe81lp9hiZbMYpXPqb6KwPXTVQQIDAQABAoIBAEbJQm276MaR2uZWK4f84S12JW5iaQZw2QGgiTIXbQkcdqRHawF3uPafhhQ0ynXU5MgBR2NqGRQasimbfLUXhgZ4wueBpUKuvOLhfekaz/YN8qy6ZsXH+TGN6/x6BYu9rSiiC+YmkZmOZgGkQqrfxJ3lU4+lRuCFZOzAJ5mYn652CHRJXy6eDgZfyFLP2ol4/ioJEhwnGFXV345DlsVgmXTEe+IfjTyuvzxBtjod4lfu3dj/f2PhPrcgvN0ZQf1ldZbS+6FkMWInMOQt/WsJ/ANfiKgQ4sPzlxIhmVjrvDlnYTc1lbFekyInzZumV0pDyId+1Y6LAjxJTAhnjFAlBSECgYEAwsQdxOiZNLtxZ8J8JCQHKERYIo7euArW0iAurF+3Q9VNeGj0voFrmfHPju5OF5BHtuc7D3lkwZG4Ac+pyQtxF5dsEMl4vBoNc6onRQFsSDVEEIpl7OBghGlg1as23tvPSMh7DKnILM9OzVfFQ9WLvwHJwLRGsM7LOtmNovq4UFsCgYEA7dE/9Avr5YtCUjij8Y2zkAxN6qb8+ggqFoPiCr91JNGaKNKV9D2K7D3Zk49TXFJm7SX2zgYFuqR2Pa9vAWh9jtmwsc8L0qpIym4J1MM5ud/Xiu9c8O/prQOr7JlICNdk8WfqGbUC83BYfWa5SDonlXFYi6x3LlXdZnvEfZF645MCgYAC2ZnR6tFrGx8StJ7abIiKR02+27ZYnRf9pSjprtDgtjtW+royG3S2oPo3jjcoUx0piQKtPEqEJpy5sg86+ObjwHx9VmVk40C1I5VFhjrOZ7EiSNQq/jGLXntjRQkdg7vpxb0/NzDNrw7pJFKnpnVQCzenkTvDlJMWvl47N04BJwKBgHnpVtuIcPlPFkSH/KMLfQ1PAXJVAEI8hTbdjLbtxuOE/34F1hFKqzjHzA2034roQxM27vpWZAF15Zdho4oZQqREPCwqc2kfGgmLt0Z2fdUnRptWcVKh6ixjQXMccKz3niuSlZNwE38wDGzciAbaqQgW/sk7NC1wnvq2X9fvCAw5AoGANG2usqWYF4x+LvbhcdrKpJsjtvkLa2u9g2/wNXdoj+tBrv310O22/YM5LOcq9MrKPlx1S1C1KLoQO9TWFZiYuQ9C/sk7/ZTNmKQxCxVV0FVPaBYp+meD6sjgoRVJvaqY0UxnJwlHWMrusPTFua7Mtogqx9cvzlQolWh5VX7N1DM=\n-----END RSA PRIVATE KEY-----",
-        "callbackPublicKey": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqkZY9RWrX1cZi/AWuBn7u6bjoT2RMBaq4Gdc87CgrIZm89wa28mYzbnuOrzxGtEMP82lU/KoVAbzY46j7s+bR0qUyUwQyFDFHYzDNSjhngeokzcZ+8rU6a8IOyXOHU0V2BLuvzKb44P4ctzZpmgtDZfxMbAt0ULumz9ma3elYa3pEYgQCoWm5i9eiN8DwhY2uBKZ94vW8+c2iCSwoNntZt6S608TYNOICl7nNWIR+zu3f3HnEE+7mQR37XC1aJWmtH5hKrHF8W5PVzEGhOWETcEdpUmaLhXOfN9nCBKNgFbYUmH+r6s93kfdHAqm6MEuFE6m42nmk6lqoDhEeHKteQIDAQAB"
+        "appsecret": "b026103ffebd2291b3edb7a269612112"
     },
     "industry": "分类综合测试",
     "recommendEntLimit": "50",

+ 7 - 7
src/jfw/front/vipsubscribe.go

@@ -24,12 +24,12 @@ type Subscribepay struct {
 	toVIPViewPage     xweb.Mapper `xweb:"/front/vipsubscribe/toVIPViewPage"`     //订阅收费预览
 
 	//修改
-	toEditSubPage     xweb.Mapper `xweb:"/front/vipsubscribe/toEditSubPage"`     //订阅收费修改页面
-	toEditSubProvPage xweb.Mapper `xweb:"/front/vipsubscribe/toEditSubProvPage"` //订阅收费修改省份
-	toEditSubAllArea  xweb.Mapper `xweb:"/front/vipsubscribe/toEditSubAllArea"`  //订阅收费全国修改
-	toEditSubCityPage xweb.Mapper `xweb:"/front/vipsubscribe/toEditSubCityPage"` //订阅收费修改城市
-	toEditSubInduPage xweb.Mapper `xweb:"/front/vipsubscribe/toEditSubInduPage"` //订阅收费修改行业
-	submitEditSub     xweb.Mapper `xweb:"/front/vipsubscribe/submitEditSub"`     //提交订阅收费
+	toEditSubPage       xweb.Mapper `xweb:"/front/vipsubscribe/toEditSubPage"`       //订阅收费修改页面
+	toEditSubProvPage   xweb.Mapper `xweb:"/front/vipsubscribe/toEditSubProvPage"`   //订阅收费修改省份
+	toEditSubAllArea    xweb.Mapper `xweb:"/front/vipsubscribe/toEditSubAllArea"`    //订阅收费全国修改
+	toEditSubCityPage   xweb.Mapper `xweb:"/front/vipsubscribe/toEditSubCityPage"`   //订阅收费修改城市
+	toEditSubInduPage   xweb.Mapper `xweb:"/front/vipsubscribe/toEditSubInduPage"`   //订阅收费修改行业
+	submitEditSubFinish xweb.Mapper `xweb:"/front/vipsubscribe/submitEditSubFinish"` //订阅收费修改成功
 
 	//升级
 	toUpgradePage xweb.Mapper `xweb:"/weixin/pay/toUpgradePage"`                   //订阅收费升级服务页面
@@ -189,7 +189,7 @@ func (s *Subscribepay) ToEditSubInduPage() {
 }
 
 //提交订阅修改
-func (s *Subscribepay) SubmitEditSub() {
+func (s *Subscribepay) SubmitEditSubFinish() {
 	s.Render("/weixin/vipsubscribe/edit_subscribe_success.html")
 }
 

+ 1 - 1
src/jfw/modules/subscribepay/src/service/vipSubscribePay.go

@@ -39,7 +39,7 @@ func (this *SubVipPayOrder) CreateOrder() {
 	r := func() *entity.FuncResult {
 		now := time.Now()
 		//数据校验
-		if len(industry) == 1 { //去掉[""]
+		if len(industry) == 1 && industry[0] == "" { //去掉[""]
 			industry = []string{}
 		}
 		if !(payWay == "wx_js" || payWay == "wx_app" || payWay == "ali_app") {

+ 45 - 3
src/web/templates/weixin/vipsubscribe/edit_subscribe_allArea.html

@@ -25,8 +25,10 @@
     <div id="choose_area">
         <!--<p class="optional_count"> 可选择市数量:<em class="count"></em> / <span class="total">11</span></p>-->
         <div class="result">
-            <!-- 首次购买 显示"已选择" -----  升级订阅显示"已新增" -->
-            <p>已选择:<span class="result_name"></span></p>
+            <p class="result_text line_two">已选择:<span class="result_name"></span>
+              <a href="javascript:;" class="detail">详情</a>
+            </p>
+            <a href="javascript:;" class="packup" style="display: none;">收起</a>
         </div>
         <div class="form">
             <div class="select-area-box">
@@ -450,6 +452,20 @@
             this.getResult();
           },
           initClick:function(){
+            $('.detail').click(function () {  
+                $('.result_text').removeClass('line_two')
+                $(".result").css("padding-bottom","0.3rem")
+                $(this).hide();
+                $('.packup').show()
+                $(".select-area-box .area-list").css("margin-top",$('.result_text').height()+20);
+            })
+            $('.packup').click(function () { 
+                $(".result").css("padding-bottom","0.2rem")
+                $('.result_text').addClass('line_two')
+                $(this).hide();
+                $('.detail').show()
+                $(".select-area-box .area-list").css("margin-top",$('.result_text').height()+20);
+            })
             // 锚点跳转
             $("body").on('click', '.slide a', function () {
                 var s = $(this).html()
@@ -532,7 +548,7 @@
               console.log("final select ",EditArea.reqData.area)
               $DoPost("/subscribepay/editSub/submit",{"type":"area","value":JSON.stringify(EditArea.reqData.area)},function(r){
                 if(r.success){
-                  window.history.go(-1);
+                  window.location.replace('/front/vipsubscribe/submitEditSubFinish');
                 }
               },false)
               $("#enter").removeAttr("disabled");  
@@ -647,6 +663,7 @@
             }
             $('.result_name').append(html);
             $(".select-area-box .area-list").css("margin-top",$('.result').height()+20);
+            this.isOpen();
             if(this.noChange(this.lastSelectObj,this.reqData.area)){
               $("#enter").attr("disabled","disabled");  
             }else{
@@ -658,8 +675,33 @@
             var tmp1 = getAreaClassArr(obj1);
             var tmp2 = getAreaClassArr(oj2);
             return (JSON.stringify(tmp1[0].sort()) === JSON.stringify(tmp2[0].sort()))&&(JSON.stringify(tmp1[1].sort()) === JSON.stringify(tmp2[1].sort()));
+          },
+          isOpen:function(){
+          let pHeight = $('.result_text').height()
+          let minHeight = $('.result_text').css('min-height')
+          let rows = Math.round(Math.round(pHeight)/ parseFloat(minHeight));
+          $(".select-area-box .area-list").css("margin-top",$('.result_text').height()+20);
+          console.log("高度:"+ pHeight,"最小高度"+ minHeight,"行数:" + rows)
+          if(rows == 1){
+              $('.packup').hide()
+              $('.detail').hide()
+          }else if(rows == 2){
+              console.log($('.result_name').html().trim().length)
+              let length = $('.result_name').html().trim().length;
+              if(length >= 50){
+                  $('.detail').show()
+                  $('.packup').hide()
+              }else{
+                  $('.detail').hide()
+                  $('.packup').hide()
+              }
+              
+          } else{
+              $('.packup').show()
+              $('.detail').hide()
           }
         }
+        }
         $(function(){
           EditArea.init();
         })

+ 1 - 1
src/web/templates/weixin/vipsubscribe/edit_subscribe_city.html

@@ -522,7 +522,7 @@
               console.log("final select ",EditCity.reqData.area);
               $DoPost("/subscribepay/editSub/submit",{"type":"area","value":JSON.stringify(EditCity.reqData.area)},function(r){
                 if(r.success){
-                  window.history.go(-1);
+                  window.location.replace('/front/vipsubscribe/submitEditSubFinish');
                 }
               },false)
               $("#enter").removeAttr("disabled");  

+ 1 - 1
src/web/templates/weixin/vipsubscribe/edit_subscribe_industry.html

@@ -345,7 +345,7 @@
                   console.log("final select ",EditIndustry.reqData)
                   $DoPost("/subscribepay/editSub/submit",{"type":"industry","value":JSON.stringify(EditIndustry.reqData.industry)},function(r){
                     if(r.success){
-                      window.history.go(-1);
+                      window.location.replace('/front/vipsubscribe/submitEditSubFinish');
                     }
                   },false)
                   $("#enter").removeAttr("disabled");  

+ 1 - 1
src/web/templates/weixin/vipsubscribe/edit_subscribe_province.html

@@ -445,7 +445,7 @@
                   
                   $DoPost("/subscribepay/editSub/submit",{"type":"area","value":JSON.stringify(EditProvince.reqData.area)},function(r){
                     if(r.success){
-                      window.history.go(-1);
+                      window.location.replace('/front/vipsubscribe/submitEditSubFinish');
                     }
                   },false)
                   $("#enter").removeAttr("disabled");