Merge branch 'bd-test' of 47.94.45.65:angelo/web-base-admin into bd-online

src/api/giftGoods.js

@@ -300,12 +300,44 @@ export function tourismDetails(params) {
   })
 }
 
-// 营销管理-直推排行数据
+// 营销管理-直推人数排行数据
-export function getMemberDirectPusht(params) {
+export function getMemberDirectPush(data) {
   return request({
-    url: '/member/manager/member/get-member-direct-push',
+    url: '/member/manage/member-statistics/topPeople',
-    method: 'get',
+    method: 'post',
-    params
+    data
+  })
+}
+// 营销管理-直推金额排行数据
+export function getMemberDirectPushAmount(data) {
+  return request({
+    url: '/member/manage/member-statistics/topAmount',
+    method: 'post',
+    data
+  })
+}
+
+// params type setShowPeople setShowAmount
+export function getMemberDirectPushSwitchStatus(type) {
+  return request({
+    url: `member/manage/member-statistics/${type}`,
+    method: 'get'
+  })
+}
+
+// 直推人数排行开关
+export function setMemberDirectPush(flag) {
+  return request({
+    url: `member/manage/member-statistics/setShowPeople/${flag}`,
+    method: 'get'
+  })
+}
+
+// 直推金额排行开关
+export function setMemberDirectPushAmount(flag) {
+  return request({
+    url: `member/manage/member-statistics/setShowAmount/${flag}`,
+    method: 'get'
   })
 }
 
@@ -354,7 +386,7 @@ export function lotteryRuleConfigSubmit(data) {
 // 直推赠送
 export function directRuleConfigSubmit(data) {
   return request({
-    url: '/sale/manage/recommend/submit',
+    url: '/sale/manage/recommend/directPushUpgrade',
     method: 'post',
     data
   })
@@ -369,3 +401,11 @@ export function tourismRuleConfigSubmit(data) {
   })
 }
 
+// 直推升级数据
+export function directUpgradeRecordList(params) {
+  return request({
+    url: '/sale/manage/recommend/directPushUpgradeList',
+    method: 'get',
+    params
+  })
+}

src/router/index.js

@@ -1928,6 +1928,7 @@ export const constantRoutes = [
           }
         ]
       },
+
       {
         path: 'lotteryDetails',
         name: 'LotteryDetails',
@@ -1941,33 +1942,6 @@ export const constantRoutes = [
           }
         ]
       },
-      {
-        path: 'rechargeCard',
-        name: 'RechargeCard',
-        component: ParentView,
-        children: [
-          {
-            path: 'rechargeCardList',
-            name: 'RechargeCardList',
-            component: () => import('@/views/marketing/rechargeCard/index'),
-            meta: { title: '充值提货卡' }
-          },
-          {
-            path: 'addRechargeCard',
-            name: 'addRechargeCard',
-            component: () => import('@/views/marketing/rechargeCard/addRechargeCard'),
-            meta: { title: '充值提货卡-添加' },
-            hidden: true
-          },
-          {
-            path: 'rechargeQc',
-            name: 'rechargeQc',
-            component: () => import('@/views/marketing/rechargeCard/rechargeQc'),
-            meta: { title: '充值提货卡-添加' },
-            hidden: true
-          }
-        ]
-      },
       {
         path: 'lottery',
         name: 'Lottery',
@@ -2002,17 +1976,45 @@ export const constantRoutes = [
           }
         ]
       },
-
       {
-        path: 'directGifts',
+        path: 'rechargeCard',
-        name: 'DirectGifts',
+        name: 'RechargeCard',
         component: ParentView,
         children: [
           {
-            path: 'directGiftsList',
+            path: 'rechargeCardList',
-            name: 'DirectGiftsList',
+            name: 'RechargeCardList',
+            component: () => import('@/views/marketing/rechargeCard/index'),
+            meta: { title: '充值提货卡' }
+          },
+          {
+            path: 'addRechargeCard',
+            name: 'addRechargeCard',
+            component: () => import('@/views/marketing/rechargeCard/addRechargeCard'),
+            meta: { title: '充值提货卡-添加' },
+            hidden: true
+          },
+          {
+            path: 'rechargeQc',
+            name: 'rechargeQc',
+            component: () => import('@/views/marketing/rechargeCard/rechargeQc'),
+            meta: { title: '充值提货卡-添加' },
+            hidden: true
+          }
+        ]
+      },
+
+      {
+        path: 'directUpgrade',
+        name: 'DirectUpgrade',
+        component: ParentView,
+        meta: { title: '直推升级' },
+        children: [
+          {
+            path: 'directUpgradeList',
+            name: 'DirectUpgradeList',
             component: () => import('@/views/marketing/directGifts/index'),
-            meta: { title: '直推赠送' }
+            meta: { title: '直推升级' }
           },
           {
             path: 'addDirect',
@@ -2020,6 +2022,40 @@ export const constantRoutes = [
             component: () => import('@/views/marketing/directGifts/addDirect'),
             meta: { title: '基本信息' },
             hidden: true
+          },
+          {
+            path: 'directUpgradeRecordList',
+            name: 'DirectUpgradeRecordList',
+            component: () => import('@/views/marketing/directGifts/record'),
+            meta: { title: '直推升级数据' }
+          }
+        ]
+      },
+      {
+        path: 'directRanking',
+        name: 'DirectRanking',
+        component: ParentView,
+        meta: { title: '直推排行数据' },
+        children: [
+          {
+            path: 'directRankingList',
+            name: 'DirectRankingList',
+            component: () => import('@/views/marketing/directRanking/index'),
+            meta: { title: '直推人数排行数据' }
+          },
+          {
+            path: 'directAmountRankingList',
+            name: 'DirectAmountRankingList',
+            component: () => import('@/views/marketing/directRanking/amount'),
+            meta: { title: '直推金额排行数据' },
+            hidden: true
+          },
+          {
+            path: 'directConfig',
+            name: 'DirectConfig',
+            component: () => import('@/views/marketing/directRanking/config'),
+            meta: { title: '直推配置' },
+            hidden: true
           }
         ]
       },
@@ -2122,19 +2158,6 @@ export const constantRoutes = [
             meta: { title: '旅游活动数据' }
           }
         ]
-      },
-      {
-        path: 'directRanking',
-        name: 'DirectRanking',
-        component: ParentView,
-        children: [
-          {
-            path: 'directRankingList',
-            name: 'DirectRankingList',
-            component: () => import('@/views/marketing/directRanking/index'),
-            meta: { title: '直推排行数据' }
-          }
-        ]
       }
 
     ]

src/views/marketing/directGifts/addDirect.vue

@@ -68,77 +68,14 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row>
-            <el-col :span="24">
-              <el-form-item :label="'目标用户群体'" required>
-                <div class="flexed">
-                  <el-checkbox
-                    v-model="ruleForm.checked1"
-                    class="flexed_l"
-                    :disabled="lookOver"
-                    @change="getCheckTit($event, 1)"
-                  >{{ '注册等级' }}</el-checkbox>
-                  <el-checkbox-group
-                    v-model="ruleForm.levelList"
-                    :disabled="lookOver"
-                    @change="getCheck"
-                  >
-                    <el-checkbox
-                      v-for="item in gradeList"
-                      :key="item.pkId"
-                      :label="item.pkId"
-                    >{{ item.gradeName }}</el-checkbox>
-                  </el-checkbox-group>
-                </div>
-                <div class="flexed">
-                  <el-checkbox
-                    v-model="ruleForm.checked2"
-                    class="flexed_l"
-                    :disabled="lookOver"
-                    @change="getCheckTit($event, 2)"
-                  >{{ '真实奖衔' }}</el-checkbox>
-                  <el-checkbox-group
-                    v-model="ruleForm.realList"
-                    :disabled="lookOver"
-                    @change="getCheck"
-                  >
-                    <el-checkbox
-                      v-for="item in awardsList"
-                      :key="item.pkId"
-                      :label="item.pkId"
-                    >{{ item.awardsName }}</el-checkbox>
-                  </el-checkbox-group>
-                </div>
-                <div class="flexed">
-                  <el-checkbox
-                    v-model="ruleForm.checked3"
-                    class="flexed_l"
-                    :disabled="lookOver"
-                    @change="getCheckTit($event, 3)"
-                  >{{ '权限中心' }}</el-checkbox>
-                  <el-checkbox-group
-                    v-model="ruleForm.centerList"
-                    :disabled="lookOver"
-                    @change="getCheck"
-                  >
-                    <el-checkbox
-                      v-for="item in registList"
-                      :key="item.value"
-                      :label="item.value"
-                    >{{ item.label }}</el-checkbox>
-                  </el-checkbox-group>
-                </div>
-              </el-form-item>
-            </el-col>
-          </el-row>
           <el-row>
             <el-col :span="8">
               <el-form-item :label="'活动时间'" prop="ruleFormTime">
                 <el-date-picker
                   v-model="ruleForm.ruleFormTime"
                   :disabled="lookOver"
-                  value-format="yyyy-MM-dd HH:mm:ss"
+                  value-format="yyyy-MM-dd"
-                  type="datetimerange"
+                  type="daterange"
                   :range-separator="'至'"
                   :start-placeholder="'开始日期'"
                   :end-placeholder="'结束日期'"
@@ -153,8 +90,8 @@
                 <el-date-picker
                   v-model="ruleForm.ruleFormTime1"
                   :disabled="lookOver"
-                  value-format="yyyy-MM-dd HH:mm:ss"
+                  value-format="yyyy-MM-dd"
-                  type="datetimerange"
+                  type="daterange"
                   :range-separator="'至'"
                   :start-placeholder="'开始日期'"
                   :end-placeholder="'结束日期'"
