diff --git a/packagecard/cardDetail/cardDetail.js b/packagecard/cardDetail/cardDetail.js
index ca674b0..e35a02a 100644
--- a/packagecard/cardDetail/cardDetail.js
+++ b/packagecard/cardDetail/cardDetail.js
@@ -234,13 +234,14 @@ 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)
- }
- }
+ // 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'
}
+ console.log(area)
self.setData({
cardInfo: res.data,
areaList: area
diff --git a/packagecard/cardDetail/cardDetail.wxml b/packagecard/cardDetail/cardDetail.wxml
index d83e298..1dc2393 100644
--- a/packagecard/cardDetail/cardDetail.wxml
+++ b/packagecard/cardDetail/cardDetail.wxml
@@ -10,7 +10,7 @@
+ wx:if="{{item.templateAreaServerLink == '1' && item.templateAreaType != '1'}}">
{{item.templateAreaFontValue}}
@@ -25,7 +25,7 @@
+ wx:if="{{item.templateAreaType == '1' && item.templateAreaServerLink == '1'}}">
{{item.templateAreaFontValue}}
@@ -39,9 +39,9 @@
wx:if="{{item.templateAreaServerLink != '2' && item.templateAreaType != '1'}}">
{{item.templateAreaName}}:
-
+ wx:if="{{item.templateAreaServerLink != '1'}}">
diff --git a/pages/mine/myCardDetail/myCardDetail.js b/pages/mine/myCardDetail/myCardDetail.js
index b553426..42334b9 100644
--- a/pages/mine/myCardDetail/myCardDetail.js
+++ b/pages/mine/myCardDetail/myCardDetail.js
@@ -212,11 +212,11 @@ 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)
- }
- }
+ // 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'
diff --git a/project.config.json b/project.config.json
index 2bc8b29..e99edf6 100644
--- a/project.config.json
+++ b/project.config.json
@@ -1,73 +1,73 @@
{
- "description": "项目配置文件",
- "packOptions": {
- "ignore": []
+ "description": "项目配置文件",
+ "packOptions": {
+ "ignore": []
+ },
+ "setting": {
+ "urlCheck": true,
+ "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": true,
- "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,
- "userConfirmedBundleSwitch": false,
- "packNpmManually": false,
- "packNpmRelationList": [],
- "minifyWXSS": true,
- "showES6CompileOption": false
+ "enableEngineNative": false,
+ "useIsolateContext": true,
+ "userConfirmedBundleSwitch": false,
+ "packNpmManually": false,
+ "packNpmRelationList": [],
+ "minifyWXSS": true,
+ "showES6CompileOption": false
+ },
+ "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