Merge branch 'dev/v4.9.79_tsz' of qmx/jy into feature/v4.9.79

src/jfw/modules/app/src/web/templates/big-member/page_orderdetail_member.html

@@ -448,8 +448,8 @@
                 cycle = filterObj.cycle + "天"
             }else {
                 cycle = filterObj.cycle + "年"
-                var createType = filterObj.createType
-                if (createType||filterObj.cycleType===0){
+                // var createType = filterObj.createType
+                if (filterObj.cycleType===0){
                   cycle = filterObj.cycle + "个月";
                 }
             }

src/web/templates/pc/member_orderDetail.html

@@ -299,7 +299,7 @@
                       cycle+="天"
                       $(".vip_type").text("-试用版")
                     }else{
-                      if (filterObj.createType||filterObj.cycleType===0){
+                      if (filterObj.cycleType===0){
                         cycle+="个月";
                       }else{
                         cycle+="年"

src/web/templates/weixin/member/memberdetail.html

@@ -349,8 +349,8 @@
             } else if (filterObj.cycleType===1){
                 cycle += "天"
             }else {
-              var createType = filterObj.createType
-              if (createType||filterObj.cycleType===0){
+              // var createType = filterObj.createType
+              if (filterObj.cycleType===0){
                 cycle+="个月";
               }else{
                 cycle+="年"