@@ -166,12 +103,8 @@
         </el-form>
       </div>
 
-      <repurchQuan v-show="tabActive == 1" ref="repurchQuan" />
       <directUpdata v-show="tabActive == 2" ref="directUpdata" />
-      <directAverage
+
-        v-show="tabActive == 3"
-        ref="directAverage"
-      />
     </div>
     <div v-show="controlType != 4" class="footer">
       <el-button size="small" class="cancelBtn" @click="$router.back()">
@@ -189,17 +122,12 @@ import Editor from '@/components/Editor'
 import * as api from '@/api/giftGoods.js'
 import topBar from '@/components/topBar'
 import ImageUpload from '@/components/ImageUpload'
-import repurchQuan from '@/views/marketing/directGifts/repurchQuan'
 import directUpdata from '@/views/marketing/directGifts/directUpdata'
-import directAverage from '@/views/marketing/directGifts/directAverage'
 export default {
-  name: 'GiftGoodsList',
+  name: 'AddDirectPushUpgrade',
   components: {
-    topBar,
     ImageUpload,
-    repurchQuan,
     directUpdata,
-    directAverage,
     Editor
   },
   data() {
@@ -210,17 +138,9 @@ export default {
           name: '基本信息',
           id: 0
         },
-        {
-          name: '复购券',
-          id: 1
-        },
         {
           name: '直推升级',
           id: 2
-        },
-        {
-          name: '复购券均分',
-          id: 3
         }
       ],
       uploadImgUrl: process.env.VUE_APP_BASE_API + '/system/upload',
@@ -245,9 +165,6 @@ export default {
         actCover: [
           { required: true, message: '请上传活动封面', trigger: 'change' }
         ],
-        goalMemberConfigList: [
-          { required: true, message: '请选择目标用户群体', trigger: 'change' }
-        ],
         ruleFormTime: [
           { required: true, message: '请选择活动时间', trigger: 'change' }
         ],
@@ -287,6 +204,9 @@ export default {
     }
   },
   methods: {
+    splitDate(date) {
+      return date.split(' ')[0]
+    },
     getDetails() {
       api
         .recommendDetail({
@@ -306,13 +226,17 @@ export default {
           this.ruleForm.actEndDate = res.data.activityParam.actEndDate
           this.ruleForm.disStartDate = res.data.activityParam.disStartDate
           this.ruleForm.disEndDate = res.data.activityParam.disEndDate
+          const actStartDate = this.splitDate(res.data.activityParam.actStartDate)
+          const actEndDate = this.splitDate(res.data.activityParam.actEndDate)
+          const disStartDate = this.splitDate(res.data.activityParam.disStartDate)
+          const disEndDate = this.splitDate(res.data.activityParam.disEndDate)
           this.$set(this.ruleForm, 'ruleFormTime', [
-            res.data.activityParam.actStartDate,
+            actStartDate,
-            res.data.activityParam.actEndDate
+            actEndDate
           ])
           this.$set(this.ruleForm, 'ruleFormTime1', [
-            res.data.activityParam.disStartDate,
+            disStartDate,
-            res.data.activityParam.disEndDate
+            disEndDate
           ])
           const arr1 = []
           const arr2 = []
@@ -330,16 +254,10 @@ export default {
           this.$set(this.ruleForm, 'realList', arr2)
           this.$set(this.ruleForm, 'centerList', arr3)
 
-          this.$refs.repurchQuan.getPage(
-            this.addData.repurchaseCouponsShowList || ''
-          )
           this.$refs.directUpdata.getPage(
             this.addData.recommendUpgradeList || ''
           )
           this.$refs.directUpdata.getPages(this.addData.authorityList || '')
-          this.$refs.directAverage.getPage(
-            this.addData.acRecommendSharVO || ''
-          )
 
           const that = this
           setTimeout(() => {
@@ -356,12 +274,12 @@ export default {
       )
       this.$set(this.ruleForm, 'actCover', this.addData.activityParam.actCover)
       this.$set(this.ruleForm, 'ruleFormTime', [
-        this.addData.activityParam.actStartDate,
+        this.splitDate(this.addData.activityParam.actStartDate),
-        this.addData.activityParam.actEndDate
+        this.splitDate(this.addData.activityParam.actEndDate)
       ])
       this.$set(this.ruleForm, 'ruleFormTime1', [
-        this.addData.activityParam.disStartDate,
+        this.splitDate(this.addData.activityParam.disStartDate),
-        this.addData.activityParam.disEndDate
+        this.splitDate(this.addData.activityParam.disEndDate)
       ])
       const arr1 = []
       const arr2 = []
@@ -379,12 +297,8 @@ export default {
       this.$set(this.ruleForm, 'realList', arr2)
       this.$set(this.ruleForm, 'centerList', arr3)
 
-      this.$refs.repurchQuan.getPage(
-        this.addData.repurchaseCouponsShowList || ''
-      )
       this.$refs.directUpdata.getPage(this.addData.recommendUpgradeList || '')
       this.$refs.directUpdata.getPages(this.addData.authorityList || '')
-      this.$refs.directAverage.getPage(this.addData.acRecommendSharVO || '')
 
       const that = this
       setTimeout(() => {
@@ -493,12 +407,16 @@ export default {
             {},
             {
               controlType: this.controlType,
-              activityParam: this.ruleForm,
+              activityParam: {
-              repurchaseCouponsShowList: this.$refs.repurchQuan.allData,
+                ...this.ruleForm,
+                actStartDate: this.ruleForm.actStartDate + ' 00:00:00',
+                actEndDate: this.ruleForm.actEndDate + ' 23:59:59',
+                disStartDate: this.ruleForm.disStartDate + ' 00:00:00',
+                disEndDate: this.ruleForm.disEndDate + ' 23:59:59'
+              },
               recommendUpgradeList:
                 this.$refs.directUpdata.recommendUpgradeList,
-              authorityList: this.$refs.directUpdata.form.waresAuthorityList,
+              authorityList: this.$refs.directUpdata.form.waresAuthorityList
-              acRecommendSharVO: this.$refs.directAverage.allData?.[0] || ''
             }
           )
           api.directRuleConfigSubmit(obj).then((res) => {

src/views/marketing/directGifts/directUpdata.vue

@@ -7,19 +7,22 @@
 <template>
   <div class="">
     <div class="tit">{{ '直推升级' }}</div>
-    <div class="xian"></div>
+    <div class="xian" />
     <div class="table">
       <!-- 批量操作 -->
       <table>
         <tr>
           <th colspan="1" class="tableLeft">
-            <el-button type="primary" @click="addNewGoods" size="mini"
+            <el-button
-              >{{ '添加' }}
+              type="primary"
+              size="mini"
+              @click="addNewGoods"
+            >{{ '添加' }}
             </el-button>
           </th>
           <th colspan="2" style="padding-bottom: 0; border: 0">
             <div class="tableFlex">
-              <div class="tableFlex_i"></div>
+              <div class="tableFlex_i" />
             </div>
           </th>
           <th colspan="6" style="padding-bottom: 0; border: 0">
@@ -35,16 +38,15 @@
                     :key="item.pkId"
                     :label="item.gradeName"
                     :value="item.pkId"
-                  >
+                  />
-                  </el-option>
                 </el-select>
               </div>
               <div class="tableFlex_i">
                 <el-input
+                  v-model="plcz.recommendNumber"
                   :placeholder="'推荐数量'"
                   size="medium"
-                  v-model="plcz.recommendNumber"
+                />
-                ></el-input>
               </div>
               <div class="tableFlex_i">
                 <el-select
@@ -57,37 +59,35 @@
                     :key="item.pkId"
                     :label="item.gradeName"
                     :value="item.pkId"
-                  >
+                  />
-                  </el-option>
                 </el-select>
               </div>
             </div>
           </th>
           <th colspan="7" style="padding-bottom: 0; border-left: 0">
             <div class="tableFlex">
-              <div class="tableFlex_i"></div>
+              <div class="tableFlex_i" />
-              <div class="tableFlex_i"></div>
+              <div class="tableFlex_i" />
               <div class="tableFlex_i">
                 <el-input
+                  v-model="plcz.quantity"
                   :placeholder="'赠送数量'"
                   size="medium"
-                  v-model="plcz.quantity"
+                />
-                ></el-input>
               </div>
-              <div class="tableAdd"></div>
+              <div class="tableAdd" />
             </div>
           </th>
           <th colspan="2" style="padding-bottom: 0">
             <div class="tableFlex">
               <div class="tableFlex_i">
-                <el-button type="primary" @click="toPlcz" size="mini">{{
+                <el-button type="primary" size="mini" @click="toPlcz">{{
                   '批量操作'
                 }}</el-button>
               </div>
               <div class="tableFlex_i">
                 <el-button size="mini" @click="reset">
-                  {{ '重置' }}</el-button
+                  {{ '重置' }}</el-button>
-                >
               </div>
             </div>
           </th>
@@ -95,7 +95,7 @@
       </table>
       <table class="table_b">
         <tr style="border-top: 0">
-          <td style="border: 0"></td>
+          <td style="border: 0" />
           <td colspan="2">{{ '结算等级' }}</td>
           <td colspan="6" style="padding-bottom: 0">
             <div class="tableFlex">
@@ -105,18 +105,18 @@
               <div class="tableFlex_i">{{ '升级等级' }}</div>
             </div>
           </td>
-          <td colspan="7" style="padding-bottom: 0">
+          <!-- <td colspan="7" style="padding-bottom: 0">
             <div class="tableFlex">
               <div class="tableFlex_i">{{ '赠送产品' }}</div>
               <div class="tableFlex_i">{{ '产品规格' }}</div>
               <div class="tableFlex_i">{{ '赠送数量' }}</div>
-              <div class="tableAdd"></div>
+              <div class="tableAdd" />
             </div>
-          </td>
+          </td> -->
-          <td colspan="2" style="border: 0"></td>
+          <td colspan="2" style="border: 0" />
         </tr>
         <tr v-for="(item, index) in recommendUpgradeList" :key="index">
-          <td style="border: 0"></td>
+          <td style="border: 0" />
           <td colspan="2" style="padding-bottom: 0">
             <div class="tableFlex">
               <div class="tableFlex_i">
@@ -130,8 +130,7 @@
                     :key="item.pkId"
                     :label="item.gradeName"
                     :value="item.pkId"
-                  >
+                  />
-                  </el-option>
                 </el-select>
               </div>
             </div>
@@ -160,16 +159,15 @@
                     :key="item.pkId"
                     :label="item.gradeName"
                     :value="item.pkId"
-                  >
+                  />
-                  </el-option>
                 </el-select>
               </div>
               <div class="tableFlex_i">
                 <el-input
+                  v-model="item.recommendNumber"
                   :placeholder="'推荐数量'"
                   size="medium"
-                  v-model="item.recommendNumber"
+                />
-                ></el-input>
               </div>
               <div class="tableFlex_i">
                 <el-select
@@ -182,291 +180,29 @@
                     :key="item.pkId"
                     :label="item.gradeName"
                     :value="item.pkId"
-                  >
+                  />
-                  </el-option>
                 </el-select>
               </div>
             </div>
           </td>
-          <td colspan="7" style="padding-bottom: 0">
+
-            <div
+          <td colspan="2" style="border: 0" />
-              class="tableFlex"
-              v-for="(ctem, cndex) in item.giftConfigList"
-              :key="cndex"
-            >
-              <div class="tableFlex_i">
-                <el-input
-                  :placeholder="'请选择赠送产品'"
-                  v-model="ctem.productName"
-                  @focus="getProduct(index, cndex)"
-                ></el-input>
-              </div>
-              <div class="tableFlex_i">
-                <el-input
-                  disabled
-                  size="medium"
-                  v-model="ctem.specsName"
-                ></el-input>
-              </div>
-              <div class="tableFlex_i">
-                <el-input size="medium" v-model="ctem.quantity"></el-input>
-              </div>
-              <div class="tableAdd">
-                <img
-                  src="@/assets/images/iconpop.png"
-                  @click="reduceProduct(index, cndex)"
-                  alt=""
-                />
-                <img
-                  v-if="cndex == item.giftConfigList.length - 1"
-                  src="@/assets/images/iconadd.png"
-                  @click="addProduct(index)"
-                  alt=""
-                />
-              </div>
-            </div>
-            <div class="tableAddPro" v-show="item.giftConfigList.length == 0">
-              {{ '添加产品' }}
-              <img
-                src="@/assets/images/iconadd.png"
-                @click="addProduct(index)"
-                alt=""
-              />
-            </div>
-          </td>
-          <td colspan="2" style="border: 0"></td>
         </tr>
       </table>
     </div>
-    <div class="teamPz">
+
-      <div class="tit">{{ '团队配置' }}</div>
-      <div class="xian"></div>
-      <el-form
-        ref="team"
-        :model="form"
-        style="width: 1200px; padding: 0 20px"
-        label-width="120px"
-      >
-        <el-row
-          :gutter="20"
-          v-for="(item, index) in form.waresAuthorityList"
-          :key="index"
-        >
-          <el-col :span="10">
-            <el-form-item :label="'可见类型'">
-              <el-select
-                clearable
-                v-model="item.authorityType"
-                @change="getTeamList(item.authorityType)"
-              >
-                <el-option
-                  v-for="cld in xyList"
-                  v-show="!(index > 0 && cld.value == 5)"
-                  :key="cld.value"
-                  :label="cld.label"
-                  :value="cld.value"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col
-            :span="10"
-            v-if="form.waresAuthorityList[index].authorityType != 5"
-          >
-            <el-form-item :label="'团队编号'">
-              <el-input
-                clearable
-                v-model="item.memberCode"
-                :placeholder="'请输入'"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col
-            v-if="
-              form.waresAuthorityList[index].authorityType != 5 &&
-              index !== form.waresAuthorityList.length - 1
-            "
-            :span="4"
-          >
-            <i
-              class="el-icon-remove-outline addIcon"
-              @click="removeTeamPz(index)"
-            ></i>
-          </el-col>
-          <el-col
-            v-if="
-              form.waresAuthorityList[index].authorityType != 5 &&
-              index == form.waresAuthorityList.length - 1
-            "
-            :span="4"
-          >
-            <i
-              class="el-icon-circle-plus-outline addIcon"
-              @click="addTeamPz"
-            ></i>
-          </el-col>
-        </el-row>
-      </el-form>
-      <!-- <Ggmx ref="ggmxed"></Ggmx> -->
-    </div>
-    <!-- <div class="footer">
-      <el-button size="small"
-                 class="thebtn2"> {{ '取消' }}</el-button>
-      <el-button size="small"
-                 @click="submit"
-                 class="thebtn1"> {{ '确认' }}</el-button>
-    </div> -->
-    <el-dialog
-      :title="'添加'"
-      :visible.sync="dialogVisible"
-      :close-on-click-modal="false"
-      width="40%"
-      center
-      :before-close="handleClose"
-    >
-      <div class="cpHeight">
-        <el-row>
-          <el-col :span="22">
-            <el-input
-              v-model="select.queryInfo"
-              clearable
-              :placeholder="'请输入'"
-              @keyup.enter.native="getDataList"
-              prefix-icon="el-icon-search"
-            ></el-input>
-          </el-col>
-          <el-col :span="2">
-            <el-button type="primary" size="small" @click="getDataList">
-              {{ '搜索' }}</el-button
-            >
-          </el-col>
-        </el-row>
-        <div style="height: 10px"></div>
-        <el-table
-          :data="dialogList"
-          ref="multipleTable"
-          style="width: 100%"
-          @select-all="onSelectAll"
-          @select="selected"
-          :header-cell-style="{ background: '#EEEEEE' }"
-          :row-class-name="tableRowClassName"
-        >
-          <el-table-column type="selection" width="55"> </el-table-column>
-          <el-table-column
-            align="center"
-            prop="productName"
-            :label="'产品名称'"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="productCode"
-            :label="'产品编号'"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="productName"
-            :label="'规格'"
-          >
-            <template slot-scope="scope">
-              <div
-                class="blueCor"
-                v-show="
-                  scope.row.selSkuNameList == '' ||
-                  scope.row.selSkuNameList == undefined
-                "
-                @click="selSku(scope.row.pkId, scope.$index)"
-              >
-                {{ '选择规格' }}
-              </div>
-              <div
-                class="blueCor"
-                v-show="
-                  scope.row.selSkuNameList != '' &&
-                  scope.row.selSkuNameList != undefined
-                "
-                @click="selSku(scope.row.pkId, scope.$index)"
-              >
-                {{ scope.row.selSkuNameList }}
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="productName"
-            :label="'商品数量'"
-          >
-            <template slot-scope="scope">
-              <el-input-number
-                size="mini"
-                v-model="scope.row.quantity"
-                :min="1"
-              ></el-input-number>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-      <pagination
-        v-show="total > 0"
-        :total="total"
-        :page.sync="queryParams.pageNum"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getDataList"
-      />
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="handleClose">{{ '取消' }}</el-button>
-        <el-button type="primary" @click="sureProduct">{{
-          '确认'
-        }}</el-button>
-      </span>
-    </el-dialog>
-    <el-dialog
-      :title="'规格'"
-      :visible.sync="ggVisible"
-      :close-on-click-modal="false"
-      width="40%"
-      center
-      :before-close="handleCloseGg"
-    >
-      <div>
-        <el-form>
-          <el-form-item
-            :label="item.typeName"
-            v-for="(item, index) in skuList"
-            :key="index"
-          >
-            <el-radio-group v-model="item.pkProductSku">
-              <el-radio
-                v-for="(ctem, cndex) in item.specsList"
-                @change="getCheckBox(item.pkId, item.specsName)"
-                :key="ctem.pkId"
-                :label="ctem.pkId"
-                >{{ ctem.specsName }}</el-radio
-              >
-            </el-radio-group>
-          </el-form-item>
-        </el-form>
-      </div>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="handleCloseGg">{{ '取消' }}</el-button>
-        <el-button type="primary" @click="sureSku">{{
-          '确认'
-        }}</el-button>
-      </span>
-    </el-dialog>
   </div>
 </template>
 
 <script>
-import * as api from "@/api/giftGoods.js";
+import * as api from '@/api/giftGoods.js'
-import * as pro from "@/api/product.js";
+import * as pro from '@/api/product.js'
-import topBar from "@/components/topBar";
+import topBar from '@/components/topBar'
-import ImageUpload from "@/components/ImageUpload";
+import ImageUpload from '@/components/ImageUpload'
 export default {
   components: {
     topBar,
-    ImageUpload,
+    ImageUpload
   },
   data() {
     return {
@@ -474,247 +210,247 @@ export default {
       ggVisible: false,
       queryParams: {
         pageNum: 1,
-        pageSize: 50,
+        pageSize: 50
       },
       form: {
         waresAuthorityList: [
           {
             authorityType: 5,
-            memberCode: "",
+            memberCode: ''
-          },
+          }
-        ],
+        ]
       },
 
       total: 0,
-      moren: "setGiftGoodsInfo",
+      moren: 'setGiftGoodsInfo',
-      allData: [], //全部数据
+      allData: [], // 全部数据
-      areaList: [], //全部专区
+      areaList: [], // 全部专区
-      isArea: "",
+      isArea: '',
       plcz: {},
-      select: {}, //产品筛选
+      select: {}, // 产品筛选
-      dialogList: [], //产品数组
+      dialogList: [], // 产品数组
-      selectData: [], //选中
+      selectData: [], // 选中
-      skuList: [], //规格数组
+      skuList: [], // 规格数组
-      gradeList: [], //规格数组
+      gradeList: [], // 规格数组
-      selSkuList: "",
+      selSkuList: '',
-      selSkuNameList: "",
+      selSkuNameList: '',
-      selIndex: "",
+      selIndex: '',
-      showCndex: "",
+      showCndex: '',
-      showIndex: "",
+      showIndex: '',
       pageData: {},
       recommendUpgradeList: [],
-      xyList: [],
+      xyList: []
-    };
+    }
   },
   mounted() {
-    this.getData();
+    this.getData()
     // 血缘关系
-    this.getXYList();
+    this.getXYList()
   },
   methods: {
     addTeamPz() {
       this.form.waresAuthorityList.push({
-        kjlx: "",
+        kjlx: '',
-        teamOrder: "",
+        teamOrder: ''
-      });
+      })
     },
     removeTeamPz(index) {
-      this.form.waresAuthorityList.splice(index, 1);
+      this.form.waresAuthorityList.splice(index, 1)
     },
     getXYList() {
       pro.getEWaresPermissionTypeList().then((res) => {
         console.log(
-          "%c [ res ]-451",
+          '%c [ res ]-451',
-          "font-size:13px; background:#73d160; color:#b7ffa4;",
+          'font-size:13px; background:#73d160; color:#b7ffa4;',
           res
-        );
+        )
-        this.xyList = res.data;
+        this.xyList = res.data
-      });
+      })
     },
     getTeamList(val) {
       if (val == 5) {
         this.form.waresAuthorityList = [
           {
             authorityType: 5,
-            memberCode: "",
+            memberCode: ''
-          },
+          }
-        ];
+        ]
       }
     },
     getPages(allData) {
-      if (allData != "") {
+      if (allData != '') {
-        this.form.waresAuthorityList = allData;
+        this.form.waresAuthorityList = allData
       }
     },
     getPage(allData) {
-      if (allData != "") {
+      if (allData != '') {
         allData.forEach((item) => {
           if (!item.giftConfigList) {
-            item.giftConfigList = [];
+            item.giftConfigList = []
           }
-        });
+        })
-        this.recommendUpgradeList = allData;
+        this.recommendUpgradeList = allData
         console.log(
-          "%c [ this.recommendUpgradeList ]-382",
+          '%c [ this.recommendUpgradeList ]-382',
-          "font-size:13px; background:#5c5250; color:#a09694;",
+          'font-size:13px; background:#5c5250; color:#a09694;',
           this.recommendUpgradeList
-        );
+        )
       }
     },
     getData() {
       api.gradeList().then((res) => {
-        this.gradeList = res.rows;
+        this.gradeList = res.rows
-      });
+      })
     },
     sureSku() {
-      this.$set(this.dialogList[this.selIndex], "selSkuList", this.selSkuList);
+      this.$set(this.dialogList[this.selIndex], 'selSkuList', this.selSkuList)
       this.$set(
         this.dialogList[this.selIndex],
-        "selSkuNameList",
+        'selSkuNameList',
         this.selSkuNameList
-      );
+      )
-      this.ggVisible = false;
+      this.ggVisible = false
     },
     sureProduct() {
       if (this.selectData.length == 0) {
         this.$message({
           message: '请选择产品',
-          type: "warning",
+          type: 'warning'
-        });
+        })
-        return false;
+        return false
       } else {
         this.recommendUpgradeList[this.showIndex].giftConfigList[
           this.showCndex
-        ].pkProduct = this.selectData.pkId;
+        ].pkProduct = this.selectData.pkId
 
         this.recommendUpgradeList[this.showIndex].giftConfigList[
           this.showCndex
-        ].productName = this.selectData.productName;
+        ].productName = this.selectData.productName
 
         this.recommendUpgradeList[this.showIndex].giftConfigList[
           this.showCndex
-        ].specsName = this.selectData.selSkuNameList;
+        ].specsName = this.selectData.selSkuNameList
 
         this.recommendUpgradeList[this.showIndex].giftConfigList[
           this.showCndex
-        ].specsNameId = this.selectData.selSkuList;
+        ].specsNameId = this.selectData.selSkuList
 
         this.recommendUpgradeList[this.showIndex].giftConfigList[
           this.showCndex
-        ].quantity = this.selectData.quantity;
+        ].quantity = this.selectData.quantity
-        this.handleClose();
+        this.handleClose()
-        this.$forceUpdate();
+        this.$forceUpdate()
       }
     },
     toPlcz() {
       this.recommendUpgradeList.forEach((stem) => {
         stem.giftConfigList.forEach((ctem) => {
-          ctem.quantity = this.plcz.quantity;
+          ctem.quantity = this.plcz.quantity
-          stem.pkRecommendGrade = this.plcz.pkRecommendGrade;
+          stem.pkRecommendGrade = this.plcz.pkRecommendGrade
-          stem.recommendNumber = this.plcz.recommendNumber;
+          stem.recommendNumber = this.plcz.recommendNumber
-          stem.pkUpgradeGrade = this.plcz.pkUpgradeGrade;
+          stem.pkUpgradeGrade = this.plcz.pkUpgradeGrade
-        });
+        })
-      });
+      })
     },
     reset() {
-      this.plcz = {};
+      this.plcz = {}
     },
     getCheckBox() {
-      let arr1 = [],
+      const arr1 = []
-        arr2 = [];
+      const arr2 = []
       this.skuList.forEach((item) => {
         item.specsList.forEach((ctem) => {
           if (ctem.pkId == item.pkProductSku) {
-            arr1.push(ctem.pkId);
+            arr1.push(ctem.pkId)
-            arr2.push(ctem.specsName);
+            arr2.push(ctem.specsName)
           }
-        });
+        })
-      });
+      })
-      this.selSkuList = arr1.join(",");
+      this.selSkuList = arr1.join(',')
-      this.selSkuNameList = arr2.join(",");
+      this.selSkuNameList = arr2.join(',')
     },
     setArea(val) {
-      this.isArea = val;
+      this.isArea = val
     },
     handleClose() {
-      this.selectData = [];
+      this.selectData = []
-      this.dialogVisible = false;
+      this.dialogVisible = false
     },
     handleCloseGg() {
-      this.ggVisible = false;
+      this.ggVisible = false
     },
     getProduct(index, cndex) {
-      this.showIndex = index;
+      this.showIndex = index
-      this.showCndex = cndex;
+      this.showCndex = cndex
-      this.getDataList();
+      this.getDataList()
-      this.dialogVisible = true;
+      this.dialogVisible = true
     },
     addProduct(index, sndex) {
       this.recommendUpgradeList[index].giftConfigList.push({
-        pkProduct: "",
+        pkProduct: '',
-        productName: "",
+        productName: '',
-        specsName: "",
+        specsName: '',
-        specsNameId: "",
+        specsNameId: '',
-        quantity: "",
+        quantity: ''
-      });
+      })
-      this.$forceUpdate();
+      this.$forceUpdate()
     },
     reduceProduct(index, cndex) {
-      this.recommendUpgradeList[index].giftConfigList.splice(cndex, 1);
+      this.recommendUpgradeList[index].giftConfigList.splice(cndex, 1)
-      this.$forceUpdate();
+      this.$forceUpdate()
     },
     addNewGoods() {
       this.recommendUpgradeList.push({
-        pkSettleGrade: "",
+        pkSettleGrade: '',
-        pkRecommendGrade: "",
+        pkRecommendGrade: '',
-        recommendNumber: "",
+        recommendNumber: '',
-        pkUpgradeGrade: "",
+        pkUpgradeGrade: '',
         giftConfigList: [
           {
-            pkProduct: "",
+            pkProduct: '',
-            productName: "",
+            productName: '',
-            specsName: "",
+            specsName: '',
-            specsNameId: "",
+            specsNameId: '',
-            quantity: "",
+            quantity: ''
-          },
+          }
-        ],
+        ]
-      });
+      })
     },
     selSku(pkId, index) {
-      this.selIndex = index;
+      this.selIndex = index
       api
         .getProductSpecs({
-          pkProduct: pkId,
+          pkProduct: pkId
         })
         .then((res) => {
-          let arr1 = [],
+          const arr1 = []
-            arr2 = [];
+          const arr2 = []
           res.data.forEach((item) => {
-            item.pkProductSku = item.specsList[0].pkId;
+            item.pkProductSku = item.specsList[0].pkId
-            arr1.push(item.specsList[0].pkId);
+            arr1.push(item.specsList[0].pkId)
-            arr2.push(item.specsList[0].specsName);
+            arr2.push(item.specsList[0].specsName)
-          });
+          })
-          this.selSkuList = arr1.join(",");
+          this.selSkuList = arr1.join(',')
-          this.selSkuNameList = arr2.join(",");
+          this.selSkuNameList = arr2.join(',')
 
-          this.skuList = res.data;
+          this.skuList = res.data
-          this.ggVisible = true;
+          this.ggVisible = true
-        });
+        })
     },
     getDataList() {
       api
         .getProductAll(
           Object.assign({ isPutOn: 0 }, this.queryParams, this.select, {
-            isExistSpecs: 1,
+            isExistSpecs: 1
           })
         )
         .then((res) => {
           res.rows.forEach((item) => {
-            item.quantity = 1;
+            item.quantity = 1
-          });
+          })
-          this.dialogList = res.rows;
+          this.dialogList = res.rows
-          this.total = res.total;
+          this.total = res.total
-        });
+        })
     },
     // submit() {
     //   let obj = Object.assign({}, this.pageData, {
