Merge remote-tracking branch 'origin/dev4.5' into dev4.5

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

@@ -215,6 +215,8 @@ $(function () {
                     $(".cyclecount").text(filterObj.cyclecount + "个月")
                 } else if (filterObj.cycleunit == 3) {
                     $(".cyclecount").text(filterObj.cyclecount + "天")
+                } else if (filterObj.cycleunit == 4) {
+                    $(".cyclecount").text(filterObj.cyclecount + "季")
                 }
             } else {
                 //未支付
@@ -224,6 +226,8 @@ $(function () {
                     $(".cyclecount").text(filterObj.cyclecount + "个月")
                 } else if (filterObj.cycleunit == 3) {
                     $(".cyclecount").text(filterObj.cyclecount + "天")
+                } else if (filterObj.cycleunit == 4) {
+                    $(".cyclecount").text(filterObj.cyclecount + "季")
                 }
             }
 
@@ -242,6 +246,8 @@ $(function () {
                     $(".cyclecount").text(filterObj.cyclecount + "个月")
                 } else if (filterObj.cycleunit == 3) {
                     $(".cyclecount").text(filterObj.cyclecount + "天")
+                } else if (filterObj.cycleunit == 4) {
+                    $(".cyclecount").text(filterObj.cyclecount + "季")
                 } else if (filterObj.cycleunit == -1) {
                     $(".cyclecount").text("不延期");
                 }
@@ -256,6 +262,8 @@ $(function () {
                     $(".cyclecount").text(filterObj.cyclecount + "个月")
                 } else if (filterObj.cycleunit == 3) {
                     $(".cyclecount").text(filterObj.cyclecount + "天")
+                } else if (filterObj.cycleunit == 4) {
+                    $(".cyclecount").text(filterObj.cyclecount + "季")
                 }
                 if (r.data.order.order_money > 0) {
                     vipType = 3

src/jfw/modules/app/src/web/templates/commonPay/myOrder.html

@@ -1317,6 +1317,8 @@
                         }
                         if (cycleunit_vip === 3) {
                             effectiveduration_vip = cyclecount_vip + "天";
+                        }else if (cycleunit_vip === 4) {
+                            effectiveduration_vip = cyclecount_vip + "季";
                         }
                         if (!$.isEmptyObject(newbuyset)) {
                             if (cycleunit_vip === 1) {
@@ -1325,6 +1327,8 @@
                                 effectiveduration_vip = cyclecount_vip + "个月"
                             } else if (cycleunit_vip === 3) {
                                 effectiveduration_vip = cyclecount_vip + "天";
+                            } else if (cycleunit_vip === 4) {
+                                effectiveduration_vip = cyclecount_vip + "季";
                             }
                         }
                     } else {
@@ -1334,6 +1338,8 @@
                             effectiveduration_vip = cyclecount_vip + "个月"
                         } else if (cycleunit_vip === 3) {
                             effectiveduration_vip = cyclecount_vip + "天";
+                        } else if (cycleunit_vip === 4) {
+                            effectiveduration_vip = cyclecount_vip + "季";
                         }
                     }
                 } else if (vip_type === 2) {
@@ -1381,6 +1387,8 @@
                         effectiveduration_vip = filterObj.cyclecount + "个月";
                     } else if (filterObj.cycleunit === 3) {
                         effectiveduration_vip = filterObj.cyclecount + "天";
+                    } else if (filterObj.cycleunit === 4) {
+                        effectiveduration_vip = filterObj.cyclecount + "季";
                     } else if (filterObj.cycleunit === -1) {
                         effectiveduration_vip = "不延期";
                     }
@@ -1471,7 +1479,9 @@
                                 effectiveduration_vip = cyclecount_vip + "个月"
                             } else if (cycleunit_vip === 3) {
                                 effectiveduration_vip = cyclecount_vip + "天";
-                            }
+                            } else if (cycleunit_vip === 4) {
+                                effectiveduration_vip = cyclecount_vip + "季";
+                            } 
                         }
                     } else {
                         if (cycleunit_vip === 1) {
@@ -1480,7 +1490,9 @@
                             effectiveduration_vip = cyclecount_vip + "个月"
                         } else if (cycleunit_vip === 3) {
                             effectiveduration_vip = cyclecount_vip + "天";
-                        }
+                        } else if (cycleunit_vip === 4) {
+                            effectiveduration_vip = cyclecount_vip + "季";
+                        } 
                     }
                 }
 
