Merge branch 'dev4.5.2' of http://192.168.3.207:8080/qmx/jy into dev4.5.2

src/jfw/front/supsearch.go

@@ -271,6 +271,11 @@ func (p *Pcsearch) PcSearchIndex() error {
 	if isPayedUser {
 		buyerclass = p.GetString("buyerclass")
 		hasBuyerTel, hasWinnerTel = p.GetString("buyertel"), p.GetString("winnertel")
+	} else {
+		//时间自定义选择默认是vip 大会员 等权限
+		if len(strings.Split(publishtime, "_")) == 2 {
+			publishtime = ""
+		}
 	}
 
 	b_word, s_word := "", ""

src/jfw/front/swordfish.go

@@ -126,6 +126,11 @@ func (m *Front) PcAjaxReq() {
 	if isPayedUser {
 		buyerclass = m.GetString("buyerclass")
 		hasBuyerTel, hasWinnerTel = m.GetString("buyertel"), m.GetString("winnertel")
+	} else {
+		//时间自定义选择默认是vip 大会员 等权限
+		if len(strings.Split(publishtime, "_")) == 2 {
+			publishtime = ""
+		}
 	}
 
 	m.SetSession("selectType", selectType)
@@ -447,6 +452,11 @@ func (m *Front) WxsearchlistPaging() {
 			if isPayedUser {
 				buyerclass = m.GetString("buyerclass")
 				hasBuyerTel, hasWinnerTel = m.GetString("buyertel"), m.GetString("winnertel")
+			} else {
+				//时间自定义选择默认是vip 大会员 等权限
+				if len(strings.Split(publishtime, "_")) == 2 {
+					publishtime = ""
+				}
 			}
 
 			//全文检索限制

src/jfw/modules/app/src/app/front/swordfish.go

@@ -280,6 +280,11 @@ func (m *Front) WxsearchlistPaging() {
 			if isPayedUser {
 				buyerclass = m.GetString("buyerclass")
 				hasBuyerTel, hasWinnerTel = m.GetString("buyertel"), m.GetString("winnertel")
+			} else {
+				//时间自定义选择默认是vip 大会员 等权限
+				if len(strings.Split(publishtime, "_")) == 2 {
+					publishtime = ""
+				}
 			}
 			//校验是否有大会员中标企业查询权限
 			if jy.GetBigVipUserBaseMsg(userid, public.Mysql, public.MQFW).CheckBigVipBackPower("search") {

src/jfw/modules/app/src/web/templates/frontRouter/portraitRecord/sess/index.html

@@ -30,7 +30,7 @@
           <div class="p-date">
             <div class="d-box flex">
               使用记录
-              <van-field v-model="dValue" @click="usedHised" placeholder="显示图标" right-icon="play" readonly/>
+              <van-field v-model="dValue" @click="usedHised" placeholder="选择年月" right-icon="play" readonly/>
             </div>
             <div class="word-tips">
               当前已使用：<span>{points.usage}个</span>
@@ -39,6 +39,7 @@
           <!-- 日期弹出框 -->
           <van-popup v-model:show="pShow" round position="bottom">
             <van-datetime-picker
+              class="record-time-d"
               v-model="curDate"
               type="year-month"
               title="选择日期"

src/jfw/modules/bigmember/src/entity/portrait.go

@@ -29,9 +29,10 @@ func CreatePortraitManager(userid string, pageFlag string) (*Portrait, error) {
 	if pageFlag == "" {
 		return nil, errors.New("未知请求")
 	}
-	isBuy := bigMsg.CheckBigVipBackPower(pageFlag)
-	if bigMsg.Status <= 0 || !isBuy {
-		return nil, errors.New("非法请求")
+	if pageFlag != "entDetail" { ////企业基本信息接口 无权限控制
+		if bigMsg.Status <= 0 || !bigMsg.CheckBigVipBackPower(pageFlag) {
+			return nil, errors.New("非法请求")
+		}
 	}
 	uid := qutil.If(bigMsg.Pid == "", userid, bigMsg.Pid).(string) //若为子账号则显示主账号行业信息
 	return &Portrait{uid}, nil

src/jfw/modules/common/src/qfw/util/jy/bigVipPower.go

@@ -172,9 +172,6 @@ func (this *BigVipBaseMsg) CheckBigVipFrontPower(reqFlag string) (pass bool) {
 }
 
 func (this *BigVipBaseMsg) CheckBigVipBackPower(reqFlag string) (pass bool) {
-	if reqFlag == "entDetail" { //企业基本信息接口 无权限控制
-		return true
-	}
 	return this.checkPower(reqFlag, BackService)
 }
 

src/web/staticres/common-module/portraitRecord/css/index.css

@@ -88,6 +88,10 @@
     font-size: .24rem;
     color: #171826;
 }
+.p-date .d-box .van-cell .van-field__right-icon {
+    padding: 0;
+    padding-right: 8px;
+}
 .p-date .d-box .van-cell .van-icon-play::before {
     -webkit-transform: rotate(90deg);
     transform:rotate(90deg);
@@ -362,4 +366,7 @@
     text-align: CENTER;
     color: #5f5e64;
     line-height: .4rem;
+}
+.record-time-d .van-picker__confirm {
+    color: #2ABED1;
 }

src/web/staticres/common-module/portraitRecord/js/index-wx.js

@@ -66,10 +66,10 @@ var vm = new Vue({
     }
   },
   created: function () {
-      var _this = this
       this.years = new Date().getFullYear()
       this.months = parseInt(new Date().getMonth() + 1)
       this.dValue = this.years + '年' + this.months + '月'
+      this.curDate = new Date()
       this.subPoint()
       this.onLoad()
   },
@@ -125,7 +125,7 @@ var vm = new Vue({
               abbr: getShortName(v.company_name),
               color: _this.statusColors[Math.floor(Math.random() * _this.statusColors.length)],
               legal: v.legal_person,
-              money: parseInt(v.capital),
+              money: v.capital,
               address: v.company_address,
               _id: v.id,
               status: _this.statusEnum.indexOf(v.company_status) || 0,

src/web/staticres/common-module/portraitRecord/js/index.js

@@ -66,10 +66,10 @@ var vm = new Vue({
     }
   },
   created: function () {
-      var _this = this
       this.years = new Date().getFullYear()
       this.months = parseInt(new Date().getMonth() + 1)
       this.dValue = this.years + '年' + this.months + '月'
+      this.curDate = new Date()
       this.subPoint()
       this.onLoad()
   },
@@ -125,7 +125,7 @@ var vm = new Vue({
               abbr: getShortName(v.company_name),
               color: _this.statusColors[Math.floor(Math.random() * _this.statusColors.length)],
               legal: v.legal_person,
-              money: parseInt(v.capital),
+              money: v.capital,
               address: v.company_address,
               _id: v.id,
               status: _this.statusEnum.indexOf(v.company_status) || 0,

src/web/staticres/frontRouter/pc/seeHistory/css/index-pc.css

@@ -32,6 +32,9 @@
 .l-tabs .tips span {
     color: #2CB7CA;
 }
+.r-tabs {
+    position: relative;
+}
 .r-tabs .r-word {
     color: #686868;
     line-height: 22px;
@@ -50,6 +53,12 @@
 .r-tabs .date-class .el-input__suffix {
     top: -5px;
 }
+.r-tabs .r-icons {
+    position: absolute;
+    top: 6px;
+    right: 8px;
+    color: #aaa;
+}
 .see-content .lists {
     flex-direction: initial;
     align-items: flex-start;

src/web/staticres/frontRouter/pc/seeHistory/js/index-pc.js

@@ -54,7 +54,8 @@ var vm = new Vue({
     created() {
         this.years = new Date().getFullYear()
         this.months = parseInt(new Date().getMonth() + 1)
-        this.dateVal = this.years + '年' + this.months + '月'
+        // this.dateVal = this.years + '年' + this.months + '月'
+        this.dateVal = new Date()
         this.subPoint()
         this.subRecord()
     },
@@ -96,7 +97,7 @@ var vm = new Vue({
                             abbr: getShortName(v.company_name),
                             color: _this.statusColors[Math.floor(Math.random() * _this.statusColors.length)],
                             legal: v.legal_person,
-                            money: parseInt(v.capital),
+                            money: v.capital,
                             phone: v.company_phone,
                             time: v.establishStamp,
                             address: v.company_address,

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

@@ -43,6 +43,7 @@
                     :clearable="false"
                     :editable="false">
                 </el-date-picker>
+                <i class="el-icon-arrow-down r-icons"></i>
             </div>
         </div>
         <div class="see-content w" v-show="seeList.length !== 0">

src/web/templates/frontRouter/wx/portraitRecord/sess/index.html

@@ -1,14 +1,28 @@
 <!DOCTYPE html>
 <html lang="zh-CN">
 <head>
-    <!--引入公共资源头部-->
-    {{include "/big-member/meta.html"}}
+    <meta charset="utf-8">
+    <meta name="keywords" content="剑鱼标讯">
+    <meta name="description" content="剑鱼标讯">
+    <meta name="author" content="剑鱼标讯">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no">
+    <meta name="browsermode" content="application">
+    <meta name="x5-orientation" content="portrait">
+    <meta name="screen-orientation" content="portrait">
+    <meta name="x5-page-mode" content="app">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
     <title>企业画像记录</title>
+    <script src="/big-member/js/rem.js"></script>
     <!--S-当前页面的css资源-->
     <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
     <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
     <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
-    <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/portraitRecord/css/index.css?v={{Msg "seo" "version"}}' />
+    <link rel="stylesheet" href='{{Msg "seo" "cdn"}}/common-module/portraitRecord/css/index.css?v={{Msg "seo" "version"}}' />
+    <script src='https://cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js'></script>
+    <script src="https://cdn-common.jianyu360.com/cdn/lib/loadjs/4.2.0/dist/loadjs.umd.js"></script>
 </head>
 <body>
   <div class="j-container">
@@ -19,7 +33,7 @@
           <div class="t-bg flex">
             <div class="nums">
               <span>{points.total}</span>个
-              <img src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/portraitRecord/image/help-p.png?v={{Msg "seo" "version"}}' @click="helpTiped" alt="">
+              <img src='{{Msg "seo" "cdn"}}/common-module/portraitRecord/image/help-p.png?v={{Msg "seo" "version"}}' @click="helpTiped" alt="">
             </div>
             <div class="btns flex">
               <span>当月企业画像剩余数</span>
@@ -86,7 +100,7 @@
           </div>
           <div class="emptycom" v-if="list.length==0">
             <div class="emptyimg">
-              <img src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/img-empty.png?v={{Msg "seo" "version"}}' alt="">
+              <img src='{{Msg "seo" "cdn"}}/common-module/collection/image/img-empty.png?v={{Msg "seo" "version"}}' alt="">
             </div>
             <div class="emptytext">
               暂无企业画像记录
@@ -102,8 +116,8 @@
   <script src=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js></script>
   <!--E-当前页面的资源-->
   {{include "/big-member/commonjs.html"}}
-  <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/selector/js/china_area.js?v={{Msg "seo" "version"}}'></script>
-  <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/portraitRecord/js/index-wx.js?v={{Msg "seo" "version"}}'></script>
+  <script src='{{Msg "seo" "cdn"}}/common-module/selector/js/china_area.js?v={{Msg "seo" "version"}}'></script>
+  <script src='{{Msg "seo" "cdn"}}/common-module/portraitRecord/js/index-wx.js?v={{Msg "seo" "version"}}'></script>
   {{include "/common/baiducc.html"}}
 </body>