Skip to content

H
h5-base
Commit 86526515 authored by IvyXia123's avatar IvyXia123
Browse files
Options

Merge branch 'pre' 

# Conflicts:
#	dist/index.html
#	src/components/map/index.vue
parents 1490237a 839635af
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 4 deletions
dist/index.html
View file @ 86526515
<!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>*{ <!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; -webkit-overflow-scrolling:touch;
}</style><link href=https://static-cdn.changchangenglish.com/new-sing/static/css/app.f20bcea19eef146115b7823cc4384226.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.c1936f2271a0b8d48071.js></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/vendor.2a119e1fa4193f8d323b.js></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/app.23a418313f262df258e2.js></script></body></html> }</style><link href=https://static-cdn.changchangenglish.com/new-sing/static/css/app.2796d289b71a9572afa33d753bc49b08.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.443a2da2cc37fcbe87ab.js></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/vendor.2a119e1fa4193f8d323b.js></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/app.23a418313f262df258e2.js></script></body></html>
\ No newline at end of file \ No newline at end of file
dist/static/js/manifest.c1936f2271a0b8d48071.js → dist/static/js/manifest.443a2da2cc37fcbe87ab.js
View file @ 86526515
!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,n,d){for(var t,r,o,i=0,u=[];i<c.length;i++)r=c[i],f[r]&&u.push(f[r][0]),f[r]=0;for(t in n)Object.prototype.hasOwnProperty.call(n,t)&&(e[t]=n[t]);for(a&&a(c,n,d);u.length;)u.shift()();if(d)for(i=0;i<d.length;i++)o=b(b.s=d[i]);return o};var c={},f={67:0};function b(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,b),f.l=!0,f.exports}b.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,b){a=f[e]=[c,b]});a[2]=c;var n=document.getElementsByTagName("head")[0],d=document.createElement("script");d.type="text/javascript",d.charset="utf-8",d.async=!0,d.timeout=12e4,d.crossOrigin="anonymous",b.nc&&d.setAttribute("nonce",b.nc),d.src=b.p+"static/js/"+({0:"vendor-async"}[e]||e)+"."+{0:"2e60501645511012c980",1:"de0e4b73b51ed214b1bd",2:"1af94944bc1726efaf9b",3:"6bbeb30f16c632496200",4:"14e65ac9bd5412c6dc6f",5:"82c77aabe6f6d93e5571",6:"4eacb6ac9498f58046a5",7:"2c62b0c03f86e1a7b869",8:"72351ff946f8bcd88899",9:"6e6600bc81eb64e7b097",10:"d21a7369ec04c9d2e769",11:"a94a729daf12ac1a5888",12:"3443d994fae863e646e8",13:"8022a884f495b17471c8",14:"fe7e5fd85bb51a819bca",15:"f1a61fd2f78b9129b854",16:"76b36eaf84f8f2ee3700",17:"d412c9b495f1148c0a3c",18:"717ee98c6005740ceabe",19:"b2a9b2e54720487ddc2e",20:"2b239c7c61a1de889816",21:"a810b4a9ffb58a99c434",22:"27d399cfcbd640df9b75",23:"cc39db3627db91531b39",24:"556a0513183c89c995c0",25:"9ebf10a30de19409419f",26:"1f744303f79d0549c35b",27:"05805c74647bb6430ca6",28:"0e5ee9efb4f076a3f3f4",29:"3af479827506b51fe6a7",30:"4cde0a5eaf719a4ac587",31:"574d8f2161045ab36c65",32:"eebb73a886e1100c1aa1",33:"60c59e8df0c97ae4efb1",34:"3b2f20a7b9d28e76177d",35:"a16eba0c0b4954994d25",36:"0be069e4d37ac0e7f97c",37:"d7bf73d5f9bffb315baf",38:"da4b5c6da73963c92098",39:"886c3383b261524be947",40:"f1f7909447f251e37873",41:"3b59527515857f0c374e",42:"9a4ffcfce87c758f54ee",43:"a3af0082b0371a6f08eb",44:"cc50700046a867e6dda4",45:"aff8decbab2cd961b334",46:"f70ed8a66995e22a5fab",47:"221ef2a673e7544aa9ca",48:"a7eb5e7c5a1e23204cbb",49:"d22a71d3549e5c6a017d",50:"1f40fd51e9fcc6a2f49c",51:"0a2afa393542b975a716",52:"80b344889e2a9af8bb32",53:"a064f80477583dc0317a",54:"107f4e2e23dc7eb7f9e8",55:"eee5e26f247074851331",56:"725b5f0d9a7fbcdf2f35",57:"c9895d4f61a09c5a2000",58:"4375300294715fc5e15b",59:"81ed8f435a78b47c11a7",60:"35d956cdde842e754c25",61:"69cadb6491a683109ce8",62:"f8ed8742b78575b29897",63:"9c7e3fa9c6a4d02ffd66",64:"e01d8a7e823843503b7c"}[e]+".js";var t=setTimeout(r,12e4);function r(){d.onerror=d.onload=null,clearTimeout(t);var a=f[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return d.onerror=d.onload=r,n.appendChild(d),c},b.m=e,b.c=c,b.d=function(e,a,c){b.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},b.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return b.d(a,"a",a),a},b.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},b.p="https://static-cdn.changchangenglish.com/new-sing/",b.oe=function(e){throw e}}([]); !function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,n,d){for(var t,r,o,i=0,u=[];i<c.length;i++)r=c[i],f[r]&&u.push(f[r][0]),f[r]=0;for(t in n)Object.prototype.hasOwnProperty.call(n,t)&&(e[t]=n[t]);for(a&&a(c,n,d);u.length;)u.shift()();if(d)for(i=0;i<d.length;i++)o=b(b.s=d[i]);return o};var c={},f={67:0};function b(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,b),f.l=!0,f.exports}b.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,b){a=f[e]=[c,b]});a[2]=c;var n=document.getElementsByTagName("head")[0],d=document.createElement("script");d.type="text/javascript",d.charset="utf-8",d.async=!0,d.timeout=12e4,d.crossOrigin="anonymous",b.nc&&d.setAttribute("nonce",b.nc),d.src=b.p+"static/js/"+({0:"vendor-async"}[e]||e)+"."+{0:"2e60501645511012c980",1:"de0e4b73b51ed214b1bd",2:"1af94944bc1726efaf9b",3:"6bbeb30f16c632496200",4:"14e65ac9bd5412c6dc6f",5:"82c77aabe6f6d93e5571",6:"4eacb6ac9498f58046a5",7:"2c62b0c03f86e1a7b869",8:"72351ff946f8bcd88899",9:"6e6600bc81eb64e7b097",10:"5097ede1c389d044417d",11:"a94a729daf12ac1a5888",12:"3443d994fae863e646e8",13:"8022a884f495b17471c8",14:"fe7e5fd85bb51a819bca",15:"f1a61fd2f78b9129b854",16:"76b36eaf84f8f2ee3700",17:"d412c9b495f1148c0a3c",18:"717ee98c6005740ceabe",19:"b2a9b2e54720487ddc2e",20:"2b239c7c61a1de889816",21:"a810b4a9ffb58a99c434",22:"27d399cfcbd640df9b75",23:"cc39db3627db91531b39",24:"556a0513183c89c995c0",25:"9ebf10a30de19409419f",26:"1f744303f79d0549c35b",27:"05805c74647bb6430ca6",28:"0e5ee9efb4f076a3f3f4",29:"3af479827506b51fe6a7",30:"4cde0a5eaf719a4ac587",31:"574d8f2161045ab36c65",32:"eebb73a886e1100c1aa1",33:"60c59e8df0c97ae4efb1",34:"3b2f20a7b9d28e76177d",35:"a16eba0c0b4954994d25",36:"0be069e4d37ac0e7f97c",37:"d7bf73d5f9bffb315baf",38:"da4b5c6da73963c92098",39:"886c3383b261524be947",40:"f1f7909447f251e37873",41:"3b59527515857f0c374e",42:"9a4ffcfce87c758f54ee",43:"a3af0082b0371a6f08eb",44:"cc50700046a867e6dda4",45:"aff8decbab2cd961b334",46:"f70ed8a66995e22a5fab",47:"221ef2a673e7544aa9ca",48:"a7eb5e7c5a1e23204cbb",49:"d22a71d3549e5c6a017d",50:"1f40fd51e9fcc6a2f49c",51:"0a2afa393542b975a716",52:"80b344889e2a9af8bb32",53:"a064f80477583dc0317a",54:"107f4e2e23dc7eb7f9e8",55:"eee5e26f247074851331",56:"725b5f0d9a7fbcdf2f35",57:"c9895d4f61a09c5a2000",58:"4375300294715fc5e15b",59:"81ed8f435a78b47c11a7",60:"35d956cdde842e754c25",61:"69cadb6491a683109ce8",62:"f8ed8742b78575b29897",63:"9c7e3fa9c6a4d02ffd66",64:"e01d8a7e823843503b7c"}[e]+".js";var t=setTimeout(r,12e4);function r(){d.onerror=d.onload=null,clearTimeout(t);var a=f[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return d.onerror=d.onload=r,n.appendChild(d),c},b.m=e,b.c=c,b.d=function(e,a,c){b.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},b.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return b.d(a,"a",a),a},b.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},b.p="https://static-cdn.changchangenglish.com/new-sing/",b.oe=function(e){throw e}}([]);
\ No newline at end of file \ No newline at end of file
src/components/map/index.vue
View file @ 86526515
...@@ -6,7 +6,11 @@ ...@@ -6,7 +6,11 @@
@select="onSelect" @select="onSelect"
/> />
<div class="unit-block"> <div class="unit-block">
<<<<<<< HEAD
<div class="course_title" @click="actionsheetShow=true">{{secActions.name}} <i class="iconfont icon-below-s"></i> </div> <div class="course_title" @click="actionsheetShow=true">{{secActions.name}} <i class="iconfont icon-below-s"></i> </div>
=======
<div class="course_title" @click="actionsheetShow=true">{{secActions.name}} <i class="iconfont icon-below-s"></i></div>
>>>>>>> pre
<!--竖屏 主题栏--> <!--竖屏 主题栏-->
<swiper :options="swiperOption" class="banner" v-if="shopType==0&&unitList.length>0" ref="mySwiper"> <swiper :options="swiperOption" class="banner" v-if="shopType==0&&unitList.length>0" ref="mySwiper">
<swiper-slide v-for="(data,index) in unitList" :key="index"> <swiper-slide v-for="(data,index) in unitList" :key="index">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment