刘晓艳 / baoxian · 提交

转到一个项目

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

家庭保险二开bug修改

内嵌 并排对比
正在显示 22 个修改的文件 包含 150 行增加 和 114 行删除
... ... @@ -24,13 +24,13 @@ button::after {
/* iconfont */
@font-face {
font-family: 'iconfont'; /* project id 926819 */
src: url('//at.alicdn.com/t/font_926819_0pzhvmpbjahd.eot');
src: url('//at.alicdn.com/t/font_926819_0pzhvmpbjahd.eot?#iefix') format('embedded-opentype'),
url('//at.alicdn.com/t/font_926819_0pzhvmpbjahd.woff2') format('woff2'),
url('//at.alicdn.com/t/font_926819_0pzhvmpbjahd.woff') format('woff'),
url('//at.alicdn.com/t/font_926819_0pzhvmpbjahd.ttf') format('truetype'),
url('//at.alicdn.com/t/font_926819_0pzhvmpbjahd.svg#iconfont') format('svg');
font-family: 'iconfont'; /* project id 926819 */
src: url('//at.alicdn.com/t/font_926819_2olbhnsznao.eot');
src: url('//at.alicdn.com/t/font_926819_2olbhnsznao.eot?#iefix') format('embedded-opentype'),
url('//at.alicdn.com/t/font_926819_2olbhnsznao.woff2') format('woff2'),
url('//at.alicdn.com/t/font_926819_2olbhnsznao.woff') format('woff'),
url('//at.alicdn.com/t/font_926819_2olbhnsznao.ttf') format('truetype'),
url('//at.alicdn.com/t/font_926819_2olbhnsznao.svg#iconfont') format('svg');
}
.iconfont {
... ... @@ -177,6 +177,10 @@ button::after {
content: "\e60f";
}
.icon-qiehuan:before {
content: "\e630";
}
.icon-wenjian:before {
content: "\e67d";
}
... ... @@ -237,6 +241,10 @@ button::after {
content: "\e605";
}
.icon-qiehuan1:before {
content: "\e62c";
}
.icon-hengxian:before {
content: "\e657";
}
... ... @@ -257,6 +265,10 @@ button::after {
content: "\e625";
}
.icon-qiehuan2:before {
content: "\e643";
}
.icon-fenxiang:before {
content: "\e62e";
}
... ...
// pages/index/TB/TB.js
const app=getApp();
const app = getApp();
var WxParse = require('../../../wxParse/wxParse.js');
Page({
... ... @@ -8,8 +8,8 @@ Page({
*/
data: {
popup_stete: false,
tlist:'',
Page:0
tlist: '',
Page: 0
},
//说明
instructionsInfo() {
... ... @@ -18,50 +18,50 @@ Page({
})
},
//取消弹窗
setpopupflase(){
console.log(1);
setpopupflase() {
console.log(1);
this.setData({
popup_stete: false
})
},
funvoid(){
},
//个人中心T币接口
gettlist(){
let that=this;
let url ='counselor/tlist';
let params={
UserId: app.globalData.UserId,
Page: that.data.Page
}
app.post(url,params).then((res)=>{
console.log(res);
if(res.data.code==200){
that.setData({
tlist:res.data.data
})
}
}).catch((err)=>{
console.log(err)
})
},
//TB信息内容接口
aboutTB(){
let that=this;
let url ='pubilc/about';
app.post(url, { AboutType:10}).then((res)=>{
if (res.data.code == 200) {
console.log(res)
console.log(res.data.data.post_content)
WxParse.wxParse('content', 'html', res.data.data.post_content, that, 5);
}
}).catch((err)=>{
console.log(err)
})
},
//个人中心T币接口
gettlist() {
let that = this;
let url = 'counselor/tlist';
let params = {
UserId: app.globalData.UserId,
Page: that.data.Page
}
app.post(url, params).then((res) => {
console.log(res);
if (res.data.code == 200) {
that.setData({
tlist: res.data.data
})
}
}).catch((err) => {
console.log(err)
})
},
//TB信息内容接口
aboutTB() {
let that = this;
let url = 'pubilc/about';
app.post(url, {
AboutType: 10
}).then((res) => {
if (res.data.code == 200) {
console.log(res)
console.log(res.data.data.post_content)
WxParse.wxParse('content', 'html', res.data.data.post_content, that, 5);
}
}).catch((err) => {
console.log(err)
})
},
/**
* 生命周期函数--监听页面加载
... ... @@ -81,9 +81,9 @@ Page({
* 生命周期函数--监听页面显示
*/
onShow: function() {
let that=this;
that.gettlist();
that.aboutTB();
let that = this;
that.gettlist();
that.aboutTB();
},
... ...
... ... @@ -38,8 +38,8 @@ Page({
risk_list: [{
name: '',
mo: [],
// project_time: '',
title: '',
// project_time: '',
title: '年',
num: ''
}],
main_array: [],
... ... @@ -360,7 +360,7 @@ Page({
focus: false
})
}
this.goTop()
// this.goTop()
console.log(this.data.focus2, this.data.focus)
let index = this.data.xulie;
var that = this
... ... @@ -697,7 +697,7 @@ Page({
risk_list[len] = {
name: '',
mo: [],
title: '',
title: '年',
num: ''
}
this.setData({
... ... @@ -1344,7 +1344,7 @@ Page({
name: '',
mo: [],
// project_time: '',
title: '',
title: '年',
num: ''
}],
imgs: '',
... ... @@ -1482,7 +1482,6 @@ Page({
},
onPageScroll: function(e) {
console.log(e.scrollTop)
if (!this.data.popup_state) {
wx.setStorageSync('scroll', e.scrollTop)
this.setData({
... ...
... ... @@ -12,7 +12,7 @@
<view class='popup_content'>
<view class='popup_title'>{{item.name}}</view>
<view class='popup_input'>
<!-- {{item.num}} -->
<!-- {{item.num}} -->
<input type='number' placeholder='请输入保额' value="{{item.num!=0?item.num:''}}" bindinput='popupNum' data-index='{{index}}' data-id='{{item.id}}'></input>
<!-- <text>{{item.title}}</text> -->
</view>
... ...
... ... @@ -65,9 +65,9 @@
</view>
<view class="item_list">
<view class="list_title">从业时间</view>
<view class="list_content">
<!-- 默认单位年 -->
<input type="number" placeholder='默认单位年' placeholder-class='pl_style' value='{{worktime}}' class="input_item" bindinput='workTime'></input>
<view class="list_content" style='display:flex;justify-content: space-between;'>
<input type="number" placeholder='请输入' placeholder-class='pl_style' value='{{worktime}}' class="input_item" bindinput='workTime'></input>
<text>年</text>
</view>
</view>
<view class='box'>
... ...
... ... @@ -47,6 +47,10 @@ Page({
var imgs=this.data.imgs
imgs.push(avatar)
if (res.data.code == 200) {
var picture = res.data.data.data.approve_pic
if (picture == 'https://insurance.w.broteam.cn/upload/') {
picture = ''
}
this.setData({
userinfo: res.data.data.data,
username: res.data.data.data.name,
... ... @@ -58,7 +62,7 @@ Page({
worktime: worktime,
avatar: res.data.data.data.avatar,
imgs: imgs,
approve_pic: res.data.data.data.approve_pic,
approve_pic: picture ,
})
}
})
... ...
... ... @@ -43,23 +43,25 @@
</view>
</view>
<view class="content_item">
<view class="item_list">
<view class="item_list" style='align-items: flex-start;'>
<view class="list_title">获得荣誉</view>
<view class="list_content">
<input type="text" placeholder='' value='{{honor}}' class="input_item" bindinput='honor' disabled='true'></input>
<!-- <input type="text" placeholder='' value='{{honor}}' class="input_item" bindinput='honor' disabled='true'></input> -->
<textarea value='{{honor}}' class="input_item" bindinput='honor' disabled='true'></textarea>
</view>
</view>
<view class="item_list">
<view class="item_list" style='align-items: flex-start;'>
<view class="list_title">座右铭</view>
<view class="list_content">
<input type="text" placeholder='' value='{{signature}}' class="input_item" bindinput='signature' disabled='true'></input>
<!-- <input type="text" placeholder='' value='{{signature}}' class="input_item" bindinput='signature' disabled='true'></input> -->
<textarea value='{{signature}}' class="input_item" bindinput='signature' disabled='true'></textarea>
</view>
</view>
<view class="item_list">
<view class="list_title">从业时间</view>
<view class="list_content">
<!-- 默认单位年 -->
<view class="list_content" style='display:flex;justify-content: space-between;'>
<input type="text" placeholder='' value='{{worktime}}' class="input_item" bindinput='workTime' disabled='true'></input>
<text>年</text>
</view>
</view>
<view class='box'>
... ...
... ... @@ -108,7 +108,11 @@ page {
color: #000;
min-width: 78%;
}
.list_content textarea{
width: 80%;
height: 120rpx;
}
.input_item {
border: 0;
outline: none;
... ...
... ... @@ -41,11 +41,14 @@ Page({
success: function() {
setTimeout(function() {
app.post(url, params).then((res) => {
console.log(res)
var policylist=res.data.data.list
for(var i in policylist){
policylist[i].year_money = parseInt(policylist[i].year_money)
}
that.setData({
policylist: res.data.data.list
policylist: policylist
})
console.log(that.data.policylist)
console.log('policylist',that.data.policylist)
})
}, 100)
}
... ...
... ... @@ -30,7 +30,7 @@
</view>
<view>
<text class='list_title'>保费</text>
<text>{{item.year_money}}万元</text>
<text>{{item.year_money}}元</text>
</view>
</view>
</view>
... ...
... ... @@ -88,22 +88,22 @@
<view class='item_list ' style='display:block;' wx:for='{{listdetail.more}}' wx:key>
<!-- <text class='list_input'> -->
<view>
<text class='list_title' style='margin-right:60rpx;'>附加险名称 </text>
<text>{{item.name}}</text>
<view class='item_list2'>
<view class='list_title'>附加险名称 </view>
<view>{{item.name}}</view>
</view>
<view class='item_list2'>
<view class='list_title' style='margin-right:50rpx;'>保障项目 </view>
<view class='list_title'>保障项目 </view>
<view class='list_info2'>
<block wx:for='{{item.mo}}' wx:key wx:for-item='its'>
<view>{{its.name}} {{its.num}}{{its.title}}</view>
</block>
</view>
</view>
<!-- </text> -->
<view class='item_list2'>
<view class='list_title'>保障期 </view>
<view>{{item.num}}{{item.title}}</view>
</view>
</view>
</view>
... ...
... ... @@ -52,7 +52,7 @@ page {
}
.list_info2 {
width: 80%;
width: 69%;
}
.list_title {
... ...
... ... @@ -59,12 +59,12 @@
<view class='list_info_box'>
<view class='list_info_item'>
<view class='item_title'>提醒时间：</view>
<picker value='{{index}}' range='{{remind_times}}' bindchange="{{edit_state&&!vip_state?'remindTime':''}}">
<picker value='{{index}}' range='{{remind_times}}' bindchange="{{edit_state&&vip_state?'remindTime':''}}">
<!-- {{remind_time!=''?'08:00':''}} -->
<input placeholder='请选择' value="{{remind_times[index]}}" disabled='true'></input>
</picker>
</view>
<view class='list_info_item' bindtap="{{edit_state&&!vip_state?'translate':''}}">
<view class='list_info_item' bindtap="{{edit_state&&vip_state?'translate':''}}">
<view class='item_title'>跟踪时间：</view>
<!-- <picker mode='date' value='{{follow_time}}' bindchange='followTime'> -->
<input placeholder='请选择' value='{{follow_time}}' disabled='true'></input>
... ... @@ -74,7 +74,7 @@
<view class='item_title'>提醒内容：</view>
<block wx:if='{{time_state}}'>
<!-- <view class='list_textarea'> -->
<textarea class='' placeholder='请输入' maxlength='50' value='{{place}}' bindinput='place' disabled='{{!edit_state||vip_state}}'></textarea>
<textarea class='' placeholder='请输入' maxlength='50' value='{{place}}' bindinput='place' disabled='{{!edit_state|| !vip_state}}'></textarea>
<!-- {{interval}} -->
<!-- </view> -->
</block>
... ... @@ -83,8 +83,8 @@
</view>
<!-- </block> -->
<view class='list_bottom'>
<view class='list_btn' bindtap="{{edit_state&&!vip_state?'nullValue':'showInfo'}}">清空</view>
<view class='list_btn list_active' bindtap="{{vip_state?'showInfo':'finish'}}" data-family_id='{{def.family_id}}'>完成</view>
<view class='list_btn' bindtap="{{edit_state&&vip_state?'nullValue':'showInfo'}}">清空</view>
<view class='list_btn list_active' bindtap="{{!vip_state?'showInfo':'finish'}}" data-family_id='{{def.family_id}}'>完成</view>
</view>
</view>
</view>
... ... @@ -93,7 +93,7 @@
<view class='log_box'>
<view class='log_line'></view>
<view class="log_item_box" wx:for='{{log}}' wx:key=''>
<view class='iconfont icon-guanbi' data-id='{{item.log_id}}' bindtap='delLog'></view>
<view class='iconfont icon-guanbi' data-id='{{item.log_id}}' bindtap='delLog'></view>
<view class='triangle'></view>
<view class='log_point'></view>
<view class='log_item'>
... ... @@ -101,7 +101,7 @@
<view class='log_time'>{{item.create_time}}</view>
</view>
</view>
<view class='add_btn_box' bindtap="{{vip_state?'showInfo':'addLogs'}}" data-DefId='{{def.id}}'>
<view class='add_btn_box' bindtap="{{!vip_state?'showInfo':'addLogs'}}" data-DefId='{{def.id}}'>
<view class='iconfont icon-tianjia'></view>
<view>添加日志</view>
</view>
... ...
... ... @@ -30,6 +30,7 @@ Page({
},
})
},
// 体检报告列表接口调取
medicalReportList() {
let url = 'counselor/publishlist';
... ...
... ... @@ -11,7 +11,7 @@
<view class='list_content'>被保险人：{{item.users}}</view>
</view>
<view class='list_btn_box'>
<view class='list_btn' bindtap="{{vip_state?'showInfo':'editInfo'}}" data-id='{{item.id}}'>修改</view>
<view class='list_btn' bindtap="{{!vip_state?'showInfo':'editInfo'}}" data-id='{{item.id}}'>修改</view>
<view class='list_btn add_btn' bindtap='summaryList' data-id='{{item.id}}'>查看</view>
</view>
</view>
... ...
... ... @@ -114,14 +114,13 @@ Page({
//选择推荐方案
popupState(e) {
let dindex = wx.getStorageSync('dindex');
let caselist = this.data.caselist;
let caselist = this.data.caselist1;
var index = e.currentTarget.dataset.index;
caselist[index].choose_state = !(caselist[index].choose_state)
this.setData({
caselist: caselist,
// tempcaselist: caselist
caselist1: caselist,
})
},
//推荐方案:名称
... ... @@ -183,12 +182,10 @@ Page({
text: caselist[index].text
}
app.post(url, params).then((res) => {
console.log(res)
if (res.data.code == 200) {
that.setData({
caselist: caselist
})
console.log(caselist)
}
})
... ... @@ -305,10 +302,16 @@ Page({
popup_state: true
})
}
},
// wx.navigateTo({
// url: '/pages/index/Program/Program',
// })
//删除保障缺口推荐方案
delCaselist(e){
var index=e.currentTarget.dataset.index
var caselist = this.data.caselist
caselist.splice(index,1)
this.setData({
caselist:caselist
})
},
//预设方案列表
... ... @@ -326,6 +329,7 @@ Page({
}
that.setData({
caselist: caselist,
caselist1: caselist
})
}
})
... ... @@ -408,7 +412,7 @@ Page({
})
} else {
wx.showToast({
title: '请选择家庭成员',
title: '请选择要生成报告的家庭成员',
icon: 'none'
})
}
... ...
<!-- 保障方案 -->
<view class='popup_box' wx:if='{{popup_state}}'>
<view class='iconfont icon-guanbi2' bindtap='cancelCase'></view>
<view class='popup_item' wx:for='{{caselist}}' wx:key=''>
<view class='popup_item' wx:for='{{caselist1}}' wx:key=''>
<view class='left_box'>
<view class='item_left' bindtap='popupState' data-index='{{index}}'>
<view class="iconfont icon-fangkuang {{item.choose_state?'icon-xuanzhongkuang':''}}"></view>
... ... @@ -106,7 +106,7 @@
<text class='info'>(选填）</text>
</view>
<view class='plan_content' wx:for='{{caselist}}' wx:key='' wx:if="{{item.choose_state}}">
<!-- <view class='iconfont icon-guanbi'></view> -->
<view class='iconfont icon-guanbi' bindtap='delCaselist' data-index='{{index}}'></view>
<view class='plan_list'>
<view class='plan_name'>产品名称</view>
<view class='plan_input'>
... ... @@ -198,7 +198,7 @@
<view class='list_title'>{{item.recognizee}}</view>
</view>
<view class='item_list'>
<view class='list_title' style='text-decoration:underline' bindtap='summaryDetail' data-InId='{{item.id}}'>{{item.in_num}}</view>
<view class='list_title' style='text-decoration:underline;color:#348af0;' bindtap='summaryDetail' data-InId='{{item.id}}'>{{item.in_num}}</view>
</view>
<view class='item_list'>
<view class='list_title'>{{item.main_risks}}</view>
... ... @@ -237,4 +237,5 @@
<button class="plan_btn2 {{shareState?'plan_active':''}}" style='border:0;' open-type="{{shareState?'share':''}}" data-status='{{status}}'>发送给客户</button>
</cover-view>
</cover-view>
</block>
\ No newline at end of file
... ...
... ... @@ -218,9 +218,9 @@ page {
.list_title {
font-size: 24rpx;
color: #000;
white-space: nowrap;
min-width: 200rpx;
color: #000;
}
.title_info {
... ... @@ -309,13 +309,18 @@ page {
color: #000;
background: rgba(255, 255, 255, 1);
padding: 32rpx;
box-sizing: border-box;
width: 100%;
min-height: 20rpx;
}
.report_content textarea {
width: 100%;
min-height: 120rpx !important;
}
textarea{
height: 0;
}
/* 缺口保障推荐方案(选填) */
.plan_box {
... ...
... ... @@ -58,7 +58,7 @@
</view>
</view>
<view class='report_content'>
<textarea value='{{report}}' focus='' disabled='true'></textarea>
<textarea value='{{report}}' focus='' disabled='true' maxlength='-1'></textarea>
</view>
</view>
<view class='medical_report_box'>
... ... @@ -68,12 +68,12 @@
</view>
</view>
<view class='report_content'>
<textarea value='{{advise}}' focus='' disabled='true'></textarea>
<textarea value='{{advise}}' focus='' disabled='true' maxlength='-1'></textarea>
</view>
</view>
<!-- 缺口保障推荐方案 -->
<view class='plan_box'>
<view class='plan_title'>缺口保障推荐方案（选填）</view>
<view class='plan_title'>缺口保障推荐方案</view>
<view class='plan_content' wx:for='{{recommend}}' wx:key=''>
<!-- <view class='iconfont icon-guanbi'></view> -->
<view class='plan_list'>
... ... @@ -159,7 +159,7 @@
<view class='list_title'>{{item.recognizee}}</view>
</view>
<view class='item_list'>
<view class='list_title' style='text-decoration:underline' bindtap='summaryDetail' data-InId='{{item.id}}'>{{item.in_num}}</view>
<view class='list_title' style='text-decoration:underline;color:#348af0;' bindtap='summaryDetail' data-InId='{{item.id}}'>{{item.in_num}}</view>
</view>
<view class='item_list'>
<view class='list_title'>{{item.main_risks}}</view>
... ...
... ... @@ -13,9 +13,10 @@
</view>
<view class='edit_box' bindtap='editInfo' wx:if='{{user_type!=2}}'>
<view class='iconfont icon-xiugai'></view>
<view>修改个人资料</view>
<view>修改资料</view>
</view>
<view class='edit_box edit2' bindtap='charge' wx:if='{{user_type==4}}'>
<view class='iconfont icon-qiehuan'></view>
<view>身份切换</view>
</view>
</view>
... ... @@ -77,7 +78,7 @@
<view>方案预设</view>
<view class='iconfont icon-jinru'></view>
</view>
</view>
</view>
<view class='item_list' bindtap='share'>
<view class='list_icon'>
<text class='iconfont icon-fenxiang1'></text>
... ... @@ -256,7 +257,7 @@
</view>
</view>
<view class='popup_btn' catchtap='confirmWithdrawal'>确认提现</view>
<view class='popup_info'>提示:提现到微信零钱包</view>
<view class='popup_info'>提示:5个工作日内提现到微信零钱包</view>
</view>
</view>
</view>
\ No newline at end of file
... ...
... ... @@ -77,7 +77,7 @@ page {
top: 77%;
transform: translateY(-50%);
}
.icon-xiugai {
.icon-xiugai,.icon-qiehuan {
font-size: 26rpx;
margin-right: 11rpx;
}
... ...
... ... @@ -49,7 +49,7 @@
{
"id": -1,
"name": "aa",
"pathName": "pages/index/editProfile/editProfile",
"pathName": "pages/index/editProfile2/editProfile2",
"scene": null
}
]
... ...