## v1.3.1 更新列表

1. 【修复】申请退款后积分等操作可能出现错误的问题 2. 【修复】拼团支付可能出现支付错误的问题 3. 【修复】退款申请后的订单流程优化和积分赠送的问题 4. 【修复】回收站中的商品无法恢复的问题 5. 【修复】一号通短信查询记录不完整的问题 6. 【修复】用户管理批量加分组，标签的问题 7. 【修复】积分日志搜索显示有误的问题 8. 【修复】手动发送优惠券可能会出错的问题 9. 【修复】核销订单创建在某种条件下会出错的问题 10. 【修复】移动端商品详情，购物车等样式兼容问题 11. 【修复】业务流程性的优化
2026-05-01 14:31:26 +08:00 · 2021-01-19 10:16:45 +08:00
parent 3b8397e4b1
commit 81a16a76df
136 changed files with 19904 additions and 23329 deletions
--- a/admin/src/views/marketing/bargain/bargainGoods/creatBargain.vue
+++ b/admin/src/views/marketing/bargain/bargainGoods/creatBargain.vue
@@ -656,7 +656,7 @@
              return this.$message.warning("请选择一个商品属性！");
            }else{
              if(!this.radio.price) return this.$message.warning("请填写砍价起始金额！");
-              // if(!this.radio.minPrice) return this.$message.warning("请填写砍价最低价！");
+              if(!this.radio.minPrice && this.radio.minPrice!=0) return this.$message.warning("请填写砍价最低价！");
              if(!this.radio.quota) return this.$message.warning("请填写限量！");
            }
            this.currentTab++;
--- a/admin/src/views/marketing/bargain/bargainList/index.vue
+++ b/admin/src/views/marketing/bargain/bargainList/index.vue
@@ -158,7 +158,6 @@
 </template>

 <script>
-  import {fromList} from '@/utils/constants.js';
  import { bargainListListApi,bargainOrderPinkApi } from '@/api/marketing'
  export default {
    name: "index",
@@ -180,7 +179,7 @@
          page: 1,
          limit: 20
        },
-        fromList: fromList,
+        fromList: this.$constants.fromList,
        timeVal: []
      }
    },
--- a/admin/src/views/marketing/coupon/list/creatCoupon.vue
+++ b/admin/src/views/marketing/coupon/list/creatCoupon.vue
@@ -31,7 +31,7 @@
          </div>
        </el-form-item>
        <el-form-item label="优惠券面值" prop="money">
-          <el-input-number v-model="ruleForm.money" :min="1" :max="10" label="描述文字"></el-input-number>
+          <el-input-number v-model="ruleForm.money" :min="1" label="描述文字"></el-input-number>
        </el-form-item>
        <el-form-item label="使用门槛">
          <el-radio-group v-model="threshold">
@@ -215,9 +215,9 @@
            total: info.total,
            status: info.status,
            primaryKey: Number(info.primaryKey),
-            checked: res.product
+            checked: res.product || []
          }
-          info.minPrice === 0 ? this.threshold = false : this.threshold = true
+          info.minPrice == 0 ? this.threshold = false : this.threshold = true
          info.isForever ? this.isForeverTime = [info.receiveStartTime, info.receiveEndTime] : this.isForeverTime = []
          info.isFixedTime ? this.termTime = [info.useStartTime, info.useEndTime] : this.termTime = []
          this.loading = false
--- a/admin/src/views/marketing/coupon/list/index.vue
+++ b/admin/src/views/marketing/coupon/list/index.vue
@@ -54,7 +54,7 @@
          min-width="100"
        >
          <template slot-scope="{ row }">
-            <span>{{row.useType | couponTypeFilter}}</span>
+            <span>{{row.type | couponTypeFilter}}</span>
          </template>
        </el-table-column>
        <el-table-column
@@ -224,12 +224,12 @@
      // 领取记录
      receive(row) {
        this.dialogVisible = true
-        this.getIssueList(row)
+        this.tableFromIssue.couponId = row.id
+        this.getIssueList()
      },
      // 列表
