刘晓艳 / baoxian · 提交

转到一个项目

作者 刘晓艳
提交 13cdbb976f3eaaed1e7e6220eef4aa28365ac9aa 1 个父辈 c3e09413

家庭保险二开bug修改

内嵌 并排对比
正在显示 22 个修改的文件 包含 150 行增加 和 114 行删除
@@ -24,13 +24,13 @@ button::after { @@ -24,13 +24,13 @@ button::after {
24 /* iconfont */ 24 /* iconfont */
25 25
26 @font-face { 26 @font-face {
27 - font-family: 'iconfont'; /* project id 926819 */  
28 - src: url('//at.alicdn.com/t/font_926819_0pzhvmpbjahd.eot');  
29 - src: url('//at.alicdn.com/t/font_926819_0pzhvmpbjahd.eot?#iefix') format('embedded-opentype'),  
30 - url('//at.alicdn.com/t/font_926819_0pzhvmpbjahd.woff2') format('woff2'),  
31 - url('//at.alicdn.com/t/font_926819_0pzhvmpbjahd.woff') format('woff'),  
32 - url('//at.alicdn.com/t/font_926819_0pzhvmpbjahd.ttf') format('truetype'),  
33 - url('//at.alicdn.com/t/font_926819_0pzhvmpbjahd.svg#iconfont') format('svg'); 27 + font-family: 'iconfont'; /* project id 926819 */
  28 + src: url('//at.alicdn.com/t/font_926819_2olbhnsznao.eot');
  29 + src: url('//at.alicdn.com/t/font_926819_2olbhnsznao.eot?#iefix') format('embedded-opentype'),
  30 + url('//at.alicdn.com/t/font_926819_2olbhnsznao.woff2') format('woff2'),
  31 + url('//at.alicdn.com/t/font_926819_2olbhnsznao.woff') format('woff'),
  32 + url('//at.alicdn.com/t/font_926819_2olbhnsznao.ttf') format('truetype'),
  33 + url('//at.alicdn.com/t/font_926819_2olbhnsznao.svg#iconfont') format('svg');
34 } 34 }
35 35
36 .iconfont { 36 .iconfont {
@@ -177,6 +177,10 @@ button::after { @@ -177,6 +177,10 @@ button::after {
177 content: "\e60f"; 177 content: "\e60f";
178 } 178 }
179 179
  180 +.icon-qiehuan:before {
  181 + content: "\e630";
  182 +}
  183 +
180 .icon-wenjian:before { 184 .icon-wenjian:before {
181 content: "\e67d"; 185 content: "\e67d";
182 } 186 }
@@ -237,6 +241,10 @@ button::after { @@ -237,6 +241,10 @@ button::after {
237 content: "\e605"; 241 content: "\e605";
238 } 242 }
239 243
  244 +.icon-qiehuan1:before {
  245 + content: "\e62c";
  246 +}
  247 +
240 .icon-hengxian:before { 248 .icon-hengxian:before {
241 content: "\e657"; 249 content: "\e657";
242 } 250 }
@@ -257,6 +265,10 @@ button::after { @@ -257,6 +265,10 @@ button::after {
257 content: "\e625"; 265 content: "\e625";
258 } 266 }
259 267
  268 +.icon-qiehuan2:before {
  269 + content: "\e643";
  270 +}
  271 +
260 .icon-fenxiang:before { 272 .icon-fenxiang:before {
261 content: "\e62e"; 273 content: "\e62e";
262 } 274 }
1 // pages/index/TB/TB.js 1 // pages/index/TB/TB.js
2 -const app=getApp(); 2 +const app = getApp();
3 var WxParse = require('../../../wxParse/wxParse.js'); 3 var WxParse = require('../../../wxParse/wxParse.js');
4 Page({ 4 Page({
5 5
@@ -8,8 +8,8 @@ Page({ @@ -8,8 +8,8 @@ Page({
8 */ 8 */
9 data: { 9 data: {
10 popup_stete: false, 10 popup_stete: false,
11 - tlist:'',  
12 - Page:0 11 + tlist: '',
  12 + Page: 0
13 }, 13 },
14 //说明 14 //说明
15 instructionsInfo() { 15 instructionsInfo() {
@@ -18,50 +18,50 @@ Page({ @@ -18,50 +18,50 @@ Page({
18 }) 18 })
19 }, 19 },
20 //取消弹窗 20 //取消弹窗
21 - setpopupflase(){  
22 - console.log(1); 21 + setpopupflase() {
  22 + console.log(1);
23 this.setData({ 23 this.setData({
24 popup_stete: false 24 popup_stete: false
25 }) 25 })
26 }, 26 },
27 - funvoid(){  
28 -  
29 - },  
30 - //个人中心T币接口  
31 - gettlist(){  
32 - let that=this;  
33 - let url ='counselor/tlist';  
34 - let params={  
35 - UserId: app.globalData.UserId,  
36 - Page: that.data.Page  
37 - }  
38 - app.post(url,params).then((res)=>{  
39 - console.log(res);  
40 - if(res.data.code==200){  
41 - that.setData({  
42 - tlist:res.data.data  
43 - })  
44 - }  
45 27
46 - }).catch((err)=>{  
47 - console.log(err)  
48 - })  
49 -  
50 - },  
51 - //TB信息内容接口  
52 - aboutTB(){  
53 - let that=this;  
54 - let url ='pubilc/about';  
55 - app.post(url, { AboutType:10}).then((res)=>{  
56 - if (res.data.code == 200) {  
57 - console.log(res)  
58 - console.log(res.data.data.post_content)  
59 - WxParse.wxParse('content', 'html', res.data.data.post_content, that, 5);  
60 - }  
61 - }).catch((err)=>{  
62 - console.log(err)  
63 - })  
64 - }, 28 + //个人中心T币接口
  29 + gettlist() {
  30 + let that = this;
  31 + let url = 'counselor/tlist';
  32 + let params = {
  33 + UserId: app.globalData.UserId,
  34 + Page: that.data.Page
  35 + }
  36 + app.post(url, params).then((res) => {
  37 + console.log(res);
  38 + if (res.data.code == 200) {
  39 + that.setData({
  40 + tlist: res.data.data
  41 + })
  42 + }
  43 + }).catch((err) => {
  44 + console.log(err)
  45 + })
  46 + },
  47 +
  48 +
  49 + //TB信息内容接口
  50 + aboutTB() {
  51 + let that = this;
  52 + let url = 'pubilc/about';
  53 + app.post(url, {
  54 + AboutType: 10
  55 + }).then((res) => {
  56 + if (res.data.code == 200) {
  57 + console.log(res)
  58 + console.log(res.data.data.post_content)
  59 + WxParse.wxParse('content', 'html', res.data.data.post_content, that, 5);
  60 + }
  61 + }).catch((err) => {
  62 + console.log(err)
  63 + })
  64 + },
65 65
66 /** 66 /**
67 * 生命周期函数--监听页面加载 67 * 生命周期函数--监听页面加载
@@ -81,9 +81,9 @@ Page({ @@ -81,9 +81,9 @@ Page({
81 * 生命周期函数--监听页面显示 81 * 生命周期函数--监听页面显示
82 */ 82 */
83 onShow: function() { 83 onShow: function() {
84 - let that=this;  
85 - that.gettlist();  
86 - that.aboutTB(); 84 + let that = this;
  85 + that.gettlist();
  86 + that.aboutTB();
87 87
88 }, 88 },
89 89
@@ -38,8 +38,8 @@ Page({ @@ -38,8 +38,8 @@ Page({
38 risk_list: [{ 38 risk_list: [{
39 name: '', 39 name: '',
40 mo: [], 40 mo: [],
41 - // project_time: '',  
42 - title: '', 41 + // project_time: '',
  42 + title: '年',
43 num: '' 43 num: ''
44 }], 44 }],
45 main_array: [], 45 main_array: [],
@@ -360,7 +360,7 @@ Page({ @@ -360,7 +360,7 @@ Page({
360 focus: false 360 focus: false
361 }) 361 })
362 } 362 }
363 - this.goTop() 363 + // this.goTop()
364 console.log(this.data.focus2, this.data.focus) 364 console.log(this.data.focus2, this.data.focus)
365 let index = this.data.xulie; 365 let index = this.data.xulie;
366 var that = this 366 var that = this
@@ -697,7 +697,7 @@ Page({ @@ -697,7 +697,7 @@ Page({
697 risk_list[len] = { 697 risk_list[len] = {
698 name: '', 698 name: '',
699 mo: [], 699 mo: [],
700 - title: '', 700 + title: '年',
701 num: '' 701 num: ''
702 } 702 }
703 this.setData({ 703 this.setData({
@@ -1344,7 +1344,7 @@ Page({ @@ -1344,7 +1344,7 @@ Page({
1344 name: '', 1344 name: '',
1345 mo: [], 1345 mo: [],
1346 // project_time: '', 1346 // project_time: '',
1347 - title: '', 1347 + title: '年',
1348 num: '' 1348 num: ''
1349 }], 1349 }],
1350 imgs: '', 1350 imgs: '',
@@ -1482,7 +1482,6 @@ Page({ @@ -1482,7 +1482,6 @@ Page({
1482 }, 1482 },
1483 1483
1484 onPageScroll: function(e) { 1484 onPageScroll: function(e) {
1485 - console.log(e.scrollTop)  
1486 if (!this.data.popup_state) { 1485 if (!this.data.popup_state) {
1487 wx.setStorageSync('scroll', e.scrollTop) 1486 wx.setStorageSync('scroll', e.scrollTop)
1488 this.setData({ 1487 this.setData({
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
12 <view class='popup_content'> 12 <view class='popup_content'>
13 <view class='popup_title'>{{item.name}}</view> 13 <view class='popup_title'>{{item.name}}</view>
14 <view class='popup_input'> 14 <view class='popup_input'>
15 - <!-- {{item.num}} --> 15 + <!-- {{item.num}} -->
16 <input type='number' placeholder='请输入保额' value="{{item.num!=0?item.num:''}}" bindinput='popupNum' data-index='{{index}}' data-id='{{item.id}}'></input> 16 <input type='number' placeholder='请输入保额' value="{{item.num!=0?item.num:''}}" bindinput='popupNum' data-index='{{index}}' data-id='{{item.id}}'></input>
17 <!-- <text>{{item.title}}</text> --> 17 <!-- <text>{{item.title}}</text> -->
18 </view> 18 </view>
@@ -65,9 +65,9 @@ @@ -65,9 +65,9 @@
65 </view> 65 </view>
66 <view class="item_list"> 66 <view class="item_list">
67 <view class="list_title">从业时间</view> 67 <view class="list_title">从业时间</view>
68 - <view class="list_content">  
69 - <!-- 默认单位年 -->  
70 - <input type="number" placeholder='默认单位年' placeholder-class='pl_style' value='{{worktime}}' class="input_item" bindinput='workTime'></input> 68 + <view class="list_content" style='display:flex;justify-content: space-between;'>
  69 + <input type="number" placeholder='请输入' placeholder-class='pl_style' value='{{worktime}}' class="input_item" bindinput='workTime'></input>
  70 + <text>年</text>
71 </view> 71 </view>
72 </view> 72 </view>
73 <view class='box'> 73 <view class='box'>
@@ -47,6 +47,10 @@ Page({ @@ -47,6 +47,10 @@ Page({
47 var imgs=this.data.imgs 47 var imgs=this.data.imgs
48 imgs.push(avatar) 48 imgs.push(avatar)
49 if (res.data.code == 200) { 49 if (res.data.code == 200) {
  50 + var picture = res.data.data.data.approve_pic
  51 + if (picture == 'https://insurance.w.broteam.cn/upload/') {
  52 + picture = ''
  53 + }
50 this.setData({ 54 this.setData({
51 userinfo: res.data.data.data, 55 userinfo: res.data.data.data,
52 username: res.data.data.data.name, 56 username: res.data.data.data.name,
@@ -58,7 +62,7 @@ Page({ @@ -58,7 +62,7 @@ Page({
58 worktime: worktime, 62 worktime: worktime,
59 avatar: res.data.data.data.avatar, 63 avatar: res.data.data.data.avatar,
60 imgs: imgs, 64 imgs: imgs,
61 - approve_pic: res.data.data.data.approve_pic, 65 + approve_pic: picture ,
62 }) 66 })
63 } 67 }
64 }) 68 })
@@ -43,23 +43,25 @@ @@ -43,23 +43,25 @@
43 </view> 43 </view>
44 </view> 44 </view>
45 <view class="content_item"> 45 <view class="content_item">
46 - <view class="item_list"> 46 + <view class="item_list" style='align-items: flex-start;'>
47 <view class="list_title">获得荣誉</view> 47 <view class="list_title">获得荣誉</view>
48 <view class="list_content"> 48 <view class="list_content">
49 - <input type="text" placeholder='' value='{{honor}}' class="input_item" bindinput='honor' disabled='true'></input> 49 + <!-- <input type="text" placeholder='' value='{{honor}}' class="input_item" bindinput='honor' disabled='true'></input> -->
  50 + <textarea value='{{honor}}' class="input_item" bindinput='honor' disabled='true'></textarea>
50 </view> 51 </view>
51 </view> 52 </view>
52 - <view class="item_list"> 53 + <view class="item_list" style='align-items: flex-start;'>
53 <view class="list_title">座右铭</view> 54 <view class="list_title">座右铭</view>
54 <view class="list_content"> 55 <view class="list_content">
55 - <input type="text" placeholder='' value='{{signature}}' class="input_item" bindinput='signature' disabled='true'></input> 56 + <!-- <input type="text" placeholder='' value='{{signature}}' class="input_item" bindinput='signature' disabled='true'></input> -->
  57 + <textarea value='{{signature}}' class="input_item" bindinput='signature' disabled='true'></textarea>
56 </view> 58 </view>
57 </view> 59 </view>
58 <view class="item_list"> 60 <view class="item_list">
59 <view class="list_title">从业时间</view> 61 <view class="list_title">从业时间</view>
60 - <view class="list_content">  
61 - <!-- 默认单位年 --> 62 + <view class="list_content" style='display:flex;justify-content: space-between;'>
62 <input type="text" placeholder='' value='{{worktime}}' class="input_item" bindinput='workTime' disabled='true'></input> 63 <input type="text" placeholder='' value='{{worktime}}' class="input_item" bindinput='workTime' disabled='true'></input>
  64 + <text>年</text>
63 </view> 65 </view>
64 </view> 66 </view>
65 <view class='box'> 67 <view class='box'>
@@ -108,7 +108,11 @@ page { @@ -108,7 +108,11 @@ page {
108 color: #000; 108 color: #000;
109 min-width: 78%; 109 min-width: 78%;
110 } 110 }
111 - 111 +.list_content textarea{
  112 + width: 80%;
  113 + height: 120rpx;
  114 +
  115 +}
112 .input_item { 116 .input_item {
113 border: 0; 117 border: 0;
114 outline: none; 118 outline: none;
@@ -41,11 +41,14 @@ Page({ @@ -41,11 +41,14 @@ Page({
41 success: function() { 41 success: function() {
42 setTimeout(function() { 42 setTimeout(function() {
43 app.post(url, params).then((res) => { 43 app.post(url, params).then((res) => {
44 - console.log(res) 44 + var policylist=res.data.data.list
  45 + for(var i in policylist){
  46 + policylist[i].year_money = parseInt(policylist[i].year_money)
  47 + }
45 that.setData({ 48 that.setData({
46 - policylist: res.data.data.list 49 + policylist: policylist
47 }) 50 })
48 - console.log(that.data.policylist) 51 + console.log('policylist',that.data.policylist)
49 }) 52 })
50 }, 100) 53 }, 100)
51 } 54 }
@@ -30,7 +30,7 @@ @@ -30,7 +30,7 @@
30 </view> 30 </view>
31 <view> 31 <view>
32 <text class='list_title'>保费</text> 32 <text class='list_title'>保费</text>
33 - <text>{{item.year_money}}万元</text> 33 + <text>{{item.year_money}}元</text>
34 </view> 34 </view>
35 </view> 35 </view>
36 </view> 36 </view>
@@ -88,22 +88,22 @@ @@ -88,22 +88,22 @@
88 88
89 89
90 <view class='item_list ' style='display:block;' wx:for='{{listdetail.more}}' wx:key> 90 <view class='item_list ' style='display:block;' wx:for='{{listdetail.more}}' wx:key>
91 -  
92 - <!-- <text class='list_input'> -->  
93 - <view>  
94 - <text class='list_title' style='margin-right:60rpx;'>附加险名称 </text>  
95 - <text>{{item.name}}</text> 91 + <view class='item_list2'>
  92 + <view class='list_title'>附加险名称 </view>
  93 + <view>{{item.name}}</view>
96 </view> 94 </view>
97 <view class='item_list2'> 95 <view class='item_list2'>
98 - <view class='list_title' style='margin-right:50rpx;'>保障项目 </view> 96 + <view class='list_title'>保障项目 </view>
99 <view class='list_info2'> 97 <view class='list_info2'>
100 <block wx:for='{{item.mo}}' wx:key wx:for-item='its'> 98 <block wx:for='{{item.mo}}' wx:key wx:for-item='its'>
101 <view>{{its.name}} {{its.num}}{{its.title}}</view> 99 <view>{{its.name}} {{its.num}}{{its.title}}</view>
102 </block> 100 </block>
103 </view> 101 </view>
104 -  
105 </view> 102 </view>
106 - <!-- </text> --> 103 + <view class='item_list2'>
  104 + <view class='list_title'>保障期 </view>
  105 + <view>{{item.num}}{{item.title}}</view>
  106 + </view>
107 </view> 107 </view>
108 </view> 108 </view>
109 109
@@ -52,7 +52,7 @@ page { @@ -52,7 +52,7 @@ page {
52 } 52 }
53 53
54 .list_info2 { 54 .list_info2 {
55 - width: 80%; 55 + width: 69%;
56 } 56 }
57 57
58 .list_title { 58 .list_title {
@@ -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&&!vip_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&&!vip_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||vip_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&&!vip_state?'nullValue':'showInfo'}}">清空</view>  
87 - <view class='list_btn list_active' bindtap="{{vip_state?'showInfo':'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>
@@ -93,7 +93,7 @@ @@ -93,7 +93,7 @@
93 <view class='log_box'> 93 <view class='log_box'>
94 <view class='log_line'></view> 94 <view class='log_line'></view>
95 <view class="log_item_box" wx:for='{{log}}' wx:key=''> 95 <view class="log_item_box" wx:for='{{log}}' wx:key=''>
96 - <view class='iconfont icon-guanbi' data-id='{{item.log_id}}' bindtap='delLog'></view> 96 + <view class='iconfont icon-guanbi' data-id='{{item.log_id}}' bindtap='delLog'></view>
97 <view class='triangle'></view> 97 <view class='triangle'></view>
98 <view class='log_point'></view> 98 <view class='log_point'></view>
99 <view class='log_item'> 99 <view class='log_item'>
@@ -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="{{vip_state?'showInfo':'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>
@@ -30,6 +30,7 @@ Page({ @@ -30,6 +30,7 @@ Page({
30 }, 30 },
31 }) 31 })
32 }, 32 },
  33 +
33 // 体检报告列表接口调取 34 // 体检报告列表接口调取
34 medicalReportList() { 35 medicalReportList() {
35 let url = 'counselor/publishlist'; 36 let url = 'counselor/publishlist';
@@ -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="{{vip_state?'showInfo':'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>
@@ -114,14 +114,13 @@ Page({ @@ -114,14 +114,13 @@ Page({
114 //选择推荐方案 114 //选择推荐方案
115 popupState(e) { 115 popupState(e) {
116 let dindex = wx.getStorageSync('dindex'); 116 let dindex = wx.getStorageSync('dindex');
117 - let caselist = this.data.caselist; 117 + let caselist = this.data.caselist1;
118 var index = e.currentTarget.dataset.index; 118 var index = e.currentTarget.dataset.index;
119 caselist[index].choose_state = !(caselist[index].choose_state) 119 caselist[index].choose_state = !(caselist[index].choose_state)
120 this.setData({ 120 this.setData({
121 caselist: caselist, 121 caselist: caselist,
122 - // tempcaselist: caselist 122 + caselist1: caselist,
123 }) 123 })
124 -  
125 }, 124 },
126 125
127 //推荐方案:名称 126 //推荐方案:名称
@@ -183,12 +182,10 @@ Page({ @@ -183,12 +182,10 @@ Page({
183 text: caselist[index].text 182 text: caselist[index].text
184 } 183 }
185 app.post(url, params).then((res) => { 184 app.post(url, params).then((res) => {
186 - console.log(res)  
187 if (res.data.code == 200) { 185 if (res.data.code == 200) {
188 that.setData({ 186 that.setData({
189 caselist: caselist 187 caselist: caselist
190 }) 188 })
191 - console.log(caselist)  
192 } 189 }
193 190
194 }) 191 })
@@ -305,10 +302,16 @@ Page({ @@ -305,10 +302,16 @@ Page({
305 popup_state: true 302 popup_state: true
306 }) 303 })
307 } 304 }
  305 + },
308 306
309 - // wx.navigateTo({  
310 - // url: '/pages/index/Program/Program',  
311 - // }) 307 + //删除保障缺口推荐方案
  308 + delCaselist(e){
  309 + var index=e.currentTarget.dataset.index
  310 + var caselist = this.data.caselist
  311 + caselist.splice(index,1)
  312 + this.setData({
  313 + caselist:caselist
  314 + })
312 }, 315 },
313 316
314 //预设方案列表 317 //预设方案列表
@@ -326,6 +329,7 @@ Page({ @@ -326,6 +329,7 @@ Page({
326 } 329 }
327 that.setData({ 330 that.setData({
328 caselist: caselist, 331 caselist: caselist,
  332 + caselist1: caselist
329 }) 333 })
330 } 334 }
331 }) 335 })
@@ -408,7 +412,7 @@ Page({ @@ -408,7 +412,7 @@ Page({
408 }) 412 })
409 } else { 413 } else {
410 wx.showToast({ 414 wx.showToast({
411 - title: '请选择家庭成员', 415 + title: '请选择要生成报告的家庭成员',
412 icon: 'none' 416 icon: 'none'
413 }) 417 })
414 } 418 }
1 <!-- 保障方案 --> 1 <!-- 保障方案 -->
2 <view class='popup_box' wx:if='{{popup_state}}'> 2 <view class='popup_box' wx:if='{{popup_state}}'>
3 <view class='iconfont icon-guanbi2' bindtap='cancelCase'></view> 3 <view class='iconfont icon-guanbi2' bindtap='cancelCase'></view>
4 - <view class='popup_item' wx:for='{{caselist}}' wx:key=''> 4 + <view class='popup_item' wx:for='{{caselist1}}' wx:key=''>
5 <view class='left_box'> 5 <view class='left_box'>
6 <view class='item_left' bindtap='popupState' data-index='{{index}}'> 6 <view class='item_left' bindtap='popupState' data-index='{{index}}'>
7 <view class="iconfont icon-fangkuang {{item.choose_state?'icon-xuanzhongkuang':''}}"></view> 7 <view class="iconfont icon-fangkuang {{item.choose_state?'icon-xuanzhongkuang':''}}"></view>
@@ -106,7 +106,7 @@ @@ -106,7 +106,7 @@
106 <text class='info'>(选填）</text> 106 <text class='info'>(选填）</text>
107 </view> 107 </view>
108 <view class='plan_content' wx:for='{{caselist}}' wx:key='' wx:if="{{item.choose_state}}"> 108 <view class='plan_content' wx:for='{{caselist}}' wx:key='' wx:if="{{item.choose_state}}">
109 - <!-- <view class='iconfont icon-guanbi'></view> --> 109 + <view class='iconfont icon-guanbi' bindtap='delCaselist' data-index='{{index}}'></view>
110 <view class='plan_list'> 110 <view class='plan_list'>
111 <view class='plan_name'>产品名称</view> 111 <view class='plan_name'>产品名称</view>
112 <view class='plan_input'> 112 <view class='plan_input'>
@@ -198,7 +198,7 @@ @@ -198,7 +198,7 @@
198 <view class='list_title'>{{item.recognizee}}</view> 198 <view class='list_title'>{{item.recognizee}}</view>
199 </view> 199 </view>
200 <view class='item_list'> 200 <view class='item_list'>
201 - <view class='list_title' style='text-decoration:underline' bindtap='summaryDetail' data-InId='{{item.id}}'>{{item.in_num}}</view> 201 + <view class='list_title' style='text-decoration:underline;color:#348af0;' bindtap='summaryDetail' data-InId='{{item.id}}'>{{item.in_num}}</view>
202 </view> 202 </view>
203 <view class='item_list'> 203 <view class='item_list'>
204 <view class='list_title'>{{item.main_risks}}</view> 204 <view class='list_title'>{{item.main_risks}}</view>
@@ -237,4 +237,5 @@ @@ -237,4 +237,5 @@
237 <button class="plan_btn2 {{shareState?'plan_active':''}}" style='border:0;' open-type="{{shareState?'share':''}}" data-status='{{status}}'>发送给客户</button> 237 <button class="plan_btn2 {{shareState?'plan_active':''}}" style='border:0;' open-type="{{shareState?'share':''}}" data-status='{{status}}'>发送给客户</button>
238 </cover-view> 238 </cover-view>
239 </cover-view> 239 </cover-view>
  240 +
240 </block> 241 </block>
@@ -218,9 +218,9 @@ page { @@ -218,9 +218,9 @@ page {
218 218
219 .list_title { 219 .list_title {
220 font-size: 24rpx; 220 font-size: 24rpx;
221 - color: #000;  
222 white-space: nowrap; 221 white-space: nowrap;
223 min-width: 200rpx; 222 min-width: 200rpx;
  223 +color: #000;
224 } 224 }
225 225
226 .title_info { 226 .title_info {
@@ -309,13 +309,18 @@ page { @@ -309,13 +309,18 @@ page {
309 color: #000; 309 color: #000;
310 background: rgba(255, 255, 255, 1); 310 background: rgba(255, 255, 255, 1);
311 padding: 32rpx; 311 padding: 32rpx;
  312 + box-sizing: border-box;
  313 + width: 100%;
  314 + min-height: 20rpx;
312 } 315 }
313 316
314 .report_content textarea { 317 .report_content textarea {
315 width: 100%; 318 width: 100%;
316 min-height: 120rpx !important; 319 min-height: 120rpx !important;
317 } 320 }
318 - 321 +textarea{
  322 + height: 0;
  323 +}
319 /* 缺口保障推荐方案(选填) */ 324 /* 缺口保障推荐方案(选填) */
320 325
321 .plan_box { 326 .plan_box {
@@ -58,7 +58,7 @@ @@ -58,7 +58,7 @@
58 </view> 58 </view>
59 </view> 59 </view>
60 <view class='report_content'> 60 <view class='report_content'>
61 - <textarea value='{{report}}' focus='' disabled='true'></textarea> 61 + <textarea value='{{report}}' focus='' disabled='true' maxlength='-1'></textarea>
62 </view> 62 </view>
63 </view> 63 </view>
64 <view class='medical_report_box'> 64 <view class='medical_report_box'>
@@ -68,12 +68,12 @@ @@ -68,12 +68,12 @@
68 </view> 68 </view>
69 </view> 69 </view>
70 <view class='report_content'> 70 <view class='report_content'>
71 - <textarea value='{{advise}}' focus='' disabled='true'></textarea> 71 + <textarea value='{{advise}}' focus='' disabled='true' maxlength='-1'></textarea>
72 </view> 72 </view>
73 </view> 73 </view>
74 <!-- 缺口保障推荐方案 --> 74 <!-- 缺口保障推荐方案 -->
75 <view class='plan_box'> 75 <view class='plan_box'>
76 - <view class='plan_title'>缺口保障推荐方案（选填）</view> 76 + <view class='plan_title'>缺口保障推荐方案</view>
77 <view class='plan_content' wx:for='{{recommend}}' wx:key=''> 77 <view class='plan_content' wx:for='{{recommend}}' wx:key=''>
78 <!-- <view class='iconfont icon-guanbi'></view> --> 78 <!-- <view class='iconfont icon-guanbi'></view> -->
79 <view class='plan_list'> 79 <view class='plan_list'>
@@ -159,7 +159,7 @@ @@ -159,7 +159,7 @@
159 <view class='list_title'>{{item.recognizee}}</view> 159 <view class='list_title'>{{item.recognizee}}</view>
160 </view> 160 </view>
161 <view class='item_list'> 161 <view class='item_list'>
162 - <view class='list_title' style='text-decoration:underline' bindtap='summaryDetail' data-InId='{{item.id}}'>{{item.in_num}}</view> 162 + <view class='list_title' style='text-decoration:underline;color:#348af0;' bindtap='summaryDetail' data-InId='{{item.id}}'>{{item.in_num}}</view>
163 </view> 163 </view>
164 <view class='item_list'> 164 <view class='item_list'>
165 <view class='list_title'>{{item.main_risks}}</view> 165 <view class='list_title'>{{item.main_risks}}</view>
@@ -13,9 +13,10 @@ @@ -13,9 +13,10 @@
13 </view> 13 </view>
14 <view class='edit_box' bindtap='editInfo' wx:if='{{user_type!=2}}'> 14 <view class='edit_box' bindtap='editInfo' wx:if='{{user_type!=2}}'>
15 <view class='iconfont icon-xiugai'></view> 15 <view class='iconfont icon-xiugai'></view>
16 - <view>修改个人资料</view> 16 + <view>修改资料</view>
17 </view> 17 </view>
18 <view class='edit_box edit2' bindtap='charge' wx:if='{{user_type==4}}'> 18 <view class='edit_box edit2' bindtap='charge' wx:if='{{user_type==4}}'>
  19 + <view class='iconfont icon-qiehuan'></view>
19 <view>身份切换</view> 20 <view>身份切换</view>
20 </view> 21 </view>
21 </view> 22 </view>
@@ -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>
@@ -256,7 +257,7 @@ @@ -256,7 +257,7 @@
256 </view> 257 </view>
257 </view> 258 </view>
258 <view class='popup_btn' catchtap='confirmWithdrawal'>确认提现</view> 259 <view class='popup_btn' catchtap='confirmWithdrawal'>确认提现</view>
259 - <view class='popup_info'>提示:提现到微信零钱包</view> 260 + <view class='popup_info'>提示:5个工作日内提现到微信零钱包</view>
260 </view> 261 </view>
261 </view> 262 </view>
262 </view> 263 </view>
@@ -77,7 +77,7 @@ page { @@ -77,7 +77,7 @@ page {
77 top: 77%; 77 top: 77%;
78 transform: translateY(-50%); 78 transform: translateY(-50%);
79 } 79 }
80 -.icon-xiugai { 80 +.icon-xiugai,.icon-qiehuan {
81 font-size: 26rpx; 81 font-size: 26rpx;
82 margin-right: 11rpx; 82 margin-right: 11rpx;
83 } 83 }
@@ -49,7 +49,7 @@ @@ -49,7 +49,7 @@
49 { 49 {
50 "id": -1, 50 "id": -1,
51 "name": "aa", 51 "name": "aa",
52 - "pathName": "pages/index/editProfile/editProfile", 52 + "pathName": "pages/index/editProfile2/editProfile2",
53 "scene": null 53 "scene": null
54 } 54 }
55 ] 55 ]