diff --git a/components/diy_goodsGroup/diy_goodsGroup.js b/components/diy_goodsGroup/diy_goodsGroup.js index e2c5d55..3e652a1 100644 --- a/components/diy_goodsGroup/diy_goodsGroup.js +++ b/components/diy_goodsGroup/diy_goodsGroup.js @@ -573,7 +573,7 @@ Component({ } }) - console.error(th.data.requestData); + // console.error(th.data.requestData); //----------------------- if (th.data.object.column_action_name) { if (th.data.object.style == 6 || th.data.object.style == 5) { @@ -643,7 +643,7 @@ Component({ }, // 加购方法 hide hide_add_purchase(){ - console.error('隐藏加购方法。。。。'); + // console.error('隐藏加购方法。。。。'); setTimeout(()=>{ this.setData({ add_purchase:false diff --git a/components/diy_top_nav/diy_top_nav.js b/components/diy_top_nav/diy_top_nav.js index 7001086..74401c3 100644 --- a/components/diy_top_nav/diy_top_nav.js +++ b/components/diy_top_nav/diy_top_nav.js @@ -20,11 +20,11 @@ Component({ }, nav_frontColor:{ type:String, - value:'#ffffff', + value:'#000', }, nav_backgroundColor:{ type:String, - value:'#ff7295', + value:'#ffffff', }, is_share:{ type:Boolean, diff --git a/packageB/pages/zuhegou/index/index.js b/packageB/pages/zuhegou/index/index.js index cbeacec..78ada49 100644 --- a/packageB/pages/zuhegou/index/index.js +++ b/packageB/pages/zuhegou/index/index.js @@ -20,6 +20,7 @@ Page({ showNum: false, haveAdded: false, imgDraw: {}, + new_imgDraw:{}, id: 0, //获得活动id page: 1, //第一页 no_more: 0, //没有更多 @@ -38,6 +39,7 @@ Page({ sec_pick_index: 0, //门店选择的下标,地区选择之后的内页 userbuynum: false,//是否有超出购买次数,还是否可以购买。false 为可购买,true为不可购买 sales_map: {}, //线下销售的map + fxShow:false,//分享是否显示 }, /** @@ -614,6 +616,8 @@ Page({ th.get_head_temp(function () { var txt = th.data.act.zhprice + "元" + th.data.act.zhbuyqty + "件"; var imgDraw = th.data.imgDraw; + // console.error('头像地址1'); + // console.error(th.data.share_head); imgDraw.views[0].url = th.data.share_head; imgDraw.views[1].text = userInfo.nickname; imgDraw.views[3].text = txt; @@ -634,7 +638,14 @@ Page({ imgDraw.views[2].url = path22; imgDraw.views[5].url = vpath; th.setData({ - imgDraw: imgDraw + // ['imgDraw.views[0].url']:imgDraw.views[0].url, + // ['imgDraw.views[1].text']:imgDraw.views[1].text, + // ['imgDraw.views[2].text']:imgDraw.views[2].text, + // ['imgDraw.views[3].text']:imgDraw.views[3].text, + // ['imgDraw.views[4].text']:imgDraw.views[4].url, + imgDraw: imgDraw, + new_imgDraw:imgDraw, + fxShow:true }) } }) @@ -649,6 +660,8 @@ Page({ th.get_head_temp(function () { var imgDraw = th.data.imgDraw; var txt = th.data.act.zhprice + "元" + th.data.act.zhbuyqty + "件"; + // console.error('头像地址2'); + // console.error(th.data.share_head); imgDraw.views[0].url = th.data.share_head; imgDraw.views[1].text = userInfo.nickname; imgDraw.views[2].text = txt; @@ -670,7 +683,14 @@ Page({ var vpath = res.path; imgDraw.views[4].url = vpath; th.setData({ - imgDraw: imgDraw + // ['imgDraw.views[0].url']:imgDraw.views[0].url, + // ['imgDraw.views[1].text']:imgDraw.views[1].text, + // ['imgDraw.views[2].text']:imgDraw.views[2].text, + // ['imgDraw.views[3].text']:imgDraw.views[3].text, + // ['imgDraw.views[4].url']:imgDraw.views[4].url, + imgDraw: imgDraw, + new_imgDraw:imgDraw, + fxShow:true }) } }) @@ -1442,7 +1462,9 @@ Page({ }, onImgOK(e) { - console.log(e.detail.path); + // console.error('绘制返回------------'); + // console.error(e); + // console.log(e.detail.path); this.setData({ myimg: e.detail.path, }); @@ -1541,7 +1563,8 @@ Page({ //---获取分享图片的本地地址,头像和商品图片---- var path2 = getApp().globalData.userInfo.head_pic; if (path2 == "") { - ee.data.share_head = "../../../../images/share/hui_hear_pic.png"; + // ee.data.share_head = "../../../../images/share/hui_hear_pic.png"; + ee.data.share_head = "https://mshopimg.yolipai.net//miniapp/images/no-head.jpg"; tt(); } else { path2 = path2.replace("http://thirdwx.qlogo.cn", "https://wx.qlogo.cn"); @@ -1555,7 +1578,8 @@ Page({ tt(); }, fail: function () { - ee.data.share_head = "../../../../images/share/hui_hear_pic.png"; //分享的图片不能用网络的 + ee.data.share_head = "https://mshopimg.yolipai.net//miniapp/images/no-head.jpg"; + // ee.data.share_head = "../../../../images/share/hui_hear_pic.png"; //分享的图片不能用网络的 tt(); } }); diff --git a/packageB/pages/zuhegou/index/index.wxml b/packageB/pages/zuhegou/index/index.wxml index c8fa98e..d2f3aa1 100644 --- a/packageB/pages/zuhegou/index/index.wxml +++ b/packageB/pages/zuhegou/index/index.wxml @@ -98,7 +98,7 @@ - + 分享 @@ -155,7 +155,9 @@ - + + + {{error}} diff --git a/pages/index/index/index.js b/pages/index/index/index.js index 7fa8032..43adb06 100644 --- a/pages/index/index/index.js +++ b/pages/index/index/index.js @@ -91,8 +91,8 @@ Page({ is_full_screen_navigation: false, //是否满屏 is_full_screen_navigation_index: -1, //广告轮播满屏下标 nav_title: '首页', - nav_frontColor: "#ffffff", - nav_backgroundColor: "#ff7295", + nav_frontColor: "#000", + nav_backgroundColor: "#fff", nav_type: 1, //导航类型 searchbox_transparent: 1, //搜索框背景是否透明 is_show_top:0, //是否置顶显示 @@ -331,8 +331,8 @@ Page({ backgroundColor: '#ff7295', // 必写项 }) this.setData({ - nav_frontColor: '#ffffff', // 必写项 - nav_backgroundColor: '#ff7295', // 必写项 + nav_frontColor: '#000', // 必写项 + nav_backgroundColor: '#fff', // 必写项 }) } @@ -1023,7 +1023,7 @@ Page({ this.setData({ nav_type: 1, searchbox_transparent: 1, - nav_frontColor: '#fff' + nav_frontColor: '#000' }) // this.data.nav_type = 1 } diff --git a/pages/index/index/index.wxml b/pages/index/index/index.wxml index 00ee5a5..e4eca6e 100644 --- a/pages/index/index/index.wxml +++ b/pages/index/index/index.wxml @@ -23,7 +23,7 @@ - + diff --git a/pages/template/index.js b/pages/template/index.js index 3d2296e..1c34fb9 100644 --- a/pages/template/index.js +++ b/pages/template/index.js @@ -17,8 +17,8 @@ Page({ is_full_screen_navigation: false, //是否满屏 is_full_screen_navigation_index: -1, //广告轮播满屏下标 nav_title: '首页', - nav_frontColor: "#ffffff", - nav_backgroundColor: "#ff7295", + nav_frontColor: "#000", + nav_backgroundColor: "#fff", nav_type: 1, //导航类型 searchbox_transparent: 1, //搜索框背景是否透明 @@ -243,7 +243,7 @@ Page({ this.setData({ nav_type: 1, searchbox_transparent: 1, - nav_frontColor: '#fff' + nav_frontColor: '#000' }) // this.data.nav_type = 1 }