默认优惠券选择

41d76036 · wangwei · 23b18802 · 41d76036 · 41d76036 · 41d76036
Commit 41d76036 authored Feb 01, 2019 by wangwei
22 changed files
--- a/dev/index.html
+++ b/dev/index.html
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no"><meta name=screen-orientation content=portrait><meta name=x5-orientation content=portrait><title>唱唱启蒙英语</title><link rel=stylesheet href=https://at.alicdn.com/t/font_822651_g9r2j7kybxu.css><style></style><link href=static/css/app.9f631d4069047acf4ee994f5d9f958c3.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.823d5ec62f35db717792.js></script><script type=text/javascript src=static/js/vendor.0302137f3a6bb59dc95e.js></script><script type=text/javascript src=static/js/app.f9154f171ae95b9f2ac3.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no"><meta name=screen-orientation content=portrait><meta name=x5-orientation content=portrait><title>唱唱启蒙英语</title><link rel=stylesheet href=https://at.alicdn.com/t/font_822651_g9r2j7kybxu.css><style></style><link href=static/css/app.9f631d4069047acf4ee994f5d9f958c3.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.b7eb085ef5cbccb23861.js></script><script type=text/javascript src=static/js/vendor.0302137f3a6bb59dc95e.js></script><script type=text/javascript src=static/js/app.cd758747078f0c4f0bd7.js></script></body></html>
\ No newline at end of file
--- a/dev/static/js/7.6e480a071fded4480eed.js
+++ b/dev/static/js/7.6e480a071fded4480eed.js
--- a/dev/static/js/7.a8eb02a98ef0ab17f728.js.map
+++ b/dev/static/js/7.a8eb02a98ef0ab17f728.js.map
--- a/dev/static/js/7.a8eb02a98ef0ab17f728.js
+++ b/dev/static/js/7.a8eb02a98ef0ab17f728.js
--- a/dev/static/js/app.f9154f171ae95b9f2ac3.js
+++ b/dev/static/js/app.f9154f171ae95b9f2ac3.js
--- a/dev/static/js/app.cd758747078f0c4f0bd7.js.map
+++ b/dev/static/js/app.cd758747078f0c4f0bd7.js.map
--- a/dev/static/js/app.f9154f171ae95b9f2ac3.js.map
+++ b/dev/static/js/app.f9154f171ae95b9f2ac3.js.map
--- a/dev/static/js/manifest.823d5ec62f35db717792.js
+++ b/dev/static/js/manifest.823d5ec62f35db717792.js
-!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,c,o){for(var f,d,b,i=0,u=[];i<r.length;i++)d=r[i],t[d]&&u.push(t[d][0]),t[d]=0;for(f in c)Object.prototype.hasOwnProperty.call(c,f)&&(e[f]=c[f]);for(n&&n(r,c,o);u.length;)u.shift()();if(o)for(i=0;i<o.length;i++)b=a(a.s=o[i]);return b};var r={},t={26:0};function a(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,a),t.l=!0,t.exports}a.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,a){n=t[e]=[r,a]});n[2]=r;var c=document.getElementsByTagName("head")[0],o=document.createElement("script");o.type="text/javascript",o.charset="utf-8",o.async=!0,o.timeout=12e4,a.nc&&o.setAttribute("nonce",a.nc),o.src=a.p+"static/js/"+e+"."+{0:"dd7a4a4d6f66f918b161",1:"74db0273aa29f9b44da4",2:"fa22829657cbd48b57a2",3:"20ef48d48dc907cfbee6",4:"091da077f95ed5811d79",5:"a37b9ee5517eca783c3e",6:"5196a65a5e3bd7113296",7:"a8eb02a98ef0ab17f728",8:"be4ed60496a08edbe14e",9:"84d52b2bfd66d01562b8",10:"fb904dd92fba2806640c",11:"79842596b7b8db168fb6",12:"6b7a9a473eb005cfd1b0",13:"d1a375ca87ee0099c55f",14:"07abae18534fd4ad84f2",15:"8016506c55a85edfab62",16:"d65597b9762dcc1cd0ed",17:"e8ffb1f4ac658fec0e7e",18:"f63413591b9bdc9cb4ce",19:"c778bfb2475fb9071e71",20:"cc3848989c6b0e891bdc",21:"3e29f0466acabc459f5b",22:"4930019ea0011ef68ac8",23:"8d337c794f25767b4793"}[e]+".js";var f=setTimeout(d,12e4);function d(){o.onerror=o.onload=null,clearTimeout(f);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return o.onerror=o.onload=d,c.appendChild(o),r},a.m=e,a.c=r,a.d=function(e,n,r){a.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},a.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return a.d(n,"a",n),n},a.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},a.p="",a.oe=function(e){throw console.error(e),e}}([]);
+!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,c,o){for(var f,d,b,i=0,u=[];i<r.length;i++)d=r[i],t[d]&&u.push(t[d][0]),t[d]=0;for(f in c)Object.prototype.hasOwnProperty.call(c,f)&&(e[f]=c[f]);for(n&&n(r,c,o);u.length;)u.shift()();if(o)for(i=0;i<o.length;i++)b=a(a.s=o[i]);return b};var r={},t={26:0};function a(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,a),t.l=!0,t.exports}a.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,a){n=t[e]=[r,a]});n[2]=r;var c=document.getElementsByTagName("head")[0],o=document.createElement("script");o.type="text/javascript",o.charset="utf-8",o.async=!0,o.timeout=12e4,a.nc&&o.setAttribute("nonce",a.nc),o.src=a.p+"static/js/"+e+"."+{0:"dd7a4a4d6f66f918b161",1:"74db0273aa29f9b44da4",2:"fa22829657cbd48b57a2",3:"20ef48d48dc907cfbee6",4:"091da077f95ed5811d79",5:"a37b9ee5517eca783c3e",6:"5196a65a5e3bd7113296",7:"6e480a071fded4480eed",8:"be4ed60496a08edbe14e",9:"84d52b2bfd66d01562b8",10:"fb904dd92fba2806640c",11:"79842596b7b8db168fb6",12:"6b7a9a473eb005cfd1b0",13:"d1a375ca87ee0099c55f",14:"07abae18534fd4ad84f2",15:"8016506c55a85edfab62",16:"d65597b9762dcc1cd0ed",17:"e8ffb1f4ac658fec0e7e",18:"f63413591b9bdc9cb4ce",19:"c778bfb2475fb9071e71",20:"cc3848989c6b0e891bdc",21:"3e29f0466acabc459f5b",22:"4930019ea0011ef68ac8",23:"8d337c794f25767b4793"}[e]+".js";var f=setTimeout(d,12e4);function d(){o.onerror=o.onload=null,clearTimeout(f);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return o.onerror=o.onload=d,c.appendChild(o),r},a.m=e,a.c=r,a.d=function(e,n,r){a.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},a.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return a.d(n,"a",n),n},a.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},a.p="",a.oe=function(e){throw console.error(e),e}}([]);
-//# sourceMappingURL=manifest.823d5ec62f35db717792.js.map
+//# sourceMappingURL=manifest.b7eb085ef5cbccb23861.js.map
\ No newline at end of file
--- a/dev/static/js/manifest.823d5ec62f35db717792.js.map
+++ b/dev/static/js/manifest.823d5ec62f35db717792.js.map
--- a/dist/index.html
+++ b/dist/index.html
 <!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no"><meta name=screen-orientation content=portrait><meta name=x5-orientation content=portrait><title>唱唱启蒙英语</title><link rel=stylesheet href=https://at.alicdn.com/t/font_822651_g9r2j7kybxu.css><style>*{
      -webkit-overflow-scrolling:touch;
