leisure-core 0.4.3 → 0.4.5

package/index.js

@@ -35,6 +35,7 @@ import LeRate from "./le-rate/index.js";
 import { LeCoupon, LeCouponSub, LeCouponDetails } from "./le-coupon/index.js";
 import LeUpload from "./le-upload/index.js";
 import LePromotions from "./le-promotions/index.js";
+import LePromotionsActivities from "./le-promotions-activities/index.js";
 import LeCommission from "./le-commission/index.js";
 import LeMpurl from "./le-mpurl/index.js";
 import { LeHelp, LeHelpDetail } from "./le-help/index.js";
@@ -75,6 +76,7 @@ const components = [
   LeCouponSub,
   LeCouponDetails,
   LePromotions,
+  LePromotionsActivities,
   LeCommission,
   LeMpurl,
   LeHelp,
@@ -186,6 +188,7 @@ export default {
   LeCouponSub,
   LeCouponDetails,
   LePromotions,
+  LePromotionsActivities,
   LeCommission,
   LeMpurl,
   LeHelp,

package/le-button/src/main.vue

@@ -5,6 +5,7 @@
     :size="size"
     v-permission="$route.params.btns"
     @click="click"
+    :disabled="disabled"
     style="margin-left: 2px; margin-right: 2px"
     v-if="disp"
     >{{ text }}</el-button
@@ -38,6 +39,10 @@ export default {
       type: Boolean,
       default: true,
     },
+    disabled: {
+      type: Boolean,
+      default: false,
+    },
   },
   methods: {
     click(param) {

package/le-coupon/src/details.vue

@@ -2,21 +2,52 @@
   <div>
     <el-form :inline="true" :model="searchData">
       <el-form-item label="领用时间">
-        <el-date-picker v-model="timeArr" type="datetimerange" value-format="yyyy-MM-dd HH:mm:ss" range-separator="至"
-          start-placeholder="开始日期" end-placeholder="结束日期">
+        <el-date-picker
+          v-model="timeArr"
+          type="datetimerange"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        >
         </el-date-picker>
       </el-form-item>
       <el-form-item label="优惠券状态">
         <el-select v-model="status" placeholder="选择状态" clearable>
-          <el-option v-for="item in statusOptions" :label="item.value" :value="item.id" :key="item.id"></el-option>
+          <el-option
+            v-for="item in statusOptions"
+            :label="item.value"
+            :value="item.id"
+            :key="item.id"
+          ></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item><el-button type="primary" @click="list">查询</el-button></el-form-item>
+      <el-form-item
+        ><el-button type="primary" @click="list">查询</el-button></el-form-item
+      >
     </el-form>
-    <el-table :data="tableData" border row-key="id" :max-height="tableHeight"
-      :header-cell-style="{ 'text-align': 'center' }" :cell-style="{ 'text-align': 'center' }" stripe
-      style="width: 100%">
-      <el-table-column prop="id" label="优惠券id"></el-table-column>
+    <el-table
+      :data="tableData"
+      border
+      row-key="id"
+      :max-height="tableHeight"
+      :header-cell-style="{ 'text-align': 'center' }"
+      :cell-style="{ 'text-align': 'center' }"
+      stripe
+      style="width: 100%"
+    >
+      <el-table-column
+        prop="id"
+        label="优惠券id"
+        show-overflow-tooltip
+        tooltip-effect="dark"
+      ></el-table-column>
+      <el-table-column
+        prop="uid"
+        label="用户id"
+        show-overflow-tooltip
+        tooltip-effect="dark"
+      ></el-table-column>
       <el-table-column prop="oid" label="使用的订单id">
         <template slot-scope="scope">
           {{ scope.row.status == 1 ? scope.row.oid : "" }}
@@ -24,9 +55,25 @@
       </el-table-column>
       <el-table-column prop="title" label="优惠券标题"></el-table-column>
       <el-table-column prop="caption" label="优惠券描述"></el-table-column>
-      <el-table-column prop="cdate" label="领用时间" :formatter="dateFormatter"></el-table-column>
-      <el-table-column prop="udate" label="使用时间" :formatter="dateFormatter"></el-table-column>
-      <el-table-column prop="date_end" label="过期时间" :formatter="dateFormatter"></el-table-column>
+      <el-table-column
+        prop="cdate"
+        label="领用时间"
+        show-overflow-tooltip
+        tooltip-effect="dark"
+        :formatter="dateFormatter"
+      ></el-table-column>
+      <el-table-column
+        prop="udate"
+        label="使用时间"
+        :formatter="dateFormatter"
+      ></el-table-column>
+      <el-table-column
+        prop="date_end"
+        label="过期时间"
+        show-overflow-tooltip
+        tooltip-effect="dark"
+        :formatter="dateFormatter"
+      ></el-table-column>
       <el-table-column label="是否已经使用">
         <template slot-scope="scope">
           <span v-if="scope.row.status == 0">未使用</span>
@@ -38,78 +85,84 @@
       <el-table-column prop="note" label="备注"></el-table-column>
     </el-table>
     <div style="text-align: center; margin-top: 30px">
-      <el-pagination background layout="prev, pager, next" :total="searchData.total" :page-size="10"
-        @current-change="current_change">></el-pagination>
+      <el-pagination
+        background
+        layout="prev, pager, next"
+        :total="searchData.total"
+        :page-size="10"
+        @current-change="current_change"
+        >></el-pagination
+      >
     </div>
   </div>
 </template>
 <script>
-  import moment from "moment";
-  import { listByUid } from "@/api/coupon";
-  export default {
-    name: "le-coupon-details",
-    data() {
-      return {
-        tableHeight: 200,
-        tableData: [],
-        searchData: {
-          uid: "",
-          pageNo: 1,
-          total: 1,
-          date_end: "",
-          date_start: "",
-        },
-        timeArr: "",
-        status: 0,
-        statusOptions: [
-          { id: 0, value: "未使用" },
-          { id: 1, value: "已经使用" },
-          { id: 2, value: "已经过期" },
-          { id: 3, value: "已经作废" },
-        ],
-      };
+import moment from "moment";
+import { listByUid } from "@/api/coupon";
+export default {
+  name: "le-coupon-details",
+  data() {
+    return {
+      tableHeight: 200,
+      tableData: [],
+      searchData: {
+        uid: "",
+        pageNo: 1,
+        total: 1,
+        date_end: "",
+        date_start: "",
+      },
+      timeArr: "",
+      status: 0,
+      statusOptions: [
+        { id: 0, value: "未使用" },
+        { id: 1, value: "已经使用" },
+        { id: 2, value: "已经过期" },
+        { id: 3, value: "已经作废" },
+      ],
+    };
+  },
+  mounted() {
+    this.list();
+    this.$nextTick(() => {
+      this.tableHeight = window.innerHeight - 255;
+    });
+  },
+  methods: {
+    dateFormatter(row, column, cellValue, index) {
+      if (cellValue) return moment.unix(cellValue).format("YYYY-MM-DD HH:mm");
     },
-    mounted() {
+    current_change(currentPage) {
+      this.searchData.pageNo = currentPage;
       this.list();
-      this.$nextTick(() => {
-        this.tableHeight = window.innerHeight - 255;
-      });
     },
-    methods: {
-      dateFormatter(row, column, cellValue, index) {
-        if (cellValue) return moment.unix(cellValue).format("YYYY-MM-DD HH:mm");
-      },
-      current_change(currentPage) {
-        this.searchData.pageNo = currentPage;
-        this.list();
-      },
-      filterParams(obj) {
-        var _newPar = {};
-        for (var key in obj) {
-          if (
-            (obj[key] === false || obj[key]) &&
-            obj[key].toString().replace(/(^\s*)|(\s*$)/g, "") !== ""
-          ) {
-            _newPar[key] = obj[key];
-          }
+    filterParams(obj) {
+      var _newPar = {};
+      for (var key in obj) {
+        if (
+          (obj[key] === false || obj[key]) &&
+          obj[key].toString().replace(/(^\s*)|(\s*$)/g, "") !== ""
+        ) {
+          _newPar[key] = obj[key];
         }
-        return _newPar;
-      },
-      list() {
-        if (this.timeArr && this.timeArr.length == 2) {
-          this.searchData.date_start = new Date(this.timeArr[0]).getTime() / 1000;
-          this.searchData.date_end = new Date(this.timeArr[1]).getTime() / 1000;
-        } else {
-          this.searchData.date_start = 0;
-          this.searchData.date_end = 0;
-        }
-        let params = this.filterParams(this.searchData);
-        params.status = this.status;
-        listByUid(params).then((res) => {
-          this.tableData = res.data.data.list;
-          this.searchData.total = res.data.data.count;
-        });
-      },
+      }
+      return _newPar;
+    },
+    list() {
+      if (this.timeArr && this.timeArr.length == 2) {
+        this.searchData.date_start = new Date(this.timeArr[0]).getTime() / 1000;
+        this.searchData.date_end = new Date(this.timeArr[1]).getTime() / 1000;
+      } else {
+        this.searchData.date_start = 0;
+        this.searchData.date_end = 0;
+      }
+      let params = this.filterParams(this.searchData);
+      params.status = this.status;
+      listByUid(params).then((res) => {
+        this.tableData = res.data.data.list;
+        this.searchData.total = res.data.data.count;
+      });
     },
-  };
-</script>
+  },
+};
+</script>

package/le-promotions/index.js

@@ -5,3 +5,5 @@ LePromotions.install = function (Vue) {
 };
 
 export default LePromotions;
+
+//# 逐步弃用 改用 le-promotion-actives

package/le-promotions-activities/src/main.vue

@@ -37,12 +37,12 @@
         <el-table-column prop="title" label="标题"></el-table-column>
         <el-table-column prop="date_start" label="开始时间" width="130">
           <template slot-scope="scope">
-            {{ dateFormat(scope.row.date_start) }}
+            {{ parseTime(scope.row.date_start) }}
           </template>
         </el-table-column>
         <el-table-column prop="date_end" label="结束时间" width="130">
           <template slot-scope="scope">
-            {{ dateFormat(scope.row.date_end) }}
+            {{ parseTime(scope.row.date_end) }}
           </template>
         </el-table-column>
         <el-table-column prop="grang" label="适应商品" width="100">
@@ -57,14 +57,8 @@
             <span v-if="scope.row.released == 1">已启用</span>
           </template>
         </el-table-column>
-        <el-table-column fixed="right" label="操作" align="center" width="180">
+        <el-table-column fixed="right" label="操作" align="center" width="248">
           <template slot-scope="scope">
-            <le-button
-              id="btnGoods"
-              text="选择商品"
-              @click="choiceGoods(scope.row)"
-              style="margin-right: 2px"
-            ></le-button>
             <le-button
               id="btnDetail"
               text="编辑"
@@ -91,10 +85,11 @@
     </div>
     <le-dialog-container
       width="60%"
-      title="促销详情"
+      title="活动详情"
       :showDialog="showDetails"
       @close="closeDetailsDialog"
       :showFooter="true"
+      saveBtnText="保存"
       @saveData="onSubmit"
     >
       <le-promotions-activities-sub
@@ -103,14 +98,18 @@
         :rowData="rowData"
         @list="list"
         v-if="showDetails"
-      ></le-promotions-activities-sub>
+      >
+        <template v-slot:default="data">
+          <!-- <slot :paid="rowData ? rowData.id : ''"></slot> -->
+          <slot :paid="data.paid"></slot>
+        </template>
+      </le-promotions-activities-sub>
     </le-dialog-container>
   </div>
 </template>
 <script>
 import { delP, listP } from "@/api/mall_promotion_activities";
 import LePromotionsActivitiesSub from "./sub.vue";
-import moment from "moment";
 
 export default {
   name: "le-promotions-activities",
@@ -119,6 +118,7 @@ export default {
     return {
       tableHeight: 200,
       showDetails: false,
+      // showGoods: false,
       rowData: null,
       editType: 1,
       tableData: [],
@@ -160,6 +160,9 @@ export default {
       listP(params).then((response) => {
         this.tableData = response.data.data.list;
         this.total = response.data.data.count;
+        if (this.showDetails) {
+          this.closeDetailsDialog();
+        }
       });
     },
     addPromotion() {
@@ -175,9 +178,6 @@ export default {
       this.editType = 1;
       this.showDetails = false;
     },
-    dateFormat(data) {
-      return moment.unix(data).format("YYYY-MM-DD HH:mm");
-    },
     deletepromotion(item) {
       let param = {};
       param.id = item.id;
@@ -189,6 +189,9 @@ export default {
     onSubmit() {
       this.$refs.promotionDetail.onSave();
     },
+    // selectGoods(goods) {
+    //   console.log(goods);
+    // },
   },
 };
 </script>

package/le-promotions-activities/src/sub.vue

@@ -20,18 +20,7 @@
         :max="100"
         @change="handleChange"
       ></el-input-number>
-      <!-- <span style="padding-left: 10px"
-        >例如:买五送一则该值为5;第二件半价该值为2</span
-      > -->
     </el-form-item>
-    <!-- <el-form-item label="赠送数量" prop="minmoney">
-      <el-input-number
-        v-model="form.num_give"
-        :min="0"
-        :max="20"
-      ></el-input-number>
-      <span style="padding-left: 10px">例如:买五送一则该值为1</span>
-    </el-form-item> -->
     <el-form-item label="开始日期" prop="date_start">
       <el-date-picker
         value-format="timestamp"
@@ -50,39 +39,21 @@
       >
       </el-date-picker>
     </el-form-item>
-    <el-form-item label="适用范围">
-      <el-radio-group v-model="form.grang">
-        <el-radio :label="1">全部商品</el-radio>
-        <el-radio :label="2">部分商品可用</el-radio>
-      </el-radio-group>
-    </el-form-item>
-    <!-- <el-form-item label="选择商品" v-if="form.grang == 2">
-      <el-select
-        v-model="form.grang_product"
-        multiple
-        filterable
-        remote
-        reserve-keyword
-        placeholder="输入商品编码或名称关键字"
-        :remote-method="getGoodsMethod"
-        :loading="loading"
-      >
-        <el-option
-          v-for="item in goodsList"
-          :key="item.gcode + '-' + item.gname"
-          :label="item.gcode + '-' + item.gname"
-          :value="item.gcode + '-' + item.gname"
-        >
-        </el-option>
-      </el-select>
-    </el-form-item> -->
     <el-form-item label="是否启用">
       <el-select v-model="form.released">
         <el-option label="是" value="1" key="1"></el-option>
         <el-option label="否" value="0" key="0"></el-option>
       </el-select>
     </el-form-item>
-    <el-form-item> </el-form-item>
+    <el-form-item label="适用范围">
+      <el-radio-group v-model="form.grang">
+        <el-radio :label="1">全部商品</el-radio>
+        <el-radio :label="2">部分商品可用</el-radio>
+      </el-radio-group>
+    </el-form-item>
+    <div v-if="form.grang == 2">
+      <slot :paid="rowData ? rowData.id : ''"></slot>
+    </div>
   </el-form>
 </template>
 <script>
@@ -113,7 +84,7 @@ export default {
         grang: 2,
         num_min: 0,
         num_give: 0,
-        grang_product: [],
+        // grang_product: [],
         is_used_coupon: "0",
         is_used_integral: "0",
         released: "1",
@@ -178,7 +149,7 @@ export default {
           param.is_used_integral = Number(param.is_used_integral);
           param.released = Number(param.released);
           if (param.grang == 2) {
-            param.grang_product = param.grang_product.toString();
+            param.grang_product = "";
           } else {
             param.grang_product = "";
           }
@@ -204,14 +175,6 @@ export default {
         this.pTypeOptions = res.data.data;
       });
     },
-    // handlePromotionType(value) {
-    //   if (value == undefined || value == "") return;
-    //   let promotionTypes = this.pTypeOptions.find(function (item) {
-    //     return item.id === value;
-    //   });
-    //   if (!promotionTypes) return;
-    //   this.form.pname = promotionTypes.name;
-    // },
     getGoodsMethod(query) {
       if (query !== "") {
         this.loading = true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "leisure-core",
-  "version": "0.4.3",
+  "version": "0.4.5",
   "description": "leisure-core是leisure-ui-core的简称,是京心数据基于vue2.0开发的一套后台系统框架与js库,包含登录,首页框架等",
   "private": false,
   "author": "北方乐逍遥(zcx7878)",