## v1.3.1 更新列表

1. 【修复】申请退款后积分等操作可能出现错误的问题
	2. 【修复】拼团支付可能出现支付错误的问题
	3. 【修复】退款申请后的订单流程优化和积分赠送的问题
	4. 【修复】回收站中的商品无法恢复的问题
	5. 【修复】一号通短信查询记录不完整的问题
	6. 【修复】用户管理批量加分组，标签的问题
	7. 【修复】积分日志搜索显示有误的问题
	8. 【修复】手动发送优惠券可能会出错的问题
	9. 【修复】核销订单创建在某种条件下会出错的问题
	10. 【修复】移动端商品详情，购物车等样式兼容问题
	11. 【修复】业务流程性的优化

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

@@ -101,7 +101,7 @@
           <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 size="mini" type="primary" :loading="loading" @click="submitForm('promoterForm')">提交</el-button>
         </el-form-item>
       </el-form>
     </el-card>
@@ -110,6 +110,7 @@
 
 <script>
   import { configApi, configUpdateApi, productCheckApi } from '@/api/distribution'
+  import * as selfUtil from '@/utils/ZBKJIutil.js'
   export default {
     name: 'Index',
     data() {
@@ -143,6 +144,7 @@
       submitForm(formName) {
         this.$refs[formName].validate((valid) => {
           if (valid) {
+          if(selfUtil.Add(this.promoterForm.storeBrokerageRatio,this.promoterForm.storeBrokerageTwo)>100) return this.$message.warning('返佣比例相加不能超过100%')
             this.loading = true
             configUpdateApi(this.promoterForm).then(res => {
               this.loading = false
@@ -155,7 +157,6 @@
               //   })
               // })
             }).catch((res) => {
-              this.$message.error(res.message)
               this.loading = false
             })
           } else {

admin/src/views/distribution/index.vue

@@ -99,15 +99,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','推广人')">推广人</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','推广订单')">推广订单</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">清除上级推广人</el-dropdown-item>
+                <el-dropdown-item @click.native="clearSpread(scope.row)" v-if="scope.row.spreadNickname && scope.row.spreadNickname!=='无'">清除上级推广人</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
           </template>
@@ -128,7 +128,7 @@
 
     <!--推广人-->
     <el-dialog
-      title="提示"
+      :title="titleName+'列表'"
       :visible.sync="dialogVisible"
       width="900px"
       :before-close="handleClose"
@@ -143,7 +143,7 @@
           </el-form-item>
           <el-form-item label="用户类型：">
             <el-radio-group v-model="spreadFrom.type" size="small" @change="onChanges">
-              <el-radio-button label="null">全部</el-radio-button>
+              <el-radio-button label="0">全部</el-radio-button>
               <el-radio-button label="1">一级推广人</el-radio-button>
               <el-radio-button label="2">二级推广人</el-radio-button>
             </el-radio-group>
@@ -194,23 +194,23 @@
           min-width="120"
         >
           <template slot-scope="scope">
-            <span>{{ scope.row.is_promoter | filterYesOrNo }}</span>
+            <span>{{ scope.row.isPromoter | filterYesOrNo }}</span>
           </template>
         </el-table-column>
         <el-table-column
           sortable
           label="推广人数"
           min-width="120"
-          prop="spread_count"
+          prop="spreadCount"
         />
         <el-table-column
           sortable
           label="订单数"
           min-width="120"
-          prop="pay_count"
+          prop="payCount"
         />
         <el-table-column
-          prop="create_time"
+          prop="spreadTime"
           label="关注时间"
           min-width="150"
         />
@@ -267,7 +267,6 @@
 
 <script>
   import { promoterListApi, spreadStatisticsApi, spreadListApi, spreadOrderListApi, spreadClearApi } from '@/api/distribution'
-  import { fromList } from '@/utils/constants.js'
   import cardsData from '@/components/cards/index'
   export default {
     name: 'AccountsUser',
@@ -287,7 +286,7 @@
           page: 1,
           limit: 20
         },
-        fromList: fromList,
+        fromList: this.$constants.fromList,
         dialogVisible: false,
         spreadData: {
           data: [],
@@ -297,14 +296,15 @@
           page: 1,
           limit: 10,
           dateLimit: '',
-          type: null,
+          type: 0,
           nickName: '',
           uid: ''
         },
         timeValSpread: [],
         spreadLoading: false,
         uid: '',
-        onName: ''
+        onName: '',
+        titleName: ''
       }
     },
     mounted() {
@@ -318,8 +318,15 @@
       },
       // 统计
       spreadStatistics() {
-        spreadStatisticsApi({ dateLimit: this.tableFrom.dateLimit, nickName: this.tableFrom.nickName}).then((res) => {
-          this.cardLists = res
+        spreadStatisticsApi({ dateLimit: this.tableFrom.dateLimit, keywords: this.tableFrom.nickName}).then((res) => {
+          //this.cardLists = res
+          this.cardLists = [
+            { name: '分销人员人数', count: res.distributionNum },
+            { name: '发展会员人数', count: res.developNum },
+            { name: '订单总数', count: res.orderNum },
+            { name: '订单金额（元）', count: res.orderPriceCount },
+            { name: '提现次数', count: res.withdrawCount }
+          ]
         })
       },
       // 清除
@@ -331,15 +338,16 @@
           })
         })
       },
-      onSpread(uid, n) {
+      onSpread(uid, n, p) {
         this.onName = n
+        this.titleName = p
         this.uid = uid
         this.dialogVisible = true
         this.spreadFrom = {
           page: 1,
           limit: 10,
           dateLimit: '',
-          type: null,
+          type: 0,
           nickName: '',
           uid: uid
         }
@@ -386,15 +394,16 @@
         this.onName === 'man' ? this.getListSpread(this.uid) : this.getSpreadOrderList(this.uid)
       },
       // 推广订单
-      onSpreadOrder(uid, n) {
+      onSpreadOrder(uid, n, p) {
         this.uid = uid
         this.onName = n
+        this.titleName = p
         this.dialogVisible = true
         this.spreadFrom = {
           page: 1,
           limit: 10,
           dateLimit: '',
-          type: '',
+          type: 0,
           nickName: '',
           uid: uid
         }