Merge branch 'master' of https://e.coding.net/tsteam/business-card/card-mini

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,

pages/cardDetail/cardDetail.wxml

@@ -39,18 +39,18 @@
       wx:if="{{item.templateAreaServerLink != '2' && item.templateAreaType != '1'}}">
       <view class="item-title">{{item.templateAreaName}}:</view>
       <view class="item-input">
-        <input type="text" placeholder="请输入内容" bindinput="editInfo" data-num="{{index}}" bindblur="getFileId"
+        <input type="text" placeholder="请输入内容,最多{{item.templateAreaFontLength}}个字" bindinput="editInfo" data-num="{{index}}" bindblur="getFileId"
           value="{{item.templateAreaFontValue}}" focus="{{item.focus}}"
-          wx:if="{{item.templateAreaServerLink != '1'}}"></input>
+          wx:if="{{item.templateAreaServerLink != '1'}}" maxlength="{{item.templateAreaFontLength}}"></input>
-        <input type="text" placeholder="请输入内容" bindinput="editInfo" data-num="{{index}}"
+        <input type="text" placeholder="请输入内容,最多{{item.templateAreaFontLength}}个字" bindinput="editInfo" data-num="{{index}}"
-          value="{{item.templateAreaFontValue}}" focus="{{item.focus}}" wx:else></input>
+          value="{{item.templateAreaFontValue}}" focus="{{item.focus}}" maxlength="{{item.templateAreaFontLength}}" wx:else></input>
       </view>
     </view>
     <view class="row" wx:for="{{areaList}}" wx:key="index"
       wx:if="{{item.templateAreaServerLink == '2'  && item.templateAreaType != '1'}}">
       <view class="item-title">{{item.templateAreaName}}:</view>
       <view class="item-input" bindtap="choosePhoto" data-cur="{{index}}">
-        <image src="{{cardUrl}}{{item.templateAreaFile}}"></image>
+        <image src="{{cardUrl}}{{item.templateAreaFile}}" mode="widthFix"></image>
         <text class="cuIcon-cameraadd"></text>
       </view>
     </view>

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%;

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') {

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') {

pages/mine/myCardDetail/myCardDetail.wxml

@@ -38,18 +38,18 @@
       wx:if="{{item.templateAreaServerLink != '2' && item.templateAreaType != '1'}}">
       <view class="item-title">{{item.templateAreaName}}:</view>
       <view class="item-input">
-        <input type="text" placeholder="请输入内容" bindinput="editInfo" data-num="{{index}}" bindblur="getFileId"
+        <input type="text" placeholder="请输入内容,最多{{item.templateAreaFontLength}}个字" bindinput="editInfo" data-num="{{index}}" bindblur="getFileId"
           value="{{item.templateAreaFontValue}}" focus="{{item.focus}}"
-          wx:if="{{item.templateAreaServerLink != '1'}}"></input>
+          wx:if="{{item.templateAreaServerLink != '1'}}" maxlength="{{item.templateAreaFontLength}}"></input>
-        <input type="text" placeholder="请输入内容" bindinput="editInfo" data-num="{{index}}"
+        <input type="text" placeholder="请输入内容,最多{{item.templateAreaFontLength}}个字" bindinput="editInfo" data-num="{{index}}"
-          value="{{item.templateAreaFontValue}}" focus="{{item.focus}}" wx:else></input>
+          value="{{item.templateAreaFontValue}}" focus="{{item.focus}}" maxlength="{{item.templateAreaFontLength}}" wx:else></input>
       </view>
     </view>
     <view class="row" wx:for="{{areaList}}" wx:key="index"
       wx:if="{{item.templateAreaServerLink == '2'  && item.templateAreaType != '1'}}">
       <view class="item-title">{{item.templateAreaName}}:</view>
       <view class="item-input" bindtap="choosePhoto" data-cur="{{index}}">
-        <image src="{{cardUrl}}{{item.templateAreaFile}}"></image>
+        <image src="{{cardUrl}}{{item.templateAreaFile}}" mode="widthFix"></image>
         <text class="cuIcon-cameraadd"></text>
       </view>
     </view>

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 {

project.config.json

@@ -1,74 +1,74 @@
 {
-    "description": "项目配置文件",
+  "description": "项目配置文件",
-    "packOptions": {
+  "packOptions": {
-        "ignore": []
+    "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": {
+    "enableEngineNative": false,
-        "urlCheck": false,
+    "useIsolateContext": true,
-        "es6": true,
+    "useCompilerModule": true,
-        "enhance": false,
+    "userConfirmedUseCompilerModuleSwitch": false,
-        "postcss": true,
+    "userConfirmedBundleSwitch": false,
-        "preloadBackgroundData": false,
+    "packNpmManually": false,
-        "minified": true,
+    "packNpmRelationList": [],
-        "newFeature": false,
+    "minifyWXSS": true
-        "coverView": true,
+  },
-        "nodeModules": false,
+  "compileType": "miniprogram",
-        "autoAudits": false,
+  "libVersion": "2.17.0",
-        "showShadowRootInWxmlPanel": true,
+  "appid": "wxe17874894f7ff27b",
-        "scopeDataCheck": false,
+  "projectname": "card",
-        "uglifyFileName": false,
+  "debugOptions": {
-        "checkInvalidKey": true,
+    "hidedInDevtools": []
-        "checkSiteMap": true,
+  },
-        "uploadWithSourceMap": true,
+  "scripts": {},
-        "compileHotReLoad": false,
+  "staticServerOptions": {
-        "useMultiFrameRuntime": true,
+    "baseURL": "",
-        "useApiHook": true,
+    "servePath": ""
-        "useApiHostProcess": false,
+  },
-        "babelSetting": {
+  "isGameTourist": false,
-            "ignore": [],
+  "condition": {
-            "disablePlugins": [],
+    "search": {
-            "outputPath": ""
+      "list": []
-        },
-        "enableEngineNative": false,
-        "useIsolateContext": true,
-        "useCompilerModule": true,
-        "userConfirmedUseCompilerModuleSwitch": false,
-        "userConfirmedBundleSwitch": false,
-        "packNpmManually": false,
-        "packNpmRelationList": [],
-        "minifyWXSS": true
     },
-    "compileType": "miniprogram",
+    "conversation": {
-    "libVersion": "2.17.0",
+      "list": []
-    "appid": "wxe17874894f7ff27b",
-    "projectname": "card",
-    "debugOptions": {
-        "hidedInDevtools": []
     },
-    "scripts": {},
+    "game": {
-    "staticServerOptions": {
+      "list": []
-        "baseURL": "",
-        "servePath": ""
     },
-    "isGameTourist": false,
+    "plugin": {
-    "condition": {
+      "list": []
-        "search": {
+    },
-            "list": []
+    "gamePlugin": {
-        },
+      "list": []
-        "conversation": {
+    },
-            "list": []
+    "miniprogram": {
-        },
+      "list": []
-        "game": {
-            "list": []
-        },
-        "plugin": {
-            "list": []
-        },
-        "gamePlugin": {
-            "list": []
-        },
-        "miniprogram": {
-            "list": []
-        }
     }
+  }
 }