chenrui hace 3 meses
padre
commit
a2de780a60

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1741686264894
+  "version": 1741743071981
 }

+ 8 - 7
src/views/promotionManagement/rechargeSettings/editModal.vue

@@ -55,7 +55,7 @@
 
 <script>
 import { commonMixin } from '@/utils/mixin'
-import { rechargeRuleDetail, rechargeRuleCreate } from '@/api/rechargeRule'
+import { rechargeRuleDetail, rechargeRuleCreate, rechargeRuleModify } from '@/api/rechargeRule'
 export default {
   name: 'RechargeEditModal',
   mixins: [commonMixin],
@@ -81,7 +81,7 @@ export default {
       form: {
         rechargeAmount: undefined, // 充值金额
         giveAmount: undefined, // 赠送金额
-        remark: undefined// 备注
+        remarks: undefined// 备注
       },
       // 必填项判断
       rules: {
@@ -96,11 +96,12 @@ export default {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
           if (!_this.form.giveAmount) {
-            _this.$message.waining('请输入赠送金额')
+            _this.$message.warning('请输入赠送金额')
             return
           }
           _this.spinning = true
-          rechargeRuleCreate(_this.form).then(res => {
+          const ajaxName = _this.itemSn ? rechargeRuleModify : rechargeRuleCreate
+          ajaxName(_this.form).then(res => {
             if (res.status == 200) {
               _this.$message.success(res.message)
               _this.$emit('ok')
@@ -118,7 +119,7 @@ export default {
     // 获取详情
     getDetail () {
       const _this = this
-      _this.spinning = false
+      _this.spinning = true
       rechargeRuleDetail({ sn: _this.itemSn }).then(res => {
         if (res.status == 200) {
           _this.form = res.data
@@ -130,7 +131,7 @@ export default {
     resetForm (obj) {
       this.form.rechargeAmount = undefined
       this.form.giveAmount = undefined
-      this.form.remark = undefined
+      this.form.remarks = undefined
       this.$refs.ruleForm.resetFields()
     }
   },
@@ -147,7 +148,7 @@ export default {
       }
     },
     itemSn (newValue, oldValue) {
-      if (this.isShow && newValue) {
+      if (newValue) {
         this.getDetail()
       }
     }

+ 1 - 1
src/views/promotionManagement/rechargeSettings/list.vue

@@ -21,7 +21,7 @@
                   v-model="queryParam.state"
                   ref="sourceType"
                   id="rechargeList-state"
-                  code="SHOP_PROMO_PROMO_STATE"
+                  code="ENABLE_FLAG"
                   placeholder="请选择状态"
                   allowClear></v-select>
               </a-form-item>

+ 1 - 1
src/views/promotionManagement/subsidizedProducts/subsidyAddModal.vue

@@ -17,7 +17,7 @@
           class="form-model-con"
           layout="inline"
           @keyup.enter.native="$refs.table.refresh(true)" >
-          <a-row :gutter="5" type="flex" justify="center" align="center">
+          <a-row :gutter="5" type="flex" justify="center">
             <a-col :md="6" :sm="24">
               <a-form-model-item label="产品编码">
                 <a-input id="subsidyAdd-code" ref="searchProductCode" v-model.trim="queryParam.productCode" allowClear placeholder="请输入产品编码"/>

+ 1 - 1
src/views/salesManagement/onlinePayOrder/list.vue

@@ -79,7 +79,7 @@
               <a-col :md="6" :sm="24">
                 <a-form-item label="收款方式">
                   <v-select
-                    code="SETTLE_STYLE"
+                    code="ONLINE_SETTLE_STYLE"
                     id="onlinePayOrderList-settleStyleSn"
                     v-model="queryParam.settleStyleSn"
                     allowClear

+ 1 - 1
src/views/salesManagement/salesQuery/list.vue

@@ -74,7 +74,7 @@
               <a-col :md="6" :sm="24">
                 <a-form-item label="收款方式">
                   <v-select
-                    code="SETTLE_STYLE"
+                    code="ONLINE_SETTLE_STYLE"
                     id="salesManagementList-settleStyleSn"
                     v-model="queryParam.settleStyleSn"
                     allowClear

+ 1 - 1
src/views/salesManagement/salesQueryNew/list.vue

@@ -74,7 +74,7 @@
               <a-col :md="6" :sm="24">
                 <a-form-item label="收款方式">
                   <v-select
-                    code="SETTLE_STYLE"
+                    code="ONLINE_SETTLE_STYLE"
                     id="salesManagementList-settleStyleSn"
                     v-model="queryParam.settleStyleSn"
                     allowClear