更新Note

1. 修复购物车,订单和退单后后置任务正确执行
	2. 修复佣金记录金额和详情
	3. 修复管理端 移动应用界面下订单管理数据统计不准确的问题
	4. 修复短信API升级-后台使用一号通
	5. 修复用户管理相关问题
	6. 修复核销点核销后核销地址不准确
	7. 修复资源同步云服务的问题
新增功能
	1. 秒杀
		a. 秒杀时段配置
		b. 秒杀商品维护
	2. 财务管理
		a. 申请提现
		b. 财务记录
			i. 充值记录
			ii. 资金监控
		c. 佣金记录
	3. 普通商品显示该商品正在参加的活动信息[秒杀]

admin/src/components/Category/edit.vue

@@ -6,13 +6,13 @@
         prop="name"
         :rules="[{ required:true,message:'请输入分类名称',trigger:['blur','change'] }]"
       >
-        <el-input v-model="editPram.name"  :maxlength="biztype.value === 1 ? 5 : 20" placeholder="分类名称" />
+        <el-input v-model="editPram.name"  :maxlength="biztype.value === 1 ? 8 : 20" placeholder="分类名称" />
       </el-form-item>
       <el-form-item label="URL">
         <el-input v-model="editPram.url" placeholder="URL" />
       </el-form-item>
       <el-form-item label="父级" v-if="biztype.value!==3">
-        <el-cascader v-model="editPram.pid" :options="biztype.value === 5 ? allTreeList : parentOptions" :props="categoryProps" style="width:100%" />
+        <el-cascader v-model="editPram.pid" :disabled="isCreate ===1 && editPram.pid ===0" :options="biztype.value === 5 ? allTreeList : parentOptions" :props="categoryProps" style="width:100%" />
       </el-form-item>
       <el-form-item label="菜单图标" v-if="biztype.value===5">
         <el-input placeholder="请选择菜单图标" v-model="editPram.extra">
@@ -128,11 +128,8 @@ export default {
     initEditData() {
       this.parentOptions = [...this.allTreeList]
       this.addTreeListLabelForCasCard(this.parentOptions, 'child')
-      if (this.isCreate !== 1) {
-        const { id } = this.prent
-        this.editPram.pid = id
-      } else {
-        const { extra, name, pid, sort, status, type, id, url } = this.editData
+      const { extra, name, pid, sort, status, type, id, url } = this.editData
+      if(this.isCreate === 1){
         this.editPram.extra = extra
         this.editPram.name = name
         this.editPram.pid = pid
@@ -141,6 +138,9 @@ export default {
         this.editPram.type = type
         this.editPram.url = url
         this.editPram.id = id
+      }else{
+        this.editPram.pid = this.prent.id
+        this.editPram.type = this.biztype.value
       }
     },
     addTreeListLabelForCasCard(arr, child) {
@@ -161,12 +161,14 @@ export default {
     },
     handlerSaveOrUpdate(isSave) {
       if (isSave) {
-        this.editPram.pid = this.prent.id
+       // this.editPram.pid = this.prent.id
         this.loadingBtn = true
         categoryApi.addCategroy(this.editPram).then(data => {
           this.$emit('hideEditDialog')
           this.$message.success('创建目录成功')
           this.loadingBtn = false
+        }).catch(() => {
+          this.loadingBtn = false
         })
       } else {
         this.editPram.pid = Array.isArray(this.editPram.pid) ? this.editPram.pid[0] : this.editPram.pid
@@ -175,6 +177,8 @@ export default {
           this.$emit('hideEditDialog')
           this.$message.success('更新目录成功')
           this.loadingBtn = false
+        }).catch(() => {
+          this.loadingBtn = false
         })
       }
     }

admin/src/components/Category/list.vue

@@ -19,7 +19,7 @@
             <div class="container">
               <el-form inline size="small">
                 <el-form-item>
-                  <el-select v-model="listPram.status" placeholder="状态" clearable class="selWidth">
+                  <el-select v-model="listPram.status" placeholder="状态" class="selWidth">
                     <el-option
                       v-for="item in constants.roleListStatus"
                       :key="item.value"
@@ -86,7 +86,7 @@
               <el-table-column label="操作" min-width="200" fixed="right">
                 <template slot-scope="scope">
                   <el-button
-                    v-if="(biztype.value === 1 && scope.row.pid === 0) || (biztype.value !== 1)"
+                    v-if="(biztype.value === 1 && scope.row.pid === 0) || biztype.value === 5"
                     type="text"
                     size="small"
                     @click="handleAddMenu(scope.row)"
@@ -179,10 +179,10 @@ export default {
       dataList: [],
       treeList: [],
       listPram: {
-        pid: this.pid,
+       pid: this.pid,
         type: this.biztype.value,
-        status: null,
-        name: null,
+        status: -1,
+        name: '',
         page: constants.page.page,
         limit: constants.page.limit[0]
       },
@@ -193,10 +193,10 @@ export default {
     }
   },
   mounted() {
-    // if(this.biztype.value === 3){
-    //   this.listPram.pageSize = constants.page.pageSize[4]
-    //   this.handlerGetList()
-    // }else{
+   /* if(this.biztype.value === 3){
+      this.listPram.pageSize = constants.page.pageSize[4]
+      this.handlerGetList()
+    }else{*/
     this.handlerGetTreeList()
     // }
   },
@@ -254,13 +254,15 @@ export default {
       })
     },
     handlerGetList() {
-      categoryApi.listCategroy(this.listPram).then(data => {
-        this.treeList = data.list
-      })
+      this.handlerGetTreeList();
+      // categoryApi.listCategroy({status:this.listPram.status, type: 1 }).then(data => {
+      //   this.treeList = data.list
+      // })
     },
     handlerGetTreeList() {
       // this.biztype.value === 5 && !this.selectModel) ?  -1 : 1
-      const _pram = { type: this.biztype.value, status: !this.selectModel ? -1 : (this.biztype.value === 5 ? -1 : 1) }
+      // const _pram = { type: this.biztype.value, status: !this.selectModel ? -1 : (this.biztype.value === 5 ? -1 : 1) }
+      const _pram = { type: this.biztype.value, status: this.listPram.status, name: this.listPram.name  }
       this.loading = true
       this.biztype.value!==3 ? categoryApi.treeCategroy(_pram).then(data => {
         this.treeList = this.handleAddArrt(data)
@@ -279,7 +281,6 @@ export default {
       console.log('data:', data)
     },
     handleAddArrt(treeData) {
-      // let _result = this.addTreeListLabel(treeData)
       const _result = selfUtil.addTreeListLabel(treeData)
       return _result
     },