Merge branch 'dev4.4' of http://192.168.3.207:10080/qmx/jy into dev4.4

src/jfw/modules/app/src/web/staticres/jyapp/squeeze/css/squeezeMobile.css

@@ -75,7 +75,7 @@
   position: absolute;
   bottom: 0.21rem;
   right: 1.85rem;
-  width: 1.07rem;
+  width: 1.27rem;
   height: 0.41rem;
   text-align: center;
 }

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

@@ -246,7 +246,7 @@ func (this *SubscribeChange) Upgrade() {
 			"dis_word":       disWord,
 			"discount_price": discount_price,
 			"d_relation_id":  userLotteryId,
-			"vip_type":       3, //立即升级
+			"vip_type":       2, //立即升级
 			"user_phone":     order_phone,
 		}
 		if order_phone != "" {

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

@@ -266,6 +266,11 @@ func (this *SubVipPayOrder) Renew() {
 		if mog_id == "" {
 			return &entity.FuncResult{false, errors.New("创建订单出错"), nil}
 		}
+
+		//计算开始价格和结束价格
+		startTime := time.Unix(endUnix, 0)
+		endTime := util.GetDATE(filter.Cycleunit, filter.Cyclecount, endUnix)
+
 		//原价
 		original_price := totalfee
 
@@ -299,7 +304,11 @@ func (this *SubVipPayOrder) Renew() {
 			"dis_word":       disWord,           //分销口令
 			"discount_price": discount_price,
 			"d_relation_id":  userLotteryId,
+			"vip_starttime":  qutil.FormatDate(&startTime, qutil.Date_Full_Layout),
+			"vip_endtime":    qutil.FormatDate(&endTime, qutil.Date_Full_Layout),
+			"vip_type":       1,
 		}
+
 		orderid := util.Mysql.Insert("dataexport_order", insertMap)
 		if orderid == -1 {
 			return &entity.FuncResult{false, errors.New("数据库操作异常"), nil}

src/jfw/modules/subscribepay/src/subvip_price.json

@@ -30,7 +30,7 @@
       "allProvince_allBuyerClass": 59900
     },
     "year": {
-      "oneProvince_allBuyerClass": 38800,
+      "oneProvince_allBuyerClass": 38000,
       "allProvince_allBuyerClass": 599900
     },
     "provincePrice": 3800,

src/web/staticres/frontRouter/wx/squeeze/css/squeezeMobile.css

@@ -78,7 +78,7 @@ html {
   position: absolute;
   bottom: 0.21rem;
   right: 1.85rem;
-  width: 1.07rem;
+  width: 1.27rem;
   height: 0.41rem;
   text-align: center;
 }

src/web/templates/frontRouter/wx/squeeze/sess/squeeze_mobile.html

@@ -73,7 +73,7 @@
           <li>
             <img src="/frontRouter/wx/squeeze/images/ticket380.png" alt="">
             <div class="ticket-btn">
-              <button class="use" is-receive="true"><i>去使用</i></button>
+              <button class="get" is-receive="true"><i>点击领取</i></button>
             </div>
           </li> 
           <li>