不能点击1.8

a978a686 · IvyXia123 · 161815d3 · a978a686 · a978a686 · a978a686
Commit a978a686 authored Sep 18, 2019 by IvyXia123
5 changed files
--- a/package-lock.json
+++ b/package-lock.json
@@ -53,6 +53,40 @@
        }
      }
    },
+    "@elastic/apm-rum": {
+      "version": "4.4.4",
+      "resolved": "https://registry.npmjs.org/@elastic/apm-rum/-/apm-rum-4.4.4.tgz",
+      "integrity": "sha512-kfERuJAvO6he+ntqJnYscbtrW2itAAtk1+2kISvU8r1AGefnxgi/TtS6aGxQXrPH+YN4Cjb0I7NZITs8VIVJhQ==",
+      "requires": {
+        "@elastic/apm-rum-core": "^4.5.4"
+      }
+    },
+    "@elastic/apm-rum-core": {
+      "version": "4.5.4",
+      "resolved": "https://registry.npmjs.org/@elastic/apm-rum-core/-/apm-rum-core-4.5.4.tgz",
+      "integrity": "sha512-+HE90cKe9qAHgqgArk6Qe6AXR9Qu4XhSENfSa6kLSnmaYfsF81mgLCg8FVlvviQF423uOqGSadF3F0uc01A5nA==",
+      "requires": {
+        "error-stack-parser": "^1.3.5",
+        "es6-promise": "^4.2.8",
+        "opentracing": "^0.14.3",
+        "uuid": "^3.1.0"
+      },
+      "dependencies": {
+        "error-stack-parser": {
+          "version": "1.3.6",
+          "resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-1.3.6.tgz",
+          "integrity": "sha1-4Oc7k+QXE40c18C3RrGkoUhUwpI=",
+          "requires": {
+            "stackframe": "^0.3.1"
+          }
+        },
+        "stackframe": {
+          "version": "0.3.1",
+          "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-0.3.1.tgz",
+          "integrity": "sha1-M6qE8Rd6VUjIk1Uzy/6zQgl19aQ="
+        }
+      }
+    },
    "@vant/icons": {
      "version": "1.1.4",
      "resolved": "https://registry.npmjs.org/@vant/icons/-/icons-1.1.4.tgz",
@@ -3168,6 +3202,11 @@
        "event-emitter": "~0.3.5"
      }
    },
+    "es6-promise": {
+      "version": "4.2.8",
+      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",
+      "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w=="
+    },
    "es6-set": {
      "version": "0.1.5",
      "resolved": "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz",
@@ -6531,6 +6570,11 @@
      "integrity": "sha512-goYSy5c2UXE4Ra1xixabeVh1guIX/ZV/YokJksb6q2lubWu6UbvPQ20p542/sFIll1nl8JnCyK9oBaOcCWXwvA==",
      "dev": true
    },
