Merge branch 'master' of https://e.coding.net/tsteam/business-card/card-mini
This commit is contained in:
commit
a0c7f9d9be
@ -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,
|
||||
|
@ -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>
|
||||
<input type="text" placeholder="请输入内容" bindinput="editInfo" data-num="{{index}}"
|
||||
value="{{item.templateAreaFontValue}}" focus="{{item.focus}}" wx:else></input>
|
||||
wx:if="{{item.templateAreaServerLink != '1'}}" maxlength="{{item.templateAreaFontLength}}"></input>
|
||||
<input type="text" placeholder="请输入内容,最多{{item.templateAreaFontLength}}个字" bindinput="editInfo" data-num="{{index}}"
|
||||
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>
|
||||
|
@ -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%;
|
||||
|
@ -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') {
|
||||
|
@ -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') {
|
||||
|
@ -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>
|
||||
<input type="text" placeholder="请输入内容" bindinput="editInfo" data-num="{{index}}"
|
||||
value="{{item.templateAreaFontValue}}" focus="{{item.focus}}" wx:else></input>
|
||||
wx:if="{{item.templateAreaServerLink != '1'}}" maxlength="{{item.templateAreaFontLength}}"></input>
|
||||
<input type="text" placeholder="请输入内容,最多{{item.templateAreaFontLength}}个字" bindinput="editInfo" data-num="{{index}}"
|
||||
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>
|
||||
|
@ -75,7 +75,7 @@ page {
|
||||
|
||||
.item-input image {
|
||||
max-width: 70%;
|
||||
max-height: 120rpx;
|
||||
/* max-height: 120rpx; */
|
||||
}
|
||||
|
||||
.item-code-input image {
|
||||
|
Loading…
Reference in New Issue
Block a user