Merge branch 'develop' of 192.168.3.17:zhanghongbo/qfw into develop

core/src/qfw/member/credit/creditdetail.go

@@ -112,6 +112,7 @@ func (c *credit) InCreditAjx() error {
 				cd.UpuserCreditSession(userId, cd.B_FXFWXQ, "B", nil, c.Action)
 			} else {
 				cd.UpuserCreditSession(userId, cd.A_FXFWXQ, "A", nil, c.Action)
+				cd.UpuserCreditSession(userId, cd.B_FXFWXQ, "B", nil, c.Action)
 			}
 		}
 		if param == "qd" {

core/src/qfw/redpackage/redpackage_test.go

@@ -83,7 +83,7 @@ func Test_reissue(t *testing.T) {
 	billno := time.Now().Unix()
 	amount = 500
 	fmt.Println("billno=", billno, ",amount=", amount)
-	bm := qrpc.BonusMsg{Mchbillno: fmt.Sprint(billno),
+	/*bm := qrpc.BonusMsg{Mchbillno: fmt.Sprint(billno),
 		Sendname: coreconfig.RedPackage.Weixin["sendname"].(string),
 		//Reopenid:    "",
 		Totalamount: amount,
@@ -91,6 +91,15 @@ func Test_reissue(t *testing.T) {
 		Wishing:     "企明星幸运有奖",
 		Actname:     "企明星幸运有奖",
 		Remark:      "企明星幸运有奖",
+	}*/
+	bm := qrpc.BonusMsg{Mchbillno: fmt.Sprint(billno),
+		Sendname:    coreconfig.RedPackage.Weixin["sendname"].(string),
+		Reopenid:    "obEpLuCBTu_QlPJhLhJjuVXdwMzE",
+		Totalamount: amount,
+		Totalnum:    1,
+		Wishing:     "企明星新年大抽奖",
+		Actname:     "企明星新年大抽奖",
+		Remark:      "欢迎参加企明星新年大抽奖活动！",
 	}
 	coreutil.PayBonus(&bm)
 }

core/src/web/templates/common/memberleft.html

@@ -104,7 +104,7 @@
 			<div><i class="glyphicon jinbi" style="width:25px;color:red;font-size:18px"></i><span style="font-weight:normal;">{{session "i_credit"}}</span></div>
 		</div>
 		<div style="height:40px;float:left;width:1px;background-color:#DDDDDD"></div>
-		<div style="float:left;width:105px;">
+		<div onclick="window.location.href='/member/accountset/index'" style="float:left;width:105px;">
 			<div>认证</div>
 			<div>
 			{{if session "identType"}}
@@ -112,14 +112,20 @@
 				{{if eq 1 $identType}}
 					{{if eq 1 $identWay}}
 					<i class="glyphicon qyrz" style="width:25px;color:red;font-size:18px;margin-right:0px;"></i><span style="font-weight:normal;">已认证企业</span>
+					{{else}}
+					<i class="glyphicon qyrz" style="width:25px;color:red;font-size:18px;margin-right:0px;"></i><span style="font-weight:normal;">未认证企业</span>
 					{{end}}
 				{{else if eq 2 $identType}}
 					{{if eq 1 $identWay}}
 					<i class="glyphicon grrz" style="width:25px;color:red;font-size:18px;margin-right:0px;"></i><span style="font-weight:normal;">已认证个人</span>
+					{{else}}
+					<i class="glyphicon grrz" style="width:25px;color:red;font-size:18px;margin-right:0px;"></i><span style="font-weight:normal;">未认证个人</span>
 					{{end}}
 				{{else if eq 3 $identType}}
 					{{if eq 1 $identWay}}
 					<i class="glyphicon jgrz" style="width:25px;color:red;font-size:18px;margin-right:0px;"></i><span style="font-weight:normal;">已认证机构</span>
+					{{else}}
+					<i class="glyphicon jgrz" style="width:25px;color:red;font-size:18px;margin-right:0px;"></i><span style="font-weight:normal;">未认证机构</span>
 					{{end}}
 				{{else}}
 				<i class="glyphicon grrz" style="width:25px;color:red;font-size:18px;margin-right:0px;"></i><span style="font-weight:normal;">未认证</span>

core/src/web/templates/member/credit/mycredit.html

@@ -101,7 +101,7 @@
 								<td width="10%" align="center">
 								<span class="n-ok-sign bootstrap-glyphicon glyphicon-ok-sign"></span> 未完成</td>
 								<td width="30%" style="padding:110px">
-								去 <button class="btn btn-primary" onclick="toUrl('/member/accountset/index')">完成验证</button></td>
+								去 <button class="btn btn-primary" onclick="toUrl('/member/accountset/index')" style="padding-top:3px;padding-bottom:3px;">完成验证</button></td>
 								{{end}}
 							</tr>
 							<tr class="rowone">
@@ -134,7 +134,7 @@
 								<td width="30%" style="padding:110px"></td>
 								{{else}}
 								<td width="10%" align="center"><span class="n-ok-sign bootstrap-glyphicon glyphicon-ok-sign"></span> 未完成</td>
-								<td width="30%" style="padding:110px">去 <button class="btn btn-primary" onclick="toUrl('/member/yellowpage/show/enterprise/{{.T.user.s_enterpriseid}}')">完善资料</button></td>
+								<td width="30%" style="padding:110px">去 <button class="btn btn-primary" onclick="toUrl('/member/yellowpage/show/enterprise/{{.T.user.s_enterpriseid}}')" style="padding-top:3px;padding-bottom:3px;">完善资料</button></td>
 								{{end}}
 							</tr>
 							<tr class="rowtwo">

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

@@ -86,15 +86,15 @@
 										{{ if eq (index $v "s_action") "01"}}
 											<span class="glyphicon qyrz   margin-l-10 jhtb"></span><span class="lineb " ><small>&nbsp;已认证企业&nbsp;</small></span>
 											{{ if $v.i_comauthenttype }}
-													{{ if eq $v.i_comauthenttype 2}}
-														<span class="glyphicon mprz   margin-r-10 jhtbtype"></span><span class="lineb " ><small style="margin-right:5px;">名片认证</small></span>					
-													{{else if eq $v.i_comauthenttype 1}}
-														<span class="glyphicon yyzzrz   margin-r-10 jhtbtype"></span><span class="lineb " ><small style="margin-left:3px;margin-right:5px;">营业执照认证</small></span>
-													{{else if eq $v.i_comauthenttype 3}}
-														<span class="glyphicon yjrz   margin-r-10 jhtbtype"></span><span class="lineb " ><small style="margin-right:5px;">年报邮箱认证</small></span>
-													{{end}}
-											{{else}}
+												{{ if eq $v.i_comauthenttype 2}}
+													<span class="glyphicon mprz   margin-r-10 jhtbtype"></span><span class="lineb " ><small style="margin-right:5px;">名片认证</small></span>					
+												{{else if eq $v.i_comauthenttype 1}}
 													<span class="glyphicon yyzzrz   margin-r-10 jhtbtype"></span><span class="lineb " ><small style="margin-left:3px;margin-right:5px;">营业执照认证</small></span>
+												{{else if eq $v.i_comauthenttype 3}}
+													<span class="glyphicon yjrz   margin-r-10 jhtbtype"></span><span class="lineb " ><small style="margin-right:5px;">年报邮箱认证</small></span>
+												{{end}}
+											{{else}}
+												<span class="glyphicon yyzzrz   margin-r-10 jhtbtype"></span><span class="lineb " ><small style="margin-left:3px;margin-right:5px;">营业执照认证</small></span>
 											{{end}}
 										{{else if eq (index $v "s_action") "02"}}
 											<span class="glyphicon grrz   margin-l-10 jhtb"></span><span class="lineb " ><small>　已认证个人</small></span>

core/src/web/templates/swordfish/infolist.html

@@ -107,9 +107,9 @@ $(function(){
 				}
 				var datatype = $(this).parents("#ycwords").attr("datatype");
 				if(datatype == "bid"){
-					datatype = "【中标】";
+					datatype = "【中标公告】";
 				}else if(datatype == "tender"){
-					datatype = "【招标】";
+					datatype = "【招标公告】";
 				}else{
 					datatype = "";
 				}
@@ -242,9 +242,9 @@ function loadMore(){
 				if($(this).children(".time-diff").length == 0){
 					var datatype = $(this).parents("#ycwords").attr("datatype");
 					if(datatype == "bid"){
-						datatype = "【中标】";
+						datatype = "【中标公告】";
 					}else if(datatype == "tender"){
-						datatype = "【招标】";
+						datatype = "【招标公告】";
 					}else{
 						datatype = "";
 					}

core/src/web/templates/yellowpage/enterpriseinfo.html

@@ -36,7 +36,7 @@
 						{{if eq $identaction "01"}}
 						<script>entType="企业"</script>
 							<span class="glyphicon qyrz"></span>
-							已认证企业{{if .T.res.i_comauthenttype}}{{if eq .T.res.i_comauthenttype 2}}<font class="margin-lr-5">-</font><span class="glyphicon mprz"></span>名片认证{{else if eq .T.res.i_comauthenttype 1}}<font class="margin-lr-5">-</font><span class="glyphicon yyzzrz"></span>营业执照认证{{else if eq .T.res.i_comauthenttype 3}}<font class="margin-lr-5">-</font><span class="glyphicon yjrz"></span>年报邮箱认证{{end}}{{end}}
+							已认证企业{{if .T.res.i_comauthenttype}}{{if eq .T.res.i_comauthenttype 2}}<font class="margin-lr-5">-</font><span class="glyphicon mprz"></span>名片认证{{else if eq .T.res.i_comauthenttype 1}}<font class="margin-lr-5">-</font><span class="glyphicon yyzzrz"></span>营业执照认证{{else if eq .T.res.i_comauthenttype 3}}<font class="margin-lr-5">-</font><span class="glyphicon yjrz"></span>年报邮箱认证{{end}}{{else}}<font class="margin-lr-5">-</font><span class="glyphicon yyzzrz"></span>营业执照认证{{end}}
 						{{else if eq $identaction "02"}}
 						<script>entType="商家"</script>
 							<span class="glyphicon grrz"></span>已认证个人