fenzhihebing

src/views/order/components/details.vue

@@ -172,6 +172,26 @@
                 </div>
             </div>
             <Divider />
+        </div>
+                <!-- 剑鱼文库会员 -->
+        <div class="infor-card" v-if="orderType == 20">
+            <div class="cont">
+                <div class="tit">产品信息</div>
+                <div class="classfity">
+                    <span><p>开通权益手机号：</p>{{orDetails.user_phone?orDetails.user_phone:'--'}}</span>
+                    <span ><p>购买周期：</p><i v-if="book">
+                        {{book?book.cyclecount?book.cycleunit==1?book.cyclecount+'年':book.cycleunit==2?book.cyclecount+'个月':book.cycleunit==3?book.cyclecount+'天':book.cycleunit==4?book.cyclecount+'个季度':'--':'--':'--'}}
+                        </i>
+                    </span>
+                    <span>
+                        <p>有效日期：</p>
+                        <i v-if="book">
+                            {{orDetails?vip_starttime:''}}{{orDetails?vip_endtime:''}}
+                        </i>
+                    </span>
+                </div>
+            </div>
+            <Divider />
         </div>
         <!-- 企业商机管理 -->
         <div class="infor-card" v-if="orderType == 6">

src/views/order/myOrderList.vue

@@ -424,9 +424,13 @@ export default {
                 { v: '22', n: 'ISO体系认证' },
                 { v: '23', n: '3A信用认证' },
                 { v: '24', n: '权益码' },
+<<<<<<< HEAD
                 { v: '0000', n: '市场分析定制报告下载包' },
                 { v: '0001', n: '企业中标分析报告下载包' },
                 { v: '0002', n: '业主采购分析报告下载包' },
+=======
+                {v: '25', n: '剑鱼文库会员'}
+>>>>>>> master
             ],
             orderTips: [
                 { v: '', n: '全部' },
@@ -620,9 +624,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/orderDetail.vue

@@ -96,6 +96,9 @@ export default {
             case '超级订阅':
                 this.proStatus = '8'
                 break;
+            case '剑鱼文库会员':    
+            this.proStatus = '20'
+                break;
         }
     },
     data () {

src/views/order/orderList.vue

@@ -252,9 +252,13 @@ export default {
         {v: '22', n: 'ISO体系认证'},
         {v: '23', n: '3A信用认证'},
         {v: '24', n: '权益码'},
+<<<<<<< HEAD
         { v: '0000', n: '市场分析定制报告下载包' },
         { v: '0001', n: '企业中标分析报告下载包' },
         { v: '0002', n: '业主采购分析报告下载包' },
+=======
+        {v: '25', n: '剑鱼文库会员'}
+>>>>>>> master
       ],
       orderTips: [
         {v: '', n: '全部'},
@@ -448,9 +452,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)