up

components/slider/slider.js

@@ -18,7 +18,7 @@ function renderSliderData ( res, root_images ) {
         var src = root_images + item.src;
         var exif = JSON.parse(item.exif);
 
-        var keys = ['make', 'model', 'focalLength', 'fNumber', 'exposureTime', 'ISO', 'exposureBiasValue', 'lensModel'];
+        var keys = ['make', 'model', 'focalLength', 'fNumber', 'exposureTime', 'ISO', 'exposureBiasValue', 'lensModel', 'create_time'];
         var len = keys.length;
 
         if ( item.exif ) {
@@ -54,7 +54,8 @@ function renderSliderData ( res, root_images ) {
             shutterSpeed: exposureTime,
             iso: exif.ISO,
             exposure: exposureBiasValue,
-            lens: exif.lensModel
+            lens: exif.lensModel,
+            create_time: exif.create_time
         }
         var obj = {
             exif: exif_obj,

components/slider/slider.wxml

@@ -50,6 +50,10 @@
                     <text>镜头</text>
                     <text>{{ slider.photos[slider.current-1].exif.lens }}</text>
                 </view>
+                <view>
+                    <text>拍摄日期</text>
+                    <text>{{ slider.photos[slider.current-1].exif.create_time }}</text>
+                </view>
             </view>
         </view>
         <image class="slider-loading" src="../../images/loading.gif" hidden="{{ slider.is_hide_loading }}"></image>

pages/index/index.js

@@ -177,7 +177,6 @@ Page({
 
             var pre = obj.relate.pre;
 
-            console.log(current_day);
             current_day = this.dateToDay(current_day);
             render_date.start = obj.date_range.range_min;
 

pages/index/index.wxss

@@ -183,6 +183,7 @@ page {
     padding: 20rpx 15rpx;
     color: #999;
     line-height: 1.4;
+    word-wrap: break-word;
 }
 
 /* 快拍  */

pages/upload-photo/upload-photo.js

@@ -424,12 +424,15 @@ Page({
                                         }, err => {
                                             console.log(err);
                                             var msg = err.data.message;
-                                            wx.hideLoading();
-                                            if ( msg ) {
+
+                                            if ( msg ) {     
                                                 wx.showToast({
                                                     title: msg
                                                 });
                                             };
+
+                                            wx.hideLoading();
+
                                             that.is_uploading = false;
                                         })
                                     };
@@ -447,15 +450,13 @@ Page({
 
                     }, err => {
                         console.log(err);
-                        var msg = err.data.message;
+                        // var msg = err.data.message;
                         that.is_uploading = false;
 
                         wx.hideLoading();
-                        if ( msg ) {
-                            wx.showToast({
-                                title: msg
-                            });
-                        };
+                        wx.showToast({
+                            title: err
+                        });
                     });
                 }
             });

pages/work-details/work-details.wxss

@@ -115,6 +115,7 @@ page {
 .des {
     line-height: 1.4;
     color: #666;
+    word-wrap: break-word;
 }
 /* 评论面板 */
 .work-comment-panel {