注册资本

core/src/web/templates/enterprise/detail.html

@@ -235,8 +235,11 @@
 						<!--注册资本-->
 						<div class="entinfo-regcap">
 							<div>
-							{{if and .T.res.RegCap .T.res.EntType}}
-								{{if and (ne .T.res.EntType "9600") (ne .T.res.EntType "5810") (ne .T.res.EntType "4540") (ne .T.res.EntType "4533")}}
+							{{if and .T.res.RegCap}}
+								{{if not .T.res.EntType}}
+									<span>注册资本</span>
+									<span><script>var d1={{.T.res.RegCap}};d1=d1?d1:0; var lenD1=(d1+"").length ;if(lenD1>4&&(d1+"").indexOf(".")>-1&&(lenD1-(d1+"").indexOf("."))>4){document.write(d1.toFixed(4))}else{document.write(d1)}</script>万{{if .T.res.RegCapCurName}}{{.T.res.RegCapCurName}}{{else}}元{{end}}</span>
+								{{else if and (ne .T.res.EntType "9600") (ne .T.res.EntType "5810") (ne .T.res.EntType "4540") (ne .T.res.EntType "4533")}}
 									<span>注册资本</span>
 									<span><script>var d1={{.T.res.RegCap}};d1=d1?d1:0; var lenD1=(d1+"").length ;if(lenD1>4&&(d1+"").indexOf(".")>-1&&(lenD1-(d1+"").indexOf("."))>4){document.write(d1.toFixed(4))}else{document.write(d1)}</script>万{{if .T.res.RegCapCurName}}{{.T.res.RegCapCurName}}{{else}}元{{end}}</span>
 								{{else}}

core/src/web/templates/member/incmobile/baseinfo.html

@@ -33,14 +33,22 @@
 			<span class="col-xs-7 entvar">{{if .T.res.OpFrom}}{{.T.res.OpFrom}}{{end}}{{if .T.res.OpTo}}&nbsp;-&nbsp;{{.T.res.OpTo}}{{else}}&nbsp;-&nbsp;长期{{end}}</span>
 		</li>
 		<li>
-		{{if and .T.res.RegCap .T.res.EntType}}
-			{{if and (ne .T.res.EntType "9600") (ne .T.res.EntType "5810") (ne .T.res.EntType "4540") (ne .T.res.EntType "4533")}}
+		{{if and .T.res.RegCap}}
+			{{if not .T.res.EntType}}
 				<div class="col-xs-5">
 					<img src="{{Msg "seo" "cdn"}}/images/entcommunity/zhuceziben.png"  width=23 />
 					<span class="ent">注册资本</span>
 				</div>
 				<span class="col-xs-7 entvar">
-								<script>var d1={{.T.res.RegCap}};d1=d1?d1:0; var lenD1=(d1+"").length ;if(lenD1>4&&(d1+"").indexOf(".")>-1&&(lenD1-(d1+"").indexOf("."))>4){document.write(d1.toFixed(4))}else{document.write(d1)}</script>万{{if .T.res.RegCapCurName}}{{.T.res.RegCapCurName}}{{else}}元{{end}}
+					<script>var d1={{.T.res.RegCap}};d1=d1?d1:0; var lenD1=(d1+"").length ;if(lenD1>4&&(d1+"").indexOf(".")>-1&&(lenD1-(d1+"").indexOf("."))>4){document.write(d1.toFixed(4))}else{document.write(d1)}</script>万{{if .T.res.RegCapCurName}}{{.T.res.RegCapCurName}}{{else}}元{{end}}
+				</span>
+			{{else if and (ne .T.res.EntType "9600") (ne .T.res.EntType "5810") (ne .T.res.EntType "4540") (ne .T.res.EntType "4533")}}
+				<div class="col-xs-5">
+					<img src="{{Msg "seo" "cdn"}}/images/entcommunity/zhuceziben.png"  width=23 />
+					<span class="ent">注册资本</span>
+				</div>
+				<span class="col-xs-7 entvar">
+					<script>var d1={{.T.res.RegCap}};d1=d1?d1:0; var lenD1=(d1+"").length ;if(lenD1>4&&(d1+"").indexOf(".")>-1&&(lenD1-(d1+"").indexOf("."))>4){document.write(d1.toFixed(4))}else{document.write(d1)}</script>万{{if .T.res.RegCapCurName}}{{.T.res.RegCapCurName}}{{else}}元{{end}}
 				</span>
 				{{else}}
 					<div class="col-xs-5">

