kubbo/dvcp_v2_wxcp_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
aixianling
2022-06-01 18:22:34 +08:00
parent 0bda297fda f176f028f3
commit dd7cca79f8
7 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/saas/AppCountryAlbum/AlbumDetail.vue
View File

@@ -48,7 +48,7 @@
<div class="photo-item__wrapper">
<div class="photo-item" @click="linkTo('./Photo?id=' + item.id)" v-for="(item, index) in list" :key="index">
<!-- <image :src="item.photoUrl" mode="aspectFill" /> -->
<u-lazy-load :image="item.photoUrl" :loading-img="$cdn + 'watermark/loading.png'" img-mode="aspectFill"></u-lazy-load>
<u-lazy-load :image="item.photoUrl" :height="328" :loading-img="$cdn + 'watermark/loading.png'" img-mode="aspectFill"></u-lazy-load>
<div class="photo-item__text">
<h2><AiOpenData v-if="item.createUserId" type="userName" :openid="item.createUserId"></AiOpenData></h2>
<p>{{ item.createTime }}</p>

12
src/saas/AppCountryAlbum/AttendanceFiexdTime.vue
View File

@@ -6,7 +6,7 @@
<label>*</label>
<span>上班打卡时间</span>
</div>
<picker mode="time" start="08:00" end="21:00" @change="e => onTimeChange(e, 'workInTime')">
<picker mode="time" @change="e => onTimeChange(e, 'workInTime')">
<div class="right">
<span>{{ form.workInTime || '请设置时间' }}</span>
<image src="./images/right.png" />
@@ -18,7 +18,7 @@
<label>*</label>
<span>下班打卡时间</span>
</div>
<picker mode="time" start="08:00" end="21:00" @change="e => onTimeChange(e, 'workOutTime')">
<picker mode="time" @change="e => onTimeChange(e, 'workOutTime')">
<div class="right">
<span>{{ form.workOutTime || '请设置时间' }}</span>
<image src="./images/right.png" />
@@ -41,7 +41,7 @@
<label>*</label>
<span>休息开始</span>
</div>
<picker mode="time" start="08:00" end="21:00" @change="e => onTimeChange(e, 'restTimeBegin')">
<picker mode="time" @change="e => onTimeChange(e, 'restTimeBegin')">
<div class="right">
<span>{{ form.restTimeBegin || '请设置时间' }}</span>
<image src="./images/right.png" />
@@ -53,7 +53,7 @@
<label>*</label>
<span>休息结束</span>
</div>
<picker mode="time" start="08:00" end="21:00" @change="e => onTimeChange(e, 'restTimeEnd')">
<picker mode="time" @change="e => onTimeChange(e, 'restTimeEnd')">
<div class="right">
<span>{{ form.restTimeEnd || '请设置时间' }}</span>
<image src="./images/right.png" />
@@ -73,7 +73,7 @@
<label>*</label>
<span>上班打卡</span>
</div>
<picker mode="time" start="08:00" end="21:00" @change="e => onTimeChange(e, 'workInFrom')">
<picker mode="time" @change="e => onTimeChange(e, 'workInFrom')">
<div class="right">
<span>{{ form.workInFrom || '请设置时间' }}</span>
<image src="./images/right.png" />
@@ -85,7 +85,7 @@
<label>*</label>
<span>下班打卡</span>
</div>
<picker mode="time" start="08:00" end="21:00" @change="e => onTimeChange(e, 'workOutEnd')">
<picker mode="time" @change="e => onTimeChange(e, 'workOutEnd')">
<div class="right">
<span>{{ form.workOutEnd || '请设置时间' }}</span>
<image src="./images/right.png" />

8
src/saas/AppCountryAlbum/AttendanceFlexibleTime.vue
View File

