Merge branch 'dev4.4' of ssh://192.168.3.207:10022/qmx/jy into dev4.4

src/jfw/front/vipsubscribe.go

@@ -246,12 +246,18 @@ func (s *Subscribepay) TrialInfo() error {
 
 //订阅收费购买页面
 func (s *Subscribepay) ToPurchasePage(flag string) {
+	userId := util.ObjToString(s.GetSession("userId"))
+	if userId == "" {
+		return
+	}
 	m, ok := public.MQFW.FindById("user", userId, `{"o_vipjy":1,"i_vip_status":1}`)
 	if !ok {
-		return s.Redirect("/swordfish/about?v=2")
+		s.Redirect("/swordfish/about?v=2")
+		return
 	}
-	if util.IntAll((*m)["i_vip_status"]) > 0 {
-		return s.Redirect("/front/vipsubscribe/toSubVipSetPage")
+	if util.IntAll((*m)["i_vip_status"]) > 0 && flag == "new" {
+		s.Redirect("/front/vipsubscribe/introducePage")
+		return
 	}
 	//直播活动
 	nowTime := time.Now().Unix()

src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/ent_portrait.js

@@ -119,7 +119,12 @@ var vNode = {
             this.getPowerInfo()
             // 获取企业基本信息
             this.getEntBaseInfo()
-            this.getEntFollowState()
+            if (this.svip) {
+                this.entInfo.followSearchFinish = true
+                this.entInfo.entExist = false
+            } else {
+                this.getEntFollowState()
+            }
         }
     },
     mounted: function () {
@@ -353,7 +358,7 @@ var vNode = {
                             // _this.conf.showPortraitAll = true
                             // 根据power判断权限，企业画像包含权限(4,12,13)
                             var power = res.data.power
-                            if (power.indexOf(4) != -1) {
+                            if (power.indexOf(4) != -1 || _this.svip) {
                                 // 获取企业画像信息-4
                                 _this.getEntPortrait()
                                 _this.conf._4 = true

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/jfw/modules/weixin/src/config.json

@@ -113,7 +113,7 @@
 	},
 	"reply":[
         {
-        		"text":"Hi~欢迎关注剑鱼标讯！\n\n每日更新10万+招标采购信息，\n定制项目监控，实时跟踪全部销售线索，\n已帮助数百万用户获取全网商机！\n\n点击这里<a href='%s'>免费订阅</a>，帮你抓住每个业务机会！\n\n【超级订阅】\n<a href='%s'>点击订阅</a>，立享380-100,2000-1000。\n●直接对接项目联系人！\n● 招标动态第一时间推送!\n● 大容量300组关键词。\n● 每日可查看2000条招标采购信息。\n● 提供企业画像，透视中标项目、重点客户。\n● 搜索全国七千万企业信息，获取商业情报。",
+        		"text":"Hi~欢迎关注剑鱼标讯！\n\n每日更新10万+招标采购信息，\n定制项目监控，实时跟踪全部销售线索，\n已帮助数百万用户获取全网商机！\n\n点击这里<a href='%s'>免费订阅</a>，帮你抓住每个业务机会！\n\n【超级订阅升级】\n<a href='%s'>点击订阅</a>，立享380-100,2000-1000。\n● 招标动态第一时间推送!\n●直接对接项目联系人！\n● 大容量300组关键词订阅。\n● 每日可查看2000条招标采购信息。\n● 提供企业画像，透视中标项目、重点客户。\n● 搜索全国七千万企业信息，获取商业情报。",
 			"href":["keysetIndex","viphomepage_new"]
         }
 	],

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>