+    "opentracing": {
+      "version": "0.14.4",
+      "resolved": "https://registry.npmjs.org/opentracing/-/opentracing-0.14.4.tgz",
+      "integrity": "sha512-nNnZDkUNExBwEpb7LZaeMeQgvrlO8l4bgY/LvGNZCR0xG/dGWqHqjKrAmR5GUoYo0FIz38kxasvA1aevxWs2CA=="
+    },
    "opn": {
      "version": "5.3.0",
      "resolved": "https://registry.npmjs.org/opn/-/opn-5.3.0.tgz",
@@ -10876,8 +10920,7 @@
    "uuid": {
      "version": "3.3.2",
      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
-      "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==",
+      "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="
-      "dev": true
    },
    "validate-npm-package-license": {
      "version": "3.0.4",

--- a/package.json
+++ b/package.json
@@ -11,6 +11,7 @@
    "build-test": "node build/build-test.js"
  },
  "dependencies": {
+    "@elastic/apm-rum": "^4.4.4",
    "axios": "^0.18.0",
    "better-scroll": "^1.15.2",
    "canvas2image": "^1.0.5",

--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -680,7 +680,6 @@
      },
      scroll_to(offsetTop){
        // debugger
-        alert(5)
        let top = offsetTop-200;
        for(let i = 0 ; i < 30 ; i ++){
          let scrollTop = document.documentElement.scrollTop | document.body.scrollTop;
@@ -735,16 +734,12 @@
        // 加载课程
        // console.log(this.secActions)
        this.shopType = this.secActions.course_type
-        alert(this.secActions.course_type)
-        alert(this.secActions.is_start_course)
        if(this.secActions.is_start_course){
          if (this.secActions.course_type==0){
            // 月课
            // debugger
            this.getUnitList()
-            alert(1)
          }else{
-            alert(2)
            this.getLessonList();
          }
        }

--- a/src/components/map/promptTime.vue
+++ b/src/components/map/promptTime.vue
+<template>
+  <div class="prompt-time">
+    <div class="title">请设置您希望接收上课提醒的时间</div>
+    <div class="tishi-timer">
+      <img :src="tishiTimer" alt="">
+    </div>
+    <div class="time-setting" ref="timeSetting" @click="dateShowClick">
+      <div class="time-setting-text">
+        当前设定的时间
+      </div>
+      <div class="time-setting-ti">
+        <span>{{ currentTime }}</span>
+        <img :src="youjiantou" alt="">
+      </div>
+    </div>
+    <div class="preservation" @click="preservationClick">保存</div>
+    <van-popup v-model="dateShow" position="bottom">
+      <van-datetime-picker :min-hour="minHour" :max-hour="maxHour" @confirm="dateConfirm" @cancel="dateConfirmNo" v-model="currentTime" type="time"/>
+    </van-popup>
+  </div>
+</template>
+<script>
+  import { postNotifySettingApi, getNotifyApi } from "../../service/api";
+  import { DatetimePicker, Popup, Toast } from 'vant';
+  import tishiTimer from '../../assets/evaluate/tishi_timer.png'
+  import youjiantou from '../../assets/evaluate/youjiantou.png'
+  export default {
+    name: "promptTime",
+    data() {
+      return {
+        currentTime: '07:00',
+        minHour: 7,
+        maxHour: 22,
+        dateVal: '',
+        dateShow: false,
+        selectedValue: '',
+        tishiTimer: tishiTimer, // 图
+        youjiantou: youjiantou  // 图
+      }
+    },
+    components: {
+      [DatetimePicker.name]: DatetimePicker,
+      [Popup.name]: Popup,
+    },
+    watch: {
+      dateShow(val) {
+        if(!val) {
+          this.contentFn()
+        }
+      }
+    },
+    methods: {
+      dateShowClick() {
+        this.dateShow = true;
+        this.$nextTick(() => {
+          document.querySelectorAll('.van-picker__confirm')[0].innerText = '完成'
+          document.querySelectorAll('.van-picker-column')[1].style.display = 'none';
+          let oLi = document.querySelectorAll('.van-picker-column')[0].querySelectorAll('li');
+          for (var i = 0; i < oLi.length; i++) {
+            oLi[i].innerText = oLi[i].innerText + ':00'
+          }
+        })
+      },
+      dateConfirm(val) {
+        this.currentTime = val == 'aN:aN' ? '00:00' : val
+        this.contentFn()
+      },
+      dateConfirmNo() {
+        this.contentFn()
+      },
+      contentFn() {
+        this.dateShow = false;
+        this.$refs.timeSetting.style.borderBottom = '1px solid #E2E2E2'
+        let oLi = document.querySelectorAll('.van-picker-column')[0].querySelectorAll('li');
+        for (var i = 0; i < oLi.length; i++) {
+          oLi[i].innerText = oLi[i].innerText.split(':')[0]
+        }
+      },
+      preservationClick() {
+        let pushAtData = { time: this.currentTime, periods_id: this.$route.query.periods_id }
+        postNotifySettingApi(pushAtData).then(res => {
+          Toast("时间设定完成");
+          this.$router.go(-1);
+        })
+      }
+    },
+    mounted() {
+      getNotifyApi(this.$route.query.periods_id).then(res => {
+        console.log(res, 8787878)
+        if(res.time)
+          this.currentTime = res.time.split(':')[0] + ':' + res.time.split(':')[1]
+      })
+    }
+  }
+</script>
+<style scoped lang="less">
+  @import "../../util/public";
+ /* .van-picker {
+    border-radius: 30 * @toVw 30 * @toVw 0 0;
+  }
+  .van-picker__toolbar::after {
+    content: '';
+    border: none;
+  }
+  .van-picker__confirm {
+    color: #333333;
+    font-size: 15 * @toVw;
+    margin: 0;
+    padding-right: 30 * @toVw;
+  }
+  .van-picker__frame, .van-picker__loading .van-loading {
+    height: 54px!important;
+  }
+  .van-picker__cancel {
+    color: #333333;
+    font-size: 15 * @toVw;
+    margin: 0;
+    padding-left: 30 * @toVw;
+  }
+  .van-picker-column__item {
+    color: #666666;
+    font-size: 17 * @toVw;
+  }
+  .van-picker-column__item--selected {
+    color: #40A9FF;
+    font-size: 21 * @toVw;
+  }*/
+  .prompt-time {
+    width: 100%;
+    height: 100%;
+    background: #ffffff;
+    padding: 0 27 * @toVw;
+    box-sizing: border-box;
+    .title {
+      padding-top: 30 * @toVw;
+      padding-bottom: 24 * @toVw;
+      font-size: 17 * @toVw;
+      font-weight: 500;
+      letter-spacing: 1px;
+      color: #000000;
+    }
+    .tishi-timer {
+      width: 322 * @toVw;
+      height: 245 * @toVw;
+      img {
+        width: 100%;
+        height: 100%;
+      }
+    }
+    .time-setting {
+      width: 100%;
+      overflow: hidden;
+      padding-top: 38 * @toVw;
+      padding-bottom: 11 * @toVw;
+      border-bottom: 1px solid #E2E2E2;
+      .time-setting-text {
+        float: left;
+        font-size: 14 * @toVw;
+      }
+      .time-setting-ti {
+        float: right;
+        span {
+          font-size: 15 * @toVw;
+          padding-right: 10 * @toVw;
+          vertical-align: middle;
+        }
+        img {
+          width: 10 * @toVw;
+          height: 14 * @toVw;
+          vertical-align: middle;
+        }
+      }
+    }
+    .preservation {
+      width: 330 * @toVw;
+      height: 50 * @toVw;
+      line-height: 50 * @toVw;
+      background: #40A9FF;
+      margin-top: 60 * @toVw;
+      border-radius: 28 * @toVw;
+      text-align: center;
+      font-size: 17 * @toVw;
+      font-weight: 500;
+      color: #ffffff;
+    }
+  }
+</style>
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -560,11 +560,11 @@ const router = new Router({
      }
    },
    // 时间提示
-    /*{
+    {
      path: '/promptTime',
      name: 'promptTime',
      component: e => require(['@/components/map/promptTime'], e)
-    },*/
+    },
    {
      path: '*',
      component: () => import('@/components/error'),