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

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

@@ -786,9 +786,11 @@ func Subscribe(w ResponseWriter, r *Request) {
 				w.ReplyText(fmt.Sprintf(exists, strings.ReplaceAll(subkey, "++", " "), fastSubscribeText["skill"].(string)))
 			} else if pcresult == "vipsubscribe##reply" { //关注
 				vipsubReply := config.Sysconfig["vipSubscribeReply"].(map[string]interface{})
-				time.AfterFunc(time.Second/2, func() {
-					w.PostText(fmt.Sprintf(fmt.Sprint(vipsubReply["content"]), config.Sysconfig["webdomain"].(string)+vipsubReply["href"].(string)))
-				})
+				if switchBl, ok := vipsubReply["switch"].(bool); switchBl && ok {
+					time.AfterFunc(time.Second/2, func() {
+						w.PostText(fmt.Sprintf(fmt.Sprint(vipsubReply["content"]), config.Sysconfig["webdomain"].(string)+vipsubReply["href"].(string)))
+					})
+				}
 				isAutoRepl = true
 			} else {
 				if subkey != "" {
@@ -1207,9 +1209,11 @@ func ScanHandler(w ResponseWriter, r *Request) {
 					w.ReplyText(fmt.Sprintf(config.Sysconfig["welcomemsg"].(string), url))
 					if pcresult == "vipsubscribe##reply" { //新用户扫码
 						vipsubReply := config.Sysconfig["vipSubscribeReply"].(map[string]interface{})
-						time.AfterFunc(time.Second/2, func() {
-							w.PostText(fmt.Sprintf(fmt.Sprint(vipsubReply["content"]), config.Sysconfig["webdomain"].(string)+vipsubReply["href"].(string)))
-						})
+						if switchBl, ok := vipsubReply["switch"].(bool); switchBl && ok {
+							time.AfterFunc(time.Second/2, func() {
+								w.PostText(fmt.Sprintf(fmt.Sprint(vipsubReply["content"]), config.Sysconfig["webdomain"].(string)+vipsubReply["href"].(string)))
+							})
+						}
 					}
 				}
 			}
@@ -1292,7 +1296,9 @@ func ScanHandler(w ResponseWriter, r *Request) {
 					w.ReplyText(fmt.Sprintf(fmt.Sprint(pchints["key_fail"]), strings.ReplaceAll(subkey, "++", " "), url))
 				} else if pcresult == "vipsubscribe##reply" { //老用户扫码
 					vipsubReply := config.Sysconfig["vipSubscribeReply"].(map[string]interface{})
-					w.ReplyText(fmt.Sprintf(fmt.Sprint(vipsubReply["content"]), config.Sysconfig["webdomain"].(string)+vipsubReply["href"].(string)))
+					if switchBl, ok := vipsubReply["switch"].(bool); switchBl && ok {
+						w.ReplyText(fmt.Sprintf(fmt.Sprint(vipsubReply["content"]), config.Sysconfig["webdomain"].(string)+vipsubReply["href"].(string)))
+					}
 				}
 			} else if pccodepre == "18" { //关注企业
 				company := redis.GetStr("sso", "pc_subscribe_"+r.EventKey) //企业名称

src/jfw/modules/wxtoken/src/config.json

@@ -1,8 +1,8 @@
 {
 	"wxs":[
 		{
-			"appid":"wx5b1c6e7cc4dac0e4",
-			"appsecret":"b026103ffebd2291b3edb7a269612112"
+			"appid":"wxdedd73f450993685",
+			"appsecret":"d55898fde0b7887e5fe4660bd2494700"
 		}
 	],
 	"redis":"wxtoken=192.168.3.206:1712"

src/web/staticres/css/subscribe_new.css

@@ -502,7 +502,7 @@
     position: absolute;
     width: 170px;
     height: 197px;
-    left: 30%;
+    left: 27.5%;
     bottom: 10%;
 }
 
@@ -510,11 +510,22 @@
     width: 180px;
     height: 21px;
     font-size: 16px;
-    font-family: MicrosoftYaHei;
     line-height: 24px;
-    color: rgba(59, 33, 5, 1);
     opacity: 1;
-    margin: 20px 0 0 -15px;
+    margin: 20px 0 0 2px;
+    font-family: Microsoft YaHei;
+    color: #714402;
+}
+
+.modal-content .vip-code .vip-text2 {
+    width: 180px;
+    height: 21px;
+    font-size: 16px;
+    line-height: 24px;
+    opacity: 1;
+    margin: 0 0 0 24px;
+    font-family: Microsoft YaHei;
+    color: #714402;
 }
 
 .modal-open {

src/web/templates/pc/subscribe_new.html

@@ -258,8 +258,9 @@
             <img src="{{Msg "seo" "cdn"}}/images/subscribe/vip_toUse.png?v={{Msg "seo" "version"}}" alt="" style="width: 335px;height: 447px">
             <button type="button" class="close vip" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
             <div class="vip-code">
-                <img id="vipCode" alt="" style="width: 139px;height: 139px">
-                <p class="vip-text">扫描二维码购买超级订阅</p>
+                <img id="vipCode" alt="" style="width: 149px;height: 149px">
+                <p class="vip-text">微信扫码关注公众号</p>
+                <p class="vip-text2">使用超级订阅</p>
             </div>
         </div>
     </div>