Commit 5f9d4fc7 authored by chenyishuai@singsingenglish.com's avatar chenyishuai@singsingenglish.com

75

parents 854ddc25 77b97ff4
...@@ -45,14 +45,14 @@ const webpackConfig = merge(baseWebpackConfig, { ...@@ -45,14 +45,14 @@ const webpackConfig = merge(baseWebpackConfig, {
collapse_vars: true, collapse_vars: true,
reduce_vars: true, reduce_vars: true,
}, },
output: { // output: {
// 最紧凑的输出 // // 最紧凑的输出
// beautify: process.env.NODE_ENV === 'production'?false:true, // // beautify: process.env.NODE_ENV === 'production'?false:true,
beautify:false, // beautify:false,
// 删除所有的注释 // // 删除所有的注释
// comments: process.env.NODE_ENV === 'production'?false:true, // // comments: process.env.NODE_ENV === 'production'?false:true,
comments: false, // comments: false,
} // }
}, },
sourceMap: config.build.productionSourceMap, sourceMap: config.build.productionSourceMap,
parallel: true parallel: true
......
...@@ -342,9 +342,7 @@ export default { ...@@ -342,9 +342,7 @@ export default {
// localStorageFn.set('liuyi',true) // localStorageFn.set('liuyi',true)
// debugger // debugger
// cookie.delete('liuyi') // cookie.delete('liuyi')
if(typeof ss !== 'undefined'){ console.log(html2canvas)
console.log(ss,'345')
}
this.unlook = localStorage.getItem('unlook'); this.unlook = localStorage.getItem('unlook');
if(document.body.clientWidth>700){ if(document.body.clientWidth>700){
that.orientationchange=true that.orientationchange=true
......
...@@ -45,12 +45,12 @@ ...@@ -45,12 +45,12 @@
<div class="head next"> <div class="head next">
<i style="background:#FFD454"></i> <i style="background:#FFD454"></i>
下期收货地址 下期收货地址
<span class="fl-r" @click="goEdit" v-if="noDeliverDetail.flag == 1"> <span class="fl-r" @click="goEdit">
<span class="iconfont icon-icon_edit"></span> 修改 <span class="iconfont icon-icon_edit"></span> 修改
</span> </span>
<span class="fl-r Invalid" v-if="noDeliverDetail.flag == 0"> <!-- <span class="fl-r Invalid" v-if="noDeliverDetail.flag == 0">
<span class="iconfont icon-icon_edit"></span> 修改 <span class="iconfont icon-icon_edit"></span> 修改
</span> </span>-->
<!-- <span class="fl-r" @click="goEdit"> <!-- <span class="fl-r" @click="goEdit">
<span class="iconfont icon-icon_edit"></span> 修改 <span class="iconfont icon-icon_edit"></span> 修改
</span>--> </span>-->
......
...@@ -3,12 +3,12 @@ ...@@ -3,12 +3,12 @@
</template> </template>
<script> <script>
import {share} from "../util/imgUrl"; // import {share} from "../util/imgUrl";
export default { export default {
name: "share", name: "share",
data(){ data(){
return{ return{
imgUrl:share, // imgUrl:share,
num:0, num:0,
pNum:0, pNum:0,
watchLog:null, watchLog:null,
......
...@@ -34,14 +34,6 @@ import shop_teacher from '../assets/shop/teacher.png' ...@@ -34,14 +34,6 @@ import shop_teacher from '../assets/shop/teacher.png'
import shop_gou from '../assets/shop/gou.png' import shop_gou from '../assets/shop/gou.png'
import shop_jiantou from '../assets/shop/jiantou.png' import shop_jiantou from '../assets/shop/jiantou.png'
import share_background from '../assets/share/background.png'
import share_tips from '../assets/share/tips.png'
import share_1 from '../assets/share/1.png'
import share_2 from '../assets/share/2.png'
import share_3 from '../assets/share/3.png'
import share_4 from '../assets/share/4.png'
import share_5 from '../assets/share/5.png'
import preview01 from '../assets/index/1.png' import preview01 from '../assets/index/1.png'
import preview02 from '../assets/index/2.png' import preview02 from '../assets/index/2.png'
import preview03 from '../assets/index/3.png' import preview03 from '../assets/index/3.png'
...@@ -102,17 +94,16 @@ export const order = { ...@@ -102,17 +94,16 @@ export const order = {
orderStatus4:orderStatus4 orderStatus4:orderStatus4
}; };
// 分享学习记录 // 分享学习记录
export const share = { // export const share = {
background:share_background, // background:share_background,
tips:share_tips, // list:[
list:[ // share_1,
share_1, // share_2,
share_2, // share_3,
share_3, // share_4,
share_4, // share_5
share_5 // ]
] // };
};
// 分享宝宝档案 // 分享宝宝档案
export const bbdaIcon = { export const bbdaIcon = {
girl2:girl2, girl2:girl2,
......
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