Merge branch 'master' of http://18.167.157.193:1026/guanli/ngds into feature/1545-theo-addressModify

backendApi/config/menu.php

@@ -205,8 +205,8 @@ return [
 //            ['name'=>'车房养老奖流水导出', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'flow-cf-export', 'routePath'=>'bonus/flow-cf-export', 'show'=>0,],
 //            ['name'=>'领袖分红奖流水', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'flow-lx', 'routePath'=>'bonus/flow-lx', 'show'=>1,],
 //            ['name'=>'领袖分红奖流水导出', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'flow-lx-export', 'routePath'=>'bonus/flow-lx-export', 'show'=>0,],
-            ['name'=>'复消积分流水', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'flow-rp', 'routePath'=>'bonus/flow-rp', 'show'=>1,],
-            ['name'=>'复消积分流水导出', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'flow-rp-export', 'routePath'=>'bonus/flow-rp-export', 'show'=>0,],
+//            ['name'=>'复消积分流水', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'flow-rp', 'routePath'=>'bonus/flow-rp', 'show'=>1,],
+//            ['name'=>'复消积分流水导出', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'flow-rp-export', 'routePath'=>'bonus/flow-rp-export', 'show'=>0,],
             ['name'=>'兑换积分流水', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'flow-exchange', 'routePath'=>'bonus/flow-exchange', 'show'=>1,],
             ['name'=>'兑换积分流水导出', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'flow-exchange-export', 'routePath'=>'bonus/flow-exchange-export', 'show'=>0,],
             ['name'=>'会员余额流水', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'flow-balance', 'routePath'=>'bonus/flow-balance', 'show'=>1,],
@@ -468,7 +468,7 @@ return [
             ['name'=>'奖金基本配置', 'class'=>'', 'icon'=>'', 'controller'=>'config', 'action'=>'bonus', 'routePath'=>'config/bonus', 'show'=>0,],
 //            ['name'=>'区域/复销奖配置', 'class'=>'', 'icon'=>'', 'controller'=>'config', 'action'=>'bonus-dec-level', 'routePath'=>'config/bonus-dec-level', 'show'=>0,],
 //            ['name'=>'育成/车房/养老配置', 'class'=>'', 'icon'=>'', 'controller'=>'config', 'action'=>'bonus-emp-level', 'routePath'=>'config/bonus-emp-level', 'show'=>0,],
-            ['name'=>'期数配置', 'class'=>'', 'icon'=>'', 'controller'=>'config', 'action'=>'period', 'routePath'=>'config/period', 'show'=>1,],
+//            ['name'=>'期数配置', 'class'=>'', 'icon'=>'', 'controller'=>'config', 'action'=>'period', 'routePath'=>'config/period', 'show'=>1,],
 //            ['name'=>'会员注册类型配置', 'class'=>'', 'icon'=>'', 'controller'=>'config', 'action'=>'reg-type', 'routePath'=>'config/reg-type', 'show'=>1,],
 //            ['name'=>'会员注册类型编辑', 'class'=>'', 'icon'=>'', 'controller'=>'config', 'action'=>'reg-type-edit', 'routePath'=>'config/reg-type-edit', 'show'=>0,],
 //            ['name'=>'维护注册协议', 'class'=>'', 'icon'=>'', 'controller'=>'config', 'action'=>'pact-edit', 'routePath'=>'config/pact-edit', 'show'=>0,],

backendApi/modules/v1/models/lists/bonus/PerfOrderList.php

@@ -122,7 +122,7 @@ class PerfOrderList extends \common\libs\dataList\DataList implements DataListIn
                     ],
                 ],
                 'PV' => [
-                    'header' => '报单PV',
+                    'header' => '报单BV',
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -179,7 +179,7 @@ class PerfOrderList extends \common\libs\dataList\DataList implements DataListIn
                 'REAL_NAME'=> ['isUserTable'=> false, 'name'=> '会员姓名'],
                 'LAST_REC_USER_NAME'=> ['isUserTable'=> false, 'name'=> '结算时开拓者编号'],
                 'LAST_REC_REAL_NAME'=> ['isUserTable'=> false, 'name'=> '结算时开拓者姓名'],
-                'PV'=> ['isUserTable'=> false, 'name'=> '报单PV'],
+                'PV'=> ['isUserTable'=> false, 'name'=> '报单BV'],
                 'DEC_AMOUNT'=> ['isUserTable'=> false, 'name'=> '报单金额'],
                 'DEC_SN'=> ['isUserTable'=> false, 'name'=> '报单编号'],
                 'CREATED_AT'=> ['isUserTable'=> true, 'name'=> '创建时间', 'other'=> 'date'],

backendApi/modules/v1/models/lists/bonus/TraceDownQyList.php

@@ -147,7 +147,7 @@ class TraceDownQyList extends \common\libs\dataList\DataList implements DataList
                     ],
                 ],
                 'PV' => [
-                    'header' => '报单PV',
+                    'header' => '报单BV',
                     'value' => function($row) {
                         return (new Price([
                             'value' => $row['PV'],

backendApi/modules/v1/models/lists/shop/DecOrderList.php

@@ -114,7 +114,7 @@ class DecOrderList extends \common\libs\dataList\DataList implements DataListInt
                     },
                 ],
                 'DEC_PV' => [
-                    'header' => '报单PV',
+                    'header' => '报单BV',
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -242,7 +242,7 @@ class DecOrderList extends \common\libs\dataList\DataList implements DataListInt
                 'MOBILE'=> ['name'=> '会员手机号'],
                 'DEC_LV_NAME'=> ['name'=> '会员级别', 'other'=> 'decLevel'],
                 'DEC_AMOUNT'=> ['name'=> '报单金额'],
-                'DEC_PV'=> ['name'=> '报单报单PV'],
+                'DEC_PV'=> ['name'=> '报单报单BV'],
                 'PERIOD_NUM'=> ['name'=> '期数'],
                 'REC_USER_NAME'=> ['name'=> '报单时开拓者'],
                 'CREATED_AT'=> ['name'=> '创建时间', 'other'=> 'date'],

backendApi/modules/v1/models/lists/shop/GoodsList.php

@@ -118,7 +118,7 @@ class GoodsList extends \common\libs\dataList\DataList implements DataListInterf
                     },
                 ],
                 'PRICE_PV' => [
-                    'header' => '销售PV',
+                    'header' => '销售BV',
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -175,7 +175,7 @@ class GoodsList extends \common\libs\dataList\DataList implements DataListInterf
                 'GOODS_NO'=> ['name'=> '商品编号'],
 //                'SELL_TYPE'=> ['name'=> '复消购买方式', 'other'=> 'select', 'selectData'=> [['id'=> 1, 'name'=> '余额购买'],['id'=> 2, 'name'=> '积分购买']]],
                 'SELL_PRICE'=> ['name'=> '销售价格'],
-                'PRICE_PV'=> ['name'=> '销售PV'],
+                'PRICE_PV'=> ['name'=> '销售BV'],
                 'CATEGORY_TYPE' => ['name' => '商品分类', 'other'=> 'select', 'selectData'=> ShopGoods::CATEGORY_TYPE],
             ];
         }

backendApi/modules/v1/models/lists/shop/OrderDecList.php

@@ -121,7 +121,7 @@ class OrderDecList extends \common\libs\dataList\DataList implements DataListInt
                     ],
                 ],
                 'PAY_PV' => [
-                    'header' => '支付PV',
+                    'header' => '支付BV',
                     'headerOther' => [
                         'width' => '150',
                     ],

backendApi/modules/v1/models/lists/shop/OrderShopList.php

@@ -131,7 +131,7 @@ class OrderShopList extends \common\libs\dataList\DataList implements DataListIn
                     ],
                 ],
                 'PAY_PV' => [
-                    'header' => '支付PV',
+                    'header' => '支付BV',
                     'headerOther' => [
                         'width' => '150',
                     ],

backendApi/modules/v1/models/lists/shop/OrderStandardList.php

@@ -132,7 +132,7 @@ class OrderStandardList extends \common\libs\dataList\DataList implements DataLi
                     ],
                 ],
                 'PAY_PV' => [
-                    'header' => '支付PV',
+                    'header' => '支付BV',
                     'headerOther' => [
                         'width' => '150',
                     ],

backendApi/modules/v1/models/lists/shop/PackageList.php

@@ -69,7 +69,7 @@ class PackageList extends \common\libs\dataList\DataList implements DataListInte
                     },
                 ],
                 'PV' => [
-                    'header' => '套餐PV',
+                    'header' => '套餐BV',
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -120,7 +120,7 @@ class PackageList extends \common\libs\dataList\DataList implements DataListInte
                 'LEVEL_NAME'=> ['name'=> '所属报单级别', 'other'=> 'decLevel'],
                 'PACKAGE_NAME'=> ['name'=> '套餐名称'],
                 'AMOUNT'=> ['name'=> '套餐金额'],
-                'PV'=> ['name'=> '套餐PV'],
+                'PV'=> ['name'=> '套餐BV'],
                 'STATUS'=> ['name'=> '状态', 'other'=> 'select', 'selectData'=> [['id'=> 1, 'name'=> '已上架'],['id'=> 0, 'name'=> '已下架']]],
             ];
         }

