李洪娟 / anleguonew · 提交

转到一个项目

作者 李洪娟
提交 0c578aedf523013cc4737de4eab91e9ddc4cfb74 2 个父辈 7bac6a92 f4829947

合并分支 'Branch_liaolinfeng' 到 'master' 

2019年1月30号上传，主要写墓地部分，新建墓地，已建墓地，关注墓地



查看合并请求 !1
内嵌 并排对比
正在显示 21 个修改的文件 包含 887 行增加 和 925 行删除

要显示太多修改。
重新载入完整差异 差异文件 邮件补丁

为保证性能只显示 21 of 21+ 个文件。

  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<project version="4">
  3 + <component name="VcsDirectoryMappings">
  4 + <mapping directory="$PROJECT_DIR$" vcs="Git" />
  5 + </component>
  6 +</project>
1 App({ 1 App({
2 onLaunch: function () { 2 onLaunch: function () {
3 - // 展示本地存储能力  
4 - var logs = wx.getStorageSync('logs') || [] 3 +
5 }, 4 },
6 post: function (url, data, headerParams) { 5 post: function (url, data, headerParams) {
7 /** 6 /**
@@ -23,7 +22,7 @@ App({ @@ -23,7 +22,7 @@ App({
23 //init 22 //init
24 let that = this; 23 let that = this;
25 let postData = data; 24 let postData = data;
26 - let baseUrl = 'http://192.168.1.7/anleguo/public'; 25 + let baseUrl = 'http://anleguo.w.bronet.cn';
27 // let baseUrl = 'http://192.168.1.15/public'; 26 // let baseUrl = 'http://192.168.1.15/public';
28 // postData.signature = that.makeSign(postData); 27 // postData.signature = that.makeSign(postData);
29 //网络请求 28 //网络请求
@@ -40,26 +39,11 @@ App({ @@ -40,26 +39,11 @@ App({
40 if (res.data.code == '20000') { 39 if (res.data.code == '20000') {
41 resolve(res.data.data); 40 resolve(res.data.data);
42 } else if (res.data.code == '40000') {//返回错误提示信息 41 } else if (res.data.code == '40000') {//返回错误提示信息
43 - console.log(res) 42 +
44 wx.showToast({ 43 wx.showToast({
45 title: res.data.msg, 44 title: res.data.msg,
46 icon: 'none' 45 icon: 'none'
47 }) 46 })
48 -  
49 -  
50 - // wx.showModal({  
51 - // title: '提示',  
52 - // // content: res.data.msg,  
53 - // success: function (res) {  
54 - // if (res.confirm) {  
55 - // wx.removeStorageSync('token');  
56 - // wx.navigateTo({  
57 - // // url: '/pages/startRecord/startRecord',  
58 - // })  
59 - // }  
60 - // }  
61 - // })  
62 -  
63 } else if (res.data.code == '40001') {//返回错误提示信息 47 } else if (res.data.code == '40001') {//返回错误提示信息
64 wx.showModal({ 48 wx.showModal({
65 title: '提示', 49 title: '提示',
@@ -107,7 +91,7 @@ App({ @@ -107,7 +91,7 @@ App({
107 wx.hideNavigationBarLoading() 91 wx.hideNavigationBarLoading()
108 }, 600) 92 }, 600)
109 }, 93 },
110 - error: function (e) { 94 + fail: function (e) {
111 reject('网络出错'); 95 reject('网络出错');
112 // wx.hideLoading() 96 // wx.hideLoading()
113 wx.hideNavigationBarLoading() 97 wx.hideNavigationBarLoading()
@@ -116,6 +100,59 @@ App({ @@ -116,6 +100,59 @@ App({
116 }); 100 });
117 return promise; 101 return promise;
118 }, 102 },
  103 +
  104 + /**
  105 + * 自定义上传文件，返回文件路径
  106 + * +-------------------
  107 + * @filetype{String} 文件类型.image,video,audio,file
  108 + * @filePath String 要传的文件路径
  109 + * +-------------------
  110 + * @return url 返回文件路径
  111 + */
  112 + upload (filetype, file) {
  113 +
  114 + var promise = new Promise((resolve, reject) => {
  115 + wx.showNavigationBarLoading()
  116 + wx.showLoading({
  117 + title: '上传中',
  118 + })
  119 + let url = 'http://anleguo.w.bronet.cn/portal/common/upload';
  120 + let head = {
  121 + 'XX-Token': wx.getStorageSync('token'),
  122 + 'XX-Device-Type': ''
  123 + }
  124 + let typename = {
  125 + filetype: filetype
  126 + }
  127 + wx.uploadFile({
  128 + url: url, //仅为示例，非真实的接口地址
  129 + filePath: file,
  130 + name: 'file',
  131 + header: {},
  132 + formData: typename,
  133 + success: function (res) {
  134 + console.log('上传文件后',res)
  135 + let temdata = JSON.parse(res.data);
  136 + let urlobj = {
  137 + url: temdata.data.preview_url
  138 + }
  139 + resolve(urlobj);
  140 + wx.hideNavigationBarLoading();
  141 + wx.hideLoading();
  142 + },
  143 + fail: function (res) {
  144 + reject('网络出错');
  145 + wx.hideNavigationBarLoading()
  146 + wx.hideLoading()
  147 + },
  148 + complete: () => {
  149 + wx.hideNavigationBarLoading()
  150 + wx.hideLoading()
  151 + },
  152 + })
  153 + });
  154 + return promise;
  155 + },
119 formCollect(id) { 156 formCollect(id) {
120 let url = '/sign/formid' 157 let url = '/sign/formid'
121 let params = { 158 let params = {
@@ -132,7 +169,10 @@ App({ @@ -132,7 +169,10 @@ App({
132 let date = new Date(); 169 let date = new Date();
133 let month = date.getMonth() + 1; 170 let month = date.getMonth() + 1;
134 let day = date.getDate(); 171 let day = date.getDate();
135 - return date.getFullYear() + '年' + (month > 9 ? month : ('0' + month)) + '月' + (day > 9 ? day : ('0' + day)) + '日'; 172 + let dayobj={};
  173 + dayobj.newdate = date.getFullYear() + '年' + (month > 9 ? month : ('0' + month)) + '月' + (day > 9 ? day : ('0' + day)) + '日';
  174 + dayobj.date = date.getFullYear() + '-' + (month > 9 ? month : ('0' + month)) + '-' + (day > 9 ? day : ('0' + day)) ;
  175 + return dayobj
136 }, 176 },
137 initDate(a) { 177 initDate(a) {
138 let date1 = new Date(); 178 let date1 = new Date();
@@ -152,6 +192,19 @@ App({ @@ -152,6 +192,19 @@ App({
152 let str = 'bronet' + strtime + 'beijing' 192 let str = 'bronet' + strtime + 'beijing'
153 return md5(md5(str)) 193 return md5(md5(str))
154 }, 194 },
  195 + //数组变字符串，中间用,隔开
  196 + array_to_string(arr){
  197 + let str='';
  198 + for (let i = 0; i < arr.length;i++){
  199 + if (i == (arr.length-1)){
  200 + str +=arr[i]
  201 + }else{
  202 + str += arr[i]+','
  203 + }
  204 + }
  205 + return str;
  206 +
  207 + },
155 globalData: { 208 globalData: {
156 userInfo: null, 209 userInfo: null,
157 baseUrl: 'http://beijing.w.bronet.cn' 210 baseUrl: 'http://beijing.w.bronet.cn'
1 { 1 {
2 "pages": [ 2 "pages": [
3 "pages/index/index", 3 "pages/index/index",
4 - "pages/personecenter/code/code",  
5 "pages/personecenter/exchange/exchange", 4 "pages/personecenter/exchange/exchange",
6 "pages/personecenter/recharge/recharge", 5 "pages/personecenter/recharge/recharge",
7 "pages/mainindex/mainindex", 6 "pages/mainindex/mainindex",
@@ -13,7 +12,6 @@ @@ -13,7 +12,6 @@
13 "pages/newcemetery/attentionmudi/attentionmudi", 12 "pages/newcemetery/attentionmudi/attentionmudi",
14 "pages/publicmemory/herolist/herolist", 13 "pages/publicmemory/herolist/herolist",
15 "pages/newcemetery/myancestral/myancestral", 14 "pages/newcemetery/myancestral/myancestral",
16 - "pages/newcemetery/xianshimudi/xianshimudi",  
17 "pages/newcemetery/jizu/jizu", 15 "pages/newcemetery/jizu/jizu",
18 "pages/newcemetery/wangshangmudi/wangshangmudi", 16 "pages/newcemetery/wangshangmudi/wangshangmudi",
19 "pages/newcemetery/gaobieting/gaobieting", 17 "pages/newcemetery/gaobieting/gaobieting",
@@ -52,7 +50,6 @@ @@ -52,7 +50,6 @@
52 "pages/publicindex/publicindex", 50 "pages/publicindex/publicindex",
53 "pages/main/searchpage/searchpage", 51 "pages/main/searchpage/searchpage",
54 "pages/main/detail/detail", 52 "pages/main/detail/detail",
55 -  
56 "pages/logs/logs", 53 "pages/logs/logs",
57 "pages/newcemetery/increasezuci/increasezuci", 54 "pages/newcemetery/increasezuci/increasezuci",
58 "pages/newcemetery/usehelp/usehelp", 55 "pages/newcemetery/usehelp/usehelp",
@@ -62,8 +59,11 @@ @@ -62,8 +59,11 @@
62 "pages/newcemetery/diepeopleinfo/diepeopleinfo", 59 "pages/newcemetery/diepeopleinfo/diepeopleinfo",
63 "pages/newcemetery/zucimemberremark/zucimemberremark", 60 "pages/newcemetery/zucimemberremark/zucimemberremark",
64 "pages/newcemetery/jianjie/jianjie", 61 "pages/newcemetery/jianjie/jianjie",
65 - "pages/newcemetery/searchmudilist/searchmudilist"  
66 - 62 + "pages/newcemetery/searchmudilist/searchmudilist",
  63 + "pages/newcemetery/xinjianwangluomudi/xinjianwangluomudi",
  64 + "pages/newcemetery/xinjianxianshimudi/xinjianxianshimudi",
  65 + "pages/newcemetery/xianshimudi/xianshimudi",
  66 + "pages/personecenter/code/code"
67 ], 67 ],
68 "window": { 68 "window": {
69 "backgroundTextStyle": "light", 69 "backgroundTextStyle": "light",
@@ -8,3 +8,61 @@ @@ -8,3 +8,61 @@
8 padding: 200rpx 0; 8 padding: 200rpx 0;
9 box-sizing: border-box; 9 box-sizing: border-box;
10 } 10 }
  11 +wxParse-img{
  12 + width: 100% !important;
  13 +}
  14 +.wxParse-strong{
  15 + font-weight: bold !important;
  16 +}
  17 +@font-face {font-family: "iconfont";
  18 + src: url('//at.alicdn.com/t/font_1000553_z9jzv7oaaf.eot?t=1548230525508'); /* IE9 */
  19 + src: url('//at.alicdn.com/t/font_1000553_z9jzv7oaaf.eot?t=1548230525508#iefix') format('embedded-opentype'), /* IE6-IE8 */
  20 + url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAAa0AAsAAAAADJQAAAZkAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHEIGVgCEGAqKcIhTATYCJAMoCxYABCAFhG0HgQcbmArIHpIEIaCAAgAHJG2A+nl+m3/uC8T3TMz1M6px1c5aFMoDsfAjGPnYGrYmrFqgqwhjlfi75YHnZr/NgYZZgRZgwOvW8+MDXIM4o5s9QAAg8Z79XJ1Y/W9pTa9t3su/mTvijUQmUakkoohG0UojQ4qEEFnMq8lJKTQ4J7+6mwECQBkvEGqnzs4APgJZEAysZFIR8EteRA+B8B28lhMzG7QNSPxwI3YPwFb/++gPdcAHwJAR0K3m91PEIHzB+yTOjXBbGqmBu1wYAOanAeAAAgEQAN1bowbAYzUQjtr+BYR8AAJ2cNgLmUlziHmSefpw3rBp+OTICGaoz0erEQFHuT2ABR4MnyXytf/xcIBSQKsVMGtqlsAMWgIsgBlJAA+YSQnAgDlEAvjAPEl7mm06SAAJhvMkAIFhkwQQYPikF/AJnbI5Qh+6AGAlMCdbsR9VIyAYlnKrZUutyD0WmQdYC0jSniDGVvf3Zwx89tPTtNYl+yUaHFyovnvW0FD2wEBmf3+R5oRz0wPvnnuOe695Z/V2jTE2o7Yn0ZTmwmhDl7rbpfmiD33y6QR1k3NTd4BL9p7rfvrbXnvuuvTd9Mo0dbrqGqD1cRS96/wofSfX4dhwjqKOPRrLNTo1dvhm6LKODzjpd7lkG5udDW2ju4em0Uaji7Fb3VVUMFDUjUH35vbHbXLOMvQ46vojTww6G3Y7ZuganPStozr6J1NqpNE56jq4Tie93om+PuDW0CLWb3TK1O9xMQ5lP8Fhi6/1M50DU24OeXQNVvd/etGnyhwazh40L9NzezXOWRk6Ta/aJTvLoO7TOmVmG7UmzjEjUzRozmIgL9L/qer9RAYyhy7oXmTDDPfRtgzXXnHmRuQJIRMQuyep1PhLetUPtX5sdZ/2PudbsbeapPhSBUFbiqvFezUX1AHSTurFB5u4JfZgN9A8qlTap76g8RVLejXnOD9WvJc7rw2QigdqL6r9GVyow2/cwHWCJlfRrY02yEZTWPOC3oTrGkZ0/zRo0SI0SZIWjTH/bNixwsH63I9BaqrgjWDmxtqpKz/3OrJWdO8hYpT9MleNUOsyx62EPNRL0xJHk3llWP1UU7zgB9tQxvZ7wYzKRUeJ2eQoobkUTs1FK9S4LhW4fqlMb9Pnlaumf95de3VarFfFmp1Vk4yZ8V7bsAkZGT+2sjWALEssJwNaeeRPGRkTyCMoLstQPvGquDxqcmTXkSnRkeVrdtZMMmbF2XcRq/JPAVgsiPLEMu588kcOxF9AlXqNlXpMjQsxpaGCQiwNm289aSh3ofkOYYP5j9PSxo1LW/DokUa/URowUckTwtWVeCJJi8aYj0Hca88znq90ZH4VaK+J155nTTulDnAyCiP1z0iGIZ8hadEY8xHrnWfOE//+S4Dp/ATBOJmQ9oKxsR9rb4PxcbY2UQMvBN9e4tyM7wfyhLaphj1tEUd9jKkThBUxuSuMEDYP9PVCRvchc/aYEFrN230qIlYWE1W2vmxdVGxebPju01ExIHomC5PrLgiThLBit3q1Z4yk0byaKuGxkhjPYPaohcJWr5HmMLikB5TPAGDkIhGeCjDSGuCbuWCzn/EvKtx1uNrz3MI5rpqr4L0OfHx9iz/w2rS2E6ya43RzhW3ib3x69FvxrFhYi4bL9AAfBti6lDWj2AQAINgvDOSj4k0ciMBHADCNbXrUJ2Db44L20mbqsAQgRSUF3qDdia1LwnanHDAWxgGOz5NKMAOBRIsEHr4UoASYdjrNgQIOxZYA4G+tAMTOQcDYuAg4O/epBPM1kJx9Bzx2AQ6UrMDhgjTvQEZNUrAiJStmcioZWa68WKICSioMLmClqkKRomjw/CxWUSorMGHBodXGNLaYVVzikNIyabhSKWEkCnkRM1Xcji0slDMlCnk+m6sMzlMqS+JDQiRtLxScKy8CyiQKLBEllhgjRyWGTC65YhK7vBJV+/kFWFIqhUQUPfNu1bOwFErJ1s4IEyyUQZ1mLWbN+yhjS5WRCqfEsASjpyrIFWFMxTCrUFblGCXt2+Vj5VIKlndCuUS8EFxMwrUG395e9G8bRtgF6FmpAEM4IhCJeMgC8ZElohAN9FYlz5GJ5BJZYaFtjkquKhLJlaragaHRFlKVqDhHFmahlImK8/VBPLFKJpWreCUiWYUqiARXsaKAbbk8kZw3zAMAAAAA') format('woff2'),
  21 + url('//at.alicdn.com/t/font_1000553_z9jzv7oaaf.woff?t=1548230525508') format('woff'),
  22 + url('//at.alicdn.com/t/font_1000553_z9jzv7oaaf.ttf?t=1548230525508') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */
  23 + url('//at.alicdn.com/t/font_1000553_z9jzv7oaaf.svg?t=1548230525508#iconfont') format('svg'); /* iOS 4.1- */
  24 +}
  25 +
  26 +.iconfont {
  27 + font-family: "iconfont" !important;
  28 + font-size: 16px;
  29 + font-style: normal;
  30 + -webkit-font-smoothing: antialiased;
  31 + -moz-osx-font-smoothing: grayscale;
  32 +}
  33 +
  34 +.icon-zuobiaofill:before {
  35 + content: "\e768";
  36 +}
  37 +
  38 +.icon-buoumaotubiao06:before {
  39 + content: "\e605";
  40 +}
  41 +
  42 +.icon-guanbi1:before {
  43 + content: "\e7b7";
  44 +}
  45 +
  46 +.icon-tianjia:before {
  47 + content: "\e7a9";
  48 +}
  49 +
  50 +.icon-duigou:before {
  51 + content: "\e648";
  52 +}
  53 +
  54 +.icon-paixu-:before {
  55 + content: "\e601";
  56 +}
  57 +
  58 +.icon-jinru:before {
  59 + content: "\e600";
  60 +}
  61 +
  62 +.icon-jiahao:before {
  63 + content: "\e62f";
  64 +}
  65 +
  66 +.icon-guanbi:before {
  67 + content: "\e643";
  68 +}
1 // pages/main/detail/detail.js 1 // pages/main/detail/detail.js
  2 +const app=getApp();
  3 +var that;
  4 +var wxParse = require('../../../wxParse/wxParse.js')
2 Page({ 5 Page({
3 6
4 /** 7 /**
@@ -7,12 +10,30 @@ Page({ @@ -7,12 +10,30 @@ Page({
7 data: { 10 data: {
8 11
9 }, 12 },
10 - 13 + getNewsDetail(){
  14 + let url ='/api/portal/index/getNewsDetail';
  15 + let params={
  16 + id:that.data.id
  17 + }
  18 + app.post(url, params).then((res)=>{
  19 + console.log(res)
  20 + that.setData({
  21 + datalist:res
  22 + })
  23 + wxParse.wxParse('content', 'html', res.content, that, 5);
  24 + }).catch((err)=>{
  25 + console.log(err)
  26 + })
  27 + },
11 /** 28 /**
12 * 生命周期函数--监听页面加载 29 * 生命周期函数--监听页面加载
13 */ 30 */
14 onLoad: function (options) { 31 onLoad: function (options) {
15 - 32 + that=this;
  33 + that.setData({
  34 + id:options.id
  35 + })
  36 + that.getNewsDetail();
16 }, 37 },
17 38
18 /** 39 /**
1 <view class="box"> 1 <view class="box">
2 - <view class="diepeoplename">著名反派演员计春华去世， 享年57岁</view> 2 + <view class="diepeoplename">{{datalist.title}}</view>
3 3
4 <view class="topnonecontent"> 4 <view class="topnonecontent">
5 5
6 <view class="newsimg"> 6 <view class="newsimg">
7 - <image src="../../../img/news.png"></image> 7 + <image src="http://bronet.wangshuwen.com//news.png"></image>
8 </view> 8 </view>
9 <text class="toponetitle dietitle">人民网</text> 9 <text class="toponetitle dietitle">人民网</text>
10 <text class="toponetitle dietitle" style="margin-left:10rpx">1小时前</text> 10 <text class="toponetitle dietitle" style="margin-left:10rpx">1小时前</text>
11 -  
12 </view> 11 </view>
13 -  
14 -  
15 <view class="diepeoplecontent"> 12 <view class="diepeoplecontent">
16 - <view class="diepeopletext">  
17 - 端午节将至，除了吃粽子，还有什么讲究？27日上午的东岳庙，用热闹丰富的活动回答了这个问题。北京民俗博物馆在这里举办“我们的节日·端午节系列文化活动”，吸引了来自北京白家庄小学、北方之星翠林幼儿园的近百位小朋友参加。包粽子、画泥人、扎风筝、做香囊，小家伙们成了东岳庙里最忙碌的人，一上午时间，要体验“端午民俗课”的全部内容，可真忙不过来呢！  
18 -  
19 -  
20 - </view>  
21 - <view class='diepeopleimg'>  
22 - <image src="../../../img/sacrifice_02@3x.png"></image>  
23 - 13 + <import src="../../../wxParse/wxParse.wxml" />
  14 + <template is='wxParse' data='{{wxParseData:content.nodes}}' />
24 </view> 15 </view>
25 - <view class="diepeopleimgtitle"> 计春华纪念馆</view>  
26 - <view class="diepeopletext">  
27 - 本次活动还特别安排了“端午民俗知识”讲座。一些小朋友们坐在小板凳上，饶有兴味地听工作人员讲古时候的孩子们怎么过端午节：“那时候大人喝雄黄酒辟邪，小孩就剪艾虎，或者在脑门儿上拿雄黄酒画一个 王老虎 ，民间寓意是虎虎实实，在这一年里不仅会有好身体，也会有好运气。  
28 - </view>  
29 -  
30 -  
31 - </view>  
32 -  
33 -  
34 -  
35 </view> 16 </view>
36 - <view class="textover">本文完</view>  
  17 +<view class="textover">本文完</view>
@@ -36,7 +36,7 @@ @@ -36,7 +36,7 @@
36 <view class="recommendpeoplebox"> 36 <view class="recommendpeoplebox">
37 <view class="recommendpeopleitem"> 37 <view class="recommendpeopleitem">
38 <view class="recommendpeopleitemimg"> 38 <view class="recommendpeopleitemimg">
39 - <image src="../../../img/choose@3x.png"></image> 39 + <image src="http://bronet.wangshuwen.com//choose@3x.png"></image>
40 </view> 40 </view>
41 41
42 <view class="recommendpeoplename">雷锋</view> 42 <view class="recommendpeoplename">雷锋</view>
@@ -45,7 +45,7 @@ @@ -45,7 +45,7 @@
45 </view> 45 </view>
46 <view class="recommendpeopleitem"> 46 <view class="recommendpeopleitem">
47 <view class="recommendpeopleitemimg"> 47 <view class="recommendpeopleitemimg">
48 - <image src="../../../img/choose@3x.png"></image> 48 + <image src="http://bronet.wangshuwen.com//choose@3x.png"></image>
49 </view> 49 </view>
50 50
51 <view class="recommendpeoplename">雷锋</view> 51 <view class="recommendpeoplename">雷锋</view>
@@ -54,7 +54,7 @@ @@ -54,7 +54,7 @@
54 </view> 54 </view>
55 <view class="recommendpeopleitem"> 55 <view class="recommendpeopleitem">
56 <view class="recommendpeopleitemimg"> 56 <view class="recommendpeopleitemimg">
57 - <image src="../../../img/choose@3x.png"></image> 57 + <image src="http://bronet.wangshuwen.com//choose@3x.png"></image>
58 </view> 58 </view>
59 59
60 <view class="recommendpeoplename">雷锋</view> 60 <view class="recommendpeoplename">雷锋</view>
@@ -63,7 +63,7 @@ @@ -63,7 +63,7 @@
63 </view> 63 </view>
64 <view class="recommendpeopleitem"> 64 <view class="recommendpeopleitem">
65 <view class="recommendpeopleitemimg"> 65 <view class="recommendpeopleitemimg">
66 - <image src="../../../img/choose@3x.png"></image> 66 + <image src="http://bronet.wangshuwen.com//choose@3x.png"></image>
67 </view> 67 </view>
68 68
69 <view class="recommendpeoplename">雷锋</view> 69 <view class="recommendpeoplename">雷锋</view>
@@ -72,7 +72,7 @@ @@ -72,7 +72,7 @@
72 </view> 72 </view>
73 <view class="recommendpeopleitem"> 73 <view class="recommendpeopleitem">
74 <view class="recommendpeopleitemimg"> 74 <view class="recommendpeopleitemimg">
75 - <image src="../../../img/choose@3x.png"></image> 75 + <image src="http://bronet.wangshuwen.com//choose@3x.png"></image>
76 </view> 76 </view>
77 77
78 <view class="recommendpeoplename">雷锋</view> 78 <view class="recommendpeoplename">雷锋</view>
@@ -81,7 +81,7 @@ @@ -81,7 +81,7 @@
81 </view> 81 </view>
82 <view class="recommendpeopleitem"> 82 <view class="recommendpeopleitem">
83 <view class="recommendpeopleitemimg"> 83 <view class="recommendpeopleitemimg">
84 - <image src="../../../img/choose@3x.png"></image> 84 + <image src="http://bronet.wangshuwen.com//choose@3x.png"></image>
85 </view> 85 </view>
86 86
87 <view class="recommendpeoplename">雷锋</view> 87 <view class="recommendpeoplename">雷锋</view>
@@ -90,7 +90,7 @@ @@ -90,7 +90,7 @@
90 </view> 90 </view>
91 <view class="recommendpeopleitem"> 91 <view class="recommendpeopleitem">
92 <view class="recommendpeopleitemimg"> 92 <view class="recommendpeopleitemimg">
93 - <image src="../../../img/choose@3x.png"></image> 93 + <image src="http://bronet.wangshuwen.com//choose@3x.png"></image>
94 </view> 94 </view>
95 95
96 <view class="recommendpeoplename">雷锋</view> 96 <view class="recommendpeoplename">雷锋</view>
1 // pages/main/mainindex/mainindex.js 1 // pages/main/mainindex/mainindex.js
  2 +const app=getApp();
  3 +var that;
2 Page({ 4 Page({
3 -  
4 /** 5 /**
5 * 页面的初始数据 6 * 页面的初始数据
6 */ 7 */
@@ -23,160 +24,243 @@ Page({ @@ -23,160 +24,243 @@ Page({
23 24
24 ], 25 ],
25 currentTab: 0, 26 currentTab: 0,
26 -  
27 - peoplenav:[  
28 - {  
29 - name:'历史名人' 27 + peoplenav: [{
  28 + name: '历史名人'
30 }, 29 },
31 { 30 {
32 - name:'演艺明星' 31 + name: '演艺明星'
33 } 32 }
34 ], 33 ],
35 - currentpeopleTab:0,  
36 - publishshow:false,  
37 - 34 + currentpeopleTab: 0,
  35 + publishshow: false,
  36 + cate: 3, //于家为国，2民俗文化, 3主页信息
  37 + page: 1, //第几页
  38 + pagenum: 5, //每页显示几条内容
  39 + starpage:1,
  40 + starnum:10,
  41 + datalist: [], //于家为国,民俗文化,主页信息的数据
  42 + starlist:[],//追思名人数据
38 //底部导航 43 //底部导航
39 - num:1  
40 -  
41 - },  
42 -  
43 -  
44 -  
45 - /**  
46 - * 生命周期函数--监听页面加载  
47 - */  
48 - onLoad: function (options) {  
49 - console.log(this.data.num) 44 + num: 1,
  45 + scroll_height:'556',
  46 + isload:true//是否加载更多
50 }, 47 },
51 //隐藏发布弹出层 48 //隐藏发布弹出层
52 - hideshow(){ 49 + hideshow() {
53 this.setData({ 50 this.setData({
54 - publishshow:false 51 + publishshow: false
55 }) 52 })
56 }, 53 },
57 54
58 - Navigation: function (e) { 55 + Navigation: function(e) {
59 console.log(e) 56 console.log(e)
60 var that = this; 57 var that = this;
61 that.setData({ 58 that.setData({
62 - num:e.currentTarget.dataset.num 59 + num: e.currentTarget.dataset.num
63 }) 60 })
64 - let number=e.currentTarget.dataset.num  
65 - if(number==1){  
66 - wx.navigateTo({ 61 + let number = e.currentTarget.dataset.num
  62 + if (number == 1) {
  63 + wx.reLaunch({
67 url: '../mainindex/mainindex', 64 url: '../mainindex/mainindex',
68 }) 65 })
69 - }else if(number==2){  
70 - console.log(666)  
71 - wx.navigateTo({ 66 + } else if (number == 2) {
  67 + wx.reLaunch({
72 url: '../publicindex/publicindex', 68 url: '../publicindex/publicindex',
73 }) 69 })
74 - } else if (number==3) { 70 + } else if (number == 3) {
75 71
76 that.setData({ 72 that.setData({
77 - publishshow:true,  
78 - num:1 73 + publishshow: true,
  74 + num: 1
79 }) 75 })
80 - }else if (number == 4) {  
81 - wx.navigateTo({ 76 + } else if (number == 4) {
  77 + wx.reLaunch({
82 url: '../mudipageindex/mudipageindex', 78 url: '../mudipageindex/mudipageindex',
83 }) 79 })
84 - }else if(number==5){  
85 - wx.navigateTo({ 80 + } else if (number == 5) {
  81 + wx.reLaunch({
86 url: '../myindex/myindex', 82 url: '../myindex/myindex',
87 }) 83 })
88 } 84 }
89 }, 85 },
90 -  
91 -  
92 -  
93 //搜索页 86 //搜索页
94 - searchlist(){ 87 + searchlist() {
95 wx.navigateTo({ 88 wx.navigateTo({
96 url: '../main/searchpage/searchpage', 89 url: '../main/searchpage/searchpage',
97 }) 90 })
98 }, 91 },
99 //求子 92 //求子
100 - qiuzi(){ 93 + qiuzi() {
101 wx.navigateTo({ 94 wx.navigateTo({
102 url: '../publish/publish', 95 url: '../publish/publish',
103 }) 96 })
104 }, 97 },
105 //求财 98 //求财
106 - qiucai(){ 99 + qiucai() {
107 wx.navigateTo({ 100 wx.navigateTo({
108 url: '../publishbox/wealthhall/wealthhall', 101 url: '../publishbox/wealthhall/wealthhall',
109 }) 102 })
110 }, 103 },
111 //寺庙 104 //寺庙
112 - simiao(){ 105 + simiao() {
113 wx.navigateTo({ 106 wx.navigateTo({
114 url: '../publishbox/treasurehall/treasurehall', 107 url: '../publishbox/treasurehall/treasurehall',
115 }) 108 })
116 }, 109 },
117 - navbarTap: function(e) {  
118 - let that=this; 110 + //顶部导航的切换
  111 + navbarTap: function (e) {
  112 + let that = this;
119 this.setData({ 113 this.setData({
120 currentTab: e.currentTarget.dataset.idx, 114 currentTab: e.currentTarget.dataset.idx,
121 -  
122 }) 115 })
123 - 116 + if (e.currentTarget.dataset.idx == '0') {//主页信息
  117 + this.setData({
  118 + cate: 3,
  119 + datalist: [],
  120 + page:1
  121 + })
  122 + this.getdatalist();
  123 + } else if (e.currentTarget.dataset.idx == '1') {//于家卫国
  124 + this.setData({
  125 + cate: 1,
  126 + datalist: [],
  127 + page:1
  128 + })
  129 + this.getdatalist();
  130 + } else if (e.currentTarget.dataset.idx == '3') {//民俗文化
  131 + this.setData({
  132 + cate: 2,
  133 + datalist:[],
  134 + page:1
  135 + })
  136 + this.getdatalist();
  137 + }
124 }, 138 },
  139 + //获取主页信息，于家为国，民俗文化的数据(cate:1于家为国，2民俗文化,3主页信息)
  140 + getdatalist() {
  141 + let that = this;
  142 + let url = '/api/portal/index/getNewsList';
  143 + let params = {
  144 + cate: that.data.cate,
  145 + page: that.data.page,
  146 + num: that.data.pagenum
  147 + }
  148 + app.post(url, params).then((res) => {
  149 + if(res.length>0){
  150 + let datalist = that.data.datalist;
  151 + let temdata = datalist.concat(res);
  152 + that.setData({
  153 + datalist: temdata,
  154 + isload: true,
  155 + page: parseInt(that.data.page) + 1
  156 + })
  157 + }else{
  158 + that.setData({
  159 + isload: false,//关闭加载更多
  160 + })
  161 + }
125 162
126 - peoplenavbarTap(e){  
127 - console.log(33) 163 + }).catch((err) => {
  164 + console.log(err)
  165 + })
  166 + },
  167 + peoplenavbarTap(e) {
128 let that = this; 168 let that = this;
129 this.setData({ 169 this.setData({
130 currentpeopleTab: e.currentTarget.dataset.peopleidx, 170 currentpeopleTab: e.currentTarget.dataset.peopleidx,
131 -  
132 }) 171 })
133 }, 172 },
  173 + // 下拉加载
  174 + onloading(){
  175 + let that=this;
  176 + if (that.data.isload){
  177 + that.getdatalist();
  178 + }
  179 + },
  180 + //接口：获取演绎明星列表
  181 + getStarList(){
  182 + let url ='/api/portal/index/getStarList';
  183 + let head={
  184 + 'XX-Token': wx.getStorageSync('token')
  185 + }
  186 + let params={
  187 + page: that.data.starpage,
  188 + num:that.data.starnum
  189 + }
  190 + app.post(url, params,head).then((res)=>{
  191 + console.log(res)
  192 + that.setData({
  193 + starlist:res
  194 + })
  195 + }).catch((err)=>{
  196 + console.log(err)
  197 + })
  198 + },
  199 + /**
  200 + * 生命周期函数--监听页面加载
  201 + */
  202 + onLoad: function (options) {
  203 + that = this;
  204 + let windowHeight = wx.getSystemInfoSync().windowHeight // 屏幕的高度
  205 + let windowWidth = wx.getSystemInfoSync().windowWidth // 屏幕的宽度
  206 + this.setData({
  207 + scroll_height: windowHeight * 750 / windowWidth
  208 + })
  209 + this.setData({
  210 + cate: 3,
  211 + datalist: [],
  212 + page: 1,
  213 + starpage:1
  214 + })
  215 + that.getdatalist();
  216 + that.getStarList();
  217 + },
134 /** 218 /**
135 * 生命周期函数--监听页面初次渲染完成 219 * 生命周期函数--监听页面初次渲染完成
136 */ 220 */
137 - onReady: function () { 221 + onReady: function() {
138 222
139 }, 223 },
140 224
141 /** 225 /**
142 * 生命周期函数--监听页面显示 226 * 生命周期函数--监听页面显示
143 */ 227 */
144 - onShow: function () { 228 + onShow: function() {
145 229
146 }, 230 },
147 231
148 /** 232 /**
149 * 生命周期函数--监听页面隐藏 233 * 生命周期函数--监听页面隐藏
150 */ 234 */
151 - onHide: function () { 235 + onHide: function() {
152 236
153 }, 237 },
154 238
155 /** 239 /**
156 * 生命周期函数--监听页面卸载 240 * 生命周期函数--监听页面卸载
157 */ 241 */
158 - onUnload: function () { 242 + onUnload: function() {
159 243
160 }, 244 },
161 245
162 /** 246 /**
163 * 页面相关事件处理函数--监听用户下拉动作 247 * 页面相关事件处理函数--监听用户下拉动作
164 */ 248 */
165 - onPullDownRefresh: function () { 249 + onPullDownRefresh: function() {
166 250
167 }, 251 },
168 252
169 /** 253 /**
170 * 页面上拉触底事件的处理函数 254 * 页面上拉触底事件的处理函数
171 */ 255 */
172 - onReachBottom: function () { 256 + onReachBottom: function() {
173 257
174 }, 258 },
175 259
176 /** 260 /**
177 * 用户点击右上角分享 261 * 用户点击右上角分享
178 */ 262 */
179 - onShareAppMessage: function () { 263 + onShareAppMessage: function() {
180 264
181 } 265 }
182 }) 266 })
1 - <!-- 发布弹出层 --> 1 +<!-- 发布弹出层 -->
  2 +<import src="../template/templates.wxml" />
  3 +<template is="showpublish" data='{{publishshow}}' />
2 4
3 - <import src="../template/templates.wxml" />  
4 - <template is="showpublish" data='{{publishshow}}' />  
5 -<view class="box">  
6 -  
7 -<!-- 底部导航 --> 5 + <!-- 底部导航 -->
8 <import src="../template/templates.wxml" /> 6 <import src="../template/templates.wxml" />
9 <template is="tabBar" data='{{num}}' /> 7 <template is="tabBar" data='{{num}}' />
10 8
11 -  
12 - <view class="search"> 9 + <view class="search mainindex_search">
13 <view class="iconfont icon-sousuo searchicon"></view> 10 <view class="iconfont icon-sousuo searchicon"></view>
14 <view class="search_hospital"> 11 <view class="search_hospital">
15 - <input placeholder="身份证号或纪念堂号" class="enterword" bindinput="searchhospital" bindtap='searchlist'/> 12 + <input placeholder="身份证号或纪念堂号" class="enterword" bindinput="searchhospital" bindtap='searchlist' />
16 </view> 13 </view>
17 -  
18 </view> 14 </view>
19 - <view class="nav"> 15 + <!-- 公告 -->
  16 + <view class="noticeindex">
  17 + 公告
  18 + </view>
  19 + <view class="nav mainindex_nav">
20 <view wx:for="{{navbar}}" data-idx="{{index}}" class="nav_item {{currentTab==index ? 'active' : ''}}" wx:key="unique" bindtap="navbarTap" data-categoryid="{{item.id}}">{{item.name}} 20 <view wx:for="{{navbar}}" data-idx="{{index}}" class="nav_item {{currentTab==index ? 'active' : ''}}" wx:key="unique" bindtap="navbarTap" data-categoryid="{{item.id}}">{{item.name}}
21 </view> 21 </view>
22 </view> 22 </view>
23 -<!--主页信息-->  
24 - <view class="mainpage" hidden="{{currentTab!==0}}">  
25 - <view class="topone"> 23 + <!--主页信息,于国危机,民俗文化-->
  24 + <scroll-view scroll-y='true' bindscrolltolower='onloading' style='height:{{scroll_height}}rpx'>
  25 + <view class="mainpage" wx:if='{{currentTab !== 2}}'>
  26 + <!-- style:1纯文字，2文字加一张图片，3文字加视频第一针，4文字加三张图片 -->
  27 + <navigator wx:for='{{datalist}}' wx:key url='/pages/main/detail/detail?id={{item.id}}' hover-class="none">
  28 + <view class="topone" wx:if='{{item.style=="1"}}'>
26 <view class="toponetext"> 29 <view class="toponetext">
27 - 如果你无法简洁的表达你的想法，那只说明你 还不够了解它。 30 + {{item.title}}
28 </view> 31 </view>
29 <view class="topnonecontent"> 32 <view class="topnonecontent">
30 - <text class="toponetitle">--阿尔伯特·爱因斯坦</text>  
31 - <view class="totop">置顶</view> 33 + <text class="toponetitle">--{{item.author}}</text>
  34 + <view class="totop">{{item.is_top=='0'?'置顶':'取消置顶'}}</view>
32 </view> 35 </view>
33 </view> 36 </view>
34 - <view class="topone"> 37 + <view class="topone" wx:elif='{{item.style=="2"}}'>
35 <view class="toptwo"> 38 <view class="toptwo">
36 <view class="toponetext toptwotext"> 39 <view class="toponetext toptwotext">
37 - 著名反派演员计春华去世，享 年57岁 40 + {{item.title}}
38 </view> 41 </view>
39 <view class="toptwoimg "> 42 <view class="toptwoimg ">
40 - <image src="../../../img/NoPath - 副本 (240)@3x.png"></image> 43 + <image src="{{item.imgs[0]}}"></image>
41 </view> 44 </view>
42 </view> 45 </view>
43 -  
44 -  
45 <view class="topnonecontent"> 46 <view class="topnonecontent">
46 <view class="newsimg"> 47 <view class="newsimg">
47 - <image src="../../../img/news.png"></image> 48 + <image src="http://bronet.wangshuwen.com//news.png"></image>
48 </view> 49 </view>
49 - <text class="toponetitle">人民网</text> 50 + <text class="toponetitle">{{item.author}}</text>
50 <text class="toponetitle" style="margin-left:10rpx">3.2万人祭拜</text> 51 <text class="toponetitle" style="margin-left:10rpx">3.2万人祭拜</text>
51 - <view class="totop">置顶</view> 52 + <view class="totop">{{item.is_top=='0'?'置顶':'取消置顶'}}</view>
52 </view> 53 </view>
53 </view> 54 </view>
54 -  
55 - <view class="topone"> 55 + <view class="topone" wx:elif='{{item.style=="3"}}'>
56 <view class="toponetext"> 56 <view class="toponetext">
57 - 著名反派演员计春华去世，享  
58 -年57岁 57 + {{item.title}}
59 </view> 58 </view>
60 -  
61 - <video id="myVideo" src="http://wxsnsdy.tc.qq.com/105/20210/snsdyvideodownload?filekey=30280201010421301f0201690402534804102ca905ce620b1241b726bc41dcff44e00204012882540400&bizid=1023&hy=SH&fileparam=302c020101042530230204136ffd93020457e3c4ff02024ef202031e8d7f02030f42400204045a320a0201000400" binderror="videoErrorCallback" danmu-list="{{danmuList}}" enable-danmu danmu-btn controls></video> 59 + <video id="myVideo" src="http://wxsnsdy.tc.qq.com/105/20210/snsdyvideodownload?filekey=30280201010421301f0201690402534804102ca905ce620b1241b726bc41dcff44e00204012882540400&bizid=1023&hy=SH&fileparam=302c020101042530230204136ffd93020457e3c4ff02024ef202031e8d7f02030f42400204045a320a0201000400"
  60 + binderror="videoErrorCallback" danmu-list="{{danmuList}}" enable-danmu danmu-btn controls></video>
62 61
63 <view class="topnonecontent"> 62 <view class="topnonecontent">
64 63
65 <view class="newsimg"> 64 <view class="newsimg">
66 - <image src="../../../img/news.png"></image> 65 + <image src="http://bronet.wangshuwen.com//news.png"></image>
67 </view> 66 </view>
68 - <text class="toponetitle">人民网</text> 67 + <text class="toponetitle">{{item.author}}</text>
69 <text class="toponetitle" style="margin-left:10rpx">3.2万人祭拜</text> 68 <text class="toponetitle" style="margin-left:10rpx">3.2万人祭拜</text>
70 -  
71 -  
72 - </view>  
73 -  
74 - </view>  
75 -  
76 - <view class="topone">  
77 - <view class="toptwo">  
78 - <view class="toponetext toptwotext">  
79 - 每逢佳节倍思亲，为家人加个 纪念馆  
80 </view> 69 </view>
81 - <view class="toptwoimg ">  
82 - <image src="../../../img/NoPath - 副本 (240)@3x.png"></image>  
83 - </view>  
84 - </view>  
85 -  
86 </view> 70 </view>
87 -  
88 -  
89 - <view class="topone praylist">  
90 - <view class="prayimg">  
91 -  
92 - <image src="../../../img/组 4218@3x.png"></image>  
93 -  
94 - </view>  
95 - <view class="prayimg">  
96 -  
97 - <image src="../../../img/组 4218@3x.png"></image>  
98 -  
99 - </view>  
100 - <view class="prayimg">  
101 -  
102 - <image src="../../../img/组 4218@3x.png"></image>  
103 -  
104 - </view>  
105 - </view>  
106 -  
107 - <view class="tourlist">  
108 - <view class="touristname">十一黄金周数万名游客齐聚西纸坊，共享民俗文化盛宴</view>  
109 - 71 + <view class="tourlist" wx:elif='{{item.style=="4"}}'>
  72 + <view class="touristname">{{item.title}}</view>
110 <view class="tourlistimglist"> 73 <view class="tourlistimglist">
111 -  
112 - <view class="tourlistimg">  
113 - <image src="../../../img/product_04@3x.png"></image>  
114 - 74 + <view class="tourlistimg" wx:for='{{item.imgs}}' wx:key >
  75 + <image src="{{item}}"></image>
115 </view> 76 </view>
116 - <view class="tourlistimg">  
117 - <image src="../../../img/product_04@3x.png"></image>  
118 -  
119 </view> 77 </view>
120 - <view class="tourlistimg">  
121 - <image src="../../../img/product_04@3x.png"></image>  
122 -  
123 - </view>  
124 -  
125 - </view>  
126 -  
127 78
128 <view class="carfrienditem"> 79 <view class="carfrienditem">
129 <view class="carfriend"></view> 80 <view class="carfriend"></view>
130 - <view class="carfriendname">车友之家 1小时前</view> 81 + <view class="carfriendname">{{item.author}} 1小时前</view>
131 </view> 82 </view>
132 -  
133 </view> 83 </view>
134 - <view class="festivalname">  
135 -  
136 - 每逢佳节倍思亲，为家人加个纪念馆  
137 -  
138 - <view class="noticeindex">  
139 - 公告  
140 - </view>  
141 -  
142 84
  85 + </navigator>
143 </view> 86 </view>
144 -  
145 - </view>  
146 -<!--于家为国-->  
147 - <view hidden="{{currentTab!==1}}">  
148 -  
149 -  
150 -  
151 - <view class="topone">  
152 - <view class="toponetext">  
153 - 如果你无法简洁的表达你的想法，那只说明你 还不够了解它。  
154 - </view>  
155 - <view class="topnonecontent">  
156 - <text class="toponetitle">--阿尔伯特·爱因斯坦</text>  
157 -  
158 - <view class="totop">置顶</view>  
159 - </view>  
160 - </view>  
161 -  
162 - <view class="topone">  
163 - <view class="toptwo">  
164 - <view class="toponetext toptwotext">  
165 - 著名反派演员计春华去世，享 年57岁  
166 - </view>  
167 - <view class="toptwoimg ">  
168 - <image src="../../../img/NoPath - 副本 (240)@3x.png"></image>  
169 - </view>  
170 - </view>  
171 -  
172 -  
173 - <view class="topnonecontent">  
174 -  
175 - <view class="newsimg">  
176 - <image src="../../../img/news.png"></image>  
177 - </view>  
178 - <text class="toponetitle">人民网</text>  
179 - <text class="toponetitle" style="margin-left:10rpx">3.2万人祭拜</text>  
180 -  
181 - <view class="totop">置顶</view>  
182 - </view>  
183 - </view>  
184 -  
185 - <view class="topone">  
186 - <view class="toponetext">  
187 - 著名反派演员计春华去世，享 年57岁  
188 - </view>  
189 -  
190 - <video id="myVideo" src="http://wxsnsdy.tc.qq.com/105/20210/snsdyvideodownload?filekey=30280201010421301f0201690402534804102ca905ce620b1241b726bc41dcff44e00204012882540400&bizid=1023&hy=SH&fileparam=302c020101042530230204136ffd93020457e3c4ff02024ef202031e8d7f02030f42400204045a320a0201000400" binderror="videoErrorCallback" danmu-list="{{danmuList}}" enable-danmu danmu-btn controls></video>  
191 -  
192 -  
193 -  
194 - <view class="topnonecontent">  
195 -  
196 - <view class="newsimg">  
197 - <image src="../../../img/news.png"></image>  
198 - </view>  
199 - <text class="toponetitle">人民网</text>  
200 - <text class="toponetitle" style="margin-left:10rpx">3.2万人祭拜</text>  
201 -  
202 -  
203 - </view>  
204 - <view class="homenoticeindex ">  
205 - 公告  
206 - </view>  
207 -  
208 - </view>  
209 -  
210 -  
211 - </view>  
212 -  
213 <!--追思名人--> 87 <!--追思名人-->
214 - <view hidden="{{currentTab!==2}}"> 88 + <view wx:else>
215 <view class="peoplenav"> 89 <view class="peoplenav">
216 <view wx:for="{{peoplenav}}" data-peopleidx="{{index}}" class="peoplenav_item {{currentpeopleTab==index ? 'peopleactive' : ''}}" wx:key="unique" bindtap="peoplenavbarTap">{{item.name}} 90 <view wx:for="{{peoplenav}}" data-peopleidx="{{index}}" class="peoplenav_item {{currentpeopleTab==index ? 'peopleactive' : ''}}" wx:key="unique" bindtap="peoplenavbarTap">{{item.name}}
217 </view> 91 </view>
218 </view> 92 </view>
219 -  
220 -  
221 <view class="peoplelist"> 93 <view class="peoplelist">
222 - <view class="peoplelistitem"> 94 + <view class="peoplelistitem" wx:for='{{starlist}}' wx:key>
223 <view class="peoplelistitemimg"> 95 <view class="peoplelistitemimg">
224 - <image src="../../../img/product_05@3x.png"></image> 96 + <image src="http://bronet.wangshuwen.com//product_05@3x.png"></image>
225 </view> 97 </view>
226 98
227 99
@@ -236,167 +108,15 @@ @@ -236,167 +108,15 @@
236 108
237 </view> 109 </view>
238 </view> 110 </view>
239 - <view class="peoplelistitem">  
240 - <view class="peoplelistitemimg">  
241 - <image src="../../../img/product_05@3x.png"></image>  
242 - </view>  
243 -  
244 - <view class="peoplecall">  
245 - <text class="peoplecallname">邓丽君</text>  
246 - <text class="peoplecalldate">诞辰24周年</text>  
247 - </view>  
248 - <view class="attentionlist">  
249 - <view class="attention">关注</view>  
250 - <view class="totop">置顶</view>  
251 -  
252 111
253 - </view>  
254 - </view>  
255 - <view class="peoplelistitem">  
256 - <view class="peoplelistitemimg">  
257 - <image src="../../../img/product_05@3x.png"></image>  
258 - </view>  
259 112
260 - <view class="peoplecall">  
261 - <text class="peoplecallname">邓丽君</text>  
262 - <text class="peoplecalldate">诞辰24周年</text>  
263 - </view>  
264 - <view class="attentionlist">  
265 - <view class="attention">关注</view>  
266 - <view class="totop">置顶</view>  
267 113
268 114
269 </view> 115 </view>
270 </view> 116 </view>
271 - <view class="peoplelistitem">  
272 - <view class="peoplelistitemimg">  
273 - <image src="../../../img/product_05@3x.png"></image>  
274 - </view>  
275 -  
276 - <view class="peoplecall">  
277 - <text class="peoplecallname">邓丽君</text>  
278 - <text class="peoplecalldate">诞辰24周年</text>  
279 - </view>  
280 - <view class="attentionlist">  
281 - <view class="attention">关注</view>  
282 - <view class="totop">置顶</view> 117 + </scroll-view>
283 118
284 119
285 - </view>  
286 - </view>  
287 - <view class="peoplelistitem">  
288 - <view class="peoplelistitemimg">  
289 - <image src="../../../img/product_05@3x.png"></image>  
290 - </view>  
291 120
292 - <view class="peoplecall">  
293 - <text class="peoplecallname">邓丽君</text>  
294 - <text class="peoplecalldate">诞辰24周年</text>  
295 - </view>  
296 - <view class="attentionlist">  
297 - <view class="attention">关注</view>  
298 - <view class="totop">置顶</view>  
299 -  
300 -  
301 - </view>  
302 - </view>  
303 - </view>  
304 - </view>  
305 -  
306 - <!--民俗文化-->  
307 -  
308 - <view hidden="{{currentTab!==3}}">  
309 - <view class="topone">  
310 - <view class="toptwo">  
311 - <view class="toponetext toptwotext folktext">  
312 - 著名反派演员计春华去世，享 年57岁  
313 - </view>  
314 - <view class="toptwoimg folkimg">  
315 - <image src="../../../img/组 4219@3x.png"></image>  
316 - </view>  
317 - </view>  
318 121
319 122
320 - <view class="topnonecontent">  
321 -  
322 - <view class="newsimg">  
323 - <image src="../../../img/news.png"></image>  
324 - </view>  
325 - <text class="toponetitle folktitle">人民网</text>  
326 - <text class="toponetitle folktitle" style="margin-left:10rpx">1小时前</text>  
327 -  
328 - </view>  
329 - </view>  
330 - <view class="topone">  
331 - <view class="toptwo">  
332 - <view class="toponetext toptwotext folktext">  
333 - 著名反派演员计春华去世，享 年57岁  
334 - </view>  
335 - <view class="toptwoimg folkimg">  
336 - <image src="../../../img/组 4219@3x.png"></image>  
337 - </view>  
338 - </view>  
339 -  
340 -  
341 - <view class="topnonecontent">  
342 -  
343 - <view class="newsimg">  
344 - <image src="../../../img/news.png"></image>  
345 - </view>  
346 - <text class="toponetitle folktitle">人民网</text>  
347 - <text class="toponetitle folktitle" style="margin-left:10rpx">1小时前</text>  
348 -  
349 - </view>  
350 - </view>  
351 - <view class="topone">  
352 - <view class="toptwo">  
353 - <view class="toponetext toptwotext folktext">  
354 - 著名反派演员计春华去世，享 年57岁  
355 - </view>  
356 - <view class="toptwoimg folkimg">  
357 - <image src="../../../img/组 4219@3x.png"></image>  
358 - </view>  
359 - </view>  
360 -  
361 -  
362 - <view class="topnonecontent">  
363 -  
364 - <view class="newsimg">  
365 - <image src="../../../img/news.png"></image>  
366 - </view>  
367 - <text class="toponetitle folktitle">人民网</text>  
368 - <text class="toponetitle folktitle" style="margin-left:10rpx">1小时前</text>  
369 -  
370 - </view>  
371 - </view>  
372 -  
373 - <view class="tourlist">  
374 - <view class="touristname">十一黄金周数万名游客齐聚西纸坊，共享民俗文化盛宴</view>  
375 -  
376 - <view class="tourlistimglist">  
377 -  
378 - <view class="tourlistimg">  
379 - <image src="../../../img/product_04@3x.png"></image>  
380 -  
381 - </view>  
382 - <view class="tourlistimg">  
383 - <image src="../../../img/product_04@3x.png"></image>  
384 -  
385 - </view>  
386 - <view class="tourlistimg">  
387 - <image src="../../../img/product_04@3x.png"></image>  
388 -  
389 - </view>  
390 -  
391 - </view>  
392 -  
393 -  
394 - <view class="carfrienditem">  
395 - <view class="carfriend"></view>  
396 - <view class="carfriendname">车友之家 1小时前</view>  
397 - </view>  
398 -  
399 - </view>  
400 -  
401 - </view>  
402 -</view>  
1 @import '../template/templates.wxss'; 1 @import '../template/templates.wxss';
2 @import '../icon/icon.wxss'; 2 @import '../icon/icon.wxss';
3 - 3 +page{
  4 + padding:0 0 120rpx 0;
  5 +}
4 .register{ 6 .register{
5 width: 100%; 7 width: 100%;
6 height: 100%; 8 height: 100%;
@@ -17,11 +19,6 @@ @@ -17,11 +19,6 @@
17 border-radius: 10px; 19 border-radius: 10px;
18 position: absolute; 20 position: absolute;
19 z-index: 6; 21 z-index: 6;
20 - /*left:0.4rem;*/  
21 - /*top: 3rem;*/  
22 -  
23 - /* left:50%;  
24 - transform: translate(-50%,-50%); */  
25 left:0; 22 left:0;
26 right:0; 23 right:0;
27 margin: 0 auto; 24 margin: 0 auto;
@@ -31,7 +28,6 @@ @@ -31,7 +28,6 @@
31 justify-content: space-between; 28 justify-content: space-between;
32 padding: 0 30rpx; 29 padding: 0 30rpx;
33 box-sizing: border-box; 30 box-sizing: border-box;
34 -  
35 } 31 }
36 .cancelpublic{ 32 .cancelpublic{
37 width:96rpx; 33 width:96rpx;
@@ -99,12 +95,12 @@ @@ -99,12 +95,12 @@
99 } 95 }
100 96
101 .nav { 97 .nav {
102 -height:60rpx; 98 +height:100rpx;
103 display:flex; 99 display:flex;
104 justify-content:space-between; 100 justify-content:space-between;
105 align-items: center; 101 align-items: center;
106 text-align:center; 102 text-align:center;
107 - 103 +box-sizing: border-box;
108 padding:20rpx 20rpx; 104 padding:20rpx 20rpx;
109 background:#fff; 105 background:#fff;
110 border-bottom:1rpx solid #f5f5f5; 106 border-bottom:1rpx solid #f5f5f5;
@@ -156,13 +152,16 @@ position:relative; @@ -156,13 +152,16 @@ position:relative;
156 font-size: 32rpx; 152 font-size: 32rpx;
157 } 153 }
158 .totop{ 154 .totop{
159 - width:60rpx; 155 + /* width:60rpx; */
160 height:32rpx; 156 height:32rpx;
  157 + padding:0 10rpx;
  158 + box-sizing: border-box;
161 border:1px solid rgba(149,27,27,1); 159 border:1px solid rgba(149,27,27,1);
162 - opacity:1; 160 + display: flex;
  161 + justify-content: center;
  162 + align-items: center;
163 font-size: 23rpx; 163 font-size: 23rpx;
164 text-align: center; 164 text-align: center;
165 - line-height: 32rpx;  
166 margin-left: 22rpx; 165 margin-left: 22rpx;
167 color:#951B1B; 166 color:#951B1B;
168 border-radius:4rpx; 167 border-radius:4rpx;
@@ -263,6 +262,10 @@ video{ @@ -263,6 +262,10 @@ video{
263 position: relative; 262 position: relative;
264 } 263 }
265 .noticeindex{ 264 .noticeindex{
  265 + position: fixed;
  266 + bottom:10%;
  267 + left:0;
  268 + z-index:2;
266 width:50rpx; 269 width:50rpx;
267 height:120rpx; 270 height:120rpx;
268 font-size: 34rpx; 271 font-size: 34rpx;
@@ -273,12 +276,6 @@ opacity:1; @@ -273,12 +276,6 @@ opacity:1;
273 border-radius:0rpx 3rpx 3rpx 0rpx; 276 border-radius:0rpx 3rpx 3rpx 0rpx;
274 text-align: center; 277 text-align: center;
275 line-height:60rpx; 278 line-height:60rpx;
276 -position: absolute;  
277 -top:14rpx;  
278 -left:0;  
279 -  
280 -  
281 -  
282 } 279 }
283 .homenoticeindex{ 280 .homenoticeindex{
284 width:50rpx; 281 width:50rpx;
@@ -382,3 +379,17 @@ left:0; @@ -382,3 +379,17 @@ left:0;
382 .folktitle{ 379 .folktitle{
383 font-size: 22rpx; 380 font-size: 22rpx;
384 } 381 }
  382 +.mainindex_search{
  383 +position: fixed;
  384 +top:0;
  385 +left:0;
  386 +width:100%;
  387 +z-index:2;
  388 +}
  389 +.mainindex_nav{
  390 +position: fixed;
  391 +top:64rpx;
  392 +left:0;
  393 +width:100%;
  394 +z-index:2;
  395 +}
@@ -5,90 +5,89 @@ Page({ @@ -5,90 +5,89 @@ Page({
5 * 页面的初始数据 5 * 页面的初始数据
6 */ 6 */
7 data: { 7 data: {
8 - publishshow:false, 8 + publishshow: false,
9 //底部导航 9 //底部导航
10 - num:4 10 + num: 4
11 11
12 }, 12 },
13 13
  14 +
14 /** 15 /**
15 * 生命周期函数--监听页面加载 16 * 生命周期函数--监听页面加载
16 */ 17 */
17 - onLoad: function (options) { 18 + onLoad: function(options) {
18 19
19 }, 20 },
20 //关注墓地 21 //关注墓地
21 - attentionmudi(){ 22 + attentionmudi() {
22 wx.navigateTo({ 23 wx.navigateTo({
23 url: '../newcemetery/attentionmudi/attentionmudi', 24 url: '../newcemetery/attentionmudi/attentionmudi',
24 }) 25 })
25 }, 26 },
26 //使用帮助 27 //使用帮助
27 - usehelp(){ 28 + usehelp() {
28 wx.navigateTo({ 29 wx.navigateTo({
29 url: '../newcemetery/usehelp/usehelp', 30 url: '../newcemetery/usehelp/usehelp',
30 }) 31 })
31 }, 32 },
32 //我的祖祠 33 //我的祖祠
33 - myzuci(){ 34 + myzuci() {
34 wx.navigateTo({ 35 wx.navigateTo({
35 url: '../newcemetery/wodezuci/wodezuci', 36 url: '../newcemetery/wodezuci/wodezuci',
36 }) 37 })
37 }, 38 },
38 39
39 //已建墓地 40 //已建墓地
40 - alreadymudi(){ 41 + alreadymudi() {
41 wx.navigateTo({ 42 wx.navigateTo({
42 url: '../newcemetery/mudilist/mudilist', 43 url: '../newcemetery/mudilist/mudilist',
43 }) 44 })
44 }, 45 },
45 -//新建墓地  
46 - newnudi(){ 46 + //新建墓地
  47 + newnudi() {
47 wx.navigateTo({ 48 wx.navigateTo({
48 url: '../newcemetery/newmudi/newmudi', 49 url: '../newcemetery/newmudi/newmudi',
49 }) 50 })
50 }, 51 },
51 //隐藏发布弹出层 52 //隐藏发布弹出层
52 - hideshow(){ 53 + hideshow() {
53 this.setData({ 54 this.setData({
54 - publishshow:false 55 + publishshow: false
55 }) 56 })
56 }, 57 },
57 -  
58 - Navigation: function (e) { 58 +//底部导航的切换
  59 + Navigation: function(e) {
59 console.log(e) 60 console.log(e)
60 var that = this; 61 var that = this;
61 that.setData({ 62 that.setData({
62 - num:e.currentTarget.dataset.num 63 + num: e.currentTarget.dataset.num
63 }) 64 })
64 - let number=e.currentTarget.dataset.num  
65 - if(number==1){  
66 - wx.navigateTo({ 65 + let number = e.currentTarget.dataset.num
  66 + if (number == 1) {
  67 + wx.reLaunch({
67 url: '../mainindex/mainindex', 68 url: '../mainindex/mainindex',
68 }) 69 })
69 - }else if(number==2){ 70 + } else if (number == 2) {
70 console.log(666) 71 console.log(666)
71 - wx.navigateTo({ 72 + wx.reLaunch({
72 url: '../publicindex/publicindex', 73 url: '../publicindex/publicindex',
73 }) 74 })
74 - } else if (number==3) { 75 + } else if (number == 3) {
75 76
76 that.setData({ 77 that.setData({
77 - publishshow:true,  
78 - num:1 78 + publishshow: true,
  79 + num: 1
79 }) 80 })
80 - }else if (number == 4) {  
81 - wx.navigateTo({ 81 + } else if (number == 4) {
  82 + wx.reLaunch({
82 url: '../mudipageindex/mudipageindex', 83 url: '../mudipageindex/mudipageindex',
83 }) 84 })
84 - }else if(number==5){  
85 - wx.navigateTo({ 85 + } else if (number == 5) {
  86 + wx.reLaunch({
86 url: '../myindex/myindex', 87 url: '../myindex/myindex',
87 }) 88 })
88 } 89 }
89 }, 90 },
90 -  
91 -  
92 btn_index() { 91 btn_index() {
93 wx.navigateTo({ 92 wx.navigateTo({
94 url: '../index/index', 93 url: '../index/index',
@@ -107,49 +106,49 @@ Page({ @@ -107,49 +106,49 @@ Page({
107 /** 106 /**
108 * 生命周期函数--监听页面初次渲染完成 107 * 生命周期函数--监听页面初次渲染完成
109 */ 108 */
110 - onReady: function () { 109 + onReady: function() {
111 110
112 }, 111 },
113 112
114 /** 113 /**
115 * 生命周期函数--监听页面显示 114 * 生命周期函数--监听页面显示
116 */ 115 */
117 - onShow: function () { 116 + onShow: function() {
118 117
119 }, 118 },
120 119
121 /** 120 /**
122 * 生命周期函数--监听页面隐藏 121 * 生命周期函数--监听页面隐藏
123 */ 122 */
124 - onHide: function () { 123 + onHide: function() {
125 124
126 }, 125 },
127 126
128 /** 127 /**
129 * 生命周期函数--监听页面卸载 128 * 生命周期函数--监听页面卸载
130 */ 129 */
131 - onUnload: function () { 130 + onUnload: function() {
132 131
133 }, 132 },
134 133
135 /** 134 /**
136 * 页面相关事件处理函数--监听用户下拉动作 135 * 页面相关事件处理函数--监听用户下拉动作
137 */ 136 */
138 - onPullDownRefresh: function () { 137 + onPullDownRefresh: function() {
139 138
140 }, 139 },
141 140
142 /** 141 /**
143 * 页面上拉触底事件的处理函数 142 * 页面上拉触底事件的处理函数
144 */ 143 */
145 - onReachBottom: function () { 144 + onReachBottom: function() {
146 145
147 }, 146 },
148 147
149 /** 148 /**
150 * 用户点击右上角分享 149 * 用户点击右上角分享
151 */ 150 */
152 - onShareAppMessage: function () { 151 + onShareAppMessage: function() {
153 152
154 } 153 }
155 }) 154 })
@@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@
13 <view class='c_right' bindtap="usehelp"> 13 <view class='c_right' bindtap="usehelp">
14 <!-- 图标 --> 14 <!-- 图标 -->
15 <view class='c_icon'> 15 <view class='c_icon'>
16 - <image src='../../img/add_02@3x.png' ></image> 16 + <image src='http://bronet.wangshuwen.com/add_02@3x.png' ></image>
17 </view> 17 </view>
18 <!-- 使用帮助 --> 18 <!-- 使用帮助 -->
19 <view class='c_text'> 19 <view class='c_text'>
@@ -24,7 +24,7 @@ @@ -24,7 +24,7 @@
24 <view class='d' bindtap="myzuci"> 24 <view class='d' bindtap="myzuci">
25 <!-- 图片 --> 25 <!-- 图片 -->
26 26
27 - <image src='../../img/ancestors@3x.png'></image> 27 + <image src='http://bronet.wangshuwen.com/ancestors@3x.png'></image>
28 <!-- 文字 --> 28 <!-- 文字 -->
29 <view class='d_text'> 29 <view class='d_text'>
30 <!-- 我的祖祠： --> 30 <!-- 我的祖祠： -->
@@ -35,7 +35,7 @@ @@ -35,7 +35,7 @@
35 <!-- 查看 --> 35 <!-- 查看 -->
36 <view class='d_text_right'> 36 <view class='d_text_right'>
37 <view>查看</view> 37 <view>查看</view>
38 - <!-- <image src='../../img/more@3x.png'></image> --> 38 + <!-- <image src='http://bronet.wangshuwen.com//more@3x.png'></image> -->
39 <view class='iconfont icon-jinru'></view> 39 <view class='iconfont icon-jinru'></view>
40 </view> 40 </view>
41 </view> 41 </view>
@@ -45,7 +45,7 @@ @@ -45,7 +45,7 @@
45 <view class='f_model' bindtap="newnudi"> 45 <view class='f_model' bindtap="newnudi">
46 <!-- 图片 --> 46 <!-- 图片 -->
47 <view class='f_model_img' bindtap='btn_newmd'> 47 <view class='f_model_img' bindtap='btn_newmd'>
48 - <image src='../../img/mu_01@3x.png'></image> 48 + <image src='http://bronet.wangshuwen.com/mu_01@3x.png'></image>
49 </view> 49 </view>
50 <!-- 文字 --> 50 <!-- 文字 -->
51 <view class='f_model_text'> 51 <view class='f_model_text'>
@@ -55,7 +55,7 @@ @@ -55,7 +55,7 @@
55 <view class='f_model' bindtap="alreadymudi"> 55 <view class='f_model' bindtap="alreadymudi">
56 <!-- 图片 --> 56 <!-- 图片 -->
57 <view class='f_model_img' bindtap='btn_oldmd'> 57 <view class='f_model_img' bindtap='btn_oldmd'>
58 - <image src='../../img/mu_02@3x.png'></image> 58 + <image src='http://bronet.wangshuwen.com/mu_02@3x.png'></image>
59 </view> 59 </view>
60 <!-- 文字 --> 60 <!-- 文字 -->
61 <view class='f_model_text'> 61 <view class='f_model_text'>
@@ -65,7 +65,7 @@ @@ -65,7 +65,7 @@
65 <view class='f_model' bindtap="attentionmudi"> 65 <view class='f_model' bindtap="attentionmudi">
66 <!-- 图片 --> 66 <!-- 图片 -->
67 <view class='f_model_img'> 67 <view class='f_model_img'>
68 - <image src='../../img/mu_03@3x.png'></image> 68 + <image src='http://bronet.wangshuwen.com/mu_03@3x.png'></image>
69 </view> 69 </view>
70 <!-- 文字 --> 70 <!-- 文字 -->
71 <view class='f_model_text'> 71 <view class='f_model_text'>
@@ -73,62 +73,7 @@ @@ -73,62 +73,7 @@
73 </view> 73 </view>
74 </view> 74 </view>
75 </view> 75 </view>
76 - <!-- 底层按钮实现 -->  
77 - <!--<view class='g'>-->  
78 - <!--<view class='g_item' bindtap='btn_index'>-->  
79 - <!--&lt;!&ndash; 图片 &ndash;&gt;-->  
80 - <!--<view class='g_icon'>-->  
81 - <!--<image src='../../img/nav_01@3x.png'></image>-->  
82 - <!--</view>-->  
83 - <!--&lt;!&ndash; 文字 &ndash;&gt;-->  
84 - <!--<view class='g_item_text'>-->  
85 - <!--<text>首页</text>-->  
86 - <!--</view>-->  
87 - <!--</view>-->  
88 - <!--<view class='g_item' bindtap='btn_index'>-->  
89 - <!--&lt;!&ndash; 图片 &ndash;&gt;-->  
90 - <!--<view class='g_icon'>-->  
91 - <!--<image src='../../img/nav_02@3x.png'></image>-->  
92 - <!--</view>-->  
93 - <!--&lt;!&ndash; 文字 &ndash;&gt;-->  
94 - <!--<view class='g_item_text'>-->  
95 - <!--<text>公祭</text>-->  
96 - <!--</view>-->  
97 - <!--</view>-->  
98 - <!--&lt;!&ndash; 发布 &ndash;&gt;-->  
99 - <!--<view class='g_item g_item_big' bindtap='btn_index'>-->  
100 - <!--&lt;!&ndash; 图片 &ndash;&gt;-->  
101 - <!--<view class='g_icon g_icon_big'>-->  
102 - <!--<image src='../../img/nav_03@3x.png'></image>-->  
103 - <!--</view>-->  
104 - <!--&lt;!&ndash; 文字 &ndash;&gt;-->  
105 - <!--<view class='g_item_text g_item_text_big'>-->  
106 - <!--<text>发布</text>-->  
107 - <!--</view>-->  
108 - <!--</view>-->  
109 76
110 - <!--<view class='g_item' bindtap='btn_index'>-->  
111 - <!--&lt;!&ndash; 图片 &ndash;&gt;-->  
112 - <!--<view class='g_icon g_icon-on'>-->  
113 - <!--<image src='../../img/nav_04_fill@3x.png'></image>-->  
114 - <!--</view>-->  
115 - <!--&lt;!&ndash; 文字 &ndash;&gt;-->  
116 - <!--<view class='g_item_text'>-->  
117 - <!--<text>墓地</text>-->  
118 - <!--</view>-->  
119 - <!--</view>-->  
120 -  
121 - <!--<view class='g_item' bindtap='btn_index'>-->  
122 - <!--&lt;!&ndash; 图片 &ndash;&gt;-->  
123 - <!--<view class='g_icon'>-->  
124 - <!--<image src='../../img/nav_05@3x.png'></image>-->  
125 - <!--</view>-->  
126 - <!--&lt;!&ndash; 文字 &ndash;&gt;-->  
127 - <!--<view class='g_item_text'>-->  
128 - <!--<text>我的</text>-->  
129 - <!--</view>-->  
130 - <!--</view>-->  
131 - <!--</view>-->  
132 </view> 77 </view>
133 </view> 78 </view>
134 79
1 -  
2 <!-- 底部导航 --> 1 <!-- 底部导航 -->
3 - <import src="../template/templates.wxml" />  
4 - <template is="tabBar" data='{{num}}' /> 2 +<import src="../template/templates.wxml" />
  3 +<template is="tabBar" data='{{num}}' />
5 <view class="myhead"> 4 <view class="myhead">
6 <view class="myheadimg"> 5 <view class="myheadimg">
7 - <image src="../../img/wish_02@3x.png"></image> 6 + <image src="http://bronet.wangshuwen.com//wish_02@3x.png"></image>
8 </view> 7 </view>
9 <view class="myinfo"> 8 <view class="myinfo">
10 <view class="myheadname">朱晓明</view> 9 <view class="myheadname">朱晓明</view>
@@ -15,7 +14,7 @@ @@ -15,7 +14,7 @@
15 <view class="mymoneyitem"> 14 <view class="mymoneyitem">
16 <view class="mymoneyhappy"> 15 <view class="mymoneyhappy">
17 <view class="mymoneyimg"> 16 <view class="mymoneyimg">
18 - <image src="../../img/组 4396@3x.png"></image> 17 + <image src="http://bronet.wangshuwen.com//组 4396@3x.png"></image>
19 </view> 18 </view>
20 <view class="mymoneynum">安乐币</view> 19 <view class="mymoneynum">安乐币</view>
21 </view> 20 </view>
@@ -26,7 +25,7 @@ @@ -26,7 +25,7 @@
26 <view class="mymoneyitem"> 25 <view class="mymoneyitem">
27 <view class="mymoneyhappy"> 26 <view class="mymoneyhappy">
28 <view class="mymoneyimg"> 27 <view class="mymoneyimg">
29 - <image src="../../img/组 4396@3x.png"></image> 28 + <image src="http://bronet.wangshuwen.com//组 4396@3x.png"></image>
30 </view> 29 </view>
31 <view class="mymoneynum">金币</view> 30 <view class="mymoneynum">金币</view>
32 </view> 31 </view>
@@ -40,18 +39,18 @@ @@ -40,18 +39,18 @@
40 <view class="listitem"> 39 <view class="listitem">
41 <view class="listitempic"> 40 <view class="listitempic">
42 <view class="listitemimg"> 41 <view class="listitemimg">
43 - <image src="../../img/pro_01@3x.png"></image> 42 + <image src="http://bronet.wangshuwen.com//pro_01@3x.png"></image>
44 </view> 43 </view>
45 <view class="listitemname">我的亲友</view> 44 <view class="listitemname">我的亲友</view>
46 </view> 45 </view>
47 <view class="iconfont icon-xiangyou"></view> 46 <view class="iconfont icon-xiangyou"></view>
48 47
49 48
50 -</view> 49 + </view>
51 <view class="listitem"> 50 <view class="listitem">
52 <view class="listitempic"> 51 <view class="listitempic">
53 <view class="listitemimg"> 52 <view class="listitemimg">
54 - <image src="../../img/pro_02@3x.png"></image> 53 + <image src="http://bronet.wangshuwen.com//pro_02@3x.png"></image>
55 </view> 54 </view>
56 <view class="listitemname">我的礼簿</view> 55 <view class="listitemname">我的礼簿</view>
57 </view> 56 </view>
@@ -62,7 +61,7 @@ @@ -62,7 +61,7 @@
62 <view class="listitem"> 61 <view class="listitem">
63 <view class="listitempic"> 62 <view class="listitempic">
64 <view class="listitemimg"> 63 <view class="listitemimg">
65 - <image src="../../img/pro_02@3x.png"></image> 64 + <image src="http://bronet.wangshuwen.com//pro_02@3x.png"></image>
66 </view> 65 </view>
67 <view class="listitemname">我的订单</view> 66 <view class="listitemname">我的订单</view>
68 </view> 67 </view>
@@ -73,7 +72,7 @@ @@ -73,7 +72,7 @@
73 <view class="listitem"> 72 <view class="listitem">
74 <view class="listitempic"> 73 <view class="listitempic">
75 <view class="listitemimg"> 74 <view class="listitemimg">
76 - <image src="../../img/icon-test@3x.png"></image> 75 + <image src="http://bronet.wangshuwen.com//icon-test@3x.png"></image>
77 </view> 76 </view>
78 <view class="listitemname"> 77 <view class="listitemname">
79 我的消息 78 我的消息
@@ -87,7 +86,7 @@ @@ -87,7 +86,7 @@
87 <view class="listitem"> 86 <view class="listitem">
88 <view class="listitempic"> 87 <view class="listitempic">
89 <view class="listitemimg"> 88 <view class="listitemimg">
90 - <image src="../../img/pro_03@3x.png"></image> 89 + <image src="http://bronet.wangshuwen.com//pro_03@3x.png"></image>
91 </view> 90 </view>
92 <view class="listitemname">已购祭品</view> 91 <view class="listitemname">已购祭品</view>
93 </view> 92 </view>
@@ -98,7 +97,7 @@ @@ -98,7 +97,7 @@
98 <view class="listitem"> 97 <view class="listitem">
99 <view class="listitempic"> 98 <view class="listitempic">
100 <view class="listitemimg"> 99 <view class="listitemimg">
101 - <image src="../../img/pro_04@3x.png"></image> 100 + <image src="http://bronet.wangshuwen.com//pro_04@3x.png"></image>
102 </view> 101 </view>
103 <view class="listitemname">收获地址</view> 102 <view class="listitemname">收获地址</view>
104 </view> 103 </view>
@@ -109,7 +108,7 @@ @@ -109,7 +108,7 @@
109 <view class="listitem"> 108 <view class="listitem">
110 <view class="listitempic"> 109 <view class="listitempic">
111 <view class="listitemimg"> 110 <view class="listitemimg">
112 - <image src="../../img/pro_05@3x.png"></image> 111 + <image src="http://bronet.wangshuwen.com//pro_05@3x.png"></image>
113 </view> 112 </view>
114 <view class="listitemname">我的店铺</view> 113 <view class="listitemname">我的店铺</view>
115 </view> 114 </view>
@@ -120,7 +119,7 @@ @@ -120,7 +119,7 @@
120 <view class="listitem"> 119 <view class="listitem">
121 <view class="listitempic"> 120 <view class="listitempic">
122 <view class="listitemimg"> 121 <view class="listitemimg">
123 - <image src="../../img/pro_06@3x.png"></image> 122 + <image src="http://bronet.wangshuwen.com//pro_06@3x.png"></image>
124 </view> 123 </view>
125 <view class="listitemname">关于我们</view> 124 <view class="listitemname">关于我们</view>
126 </view> 125 </view>
@@ -128,22 +127,20 @@ @@ -128,22 +127,20 @@
128 127
129 128
130 </view> 129 </view>
131 - <view class="listitem"> 130 + <navigator class="listitem" url='/pages/personecenter/code/code' hover-class="none">
132 <view class="listitempic"> 131 <view class="listitempic">
133 <view class="listitemimg"> 132 <view class="listitemimg">
134 - <image src="../../img/saomiaoerweima@2x.png"></image> 133 + <image src="http://bronet.wangshuwen.com//saomiaoerweima@2x.png"></image>
135 </view> 134 </view>
136 <view class="listitemname">绑定二维码</view> 135 <view class="listitemname">绑定二维码</view>
137 </view> 136 </view>
138 <view class="iconfont icon-xiangyou"></view> 137 <view class="iconfont icon-xiangyou"></view>
139 -  
140 -  
141 - </view> 138 + </navigator>
142 </view> 139 </view>
143 140
144 <view class="connectus"> 141 <view class="connectus">
145 <view class="connectusimg"> 142 <view class="connectusimg">
146 - <image src="../../img/customerservice@3x.png"></image> 143 + <image src="http://bronet.wangshuwen.com//customerservice@3x.png"></image>
147 </view> 144 </view>
148 <view class="connectusname">联系我们</view> 145 <view class="connectusname">联系我们</view>
149 </view> 146 </view>
1 // pages/publicmemory/herolist/herolist.js 1 // pages/publicmemory/herolist/herolist.js
  2 +const app=getApp();
  3 +var that;
2 Page({ 4 Page({
3 5
4 /** 6 /**
5 * 页面的初始数据 7 * 页面的初始数据
6 */ 8 */
7 data: { 9 data: {
8 - 10 + page:1,
  11 + num:10,
  12 + datalist:[]
  13 + },
  14 + // 接口：获取我关注的墓地
  15 + getFollow(){
  16 + let url ='/api/portal/cemetery/getFollow';
  17 + let head={
  18 + 'XX-Token':wx.getStorageSync('token')
  19 + }
  20 + let params={
  21 + page: that.data.page,
  22 + num:that.data.num
  23 + }
  24 + app.post(url, params, head).then((res)=>{
  25 + console.log(res)
  26 + that.setData({
  27 + datalist:res
  28 + })
  29 + }).catch((err)=>{
  30 + console.log(err)
  31 + })
9 }, 32 },
10 -  
11 /** 33 /**
12 * 生命周期函数--监听页面加载 34 * 生命周期函数--监听页面加载
13 */ 35 */
14 onLoad: function (options) { 36 onLoad: function (options) {
  37 + that=this;
  38 + that.getFollow();
  39 +
15 40
16 }, 41 },
17 42
1 -  
2 <import src="../template/templates.wxml" /> 1 <import src="../template/templates.wxml" />
3 <template is="tabBar" data='{{...tabcurrent}}' /> 2 <template is="tabBar" data='{{...tabcurrent}}' />
4 3
@@ -7,107 +6,28 @@ @@ -7,107 +6,28 @@
7 <view class="search"> 6 <view class="search">
8 <view class="iconfont icon-sousuo searchicon"></view> 7 <view class="iconfont icon-sousuo searchicon"></view>
9 <view class="search_hospital"> 8 <view class="search_hospital">
10 - <input placeholder="名字身份证号或纪念堂号" class="enterword" bindinput="searchhospital"/> 9 + <input placeholder="名字身份证号或纪念堂号" class="enterword" bindinput="searchhospital" />
11 </view> 10 </view>
12 -  
13 </view> 11 </view>
14 -  
15 -  
16 -  
17 <!--追思名人--> 12 <!--追思名人-->
18 - <view > 13 + <view>
19 <view class="matry"> 14 <view class="matry">
20 关注的墓地列表 15 关注的墓地列表
21 </view> 16 </view>
22 -  
23 -  
24 <view class="peoplelist"> 17 <view class="peoplelist">
25 - <view class="peoplelistitem">  
26 - <view class="peoplelistitemimg">  
27 - <image src="../../../img/product_05@3x.png"></image>  
28 - </view>  
29 -  
30 -  
31 - <view class="peoplecall">  
32 -  
33 -  
34 - <view class="matrypeoplename">  
35 - <text class="peoplecallname">邓丽君</text>  
36 - <text class="peoplecalldate">诞辰24周年</text>  
37 - </view>  
38 - <view class="attention">关注</view>  
39 -  
40 - </view>  
41 -  
42 - </view>  
43 - <view class="peoplelistitem">  
44 - <view class="peoplelistitemimg">  
45 - <image src="../../../img/product_05@3x.png"></image>  
46 - </view>  
47 -  
48 -  
49 - <view class="peoplecall">  
50 -  
51 -  
52 - <view class="matrypeoplename">  
53 - <text class="peoplecallname">邓丽君</text>  
54 - <text class="peoplecalldate">诞辰24周年</text>  
55 - </view>  
56 - <view class="attention">关注</view>  
57 -  
58 - </view>  
59 -  
60 - </view>  
61 - <view class="peoplelistitem">  
62 - <view class="peoplelistitemimg">  
63 - <image src="../../../img/product_05@3x.png"></image>  
64 - </view>  
65 -  
66 -  
67 - <view class="peoplecall">  
68 -  
69 -  
70 - <view class="matrypeoplename">  
71 - <text class="peoplecallname">邓丽君</text>  
72 - <text class="peoplecalldate">诞辰24周年</text>  
73 - </view>  
74 - <view class="attention">关注</view>  
75 -  
76 - </view>  
77 -  
78 - </view>  
79 - <view class="peoplelistitem"> 18 + <view class="peoplelistitem" wx:for='{{datalist}}' wx:key>
80 <view class="peoplelistitemimg"> 19 <view class="peoplelistitemimg">
81 - <image src="../../../img/product_05@3x.png"></image> 20 + <image src="{{item.thumb}}"></image>
82 </view> 21 </view>
83 -  
84 -  
85 <view class="peoplecall"> 22 <view class="peoplecall">
86 -  
87 -  
88 <view class="matrypeoplename"> 23 <view class="matrypeoplename">
89 - <text class="peoplecallname">邓丽君</text> 24 + <text class="peoplecallname">{{item.name?item.name:'暂无'}}</text>
90 <text class="peoplecalldate">诞辰24周年</text> 25 <text class="peoplecalldate">诞辰24周年</text>
91 </view> 26 </view>
92 <view class="attention">关注</view> 27 <view class="attention">关注</view>
93 -  
94 - </view>  
95 -  
96 </view> 28 </view>
97 - <view class="peoplelistitem">  
98 - <view class="peoplelistitemimg">  
99 - <image src="../../../img/product_05@3x.png"></image>  
100 - </view>  
101 - <view class="peoplecall">  
102 - <view class="matrypeoplename">  
103 - <text class="peoplecallname">邓丽君</text>  
104 - <text class="peoplecalldate">诞辰24周年</text>  
105 - </view>  
106 - <view class="attention">关注</view>  
107 -  
108 </view> 29 </view>
109 30
110 - </view>  
111 31
112 </view> 32 </view>
113 </view> 33 </view>
1 @import '../../publicmemory/herolist/herolist.wxss'; 1 @import '../../publicmemory/herolist/herolist.wxss';
  2 +page{
  3 +padding:0;
  4 +}
2 .searchicon { 5 .searchicon {
3 left:144rpx; 6 left:144rpx;
4 } 7 }
@@ -7,7 +7,7 @@ Page({ @@ -7,7 +7,7 @@ Page({
7 data: { 7 data: {
8 flowernavbar: [{ id: 1, name: '鲜花' }, { id: 2, name: '上香' }, { id: 3, name: '祭品' }], 8 flowernavbar: [{ id: 1, name: '鲜花' }, { id: 2, name: '上香' }, { id: 3, name: '祭品' }],
9 flowercurrentTab: 0, 9 flowercurrentTab: 0,
10 - imgUrls: ["../../../img/gongxi@3x.png", "../../../img/gongxi@3x.png", "../../../img/gongxi@3x.png", "../../../img/gongxi@3x.png"], 10 + imgUrls: ["http://bronet.wangshuwen.com//gongxi@3x.png", "http://bronet.wangshuwen.com//gongxi@3x.png", "http://bronet.wangshuwen.com//gongxi@3x.png", "http://bronet.wangshuwen.com//gongxi@3x.png"],
11 indicatorDots: false, 11 indicatorDots: false,
12 autoplay: true, 12 autoplay: true,
13 interval: 2000, 13 interval: 2000,
1 1
2 <view class="box"> 2 <view class="box">
3 <view class="peopledetailimg"> 3 <view class="peopledetailimg">
4 - <image src="../../../img/sun.png"></image> 4 + <image src="http://bronet.wangshuwen.com//sun.png"></image>
5 </view> 5 </view>
6 6
7 <view class="peopledetailinfo"> 7 <view class="peopledetailinfo">
@@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
15 </view> 15 </view>
16 </view> 16 </view>
17 <view class="peopledetailcard"> 17 <view class="peopledetailcard">
18 - <image src="../../../img/idcard.png"></image> 18 + <image src="http://bronet.wangshuwen.com//idcard.png"></image>
19 </view> 19 </view>
20 </view> 20 </view>
21 21
@@ -28,61 +28,61 @@ @@ -28,61 +28,61 @@
28 <view class="peoplememorygood"> 28 <view class="peoplememorygood">
29 <view class="peoplememorygooditem"> 29 <view class="peoplememorygooditem">
30 <view class="peoplememorygoodimg"> 30 <view class="peoplememorygoodimg">
31 - <image src="../../../img/product_03@3x.png"></image> 31 + <image src="http://bronet.wangshuwen.com//product_03@3x.png"></image>
32 </view> 32 </view>
33 33
34 <view class="peoplememorygoodname">朱小明</view> 34 <view class="peoplememorygoodname">朱小明</view>
35 </view> 35 </view>
36 <view class="peoplememorygooditem"> 36 <view class="peoplememorygooditem">
37 <view class="peoplememorygoodimg"> 37 <view class="peoplememorygoodimg">
38 - <image src="../../../img/product_03@3x.png"></image> 38 + <image src="http://bronet.wangshuwen.com//product_03@3x.png"></image>
39 </view> 39 </view>
40 40
41 <view class="peoplememorygoodname">朱小明朱小明朱小明朱小明朱小明朱小明</view> 41 <view class="peoplememorygoodname">朱小明朱小明朱小明朱小明朱小明朱小明</view>
42 </view> 42 </view>
43 <view class="peoplememorygooditem"> 43 <view class="peoplememorygooditem">
44 <view class="peoplememorygoodimg"> 44 <view class="peoplememorygoodimg">
45 - <image src="../../../img/product_03@3x.png"></image> 45 + <image src="http://bronet.wangshuwen.com//product_03@3x.png"></image>
46 </view> 46 </view>
47 <view class="peoplememorygoodname">朱小明</view> 47 <view class="peoplememorygoodname">朱小明</view>
48 </view> 48 </view>
49 <view class="peoplememorygooditem"> 49 <view class="peoplememorygooditem">
50 <view class="peoplememorygoodimg"> 50 <view class="peoplememorygoodimg">
51 - <image src="../../../img/product_03@3x.png"></image> 51 + <image src="http://bronet.wangshuwen.com//product_03@3x.png"></image>
52 </view> 52 </view>
53 53
54 <view class="peoplememorygoodname">朱小明</view> 54 <view class="peoplememorygoodname">朱小明</view>
55 </view> 55 </view>
56 <view class="peoplememorygooditem"> 56 <view class="peoplememorygooditem">
57 <view class="peoplememorygoodimg"> 57 <view class="peoplememorygoodimg">
58 - <image src="../../../img/product_03@3x.png"></image> 58 + <image src="http://bronet.wangshuwen.com//product_03@3x.png"></image>
59 </view> 59 </view>
60 60
61 <view class="peoplememorygoodname">朱小明</view> 61 <view class="peoplememorygoodname">朱小明</view>
62 </view> 62 </view>
63 <view class="peoplememorygooditem"> 63 <view class="peoplememorygooditem">
64 <view class="peoplememorygoodimg"> 64 <view class="peoplememorygoodimg">
65 - <image src="../../../img/product_03@3x.png"></image> 65 + <image src="http://bronet.wangshuwen.com//product_03@3x.png"></image>
66 </view> 66 </view>
67 67
68 <view class="peoplememorygoodname">朱小明</view> 68 <view class="peoplememorygoodname">朱小明</view>
69 </view><view class="peoplememorygooditem"> 69 </view><view class="peoplememorygooditem">
70 <view class="peoplememorygoodimg"> 70 <view class="peoplememorygoodimg">
71 - <image src="../../../img/product_03@3x.png"></image> 71 + <image src="http://bronet.wangshuwen.com//product_03@3x.png"></image>
72 </view> 72 </view>
73 73
74 <view class="peoplememorygoodname">朱小明</view> 74 <view class="peoplememorygoodname">朱小明</view>
75 </view> 75 </view>
76 <view class="peoplememorygooditem"> 76 <view class="peoplememorygooditem">
77 <view class="peoplememorygoodimg"> 77 <view class="peoplememorygoodimg">
78 - <image src="../../../img/product_03@3x.png"></image> 78 + <image src="http://bronet.wangshuwen.com//product_03@3x.png"></image>
79 </view> 79 </view>
80 80
81 <view class="peoplememorygoodname">朱小明</view> 81 <view class="peoplememorygoodname">朱小明</view>
82 </view> 82 </view>
83 <view class="peoplememorygooditem"> 83 <view class="peoplememorygooditem">
84 <view class="peoplememorygoodimg"> 84 <view class="peoplememorygoodimg">
85 - <image src="../../../img/product_03@3x.png"></image> 85 + <image src="http://bronet.wangshuwen.com//product_03@3x.png"></image>
86 </view> 86 </view>
87 87
88 <view class="peoplememorygoodname">朱小明</view> 88 <view class="peoplememorygoodname">朱小明</view>
@@ -162,7 +162,7 @@ @@ -162,7 +162,7 @@
162 <view class="grieve"> 162 <view class="grieve">
163 <view class="grieveitem"> 163 <view class="grieveitem">
164 <view class="grieveimg"> 164 <view class="grieveimg">
165 - <image src="../../../img/files_02@3x.png"></image> 165 + <image src="http://bronet.wangshuwen.com//files_02@3x.png"></image>
166 </view> 166 </view>
167 <view class="grieveword">祭文悼词</view> 167 <view class="grieveword">祭文悼词</view>
168 </view> 168 </view>
@@ -174,7 +174,7 @@ @@ -174,7 +174,7 @@
174 <view class="grievehead"> 174 <view class="grievehead">
175 <view class="grieveinfo"> 175 <view class="grieveinfo">
176 <view class="grievepeopleimg"> 176 <view class="grievepeopleimg">
177 - <image src="../../../img/kefu1@3x.png"></image> 177 + <image src="http://bronet.wangshuwen.com//kefu1@3x.png"></image>
178 </view> 178 </view>
179 179
180 <view class="grievename">朱*明</view> 180 <view class="grievename">朱*明</view>
@@ -192,7 +192,7 @@ @@ -192,7 +192,7 @@
192 <view class="grievehead"> 192 <view class="grievehead">
193 <view class="grieveinfo"> 193 <view class="grieveinfo">
194 <view class="grievepeopleimg"> 194 <view class="grievepeopleimg">
195 - <image src="../../../img/kefu1@3x.png"></image> 195 + <image src="http://bronet.wangshuwen.com//kefu1@3x.png"></image>
196 </view> 196 </view>
197 197
198 <view class="grievename">朱*明</view> 198 <view class="grievename">朱*明</view>
@@ -227,7 +227,7 @@ @@ -227,7 +227,7 @@
227 <view class="grieve"> 227 <view class="grieve">
228 <view class="grieveitem"> 228 <view class="grieveitem">
229 <view class="grieveimg"> 229 <view class="grieveimg">
230 - <image src="../../../img/files_02@3x.png"></image> 230 + <image src="http://bronet.wangshuwen.com//files_02@3x.png"></image>
231 </view> 231 </view>
232 <view class="grieveword">人物简介</view> 232 <view class="grieveword">人物简介</view>
233 </view> 233 </view>
@@ -247,7 +247,7 @@ @@ -247,7 +247,7 @@
247 <view class="grieve"> 247 <view class="grieve">
248 <view class="grieveitem"> 248 <view class="grieveitem">
249 <view class="grieveimg"> 249 <view class="grieveimg">
250 - <image src="../../../img/files_02@3x.png"></image> 250 + <image src="http://bronet.wangshuwen.com//files_02@3x.png"></image>
251 </view> 251 </view>
252 <view class="grieveword">纪念文集</view> 252 <view class="grieveword">纪念文集</view>
253 </view> 253 </view>
@@ -269,7 +269,7 @@ @@ -269,7 +269,7 @@
269 <view class="grieve"> 269 <view class="grieve">
270 <view class="grieveitem"> 270 <view class="grieveitem">
271 <view class="grieveimg"> 271 <view class="grieveimg">
272 - <image src="../../../img/files_02@3x.png"></image> 272 + <image src="http://bronet.wangshuwen.com//files_02@3x.png"></image>
273 </view> 273 </view>
274 <view class="grieveword">照片</view> 274 <view class="grieveword">照片</view>
275 </view> 275 </view>
@@ -278,16 +278,16 @@ @@ -278,16 +278,16 @@
278 278
279 <view class="peopleintrotext piclist"> 279 <view class="peopleintrotext piclist">
280 <view class="picture"> 280 <view class="picture">
281 - <image src="../../../img/product_04@3x.png"></image> 281 + <image src="http://bronet.wangshuwen.com//product_04@3x.png"></image>
282 </view> 282 </view>
283 <view class="picture"> 283 <view class="picture">
284 - <image src="../../../img/product_04@3x.png"></image> 284 + <image src="http://bronet.wangshuwen.com//product_04@3x.png"></image>
285 </view> 285 </view>
286 <view class="picture"> 286 <view class="picture">
287 - <image src="../../../img/product_04@3x.png"></image> 287 + <image src="http://bronet.wangshuwen.com//product_04@3x.png"></image>
288 </view> 288 </view>
289 <view class="picture"> 289 <view class="picture">
290 - <image src="../../../img/product_04@3x.png"></image> 290 + <image src="http://bronet.wangshuwen.com//product_04@3x.png"></image>
291 </view> 291 </view>
292 292
293 </view> 293 </view>
@@ -301,7 +301,7 @@ @@ -301,7 +301,7 @@
301 <view class="grieve"> 301 <view class="grieve">
302 <view class="grieveitem"> 302 <view class="grieveitem">
303 <view class="grieveimg"> 303 <view class="grieveimg">
304 - <image src="../../../img/files_02@3x.png"></image> 304 + <image src="http://bronet.wangshuwen.com//files_02@3x.png"></image>
305 </view> 305 </view>
306 <view class="grieveword">音频文件</view> 306 <view class="grieveword">音频文件</view>
307 </view> 307 </view>
@@ -310,13 +310,13 @@ @@ -310,13 +310,13 @@
310 310
311 <view class="peopleintrotext piclist"> 311 <view class="peopleintrotext piclist">
312 <view class="picture"> 312 <view class="picture">
313 - <image src="../../../img/product_04@3x.png"></image> 313 + <image src="http://bronet.wangshuwen.com//product_04@3x.png"></image>
314 </view> 314 </view>
315 <view class="picture"> 315 <view class="picture">
316 - <image src="../../../img/product_04@3x.png"></image> 316 + <image src="http://bronet.wangshuwen.com//product_04@3x.png"></image>
317 </view> 317 </view>
318 <view class="picture"> 318 <view class="picture">
319 - <image src="../../../img/product_04@3x.png"></image> 319 + <image src="http://bronet.wangshuwen.com//product_04@3x.png"></image>
320 </view> 320 </view>
321 </view> 321 </view>
322 </view> 322 </view>
@@ -324,7 +324,7 @@ @@ -324,7 +324,7 @@
324 <view class="grieve"> 324 <view class="grieve">
325 <view class="grieveitem"> 325 <view class="grieveitem">
326 <view class="grieveimg"> 326 <view class="grieveimg">
327 - <image src="../../../img/files_02@3x.png"></image> 327 + <image src="http://bronet.wangshuwen.com//files_02@3x.png"></image>
328 </view> 328 </view>
329 <view class="grieveword">视频影像</view> 329 <view class="grieveword">视频影像</view>
330 </view> 330 </view>
@@ -333,7 +333,7 @@ @@ -333,7 +333,7 @@
333 333
334 <view class="peopleintrotext piclist"> 334 <view class="peopleintrotext piclist">
335 <view class="picture"> 335 <view class="picture">
336 - <image src="../../../img/product_04@3x.png"></image> 336 + <image src="http://bronet.wangshuwen.com//product_04@3x.png"></image>
337 </view> 337 </view>
338 338
339 </view> 339 </view>
@@ -351,7 +351,7 @@ @@ -351,7 +351,7 @@
351 <view class="join"> 351 <view class="join">
352 <view class="joinword">邀请加入</view> 352 <view class="joinword">邀请加入</view>
353 <view class="joinimg"> 353 <view class="joinimg">
354 - <image src="../../../img/add_red@3x.png"></image> 354 + <image src="http://bronet.wangshuwen.com//add_red@3x.png"></image>
355 </view> 355 </view>
356 </view> 356 </view>
357 357
@@ -361,7 +361,7 @@ @@ -361,7 +361,7 @@
361 361
362 <view class="memberitem"> 362 <view class="memberitem">
363 <view class="memberitemimg"> 363 <view class="memberitemimg">
364 - <image src="../../../img/product_04@3x.png"></image> 364 + <image src="http://bronet.wangshuwen.com//product_04@3x.png"></image>
365 </view> 365 </view>
366 <view class="memberitemname">女儿</view> 366 <view class="memberitemname">女儿</view>
367 </view> 367 </view>
@@ -369,7 +369,7 @@ @@ -369,7 +369,7 @@
369 369
370 <view class="memberitem"> 370 <view class="memberitem">
371 <view class="memberitemimg"> 371 <view class="memberitemimg">
372 - <image src="../../../img/product_04@3x.png"></image> 372 + <image src="http://bronet.wangshuwen.com//product_04@3x.png"></image>
373 </view> 373 </view>
374 <view class="memberitemname">女儿</view> 374 <view class="memberitemname">女儿</view>
375 375
1 // pages/publicmemory/peoplememorydetail/peoplememorydetail.js 1 // pages/publicmemory/peoplememorydetail/peoplememorydetail.js
  2 +const app=getApp();
  3 +var that;
2 Page({ 4 Page({
3 -  
4 /** 5 /**
5 * 页面的初始数据 6 * 页面的初始数据
6 */ 7 */
7 data: { 8 data: {
  9 + f:false,
8 flowernavbar: [{ id: 1, name: '鲜花' }, { id: 2, name: '上香' }, { id: 3, name: '祭品' }], 10 flowernavbar: [{ id: 1, name: '鲜花' }, { id: 2, name: '上香' }, { id: 3, name: '祭品' }],
9 flowercurrentTab: 0, 11 flowercurrentTab: 0,
10 - imgUrls: ["../../../img/gongxi@3x.png", "../../../img/gongxi@3x.png", "../../../img/gongxi@3x.png", "../../../img/gongxi@3x.png"], 12 + imgUrls: ["http://bronet.wangshuwen.com//gongxi@3x.png", "http://bronet.wangshuwen.com//gongxi@3x.png", "http://bronet.wangshuwen.com//gongxi@3x.png", "http://bronet.wangshuwen.com//gongxi@3x.png"],
11 indicatorDots: false, 13 indicatorDots: false,
12 autoplay: true, 14 autoplay: true,
  15 + ifmold:false,
13 interval: 2000, 16 interval: 2000,
14 duration: 1000, 17 duration: 1000,
15 currentSwiper: 0, 18 currentSwiper: 0,
  19 + type:1,
  20 + relationship:'',
  21 + memorial_id:'',
  22 + datalist:[],//墓地详情
  23 + usergift:[],//用户赠送的礼物
  24 + gift:[],//礼物
  25 + textlist:[],//祭文列表
  26 + memorialmember:[],//公祭成员
  27 + memorial_member_id:''
  28 + },
  29 + //接口：获取演绎明星/名人公祭/事件公祭/国家公祭日/瞻仰烈士/烈士诞辰纪念日/纪念馆详情
  30 + getStarDetail(){
  31 + let head={
  32 + 'XX-Token':wx.getStorageSync('token')
  33 + }
  34 + let url ='/api/portal/index/getStarDetail';
  35 + let params={
  36 + memorial_id: that.data.memorial_id
  37 + }
  38 + app.post(url, params, head).then((res)=>{
  39 + that.setData({
  40 + datalist:res
  41 + })
  42 + that.getUserGift();
  43 + that.getText();
  44 + that.getMemorialMember();
  45 + }).catch((err)=>{
  46 + console.log(err)
  47 + })
  48 + },
  49 + hidemold(){
  50 + that.setData({
  51 + ifmold:false
  52 + })
  53 + },
  54 + showmold(e){
  55 +
  56 + that.setData({
  57 + ifmold: true,
  58 + memorial_member_id: e.currentTarget.id,
  59 + })
  60 + },
  61 +//接口：获取用户赠送礼物(类型(1公祭,2祖祠))
  62 + getUserGift(){
  63 + let url ='/api/portal/index/getUserGift';
  64 + let params={
  65 + memorial_id: that.data.memorial_id,
  66 + type:that.data.type
  67 + }
  68 + app.post(url, params).then((res)=>{
  69 + console.log(res)
  70 + that.setData({
  71 + usergift:res
  72 + })
  73 + }).catch((err)=>{
  74 + console.log(err)
  75 + })
  76 +
  77 + },
  78 + //接口：获取礼物
  79 + getGift() {
  80 + let url = '/api/portal/index/getGift';
  81 + app.post(url, {}).then((res) => {
  82 + let cate1 = res.cate1;
  83 + let cate2 = res.cate2;
  84 + let cate3 = res.cate3;
  85 + let temcate1 = [];
  86 + let temcate2 = [];
  87 + let temcate3 = [];
  88 + let tem = [];
  89 + for (let i = 0; i < cate1.length; i++) {
  90 + tem.push(cate1[i]);
  91 + if ((i + 1) != cate1.length) {
  92 + if ((i + 1) % 8 == 0) {
  93 + temcate1.push(tem);
  94 + tem = [];
  95 + }
  96 + } else {
  97 + temcate1.push(tem);
  98 + tem = [];
  99 + }
  100 + }
  101 + for (let i = 0; i < cate2.length; i++) {
  102 + tem.push(cate2[i]);
  103 + if ((i + 1) % 8 == 0) {
  104 + temcate2.push(tem);
  105 + tem = [];
  106 + } else {
  107 + temcate2.push(tem);
  108 + tem = [];
  109 + }
  110 + }
  111 + for (let i = 0; i < cate3.length; i++) {
  112 + tem.push(cate3[i]);
  113 + if ((i + 1) % 8 == 0) {
  114 + temcate3.push(tem);
  115 + tem = [];
  116 + } else {
  117 + temcate3.push(tem);
  118 + tem = [];
  119 + }
  120 + }
  121 + let temgift = [];
  122 + temgift.push(temcate1);
  123 + temgift.push(temcate2);
  124 + temgift.push(temcate3);
  125 + that.setData({
  126 + gift: temgift
  127 + })
  128 + }).catch((err) => {
  129 + console.log(err)
  130 + })
  131 + },
  132 + //点击礼物献礼物
  133 + setitemflower(e) {
  134 + let gift = that.data.gift;
  135 + let flowercurrentTab = that.data.flowercurrentTab;
  136 + let indexs = e.currentTarget.dataset.indexs;//一级下标
  137 + let tem = gift[indexs];
  138 + let index = e.currentTarget.dataset.index;//二级下标
  139 + },
  140 + //鲜花,上香,祭品的切换
  141 + flowernavbarTap: function (e) {
  142 + let that = this;
  143 + this.setData({
  144 + flowercurrentTab: e.currentTarget.dataset.idx,
  145 + })
  146 + },
  147 +//接口：获取祭文列表
  148 + getText(){
  149 + let url ='/api/portal/index/getText';
  150 + let params={
  151 + memorial_id: that.data.datalist.id,
  152 + type: that.data.type
  153 + }
  154 + app.post(url,params).then((res)=>{
  155 + console.log(res)
  156 + that.setData({
  157 + textlist:res
  158 + })
  159 + }).catch((err)=>{
  160 + console.log(err)
  161 + })
  162 +
  163 + },
  164 + //接口：获取公祭成员
  165 + getMemorialMember(){
  166 + let url ='/api/portal/index/getMemorialMember';
  167 + let params={
  168 + memorial_id: that.data.memorial_id
  169 + }
  170 + app.post(url, params).then((res)=>{
  171 + that.setData({
  172 + memorialmember:res
  173 + })
  174 + }).catch((err)=>{
  175 + console.log(err)
  176 + })
  177 + },
  178 + // 接口：添加公祭成员
  179 + setMemorialMember(){
  180 + let url ='/api/portal/index/setMemorialMember';
  181 + let head={
  182 + 'XX-Token':wx.getStorageSync('token')
  183 + }
  184 + let params={
  185 + 'memorial_id': that.data.memorial_id
  186 + }
  187 + app.post(url, params, head).then((res)=>{
  188 +
  189 + }).catch((err)=>{
  190 + console.log(err)
  191 + })
16 }, 192 },
  193 + // 接口：设置成员关系
  194 + setMemorialRelationship(){
  195 + let url ='/api/portal/index/setMemorialRelationship';
  196 + let memorialmember = that.data.memorialmember;
  197 + let params={
  198 + memorial_member_id: that.data.memorial_member_id,
  199 + relationship: that.data.relationship
  200 + }
  201 + app.post(url, params).then((res)=>{
  202 + console.log(res)
  203 + memorialmember.forEach(function (item, index, arrSelf){
  204 + if (item.id == that.data.memorial_member_id){
  205 + item.relationship = that.data.relationship;
  206 + }
  207 + })
  208 + that.setData({
  209 + memorialmember: memorialmember
  210 + })
  211 + }).catch((err)=>{
  212 + console.log(err)
  213 + })
17 214
  215 + },
  216 + voidfun(){
  217 +
  218 + },
  219 + setrelationship(e){
  220 + that.setData({
  221 + relationship:e.detail.value
  222 + })
  223 + },
18 /** 224 /**
19 * 生命周期函数--监听页面加载 225 * 生命周期函数--监听页面加载
20 */ 226 */
21 onLoad: function (options) { 227 onLoad: function (options) {
  228 + that=this;
  229 + that.setData({
  230 + memorial_id: options.memorial_id
  231 + })
  232 + that.getStarDetail();
  233 + that.getGift();
  234 + that.setMemorialMember();
  235 +
22 236
23 }, 237 },
24 238
@@ -32,7 +246,6 @@ Page({ @@ -32,7 +246,6 @@ Page({
32 let that = this; 246 let that = this;
33 this.setData({ 247 this.setData({
34 flowercurrentTab: e.currentTarget.dataset.idx, 248 flowercurrentTab: e.currentTarget.dataset.idx,
35 -  
36 }) 249 })
37 250
38 }, 251 },
1 -  
2 <view class="box"> 1 <view class="box">
3 <view class="peopledetailimg"> 2 <view class="peopledetailimg">
4 - <image src="../../../img/sun.png"></image> 3 + <image src="{{datalist.thumb}}"></image>
5 </view> 4 </view>
6 -  
7 <view class="peopledetailinfo"> 5 <view class="peopledetailinfo">
8 -  
9 <view class="peopledetailinfoitem"> 6 <view class="peopledetailinfoitem">
10 <view class="peopledetailcard fugaopic"> 7 <view class="peopledetailcard fugaopic">
11 - <image src="../../../img/idcard.png"></image> 8 + <view class='fugaopic_img'>
  9 + <image src='../../../img/fugao.png'></image>
  10 + </view>
  11 + <view>讣告</view>
12 </view> 12 </view>
13 <view class="peopledetailmodel"> 13 <view class="peopledetailmodel">
14 - <view class="peopledetailname">孙中山</view> 14 + <view class="peopledetailname">{{datalist.name}}</view>
15 <view class="labelist"> 15 <view class="labelist">
16 - <view class="labelitem">1884~1927</view>  
17 - <view class="labelitem">浙江人</view> 16 + <view class="labelitem">{{datalist.handle_data.live_time}}</view>
  17 + <view class="labelitem">{{datalist.ancestral_home}}人</view>
18 </view> 18 </view>
19 </view> 19 </view>
20 <view class="peopledetailcard"> 20 <view class="peopledetailcard">
21 - <image src="../../../img/idcard.png"></image> 21 + <image src="{{datalist.anleguo_code}}"></image>
22 </view> 22 </view>
23 </view> 23 </view>
24 -  
25 -  
26 </view> 24 </view>
27 -  
28 -  
29 -  
30 </view> 25 </view>
31 - <view class="peoplememorygood">  
32 - <view class="peoplememorygooditem"> 26 +<view class="peoplememorygood">
  27 + <view class="peoplememorygooditem" wx:for='{{usergift}}' wx:key>
33 <view class="peoplememorygoodimg"> 28 <view class="peoplememorygoodimg">
34 - <image src="../../../img/product_03@3x.png"></image> 29 + <image src="{{item.avatar}}"></image>
35 </view> 30 </view>
36 -  
37 - <view class="peoplememorygoodname">朱小明</view>  
38 - </view>  
39 - <view class="peoplememorygooditem">  
40 - <view class="peoplememorygoodimg">  
41 - <image src="../../../img/product_03@3x.png"></image>  
42 - </view>  
43 -  
44 - <view class="peoplememorygoodname">朱小明朱小明朱小明朱小明朱小明朱小明</view>  
45 - </view>  
46 - <view class="peoplememorygooditem">  
47 - <view class="peoplememorygoodimg">  
48 - <image src="../../../img/product_03@3x.png"></image>  
49 - </view>  
50 - <view class="peoplememorygoodname">朱小明</view>  
51 - </view>  
52 - <view class="peoplememorygooditem">  
53 - <view class="peoplememorygoodimg">  
54 - <image src="../../../img/product_03@3x.png"></image> 31 + <view class="peoplememorygoodname">{{item.user_nickname}}</view>
55 </view> 32 </view>
56 -  
57 - <view class="peoplememorygoodname">朱小明</view>  
58 - </view>  
59 - <view class="peoplememorygooditem">  
60 - <view class="peoplememorygoodimg">  
61 - <image src="../../../img/product_03@3x.png"></image>  
62 - </view>  
63 -  
64 - <view class="peoplememorygoodname">朱小明</view>  
65 - </view>  
66 - <view class="peoplememorygooditem">  
67 - <view class="peoplememorygoodimg">  
68 - <image src="../../../img/product_03@3x.png"></image>  
69 - </view>  
70 -  
71 - <view class="peoplememorygoodname">朱小明</view>  
72 - </view><view class="peoplememorygooditem">  
73 - <view class="peoplememorygoodimg">  
74 - <image src="../../../img/product_03@3x.png"></image>  
75 - </view>  
76 -  
77 - <view class="peoplememorygoodname">朱小明</view>  
78 - </view>  
79 - <view class="peoplememorygooditem">  
80 - <view class="peoplememorygoodimg">  
81 - <image src="../../../img/product_03@3x.png"></image>  
82 - </view>  
83 -  
84 - <view class="peoplememorygoodname">朱小明</view>  
85 - </view>  
86 - <view class="peoplememorygooditem">  
87 - <view class="peoplememorygoodimg">  
88 - <image src="../../../img/product_03@3x.png"></image>  
89 - </view>  
90 -  
91 - <view class="peoplememorygoodname">朱小明</view>  
92 - </view>  
93 -  
94 - </view>  
95 -  
96 -  
97 - <view class="flower"> 33 +</view>
  34 +<view class="flower">
98 <view class="flowernav"> 35 <view class="flowernav">
99 <view wx:for="{{flowernavbar}}" data-idx="{{index}}" class="flowernav_item {{flowercurrentTab==index ? 'floweractive' : ''}}" wx:key="unique" bindtap="flowernavbarTap">{{item.name}} 36 <view wx:for="{{flowernavbar}}" data-idx="{{index}}" class="flowernav_item {{flowercurrentTab==index ? 'floweractive' : ''}}" wx:key="unique" bindtap="flowernavbarTap">{{item.name}}
100 </view> 37 </view>
101 </view> 38 </view>
102 -  
103 - <view class="swiper_image"> 39 + <view class="swiper_box">
104 <swiper indicator-dots="{{indicatorDots}}" autoplay="{{autoplay}}" interval="{{interval}}" duration="{{duration}}" class="swiper_item_img" bindchange="swiperChange"> 40 <swiper indicator-dots="{{indicatorDots}}" autoplay="{{autoplay}}" interval="{{interval}}" duration="{{duration}}" class="swiper_item_img" bindchange="swiperChange">
105 - <block wx:for="{{imgUrls}}" wx:key="doct">  
106 - <swiper-item>  
107 - <image src="{{item}}" class="slide-image" width="355" height="150" /> 41 + <block wx:if='{{gift[flowercurrentTab].length>0}}'>
  42 + <swiper-item wx:for='{{gift[flowercurrentTab]}}' wx:key=''
  43 + wx:for-index="indexs" wx:for-item="items">
  44 + <view class='swiper_itemflower' wx:for='{{items}}' data-index='{{index}}' data-indexs='{{indexs}}' wx:key='' bindtap='setitemflower' >
  45 + <view class='itemflowerimg'>
  46 + <image src="{{item.thumb}}"></image>
  47 + </view>
  48 + <view>{{item.title}}</view>
  49 + <view class='itemflowertxt'>1天
  50 + <text class='{{item.coin==0?"txt_blue":""}}'>{{item.coin==0?'免费':item.coin+'金币'}}</text>
  51 + </view>
  52 + </view>
108 </swiper-item> 53 </swiper-item>
109 </block> 54 </block>
  55 + <block wx:else>
  56 + <swiper-item class='empty'>暂无数据</swiper-item>
  57 + </block>
110 </swiper> 58 </swiper>
111 -  
112 <view class="dots"> 59 <view class="dots">
113 - <block wx:for="{{imgUrls}}" wx:key=""> 60 + <block wx:for="{{gift[flowercurrentTab]}}" wx:key="">
114 <view class="dot{{index == currentSwiper ? ' active' : ''}}"></view> 61 <view class="dot{{index == currentSwiper ? ' active' : ''}}"></view>
115 </block> 62 </block>
116 </view> 63 </view>
117 -  
118 </view> 64 </view>
119 -  
120 <view class="morelist"> 65 <view class="morelist">
121 <view class="moreword">更多</view> 66 <view class="moreword">更多</view>
122 <view> 67 <view>
123 - <view class="morelistitem">  
124 - <text class="morelistdate">7-12 22:14</text>  
125 - <text class="morelistcontent">朱小明献上了鲜花</text>  
126 - </view>  
127 - <view class="morelistitem">  
128 - <text class="morelistdate">7-12 22:14</text>  
129 - <text class="morelistcontent">朱小明献上了鲜花</text>  
130 - </view>  
131 - <view class="morelistitem">  
132 - <text class="morelistdate">7-12 22:14</text>  
133 - <text class="morelistcontent">朱小明献上了鲜花</text> 68 + <view class="morelistitem" wx:for='{{usergift}}' wx:key>
  69 + <text class="morelistdate">{{item.handle_data.create_date}}</text>
  70 + <text class="morelistcontent">{{item.user_nickname}}献上了{{item.title}}</text>
134 </view> 71 </view>
135 - <view class="morelistitem">  
136 - <text class="morelistdate">7-12 22:14</text>  
137 - <text class="morelistcontent">朱小明献上了鲜花</text>  
138 </view> 72 </view>
139 - <view class="morelistitem">  
140 - <text class="morelistdate">7-12 22:14</text>  
141 - <text class="morelistcontent">朱小明献上了鲜花</text>  
142 </view> 73 </view>
143 -  
144 - </view>  
145 - </view>  
146 -  
147 <view class="ground"> 74 <view class="ground">
148 <view class="grounditem"> 75 <view class="grounditem">
149 - <view class="groundname">虚拟墓地</view> 76 + <view class="groundname">守灵堂</view>
150 <view class="groundpeople">7人吊唁</view> 77 <view class="groundpeople">7人吊唁</view>
151 <view class="groundenter">进入</view> 78 <view class="groundenter">进入</view>
152 </view> 79 </view>
153 <view class="grounditem"> 80 <view class="grounditem">
154 - <view class="groundname">现实墓地</view> 81 + <view class="groundname">告别厅</view>
155 <view class="groundpeople">7人吊唁</view> 82 <view class="groundpeople">7人吊唁</view>
156 <view class="groundenter">进入</view> 83 <view class="groundenter">进入</view>
157 </view> 84 </view>
158 - 85 + <view class="grounditem">
  86 + <view class="groundname">墓室</view>
  87 + <view class="groundpeople">7人吊唁</view>
  88 + <view class="groundenter">进入</view>
159 </view> 89 </view>
160 -  
161 </view> 90 </view>
162 -  
163 -  
164 - <view class="grievecontent"> 91 +</view>
  92 +<view class="grievecontent">
165 <view class="grieve"> 93 <view class="grieve">
166 <view class="grieveitem"> 94 <view class="grieveitem">
167 <view class="grieveimg"> 95 <view class="grieveimg">
168 - <image src="../../../img/files_02@3x.png"></image> 96 + <image src="http://bronet.wangshuwen.com//files_02@3x.png"></image>
169 </view> 97 </view>
170 <view class="grieveword">祭文悼词</view> 98 <view class="grieveword">祭文悼词</view>
171 </view> 99 </view>
172 - <view class="slice">共72条</view> 100 + <view class="slice">共{{textlist.length}}条</view>
173 </view> 101 </view>
174 -  
175 <view class="grievebox"> 102 <view class="grievebox">
176 - <view class="grievelist">  
177 - <view class="grievehead">  
178 - <view class="grieveinfo">  
179 - <view class="grievepeopleimg">  
180 - <image src="../../../img/kefu1@3x.png"></image>  
181 - </view>  
182 -  
183 - <view class="grievename">朱*明</view>  
184 - </view>  
185 -  
186 - <view class="grievedate">7-12 23:11</view>  
187 - </view>  
188 - <view class="grievetail">  
189 - 中国近代民族民主主义革命的开拓者，中国民主革命伟大先行者中  
190 - 华民国和中国国民党的缔造者，三民主义的倡导者，创立《五权宪 法》  
191 - 。他首举彻底反帝反封建的旗帜， “起共和而终两千年封建帝制”。  
192 - </view>  
193 - </view>  
194 - <view class="grievelist"> 103 + <view class="grievelist" wx:for='{{textlist}}' wx:key>
195 <view class="grievehead"> 104 <view class="grievehead">
196 <view class="grieveinfo"> 105 <view class="grieveinfo">
197 <view class="grievepeopleimg"> 106 <view class="grievepeopleimg">
198 - <image src="../../../img/kefu1@3x.png"></image> 107 + <image src="{{item.avatar}}"></image>
199 </view> 108 </view>
200 -  
201 - <view class="grievename">朱*明</view> 109 + <view class="grievename">{{item.user_nickname}}</view>
202 </view> 110 </view>
203 -  
204 - <view class="grievedate">7-12 23:11</view> 111 + <view class="grievedate">{{item.handle_data.create_date}}</view>
205 </view> 112 </view>
206 <view class="grievetail"> 113 <view class="grievetail">
207 - 中国近代民族民主主义革命的开拓者，中国民主革命伟大先行者中  
208 - 华民国和中国国民党的缔造者，三民主义的倡导者，创立《五权宪 法》  
209 - 。他首举彻底反帝反封建的旗帜， “起共和而终两千年封建帝制”。 114 + {{item.content}}
210 </view> 115 </view>
211 </view> 116 </view>
212 -  
213 -  
214 </view> 117 </view>
215 -  
216 -  
217 -  
218 -  
219 - </view>  
220 - <view class="writeoration">  
221 - <view class="writeorationword">写祭文</view>  
222 - </view>  
223 - 118 +</view>
  119 +<view class="writeoration">
  120 + <navigator class="writeorationword" url='/pages/publicmemory/writeoration/writeoration?memorial_id={{memorial_id}}&type={{type}}' hover-class="none">写祭文</navigator>
  121 +</view>
224 <view class="misshead"> 122 <view class="misshead">
225 <view></view> 123 <view></view>
226 <view class="missname">追思殿</view> 124 <view class="missname">追思殿</view>
227 </view> 125 </view>
228 -  
229 <view class="grievecontent"> 126 <view class="grievecontent">
230 <view class="grieve"> 127 <view class="grieve">
231 <view class="grieveitem"> 128 <view class="grieveitem">
232 <view class="grieveimg"> 129 <view class="grieveimg">
233 - <image src="../../../img/files_02@3x.png"></image> 130 + <image src="http://bronet.wangshuwen.com//files_02@3x.png"></image>
234 </view> 131 </view>
235 <view class="grieveword">人物简介</view> 132 <view class="grieveword">人物简介</view>
236 </view> 133 </view>
237 -  
238 </view> 134 </view>
239 -  
240 <view class="peopleintrotext"> 135 <view class="peopleintrotext">
241 - 中国近代民族民主主义革命的开拓者，中国民主革命伟大先行者  
242 - 中华民国和中国国民党的缔造者，三民主义的倡导者，创立《五 权宪法》。  
243 - 他首举彻底反帝反封建的旗帜，“起共和而终两千年 封建帝制”。 136 + {{datalist.briefcontent}}
244 </view> 137 </view>
245 -  
246 -  
247 -  
248 </view> 138 </view>
249 -<view class="grievecontent"> 139 +<view class="grievecontent" wx:if='{{f}}'>
250 <view class="grieve"> 140 <view class="grieve">
251 <view class="grieveitem"> 141 <view class="grieveitem">
252 <view class="grieveimg"> 142 <view class="grieveimg">
253 - <image src="../../../img/files_02@3x.png"></image> 143 + <image src="http://bronet.wangshuwen.com//files_02@3x.png"></image>
254 </view> 144 </view>
255 <view class="grieveword">纪念文集</view> 145 <view class="grieveword">纪念文集</view>
256 </view> 146 </view>
257 -  
258 </view> 147 </view>
259 -  
260 <view class="peopleintrotext"> 148 <view class="peopleintrotext">
261 <view class="peopleintrotextlist">XX纪念孙中山同志</view> 149 <view class="peopleintrotextlist">XX纪念孙中山同志</view>
262 <view class="peopleintrotextlist">XX纪念孙中山同志</view> 150 <view class="peopleintrotextlist">XX纪念孙中山同志</view>
@@ -264,62 +152,43 @@ @@ -264,62 +152,43 @@
264 <view class="peopleintrotextlist">XX纪念孙中山同志</view> 152 <view class="peopleintrotextlist">XX纪念孙中山同志</view>
265 153
266 </view> 154 </view>
267 -  
268 -  
269 -  
270 </view> 155 </view>
271 -<view class="grievecontent"> 156 +<view class="grievecontent" >
272 <view class="grieve"> 157 <view class="grieve">
273 <view class="grieveitem"> 158 <view class="grieveitem">
274 <view class="grieveimg"> 159 <view class="grieveimg">
275 - <image src="../../../img/files_02@3x.png"></image> 160 + <image src="http://bronet.wangshuwen.com//files_02@3x.png"></image>
276 </view> 161 </view>
277 <view class="grieveword">照片</view> 162 <view class="grieveword">照片</view>
278 </view> 163 </view>
279 -  
280 </view> 164 </view>
281 -  
282 <view class="peopleintrotext piclist"> 165 <view class="peopleintrotext piclist">
283 - <view class="picture">  
284 - <image src="../../../img/product_04@3x.png"></image>  
285 - </view>  
286 - <view class="picture">  
287 - <image src="../../../img/product_04@3x.png"></image>  
288 - </view>  
289 - <view class="picture">  
290 - <image src="../../../img/product_04@3x.png"></image>  
291 - </view>  
292 - <view class="picture">  
293 - <image src="../../../img/product_04@3x.png"></image>  
294 - </view>  
295 - 166 + <view class="picture" wx:for='{{datalist.imgs}}' wx:key>
  167 + <image src="{{item}}"></image>
296 </view> 168 </view>
297 169
298 170
299 171
  172 + </view>
300 </view> 173 </view>
301 -  
302 -  
303 -<view class="grievecontent"> 174 +<view class="grievecontent" wx:if='{{f}}'>
304 <view class="grieve"> 175 <view class="grieve">
305 <view class="grieveitem"> 176 <view class="grieveitem">
306 <view class="grieveimg"> 177 <view class="grieveimg">
307 - <image src="../../../img/files_02@3x.png"></image> 178 + <image src="http://bronet.wangshuwen.com//files_02@3x.png"></image>
308 </view> 179 </view>
309 <view class="grieveword">音频文件</view> 180 <view class="grieveword">音频文件</view>
310 </view> 181 </view>
311 -  
312 </view> 182 </view>
313 -  
314 <view class="peopleintrotext piclist"> 183 <view class="peopleintrotext piclist">
315 <view class="picture"> 184 <view class="picture">
316 - <image src="../../../img/product_04@3x.png"></image> 185 + <image src="http://bronet.wangshuwen.com//product_04@3x.png"></image>
317 </view> 186 </view>
318 <view class="picture"> 187 <view class="picture">
319 - <image src="../../../img/product_04@3x.png"></image> 188 + <image src="http://bronet.wangshuwen.com//product_04@3x.png"></image>
320 </view> 189 </view>
321 <view class="picture"> 190 <view class="picture">
322 - <image src="../../../img/product_04@3x.png"></image> 191 + <image src="http://bronet.wangshuwen.com//product_04@3x.png"></image>
323 </view> 192 </view>
324 </view> 193 </view>
325 </view> 194 </view>
@@ -327,58 +196,46 @@ @@ -327,58 +196,46 @@
327 <view class="grieve"> 196 <view class="grieve">
328 <view class="grieveitem"> 197 <view class="grieveitem">
329 <view class="grieveimg"> 198 <view class="grieveimg">
330 - <image src="../../../img/files_02@3x.png"></image> 199 + <image src="http://bronet.wangshuwen.com//files_02@3x.png"></image>
331 </view> 200 </view>
332 <view class="grieveword">视频影像</view> 201 <view class="grieveword">视频影像</view>
333 </view> 202 </view>
334 -  
335 </view> 203 </view>
336 -  
337 <view class="peopleintrotext piclist"> 204 <view class="peopleintrotext piclist">
338 - <view class="picture">  
339 - <image src="../../../img/product_04@3x.png"></image> 205 + <view class="picture" wx:for='{{datalist.videos}}' wx:key>
  206 + <video src='{{item}}'></video>
340 </view> 207 </view>
341 -  
342 </view> 208 </view>
343 -  
344 -  
345 -  
346 </view> 209 </view>
347 -  
348 -  
349 <view class="grievecontent"> 210 <view class="grievecontent">
350 <view class="grieve"> 211 <view class="grieve">
351 <view class="grieveitem joinnum"> 212 <view class="grieveitem joinnum">
352 - 成员（2个） 213 + 成员（{{memorialmember.length}}个）
353 </view> 214 </view>
354 <view class="join"> 215 <view class="join">
355 <view class="joinword">邀请加入</view> 216 <view class="joinword">邀请加入</view>
356 <view class="joinimg"> 217 <view class="joinimg">
357 - <image src="../../../img/add_red@3x.png"></image> 218 + <image src="http://bronet.wangshuwen.com//add_red@3x.png"></image>
358 </view> 219 </view>
359 </view> 220 </view>
360 -  
361 </view> 221 </view>
362 -  
363 <view class="peopleintrotext"> 222 <view class="peopleintrotext">
364 -  
365 - <view class="memberitem">  
366 - <view class="memberitemimg">  
367 - <image src="../../../img/product_04@3x.png"></image>  
368 - </view>  
369 - <view class="memberitemname">女儿</view>  
370 - </view>  
371 -  
372 -  
373 - <view class="memberitem"> 223 + <view class="memberitem" wx:for='{{memorialmember}}' wx:key>
374 <view class="memberitemimg"> 224 <view class="memberitemimg">
375 - <image src="../../../img/product_04@3x.png"></image> 225 + <image src="{{item.avatar}}"></image>
376 </view> 226 </view>
377 - <view class="memberitemname">女儿</view>  
378 -  
379 - <view class="setconnection">设置和逝者的关系</view> 227 + <view class="memberitemname">{{item.relationship?item.relationship:'暂无'}}</view>
  228 + <view class="setconnection" wx:if='{{!item.relationship}}' catchtap='showmold' id='{{item.id}}'>设置和逝者的关系</view>
380 </view> 229 </view>
381 -  
382 -  
383 </view> 230 </view>
384 </view> 231 </view>
  232 +<!-- 设置于逝者的关系弹框 -->
  233 +<view class='mold' wx:if='{{ifmold}}' bindtap='hidemold'>
  234 +<view class='mold_main' catchtap='voidfun'>
  235 +<view>设置与逝者的关系</view>
  236 +<view class='mold_text'>
  237 +<textarea placeholder='请输入' placeholder-class='text_p' bindinput='setrelationship'></textarea>
  238 +</view>
  239 +<view class='mold_btn' catchtap='setMemorialRelationship'>确定</view>
  240 +</view>
  241 +</view>
1 @import '../../publicmemory/peoplememorydetail/peoplememorydetail.wxss'; 1 @import '../../publicmemory/peoplememorydetail/peoplememorydetail.wxss';
  2 +@import '../../../swiper.wxss';
2 .fugaopic{ 3 .fugaopic{
  4 + display: flex;
  5 + align-items: center;
  6 + justify-content: center;
  7 + flex-direction: column;
3 margin-right: 48rpx; 8 margin-right: 48rpx;
  9 + background: #E3E3E3;
  10 + color:#333;
  11 + font-size:22rpx;
4 } 12 }
5 .labelitem{ 13 .labelitem{
6 background: #000000; 14 background: #000000;
@@ -44,3 +52,64 @@ @@ -44,3 +52,64 @@
44 border:2rpx solid #000; 52 border:2rpx solid #000;
45 color:#000; 53 color:#000;
46 } 54 }
  55 +.fugaopic_img{
  56 + width:25rpx;
  57 + height: 32rpx;
  58 + display: flex;
  59 + align-items: center;
  60 + justify-content: center;
  61 + margin: 0 0 4rpx 0;
  62 +}
  63 +.fugaopic_img image{
  64 + width:100%;
  65 + height: 100%;
  66 + display: block;
  67 +}
  68 +.mold{
  69 + position: fixed;
  70 + top:0;
  71 + left:0;
  72 + bottom:0;
  73 + width:100%;
  74 + height: 100%;
  75 + background: rgba(0,0,0,0.3);
  76 + display: flex;
  77 + align-items: center;
  78 + justify-content: center;
  79 +}
  80 +.mold_main{
  81 + width:100%;
  82 + color:#333;
  83 + font-size:36rpx;
  84 + text-align: center;
  85 + background: #fff;
  86 + padding:40rpx 45rpx;
  87 +}
  88 +.mold_text{
  89 + margin: 13rpx 0 0 0;
  90 + height: 165rpx;
  91 + border:2rpx solid #D1D1D1;
  92 + border-radius: 10rpx;
  93 +}
  94 +.mold_text textarea{
  95 + text-align: left;
  96 + padding:16rpx 30rpx;
  97 + font-size:36rpx;
  98 + width:100%;
  99 + height: 100%;
  100 +}
  101 +.text_p{
  102 + color:#999;
  103 +}
  104 +.mold_btn{
  105 + width:125rpx;
  106 + height: 54rpx;
  107 + display: flex;
  108 + align-items: center;
  109 + justify-content: center;
  110 + font-size:32rpx;
  111 + color:#fff;
  112 + background: #951B1B;
  113 + border-radius: 27rpx;
  114 + margin: 27rpx auto 0 auto;
  115 +}