Explorar el Código

fix:卡券代码

yangfeng hace 4 años
padre
commit
e884114840

+ 1 - 0
src/jfw/modules/app/src/web/staticres/jyapp/js/pay-order-template.js

@@ -231,6 +231,7 @@ var couponTem = {
         _this.coupon.value = couponStorage.reduce;
         _this.coupon.type = couponStorage.lotteryAttribute;
         _this.coupon.checkedId = couponStorage.checkedId
+        console.log(couponStorage.checkedId)
         sessionStorage.removeItem('$select-coupon')
         _this.$emit('update-coupon',_this.coupon)
       } else {

+ 1 - 1
src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/js/vip_index_new.js

@@ -864,6 +864,7 @@ $(function () {
   var subVipState = sessionStorage.getItem('sub_vip_state');
   var readcache = sessionStorage.getItem('index_read_cache');
   var reqData = JSON.parse(subVipState);
+  console.log(readcache,'readcache')
   if (readcache) {
       sessionStorage.removeItem('index_read_cache');
       init(reqData);
@@ -925,7 +926,6 @@ $(function () {
           }
           $(".industry .tip-need-upgrade").show()
       }
-
       if (status[0] > 0) {
           //需要付钱
           $(".vip-footer.upgrade").show();

+ 1 - 1
src/jfw/modules/app/src/web/templates/vipsubscribe/vip_index_new.html

@@ -97,7 +97,7 @@
 </head>
 
 <body class="no-touch">
-  <div class="app-layout-header jy-app-header custom-header">
+  <div class="app-layout-header jy-app-header custom-header" style="z-index: 8;">
     <span class="app-back jyapp-icon jyapp-icon-zuojiantou" style="color: #fff;"></span>
     <div class="custom-header-title">
       <span class="title-text"><em class="title-vip-logo"></em>超级订阅</span>

+ 8 - 4
src/web/staticres/frontRouter/wx/coupon/css/coupon-list-template.css

@@ -172,14 +172,18 @@
   border-radius: 8px 0 0 0;
 }
 .coupon-list-template .select-radio{
-  width: .48rem;
-  height: .48rem;
-  margin: 0;
+  width: .36rem;
+  height: .36rem;
+  /* margin: 0; */
   background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAACXBIWXMAABYlAAAWJQFJUiTwAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAMoSURBVHgBzVjdUdtAEP72ZPGQJ6UDUUGcScgMAxmsCmIqACqAVACuIFBBoII4FdiekPgBMnYqiNOBn/KALW12Tz/IYIMVbItvRtxZ6G4/rXb3dpdQEK1u10dYqROZV2CugeGB5FIwhjIf6MXMHYzGzSDYHBTYXpbOS+T7z31i3pNpDcXQZ4rOgq135/M8/Cih1rerGhF9lqlvb6gWDDU5RAdO2MeNOwiC10P7bKvnYW0kzzlVhKGsMx8y7UG0RlHjMWIzCenmxo2OGXyUbQg+w6hynhKYB4lmj9MXItBpNDKNWXvQdDJdn1z3i0yrqhEmbgTbG6d4AlqXV0dC5lPyc8CjUTDNvmgGmRbiN5q58L9IzbG3mVzQ83IL+osko9C9dE/dW2XoV7B2N4uQ2kyO/e4iydwhtasy5KomMjNknywxPvUmyIL1ZZDJI/l8PZl6ErOC4P1GW+9nGko8QWyYPy6bjMJqCtywsuOwEvOwbG+1M6htv13HCtG+vP4tgy8x6kBjlNWQkDnUUQMXVgwb2ywHs2fH5Fsqy6Fo5yVWjNizQ5XvuS+Mb+BW6vG/qIkSoBGbI3zV+c3fcNcQ047+YAo7KA3Utn8lgzBi1n5yt4+yEIap7JoatW+ncmqjNCSymT0lZEN3kRN80cjJ9gyeGZTQbXJVEnKyhxmhONMrC5nsgZEYkLp7FWVhzbGyJWr/MTBsXY7g7KAkyNGVym4bLVXslLleoh3Fp4VwMUmq0Ya6vzvex4qhmQbi0NNXLtbtmehCR0nCD7FiZHmY1G46WkLB1ptzxCmlr9UBVoTOj2tVgK+y03otC4ySRh7oKFo61pQES4bKEA+3pVU+D8sIaU7LDFWbrTyWSSpXDkFl5qvZyaNj7JxgokRZPKlcEepDzSSWmeF5F4qKXDGnD9pSZRGGrgZMFVv2+HigCH2w2YBKeEKENBTM1b24t4fEtiSc+HrP2ql8pkLNholN73Qv4qaUtGPilHd6OyZ0quRgBxHXJ9ox4slpQTgLRRtW+qZFD+G2aPZiYQ2re8TU81xt6UlxwKI1vSZbeqpBCSHRLzjS0tss5hD/AKCFuJpwctRRAAAAAElFTkSuQmCC) no-repeat center center;
   background-size: contain;
   box-sizing: border-box;
 }
-.coupon-list-template .select-radio:checked{
+.coupon-list-template .select-radio-checked{
+  width: .36rem;
+  height: .36rem;
+  /* margin: 0; */
   background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAACXBIWXMAABYlAAAWJQFJUiTwAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAMfSURBVHgBxZhNUhpBFIDfexhduOEGmSxSJaRSMCcQtLLITk8gniDkBOAJ1BNETqC7VCVRdJH1QFKF7DK5AZuUMRX65b3mV5wJMzCMr6qhmX7d/THd76cbIaZsffSczDrsMWABEEsIkGUp2ib1ntR9ZvQJ+jf9P3DRfev6ccbHqIr5S6/CmDlA4BLEkxawOe3sumdRlOcCbX32SpShD1J1YDnxBexoHlgokHPuZTezmRozVyFBQcaTX9Q/8stuL7A96KHuE9qgc6kWYTXim3tTDtpfGALThOWXaCEomv6hy5QSjJ1OV8FpelkIA9I9kxLMSIqbxs45lvGSqVkDWmtKXUxflu6Ne631yRtCqsETydCtDOr6Yd9OGkuFfMZgGgEtzpBhAIRI72DVwnDUKRcPb3fcShCURgELpGbOq/M3E5jdQn30EznDsyoaknJfO88JJVBCijBbzfaBEFUCdX/f7xNCZhtShCGGszB1JCwQIjvBY4knRfNCC2jEXjHMoA+WRCfYupBNo1t2fS3raMrAfAGrhBlIFvNXbQ5pfBRrxDRPYJ5FzsDkvnh7SDZQRxL6T5sNsmqFoweSy1Q1p4GIMPlPXpEonvdXoB7Eg6oHQgXA4Bo1R+ltROnNAxpBeS9lgmkow+ZwwgKNBGBUfNlr5iaCYvbZGnnWhwylq6noX+Nqvny7U6gkACN/zPzE3KVXldBxHLkXUr1Tfh24j5ZN7pjNe2KC6OZse5l6vvm9ljSMHVpYSP2MxJHrOB0V6tXlt+MkYURayrKmtT5zQ1x2KU5vRq6KDyvJofCaJDYtsmemRYzkVL/HGWPuqv0D001fx6JhSgxDQ9TEMXJ/YsapA035tTGQzWmHry1dGDjtTp1mH4SOdYI6LBLZF4WRpbojU59+9gCoJcdbSTf2VRFSgGHJImaP1I+Cq5qeKq4SSsZu6Rw612xbYLRXxQ0chAVIGkb2zF0IjMr86xg5nkhoqS3rEuwSiSWPDoRhEvnCSsHEeUpyhrFOKCxRQK50Gt2kLqwegTU9Bw3sIeC29HZkCCljL92zhQUCuM0LXOn9A06rk6ZU1XotAAAAAElFTkSuQmCC) no-repeat center center;
   background-size: contain;
+  box-sizing: border-box;
 }

+ 1 - 1
src/web/staticres/js/pay-order-template.js

@@ -145,7 +145,7 @@ var couponTem = {
       var price = this.config.type === 'dataExport' ? this.config.disPrice : this.config.initPrice;
       var checkedId = this.coupon.checkedId;
       if(this.coupon.list.length > 0) {
-        location.href = '/jyapp/frontPage/coupon/free/selectCoupon?pId=' + pId + '&price=' + price + '&checkedId=' + checkedId;
+        location.href = '/weixin/frontPage/coupon/free/selectCoupon?pId=' + pId + '&price=' + price + '&checkedId=' + checkedId;
         // 通知父组件,父组件可通过save事件进行存储数据等操作
         this.$emit('save')
       }

+ 1 - 1
src/web/staticres/vipsubscribe/js/vip_index_new.js

@@ -935,7 +935,7 @@ $(function () {
             }
             $(".industry .tip-need-upgrade").show()
         }
-
+        console.log(status[0],'111111')
         if (status[0] > 0) {
             //需要付钱
             $(".vip-footer.upgrade").show();

+ 41 - 77
src/web/templates/frontRouter/wx/coupon/free/selectCoupon.html

@@ -76,6 +76,7 @@
   <script src=//cdn.jsdelivr.net/npm/vant@2.8.2/lib/vant.min.js></script>
   <script src=//cdn.jsdelivr.net/npm/zepto@1.2.0/dist/zepto.min.js></script>
   <!--E-当前页面的资源-->
+  <script src='{{Msg "seo" "cdn"}}/big-member/js/utils.js?v={{Msg "seo" "version"}}'></script>
   <script src='{{Msg "seo" "cdn"}}/frontRouter/wx/coupon/js/coupon-template.js?v={{Msg "seo" "version"}}'></script>
   <script>
     
@@ -83,74 +84,13 @@
       delimiters: ['${', '}'],
       el: '#selectCoupon',
       data: {
-        allCouponData:[
-          {
-            lotteryId: '001', 
-            lotteryAttribute: '满减券',
-            lotteryBeginDate: '2020.12.01', 
-            lotteryEndDate: '2020.12.31',
-            products: [
-              {
-                name: "招标解读文档",
-                url: "/bid/pc/page/bidfile_landpage",
-                describe: "招标文件解读介绍内容"
-              },
-              {
-                name: "大会员",
-                url: "/big/page/index",
-                describe: "大会员介绍内容"
-              }
-            ], 
-            available: true,
-            full: 100,
-            reduce: 10, 
-            instructions: '使用说明',
-            userLotteryId: '465c',
-            isOpen: false
-          },
-          {
-            lotteryId: '001', 
-            lotteryAttribute: '折扣券',
-            lotteryBeginDate: '2020.12.01', 
-            lotteryEndDate: '2020.12.31',
-            products: [
-            {
-              name: "超级订阅",
-              url: "/front/subscribe.html",
-              describe: "超级订阅介绍内容"
-            },
-            {
-              name: "数据导出",
-              url: "/front/dataExport/toSieve",
-              describe: "数据导出介绍内容"
-            },
-            ,
-            {
-              name: "大会员7天试用",
-              url: "/big/page/index",
-              describe: "大会员试用介绍内容"
-            }],
-            available: false,
-            full: 100,
-            reduce: 10, 
-            instructions: '使用说明',
-            userLotteryId: '465c',
-            isOpen: false
-          }
-        ],
-        activeId: '',
         usableCoupon: [], // 可用优惠券
-        disabledCoupon: [] // 不可用优惠券
+        disabledCoupon: [], // 不可用优惠券
+        selectCoupon: {}
       },
       computed: {
         confirmDisabled: function () {
-          return !this.activeId
-        }
-      },
-      created () {
-        var session = sessionStorage.getItem('$select-coupon-id')
-        if(session) {
-          this.activeId = session
+          return !(Object.keys(this.selectCoupon).length > 0)
         }
       },
       mounted() {
@@ -161,24 +101,48 @@
           var _this= this;
           var arr1 = []
           var arr2 = []
-          this.allCouponData.forEach(function(v) {
-            v.isOpen = false
-            if(v.available) {
-              arr1.push(v)
-            } else {
-              arr2.push(v)
+          var checkedId = utils.getParam('checkedId')
+          $.ajax({
+            type:'POST',
+            url:'/jyCoupon/showCoupons',
+            data:{
+              pId: utils.getParam('pId'),
+              price: parseInt(utils.getParam('price')*100)
+            },
+            success:function(res) {
+              if (res.data && res.data.length > 0) {
+                res.data.forEach(function(v) {
+                  v.isOpen = false;
+                  v.isChecked = false;
+                  v.lotteryBeginDate = v.lotteryBeginDate.replace(/\-/g,'.')
+                  v.lotteryEndDate = v.lotteryEndDate.replace(/\-/g,'.')
+                  if (v.available) {
+                    if(v.userLotteryId == checkedId) {
+                      v.isChecked = true
+                      _this.selectCoupon = v
+                    }
+                    arr1.push(v)
+                  } else {
+                    arr2.push(v)
+                  }
+                })
+                _this.usableCoupon = arr1;
+                _this.disabledCoupon = arr2;
+              } else {
+                console.log('没有优惠券')
+              }
+            },
+            error:function(err) {
+              console.log(err)
             }
           })
-          _this.usableCoupon = arr1;
-          _this.disabledCoupon = arr2
-          console.log(this.usableCoupon,this.disabledCoupon)
         },
-        parentFn: function (id) {
-          console.log('父组件接收:' + id)
-          this.activeId = id
+        parentFn: function (obj) {
+          // console.log('父组件接收:' + JSON.stringify(obj))
+          this.selectCoupon = obj
         },
         saveCouponFn: function () {
-          sessionStorage.setItem('$select-coupon-id', this.activeId)
+          sessionStorage.setItem('$select-coupon', JSON.stringify(this.selectCoupon))
           history.back()
         }
       }