Merge branch 'dev' of 47.94.45.65:angelo/web-zk-admin into test

src/views/settlementCenter/performanceTotal/index.vue

@@ -28,22 +28,6 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="4">
-            <el-form-item :label="'币种展示'">
-              <el-select
-                v-model="select.pkCurrency"
-                clearable
-                placeholder=""
-              >
-                <el-option
-                  v-for="item in acList"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
           <el-col :span="8">
             <el-form-item :label="'结算日期'">
               <el-date-picker
@@ -162,85 +146,75 @@
                              :label="'结算期数'">
             </el-table-column> -->
             <el-table-column
-              v-if="allTxt.settleDate"
               align="center"
               prop="settleDate"
               width="150"
               :label="'结算时间'"
             />
             <el-table-column
-              v-if="allTxt.registerAmount"
               align="center"
               prop="registerAmount"
               :formatter="stateFormat"
               width="160"
-              :label="'注册金额'"
+              :label="'精品金额'"
             />
 
             <el-table-column
-              v-if="allTxt.registerPv"
               align="center"
               prop="registerPv"
               :formatter="stateFormat"
               width="160"
-              :label="'注册业绩'"
+              :label="'精品业绩'"
             />
 
             <el-table-column
-              v-if="allTxt.upgradeAmount"
               align="center"
               prop="upgradeAmount"
               :formatter="stateFormat"
               width="160"
-              :label="'升级金额'"
+              :label="'甄选金额'"
             />
             <el-table-column
-              v-if="allTxt.upgradePv"
               align="center"
               prop="upgradePv"
               :formatter="stateFormat"
               width="160"
-              :label="'升级业绩'"
+              :label="'甄选业绩'"
             />
 
             <el-table-column
-              v-if="allTxt.firstPurchaseAmount"
-              align="center"
-              prop="firstPurchaseAmount"
-              :formatter="stateFormat"
-              width="160"
-              :label="'首购金额'"
-            />
-
-            <el-table-column
-              v-if="allTxt.firstPurchasePv"
-              align="center"
-              prop="firstPurchasePv"
-              :formatter="stateFormat"
-              width="160"
-              :label="'首购业绩'"
-            />
-
-            <el-table-column
-              v-if="allTxt.repurchaseAmount"
               align="center"
               prop="repurchaseAmount"
               :formatter="stateFormat"
               width="160"
-              :label="'复购金额'"
+              :label="'商城金额'"
             />
 
             <el-table-column
-              v-if="allTxt.repurchasePv"
               align="center"
               prop="repurchasePv"
               :formatter="stateFormat"
-              width="150"
-              :label="'复购业绩'"
+              width="160"
+              :label="'商城业绩'"
+            />
+
+            <el-table-column
+              align="center"
+              prop="discountAmount"
+              :formatter="stateFormat"
+              width="160"
+              :label="'五折金额'"
+            />
+
+            <el-table-column
+              align="center"
+              prop="discountPv"
+              :formatter="stateFormat"
+              width="150"
+              :label="'五折业绩'"
             />
 
             <el-table-column
-              v-if="allTxt.amountTotal"
               align="center"
               prop="amountTotal"
               :formatter="stateFormat"
@@ -249,7 +223,6 @@
             />
 
             <el-table-column
-              v-if="allTxt.pvTotal"
               align="center"
               prop="pvTotal"
               :formatter="stateFormat"