From-wh 2 лет назад
Родитель
Сommit
3d7e487a5a

+ 1 - 1
template/admin/src/components/from/from.vue

@@ -97,8 +97,8 @@ export default {
           this.modals = false;
           setTimeout(() => {
             this.$emit('submitFail');
+            this.loading = false;
           }, 1000);
-          this.loading = false;
         })
         .catch((res) => {
           this.loading = false;

+ 7 - 7
template/admin/src/pages/marketing/storeSeckill/create.vue

@@ -5,7 +5,7 @@
         <span>
           <Button icon="ios-arrow-back" size="small" type="text" @click="$router.go(-1)">返回</Button>
         </span>
-        <Divider type="vertical"/>
+        <Divider type="vertical" />
         <span class="ivu-page-header-title">{{ $route.params.id ? '编辑秒杀商品' : '添加秒杀商品' }}</span>
       </div>
     </div>
@@ -267,7 +267,7 @@
               <Col span="24">
                 <FormItem label="规格选择:">
                   <Table :data="specsData" :columns="columns" border @on-selection-change="changeCheckbox">
-                    <template slot-scope="{ row, index }" slot="price">
+                    <!-- <template slot-scope="{ row, index }" slot="price">
                       <InputNumber
                         v-model="row.price"
                         :min="0.01"
@@ -280,7 +280,7 @@
                         "
                         :active-change="false"
                       ></InputNumber>
-                    </template>
+                    </template> -->
                     <template slot-scope="{ row, index }" slot="pic">
                       <div
                         class="acea-row row-middle row-center-wrapper"
@@ -630,18 +630,18 @@ export default {
           title: title,
           key: key,
           align: 'center',
-          minWidth: 100,
+          minWidth: 120,
           render: (h, params) => {
             return h('div', [
               h('InputNumber', {
                 props: {
-                  min: 1,
+                  min: 0,
                   precision: 0,
-                  value: params.row.quota,
+                  value: key === 'price' ? params.row.price : params.row.quota,
                 },
                 on: {
                   'on-change': (e) => {
-                    params.row.quota = e;
+                    key === 'price' ? (params.row.price = e) : (params.row.quota = e);
                     that.specsData[params.index] = params.row;
                     if (!!that.formValidate.attrs && that.formValidate.attrs.length) {
                       that.formValidate.attrs.forEach((v, index) => {

+ 8 - 5
template/admin/src/pages/marketing/storeSeckill/statistics.vue

@@ -5,7 +5,7 @@
         <span>
           <Button icon="ios-arrow-back" size="small" type="text" @click="$router.go(-1)">返回</Button>
         </span>
-        <Divider type="vertical"/>
+        <Divider type="vertical" />
         <span class="ivu-page-header-title">{{ $route.meta.title }}</span>
       </div>
     </div>
@@ -26,8 +26,7 @@
         <Row type="flex" :gutter="24">
           <Col span="6" v-if="type == 1">
             <FormItem label="订单状态:" label-for="status">
-              <Select v-model="pagination.status" placeholder="请选择订单状态">
-                <Option value="">全部</Option>
+              <Select v-model="pagination.status" clearable placeholder="请选择订单状态" @on-change="changeStatus">
                 <Option value="0">未支付</Option>
                 <Option value="1">待发货</Option>
                 <Option value="2">待收货</Option>
@@ -199,6 +198,10 @@ export default {
     this.getList(this.id);
   },
   methods: {
+    changeStatus() {
+      this.pagination.page = 1;
+      this.getList(this.id);
+    },
     // 统计
     getStatistics(id) {
       getseckillStatistics(id).then((res) => {
@@ -246,7 +249,7 @@ export default {
 };
 </script>
 
-<style lang='less' scoped>
+<style lang="less" scoped>
 .cl {
   margin-right: 20px;
 }
@@ -261,7 +264,7 @@ export default {
 .ech-box {
   margin-top: 10px;
 }
-/deep/ .ivu-tabs-nav-scroll{
+/deep/ .ivu-tabs-nav-scroll {
   background-color: #fff;
   padding-top: 5px;
 }