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

src/web/staticres/common-module/order-list/js/order-list.js

@@ -2628,7 +2628,7 @@ var vm = new Vue({
         duration.text = filterInfo.cycle + '天'
       } else {
         duration.text = filterInfo.cycle + '年'
-        if (filterInfo.createType || filterInfo.cycleType === 0) {
+        if (filterInfo.cycleType === 0) {
           duration.text = filterInfo.cycle + '个月'
         }
       }

src/web/templates/pc/myOrder.html

@@ -1001,7 +1001,7 @@
               v.memberInfo.cycle = v.filter.cycle + "天";
             } else {
               v.memberInfo.cycle = v.filter.cycle + "年";
-              if (v.filter.createType || v.filter.cycleType === 0) {
+              if (v.filter.cycleType === 0) {
                 v.memberInfo.cycle = v.filter.cycle + "个月";
               }
             }