Merge branch 'dev2.8.5' of http://192.168.3.207:10080/qmx/jy into dev2.8.5

src/jfw/modules/subscribepay/src/service/afterPay.go

@@ -20,6 +20,43 @@ type AfterPay struct {
 	setUserInfo xweb.Mapper `xweb:"/afterPay/setUserInfo"` //保存用户当前支付后的信息
 }
 
+//初始化vip订阅关键词
+func MergeKws() {
+	defer qutil.Catch()
+	userId, _ := a.GetSession("userId").(string)
+	if userId == "" {
+		return
+	}
+	data, ok := util.MQFW.FindById("user", userId, `{"o_jy":1,"o_vipjy":1}`)
+	var o_jy map[string]interface{}
+	var o_vipjy map[string]interface{}
+	if ok && data != nil && len(*data) > 0 {
+		o_vipjy, _ = (*data)["o_vipjy"].(map[string]interface{})
+		a_items, _ := o_vipjy["a_items"].([]interface{})
+		if a_items == nil { //首次
+			var o_kws = make(map[string]interface{})
+			o_jy, _ = (*data)["o_jy"].(map[string]interface{})
+			a_key, _ := o_jy["a_key"].([]interface{})
+			var _key = make([]map[string]interface{}, len(a_key))
+			if len(a_key) > 0 {
+				o_kws["s_item"] = "未分类"
+				for k, v := range a_key {
+					keyarr := v.(map[string]interface{})
+					_key[k] = map[string]interface{}{"key": keyarr["key"].([]interface{})}
+				}
+			}
+			o_kws["a_key"] = _key
+			if o_kws != nil && len(o_kws) > 0 {
+				a := util.MQFW.UpdateById("user", userId, bson.M{
+					"$push": bson.M{"o_vipjy.a_items": o_kws},
+				})
+				log.Println(a)
+			}
+		}
+	}
+
+}
+
 //
 func (a *AfterPay) SetUserInfo() error {
 	defer qutil.Catch()

src/web/templates/weixin/vipsubscribe/keyWord.html

@@ -163,8 +163,8 @@
                         var _userData = r.userData;
                         var _vipData = _userData["o_vipjy"];
                         modifyFlag = false;
-                        a_items = _vipData["a_items"]
-                        if (a_items!=undefined&&a_items.length>0){
+                        if (_vipData["a_items"]!=undefined&&_vipData["a_items"].length>0){
+                            a_items = _vipData["a_items"]
                             pageState.isFirstSetKeyword = false;
                             appendHtml(a_items);
                         }else{
@@ -475,7 +475,6 @@
         // 设置一条空记录，用户第一次进入添加关键词点击确定时候调用
         function setEmptyHistory() {
             if (pageState.isFirstSetKeyword) {
-                    console.log("33333333333")
                 history.pushState({}, "","")
                 pageState.isFirstSetKeyword = false
             }
@@ -488,7 +487,6 @@
                 // isClassifyColumnShow = true说明是添加新分类
                 var isClassifyColumnShow = $('.add-keyword-container').is(':hidden');
                 if (isClassifyColumnShow) {
-                    console.log("11111111111111111")
                     history.pushState({}, "","");
                     classify_index = $(".classify-list li").length;
                     // 还原有数据
@@ -510,7 +508,6 @@
             // 点击分类目录的每一项，进入对应列表
             $('.classify-list').on('click', '.classify-item-r', function() {
                 // 添加一条空历史记录
-                    console.log("2222222222")
                 history.pushState({}, "","");
                 classify_name = $(this).parent().find('.classify-item-l').text();
                 classify_index = $(this).parent("li").index()

src/web/templates/weixin/vipsubscribe/vip_index.html

@@ -185,11 +185,13 @@
                         $("#pushSet").text(pushText);
                         var a_items = _vipData["a_items"]
                         var s_items = ""
-                        for (var i = a_items.length - 1; i >= 0; i--) {
-                            if(s_items!=""){
-                                s_items += " "
+                        if (a_items!=undefined &&a_items.length>0){
+                            for (var i = 0; a_items.length - 1 >= i ; i++) {
+                                if(s_items!=""){
+                                    s_items += "、"
+                                }
+                                s_items  += a_items[i]["s_item"]
                             }
-                            s_items  += a_items[i]["s_item"]
                         }
                         $("#keywords").text(s_items);
                    }