‘提交修改’

9e1aa3ca · 华国豪 · 82e22106 · 9e1aa3ca · 9e1aa3ca · 9e1aa3ca
Commit 9e1aa3ca authored Mar 07, 2019 by 华国豪 🙄
Showing with 12 additions and 10 deletions

index.html index.html +2 -2

package.json package.json +1 -1

CouponList.vue src/components/activity/CouponList.vue +5 -5

LuckyDraw.vue src/components/activity/LuckyDraw.vue +4 -2

No files found.
--- a/index.html
+++ b/index.html
@@ -9,9 +9,9 @@
    <meta http-equiv="expires" content="-1, 26 Feb 1997 08:21:57 GMT">
    <!--<meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" name="viewport">-->
    <script  type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=ZzGBZF6L0sgFDLlDohyvYhCnWy4dwksX" ></script>
-    <script type="text/javascript" src="http://api.map.baidu.com/library/CurveLine/1.5/src/CurveLine.min.js"></script>
+    <script type="text/javascript" src="static/CurveLine.min.js"></script>
    <script type="text/javascript" src="http://ditu.google.cn/maps/api/js?key=AIzaSyAZ5MIfzicStzKbIkbI3RcBBeZBjQFKsp0&language=zh-CN"></script>
-    <script src="http://code.jquery.com/jquery-2.1.1.min.js"></script>
+    <script src="static/jquery.min.js"></script>
    <title>四川和平国际旅行社</title>
  </head>
  <body>

--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
    "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js",
    "start": "npm run dev",
    "lint": "eslint --ext .js,.vue src",
-    "build": "node build/build.js"
+    "build": "node --max-old-space-size=4096 build/build.js"
  },
  "dependencies": {
    "@riophae/vue-treeselect": "0.0.36",

--- a/src/components/activity/CouponList.vue
+++ b/src/components/activity/CouponList.vue
@@ -85,8 +85,8 @@
        <th>数量</th>
        <th>线路名称</th>
        <th>类型</th>
-        <th>面额</th>
        <th>满减/折扣</th>
+        <th>面额</th>
        <!-- <th>使用状态</th> -->
        <th>叠加使用</th>
        <th>生效日期</th>
@@ -99,8 +99,8 @@
        <td>{{item.couponCount}}</td>
        <td>{{item.lineName}}</td>
        <td>{{item.couponsType ===1 ? "抵用券" : "折扣券"}}</td>
-        <td>{{item.denomination}}</td>
        <td>{{item.useCondition}}</td>
+        <td>{{item.denomination}}</td>
        <!-- <td>{{item.useState}}</td> -->
        <td>{{item.overlapUse === 1 ? "不允许" : "允许"}}</td>
        <td>{{item.effectDate}}</td>
@@ -368,9 +368,9 @@ export default {
      }, null);
    },
    maxValue: function (val) {
-      if (this.addMsg.couponsType === 2 && val >= 1) {
-        this.addMsg.denomination = 0.99
-        this.$message.error("折扣券最大折扣为0.99折")
+      if (this.addMsg.couponsType === 2 && val >= 9.99) {
+        this.addMsg.denomination = 9.99
+        this.$message.error("折扣券最大折扣为99折")
      }
    },
    addData() {

--- a/src/components/activity/LuckyDraw.vue
+++ b/src/components/activity/LuckyDraw.vue
@@ -130,8 +130,9 @@
      <tr>
        <th>抽奖名称</th>
        <th>公司名称</th>
-        <th>结束日期</th>
        <th>抽奖次数（每人）</th>
+        <th>开始日期</th>
+        <th>结束日期</th>
        <th>抽奖状态</th>
        <th>备注</th>
        <th>操作</th>
@@ -139,8 +140,9 @@
      <tr v-for="item in dataList">
          <td>{{item.lotteryName}}</td>
          <td>{{item.branchName}}</td>
-          <td>{{item.endDate}}</td>
          <td>{{item.lotteryCount}}</td>
+          <td>{{item.startDate}}</td>
+          <td>{{item.endDate}}</td>
          <td>{{item.lotteryStatus==1?'正常':'禁用'}}</td>
          <td>{{item.remark}}</td>
          <td>