12.31开源admin代码更新

admin/src/views/distribution/config/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="divBox">
     <el-card class="box-card">
-      <el-form ref="promoterForm" :model="promoterForm" :rules="rules" label-width="200px" class="demo-promoterForm">
+      <el-form ref="promoterForm" :model="promoterForm" :rules="rules" label-width="200px" class="demo-promoterForm"  v-loading="loading">
         <el-form-item prop="brokerageFuncStatus">
           <span slot="label">
             <span>分销启用：</span>
@@ -14,7 +14,20 @@
             <el-radio label="0">关闭</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item prop="storeBrokerageStatus">
+        <el-form-item prop="storeBrokerageQuota">
+          <span slot="label">
+            <span>满额分销最低金额：</span>
+            <el-tooltip class="item" effect="dark" content="满额分销满足金额开通分销权限" placement="top-start">
+              <i class="el-icon-warning-outline" />
+            </el-tooltip>
+          </span>
+          <el-input-number
+          v-model="promoterForm.storeBrokerageQuota"
+          placeholder="满额分销满足金额开通分销权限" :min="-1"
+          :step="1" class="selWidth"
+          @keydown.native="channelInputLimit"></el-input-number>
+        </el-form-item>
+        <!-- <el-form-item prop="storeBrokerageStatus">
           <span slot="label">
             <span>分销模式：</span>
             <el-tooltip class="item" effect="dark" content="人人分销”默认每个人都可以分销，“指定分销”仅可后台手动设置推广员" placement="top-start">
@@ -24,9 +37,8 @@
           <el-radio-group v-model="promoterForm.storeBrokerageStatus">
             <el-radio label="1">指定分销</el-radio>
             <el-radio label="2">人人分销</el-radio>
-            <!--<el-radio label="3">满额分销</el-radio>-->
           </el-radio-group>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item prop="brokerageBindind">
           <span slot="label">
             <span>分销关系绑定：</span>
@@ -38,6 +50,18 @@
             <el-radio label="0">所有用户</el-radio>
             <el-radio label="1">新用户</el-radio>
           </el-radio-group>
+        </el-form-item>
+         <el-form-item prop="storeBrokerageIsBubble">
+          <span slot="label">
+            <span>分销气泡：</span>
+            <el-tooltip class="item" effect="dark" content="基础商品详情页分销气泡功能开启关闭" placement="top-start">
+              <i class="el-icon-warning-outline" />
+            </el-tooltip>
+          </span>
+          <el-radio-group  v-model="promoterForm.storeBrokerageIsBubble">
+            <el-radio label="1">开启</el-radio>
+            <el-radio label="0">关闭</el-radio>
+          </el-radio-group>
         </el-form-item>
         <el-form-item prop="storeBrokerageRatio">
           <span slot="label">
@@ -66,7 +90,7 @@
               <i class="el-icon-warning-outline" />
             </el-tooltip>
           </span>
-          <el-input-number v-model="promoterForm.userExtractMinPrice" :min="0" :precision="2" :step="0.1" class="selWidth" placeholder="用户提现最低金额"></el-input-number>
+          <el-input-number v-model="promoterForm.userExtractMinPrice" :min="0" :step="1" class="selWidth" placeholder="用户提现最低金额"></el-input-number>
         </el-form-item>
         <el-form-item prop="userExtractBank">
           <span slot="label">
@@ -91,17 +115,8 @@
           </span>
           <el-input-number v-model="promoterForm.extractTime" :min="0" class="selWidth" placeholder="佣金冻结时间(天)"></el-input-number>
         </el-form-item>
-        <!--<el-form-item prop="storeBrokeragePrice">-->
-          <!--<span slot="label">-->
-            <!--<span>满额分销最低金额：</span>-->
-            <!--<el-tooltip class="item" effect="dark" content="满额分销满足金额开通分销权限" placement="top-start">-->
-              <!--<i class="el-icon-warning-outline" />-->
-            <!--</el-tooltip>-->
-          <!--</span>-->
-          <!--<el-input-number v-model="promoterForm.storeBrokeragePrice" placeholder="满额分销满足金额开通分销权限" :min="0" :precision="2" :step="0.1" class="selWidth"></el-input-number>-->
-        <!--</el-form-item>-->
         <el-form-item>
-          <el-button size="mini" type="primary" :loading="loading" @click="submitForm('promoterForm')">提交</el-button>
+          <el-button type="primary" :loading="loading" @click="submitForm('promoterForm')" v-hasPermi="['admin:retail:spread:manage:set']">提交</el-button>
         </el-form-item>
       </el-form>
     </el-card>
@@ -111,12 +126,14 @@
 <script>
   import { configApi, configUpdateApi, productCheckApi } from '@/api/distribution'
   import * as selfUtil from '@/utils/ZBKJIutil.js'
