刘晓艳 / baoxian · 提交

转到一个项目

作者 刘晓艳
提交 fbda74c9b57849596f81034acf70057f7eb46505 1 个父辈 794c34db

保险二开反馈问题修改

内嵌 并排对比
正在显示 44 个修改的文件 包含 293 行增加 和 168 行删除
@@ -73,6 +73,28 @@ App({ @@ -73,6 +73,28 @@ App({
73 let str = 'bronet' + strtime + 'beijing' 73 let str = 'bronet' + strtime + 'beijing'
74 return md5(md5(str)) 74 return md5(md5(str))
75 }, 75 },
  76 +
  77 + onLaunch() {
  78 + var that=this
  79 + wx.login({
  80 + success: (res) => {
  81 + let url = 'pubilc/sign';
  82 + let params = {
  83 + code: res.code,
  84 + // status: this.data.status //分享进入的需要此参数
  85 + }
  86 + that.post(url, params).then((res) => {
  87 + console.log(res)
  88 + // console.log('start', res.data.data.UserType, res.data.data.checkstatus, res.data.data.PublishId)
  89 +
  90 + }).catch((errMsg) => {
  91 + console.log(errMsg)
  92 + })
  93 + }
  94 + });
  95 +
  96 + },
  97 +
76 globalData: { 98 globalData: {
77 userInfo: null, 99 userInfo: null,
78 OpenId: '', //用户openid 100 OpenId: '', //用户openid
@@ -82,7 +104,7 @@ App({ @@ -82,7 +104,7 @@ App({
82 UserStatus: '', //用户状态（1初次登录需要授权操作，2多次登录不需要授权） 104 UserStatus: '', //用户状态（1初次登录需要授权操作，2多次登录不需要授权）
83 PublishId: '', //如果是保单分享返回保单id 105 PublishId: '', //如果是保单分享返回保单id
84 NewsId: '', //如果是文章分享返回文章id 106 NewsId: '', //如果是文章分享返回文章id
85 - temp_UserType:'',  
86 - user_index:'' 107 + temp_UserType: '',
  108 + user_index: '',
87 } 109 }
88 }) 110 })
1 /* pages/about/about.wxss */ 1 /* pages/about/about.wxss */
2 .topimg{ 2 .topimg{
3 - height:420rpx; 3 + height:376rpx;
4 width:100%; 4 width:100%;
5 box-sizing: border-box; 5 box-sizing: border-box;
6 overflow: hidden; 6 overflow: hidden;
7 } 7 }
8 .topimg image{ 8 .topimg image{
9 width:100%; 9 width:100%;
  10 + height: 100%;
10 } 11 }
11 .content{ 12 .content{
12 padding:32rpx 32rpx 0 32rpx; 13 padding:32rpx 32rpx 0 32rpx;
@@ -10,8 +10,14 @@ Page({ @@ -10,8 +10,14 @@ Page({
10 GoId: '', //分享人id 10 GoId: '', //分享人id
11 articleDetail: [], //文章详情内容 11 articleDetail: [], //文章详情内容
12 share_num: '', 12 share_num: '',
13 - UserId:'',  
14 - UserType:'' 13 + UserId: '',
  14 + UserType: '',
  15 + show_state: true
  16 + },
  17 + goIndex() {
  18 + wx.switchTab({
  19 + url: '/pages/index/index',
  20 + })
15 }, 21 },
16 //文章详情 22 //文章详情
17 listDetail() { 23 listDetail() {
@@ -35,15 +41,15 @@ Page({ @@ -35,15 +41,15 @@ Page({
35 }) 41 })
36 }, 42 },
37 43
38 -//注册顾问  
39 - goRegister(){ 44 + //注册顾问
  45 + goRegister() {
40 wx.navigateTo({ 46 wx.navigateTo({
41 url: '/pages/index/register/register', 47 url: '/pages/index/register/register',
42 }) 48 })
43 }, 49 },
44 50
45 //查看顾问详情 51 //查看顾问详情
46 - goDetail(e){ 52 + goDetail(e) {
47 var CounselorId = this.data.GoId 53 var CounselorId = this.data.GoId
48 console.log(222, CounselorId) 54 console.log(222, CounselorId)
49 wx.navigateTo({ 55 wx.navigateTo({
@@ -87,13 +93,14 @@ Page({ @@ -87,13 +93,14 @@ Page({
87 * 生命周期函数--监听页面加载 93 * 生命周期函数--监听页面加载
88 */ 94 */
89 onLoad: function(options) { 95 onLoad: function(options) {
90 - console.log(options.GoId) 96 + console.log('aa', options.show_state)
91 let that = this; 97 let that = this;
92 that.setData({ 98 that.setData({
93 NewsId: options.NewsId, 99 NewsId: options.NewsId,
94 - UserId:app.globalData.UserId, 100 + UserId: app.globalData.UserId,
95 GoId: options.GoId, 101 GoId: options.GoId,
96 - UserType:app.globalData.UserType 102 + UserType: app.globalData.UserType,
  103 + show_state: options.show_state
97 }) 104 })
98 that.listDetail(); 105 that.listDetail();
99 106
@@ -144,21 +151,26 @@ Page({ @@ -144,21 +151,26 @@ Page({
144 /** 151 /**
145 * 用户点击右上角分享 152 * 用户点击右上角分享
146 */ 153 */
147 - onShareAppMessage: function (options) { 154 + onShareAppMessage: function(options) {
148 // console.log(options) 155 // console.log(options)
  156 + if (app.globalData.UserType == 2) {
  157 + this.setData({
  158 + show_state: false
  159 + })
  160 + }
149 this.prizeshare() 161 this.prizeshare()
150 var shareObj = { 162 var shareObj = {
151 title: options.target.dataset.title, // 默认是小程序的名称(可以写slogan等) 163 title: options.target.dataset.title, // 默认是小程序的名称(可以写slogan等)
152 - path: '/pages/start/start?status=' + options.target.dataset.status + '&GoId=' + app.globalData.UserId,  
153 - imgUrl: '', 164 + path: '/pages/start/start?status=' + options.target.dataset.status + '&GoId=' + app.globalData.UserId + '' + '&show_state=' + this.data.show_state,
  165 + imgUrl: '',
154 }　　 166 }　　
155 167
156 - if (options.from == 'button') {  
157 - // 此处可以修改 shareObj 中的内容  
158 - shareObj.path = '/pages/start/start?status=' + options.target.dataset.status  
159 - }　　 168 + // if (options.from == 'button') {
  169 + // // 此处可以修改 shareObj 中的内容
  170 + // shareObj.path = '/pages/start/start?status=' + options.target.dataset.status
  171 + // }　　
160 172
161 return shareObj; 173 return shareObj;
162 } 174 }
163 - 175 +
164 }) 176 })
1 <!--pages/personalCenter/personalCenter.wxml--> 1 <!--pages/personalCenter/personalCenter.wxml-->
2 <import src="../../../wxParse/wxParse.wxml" /> 2 <import src="../../../wxParse/wxParse.wxml" />
  3 +<view class='go_index' bindtap="goIndex" wx:if="{{GoId!=''}}">回到首页</view>
3 <view class='content_box'> 4 <view class='content_box'>
4 <view class='list_title'>{{articleDetail.title}}</view> 5 <view class='list_title'>{{articleDetail.title}}</view>
5 <view class='list_info_box'> 6 <view class='list_info_box'>
@@ -9,7 +10,8 @@ @@ -9,7 +10,8 @@
9 <text class='line'></text> 10 <text class='line'></text>
10 <text> {{articleDetail.create_time}}</text> 11 <text> {{articleDetail.create_time}}</text>
11 </view> 12 </view>
12 - <view class='banner_box' wx:if="{{GoId!=''&&UserType!=3&&GoId!=UserId}}"> 13 + <!-- &&UserType!=3&&GoId!=UserId&&UserType!=4 -->
  14 + <view class='banner_box' wx:if="{{GoId!=''&&show_state==true}}">
13 <view class='head_img'> 15 <view class='head_img'>
14 <image src='{{articleDetail.user.picurl}}'></image> 16 <image src='{{articleDetail.user.picurl}}'></image>
15 </view> 17 </view>
1 /* pages/ArticleDetails/ArticleDetails.wxss */ 1 /* pages/ArticleDetails/ArticleDetails.wxss */
2 - 2 +.go_index {
  3 + width: 100rpx;
  4 + height: 100rpx;
  5 + border-radius: 50%;
  6 + position: fixed;
  7 + right: 30rpx;
  8 + top: 60rpx;
  9 + background: #0286ff;
  10 + font-size: 30rpx;
  11 + color: #fff;
  12 + display: flex;
  13 + align-items: center;
  14 + justify-content: center;
  15 + text-align: center;
  16 + padding: 20rpx;
  17 + box-sizing: border-box;
  18 +}
3 .banner_box { 19 .banner_box {
4 background: #0286ff; 20 background: #0286ff;
5 display: flex; 21 display: flex;
@@ -138,9 +154,13 @@ @@ -138,9 +154,13 @@
138 word-spacing: normal; 154 word-spacing: normal;
139 word-wrap: normal; 155 word-wrap: normal;
140 display: block !important; 156 display: block !important;
  157 + margin: 0!important;
141 } 158 }
142 159
143 .wxParse-img { 160 .wxParse-img {
144 width: 100% !important; 161 width: 100% !important;
145 height: 100%; 162 height: 100%;
146 } 163 }
  164 +.wxParse-span{
  165 + width: 100%;
  166 +}
@@ -12,6 +12,23 @@ Page({ @@ -12,6 +12,23 @@ Page({
12 mainid: '', 12 mainid: '',
13 vip_state: false 13 vip_state: false
14 }, 14 },
  15 +
  16 + showInfo() {
  17 + wx.showModal({
  18 + title: '提示',
  19 + content: '请充值会员',
  20 + cancelText: '暂不充值',
  21 + confirmText: '立即充值',
  22 + success(res) {
  23 + console.log(res)
  24 + if (res.confirm) {
  25 + wx.navigateTo({
  26 + url: '/pages/index/VipRecharge/VipRecharge',
  27 + })
  28 + }
  29 + },
  30 + })
  31 + },
15 goIndex() { 32 goIndex() {
16 wx.switchTab({ 33 wx.switchTab({
17 url: '/pages/index/index', 34 url: '/pages/index/index',
@@ -118,7 +135,7 @@ Page({ @@ -118,7 +135,7 @@ Page({
118 } 135 }
119 } 136 }
120 wx.navigateTo({ 137 wx.navigateTo({
121 - url: '../remind/remind?cid=' + this.data.cid + '&mainid=' + this.data.mainid, 138 + url: '../remind/remind?cid=' + this.data.cid + '&mainid=' + this.data.mainid + '&vip_state=' + this.data.vip_state,
122 }) 139 })
123 }, 140 },
124 141
@@ -48,7 +48,7 @@ @@ -48,7 +48,7 @@
48 </view> 48 </view>
49 <view class='null_box'></view> 49 <view class='null_box'></view>
50 <view class='bottom'> 50 <view class='bottom'>
51 - <view class='bottom_box' style='100%;' bindtap="{{vip_state?'addFamily':''}}">创建新家庭</view> 51 + <view class='bottom_box' style='100%;' bindtap="{{vip_state?'addFamily':'showInfo'}}">创建新家庭</view>
52 <view class='bottom_box' bindtap="goIndex">回到首页</view> 52 <view class='bottom_box' bindtap="goIndex">回到首页</view>
53 </view> 53 </view>
54 </view> 54 </view>
@@ -97,13 +97,9 @@ @@ -97,13 +97,9 @@
97 <view class='box'> 97 <view class='box'>
98 <!-- 上传图片 --> 98 <!-- 上传图片 -->
99 <view class='upload_box' wx:if='{{list.picurl}}'> 99 <view class='upload_box' wx:if='{{list.picurl}}'>
100 - <view class='popup_img'>  
101 - <image src='{{list.picurl}}'></image> 100 + <view class='popup_img' >
  101 + <image src='{{list.picurl}}' mode="widthFix"></image>
102 </view> 102 </view>
103 - <!-- <view wx:else>  
104 - <view class='iconfont icon-add'></view>  
105 - <view>上传客户照片</view>  
106 - </view> -->  
107 </view> 103 </view>
108 </view> 104 </view>
109 <view class='content_item'> 105 <view class='content_item'>
@@ -22,7 +22,7 @@ @@ -22,7 +22,7 @@
22 <view>{{item.description}}</view> 22 <view>{{item.description}}</view>
23 </view> 23 </view>
24 <view class='list_info'> 24 <view class='list_info'>
25 - <view class=" ">{{item.text}}</view> 25 + <view class=" ">{{item.text}}元</view>
26 <view class=" ">{{item.time}}</view> 26 <view class=" ">{{item.time}}</view>
27 </view> 27 </view>
28 </view> 28 </view>
@@ -66,14 +66,18 @@ Page({ @@ -66,14 +66,18 @@ Page({
66 focus: false, 66 focus: false,
67 focus2: false, 67 focus2: false,
68 sub_index: '', 68 sub_index: '',
69 - birthday: '' 69 + birthday: '',
  70 + height: '',
  71 + scroll: 0
70 }, 72 },
71 73
  74 +
72 //回到顶部 75 //回到顶部
73 - goTop: function(e) { // 一键回到顶部 76 + goTop() { // 一键回到顶部
  77 + console.log( wx.getStorageSync('scroll'), 'scroll')
74 if (wx.pageScrollTo) { 78 if (wx.pageScrollTo) {
75 wx.pageScrollTo({ 79 wx.pageScrollTo({
76 - scrollTop: 0 80 + scrollTop: wx.getStorageSync('scroll')
77 }) 81 })
78 } else { 82 } else {
79 wx.showModal({ 83 wx.showModal({
@@ -348,7 +352,7 @@ Page({ @@ -348,7 +352,7 @@ Page({
348 if (type == 'fujiaxian') { 352 if (type == 'fujiaxian') {
349 this.setData({ 353 this.setData({
350 focus: true, 354 focus: true,
351 - focus2:false 355 + focus2: false
352 }) 356 })
353 } else { 357 } else {
354 this.setData({ 358 this.setData({
@@ -356,6 +360,7 @@ Page({ @@ -356,6 +360,7 @@ Page({
356 focus: false 360 focus: false
357 }) 361 })
358 } 362 }
  363 + this.goTop()
359 console.log(this.data.focus2, this.data.focus) 364 console.log(this.data.focus2, this.data.focus)
360 let index = this.data.xulie; 365 let index = this.data.xulie;
361 var that = this 366 var that = this
@@ -1311,7 +1316,9 @@ Page({ @@ -1311,7 +1316,9 @@ Page({
1311 icon: 'none', 1316 icon: 'none',
1312 duration: 2000, 1317 duration: 2000,
1313 }) 1318 })
  1319 + wx.setStorageSync('scroll', 0)
1314 this.setData({ 1320 this.setData({
  1321 + scroll: 0,
1315 inforid: 0, 1322 inforid: 0,
1316 in_num: '', 1323 in_num: '',
1317 firm: '', 1324 firm: '',
@@ -1413,7 +1420,6 @@ Page({ @@ -1413,7 +1420,6 @@ Page({
1413 1420
1414 var warranty_two = res.data.data.def.warranty_two 1421 var warranty_two = res.data.data.def.warranty_two
1415 var guarantee_name = warranty_two.num 1422 var guarantee_name = warranty_two.num
1416 -  
1417 var long_money = res.data.data.def.long_money 1423 var long_money = res.data.data.def.long_money
1418 var time_name = long_money.num 1424 var time_name = long_money.num
1419 1425
@@ -1473,7 +1479,16 @@ Page({ @@ -1473,7 +1479,16 @@ Page({
1473 if (wx.getStorageSync('storge_state') && options.inforid == undefined) { 1479 if (wx.getStorageSync('storge_state') && options.inforid == undefined) {
1474 this.getStorage() 1480 this.getStorage()
1475 } 1481 }
  1482 + },
1476 1483
  1484 + onPageScroll: function(e) {
  1485 + console.log(e.scrollTop)
  1486 + if (!this.data.popup_state) {
  1487 + wx.setStorageSync('scroll', e.scrollTop)
  1488 + this.setData({
  1489 + scroll: e.scrollTop
  1490 + })
  1491 + }
1477 }, 1492 },
1478 1493
1479 /** 1494 /**
@@ -38,13 +38,13 @@ @@ -38,13 +38,13 @@
38 <text>保单号</text> 38 <text>保单号</text>
39 </view> 39 </view>
40 <view class='list_input'> 40 <view class='list_input'>
41 - <input type='text' placeholder='请输入' name='policy_num' value="{{in_num!='undefined'?in_num:''}}" bindinput='policyNum'></input> 41 + <input type='text' placeholder='请输入' name='policy_num' value="{{in_num!='undefined'?in_num:''}}" bindinput='policyNum'></input>
42 </view> 42 </view>
43 </view> 43 </view>
44 <view class='item_list'> 44 <view class='item_list'>
45 <view class='list_title'>所属公司</view> 45 <view class='list_title'>所属公司</view>
46 <view class='list_input'> 46 <view class='list_input'>
47 - <input type='text' placeholder='请输入' name='company' value="{{firm!='undefined'?firm:''}}" bindinput='setFirm'></input> 47 + <input type='text' placeholder='请输入' name='company' value="{{firm!='undefined'?firm:''}}" bindinput='setFirm'></input>
48 </view> 48 </view>
49 </view> 49 </view>
50 <view class='item_list'> 50 <view class='item_list'>
@@ -54,7 +54,7 @@ @@ -54,7 +54,7 @@
54 <input type='text' placeholder='请选择' name='policy_holder' value='{{applicant_name}}' disabled='true'></input> 54 <input type='text' placeholder='请选择' name='policy_holder' value='{{applicant_name}}' disabled='true'></input>
55 </picker> 55 </picker>
56 </view> 56 </view>
57 - </view> 57 + </view>
58 <view class='item_list'> 58 <view class='item_list'>
59 <view class='list_title'>被保险人</view> 59 <view class='list_title'>被保险人</view>
60 <view class='list_input'> 60 <view class='list_input'>
@@ -136,7 +136,7 @@ @@ -136,7 +136,7 @@
136 <view class='protec_item' wx:for='{{main_array}}' wx:key=''> 136 <view class='protec_item' wx:for='{{main_array}}' wx:key=''>
137 <view>{{item.name}}</view> 137 <view>{{item.name}}</view>
138 <view class='protec_num'>{{item.num}} 138 <view class='protec_num'>{{item.num}}
139 - <text >{{item.title}}</text> 139 + <text>{{item.title}}</text>
140 <!-- <block wx:else> 140 <!-- <block wx:else>
141 <block wx:for='{{item.title}}' wx:for-item='danwei' wx:key=''> 141 <block wx:for='{{item.title}}' wx:for-item='danwei' wx:key=''>
142 <text wx:if="{{danwei.label_state}}">{{danwei.name}}</text> 142 <text wx:if="{{danwei.label_state}}">{{danwei.name}}</text>
@@ -194,7 +194,7 @@ @@ -194,7 +194,7 @@
194 <view class='list_title'>缴费时长</view> 194 <view class='list_title'>缴费时长</view>
195 <view class='list_input_box'> 195 <view class='list_input_box'>
196 <view class='list_input'> 196 <view class='list_input'>
197 - <input type='text' placeholder="{{unit2=='终身'?'':'请输入'}}" value='{{long_money.num}}' bindinput='burningTime' disabled='{{unit2=="终身"}}'></input> 197 + <input type='text' placeholder="{{unit2=='终身'?'':'请输入'}}" value='{{long_money.num}}' bindinput='burningTime' disabled='{{unit2=="终身"}}'></input>
198 </view> 198 </view>
199 <view class='list_label_box'> 199 <view class='list_label_box'>
200 <view class="list_label_item {{unit2=='年'?'list_label_active':''}}" bindtap='selectUnit2' data-unit='年'>年</view> 200 <view class="list_label_item {{unit2=='年'?'list_label_active':''}}" bindtap='selectUnit2' data-unit='年'>年</view>
@@ -270,11 +270,14 @@ @@ -270,11 +270,14 @@
270 </view> 270 </view>
271 </view> 271 </view>
272 </view> 272 </view>
  273 + <!-- style='margin-bottom:{{height}}rpx;' -->
273 <view class='item_list'> 274 <view class='item_list'>
274 <view class='list_title'>保障期</view> 275 <view class='list_title'>保障期</view>
275 <view class='list_input_box'> 276 <view class='list_input_box'>
276 - <view class='list_input'>  
277 - <input type='text' placeholder="{{item.title=='终身'?'':'请输入'}}" confirm-type="{{focus?false:''}}" value='{{item.num}}' data-index='{{index}}' bindinput='addRiskUnit' disabled='{{item.title=="终身"}}' focus='{{focus}}' cursor-spacing='200rpx'></input> 277 + <view class='list_input' >
  278 + <input type='text' placeholder="{{item.title=='终身'?'':'请输入'}}" confirm-type="{{focus?false:''}}"
  279 + value='{{item.num}}' data-index='{{index}}' disabled='{{item.title=="终身"}}' cursor-spacing='2000px' bindinput='addRiskUnit'></input>
  280 + <!-- focus='{{focus}}' -->
278 </view> 281 </view>
279 <view class='list_label_box'> 282 <view class='list_label_box'>
280 <view class="list_label_item {{item.title=='年'?'list_label_active':''}}" bindtap='selectUnit4' data-index="{{index}}" data-unit='年'>年</view> 283 <view class="list_label_item {{item.title=='年'?'list_label_active':''}}" bindtap='selectUnit4' data-index="{{index}}" data-unit='年'>年</view>
@@ -322,8 +325,7 @@ @@ -322,8 +325,7 @@
322 </view> 325 </view>
323 </view> 326 </view>
324 </view> 327 </view>
325 - <!--  
326 - <view class='add_btn' bindtap='goTop'>aaaa</view> --> 328 +
327 <!-- 继续添加保单按钮 --> 329 <!-- 继续添加保单按钮 -->
328 <button class='add_btn' data-type='continue1' formType='submit'>继续添加保单</button> 330 <button class='add_btn' data-type='continue1' formType='submit'>继续添加保单</button>
329 <!--底部按钮 --> 331 <!--底部按钮 -->
@@ -95,18 +95,19 @@ Page({ @@ -95,18 +95,19 @@ Page({
95 var data = JSON.parse(res.data); 95 var data = JSON.parse(res.data);
96 var picurl = data.data.picurl; 96 var picurl = data.data.picurl;
97 picurl = picurl.indexOf('http') != '-1' ? picurl : "http://" + picurl 97 picurl = picurl.indexOf('http') != '-1' ? picurl : "http://" + picurl
98 - var imgs = that.data.imgs 98 + var imgs = []
99 imgs.push(picurl) 99 imgs.push(picurl)
100 that.setData({ 100 that.setData({
101 hasimg: picurl, 101 hasimg: picurl,
102 imgs: imgs 102 imgs: imgs
103 }) 103 })
104 -  
105 } 104 }
106 }) 105 })
107 } 106 }
108 }) 107 })
109 }, 108 },
  109 +
  110 +
110 // 选择上传的图片 111 // 选择上传的图片
111 chooseimg2() { //这里是选取图片的方法 112 chooseimg2() { //这里是选取图片的方法
112 var that = this; 113 var that = this;
1 <!--pages/my/editProfile/editProfile.wxml--> 1 <!--pages/my/editProfile/editProfile.wxml-->
2 <view class='banner_box' catchtap='chooseimg'> 2 <view class='banner_box' catchtap='chooseimg'>
3 - <view class='header_portrait' wx:if='{{!hasimg}}'>  
4 - <!-- <image src="{{userinfo.avatar}}"></image> -->  
5 - <view class='iconfont icon-bi'></view>  
6 - <block wx:for='{{imgs}}' wx:key>  
7 - <image src="{{item}}" catchtap='viewImg'></image>  
8 - </block>  
9 - </view>  
10 <view class='header_portrait'> 3 <view class='header_portrait'>
11 - <!-- <view class='iconfont icon-zhaoxiangji1'></view> -->  
12 - <view class='iconfont icon-bi'></view>  
13 <block wx:for='{{imgs}}' wx:key> 4 <block wx:for='{{imgs}}' wx:key>
14 <image src="{{item}}" catchtap='viewImg'></image> 5 <image src="{{item}}" catchtap='viewImg'></image>
15 </block> 6 </block>
  7 + <view class='iconfont icon-bi'></view>
16 </view> 8 </view>
17 </view> 9 </view>
18 -  
19 <view class="content_item"> 10 <view class="content_item">
20 <view class="item_list"> 11 <view class="item_list">
21 <view class="list_title">姓名</view> 12 <view class="list_title">姓名</view>
@@ -58,23 +49,25 @@ @@ -58,23 +49,25 @@
58 </view> 49 </view>
59 </view> 50 </view>
60 <view class="content_item"> 51 <view class="content_item">
61 - <view class="item_list"> 52 + <view class="item_list" style=' align-items: flex-start;'>
62 <view class="list_title">获得荣誉</view> 53 <view class="list_title">获得荣誉</view>
63 <view class="list_content"> 54 <view class="list_content">
64 - <input type="text" placeholder='请输入' placeholder-class='pl_style' value="{{honor}}" class="input_item" bindinput='honor'></input> 55 + <!-- <input type="text" placeholder='请输入' placeholder-class='pl_style' value="{{honor}}" class="input_item" bindinput='honor'></input> -->
  56 + <textarea placeholder='请输入' placeholder-class='pl_style' value="{{honor}}" class="area_item" bindinput='honor'></textarea>
65 </view> 57 </view>
66 </view> 58 </view>
67 - <view class="item_list"> 59 + <view class="item_list" style=' align-items: flex-start;'>
68 <view class="list_title">座右铭</view> 60 <view class="list_title">座右铭</view>
69 <view class="list_content"> 61 <view class="list_content">
70 - <input type="text" placeholder='请输入' placeholder-class='pl_style' value="{{signature}}" class="input_item" bindinput='signature'></input> 62 + <!-- <input type="text" placeholder='请输入' placeholder-class='pl_style' value="{{signature}}" class="input_item" bindinput='signature'></input> -->
  63 + <textarea placeholder='请输入' placeholder-class='pl_style' value="{{signature}}" class="area_item" bindinput='signature'></textarea>
71 </view> 64 </view>
72 </view> 65 </view>
73 <view class="item_list"> 66 <view class="item_list">
74 <view class="list_title">从业时间</view> 67 <view class="list_title">从业时间</view>
75 <view class="list_content"> 68 <view class="list_content">
76 <!-- 默认单位年 --> 69 <!-- 默认单位年 -->
77 - <input type="text" placeholder='请输入' placeholder-class='pl_style' value='{{worktime}}' class="input_item" bindinput='workTime'></input> 70 + <input type="number" placeholder='默认单位年' placeholder-class='pl_style' value='{{worktime}}' class="input_item" bindinput='workTime'></input>
78 </view> 71 </view>
79 </view> 72 </view>
80 <view class='box'> 73 <view class='box'>
@@ -16,8 +16,8 @@ page { @@ -16,8 +16,8 @@ page {
16 } 16 }
17 17
18 .header_portrait { 18 .header_portrait {
19 - width: 130rpx;  
20 - height: 130rpx; 19 + width: 170rpx;
  20 + height: 170rpx;
21 position: absolute; 21 position: absolute;
22 top: 50%; 22 top: 50%;
23 left: 50%; 23 left: 50%;
@@ -135,8 +135,12 @@ page { @@ -135,8 +135,12 @@ page {
135 .input_item { 135 .input_item {
136 border: 0; 136 border: 0;
137 outline: none; 137 outline: none;
  138 +
  139 +}
  140 +.area_item{
  141 + width: 80%;
  142 + height: 120rpx;
138 } 143 }
139 -  
140 .save_btn { 144 .save_btn {
141 width: 100%; 145 width: 100%;
142 height: 80rpx; 146 height: 80rpx;
@@ -9,6 +9,23 @@ Page({ @@ -9,6 +9,23 @@ Page({
9 KeyWord: '', 9 KeyWord: '',
10 vip_state: false 10 vip_state: false
11 }, 11 },
  12 +
  13 + showInfo() {
  14 + wx.showModal({
  15 + title: '提示',
  16 + content: '请充值会员',
  17 + cancelText: '暂不充值',
  18 + confirmText: '立即充值',
  19 + success(res) {
  20 + console.log(res)
  21 + if (res.confirm) {
  22 + wx.navigateTo({
  23 + url: '/pages/index/VipRecharge/VipRecharge',
  24 + })
  25 + }
  26 + },
  27 + })
  28 + },
12 29
13 goIndex() { 30 goIndex() {
14 wx.switchTab({ 31 wx.switchTab({
@@ -74,7 +91,7 @@ Page({ @@ -74,7 +91,7 @@ Page({
74 reportList(e) { 91 reportList(e) {
75 var allinfo = JSON.stringify(e.currentTarget.dataset.allinfo) 92 var allinfo = JSON.stringify(e.currentTarget.dataset.allinfo)
76 wx.navigateTo({ 93 wx.navigateTo({
77 - url: '../reportList/reportList?FamilyId=' + e.currentTarget.dataset.familyid + '&allinfo=' + allinfo, 94 + url: '../reportList/reportList?FamilyId=' + e.currentTarget.dataset.familyid + '&allinfo=' + allinfo + '&vip_state=' + this.data.vip_state,
78 }) 95 })
79 }, 96 },
80 97
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
12 <view class='content_box'> 12 <view class='content_box'>
13 <view class='item_list' wx:for='{{list}}' wx:key='' wx:for-index='indexs' wx:for-item='items'> 13 <view class='item_list' wx:for='{{list}}' wx:key='' wx:for-index='indexs' wx:for-item='items'>
14 <view class='list_left_box'> 14 <view class='list_left_box'>
15 - <view class='list_label_box' bindtap="{{vip_state?'summaryList':''}}" data-num='{{items.infor}}' data-family_id='{{items.family_id}}' data-allinfo='{{items}}'> 15 + <view class='list_label_box' bindtap="{{vip_state?'summaryList':'showInfo'}}" data-num='{{items.infor}}' data-family_id='{{items.family_id}}' data-allinfo='{{items}}'>
16 <view class='iconfont icon-jiating1'></view> 16 <view class='iconfont icon-jiating1'></view>
17 <view>生成报告</view> 17 <view>生成报告</view>
18 <text class='peoper_num'>{{items.infor}}</text> 18 <text class='peoper_num'>{{items.infor}}</text>
@@ -36,7 +36,7 @@ @@ -36,7 +36,7 @@
36 </view> 36 </view>
37 <view class='list_right_box'> 37 <view class='list_right_box'>
38 <view class='list_btn_box'> 38 <view class='list_btn_box'>
39 - <view class='list_btn' bindtap="{{vip_state?'PolicyManage':''}}" data-familyid='{{items.family_id}}'> 39 + <view class='list_btn' bindtap="{{vip_state?'PolicyManage':'showInfo'}}" data-familyid='{{items.family_id}}'>
40 <view>保单管理</view> 40 <view>保单管理</view>
41 </view> 41 </view>
42 <view class='list_btn' bindtap='reportList' data-familyid='{{items.family_id}}' data-allinfo='{{items}}'> 42 <view class='list_btn' bindtap='reportList' data-familyid='{{items.family_id}}' data-allinfo='{{items}}'>
@@ -64,7 +64,7 @@ Page({ @@ -64,7 +64,7 @@ Page({
64 mainid: '', 64 mainid: '',
65 def: [], 65 def: [],
66 warn: [], 66 warn: [],
67 - remind_times: ['提前一天 08:00', '提前两天 08:00', '提前三天 08:00', '提前四天 08:00', '提前五天 08:00'], 67 + remind_times: ['当天 08:00','提前一天 08:00', '提前两天 08:00', '提前三天 08:00', '提前四天 08:00', '提前五天 08:00'],
68 remind_time: '', 68 remind_time: '',
69 index: -1, 69 index: -1,
70 years: years, 70 years: years,
@@ -79,6 +79,23 @@ Page({ @@ -79,6 +79,23 @@ Page({
79 interval: false, 79 interval: false,
80 }, 80 },
81 81
  82 + showInfo() {
  83 + wx.showModal({
  84 + title: '提示',
  85 + content: '请充值会员',
  86 + cancelText: '暂不充值',
  87 + confirmText: '立即充值',
  88 + success(res) {
  89 + console.log(res)
  90 + if (res.confirm) {
  91 + wx.navigateTo({
  92 + url: '/pages/index/VipRecharge/VipRecharge',
  93 + })
  94 + }
  95 + },
  96 + })
  97 + },
  98 +
82 // 打电话 99 // 打电话
83 makePhoneCall() { 100 makePhoneCall() {
84 let that = this; 101 let that = this;
@@ -193,7 +210,7 @@ Page({ @@ -193,7 +210,7 @@ Page({
193 var params = { 210 var params = {
194 UserId: app.globalData.UserId, 211 UserId: app.globalData.UserId,
195 family_id: family_id, 212 family_id: family_id,
196 - warn_time: parseInt(this.data.index) + 1, 213 + warn_time: parseInt(this.data.index) ,
197 text_time: this.data.follow_time, 214 text_time: this.data.follow_time,
198 text: this.data.place, 215 text: this.data.place,
199 } 216 }
@@ -279,7 +296,7 @@ Page({ @@ -279,7 +296,7 @@ Page({
279 console.log(res) 296 console.log(res)
280 if (res.data.code == 200) { 297 if (res.data.code == 200) {
281 var time = res.data.data.warn.warn_time 298 var time = res.data.data.warn.warn_time
282 - var index = parseInt(time) - 1 299 + var index = parseInt(time)
283 that.setData({ 300 that.setData({
284 def: res.data.data.def, 301 def: res.data.data.def,
285 label: res.data.data.label, 302 label: res.data.data.label,
@@ -361,6 +378,9 @@ Page({ @@ -361,6 +378,9 @@ Page({
361 options.mainid ? this.setData({ 378 options.mainid ? this.setData({
362 mainid: options.mainid 379 mainid: options.mainid
363 }) : '' 380 }) : ''
  381 + this.setData({
  382 + vip_state: options.vip_state ? options.vip_state:false
  383 + })
364 this.getData() 384 this.getData()
365 cellId = options.cellId; 385 cellId = options.cellId;
366 var that = this; 386 var that = this;
@@ -59,12 +59,12 @@ @@ -59,12 +59,12 @@
59 <view class='list_info_box'> 59 <view class='list_info_box'>
60 <view class='list_info_item'> 60 <view class='list_info_item'>
61 <view class='item_title'>提醒时间：</view> 61 <view class='item_title'>提醒时间：</view>
62 - <picker value='{{index}}' range='{{remind_times}}' bindchange="{{edit_state?'remindTime':''}}"> 62 + <picker value='{{index}}' range='{{remind_times}}' bindchange="{{edit_state&&!vip_state?'remindTime':''}}">
63 <!-- {{remind_time!=''?'08:00':''}} --> 63 <!-- {{remind_time!=''?'08:00':''}} -->
64 <input placeholder='请选择' value="{{remind_times[index]}}" disabled='true'></input> 64 <input placeholder='请选择' value="{{remind_times[index]}}" disabled='true'></input>
65 </picker> 65 </picker>
66 </view> 66 </view>
67 - <view class='list_info_item' bindtap="{{edit_state?'translate':''}}"> 67 + <view class='list_info_item' bindtap="{{edit_state&&!vip_state?'translate':''}}">
68 <view class='item_title'>跟踪时间：</view> 68 <view class='item_title'>跟踪时间：</view>
69 <!-- <picker mode='date' value='{{follow_time}}' bindchange='followTime'> --> 69 <!-- <picker mode='date' value='{{follow_time}}' bindchange='followTime'> -->
70 <input placeholder='请选择' value='{{follow_time}}' disabled='true'></input> 70 <input placeholder='请选择' value='{{follow_time}}' disabled='true'></input>
@@ -74,7 +74,7 @@ @@ -74,7 +74,7 @@
74 <view class='item_title'>提醒内容：</view> 74 <view class='item_title'>提醒内容：</view>
75 <block wx:if='{{time_state}}'> 75 <block wx:if='{{time_state}}'>
76 <!-- <view class='list_textarea'> --> 76 <!-- <view class='list_textarea'> -->
77 - <textarea class='' placeholder='请输入' maxlength='50' value='{{place}}' bindinput='place' disabled='{{!edit_state}}'></textarea> 77 + <textarea class='' placeholder='请输入' maxlength='50' value='{{place}}' bindinput='place' disabled='{{!edit_state||vip_state}}'></textarea>
78 <!-- {{interval}} --> 78 <!-- {{interval}} -->
79 <!-- </view> --> 79 <!-- </view> -->
80 </block> 80 </block>
@@ -83,8 +83,8 @@ @@ -83,8 +83,8 @@
83 </view> 83 </view>
84 <!-- </block> --> 84 <!-- </block> -->
85 <view class='list_bottom'> 85 <view class='list_bottom'>
86 - <view class='list_btn' bindtap="{{edit_state?'nullValue':''}}">清空</view>  
87 - <view class='list_btn list_active' bindtap='finish' data-family_id='{{def.family_id}}'>完成</view> 86 + <view class='list_btn' bindtap="{{edit_state&&!vip_state?'nullValue':'showInfo'}}">清空</view>
  87 + <view class='list_btn list_active' bindtap="{{vip_state?'showInfo':'finish'}}" data-family_id='{{def.family_id}}'>完成</view>
88 </view> 88 </view>
89 </view> 89 </view>
90 </view> 90 </view>
@@ -101,7 +101,7 @@ @@ -101,7 +101,7 @@
101 <view class='log_time'>{{item.create_time}}</view> 101 <view class='log_time'>{{item.create_time}}</view>
102 </view> 102 </view>
103 </view> 103 </view>
104 - <view class='add_btn_box' bindtap='addLogs' data-DefId='{{def.id}}'> 104 + <view class='add_btn_box' bindtap="{{vip_state?'showInfo':'addLogs'}}" data-DefId='{{def.id}}'>
105 <view class='iconfont icon-tianjia'></view> 105 <view class='iconfont icon-tianjia'></view>
106 <view>添加日志</view> 106 <view>添加日志</view>
107 </view> 107 </view>
@@ -11,8 +11,25 @@ Page({ @@ -11,8 +11,25 @@ Page({
11 mid: '', 11 mid: '',
12 cid: '', 12 cid: '',
13 medicalreportlist: [], //数据列表 13 medicalreportlist: [], //数据列表
  14 + vip_state:false,
14 }, 15 },
15 16
  17 + showInfo() {
  18 + wx.showModal({
  19 + title: '提示',
  20 + content: '请充值会员',
  21 + cancelText: '暂不充值',
  22 + confirmText: '立即充值',
  23 + success(res) {
  24 + console.log(res)
  25 + if (res.confirm) {
  26 + wx.navigateTo({
  27 + url: '/pages/index/VipRecharge/VipRecharge',
  28 + })
  29 + }
  30 + },
  31 + })
  32 + },
16 // 体检报告列表接口调取 33 // 体检报告列表接口调取
17 medicalReportList() { 34 medicalReportList() {
18 let url = 'counselor/publishlist'; 35 let url = 'counselor/publishlist';
@@ -72,7 +89,8 @@ Page({ @@ -72,7 +89,8 @@ Page({
72 onLoad: function(options) { 89 onLoad: function(options) {
73 this.setData({ 90 this.setData({
74 FamilyId: options.FamilyId, 91 FamilyId: options.FamilyId,
75 - allinfo: options.allinfo 92 + allinfo: options.allinfo,
  93 + vip_state: options.vip_state ? options.vip_state:false
76 }) 94 })
77 this.medicalReportList() 95 this.medicalReportList()
78 }, 96 },
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
11 <view class='list_content'>被保险人：{{item.users}}</view> 11 <view class='list_content'>被保险人：{{item.users}}</view>
12 </view> 12 </view>
13 <view class='list_btn_box'> 13 <view class='list_btn_box'>
14 - <view class='list_btn' bindtap='editInfo' data-id='{{item.id}}'>修改</view> 14 + <view class='list_btn' bindtap="{{vip_state?'showInfo':'editInfo'}}" data-id='{{item.id}}'>修改</view>
15 <view class='list_btn add_btn' bindtap='summaryList' data-id='{{item.id}}'>查看</view> 15 <view class='list_btn add_btn' bindtap='summaryList' data-id='{{item.id}}'>查看</view>
16 </view> 16 </view>
17 </view> 17 </view>
@@ -472,8 +472,8 @@ Page({ @@ -472,8 +472,8 @@ Page({
472 familymember: familymember, //家庭成员 472 familymember: familymember, //家庭成员
473 userinfo: res.data.data.list.counselor, //顾问信息 473 userinfo: res.data.data.list.counselor, //顾问信息
474 information: information, 474 information: information,
475 - advise: res.data.data.list.advise,  
476 - report: res.data.data.list.report, 475 + advise: res.data.data.list.report,
  476 + report: res.data.data.list.advise,
477 guarantee: res.data.data.list.guarantee, 477 guarantee: res.data.data.list.guarantee,
478 information_user: res.data.data.list.information_user, 478 information_user: res.data.data.list.information_user,
479 collect: collect, 479 collect: collect,
@@ -25,7 +25,11 @@ Page({ @@ -25,7 +25,11 @@ Page({
25 recommend:[], 25 recommend:[],
26 status:'' 26 status:''
27 }, 27 },
28 - 28 + goIndex() {
  29 + wx.switchTab({
  30 + url: '/pages/index/index',
  31 + })
  32 + },
29 33
30 //保单详情 34 //保单详情
31 summaryDetail(e) { 35 summaryDetail(e) {
@@ -112,7 +116,7 @@ Page({ @@ -112,7 +116,7 @@ Page({
112 onLoad: function (options) { 116 onLoad: function (options) {
113 this.setData({ 117 this.setData({
114 PublishId: options.PublishId, 118 PublishId: options.PublishId,
115 - reportid: options.reportid 119 + reportid: options.reportid,
116 }) 120 })
117 if (options.PublishId) { 121 if (options.PublishId) {
118 this.listDetail() 122 this.listDetail()
@@ -181,4 +181,5 @@ @@ -181,4 +181,5 @@
181 </view> 181 </view>
182 </view> 182 </view>
183 </block> 183 </block>
184 -</view>  
  184 +</view>
  185 +<view class='go_index' bindtap="goIndex" wx:if="{{reportid!=''}}">回到首页</view>
1 @import '/pages/index/summaryList/summaryList.wxss'; 1 @import '/pages/index/summaryList/summaryList.wxss';
2 - 2 +.go_index {
  3 + width: 100rpx;
  4 + height: 100rpx;
  5 + border-radius: 50%;
  6 + position: fixed;
  7 + right: 30rpx;
  8 + bottom: 60rpx;
  9 + background: #0286ff;
  10 + font-size: 30rpx;
  11 + color: #fff;
  12 + display: flex;
  13 + align-items: center;
  14 + justify-content: center;
  15 + text-align: center;
  16 + padding: 20rpx;
  17 + box-sizing: border-box;
  18 +}
3 .content_item_box { 19 .content_item_box {
4 background: #fff; 20 background: #fff;
5 padding: 0 62rpx; 21 padding: 0 62rpx;
@@ -37,7 +37,7 @@ Page({ @@ -37,7 +37,7 @@ Page({
37 }) 37 })
38 } else { 38 } else {
39 wx.navigateTo({ 39 wx.navigateTo({
40 - url: '/pages/index/summaryList2/summaryList2?PublishId=' + this.data.PublishId, 40 + url: '/pages/index/summaryList2/summaryList2?reportid=' + this.data.PublishId,
41 }) 41 })
42 } 42 }
43 } 43 }
@@ -66,7 +66,7 @@ Page({ @@ -66,7 +66,7 @@ Page({
66 if (res.data.code == 200) { 66 if (res.data.code == 200) {
67 if (res.data.data.type == 1) { 67 if (res.data.data.type == 1) {
68 wx.navigateTo({ 68 wx.navigateTo({
69 - url: '/pages/index/summaryList2/summaryList2?PublishId=' + that.data.PublishId, 69 + url: '/pages/index/summaryList2/summaryList2?reportid=' + that.data.PublishId,
70 }) 70 })
71 } else { 71 } else {
72 wx.showToast({ 72 wx.showToast({
@@ -82,7 +82,8 @@ Page({ @@ -82,7 +82,8 @@ Page({
82 var num = parseInt(popularize.tb) //1000 82 var num = parseInt(popularize.tb) //1000
83 var balance = parseInt(popularize.balance) //我的TB 83 var balance = parseInt(popularize.balance) //我的TB
84 var TbNum = parseInt(that.data.TbNum) //输入TB 84 var TbNum = parseInt(that.data.TbNum) //输入TB
85 - if (TbNum == '') { 85 + console.log('TbNum', TbNum)
  86 + if (TbNum == '' || TbNum == 'Nan') {
86 wx.showToast({ 87 wx.showToast({
87 title: '请输入提现金额', 88 title: '请输入提现金额',
88 icon: 'none', 89 icon: 'none',
@@ -103,6 +104,7 @@ Page({ @@ -103,6 +104,7 @@ Page({
103 duration: 2000, 104 duration: 2000,
104 mask: true, 105 mask: true,
105 }) 106 })
  107 +
106 } else if (res.data.data.type == -1) { 108 } else if (res.data.data.type == -1) {
107 wx.showToast({ 109 wx.showToast({
108 title: 'T币数值错误', 110 title: 'T币数值错误',
@@ -140,9 +142,13 @@ Page({ @@ -140,9 +142,13 @@ Page({
140 duration: 2000, 142 duration: 2000,
141 }) 143 })
142 } 144 }
143 - this.setData({ 145 + setTimeout(function() {
  146 + that.getPersonanCenter()
  147 + }, 2000)
  148 + that.setData({
144 withdraw_state: false 149 withdraw_state: false
145 }) 150 })
  151 +
146 }) 152 })
147 } 153 }
148 154
@@ -181,16 +187,16 @@ Page({ @@ -181,16 +187,16 @@ Page({
181 187
182 //会员充值 188 //会员充值
183 vipCharge() { 189 vipCharge() {
184 - // if (app.globalData.UserType == 4) {  
185 - // wx.showToast({  
186 - // title: '暂无权限',  
187 - // icon: 'none'  
188 - // })  
189 - // } else { 190 + if (app.globalData.UserType == 4) {
  191 + wx.showToast({
  192 + title: '暂无权限',
  193 + icon: 'none'
  194 + })
  195 + } else {
190 wx.navigateTo({ 196 wx.navigateTo({
191 url: '../index/VipRecharge/VipRecharge', 197 url: '../index/VipRecharge/VipRecharge',
192 }) 198 })
193 - // } 199 + }
194 }, 200 },
195 201
196 //报告浏览记录 202 //报告浏览记录
@@ -240,7 +246,7 @@ Page({ @@ -240,7 +246,7 @@ Page({
240 twoCode(e) { 246 twoCode(e) {
241 let imgurl = e.currentTarget.dataset.imgurl 247 let imgurl = e.currentTarget.dataset.imgurl
242 console.log(e) 248 console.log(e)
243 - if (app.globalData.UserType == 4 && app.globalData.user_index!=4) { 249 + if (app.globalData.UserType == 4 && app.globalData.user_index != 4) {
244 wx.showToast({ 250 wx.showToast({
245 title: '暂无权限', 251 title: '暂无权限',
246 icon: 'none' 252 icon: 'none'
@@ -487,13 +493,15 @@ Page({ @@ -487,13 +493,15 @@ Page({
487 * 用户点击右上角分享 493 * 用户点击右上角分享
488 */ 494 */
489 onShareAppMessage: function(options) { 495 onShareAppMessage: function(options) {
490 - console.log(options)  
491 - console.log(options.target.dataset.status) 496 + var sharetext = options.target.dataset.sharetext
492 // 设置菜单中的转发按钮触发转发事件时的转发内容 497 // 设置菜单中的转发按钮触发转发事件时的转发内容
493 var shareObj = { 498 var shareObj = {
494 - title: "保单体验专家", // 默认是小程序的名称(可以写slogan等)  
495 - path: '/pages/start/start?status =' + options.target.dataset.status, // 默认是当前页面，必须是以‘/’开头的完整路径  
496 - imgUrl: '', //自定义图片路径，可以是本地文件路径、代码包文件路径或者网络图片路径，支持PNG及JPG，不传入 imageUrl 则使用默认截图。显示图片长宽比是 5:4 499 + title: "保险顾问专用客户和保单管理工具，诚邀使用",
  500 + // 默认是小程序的名称(可以写slogan等)
  501 + path: '/pages/start/start?status =' + options.target.dataset.status + '&sharetext=' + sharetext,
  502 + // 默认是当前页面，必须是以‘/’开头的完整路径
  503 + imageUrl: '/images/bg.jpg',
  504 + //自定义图片路径，可以是本地文件路径、代码包文件路径或者网络图片路径，支持PNG及JPG，不传入 imageUrl 则使用默认截图。显示图片长宽比是 5:4
497 success: function(res) { 505 success: function(res) {
498 // 转发成功之后的回调 506 // 转发成功之后的回调
499 if (res.errMsg == 'shareAppMessage:ok') {} 507 if (res.errMsg == 'shareAppMessage:ok') {}
@@ -511,11 +519,12 @@ Page({ @@ -511,11 +519,12 @@ Page({
511 } 519 }
512 }　　 // 来自页面内的按钮的转发 520 }　　 // 来自页面内的按钮的转发
513 521
514 - if (options.from == 'button') {  
515 - var sharetext = options.target.dataset.sharetext  
516 - // 此处可以修改 shareObj 中的内容  
517 - shareObj.path = '/pages/start/start?status=' + options.target.dataset.status + '&sharetext=' + sharetext;  
518 - }　　 // 返回shareObj 522 + // if (options.from == 'button') {
  523 + // var sharetext = options.target.dataset.sharetext
  524 + // // 此处可以修改 shareObj 中的内容
  525 + // shareObj.path = '/pages/start/start?status=' + options.target.dataset.status + '&sharetext=' + sharetext
  526 + // shareObj.imgUrl= '/images/bg.jpg'
  527 + // }　　 // 返回shareObj
519 return shareObj; 528 return shareObj;
520 529
521 } 530 }
1 <!--pages/personalCenter/personalCenter.wxml--> 1 <!--pages/personalCenter/personalCenter.wxml-->
  2 +<!-- <image src='/images/bg.jpg'></image> -->
2 <view class='banner_box'> 3 <view class='banner_box'>
3 <view class='head_img'> 4 <view class='head_img'>
4 <image src='{{user_info.avatar}}'></image> 5 <image src='{{user_info.avatar}}'></image>
@@ -77,7 +78,7 @@ @@ -77,7 +78,7 @@
77 <view>方案预设</view> 78 <view>方案预设</view>
78 <view class='iconfont icon-jinru'></view> 79 <view class='iconfont icon-jinru'></view>
79 </view> 80 </view>
80 - </view> 81 + </view>
81 <view class='item_list' bindtap='share'> 82 <view class='item_list' bindtap='share'>
82 <view class='list_icon'> 83 <view class='list_icon'>
83 <text class='iconfont icon-fenxiang1'></text> 84 <text class='iconfont icon-fenxiang1'></text>
@@ -187,7 +188,7 @@ @@ -187,7 +188,7 @@
187 <view class="envoy_info_box {{!item.tab_state?'expand':''}}"> 188 <view class="envoy_info_box {{!item.tab_state?'expand':''}}">
188 <view class='envoy_content' wx:for='{{item.pg}}' wx:key=''> 189 <view class='envoy_content' wx:for='{{item.pg}}' wx:key=''>
189 <view>{{item.time}}</view> 190 <view>{{item.time}}</view>
190 - <view class='envoy_title'>{{item.parent_change}}元</view> 191 + <view class='envoy_title'>{{item.parent_change==null?'0':item.parent_change}}元</view>
191 </view> 192 </view>
192 </view> 193 </view>
193 </view> 194 </view>
@@ -12,8 +12,9 @@ Page({ @@ -12,8 +12,9 @@ Page({
12 report_state: false, 12 report_state: false,
13 share_state: false, 13 share_state: false,
14 PublishId: '', 14 PublishId: '',
15 - img: '', 15 + imgUrl: '',
16 GoId: '', 16 GoId: '',
  17 + show_state: true
17 }, 18 },
18 19
19 //登录 20 //登录
@@ -21,7 +22,6 @@ Page({ @@ -21,7 +22,6 @@ Page({
21 app.globalData.userInfo = e.detail.userInfo 22 app.globalData.userInfo = e.detail.userInfo
22 var user_index = parseInt(e.target.dataset.user) 23 var user_index = parseInt(e.target.dataset.user)
23 app.globalData.user_index = user_index 24 app.globalData.user_index = user_index
24 -  
25 var that = this 25 var that = this
26 wx.login({ 26 wx.login({
27 success: (res) => { 27 success: (res) => {
@@ -41,11 +41,9 @@ Page({ @@ -41,11 +41,9 @@ Page({
41 res.data.data.PublishId ? that.setData({ 41 res.data.data.PublishId ? that.setData({
42 PublishId: res.data.data.PublishId 42 PublishId: res.data.data.PublishId
43 }) : '' 43 }) : ''
44 -  
45 if (res.data.data.UserType == 4) { 44 if (res.data.data.UserType == 4) {
46 app.globalData.temp_UserType = 3 45 app.globalData.temp_UserType = 3
47 } 46 }
48 -  
49 if (res.data.data.type == '-3') { //-3已经注册过了 47 if (res.data.data.type == '-3') { //-3已经注册过了
50 wx.switchTab({ 48 wx.switchTab({
51 url: '../index/index' 49 url: '../index/index'
@@ -67,7 +65,7 @@ Page({ @@ -67,7 +65,7 @@ Page({
67 }) 65 })
68 } else if (res.data.data.checkstatus == '3') { //3为文章分享 66 } else if (res.data.data.checkstatus == '3') { //3为文章分享
69 wx.navigateTo({ 67 wx.navigateTo({
70 - url: '/pages/index/ArticleDetails/ArticleDetails?NewsId=' + res.data.data.NewsId + '&GoId=' + res.data.data.GoId 68 + url: '/pages/index/ArticleDetails/ArticleDetails?NewsId=' + res.data.data.NewsId + '&GoId=' + res.data.data.GoId + '&show_state=' + this.data.show_state
71 }) 69 })
72 this.setData({ 70 this.setData({
73 GoId: res.data.data.GoId 71 GoId: res.data.data.GoId
@@ -267,7 +265,7 @@ Page({ @@ -267,7 +265,7 @@ Page({
267 265
268 //体检报告详情检测 266 //体检报告详情检测
269 reportInfo2() { 267 reportInfo2() {
270 - console.log(that.data.PubilshId,'aa') 268 + console.log(that.data.PubilshId, 'aa')
271 let that = this; 269 let that = this;
272 that.setData({ 270 that.setData({
273 report_state: false 271 report_state: false
@@ -305,9 +303,9 @@ Page({ @@ -305,9 +303,9 @@ Page({
305 app.post(url, params).then((res) => { 303 app.post(url, params).then((res) => {
306 if (res.data.code == 200) { 304 if (res.data.code == 200) {
307 that.setData({ 305 that.setData({
308 - img: res.data.data.piclur 306 + imgUrl: res.data.data.picurl
309 }) 307 })
310 - console.log(that.data.img) 308 + console.log(res.data.data.picurl)
311 } 309 }
312 }).catch((errMsg) => { 310 }).catch((errMsg) => {
313 console.log(errMsg) 311 console.log(errMsg)
@@ -325,10 +323,12 @@ Page({ @@ -325,10 +323,12 @@ Page({
325 * 生命周期函数--监听页面加载 323 * 生命周期函数--监听页面加载
326 */ 324 */
327 onLoad: function(options) { 325 onLoad: function(options) {
  326 + console.log('start', options)
328 if (options.status) { 327 if (options.status) {
329 this.setData({ 328 this.setData({
330 status: options.status, 329 status: options.status,
331 - sharetext: options.sharetext 330 + sharetext: options.sharetext,
  331 + show_state: options.show_state ? options.show_state:true
332 }) 332 })
333 } 333 }
334 }, 334 },
@@ -48,7 +48,7 @@ @@ -48,7 +48,7 @@
48 </view> 48 </view>
49 <view class='code_img'> 49 <view class='code_img'>
50 <!-- <image src='/images/img2.png'></image> --> 50 <!-- <image src='/images/img2.png'></image> -->
51 - <image src='{{img}}'></image> 51 + <image src='{{imgUrl}}'></image>
52 </view> 52 </view>
53 </view> 53 </view>
54 </view> 54 </view>
@@ -37,65 +37,19 @@ @@ -37,65 +37,19 @@
37 "list": [] 37 "list": []
38 }, 38 },
39 "miniprogram": { 39 "miniprogram": {
40 - "current": 8, 40 + "current": 1,
41 "list": [ 41 "list": [
42 { 42 {
43 - "id": -1,  
44 - "name": "个人信息录入",  
45 - "pathName": "pages/index/EntryInformation/EntryInformation",  
46 - "query": ""  
47 - },  
48 - {  
49 - "id": 4, 43 + "id": 0,
50 "name": "编辑保单", 44 "name": "编辑保单",
51 "pathName": "pages/index/addListDetail/addListDetail", 45 "pathName": "pages/index/addListDetail/addListDetail",
52 - "query": "def_id=105&inforid=68&FamilyId=53",  
53 - "scene": null  
54 - },  
55 - {  
56 - "id": -1,  
57 - "name": "方案预设",  
58 - "pathName": "pages/index/Program/Program",  
59 - "query": ""  
60 - },  
61 - {  
62 - "id": -1,  
63 - "name": "center",  
64 - "pathName": "pages/personalCenter/personalCenter",  
65 - "query": ""  
66 - },  
67 - {  
68 - "id": -1,  
69 - "name": "保单汇总表",  
70 - "pathName": "pages/index/summaryList/summaryList",  
71 - "query": "allinfo={\"family_id\":130,\"warn_time\":0,\"warn_status\":0,\"infor\":1,\"users\":[{\"family_id\":130,\"id\":245,\"name\":\"ceshi\",\"family_role\":\"dsfs\",\"user_family\":1,\"cid\":413,\"key_status\":0}]}"  
72 - },  
73 - {  
74 - "id": -1,  
75 - "name": "提醒和跟踪",  
76 - "pathName": "pages/index/remind/remind",  
77 - "query": "cid=5&mainid=127",  
78 - "scene": null  
79 - },  
80 - {  
81 - "id": -1,  
82 - "name": "保单编辑",  
83 - "pathName": "pages/index/addListDetail/addListDetail",  
84 - "query": "def_id=53&inforid=26&FamilyId=19",  
85 - "scene": null  
86 - },  
87 - {  
88 - "id": -1,  
89 - "name": "保单添加",  
90 - "pathName": "pages/index/addListDetail/addListDetail",  
91 - "query": "def_id=135&FamilyId=70&name=333", 46 + "query": "def_id=1&FamilyId=1&name=测试",
92 "scene": null 47 "scene": null
93 }, 48 },
94 { 49 {
95 "id": -1, 50 "id": -1,
96 "name": "aa", 51 "name": "aa",
97 - "pathName": "pages/index/summaryList/summaryList",  
98 - "query": "allinfo={\"family_id\":78,\"warn_time\":9000000000,\"warn_status\":0,\"infor\":2,\"users\":[{\"family_id\":78,\"id\":153,\"name\":\"刘晓艳\",\"family_role\":\"11\",\"user_family\":1,\"cid\":5,\"key_status\":0},{\"family_id\":78,\"id\":154,\"name\":\"秘密\",\"family_role\":\"你们\",\"user_family\":0,\"cid\":5,\"key_status\":0}]}", 52 + "pathName": "pages/index/editProfile/editProfile",
99 "scene": null 53 "scene": null
100 } 54 }
101 ] 55 ]