@@ -1614,6 +1626,8 @@
                         effectiveduration_vip = filter_vip.cyclecount + "年"
                     } else if (parseInt(filter_vip.cycleunit) === 2) {
                         effectiveduration_vip = filter_vip.cyclecount + "个月"
+                    }  else if (parseInt(filter_vip.cycleunit) === 4) {
+                        effectiveduration_vip = filter_vip.cyclecount + "季"
                     } else {
                         effectiveduration_vip = "7天"
                     }

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

@@ -703,6 +703,9 @@
                   coupon.updatePrice(size.price/100)
                   goodsCoupon.updatePrice(size.price/100)
                 })
+              } else {
+                // 默认选择1年
+                this.$refs.goodsSize.goodsActive = 2
               }
             },
             getGoodSize: function(data) {
@@ -830,7 +833,7 @@
         var purchase = {
           areaSelect: {"一个省": ["一个市"]},//已选择地区 {"一个省":["一个市"]}计算价格临时变量
           industrySelect: ["一个行业"],// 已选择行业 一个行业(计算价格临时变量)
-          timeSelect: [1, 2],//已选择时间 timeSelect[0]时长  timeSelect[1] 1:年 2:月
+          timeSelect: [1, 1],//已选择时间 timeSelect[0]时长  timeSelect[1] 1:年 2:月
           price: {}, //价格
           nowBuyset: {},
           vipSubisTrial: false,
@@ -1031,6 +1034,7 @@
             checkMonth(giveTime)
           },
           flushPrice: function (time, flag) {
+            console.log(time, 'time')
               if (this.vipSubisTrial) {
                 $('.price .billing-price').text('0.00');
                 $('.now-price .dis-price').text('0.00');  // 优惠明细
@@ -1297,7 +1301,7 @@
               }
               sizeTime = size.period
             } else {
-              sizeTime = '1个月'
+              sizeTime = '1年'
             }
             console.log(sizeTime, '选择的周期')
             //付费用户

src/jfw/modules/subscribepay/src/entity/subscribeVip.go

@@ -634,7 +634,7 @@ func (this *vipSubscribeStruct) GetVipLiveActive(userId string) bool {
 vip订阅 套餐价格 -非升级版
 c(city) 全国:0 省:1 市:2
 iCount(industry) 全行业:0 行业:1 其他:多个行业
-u(unit) 年:1 月:2
+u(unit) 年:1 月:2 天:3 季度：4
 */
 func getSetMealPrice_old(c, iCount, u int) int {
 	t := u == 2 //是否是月单位
@@ -681,7 +681,7 @@ func getSetMealPrice_old(c, iCount, u int) int {
 /*
 vip订阅 套餐价格 -升级版
 p(province) 全国:0 省:1
-u(unit) 年:1 月:2 季度:3
+u(unit) 年:1 月:2 天:3 季度:4
 */
 func getSetMealPrice(p, u int) int {
 	// t := u == 2 //是否是月单位
@@ -692,7 +692,7 @@ func getSetMealPrice(p, u int) int {
 			return SubVipPrice.New.Year.AllProvince_allBuyerClass //1年全国全行业
 		case 2:
 			return SubVipPrice.New.Month.AllProvince_allBuyerClass // 1月全国全行业
-		case 3:
+		case 4:
 			return SubVipPrice.New.Quarter.AllProvince_allBuyerClass // 1季度全国全行业
 		}
 	default:
@@ -701,7 +701,7 @@ func getSetMealPrice(p, u int) int {
 			return SubVipPrice.New.Year.OneProvince_allBuyerClass * p //1年1省全行业
 		case 2:
 			return SubVipPrice.New.Month.OneProvince_allBuyerClass * p //1月1省全行业
-		case 3:
+		case 4:
 			return SubVipPrice.New.Quarter.OneProvince_allBuyerClass * p // 1季度1省全行业
 		}
 	}

src/jfw/modules/subscribepay/src/service/vipSubscribePay.go

@@ -340,7 +340,7 @@ func TimeProcessing(hour interface{}, duration int) time.Time {
 	return t
 }
 
-//cycleunit(1:年 2:月 3:季)
+//cycleunit(1:年 2:月 3:天 4:季)
 //cyclecount 数字长度
 func checkReqDate(dateStr string) (cyclecount, cycleunit int, err error) {
 	if strings.HasSuffix(dateStr, "年") {
@@ -352,7 +352,7 @@ func checkReqDate(dateStr string) (cyclecount, cycleunit int, err error) {
 		}
 		return
 	} else if strings.HasSuffix(dateStr, "季") {
-		cycleunit = 3
+		cycleunit = 4
 		dateStr = strings.Replace(dateStr, "季", "", -1)
 		cyclecount, err = strconv.Atoi(strings.Trim(dateStr, " "))
 		if cyclecount > 12 && err == nil {

src/web/templates/weixin/commonPay/myOrder.html

@@ -738,7 +738,7 @@
                         }
                     }
                     var cyclecount_vip = filter_vip.cyclecount;	//时长
-                    var cycleunit_vip = filter_vip.cycleunit;//单位 1:年 2:月 3:天
+                    var cycleunit_vip = filter_vip.cycleunit;//单位 1:年 2:月 3:天 4:季
                     //订阅周期
                     var effectiveduration_vip = ""
                     if ((obj.vip_starttime) && (obj.vip_endtime)) {
@@ -778,6 +778,8 @@
                         }
                         if (cycleunit_vip === 3) {
                             effectiveduration_vip = cyclecount_vip + "天";
+                        }else if (cycleunit_vip === 4) {
+                            effectiveduration_vip = cyclecount_vip + "季";
                         }
                     } else {
                         if (cycleunit_vip === 1) {
@@ -786,6 +788,8 @@
                             effectiveduration_vip = cyclecount_vip + "个月"
                         } else if (cycleunit_vip === 3) {
                             effectiveduration_vip = cyclecount_vip + "天";
+                        } else if (cycleunit_vip === 4) {
+                            effectiveduration_vip = cyclecount_vip + "季";
                         }
                     }
                     //试用用户生成订单 周期
@@ -796,6 +800,8 @@
                             effectiveduration_vip = cyclecount_vip + "个月"
                         } else if (cycleunit_vip === 3) {
                             effectiveduration_vip = cyclecount_vip + "天";
+                        } else if (cycleunit_vip === 4) {
+                            effectiveduration_vip = cyclecount_vip + "季";
                         }
                     }
                 } else if (vip_type === 2) {
@@ -867,6 +873,8 @@
                         effectiveduration_vip = filterObj.cyclecount + "个月";
                     } else if (filterObj.cycleunit === 3) {
                         effectiveduration_vip = filterObj.cyclecount + "天";
+                    } else if (filterObj.cycleunit === 4) {
+                        effectiveduration_vip = filterObj.cyclecount + "季";
                     } else if (filterObj.cycleunit === -1) {
                         effectiveduration_vip = "不延期";
                     } else {
@@ -907,6 +915,8 @@
                             }
                             if (cycleunit_vip === 3) {
                                 effectiveduration_vip = cyclecount_vip + "天";
+                            }else if (cycleunit_vip === 4) {
+                                effectiveduration_vip = cyclecount_vip + "季";
                             }
                         } else {
                             if (cycleunit_vip === 1) {
@@ -915,6 +925,8 @@
                                 effectiveduration_vip = cyclecount_vip + "个月"
                             } else if (cycleunit_vip === 3) {
                                 effectiveduration_vip = cyclecount_vip + "天";
+                            } else if (cycleunit_vip === 4) {
+                                effectiveduration_vip = cyclecount_vip + "季";
                             }
                         }
                     }