@@ -6,7 +6,7 @@
<label>*</label>
<span>最早允许打卡时间</span>
</div>
<picker mode="time" start="08:00" end="21:00" @change="e => onTimeChange(e, 'workInFrom')">
<picker mode="time" @change="e => onTimeChange(e, 'workInFrom')">
<div class="right">
<span>{{ form.workInFrom || '请设置时间' }}</span>
<image src="./images/right.png" />
@@ -18,7 +18,7 @@
<label>*</label>
<span>最晚允许打卡时间</span>
</div>
<picker mode="time" start="08:00" end="21:00" @change="e => onTimeChange(e, 'workOutEnd')">
<picker mode="time" @change="e => onTimeChange(e, 'workOutEnd')">
<div class="right">
<span>{{ form.workOutEnd || '请设置时间' }}</span>
<image src="./images/right.png" />
@@ -41,7 +41,7 @@
<label>*</label>
<span>休息开始</span>
</div>
<picker mode="time" start="08:00" end="21:00" @change="e => onTimeChange(e, 'restTimeBegin')">
<picker mode="time" @change="e => onTimeChange(e, 'restTimeBegin')">
<div class="right">
<span>{{ form.restTimeBegin || '请设置时间' }}</span>
<image src="./images/right.png" />
@@ -53,7 +53,7 @@
<label>*</label>
<span>休息结束</span>
</div>
<picker mode="time" start="08:00" end="21:00" @change="e => onTimeChange(e, 'restTimeEnd')">
<picker mode="time" @change="e => onTimeChange(e, 'restTimeEnd')">
<div class="right">
<span>{{ form.restTimeEnd || '请设置时间' }}</span>
<image src="./images/right.png" />

7
src/saas/AppCountryAlbum/EditAlbum.vue
View File

@@ -1,7 +1,7 @@
<template>
<div class="EditAlbum" v-if="pageShow">
<div class="img-item" v-for="(item, index) in list" :key="index" @click="choose(index)">
<u-lazy-load class="img" :loading-img="$cdn + 'watermark/loading.png'" :image="item.photoUrl" img-mode="aspectFill"></u-lazy-load>
<u-lazy-load class="img" :height="182" :loading-img="$cdn + 'watermark/loading.png'" :image="item.photoUrl" img-mode="scaleToFill"></u-lazy-load>
<span class="icon" v-if="!item.checked"></span>
<image class="icon" v-else src="./images/img-choose.png" />
</div>
@@ -370,6 +370,7 @@
margin-bottom: 4px;
box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.02);
border-radius: 4px;
overflow: hidden;
.icon {
position: absolute;
@@ -382,8 +383,8 @@
}
.img {
width: 100%;
height: 100%;
width: 182px;
height: 182px;
}
span {

2
src/saas/AppCountryAlbum/Watermark.vue
View File

@@ -153,7 +153,7 @@
albumList: [],
address: {},
x: 32,
y: 200,
y: 24,
startX: 0,
startY: 0,
canvasHeight: 0

4
src/saas/AppCountryAlbum/WatermarkConfig.vue
View File

@@ -12,7 +12,7 @@
</div>
<u-icon name="arrow-right" color="#E1E2E3" v-if="item.editEnable !== '0'"></u-icon>
</div>
<picker mode="date" style="flex: 1;" v-if="item.fieldType === '7'" :value="item.defaultValue" @change="e => onDateChange(e, index)">
<picker mode="date" :disabled="item.editEnable === '0'" style="flex: 1;" v-if="item.fieldType === '7'" :value="item.defaultValue" @change="e => onDateChange(e, index)">
<div class="right">
<div class="right-left">
<h2>{{ mapFieldLable(item.type) }}</h2>
@@ -21,7 +21,7 @@
<u-icon name="arrow-right" color="#E1E2E3" v-if="item.editEnable !== '0'"></u-icon>
</div>
</picker>
<picker mode="time" style="flex: 1;" v-if="item.fieldType === '6'" :value="item.defaultValue" @change="e => onDateChange(e, index)">
<picker mode="time" style="flex: 1;" :disabled="item.editEnable === '0'" v-if="item.fieldType === '6'" :value="item.defaultValue" @change="e => onDateChange(e, index)">
<div class="right">
<div class="right-left">
<h2>{{ mapFieldLable(item.type) }}</h2>

2
src/saas/AppCountryAlbum/components/Home.vue
View File

@@ -55,7 +55,7 @@
<div class="item" v-for="(item, index) in list" :key="index" @click="linkTo('./AlbumDetail?id=' + item.id)">
<span v-if="item.photoHasRead === 'NO'">未查看</span>
<image src="./../images/icon.png" :loading-img="$cdn + 'watermark/loading.png'" v-if="!item.lastPhotoUrl" />
<u-lazy-load class="item-img" :image="item.lastPhotoUrl" v-else img-mode="aspectFill"></u-lazy-load>
<u-lazy-load class="item-img" img-mode="aspectFill" :height="328" :image="item.lastPhotoUrl" v-else></u-lazy-load>
<div class="item-bottom">
<h2>{{ item.albumName }}</h2>
<div class="item-bottom__info">