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

src/jfw/modules/app/src/web/staticres/jyapp/big-member/css/analysis_result.css

@@ -357,15 +357,16 @@
 #analysis-result .company-info{
     display: flex;
     align-items: center;
-    padding: 5px 8px 8px;
+    justify-content: space-between;
+    padding: 5px 6px 8px;
     color: #5F5E64;
     font-size: .2rem;
     line-height: .36rem;
 }
 #analysis-result .company-info span{
-    flex: 1;
+    /* flex: 1; */
     white-space: nowrap;
-    margin-right: .24rem;
+    /* margin-right: .14rem; */
 }
 #analysis-result .same-history,.other-history{
     margin-top: .16rem;

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

@@ -188,8 +188,9 @@ var vNode = {
         // 根据城市的选择情况判断省份的选择情况
         changeCityState(province, city) {
             if (city === '#') {
+                this.setCitySelected()
                 this.onChange()
-                return this.setCitySelected()
+                return
             }
             // 全国置为空
             this.provinceListMap['#'][0].selectedState = ''

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

@@ -133,17 +133,17 @@
                                                 <span v-else class="index">${i + 1}</span>
                                                 <span class="title" @click="goEntImg(hs.entId)">${hs.key}</span>
                                             </div>
-                                            <div class="win-capital">注册资本：${formatterMoney(hs.capital)}</div>
+                                            <div class="win-capital">注册资本:${formatterMoney(hs.capital)}</div>
                                             <div class="win-info" @click="goDetail(hs.key)">
                                               <div class="w-title">
                                                 <span class="w-title-label">类似项目明细</span>
                                                 <van-icon class="win-arrow" name="arrow"></van-icon>
                                               </div>
                                               <div class="company-info">
-                                                <span>项目数量：${hs.doc_count}个</span>
-                                                <span>项目金额：${formatterMoney(hs.total_project)}</span>
+                                                <span>项目数量:${hs.doc_count}个</span>
+                                                <span>项目金额:${formatterMoney(hs.total_project)}</span>
                                                 <!-- <span>注册资本：${formatterMoney(hs.capital)}</span> -->
-                                                <span class="ellipsis">最近中标：${formatterTime(hs.max_jytime)}</span>
+                                                <span>最近中标:${formatterTime(hs.max_jytime)}</span>
                                               </div>
                                             </div>
                                             

src/jfw/modules/weixin/src/config.json

@@ -16,11 +16,11 @@
     "weixinrpcport": "8083",
     "webrpcport": "127.0.0.1:8084",
     "jyop_webrpcport": "127.0.0.1:8012",
-    "webdomain": "https://web-ws.jydev.jianyu360.com",
-    "appid":"wx5b1c6e7cc4dac0e4",
-    "appsecret":"b026103ffebd2291b3edb7a269612112",
+    "webdomain": "https://web-zxl.jydev.jianyu360.com",
+    "appid":"wxdedd73f450993685",
+    "appsecret":"d55898fde0b7887e5fe4660bd2494700",
     "apptoken": "top2022top2022",
-    "proxysess": "https://web-ws.jydev.jianyu360.com/front/sess/%s",
+    "proxysess": "https://web-zxl.jydev.jianyu360.com/front/sess/%s",
     "followCompany": 10,
     "welcomemsg": "用剑鱼标讯，所有功能完全免费，\n和传统的会员制说再见！\n\n<a href='%s'>点击这里</a>设置关键词，或直接回复“订阅 关键词”，如“订阅 教学设备”，您将随时随地接收招标信息！\n\n剑鱼标讯，让投标无限可能！",
     "tpl_subscribe_push_id": "IY_RWWzMlwDK6hcd6RAzTec6qre8n5r8PNOOUM_hgk0",
@@ -140,5 +140,8 @@
         "EntUrl": ["企业全景分析","多维度帮你分析竞争对手","/big-member/image/wxreply/entportrait.png","https://mp.weixin.qq.com/s/0HguU-yu8eTf96Y8mNsD3A?wxreply=%s"],
         "BuyerUrl": ["采购单位全景分析","快速、全面地了解采购单位","/big-member/image/wxreply/buyportrait.png","https://mp.weixin.qq.com/s/gXpB25K6I8401115pBGV1g?wxreply=%s"],
         "ReportUrl": ["市场分析周报/月报","分析市场规模、增长趋势，评估市场体量","/big-member/image/wxreply/reportmm.png","https://mp.weixin.qq.com/s/rlJenKOvmHvqd9_4811otg?wxreply=%s"]
+    },
+    "pcQrCode":{
+    		"10":true,"11":true,"12":true,"13":true,"14":true,"17":true,"18":true,"19":true
     }
 }

src/jfw/modules/weixin/src/wx/wx.go

@@ -527,6 +527,13 @@ func saveUser(u *UserInfo, source, pre, RSource, CSource string) (bool, string,
 				redis.Del("other", fromkey)
 			}
 		}
+		if pcQrCode := *util.ObjToMap(config.Sysconfig["pcQrCode"]); len(pcQrCode) > 0 {
+			if bl, ok := pcQrCode[pre].(bool); bl && ok {
+				newUser["s_platform"] = "pc"
+			} else {
+				newUser["s_platform"] = "wx"
+			}
+		}
 		_id := tools.MQFW.Save("user", newUser)
 		if fromid != "" && fromid != _id {
 			//被邀请新用户

src/web/staticres/big-member/js/set_area.js

@@ -188,8 +188,9 @@ var vNode = {
         // 根据城市的选择情况判断省份的选择情况
         changeCityState(province, city) {
             if (city === '#') {
+                this.setCitySelected()
                 this.onChange()
-                return this.setCitySelected()
+                return
             }
             // 全国置为空
             this.provinceListMap['#'][0].selectedState = ''

src/web/staticres/common-module/vipsubscribe/js/vip-subscribe-set-template.js

@@ -820,7 +820,7 @@ var subComponent = {
 
               let areaArr = []
               if (res.data) {
-                if (!res.data.area || res.data.provincenum === 0) {
+                if (!res.data.area) {
                   _this.noAreaFreeType = true
                 } else {
                   for (const key in res.data.area) {