528

0977f703 · chenyishuai@singsingenglish.com · 2632c675 · 0977f703 · 0977f703 · 0977f703
Commit 0977f703 authored May 28, 2019 by chenyishuai@singsingenglish.com
9 changed files
--- a/dev/index.html
+++ b/dev/index.html
@@ -6,4 +6,4 @@
          overflow: hidden;
          position: fixed;
          background: #f4f4f4;
-        }</style><link href=static/css/app.a33637a3392be2fde512aa6031b6e4df.css rel=stylesheet></head><body><div id=app></div><script src=https://res.wx.qq.com/open/js/jweixin-1.3.2.js></script><script type=text/javascript src=static/js/manifest.3f899bed608b785bc757.js></script><script type=text/javascript src=static/js/vendor.08bb4c1de1fdf5bf85a2.js></script><script type=text/javascript src=static/js/app.2c2323b9c57064009e04.js></script></body></html>
+        }</style><link href=static/css/app.a33637a3392be2fde512aa6031b6e4df.css rel=stylesheet></head><body><div id=app></div><script src=https://res.wx.qq.com/open/js/jweixin-1.3.2.js></script><script type=text/javascript src=static/js/manifest.6274084468e6925ec92d.js></script><script type=text/javascript src=static/js/vendor.08bb4c1de1fdf5bf85a2.js></script><script type=text/javascript src=static/js/app.2c2323b9c57064009e04.js></script></body></html>
\ No newline at end of file
--- a/dev/static/js/15.6dc965f957595f755035.js
+++ b/dev/static/js/15.6dc965f957595f755035.js
--- a/dev/static/js/16.40ce532f38950b924e5c.js
+++ b/dev/static/js/16.40ce532f38950b924e5c.js
--- a/dev/static/js/6.31b7a0b8c7417a15445f.js
+++ b/dev/static/js/6.31b7a0b8c7417a15445f.js
--- a/dev/static/js/6.71f3619fc2cf472d5b4a.js
+++ b/dev/static/js/6.71f3619fc2cf472d5b4a.js
--- a/dev/static/js/manifest.3f899bed608b785bc757.js
+++ b/dev/static/js/manifest.3f899bed608b785bc757.js
-!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,t,r){for(var o,d,b,i=0,u=[];i<c.length;i++)d=c[i],f[d]&&u.push(f[d][0]),f[d]=0;for(o in t)Object.prototype.hasOwnProperty.call(t,o)&&(e[o]=t[o]);for(a&&a(c,t,r);u.length;)u.shift()();if(r)for(i=0;i<r.length;i++)b=n(n.s=r[i]);return b};var c={},f={37:0};function n(a){if(c[a])return c[a].exports;var f=c[a]={i:a,l:!1,exports:{}};return e[a].call(f.exports,f,f.exports,n),f.l=!0,f.exports}n.e=function(e){var a=f[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,n){a=f[e]=[c,n]});a[2]=c;var t=document.getElementsByTagName("head")[0],r=document.createElement("script");r.type="text/javascript",r.charset="utf-8",r.async=!0,r.timeout=12e4,n.nc&&r.setAttribute("nonce",n.nc),r.src=n.p+"static/js/"+e+"."+{0:"b8d329232924c52f21f9",1:"2af48a38a0a5ba4de8d7",2:"320fe507d344efb0c388",3:"fb9eacc4cab1241045b3",4:"498fdae1cf375720d0fd",5:"665e1536f07d3a98174d",6:"31b7a0b8c7417a15445f",7:"f1db37c6902f5aa481c6",8:"131627a8ab119649a31a",9:"e9c88acab2565bf7629c",10:"fd3d73f3ae4cf823f641",11:"824d4ca021e7d0fc13e1",12:"40360dcce0a769c5019c",13:"a49a6fe121412551f160",14:"a0a3bf1f6c6d07ebc4bd",15:"6dc965f957595f755035",16:"40ce532f38950b924e5c",17:"9498402cbdfb14710ef2",18:"9d8477aa7d6551b11988",19:"5a62a749b9ba8977df27",20:"efc022c1cddf26b4e76e",21:"b5fbe416a6ed0a351765",22:"5711cb64898166468a42",23:"c4f7239d893424072548",24:"74105ee90759eb3a1c0c",25:"710a83363e346f356722",26:"0dcd222d813e24c1c38a",27:"adcf10f7b58e924a2943",28:"06b0ca68e1b4e7a0be92",29:"5cbdfdcf0859e7be0f3e",30:"089b631d6b1ef3203f55",31:"5add3cb58a0305fc7b52",32:"b5826e79a4bff96ab34e",33:"d9c1dd5f78efa0809ec7",34:"8b89d32c134f24882103"}[e]+".js";var o=setTimeout(d,12e4);function d(){r.onerror=r.onload=null,clearTimeout(o);var a=f[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return r.onerror=r.onload=d,t.appendChild(r),c},n.m=e,n.c=c,n.d=function(e,a,c){n.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},n.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(a,"a",a),a},n.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},n.p="",n.oe=function(e){throw e}}([]);
+!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,t,r){for(var o,d,b,i=0,u=[];i<c.length;i++)d=c[i],f[d]&&u.push(f[d][0]),f[d]=0;for(o in t)Object.prototype.hasOwnProperty.call(t,o)&&(e[o]=t[o]);for(a&&a(c,t,r);u.length;)u.shift()();if(r)for(i=0;i<r.length;i++)b=n(n.s=r[i]);return b};var c={},f={37:0};function n(a){if(c[a])return c[a].exports;var f=c[a]={i:a,l:!1,exports:{}};return e[a].call(f.exports,f,f.exports,n),f.l=!0,f.exports}n.e=function(e){var a=f[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,n){a=f[e]=[c,n]});a[2]=c;var t=document.getElementsByTagName("head")[0],r=document.createElement("script");r.type="text/javascript",r.charset="utf-8",r.async=!0,r.timeout=12e4,n.nc&&r.setAttribute("nonce",n.nc),r.src=n.p+"static/js/"+e+"."+{0:"b8d329232924c52f21f9",1:"2af48a38a0a5ba4de8d7",2:"320fe507d344efb0c388",3:"fb9eacc4cab1241045b3",4:"498fdae1cf375720d0fd",5:"665e1536f07d3a98174d",6:"71f3619fc2cf472d5b4a",7:"f1db37c6902f5aa481c6",8:"131627a8ab119649a31a",9:"e9c88acab2565bf7629c",10:"fd3d73f3ae4cf823f641",11:"824d4ca021e7d0fc13e1",12:"40360dcce0a769c5019c",13:"a49a6fe121412551f160",14:"a0a3bf1f6c6d07ebc4bd",15:"707d58743fc9a74249e6",16:"122a88228eaf23a73c64",17:"9498402cbdfb14710ef2",18:"9d8477aa7d6551b11988",19:"5a62a749b9ba8977df27",20:"efc022c1cddf26b4e76e",21:"b5fbe416a6ed0a351765",22:"5711cb64898166468a42",23:"c4f7239d893424072548",24:"74105ee90759eb3a1c0c",25:"710a83363e346f356722",26:"0dcd222d813e24c1c38a",27:"adcf10f7b58e924a2943",28:"06b0ca68e1b4e7a0be92",29:"5cbdfdcf0859e7be0f3e",30:"089b631d6b1ef3203f55",31:"5add3cb58a0305fc7b52",32:"b5826e79a4bff96ab34e",33:"d9c1dd5f78efa0809ec7",34:"8b89d32c134f24882103"}[e]+".js";var o=setTimeout(d,12e4);function d(){r.onerror=r.onload=null,clearTimeout(o);var a=f[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return r.onerror=r.onload=d,t.appendChild(r),c},n.m=e,n.c=c,n.d=function(e,a,c){n.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},n.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(a,"a",a),a},n.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},n.p="",n.oe=function(e){throw e}}([]);
\ No newline at end of file
--- a/src/components/buy/index.vue
+++ b/src/components/buy/index.vue
@@ -521,9 +521,9 @@ export default {
      if (!userCourse.periods_list) {
        // 优惠券
-        getAutomationCouponApi().then(res => {
+        getCouponListApi(this.$route.query.shopId).then(res => {
-          if(res.coupon_list.length){
+          if(res.length){
-            this.couponInfo = res.coupon_list[0]
+            this.couponInfo = res[0]
            this.couponShadow = true;
          }
          // this.couponInfo = res[res.length - 1];

--- a/src/components/indexPage/preview.vue
+++ b/src/components/indexPage/preview.vue
@@ -64,6 +64,7 @@
 <style scoped lang="less">
  @import "../../util/public";
  .nofinish-block{
+    position: relative;
    .bg{width: 100%;vertical-align:top;}
    .pic{position: absolute;left: 30*@toVw;width:315 *@toVw ;}
    .pic1{top: 505 *@toVw;height:115 *@toVw ;}

--- a/src/components/map/secMap.vue
+++ b/src/components/map/secMap.vue
@@ -202,6 +202,7 @@ import diaBGI from "../../assets/newLesson/diaBG.png";
 import couponBg from "../../assets/bg_coupon@2x.png";
 import mok4 from "../../assets/newLesson/mok4.png";
 import { IndexImage } from "../../util/imgUrl";
+import cookie from "../../util/cookie";
 import "swiper/dist/css/swiper.css";
 import { swiper, swiperSlide } from "vue-awesome-swiper";
 import { Toast, Actionsheet } from "vant";
@@ -820,6 +821,31 @@ export default {
 </script>
 <style scoped lang="less">
  @import "../../util/public";
+  .van-popup{
+  width: 283* @toVw;
+  top: 20vh;
+  border-radius: 22* @toVw;
+  overflow: hidden;
+  text-align: center;
+  padding-bottom: 26* @toVw;
+  font-size: 14* @toVw;
+  .content{
+    img{width: 100%;}
+    .textBox{
+      margin: 20* @toVw 0;
+    }
+    .btn{
+      background: #40A9FF;
+      width: 180* @toVw;
+      height: 44* @toVw;
+      line-height: 44* @toVw;
+      color: white;
+      display: inline-block;
+      border-radius: 22* @toVw;
+      font-size: 22* @toVw;
+    }
+  }
+}
  .liuyiBtn{
  position: fixed;
  bottom: 105* @toVw;