src/jfw/modules/app/src/app/miniprogram/miniprogram.go

@@ -172,8 +172,7 @@ func (m *MiniProgram) BindPhone() error {
 				if err := jy.Publish(public.Mgo_Log, nsqPath, nsq_topic, jy.Jyapp_phone_register, mgoUserId, jy.Jyapp_node1, nil); err != nil {
 					log.Println("nsq队列写入失败-->", err, jy.Jyapp_phone_register, mgoUserId)
 				}
-			}
-			if createRes == 2 {
+			} else if createRes == 2 {
 				if err := jy.Publish(public.Mgo_Log, nsqPath, nsq_topic, "task", mgoUserId, jy.Jyweb_node2, map[string]interface{}{
 					"code":       1007,
 					"types":      "bindPhone",

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

@@ -351,6 +351,25 @@ var vNode = {
     }
   },
   methods: {
+    doMiniPostMessageShareFn (title) {
+      try {
+        wx.miniProgram.postMessage({ data: {
+            post: 'share',
+            type: 'common',
+            desc: '企业画像',
+            title: title + '画像分析'
+          }})
+      } catch (e) {
+        console.log(e)
+      }
+    },
+    doMiniPostMessageShare (title) {
+      this.doMiniPostMessageShareFn(title)
+      var _that = this
+       window.miniAppInitLoaded = function () {
+        _that.doMiniPostMessageShareFn(title)
+      }
+    },
     restoreTab: function() {
       var tab = utils.getParam('tab') || ''
       if (tab) {
@@ -768,6 +787,7 @@ var vNode = {
           if (res.error_code == 0) {
             if (res.data && Object.keys(res.data).length !== 0) {
               _this.entInfo.name = res.data.entName
+              _this.doMiniPostMessageShare(_this.entInfo.name)
               _this.entBaseInfo._empty = false
               for (var key in res.data) {
                 _this.entBaseInfo[key] = res.data[key]
@@ -1645,11 +1665,11 @@ var vNode = {
       var container = document.querySelector('.sesame-main');
       if(!container) return
       var items = container.getElementsByClassName('sesame-item');
-  
+
       // 获取所有子元素的top值,如果所有子元素的top值相同,则说明只有一行
       var firstItemTop = items[0].offsetTop;
       var isOneRow = true;
-  
+
       for (var i = 1; i < items.length; i++) {
         if (items[i].offsetTop !== firstItemTop) {
           isOneRow = false;

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

@@ -325,6 +325,7 @@ var vNode = {
   created () {
     this.buyer.name = decodeURIComponent(utils.getParam('entName'))
     this.portraitName = decodeURIComponent(utils.getParam('entName'))
+    this.doMiniPostMessageShare(this.buyer.name)
     this.getUserSimpleInfo()
     this.restore = this.reStoreState()
     setTimeout(() => {
@@ -358,6 +359,25 @@ var vNode = {
     window.removeEventListener("resize", this.init, 20);
   },
   methods: {
+    doMiniPostMessageShareFn (title) {
+      try {
+        wx.miniProgram.postMessage({ data: {
+            post: 'share',
+            type: 'common',
+            desc: '采购单位画像',
+            title: title + '画像分析'
+          }})
+      } catch (e) {
+        console.log(e)
+      }
+    },
+    doMiniPostMessageShare (title) {
+      this.doMiniPostMessageShareFn(title)
+      var _that = this
+      window.miniAppInitLoaded = function () {
+        _that.doMiniPostMessageShareFn(title)
+      }
+    },
     restoreTab: function() {
       var tab = utils.getParam('tab') || ''
       if (tab) {

src/jfw/modules/app/src/web/staticres/jyapp/js/common.js

@@ -355,6 +355,7 @@ window.utilsEnv = {
   },
   getPlatformEnvs: function () {
     var inWX = navigator.userAgent.toLowerCase().indexOf('micromessenger') !== -1
+    var inWeiXinMiniApp = navigator.userAgent.toLowerCase().indexOf('miniprogram') !== -1
     var inApp = this.getIsInTheAppContainer()
     var platformOS = this.androidOrIOS()
     var getPlatform = function () {
@@ -374,6 +375,7 @@ window.utilsEnv = {
       platformOS: platformOS,
       platform: platform,
       inApp: inApp,
+      inWxMini: inWeiXinMiniApp, // 微信小程序
       inWX: inWX
     }
   }

src/jfw/modules/app/src/web/templates/big-member/page_pro_follow_detail.html

@@ -1508,6 +1508,9 @@
                 if (!this.isPayedUser) {
                     return this.openVip()
                 }
+                if (utils.$envs.inWxMini) {
+                    return utils.toDownloadApp()
+                }
                 if (this.isRequestIng) {
                     return
                 }

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

@@ -422,6 +422,11 @@
   {{include "/big-member/commonjs.html"}}
   <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/common.js?v={{Msg "seo" "version"}}'></script>
   <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/public/js/china-map-data.js?v={{Msg "seo" "version"}}'></script>
+  <script>
+    var __pageData = {
+        platform: 'app'
+    }
+  </script>
   <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/file-pack/js/index.js?v={{Msg "seo" "version"}}'></script>
 <!--  <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/file-pack/js/rights-box.js?v={{Msg "seo" "version"}}'></script>-->
   {{include "/common/baiducc.html"}}

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

@@ -454,6 +454,10 @@
       }
 
       $('.save-button').off('click').on('click', function () {
+        if (utils.$envs.inWxMini) {
+          return utils.toDownloadApp()
+        }
+
         if (saveSuccess) {
           console.log('返回')
           return

src/jfw/modules/app/src/web/templates/frontRouter/share/sess/invite-friends.html

@@ -90,6 +90,7 @@
   <script src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js></script>
   <script src=//cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js></script>
   <script src="//cdn-common.jianyu360.com/cdn/lib/html2canvas/1.3.3/dist/html2canvas.min.js" crossorigin></script>
+  <script src=//res2.wx.qq.com/open/js/jweixin-1.6.0.js></script>
   <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/common.js?v={{Msg "seo" "version"}}'></script>
   {{include "/big-member/commonjs.html"}}
   <script>

src/jfw/modules/bigmember/src/go.sum

@@ -852,12 +852,10 @@ github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk5
 github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE=
 github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a/go.mod h1:SGnFV6hVsYE877CKEZ6tDNTjaSXYUk6QqoIK6PrAtcc=
 github.com/alicebob/gopher-json v0.0.0-20230218143504-906a9b012302 h1:uvdUDbHQHO85qeSydJtItA4T55Pw6BtAejd0APRJOCE=
-github.com/alicebob/gopher-json v0.0.0-20230218143504-906a9b012302/go.mod h1:SGnFV6hVsYE877CKEZ6tDNTjaSXYUk6QqoIK6PrAtcc=
 github.com/alicebob/miniredis/v2 v2.17.0/go.mod h1:gquAfGbzn92jvtrSC69+6zZnwSODVXVpYDRaGhWaL6I=
 github.com/alicebob/miniredis/v2 v2.22.0/go.mod h1:XNqvJdQJv5mSuVMc0ynneafpnL/zv52acZ6kqeS0t88=
 github.com/alicebob/miniredis/v2 v2.30.5/go.mod h1:b25qWj4fCEsBeAAR2mlb0ufImGC6uH3VlUfb/HS5zKg=
 github.com/alicebob/miniredis/v2 v2.32.1 h1:Bz7CciDnYSaa0mX5xODh6GUITRSx+cVhjNoOR4JssBo=
-github.com/alicebob/miniredis/v2 v2.32.1/go.mod h1:AqkLNAfUm0K07J28hnAyyQKf/x0YkCY/g5DCtuL01Mw=
 github.com/aliyun/aliyun-oss-go-sdk v2.1.6+incompatible/go.mod h1:T/Aws4fEfogEE9v+HPhhw+CntffsBHJ8nXQCwKr0/g8=
 github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
@@ -887,9 +885,7 @@ github.com/bos-hieu/mongostore v0.0.2/go.mod h1:8AbbVmDEb0yqJsBrWxZIAZOxIfv/tsP8
 github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b/go.mod h1:H0wQNHz2YrLsuXOZozoeDmnHXkNCRmMW0gwFWDfEZDA=
 github.com/bradleypeabody/gorilla-sessions-memcache v0.0.0-20181103040241-659414f458e1/go.mod h1:dkChI7Tbtx7H1Tj7TqGSZMOeGpMP5gLHtjroHd4agiI=
 github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs=
-github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c=
 github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA=
-github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0=
 github.com/bufbuild/protocompile v0.4.0/go.mod h1:3v93+mbWn/v3xzN+31nwkJfrEpAUwp+BagBSZWx+TP8=
 github.com/bufbuild/protocompile v0.6.0/go.mod h1:YNP35qEYoYGme7QMtz5SBCoN4kL4g12jTtjuzRNdjpE=
 github.com/cenkalti/backoff/v4 v4.2.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
@@ -1003,7 +999,6 @@ github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8
 github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g=
 github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k=
 github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE=
-github.com/frankban/quicktest v1.14.3/go.mod h1:mgiwOwqx65TmIk1wJ6Q7wvnVMocbUorkibMOrVTHZps=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU=
@@ -1090,7 +1085,6 @@ github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqw
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
 github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
-github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
 github.com/go-test/deep v1.0.7/go.mod h1:QV8Hv/iy04NyLBxAdO9njL0iVPN1S4d/A3NVv1V36o8=
 github.com/go-xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a/go.mod h1:56xuuqnHyryaerycW3BfssRdxQstACi0Epw/yC5E2xM=
 github.com/go-xorm/xorm v0.7.9/go.mod h1:XiVxrMMIhFkwSkh96BW7PACl7UhLtx2iJIHMdmjh5sQ=
@@ -1138,7 +1132,6 @@ github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0L
 github.com/golang/glog v1.1.0/go.mod h1:pfYeQZ3JWZoXTV5sFc986z3HTpwQs9At6P4ImfuP3NQ=
 github.com/golang/glog v1.1.2/go.mod h1:zR+okUeTbrL6EL3xHUDxZuEtGv04p5shwip1+mL/rLQ=
 github.com/golang/glog v1.2.0 h1:uCdmnmatrKCgMBlM4rMuJZWOkPDqdbZPnrMXDY4gI68=
-github.com/golang/glog v1.2.0/go.mod h1:6AhwSGph0fcJtXVM/PEHPqZlFeoLxhs7/t5UDAwmO+w=
 github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
@@ -1232,7 +1225,6 @@ github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLe
 github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20211214055906-6f57359322fd h1:1FjCyPC+syAzJ5/2S8fqdZK1R22vvA0J7JZKcuOIQ7Y=
-github.com/google/pprof v0.0.0-20211214055906-6f57359322fd/go.mod h1:KgnwoLYCZ8IQu3XUZ8Nc/bM9CCZFOyjUNOSygVozoDg=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/google/s2a-go v0.1.0/go.mod h1:OJpEgntRZo8ugHpF9hkoLJbS5dSI20XZeXJ9JVywLlM=
 github.com/google/s2a-go v0.1.3/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A=
@@ -1538,7 +1530,6 @@ github.com/onsi/ginkgo/v2 v2.4.0/go.mod h1:iHkDK1fKGcBoEHT5W7YBq4RFWaQulw+caOMkA
 github.com/onsi/ginkgo/v2 v2.5.0/go.mod h1:Luc4sArBICYCS8THh8v3i3i5CuSZO+RaQRaJoeNwomw=
 github.com/onsi/ginkgo/v2 v2.7.0/go.mod h1:yjiuMwPokqY1XauOgju45q3sJt6VzQ/Fict1LFVcsAo=
 github.com/onsi/ginkgo/v2 v2.13.0 h1:0jY9lJquiL8fcf3M4LAXN5aMlS/b2BV86HFFPCPMgE4=
-github.com/onsi/ginkgo/v2 v2.13.0/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o=
 github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
@@ -1556,7 +1547,6 @@ github.com/onsi/gomega v1.24.0/go.mod h1:Z/NWtiqwBrwUt4/2loMmHL63EDLnYHmVbuBpDr2
 github.com/onsi/gomega v1.24.1/go.mod h1:3AOiACssS3/MajrniINInwbfOOtfZvplPzuRSmvt1jM=
 github.com/onsi/gomega v1.26.0/go.mod h1:r+zV744Re+DiYCIPRlYOTxn0YkOLcAnW8k1xXdMPGhM=
 github.com/onsi/gomega v1.29.0 h1:KIA/t2t5UBzoirT4H9tsML45GEbo3ouUnBHsCfD2tVg=
-github.com/onsi/gomega v1.29.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ=
 github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc=
 github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw=
 github.com/openzipkin/zipkin-go v0.3.0/go.mod h1:4c3sLeE8xjNqehmF5RpAFLPLJxXscc0R4l6Zg0P1tTQ=
@@ -1652,7 +1642,6 @@ github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR
 github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
 github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
 github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
-github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
 github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
 github.com/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
 github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU=
@@ -1770,7 +1759,6 @@ github.com/yuin/gopher-lua v0.0.0-20200816102855-ee81675732da/go.mod h1:E1AXubJB
 github.com/yuin/gopher-lua v0.0.0-20210529063254-f4c35e4016d9/go.mod h1:E1AXubJBdNmFERAOucpDIxNzeGfLzg0mYh+UfMWdChA=
 github.com/yuin/gopher-lua v1.1.0/go.mod h1:GBR0iDaNXjAgGg9zfCvksxSRnQx76gclCIb7kdAd1Pw=
 github.com/yuin/gopher-lua v1.1.1 h1:kYKnWBjvbNP4XLT3+bPEwAXJx262OhaHDWDVOPjL46M=
-github.com/yuin/gopher-lua v1.1.1/go.mod h1:GBR0iDaNXjAgGg9zfCvksxSRnQx76gclCIb7kdAd1Pw=
 github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
 github.com/zeebo/assert v1.3.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0=
 github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA=
@@ -2404,7 +2392,6 @@ golang.org/x/tools v0.8.0/go.mod h1:JxBZ99ISMI5ViVkT1tr6tdNmXeTrcpVSD3vZ1RsRdN4=
 golang.org/x/tools v0.9.1/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
 golang.org/x/tools v0.10.0/go.mod h1:UJwyiVBsOA2uwvK/e5OY3GTpDUJriEd+/YlqAwLPmyM=
 golang.org/x/tools v0.16.1 h1:TLyB3WofjdOEepBHAU20JdNC1Zbg87elYofWYAY5oZA=
-golang.org/x/tools v0.16.1/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0=
 golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

src/jfw/modules/bigmember/src/service/analysis/forecastproject.go

@@ -177,10 +177,11 @@ func (this *Analysis) ForPContent() {
 		}
 		id = util.DecodeId(id)
 		data, ok := db.Mgo_Ent.FindById(C_FPContent, id, nil)
-		if ok && data != nil && (*data)["results"] != nil {
+		if ok && data != nil {
 			yucetime := (*data)["yucetime"]
 			(*data)["yucetime"] = FormatDateWithObj(&yucetime, "2006/01/02")
-			results := qutil.ObjArrToMapArr((*data)["results"].([]interface{}))
+			resultsTemp, _ := (*data)["results"].([]interface{})
+			results := qutil.ObjArrToMapArr(resultsTemp)
 			resultsArr := []map[string]interface{}{}
 			resultsMap := map[string]interface{}{}
 			if len(results) > 0 {

src/jfw/modules/publicapply/src/activityday/dao/raffle.go

@@ -290,7 +290,7 @@ func (r *RaffleInfo) ActiveInfo() (ai *Lai, err error) {
 
 // 奖品信息
 func (r *RaffleInfo) PrizeInfo() (pi *Lpi, err error) {
-	sql := fmt.Sprintf("SELECT lpi.id ,lpi.active_id ,lpi.jy_prize ,lpi.frequency ,lpi.probability ,lpi.inventory ,lpi.total ,lpi.alarm_switch ,lpi.alarm_threshold ,lpi.target ,lpi.daily_num ,pbi.name ,pbi.attribute ,pbi.draw_pic ,pbi.win_pic ,pbi.notes ,pbi.url ,pbi.label  FROM %s lpi LEFT JOIN %s pbi ON lpi.pb_id = pbi.id  WHERE lpi.active_id = ? AND state = 0", consts.TablePrizeInfo, consts.TablePrizeBaseInfo)
+	sql := fmt.Sprintf("SELECT lpi.id ,lpi.active_id ,lpi.mold,lpi.jy_prize ,lpi.frequency ,lpi.probability ,lpi.inventory ,lpi.total ,lpi.alarm_switch ,lpi.alarm_threshold ,lpi.target ,lpi.daily_num ,pbi.name ,pbi.attribute ,pbi.draw_pic ,pbi.win_pic ,pbi.notes ,pbi.url ,pbi.label  FROM %s lpi LEFT JOIN %s pbi ON lpi.pb_id = pbi.id  WHERE lpi.active_id = ? AND state = 0", consts.TablePrizeInfo, consts.TablePrizeBaseInfo)
 	data := db.BaseMysql.SelectBySql(sql, r.ActiveId)
 	if data != nil && len(*data) > 0 {
 		var (

src/jfw/modules/publicapply/src/detail/config/config.go

@@ -31,4 +31,5 @@ func init() {
 			}
 		}
 	}
+
 }

src/jfw/modules/publicapply/src/detail/dao/bidding.go

@@ -734,3 +734,16 @@ func DescriptionHandle(stype string, obj map[string]interface{}) string {
 	}
 	return description
 }
+
+// IsSubscribe 获取用户是否关注
+func IsSubscribe(mgoId string) bool {
+	user, ok := db.Mgo.FindById("user", mgoId, `{"i_ispush":1}`)
+	if ok && user != nil {
+		if common.IntAll((*user)["i_ispush"]) == 0 {
+			return false
+		} else {
+			return true
+		}
+	}
+	return false
+}

src/jfw/modules/publicapply/src/detail/image.yaml

@@ -0,0 +1,3 @@
+homeShareImg: https://www.qmx.top/upload/2025/01/09/202501091441150013Z21b9dr.png  #首页分享卡片-品宣图
+subImg:  https://www.qmx.top/upload/2025/01/09/202501091440220010477v609.png # 首页-关注按钮图片地址
+stepImg: https://www.qmx.top/upload/2025/01/09/2025010914343000110LM83R3.png # 首页-关注微信公众号步骤图地址

src/jfw/modules/publicapply/src/detail/service/action.go

@@ -3,10 +3,11 @@ package service
 import "app.yhyue.com/moapp/jybase/go-xweb/xweb"
 
 type Detail struct {
-    *xweb.Action
-    preAgent     xweb.Mapper `xweb:"/detail/preAgent"`     //数据处理 前置代理接口返回 有效token ；get 请求
-    baseInfo     xweb.Mapper `xweb:"/detail/baseInfo"`     //招标数据基本信息接口（公告信息、摘要、正文、原文、附件信息、打赏文案）
-    minBaseInfo  xweb.Mapper `xweb:"/detail/minBaseInfo"`  //招标数据基本信息接口
-    advancedInfo xweb.Mapper `xweb:"/detail/advancedInfo"` //招标数据进阶信息（招标/采购进度、投标服务、商机推荐、客户推荐）
-    shareInfo    xweb.Mapper `xweb:"/detail/shareInfo"`    //分享所需要的信息
+	*xweb.Action
+	preAgent       xweb.Mapper `xweb:"/detail/preAgent"`       //数据处理 前置代理接口返回 有效token ；get 请求
+	baseInfo       xweb.Mapper `xweb:"/detail/baseInfo"`       //招标数据基本信息接口（公告信息、摘要、正文、原文、附件信息、打赏文案）
+	minBaseInfo    xweb.Mapper `xweb:"/detail/minBaseInfo"`    //招标数据基本信息接口
+	advancedInfo   xweb.Mapper `xweb:"/detail/advancedInfo"`   //招标数据进阶信息（招标/采购进度、投标服务、商机推荐、客户推荐）
+	shareInfo      xweb.Mapper `xweb:"/detail/shareInfo"`      //分享所需要的信息
+	checkSubscribe xweb.Mapper `xweb:"/detail/checkSubscribe"` //验证用户是否分享
 }

src/jfw/modules/publicapply/src/detail/service/service.go

@@ -5,6 +5,8 @@ import (
 	"app.yhyue.com/moapp/jybase/common"
 	"app.yhyue.com/moapp/jybase/encrypt"
 	"encoding/json"
+	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/os/gctx"
 	"jy/src/jfw/modules/publicapply/src/detail/config"
 	"jy/src/jfw/modules/publicapply/src/detail/dao"
 	"jy/src/jfw/modules/publicapply/src/detail/util"
@@ -131,11 +133,13 @@ func (d *Detail) ShareInfo() {
 		if ub.Nickname == "" {
 			ub.Nickname = string(ub.Phone[0:3]) + "****" + string(ub.Phone[len(ub.Phone)-4:])
 		}
+		shareImg := g.Cfg("./detail/image.yaml").MustGet(gctx.New(), "homeShareImg") 
 		shareInfo := map[string]interface{}{
 			"nickname": ub.Nickname,
 			"userId":   encrypt.SE.Encode2Hex(ub.UserId), //加密用户userid
 			"openId":   encrypt.SE.Encode2Hex(ub.OpenId),
 			"avatar":   ub.Avatar,
+			"shareImg": shareImg,
 		}
 		return Result{Data: shareInfo}
 	}()
@@ -187,3 +191,27 @@ func (d *Detail) MinBaseInfo() {
 	}()
 	d.ServeJson(r)
 }
+
+// CheckSubscribe 判断用户是否关注微信公众号
+func (d *Detail) CheckSubscribe() {
+	imgCfg := g.Cfg("./detail/image.yaml")
+
+	data := &map[string]interface{}{
+		"sub_img":      imgCfg.MustGet(gctx.New(), "subImg"),
+		"step_img":     imgCfg.MustGet(gctx.New(), "stepImg"),
+		"is_subscribe": false,
+	}
+	result := Result{Data: data}
+	if d.Session() == nil {
+		d.ServeJson(result)
+		return
+	}
+	ub := util.GetUserBaseInfo(d.Session())
+	if ub.UserId == "" || ub.MgoUserId == "" {
+		d.ServeJson(result)
+		return
+	}
+	(*data)["is_subscribe"] = dao.IsSubscribe(ub.MgoUserId)
+	d.ServeJson(result)
+	return
+}

src/jfw/modules/publicapply/src/enterpriseSearch/service/search.go

@@ -52,7 +52,7 @@ func (esa *EnterpriseSearchAction) DoEntSearch() {
 			entSearch.IsVip = true
 		}
 		//免费用户 无搜索权益
-		if vipData.Data != nil && vipData.Data.Free != nil && vipData.Data.Free.IsFree {
+		if (vipData.Data != nil && vipData.Data.Free != nil && vipData.Data.Free.IsFree) || entSearch.ZhiMa == "{}" {
 			entSearch.ZhiMa = ""
 		}
 		// 存搜索记录

src/jfw/modules/publicapply/src/filter/sessionfilter.go

@@ -27,6 +27,7 @@ var regOriginalText = regexp.MustCompile("^/publicapply/userbase/getOriginalText
 var regActivityDayInfo = regexp.MustCompile("^/publicapply/activity/day/info$")              // p477天天抢会员活动活动信息接口未登录也可以访问
 var regDeatil = regexp.MustCompile("^/publicapply/detail/(preAgent|baseInfo|advancedInfo)$") // p406 详情页改版 部分类型未登录也可以查看 所以在接口里面在处理
 var regMinDeatil = regexp.MustCompile("^/publicapply/detail/minBaseInfo$")                   // p406 详情页改版 部分类型未登录也可以查看 所以在接口里面在处理
+var regCheckSub = regexp.MustCompile("^/publicapply/detail/checkSubscribe$")                 // p532 判断用户是否关注公众号
 func (l *sessionfilter) Do(w http.ResponseWriter, req *http.Request) bool {
 	session := l.App.SessionManager.Session(req, w)
 	getSession := session.GetMultiple()
@@ -57,6 +58,9 @@ func (l *sessionfilter) Do(w http.ResponseWriter, req *http.Request) bool {
 	if regMinDeatil.MatchString(req.URL.Path) {
 		return true
 	}
+	if regCheckSub.MatchString(req.URL.Path) {
+		return true
+	}
 	userId, ok := getSession["userId"].(string)
 	if !ok || userId == "" {
 		R.ServeJson(w, req, &Result{Error_code_1004, Error_msg_1004, nil})

src/jfw/modules/publicapply/src/test/http-client.env.json

@@ -1,7 +1,7 @@
 {
   "dev": {
     "addr": "http://127.0.0.1:828",
-    "session": "4a60ae53625b98cf77942f9f2fb220e5e3bfcccb",
+    "session": "5696788f98bb1cc7e24b9d2e6c4ba58c0ee38ddd",
     "referer": "http://127.0.0.1:828/article/content/ABCY1xFfykFFjg7Amhhc3ISCzAoIyFmYXh1KT8vIy43a3xzei9UCc0%3D.html"
   },
   "dev_mailprivate": {

src/jfw/modules/publicapply/src/test/p532.http

@@ -0,0 +1,11 @@
+GET {{addr}}/publicapply/detail/checkSubscribe
+Accept: application/json
+Cookie: SESSIONID={{session}};
+###
+
+
+### 分享所需要的信息
+POST {{addr}}/publicapply/detail/shareInfo
+Content-Type: application/json
+Cookie: SESSIONID={{session}};
+

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

@@ -60,6 +60,7 @@ func (a *AiForecastPack) CreateOrder() {
 		if entId > 0 {
 			buy_subject = 2
 		}
+		_, way := util.GetJyOrderChannel("", a.UserAgent())
 		order_id := util.Mysql.Insert("dataexport_order", map[string]interface{}{
 			"order_money":    order_money,
 			"order_status":   0,
@@ -74,6 +75,7 @@ func (a *AiForecastPack) CreateOrder() {
 			"audit_status":   3, //默认审核通过
 			"buy_subject":    buy_subject,
 			"ent_id":         entId,
+			"order_channel":  way,
 		})
 		log.Println("AI预测包购买订单", userId, order_id, code)
 		if order_id > 0 {

src/jfw/modules/subscribepay/src/util/order_channel.go

@@ -9,7 +9,7 @@ var mobileReg = regexp.MustCompile("(?i)(Android|Mobile|Phone)")
 
 // GetJyOrderChannel 获取订单销售渠道、下单渠道
 // channel 线上直销-剑鱼平台[x010]、代销-剑鱼伙伴[x032]
-// way 下单渠道 剑鱼PC[xdqd01]、剑鱼微信[xdqd02]、剑鱼APP[xdqd03]、启明星后台销售创建[xdqd04]
+// way 下单渠道 剑鱼PC[xdqd01]、剑鱼微信[xdqd02]、剑鱼APP[xdqd03]、启明星后台销售创建[xdqd04]、剑鱼招标网小程序[xdqd07]
 func GetJyOrderChannel(disWord, userAgent string) (channel, way string) {
 	channel = "x010"
 	if disWord != "" {
@@ -17,7 +17,9 @@ func GetJyOrderChannel(disWord, userAgent string) (channel, way string) {
 	}
 	if userAgent != "" {
 		if mobileReg.MatchString(userAgent) {
-			if strings.Index(strings.ToLower(userAgent), "micromessenger") > -1 {
+			if strings.Index(strings.ToLower(userAgent), "miniprogram") > -1 {
+				way = "xdqd07"
+			} else if strings.Index(strings.ToLower(userAgent), "micromessenger") > -1 {
 				way = "xdqd02"
 			} else {
 				way = "xdqd03"

src/web/staticres/common-module/big-member/js/page_client_follow_detail.js

@@ -1155,6 +1155,10 @@ var vNode = {
             if (!this.isPayedUser) {
                 return this.openVip()
             }
+            if (utils.$envs.inWxMini) {
+                return utils.toDownloadApp()
+            }
+
             if (this.isRequestIng) {
                 return
             }

src/web/staticres/common-module/file-pack/js/index.js

@@ -314,7 +314,7 @@ var vm = new Vue({
     getDatas () {
       return {
         queryTime: new Date(this.years, this.months-1, 1).pattern('yyyy-MM'),
-        platform: navigator.userAgent.toLowerCase().indexOf('micromessenger') !== -1 ? 'WX' : 'APP',
+        platform: __pageData.platform.toUpperCase(),
         productName: '附件下载包',
         pageSize: this.listInfo.pageSize,
         pageNum: this.listInfo.pageNum
@@ -333,6 +333,9 @@ var vm = new Vue({
     },
     downFile (item) {
       //location.href = item.s_downUrl
+      if (utils.$envs.inWxMini) {
+        return utils.toDownloadApp()
+      }
 		   $.ajax({
 		       type: 'post',
 		       url: '/jypay/resourcePack/consumePack',

src/web/staticres/common-module/mobile-portrayal-footer/js/mobile-portrayal-footer.js

@@ -130,6 +130,9 @@ var mobilePortrayalFooter = {
  },
   methods: {
     downLoad(){
+      // if (utils.$envs.inWxMini) {
+      //   return utils.toDownloadApp()
+      // }
       this.$parent.$refs.downloadpopup.show() //触发引用此组件父级组件的下载弹框
     },
     monitorClick: utils.debounce(function(){

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

@@ -74,6 +74,9 @@ var vm = new Vue({
       }
     },
     downloaded(url, type) {
+      if (utils.$envs.inWxMini) {
+        return utils.toDownloadApp()
+      }
       this.downUrl = url
       if (type == 'app') {
         var isIos = !!navigator.userAgent.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/);

src/web/staticres/common-module/public/head.js

@@ -28,6 +28,8 @@
 })();
 
 ;(function () {
+
+
   function loadJS (url, success) {
     var scripts = document.getElementsByTagName('script')
     for (var i = 0; i < scripts.length; i++) {
@@ -50,6 +52,38 @@
     document.getElementsByTagName('head')[0].appendChild(domScript);
   }
 
+  function initMiniAppInfo () {
+    function setMiniAppInfo () {
+      try {
+        var title = document.title
+        var meta = document.querySelector('meta[name="mini-app-data"]');
+        if (meta) {
+          title = meta.getAttribute('content');
+        }
+        wx.miniProgram.postMessage({ data: {
+            post: 'share',
+            type: 'common',
+            desc: '默认标题',
+            title: title
+          }})
+      } catch (e) {
+        console.log(e)
+      }
+    }
+
+    loadJS('https://res2.wx.qq.com/open/js/jweixin-1.6.0.js', function () {
+      setMiniAppInfo()
+      try {
+        miniAppInitLoaded && miniAppInitLoaded()
+      } catch (error) {}
+    })
+  }
+
+  var inWxMini = navigator.userAgent.toLowerCase().indexOf('miniprogram') !== -1
+  if (inWxMini) {
+    initMiniAppInfo()
+  }
+
   try {
     // 初始化JTrack
     var sdkVersion = 142

src/web/staticres/common-module/public/js/utils.js

@@ -141,6 +141,8 @@ if (!window.utilsEnv) {
     },
     getPlatformEnvs: function () {
       var inWX = navigator.userAgent.toLowerCase().indexOf('micromessenger') !== -1
+      var inWeiXinMiniApp = navigator.userAgent.toLowerCase().indexOf('miniprogram') !== -1
+
       var inApp = this.getIsInTheAppContainer()
       var platformOS = this.androidOrIOS()
       var getPlatform = function () {
@@ -160,6 +162,7 @@ if (!window.utilsEnv) {
         platformOS: platformOS,
         platform: platform,
         inApp: inApp,
+        inWxMini: inWeiXinMiniApp, // 微信小程序
         inWX: inWX
       }
     }
@@ -181,6 +184,7 @@ var utils = {
     inApp: window.utilsEnv.platformEnvs.inApp, // 是否在app中
     inAndroid: window.utilsEnv.platformEnvs.platformOS === 'android', // 是否在android中
     inIOS: window.utilsEnv.platformEnvs.platformOS === 'ios', // 是否在android中
+    inWxMini: window.utilsEnv.platformEnvs.inWxMini, // 是否在微信小程序中
   },
   isWeiXinBrowser: navigator.userAgent.toLowerCase().indexOf('micromessenger') !== -1,
   isH5: window.location.href.toLowerCase().indexOf('h5') !== -1,
@@ -805,6 +809,17 @@ var utils = {
   toWxGzhProfile: function () {
     window.location.href = 'https://mp.weixin.qq.com/mp/profile_ext?action=home&__biz=Mzk0MjIyMzY2Nw==&scene=110#wechat_redirect'
   },
+  // 去下载app页面
+  toDownloadApp: function() {
+    try {
+      wx.miniProgram.navigateTo({
+        url: '/pages/guide/download',
+      })
+    } catch (error) {
+      console.error(error)
+      location.href = 'https://h5.jianyu360.cn/front/downloadapppage/normal'
+    }
+  },
   moneyUnit: function (num, type, lv) {
     if (num === '' || num == null || num == undefined || isNaN(num)) return ''
     var levelArr = ['元', '万元', '亿元', '万亿元']

src/web/staticres/common-module/report-analysis/js/components/downloadpopup.js

@@ -114,6 +114,9 @@ var downloadpopup = {
 
     },
     sampleReport(){ // 下载样例
+      if (utils.$envs.inWxMini) {
+        return utils.toDownloadApp()
+      }
       let url =`${location.origin}/common-module/pdf/【剑鱼标讯】市场分析定制报告样例.pdf`
       const { platform, platformOS } = utils.$env
       if (platform === 'app' && platformOS === 'ios') {

src/web/staticres/common-module/share/js/invite-friends.js

@@ -177,6 +177,9 @@ var shareContent = new Vue({
                 scale: 3,
                 imageTimeout: 30000,
             }).then(function(canvas) {
+                if (utils.$envs.inWxMini) {
+                  return utils.toDownloadApp()
+                }
                 var imgUrl = canvas.toDataURL('image/png');
                 if (goTemplateData.platform === 'app') {
                   _this.doAppSaveImg(imgUrl)
@@ -248,6 +251,9 @@ var shareContent = new Vue({
           }
         },
         doShare: function (item) {
+            if (utils.$envs.inWxMini) {
+                return utils.toDownloadApp()
+            }
             this.doAppShare(item.id)
         },
         swiperChange: function (index) {

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

@@ -429,6 +429,11 @@
   {{include "/big-member/commonjs.html"}}
   <script src='{{Msg "seo" "cdn"}}/common-module/public/js/utils.js'></script>
   <script src='{{Msg "seo" "cdn"}}/common-module/public/js/china-map-data.js?v={{Msg "seo" "version"}}'></script>
+  <script>
+    var __pageData = {
+        platform: 'wx'
+    }
+  </script>
   <script src='{{Msg "seo" "cdn"}}/common-module/file-pack/js/index-wx.js?v={{Msg "seo" "version"}}'></script>
   {{include "/common/baiducc.html"}}
 </body>