Commit a2083da8 authored by 李俊赕's avatar 李俊赕

Merge branch 'dev-photo-v2' of https://git.banshouhui.com/heyinchen/take_order into dev-photo-v2

parents 964a8dbc 4ef5bba2
...@@ -12,14 +12,14 @@ ...@@ -12,14 +12,14 @@
<view class="right-view-title">拍照项有:</view> <view class="right-view-title">拍照项有:</view>
<template v-for="(item,ikey) in rightList"> <template v-for="(item,ikey) in rightList">
<view class="rightItemView" @click="rightItemClick(item,ikey)" :key="ikey"> <view class="rightItemView" @click="rightItemClick(item,ikey)" :key="ikey">
<view :class="['rightContentView', {'active':item.images.length > 0}]"> <view :class="['rightContentView', {'active':item.imageList.length > 0 || item.images.length > 0}]">
<text class="ph-lst-item-index">{{ ikey + 1 }}</text> <text class="ph-lst-item-index">{{ ikey + 1 }}</text>
<text class="">{{item.name}}</text> <text class="">{{item.name}}</text>
<image class="ph-list-item-arrow" src="/static/photo/arrow.png"></image> <image class="ph-list-item-arrow" src="/static/photo/arrow.png"></image>
<!-- <text class="rightContent u-m-t-14 u-m-l-30 u-p-b-30">{{item.describe}}</text> --> <!-- <text class="rightContent u-m-t-14 u-m-l-30 u-p-b-30">{{item.describe}}</text> -->
</view> </view>
<view class="rightImageView" v-if="item.images"> <view class="rightImageView" v-if="item.imageList.length > 0 || item.images.length > 0">
<image class="rightImage" v-for="(image, index) in item.images" :src="image" :key="image" <image class="rightImage" v-for="(image, index) in (item.imageList.length > 0 ? item.imageList : item.images)" :src="image" :key="image"
@click.stop="handleClickImage(item, index)" mode=""></image> @click.stop="handleClickImage(item, index)" mode=""></image>
</view> </view>
</view> </view>
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
// 点击图片 // 点击图片
handleClickImage(item, index) { handleClickImage(item, index) {
uni.previewImage({ uni.previewImage({
urls: item.images, urls: item.imageList.length > 0 ? item.imageList : item.images,
current:index current:index
}) })
}, },
......
...@@ -18,7 +18,7 @@ exports.main = async (event, context) => { ...@@ -18,7 +18,7 @@ exports.main = async (event, context) => {
$.eq(['$user_id', user_id]) $.eq(['$user_id', user_id])
]))).sort({ ]))).sort({
create_date: -1 create_date: -1
}).limit(5) }).limit(10)
.project({ .project({
"_id": 0, "_id": 0,
"url": 1, "url": 1,
......
...@@ -9,7 +9,7 @@ exports.main = async (event, context) => { ...@@ -9,7 +9,7 @@ exports.main = async (event, context) => {
await uniCloud.database().collection("user_upload_file").add({ await uniCloud.database().collection("user_upload_file").add({
"user_id": workerId, "user_id": workerId,
"standard_id": event.standardId, "standard_id": event.standardId,
url: event.url, url: "https://img2.banshouhui.com/" + event.url,
create_date: new Date() create_date: new Date()
}) })
return true return true
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment