From bf37c3e60e4d306ab5117b389d941c37c7525698 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=81=A5?= Date: Tue, 7 Sep 2021 17:46:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=B7=E6=8A=A5=E5=88=86=E4=BA=AB=E6=96=B9?= =?UTF-8?q?=E5=BC=8F=E6=9B=BF=E6=8D=A2=E3=80=81=E5=8F=91=E5=B8=83=E5=8E=86?= =?UTF-8?q?=E5=8F=B2=E6=94=B9=E4=B8=BA=E6=88=91=E7=9A=84=E6=B5=B7=E6=8A=A5?= =?UTF-8?q?,=E4=BC=9A=E5=91=98=E5=BC=80=E9=80=9A=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E4=BC=98=E5=8C=96=E5=B1=95=E7=A4=BA=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E3=80=81=E4=BC=9A=E5=91=98=E5=BC=80=E9=80=9A=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E7=89=88=E6=9C=AC=E5=AF=B9=E6=AF=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- images/ic_version_contrast.png | Bin 0 -> 3686 bytes packagecard/marketing/marketingposter.js | 6 +-- packagecard/paypage/paypage.js | 25 ++++++++++- packagecard/paypage/paypage.wxml | 51 ++++++++++++++++++----- packagecard/paypage/paypage.wxss | 15 ++++++- pages/index/index.js | 37 +++++++++++++--- pages/index/index.wxml | 2 +- project.config.json | 6 +-- utils/api.js | 13 +++--- 9 files changed, 122 insertions(+), 33 deletions(-) create mode 100644 images/ic_version_contrast.png diff --git a/images/ic_version_contrast.png b/images/ic_version_contrast.png new file mode 100644 index 0000000000000000000000000000000000000000..8bd77a07276a935e0062fde5d54fd3114039280c GIT binary patch literal 3686 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 literal 0 HcmV?d00001 diff --git a/packagecard/marketing/marketingposter.js b/packagecard/marketing/marketingposter.js index 426a625..20f0ef4 100644 --- a/packagecard/marketing/marketingposter.js +++ b/packagecard/marketing/marketingposter.js @@ -15,7 +15,7 @@ Page({ tabList: [{ name: '营销模板', }, { - name: '发布历史' + name: '我的海报' }], isRefreshing: false, //是否刷新中 isLoadMore: false, //是否在加载中 @@ -176,12 +176,12 @@ Page({ }) var type = res.target.dataset.sharetype var img = _self.data.imgUrl + _self.data.posterHistoryList[_self.data.curItemIndex].cardTemplateUsePhotoUrl - + var id = _self.data.posterHistoryList[_self.data.curItemIndex].cardTemplateUseId if (type && type == '2') { //转发个人动态 } else { - var param = '/pages/index/index?posterId=' + img; + var param = '/pages/index/index?cardTemplateUseId=' + id; return { title: '活动', path: param, diff --git a/packagecard/paypage/paypage.js b/packagecard/paypage/paypage.js index 19c31bf..dbbedf5 100644 --- a/packagecard/paypage/paypage.js +++ b/packagecard/paypage/paypage.js @@ -36,6 +36,8 @@ Page({ selTypeIndex: 0, //当前选中的类型列表 selTypeId: '', //当前选中的类型id selType: '', //选中的类型type + isShowContrast: false, //是否显示版本对比 + contrastId: '', //版本对比图片ID }, /** @@ -122,7 +124,8 @@ Page({ this.setData({ isShowUseDeal: false, //使用协议 isShowServiceTreaty: false, //会员服务协议 - isShowIntimacyTreaty: false //隐私政策 + isShowIntimacyTreaty: false, //隐私政策 + isShowContrast: false //版本对比 }) }, //提交支付 @@ -294,5 +297,25 @@ Page({ .catch(err => { }) + }, + //显示版本对比 + showContrast() { + var _self = this + wx.showLoading({ + title: '加载中...', + }) + app.http.get(app.urls.getVersionContrast, { + header: { + token: app.globalData.token + } + }) + .then(res => { + wx.hideLoading({}) + _self.setData({ + contrastId: app.urls.baseImgUrl + res.data.data, + isShowContrast: true, + }) + }) + .catch(err => {}) } }) \ No newline at end of file diff --git a/packagecard/paypage/paypage.wxml b/packagecard/paypage/paypage.wxml index 0d1c484..eaea0a3 100644 --- a/packagecard/paypage/paypage.wxml +++ b/packagecard/paypage/paypage.wxml @@ -22,6 +22,7 @@ 邀请码 (选填) + @@ -40,8 +41,7 @@ - - + @@ -53,21 +53,50 @@ + - - - + + + + + + - - - + + + + + + - - - + + + + + + + + + + + + + + \ No newline at end of file diff --git a/packagecard/paypage/paypage.wxss b/packagecard/paypage/paypage.wxss index 02c0580..a9d7f41 100644 --- a/packagecard/paypage/paypage.wxss +++ b/packagecard/paypage/paypage.wxss @@ -107,14 +107,19 @@ font-weight: normal; } +.code-box image { + width: 96rpx; + height: 96rpx; +} + .code-input { - text-align: right; + text-align: left; align-self: center; padding: 15rpx; margin-left: 15rpx; height: 70rpx; border-radius: 10rpx; - width: 70%; + width: 60%; } .treaty-box { @@ -125,6 +130,9 @@ margin-bottom: 40rpx; font-size: 28rpx; margin-top: 15rpx; + background-color: #ffffff; + height: 50%; + width: 90%; } .treaty-content-box { @@ -133,6 +141,9 @@ justify-content: center; align-items: center; padding: 15rpx; + height: 90%; + background-color: #ffffff; + border-radius: 5rpx; } .treaty-content-box .title { diff --git a/pages/index/index.js b/pages/index/index.js index 2a3791f..2f775e6 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -42,7 +42,8 @@ Page({ isBindPhone: false, isNeedRefresh: true, isShowComment: false, //是否显示评论弹框 - posterId: '', //分享过来的海报图片 + posterId: '', //分享过来的海报ID + posterImg: '', //分享过来的海报图片 isShowPoster: false, defaultBtnIcon: '/images/ic_share_img.png' }, @@ -55,15 +56,14 @@ Page({ isMine: 2 }) } - self.buildId() - self.doLogin() - if (options.posterId) { + if (options.cardTemplateUseId) { //展示图片 self.setData({ - posterId: options.posterId, - isShowPoster: true + posterId: options.cardTemplateUseId }) } + self.buildId() + self.doLogin() }, // 登录 doLogin() { @@ -100,6 +100,9 @@ Page({ } self.getOtherCard(2) self.getBtnIcon() //获取首页按钮图片 + if (self.data.posterId != '') { + self.getPosterImg() + } }) .catch(err => { wx.hideLoading({}) @@ -107,6 +110,28 @@ Page({ } }) }, + //获取分享的海报 + getPosterImg() { + var _self = this + app.http.get(app.urls.getMyCardDetail.format({ + cardTemplateUseId: _self.data.posterId + }), { + header: { + token: app.globalData.token + } + }) + .then(res => { + var img = _self.data.imgUrl + res.data.cardTemplateUsePhotoUrl + console.log(img) + _self.setData({ + posterImg: img, + isShowPoster: true + }) + }) + .catch(err => { + + }) + }, //首页按钮图片 getBtnIcon() { var _self = this diff --git a/pages/index/index.wxml b/pages/index/index.wxml index 361557f..0351f2a 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -442,7 +442,7 @@ custom-style="background-color:transparent;height:100%;width:100%;" round> - + diff --git a/project.config.json b/project.config.json index 5cd973a..a69dadf 100644 --- a/project.config.json +++ b/project.config.json @@ -21,9 +21,9 @@ "checkSiteMap": true, "uploadWithSourceMap": true, "compileHotReLoad": false, - "useMultiFrameRuntime": false, - "useApiHook": false, - "useApiHostProcess": false, + "useMultiFrameRuntime": true, + "useApiHook": true, + "useApiHostProcess": true, "babelSetting": { "ignore": [], "disablePlugins": [], diff --git a/utils/api.js b/utils/api.js index 2352406..08e8dbf 100644 --- a/utils/api.js +++ b/utils/api.js @@ -1,15 +1,15 @@ var apis = { - // url: 'http://192.168.0.115:8091/systemcard/', - // userCenter: 'http://192.168.0.115:8091/systemcard/', - // baseImgUrl: 'http://192.168.0.115:8091/systemcard/route/file/download/true/', + url: 'http://192.168.0.115:8091/systemcard/', + userCenter: 'http://192.168.0.115:8091/systemcard/', + baseImgUrl: 'http://192.168.0.115:8091/systemcard/route/file/download/true/', // url: 'https://cbc.wgink.ink/systemcard/', // userCenter: 'https://cbc.wgink.ink/systemcard/', // baseImgUrl: 'https://cbc.wgink.ink/systemcard/route/file/download/true/', - url: 'https://www.tenlion.com.cn/systemcard/', - userCenter: 'https://www.tenlion.com.cn/systemcard/', - baseImgUrl: 'https://www.tenlion.com.cn/systemcard/route/file/download/true/', + // url: 'https://www.tenlion.com.cn/systemcard/', + // userCenter: 'https://www.tenlion.com.cn/systemcard/', + // baseImgUrl: 'https://www.tenlion.com.cn/systemcard/route/file/download/true/', // url: 'http://192.168.0.111:8091/systemcard/', // userCenter: 'http://192.168.0.111:8091/systemcard/', @@ -46,6 +46,7 @@ var apis = { getCardPayState: `app/cardcharge/savecharge/{mode}`, //获取开通名片的订单信息 doSaveOrderPayState: `app/cardcharge/checkorder/{cardChargeOrderNumber}`, //保存订单支付状态 getPayHistoryList: `app/cardcharge/listpage`, //获取 + getVersionContrast: `app/projectconfigrelease/file/versionContrastPhoto`, //版本对比图 /*用户 */ /**店铺相关 **/ doSaveShop: `app/shop/save`, //保存商店