@@ -737,32 +473,32 @@ export default {
     //   })
     // },
     onSelectAll() {
-      this.$refs.multipleTable.clearSelection();
+      this.$refs.multipleTable.clearSelection()
     },
     selected(selection, row) {
       // 清除 所有勾选项
-      this.$refs.multipleTable.clearSelection();
+      this.$refs.multipleTable.clearSelection()
       // 当表格数据都没有被勾选的时候 就返回
       // 主要用于将当前勾选的表格状态清除
-      if (selection.length == 0) return;
+      if (selection.length == 0) return
-      this.$refs.multipleTable.toggleRowSelection(row, true);
+      this.$refs.multipleTable.toggleRowSelection(row, true)
-      this.selectData = row;
+      this.selectData = row
     },
     // 表格的选中 可以获得当前选中的数据
     selectionChange(val) {
       // 将选中的数据存储起来
-      this.selectData = val;
+      this.selectData = val
     },
     tableRowClassName({ row, rowIndex }) {
       if (rowIndex % 2 == 1) {
-        return "warning-row";
+        return 'warning-row'
       } else if (rowIndex % 2 == 0) {
-        return "success-row";
+        return 'success-row'
       }
-      return "";
+      return ''
-    },
+    }
-  },
+  }
-};
+}
 </script>
 
 <style lang="scss" scoped>

