优化

wangyu
pages/main/addtionalreduce/lookandupdate/lookandupdate.js
pages/main/addtionalreduce/lookandupdate/lookandupdate.wxml
pages/main/finalpayment/home.js
pages/main/smartchat/chat.js
pages/main/smartchat/chat.wxml
pages/main/smartchat/chat.wxss
--- a/pages/main/addtionalreduce/lookandupdate/lookandupdate.js
查看文件 @79c5222
+++ b/pages/main/addtionalreduce/lookandupdate/lookandupdate.js
查看文件 @79c5222
@@ -9,6 +9,7 @@ Page({
    */
   data: {
     cur_status: "",
+    handle_finished:false,
     legal_entity_id: "",
     legal_entity: "",
     house_type: "",
@@ -106,6 +107,9 @@ Page({
   onLoad: function(options) {
     var that = this
     var housetype, housestatus
+    wx.showLoading({
+      title: '',
+    })
     console.log("options", options);
     if (options.status == 'house_fund_rent') {
       housetype = 'house_fund_rent'
@@ -160,6 +164,9 @@ Page({
           console.log("res", res)
           that.handleAddition(res.data)
         }
+      },
+      fail:function(res){
+        wx.hideLoading()
       }
     })
   },
@@ -252,10 +259,12 @@ Page({
     console.log("housetype_new", housetype_new)
     this.setData({
       house_type: housetype_new,
+      handle_finished:true,
       person_total_amount: data.person_total_amount ? data.person_total_amount : 0,
       remaining_amount: data.remaining_amount ? data.remaining_amount : 0,
       additionInfo: newdata
     })
+    wx.hideLoading()
   },
   goaddSupporter: function() {
--- a/pages/main/addtionalreduce/lookandupdate/lookandupdate.wxml
查看文件 @79c5222
+++ b/pages/main/addtionalreduce/lookandupdate/lookandupdate.wxml
查看文件 @79c5222
@@ -385,7 +385,8 @@
     </view>
-    <view class='bottom_btn_wrap' hidden="{{additionInfo&&additionInfo.length>0&&cur_status=='house_fund'&&house_type=='house_fund_loan'}}">
+    <view class='bottom_btn_wrap' hidden="{{handle_finished&&additionInfo&&additionInfo.length>0&&cur_status=='house_fund'&&house_type=='house_fund_loan'}}">
+    <!-- <view class='bottom_btn_wrap' wx:if="{{(cur_status!='house_fund'&&additionInfo.length<1)&&cur_status=='house_fund'&&house_type=='house_fund_loan'}}"> -->
       <view class='btn_blue_radius' bindtap="goadd">
         <view class='text_white_34'>添加</view>
       </view>
--- a/pages/main/finalpayment/home.js
查看文件 @79c5222
+++ b/pages/main/finalpayment/home.js
查看文件 @79c5222
@@ -20,7 +20,7 @@ Page({
   onLoad: function(options) {
     var mydate = new Date();
     this.setData({
-      choosed_date: mydate.getFullYear() + "年" ,
+      choosed_date: mydate.getFullYear() + "年",
       long_date: mydate.getTime() / 1000
     })
@@ -37,13 +37,13 @@ Page({
       animation: true,
       canvasId: 'pieCanvas',
       type: 'pie',
-      series: [ {
-        name: '子女教育可扣除金额',
-        data: 35,
-      }, {
+      series: [{
+          name: '子女教育可扣除金额',
+          data: 35,
+        }, {
           name: '子女教育已扣除金额',
-        data: 78,
-      },
+          data: 78,
+        },
         {
           name: '继续教育可扣除金额',
           data: 35,
@@ -76,7 +76,8 @@ Page({
         }, {
           name: '剩余扣除额度已扣除金额',
           data: 78,
-        },],
+        },
+      ],
       width: windowWidth,
       height: 320,
       dataLabel: true,
@@ -103,21 +104,21 @@ Page({
     })
   },
-  gohistory: function (e) {
+  gohistory: function(e) {
     wx.navigateTo({
       url: 'historylist/historylist',
     })
   },
-  datePickerChange: function (e) {
+  datePickerChange: function(e) {
     console.log("e", e)
     var datelong = Date.parse(new Date(e.detail.value)) / 1000
     console.log('datelong', datelong)
     this.setData({
       long_date: datelong,
-      choosed_date: format.yearFormString(datelong) + "年" 
+      choosed_date: format.yearFormString(datelong) + "年"
     })
-    },
+  },
   /**
    * Lifecycle function--Called when page hide
--- a/pages/main/smartchat/chat.js
查看文件 @79c5222
+++ b/pages/main/smartchat/chat.js
查看文件 @79c5222
@@ -12,6 +12,7 @@ Page({
     comlist: [],
     com_id: "",
     choosed_index: 0,
+    scrollview_h:0,
     chat_idx:"Toview"+0,
     chatlist: []
   },
@@ -21,6 +22,15 @@ Page({
    */
   onLoad: function(options) {
     this.getComList()
+    var that = this
+    wx.getSystemInfo({
+      success: function (res) {
+        that.setData({
+          scrollview_h: res.windowHeight-66
+        })
+        console.log("windowHeight",res.windowHeight)
+      }
+    })
   },
   /**
@@ -104,8 +114,15 @@ Page({
             chatlist: that.data.chatlist
           })
           console.log("chatlist", that.data.chatlist)
+          wx.pageScrollTo({
+            scrollTop: 20000,
+            duration: 300
+          })
           // that.getChatinfo()
-          that.bottom()
+          // setTimeout(function(){
+          //   that.bottom()
+          // },400);
+          
         }
       }
     })
@@ -198,17 +215,21 @@ Page({
   //聊天消息始终显示最底端
   bottom: function () {
-    var query = wx.createSelectorQuery()
-    query.select('#flag').boundingClientRect()
-    query.selectViewport().scrollOffset()
-    query.exec(function (res) {
+    // var query = wx.createSelectorQuery()
+    // query.select('#flag').boundingClientRect()
+    // query.selectViewport().scrollOffset()
+    // query.exec(function (res) {
+    //   wx.pageScrollTo({
+    //     scrollTop: res[0].bottom // #the-id节点的下边界坐标
+    //   })
+    //   res[1].scrollTop // 显示区域的竖直滚动位置
+    // })
+    wx.createSelectorQuery().select('#flag').boundingClientRect(function (rect) {
+      // 使页面滚动到底部
       wx.pageScrollTo({
-        scrollTop: res[0].bottom // #the-id节点的下边界坐标
+        scrollTop: rect.bottom
       })
-      res[1].scrollTop // 显示区域的竖直滚动位置
-    })
-    // var d = SmsListView.ActualHeight;
-    // xxx.ScrollToVerticalOffset(d); 
+    }).exec()
   },
   /**
--- a/pages/main/smartchat/chat.wxml
查看文件 @79c5222
+++ b/pages/main/smartchat/chat.wxml
查看文件 @79c5222
 <!--pages/main/smartchat/chat.wxml-->
 <import src="../../../common/picker_cell" />
-<view>
-  <scroll-view style='background:#fff;margin-bottom:150rpx' scroll-y="true" >
+<view class='page'>
+  <view style='background:#fff;margin-bottom:60px;width:100%;'>
     <view wx:for="{{chatlist}}" wx:for-item="item" style='display:flex;flex-direction:column'>
       <view style='margin:50rpx 60rpx 0 36rpx;display:flex;flex-direction:row' wx:if="{{item.type=='0'}}">
         <image style='width:102rpx;height:92rpx' src="/images/icon_robot.png"></image>
@@ -19,17 +19,17 @@
         </view>
       </view>
     </view>
-  <view id="flag"></view>
-
-  </scroll-view>
+    <view id="flag"></view>
+  </view>
   <view class='bottom_wrap' id='bottom'>
     <input class='input_wrap' placeholder-class='input_placeholder_wrap' bindinput="bindKeyInput" placeholder='请输入您要咨询的问题' value='{{inputValue}}'></input>
     <view class='btn_send_wrap' bindtap='sendMsg'>发送</view>
   </view>
 </view>
+
 <!-- 自定义弹窗 -->
-<view class="mask" catchtouchmove="preventTouchMove" hidden="{{!showModal}}"></view>
+<view class="mask" hidden="{{!showModal}}"></view>
 <view class='modal_lg' hidden="{{!showModal}}">
   <text class="text_title">您在多个单位有任职信息，请选择您要在哪家单位咨询问题。</text>
   <view class='divide_line_f5f5f5'></view>
--- a/pages/main/smartchat/chat.wxss
查看文件 @79c5222
+++ b/pages/main/smartchat/chat.wxss
查看文件 @79c5222
 /* pages/main/smartchat/chat.wxss */
+page{
+  width:100%;
+  height: 100%
+}
+
 /* 遮罩层 */
 .mask {