新首页

f2ee2f3c · chenyishuai@singsingenglish.com · 163eb721 · f2ee2f3c · f2ee2f3c · 163eb721
Commit f2ee2f3c authored Apr 08, 2019 by chenyishuai@singsingenglish.com
10 changed files
--- a/dev/index.html
+++ b/dev/index.html
@@ -3,4 +3,4 @@
      }
      *{
        -webkit-overflow-scrolling: touch
-      }</style><link href=static/css/app.36f1a827a9c97142b68b591948be53f1.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.8b69b57194d303ed1543.js></script><script type=text/javascript src=static/js/vendor.05c910a446ce196f2037.js></script><script type=text/javascript src=static/js/app.90b98a69857d5a217b0d.js></script></body></html>
\ No newline at end of file
+      }</style><link href=static/css/app.36f1a827a9c97142b68b591948be53f1.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.d8451027c7d00085f825.js></script><script type=text/javascript src=static/js/vendor.05c910a446ce196f2037.js></script><script type=text/javascript src=static/js/app.740434e08c6a706956f0.js></script></body></html>
\ No newline at end of file
--- a/dev/static/js/0.3c24f2d37af983900d94.js
+++ b/dev/static/js/0.3c24f2d37af983900d94.js
--- a/dev/static/js/7.4cf4dd4158b2b0b4b1e1.js
+++ b/dev/static/js/7.4cf4dd4158b2b0b4b1e1.js
--- a/dev/static/js/7.b897af255e9c9fa9f521.js
+++ b/dev/static/js/7.b897af255e9c9fa9f521.js
--- a/dev/static/js/app.740434e08c6a706956f0.js
+++ b/dev/static/js/app.740434e08c6a706956f0.js
--- a/dev/static/js/app.90b98a69857d5a217b0d.js
+++ b/dev/static/js/app.90b98a69857d5a217b0d.js
--- a/dev/static/js/manifest.8b69b57194d303ed1543.js
+++ b/dev/static/js/manifest.8b69b57194d303ed1543.js
-!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,t,o){for(var f,d,b,i=0,u=[];i<a.length;i++)d=a[i],n[d]&&u.push(n[d][0]),n[d]=0;for(f in t)Object.prototype.hasOwnProperty.call(t,f)&&(e[f]=t[f]);for(c&&c(a,t,o);u.length;)u.shift()();if(o)for(i=0;i<o.length;i++)b=r(r.s=o[i]);return b};var a={},n={34:0};function r(c){if(a[c])return a[c].exports;var n=a[c]={i:c,l:!1,exports:{}};return e[c].call(n.exports,n,n.exports,r),n.l=!0,n.exports}r.e=function(e){var c=n[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,r){c=n[e]=[a,r]});c[2]=a;var t=document.getElementsByTagName("head")[0],o=document.createElement("script");o.type="text/javascript",o.charset="utf-8",o.async=!0,o.timeout=12e4,r.nc&&o.setAttribute("nonce",r.nc),o.src=r.p+"static/js/"+e+"."+{0:"3c24f2d37af983900d94",1:"6dffa05763f0439bbbe1",2:"ae57d591a1c6e5092b19",3:"8dfb98444be7be3da1f8",4:"74a5ca2992fb50fce87c",5:"aaf704a2afdad27e785d",6:"1893d4e9348d036a5f64",7:"4cf4dd4158b2b0b4b1e1",8:"4746f0b53b1c9bc0e8c2",9:"fe6ce3b3bfae6e85d519",10:"e4900390e294708e603c",11:"08b648925597ca923e39",12:"eb00a8159328d7a369a4",13:"9ff02b5cebcc1ae3d6f5",14:"63dd06736295a7405b75",15:"f189e15d1708d33abfe7",16:"021e3bdb029874a18545",17:"c85de1b79a8bdc7112a8",18:"d68cc621b7ed95b4d916",19:"07b553dc61841e537338",20:"9731a2dc3422d0c6fd89",21:"ce4c37cbb478135080a7",22:"b35467abc636b6075196",23:"dc986b0fc5ea6fd33d4a",24:"0b552a73b78c2278d77a",25:"f81fdc8c2a0ca0fc44cc",26:"4a314447d1a8347111fd",27:"788e10f59044c0ca03e2",28:"617cfa8996077c66713d",29:"0d208ecf9fbf872c6d0e",30:"640aaa7e7b99b3485ec9",31:"c7a087b475e48dc06a1b"}[e]+".js";var f=setTimeout(d,12e4);function d(){o.onerror=o.onload=null,clearTimeout(f);var c=n[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),n[e]=void 0)}return o.onerror=o.onload=d,t.appendChild(o),a},r.m=e,r.c=a,r.d=function(e,c,a){r.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},r.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(c,"a",c),c},r.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},r.p="",r.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
+!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,t,f){for(var o,d,b,i=0,u=[];i<a.length;i++)d=a[i],n[d]&&u.push(n[d][0]),n[d]=0;for(o in t)Object.prototype.hasOwnProperty.call(t,o)&&(e[o]=t[o]);for(c&&c(a,t,f);u.length;)u.shift()();if(f)for(i=0;i<f.length;i++)b=r(r.s=f[i]);return b};var a={},n={34:0};function r(c){if(a[c])return a[c].exports;var n=a[c]={i:c,l:!1,exports:{}};return e[c].call(n.exports,n,n.exports,r),n.l=!0,n.exports}r.e=function(e){var c=n[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,r){c=n[e]=[a,r]});c[2]=a;var t=document.getElementsByTagName("head")[0],f=document.createElement("script");f.type="text/javascript",f.charset="utf-8",f.async=!0,f.timeout=12e4,r.nc&&f.setAttribute("nonce",r.nc),f.src=r.p+"static/js/"+e+"."+{0:"c6fce4759e767d863cb4",1:"6dffa05763f0439bbbe1",2:"ae57d591a1c6e5092b19",3:"8dfb98444be7be3da1f8",4:"74a5ca2992fb50fce87c",5:"aaf704a2afdad27e785d",6:"1893d4e9348d036a5f64",7:"b897af255e9c9fa9f521",8:"4746f0b53b1c9bc0e8c2",9:"fe6ce3b3bfae6e85d519",10:"e4900390e294708e603c",11:"08b648925597ca923e39",12:"eb00a8159328d7a369a4",13:"9ff02b5cebcc1ae3d6f5",14:"63dd06736295a7405b75",15:"f189e15d1708d33abfe7",16:"021e3bdb029874a18545",17:"c85de1b79a8bdc7112a8",18:"d68cc621b7ed95b4d916",19:"07b553dc61841e537338",20:"9731a2dc3422d0c6fd89",21:"ce4c37cbb478135080a7",22:"b35467abc636b6075196",23:"dc986b0fc5ea6fd33d4a",24:"0b552a73b78c2278d77a",25:"f81fdc8c2a0ca0fc44cc",26:"4a314447d1a8347111fd",27:"788e10f59044c0ca03e2",28:"617cfa8996077c66713d",29:"0d208ecf9fbf872c6d0e",30:"640aaa7e7b99b3485ec9",31:"c7a087b475e48dc06a1b"}[e]+".js";var o=setTimeout(d,12e4);function d(){f.onerror=f.onload=null,clearTimeout(o);var c=n[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),n[e]=void 0)}return f.onerror=f.onload=d,t.appendChild(f),a},r.m=e,r.c=a,r.d=function(e,c,a){r.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},r.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(c,"a",c),c},r.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},r.p="",r.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
--- a/src/components/collection/audio.vue
+++ b/src/components/collection/audio.vue
@@ -375,7 +375,7 @@
    overflow: auto;
    margin: auto;
    display: block;