src/views/marketing/directGifts/index.vue

@@ -6,147 +6,185 @@
 -->
 <template>
   <div class="page">
-    <topBar v-if="topList.length > 0"
+    <topBar
-            :topList="topList"
+      v-if="topList.length > 0"
-            :moren="moren"></topBar>
+      :top-list="topList"
+      :moren="moren"
+    />
     <div class="main">
       <div class="form_all">
-        <el-form ref="select"
+        <el-form
-                 :model="select"
+          ref="select"
-                 label-width="auto">
+          :model="select"
+          label-width="auto"
+        >
           <el-row :gutter="40">
             <!-- 一层 -->
             <el-col :span="4">
               <el-form-item :label="'活动名称'">
-                <el-input clearable
+                <el-input
-                          v-model="select.actName"></el-input>
+                  v-model="select.actName"
+                  clearable
+                />
               </el-form-item>
             </el-col>
             <el-col :span="4">
               <el-form-item :label="'活动状态'">
-                <el-select clearable
+                <el-select
-                           :placeholder="'请选择'"
+                  v-model="select.activityStatus"
-                           v-model="select.activityStatus">
+                  clearable
-                  <el-option v-for="item in actStatus"
+                  :placeholder="'请选择'"
-                             :key="item.value"
+                >
-                             :label="item.label"
+                  <el-option
-                             :value="item.value"></el-option>
+                    v-for="item in actStatus"
+                    :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 v-model="creationTime"
+                <el-date-picker
-                                @change="changeTime"
+                  v-model="creationTime"
-                                value-format="yyyy-MM-dd HH:mm:ss"
+                  value-format="yyyy-MM-dd HH:mm:ss"
-                                type="datetimerange"
+                  type="datetimerange"
-                                :range-separator="'至'"
+                  :range-separator="'至'"
-                                :start-placeholder="'开始日期'"
+                  :start-placeholder="'开始日期'"
-                                :end-placeholder="'结束日期'">
+                  :end-placeholder="'结束日期'"
-                </el-date-picker>
+                  @change="changeTime"
+                />
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item :label="'结束日期'">
-                <el-date-picker v-model="creationTime1"
+                <el-date-picker
-                                @change="changeTime1"
+                  v-model="creationTime1"
-                                value-format="yyyy-MM-dd HH:mm:ss"
+                  value-format="yyyy-MM-dd HH:mm:ss"
-                                type="datetimerange"
+                  type="datetimerange"
-                                :range-separator="'至'"
+                  :range-separator="'至'"
-                                :start-placeholder="'开始日期'"
+                  :start-placeholder="'开始日期'"
-                                :end-placeholder="'结束日期'">
+                  :end-placeholder="'结束日期'"
-                </el-date-picker>
+                  @change="changeTime1"
+                />
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item :label="'创建日期'">
-                <el-date-picker v-model="creationTime2"
+                <el-date-picker
-                                @change="changeTime2"
+                  v-model="creationTime2"
-                                value-format="yyyy-MM-dd HH:mm:ss"
+                  value-format="yyyy-MM-dd HH:mm:ss"
-                                type="datetimerange"
+                  type="datetimerange"
-                                :range-separator="'至'"
+                  :range-separator="'至'"
-                                :start-placeholder="'开始日期'"
+                  :start-placeholder="'开始日期'"
-                                :end-placeholder="'结束日期'">
+                  :end-placeholder="'结束日期'"
-                </el-date-picker>
+                  @change="changeTime2"
+                />
               </el-form-item>
             </el-col>
             <el-col :span="4">
