no message

pages/bslbrecord/bslbrecord.js

@@ -74,8 +74,11 @@ Page({
       measure_id_t: measure_id_t, name: name, time: time1, t_openid: t_openid, z_openid: z_openid, g_id: g_id, unitid: unitid
     }
     wx.setStorageSync('tplbDetail', tplbDetail)
+    // wx.navigateTo({
+    //   url: '/pages/info1/info1?paramTopenid='+e.currentTarget.dataset.topenid,
+    // })
     wx.navigateTo({
-      url: '/pages/info1/info1?paramTopenid='+e.currentTarget.dataset.topenid,
+        url: '/pages/info1/info1?g_id='+ e.currentTarget.dataset.gid + '&showInfo=1'+'&paramTopenid='+e.currentTarget.dataset.topenid,
     })
   },
   time(timestamp) {

pages/bslbrecord/bslbrecord.wxml

@@ -9,7 +9,7 @@
 <!-- <scroll-view scroll-y style="height: {{winH}}px;"> -->
   <block>
     <view class="list no_line">
-      <view class='record_1' wx:for="{{result}}" wx:for-item="item" bindtap='test' data-measure_id_t="{{item.measure_id_t}}" data-topenid="{{item.t_openid}}" data-name="{{item.name}}" data-t_openid="{{item.t_openid}}" data-z_openid="{{item.z_openid}}" data-time="{{item.time01}}" data-t="{{item.g_time}}" data-img="{{item.headimgurl}}" data-measure_name_t="{{item.measure_name_t}}" data-idx="{{item.id}}" wx:for-index="index" wx:key="key">
+      <view class='record_1' wx:for="{{result}}" wx:for-item="item" bindtap='test' data-gid="{{item.g_id}}" data-measure_id_t="{{item.measure_id_t}}" data-topenid="{{item.t_openid}}" data-name="{{item.name}}" data-t_openid="{{item.t_openid}}" data-z_openid="{{item.z_openid}}" data-time="{{item.time01}}" data-t="{{item.g_time}}" data-img="{{item.headimgurl}}" data-measure_name_t="{{item.measure_name_t}}" data-idx="{{item.id}}" wx:for-index="index" wx:key="key">
         <view class='pho'>
           <image src='{{item.headimgurl}}'></image>
           <view class='t-round'>{{item.lb_num}}</view>

pages/info/info.js

@@ -649,7 +649,7 @@ Page({
             username: storageUserinfo.name ? storageUserinfo.name : '',
             usernumber: storageUserinfo.usernumber ? storageUserinfo.usernumber : '',
             ask_department: storageUserinfo.ask_department ? storageUserinfo.ask_department : '',
-            select: storageUserinfo.select ? storageUserinfo.select : 0,
+            select: storageUserinfo.hunfou ? storageUserinfo.hunfou : 0,
             idCard:storageUserinfo.idCard ? storageUserinfo.idCard : '',
             index: storageUserinfo.edu,
             date: storageUserinfo.birthday,
@@ -686,7 +686,7 @@ Page({
                 username: res.info.name||'',
                 usernumber: essentialData.usernumber || '',
                 ask_department: essentialData.ask_department || '',
-                select: essentialData.select || 0,
+                select: res.info.hunfou || 0,
                 idCard:essentialData.idCard||'',
                 index: res.info.cultural||0,//文化程度-接口返回的是cultural，前端用的是edu
                 date: res.info.birthday,

pages/info1/info1.js

@@ -58,7 +58,8 @@ Page({
     mage: '', // 母亲年龄
     moccupation: '', //母亲职业
     mdegree: '', //母亲文化程度
-    idCard:''
+    idCard:'',
+    showInfo:'',//是否从列表第一次进去 1是 2-续答
   },
   onLoad: function(options) {
     if(options.g_id) {
@@ -68,6 +69,11 @@ Page({
         wx.setStorageSync('param_t_openid',options.paramTopenid);
     }
     var that = this;
+    if(options.showInfo) {
+        that.setData({
+            showInfo:options.showInfo
+        })
+    }
     var info = wx.getStorageSync('tplbDetail');
     if (info.unitid == 737) {
       this.setData({
@@ -184,7 +190,7 @@ Page({
                 that.setData({
                   username: storageUserinfo.name ? storageUserinfo.name :'',
                   index: storageUserinfo.edu,
-                  idCard:storageUserinfo.idcard ? storageUserinfo.idcard : '',
+                  idCard:storageUserinfo.idCard ? storageUserinfo.idCard : '',
                   date: storageUserinfo.birthday,
                   sex: storageUserinfo.sex,
                   home: storageUserinfo.house, // 家庭类型
@@ -204,7 +210,7 @@ Page({
                   sex: storageUserinfo.sex,
                   select: storageUserinfo.hunfou,
                   username1: storageUserinfo.ask_department,
-                  idCard:storageUserinfo.idcard ? storageUserinfo.idcard : '',
+                  idCard:storageUserinfo.idCard ? storageUserinfo.idCard : '',
                 });
               }
         } else {
@@ -334,7 +340,7 @@ Page({
       }
 
       if (that.data.hosiptiaFlag) { // 非池州市人民医院
-        if (data.name == '' || data.name == 'null' || data.sex == "null" || data.sex == "" || data.birthday == '' || data.birthday == 'null' || data.edu == 0) {
+        if (data.name == '' || data.name == 'null' || data.sex == "null" || data.sex == "" || data.birthday == '' || data.birthday == 'null' || data.edu == 0||data.idCard==""||data.ask_department==""||data.select==0) {
           // wx.hideLoading()
           clearTimeout(timer1)
           that.setData({

pages/info1/info1.wxml

@@ -3,6 +3,7 @@
     <view class='top'>{{title1}}</view>
     <view class='bn'><text>{{content}}</text></view>
   </view>
+<view hidden="{{showInfo != 1}}">
   <view wx:if='{{hosiptiaFlag}}'>
     <view class="content">
       <view class="partyone" wx:if='{{unitid == 775 || unitid == 776}}'>工号
@@ -123,6 +124,7 @@
       </view>
     </view>
   </view>
+</view>
   <view class="footer" bindtap="submit">
     <button>开始</button>
   </view>

utils/api.js

 var HOST_xinli = 'https://www.xiaodongai.com/xiaodong_yiyuan/'; // 提交量表
 // var HOST_xinli = 'http://123.207.162.160/xiaodong_yiyuan/';//测试
-var HOST = 'https://xam.xiaodongai.com/kongtian/';
+// var HOST = 'https://xam.xiaodongai.com/kongtian/';
+var HOST = 'https://demos-xam.xiaodongai.com/kongtian/';
 // var HOST = 'http://123.207.162.160/xiaodong_yiyuan/kongtian/';
 var HOST_info = 'https://www.xiaodongai.com/xiaodongai/kongtian/';  //  个人咨询  弃用
 var HOST_Linux = 'https://www.xiaodongai.com/xiaodongai/kongtian/';  // 加载Linux 服务器资讯