Commit 63080ffb authored by 谭文海's avatar 谭文海

Merge branch 'pre' into 'master'

Pre

See merge request !2
parents 3d607c83 dc5ad450
...@@ -11,4 +11,4 @@ ...@@ -11,4 +11,4 @@
position: fixed; position: fixed;
background: #f4f4f4; background: #f4f4f4;
} }
/* html{font-size: 1px;} */</style><link href=static/css/app.f983055a19b69eb54137ee36031e8a72.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=static/js/manifest.66cab183f428a7d4f621.js></script><script type=text/javascript src=static/js/vendor.e4eb38428ad1549116b0.js></script><script type=text/javascript src=static/js/app.d5f1443656fcfb8521b5.js></script></body></html> /* html{font-size: 1px;} */</style><link href=static/css/app.f983055a19b69eb54137ee36031e8a72.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=static/js/manifest.fc0e3802501c3da5f46b.js></script><script type=text/javascript src=static/js/vendor.0c8bc24167292824b3ef.js></script><script type=text/javascript src=static/js/app.21f4c31bc552fd95d4b4.js></script></body></html>
\ No newline at end of file \ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
webpackJsonp([53],{"6IIy":function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var i,s=t("bOdI"),a=t.n(s),r=(t("y+mr"),t("3JdW")),l=t.n(r),o=(t("f1Vh"),t("ZQVe")),c=t.n(o),p=(t("q/am"),t("4VPn")),d=t.n(p),u=t("CCn6"),h=t("/Bxx"),f=t.n(h),g={name:"shareConfig",components:(i={},a()(i,d.a.name,d.a),a()(i,c.a.name,c.a),a()(i,l.a.name,l.a),i),data:function(){return{desc:"赠你1元领取价值398元课程特权,和我一起快乐启蒙英语吧",shareUrl:f.a,title:"我家宝宝正在【唱唱启蒙英语】挑战童谣,已坚持1天",link:window.location.href.split("#")[0],shareVisible:!1}},methods:{enableShare:function(n){Object(u.Y)({api_list:"onMenuShareAppMessage,onMenuShareTimeline",url:window.location.href.split("#")[0]}).then(function(e){wx.config({debug:!1,appId:e.appId,timestamp:parseInt(e.timestamp),nonceStr:e.nonceStr,signature:e.signature,jsApiList:e.jsApiList}),wx.ready(function(){wx.onMenuShareTimeline({title:n.product_title,desc:n.desc,link:n.shareUrl,imgUrl:n.shareIcon||"https://cdn.singsingenglish.com/singsing/recommend/logo-refer.png",success:function(){},cancel:function(){}}),wx.onMenuShareAppMessage({title:n.product_title,desc:n.desc,link:n.shareUrl,imgUrl:n.shareIcon||"https://cdn.singsingenglish.com/singsing/recommend/logo-refer.png",success:function(){},cancel:function(){}})})})},sharePage:function(){this.enableShare({product_title:this.title,desc:this.desc,shareIcon:"https://cdn.singsingenglish.com/logo/logo.jpg",shareUrl:this.link}),this.shareVisible=!0}}},m=function(){var n=this,e=n.$createElement,t=n._self._c||e;return t("div",[t("mt-popup",{staticClass:"refer-share",staticStyle:{background:"transparent"},attrs:{position:"top"},model:{value:n.shareVisible,callback:function(e){n.shareVisible=e},expression:"shareVisible"}},[t("img",{staticStyle:{width:"80vw"},attrs:{src:n.shareUrl}})]),n._v(" "),t("div",{staticStyle:{padding:"10px"}},[t("mt-field",{attrs:{label:"分享标题",type:"textarea",placeholder:"请输入分享标题",rows:"4"},model:{value:n.title,callback:function(e){n.title=e},expression:"title"}}),n._v(" "),t("mt-field",{attrs:{label:"分享链接",type:"textarea",placeholder:"请输入分享链接",rows:"4"},model:{value:n.link,callback:function(e){n.link=e},expression:"link"}}),n._v(" "),t("mt-field",{attrs:{label:"分享描述",type:"textarea",placeholder:"请输入分享描述",rows:"4"},model:{value:n.desc,callback:function(e){n.desc=e},expression:"desc"}}),n._v(" "),t("div",{staticStyle:{width:"calc(100vw - 20px)",margin:"0"}},[t("mt-button",{attrs:{type:"primary",size:"large"},on:{click:function(e){n.sharePage()}}},[n._v("分享")])],1)],1)],1)};m._withStripped=!0;var v={render:m,staticRenderFns:[]},b=v;var x=!1;var w=t("VU/8")(g,b,!1,function(n){x||t("oiC4")},"data-v-fe968cbe",null);w.options.__file="src/components/shareConfig.vue";e.default=w.exports},oiC4:function(n,e,t){var i=t("xc6X");"string"==typeof i&&(i=[[n.i,i,""]]),i.locals&&(n.exports=i.locals);t("rjj0")("64f549e4",i,!1,{})},xc6X:function(n,e,t){(n.exports=t("FZ+f")(!0)).push([n.i,"\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n","",{version:3,sources:[],names:[],mappings:"",file:"shareConfig.vue",sourceRoot:""}])}}); webpackJsonp([54],{"6IIy":function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var i,s=t("bOdI"),a=t.n(s),r=(t("y+mr"),t("3JdW")),l=t.n(r),o=(t("f1Vh"),t("ZQVe")),c=t.n(o),p=(t("q/am"),t("4VPn")),d=t.n(p),u=t("CCn6"),h=t("/Bxx"),f=t.n(h),g={name:"shareConfig",components:(i={},a()(i,d.a.name,d.a),a()(i,c.a.name,c.a),a()(i,l.a.name,l.a),i),data:function(){return{desc:"赠你1元领取价值398元课程特权,和我一起快乐启蒙英语吧",shareUrl:f.a,title:"我家宝宝正在【唱唱启蒙英语】挑战童谣,已坚持1天",link:window.location.href.split("#")[0],shareVisible:!1}},methods:{enableShare:function(n){Object(u.Y)({api_list:"onMenuShareAppMessage,onMenuShareTimeline",url:window.location.href.split("#")[0]}).then(function(e){wx.config({debug:!1,appId:e.appId,timestamp:parseInt(e.timestamp),nonceStr:e.nonceStr,signature:e.signature,jsApiList:e.jsApiList}),wx.ready(function(){wx.onMenuShareTimeline({title:n.product_title,desc:n.desc,link:n.shareUrl,imgUrl:n.shareIcon||"https://cdn.singsingenglish.com/singsing/recommend/logo-refer.png",success:function(){},cancel:function(){}}),wx.onMenuShareAppMessage({title:n.product_title,desc:n.desc,link:n.shareUrl,imgUrl:n.shareIcon||"https://cdn.singsingenglish.com/singsing/recommend/logo-refer.png",success:function(){},cancel:function(){}})})})},sharePage:function(){this.enableShare({product_title:this.title,desc:this.desc,shareIcon:"https://cdn.singsingenglish.com/logo/logo.jpg",shareUrl:this.link}),this.shareVisible=!0}}},m=function(){var n=this,e=n.$createElement,t=n._self._c||e;return t("div",[t("mt-popup",{staticClass:"refer-share",staticStyle:{background:"transparent"},attrs:{position:"top"},model:{value:n.shareVisible,callback:function(e){n.shareVisible=e},expression:"shareVisible"}},[t("img",{staticStyle:{width:"80vw"},attrs:{src:n.shareUrl}})]),n._v(" "),t("div",{staticStyle:{padding:"10px"}},[t("mt-field",{attrs:{label:"分享标题",type:"textarea",placeholder:"请输入分享标题",rows:"4"},model:{value:n.title,callback:function(e){n.title=e},expression:"title"}}),n._v(" "),t("mt-field",{attrs:{label:"分享链接",type:"textarea",placeholder:"请输入分享链接",rows:"4"},model:{value:n.link,callback:function(e){n.link=e},expression:"link"}}),n._v(" "),t("mt-field",{attrs:{label:"分享描述",type:"textarea",placeholder:"请输入分享描述",rows:"4"},model:{value:n.desc,callback:function(e){n.desc=e},expression:"desc"}}),n._v(" "),t("div",{staticStyle:{width:"calc(100vw - 20px)",margin:"0"}},[t("mt-button",{attrs:{type:"primary",size:"large"},on:{click:function(e){n.sharePage()}}},[n._v("分享")])],1)],1)],1)};m._withStripped=!0;var v={render:m,staticRenderFns:[]},b=v;var x=!1;var w=t("VU/8")(g,b,!1,function(n){x||t("oiC4")},"data-v-fe968cbe",null);w.options.__file="src/components/shareConfig.vue";e.default=w.exports},oiC4:function(n,e,t){var i=t("xc6X");"string"==typeof i&&(i=[[n.i,i,""]]),i.locals&&(n.exports=i.locals);t("rjj0")("64f549e4",i,!1,{})},xc6X:function(n,e,t){(n.exports=t("FZ+f")(!0)).push([n.i,"\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n","",{version:3,sources:[],names:[],mappings:"",file:"shareConfig.vue",sourceRoot:""}])}});
\ No newline at end of file \ No newline at end of file
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
src/assets/yezi.png

