diff --git a/packagecard/cardDetail/cardDetail.js b/packagecard/cardDetail/cardDetail.js index e7c7d6c..1c7103b 100644 --- a/packagecard/cardDetail/cardDetail.js +++ b/packagecard/cardDetail/cardDetail.js @@ -242,12 +242,6 @@ Page({ } else { area[i]['templateAreaFontStyle'] = 'italic' } - // if (area[i].templateAreaServerLink == '1') { - // if (area[i].templateAreaFontValue.length > area[i].templateAreaFontLength) { - // area[i].templateAreaFontValue = area[i].templateAreaFontValue.substring(area[i].templateAreaFontLength, -1) - // } - // } - // area[i].templateAreaFontSize = Math.floor(() + 'rpx' area[i].templateAreaFontSize = area[i].templateAreaFontSize / scale + 'px' area[i].templateAreaHeight = area[i].templateAreaHeight / scale area[i].templateAreaWidth = area[i].templateAreaWidth / scale diff --git a/packagecard/cardDetail/cardDetail.wxml b/packagecard/cardDetail/cardDetail.wxml index 7998060..545113f 100644 --- a/packagecard/cardDetail/cardDetail.wxml +++ b/packagecard/cardDetail/cardDetail.wxml @@ -11,7 +11,7 @@ {{item.templateAreaFontValue}} diff --git a/packagecard/cardDetail/cardDetail.wxss b/packagecard/cardDetail/cardDetail.wxss index 63d1a3c..c737781 100644 --- a/packagecard/cardDetail/cardDetail.wxss +++ b/packagecard/cardDetail/cardDetail.wxss @@ -16,7 +16,6 @@ } .area-box { - white-space: nowrap; background: none !important; z-index: 111; } @@ -212,7 +211,7 @@ /* 换行 */ .wrap-line { - white-space: pre-line; + overflow-wrap: break-word; } /* 居中 */ @@ -220,4 +219,5 @@ overflow: hidden; text-overflow: ellipsis; white-space: nowrap; + overflow-wrap: break-word; } \ No newline at end of file diff --git a/packagecard/marketing/marketingposter.js b/packagecard/marketing/marketingposter.js index 20f0ef4..52757f2 100644 --- a/packagecard/marketing/marketingposter.js +++ b/packagecard/marketing/marketingposter.js @@ -177,11 +177,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 + var userId = _self.data.posterHistoryList[_self.data.curItemIndex].creator if (type && type == '2') { //转发个人动态 } else { - var param = '/pages/index/index?cardTemplateUseId=' + id; + var param = '/pages/index/index?cardTemplateUseId=' + id + '&userId=' + userId; return { title: '活动', path: param, @@ -471,11 +472,4 @@ Page({ isShowSel: false }) } - //分享到朋友圈 - // onShareTimeline(options) { - // var params = {} - // params['title'] = '分享朋友圈' - // params['imageUrl'] = 'https://img2.baidu.com/it/u=2645096297,1507428582&fm=26&fmt=auto&gp=0.jpg' - // return params - // } }) \ No newline at end of file diff --git a/packagecard/marketing/marketingpublish.wxss b/packagecard/marketing/marketingpublish.wxss index db93d9f..98418e2 100644 --- a/packagecard/marketing/marketingpublish.wxss +++ b/packagecard/marketing/marketingpublish.wxss @@ -16,7 +16,6 @@ } .area-box { - white-space: nowrap; background: none !important; z-index: 111; } @@ -211,7 +210,7 @@ /* 换行 */ .wrap-line { - white-space: pre-line; + overflow-wrap: break-word; } /* 居中 */ @@ -219,4 +218,5 @@ overflow: hidden; text-overflow: ellipsis; white-space: nowrap; + overflow-wrap: break-word; } \ No newline at end of file diff --git a/pages/index/index.js b/pages/index/index.js index 2f775e6..0780f20 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -33,6 +33,7 @@ Page({ otherCardList: [], //卡包名片 isPlayAudio: false, //标识当前是否在播放音乐 audioId: '', + uId: '', //海报过来的UserId count: 3, isMine: 1, //1 自己 2 其他 isDefault: true, @@ -59,7 +60,8 @@ Page({ if (options.cardTemplateUseId) { //展示图片 self.setData({ - posterId: options.cardTemplateUseId + posterId: options.cardTemplateUseId, + uId: options.userId }) } self.buildId() @@ -652,11 +654,12 @@ Page({ cardInfo: {}, areaList: [] }) - app.http.get(app.urls.getDefaultCard, { + app.http.get(app.urls.getDefaultCard.format({ + userId: self.data.uId + }), { header: { token: app.globalData.token - }, - data: {} + } }).then(res => { var area = res.data.areaList area.forEach(it => { @@ -1139,7 +1142,8 @@ Page({ cardTemplateUseId: '', isShowCard: false, isMine: 1, - isDefault: false + isDefault: false, + uId: '' }) this.getDefault() } else if (type == 2) { diff --git a/pages/mine/index/index.js b/pages/mine/index/index.js index ec9cf8f..05ea209 100644 --- a/pages/mine/index/index.js +++ b/pages/mine/index/index.js @@ -88,14 +88,11 @@ Page({ }) }, formatDate(date) { - var d = new Date(date), - month = '' + (d.getMonth() + 1), - day = '' + d.getDate(), - year = d.getFullYear(); - - if (month.length < 2) month = '0' + month; - if (day.length < 2) day = '0' + day; - return [year, month, day].join('-'); + if (date.length > 0) { + return date.slice(0, 11) + } else { + return '' + } }, //获取菜单状态 getMenuState() { diff --git a/pages/mine/myCardDetail/myCardDetail.wxml b/pages/mine/myCardDetail/myCardDetail.wxml index ff4b050..098e1fd 100644 --- a/pages/mine/myCardDetail/myCardDetail.wxml +++ b/pages/mine/myCardDetail/myCardDetail.wxml @@ -8,7 +8,7 @@ - {{item.templateAreaFontValue}} diff --git a/pages/mine/myCardDetail/myCardDetail.wxss b/pages/mine/myCardDetail/myCardDetail.wxss index 2cba944..5ff6ab2 100644 --- a/pages/mine/myCardDetail/myCardDetail.wxss +++ b/pages/mine/myCardDetail/myCardDetail.wxss @@ -16,7 +16,6 @@ } .area-box { - white-space: nowrap; background: none !important; z-index: 111; } @@ -217,4 +216,17 @@ .share .btn:last-child { margin-right: 0; background: #ff2525; +} + +/* 换行 */ +.wrap-line { + overflow-wrap: break-word; +} + +/* 居中 */ +.wrap-center { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + overflow-wrap: break-word; } \ No newline at end of file diff --git a/pages/mine/vip/vipcenter.js b/pages/mine/vip/vipcenter.js index 0aff4ad..f038b87 100644 --- a/pages/mine/vip/vipcenter.js +++ b/pages/mine/vip/vipcenter.js @@ -62,14 +62,11 @@ Page({ }) }, formatDate(date) { - var d = new Date(date), - month = '' + (d.getMonth() + 1), - day = '' + d.getDate(), - year = d.getFullYear(); - - if (month.length < 2) month = '0' + month; - if (day.length < 2) day = '0' + day; - return [year, month, day].join('-'); + if (date.length > 0) { + return date.slice(0, 11) + } else { + return '' + } }, //获取支付历史列表 getPayHistoryList() { diff --git a/pages/mine/vip/vipcenter.wxml b/pages/mine/vip/vipcenter.wxml index 6a790aa..0cb07e2 100644 --- a/pages/mine/vip/vipcenter.wxml +++ b/pages/mine/vip/vipcenter.wxml @@ -2,26 +2,26 @@ 会员中心 - - - - - - - - {{name}} - - - - 会员将于{{payState.cardChargeEnd}}到期 - - 会员已于{{payState.cardChargeEnd}}到期 + + + + + + + {{name}} + + + 会员将于{{payState.cardChargeEnd}}到期 + + 会员已于{{payState.cardChargeEnd}}到期 - - 立即续费 + + 立即续费 + + @@ -46,7 +46,7 @@ 加载中... - + diff --git a/utils/api.js b/utils/api.js index 08e8dbf..a4f9e4e 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/', @@ -137,7 +137,7 @@ var apis = { updateMyCard: `app/cardtemplateuse/update/{cardTemplateUseId}`, //更新名片内容 setDefaultCard: `app/cardtemplateuse/default/{cardTemplateUseId}`, //制定名片 deleteCard: `app/cardtemplateuse/remove/{ids}`, //删除名片 - getDefaultCard: `app/cardtemplateuse/getdefault`, //首页默认名片 + getDefaultCard: `app/cardtemplateuse/getdefault/{userId}`, //首页默认名片 shareRecord: `app/cardtemplatedispatch/save`, //转发记录 checkRecord: `app/cardtemplatescans/save`, //保存查看记录 shareCard: `app/cardtemplateuse/getdispatch/{cardTemplateUseId}`, //查看分享名片