更新Note

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

admin/src/components/FormGenerator/components/generator/config.js

@@ -384,6 +384,28 @@ export const selectComponents = [
     format: 'HH:mm:ss',
     'value-format': 'HH:mm:ss'
   },
+  {
+    __config__: {
+      label: '固定时间范围',
+      tag: 'time-select',
+      tagIcon: 'time-select',
+      span: 24,
+      showLabel: true,
+      labelWidth: null,
+      layout: 'colFormItem',
+      defaultValue: null,
+      required: true,
+      regList: [],
+      changeTag: true,
+      document: 'https://element.eleme.cn/#/zh-CN/component/time-picker'
+    },
+    style: { width: '100%' },
+    disabled: false,
+    clearable: true,
+    placeholder: '请选择',
+    format: 'HH:mm',
+    'value-format': 'HH:mm'
+  },
   {
     __config__: {
       label: '日期选择',

admin/src/components/FormGenerator/components/generator/html.js

@@ -57,7 +57,7 @@ function buildFromBtns(scheme, type) {
   if (scheme.formBtns && type === 'file') {
     str = `<el-form-item size="large">
           <el-button type="primary" @click="submitForm">提交</el-button>
-          <el-button @click="resetForm">重置</el-button>
+          <el-button @click="resetForm">取消</el-button>
         </el-form-item>`
     if (someSpanIsNot24) {
       str = `<el-col :span="24">
@@ -304,6 +304,11 @@ const tags = {
     const height = el.height ? `:height="${el.height}"` : ''
     return `<${tag} ${vModel}${height} >`
   },
+  'time-select': el => {
+    const { tag, vModel } = attrBuilder(el)
+    const height = el.height ? `:height="${el.height}"` : ''
+    return `<${tag} ${vModel}${height} >`
+  },
   tinymce: el => {
     const { tag, vModel } = attrBuilder(el)
     const branding = el.branding ? `:branding="${el.branding}"` : ''

admin/src/components/FormGenerator/components/generator/ruleTrigger.js

@@ -13,5 +13,7 @@ export default {
   'el-time-picker': 'change',
   'el-date-picker': 'change',
   'el-rate': 'change',
-  tinymce: 'blur'
+  tinymce: 'blur',
+  'time-select': 'change'
+
 }

admin/src/components/FormGenerator/components/parser/Parser.vue

@@ -39,7 +39,7 @@ function formBtns(h) {
   return <el-col>
     <el-form-item size='mini'>
       <el-button type='primary' onClick={this.submitForm}>提交</el-button>
-      <el-button onClick={this.resetForm}>重置</el-button>
+      <el-button onClick={this.resetForm}>取消</el-button>
     </el-form-item>
   </el-col>
 }
@@ -188,6 +188,7 @@ export default {
       })
     },
     resetForm() {
+      this.$emit('resetForm', this.formConf)
       this.formConfCopy = JSON.parse(JSON.stringify(this.formConf))
       this.$refs[this.formConf.formRef].resetFields()
     },

admin/src/components/FormGenerator/components/parser/ZBParser.vue

@@ -6,6 +6,7 @@
       :form-conf="formConf"
       :form-edit-data="editData"
       @submit="handlerSubmit"
+      @resetForm="resetForm"
     />
     <!--    editData:{{ editData }}-->
     <!--    formConf:{{ formConf }}-->
@@ -54,6 +55,9 @@ export default {
     },
     handlerSubmit(formValue) {
       this.$emit('submit', formValue)
+    },
+    resetForm(formValue){
+      this.$emit('resetForm', formValue)
     }
   }
 }