徐强 / obituary · 提交

转到一个项目

作者 xuqiang
提交 445f4fd19e13de835bc23d43e5a6c65a4228430c 1 个父辈 9f3a0d6d

调整

内嵌 并排对比
正在显示 26 个修改的文件 包含 59 行增加 和 41 行删除
... ... @@ -3,59 +3,59 @@
<!-- 模板图片区域 -->
<view class="tempImgList">
<view class="tempImgItem" :class="{active:temp == 1}" @click="changeIndex(1)">
<image src="../../static/image/Mask_Group_1@2x.jpg" mode=""></image>
<image src="../../static/image/Mask_Group_1@2x.png" mode=""></image>
<view class="radioCheck">
<image v-if="temp == 1" src="../../static/image/Group_206@2x.jpg" mode=""></image>
<image v-else src="../../static/image/Group_207@2x.jpg" mode=""></image>
<image v-if="temp == 1" src="../../static/image/Group_206@2x.png" mode=""></image>
<image v-else src="../../static/image/Group_207@2x.png" mode=""></image>
</view>
</view>
<view class="tempImgItem" :class="{active:temp == 2}" @click="changeIndex(2)">
<image src="../../static/image/Mask_Group_3@2x.jpg" mode=""></image>
<image src="../../static/image/Mask_Group_3@2x.png" mode=""></image>
<view class="radioCheck">
<image v-if="temp == 2" src="../../static/image/Group_206@2x.jpg" mode=""></image>
<image v-else src="../../static/image/Group_207@2x.jpg" mode=""></image>
<image v-if="temp == 2" src="../../static/image/Group_206@2x.png" mode=""></image>
<image v-else src="../../static/image/Group_207@2x.png" mode=""></image>
</view>
</view>
<view class="tempImgItem" :class="{active:temp == 3}" @click="changeIndex(3)">
<image src="../../static/image/Mask_Group_5@2x.jpg" mode=""></image>
<image src="../../static/image/Mask_Group_5@2x.png" mode=""></image>
<view class="radioCheck">
<image v-if="temp == 3" src="../../static/image/Group_206@2x.jpg" mode=""></image>
<image v-else src="../../static/image/Group_207@2x.jpg" mode=""></image>
<image v-if="temp == 3" src="../../static/image/Group_206@2x.png" mode=""></image>
<image v-else src="../../static/image/Group_207@2x.png" mode=""></image>
</view>
</view>
<view class="tempImgItem" :class="{active:temp == 4}" @click="changeIndex(4)">
<image src="../../static/image/Mask_Group_4@2x.jpg" mode=""></image>
<image src="../../static/image/Mask_Group_4@2x.png" mode=""></image>
<view class="radioCheck">
<image v-if="temp == 4" src="../../static/image/Group_206@2x.jpg" mode=""></image>
<image v-else src="../../static/image/Group_207@2x.jpg" mode=""></image>
<image v-if="temp == 4" src="../../static/image/Group_206@2x.png" mode=""></image>
<image v-else src="../../static/image/Group_207@2x.png" mode=""></image>
</view>
</view>
<view class="tempImgItem" :class="{active:temp == 5}" @click="changeIndex(5)">
<image src="../../static/image/Mask_Group@2x.jpg" mode=""></image>
<image src="../../static/image/Mask_Group@2x.png" mode=""></image>
<view class="radioCheck">
<image v-if="temp == 5" src="../../static/image/Group_206@2x.jpg" mode=""></image>
<image v-else src="../../static/image/Group_207@2x.jpg" mode=""></image>
<image v-if="temp == 5" src="../../static/image/Group_206@2x.png" mode=""></image>
<image v-else src="../../static/image/Group_207@2x.png" mode=""></image>
</view>
</view>
<view class="tempImgItem" :class="{active:temp == 6}" @click="changeIndex(6)">
<image src="../../static/image/Mask_Group_6@2x.jpg" mode=""></image>
<image src="../../static/image/Mask_Group_6@2x.png" mode=""></image>
<view class="radioCheck">
<image v-if="temp == 6" src="../../static/image/Group_206@2x.jpg" mode=""></image>
<image v-else src="../../static/image/Group_207@2x.jpg" mode=""></image>
<image v-if="temp == 6" src="../../static/image/Group_206@2x.png" mode=""></image>
<image v-else src="../../static/image/Group_207@2x.png" mode=""></image>
</view>
</view>
<view class="tempImgItem" :class="{active:temp == 7}" @click="changeIndex(7)">
<image src="../../static/image/Mask_Group_7@2x.jpg" mode=""></image>
<image src="../../static/image/Mask_Group_7@2x.png" mode=""></image>
<view class="radioCheck">
<image v-if="temp == 7" src="../../static/image/Group_206@2x.jpg" mode=""></image>
<image v-else src="../../static/image/Group_207@2x.jpg" mode=""></image>
<image v-if="temp == 7" src="../../static/image/Group_206@2x.png" mode=""></image>
<image v-else src="../../static/image/Group_207@2x.png" mode=""></image>
</view>
</view>
<view class="tempImgItem" :class="{active:temp == 8}" @click="changeIndex(8)">
<image src="../../static/image/Mask_Group_2@2x.jpg" mode=""></image>
<image src="../../static/image/Mask_Group_2@2x.png" mode=""></image>
<view class="radioCheck">
<image v-if="temp == 8" src="../../static/image/Group_206@2x.jpg" mode=""></image>
<image v-else src="../../static/image/Group_207@2x.jpg" mode=""></image>
<image v-if="temp == 8" src="../../static/image/Group_206@2x.png" mode=""></image>
<image v-else src="../../static/image/Group_207@2x.png" mode=""></image>
</view>
</view>
... ... @@ -92,6 +92,7 @@
getData(){
this.$request('/api/Index/ObBack',{ob_id:uni.getStorageSync('ob_id')}).then((res)=>{
this.obi = res.data
this.ob_id = uni.getStorageSync('ob_id')
this.obi.after_images = this.obi.after_images.join(',')
this.obi.url = this.obiUrl
//1=用户生成,2=商家生成
... ... @@ -115,7 +116,9 @@
createObi(){
this.obi.moban_id = this.temp
this.$request('/api/Index/UserAddOb',this.obi,2).then((res)=>{
this.$href('/pages/member/obiManage')
uni.reLaunch({
url:'/pages/member/obiManage'
})
})
}
}
... ...
... ... @@ -399,16 +399,15 @@
});
},
onShow() {
if(uni.getStorageSync('ob_id')){
if(uni.getStorageSync('ob_id') != ''){
this.getData()
}
},
methods: {
getData(){
this.$request('/api/Index/ObBack',{ob_id:uni.getStorageSync('ob_id')}).then((res)=>{
console.log(res.data)
this.imgList = res.data.after_images2
this.obi = res.data
this.imgList = this.obi.after_images2
this.obi.url = this.obiUrl
//1=用户生成,2=商家生成
this.obi.enmu = 1
... ... @@ -488,6 +487,7 @@
nextHandle(){
this.obi.happy_year = this.happy_year
this.obi.after_images = this.imgList.join(',')
this.obi.portrait_image = this.obi.portrait_image2
if(this.obi.die_name == ''){
uni.showToast({
title:'请输入逝者姓名',
... ...
... ... @@ -86,10 +86,11 @@
this.obi.content = e
},
getData(){
this.imgList = []
this.$request('/api/Index/ObBack',{ob_id:uni.getStorageSync('ob_id')}).then((res)=>{
this.obi = res.data
if(this.obi.portrait_image2){
this.imgList = this.obi.portrait_image2
if(this.obi.portrait_image2 != ''){
this.imgList.push(this.obi.portrait_image2)
}
this.obi.after_images = this.obi.after_images.join(',')
this.obi.url = this.obiUrl
... ...
... ... @@ -118,18 +118,18 @@
<index-obituary-title :title="6" :temp="temp">
<view class="service">
<view class="serviceImg">
<image :src="obi.SellerArray.Image" mode=""></image>
<image :src="SellerArray.Image" mode=""></image>
</view>
<view class="serviceInfo">
<view class="serviceName">
{{obi.SellerArray.title}}
{{SellerArray.title}}
</view>
<view class="serviceDesc">
<parse :content="obi.SellerArray.Content" :imageProp="{'domain':'www.mall.com'}"></parse>
<parse :content="SellerArray.Content" :imageProp="{'domain':'www.mall.com'}"></parse>
</view>
<view class="serviceAddress" @click="navigat(4)">
<image :src="'/static/image/obiTemplete/temp'+temp+'_dz.png'" mode=""></image>
{{obi.SellerArray.Address}}
{{SellerArray.Address}}
</view>
</view>
</view>
... ... @@ -182,6 +182,7 @@
temp:1,
ob_id:'',
obi:{},
SellerArray:{},
On:0,
open:''
}
... ... @@ -198,7 +199,6 @@
timeStamp: function(value) {
if (!value) return '';
var now = new Date(value);
console.log("time:" + JSON.stringify(now));
var year = now.getFullYear();
var month = now.getMonth() + 1;
if (month < 10) {
... ... @@ -398,6 +398,7 @@
})
this.$request('/api/Index/ObCon',{ob_id:this.ob_id}).then((res)=>{
this.obi = res.data
this.SellerArray = res.data.SellerArray
console.log(this.obi)
})
},
... ... @@ -442,10 +443,9 @@
checkWeChatCode() {
let code = this.getUrlCode('code')
if (code == null) {
console.log('../login/login?red_uri='+this.obiUrl+'pages/index/obiDetail?ob_id='+this.ob_id+'&temp='+this.temp+'&On='+this.On)
/* uni.reLaunch({
uni.reLaunch({
url:'../login/login?red_uri='+this.obiUrl+'pages/index/obiDetail?ob_id='+this.ob_id+'&temp='+this.temp+'&On='+this.On
}) */
})
}
},
//方法:用来提取code
... ...
... ... @@ -89,6 +89,18 @@
onLoad() {
this.getData()
},
onReachBottom(){
if(this.List.length >= this.Count){
uni.showToast({
title:'无更多数据',
icon:'none'
})
return ;
}else{
this.param.pages++
this.getData()
}
},
methods:{
onClick(e,index,Id,On){
if(e.content.text == '删除'){
... ... @@ -104,8 +116,9 @@
title:'删除成功'
})
setTimeout(()=>{
this.List = []
this.getData()
}, 1000);
}, 500);
}else{
uni.showToast({
... ... @@ -128,10 +141,11 @@
this.$request('/api/Index/UserObList',this.param).then((res)=>{
console.log(res)
this.Count = res.data.Count
this.List = res.data.List
this.List = this.List.concat(res.data.List)
})
},
changeTabItem(type){
this.List = []
if(type == 1){
this.disabled = false
}else{
... ...
... ... @@ -17,7 +17,7 @@
</view>
</view>
<view class="newsDesc">
{{item.ObName}}:{{item.Type == 1 ? '讣告发布成功' : item.Type == 2 ? '送礼物' : item.Type == 3 ? '随礼' : ''}}
{{item.Type == 1 ? '讣告发布成功' : item.Type == 2 ? '送礼物' : item.Type == 3 ? '随礼' : ''}}
</view>
</view>
</view>
... ...