Commit 052d508a authored by 李超鹏's avatar 李超鹏

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

parents 7b16d146 ef96161a
......@@ -2,8 +2,8 @@
<view class="backView">
<text class="topTitle"> {{product}} > 选择产品</text>
<view class="u-p-b-48">
<view class="itemView u-m-t-48" v-for="(item,ikey) in brandList":key="ikey">
<text class="itemTitle" @click="itemClick(item)">{{item.name}}</text>
<view class="itemView u-m-t-48" @click="itemClick(item)" v-for="(item,ikey) in brandList":key="ikey">
<text class="itemTitle">{{item.name}}</text>
</view>
</view>
......
......@@ -2,8 +2,8 @@
<view class="backView">
<text class="topTitle">选择产品</text>
<view class="u-p-b-48">
<view class="itemView u-m-t-48" v-for="(item,ikey) in productList":key="ikey">
<text class="itemTitle" @click="itemClick(item)">{{item.name}}</text>
<view class="itemView u-m-t-48" @click="itemClick(item)" v-for="(item,ikey) in productList":key="ikey">
<text class="itemTitle">{{item.name}}</text>
</view>
</view>
......@@ -34,7 +34,7 @@
this.$u.cloudApi.getAllProduct().then(res =>{
console.log('获取产品数据:')
console.log(res)
if(res.result.data){
if(res.result && res.result.data){
that.productList = res.result.data
}
......
......@@ -234,10 +234,11 @@
},
fail: function(e) {
that.showImage = false
uni.hideLoading()
uni.showToast({
title: '出错啦...',
icon: 'loading'
icon: 'none',
title: '还没有准备好',
})
console.log('处理图片 失败:')
console.log(e)
......@@ -258,7 +259,11 @@
icon:'none',
title:'已将照片保存到本地相册'
})
setTimeout(function() {
that.goBack()
}, 1000);
},
fail() {
console.log('保存本地相册 失败')
......
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