-      getIssueList(row) {
+      getIssueList() {
        this.Loading = true
-        this.tableFromIssue.couponId = row.id
        couponUserListApi(this.tableFromIssue).then(res => {
          this.issueData.data = res.list
          this.issueData.total = res.total
--- a/admin/src/views/marketing/coupon/record/index.vue
+++ b/admin/src/views/marketing/coupon/record/index.vue
@@ -90,7 +90,7 @@
        >
          <template slot-scope="scope">
            <i v-if="scope.row.status === 0" class="el-icon-check" style="font-size: 14px;color: #0092DC;" />
-            <i v-else class="el-icon-download" style="font-size: 14px;color: #ed5565;" />
+            <i v-else class="el-icon-close" style="font-size: 14px;color: #ed5565;" />
          </template>
        </el-table-column>
        <el-table-column
--- a/admin/src/views/marketing/groupBuy/groupList/index.vue
+++ b/admin/src/views/marketing/groupBuy/groupList/index.vue
@@ -29,6 +29,7 @@
        style="width: 100%"
        size="mini"
        ref="multipleTable"
+        highlight-current-row
      >
        <el-table-column
          prop="id"
@@ -143,7 +144,7 @@
        />
        <el-table-column
          label="金额"
-          prop="price"
+          prop="totalPrice"
          min-width="100"
        />
        <el-table-column
@@ -151,7 +152,8 @@
          min-width="100"
        >
          <template slot-scope="scope">
-            <span>{{scope.row.status | orderStatusFilter}}</span>
+            <span v-if="scope.row.refundStatus==0">{{scope.row.orderStatus | orderStatusFilter}}</span>
+            <span v-else>{{scope.row.refundStatus | refundStatusFilter}}</span>
          </template>
        </el-table-column>
      </el-table>
@@ -160,7 +162,6 @@
 </template>

 <script>
-  import {fromList} from '@/utils/constants.js';
  import { combineListApi, combineStatisticsApi,combineOrderPinkApi } from '@/api/marketing'
  import cardsData from '@/components/cards/index'
  export default {
@@ -186,7 +187,7 @@
          page: 1,
          limit: 20
        },
-        fromList: fromList,
+        fromList: this.$constants.fromList,
        timeVal: [],
        cardLists: []
      }
--- a/admin/src/views/marketing/integral/config/index.vue
+++ b/admin/src/views/marketing/integral/config/index.vue
@@ -32,7 +32,7 @@
    },
    methods: {
      resetForm(formValue) {
-        this.isShow = false
+        this.editData = {}
      },
      handlerSubmit(data) {
        const tempArr = []
--- a/admin/src/views/marketing/integral/integralLog/index.vue
+++ b/admin/src/views/marketing/integral/integralLog/index.vue
@@ -3,7 +3,7 @@
    <el-card class="box-card">
      <div slot="header" class="clearfix">
        <div class="container">
-          <el-form size="small" label-width="100px">
+          <el-form size="small" label-width="120px">
            <el-form-item label="时间选择：" class="width100">
              <el-radio-group v-model="tableFrom.dateLimit" type="button" class="mr20" size="small"
                              @change="selectChange(tableFrom.dateLimit)">
@@ -14,9 +14,9 @@
                              type="daterange" placement="bottom-end" placeholder="自定义时间" style="width: 250px;"
                              @change="onchangeTime"/>
            </el-form-item>
-            <el-form-item label="用户搜索：">
+            <el-form-item label="用户微信昵称：">
              <el-select v-model="tableFrom.userIdList" style="width: 500px" reserve-keyword multiple remote filterable
-                         :remote-method="remoteMethod" :loading="loading" placeholder="请输入用户名称" clearable @change="seachList">
+                         :remote-method="remoteMethod" :loading="loading" placeholder="请输入用户微信昵称" clearable @change="seachList">
                <el-option
                  v-for="item in options"
                  :key="item.uid"
@@ -52,12 +52,14 @@
          prop="balance"
          label="积分余量"
          min-width="120"
+          :sort-method="(a,b)=>{return a.balance - b.balance}"
        />
        <el-table-column
          sortable
          label="明细数字"
          min-width="120"
          prop="number"
+          :sort-method="(a,b)=>{return a.number - b.number}"
        />
        <el-table-column
          label="备注"
@@ -91,7 +93,6 @@
 </template>

 <script>
-  import { fromList } from '@/utils/constants.js'
  import { integralListApi } from '@/api/marketing'
  import { userListApi } from '@/api/user'
  import cardsData from '@/components/cards/index'
@@ -101,7 +102,7 @@
      return {
        loading: false,
        options: [],
-        fromList: fromList,
+        fromList: this.$constants.fromList,
        listLoading: false,
        tableData: {
          data: [],
--- a/admin/src/views/marketing/spike/config/edit.vue
+++ b/admin/src/views/marketing/spike/config/edit.vue
@@ -13,7 +13,6 @@
 </template>

 <script>
-import * as constants from '@/utils/constants.js'
 import zbParser from '@/components/FormGenerator/components/parser/ZBParser'
 import * as systemGroupDataApi from '@/api/systemGroupData.js'
 import * as systemFormConfigApi from '@/api/systemFormConfig.js'
@@ -35,7 +34,7 @@ export default {
  },
  data() {
    return {
-      constants,
+      constants: this.$constants,
      formConf: { fields: [] },
      selfForm: {
        sort: 0,
--- a/admin/src/views/marketing/spike/config/index.vue
+++ b/admin/src/views/marketing/spike/config/index.vue
@@ -72,7 +72,6 @@

 <script>
 import edit from './edit'
-import * as constants from '@/utils/constants.js'
 import * as systemGroupDataApi from '@/api/systemGroupData.js'
 import * as systemFormConfigApi from '@/api/systemFormConfig.js'
 export default {
@@ -80,7 +79,7 @@ export default {
  components: { edit },
  data() {
    return {
-      constants,
+      constants: this.$constants,
      listPram: {
        gid: null,
        keywords: null,