backendEle/src/components/DecListTable.vue

@@ -10,19 +10,19 @@
       </el-table-column>
       <el-table-column label="报单金额" prop="DEC_AMOUNT" v-if="type!=='OR'"></el-table-column>
       <el-table-column label="订货单金额" prop="ORDER_AMOUNT" v-if="type==='OR'"></el-table-column>
-      <el-table-column label="报单PV" prop="DEC_PV" v-if="type!=='OR'"></el-table-column>
-      <el-table-column label="订货单PV" prop="ORDER_PV" v-if="type==='OR'"></el-table-column>
+      <el-table-column label="报单BV" prop="DEC_PV" v-if="type!=='OR'"></el-table-column>
+      <el-table-column label="订货单BV" prop="ORDER_PV" v-if="type==='OR'"></el-table-column>
       <el-table-column label="支付钱包">
         <template slot-scope="scope">
           {{paidType[scope.row.PAID_WALLET].title}}<br>
         </template>
       </el-table-column>
-      <el-table-column label="返利PV" v-if="type==='OR'">
+      <el-table-column label="返利BV" v-if="type==='OR'">
         <template slot-scope="scope">
           {{scope.row.FL_PV}}<br>
         </template>
       </el-table-column>
-      <el-table-column label="补贴PV" v-if="type==='OR'">
+      <el-table-column label="补贴BV" v-if="type==='OR'">
         <template slot-scope="scope">
           {{scope.row.BT_PV}}<br>
         </template>
@@ -86,4 +86,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>

backendEle/src/router/index.js

@@ -742,18 +742,18 @@ export const constantRouterMap = [
           ],
         },
       },
