feat: 订阅购买、续费、升级满赠满折活动

src/jfw/modules/app/src/web/staticres/jyapp/me/js/mine.js

@@ -21,6 +21,10 @@ var mine = {
         this.showUserMerge()
         // 获取小红点状态
         this.getRedDotState()
+        // 清除超级订阅购买、续费、升级相关的缓存
+        sessionStorage.removeItem('vip-cur-select-coupon')
+        sessionStorage.removeItem('$select-coupon')
+        sessionStorage.removeItem('vip-cur-select-size')
     },
     // ios返回刷新问题
     iosBackInvoke: function () {

src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/js/choose_area.js

@@ -353,6 +353,7 @@ var AreaChoose = {
       })*/
 
       $('.save-btn').click(function () {  // 提交
+          sessionStorage.removeItem('vip-cur-select-coupon') // 提交之后清除订阅升级页面选择的优惠券
           AreaChoose.submitArea();
       })
       $('.reset-btn').click(function () {  //重置

src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/js/vip_renew.js

@@ -200,22 +200,23 @@ var renew = {
             goodsOrder.updatePrice(size.price / 100)
             // 查有无满赠活动 有满赠不再请求优惠券接口
             renew.getGiftList(function(){
-              goodsCoupon.updatePrice(size.price / 100)
+              goodsCoupon.updatePrice(size.price / 100, size.pId)
             })
             // 校验本次选择的周期是否达到3年的最大限制
             renew.checkOver3Years(goodsSize.getTimeSelect(size.period))
           } else {
             // 初始化默认一年*省份数量或全国价格
+            // 一年对应的pId 是1014
             sessionStorage.removeItem('$select-coupon')
             if (count >= 16) {
               goodsOrder.updatePrice(599900 / 100)
               renew.getGiftList(function(){
-                goodsCoupon.updatePrice(599900 / 100)
+                goodsCoupon.updatePrice(599900 / 100, 1014)
               })
             } else {
               goodsOrder.updatePrice(38000*count / 100)
               renew.getGiftList(function(){
-                goodsCoupon.updatePrice(38000*count / 100)
+                goodsCoupon.updatePrice(38000*count / 100, 1014)
               })
             }
             // 校验本次选择的周期是否达到3年的最大限制
@@ -224,7 +225,7 @@ var renew = {
         } else {
           // 旧规则初始化订单价格
           goodsOrder.updatePrice(this.price / 100)
-          // 旧规则初始化自动领券 旧规则无满赠活动可直接领券
+          // 旧规则初始化自动领券 旧规则无满赠活动可直接领券 旧规则使用默认的pId 101 不传即为默认
           goodsCoupon.updatePrice(this.price / 100)
         }
     },
@@ -614,7 +615,9 @@ function clearSessionStorage() {
     sessionStorage.removeItem("liveActiveCode_new");
     // 清除商品规格当前选择
     sessionStorage.removeItem("vip-cur-select-size")
-    sessionStorage.removeItem("$select-coupon")
+    sessionStorage.removeItem("$select-coupon") // 原订单提交组件上记录的缓存
+    // 商品介绍页上记录的当前选择的优惠券
+    sessionStorage.removeItem('vip-cur-select-coupon')
 }
 function showToast(text) {
     weui.toast(text, {
@@ -693,7 +696,7 @@ var goodsSize = new Vue({
       goodsOrder.updatePrice(data.price/100)
       // 查询有无满赠，无满赠执行回调查优惠券
       renew.getGiftList(function(){
-        goodsCoupon.updatePrice(data.price/100)
+        goodsCoupon.updatePrice(data.price/100, data.pId)
       })
     },
     getTimeSelect: function(data) {
@@ -723,8 +726,8 @@ var goodsCoupon = new Vue({
   },
   mounted () {},
   methods: {
-    updatePrice: function(data){
-      this.$refs.goodsCoupon.getCoupon(data)
+    updatePrice: function(data, pId){
+      this.$refs.goodsCoupon.getCoupon(data, pId)
     },
     updateCoupon: function(data) {
       console.log(data, '更新优惠券选择')
@@ -776,7 +779,7 @@ var goodsOrder = new Vue({
       if (curCoupon) {
         if(curCoupon.lotteryAttribute == '折扣券') {
           // disCount为折扣率 优惠金额 = 原价*优惠了多少比例（100 - disCount）
-          this.$refs.couponRef.coupon.value = Number(before*((100 - curCoupon.disCount)/100)).toFixed(2)
+          this.$refs.couponRef.coupon.value = Number(before*((100 - curCoupon.disCount*10)/100)).toFixed(2)
         } else if (curCoupon.lotteryAttribute == '满减券') {
           this.$refs.couponRef.coupon.value = curCoupon.reduce
         }

src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/js/vip_upgrade.js

@@ -349,7 +349,7 @@ $(function () {
   var time_limit; //定义一个周期变量
   $('[data-upgrade-to-area]').click(function() {
     // 跳转选择省份页面前，将当前订单的原价存起来，用于返回后比较是否更改的省份数量
-    sessionStorage.setItem('jump-before-price', goodsOrder.initPrice)
+    // sessionStorage.setItem('jump-before-price', goodsOrder.initPrice)
   })
   /*------ 关闭弹窗事件  点击取消或遮罩层 -----*/
   $('.weui-mask').click(hideDialog);
@@ -653,6 +653,9 @@ function clearSessionStorage () {
   sessionStorage.removeItem("pay_read_cache")
   sessionStorage.removeItem("liveActiveCode_renew");
   sessionStorage.removeItem("liveActiveCode_new");
+  sessionStorage.removeItem("$select-coupon") // 原订单提交组件上记录的缓存
+    // 商品介绍页上记录的当前选择的优惠券
+    sessionStorage.removeItem('vip-cur-select-coupon')
 }
 
 function pickerShow (selector, f) {
@@ -713,18 +716,18 @@ var goodsOrder = new Vue({
     }
   },
   watch: {
-    initPrice: {
-      handler: function(newVal, oldVal) {
-        var beforePrice = parseInt(sessionStorage.getItem('jump-before-price'))
-        sessionStorage.removeItem('jump-before-price')
-        if (beforePrice != newVal) {
-          sessionStorage.removeItem('vip-cur-select-coupon')
-          goodsOrder.updatePrice(goodsOrder.initPrice)
-        }
-        console.log(newVal,beforePrice, oldVal, 'watch')
-      },
-    },
-    deep: true
+    // initPrice: {
+    //   handler: function(newVal, oldVal) {
+    //     var beforePrice = parseInt(sessionStorage.getItem('jump-before-price'))
+    //     sessionStorage.removeItem('jump-before-price')
+    //     if (beforePrice != newVal) {
+    //       sessionStorage.removeItem('vip-cur-select-coupon')
+    //       goodsOrder.updatePrice(goodsOrder.initPrice)
+    //     }
+    //     console.log(newVal,beforePrice, oldVal, 'watch')
+    //   },
+    // },
+    // deep: true
   },
   mounted () {
     this.init()
@@ -737,7 +740,7 @@ var goodsOrder = new Vue({
       if (curCoupon) {
         if(curCoupon.lotteryAttribute == '折扣券') {
           // disCount为折扣率 优惠金额 = 原价*优惠了多少比例（100 - disCount）
-          this.$refs.couponRef.coupon.value = Number(before*((100 - curCoupon.disCount)/100)).toFixed(2)
+          this.$refs.couponRef.coupon.value = Number(before*((100 - curCoupon.disCount*10)/100)).toFixed(2)
         } else if (curCoupon.lotteryAttribute == '满减券') {
           this.$refs.couponRef.coupon.value = curCoupon.reduce
         }

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

@@ -228,7 +228,6 @@
     });
 
     function toRead() {
-      sessionStorage.setItem('jump-before-price', goodsOrder.initPrice)
       sessionStorage.setItem("pay_read_cache", "0");
       window.location.href = "/jyapp/front/staticPage/wx-serviceterms.html";
     }

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

@@ -709,6 +709,9 @@
         sessionStorage.removeItem('vipSub_oldBuySet')
         location.href = '/jyapp/vipsubscribe/upgradePage'
       })
+      sessionStorage.removeItem('vip-cur-select-coupon')
+      sessionStorage.removeItem('$select-coupon')
+      sessionStorage.removeItem('vip-cur-select-size')
     </script>
     <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/vipsubscribe/js/UpgradePrice.js?v={{Msg "seo" "version"}}'></script>
     <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/vipsubscribe/js/vip_index_new.js?v={{Msg "seo" "version"}}'></script>

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

@@ -324,6 +324,10 @@
           $('.coupon-tips').hide()
         }
       })
+      // 清除超级订阅购买、续费、升级页面相关的优惠券、商品规格缓存
+      sessionStorage.removeItem('vip-cur-select-coupon')
+      sessionStorage.removeItem('$select-coupon')
+      sessionStorage.removeItem('vip-cur-select-size')
     })
 </script>
 

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

@@ -701,7 +701,7 @@
                 this.props.defaultSize = size
                 this.$nextTick(function(){
                   goodsOrder.updatePrice(size.price/100)
-                  goodsCoupon.updatePrice(size.price/100)
+                  goodsCoupon.updatePrice(size.price/100, size.pId)
                 })
               } else {
                 // 默认选择1年
@@ -714,7 +714,7 @@
               goodsOrder.updatePrice(data.price/100)
               // 查询有无满赠，无满赠执行回调查优惠券
               purchase.getGiftList(function(){
-                goodsCoupon.updatePrice(data.price/100)
+                goodsCoupon.updatePrice(data.price/100, data.pId)
               })
             }
           }
@@ -730,8 +730,8 @@
           mounted () {},
           methods: {
             // 传入价格查询优惠券
-            updatePrice: function(data){
-              this.$refs.goodsCoupon.getCoupon(data)
+            updatePrice: function(data, pId){
+              this.$refs.goodsCoupon.getCoupon(data, pId)
             },
             // 切换优惠券 更新价格
             updateCoupon: function(data) {
@@ -783,7 +783,7 @@
               if (curCoupon) {
                 if(curCoupon.lotteryAttribute == '折扣券') {
                   // disCount为折扣率 优惠金额 = 原价*优惠了多少比例（100 - disCount）
-                  this.$refs.couponRef.coupon.value = Number(before*((100 - curCoupon.disCount)/100)).toFixed(2)
+                  this.$refs.couponRef.coupon.value = Number(before*((100 - curCoupon.disCount*10)/100)).toFixed(2)
                 } else if (curCoupon.lotteryAttribute == '满减券') {
                   this.$refs.couponRef.coupon.value = curCoupon.reduce
                 }
@@ -1074,11 +1074,12 @@
                 if (!size) {
                   goodsOrder.updatePrice(price) // 更新提交订单组件价格
                   purchase.getGiftList(function(){
-                    goodsCoupon.updatePrice(price) // 更新商品优惠券价格（查询优惠券）
+                    // 默认选择1年 pId 对应为1014
+                    goodsCoupon.updatePrice(price, 1014) // 更新商品优惠券价格（查询优惠券）
                   })
                 } else {
                   purchase.getGiftList(function(){
-                    goodsCoupon.updatePrice(size.price) // 更新商品优惠券价格（查询优惠券）
+                    goodsCoupon.updatePrice(size.price / 100, size.pId) // 更新商品优惠券价格（查询优惠券）
                   })
                 }
               }

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

@@ -1419,7 +1419,10 @@ function hasNoData() {
         }
     }
   }
-
+  // 清除超级订阅购买、续费、升级页面相关的优惠券、商品规格缓存
+  sessionStorage.removeItem('vip-cur-select-coupon')
+  sessionStorage.removeItem('$select-coupon')
+  sessionStorage.removeItem('vip-cur-select-size')
   //介绍页
   function tointroducepage() {
       setSessionStorage();

src/jfw/modules/subscribepay/src/message.json

@@ -1,105 +1,105 @@
 {
-	"WxTpl_OnTrial_SoonExpire": {
-		"id": "_2qGuk_KkOQtiO8oV_7ZOCWfjX2FQjs6pUDYBHkpygI",
-		"first":{
-			"value":"001",
-			"color":"#FE737A"
-		},
-		"remark": {
-			"value":"感谢您的试用，如已购买，请忽略此信息。"
-		}
-	},
-	"WxTpl_OnTrial_Expired": {
-		"id": "_2qGuk_KkOQtiO8oV_7ZOCWfjX2FQjs6pUDYBHkpygI",
-		"first":{
-			"value":"002",
-			"color":"#FE737A"
-		},
-		"remark": {
-			"value":"感谢您的试用，如已购买，请忽略此信息。"
-		}
-	},
-	"WxTpl_SoonExpire": {
-		"id": "3_VPNbD7fmfd8BsdjLW-a7FOP4wIhEGV7Jx-11-9c7g",
-		"first":{
-			"value":"001",
-			"color":"#FE737A"
-		},
-		"keyword2": {
-			"value":"-"
-		},
-		"keyword3": {
-			"value":"超级订阅"
-		},
-		"remark": {
-			"value":"如已续费，请忽略此信息。"
-		}
-	},
-	"WxTpl_Expired": {
-		"id": "3_VPNbD7fmfd8BsdjLW-a7FOP4wIhEGV7Jx-11-9c7g",
-		"first":{
-			"value":"002",
-			"color":"#FE737A"
-		},
-		"keyword2": {
-			"value":"-"
-		},
-		"keyword3": {
-			"value":"超级订阅"
-		},
-		"remark": {
-			"value":"如已续费，请忽略此信息。"
-		}
-	},
-	"WxTpl_Unpaid": {
-		"id": "Fy18yqcrhmGJQEM10y3rzcEFq0Tt7bdQv5A-favVZTs",
-		"first":{
-			"value":"您的订单 %s 处于未支付状态，为了使您获取更多招标信息，请您及时付款。",
-			"color":"#FE737A"
-		},
-		"second":{
-			"value":"您的订单 %s 还未支付，现在支付立省%s元，全年仅此一次，错过不再有，请及时付款。",
-			"color":"#FE737A"
-		},
-		"third":{
-			"value":"您的订单 %s 还未支付，已有%s人享受超级订阅 6 折活动，现在支付立省%s元，全年仅此一次，错过不再有，请及时付款。",
-			"color":"#FE737A"
-		},
-		"fourth":{
-			"value":"您的订单 %s 还未支付，将在 2 小时后关闭，现在支付享超级订阅 6 折活动，立省%s元，全年仅此一次，错过不再有，请及时付款。",
-			"color":"#FE737A"
-		},
-		"fifth":{
-			"value":"您的订单 %s 还未支付，请及时付款。",
-			"color":"#FE737A"
-		},
-		"sixth":{
-			"value":"您的订单 %s 还未支付，将在 2 小时后关闭，请及时付款。",
-			"color":"#FE737A"
-		},
-		"keyword3": {
-			"value":"%s元"
-		},
-		"keyword4": {
-			"value":"超级订阅%s"
-		},
-		"remark": {
-			"value":"订单将在%.0f小时后自动关闭，请及时支付。"
-		}
-	},
-	"WxTpl_PaySuccess": {
-		"id": "Pr6QjYUit1Tc7GMHhziU5pnfYAiKsa11l2NMGdHO-NU",
-		"first":{
-			"value":"您的订单 %s 已支付成功，剑鱼标讯将为您提供更多精准招标信息，感谢您的购买！"
-		},
-		"keyword1": {
-			"value":"超级订阅%s"
-		}
-	},
-	"WxTpl_DataReport": {
-		"id": "1p3eqXz28HNlIJxhLoWl8zP7y0l8ZGd8YTsLvTq2J28",
-		"first":{
-			"value":"001"
-		}
-	}
+  "WxTpl_OnTrial_SoonExpire": {
+    "id": "p6Tdk6FjeKTIDAgW-ioxjAS79ElaUpaUVWVp9O7wW6g",
+    "first":{
+      "value":"001",
+      "color":"#FE737A"
+    },
+    "remark": {
+      "value":"感谢您的试用，如已购买，请忽略此信息。"
+    }
+  },
+  "WxTpl_OnTrial_Expired": {
+    "id": "p6Tdk6FjeKTIDAgW-ioxjAS79ElaUpaUVWVp9O7wW6g",
+    "first":{
+      "value":"002",
+      "color":"#FE737A"
+    },
+    "remark": {
+      "value":"感谢您的试用，如已购买，请忽略此信息。"
+    }
+  },
+  "WxTpl_SoonExpire": {
+    "id": "_kQ-lk4LLPY_3gPWd1XKjRX3o-exDwoAPETBCaw53hg",
+    "first":{
+      "value":"001",
+      "color":"#FE737A"
+    },
+    "keyword2": {
+      "value":"-"
+    },
+    "keyword3": {
+      "value":"超级订阅"
+    },
+    "remark": {
+      "value":"如已续费，请忽略此信息。"
+    }
+  },
+  "WxTpl_Expired": {
+    "id": "_kQ-lk4LLPY_3gPWd1XKjRX3o-exDwoAPETBCaw53hg",
+    "first":{
+      "value":"002",
+      "color":"#FE737A"
+    },
+    "keyword2": {
+      "value":"-"
+    },
+    "keyword3": {
+      "value":"超级订阅"
+    },
+    "remark": {
+      "value":"如已续费，请忽略此信息。"
+    }
+  },
+  "WxTpl_Unpaid": {
+    "id": "kDYkiU8GlkScTLOUcpO7T99wbI8UJUelasPzyOJTn0s",
+    "first":{
+      "value":"您的订单 %s 处于未支付状态，为了使您获取更多招标信息，请您及时付款。",
+      "color":"#FE737A"
+    },
+    "second":{
+      "value":"您的订单 %s 还未支付，现在支付立省%s元，全年仅此一次，错过不再有，请及时付款。",
+      "color":"#FE737A"
+    },
+    "third":{
+      "value":"您的订单 %s 还未支付，已有%s人享受超级订阅 6 折活动，现在支付立省%s元，全年仅此一次，错过不再有，请及时付款。",
+      "color":"#FE737A"
+    },
+    "fourth":{
+      "value":"您的订单 %s 还未支付，将在 2 小时后关闭，现在支付享超级订阅 6 折活动，立省%s元，全年仅此一次，错过不再有，请及时付款。",
+      "color":"#FE737A"
+    },
+    "fifth":{
+      "value":"您的订单 %s 还未支付，请及时付款。",
+      "color":"#FE737A"
+    },
+    "sixth":{
+      "value":"您的订单 %s 还未支付，将在 2 小时后关闭，请及时付款。",
+      "color":"#FE737A"
+    },
+    "keyword3": {
+      "value":"%s元"
+    },
+    "keyword4": {
+      "value":"超级订阅%s"
+    },
+    "remark": {
+      "value":"订单将在%.0f小时后自动关闭，请及时支付。"
+    }
+  },
+  "WxTpl_PaySuccess": {
+    "id": "FLiFtUSALz4vfz7G8D7Riuicm0l0asg5zVxn_eE7t5k",
+    "first":{
+      "value":"您的订单 %s 已支付成功，剑鱼标讯将为您提供更多精准招标信息，感谢您的购买！"
+    },
+    "keyword1": {
+      "value":"超级订阅%s"
+    }
+  },
+  "WxTpl_DataReport": {
+    "id": "PfB-71Ru9Fkt3L6vLTwnrtFFdVnf-npGwBmWXHPEOtY",
+    "first":{
+      "value":"001"
+    }
+  }
 }

src/web/staticres/common-module/coupon/css/coupon-list-template.css

@@ -208,4 +208,7 @@
 .coupon-list-template .reduce-opacity{
   background: rgba(251, 72, 61, 0.1);
   color: #FB483D;
+}
+.coupon-list-template .dis-label{
+  font-size: .28rem;
 }

src/web/staticres/common-module/coupon/js/coupon-template.js

@@ -9,7 +9,8 @@ Vue.component('coupon-list', {
   data: function () {
     return {
       defaultTitle: '使用说明： 1.不与其他活动优惠同时享受，在线支付专享。 2.支付时可抵扣现金，不可拆分、不可叠加、不可找零。',
-      activeTitle: '使用说明：<br> 1.不与其他活动优惠同时享受，在线支付专享。<br> 2.支付时可抵扣现金，不可拆分、不可叠加、不可找零。<br> 适用产品：<br>'
+      activeTitle: '使用说明：<br> 1.不与其他活动优惠同时享受，在线支付专享。<br> 2.支付时可抵扣现金，不可拆分、不可叠加、不可找零。<br> 适用产品：<br>',
+      vipStatus: 0
     }
   },
   template: `
@@ -27,7 +28,7 @@ Vue.component('coupon-list', {
               :class="['price', mold != 4 || disabled ? 'gray' : 'reduce-color']">￥<strong>@@item.reduce@@</strong>
             </span>
             <span v-else-if="item.lotteryAttribute == '折扣券'" 
-              :class="['price',mold != 4 || disabled ? 'gray' : 'dis-color']"><strong>@@item.disCount@@</strong>
+              :class="['price',mold != 4 || disabled ? 'gray' : 'dis-color']"><strong>@@item.disCount@@<em class="dis-label">折</em></strong>
             </span>
             <span class="usable" :class="[ 
               mold != 4 || disabled ? 'gray gray-bg' : '',
@@ -73,6 +74,9 @@ Vue.component('coupon-list', {
     </div>
   </div>
   `,
+  mounted() {
+    this.getVipState()
+  },
   methods: {
     switchEvent: function(index) {
       this.$set(this.couponList[index], 'isOpen', !this.couponList[index].isOpen)
@@ -83,8 +87,9 @@ Vue.component('coupon-list', {
         2.判断该优惠券是适用单产品还是多产品，多产品跳选择产品列表页面；单产品（超级订阅）新用户跳购买页面，老用户跳订阅设置首页.
       */
       var isWeiXinBrowser = navigator.userAgent.toLowerCase().indexOf('micromessenger') !== -1
-      var isVip = this.getVipState(); // 是否是超级订阅用户
+      var isVip = this.vipStatus; // 是否是超级订阅用户
       var isSingle = this.getSinglePro(str); // 是否适用多产品
+      console.log(isSingle, isVip)
       if (isWeiXinBrowser) {
         // 判断是否适用多产品
         if (isSingle) {
@@ -115,17 +120,19 @@ Vue.component('coupon-list', {
       var result = data.every(function(item){
         return item.name.indexOf('超级订阅') > -1
       })
-      console.log(result,'是否适用多产品')
+      console.log(result,'是否适用单产品')
       return result
     },
     // 判断是否是超级订阅用户
     getVipState: function() {
+      var _this = this
       $.ajax({
         url:'/bigmember/use/isAdd?t=' + Date.now(),
         type:'GET',
         success: function(res){
-          console.log(res.data && res.data.vipStatus > 0)
-          return res.data && res.data.vipStatus > 0
+          if (res.data) {
+            _this.vipStatus = res.data.vipStatus
+          }
         }
       })
     },

src/web/staticres/common-module/coupon/js/pay-order-template.js

@@ -235,6 +235,18 @@ var couponTem = {
           break;
         case 'jyPoints':
           id = 105
+        break;
+        case 'vip-7day':
+          id = 1011
+          break;
+        case 'vip-30day':
+          id = 1012
+        break;
+        case 'vip-3month':
+          id = 1013
+          break;
+        case 'vip-1year':
+          id = 1014
           break;
       }
       return id;

src/web/staticres/common-module/vipsubscribe/css/vip-coupon-template.css

@@ -84,21 +84,29 @@
 #vip-coupon-template .handle-use{
   background: transparent;
 }
-#vip-coupon-template .red-color{
-  color: #FB483D;
-}
-#vip-coupon-template .yellow-color{
-  color: #FF9F40;
-}
 #vip-coupon-template .handle-disabled{
   color: #c0c4cc;
   background: transparent;
 }
-#vip-coupon-template .handle-selected {
+#vip-coupon-template .yellow-selected {
   padding: .06rem .28rem;
   border: 1px solid #FF9F40;
   background: rgba(255,159,64,0.10);
   color: #ff9f40;
   line-height: .36rem;
   border-radius: 16px;
+}
+#vip-coupon-template .red-selected {
+  padding: .06rem .28rem;
+  border: 1px solid #fb483d;
+  background: rgba(251,72,61,0.10);
+  color: #FB483D;
+  line-height: .36rem;
+  border-radius: 16px;
+}
+#vip-coupon-template .red-color{
+  color: #FB483D;
+}
+#vip-coupon-template .yellow-color{
+  color: #FF9F40;
 }

src/web/staticres/common-module/vipsubscribe/js/vip-coupon-template.js

@@ -16,7 +16,7 @@ var vipCouponTem = {
           <span class="r-price">@@item.reduce@@</span>
         </div>
         <div class="c-result" v-else-if="item.lotteryAttribute == '折扣券'">
-          <span class="r-price">@@item.disCount/10@@</span>
+          <span class="r-price">@@item.disCount@@</span>
           <em class="dis-text">折</em>
         </div>
         <div class="c-sub">满@@item.full@@元可用</div>
@@ -27,7 +27,10 @@ var vipCouponTem = {
           <p class="valid-value">@@item.lotteryBeginDate@@ - @@item.lotteryEndDate@@</p>
         </div>
         <div class="handle">
-          <button v-if="item.available" :class="['handle-use', item.active ? 'handle-selected' : '', item.lotteryAttribute == '满减券' ? 'red-color': 'yellow-color']" @click="useFn(item)" v-html="item.active ? '已选择': '使用'"></button>
+          <button v-if="item.available" :class="['handle-use', item.active && item.lotteryAttribute == '折扣券' ? 'yellow-selected' : '', item.active && item.lotteryAttribute == '满减券' ? 'red-selected' : '']" @click="useFn(item)" >
+            <em v-if="item.active">已选择</em>
+            <em v-else :class="[item.lotteryAttribute == '满减券' ? 'red-color': 'yellow-color']">使用</em>
+          </button>
           <button v-else-if="!item.available" class="handle-disabled">暂不可用</button>
         </div>
       </div> 
@@ -44,13 +47,13 @@ var vipCouponTem = {
       sessionStorage.setItem('vip-cur-select-coupon', JSON.stringify(item))
       this.$emit('update-coupon', item)
     },
-    getCoupon: function(price) {
+    getCoupon: function(price, pId) {
       var _this = this
       $.ajax({
         type:'POST',
         url:'/jyCoupon/showCoupons',
         data:{
-          pId: 101,
+          pId: pId ? pId : 101,
           price: parseInt(price*10000/100) ,
           JYR: 1
         },

src/web/staticres/common-module/vipsubscribe/js/vip-size-template.js

@@ -57,16 +57,20 @@ var goodsSizeTem = {
       // console.log(this.config.priceInfo.time, '111')
       for (var key in obj) {
         var days = 30
+        var pid = 101
         if (obj[key]) {
           switch (key) {
             case '1月':
               days = 30
+              pId = 1012
               break;
             case '1季':
               days = 90
+              pId = 1013
               break;
             case '1年':
               days = 365
+              pId = 1014
               break;
           }
           if (count < 16) {
@@ -74,14 +78,16 @@ var goodsSizeTem = {
               period: key,
               price: obj[key].oneProvince_allBuyerClass * count,
               days: days,
-              time: this.config.priceInfo.time
+              time: this.config.priceInfo.time,
+              pId: pId
             })
           } else {
             list.push({
               period: key,
               price: obj[key].allProvince_allBuyerClass,
               days: days,
-              time: this.config.priceInfo.time
+              time: this.config.priceInfo.time,
+              pId: pId
             })
           }
         }

src/web/staticres/frontRouter/pc/coupon/css/coupon-list.css

@@ -146,6 +146,7 @@
     height: 120px;
     background: linear-gradient(281deg, #28C1E2 3.53%, #5FD4E3 98.32%);
 }
+
 .coupon-item .c-i-h-type {
     position: absolute;
     left: 0;
@@ -291,4 +292,10 @@
     margin: 40px 0 44px;
     font-size: 24px;
     line-height: 36px;
+}
+.coupon-item .coupon-yellow-bg{
+  background: linear-gradient(292deg,#ff9f40 0%, #ffc046 100%)
+}
+.coupon-item .coupon-yellow-color{
+  color: #ff9f40;
 }

src/web/staticres/frontRouter/pc/coupon/js/coupon-item-template.js

@@ -1,14 +1,17 @@
 var couponItemString = `
 <div class="coupon-item" :class="lotteryStateClass">
-    <div class="coupon-item-header dotted">
-        <div class="c-i-h-type">{{attribute}}</div>
+    <div class="coupon-item-header dotted" :class="[attribute.indexOf('折扣') != -1 ? 'coupon-yellow-bg' : '']">
+        <div class="c-i-h-type" :class="[attribute.indexOf('折扣') != -1 ? 'coupon-yellow-color' : '']">{{attribute}}</div>
         <div class="c-i-h-info">
-            <div class="info-content c-i-h-discount" key="content" v-if="attribute.indexOf('折扣') != -1">折扣券</div>
-            <div class="info-content c-i-h-full-cut" key="content" v-else-if="attribute.indexOf('满减') != -1">
-                <span class="info-denomination">
+            <div class="info-content c-i-h-full-cut">
+                <span class="info-denomination" v-if="attribute.indexOf('满减') != -1">
                     <span class="i-yen">&yen;</span>
                     <span class="i-num">{{ reduce }}</span>
                 </span>
+                <span class="info-denomination" v-else-if="attribute.indexOf('折扣') != -1">
+                    <span class="i-num" style="margin-right:0;">{{ disCount }}</span>
+                    <span class="i-yen" style="margin-right:16px;">折</span>
+                </span>
                 <span class="info-condition">满{{ full }}可用</span>
             </div>
             <div class="info-content c-i-h-p-voucher" key="content" v-else-if="attribute.indexOf('实物') != -1">实物券</div>

src/web/staticres/frontRouter/pc/coupon/js/coupon-list.js

@@ -34,6 +34,10 @@ Vue.component('coupon-item', {
             type: [String, Number],
             default: 0
         },
+        disCount: {
+          type: [String, Number],
+          default: 0
+        },
         // 使用说明
         instructions: {
             type: String,

src/web/staticres/me/js/mine.js

@@ -24,6 +24,10 @@ var mine = {
         this.getOfflineMessageCount()
         // 企业画像记录访问权限
         this.getBigVipState()
+        // 清除超级订阅购买、续费、升级相关的缓存
+        sessionStorage.removeItem('vip-cur-select-coupon')
+        sessionStorage.removeItem('$select-coupon')
+        sessionStorage.removeItem('vip-cur-select-size')
     },
     // ios返回刷新问题
     iosBackInvoke: function () {

src/web/staticres/vipsubscribe/js/choose_area.js

@@ -344,6 +344,7 @@ var AreaChoose = {
       })*/
 
       $('.save-btn').click(function () {  // 提交
+        sessionStorage.removeItem('vip-cur-select-coupon') // 提交之后清除订阅升级页面选择的优惠券
           AreaChoose.submitArea();
       })
       $('.reset-btn').click(function () {  //重置

src/web/staticres/vipsubscribe/js/vip_renew.js

@@ -200,7 +200,7 @@ var renew = {
             goodsOrder.updatePrice(size.price / 100)
             // 查有无满赠活动 有满赠不再请求优惠券接口
             renew.getGiftList(function(){
-              goodsCoupon.updatePrice(size.price / 100)
+              goodsCoupon.updatePrice(size.price / 100, size.pId)
             })
             // 校验本次选择的周期是否达到3年的最大限制
             renew.checkOver3Years(goodsSize.getTimeSelect(size.period))
@@ -210,12 +210,13 @@ var renew = {
             if (count >= 16) {
               goodsOrder.updatePrice(599900 / 100)
               renew.getGiftList(function(){
-                goodsCoupon.updatePrice(599900 / 100)
+                // 一年对应的pId 是1014
+                goodsCoupon.updatePrice(599900 / 100, 1014)
               })
             } else {
               goodsOrder.updatePrice(38000*count / 100)
               renew.getGiftList(function(){
-                goodsCoupon.updatePrice(38000*count / 100)
+                goodsCoupon.updatePrice(38000*count / 100, 1014)
               })
             }
             // 校验本次选择的周期是否达到3年的最大限制
@@ -224,7 +225,7 @@ var renew = {
         } else {
             // 旧规则初始化订单价格
             goodsOrder.updatePrice(this.price / 100)
-            // 旧规则初始化自动领券 旧规则无满赠活动可直接领券
+            // 旧规则初始化自动领券 旧规则无满赠活动可直接领券  旧规则使用默认的pId 101
             goodsCoupon.updatePrice(this.price / 100)
         }
     },
@@ -615,7 +616,10 @@ function clearSessionStorage() {
     sessionStorage.removeItem("liveActiveCode_new");
     // 清除商品规格当前选择
     sessionStorage.removeItem("vip-cur-select-size")
-    sessionStorage.removeItem("$select-coupon")
+    sessionStorage.removeItem("$select-coupon") // 原订单提交组件上记录的缓存
+    // 商品介绍页上记录的当前选择的优惠券
+    sessionStorage.removeItem('vip-cur-select-coupon')
+
 }
 function showToast(text) {
     weui.toast(text, {
@@ -694,7 +698,7 @@ var goodsSize = new Vue({
       goodsOrder.updatePrice(data.price/100)
       // 查询有无满赠，无满赠执行回调查优惠券
       renew.getGiftList(function(){
-        goodsCoupon.updatePrice(data.price/100)
+        goodsCoupon.updatePrice(data.price/100, data.pId)
       })
     },
     getTimeSelect: function(data) {
@@ -724,8 +728,8 @@ var goodsCoupon = new Vue({
   },
   mounted () {},
   methods: {
-    updatePrice: function(data){
-      this.$refs.goodsCoupon.getCoupon(data)
+    updatePrice: function(data, pId){
+      this.$refs.goodsCoupon.getCoupon(data, pId)
     },
     updateCoupon: function(data) {
       console.log(data, '更新优惠券选择')
@@ -776,7 +780,7 @@ var goodsOrder  = new Vue({
       if (curCoupon) {
         if(curCoupon.lotteryAttribute == '折扣券') {
           // disCount为折扣率 优惠金额 = 原价*优惠了多少比例（100 - disCount）
-          this.$refs.couponRef.coupon.value = Number(before*((100 - curCoupon.disCount)/100)).toFixed(2)
+          this.$refs.couponRef.coupon.value = Number(before*((100 - curCoupon.disCount*10)/100)).toFixed(2)
         } else if (curCoupon.lotteryAttribute == '满减券') {
           this.$refs.couponRef.coupon.value = curCoupon.reduce
         }

src/web/staticres/vipsubscribe/js/vip_upgrade.js

@@ -639,6 +639,9 @@ function clearSessionStorage() {
   sessionStorage.removeItem("vip_change_time");
   sessionStorage.removeItem("liveActiveCode_renew");
   sessionStorage.removeItem("liveActiveCode_new");
+  sessionStorage.removeItem("$select-coupon") // 原订单提交组件上记录的缓存
+  // 商品介绍页上记录的当前选择的优惠券
+  sessionStorage.removeItem('vip-cur-select-coupon')
 }
 
 function pickerShow(selector, f) {
@@ -745,18 +748,19 @@ var goodsOrder = new Vue({
     }
   },
   watch: {
-    initPrice: {
-      handler: function(newVal, oldVal) {
-        var beforePrice = parseInt(sessionStorage.getItem('jump-before-price'))
-        sessionStorage.removeItem('jump-before-price')
-        if (beforePrice != newVal) {
-          sessionStorage.removeItem('vip-cur-select-coupon')
-          goodsOrder.updatePrice(goodsOrder.initPrice)
-        }
-        console.log(newVal,beforePrice, oldVal, 'watch')
-      },
-    },
-    deep: true
+    // initPrice: {
+    //   handler: function(newVal, oldVal) {
+    //     var beforePrice = parseInt(sessionStorage.getItem('jump-before-price'))
+    //     sessionStorage.removeItem('jump-before-price')
+    //     console.log(beforePrice, newVal, '111')
+    //     if (beforePrice != newVal) {
+    //       sessionStorage.removeItem('vip-cur-select-coupon')
+    //       goodsOrder.updatePrice(goodsOrder.initPrice)
+    //     }
+    //     console.log(newVal,beforePrice, oldVal, 'watch')
+    //   },
+    // },
+    // deep: true
   },
   mounted () {
     this.init()
@@ -769,7 +773,7 @@ var goodsOrder = new Vue({
       if (curCoupon) {
         if(curCoupon.lotteryAttribute == '折扣券') {
           // disCount为折扣率 优惠金额 = 原价*优惠了多少比例（100 - disCount）
-          this.$refs.couponRef.coupon.value = Number(before*((100 - curCoupon.disCount)/100)).toFixed(2)
+          this.$refs.couponRef.coupon.value = Number(before*((100 - curCoupon.disCount*10)/100)).toFixed(2)
         } else if (curCoupon.lotteryAttribute == '满减券') {
           this.$refs.couponRef.coupon.value = curCoupon.reduce
         }

src/web/templates/frontRouter/pc/coupon/sess/index.html

@@ -61,6 +61,7 @@
                                 :instructions="item.instructions"
                                 :full="item.full"
                                 :reduce="item.reduce"
+                                :dis-count="item.disCount"
                             ></coupon-item>
                         </div>
                     </div>
@@ -88,7 +89,7 @@
 <script src='https://cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js' type="text/javascript"></script>
 <script src='//cdn.jsdelivr.net/npm/element-ui@2.9.2/lib/index.js' type="text/javascript"></script>
 <script src='{{Msg "seo" "cdn"}}/big-member/js/utils.js?v={{Msg "seo" "version"}}'></script>
-<script src='{{Msg "seo" "cdn"}}/frontRouter/pc/coupon/js/coupon-item-template.min.js?v={{Msg "seo" "version"}}'></script>
+<script src='{{Msg "seo" "cdn"}}/frontRouter/pc/coupon/js/coupon-item-template.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Msg "seo" "cdn"}}/frontRouter/pc/coupon/js/coupon-list.js?v={{Msg "seo" "version"}}'></script>
 <script>
     $(function () {

src/web/templates/weixin/historypush.html

@@ -1666,6 +1666,10 @@
         }
     }
 
+     // 清除超级订阅购买、续费、升级页面相关的优惠券、商品规格缓存
+    sessionStorage.removeItem('vip-cur-select-coupon')
+    sessionStorage.removeItem('$select-coupon')
+    sessionStorage.removeItem('vip-cur-select-size')
     //介绍页
     function tointroducepage() {
         setSessionStorage();

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

@@ -436,7 +436,6 @@
       }
     }
     function toRead() {
-      sessionStorage.setItem('jump-before-price', goodsOrder.initPrice)
       window.location.href = "/front/staticPage/wx-serviceterms.html";
     }
 

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

@@ -704,6 +704,9 @@
   $('*[data-bind-update]').on('click',function() {
     location.href = '/front/vipsubscribe/upgradePage'
   })
+  sessionStorage.removeItem('vip-cur-select-coupon')
+  sessionStorage.removeItem('$select-coupon')
+  sessionStorage.removeItem('vip-cur-select-size')
 </script>
 <script src="/vipsubscribe/js/UpgradePrice.js?v={{Msg "seo" "version"}}"></script>
 <script src='{{Msg "seo" "cdn"}}/common-module/vipsubscribe/js/vip-subscribe-set-template.js?v={{Msg "seo" "version"}}'></script>

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

@@ -304,6 +304,10 @@
           $('.coupon-tips').hide()
         }
       })
+      // 清除超级订阅购买、续费、升级页面相关的优惠券、商品规格缓存
+      sessionStorage.removeItem('vip-cur-select-coupon')
+      sessionStorage.removeItem('$select-coupon')
+      sessionStorage.removeItem('vip-cur-select-size')
     </script>
     {{include "/common/baiducc.html"}}
 </body>

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

@@ -686,7 +686,7 @@
                     this.props.defaultSize = size
                     this.$nextTick(function(){
                       goodsOrder.updatePrice(size.price/100)
-                      goodsCoupon.updatePrice(size.price/100)
+                      goodsCoupon.updatePrice(size.price/100, size.pId)
                     })
                   } else {
                     // 默认选择1年
@@ -699,7 +699,7 @@
                   goodsOrder.updatePrice(data.price/100)
                   // 查询有无满赠，无满赠执行回调查优惠券
                   purchase.getGiftList(function(){
-                    goodsCoupon.updatePrice(data.price/100)
+                    goodsCoupon.updatePrice(data.price/100, data.pId)
                   })
                 }
               }
@@ -715,8 +715,8 @@
               mounted () {},
               methods: {
                 // 传入价格查询优惠券
-                updatePrice: function(data){
-                  this.$refs.goodsCoupon.getCoupon(data)
+                updatePrice: function(data, pId){
+                  this.$refs.goodsCoupon.getCoupon(data, pId)
                 },
                 // 切换优惠券 更新价格
                 updateCoupon: function(data) {
@@ -770,7 +770,7 @@
                   if (curCoupon) {
                     if(curCoupon.lotteryAttribute == '折扣券') {
                       // disCount为折扣率 优惠金额 = 原价*优惠了多少比例（100 - disCount）
-                      this.$refs.couponRef.coupon.value = Number(before*((100 - curCoupon.disCount)/100)).toFixed(2)
+                      this.$refs.couponRef.coupon.value = Number(before*((100 - curCoupon.disCount*10)/100)).toFixed(2)
                     } else if (curCoupon.lotteryAttribute == '满减券') {
                       this.$refs.couponRef.coupon.value = curCoupon.reduce
                     }
@@ -1046,11 +1046,12 @@
                         if (!size) {
                           goodsOrder.updatePrice(price) // 更新提交订单组件价格
                           purchase.getGiftList(function(){
-                            goodsCoupon.updatePrice(price) // 更新商品优惠券价格（查询优惠券）
+                            // 默认选择1年周期 对应pId为1014
+                            goodsCoupon.updatePrice(price, 1014) // 更新商品优惠券价格（查询优惠券）
                           })
                         } else {
                           purchase.getGiftList(function(){
-                            goodsCoupon.updatePrice(size.price) // 更新商品优惠券价格（查询优惠券）
+                            goodsCoupon.updatePrice(size.price / 100, size.pId) // 更新商品优惠券价格（查询优惠券）
                           })
                         }
                     }

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

@@ -17,7 +17,7 @@
     <link rel="stylesheet" href="/css/wxbutton.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="/vipsubscribe/css/vip_renew.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href='{{Msg "seo" "cdn"}}/common-module/vipsubscribe/css/vip-size-template.css?v={{Msg "seo" "version"}}' />
-    <link rel="stylesheet" href='{{Msg "seo" "cdn"}}/common-module/coupon/css/vip-coupon-template.css?v={{Msg "seo" "version"}}' />
+    <link rel="stylesheet" href='{{Msg "seo" "cdn"}}/common-module/vipsubscribe/css/vip-coupon-template.css?v={{Msg "seo" "version"}}' />
     <link rel="stylesheet" href='{{Msg "seo" "cdn"}}/common-module/coupon/css/pay-order-template.css?v={{Msg "seo" "version"}}' />
     <style>
       .vip-header {
@@ -88,14 +88,6 @@
               <span class="item-l a-r-label">省份数量</span>
               <span class="a-r-val"><span class="item-r"></span></span>
             </div>
-          </div>
-            <!-- 商品规格 -->
-          <div id="goods-size-vue" data-new-vip style="display: none;">
-            <goods-size-template ref="goodsSize" :config="props" @select-vip-size="getGoodSize"></goods-size-template>
-          </div>
-          <!-- 商品优惠券 -->
-          <div id="goods-coupon-vue">
-            <goods-coupon-template ref="goodsCoupon" @update-coupon="updateCoupon"></goods-coupon-template>
           </div>
             <ul style="padding: .16rem .24rem;" data-old-vip>
                 <li class="body-item area-industry">
@@ -131,13 +123,6 @@
                         </div>
                     </a>
                 </li>
-                <div class="tips" data-old-vip>
-                    <div class="tip-title l-line">续费说明</div>
-                    <div class="tip-content">
-                        <div>1、仅支持原套餐延长周期续费，不支持套餐变更（含增加、减少、更改）原订阅的省份、城市、行业。 <br />续费费用=续费周期（按月/年）/原地区/原行业</div>
-                        <div>2、套餐周期内，用户也可以选择升级超级订阅享受更多权益。</div>
-                    </div>
-                </div>
             </ul>
         <ul style="padding: 0 .24rem;display: none;" id="giveTimeBox">
                 <li class="body-item select_cycle">
@@ -153,6 +138,21 @@
                     </div>
                 </li>
             </ul>
+            <!-- 商品规格 -->
+            <div id="goods-size-vue" data-new-vip style="display: none;">
+              <goods-size-template ref="goodsSize" :config="props" @select-vip-size="getGoodSize"></goods-size-template>
+            </div>
+            <!-- 商品优惠券 -->
+            <div id="goods-coupon-vue">
+              <goods-coupon-template ref="goodsCoupon" @update-coupon="updateCoupon"></goods-coupon-template>
+            </div>
+            <div class="tips" data-old-vip style="padding: .16rem .24rem;">
+              <div class="tip-title l-line">续费说明</div>
+              <div class="tip-content">
+                  <div>1、仅支持原套餐延长周期续费，不支持套餐变更（含增加、减少、更改）原订阅的省份、城市、行业。 <br />续费费用=续费周期（按月/年）/原地区/原行业</div>
+                  <div>2、套餐周期内，用户也可以选择升级超级订阅享受更多权益。</div>
+              </div>
+            </div>
             <div data-new-vip style="display: none;">
               {{include "/common/commonRules.html"}}
             </div>
@@ -385,7 +385,7 @@
     <script src="/vipsubscribe/js/jquery-2.1.4.js?v={{Msg "seo" "version"}}"></script>
     <script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js></script>
     <script src='{{Msg "seo" "cdn"}}/common-module/vipsubscribe/js/vip-size-template.js?v={{Msg "seo" "version"}}'></script>
-    <script src='{{Msg "seo" "cdn"}}/common-module/coupon/js/vip-coupon-template.js.js?v={{Msg "seo" "version"}}'></script>
+    <script src='{{Msg "seo" "cdn"}}/common-module/vipsubscribe/js/vip-coupon-template.js?v={{Msg "seo" "version"}}'></script>
     <script src='{{Msg "seo" "cdn"}}/common-module/coupon/js/pay-order-template.js?v={{Msg "seo" "version"}}'></script>
     <script src="/vipsubscribe/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
     <script src="/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}"></script>