feat:app端未登录调整

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

@@ -282,14 +282,26 @@ func (s *Short) Article(stype, id string) error {
 // 未登录用户进行数据过滤
 func Filter(obj map[string]interface{}) map[string]interface{} {
 	detail := fmt.Sprint(obj["detail"])
-	mosaicText := fmt.Sprintf(`<span class="noLoginMosaic">%s</span>`, util.ObjToString(config.Sysconfig["detailMosaic"]))
+	//mosaicText := fmt.Sprintf(`<span class="noLoginMosaic">%s</span>`, util.ObjToString(config.Sysconfig["detailMosaic"]))
+	mosaicText := fmt.Sprintf(`<span onclick="appAutoLogin()" style="cursor:pointer;color: #1D1D1D;">%s</span>`, util.ObjToString(config.Sysconfig["detailMosaic"]))
+	detailText := fmt.Sprintf(`<span class="noLoginMosaic" style="color: #2ABED1;">%s</span>`, util.ObjToString(config.Sysconfig["detailMosaic"]))
 	for k, _ := range obj {
 		detailNeedMosaic, _ := config.Sysconfig["detailNeedMosaic"].(map[string]interface{})
 		if ok, _ := detailNeedMosaic[k].(bool); ok {
 			if util.ObjToString(obj[k]) != "" {
-				detail = strings.ReplaceAll(detail, util.ObjToString(obj[k]), mosaicText)
+				detail = strings.ReplaceAll(detail, util.ObjToString(obj[k]), detailText)
+			}
+			//中标企业信息
+			if k == "winnerMap" && obj[k] != nil {
+				winnerNewMap := map[string]interface{}{}
+				winnerMap := util.ObjToMap(obj[k])
+				for _, wv := range *winnerMap {
+					winnerNewMap[mosaicText] = wv
+				}
+				obj[k] = winnerNewMap
+			} else {
+				obj[k] = mosaicText
 			}
-			obj[k] = mosaicText
 		}
 	}
 	obj["detail"] = detail

src/jfw/modules/app/src/config.json

@@ -225,7 +225,11 @@
     "agencyperson":true,
     "agencytel":true,
     "budget":true,
-    "bidamount":true
+    "bidamount":true,
+    "buyer": true,
+    "winner": true,
+    "s_winner": true,
+    "winnerMap": true
   },
   "keepShowRedSpot": true,
   "detail_element": [

src/jfw/modules/app/src/config.yaml

@@ -1,6 +1,6 @@
 etcd:
   hosts:
-  - 127.0.0.1:2379
+  - 192.168.3.149:2379
 userCenterKey: "usercenter.rpc" #用户中台rpc
 powerCheckCenterKey: "powercheck.rpc" #权益校验中台
-entManageApplication: "entmanageapplication.rpc" #企业管理中台
+entManageApplication: "entmanageapplication.rpc" #企业管理中台

src/jfw/modules/app/src/db.json

@@ -20,7 +20,7 @@
 			"password": "jy@DevGroup"
 		},
 		"bidding": {
-			"address": "192.168.3.206:27001,192.168.3.206:27002",
+			"address": "192.168.3.206:27002",
 	 		"size": 5,
 	 		"dbName": "qfw_data",
 			"collection": "bidding",

src/jfw/modules/app/src/web/templates/weixin/wxinfocontent.html

@@ -1414,7 +1414,11 @@
             }
         }
     }
-
+    function appAutoLogin(){
+      // 去登录
+        const url = `/jyapp/article/content/${id}.html`
+        autoLogin(url)
+    }
     // 去登录
     $('.option-login').on('click', function() {
       const url = `/jyapp/article/content/${id}.html`
@@ -2417,7 +2421,7 @@
           rerprojectname=""
       }
       outhtml +='<li><p class="name">项目名称</p><p class="textcontent">'+rerprojectname+'</p></li>'
-      var rerbuyer = {{.T.obj.buyer}} ? {{.T.obj.buyer}} : {{.T.obj.owner}};
+      var rerbuyer = {{.T.obj.buyer}} ? {{Html .T.obj.buyer}} : {{.T.obj.owner}};
       var rerbuyer_show = ""
       if(rerbuyer==undefined||rerbuyer==null){
           rerbuyer=""