core/src/web/templates/search/enterpriseList.html

@@ -114,9 +114,13 @@
 											{{else}}
 												<span class="margin-l-15"><font class="b-disabled">法定代表人：</font><font  class="lineb " >{{index $v "LeRep"}}</font></span>
 											{{end}}
+										{{else}}
+											<span class="margin-l-15"><font class="b-disabled">法定代表人：</font><font  class="lineb " >{{index $v "LeRep"}}</font></span>
 										{{end}}
-										{{if and (index $v "RegCap") ($v.RegCapEntType)}}
-											{{if and (ne $v.RegCapEntType "9600") (ne $v.RegCapEntType "5810") (ne $v.RegCapEntType "4540") (ne $v.RegCapEntType "4533")}}
+										{{if and (index $v "RegCap")}}
+											{{if not $v.RegCapEntType}}
+												<span class="margin-l-15"><font class="b-disabled">注册资本：</font><font  class="lineb " ><script>var d1={{$v.RegCap}};d1=d1?d1:0; var lenD1=(d1+"").length ;if(lenD1>4&&(d1+"").indexOf(".")>-1&&(lenD1-(d1+"").indexOf("."))>4){document.write(d1.toFixed(4))}else{document.write(d1)}</script>万{{if $v.RegCapCurName}}{{$v.RegCapCurName}}{{else}}元{{end}}</font></span>
+											{{else if and (ne $v.RegCapEntType "9600") (ne $v.RegCapEntType "5810") (ne $v.RegCapEntType "4540") (ne $v.RegCapEntType "4533")}}
 												<span class="margin-l-15"><font class="b-disabled">注册资本：</font><font  class="lineb " ><script>var d1={{$v.RegCap}};d1=d1?d1:0; var lenD1=(d1+"").length ;if(lenD1>4&&(d1+"").indexOf(".")>-1&&(lenD1-(d1+"").indexOf("."))>4){document.write(d1.toFixed(4))}else{document.write(d1)}</script>万{{if $v.RegCapCurName}}{{$v.RegCapCurName}}{{else}}元{{end}}</font></span>
 											{{end}}
 										{{end}}

weixin/src/config.json

@@ -52,6 +52,7 @@
 		"description":"请识别图中验证码并回复",
 		"in":"欢迎您进入了识别验证码工作，输入“结束识别验证码”退出本次工作。",
 		"out":"您已退出本次工作，辛苦了，再见。",
-		"reply":"已收到您的回复，谢谢。"
+		"reply":"已收到您的回复，谢谢。",
+		"msgError":"该功能暂不可用，请稍后再试！"
 	}
 }

weixin/src/qfw/weixin/distinguishwork.go

@@ -96,9 +96,6 @@ func processevent(p *util.Packet) {
 //开始工作，记录工作人的相关数
 func (a *DistinguishWork) Start(openId string) {
 	defer util.Catch()
-	if client == nil {
-		InitDgWork()
-	}
 	for _, v := range workers {
 		if v["openId"] == openId {
 			log.Println("验证码--", openId, "已经在工作中，重复进入")

weixin/src/qfw/weixin/msgtxtchandler.go

@@ -47,10 +47,15 @@ func MsgTxtHandler(w ResponseWriter, r *Request) {
 	//log.Println("........", r.FromUserName, r.Content)
 	//在会话中
 	if r.Content == "开始识别验证码" { //进入人工识别验证码工作
-		w.PostText(wf.SysConfig.DistinguishWork["in"].(string))
-		time.AfterFunc(2*time.Second, func() {
-			distinguishWork.Start(openid)
-		})
+		if client == nil {
+			w.ReplyText(wf.SysConfig.DistinguishWork["msgError"].(string))
+			return
+		} else {
+			w.PostText(wf.SysConfig.DistinguishWork["in"].(string))
+			time.AfterFunc(2*time.Second, func() {
+				distinguishWork.Start(openid)
+			})
+		}
 	} else if distinguishWork.IsWorking(openid) { //人工识别验证码工作中。。。
 		if r.Content == "结束识别验证码" {
 			w.PostText(wf.SysConfig.DistinguishWork["out"].(string))