1.06 KB | W: | H:

src/assets/yezi.png

1.17 KB | W: | H:

src/assets/yezi.png
src/assets/yezi.png
src/assets/yezi.png
src/assets/yezi.png
  • 2-up
  • Swipe
  • Onion skin
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<span class="num">{{ itemChild.parent_child }}</span> <span class="num">{{ itemChild.parent_child }}</span>
</div> </div>
<div class="rowthRecord-content-sub" @click="xiajiantou(itemChild.id)"> <div class="rowthRecord-content-sub" @click="xiajiantou(itemChild.id)">
<span class="fa-text" :data-id="itemChild.id" :data-int="1" v-html="itemChild.growth_record"></span> <span class="fa-text" :data-id="itemChild.id" :data-int="1" v-html="itemChild.growth_record.replace(/\n/g, '<br/>')"></span>
<span class=""><img class="xiajiantou" :src="scoringCategoryImage.xiajiantou" alt=""></span> <!-- @click="xiajiantou(itemChild.id)" --> <span class=""><img class="xiajiantou" :src="scoringCategoryImage.xiajiantou" alt=""></span> <!-- @click="xiajiantou(itemChild.id)" -->
</div> </div>
<div class="timer">{{ itemChild.created_at.split(' ')[1] }}</div> <div class="timer">{{ itemChild.created_at.split(' ')[1] }}</div>
...@@ -60,6 +60,7 @@ ...@@ -60,6 +60,7 @@
methods: { methods: {
async userGrowthRecordList() { async userGrowthRecordList() {
const userGrowthRecordData = await getUserGrowthListApi(); const userGrowthRecordData = await getUserGrowthListApi();
if(userGrowthRecordData.length === 0) return
userGrowthRecordData.map(item => { userGrowthRecordData.map(item => {
item.monthArr = []; item.monthArr = [];
for(let k in item.month) { for(let k in item.month) {
......
This diff is collapsed.
This diff is collapsed.
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<img slot="icon" :src="image.order" /> <img slot="icon" :src="image.order" />
</van-cell> </van-cell>
<van-cell title="成长记录" ref="star" to="/growthRecord" @click="toStar" is-link> <van-cell title="成长记录" ref="star" to="/growthRecord" @click="toStar" is-link>
<img slot="icon" :src="image.yizi" style="width: 5.5vw; height: 5.5vw;" /> <img slot="icon" :src="image.yizi" />
</van-cell> </van-cell>
<van-cell v-if="acitivityType==1" title="我的星星" ref="star" to="/starRank" @click="toStar" is-link> <van-cell v-if="acitivityType==1" title="我的星星" ref="star" to="/starRank" @click="toStar" is-link>
<img slot="icon" :src="image.mine_icon_star" /> <img slot="icon" :src="image.mine_icon_star" />
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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