-              <el-button type="primary"
+              <el-button
-                         size="small"
+                type="primary"
-                         @click="getDataList"> {{ '搜索' }}</el-button>
+                size="small"
-              <el-button size="small"
+                @click="getDataList"
-                         class="resetBtn"
+              > {{ '搜索' }}</el-button>
-                         @click="reset"> {{ '重置' }}</el-button>
+              <el-button
+                size="small"
+                class="resetBtn"
+                @click="reset"
+              > {{ '重置' }}</el-button>
             </el-col>
           </el-row>
         </el-form>
       </div>
       <div class="main_a">
         <div class="mainbtn">
-          <el-button size="small"
+          <el-button
-                     @click="openDig"
+            v-hasButtons="['directAdd']"
-                     v-hasButtons="['directAdd']"
+            size="small"
-                     class="addBtn">{{'添加'}}</el-button>
+            class="addBtn"
-                     <el-button size="small"
+            @click="openDig"
-          @click="handleExport"
+          >{{ '添加' }}</el-button>
-          v-hasButtons="['directExport']"
+          <el-button
-                     class="exportBtn"> {{ '导出' }}</el-button>
+            v-hasButtons="['directExport']"
+            size="small"
+            class="exportBtn"
+            @click="handleExport"
+          > {{ '导出' }}</el-button>
         </div>
         <div class="maintable">
-          <el-table :data="tableData"
+          <el-table
-          v-loading="loading"
+            v-loading="loading"
-                    style="width: 100%"
+            :data="tableData"
-                    height="710px"
+            style="width: 100%"
-                    :header-cell-style="{ background: '#EEEEEE' }"
+            height="710px"
-                    :row-class-name="tableRowClassName"
+            :header-cell-style="{ background: '#EEEEEE' }"
-                    @selection-change="handleSelectionChange">
+            :row-class-name="tableRowClassName"
-            <el-table-column type="selection"
+            @selection-change="handleSelectionChange"
-                             width="55"> </el-table-column>
+          >
-            <el-table-column align="center"
+            <el-table-column
-                             prop="actName"
+              type="selection"
-                             :label="'活动名称'">
+              width="55"
-            </el-table-column>
+            />
-            <el-table-column align="center"
+            <el-table-column
-                             prop="actStartDate"
+              align="center"
-                             :label="'开始日期'">
+              prop="actName"
-            </el-table-column>
+              :label="'活动名称'"
-            <el-table-column align="center"
+            />
-                             prop="actEndDate"
+            <el-table-column
-                             :label="'结束日期'">
+              align="center"
-            </el-table-column>
+              prop="actStartDate"
-            <el-table-column align="center"
+              :label="'开始日期'"
-                             prop="status"
+            />
-                             :label="'活动状态'">
+            <el-table-column
-            </el-table-column>
+              align="center"
-            <el-table-column align="center"
+              prop="actEndDate"
-                             prop="creationTime"
+              :label="'结束日期'"
-                             :label="'创建日期'">
+            />
-            </el-table-column>
+            <el-table-column
-            <el-table-column align="center"
+              align="center"
-                             prop="time"
+              prop="status"
-                             :label="'操作'"
+              :label="'活动状态'"
-                             fixed="right">
+            />
+            <el-table-column
+              align="center"
+              prop="creationTime"
+              :label="'创建日期'"
+            />
+            <el-table-column
+              align="center"
+              prop="time"
+              :label="'操作'"
+              fixed="right"
+            >
               <template slot-scope="scope">
 
-                <el-button @click="toFixed(scope.row.pkId, 4)"
+                <el-button
-                           type="text"
+                  v-hasButtons="['directSee']"
-                           v-hasButtons="['directSee']"
+                  type="text"
-                           style="color: #48B2FD;"
+                  style="color: #48B2FD;"
-                           size="small">
+                  size="small"
+                  @click="toFixed(scope.row.pkId, 4)"
+                >
                   {{ '查看' }}
                 </el-button>
-                <el-button @click="toFixed(scope.row.pkId, 2)"
+                <el-button
-                           type="text"
+                  v-hasButtons="['directUpdata']"
-                           v-hasButtons="['directUpdata']"
+                  type="text"
-                           style="color: #F3A900;"
+                  style="color: #F3A900;"
-                           size="small">
+                  size="small"
-                  {{'修改'}}
+                  @click="toFixed(scope.row.pkId, 2)"
+                >
+                  {{ '修改' }}
                 </el-button>
-                <el-button @click="toFixed(scope.row.pkId,3)"
+                <el-button
-                           type="text"
+                  v-hasButtons="['directDel']"
-                           size="small"
+                  type="text"
-                           v-hasButtons="['directDel']"
+                  size="small"
-                           style="color: #C8161D">
+                  style="color: #C8161D"
+                  @click="toFixed(scope.row.pkId,3)"
+                >
                   {{ '删除' }}
                 </el-button>
               </template>
@@ -155,11 +193,13 @@
         </div>
       </div>
     </div>
