提交分支代码

.env

@@ -1,5 +1,5 @@
 VUE_APP_ADMIN_TOKEN_NAME = 'admin_token'
-VUE_APP_API_URL_PREFIX = 'http://web204-qmx_admin.jianyu360.cn/api/admin/'
+VUE_APP_API_URL_PREFIX = 'http://admin204.jydev.jianyu360.com/api/admin/'
 VUE_APP_API_ACTION_NAME = '_action'
 VUE_APP_API_TOKEN_NAME = '_token'
 VUE_APP_INDEX_URL = '/'

src/views/order/components/details.vue

@@ -164,6 +164,18 @@
             </div>
             <Divider />
         </div>
+        <!-- 剑鱼币 -->
+        <div class="infor-card" v-if="orderType == 12">
+            <div class="cont">
+                <div class="tit">产品信息</div>
+                <div class="classfity">
+                    <span>购买次数： &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<i v-if="book">{{book?numed(book.order_score)+'枚':'--'}}</i></span>                   
+                    <span>有效日期： &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<i v-if="orDetails">{{book.isPermanent?'永久':'--'}}</i></span>
+                    <span>手机号： &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{book.phone?book.phone:'--'}}</span>
+                </div>
+            </div>
+            <Divider />
+        </div>
         <!-- 支付信息 -->
         <div class="infor-card">
             <div class="cont">
@@ -424,6 +436,12 @@ export default {
         localed(val) {
             return val.toLocaleString('zh', { style:'currency', currency:'CNY' })
         },
+        numed (value) {
+            if (!value) return '0'
+            const intPart = Math.trunc(value)
+            const intPartFormat = intPart.toString().replace(/(\d)(?=(?:\d{3})+$)/g, '$1,')
+            return intPartFormat
+        },
         inited() {
             this.invoice.type = ''
             this.evidence.sum = ''

src/views/order/orderDetail.vue

@@ -48,6 +48,9 @@ export default {
             case '招标文件解读':
                 this.proStatus = '11'
                 break;
+            case '剑鱼币':
+                this.proStatus = '12'
+                break;
             case 'VIP订阅':
                 this.proStatus = '8'
                 break;

src/views/order/orderList.vue

@@ -294,6 +294,7 @@ export default {
                 {v: '7', n: '大会员-子账号'},
                 {v: '8', n: '大会员-补充包'},
                 {v: '9', n: '招标文件解读'},
+                {v: '10', n: '剑鱼币'},
                 {v: '0', n: '超级订阅'},
                 {v: '1', n: '数据报告'},
                 {v: '2', n: '历史数据'},

src/views/userManage/userDetail.vue

@@ -240,10 +240,10 @@ export default {
                 let mony = res.data.userOrderData
                 this.allPrice = this.localed(mony.Big.allMoney/100 + mony.BigSub.allMoney/100 + mony.BigSupply.allMoney/100 + mony.bidFile.allMoney/100
                 + mony.course_xs.allMoney/100 + mony.dataExport.allMoney/100 + mony.dataReport.allMoney/100
-                + mony.entniche.allMoney/100 + mony.vip.allMoney/100)
+                + mony.entniche.allMoney/100 + mony.jyB.allMoney/100 + mony.vip.allMoney/100)
 
                 this.payNum = mony.Big.payNum + mony.BigSub.payNum + mony.BigSupply.payNum + mony.bidFile.payNum + mony.course_xs.payNum + mony.dataExport.payNum 
-                + mony.dataReport.payNum + mony.entniche.payNum + mony.vip.payNum
+                + mony.dataReport.payNum + mony.entniche.payNum + mony.jyB.payNum + mony.vip.payNum
                 this.allInvoiceMoney = this.localed(res.data.allInvoiceMoney/100)
                 for (const i in this.orderDatas) {
                     if (this.orderDatas[i]) {

src/views/userManage/userList.vue

@@ -186,13 +186,13 @@
                 <Option value="2">否</Option>
               </Select>
             </FormItem>
-            <!-- <FormItem label="线下课程用户" :label-width="138" class="ji-chu lai-yuan bot-user">
-              <Select v-model="filter.isCourse" placeholder="全部" @on-change="allChange" style="width:76px">
+            <FormItem label="剑鱼币" :label-width="138" class="ji-chu lai-yuan bot-user">
+              <Select v-model="filter.isJyB" placeholder="全部" @on-change="allChange" style="width:76px">
                 <Option value="0">全部</Option>
                 <Option value="1">是</Option>
                 <Option value="2">否</Option>
               </Select>
-            </FormItem> -->
+            </FormItem>
           </div>
         </div>
         <br />
@@ -265,7 +265,7 @@ export default {
         this.filter.isEntniche = "";
         this.filter.isDataExport = "";
         this.filter.isDataReport = "";
-        this.filter.isCourse = "";
+        this.filter.isJyB = "";
         this.filter.isCourse_xs = "";
       }
     },
@@ -334,7 +334,7 @@ export default {
         isEntniche: "",
         isDataExport: "",
         isDataReport: "",
-        isCourse: "",
+        isJyB: "",
         isCourse_xs: "",
         minMoney: "",
         maxMoney: "",