src/api/giftGoods.js

@@ -300,44 +300,12 @@ export function tourismDetails(params) {
   })
 }
 
-// 营销管理-直推人数排行数据
+// 营销管理-直推排行数据
-export function getMemberDirectPush(data) {
+export function getMemberDirectPusht(params) {
   return request({
-    url: '/member/manage/member-statistics/topPeople',
+    url: '/member/manager/member/get-member-direct-push',
-    method: 'post',
+    method: 'get',
-    data
+    params
-  })
-}
-// 营销管理-直推金额排行数据
-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'
   })
 }
 
@@ -386,7 +354,7 @@ export function lotteryRuleConfigSubmit(data) {
 // 直推赠送
 export function directRuleConfigSubmit(data) {
   return request({
-    url: '/sale/manage/recommend/directPushUpgrade',
+    url: '/sale/manage/recommend/submit',
     method: 'post',
     data
   })
@@ -401,11 +369,3 @@ export function tourismRuleConfigSubmit(data) {
   })
 }
 
-// 直推升级数据
-export function directUpgradeRecordList(params) {
-  return request({
-    url: '/sale/manage/recommend/directPushUpgradeList',
-    method: 'get',
-    params
-  })
-}

src/router/index.js

@@ -1928,7 +1928,6 @@ export const constantRoutes = [
           }
         ]
       },
-
       {
         path: 'lotteryDetails',
         name: 'LotteryDetails',
@@ -1942,6 +1941,33 @@ 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',
@@ -1976,45 +2002,17 @@ 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: 'directUpgrade',
+        path: 'directGifts',
-        name: 'DirectUpgrade',
+        name: 'DirectGifts',
         component: ParentView,
-        meta: { title: '直推升级' },
         children: [
           {
-            path: 'directUpgradeList',
+            path: 'directGiftsList',
-            name: 'DirectUpgradeList',
+            name: 'DirectGiftsList',
             component: () => import('@/views/marketing/directGifts/index'),
-            meta: { title: '直推升级' }
+            meta: { title: '直推赠送' }
           },
           {
             path: 'addDirect',
@@ -2022,40 +2020,6 @@ 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
           }
         ]
       },
@@ -2158,6 +2122,19 @@ 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,14 +68,77 @@
               </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"
+                  value-format="yyyy-MM-dd HH:mm:ss"
-                  type="daterange"
+                  type="datetimerange"
                   :range-separator="'至'"
                   :start-placeholder="'开始日期'"
                   :end-placeholder="'结束日期'"
@@ -90,8 +153,8 @@
                 <el-date-picker
                   v-model="ruleForm.ruleFormTime1"
                   :disabled="lookOver"
-                  value-format="yyyy-MM-dd"
+                  value-format="yyyy-MM-dd HH:mm:ss"
-                  type="daterange"
+                  type="datetimerange"
                   :range-separator="'至'"
                   :start-placeholder="'开始日期'"
                   :end-placeholder="'结束日期'"
@@ -103,8 +166,12 @@
         </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()">
@@ -122,12 +189,17 @@ 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: 'AddDirectPushUpgrade',
+  name: 'GiftGoodsList',
   components: {
+    topBar,
     ImageUpload,
+    repurchQuan,
     directUpdata,
+    directAverage,
     Editor
   },
   data() {
@@ -138,9 +210,17 @@ export default {
           name: '基本信息',
           id: 0
         },
+        {
+          name: '复购券',
+          id: 1
+        },
         {
           name: '直推升级',
           id: 2
+        },
+        {
+          name: '复购券均分',
+          id: 3
         }
       ],
       uploadImgUrl: process.env.VUE_APP_BASE_API + '/system/upload',