@@ -1019,6 +1031,8 @@
                         }
                         if (cycleunit_vip === 3) {
                             effectiveduration_vip = cyclecount_vip + "天";
+                        }else if (cycleunit_vip === 4) {
+                            effectiveduration_vip = cyclecount_vip + "季";
                         }
                     } else {
                         if (cycleunit_vip === 1) {
@@ -1027,6 +1041,8 @@
                             effectiveduration_vip = cyclecount_vip + "个月"
                         } else if (cycleunit_vip === 3) {
                             effectiveduration_vip = cyclecount_vip + "天";
+                        } else if (cycleunit_vip === 4) {
+                            effectiveduration_vip = cyclecount_vip + "季";
                         }
                     }
                 }
@@ -1148,6 +1164,8 @@
                         effectiveduration_vip = filter_vip.cyclecount + "年"
                     } else if (parseInt(filter_vip.cycleunit) === 2) {
                         effectiveduration_vip = filter_vip.cyclecount + "个月"
+                    } else if (parseInt(filter_vip.cycleunit) === 4) {
+                        effectiveduration_vip = filter_vip.cyclecount + "季"
                     } else {
                         effectiveduration_vip = "7天"
                     }

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

@@ -501,6 +501,8 @@
                         $(".cyclecount").text(filterObj.cyclecount + "个月")
                     } else if (filterObj.cycleunit == 3) {
                         $(".cyclecount").text(filterObj.cyclecount + "天")
+                    } else if (filterObj.cycleunit == 4) {
+                        $(".cyclecount").text(filterObj.cyclecount + "季")
                     }
                 } else {
                     //未支付
@@ -510,6 +512,8 @@
                         $(".cyclecount").text(filterObj.cyclecount + "个月")
                     } else if (filterObj.cycleunit == 3) {
                         $(".cyclecount").text(filterObj.cyclecount + "天")
+                    } else if (filterObj.cycleunit == 4) {
+                        $(".cyclecount").text(filterObj.cyclecount + "季")
                     }
                 }
 
