提交订单列表详情调整处理

src/views/order/components/details.vue

@@ -192,6 +192,28 @@
                 </div>
             </div>
             <Divider />
+        </div>
+                <!-- 小程序相关 -->
+        <div class="infor-card" v-if="orderType == 21">
+            <div class="cont">
+                <div class="tit">产品信息</div>
+                <div class="classfity">
+                    <span><p>开通权益手机号：</p>{{orDetails.user_phone?orDetails.user_phone:'--'}}</span>
+                    <span ><p>购买数量：</p><i>{{orDetails.buy_count || '1'}}人</i></span>
+                    <span ><p>购买省份：</p>{{buyProvince?buyProvince:'--'}}</span>
+                    <span><p>计费模式：</p>{{orDetails?orDetails.billingMode==0?'免费':'收费':'--'}}</span>
+                    <span ><p>订购区域：</p><i style="max-width:70%;width:auto;">{{orDetails?orDetails.buyArea?orDetails.buyArea:'--':'--'}}</i></span>
+                    <span ><p>订购行业：</p><i>{{orDetails?orDetails.buyIndustry?orDetails.buyIndustry:'--':'--'}}</i></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+'个季度':'--':'--':'--'}}
+                        {{book?book.cycleCount?book.give_cycle?' + ':'':'':''}}
+                        <em class="zeng">{{book?book.give_cycle?book.give_cycle?'活动赠送'+timeChange(book.give_cycle,book.give_type):'':'':''}}</em>
+                        <em class="zeng">{{book?book.seller_give_cycle?book.seller_give_cycle?'+销售赠送'+timeChange(book.seller_give_cycle,book.seller_give_type):'':'':''}}</em>
+                        </i>
+                    </span>
+                </div>
+            </div>
+            <Divider />
         </div>
         <!-- 企业商机管理 -->
         <div class="infor-card" v-if="orderType == 6">