-    <pagination v-show="total > 0"
+    <pagination
-                :total="total"
+      v-show="total > 0"
-                :page.sync="queryParams.pageNum"
+      :total="total"
-                :limit.sync="queryParams.pageSize"
+      :page.sync="queryParams.pageNum"
-                @pagination="getDataList" />
+      :limit.sync="queryParams.pageSize"
+      @pagination="getDataList"
+    />
   </div>
 </template>
 
@@ -169,16 +209,16 @@ import * as api from '@/api/giftGoods.js'
 export default {
   name: 'Bzpz',
   components: {
-    topBar,
+    topBar
   },
   filters: {
-     isAgree(val) {
+    isAgree(val) {
       if (!val) {
-        return '允许';
+        return '允许'
       } else {
-        return '禁止';
+        return '禁止'
       }
-    },
+    }
   },
   data() {
     return {
@@ -189,27 +229,27 @@ export default {
       // 查询参数
       queryParams: {
         pageNum: 1,
-        pageSize: 50,
+        pageSize: 50
       },
       addOrEdit: '',
       total: 0,
       dialogVisible: false,
       tableData: [],
-      loading:false,
+      loading: false,
       moren: 'directGiftsList',
       topList: [
         {
           name: '直推赠送',
-          path: 'directGiftsList',
+          path: 'directGiftsList'
-        },
+        }
       ],
       form: {
-        name: '',
+        name: ''
       },
       rules: {
-        name: [{ required: true, message: '请输入规格类型', trigger: 'blur' }],
+        name: [{ required: true, message: '请输入规格类型', trigger: 'blur' }]
       },
-      actStatus: [],
+      actStatus: []
     }
   },
   mounted() {
@@ -219,7 +259,7 @@ export default {
     this.getDataList()
   },
   methods: {
-    //重置
+    // 重置
     reset() {
       this.select = {}
       this.creationTime = []
@@ -233,16 +273,16 @@ export default {
       })
     },
     changeTime(val) {
-      this.select.startActStartDate = val ? val[0] : "";
+      this.select.startActStartDate = val ? val[0] : ''
-      this.select.endActStartDate  = val ? val[1] : "";
+      this.select.endActStartDate = val ? val[1] : ''
     },
     changeTime1(val) {
-      this.select.startActEndDate = val ? val[0] : "";
+      this.select.startActEndDate = val ? val[0] : ''
-      this.select.endActEndDate = val ? val[1] : "";
+      this.select.endActEndDate = val ? val[1] : ''
     },
     changeTime2(val) {
-      this.select.startCreationTime = val ? val[0] : "";
+      this.select.startCreationTime = val ? val[0] : ''
-      this.select.endCreationTime = val ? val[1] : "";
+      this.select.endCreationTime = val ? val[1] : ''
     },
     // 点击修改
     toFixed(id, index) {
@@ -252,9 +292,9 @@ export default {
         path: 'addDirect',
         query: {
           pkId: id,
-          controlType: index,
+          controlType: index
           // functionType:this.select.functionType
-        },
+        }
       })
     },
     // 删除