-      {
-        path: '/bonus/flow-rp',
-        component: _import('bonus/flow-rp'),
-        name: 'bonus_flow-rp',
-        meta: {
-          title: '复消积分流水',
-          breadcrumb: [
-            {title: '首页', path: '/dashboard/index'},
-            {title: '奖金管理', path: '/bonus/period'},
-          ],
-        },
-      },
+      // {
+      //   path: '/bonus/flow-rp',
+      //   component: _import('bonus/flow-rp'),
+      //   name: 'bonus_flow-rp',
+      //   meta: {
+      //     title: '复消积分流水',
+      //     breadcrumb: [
+      //       {title: '首页', path: '/dashboard/index'},
+      //       {title: '奖金管理', path: '/bonus/period'},
+      //     ],
+      //   },
+      // },
       {
         path: '/bonus/flow-lx',
         component: _import('bonus/flow-lx'),

backendEle/src/views/bonus/perf.vue

@@ -15,40 +15,40 @@
           <template slot-scope="scope">
             <el-form label-position="left" inline class="demo-table-expand">
               <el-form-item label="个人首购">
-                <span>{{tool.formatPrice(scope.row.PV_PCS_ZC)}}PV</span>
+                <span>{{tool.formatPrice(scope.row.PV_PCS_ZC)}}BV</span>
               </el-form-item>
               <el-form-item label="个人增购">
-                <span>{{tool.formatPrice(scope.row.PV_PCS_ZG)}}PV</span>
+                <span>{{tool.formatPrice(scope.row.PV_PCS_ZG)}}BV</span>
               </el-form-item>
               <el-form-item label="个人零售">
-                <span>{{tool.formatPrice(scope.row.PV_PCS_LS)}}PV</span>
+                <span>{{tool.formatPrice(scope.row.PV_PCS_LS)}}BV</span>
               </el-form-item>
               <el-form-item label="个人复销">
-                <span>{{tool.formatPrice(scope.row.PV_PCS_FX)}}PV</span>
+                <span>{{tool.formatPrice(scope.row.PV_PCS_FX)}}BV</span>
               </el-form-item>
               <el-form-item label="左区业绩">
-                <span>{{tool.formatPrice(Number.parseFloat(scope.row.PV_1L_ZC) + Number.parseFloat(scope.row.PV_1L_ZG) + Number.parseFloat(scope.row.PV_1L_LS) + Number.parseFloat(scope.row.PV_1L_FX))}}PV</span>
+                <span>{{tool.formatPrice(Number.parseFloat(scope.row.PV_1L_ZC) + Number.parseFloat(scope.row.PV_1L_ZG) + Number.parseFloat(scope.row.PV_1L_LS) + Number.parseFloat(scope.row.PV_1L_FX))}}BV</span>
               </el-form-item>
               <el-form-item label="中区业绩">
-                <span>{{tool.formatPrice(Number.parseFloat(scope.row.PV_2L_ZC) + Number.parseFloat(scope.row.PV_2L_ZG) + Number.parseFloat(scope.row.PV_2L_LS) + Number.parseFloat(scope.row.PV_2L_FX))}}PV</span>
+                <span>{{tool.formatPrice(Number.parseFloat(scope.row.PV_2L_ZC) + Number.parseFloat(scope.row.PV_2L_ZG) + Number.parseFloat(scope.row.PV_2L_LS) + Number.parseFloat(scope.row.PV_2L_FX))}}BV</span>
               </el-form-item>
               <el-form-item label="右区业绩">
-                <span>{{tool.formatPrice(Number.parseFloat(scope.row.PV_3L_ZC) + Number.parseFloat(scope.row.PV_3L_ZG) + Number.parseFloat(scope.row.PV_3L_LS) + Number.parseFloat(scope.row.PV_3L_FX))}}PV</span>
+                <span>{{tool.formatPrice(Number.parseFloat(scope.row.PV_3L_ZC) + Number.parseFloat(scope.row.PV_3L_ZG) + Number.parseFloat(scope.row.PV_3L_LS) + Number.parseFloat(scope.row.PV_3L_FX))}}BV</span>
               </el-form-item>
               <el-form-item label="零售区业绩">
-                <span>{{tool.formatPrice(scope.row.PV_PERSON_LS)}}PV</span>
+                <span>{{tool.formatPrice(scope.row.PV_PERSON_LS)}}BV</span>
               </el-form-item>
               <el-form-item label="上期左区结余未碰业绩">
-                <span>{{tool.formatPrice(scope.row.SURPLUS_1L)}}PV</span>
+                <span>{{tool.formatPrice(scope.row.SURPLUS_1L)}}BV</span>
               </el-form-item>
               <el-form-item label="上期中区结余未碰业绩">
-                <span>{{tool.formatPrice(scope.row.SURPLUS_2L)}}PV</span>
+                <span>{{tool.formatPrice(scope.row.SURPLUS_2L)}}BV</span>
               </el-form-item>
               <el-form-item label="上期右区结余未碰业绩">
-                <span>{{tool.formatPrice(scope.row.SURPLUS_3L)}}PV</span>
+                <span>{{tool.formatPrice(scope.row.SURPLUS_3L)}}BV</span>
               </el-form-item>
               <el-form-item label="上期零售区结余未碰业绩">
-                <span>{{tool.formatPrice(scope.row.SURPLUS_LS)}}PV</span>
+                <span>{{tool.formatPrice(scope.row.SURPLUS_LS)}}BV</span>
               </el-form-item>
             </el-form>
           </template>
@@ -135,4 +135,4 @@ export default {
     margin-right: 0;
     margin-bottom: 0;
   }
-</style>
+</style>

backendEle/src/views/config/dec-level.vue

@@ -8,7 +8,7 @@
             <el-tag type="warning" size="small" class="no-border">{{scope.row.LEVEL_NAME}}</el-tag>
           </template>
         </el-table-column>
-        <el-table-column prop="PERF" label="所需业绩(PV)">
+        <el-table-column prop="PERF" label="所需业绩(BV)">
           <template slot-scope="scope">
             <el-tag type="danger" size="small" class="no-border">{{scope.row.PERF}}</el-tag>
           </template>
@@ -140,4 +140,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>

backendEle/src/views/config/emp-level-edit.vue

@@ -25,7 +25,7 @@
           <el-input v-model="form.sort"></el-input>
         </el-form-item>
         </div>
-        <el-form-item label="其他部门PV" v-show="otherPerfShow">
+        <el-form-item label="其他部门BV" v-show="otherPerfShow">
           <el-input v-model="form.otherDepartPerf"></el-input>
         </el-form-item>
         <el-form-item label="图标类型 ">

backendEle/src/views/config/emp-level.vue

@@ -11,7 +11,7 @@
         <el-table-column label="等级要求" width="400">
           <template slot-scope="scope">
             <span v-show="scope.row.LOCATION_NUM>0">有 {{scope.row.LOCATION_NUM}} 个部门（及以上）</span>
-            <span v-show="scope.row.OTHER_DEPART_PERF>0">去最大部门，其他部门累计大于等于 {{scope.row.OTHER_DEPART_PERF}} PV</span>
+            <span v-show="scope.row.OTHER_DEPART_PERF>0">去最大部门，其他部门累计大于等于 {{scope.row.OTHER_DEPART_PERF}} BV</span>
             <span v-show="scope.row.MIN_EMPLOY_LEVEL !== null && scope.row.MIN_EMPLOY_NUM>0">，各{{scope.row.MIN_EMPLOY_NUM}}个 {{scope.row.MIN_EMPLOY_LEVEL_NAME}} </span>
             <span v-show="scope.row.SORT==='8'">，任意部门1个高级总监</span>
           </template>

backendEle/src/views/reconsume/change-audit-add.vue

@@ -17,7 +17,7 @@
         <el-form-item :label="form.type === 0 ? '调整积分' : '调整月数'">
           <el-input v-model="form.changeAmount"></el-input>
           <template>
-            <el-tag v-if="form.type === 0" type="success">可用余额：{{balance.unusedPV}}PV</el-tag>
+            <el-tag v-if="form.type === 0" type="success">可用余额：{{balance.unusedPV}}BV</el-tag>
             <el-tag v-if="form.type === 1" type="success">可用月数：{{balance.unusedMonth}}</el-tag>
           </template>
         </el-form-item>

backendEle/src/views/reconsume/change-audit-list.vue

@@ -79,7 +79,7 @@
           <el-form-item label="调整积分" v-if="form.type==='0'">
             <el-input v-model="form.changePv"></el-input>
             <template>
-              <el-tag type="success">可用余额：{{form.balance.unusedPV}}PV</el-tag>
+              <el-tag type="success">可用余额：{{form.balance.unusedPV}}BV</el-tag>
             </template>
           </el-form-item>
           <el-form-item label="调整月数" v-if="form.type==='1'">
@@ -119,7 +119,7 @@
           <el-form-item label="调整积分" v-if="form.type==='0'">
             <el-input v-model="form.changePv"></el-input>
             <template>
-              <el-tag type="success">可用余额：{{form.balance.unusedPV}}PV</el-tag>
+              <el-tag type="success">可用余额：{{form.balance.unusedPV}}BV</el-tag>
             </template>
           </el-form-item>
           <el-form-item label="调整月数" v-if="form.type==='1'">
@@ -398,4 +398,4 @@
 
 <style scoped>
 
-</style>
+</style>

backendEle/src/views/reconsume/deduct-audit-add.vue

@@ -25,10 +25,10 @@
             <el-option v-for="(item, key) in allMonth" :key="key" :label="item.title" :value="item.value" :disabled="item.disabled"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="可用PV" v-show="unusedPV!==null">
+        <el-form-item label="可用BV" v-show="unusedPV!==null">
           <el-input :value="unusedPV" :disabled="true"></el-input>
         </el-form-item>
-        <el-form-item label="补扣PV" v-show="deductPv!==null">
+        <el-form-item label="补扣BV" v-show="deductPv!==null">
           <el-input :value="deductPv" :disabled="true"></el-input>
         </el-form-item>
         <el-form-item label="备注" v-if="false">

backendEle/src/views/report/dec-table.vue

@@ -31,7 +31,7 @@
           {{tool.formatPrice(scope.row.DEC_AMOUNT)}}
         </template>
       </el-table-column>
-      <el-table-column label="报单PV">
+      <el-table-column label="报单BV">
         <template slot-scope="scope">
           {{tool.formatPrice(scope.row.DEC_PV)}}
         </template>

backendEle/src/views/shop/goods-add.vue

@@ -38,7 +38,7 @@
                 <el-form-item label="销售价格">
                     <el-input v-model="form.sellPrice"></el-input>
                 </el-form-item>
-                <el-form-item label="价格PV" v-show="pvDisabled">
+                <el-form-item label="价格BV" v-show="pvDisabled">
                     <el-input v-model="form.pricePv"></el-input>
                 </el-form-item>
                 <!-- <el-form-item label="兑换积分">

backendEle/src/views/shop/index.vue

@@ -102,7 +102,7 @@
                     <el-form-item label="销售价格" p>
                         <el-input v-model="form.sellPrice"></el-input>
                     </el-form-item>
-                    <el-form-item label="价格PV" v-show="pvDisabled">
+                    <el-form-item label="价格BV" v-show="pvDisabled">
                         <el-input v-model="form.pricePv"></el-input>
                     </el-form-item>
                     <el-form-item label="兑换积分" v-show="false">

backendEle/src/views/shop/package-add.vue

@@ -12,7 +12,7 @@
                 <el-form-item label="套餐金额">
                     <el-input v-model="form.amount"></el-input>
                 </el-form-item>
-                <el-form-item label="套餐PV">
+                <el-form-item label="套餐BV">
                     <el-input v-model="form.amountPv"></el-input>
                 </el-form-item>
                 <el-form-item label="报单级别ID">
@@ -107,4 +107,4 @@
 
 <style scoped>
 
-</style>
+</style>

backendEle/src/views/shop/package.vue

@@ -58,7 +58,7 @@
                 <el-form-item label="套餐金额">
                     <el-input v-model="form.amount"></el-input>
                 </el-form-item>
-                <el-form-item label="套餐PV">
+                <el-form-item label="套餐BV">
                     <el-input v-model="form.amountPv"></el-input>
                 </el-form-item>
                 <el-form-item label="报单级别ID">

backendEle/src/views/user/re-consume-audit-add.vue

@@ -7,14 +7,14 @@
         </el-form-item>
         <el-form-item label="调整类型">
           <el-select v-model="form.type" placeholder="调整类型">
-            <el-option label="调整余额PV" :value="0"></el-option>
+            <el-option label="调整余额BV" :value="0"></el-option>
             <el-option label="调整剩余月数" :value="1"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item :label="form.type === 0 ? '调整额度' : '调整月数'">
           <el-input v-model="form.changeAmount"></el-input>
           <template>
-            <el-tag v-if="form.type === 0" type="success">可用余额：{{balance.unusedPV}}PV</el-tag>
+            <el-tag v-if="form.type === 0" type="success">可用余额：{{balance.unusedPV}}BV</el-tag>
             <el-tag v-if="form.type === 1" type="success">可用月数：{{balance.unusedMonth}}</el-tag>
           </template>
 
@@ -89,4 +89,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>

backendEle/src/views/user/re-consume-audit-list.vue

@@ -6,7 +6,7 @@
         <el-table-column type="selection" width="55"></el-table-column>
         <el-table-column label="会员编号" prop="USER_NAME" width="150"></el-table-column>
         <el-table-column label="会员姓名" prop="REAL_NAME"></el-table-column>
-        <el-table-column label="变动PV">
+        <el-table-column label="变动BV">
           <template slot-scope="scope">
             <span>{{scope.row.CHANGE_PV}}</span>
           </template>
@@ -138,4 +138,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>

backendEle/src/views/user/re-consume-list.vue

@@ -16,7 +16,7 @@
             <span>{{baseInfo.empLevels[scope.row.EMP_LV].LEVEL_NAME}}</span>
           </template>
         </el-table-column>
-        <el-table-column label="复销未用PV">
+        <el-table-column label="复销未用BV">
           <template slot-scope="scope">
             <span>{{scope.row.UNUSED_PV}}</span>
           </template>
@@ -119,4 +119,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>

common/models/DeclarationPackage.php

@@ -62,7 +62,7 @@ class DeclarationPackage extends \common\components\ActiveRecord
             'PACKAGE_NO' => '套餐编号',
             'LEVEL_ID' => '所属报单级别ID',
             'AMOUNT' => '套餐金额',
-            'PV' => '套餐PV',
+            'PV' => '套餐BV',
             'PACKAGE_CONTENT' => '套餐内容',
             'CREATED_AT' => '创建时间',
             'CREATE_ADMIN' => '创建人',

common/models/Order.php

@@ -93,9 +93,9 @@ class Order extends \common\components\ActiveRecord
             'USER_NAME' => '会员编号',
             'ORDER_TYPE' => '订货类型',
             'ORDER_AMOUNT' => '订单总价格',
-            'PV' => '订货PV',
+            'PV' => '订货BV',
             'PAY_AMOUNT' => '支付价格',
-            'PAY_PV' => '实付PV',
+            'PAY_PV' => '实付BV',
             'PAY_AT' => '支付时间',
             'PAY_TYPE' => '支付方式',
             'FREIGHT' => '运费',

common/models/OrderDec.php

@@ -93,9 +93,9 @@ class OrderDec extends \common\components\ActiveRecord
             'USER_NAME' => '会员编号',
             'ORDER_TYPE' => '订货类型',
             'ORDER_AMOUNT' => '订单总价格',
-            'PV' => '订货PV',
+            'PV' => '订货BV',
             'PAY_AMOUNT' => '支付价格',
-            'PAY_PV' => '实付PV',
+            'PAY_PV' => '实付BV',
             'PAY_AT' => '支付时间',
             'PAY_TYPE' => '支付方式',
             'FREIGHT' => '运费',

common/models/OrderGoods.php

@@ -61,8 +61,8 @@ class OrderGoods extends \common\components\ActiveRecord
             'GOODS_TITLE' => '商品名称',
             'PRICE' => '价格',
             'REAL_PRICE' => '实际价格',
-            'PV' => '订货PV',
-            'REAL_PV' => '实际PV',
+            'PV' => '订货BV',
+            'REAL_PV' => '实际BV',
             'POINT' => '兑换积分',
             'SKU_CODE' => '商品编码',
             'BUY_NUMS' => '购买数量',

common/models/OrderGoodsDec.php

@@ -58,8 +58,8 @@ class OrderGoodsDec extends \common\components\ActiveRecord
             'GOODS_TITLE' => '商品名称',
             'PRICE' => '价格',
             'REAL_PRICE' => '实际价格',
-            'PV' => '订货PV',
-            'REAL_PV' => '实际PV',
+            'PV' => '订货BV',
+            'REAL_PV' => '实际BV',
             'POINT' => '兑换积分',
             'PERIOD_NUM' => '期数',
             'ORDER_DAY' => '日期',

common/models/OrderGoodsShop.php

@@ -57,8 +57,8 @@ class OrderGoodsShop extends \common\components\ActiveRecord
             'GOODS_TITLE' => '商品名称',
             'PRICE' => '价格',
             'REAL_PRICE' => '实际价格',
-            'PV' => '订货PV',
-            'REAL_PV' => '实际PV',
+            'PV' => '订货BV',
+            'REAL_PV' => '实际BV',
             'POINT' => '兑换积分',
             'PERIOD_NUM' => '期数',
             'SKU_CODE' => '商品编码',

common/models/OrderStandard.php

@@ -94,7 +94,7 @@ class OrderStandard extends \common\components\ActiveRecord
             'ORDER_AMOUNT' => 'Order  Amount',
             'PV' => 'Pv',
             'PAY_AMOUNT' => 'Pay  Amount',
-            'PAY_PV' => 'Pay  Pv',
+            'PAY_PV' => 'Pay  Bv',
             'PAY_AT' => 'Pay  At',
             'FREIGHT' => 'Freight',
             'PAY_FREIGHT' => 'Pay  Freight',

common/models/OrderStandardGoods.php

@@ -58,8 +58,8 @@ class OrderStandardGoods extends \common\components\ActiveRecord
             'GOODS_TITLE' => 'Goods  Title',
             'PRICE' => 'Price',
             'REAL_PRICE' => 'Real  Price',
-            'PV' => 'Pv',
-            'REAL_PV' => 'Real  Pv',
+            'PV' => 'Bv',
+            'REAL_PV' => 'Real  Bv',
             'SKU_CODE' => 'Sku  Code',
             'BUY_NUMS' => 'Buy  Nums',
             'POINT' => 'Point',

common/models/PerfOrder.php

@@ -92,7 +92,7 @@ class PerfOrder extends \common\components\ActiveRecord
             'LAST_STATUS' => '结算时状态',
             'LAST_REC_USER_NAME' => '结算时开拓者编号',
             'LAST_REC_REAL_NAME' => '结算时开拓者姓名',
-            'PV' => '业绩单PV',
+            'PV' => '业绩单BV',
             'DEC_AMOUNT' => '报单金额',
             'LAST_SUB_COM_ID' => '结算时所属分公司',
             'LAST_PROVINCE' => '结算时省份',

common/models/forms/DecPackageForm.php

@@ -45,7 +45,7 @@ class DecPackageForm extends Model
             'packageName' => '套餐名称',
             'packageNo' => '套餐编号',
             'amount' => '套餐金额',
-            'amountPv' => '套餐PV',
+            'amountPv' => '套餐BV',
             'levelId' => '所属报单级别',
             'packageContent' => '套餐详情',
         ];