-    }</style><link href=https://static-cdn.changchangenglish.com/new-sing/static/css/app.5bb60aa9c813382d3f6c85ec006a5f60.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></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/manifest.f22b658a7de650ff894d.js></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/vendor.3a0087e50012f11a0897.js></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/app.5e2fc392ef596c5457f4.js></script></body></html>
+    }</style><link href=https://static-cdn.changchangenglish.com/new-sing/static/css/app.d92ad033dddd464bd7c7f5468dfb00b8.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></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/manifest.ef93a729e267fd3edb83.js></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/vendor.3a0087e50012f11a0897.js></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/app.2ccb3310d1b8efd2133c.js></script></body></html>
\ No newline at end of file
--- a/dist/static/css/app.5bb60aa9c813382d3f6c85ec006a5f60.css
+++ b/dist/static/css/app.5bb60aa9c813382d3f6c85ec006a5f60.css
--- a/dist/static/css/app.5bb60aa9c813382d3f6c85ec006a5f60.css.map
+++ b/dist/static/css/app.5bb60aa9c813382d3f6c85ec006a5f60.css.map
--- a/dist/static/js/7.1b71590a2a3999ebbc74.js
+++ b/dist/static/js/7.1b71590a2a3999ebbc74.js
--- a/dist/static/js/7.7b0551302ef3f91cb11a.js
+++ b/dist/static/js/7.7b0551302ef3f91cb11a.js
--- a/dist/static/js/7.1b71590a2a3999ebbc74.js.map
+++ b/dist/static/js/7.1b71590a2a3999ebbc74.js.map
--- a/dist/static/js/app.5e2fc392ef596c5457f4.js
+++ b/dist/static/js/app.5e2fc392ef596c5457f4.js
--- a/dist/static/js/app.2ccb3310d1b8efd2133c.js.map
+++ b/dist/static/js/app.2ccb3310d1b8efd2133c.js.map
--- a/dist/static/js/app.5e2fc392ef596c5457f4.js.map
+++ b/dist/static/js/app.5e2fc392ef596c5457f4.js.map
--- a/dist/static/js/manifest.f22b658a7de650ff894d.js
+++ b/dist/static/js/manifest.f22b658a7de650ff894d.js
-!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(t,c,f){for(var o,d,b,i=0,u=[];i<t.length;i++)d=t[i],r[d]&&u.push(r[d][0]),r[d]=0;for(o in c)Object.prototype.hasOwnProperty.call(c,o)&&(e[o]=c[o]);for(n&&n(t,c,f);u.length;)u.shift()();if(f)for(i=0;i<f.length;i++)b=a(a.s=f[i]);return b};var t={},r={26:0};function a(n){if(t[n])return t[n].exports;var r=t[n]={i:n,l:!1,exports:{}};return e[n].call(r.exports,r,r.exports,a),r.l=!0,r.exports}a.e=function(e){var n=r[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var t=new Promise(function(t,a){n=r[e]=[t,a]});n[2]=t;var c=document.getElementsByTagName("head")[0],f=document.createElement("script");f.type="text/javascript",f.charset="utf-8",f.async=!0,f.timeout=12e4,a.nc&&f.setAttribute("nonce",a.nc),f.src=a.p+"static/js/"+e+"."+{0:"f8138779f472b8734556",1:"d9d65737691e89e80e67",2:"b00d3826b27a25730b77",3:"cb1beb9052885f8f5697",4:"7a7724475dae404da2ee",5:"0fe20001f4dfd6979b47",6:"60c62ede89bfe199fb3b",7:"1b71590a2a3999ebbc74",8:"964d58ebe302a7e1787c",9:"f9c5a89d289fcc720fdf",10:"8df83c76a31ac2deb389",11:"fee312134b00b39430e4",12:"79ef9188732365b2d4e2",13:"0ece939dc8a6a0e2c16d",14:"f1af0bb5d9e0353f58f9",15:"79fd72490282b9f2a35e",16:"fe0f31dd6fdfc1084f70",17:"97ebc305119c1291dabd",18:"a2ffbd298e78fb0ba6d3",19:"01152fe5c3dce2d3f467",20:"d3ada18be84514a2ec97",21:"e397d641cb978eef9f8b",22:"e2f4a4138c38aba8699e",23:"8ac42f5044de2f8ead1b"}[e]+".js";var o=setTimeout(d,12e4);function d(){f.onerror=f.onload=null,clearTimeout(o);var n=r[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),r[e]=void 0)}return f.onerror=f.onload=d,c.appendChild(f),t},a.m=e,a.c=t,a.d=function(e,n,t){a.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:t})},a.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return a.d(n,"a",n),n},a.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},a.p="https://static-cdn.changchangenglish.com/new-sing/",a.oe=function(e){throw console.error(e),e}}([]);
+!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(t,c,a){for(var o,d,i,b=0,u=[];b<t.length;b++)d=t[b],r[d]&&u.push(r[d][0]),r[d]=0;for(o in c)Object.prototype.hasOwnProperty.call(c,o)&&(e[o]=c[o]);for(n&&n(t,c,a);u.length;)u.shift()();if(a)for(b=0;b<a.length;b++)i=f(f.s=a[b]);return i};var t={},r={26:0};function f(n){if(t[n])return t[n].exports;var r=t[n]={i:n,l:!1,exports:{}};return e[n].call(r.exports,r,r.exports,f),r.l=!0,r.exports}f.e=function(e){var n=r[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var t=new Promise(function(t,f){n=r[e]=[t,f]});n[2]=t;var c=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,f.nc&&a.setAttribute("nonce",f.nc),a.src=f.p+"static/js/"+e+"."+{0:"f8138779f472b8734556",1:"d9d65737691e89e80e67",2:"b00d3826b27a25730b77",3:"cb1beb9052885f8f5697",4:"7a7724475dae404da2ee",5:"0fe20001f4dfd6979b47",6:"60c62ede89bfe199fb3b",7:"7b0551302ef3f91cb11a",8:"964d58ebe302a7e1787c",9:"f9c5a89d289fcc720fdf",10:"8df83c76a31ac2deb389",11:"fee312134b00b39430e4",12:"79ef9188732365b2d4e2",13:"0ece939dc8a6a0e2c16d",14:"f1af0bb5d9e0353f58f9",15:"79fd72490282b9f2a35e",16:"fe0f31dd6fdfc1084f70",17:"97ebc305119c1291dabd",18:"a2ffbd298e78fb0ba6d3",19:"01152fe5c3dce2d3f467",20:"d3ada18be84514a2ec97",21:"e397d641cb978eef9f8b",22:"e2f4a4138c38aba8699e",23:"8ac42f5044de2f8ead1b"}[e]+".js";var o=setTimeout(d,12e4);function d(){a.onerror=a.onload=null,clearTimeout(o);var n=r[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),r[e]=void 0)}return a.onerror=a.onload=d,c.appendChild(a),t},f.m=e,f.c=t,f.d=function(e,n,t){f.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:t})},f.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return f.d(n,"a",n),n},f.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},f.p="https://static-cdn.changchangenglish.com/new-sing/",f.oe=function(e){throw console.error(e),e}}([]);
-//# sourceMappingURL=manifest.f22b658a7de650ff894d.js.map
+//# sourceMappingURL=manifest.ef93a729e267fd3edb83.js.map
\ No newline at end of file
--- a/dist/static/js/manifest.f22b658a7de650ff894d.js.map
+++ b/dist/static/js/manifest.f22b658a7de650ff894d.js.map
--- a/src/components/buy/buy.vue
+++ b/src/components/buy/buy.vue
@@ -271,7 +271,12 @@
            this.shopId = this.$route.query.shopId;
            this.group_order_id = this.$route.query.group_order_id;
            getCouponListApi(this.shopId).then(res=>{
-              if(res.length>0){
+              if(res.length > 0){
+                let x = {money:0};
+                for (let k = 0 ; k < res.length ; k++){
+                  x = res[k].money > x.money ? res[k] : x;
+                }
+                this.saleObj = x;
                this.canSale = true
              }
            });

--- a/src/router/index.js
+++ b/src/router/index.js
@@ -35,7 +35,8 @@ const router =new Router({
      name: 'index',
      component: e=>require(['@/components/index'],e),//
      meta:{
-        deep:0
+        deep:0,
+        title:'唱唱启蒙'
      }
    }, {
      path: '/exChange',