@@ -262,7 +302,7 @@ export default {
       this.$confirm('确认删除?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
-        type: 'warning',
+        type: 'warning'
       }).then(() => {
         api.activityRemove(id).then((res) => {
           this.getDataList()
@@ -282,7 +322,7 @@ export default {
             if (res.code == 200) {
               this.$message({
                 message: res.msg,
-                type: 'success',
+                type: 'success'
               })
               this.dialogVisible = false
               // 充值数据
@@ -305,8 +345,8 @@ export default {
       this.$router.push({
         path: 'addDirect',
         query: {
-          controlType: 1,
+          controlType: 1
-        },
+        }
       })
     },
 
@@ -315,7 +355,7 @@ export default {
       this.loading = true
       api
         .directList(
-          Object.assign({}, this.queryParams, this.select, { actType: 13 })
+          Object.assign({}, this.queryParams, this.select, { actType: 30 })
         )
         .then((res) => {
           this.tableData = res.rows
@@ -326,15 +366,15 @@ export default {
     handleSelectionChange(val) {},
     /** 导出按钮操作 */
     handleExport() {
-      this.$confirm( '是否确认导出所有数据项?', '警告', {
+      this.$confirm('是否确认导出所有数据项?', '警告', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
-        type: 'warning',
+        type: 'warning'
       }).then((_) => {
         this.download(
           'activity/manage/recommend/export',
-          Object.assign({},{actType:12}, this.queryParams, this.select),
+          Object.assign({}, { actType: 12 }, this.queryParams, this.select),
-          `${'直推赠送'}${new Date().getTime()}.xlsx`
+          `${'直推升级'}${new Date().getTime()}.xlsx`
         )
       })
     },
@@ -345,8 +385,8 @@ export default {
         return 'success-row'
       }
       return ''
-    },
+    }
-  },
+  }
 }
 </script>
 <style scoped lang="scss">

src/views/marketing/directGifts/record.vue

@@ -0,0 +1,315 @@
+<!--
+ * @Descripttion:
+ * @version:
+ * @Author: kBank
+ * @Date: 2022-10-24 15:45:01
+-->
+<template>
+  <div class="page">
+    <topBar
+      v-if="topList.length > 0"
+      :top-list="topList"
+      :moren="moren"
+    />
+    <div class="main">
+      <div class="form_all">
+        <el-form
+          ref="select"
+          :model="select"
+          label-width="auto"
+        >
+          <el-row :gutter="40">
+            <!-- 一层 -->
+            <el-col :span="6">
+              <el-form-item :label="'活动名称'">
+                <el-input
+                  v-model="select.actName"
+                  clearable
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item :label="'会员编号'">
+                <el-input
+                  v-model="select.memberCode"
+                  clearable
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item :label="'活动开始日期'">
+                <el-date-picker
+                  v-model="creationTime"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  type="datetimerange"
+                  :range-separator="'至'"
+                  :start-placeholder="'开始日期'"
+                  :end-placeholder="'结束日期'"
+                  @change="changeTime"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item :label="'活动结束日期'">
+                <el-date-picker
+                  v-model="creationTime1"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  type="datetimerange"
+                  :range-separator="'至'"
+                  :start-placeholder="'开始日期'"
+                  :end-placeholder="'结束日期'"
+                  @change="changeTime1"
+                />
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="4">
+              <el-button
+                type="primary"
+                size="small"
+                @click="getDataList"
+              > {{ '搜索' }}</el-button>
+              <el-button
+                size="small"
+                class="resetBtn"
+                @click="reset"
+              > {{ '重置' }}</el-button>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+      <div class="main_a">
+        <div class="mainbtn">
+          <el-button
+            v-hasButtons="['directRecordExport']"
+            size="small"
+            class="exportBtn"
+            @click="handleExport"
+          > {{ '导出' }}</el-button>
+        </div>
+        <div class="maintable">
+          <el-table
+            v-loading="loading"
+            :data="tableData"
+            style="width: 100%"
+            height="710px"
+            :header-cell-style="{ background: '#EEEEEE' }"
+            :row-class-name="tableRowClassName"
+            @selection-change="handleSelectionChange"
+          >
+            <el-table-column
+              type="selection"
+              width="55"
+            />
+            <el-table-column
+              align="center"
+              prop="actName"
+              :label="'活动名称'"
+            />
+            <el-table-column
+              align="center"
+              prop="memberCode"
+              :label="'会员编号'"
+            />
+            <el-table-column
+              align="center"
+              prop="memberName"
+              :label="'会员姓名'"
+            />
+            <el-table-column
+              align="center"
+              prop="pkSettleGrade"
+              :label="'原等级'"
+            />
+            <el-table-column
+              align="center"
+              prop="pkRecommendGrade"
+              :label="'新等级'"
+            />
+            <el-table-column
+              align="center"
+              prop="actStartDate"
+              :label="'活动开始时间'"
+            />
+            <el-table-column
+              align="center"
+              prop="actEndDate"
+              :label="'活动结束时间'"
+            />
+            <el-table-column
+              align="center"
+              prop="upgradeTime"
+              :label="'升级年月'"
+            />
+            <el-table-column
+              align="center"
+              prop="creationTime"
+              :label="'创建时间'"
+            />
+
+          </el-table>
+        </div>
+      </div>
+    </div>
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getDataList"
+    />
+  </div>
+</template>
+
+<script>
+import topBar from '@/components/topBar'
+import * as api from '@/api/giftGoods.js'
+export default {
+  name: 'Bzpz',
+  components: {
+    topBar
+  },
+  filters: {
+    isAgree(val) {
+      if (!val) {
+        return '允许'
+      } else {
+        return '禁止'
+      }
+    }
+  },
+  data() {
+    return {
+      creationTime: [],
+      creationTime1: [],
+      creationTime2: [],
+      select: {},
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 50
+      },
+      total: 0,
+      tableData: [],
+      loading: false,
+      moren: 'directUpgradeRecordList',
+      topList: [
+        {
+          name: '直推升级数据',
+          path: 'directUpgradeRecordList'
+        }
+      ],
+      form: {
+        name: ''
+      }
+    }
+  },
+  mounted() {
+    // 获取列表
+    this.getDataList()
+  },
+  methods: {
+    // 重置
+    reset() {
+      this.select = {}
+      this.creationTime = []
+      this.creationTime1 = []
+      this.creationTime2 = []
+      this.getDataList()
+    },
+
+    changeTime(val) {
+      this.select.startActStartDate = val ? val[0] : ''
+      this.select.startActEndDate = val ? val[1] : ''
+    },
+    changeTime1(val) {
+      this.select.endActStartDate = val ? val[0] : ''
+      this.select.endActEndDate = val ? val[1] : ''
+    },
+    // 获取列表
+    getDataList() {
+      this.loading = true
+      api
+        .directUpgradeRecordList(
+          Object.assign({}, this.queryParams, this.select)
+        )
+        .then((res) => {
+          this.tableData = res.rows
+          this.total = res.total
+          this.loading = false
+        })
+    },
+    handleSelectionChange(val) {},
+    /** 导出按钮操作 */
+    handleExport() {
+      this.$confirm('是否确认导出所有数据项?', '警告', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then((_) => {
+        this.download(
+          'sale/manage/recommend/directPushUpgradeExport',
+          Object.assign({}, { actType: 12 }, this.queryParams, this.select),
+          `${'直推升级数据'}${new Date().getTime()}.xlsx`
+        )
+      })
+    },
+    tableRowClassName({ row, rowIndex }) {
+      if (rowIndex % 2 == 1) {
+        return 'warning-row'
+      } else if (rowIndex % 2 == 0) {
+        return 'success-row'
+      }
+      return ''
+    }
+  }
+}
+</script>
+<style scoped lang="scss">
+::v-deep .el-table .warning-row {
+  background: #f9f9f9;
+}
+
+::v-deep .el-table .success-row {
+  background: #ffffff;
+}
+::v-deep .el-table thead {
+  color: #000000;
+}
+::v-deep .el-select {
+  width: 100%;
+}
+.page {
+  padding: 20px;
+  background: #f9f9f9;
+  font-size: 14px;
+  .main {
+    // background: #ffffff;
+    border-radius: 8px;
+    display: flex;
+    flex-direction: column;
+    .main_a {
+      background: #fff;
+      border-radius: 8px;
+      justify-content: space-between;
+      align-items: center;
+      box-shadow: 0px 2px 20px 0px rgba(238, 238, 238, 0.5);
+    }
+    .mainbtn {
+      padding: 0;
+    }
+    .maintable {
+      flex: 1;
+    }
+  }
+}
+::v-deep .el-date-editor.el-input,
+.el-date-editor.el-input__inner {
+  width: 100%;
+}
+.form_all {
+  padding: 0 20px;
+  margin-bottom: 10px;
+  background: #fff;
+}
+</style>

src/views/marketing/directRanking/amount.vue

@@ -0,0 +1,288 @@
+<template>
+  <div class="page">
+    <topBar
+      v-if="topList.length > 0"
+      :top-list="topList"
+      :moren="moren"
+    />
+    <div class="main">
+      <div class="form_all">
+        <el-form ref="select" :model="select" label-width="auto">
+          <el-row :gutter="10">
+            <el-col :span="6">
+              <el-form-item :label="'统计时间'">
+                <el-date-picker
+                  v-model="select.selectDate"
+                  type="month"
+                  value-format="yyyy-MM"
+                  :placeholder="'请选择'"
+                  :clearable="false"
+                  @change="changeTime"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-button type="primary" @click="getDataList">
+                {{ '搜索' }}</el-button>
+              <el-button type="" @click="reset"> {{ '重置' }}</el-button>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+      <div class="maintop">
+        <div class="mainbtn">
+          <el-button
+            v-hasButtons="['directRankingExport']"
+            size="small"
+            style="background-color: #ffad41"
+            class="thebtn1"
+            @click="handleExport"
+          >
+            {{ '导出' }}</el-button>
+        </div>
+      </div>
+      <div class="maintable">
+        <el-table
+          v-loading="loading"
+          :data="tableData"
+          style="width: 100%"
+          :header-cell-style="{ background: '#EEEEEE' }"
+          :row-class-name="tableRowClassName"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column type="selection" width="55" />
+
+          <el-table-column align="center" prop="ranking" label="排名">
+            <template slot-scope="scope">
+              <span :class="getRankingClass(scope.$index + 1)">{{ scope.$index + 1 }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            align="center"
+            prop="memberCode"
+            :label="'会员编号'"
+          />
+
+          <el-table-column
+            align="center"
+            prop="memberName"
+            :label="'会员姓名'"
+          />
+          <el-table-column
+            align="center"
+            prop="numberOfAmount"
+            label="直推金额(万元)"
+          />
+        </el-table>
+      </div>
+    </div>
+    <!-- <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getDataList"
+    /> -->
+  </div>
+</template>
+
+<script>
+import * as api from '@/api/giftGoods.js'
+import mixins from './mixins'
+export default {
+  name: 'DirectRankingList',
+
+  mixins: [mixins],
+  data() {
+    return {
+      select: {
+        selectDate: ''
+      },
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 50,
+        year: '',
+        month: '',
+        faker: false
+      },
+      total: 0,
+      tableData: [],
+      loading: false,
+      moren: 'directAmountRankingList'
+
+    }
+  },
+  mounted() {
+    this.init()
+    this.getDataList()
+  },
+  methods: {
+    aaa(obj) {
+      console.log(obj, '....obj')
+    },
+    init() {
+      const month = new Date().getMonth() + 1
+      const monthStr = month < 10 ? '0' + month : month
+      this.select.selectDate = new Date().getFullYear() + '-' + monthStr
+    },
+    changeTime(val) {
+      this.queryParams.selectDate = val
+    },
+    reset() {
+      this.select = {}
+    },
+
+    getDataList() {
+      this.loading = true
+      const [year, month] = this.select.selectDate.split('-')
+      api
+        .getMemberDirectPushAmount(Object.assign({}, this.queryParams, this.select, {
+          year,
+          month
+        }))
+        .then((res) => {
+          this.tableData = res.data
+          this.total = res.total
+          this.loading = false
+        })
+    },
+
+    handleSelectionChange(val) {},
+    tableRowClassName({ row, rowIndex }) {
+      if (rowIndex % 2 === 1) {
+        return 'warning-row'
+      } else if (rowIndex % 2 === 0) {
+        return 'success-row'
+      }
+      return ''
+    },
+    getRankingClass(ranking) {
+      if (ranking === 1) {
+        return 'first-place-cell'
+      } else if (ranking === 2) {
+        return 'second-place-cell'
+      } else if (ranking === 3) {
+        return 'third-place-cell'
+      }
+      return 'normal-ranking'
+    }
+  }
+}
+</script>
+    <style scoped lang="scss">
+::v-deep .el-table .warning-row {
+  background: #f9f9f9;
+}
+
+::v-deep .el-table .success-row {
+  background: #ffffff;
+}
+::v-deep .el-table thead {
+  color: #000000;
+}
+::v-deep .el-select {
+  width: 100%;
+}
+.uploadIcon ::v-deep .el-upload--picture-card {
+  display: none !important; /* 上传按钮隐藏 */
+}
+.page {
+  padding: 20px;
+  background: #f9f9f9;
+  font-size: 14px;
+  .main {
+    background: #ffffff;
+    border-radius: 8px;
+    box-shadow: 0px 2px 20px 0px rgba(238, 238, 238, 0.5);
+    .form_all {
+      padding: 0px 20px 0 20px;
+      // margin-bottom: 20px;
+      background: #fff;
+      border-radius: 8px;
+    }
+    .maintop {
+      display: flex;
+      padding: 0px 0px;
+      justify-content: space-between;
+      align-items: center;
+
+      background: #f8f8f8;
+      .mainbtn {
+        .thebtn1 {
+          background: #3181e5;
+          color: #ffffff;
+        }
+        .thebtn2 {
+          background: #ffad41;
+          color: #ffffff;
+        }
+      }
+      .maintitle {
+        font-size: 10px;
+        font-family: MicrosoftYaHei;
+        color: #999999;
+      }
+    }
+  }
+  .tem {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    img {
+      width: 28px;
+      height: 20px;
+      margin-right: 3px;
+    }
+  }
+  .isRed {
+    color: #ed1d25;
+  }
+  .isGreen {
+    color: #1ab62b;
+  }
+  .bgImg {
+    width: 48px;
+    height: 48px;
+  }
+}
+.openClose {
+  text-align: right;
+  margin-right: 10px;
+  color: #3181e5;
+}
+.dizhi {
+  ::v-deep .el-cascader {
+    width: 100%;
+  }
+}
+::v-deep .el-date-editor.el-input,
+.el-date-editor.el-input__inner {
+  width: auto;
+}
+.lan {
+  text-decoration: underline;
+  color: #48b2fd;
+  cursor: pointer;
+}
+
+/* 排名字体颜色样式 */
+.first-place-cell {
+  color: #FFD700;
+  font-weight: bold;
+}
+
+.second-place-cell {
+  color: #C0C0C0;
+  font-weight: bold;
+}
+
+.third-place-cell {
+  color: #CD853F;
+  font-weight: bold;
+}
+
+.normal-ranking {
+  color: #666666;
+}
+</style>

src/views/marketing/directRanking/config.vue

@@ -0,0 +1,96 @@
+<template>
+  <div class="page">
+    <topBar
+      v-if="topList.length > 0"
+      :top-list="topList"
+      :moren="moren"
+    />
+    <el-form>
+      <el-form-item label="直推人数排行榜">
+        <el-switch
+          :value="pushPeople"
+          active-text="开启"
+          active-value="true"
+          inactive-value="false"
+          inactive-text="关闭"
+          @change="pushPeopleHandle"
+        />
+      </el-form-item>
+      <el-form-item label="直推金额排行榜">
+        <el-switch
+          :value="pushAmount"
+          active-text="开启"
+          active-value="true"
+          inactive-value="false"
+          inactive-text="关闭"
+          @change="pushAmountHandle"
+        />
+      </el-form-item>
+    </el-form>
+  </div>
+
+</template>
+
+<script>
+import mixins from './mixins'
+import {
+  getMemberDirectPushSwitchStatus,
+  setMemberDirectPush,
+  setMemberDirectPushAmount
+} from '@/api/giftGoods'
+
+export default {
+  name: 'DirectRankingConfig',
+  mixins: [mixins],
+  data() {
+    return {
+      pushPeople: 'false',
+      pushAmount: 'false',
+      moren: 'directConfig'
+    }
+  },
+  mounted() {
+    this.getMemberDirectPushSwitchStatus()
+  },
+  methods: {
+    pushPeopleHandle(val) {
+      this.pushPeople = val
+      this.setMemberDirectPush(val)
+    },
+    pushAmountHandle(val) {
+      this.pushAmount = val
+      this.setMemberDirectPushAmount(val)
+    },
+    getMemberDirectPushSwitchStatus() {
+      getMemberDirectPushSwitchStatus('getShowPeople').then(res => {
+        this.pushPeople = res.data
+      })
+      getMemberDirectPushSwitchStatus('getShowAmount').then(res => {
+        this.pushAmount = res.data
+      })
+    },
+
+    setMemberDirectPush(val) {
+      setMemberDirectPush(val).then(res => {
+        if (res.code === 200) {
+          this.$message.success('操作成功')
+          this.pushPeople = val
+        }
+      })
+    },
+    setMemberDirectPushAmount(val) {
+      setMemberDirectPushAmount(val).then(res => {
+        if (res.code === 200) {
+          this.$message.success('操作成功')
+          this.pushAmount = val
+        }
+      })
+    }
+  }
+
+}
+</script>
+
+<style>
+
+</style>

src/views/marketing/directRanking/index.vue

@@ -2,171 +2,139 @@
   <div class="page">
     <topBar
       v-if="topList.length > 0"
-      :topList="topList"
+      :top-list="topList"
       :moren="moren"
-    ></topBar>
+    />
     <div class="main">
       <div class="form_all">
         <el-form ref="select" :model="select" label-width="auto">
           <el-row :gutter="10">
-            <el-col :span="4">
-              <el-form-item :label="'会员编号'" prop="memberCode">
-                <el-input
-                  clearable
-                  v-model="select.memberCode"
-                  :placeholder="'请输入'"
-                ></el-input>
-              </el-form-item>
-            </el-col>
             <el-col :span="6">
               <el-form-item :label="'统计时间'">
                 <el-date-picker
-                  v-model="select.payDate"
+                  v-model="select.selectDate"
-                  @change="changeTime"
                   type="month"
                   value-format="yyyy-MM"
                   :placeholder="'请选择'"
-                >
+                  :clearable="false"
-                </el-date-picker>
+                  @change="changeTime"
+                />
               </el-form-item>
             </el-col>
             <el-col :span="4">
               <el-button type="primary" @click="getDataList">
-                {{ '搜索' }}</el-button
+                {{ '搜索' }}</el-button>
-              >
               <el-button type="" @click="reset"> {{ '重置' }}</el-button>
             </el-col>
           </el-row>
         </el-form>
       </div>
-      <div class="maintop">
+
-        <div class="mainbtn">
-          <el-button
-            size="small"
-            @click="handleExport"
-            v-hasButtons="['directRankingExport']"
-            style="background-color: #ffad41"
-            class="thebtn1"
-          >
-            {{ '导出' }}</el-button
-          >
-        </div>
-      </div>
       <div class="maintable">
         <el-table
-          :data="tableData"
           v-loading="loading"
+          :data="tableData"
           style="width: 100%"
           :header-cell-style="{ background: '#EEEEEE' }"
           :row-class-name="tableRowClassName"
           @selection-change="handleSelectionChange"
         >
-          <el-table-column type="selection" width="55"> </el-table-column>
+          <el-table-column type="selection" width="55" />
 
-          <el-table-column
-            align="center"
-            prop="payTime"
-            :label="'统计时间'"
-          >
-          </el-table-column>
           <el-table-column align="center" prop="ranking" label="排名">
+            <template slot-scope="scope">
+              <span :class="getRankingClass(scope.$index + 1)">{{ scope.$index + 1 }}</span>
+            </template>
           </el-table-column>
           <el-table-column
             align="center"
             prop="memberCode"
             :label="'会员编号'"
-          >
+          />
-          </el-table-column>
 
           <el-table-column
             align="center"
             prop="memberName"
             :label="'会员姓名'"
-          >
+          />
-          </el-table-column>
           <el-table-column
             align="center"
-            prop="gradeName"
+            prop="numberOfPeople"
-            :label="'结算等级'"
+            label="直推人数"
-          >
+          />
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="awardsName"
-            :label="'真实奖衔'"
-          >
-          </el-table-column>
-
-          <el-table-column
-            align="center"
-            prop="orderAchieve"
-            :label="'直推业绩'"
-          >
-          </el-table-column>
         </el-table>
       </div>
     </div>
-    <pagination
+    <!-- <pagination
       v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
       @pagination="getDataList"
-    />
+    /> -->
   </div>
 </template>
-    
+
-    <script>
+<script>
-import topBar from "@/components/topBar";
+import * as api from '@/api/giftGoods.js'
-import * as api from "@/api/giftGoods.js";
+import mixins from './mixins'
 export default {
-  name: "DirectRankingList",
+  name: 'DirectRankingList',
-  components: {
+
-    topBar,
+  mixins: [mixins],
-  },
   data() {
     return {
-      creationTime: [],
+      select: {
-      select: {},
+        selectDate: ''
+      },
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 50,
+        year: '',
+        month: '',
+        faker: false
       },
       total: 0,
       tableData: [],
-      loading:false,
+      loading: false,
-      moren: "directRankingList",
+      moren: 'directRankingList'
-      topList: [
+
-        {
+    }
-          name: "直推排行数据",
-          path: "directRankingList",
-        },
-      ],
-    };
   },
   mounted() {
-    // 获取列表
+    this.init()
-    //   this.getDataList();
+    this.getDataList()
   },
   methods: {
-    changeTime(val){
+    aaa(obj) {
-      this.queryParams.payDate = val
+      console.log(obj, '....obj')
+    },
+    init() {
+      const month = new Date().getMonth() + 1
+      const monthStr = month < 10 ? '0' + month : month
+      this.select.selectDate = new Date().getFullYear() + '-' + monthStr
+    },
+    changeTime(val) {
+      this.queryParams.selectDate = val
     },
     reset() {
-      this.select = {};
+      this.select = {}
-      this.creationTime = [];
     },
-   
+
     getDataList() {
       this.loading = true
+      const [year, month] = this.select.selectDate.split('-')
       api
-        .getMemberDirectPusht(Object.assign({}, this.queryParams, this.select))
+        .getMemberDirectPush(Object.assign({}, this.queryParams, this.select, {
+          year,
+          month
+        }))
         .then((res) => {
-          this.tableData = res.data;
+          this.tableData = res.data
-          this.total = res.total;
+          this.total = res.total
           this.loading = false
-        });
+        })
     },
 
     handleSelectionChange(val) {},
@@ -175,25 +143,35 @@ export default {
       this.$confirm('是否确认导出所有数据项?', '警告', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
-        type: "warning",
+        type: 'warning'
       }).then((_) => {
         this.download(
-          "/member/manager/member/get-member-direct-push-export",
+          '/member/manager/member/get-member-direct-push-export',
           Object.assign({}, this.queryParams, this.select),
           `直推排行数据${new Date().getTime()}.xlsx`
-        );
+        )
-      });
+      })
     },
     tableRowClassName({ row, rowIndex }) {
-      if (rowIndex % 2 == 1) {
+      if (rowIndex % 2 === 1) {
-        return "warning-row";
+        return 'warning-row'
-      } else if (rowIndex % 2 == 0) {
+      } else if (rowIndex % 2 === 0) {
-        return "success-row";
+        return 'success-row'
       }
-      return "";
+      return ''
     },
-  },
+    getRankingClass(ranking) {
-};
+      if (ranking === 1) {
+        return 'first-place-cell'
+      } else if (ranking === 2) {
+        return 'second-place-cell'
+      } else if (ranking === 3) {
+        return 'third-place-cell'
+      }
+      return 'normal-ranking'
+    }
+  }
+}
 </script>
     <style scoped lang="scss">
 ::v-deep .el-table .warning-row {
@@ -290,5 +268,24 @@ export default {
   color: #48b2fd;
   cursor: pointer;
 }
+
+/* 排名字体颜色样式 */
+.first-place-cell {
+  color: #FFD700;
+  font-weight: bold;
+}
+
+.second-place-cell {
+  color: #C0C0C0;
+  font-weight: bold;
+}
+
+.third-place-cell {
+  color: #CD853F;
+  font-weight: bold;
+}
+
+.normal-ranking {
+  color: #666666;
+}
 </style>
-    

src/views/marketing/directRanking/mixins.js

@@ -0,0 +1,48 @@
+import topBar from '@/components/topBarRole'
+import { getRouters } from '@/api/settle'
+
+export default {
+  data() {
+    return {
+      topList: [
+        {
+          name: '直推人数排行数据',
+          path: 'directRankingList',
+          url: 'DirectRankingList',
+          changed: false
+        },
+        {
+          name: '直推金额排行数据',
+          path: 'directAmountRankingList',
+          url: 'DirectAmountRankingList',
+          changed: false
+        },
+        {
+          name: '直推配置',
+          path: 'directConfig',
+          url: 'DirectConfig',
+          changed: false
+        }
+      ]
+    }
+  },
+  components: {
+    topBar
+  },
+  mounted() {
+    this.getUserRoute()
+  },
+  methods: {
+    getUserRoute() {
+      getRouters().then((res) => {
+        res.data.forEach((item) => {
+          this.topList.forEach((items) => {
+            if (item.routeName === items.url) {
+              items.changed = true
+            }
+          })
+        })
+      })
+    }
+  }
+}