Commit c2254069 by 赵雅纹

bug修复

parent 60a3f423
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
> >
<image <image
class="pic-img" class="pic-img"
style="width: {{100}}%;" style="width: {{100}}%;display:block;"
src="{{utils.formateUrl(item.imageUrl,baseImgUrl)}}" src="{{utils.formateUrl(item.imageUrl,baseImgUrl)}}"
data-appid="{{item.link.appid}}" data-appid="{{item.link.appid}}"
data-path="{{item.link.url}}" data-path="{{item.link.url}}"
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
<image <image
wx:if="{{currentHasUserInfo}}" wx:if="{{currentHasUserInfo}}"
class="pic-img" class="pic-img"
style="width: {{100}}%;" style="width: {{100}}%;display:block;"
src="{{utils.formateUrl(item.imageUrl,baseImgUrl)}}" src="{{utils.formateUrl(item.imageUrl,baseImgUrl)}}"
data-appid="{{item.link.appid}}" data-appid="{{item.link.appid}}"
data-path="{{item.link.url}}" data-path="{{item.link.url}}"
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
<view wx:else> <view wx:else>
<image <image
class="pic-img" class="pic-img"
style="width: {{100}}%;" style="width: {{100}}%;display:block;"
src="{{utils.formateUrl(item.imageUrl,baseImgUrl)}}" src="{{utils.formateUrl(item.imageUrl,baseImgUrl)}}"
data-appid="{{item.link.appid}}" data-appid="{{item.link.appid}}"
data-path="{{item.link.url}}" data-path="{{item.link.url}}"
......
...@@ -12,7 +12,10 @@ ...@@ -12,7 +12,10 @@
bottom: 88rpx; bottom: 88rpx;
padding: 36rpx 0 36rpx 30rpx; padding: 36rpx 0 36rpx 30rpx;
/* background-color: rgba(192, 154, 116, 0.2); */ /* background-color: rgba(192, 154, 116, 0.2); */
background-color: rgb(230,215,199); /* background-color: rgb(230,215,199); */
/* background: #ffffff; */
/* border-top: solid 1rpx #eee; */
background: transparent;
} }
.scroll-view_H { .scroll-view_H {
...@@ -93,6 +96,7 @@ ...@@ -93,6 +96,7 @@
.pay-wrap{ .pay-wrap{
width: 750rpx; width: 750rpx;
background-color: #ffffff; background-color: #ffffff;
/* background: transparent; */
height: 88rpx; height: 88rpx;
position: fixed; position: fixed;
bottom: 0; bottom: 0;
......
...@@ -206,6 +206,7 @@ Component({ ...@@ -206,6 +206,7 @@ Component({
ctx.drawImage(codeSrc, 190, 281, 61.5, 61.5) ctx.drawImage(codeSrc, 190, 281, 61.5, 61.5)
ctx.setFontSize(10); ctx.setFontSize(10);
ctx.setFillStyle('#000'); ctx.setFillStyle('#000');
// ctx.fillText("微信扫码或长按保存图片", left + 165, imgheght + 110); // ctx.fillText("微信扫码或长按保存图片", left + 165, imgheght + 110);
} }
}).exec() }).exec()
......
...@@ -56,12 +56,17 @@ wxService.page({ ...@@ -56,12 +56,17 @@ wxService.page({
this.generatePointObject(tentacleInfo); this.generatePointObject(tentacleInfo);
} }
// 邀请奖励弹框 // 邀请奖励弹框
if (options && options.type == 10){ if (options && options['scene']) {
let idParam = decodeURIComponent(options['scene']).split('&')[0]
let shareId = idParam && idParam.split('=')[1] || 0
if (shareId == 10){
this.setData({ this.setData({
shareBenefitModalShow: true shareBenefitModalShow: true
}) })
this.getShareImg() this.getShareImg()
} }
}
}, },
// 获取邀请奖励图片 // 获取邀请奖励图片
......
...@@ -2,6 +2,9 @@ ...@@ -2,6 +2,9 @@
<view class='page-want-buy'> <view class='page-want-buy'>
<buy-image-swiper bind:updatePage="updatePage" image-data="{{contentInfo.shareShowPictureRESDTOList}}" /> <buy-image-swiper bind:updatePage="updatePage" image-data="{{contentInfo.shareShowPictureRESDTOList}}" />
<!-- 标题 -->
<view class="detail-title">{{contentInfo.headline}}</view>
<view class="buy-desc"> <view class="buy-desc">
<view> <x-html html="{{contentInfo.article}}" /></view> <view> <x-html html="{{contentInfo.article}}" /></view>
</view> </view>
......
...@@ -150,7 +150,12 @@ swiper { ...@@ -150,7 +150,12 @@ swiper {
background: #ffffff; background: #ffffff;
border-top: solid 1px #eee; border-top: solid 1px #eee;
} }
.detail-title {
font-weight: 700;
font-size: 32rpx;
margin-bottom: 30rpx;
padding: 0 30rpx;
}
......
...@@ -50,6 +50,7 @@ wxService.page({ ...@@ -50,6 +50,7 @@ wxService.page({
// 获取编辑详情 // 获取编辑详情
getInitInfo(){ getInitInfo(){
const { memberId } = wx.getStorageSync('_baseUserInfo')
let params = { let params = {
id: this.data.params.id, id: this.data.params.id,
userId: memberId userId: memberId
......
...@@ -17,6 +17,7 @@ page{ ...@@ -17,6 +17,7 @@ page{
.detail-title { .detail-title {
font-weight: 700; font-weight: 700;
font-size: 32rpx; font-size: 32rpx;
margin-bottom: 30rpx;
} }
.detail-desc { .detail-desc {
min-height: 486rpx; min-height: 486rpx;
......
...@@ -15,6 +15,7 @@ wxService.page({ ...@@ -15,6 +15,7 @@ wxService.page({
swiperCurrent: 0, swiperCurrent: 0,
currentTab: 0, currentTab: 0,
indicatorDots: false, indicatorDots: false,
saveBtnDisabled : true,//保存海报默认disabled
autoplay: false, autoplay: false,
interval: 2000, interval: 2000,
duration: 1000, duration: 1000,
...@@ -39,7 +40,8 @@ wxService.page({ ...@@ -39,7 +40,8 @@ wxService.page({
onLoad: function(){ onLoad: function(){
this.getMiniCode() this.getMiniCode()
this.getShareImg() this.getShareImg()
wx.hideShareMenu() wx.hideShareMenu();
}, },
//轮播图的切换事件 //轮播图的切换事件
...@@ -66,6 +68,7 @@ wxService.page({ ...@@ -66,6 +68,7 @@ wxService.page({
//生成海报 //生成海报
generatePoster(){ generatePoster(){
const { member } = wx.getStorageSync('_baseUserInfo')
let _this = this; let _this = this;
wx.getSystemInfo({ wx.getSystemInfo({
success: function (system) { success: function (system) {
...@@ -100,7 +103,7 @@ wxService.page({ ...@@ -100,7 +103,7 @@ wxService.page({
if (res) { if (res) {
const { result, data } = res.data const { result, data } = res.data
if (result == 0) { if (result == 0) {
wx.hideLoading()
let initiatorPage = JSON.parse(data.initiatorPage) let initiatorPage = JSON.parse(data.initiatorPage)
this.setData({ this.setData({
posterImgData: initiatorPage posterImgData: initiatorPage
...@@ -127,7 +130,7 @@ wxService.page({ ...@@ -127,7 +130,7 @@ wxService.page({
codeImg: app.globalData.imageUrl + data codeImg: app.globalData.imageUrl + data
// codeImg: "https://hwimagecdn.ihotwind.cn/usr/201908/miniQrCode-f00c5051fef7479395efb193431762c4.jpg" // codeImg: "https://hwimagecdn.ihotwind.cn/usr/201908/miniQrCode-f00c5051fef7479395efb193431762c4.jpg"
},()=>{ },()=>{
const { member } = wx.getStorageSync('_baseUserInfo')
wx.getSystemInfo({ wx.getSystemInfo({
success: function (system) { success: function (system) {
wx.getImageInfo({ wx.getImageInfo({
...@@ -196,6 +199,10 @@ wxService.page({ ...@@ -196,6 +199,10 @@ wxService.page({
}) })
}, },
onImgOK(e) { onImgOK(e) {
this.setData({
saveBtnDisabled : false,
});
wx.hideLoading()
this.imagePath = e.detail.path; this.imagePath = e.detail.path;
} }
}); });
\ No newline at end of file
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
</block> </block>
</swiper> </swiper>
<view class="save-btn" bindtap="savePoster"> <view class="save-btn" bindtap="savePoster">
<button class="btn btn-primary ">保存海报</button> <button class="btn btn-primary save-poster" disabled="{{saveBtnDisabled}}">保存海报</button>
<view class="save-tips">适用于朋友圈分享</view> <view class="save-tips">适用于朋友圈分享</view>
</view> </view>
......
...@@ -66,6 +66,12 @@ swiper-item{ ...@@ -66,6 +66,12 @@ swiper-item{
margin-top: 12rpx; margin-top: 12rpx;
} }
.save-btn button[disabled]{
opacity: 0.5 !important;
background-color: #cb3c3c !important;
color: #ffffff !important;
border: 1px solid #cb3c3c !important;
}
.tab-sort { .tab-sort {
width: 100%; width: 100%;
......
...@@ -231,12 +231,14 @@ wxService.page({ ...@@ -231,12 +231,14 @@ wxService.page({
if (plus.length != 0) { if (plus.length != 0) {
this.setData({ this.setData({
paddingBottom: '320rpx' paddingBottom: '96rpx',
outoHeigth : '0',
}) })
} }
else if (tabbar.length != 0) { else if (tabbar.length != 0) {
this.setData({ this.setData({
paddingBottom: '140rpx' paddingBottom: '140rpx',
outoHeigth: '0',
}) })
} }
else { else {
......
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