Merge branch 'dev2.5.8.2' into release

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

@@ -142,10 +142,10 @@ body{
 		</div>
 	</div>
 </div>
-<script type="text/javascript">
+<!--<script type="text/javascript">
 var ucbs_source="app",ucbsId="{{.T.obj.ucbsId}}",title="{{.T.obj.title}}",projectname="{{.T.obj.projectname}}";
 </script>
-<script type="text/javascript" src="/jyapp/js/ucbs.js?v={{Msg "seo" "version"}}"></script>
+<script type="text/javascript" src="/jyapp/js/ucbs.js?v={{Msg "seo" "version"}}"></script>-->
 <script>
 //头部分享
 $("body").click(function(e){

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

@@ -767,10 +767,10 @@ pre {
 	<img class="upclose" src="/jyapp/images/wx/upclose.png"/>
 	</div>
 </div>
-<script type="text/javascript">
+<!--<script type="text/javascript">
 var ucbs_source="app",ucbsId="{{.T.obj.ucbsId}}",title="{{.T.obj.title}}",projectname="{{.T.obj.projectname}}";
 </script>
-<script type="text/javascript" src="/jyapp/js/ucbs.js?v={{Msg "seo" "version"}}"></script>
+<script type="text/javascript" src="/jyapp/js/ucbs.js?v={{Msg "seo" "version"}}"></script>-->
 <script>
 //头部分享
 $("body").click(function(e){

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

@@ -362,6 +362,7 @@ func saveUser(u *UserInfo, source, pre, RSource string) (bool, string, string) {
 		newUser["s_country"] = u.Country
 		newUser["s_province"] = u.Province
 		newUser["s_city"] = u.City
+		newUser["i_applystatus"] = 1
 		if isJyopUser {
 			newUser["s_registersource"] = "openplatform"
 		}

src/web/templates/pc/biddetail.html

@@ -502,10 +502,10 @@ function isWechat() {
 		<img src="/front/pay/qr/{{.T.obj._id}}" class="qrcode">
 	</div>
 </div>
-<script type="text/javascript">
+<!--<script type="text/javascript">
 var ucbs_source="pc",ucbsId="{{.T.obj.ucbsId}}";
 </script>
-<script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/ucbs.js?v={{Msg "seo" "version"}}"></script>
+<script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/ucbs.js?v={{Msg "seo" "version"}}"></script>-->
 <script type="text/javascript">
 var hstShowFlag = false;
 var entProListShowFlag = false;

src/web/templates/pc/biddetail_rec.html

@@ -603,10 +603,10 @@ function isWechat() {
 		<img src="/front/pay/qr/{{.T.obj._id}}" class="qrcode">
 	</div>
 </div>
-<script type="text/javascript">
+<!--<script type="text/javascript">
 var ucbs_source="pc_rec",ucbsId="{{.T.obj.ucbsId}}";
 </script>
-<script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/ucbs.js?v={{Msg "seo" "version"}}"></script>
+<script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/ucbs.js?v={{Msg "seo" "version"}}"></script>-->
 <script src="{{Msg "seo" "cdn"}}/js/zxx.drag.1.0-min.js"></script>
 <script type="text/javascript">
 var oBox = document.getElementById("popup");

src/web/templates/weixin/historypush.html

@@ -642,7 +642,7 @@ a{
 	</div>
 	<img src="{{Msg "seo" "cdn"}}/applysub/img/click.png" alt="">
 </div>
-<!--开启推送 -->
+<!-- 开启推送 -->
 
 <div class="showType">
 	<div class="showlist on">列表</div>

src/web/templates/weixin/wxinfocontent.html

@@ -475,7 +475,7 @@ pre {
 	</div>
 	<img src="{{Msg "seo" "cdn"}}/applysub/img/click.png" alt="">
 </div>
-<!--开启推送 -->
+<!-- 开启推送 -->
 {{if .T.shareopenid}}
 <img class="shareimg hidden" src="/front/wxshare/{{.T.shareopenid}}__jy_extend"/>
 {{end}}
@@ -723,10 +723,10 @@ pre {
 <img class="upshare" src="{{Msg "seo" "cdn"}}/images/wx/upshare.png"/>
 <img class="upclose" src="{{Msg "seo" "cdn"}}/images/wx/upclose.png"/>
 </div>
-<script type="text/javascript">
+<!--<script type="text/javascript">
 var ucbs_source="wx",ucbsId="{{.T.obj.ucbsId}}";
 </script>
-<script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/ucbs.js?v={{Msg "seo" "version"}}"></script>
+<script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/ucbs.js?v={{Msg "seo" "version"}}"></script>-->
 <script>
 sessionStorage.removeItem("remind"); //开标提醒标识
 var pcname = {{.T.obj.projectname}};

src/web/templates/weixin/wxinfocontent_rec.html

@@ -418,7 +418,7 @@ pre {
 	</div>
 	<img src="{{Msg "seo" "cdn"}}/applysub/img/click.png" alt="">
 </div>
-<!--开启推送 -->
+<!-- 开启推送 -->
 {{if .T.shareopenid}}
 <img class="shareimg hidden" src="/front/wxshare/{{.T.shareopenid}}__jy_extend"/>
 {{end}}
@@ -651,10 +651,10 @@ pre {
 		<span class="null-no">否</span>
 	</div>
 </div>
-<script type="text/javascript">
+<!--<script type="text/javascript">
 var ucbs_source="wx_rec",ucbsId="{{.T.obj.ucbsId}}";
 </script>
-<script type="text/javascript" src="/js/ucbs.js?v={{Msg "seo" "version"}}"></script>
+<script type="text/javascript" src="/js/ucbs.js?v={{Msg "seo" "version"}}"></script>-->
 <script>
 sessionStorage.removeItem("remind"); //开标提醒标识
 var inithgt = 45;//tab高度