@@ -1210,7 +1232,7 @@ export default {
                 let akp1 = new Date(), akp2 = new Date(addDate(r.data.res.create_time, 8))
                 this.addDate8 = akp1 < akp2
                 this.orders = r.data
-                if (r.data.res.invoice.length > 0) {
+                if (r.data.res.invoice && r.data.res.invoice.length > 0) {
                     r.data.res.invoice.forEach(v => {
                         v.create_time = dateFormatter(v.create_time * 1000)
                     })

src/views/order/myOrderList.vue

@@ -8,7 +8,8 @@
                 <div class="shai_xuan">
                     <span @click="screened">
                         高级筛选
-                        <Icon :class="{ 'arrowTransform': !flag, 'arrowTransformReturn': flag }" type="ios-arrow-down" />
+                        <Icon :class="{ 'arrowTransform': !flag, 'arrowTransformReturn': flag }"
+                            type="ios-arrow-down" />
                     </span>
                     <div class="right-msg">
                         <Button type="primary" @click="scanCodeVote(1)" class="create-order">客户自助扫码合并开票</Button>
@@ -28,19 +29,22 @@
             <template slot="filterContent" v-if="flag">
                 <Select placeholder="产品类型" clearable v-model="filter.productType" @on-change="proChge"
                     style="width:100px;margin:0 10px 10px 0">
-                    <Option v-for="item in proType" :value="item.v" :key="item.v">{{ item.n }}</Option>
+                    <Option v-for="item in proType" :value="item" :key="item">{{ item }}</Option>
                 </Select>
                 <div class="cas-div">
                     <v-cascader ref="casRef" placeholderType="销售渠道" type="1" quType="1"
                         @levelChange="levelChange"></v-cascader>
                 </div>
-                <Select placeholder="订单状态" clearable v-model="filter.orderStatus" style="width:100px;margin:0 10px 10px 0">
+                <Select placeholder="订单状态" clearable v-model="filter.orderStatus"
+                    style="width:100px;margin:0 10px 10px 0">
                     <Option v-for="item in orderStas" :value="item.v" :key="item.v">{{ item.n }}</Option>
                 </Select>
-                <Select placeholder="回款状态" clearable v-model="filter.returnStatus" style="width:100px;margin:0 10px 10px 0">
+                <Select placeholder="回款状态" clearable v-model="filter.returnStatus"
+                    style="width:100px;margin:0 10px 10px 0">
                     <Option v-for="item in returnStas" :value="item.v" :key="item.v">{{ item.n }}</Option>
                 </Select>
-                <Select placeholder="退款状态" clearable v-model="filter.refundStatus" style="width:100px;margin:0 10px 10px 0">
+                <Select placeholder="退款状态" clearable v-model="filter.refundStatus"
+                    style="width:100px;margin:0 10px 10px 0">
                     <Option v-for="item in refundStas" :value="item.v" :key="item.v">{{ item.n }}</Option>
                 </Select>
                 <Select placeholder="发票状态" clearable v-model="filter.invoiceStatus"
@@ -74,8 +78,9 @@
                     style="width:150px;margin:0 10px 10px 0">
                     <Option v-for="item in auditStatus" :value="item.v" :key="item.v">{{ item.n }}</Option>
                 </Select>
-                <Select placeholder="合同性质" clearable v-model="filter.contract_nature" style="width:150px;margin:0 10px 10px 0">
-                 <Option v-for="item in contractStatus" :value="item.v" :key="item.v">{{ item.n }}</Option>
+                <Select placeholder="合同性质" clearable v-model="filter.contract_nature"
+                    style="width:150px;margin:0 10px 10px 0">
+                    <Option v-for="item in contractStatus" :value="item.v" :key="item.v">{{ item.n }}</Option>
                 </Select>
                 <br />
                 <Select placeholder="广告来源" clearable v-model="filter.adSource" style="width:100px;margin:0 10px 10px 0"
@@ -94,8 +99,8 @@
                     v-show="select2">
                     <Option v-for="item in dataCont" :value="item.v" :key="item.v">{{ item.n }}</Option>
                 </Select>
-                <Select placeholder="发票开具方" clearable v-model="filter.invoiceType" style="width:110px;margin:0 10px 10px 0"
-                    v-show="select3">
+                <Select placeholder="发票开具方" clearable v-model="filter.invoiceType"
+                    style="width:110px;margin:0 10px 10px 0" v-show="select3">
                     <Option v-for="item in invoicePerson" :value="item.v" :key="item.v">{{ item.n }}</Option>
                 </Select><br v-show="select1 || select2 || select3 || select4 || select5" />
             </template>
@@ -108,7 +113,8 @@
                 <div style="color:#d7d7d7;font-size:14px">
                     <p>共计{{ list.total ? list.total : 0 }}个订单</p>
                     <p>
-                        应收金额 {{ list.money >= 0 && list.refundMoney >= 0 ? localed((list.money - list.refundMoney) / 100) : localed(0) }}，
+                        应收金额 {{ list.money >= 0 && list.refundMoney >= 0 ? localed((list.money - list.refundMoney) /
+            100) : localed(0) }}，
                         退款金额 {{ list.refundMoney >= 0 ? localed(list.refundMoney / 100) : localed(0) }}
                     </p>
                 </div>
@@ -145,7 +151,7 @@ export default {
     watch: {
         'filter.productType': {
             handler(newVal) {
-                if (newVal == '0' || newVal == '18') {
+                if (newVal == '超级订阅' || newVal == '省份订阅包') {
                     this.select1 = true
                     this.select2 = false
                     this.select3 = false
@@ -154,7 +160,7 @@ export default {
                     this.filter.dataType = ''
                     this.filter.invoiceType = ''
                     this.filter.level = ''
-                } else if (newVal == '2') {
+                } else if (newVal == '历史数据') {
                     this.select2 = true
                     this.select1 = false
                     this.select3 = false
@@ -163,7 +169,7 @@ export default {
                     this.filter.payType = ''
                     this.filter.invoiceType = ''
                     this.filter.level = ''
-                } else if (newVal == '4') {
+                } else if (newVal == '中标必听课') {
                     this.select3 = true
                     this.select1 = false
                     this.select2 = false
@@ -172,7 +178,7 @@ export default {
                     this.filter.dataType = ''
                     this.filter.payType = ''
                     this.filter.level = ''
-                } else if (newVal == '6') {
+                } else if (newVal == '大会员') {
                     this.select4 = true
                     this.select1 = false
                     this.select2 = false
@@ -180,7 +186,7 @@ export default {
                     this.select5 = false
                     this.filter.dataType = ''
                     this.filter.payType = ''
-                } else if (newVal == '12') {
+                } else if (newVal == '广告') {
                     this.select5 = true
                     this.select4 = false
                     this.select1 = false
@@ -203,7 +209,18 @@ export default {
             deep: true
         }
     },
+    created() {
+        this.getproType()
+
+    },
     methods: {
+        getproType() {
+            this.$request('/order/productTypeFilter').data({}).success((res) => {
+                if (res.data) {
+                    this.proType = res.data.filter
+                }
+            }).get()
+        },
         // 关闭弹框
         closeComDialog() {
             this.setDialogStatus.showDialog = false
@@ -262,7 +279,7 @@ export default {
         },
         rowClick(row) {
             const sources = JSON.parse(row.filter).source ? JSON.parse(row.filter).source : ''
-            const news = this.$router.resolve({ path: '/order/orderList/orderDetail', query: { id: row.id, proType: row.product_type, type: sources, path: `my` } })
+            const news = this.$router.resolve({ path: '/order/orderList/orderDetail', query: { id: row.id, proType: row.product_type, type: sources,otherType:row.orderProducttype, path: `my` } })
             window.open(news.href, '_blank')
         },
         selChange(val) {
@@ -398,33 +415,33 @@ export default {
             selectName: [],
             selectData: [],
             proType: [
-                { v: '', n: '全部' },
-                { v: '6', n: '大会员' },
-                { v: '7', n: '大会员-子账号' },
-                { v: '8', n: '大会员-补充包' },
-                { v: '9', n: '招标文件解读' },
-                { v: '10', n: '剑鱼币' },
-                { v: '11', n: '结构化数据' },
-                { v: '12', n: '广告' },
-                { v: '13', n: '数据流量包' },
-                { v: '14', n: '线下课程培训' },
-                { v: '15', n: '课程分销' },
-                { v: '16', n: '标书制作' },
-                { v: '17', n: '打赏' },
-                { v: '18', n: '省份订阅包' },
-                { v: '19', n: '附件下载包' },
-                { v: '20', n: '采购单位画像包' },
-                { v: '21', n: '数据文件' },
-                { v: '0', n: '超级订阅' },
-                { v: '1', n: '数据报告' },
-                { v: '2', n: '历史数据' },
-                // {v: '3', n: '线下课程'},
-                { v: '4', n: '中标必听课' },
-                { v: '5', n: '企业商机管理' },
-                { v: '22', n: 'ISO体系认证' },
-                { v: '23', n: '3A信用认证' },
-                { v: '24', n: '权益码' },
-                {v: '25', n: '剑鱼文库会员'}
+                // { v: '', n: '全部' },
+                // { v: '6', n: '大会员' },
+                // { v: '7', n: '大会员-子账号' },
+                // { v: '8', n: '大会员-补充包' },
+                // { v: '9', n: '招标文件解读' },
+                // { v: '10', n: '剑鱼币' },
+                // { v: '11', n: '结构化数据' },
+                // { v: '12', n: '广告' },
+                // { v: '13', n: '数据流量包' },
+                // { v: '14', n: '线下课程培训' },
+                // { v: '15', n: '课程分销' },
+                // { v: '16', n: '标书制作' },
+                // { v: '17', n: '打赏' },
+                // { v: '18', n: '省份订阅包' },
+                // { v: '19', n: '附件下载包' },
+                // { v: '20', n: '采购单位画像包' },
+                // { v: '21', n: '数据文件' },
+                // { v: '0', n: '超级订阅' },
+                // { v: '1', n: '数据报告' },
+                // { v: '2', n: '历史数据' },
+                // // {v: '3', n: '线下课程'},
+                // { v: '4', n: '中标必听课' },
+                // { v: '5', n: '企业商机管理' },
+                // { v: '22', n: 'ISO体系认证' },
+                // { v: '23', n: '3A信用认证' },
+                // { v: '24', n: '权益码' },
+                // {v: '25', n: '剑鱼文库会员'}
             ],
             orderTips: [
                 { v: '', n: '全部' },
@@ -465,10 +482,10 @@ export default {
                 { v: '3', n: '未通过' },
                 { v: '4', n: '已通过' }
             ],
-            contractStatus : [
-              {v: '', n: '全部'},
-              {v: '1', n: '新签合同'},
-              {v: '2', n: '续签合同'},
+            contractStatus: [
+                { v: '', n: '全部' },
+                { v: '1', n: '新签合同' },
+                { v: '2', n: '续签合同' },
             ],
             auditStatus: [
                 { v: '', n: '全部' },
@@ -529,7 +546,7 @@ export default {
                 { v: '3', n: '剑鱼广告位' }
             ],
             filter: {
-                productType: '',
+                productType: '全部',
                 orderType: '',
                 orderStatus: '',
                 invoiceStatus: '',
@@ -551,7 +568,7 @@ export default {
                 adSource: '',
                 salesSecondLevel: '',
                 auditStatus: '',
-                contract_nature:'' // 合同性质
+                contract_nature: '' // 合同性质
             },
             sear: {
                 keyword: ''
@@ -620,19 +637,21 @@ export default {
                         }
                         let dosc = ''
                         let dosctype = row.vip_type
-                        if(dosctype == 1){
-                          dosc = '（续费）'
-                        }else{
-                          dosc = '（购买）'
+                        if (dosctype == 1) {
+                            dosc = '（续费）'
+                        } else {
+                            dosc = '（购买）'
                         }
                         if (words == 'VIP订阅' || words == 'vip订阅') {
                             return h('span', '超级订阅' + vipType)
-                        } else if (words == '剑鱼文库会员'){
-                          return h('span', '剑鱼文库会员' + dosc)
-                        }else if (words == '大会员') {
+                        } else if (words == '剑鱼文库会员') {
+                            return h('span', '剑鱼文库会员' + dosc)
+                        } else if (words == '大会员') {
                             return h('span', '大会员' + bigVip)
                         } else if (words == '省份订阅包') {
                             return h('span', '省份订阅包' + bookType)
+                        } else if (row.orderProducttype == '碎片化小程序') {
+                            return h('span', row.product_type + bookType)
                         } else {
                             return h('span', row.product_type)
                         }

src/views/order/orderDetail.vue

@@ -15,7 +15,7 @@ export default {
     components: {
         vDetail
     },
-    created () {
+    created() {
         let str = this.$route.query
         switch (str.proType) {
             case '中标必听课':
@@ -63,8 +63,8 @@ export default {
             case '课程分销':
                 this.proStatus = '14'
                 break;
-            case 'ISO体系认证' :
-            case '3A信用认证' :
+            case 'ISO体系认证':
+            case '3A信用认证':
             case '权益码':
             case '标书制作':
                 this.proStatus = '14'
@@ -96,12 +96,19 @@ export default {
             case '超级订阅':
                 this.proStatus = '8'
                 break;
-            case '剑鱼文库会员':    
-            this.proStatus = '20'
+            case '剑鱼文库会员':
+                this.proStatus = '20'
                 break;
         }
+        if(str.otherType){
+            switch (str.otherType) {
+            case '碎片化小程序':
+                this.proStatus = '21'
+            break;
+           }
+        }
     },
-    data () {
+    data() {
         return {
             proStatus: ''
         }
@@ -112,12 +119,14 @@ export default {
 <style lang="scss" scoped>
 .with-detail {
     .det {
-        background:#fff;
+        background: #fff;
         padding: 10px 0;
     }
+
     h1 {
         padding: 10px 0 20px 10px;
     }
+
     .right-fund {
         font-size: 20px;
         color: #575962;

src/views/order/orderList.vue

@@ -37,7 +37,7 @@
       <template slot="filterContent" v-if="flag">
         <Select placeholder="产品类型" clearable v-model="filter.productType" @on-change="proChge"
                 style="width:100px;margin:0 10px 10px 0">
-          <Option v-for="item in proType" :value="item.v" :key="item.v">{{ item.n }}</Option>
+          <Option v-for="item in proType" :value="item" :key="item">{{ item }}</Option>
         </Select>
         <div class="cas-div">
           <v-cascader ref="casRef" placeholderType="销售渠道" type="1" quType="1" @levelChange="levelChange"></v-cascader>
@@ -226,33 +226,33 @@ export default {
       selectName: [],
       selectData: [],
       proType: [
-        {v: '', n: '全部'},
-        {v: '6', n: '大会员'},
-        {v: '7', n: '大会员-子账号'},
-        {v: '8', n: '大会员-补充包'},
-        {v: '9', n: '招标文件解读'},
-        {v: '10', n: '剑鱼币'},
-        {v: '11', n: '结构化数据'},
-        {v: '12', n: '广告'},
-        {v: '13', n: '数据流量包'},
-        {v: '14', n: '线下课程培训'},
-        {v: '15', n: '课程分销'},
-        {v: '16', n: '标书制作'},
-        {v: '17', n: '打赏'},
-        {v: '18', n: '省份订阅包'},
-        {v: '19', n: '附件下载包'},
-        {v: '20', n: '采购单位画像包'},
-        {v: '21', n: '数据文件'},
-        {v: '0', n: '超级订阅'},
-        {v: '1', n: '数据报告'},
-        {v: '2', n: '历史数据'},
-        // {v: '3', n: '线下课程'},
-        {v: '4', n: '中标必听课'},
-        {v: '5', n: '企业商机管理'},
-        {v: '22', n: 'ISO体系认证'},
-        {v: '23', n: '3A信用认证'},
-        {v: '24', n: '权益码'},
-        {v: '25', n: '剑鱼文库会员'}
+        // {v: '', n: '全部'},
+        // {v: '6', n: '大会员'},
+        // {v: '7', n: '大会员-子账号'},
+        // {v: '8', n: '大会员-补充包'},
+        // {v: '9', n: '招标文件解读'},
+        // {v: '10', n: '剑鱼币'},
+        // {v: '11', n: '结构化数据'},
+        // {v: '12', n: '广告'},
+        // {v: '13', n: '数据流量包'},
+        // {v: '14', n: '线下课程培训'},
+        // {v: '15', n: '课程分销'},
+        // {v: '16', n: '标书制作'},
+        // {v: '17', n: '打赏'},
+        // {v: '18', n: '省份订阅包'},
+        // {v: '19', n: '附件下载包'},
+        // {v: '20', n: '采购单位画像包'},
+        // {v: '21', n: '数据文件'},
+        // {v: '0', n: '超级订阅'},
+        // {v: '1', n: '数据报告'},
+        // {v: '2', n: '历史数据'},
+        // // {v: '3', n: '线下课程'},
+        // {v: '4', n: '中标必听课'},
+        // {v: '5', n: '企业商机管理'},
+        // {v: '22', n: 'ISO体系认证'},
+        // {v: '23', n: '3A信用认证'},
+        // {v: '24', n: '权益码'},
+        // {v: '25', n: '剑鱼文库会员'}
       ],
       orderTips: [
         {v: '', n: '全部'},
@@ -357,7 +357,7 @@ export default {
         {v: '3', n: '剑鱼广告位'}
       ],
       filter: {
-        productType: '',
+        productType: '全部',
         orderType: '',
         orderStatus: '',
         invoiceStatus: '',
@@ -436,7 +436,7 @@ export default {
             } else if (levels == 7) {
               bigVip = '（专家版2.0）'
             }
-            // 省份订阅包
+            // 省份订阅包 || 小程序
             let bookType = ''
             let book = row.vip_type
             if (book == 1) {
@@ -461,7 +461,10 @@ export default {
               return h('span', '大会员' + bigVip)
             } else if (words == '省份订阅包') {
               return h('span', '省份订阅包' + bookType)
-            } else {
+            } else if (row.orderProducttype == '碎片化小程序'){
+              return h('span', row.product_type + bookType)
+            }
+            else {
               return h('span', row.product_type)
             }
           }
@@ -808,7 +811,7 @@ export default {
   watch: {
     'filter.productType': {
       handler(newVal) {
-        if (newVal == '0' || newVal == '18') {
+        if (newVal == '超级订阅' || newVal == '省份订阅包') {
           this.select1 = true
           this.select2 = false
           this.select3 = false
@@ -817,7 +820,7 @@ export default {
           this.filter.dataType = ''
           this.filter.invoiceType = ''
           this.filter.level = ''
-        } else if (newVal == '2') {
+        } else if (newVal == '历史数据') {
           this.select2 = true
           this.select1 = false
           this.select3 = false
@@ -826,7 +829,7 @@ export default {
           this.filter.payType = ''
           this.filter.invoiceType = ''
           this.filter.level = ''
-        } else if (newVal == '4') {
+        } else if (newVal == '中标必听课') {
           this.select3 = true
           this.select1 = false
           this.select2 = false
@@ -835,7 +838,7 @@ export default {
           this.filter.dataType = ''
           this.filter.payType = ''
           this.filter.level = ''
-        } else if (newVal == '6') {
+        } else if (newVal == '大会员') {
           this.select4 = true
           this.select1 = false
           this.select2 = false
@@ -843,7 +846,7 @@ export default {
           this.select5 = false
           this.filter.dataType = ''
           this.filter.payType = ''
-        } else if (newVal == '12') {
+        } else if (newVal == '广告') {
           this.select5 = true
           this.select4 = false
           this.select1 = false
@@ -866,7 +869,18 @@ export default {
       deep: true
     }
   },
+  created(){
+    this.getproType()
+
+  },
   methods: {
+    getproType(){
+      this.$request('/order/productTypeFilter').data({}).success((res) => {
+        if(res.data){
+          this.proType = res.data.filter 
+        }
+      }).get()
+    },
     // 关闭弹框
     closeComDialog() {
       this.setDialogStatus.showDialog = false
@@ -929,7 +943,7 @@ export default {
       const sources = JSON.parse(row.filter).source ? JSON.parse(row.filter).source : ''
       const news = this.$router.resolve({
         path: '/order/orderList/orderDetail',
-        query: {id: row.id, proType: row.product_type, type: sources}
+        query: {id: row.id, proType: row.product_type, type: sources,otherType:row.orderProducttype}
       })
       window.open(news.href, '_blank')
     },