-    height: 610*@toVw;
+    height: 100vh;
    width: 375*@toVw;
    border-radius: 8*@toVw;
    text-align: center;

--- a/src/components/index.vue
+++ b/src/components/index.vue
@@ -9,8 +9,11 @@
            <p style="font-size:36px;">{{bannerData.course_title}}</p>
          </div>
          <div class="date" @click="toShop()">
-            <p style="font-size:12px;">原价：{{bannerData.original_price}}元</p>
-            <p style="font-size:18px;">限时{{bannerData.current_price}}元领取</p>
+            <p style="font-size:12px;text-decoration:line-through;">原价：{{bannerData.original_price/100}}元</p>
+            <p style="font-size:18px;">限时{{bannerData.current_price/100}}元领取</p>
+          </div>
+          <div class="triangle">
+            <span >专属福利</span>
          </div>
        </div>
      </div>
@@ -20,7 +23,7 @@
          <img v-if="bannerData.qr" class="qr" :src="bannerData.qr" alt="">
          <div class="date">
            <p>开课时间：{{bannerData.start_at}}</p>
-            <p>全勤打卡活动开始时间：{{bannerData.active_start_at}}</p>
+            <p v-if="bannerData.active_start_at">全勤打卡活动开始时间：{{bannerData.active_start_at}}</p>
          </div>
          <div class="triangle">
            <span v-if="bannerData.is_start_active==1">已开课</span>
@@ -156,8 +159,9 @@ export default {
  },
  methods: {
    toShop(){
+      console.log(this.bannerData.goods_id)
      this.$router.push({name:'buyDetail', query: {
-         hopId: this.goods_id,
+         shopId: this.bannerData.goods_id,
        }},
     )
    },
@@ -356,6 +360,9 @@ export default {
    box-shadow: 1px 2px 5px 0px rgba(0,0,0,0.2);
    .title{position: absolute;color: white;top: 35* @toVw;left: 20* @toVw;}
    .date{color: white;text-align: center;position: absolute;bottom: 34*@toVw;left: 20* @toVw;width: 100%;font-size: 14px;width: 152* @toVw;}
+    .triangle{background: #FFC53D;width:104* @toVw ;height: 104* @toVw;position: absolute;right: -46* @toVw; top: -62* @toVw; transform:rotate(-50deg);
+      span{color: white;font-size: 14px;transform:rotate(85deg);position: absolute;top: 54* @toVw;font-size: 13px;bottom: 74* @toVw;}
+     }
  }
 }
 .contentBox{

--- a/src/service/index.js
+++ b/src/service/index.js
@@ -170,7 +170,7 @@ export function fetch(url,params={}){
          reject(response.data);
        }else{
          reject(response.data);
-          Toast(response.data.msg)
+          // Toast(response.data.msg)
        }
      })
      .catch(err => {
@@ -216,7 +216,7 @@ export function post(url,data = {}){
          reject(response.data);
        }else{
          reject(response.data);
-          Toast(response.data.msg)
+          // Toast(response.data.msg)
        }
      },err => {
        reject(err);
@@ -250,7 +250,7 @@ export function patch(url,data = {}){
          reject(response.data);
        }else{
          reject(response.data);
-          Toast(response.data.msg)
+          // Toast(response.data.msg)
        }
      },err => {
        reject(err);
@@ -284,7 +284,7 @@ export function put(url,data = {}){
          reject(response.data);
        }else{
          reject(response.data);
-          Toast(response.data.msg)
+          // Toast(response.data.msg)
        }
      },err => {
        reject(err);
@@ -311,7 +311,7 @@ export function del(url,data = {}){
          reject(response.data);
        }else{
          reject(response.data);
-          Toast(response.data.msg)
+          // Toast(response.data.msg)
        }
      },err => {
        reject(err);