合并

app.js

@@ -3,7 +3,7 @@ const webSocket = require('./utils/websocket.js');
 App({
   //设置全局请求URL
   globalData: {
-    url: 'http://xiaochengxuapi.jrjyjrjy.com/v1/'
+    url: 'https://xiaochengxuapi.jrjyjrjy.com/v1/'
   },
 
   judge_Land() {

pages/chat-list/chat-list.js

@@ -20,7 +20,9 @@ Page({
      */
     onLoad(options) {
       let that = this;
-
+      var timestamp = Date.parse(new Date());
+      timestamp = timestamp / 1000;
+      console.log("当前时间戳为：" + timestamp);  
   
 
 

pages/index/index.js

@@ -368,7 +368,7 @@ Page({
     app.postRequest(Education_url, Education_data, function (res) {      //  学历 ajax
       if (res.code == 201) {
 
-        var obj = { id: 0, name: '不限' };
+        var obj = { id: 0, education_name: '不限' };
         var datares = res.data;
         datares.unshift(obj)
 

pages/index/index.wxml

@@ -89,11 +89,11 @@
 
 
         <view class='screen_styke'>
-                <picker  bindchange="EducationEvent" value="{{Educationindex}}" range="{{EducationArray}}"  range-key="name">
+                <picker  bindchange="EducationEvent" value="{{Educationindex}}" range="{{EducationArray}}"  range-key="education_name">
                         <text  wx:if='{{educationid == 0}}'>学历</text>
                         <block  wx:else>
-                        <text wx:if='{{education != 0}}'>{{EducationArray[Educationindex].name}}</text>
-                        <text wx:else>{{EducationArray[Educationindex].name ? EducationArray[Educationindex].name  :  "学历"}}</text>
+                        <text wx:if='{{education != 0}}'>{{EducationArray[Educationindex].education_name}}</text>
+                        <text wx:else>{{EducationArray[Educationindex].education_name ? EducationArray[Educationindex].education_name  :  "学历"}}</text>
                         </block>
                         <image src='/image/search1.png' mode="aspectFill"></image>
                       

pages/index_details/index_details.js

@@ -21,6 +21,7 @@ Page({
     uploadImages:[], //相册放大图集
     albumimg:'', // 相册
     albumimgurl: '',// 相册url
+    watermark: '',
   },
 
 
@@ -80,13 +81,14 @@ Page({
         //遍历数据
         for (let i in itemList) {
           //push到空数组里
-          items.push(res.data.url+itemList[i].img);
+          items.push(res.data.url + itemList[i].img + res.data.watermark);
         }
         console.log(items);
         that.setData({
           uploadImages: items,
           albumimg: res.data.data,
           albumimgurl: res.data.url,
+          watermark: res.data.watermark,
         })
       }
     })
@@ -196,7 +198,7 @@ Page({
     var that = this;
 console.log(that.data.uploadImages)
     wx.previewImage({
-      urls: that.data.uploadImages,
+      urls: that.data.uploadImages ,
       current: e.currentTarget.dataset.src
     })
 

pages/index_details/index_details.wxml

@@ -20,7 +20,7 @@
       <view class='Album_box c' wx:if="{{albumimg}}">
                   <block wx:for='{{albumimg}}'  wx:key="item">  
                           <view class='Album'  >
-                                  <image mode="aspectFill" class='Album_img'  src='{{albumimgurl}}{{item.img}}'  data-src='{{albumimgurl}}{{item.img}}'  bindtap='enlarge'></image>
+                                  <image mode="aspectFill" class='Album_img'  src='{{albumimgurl}}{{item.img}}{{watermark}}'  data-src='{{albumimgurl}}{{item.img}}{{watermark}}'  bindtap='enlarge'></image>
                           </view>
                   </block>
       </view>

pages/index_screen/index_screen.js

@@ -287,7 +287,7 @@ Page({
       if (res.code == 201) {
         // console.log(res.data);
 
-        var obj = { id: 0, name: '不限' };
+        var obj = { id: 0, education_name: '不限' };
         var datares = res.data;
         datares.unshift(obj)
 

pages/index_screen/index_screen.wxml

@@ -145,7 +145,7 @@
 
 
             <view class="Choice_dx_box">     <!--  学历 单项选择器-->
-                        <picker  bindchange="EducationEvent" value="{{Educationindex}}" range="{{EducationArray}}"  range-key="name">
+                        <picker  bindchange="EducationEvent" value="{{Educationindex}}" range="{{EducationArray}}"  range-key="education_name">
                                 
                                   <view class='Choice_dx c'>
                                         <view class="Choice_dx_title">学历</view>
@@ -155,13 +155,13 @@
                                         <block  wx:else>
                                                 <view class='Choice_dx_text'  wx:if='{{education != 0}}'>
                                                 
-                                                      {{EducationArray[Educationindex].name}}
+                                                      {{EducationArray[Educationindex].education_name}}
                                                     
                                                 </view>
 
                                                 <view class='Choice_dx_text'  wx:else>
                                                   
-                                                      {{EducationArray[Educationindex].name ? EducationArray[Educationindex].name  : "请选择"}}
+                                                      {{EducationArray[Educationindex].education_name ? EducationArray[Educationindex].education_name  : "请选择"}}
                                                     
                                                 </view>
                                         </block>