@@ -526,6 +530,8 @@
                         $(".cyclecount").text(filterObj.cyclecount + "个月")
                     } else if (filterObj.cycleunit == 3) {
                         $(".cyclecount").text(filterObj.cyclecount + "天")
+                    } else if (filterObj.cycleunit == 4) {
+                        $(".cyclecount").text(filterObj.cyclecount + "季")
                     } else if (filterObj.cycleunit == -1) {
                         $(".cyclecount").text("不延期");
                     }

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

@@ -640,7 +640,7 @@
             function toChooseArea() {
               sessionStorage.removeItem('vip-cur-select-coupon')
               sessionStorage.removeItem('vip-cur-select-size')
-              location.href = '/jyapp/vipsubscribe/toChooseArea'         
+              location.href = '/front/vipsubscribe/toChooseArea'         
             }
             /* vue 代码 start */
             // vip商品规格
@@ -688,6 +688,9 @@
                       coupon.updatePrice(size.price/100)
                       goodsCoupon.updatePrice(size.price/100)
                     })
+                  } else {
+                    // 默认选择1年
+                    this.$refs.goodsSize.goodsActive = 2
                   }
                 },
                 getGoodSize: function(data) {
@@ -812,7 +815,7 @@
             var purchase = {
                 areaSelect: {"一个省": ["一个市"]},//已选择地区 {"一个省":["一个市"]}计算价格临时变量
                 industrySelect: ["一个行业"],// 已选择行业 一个行业(计算价格临时变量)
-                timeSelect: [1, 2],//已选择时间 timeSelect[0]时长  timeSelect[1] 1:年 2:月
+                timeSelect: [1, 1],//已选择时间 timeSelect[0]时长  timeSelect[1] 1:年 2:月
                 price: {}, //价格
                 nowBuyset: {},
                 vipSubisTrial: false,
@@ -1263,7 +1266,7 @@
                       }
                       sizeTime = size.period
                     } else {
-                      sizeTime = '1个月'
+                      sizeTime = '1年'
                     }
                     console.log(sizeTime, '选择的周期')
                     var param = {