Merge branch 'dev/v2.4.31_wmh' of jianyu/qmx_page_admin into feature/v2.4.31

src/views/order/myOrderList.vue

@@ -618,9 +618,18 @@ export default {
                         } else {
                             bookType = '（购买）'
                         }
+                        let dosc = ''
+                        let dosctype = row.vip_type
+                        if(dosctype == 1){
+                          dosc = '（续费）'
+                        }else{
+                          dosc = '（购买）'
+                        }
                         if (words == 'VIP订阅' || words == 'vip订阅') {
                             return h('span', '超级订阅' + vipType)
-                        } else if (words == '大会员') {
+                        } else if (words == '剑鱼文库会员'){
+                          return h('span', '剑鱼文库会员' + dosc)
+                        }else if (words == '大会员') {
                             return h('span', '大会员' + bigVip)
                         } else if (words == '省份订阅包') {
                             return h('span', '省份订阅包' + bookType)

src/views/order/orderList.vue

@@ -446,9 +446,18 @@ export default {
             } else {
               bookType = '（购买）'
             }
+            let dosc = ''
+            let dosctype = row.vip_type
+            if(dosctype == 1){
+              dosc = '（续费）'
+            }else{
+              dosc = '（购买）'
+            }
             if (words == 'VIP订阅' || words == 'vip订阅') {
               return h('span', '超级订阅' + vipType)
-            } else if (words == '大会员') {
+            } else if (words == '剑鱼文库会员'){
+              return h('span', '剑鱼文库会员' + dosc)
+            }else if (words == '大会员') {
               return h('span', '大会员' + bigVip)
             } else if (words == '省份订阅包') {
               return h('span', '省份订阅包' + bookType)