diff --git a/assets/image/hbbj21524.jpg b/assets/image/hbbj21524.jpg new file mode 100644 index 0000000..8bdab39 Binary files /dev/null and b/assets/image/hbbj21524.jpg differ diff --git a/assets/image/ic_create_poster.png b/assets/image/ic_create_poster.png new file mode 100644 index 0000000..498ec29 Binary files /dev/null and b/assets/image/ic_create_poster.png differ diff --git a/assets/image/ic_save_poster.png b/assets/image/ic_save_poster.png new file mode 100644 index 0000000..db9d610 Binary files /dev/null and b/assets/image/ic_save_poster.png differ diff --git a/assets/image/im_poster_header_no_title.png b/assets/image/im_poster_header_no_title.png new file mode 100644 index 0000000..4a053de Binary files /dev/null and b/assets/image/im_poster_header_no_title.png differ diff --git a/assets/image/img_poster_bg.png b/assets/image/img_poster_bg.png new file mode 100644 index 0000000..1174a7c Binary files /dev/null and b/assets/image/img_poster_bg.png differ diff --git a/assets/image/img_poster_footer.png b/assets/image/img_poster_footer.png new file mode 100644 index 0000000..7d55bf7 Binary files /dev/null and b/assets/image/img_poster_footer.png differ diff --git a/assets/image/img_poster_header_has_title.png b/assets/image/img_poster_header_has_title.png new file mode 100644 index 0000000..7059c1a Binary files /dev/null and b/assets/image/img_poster_header_has_title.png differ diff --git a/assets/image/pyqicon.png b/assets/image/pyqicon.png new file mode 100644 index 0000000..cb8746b Binary files /dev/null and b/assets/image/pyqicon.png differ diff --git a/assets/image/ssxiyzc.png b/assets/image/ssxiyzc.png new file mode 100644 index 0000000..da4634a Binary files /dev/null and b/assets/image/ssxiyzc.png differ diff --git a/assets/image/weixinicon.png b/assets/image/weixinicon.png new file mode 100644 index 0000000..31d324d Binary files /dev/null and b/assets/image/weixinicon.png differ diff --git a/pages/article/detail/index.js b/pages/article/detail/index.js index dd08453..cf6256d 100644 --- a/pages/article/detail/index.js +++ b/pages/article/detail/index.js @@ -306,7 +306,7 @@ Page({ success: function (res) { var tempFilePath = res.tempFilePath; that.setData({ - imagePath: tempFilePath, + imagePathHb: tempFilePath, canvasHidden:true, maskHidden: true, }); @@ -316,8 +316,10 @@ Page({ } }); }, 200); + }, baocun(){ + console.log(this.data) this.setData({ maskHidden:false }) diff --git a/pages/article/detail/index.wxml b/pages/article/detail/index.wxml index 5dac308..a0cc49c 100644 --- a/pages/article/detail/index.wxml +++ b/pages/article/detail/index.wxml @@ -106,15 +106,66 @@ - + - - - + \ No newline at end of file diff --git a/pages/article/detail/index.wxss b/pages/article/detail/index.wxss index 44d78f9..1e81e2a 100644 --- a/pages/article/detail/index.wxss +++ b/pages/article/detail/index.wxss @@ -35,8 +35,8 @@ .share-btn::after{ border: none; } .shengcheng{ - width: 87%; - height: 80%; + width: 670rpx; + height: 1190rpx; position: fixed; top: 100rpx; left: 50%; @@ -44,18 +44,86 @@ z-index: 10; margin-top: 2%; } +.shengcheng2{ + width: 670rpx; + height: 80%; + position: fixed; + left: 50%; + margin-left: -44%; + z-index: 10; + top: 142rpx; + margin-top: 2%; +} +.topImg{ + width: 670rpx; + height: 174rpx; +} +.contentText{ + width: 670rpx; + height: 885rpx; +} +.footzt{ + width: 670rpx; + height:280rpx; + position: absolute; + bottom: 0rpx; +} .baocun{ display: block; - width: 87%; - height: 80rpx; + width: 670rpx; + height: 140rpx; padding: 0; line-height: 80rpx; text-align: center; position: fixed; left: 6%; - background: red; + background: white; color: white; font-size: 32rpx; top:82%; z-index: 11; } +.footImg1{ + width: 670rpx; + height:240rpx; +} +.footImg2{ + width: 670rpx; + height:140rpx; + background-color: white; + display: flex; + justify-content: flex-start; +} +.footIcon{ + width: 120rpx; + height:140rpx; + +} +.footSmallIconArea{ + width: 100%; + height: 64rpx; + display: flex; + justify-content: center; + align-items: center; + margin-top: 10rpx; + +} +.footSmallIcon{ + width: 64rpx; + height: 64rpx; + +} +.footSmalltextArea{ + width: 100%; + height: 33rpx; + display: flex; + justify-content: center; + align-items: center; +} +.footSmalltext{ + width:120rpx; + height: 33rpx; + display: flex; + justify-content: center; + align-items: center; +} \ No newline at end of file diff --git a/pages/home/tab1/index.js b/pages/home/tab1/index.js index e50111d..559c403 100644 --- a/pages/home/tab1/index.js +++ b/pages/home/tab1/index.js @@ -16,7 +16,8 @@ Page({ */ data: { bidType: 0, - identityTag: '' + identityTag: '', + isFristLogin:false, }, @@ -24,6 +25,9 @@ Page({ * 生命周期函数--监听页面加载 */ onLoad: function (options) { + this.setData({ + isFristLogin:storage.get('isfirstlogin') + }) this.getUerInfoFct() }, toNextTab: function () { @@ -134,7 +138,7 @@ Page({ }, getUerInfoFct: function () { getBaseInfo().then(res => { - if(res.data.hasShowedLoginTag==false){ + if(res.data.hasShowedLoginTag==false||this.data.isFristLogin){ this.showDialog() } if (res.data.identityTag == '打包站') { diff --git a/pages/index/index.js b/pages/index/index.js index 45e99b2..c8090b6 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -250,6 +250,7 @@ Page({ this.updateUserInfoFct({ hasShowedLoginTag: true }) + storage.put('isfirstlogin',true) wx.navigateTo({ url: '/pages/home/tab1/index' })