提交

src/client/client.go

@@ -37,11 +37,11 @@ func (this *Client) Index() {
 	log.Println("depart", depart)
 	(*data)["_id"] = mongoutil.BsonIdToSId((*data)["_id"])
 	// if (*data)["i_state"] == 1 {
-	tagRule, _ := Mgo.Find("cusertagrule", map[string]interface{}{"s_userid": id, "b_delete": false}, nil, nil, false, -1, -1)
+	tagRule, _ := Mgo.Find("eusertagrule", map[string]interface{}{"s_userid": id, "b_delete": false}, nil, nil, false, -1, -1)
 	this.T["tagrule"] = *tagRule
+	log.Println(tagRule)
 	appid := qu.ObjToString((*data)["s_appid"])
 	mails, _ := MgoCus.FindOneByField("user", map[string]interface{}{"appid": appid}, `{"mails":1,"username":1}`)
-	log.Println(mails)
 	this.T["mails"] = mails
 	// }
 	this.T["data"] = *data

src/web/templates/client/index.html

@@ -43,7 +43,8 @@
                                                     <label class="col-sm-2 control-label">客户名称</label>
                                                     <div>
 
-                                                        <label id="S_name" class="control-label" style="margin-left: 15px;"></label>
+                                                        <label id="S_name" class="control-label"
+                                                               style="margin-left: 15px;font-weight:normal;"></label>
                                                         <!--<input id="pushSwitch" type="checkbox" checked/>-->
                                                  
                                                 </div>
@@ -260,12 +261,12 @@
 <script>
     // menuActive("/customer/list");
     var dataMap = {{.T.data}}
-    console.log(dataMap)
+        console.log(dataMap)
     var departArr = {{.T.depart}}
     var tagruleArr = []
     var ruleArr = []
     var mailsArr = {{.T.mails}}
-    if (mailsArr != null){
+    if (mailsArr != null) {
         if (mailsArr.mails !== null) {
             for (var key in mailsArr.mails) {
                 var str = key + "+" + mailsArr.mails[key];
@@ -336,11 +337,16 @@
                 $('#pushTypeSelect').html("接口");
             }
         }
-         if (dataMap.i_pushtype == 0) {
+        if (dataMap.i_pushtype == 0) {
             $('#pushTypeSelect').html("邮箱");
         } else if (dataMap.i_pushtype && dataMap.i_pushmodel == 1) {
+<<<<<<< HEAD
            $('#pushTypeSelect').html("接口");
         } */
+=======
+            $('#pushTypeSelect').html("接口");
+        }
+>>>>>>> 9c8b9f9702a7bc63727db3c7f7dce2b63d1cb38b
         $('#S_name').html(dataMap.s_name);
         $('#departTable').DataTable({
             "paging": false,
@@ -577,7 +583,6 @@
             dataMap.i_pushtype = $('#pushTypeSelect option:selected').val()
         }
         dataMap.id = dataMap._id
-        console.log(dataMap)
         $.ajax({
             url: "/client/customer/save",
             type: 'POST',