+  import { checkPermi } from "@/utils/permission"; // 权限判断函数
+  import {Debounce} from '@/utils/validate'
   export default {
     name: 'Index',
     data() {
       return {
         promoterForm: {},
-        loading: false,
+        loading: true,
         rules: {
           brokerageFuncStatus: [
             { required: true, message: '请选择是否启用分销', trigger: 'change' }
@@ -134,14 +151,29 @@
       this.getDetal()
     },
     methods: {
+      checkPermi,
+      channelInputLimit(e){
+        let key = e.key
+      // 不允许输入'e'和'.'
+      if (key === 'e' || key === '.') {
+        e.returnValue = false
+        return false
+      }
+      return true
+      },
       getDetal() {
+        this.loading = true;
         configApi().then(res => {
-          this.promoterForm = res
+          this.loading = false;
+          this.promoterForm = res;
+          this.promoterForm.storeBrokerageIsBubble = res.storeBrokerageIsBubble.toString();
+          this.promoterForm.brokerageFuncStatus = res.brokerageFuncStatus.toString();
+          this.promoterForm.brokerageBindind = res.brokerageBindind.toString();
         }).catch((res) => {
           this.$message.error(res.message)
         })
       },
-      submitForm(formName) {
+      submitForm:Debounce(function(formName) {
         this.$refs[formName].validate((valid) => {
           if (valid) {
           if(selfUtil.Add(this.promoterForm.storeBrokerageRatio,this.promoterForm.storeBrokerageTwo)>100) return this.$message.warning('返佣比例相加不能超过100%')
@@ -156,14 +188,14 @@
               //     this.$message.error(message)
               //   })
               // })
-            }).catch((res) => {
+            }).catch((err) => {
               this.loading = false
             })
           } else {
             return false
           }
         })
-      }
+      })
     }
   }
 </script>

admin/src/views/distribution/index.vue

@@ -17,7 +17,7 @@
             </el-form-item>
           </el-form>
         </div>
-        <cards-data :cardLists="cardLists"></cards-data>
+        <!-- <cards-data :cardLists="cardLists"></cards-data> -->
       </div>
       <el-table
         v-loading="listLoading"
@@ -99,6 +99,18 @@
           :sort-method="(a,b)=>{return a.brokeragePrice - b.brokeragePrice}"
           prop="brokeragePrice"
         />
+        <el-table-column
+          sortable
+          label="冻结中佣金"
+          min-width="120"
+          :sort-method="(a,b)=>{return a.freezeBrokeragePrice - b.freezeBrokeragePrice}"
+          prop="freezeBrokeragePrice"
+        />
+        <el-table-column
+          prop="promoterTime"
+          label="成为推广员时间"
+          min-width="150"
+        />
         <el-table-column
           prop="spreadNickname"
           label="上级推广人"
@@ -106,15 +118,15 @@
         />
         <el-table-column label="操作" min-width="150" fixed="right" align="center">
           <template slot-scope="scope">
-            <el-button type="text" size="small" class="mr10" @click="onSpread(scope.row.uid, 'man','推广人')">推广人</el-button>
+            <el-button type="text" size="small" class="mr10" @click="onSpread(scope.row.uid, 'man','推广人')" v-hasPermi="['admin:retail:spread:list']">推广人</el-button>
             <el-dropdown>
               <span class="el-dropdown-link">
                 更多<i class="el-icon-arrow-down el-icon--right" />
               </span>
               <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item @click.native="onSpreadOrder(scope.row.uid, 'order','推广订单')">推广订单</el-dropdown-item>
+                <el-dropdown-item @click.native="onSpreadOrder(scope.row.uid, 'order','推广订单')" v-if="checkPermi(['admin:retail:spread:order:list'])">推广订单</el-dropdown-item>
                 <!--<el-dropdown-item @click.native="onSpreadType(scope.row.uid)">推广方式</el-dropdown-item>-->
-                <el-dropdown-item @click.native="clearSpread(scope.row)" v-if="scope.row.spreadNickname && scope.row.spreadNickname!=='无'">清除上级推广人</el-dropdown-item>
+                <el-dropdown-item @click.native="clearSpread(scope.row)" v-if="scope.row.spreadNickname && scope.row.spreadNickname!=='无'" v-hasPermi="['admin:retail:spread:clean']">清除上级推广人</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
           </template>
@@ -275,6 +287,7 @@
 <script>
   import { promoterListApi, spreadStatisticsApi, spreadListApi, spreadOrderListApi, spreadClearApi } from '@/api/distribution'
   import cardsData from '@/components/cards/index'
+  import { checkPermi } from "@/utils/permission"; // 权限判断函数
   export default {
     name: 'AccountsUser',
     components: { cardsData },
@@ -315,26 +328,27 @@
       }
     },
     mounted() {
-      this.spreadStatistics()
+      // this.spreadStatistics()
       this.getList()
     },
     methods: {
+      checkPermi,
       seachList() {
         this.tableFrom.page = 1
         this.getList()
       },
       // 统计
-      spreadStatistics() {
-        spreadStatisticsApi({ dateLimit: this.tableFrom.dateLimit, keywords: this.tableFrom.nickName}).then((res) => {
-          this.cardLists = [
-            { name: '分销人员人数', count: res.distributionNum },
-            { name: '发展会员人数', count: res.developNum },
-            { name: '推广总数', count: res.orderNum },
-            { name: '推广金额（元）', count: res.orderPriceCount },
-            { name: '提现次数', count: res.withdrawCount }
-          ]
-        })
-      },
+      // spreadStatistics() {
+      //   spreadStatisticsApi({ dateLimit: this.tableFrom.dateLimit, keywords: this.tableFrom.nickName}).then((res) => {
+      //     this.cardLists = [
+      //       { name: '分销人员人数', count: res.distributionNum },
+      //       { name: '发展会员人数', count: res.developNum },
+      //       { name: '推广订单总数', count: res.orderNum },
+      //       { name: '推广订单金额（元）', count: res.orderPriceCount },
+      //       { name: '提现次数', count: res.withdrawCount }
+      //     ]
+      //   })
+      // },
       // 清除
       clearSpread(row) {
         this.$modalSure('解除【' + row.nickname + '】的上级推广人吗').then(() => {
@@ -429,7 +443,7 @@
         this.tableFrom.dateLimit = tab
         this.tableFrom.page = 1
         this.timeVal = []
-        this.spreadStatistics()
+        // this.spreadStatistics()
         this.getList()
       },
       // 具体日期