From ebc272a517908dedcc56684eca57bb9dcd276751 Mon Sep 17 00:00:00 2001 From: dong_bo0602 <358256383@qq.com> Date: Tue, 20 Jul 2021 16:39:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/cardDetail/cardDetail.js | 6 + pages/cardDetail/cardDetail.wxml | 10 +- pages/cardDetail/cardDetail.wxss | 3 +- pages/index/index.js | 6 + pages/mine/myCardDetail/myCardDetail.js | 6 + pages/mine/myCardDetail/myCardDetail.wxml | 10 +- pages/mine/myCardDetail/myCardDetail.wxss | 2 +- project.config.json | 134 +++++++++++----------- 8 files changed, 98 insertions(+), 79 deletions(-) diff --git a/pages/cardDetail/cardDetail.js b/pages/cardDetail/cardDetail.js index a3ab1c4..b34b1f2 100644 --- a/pages/cardDetail/cardDetail.js +++ b/pages/cardDetail/cardDetail.js @@ -216,6 +216,12 @@ 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(area[i].templateAreaFontSize * 750 / wx.getSystemInfoSync().windowWidth) + 'rpx' } self.setData({ cardInfo: res.data, diff --git a/pages/cardDetail/cardDetail.wxml b/pages/cardDetail/cardDetail.wxml index 029f4cb..9d20afe 100644 --- a/pages/cardDetail/cardDetail.wxml +++ b/pages/cardDetail/cardDetail.wxml @@ -39,18 +39,18 @@ wx:if="{{item.templateAreaServerLink != '2' && item.templateAreaType != '1'}}"> {{item.templateAreaName}}: - - + wx:if="{{item.templateAreaServerLink != '1'}}" maxlength="{{item.templateAreaFontLength}}"> + {{item.templateAreaName}}: - + diff --git a/pages/cardDetail/cardDetail.wxss b/pages/cardDetail/cardDetail.wxss index ba8374b..701a555 100644 --- a/pages/cardDetail/cardDetail.wxss +++ b/pages/cardDetail/cardDetail.wxss @@ -20,6 +20,7 @@ page{ .area-box{ white-space: nowrap; background: none !important; + z-index: 111; } .area-box image{ width: 100%; @@ -63,7 +64,7 @@ page{ } .item-input image{ max-width: 70%; - max-height: 120rpx; + /* max-height: 120rpx; */ } .item-code-input image{ max-width: 35%; diff --git a/pages/index/index.js b/pages/index/index.js index c1a2595..b70b42e 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -455,6 +455,12 @@ Page({ }).then(res => { var area = res.data.areaList for (let i = 0; i < area.length; i++) { + 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(area[i].templateAreaFontSize * 750 / wx.getSystemInfoSync().windowWidth) + 'rpx' if (area[i].templateAreaFontCenter == '1') { area[i].templateAreaFontCenter = 'left' } else if (area[i].templateAreaFontCenter == '2') { diff --git a/pages/mine/myCardDetail/myCardDetail.js b/pages/mine/myCardDetail/myCardDetail.js index 2f25df6..b553426 100644 --- a/pages/mine/myCardDetail/myCardDetail.js +++ b/pages/mine/myCardDetail/myCardDetail.js @@ -212,6 +212,12 @@ Page({ }).then(res => { var area = res.data.areaList for (let i = 0; i < area.length; i ++) { + 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(area[i].templateAreaFontSize * 750 / wx.getSystemInfoSync().windowWidth) + 'rpx' if (area[i].templateAreaFontCenter == '1') { area[i].templateAreaFontCenter = 'left' } else if (area[i].templateAreaFontCenter == '2') { diff --git a/pages/mine/myCardDetail/myCardDetail.wxml b/pages/mine/myCardDetail/myCardDetail.wxml index ce96c6a..a1e76f8 100644 --- a/pages/mine/myCardDetail/myCardDetail.wxml +++ b/pages/mine/myCardDetail/myCardDetail.wxml @@ -38,18 +38,18 @@ wx:if="{{item.templateAreaServerLink != '2' && item.templateAreaType != '1'}}"> {{item.templateAreaName}}: - - + wx:if="{{item.templateAreaServerLink != '1'}}" maxlength="{{item.templateAreaFontLength}}"> + {{item.templateAreaName}}: - + diff --git a/pages/mine/myCardDetail/myCardDetail.wxss b/pages/mine/myCardDetail/myCardDetail.wxss index 2521068..f5565d3 100644 --- a/pages/mine/myCardDetail/myCardDetail.wxss +++ b/pages/mine/myCardDetail/myCardDetail.wxss @@ -75,7 +75,7 @@ page { .item-input image { max-width: 70%; - max-height: 120rpx; + /* max-height: 120rpx; */ } .item-code-input image { diff --git a/project.config.json b/project.config.json index acac863..292a001 100644 --- a/project.config.json +++ b/project.config.json @@ -1,74 +1,74 @@ { - "description": "项目配置文件", - "packOptions": { - "ignore": [] + "description": "项目配置文件", + "packOptions": { + "ignore": [] + }, + "setting": { + "urlCheck": false, + "es6": true, + "enhance": false, + "postcss": true, + "preloadBackgroundData": false, + "minified": true, + "newFeature": false, + "coverView": true, + "nodeModules": false, + "autoAudits": false, + "showShadowRootInWxmlPanel": true, + "scopeDataCheck": false, + "uglifyFileName": false, + "checkInvalidKey": true, + "checkSiteMap": true, + "uploadWithSourceMap": true, + "compileHotReLoad": false, + "useMultiFrameRuntime": true, + "useApiHook": true, + "useApiHostProcess": false, + "babelSetting": { + "ignore": [], + "disablePlugins": [], + "outputPath": "" }, - "setting": { - "urlCheck": false, - "es6": true, - "enhance": false, - "postcss": true, - "preloadBackgroundData": false, - "minified": true, - "newFeature": false, - "coverView": true, - "nodeModules": false, - "autoAudits": false, - "showShadowRootInWxmlPanel": true, - "scopeDataCheck": false, - "uglifyFileName": false, - "checkInvalidKey": true, - "checkSiteMap": true, - "uploadWithSourceMap": true, - "compileHotReLoad": false, - "useMultiFrameRuntime": true, - "useApiHook": true, - "useApiHostProcess": false, - "babelSetting": { - "ignore": [], - "disablePlugins": [], - "outputPath": "" - }, - "enableEngineNative": false, - "useIsolateContext": true, - "useCompilerModule": true, - "userConfirmedUseCompilerModuleSwitch": false, - "userConfirmedBundleSwitch": false, - "packNpmManually": false, - "packNpmRelationList": [], - "minifyWXSS": true + "enableEngineNative": false, + "useIsolateContext": true, + "useCompilerModule": true, + "userConfirmedUseCompilerModuleSwitch": false, + "userConfirmedBundleSwitch": false, + "packNpmManually": false, + "packNpmRelationList": [], + "minifyWXSS": true + }, + "compileType": "miniprogram", + "libVersion": "2.17.0", + "appid": "wxe17874894f7ff27b", + "projectname": "card", + "debugOptions": { + "hidedInDevtools": [] + }, + "scripts": {}, + "staticServerOptions": { + "baseURL": "", + "servePath": "" + }, + "isGameTourist": false, + "condition": { + "search": { + "list": [] }, - "compileType": "miniprogram", - "libVersion": "2.17.0", - "appid": "wxe17874894f7ff27b", - "projectname": "card", - "debugOptions": { - "hidedInDevtools": [] + "conversation": { + "list": [] }, - "scripts": {}, - "staticServerOptions": { - "baseURL": "", - "servePath": "" + "game": { + "list": [] }, - "isGameTourist": false, - "condition": { - "search": { - "list": [] - }, - "conversation": { - "list": [] - }, - "game": { - "list": [] - }, - "plugin": { - "list": [] - }, - "gamePlugin": { - "list": [] - }, - "miniprogram": { - "list": [] - } + "plugin": { + "list": [] + }, + "gamePlugin": { + "list": [] + }, + "miniprogram": { + "list": [] } + } } \ No newline at end of file