common/models/forms/ExcelOrderDecForm.php

@@ -47,8 +47,8 @@ class ExcelOrderDecForm extends \common\components\ActiveRecord
         '数量' => 'BUY_NUMS',
         '商品单价' => 'PRICE',
         '商品金额' => 'REAL_PRICE',
-        '商品PV' => 'PV',
-        'PV合计' => 'REAL_PV',
+        '商品BV' => 'PV',
+        'BV合计' => 'REAL_PV',
         '期数' => 'PERIOD_NUM',
     ];
 

common/models/forms/ExcelOrderShopForm.php

@@ -47,8 +47,8 @@ class ExcelOrderShopForm extends \common\components\ActiveRecord
         '数量' => 'BUY_NUMS',
         '商品单价' => 'PRICE',
         '商品金额' => 'REAL_PRICE',
-        '商品PV' => 'PV',
-        'PV合计' => 'REAL_PV',
+        '商品BV' => 'PV',
+        'BV合计' => 'REAL_PV',
         '期数' => 'PERIOD_NUM',
     ];
 

common/models/forms/ShopGoodsForm.php

@@ -129,7 +129,7 @@ class ShopGoodsForm extends Model
             }
 
             // 购买方式格式化为','分割的方式
-            $sellType = implode(',', array_column($sellType, 'id'));
+            $this->sellType = implode(',', array_column($sellType, 'id'));
             // 如果是普通商品,有PV，旅游、名车、豪宅商品没有PV
             if ($this->categoryType != 1) {
                 $this->pricePv = 0;

frontendApi/modules/v1/controllers/BonusController.php

@@ -373,7 +373,7 @@ class BonusController extends BaseController {
         $calcBonus = CalcBonus::find()->where('USER_ID=:USER_ID AND IS_SENT=1', [':USER_ID' => \Yii::$app->user->id])
         ->select('PERIOD_NUM,ORI_BONUS_QY,ORI_BONUS_YC,ORI_BONUS_VIP,ORI_BONUS_STANDARD,ORI_BONUS_BD,ORI_BONUS_TG,
         ORI_BONUS_XF,BONUS_TOTAL,MANAGE_TAX,BONUS_REAL,BONUS_INCOME,ORI_BONUS_YJ,ORI_BONUS_GX,ORI_BONUS_GL,RECONSUME_POINTS,
-        LAST_DEC_LV,LAST_EMP_LV,EXCHANGE_POINTS,ORI_BONUS_BS')
+        LAST_DEC_LV,LAST_EMP_LV,EXCHANGE_POINTS,ORI_BONUS_BS,ORI_BONUS_BS_MNT,ORI_BONUS_BS_ABBR,BONUS_TRAVEL,BONUS_CAR,BONUS_HOUSE')
         ->limit($showBonusPeriodNum)
         ->orderBy('PERIOD_NUM DESC')
         ->asArray()
@@ -411,7 +411,7 @@ class BonusController extends BaseController {
                 $calcBonus[$key]['ORI_BONUS_BS_MNT'] = ['name' => '管理奖金', 'value' => Tool::formatPrice($calcBonus[$key]['ORI_BONUS_BS_MNT'])];
                 $calcBonus[$key]['ORI_BONUS_BS_ABBR'] = ['name' => '绩效奖金', 'value' => Tool::formatPrice($calcBonus[$key]['ORI_BONUS_BS_ABBR'])];
 
-                $calcBonus[$key]['ORI_BONUS_QUARTER'] = ['name' => '季度奖金', 'value' => Tool::formatPrice($calcBonus[$key]['ORI_BONUS_QUARTER'])];
+                $calcBonus[$key]['ORI_BONUS_QUARTER'] = ['name' => '季度奖金', 'value' => Tool::formatPrice($calcBonus[$key]['ORI_BONUS_QUARTER'] ?? 0)];
                 $calcBonus[$key]['BONUS_TRAVEL'] = ['name' => '旅游奖', 'value' => Tool::formatPrice($calcBonus[$key]['BONUS_TRAVEL'])];
                 $calcBonus[$key]['BONUS_CAR'] = ['name' => '名车奖', 'value' => Tool::formatPrice($calcBonus[$key]['BONUS_CAR'])];
                 $calcBonus[$key]['BONUS_HOUSE'] = ['name' => '豪宅奖', 'value' => Tool::formatPrice($calcBonus[$key]['BONUS_HOUSE'])];
@@ -491,7 +491,7 @@ class BonusController extends BaseController {
 //            $tableKey[] = 'BONUS_TOTAL';
 //        }
 
-        return static::notice(['tableData' => $calcBonus, 'tableKey' => $tableKey]);
+        return static::notice(['tableData' => $calcBonus, 'tableKey' => '']);
     }
 
     /**

frontendApi/modules/v1/controllers/FinanceController.php

@@ -211,7 +211,14 @@ class FinanceController extends BaseController {
 //        }
         $minAmount = Cache::getSystemConfig()['manualWithdrawMinAmount']['VALUE'] ?? 0;
         $fee = Cache::getSystemConfig()['withdrawFee']['VALUE'] ?? 0;
-        return static::notice(['userInfo' => $userInfo, 'isPact' => $regType['IS_PACT'], 'content' => $oneData['CONTENT'] ?? '', 'withdrawFee'=>$fee]);
+
+        return static::notice([
+            'userInfo' => $userInfo,
+            'isPact' => $regType['IS_PACT'] ?? '',
+            'content' => $oneData['CONTENT'] ?? '',
+            'withdrawFee'=>$fee,
+            'minAmount' => $minAmount,
+        ]);
     }
 
     /**

frontendEle/src/components/DecListTable.vue

@@ -8,20 +8,20 @@
         </template>
       </el-table-column>
       <el-table-column label="报单金额" prop="DEC_AMOUNT" v-if="type!=='OR'"></el-table-column>
-      <el-table-column label="报单PV" prop="DEC_PV" v-if="type!=='OR'"></el-table-column>
+      <el-table-column label="报单BV" prop="DEC_PV" v-if="type!=='OR'"></el-table-column>
       <el-table-column label="订货单金额" prop="ORDER_AMOUNT" v-if="type==='OR'"></el-table-column>
-      <el-table-column label="订货单PV" prop="ORDER_PV" v-if="type==='OR'"></el-table-column>
+      <el-table-column label="订货单BV" prop="ORDER_PV" v-if="type==='OR'"></el-table-column>
       <el-table-column label="支付钱包">
         <template slot-scope="scope">
           {{paidType[scope.row.PAID_WALLET].title}}<br>
         </template>
       </el-table-column>
-      <el-table-column label="返利PV" v-if="type==='OR'">
+      <el-table-column label="返利BV" v-if="type==='OR'">
         <template slot-scope="scope">
           {{scope.row.FL_PV}}<br>
         </template>
       </el-table-column>
-      <el-table-column label="补贴PV" v-if="type==='OR'">
+      <el-table-column label="补贴BV" v-if="type==='OR'">
         <template slot-scope="scope">
           {{scope.row.BT_PV}}<br>
         </template>
@@ -85,4 +85,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>

frontendEle/src/views/finance/perf.vue

@@ -13,40 +13,40 @@
           <template slot-scope="scope">
             <el-form label-position="left" inline class="demo-table-expand">
               <el-form-item label="个人首购">
-                <span>{{tool.formatPrice(scope.row.PV_PCS_ZC)}}PV</span>
+                <span>{{tool.formatPrice(scope.row.PV_PCS_ZC)}}BV</span>
               </el-form-item>
               <el-form-item label="个人增购">
-                <span>{{tool.formatPrice(scope.row.PV_PCS_ZG)}}PV</span>
+                <span>{{tool.formatPrice(scope.row.PV_PCS_ZG)}}BV</span>
               </el-form-item>
               <el-form-item label="个人零售">
-                <span>{{tool.formatPrice(scope.row.PV_PCS_LS)}}PV</span>
+                <span>{{tool.formatPrice(scope.row.PV_PCS_LS)}}BV</span>
               </el-form-item>
               <el-form-item label="个人复销">
-                <span>{{tool.formatPrice(scope.row.PV_PCS_FX)}}PV</span>
+                <span>{{tool.formatPrice(scope.row.PV_PCS_FX)}}BV</span>
               </el-form-item>
               <el-form-item label="左区业绩">
-                <span>{{tool.formatPrice(Number.parseFloat(scope.row.PV_1L_ZC) + Number.parseFloat(scope.row.PV_1L_ZG) + Number.parseFloat(scope.row.PV_1L_LS) + Number.parseFloat(scope.row.PV_1L_FX))}}PV</span>
+                <span>{{tool.formatPrice(Number.parseFloat(scope.row.PV_1L_ZC) + Number.parseFloat(scope.row.PV_1L_ZG) + Number.parseFloat(scope.row.PV_1L_LS) + Number.parseFloat(scope.row.PV_1L_FX))}}BV</span>
               </el-form-item>
               <el-form-item label="中区业绩">
-                <span>{{tool.formatPrice(Number.parseFloat(scope.row.PV_2L_ZC) + Number.parseFloat(scope.row.PV_2L_ZG) + Number.parseFloat(scope.row.PV_2L_LS) + Number.parseFloat(scope.row.PV_2L_FX))}}PV</span>
+                <span>{{tool.formatPrice(Number.parseFloat(scope.row.PV_2L_ZC) + Number.parseFloat(scope.row.PV_2L_ZG) + Number.parseFloat(scope.row.PV_2L_LS) + Number.parseFloat(scope.row.PV_2L_FX))}}BV</span>
               </el-form-item>
               <el-form-item label="右区业绩">
-                <span>{{tool.formatPrice(Number.parseFloat(scope.row.PV_3L_ZC) + Number.parseFloat(scope.row.PV_3L_ZG) + Number.parseFloat(scope.row.PV_3L_LS) + Number.parseFloat(scope.row.PV_3L_FX))}}PV</span>
+                <span>{{tool.formatPrice(Number.parseFloat(scope.row.PV_3L_ZC) + Number.parseFloat(scope.row.PV_3L_ZG) + Number.parseFloat(scope.row.PV_3L_LS) + Number.parseFloat(scope.row.PV_3L_FX))}}BV</span>
               </el-form-item>
               <el-form-item label="零售区业绩">
-                <span>{{tool.formatPrice(scope.row.PV_PERSON_LS)}}PV</span>
+                <span>{{tool.formatPrice(scope.row.PV_PERSON_LS)}}BV</span>
               </el-form-item>
               <el-form-item label="上期左区结余未碰业绩">
-                <span>{{tool.formatPrice(scope.row.SURPLUS_1L)}}PV</span>
+                <span>{{tool.formatPrice(scope.row.SURPLUS_1L)}}BV</span>
               </el-form-item>
               <el-form-item label="上期中区结余未碰业绩">
-                <span>{{tool.formatPrice(scope.row.SURPLUS_2L)}}PV</span>
+                <span>{{tool.formatPrice(scope.row.SURPLUS_2L)}}BV</span>
               </el-form-item>
               <el-form-item label="上期右区结余未碰业绩">
-                <span>{{tool.formatPrice(scope.row.SURPLUS_3L)}}PV</span>
+                <span>{{tool.formatPrice(scope.row.SURPLUS_3L)}}BV</span>
               </el-form-item>
               <el-form-item label="上期零售区结余未碰业绩">
-                <span>{{tool.formatPrice(scope.row.SURPLUS_LS)}}PV</span>
+                <span>{{tool.formatPrice(scope.row.SURPLUS_LS)}}BV</span>
               </el-form-item>
             </el-form>
           </template>
@@ -132,4 +132,4 @@ export default {
     margin-right: 0;
     margin-bottom: 0;
   }
-</style>
+</style>

frontendEle/src/views/shop/dec-order-list.vue

@@ -6,7 +6,7 @@
                 <el-table-column label="商品名称" prop="GOODS_TITLE"></el-table-column>
                 <el-table-column label="数量" prop="BUY_NUMS"></el-table-column>
                 <el-table-column label="报单金额" prop="REAL_PRICE"></el-table-column>
-                <el-table-column label="报单PV" prop="REAL_PV"></el-table-column>
+                <el-table-column label="报单BV" prop="REAL_PV"></el-table-column>
                 <el-table-column label="报单编号" prop="DEC_SN"></el-table-column>
                 <el-table-column label="订单编号" prop="ORDER_SN"></el-table-column>
                 <el-table-column label="会员编号" prop="USER_NAME"></el-table-column>

frontendEle/src/views/shop/index.vue

@@ -28,7 +28,7 @@
                               <span>{{ Math.round(scope.row.SELL_PRICE * 100) / 100 }}</span>
                           </template>
                       </el-table-column>
-                      <el-table-column label="价格PV" prop="PRICE_PV" v-if="goodsCategory === '1'">
+                      <el-table-column label="价格BV" prop="PRICE_PV" v-if="goodsCategory === '1'">
                           <template slot-scope="scope">
                               <span>{{ Math.round(scope.row.PRICE_PV * 100) / 100 }}</span>
                           </template>

frontendEle/src/views/shop/order-list.vue

@@ -10,7 +10,7 @@
                         {{ Math.round(props.row.REAL_PRICE * props.row.BUY_NUMS * 100) / 100 }}
                     </template>
                 </el-table-column>
-                <el-table-column label="会员PV">
+                <el-table-column label="会员BV">
                     <template slot-scope="props">
                         <span v-if="![4, 5, 6].includes(props.row.CATEGORY_TYPE)">{{ Math.round(props.row.REAL_PV * props.row.BUY_NUMS * 100) / 100 }}</span>
                         <span v-else>0</span>

frontendEle/src/views/shop/order.vue

@@ -22,7 +22,7 @@
                                 <span>{{ Math.round(scope.row.member_price * 100) / 100 }}</span>
                             </template>
                         </el-table-column>
-                        <el-table-column label="会员PV" prop="member_pv" v-if="category_type === 1">
+                        <el-table-column label="会员BV" prop="member_pv" v-if="category_type === 1">
                             <template slot-scope="scope">
                                 <span>{{ Math.round(scope.row.member_pv * 100) / 100 }}</span>
                             </template>
@@ -38,7 +38,7 @@
                                 <span>{{ Math.round(scope.row.member_price_plus * 100) / 100 }}</span>
                             </template>
                         </el-table-column>
-                        <el-table-column label="合计PV" prop="member_pv_plus" v-if="category_type === 1">
+                        <el-table-column label="合计BV" prop="member_pv_plus" v-if="category_type === 1">
                             <template slot-scope="scope">
                                 <span>{{ Math.round(scope.row.member_pv_plus * 100) / 100 }}</span>
                             </template>

frontendEle/src/views/shop/reconsume-order.vue

@@ -18,7 +18,7 @@
 
                     <el-table-column label="会员价格" prop="member_price">
                     </el-table-column>
-                    <el-table-column label="会员PV" prop="member_pv">
+                    <el-table-column label="会员BV" prop="member_pv">
                     </el-table-column>
 <!--                    <el-table-column label="库存" prop="STORE_NUMS">-->
 <!--                    </el-table-column>-->
@@ -29,7 +29,7 @@
                     <el-table-column label="合计金额" prop="member_price_plus">
 
                     </el-table-column>
-                    <el-table-column label="合计PV" prop="member_pv_plus"></el-table-column>
+                    <el-table-column label="合计BV" prop="member_pv_plus"></el-table-column>
                 </el-table>
             </div>
             <!--<div class="sum">-->

frontendEle/src/views/shop/reconsume.vue

@@ -24,7 +24,7 @@
 
                 <el-table-column label="商品价格" prop="SELL_PRICE">
                 </el-table-column>
-                <el-table-column label="价格PV" prop="PRICE_PV">
+                <el-table-column label="价格BV" prop="PRICE_PV">
                 </el-table-column>
                 <el-table-column label="库存" prop="STORE_NUMS">
                 </el-table-column>
@@ -216,4 +216,4 @@
 .flex{
     display: flex;
 }
-</style>
+</style>

frontendEle/src/views/user/dec.vue

@@ -50,7 +50,7 @@
                                 <el-table-column label="套餐金额" prop="AMOUNT">
 
                                 </el-table-column>
-                                <el-table-column label="套餐PV" prop="PV">
+                                <el-table-column label="套餐BV" prop="PV">
                                     <template>
 
                                     </template>
@@ -92,7 +92,7 @@
                                 <el-table-column label="卖价" prop="SELL_PRICE">
 
                                 </el-table-column>
-                                <el-table-column label="PV价格" prop="PRICE_PV">
+                                <el-table-column label="BV价格" prop="PRICE_PV">
 
                                 </el-table-column>
                                 <el-table-column label="数量" width="150">
@@ -109,7 +109,7 @@
                                 <el-button @click="getSum()">计算合计</el-button>
                                 <div class='flex data' style="flex:1;justify-content: flex-end;">
                                     <div style="margin-right:2rem">商品价格：￥{{sell_price_sum}}</div>
-                                    <div>商品PV：￥{{price_pv_sum}}</div>
+                                    <div>商品BV：￥{{price_pv_sum}}</div>
                                 </div>
                             </div>