保障项目

刘晓艳
images/logo.png
images/verify.png
pages/index/EntryInformation/EntryInformation.js
pages/index/EntryInformation/EntryInformation.wxml
pages/index/EntryInformation2/EntryInformation2.js
pages/index/EntryInformation2/EntryInformation2.wxml
pages/index/EntryInformation2/EntryInformation2.wxss
pages/index/addListDetail/addListDetail.js
pages/index/addListDetail/addListDetail.wxml
pages/index/addListDetail/addListDetail.wxss
pages/index/addNewFamily/addNewFamily.wxml
pages/index/remind/remind.js
pages/index/remind/remind.wxml
pages/index/remind/remind.wxss
project.config.json
--- a/images/logo.png 0 → 100644
查看文件 @56f7b27
+++ b/images/logo.png 0 → 100644
查看文件 @56f7b27
--- a/images/verify.png 0 → 100644
查看文件 @56f7b27
+++ b/images/verify.png 0 → 100644
查看文件 @56f7b27
--- a/pages/index/EntryInformation/EntryInformation.js
查看文件 @56f7b27
+++ b/pages/index/EntryInformation/EntryInformation.js
查看文件 @56f7b27
@@ -28,6 +28,16 @@ Page({
     DefId: ''
   },
+  // 打电话
+  makePhoneCall() {
+    let that = this;
+    var list = that.data.list
+    var phoneNumber = list.mobile
+    wx.makePhoneCall({
+      phoneNumber: phoneNumber
+    })
+  },
+
   //设置查询的关键词
   setKeyWord(e) {
     let that = this;
--- a/pages/index/EntryInformation/EntryInformation.wxml
查看文件 @56f7b27
+++ b/pages/index/EntryInformation/EntryInformation.wxml
查看文件 @56f7b27
@@ -33,11 +33,11 @@
     <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:100rpx;'></input>
         <view>万</view>
       </view>
     </view>
-    <view class='item_list'>
+    <view class='item_list' >
       <view class='list_title'>手机号 </view>
       <view class='list_input'>
         <input type='number' placeholder='请输入手机号' value='{{list.mobile}}' bindinput='setMobile'></input>
--- a/pages/index/EntryInformation2/EntryInformation2.js
查看文件 @56f7b27
+++ b/pages/index/EntryInformation2/EntryInformation2.js
查看文件 @56f7b27
@@ -28,7 +28,15 @@ Page({
     DefId: ''
   },
-
+  // 打电话
+  makePhoneCall() {
+    let that = this;
+    var list = that.data.list
+    var phoneNumber = list.mobile
+    wx.makePhoneCall({
+      phoneNumber: phoneNumber
+    })
+  },
   //获取成员详细信息
   getUserInfo() {
     let that = this;
--- a/pages/index/EntryInformation2/EntryInformation2.wxml
查看文件 @56f7b27
+++ b/pages/index/EntryInformation2/EntryInformation2.wxml
查看文件 @56f7b27
@@ -6,7 +6,7 @@
         <text>姓名</text>
       </view>
       <view class='list_input'>
-        <input type='text' placeholder='' value='{{list.name}}'  disabled='true'></input>
+        <input type='text' placeholder='' value='{{list.name}}' disabled='true'></input>
       </view>
     </view>
     <view class='item_list'>
@@ -35,10 +35,10 @@
         <text>万</text>
       </view>
     </view>
-    <view class='item_list'>
+    <view class='item_list' catchtap='makePhoneCall'>
       <view class='list_title'>手机号 </view>
       <view class='list_input'>
-        <input type='text' placeholder='' value='{{list.mobile}}'  disabled='true' disabled='true'></input>
+        <input type='text' placeholder='' value='{{list.mobile}}' disabled='true' disabled='true'></input>
       </view>
     </view>
@@ -47,7 +47,7 @@
         <text>出生日期</text>
       </view>
       <view class='list_input'>
-        <view class='picker' mode="date" value='{{list.birthday}}' >
+        <view class='picker' mode="date" value='{{list.birthday}}'>
           <input placeholder='' value='{{list.birthday}}' disabled='true'></input>
         </view>
       </view>
@@ -55,7 +55,7 @@
     <view class='item_list'>
       <view class='list_title'>单位名称 </view>
       <view class='list_input'>
-        <input type='text' placeholder='' value='{{list.work}}'  disabled='true' disabled='true'></input>
+        <input type='text' placeholder='' value='{{list.work}}' disabled='true' disabled='true'></input>
       </view>
     </view>
     <view class='item_list'>
@@ -66,7 +66,7 @@
     </view>
     <view class='item_list' style='align-items:flex-start;'>
       <view class='list_title'>家庭地址 </view>
-      <view class='list_input' >
+      <view class='list_input'>
         <textarea type='text' placeholder='' value='{{list.address}}' disabled='true' disabled='true' style='height:120rpx;'></textarea>
       </view>
     </view>
@@ -74,15 +74,15 @@
     <view class='item_list'>
       <view class='list_title'>通讯地址 </view>
       <view class='list_input'>
-        <view class="address_btn {{addsess_current==1?'unit_address':''}}" data-current='1' >家庭地址</view>
-        <view class="address_btn {{addsess_current==2?'unit_address':''}}" data-current='2' >单位地址</view>
+        <view class="address_btn {{addsess_current==1?'unit_address':''}}" data-current='1'>家庭地址</view>
+        <view class="address_btn {{addsess_current==2?'unit_address':''}}" data-current='2'>单位地址</view>
       </view>
     </view>
     <view class='item_list'>
       <view class='list_title'>证件类型</view>
       <view class='list_input'>
-        <view class='picker' range='{{card_Array}}' value='{{card_index}}' >
+        <view class='picker' range='{{card_Array}}' value='{{card_index}}'>
           <input placeholder='' value='{{card_Array[card_index]}}' disabled='true'></input>
         </view>
       </view>
@@ -96,14 +96,14 @@
   </view>
   <view class='box'>
     <!-- 上传图片  -->
-    <view class='upload_box'>
-      <view class='popup_img' wx:if='{{hasimg}}'>
-        <image src='{{list.picurl}}' bindtap='viewImg'></image>
+    <view class='upload_box' wx:if='{{list.picurl}}'>
+      <view class='popup_img'>
+        <image src='{{list.picurl}}'></image>
       </view>
-      <view  wx:else>
+      <!-- <view wx:else>
         <view class='iconfont icon-add'></view>
         <view>上传客户照片</view>
-      </view>
+      </view> -->
     </view>
   </view>
   <view class='content_item'>
@@ -118,14 +118,14 @@
     <view class='item_list'>
       <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}}' wx:if='{{sub_its.status!=0}}'>{{sub_its.name}}</view>
       </view>
     </view>
   </view>
-        
+
   <!-- 底部按钮 -->
   <!-- <view class='null_box'></view>
   <view class='bottom_box'>
--- a/pages/index/EntryInformation2/EntryInformation2.wxss
查看文件 @56f7b27
+++ b/pages/index/EntryInformation2/EntryInformation2.wxss
查看文件 @56f7b27
@@ -126,21 +126,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%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
 }
-.icon-guanbi {
+.popup_img image {
+  width: 100%;
+}
+/* .icon-guanbi {
   position: absolute;
   top: 10rpx;
   right: 20rpx;
   color: #ccc;
-}
+} */
 .upload_box .icon-add {
   font-size: 64rpx;
--- a/pages/index/addListDetail/addListDetail.js
查看文件 @56f7b27
+++ b/pages/index/addListDetail/addListDetail.js
查看文件 @56f7b27
@@ -67,26 +67,41 @@ Page({
     sub_index: ''
   },
-  cancleMask() {
-    if (this.data.inforid != 0) {
-      if (this.data.edit_state3) {
-        this.setData({
-          edit_state: false,
-          edit_state2: false
-        })
-      } else {
-        this.setData({
-          edit_state: true,
-          edit_state2: true
-        })
-      }
+  //回到顶部
+  goTop: function(e) { // 一键回到顶部
+    if (wx.pageScrollTo) {
+      wx.pageScrollTo({
+        scrollTop: 0
+      })
     } else {
-      this.setData({
-        edit_state: false,
-        edit_state2: false
+      wx.showModal({
+        title: '提示',
+        content: '当前微信版本过低，无法使用该功能，请升级到最新微信版本后重试。'
       })
     }
-    console.log(this.data.edit_state)
+  },
+
+
+  cancleMask() {
+    // if (this.data.inforid != 0) {
+    //   if (this.data.edit_state3) {
+    //     this.setData({
+    //       edit_state: false,
+    //       edit_state2: false
+    //     })
+    //   } else {
+    //     this.setData({
+    //       edit_state: true,
+    //       edit_state2: true
+    //     })
+    //   }
+    // } else {
+    //   this.setData({
+    //     edit_state: false,
+    //     edit_state2: false
+    //   })
+    // }
+    // console.log(this.data.edit_state)
     this.setData({
       popup_state: false,
@@ -207,16 +222,23 @@ Page({
     // 已经添加的主险
     let tempMain_list = Object.assign(this.data.main_array, {})
     // this.data.inforid != 0 && this.data.inforid != undefined
+    //编辑/缓存状态
     if (that.data.temp_state) {
-      if (!edit_state3) {
+      console.log('edit')
+      //edit_state3：代表是刚获取到信息是的结构，还是重新选择之后的数据结构
+      if (edit_state3) {
+        //获取到的信息结构
         if (type == 'zhuxian') {
+          console.log('zx')
+          this.setData({
+            focus: false
+          })
           if (tempMain_list.length > 0) {
             for (let i in tempProjectlist) {
               for (let j in tempMain_list) {
                 if (tempProjectlist[i].id == tempMain_list[j].id) {
                   tempProjectlist[i].choose_status = true
                   tempProjectlist[i].num = tempMain_list[j].num
-                  console.log(tempProjectlist, tempMain_list)
                   for (let g in tempProjectlist[i].title) {
                     if (tempProjectlist[i].title[g].t_id == tempMain_list[j].t_id) {
                       tempProjectlist[i].title[g].label_state = true
@@ -231,6 +253,7 @@ Page({
             }
           }
         } else {
+          console.log('fjx')
           if (tempRist.length) {
             for (let i in tempProjectlist) {
               for (let j in tempRist) {
@@ -298,8 +321,8 @@ Page({
           }
         }
       }
-
     } else {
+      console.log('add')
       if (type == 'zhuxian') {
         if (tempMain_list.length > 0) {
           for (let i in tempProjectlist) {
@@ -704,6 +727,7 @@ Page({
     })
     console.log(this.data.beneficiary_list)
   },
+  
   //重组添加受益人
   tempBeneficiary() {
     var beneficiary_list = this.data.beneficiary_list
@@ -885,6 +909,7 @@ Page({
     }
     var guarantee_name = e.detail.value
     var warranty_two = this.data.warranty_two
+    var impletion_time = this.data.impletion_time
     warranty_two.num = guarantee_name
     this.setData({
       guarantee_name: e.detail.value,
@@ -899,12 +924,21 @@ Page({
     this.setData({
       unit: unit,
     })
+    var warranty_two = this.data.warranty_two
     if (unit == '终身') {
+      warranty_two.num = ''
       this.setData({
         warranty_info: '',
         warranty_state: true
       })
+    } else {
+      this.setData({
+        warranty_state: false
+      })
     }
+    this.setData({
+      warranty_two: warranty_two
+    })
     this.countImpletionTime2()
   },
@@ -974,6 +1008,7 @@ Page({
     var time_name = e.detail.value
     var long_money = this.data.long_money
     long_money.num = time_name
+
     this.setData({
       time_name: time_name,
       long_money: long_money
@@ -986,12 +1021,21 @@ Page({
     this.setData({
       unit2: unit
     })
+    var long_money = this.data.long_money
     if (unit == '终身') {
+      long_money.num = ''
       this.setData({
         warranty_info1: '',
         warranty_state1: true
       })
+    } else {
+      this.setData({
+        warranty_state1: false
+      })
     }
+    this.setData({
+      long_money: long_money
+    })
     this.countImpletionTime()
   },
@@ -1065,6 +1109,17 @@ Page({
     let index = e.currentTarget.dataset.index;
     let risk_list = Object.assign(this.data.risk_list, {});
     risk_list[index].title = unit
+    if (risk_list[index].title == '终身') {
+      risk_list[index].num = ''
+      this.setData({
+        risk_state: true
+      })
+    } else {
+      this.setData({
+        risk_state: false
+      })
+    }
+
     this.setData({
       risk_list: risk_list
     })
@@ -1114,7 +1169,6 @@ Page({
     var recognizee = this.data.recognizee_name
     var main_risks = this.data.main_risks
     var coverage = this.data.coverage
-
     var year_money = this.data.year_money
     var compact_time = this.data.compact_time
     var impletion_time = this.data.impletion_time
@@ -1217,8 +1271,8 @@ Page({
           beneficiary_list: beneficiary_list,
           edit_state: true,
           edit_state2: true,
-          edit_state3: false,
-          temp_state:true
+          edit_state3: true,
+          temp_state: true
         })
       }
     })
@@ -1354,6 +1408,7 @@ Page({
       app.post(url, params).then((res) => {
         if (res.data.code == 200) {
           if (continue1 == 'continue1') {
+            this.goTop()
             wx.showToast({
               title: '添加成功',
               icon: 'none',
@@ -1492,7 +1547,7 @@ Page({
           beneficiary_list: beneficiary_list,
           edit_state: true,
           edit_state2: true,
-          edit_state3: false,
+          edit_state3: true,
           temp_state: true,
           guarantee_name: guarantee_name,
           time_name: time_name,
--- a/pages/index/addListDetail/addListDetail.wxml
查看文件 @56f7b27
+++ b/pages/index/addListDetail/addListDetail.wxml
查看文件 @56f7b27
@@ -85,17 +85,16 @@
       </view>
     </view> -->
-
     <!-- 受益人 -->
     <view>
       <view class='item_list benefic' wx:for='{{beneficiary_list}}' wx:key='' wx:for-index='its'>
         <view class='list_title'>受益人</view>
         <view class='list_input_box'>
-          <view class='list_input'>
+          <view class='list_input' style='width:120rpx;'>
             <input type='text' placeholder='请输入' value='{{item.name}}' data-index='{{its}}' bindinput='addPeople'></input>
           </view>
-          <view class='list_input'>
-            <input class='income_input' type='number' placeholder='受益比例' value='{{item.unit}}' data-index='{{its}}' bindinput='addUnit2'></input>
+          <view class='list_input' style='width:150rpx;'>
+            <input class='income_input' style='width:150rpx;text-align:right' type='number' placeholder='受益比例' value='{{item.unit}}' data-index='{{its}}' bindinput='addUnit2'></input>
             <text>%</text>
           </view>
         </view>
@@ -124,10 +123,10 @@
       </view>
       <view class='list_input_box'>
-        <view class='list_input'>
+        <view class='list_input' style='width:120rpx;'>
           <input type='number' placeholder='请填写' name='coverage' value='{{coverage}}' bindinput='setRiskMoney'></input>
         </view>
-        <view class='list_input'>
+        <view class='list_input' style='width:150rpx;'>
           <input class='income_input' type='text' placeholder='请填写' value='万' disabled='true'></input>
         </view>
       </view>
@@ -182,7 +181,7 @@
       <view class='list_title'>保障期</view>
       <view class='list_input_box'>
         <view class='list_input'>
-          <input type='text' placeholder='{{warranty_info}}' value='{{warranty_two.num}}' bindinput='warrantyTwo' disabled='{{warranty_state}}'></input>
+          <input type='text' placeholder="{{warranty_state?'':'请输入'}}" value='{{warranty_two.num}}' bindinput='warrantyTwo' disabled='{{warranty_state}}'></input>
         </view>
         <view class='list_label_box'>
           <view class="list_label_item {{unit=='年'?'list_label_active':''}}" bindtap='selectUnit' data-unit='年'>年</view>
@@ -195,7 +194,7 @@
       <view class='list_title'>缴费时长</view>
       <view class='list_input_box'>
         <view class='list_input'>
-          <input type='text' placeholder='{{warranty_info1}}' name='beneficiary' value='{{long_money.num}}' bindinput='burningTime' disabled='{{warranty_state1}}'></input>
+          <input type='text' placeholder="{{warranty_state1?'':'请输入'}}"  value='{{long_money.num}}' bindinput='burningTime' disabled='{{warranty_state1}}'></input>
         </view>
         <view class='list_label_box'>
           <view class="list_label_item {{unit2=='年'?'list_label_active':''}}" bindtap='selectUnit2' data-unit='年'>年</view>
@@ -243,7 +242,7 @@
     <view class='risk_box'>
       <view class='risk_item' wx:for='{{risk_list}}' wx:key=''>
         <view class='iconfont icon-guanbi symool_box' bindtap='deleteRisk' wx:if="{{index>0}}" data-index='{{index}}'></view>
-        <view class='item_list' style='  align-items: flex-start;'>
+        <view class='item_list' style='align-items: flex-start;'>
           <view class='list_title project'>附加险名称</view>
           <view class='list_input'>
             <textarea type='text' placeholder='请填写' bindinput='addRiskName' value='{{item.name}}' data-index='{{index}}'></textarea>
@@ -274,7 +273,7 @@
           <view class='list_title'>保障期</view>
           <view class='list_input_box'>
             <view class='list_input'>
-              <input type='text' placeholder='请输入' confirm-hold='{{focus}}' name='beneficiary' value='{{item.num}}' data-index='{{index}}' bindinput='addRiskUnit'></input>
+              <input type='text' placeholder="{{risk_state?'':'请输入'}}" confirm-type="{{focus?false:''}}"  adjust-position="{{focus}}" value='{{item.num}}' data-index='{{index}}' bindinput='addRiskUnit' disabled='{{risk_state}}' focus='{{focus}}' cursor-spacing='200rpx'></input>
             </view>
             <view class='list_label_box'>
               <view class="list_label_item {{item.title=='年'?'list_label_active':''}}" bindtap='selectUnit4' data-index="{{index}}" data-unit='年'>年</view>
@@ -322,16 +321,18 @@
       </view>
     </view>
   </view>
+  <!-- 
+  <view  class='add_btn' bindtap='goTop'>aaaa</view> -->
   <!-- 继续添加保单按钮 -->
   <button class='add_btn' data-type='continue1' formType='submit'>继续添加保单</button>
   <!--底部按钮  -->
   <view class='null_box'></view>
   <cover-view class='bottom_box'>
-    <cover-view  class='bottom_btn save_btn'>
+    <cover-view class='bottom_btn save_btn'>
       <button class='bottom_btn save_btn' bindtap='setStorge'>暂存</button>
     </cover-view>
     <cover-view class='bottom_btn'>
-      <button class='bottom_btn'  style='' data-type='complete' formType='submit'>完成</button>
+      <button class='bottom_btn' style='' data-type='complete' formType='submit'>完成</button>
     </cover-view>
   </cover-view>
 </form>
--- a/pages/index/addListDetail/addListDetail.wxss
查看文件 @56f7b27
+++ b/pages/index/addListDetail/addListDetail.wxss
查看文件 @56f7b27
@@ -111,10 +111,11 @@ page {
 }
 .income_input {
-  text-align: right;
+  /* text-align: right; */
 }
 .list_input input {
+  width: 100%;
   border: 0;
   outline: none;
   font-size: 30rpx;
@@ -399,7 +400,7 @@ page {
 }
 .popup_label_item {
-  width: 84rpx;
+  width: 82rpx;
   height: 62rpx;
   background: rgba(255, 255, 255, 1);
   border: 1rpx solid rgba(0, 122, 255, 1);
--- a/pages/index/addNewFamily/addNewFamily.wxml
查看文件 @56f7b27
+++ b/pages/index/addNewFamily/addNewFamily.wxml
查看文件 @56f7b27
@@ -4,12 +4,12 @@
       <view>{{item.name}}</view>
       <view class='edit_btn' bindtap='editInfo' data-id='{{item.id}}'>编辑资料</view>
     </view>
-    <view class="choose_box" data-id='{{item.id}}'  bindtap='sethost' wx:if='{{!is_del}}'>
-      <view class="iconfont icon-artboard61 {{item.user_family==1?'icon-xuanze':''}}" data-id='{{item.id}}'  bindtap='sethost'></view>
+    <view class="choose_box" data-id='{{item.id}}' bindtap='sethost' wx:if='{{!is_del}}'>
+      <view class="iconfont icon-artboard61 {{item.user_family==1?'icon-xuanze':''}}" data-id='{{item.id}}' bindtap='sethost'></view>
       <view>设置为联络人</view>
     </view>
-    <view class="choose_box"  wx:else=''>
-      <view class="iconfont icon-artboard61 {{item.choose_state?'icon-xuanze':''}}"  data-index='{{index}}' data-id='{{item.id}}' bindtap='choose'></view>
+    <view class="choose_box" wx:else=''>
+      <view class="iconfont icon-artboard61 {{item.choose_state?'icon-xuanze':''}}" data-index='{{index}}' data-id='{{item.id}}' bindtap='choose'></view>
       <view>删除</view>
     </view>
   </view>
@@ -31,7 +31,7 @@
         <view class='iconfont icon-tianjia '></view>
         <view>添加成员</view>
       </view>
-      
+
       <view class='' bindtap='setDel' wx:if='{{del_icon}}'>
         <view class='iconfont icon-bianji '></view>
         <view>删除</view>
--- a/pages/index/remind/remind.js
查看文件 @56f7b27
+++ b/pages/index/remind/remind.js
查看文件 @56f7b27
@@ -75,7 +75,8 @@ Page({
     seconds: seconds,
     appointment_time: '',
     level_state: false,
-    time_state:false
+    time_state: false,
+    interval:false,
   },
   // 打电话
@@ -222,6 +223,22 @@ Page({
     })
   },
+  //删除日志
+  delLog(e){
+    let that = this;
+    let id = e.currentTarget.dataset.id; //客户id
+    let url ='counselor/logDelete'
+    let params={
+      log_id:id
+    }
+    app.post(url,params).then((res)=>{
+      if (res.data.code == 200) {
+        console.log(res)
+        this.getData()
+      }
+    })
+  },
+
   //获取数据
   getData() {
     let url = 'counselor/deflook';
@@ -230,32 +247,32 @@ Page({
     //   title: '加载中',
     //   success: function() {
     //     setTimeout(function() {
-          app.post(url, {
-            UserId: app.globalData.UserId,
-            DefId: that.data.mainid
-          }).then((res) => {
-            console.log(res)
-            if (res.data.code == 200) {
-              var time = res.data.data.warn.warn_time
-              var index = parseInt(time) - 1
-              that.setData({
-                def: res.data.data.def,
-                label: res.data.data.label,
-                level: res.data.data.level,
-                log: res.data.data.log,
-                warn: res.data.data.warn,
-                follow_time: res.data.data.warn.text_time,
-                place: res.data.data.warn.text,
-                index: index
-              })
-              // that.warnBox()
-              // that.trackBox()
-            }
-          }).catch((errMsg) => {
-            console.log(errMsg)
-          })
-        // },2000)
-      // },
+    app.post(url, {
+      UserId: app.globalData.UserId,
+      DefId: that.data.mainid
+    }).then((res) => {
+      console.log(res)
+      if (res.data.code == 200) {
+        var time = res.data.data.warn.warn_time
+        var index = parseInt(time) - 1
+        that.setData({
+          def: res.data.data.def,
+          label: res.data.data.label,
+          level: res.data.data.level,
+          log: res.data.data.log,
+          warn: res.data.data.warn,
+          follow_time: res.data.data.warn.text_time,
+          place: res.data.data.warn.text,
+          index: index
+        })
+        // that.warnBox()
+        // that.trackBox()
+      }
+    }).catch((errMsg) => {
+      console.log(errMsg)
+    })
+    // },2000)
+    // },
     // })
   },
@@ -291,7 +308,7 @@ Page({
       t = 0;
     }
     this.setData({
-      time_state:false
+      time_state: false
     })
     // this.animation.translate(arr[0], arr[1]).step();
     animationEvents(this, moveY, show);
@@ -338,11 +355,28 @@ Page({
       value: [nowYear - temp_year, nowMonth - 1, nowDay - 1, nowHour, nowMinute, nowSecond]
     })
     var follow_time = that.data.year + '-' + that.data.month + '-' + that.data.day + ' ' + that.data.hour + ':' + that.data.minute
-    setTimeout(function(){
+    setTimeout(function() {
       that.setData({
-        time_state:true
+        time_state: true
       })
-    },300)
+    }, 300)
+
+
+    var phone = wx.getSystemInfoSync();  //调用方法获取机型 
+    var that = this;  
+    if (phone.platform == 'ios') {   
+      that.setData({    
+        interval: true   
+      });  
+    } else if (phone.platform == 'android') {   
+      that.setData({    
+        interval: false   
+      });  
+    }
+
+
+
+
   },
   /**
--- a/pages/index/remind/remind.wxml
查看文件 @56f7b27
+++ b/pages/index/remind/remind.wxml
查看文件 @56f7b27
@@ -73,7 +73,10 @@
           <view class='list_info_item'>
             <view class='item_title'>提醒内容：</view>
             <block wx:if='{{time_state}}'>
-              <textarea placeholder='请输入' maxlength='50' value='{{place}}' bindinput='place' disabled='{{!edit_state}}'></textarea>
+              <!-- <view class='list_textarea'> -->
+              <textarea class='' placeholder='请输入' maxlength='50' value='{{place}}' bindinput='place' disabled='{{!edit_state}}'></textarea>
+              <!-- {{interval}} -->
+              <!-- </view> -->
             </block>
           </view>
@@ -90,6 +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='triangle'></view>
         <view class='log_point'></view>
         <view class='log_item'>
@@ -101,6 +105,16 @@
         <view class='iconfont icon-tianjia'></view>
         <view>添加日志</view>
       </view>
+      <!-- <view class='add_btn_box'>
+        <view class='' bindtap='addLogs' data-DefId='{{def.id}}'>
+          <view class='iconfont icon-tianjia '></view>
+          <view>添加日志</view>
+        </view>
+        <view class='' bindtap='delLogs' data-DefId='{{def.id}}'>
+          <view class='iconfont icon-bianji '></view>
+          <view>删除</view>
+        </view>
+      </view> -->
     </view>
   </block>
 </view>
@@ -155,11 +169,11 @@
         </view>
       </picker-view-column>
       <!--秒-->
-      <picker-view-column>
+      <!-- <picker-view-column>
         <view wx:for="{{seconds}}" wx:key="">
           {{item}}
         </view>
-      </picker-view-column>
+      </picker-view-column> -->
     </picker-view>
   </view>
 </view>
--- a/pages/index/remind/remind.wxss
查看文件 @56f7b27
+++ b/pages/index/remind/remind.wxss
查看文件 @56f7b27
@@ -111,7 +111,6 @@
   font-size: 28rpx;
   color: #000;
   margin-top: 30rpx;
-  
 }
 .content_box {
@@ -228,7 +227,6 @@
 }
 .list_info_item {
-  /* height: 45rpx; */
   width: 100%;
   display: flex;
   align-items: flex-start;
@@ -240,7 +238,6 @@
 }
 .list_info_item input {
-  /* width: 80%; */
   border: 0;
   outline: none;
 }
@@ -248,6 +245,9 @@
 .list_info_item textarea {
   height: 80rpx;
   width: 75%;
+  /* border: 1rpx solid red; */
+  padding: 0 !important;
+  margin: 0;
 }
 .list_title_info {
@@ -310,6 +310,14 @@
   padding-left: 15rpx;
 }
+.icon-guanbi {
+  font-size: 25rpx;
+  color: #999;
+  position: absolute;
+  right: 30rpx;
+  top: 10rpx;
+}
+
 .log_item {
   margin: 25rpx 20rpx 0 20rpx;
   background: #fff;
@@ -375,11 +383,38 @@
   z-index: 200;
 }
-.icon-tianjia {
+/* .add_btn_box {
+  width: 300rpx;
+  height: 100rpx;
+  box-sizing: border-box;
+  box-shadow: 0rpx 3rpx 5rpx 0rpx rgba(0, 0, 0, 0.12);
+  border-radius: 50rpx;
+  color: #999;
+  font-size: 24rpx;
+  text-align: center;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin: 36rpx auto;
+  padding: 10rpx 40rpx;
+  position: fixed;
+  bottom: 40rpx;
+  left: 50%;
+  transform: translate(-50%);
+  z-index: 200;
+  background: #fff;
+} */
+
+.icon-tianjia, .icon-bianji {
   color: #487aff;
   font-size: 50rpx;
 }
+/* .icon-tianjia {
+  color: #487aff;
+  font-size: 50rpx;
+} */
+
 /*  */
 .infoText {
--- a/project.config.json
查看文件 @56f7b27
+++ b/project.config.json
查看文件 @56f7b27
@@ -37,7 +37,7 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 0,
+			"current": -1,
 			"list": [
 				{
 					"id": 0,
@@ -91,27 +91,9 @@
 				},
 				{
 					"id": -1,
-					"name": "aa",
-					"pathName": "pages/index/editProfile/editProfile",
-					"query": ""
-				},
-				{
-					"id": -1,
-					"name": "aa",
-					"pathName": "pages/index/inviteList/inviteList",
-					"query": ""
-				},
-				{
-					"id": -1,
-					"name": "aaf",
-					"pathName": "pages/index/policyListDetail/policyListDetail",
-					"query": "InId=25"
-				},
-				{
-					"id": -1,
-					"name": "ad",
-					"pathName": "pages/index/EntryInformation/EntryInformation",
-					"query": "DefId=93&familyid=44",
+					"name": "提醒和跟踪",
+					"pathName": "pages/index/remind/remind",
+					"query": "cid=5&mainid=127",
 					"scene": null
 				}
 			]