家庭保险

LXY
pages/index/CustomerManagement/CustomerManagement.wxml
pages/index/EntryInformation/EntryInformation.js
pages/index/EntryInformation/EntryInformation.wxml
pages/index/EntryInformation/EntryInformation.wxss
pages/index/VipRecharge/VipRecharge.wxml
pages/index/addListDetail/addListDetail.js
pages/index/addListDetail/addListDetail.wxml
pages/index/addNewFamily/addNewFamily.js
pages/index/agreement/agreement.json
pages/index/periodicReviews/periodicReviews.js
pages/index/policyListDetail/policyListDetail.wxml
pages/index/policyManage/policyManage.js
pages/index/remind/remind.js
pages/index/remind/remind.wxml
pages/index/remind/remind.wxss
pages/index/summaryList/summaryList.wxml
pages/index/summaryList/summaryList.wxss
pages/index/summaryList2/summaryList2.json
pages/personalCenter/personalCenter.js
project.config.json
--- a/pages/index/CustomerManagement/CustomerManagement.wxml
查看文件 @80626ab
+++ b/pages/index/CustomerManagement/CustomerManagement.wxml
查看文件 @80626ab
@@ -11,8 +11,8 @@
 <view class='line_box'></view>
 <view class='content_box'>
   <view class='tab_box'>
-    <view class="tab_item  {{currentTab==1?'tab_active':''}}" data-current="1" bindtap='tabCharge'>提醒日期升序</view>
-    <view class="tab_item  {{currentTab==2?'tab_active':''}}" data-current="2" bindtap='tabCharge'>优先级排序</view>
+    <view class="tab_item  {{currentTab==2?'tab_active':''}}" data-current="2" bindtap='tabCharge'>提醒日期升序</view>
+    <view class="tab_item  {{currentTab==1?'tab_active':''}}" data-current="1" bindtap='tabCharge'>优先级排序</view>
   </view>
   <view class='item_list' wx:for='{{list}}' wx:key=''>
     <view class='list_left_box'>