@@ -165,6 +245,9 @@ export default {
         actCover: [
           { required: true, message: '请上传活动封面', trigger: 'change' }
         ],
+        goalMemberConfigList: [
+          { required: true, message: '请选择目标用户群体', trigger: 'change' }
+        ],
         ruleFormTime: [
           { required: true, message: '请选择活动时间', trigger: 'change' }
         ],
@@ -204,9 +287,6 @@ export default {
     }
   },
   methods: {
-    splitDate(date) {
-      return date.split(' ')[0]
-    },
     getDetails() {
       api
         .recommendDetail({
@@ -226,17 +306,13 @@ 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', [
-            actStartDate,
+            res.data.activityParam.actStartDate,
-            actEndDate
+            res.data.activityParam.actEndDate
           ])
           this.$set(this.ruleForm, 'ruleFormTime1', [
-            disStartDate,
+            res.data.activityParam.disStartDate,
-            disEndDate
+            res.data.activityParam.disEndDate
           ])
           const arr1 = []
           const arr2 = []
@@ -254,10 +330,16 @@ 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(() => {
@@ -274,12 +356,12 @@ export default {
       )
       this.$set(this.ruleForm, 'actCover', this.addData.activityParam.actCover)
       this.$set(this.ruleForm, 'ruleFormTime', [
-        this.splitDate(this.addData.activityParam.actStartDate),
+        this.addData.activityParam.actStartDate,
-        this.splitDate(this.addData.activityParam.actEndDate)
+        this.addData.activityParam.actEndDate
       ])
       this.$set(this.ruleForm, 'ruleFormTime1', [
-        this.splitDate(this.addData.activityParam.disStartDate),
+        this.addData.activityParam.disStartDate,
-        this.splitDate(this.addData.activityParam.disEndDate)
+        this.addData.activityParam.disEndDate
       ])
       const arr1 = []
       const arr2 = []
@@ -297,8 +379,12 @@ 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(() => {
@@ -407,16 +493,12 @@ export default {
             {},
             {
               controlType: this.controlType,
-              activityParam: {
+              activityParam: this.ruleForm,
-                ...this.ruleForm,
+              repurchaseCouponsShowList: this.$refs.repurchQuan.allData,
-                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,22 +7,19 @@
 <template>
   <div class="">
     <div class="tit">{{ '直推升级' }}</div>
-    <div class="xian" />
+    <div class="xian"></div>
     <div class="table">
       <!-- 批量操作 -->
       <table>
         <tr>
           <th colspan="1" class="tableLeft">
-            <el-button
+            <el-button type="primary" @click="addNewGoods" size="mini"
-              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 class="tableFlex_i"></div>
             </div>
           </th>
           <th colspan="6" style="padding-bottom: 0; border: 0">
@@ -38,15 +35,16 @@
                     :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
@@ -59,35 +57,37 @@
                     :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 class="tableFlex_i"></div>
-              <div class="tableFlex_i" />
+              <div class="tableFlex_i"></div>
               <div class="tableFlex_i">
                 <el-input
-                  v-model="plcz.quantity"
                   :placeholder="'赠送数量'"
                   size="medium"
-                />
+                  v-model="plcz.quantity"
+                ></el-input>
               </div>
-              <div class="tableAdd" />
+              <div class="tableAdd"></div>
             </div>
           </th>
           <th colspan="2" style="padding-bottom: 0">
             <div class="tableFlex">
               <div class="tableFlex_i">
-                <el-button type="primary" size="mini" @click="toPlcz">{{
+                <el-button type="primary" @click="toPlcz" size="mini">{{
                   '批量操作'
                 }}</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 style="border: 0"></td>
           <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 class="tableAdd"></div>
             </div>
-          </td> -->
+          </td>
-          <td colspan="2" style="border: 0" />
+          <td colspan="2" style="border: 0"></td>
         </tr>
         <tr v-for="(item, index) in recommendUpgradeList" :key="index">
-          <td style="border: 0" />
+          <td style="border: 0"></td>
           <td colspan="2" style="padding-bottom: 0">
             <div class="tableFlex">
               <div class="tableFlex_i">
@@ -130,7 +130,8 @@
                     :key="item.pkId"
                     :label="item.gradeName"
                     :value="item.pkId"
-                  />
+                  >
+                  </el-option>
                 </el-select>
               </div>
             </div>
@@ -159,15 +160,16 @@
                     :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
@@ -180,29 +182,291 @@
                     :key="item.pkId"
                     :label="item.gradeName"
                     :value="item.pkId"
-                  />
+                  >
+                  </el-option>
                 </el-select>
               </div>
             </div>
           </td>
-
+          <td colspan="7" style="padding-bottom: 0">
-          <td colspan="2" style="border: 0" />
+            <div
+              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 {
@@ -210,247 +474,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: [], //全部数据
       areaList: [], //全部专区
-      isArea: '',
+      isArea: "",
       plcz: {},
       select: {}, //产品筛选
       dialogList: [], //产品数组
       selectData: [], //选中
       skuList: [], //规格数组
       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() {
-      const arr1 = []
+      let arr1 = [],
-      const arr2 = []
+        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) => {
-          const arr1 = []
+          let arr1 = [],
-          const arr2 = []
+            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, {
@@ -473,32 +737,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,185 +6,147 @@
 -->
 <template>
   <div class="page">
-    <topBar
+    <topBar v-if="topList.length > 0"
-      v-if="topList.length > 0"
+            :topList="topList"
-      :top-list="topList"
+            :moren="moren"></topBar>
-      :moren="moren"
-    />
     <div class="main">
       <div class="form_all">
-        <el-form
+        <el-form ref="select"
-          ref="select"
                  :model="select"
-          label-width="auto"
+                 label-width="auto">
-        >
           <el-row :gutter="40">
             <!-- 一层 -->
             <el-col :span="4">
               <el-form-item :label="'活动名称'">
-                <el-input
+                <el-input clearable
-                  v-model="select.actName"
+                          v-model="select.actName"></el-input>
-                  clearable
-                />
               </el-form-item>
             </el-col>
             <el-col :span="4">
               <el-form-item :label="'活动状态'">
-                <el-select
+                <el-select clearable
-                  v-model="select.activityStatus"
-                  clearable
                            :placeholder="'请选择'"
-                >
+                           v-model="select.activityStatus">
-                  <el-option
+                  <el-option v-for="item in actStatus"
-                    v-for="item in actStatus"
                              :key="item.value"
                              :label="item.label"
-                    :value="item.value"
+                             :value="item.value"></el-option>
-                  />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item :label="'开始日期'">
-                <el-date-picker
+                <el-date-picker v-model="creationTime"
-                  v-model="creationTime"
+                                @change="changeTime"
                                 value-format="yyyy-MM-dd HH:mm:ss"
                                 type="datetimerange"
                                 :range-separator="'至'"
                                 :start-placeholder="'开始日期'"
-                  :end-placeholder="'结束日期'"
+                                :end-placeholder="'结束日期'">
-                  @change="changeTime"
+                </el-date-picker>
-                />
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item :label="'结束日期'">
-                <el-date-picker
+                <el-date-picker v-model="creationTime1"
-                  v-model="creationTime1"
+                                @change="changeTime1"
                                 value-format="yyyy-MM-dd HH:mm:ss"
                                 type="datetimerange"
                                 :range-separator="'至'"
                                 :start-placeholder="'开始日期'"
-                  :end-placeholder="'结束日期'"
+                                :end-placeholder="'结束日期'">
-                  @change="changeTime1"
+                </el-date-picker>
-                />
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item :label="'创建日期'">
-                <el-date-picker
+                <el-date-picker v-model="creationTime2"
-                  v-model="creationTime2"
+                                @change="changeTime2"
                                 value-format="yyyy-MM-dd HH:mm:ss"
                                 type="datetimerange"
                                 :range-separator="'至'"
                                 :start-placeholder="'开始日期'"
-                  :end-placeholder="'结束日期'"
+                                :end-placeholder="'结束日期'">
-                  @change="changeTime2"
+                </el-date-picker>
-                />
               </el-form-item>
             </el-col>
             <el-col :span="4">
-              <el-button
+              <el-button type="primary"
-                type="primary"
-                size="small"
-                @click="getDataList"
-              > {{ '搜索' }}</el-button>
-              <el-button
                          size="small"
+                         @click="getDataList"> {{ '搜索' }}</el-button>
+              <el-button size="small"
                          class="resetBtn"
-                @click="reset"
+                         @click="reset"> {{ '重置' }}</el-button>
-              > {{ '重置' }}</el-button>
             </el-col>
           </el-row>
         </el-form>
       </div>
       <div class="main_a">
         <div class="mainbtn">
-          <el-button
+          <el-button size="small"
-            v-hasButtons="['directAdd']"
-            size="small"
-            class="addBtn"
                      @click="openDig"
-          >{{ '添加' }}</el-button>
+                     v-hasButtons="['directAdd']"
-          <el-button
+                     class="addBtn">{{'添加'}}</el-button>
-            v-hasButtons="['directExport']"
+                     <el-button size="small"
-            size="small"
-            class="exportBtn"
           @click="handleExport"
-          > {{ '导出' }}</el-button>
+          v-hasButtons="['directExport']"
+                     class="exportBtn"> {{ '导出' }}</el-button>
         </div>
         <div class="maintable">
-          <el-table
+          <el-table :data="tableData"
           v-loading="loading"
-            :data="tableData"
                     style="width: 100%"
                     height="710px"
                     :header-cell-style="{ background: '#EEEEEE' }"
                     :row-class-name="tableRowClassName"
-            @selection-change="handleSelectionChange"
+                    @selection-change="handleSelectionChange">
-          >
+            <el-table-column type="selection"
-            <el-table-column
+                             width="55"> </el-table-column>
-              type="selection"
+            <el-table-column align="center"
-              width="55"
-            />
-            <el-table-column
-              align="center"
                              prop="actName"
-              :label="'活动名称'"
+                             :label="'活动名称'">
-            />
+            </el-table-column>
-            <el-table-column
+            <el-table-column align="center"
-              align="center"
                              prop="actStartDate"
-              :label="'开始日期'"
+                             :label="'开始日期'">
-            />
+            </el-table-column>
-            <el-table-column
+            <el-table-column align="center"
-              align="center"
                              prop="actEndDate"
-              :label="'结束日期'"
+                             :label="'结束日期'">
-            />
+            </el-table-column>
-            <el-table-column
+            <el-table-column align="center"
-              align="center"
                              prop="status"
-              :label="'活动状态'"
+                             :label="'活动状态'">
-            />
+            </el-table-column>
-            <el-table-column
+            <el-table-column align="center"
-              align="center"
                              prop="creationTime"
-              :label="'创建日期'"
+                             :label="'创建日期'">
-            />
+            </el-table-column>
-            <el-table-column
+            <el-table-column align="center"
-              align="center"
                              prop="time"
                              :label="'操作'"
-              fixed="right"
+                             fixed="right">
-            >
               <template slot-scope="scope">
 
-                <el-button
+                <el-button @click="toFixed(scope.row.pkId, 4)"
-                  v-hasButtons="['directSee']"
                            type="text"
+                           v-hasButtons="['directSee']"
                            style="color: #48B2FD;"
-                  size="small"
+                           size="small">
-                  @click="toFixed(scope.row.pkId, 4)"
-                >
                   {{ '查看' }}
                 </el-button>
-                <el-button
+                <el-button @click="toFixed(scope.row.pkId, 2)"
-                  v-hasButtons="['directUpdata']"
                            type="text"
+                           v-hasButtons="['directUpdata']"
                            style="color: #F3A900;"
-                  size="small"
+                           size="small">
-                  @click="toFixed(scope.row.pkId, 2)"
-                >
                   {{'修改'}}
                 </el-button>
-                <el-button
+                <el-button @click="toFixed(scope.row.pkId,3)"
-                  v-hasButtons="['directDel']"
                            type="text"
                            size="small"
-                  style="color: #C8161D"
+                           v-hasButtons="['directDel']"
-                  @click="toFixed(scope.row.pkId,3)"
+                           style="color: #C8161D">
-                >
                   {{ '删除' }}
                 </el-button>
               </template>
@@ -193,13 +155,11 @@
         </div>
       </div>
     </div>
-    <pagination
+    <pagination v-show="total > 0"
-      v-show="total > 0"
                 :total="total"
                 :page.sync="queryParams.pageNum"
                 :limit.sync="queryParams.pageSize"
-      @pagination="getDataList"
+                @pagination="getDataList" />
-    />
   </div>
 </template>
 
@@ -209,17 +169,17 @@ import * as api from '@/api/giftGoods.js'
 export default {
   name: 'Bzpz',
   components: {
-    topBar
+    topBar,
   },
   filters: {
      isAgree(val) {
       if (!val) {
-        return '允许'
+        return '允许';
       } else {
-        return '禁止'
+        return '禁止';
-      }
       }
     },
+  },
   data() {
     return {
       creationTime: [],
@@ -229,7 +189,7 @@ export default {
       // 查询参数
       queryParams: {
         pageNum: 1,
-        pageSize: 50
+        pageSize: 50,
       },
       addOrEdit: '',
       total: 0,
@@ -240,16 +200,16 @@ export default {
       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() {
@@ -273,16 +233,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) {
@@ -292,9 +252,9 @@ export default {
         path: 'addDirect',
         query: {
           pkId: id,
-          controlType: index
+          controlType: index,
           // functionType:this.select.functionType
-        }
+        },
       })
     },
     // 删除
@@ -302,7 +262,7 @@ export default {
       this.$confirm('确认删除?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
-        type: 'warning'
+        type: 'warning',
       }).then(() => {
         api.activityRemove(id).then((res) => {
           this.getDataList()
@@ -322,7 +282,7 @@ export default {
             if (res.code == 200) {
               this.$message({
                 message: res.msg,
-                type: 'success'
+                type: 'success',
               })
               this.dialogVisible = false
               // 充值数据
@@ -345,8 +305,8 @@ export default {
       this.$router.push({
         path: 'addDirect',
         query: {
-          controlType: 1
+          controlType: 1,
-        }
+        },
       })
     },
 
@@ -355,7 +315,7 @@ export default {
       this.loading = true
       api
         .directList(
-          Object.assign({}, this.queryParams, this.select, { actType: 30 })
+          Object.assign({}, this.queryParams, this.select, { actType: 13 })
         )
         .then((res) => {
           this.tableData = res.rows
@@ -369,12 +329,12 @@ export default {
       this.$confirm( '是否确认导出所有数据项?', '警告', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
-        type: 'warning'
+        type: 'warning',
       }).then((_) => {
         this.download(
           'activity/manage/recommend/export',
           Object.assign({},{actType:12}, this.queryParams, this.select),
-          `${'直推升级'}${new Date().getTime()}.xlsx`
+          `${'直推赠送'}${new Date().getTime()}.xlsx`
         )
       })
     },
@@ -385,8 +345,8 @@ export default {
         return 'success-row'
       }
       return ''
-    }
+    },
-  }
+  },
 }
 </script>
 <style scoped lang="scss">

src/views/marketing/directGifts/record.vue

@@ -1,315 +0,0 @@
-<!--
- * @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

@@ -1,288 +0,0 @@
-<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

@@ -1,96 +0,0 @@
-<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,139 +2,171 @@
   <div class="page">
     <topBar
       v-if="topList.length > 0"
-      :top-list="topList"
+      :topList="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.selectDate"
+                  v-model="select.payDate"
+                  @change="changeTime"
                   type="month"
                   value-format="yyyy-MM"
                   :placeholder="'请选择'"
-                  :clearable="false"
+                >
-                  @change="changeTime"
+                </el-date-picker>
-                />
               </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
-          v-loading="loading"
           :data="tableData"
+          v-loading="loading"
           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 type="selection" width="55"> </el-table-column>
 
+          <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="numberOfPeople"
+            prop="gradeName"
-            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>
-import * as api from '@/api/giftGoods.js'
+import topBar from "@/components/topBar";
-import mixins from './mixins'
+import * as api from "@/api/giftGoods.js";
 export default {
-  name: 'DirectRankingList',
+  name: "DirectRankingList",
-
+  components: {
-  mixins: [mixins],
+    topBar,
+  },
   data() {
     return {
-      select: {
+      creationTime: [],
-        selectDate: ''
+      select: {},
-      },
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 50,
-        year: '',
-        month: '',
-        faker: false
       },
       total: 0,
       tableData: [],
       loading:false,
-      moren: 'directRankingList'
+      moren: "directRankingList",
-
+      topList: [
-    }
+        {
+          name: "直推排行数据",
+          path: "directRankingList",
+        },
+      ],
+    };
   },
   mounted() {
-    this.init()
+    // 获取列表
-    this.getDataList()
+    //   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
+      this.queryParams.payDate = val
     },
     reset() {
-      this.select = {}
+      this.select = {};
+      this.creationTime = [];
     },
    
     getDataList() {
       this.loading = true
-      const [year, month] = this.select.selectDate.split('-')
       api
-        .getMemberDirectPush(Object.assign({}, this.queryParams, this.select, {
+        .getMemberDirectPusht(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) {},
@@ -143,35 +175,25 @@ 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 {
@@ -268,24 +290,5 @@ 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

@@ -1,48 +0,0 @@
-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
-            }
-          })
-        })
-      })
-    }
-  }
-}