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

common/src/qfw/util/encrypt_test.go

@@ -161,3 +161,8 @@ func Test_unicode(t *testing.T) {
 	fmt.Println(strconv.Unquote(`"\u1F465招标社区"`))
 	log.Println(string(0x1F465), GetMd5String("111qqq"))
 }
+
+func Test_en(t *testing.T) {
+	var SE = &SimpleEncrypt{Key: "topnet2015topnet2015"}
+	fmt.Println("00: ", SE.DecodeString("QVdCDVRGC1IIBkxZElsBTFQJCQVBCkZX"))
+}

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

@@ -118,7 +118,6 @@
 			{{else}}
 			<div class="b-com-last">
 				{{if .T.res.s_persion}}<span class="glyphicon ren2"></span>{{.T.res.s_persion}}<span class="margin-r-15"></span>{{end}}
-				{{if or .T.res.s_mobile .T.res.Tel}}<span class="glyphicon shouji"></span>{{if .T.res.s_mobile}}{{.T.res.s_mobile}}{{else if .T.res.Tel}}{{.T.res.Tel}}{{end}}<span class="margin-r-15"></span>{{end}}
 				{{if .T.res.s_qq}}
 					<span class="glyphicon qq1"></span>
 					<script type="text/javascript">

core/src/web/templates/manage/feedbackcontent.html

@@ -113,8 +113,8 @@ background-color:#FFFFFF;
 		</div>
 		<div class="form-group">
         <label id="col-sm-2" class="col-sm-2 control-label" for="name">问题来源页面：</label>
-	    <div class="col-sm-4">
-        <span style="background-color:#f0f0f0;" class="form-control">{{.T.s_source}}</span>
+	    <div class="col-sm-6">
+        <span style="background-color:#f0f0f0;cursor:pointer" title="点击访问此地址" onClick="window.open({{.T.s_source}})" class="form-control">{{.T.s_source}}</span>
 		</div>
 		<div class="col-sm-4">
 		</div>