--- a/pages/index/EntryInformation/EntryInformation.js
查看文件 @80626ab
+++ b/pages/index/EntryInformation/EntryInformation.js
查看文件 @80626ab
@@ -194,13 +194,30 @@ Page({
     var label_list = this.data.label_list
     var label_ids = this.data.label_ids;
-  //去重
+    //去重
     const add = label_ids.every((label_ids) => {
       return label_ids != id
     })
-    if (add) {
+    // if (add) {
+    // console.log(add)
+    if (!(label_list[mindex].data[sindex].status)) {
       label_ids.push(id)
+      console.log(22, label_ids)
+    } else {
+      for (var i = 0; i < label_ids.length; i++) {
+        // if (!(label_list[mindex].data[sindex].status)) {
+        if (label_list[mindex].data[sindex].id == label_ids[i]) {
+          label_ids.splice(i, 1);
+          console.log(11, label_ids)
+        }
+        // }
+      }
     }
+    // }
+    // console.log(label_list, label_ids)
+
+
+
     label_list[mindex].data[sindex].status = !(label_list[mindex].data[sindex].status)
     this.setData({
       label_list: label_list,
@@ -249,17 +266,16 @@ Page({
   //成员信息的修改，新增
   listVerify(e) {
-    console.log(111)
     let that = this;
     var warn = "";
     var flag = true;
     var state = that.data.state
     var list = this.data.list;
-    var sex_index = parseInt(this.data.sex_index)
+    var sex_index = (this.data.sex_index)
     console.log(sex_index, sex_index == '')
     if (list.name == "") {
       warn = "请填写您的姓名";
-    } else if (sex_index==''&&sex_index!=0) {
+    } else if (sex_index == undefined) {
       warn = "请填写您的性别";
     } else if (list.family_role == '') {
       warn = '请填写您的家庭角色'
@@ -280,7 +296,7 @@ Page({
         mid: list.mid,
         user_status: list.user_status,
         status_num: list.status_num,
-        picurl: this.data.hasimg,
+        picurl: list.picurl,
         text: list.text,
         label_ids: this.data.label_ids,
         family_id: that.data.familyid,
@@ -295,9 +311,9 @@ Page({
             title: '录入成功',
           })
           wx.setStorageSync('familyid', res.data.data.family_id)
-          setTimeout(()=>{
+          setTimeout(() => {
             wx.navigateBack()
-          },1500)
+          }, 1500)
           // wx.navigateTo({
           //   url: '/pages/index/addNewFamily/addNewFamily?familyid=' + res.data.data.family_id,
           // })
@@ -338,21 +354,22 @@ Page({
           for (var j = 0; j < label_list[i].data.length; j++) {
             if (label_list[i].data[j].status == 1) {
               label_ids.push(label_list[i].data[j].id)
+              label_list[i].data[j].status = true
+            } else {
+              label_list[i].data[j].status = false
             }
           }
         }
         var list = res.data.data.list;
         list.sex = res.data.data.list.sex;
-        console.log(list.sex)
         that.setData({
           list: list,
-          label_list: res.data.data.label_list,
+          label_list: label_list,
           sex_index: res.data.data.list.sex,
           card_index: parseInt(res.data.data.list.user_status) - 1,
           addsess_current: res.data.data.list.mid,
           label_ids: label_ids
         })
-
       }
     }).catch((errMsg) => {
       console.log(errMsg)
--- a/pages/index/EntryInformation/EntryInformation.wxml
查看文件 @80626ab
+++ b/pages/index/EntryInformation/EntryInformation.wxml
查看文件 @80626ab
@@ -33,7 +33,7 @@
     <view class='item_list'>
       <view class='list_title'>个人年收入</view>
       <view class='list_input' style='justify-content:flex-start;'>
-        <input type='number' placeholder='请输入个人年收入' value='{{list.money}}' bindinput='income' style='width:200rpx;'></input>
+        <input type='number' placeholder='请输入' value='{{list.money}}' bindinput='income' style='width:200rpx;'></input>
         <view>万</view>
       </view>
     </view>
@@ -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>
--- a/pages/index/EntryInformation/EntryInformation.wxss
查看文件 @80626ab
+++ b/pages/index/EntryInformation/EntryInformation.wxss
查看文件 @80626ab
@@ -96,6 +96,7 @@ page {
   padding: 30rpx 0;
   box-sizing: border-box;
   min-height: 140rpx;
+  
 }
 .font_color {
--- a/pages/index/VipRecharge/VipRecharge.wxml
查看文件 @80626ab
+++ b/pages/index/VipRecharge/VipRecharge.wxml
查看文件 @80626ab
@@ -3,17 +3,18 @@
     <view class='banner_img'>
       <image src='/images/ele@2x.png'></image>
     </view>
-    <text class='banner_info'>新手任务奖励</text>
+    <text class='banner_info'>{{toplist[0].t_text}}</text>
     <view class='banner_title'>{{toplist[0].title}}</view>
-    <view class='banner_content'>完成新手任务，赠送{{toplist[0].title}}</view>
+    <!-- <view class='banner_content'>完成新手任务，赠送{{toplist[0].title}}</view> -->
+     <view class='banner_content'>{{toplist[0].t_title}}{{toplist[0].title}}</view>
     <navigator class='list_btn' hover-class="navigator-hover" url='/pages/index/payWay/payWay?id={{toplist[0].id}}&moneyt={{toplist[0].moneyt}}&title={{toplist[0].title}}'>立即购买</navigator>
   </view>
   <view class='item_list_box'>
     <view class="item_list {{(index+1)%2==0?'year_list':''}}" wx:for='{{mainlist}}' wx:key>
       <view class='list_title'>{{item.title}}</view>
       <view class='list_content'>
-        <text>￥{{item.money}}</text>
-        <text>￥{{item.moneyt}}</text>
+        <text>优惠{{item.money}}</text>
+        <text>或{{item.moneyt}}T币</text>
       </view>
       <navigator class='list_btn month_card' hover-class="navigator-hover"
       url='/pages/index/payWay/payWay?id={{item.id}}&moneyt={{item.moneyt}}&title={{item.title}}'  >立即购买</navigator>
--- a/pages/index/addListDetail/addListDetail.js
查看文件 @80626ab
+++ b/pages/index/addListDetail/addListDetail.js
查看文件 @80626ab
@@ -161,14 +161,14 @@ Page({
     this.setData({
       edit_state: true
     })
-
+    console.log(this.data.projectlist)
     let that = this;
     let type = e.currentTarget.dataset.type;
     let index = e.currentTarget.dataset.xulie;
     let tempProjectlist = Object.assign(this.data.projectlist, {});
     // 已经添加的附加险
     let risk_list = Object.assign(this.data.risk_list, {});
-    console.log(risk_list)
+    // console.log(risk_list)
     let tempRist = risk_list[index].mo;
     console.log(tempRist)
     // 已经添加的主险
@@ -206,7 +206,7 @@ Page({
     wx.setNavigationBarTitle({
       title: '选择保障项目',
     })
-
+    console.log(tempProjectlist)
     this.setData({
       popup_state: true,
       addType: type,
@@ -271,6 +271,7 @@ Page({
     this.setData({
       projectlist: projectlist
     })
+    console.log(projectlist)
   },
   //选择保障项目
@@ -430,7 +431,7 @@ Page({
   beneficiarySelect(e) {
     if (this.data.inforid != 0) {
       this.setData({
-        edit_state: false
+        edit_state: true
       })
     }
     var index = e.currentTarget.dataset.mindex
@@ -464,9 +465,17 @@ Page({
   addUnit(e) {
     var beneficiary_list = this.data.beneficiary_list;
     beneficiary_list[beneficiary_list.length - 1].unit = e.detail.value;
+    if (beneficiary_list[beneficiary_list.length - 1].unit > 100) {
+      wx.showToast({
+        title: '请重新输入收益比例',
+        icon: 'none'
+      })
+      beneficiary_list[beneficiary_list.length - 1].unit = 0
+    }
     this.setData({
       beneficiary_list: beneficiary_list,
     })
+
   },
   //添加受益人
--- a/pages/index/addListDetail/addListDetail.wxml
查看文件 @80626ab
+++ b/pages/index/addListDetail/addListDetail.wxml
查看文件 @80626ab
@@ -12,7 +12,7 @@
               <view class='popup_title'>{{item.name}}</view>
               <view class='popup_input'>
               <!-- {{item.num}} -->
-                <input type='number' placeholder='请输入保额' value='' bindinput='popupNum' data-index='{{index}}' data-id='{{item.id}}'></input>
+                <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>
             </view>
@@ -29,7 +29,7 @@
 </view>
 <!-- 表单部分 -->
-<form bindsubmit='listVerify' >
+<form bindsubmit='listVerify' wx:else>
   <view class='content_item'>
     <view class='item_list'>
       <view class='list_title'>保单号</view>
@@ -189,7 +189,7 @@
     <view class='item_list'>
       <view class='list_title'>续费账号</view>
       <view class='list_input'>
-        <input type='text' placeholder='请输入末四位' name='bank_num' value='{{bank_num}}' bindinput='setBankNum'></input>
+        <input type='text' placeholder='请输入末四位' maxlength='4' name='bank_num' value='{{bank_num}}' bindinput='setBankNum'></input>
       </view>
     </view>
--- a/pages/index/addNewFamily/addNewFamily.js
查看文件 @80626ab
+++ b/pages/index/addNewFamily/addNewFamily.js
查看文件 @80626ab
@@ -164,7 +164,7 @@ Page({
   //返回客户管理
   goManage() {
-    wx.navigateTo({
+    wx.redirectTo({
       url: '../CustomerManagement/CustomerManagement',
     })
   },
--- a/pages/index/agreement/agreement.json
查看文件 @80626ab
+++ b/pages/index/agreement/agreement.json
查看文件 @80626ab
 {
-  "navigationBarTitleText": "注册协议"
+  "navigationBarTitleText": "关于保单体检专家"
 }
--- a/pages/index/periodicReviews/periodicReviews.js
查看文件 @80626ab
+++ b/pages/index/periodicReviews/periodicReviews.js
查看文件 @80626ab
@@ -15,11 +15,12 @@ Page({
     this.setData({
       KeyWord: e.detail.value
     })
+    
   },
   //
   goData() {
-    this.getData()
+    this.getInfo()
   },
   //家庭保单汇总表
@@ -77,7 +78,7 @@ Page({
     let url = 'counselor/familylist';
     let param = {
       UserId: app.globalData.UserId,
-      Status: 1, //固定传1
+      Status: '', //固定传1
       KeyWord: that.data.KeyWord
     }
     app.post(url, param).then((res) => {
--- a/pages/index/policyListDetail/policyListDetail.wxml
查看文件 @80626ab
+++ b/pages/index/policyListDetail/policyListDetail.wxml
查看文件 @80626ab
@@ -35,14 +35,14 @@
     <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'>{{listdetail.coverage}}</view>
+    <view class='list_input'>{{listdetail.coverage}}万</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>
@@ -53,7 +53,7 @@
   </view> -->
   <view class='item_list'>
     <view class='list_title'>年缴保费</view>
-    <view class='list_input'>{{listdetail.year_money}}</view>
+    <view class='list_input'>{{listdetail.year_money}}元/年</view>
   </view>
   <view class='item_list'>
     <view class='list_title'>保障期</view>
--- a/pages/index/policyManage/policyManage.js
查看文件 @80626ab
+++ b/pages/index/policyManage/policyManage.js
查看文件 @80626ab
@@ -6,7 +6,8 @@ Page({
    * 页面的初始数据
    */
   data: {
-    inforlist: []
+    inforlist: [],
+    mainid:''
   },
   //添加保单
@@ -79,10 +80,12 @@ Page({
   //goRemind
   goRemind() {
+    // cid = 5 & mainid=65
+    var mainid = this.data.mainid
     wx.navigateTo({
-      url: '../remind/remind',
+      url: '../remind/remind?mainid=' + mainid,
     })
-  },
+  },    
   //获取保单列表
   getData() {
@@ -94,7 +97,8 @@ Page({
       console.log(res)
       if (res.data.code == 200) {
         that.setData({
-          inforlist: res.data.data.inforlist
+          inforlist: res.data.data.inforlist,
+          mainid: res.data.data.inforlist[0].def_id
         })
       }
     }).catch((errMsg) => {
--- a/pages/index/remind/remind.js
查看文件 @80626ab
+++ b/pages/index/remind/remind.js
查看文件 @80626ab
@@ -2,7 +2,7 @@
 const app = getApp()
 const pickerFile = require('../../picker/picker_datetime.js');
 var util = require('../../../utils/time.js')
-
+               
 var cellId;
 var date = new Date();
 var years = [];
--- a/pages/index/remind/remind.wxml
查看文件 @80626ab
+++ b/pages/index/remind/remind.wxml
查看文件 @80626ab
@@ -58,22 +58,22 @@
         <!-- <block wx:else> -->
           <view class='list_info_box'>
             <view class='list_info_item'>
-              <view>提醒时间：</view>
+              <view class='item_title'>提醒时间：</view>
               <picker value='{{index}}' range='{{remind_times}}' bindchange="{{edit_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?'translate':''}}">
-              <view>跟踪时间：</view>
+              <view class='item_title'>跟踪时间：</view>
               <!-- <picker mode='date' value='{{follow_time}}' bindchange='followTime'> -->
               <input placeholder='请选择' value='{{follow_time}}'  disabled='true'></input>
               <!-- </picker> -->
             </view>
             <view class='list_info_item'>
-              <view>提醒内容：</view>
-              <input placeholder='请输入' value='{{place}}' bindinput='place' disabled='{{!edit_state}}'></input>
+              <view class='item_title'>提醒内容：</view>
+              <textarea placeholder='请输入' maxlength='50' value='{{place}}' bindinput='place' disabled='{{!edit_state}}'></textarea>
             </view>
           </view>
         <!-- </block> -->
--- a/pages/index/remind/remind.wxss
查看文件 @80626ab
+++ b/pages/index/remind/remind.wxss
查看文件 @80626ab
@@ -6,8 +6,8 @@
   padding: 50rpx 30rpx;
   background: #fff;
   box-sizing: border-box;
- display: flex;
- align-items: flex-start;
+  display: flex;
+  align-items: flex-start;
 }
 .user_name_box {
@@ -39,6 +39,7 @@
   font-size: 12rpx;
   margin-left: 12rpx;
 }
+
 .choose_view {
   position: fixed;
   top: 110rpx;
@@ -62,6 +63,7 @@
   padding: 20rpx 20rpx 26rpx 0;
   border-bottom: 1rpx solid #eee;
 }
+
 .iconbox {
   display: flex;
   justify-content: center;
@@ -82,6 +84,7 @@
   font-size: 25rpx;
   color: #fff;
 }
+
 .user_label_box {
   display: flex;
   align-items: center;
@@ -217,23 +220,35 @@
 }
 .list_info_box {
+  width: 100%;
   font-size: 30rpx;
   color: #333;
   margin-top: 40rpx;
 }
 .list_info_item {
-  height: 45rpx;
+  /* height: 45rpx; */
+  width: 100%;
   display: flex;
-  align-items: center;
+  align-items: flex-start;
   margin-top: 20rpx;
 }
+.item_title {
+  width: 160rpx;
+}
+
 .list_info_item input {
+  /* width: 80%; */
   border: 0;
   outline: none;
 }
+.list_info_item textarea {
+  height: 80rpx;
+  width: 75%;
+}
+
 .list_title_info {
   font-size: 32rpx;
   font-weight: bold;
@@ -356,6 +371,7 @@
   bottom: 40rpx;
   left: 50%;
   transform: translate(-50%);
+  z-index: 200;
 }
 .icon-tianjia {
--- a/pages/index/summaryList/summaryList.wxml
查看文件 @80626ab
+++ b/pages/index/summaryList/summaryList.wxml
查看文件 @80626ab
@@ -220,7 +220,6 @@
   <view class='null_box'></view>
   <view class='bottom_box'>
     <button class='plan_btn' data-status='{{status}}' bindtap="{{save_state?'saveInfo':''}}">保存</button>
-    <button class='plan_btn plan_active' open-type="{{shareState?'share':''}}"  data-status='{{status}}'>发送给客户</button>
+    <button class="plan_btn2 {{shareState?'plan_active':''}}" open-type="{{shareState?'share':''}}"  data-status='{{status}}'>发送给客户</button>
   </view>
-  
 </block>
--- a/pages/index/summaryList/summaryList.wxss
查看文件 @80626ab
+++ b/pages/index/summaryList/summaryList.wxss
查看文件 @80626ab
@@ -411,7 +411,18 @@ page {
   align-items: center;
   justify-content: center;
 }
-
+.plan_btn2 {
+  width: 335rpx;
+  height: 80rpx;
+  background: rgba(255, 255, 255, 1);
+  border: 1rpx solid  #ccc;
+  border-radius: 40rpx;
+  font-size: 28rpx;
+  color: #ccc;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
 .plan_active {
   background: #0286ff;
   color: #fff;
--- a/pages/index/summaryList2/summaryList2.json
查看文件 @80626ab
+++ b/pages/index/summaryList2/summaryList2.json
查看文件 @80626ab
 {
   "usingComponents": {},
-  "navigationBarTitleText": "String"
+  "navigationBarTitleText": "体检报告"
 }
--- a/pages/personalCenter/personalCenter.js
查看文件 @80626ab
+++ b/pages/personalCenter/personalCenter.js
查看文件 @80626ab
@@ -168,16 +168,16 @@ Page({
   //会员充值
   vipCharge() {
-    if (app.globalData.UserType == 4) {
-      wx.showToast({
-        title: '暂无权限',
-        icon: 'none'
-      })
-    } else {
+    // if (app.globalData.UserType == 4) {
+    //   wx.showToast({
+    //     title: '暂无权限',
+    //     icon: 'none'
+    //   })
+    // } else {
       wx.navigateTo({
         url: '../index/VipRecharge/VipRecharge',
       })
-    }
+    // }
   },
   //报告浏览记录
--- a/project.config.json
查看文件 @80626ab
+++ b/project.config.json
查看文件 @80626ab
@@ -37,7 +37,7 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 10,
+			"current": -1,
 			"list": [
 				{
 					"id": -1,