刘晓艳 / baoxian · 提交

转到一个项目

作者 朱振飞
提交 91b0ff49b6c5e6d17a27c7d2323b1df2f810b412 2 个父辈 eff5418e 6367b6c0

Merge branch 'master' of http://114.215.101.231:8099/liuxiaoyan/baoxian into Branch_zhu 

# Conflicts:
#	pages/index/addListDetail/addListDetail.js
内嵌 并排对比
正在显示 9 个修改的文件 包含 67 行增加 和 60 行删除
... ... @@ -6,7 +6,7 @@
<input placeholder='搜索姓名或标签' bindinput='setKeyWord'></input>
</view>
</view>
<view bindtap='getdata'>搜索</view>
<view bindtap='getInfo'>搜索</view>
</view>
<view class='line_box'></view>
<view class='content_box'>
... ...
... ... @@ -51,7 +51,7 @@
</view>
<view class='list_input'>
<picker class='picker' mode="date" value='{{list.birthday}}' bindchange='birthDate'>
<input placeholder='请选择出生日期' value='{{list.birthday}}' disabled='true'></input>
<input placeholder='请选择真实出生日期，才能准确生日提醒' value='{{list.birthday}}' disabled='true'></input>
</picker>
</view>
</view>
... ... @@ -67,10 +67,10 @@
<input type='text' placeholder='请输入单位地址' value='{{list.work_address}}' bindinput='setworkAddress'></input>
</view>
</view>
<view class='item_list'>
<view class='item_list' style='align-items: flex-start;min-height:80rpx;'>
<view class='list_title'>家庭地址 </view>
<view class='list_input'>
<input type='text' placeholder='请输入家庭地址' value='{{list.address}}' bindinput='setSddress'></input>
<textarea type='text' placeholder='请输入家庭地址' value='{{list.address}}' bindinput='setSddress'></textarea>
</view>
</view>
... ... @@ -101,17 +101,17 @@
<!-- 上传图片 -->
<view class='upload_box'>
<view class='popup_img' wx:if='{{hasimg}}' bindtap='chooseImg'>
<image src='{{list.picurl}}' bindtap='viewImg' mode='WidthFix'></image>
<image src='{{list.picurl}}' mode='widthFix'></image>
</view>
<view bindtap='chooseImg' wx:else>
<view class='iconfont icon-add'></view>
<view>上传客户照片</view>
<view style='margin-bottom:25rpx;'>上传客户照片</view>
</view>
</view>
</view>
<view class='content_item'>
<view class='item_list'>
<view class='list_title'>用户描述</view>
<view class='list_title'>客户描述</view>
</view>
<view class='list_textarea'>
<textarea placeholder='请在此添加对用户的描述' value='{{list.text}}' placeholder-class='font_color' bindinput='descript'></textarea>
... ... @@ -119,7 +119,7 @@
</view>
<view class='content_item'>
<view class='item_list'>
<view class='list_title'>添加用户标签</view>
<view class='list_title' style='width: 100%;text-align: center;'>客户画像</view>
</view>
<view class='item_list item_label_box' wx:for='{{label_list}}' wx:key='' wx:for-index='mindex'>
<view class='list_label_title'>{{item.label}} </view>
... ...
... ... @@ -11,6 +11,7 @@ page {
}
.item_list {
width: 100%;
display: flex;
align-items: center;
border-bottom: 1rpx dashed #ebebeb;
... ... @@ -24,9 +25,10 @@ page {
}
.list_title {
width: 185rpx;
width: 170rpx;
font-size: 29rpx;
color: #000;
}
.list_label_title {
... ... @@ -125,25 +127,33 @@ page {
background: #fff;
margin-top: 16rpx;
text-align: center;
padding: 36rpx 0;
/* padding: 36rpx 0; */
border-radius: 10rpx;
box-shadow: 2rpx 0rpx 3rpx rgba(235, 235, 235, 1);
overflow: hidden;
}
.upload_box .icon-add {
font-size: 64rpx;
}
.popup_img {
position: relative;
width: 100%;
height: 100%;
/* position: relative; */
}
.popup_img image {
/* width: 100%; */
/* height: 100%; */
}
.icon-guanbi {
/* .icon-guanbi {
position: absolute;
top: 10rpx;
right: 20rpx;
color: #ccc;
}
.upload_box .icon-add {
font-size: 64rpx;
}
} */
.content_info {
font-size: 24rpx;
... ... @@ -227,6 +237,3 @@ page {
color: #fff;
background: rgba(2, 134, 255, 1);
}
.popup_img image{
width: 100%
}
... ...
... ... @@ -30,7 +30,9 @@
<view class='item_list'>
<view class='list_title'>个人年收入</view>
<view class='list_input'>
<input type='text' placeholder='' value='{{list.money}}' disabled='true' disabled='true'></input>
<!-- <input type='text' placeholder='' value='{{list.money}}' disabled='true' disabled='true'></input> -->
<text>{{list.money}}</text>
<text>万</text>
</view>
</view>
<view class='item_list'>
... ... @@ -106,7 +108,7 @@
</view>
<view class='content_item'>
<view class='item_list'>
<view class='list_title'>用户描述</view>
<view class='list_title'>客户描述</view>
</view>
<view class='list_textarea'>
<textarea placeholder='' value='{{list.text}}' placeholder-class='font_color' bindinput='descript' disabled='true'></textarea>
... ... @@ -114,12 +116,12 @@
</view>
<view class='content_item'>
<view class='item_list'>
<view class='list_title'>添加用户标签</view>
<view class='list_title' style='width: 100%;text-align: center;'>客户画像</view>
</view>
<view class='item_list item_label_box' wx:for='{{label_list}}' wx:key='' wx:for-index='mindex'>
<view class='item_list item_label_box' wx:for='{{label_list}}' wx:key='' wx:for-index='mindex'>
<view class='list_label_title'>{{item.label}} </view>
<view class='list_label'>
<view class="address_btn {{sub_its.status?'unit_address':''}}" data-id='{{sub_its.id}}' data-status='{{sub_its.status}}' wx:for='{{item.data}}' wx:for-item='sub_its' wx:key='' wx:for-index='sindex' data-sindex='{{sindex}}' data-mindex='{{mindex}}'>{{sub_its.name}}</view>
<view class="address_btn {{sub_its.status?'unit_address':''}}" data-id='{{sub_its.id}}' data-status='{{sub_its.status}}' wx:for='{{item.data}}' wx:for-item='sub_its' wx:key='' wx:for-index='sindex' data-sindex='{{sindex}}' data-mindex='{{mindex}}' wx:if='{{sub_its.status!=0}}'>{{sub_its.name}}</view>
</view>
</view>
</view>
... ...
... ... @@ -48,6 +48,8 @@ page {
width: 75%;
display: flex;
align-items: center;
font-size: 29rpx;
color: #000;
}
.list_input input {
... ...
... ... @@ -1229,20 +1229,11 @@ Page({
this.ensureProjectList()
let that = this;
// this.setData({
// def_id: options.def_id,
// inforid: options.inforid,
// FamilyId: options.FamilyId,
// recognizee_name: options.name
// })
// if (options.inforid == undefined) {
// this.setData({
// inforid: 0
// })
// }
options.inforid ? (that.getlistVerify(options.inforid),that.setData({
inforid: options.inforid,
edit_state: true
}),wx.setNavigationBarTitle({
title: '编辑保单',
})): ""
options.def_id ? that.setData({
def_id: options.def_id,
... ... @@ -1250,14 +1241,6 @@ Page({
options.FamilyId ? (that.familyMember(options.FamilyId),that.setData({
FamilyId: options.FamilyId
})):'';
// if (options.FamilyId != '') {
// this.familyMember()
// }
// if (options.inforid != undefined) {
// this.getlistVerify()
// }
if (wx.getStorageSync('storge_state') && options.inforid == undefined) {
this.getStorage()
}
... ...
... ... @@ -35,18 +35,18 @@
<view class='list_title'>主险名称</view>
<view class='list_input'>{{listdetail.main_risks}}</view>
</view>
<view class='item_list' style=' align-items: flex-start;'>
<!-- <view class='item_list' style=' align-items: flex-start;'>
<view class='list_title'>主险保障项</view>
<view class='list_input' wx:for='{{listdetail.guarantee}}' wx:key wx:for-item='its'>{{its.name}} {{its.num}}{{its.title}} </view>
</view>
</view> -->
<view class='item_list'>
<view class='list_title'>合同生效日</view>
<view class='list_input'>{{listdetail.compact_time}}</view>
</view>
<view class='item_list'>
<!-- <view class='item_list'>
<view class='list_title'>期满日</view>
<view class='list_input'>{{listdetail.impletion_time}}</view>
</view>
</view> -->
<view class='item_list'>
<view class='list_title'>年缴保费</view>
<view class='list_input'>{{listdetail.year_money}}</view>
... ... @@ -56,7 +56,7 @@
<view class='list_input'>{{listdetail.warranty_two.num}}{{listdetail.warranty_two.title}}</view>
</view>
<view class='item_list'>
<view class='list_title'>续费时长</view>
<view class='list_title'>缴费期</view>
<view class='list_input'>{{listdetail.long_money.num}}{{listdetail.long_money.title}}</view>
</view>
<view class='item_list'>
... ... @@ -75,18 +75,25 @@
<view class='list_title'>缴费期满日</view>
<view class='list_input'>{{listdetail.impletion_time}}</view>
</view>
<view class='item_list'>
<!-- <view class='item_list'>
<view class='list_title'>主险保障期</view>
<view class='list_input'>{{listdetail.warranty_one}}</view>
</view>
</view> -->
<view class='item_list' style=' align-items: flex-start;'>
<view class='list_title'>附加险名称 </view>
<view class='list_input' wx:for='{{listdetail.more}}' wx:key>
<view>{{item.name}}</view>
<view wx:for='{{item.mo}}' wx:key wx:for-item='its'>{{its.name}} {{its.num}}{{its.title}}</view>
<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:20rpx;'>附加险名称 </text>
<text>{{item.name}}</text>
</view>
<view>
<text class='list_title' style='margin-right:50rpx;'>保障项目 </text>
<text wx:for='{{item.mo}}' wx:key wx:for-item='its'>
<text style='margin-right:30rpx;'>{{its.name}} {{its.num}}{{its.title}}</text></text>
</view>
<!-- </text> -->
</view>
</view>
... ...
... ... @@ -306,7 +306,6 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad: function(options) {
console.log(options)
if (options.status) {
this.setData({
status: options.status,
... ...
... ... @@ -14,7 +14,7 @@
"compileType": "miniprogram",
"libVersion": "2.4.0",
"appid": "wxac365079a43a66bb",
"projectname": "%E5%AE%B6%E5%BA%AD%E4%BF%9D%E9%99%A92",
"projectname": "%E5%AE%B6%E5%BA%AD%E4%BF%9D%E9%99%A9",
"debugOptions": {
"hidedInDevtools": []
},
... ... @@ -37,7 +37,7 @@
"list": []
},
"miniprogram": {
"current": 9,
"current": 10,
"list": [
{
"id": -1,
... ... @@ -96,7 +96,14 @@
{
"id": -1,
"name": "aa",
"pathName": "pages/index/inviteList/inviteList"
"pathName": "pages/index/inviteList/inviteList",
"query": ""
},
{
"id": -1,
"name": "aaf",
"pathName": "pages/index/policyListDetail/policyListDetail",
"query": "InId=25"
}
]
}
... ...