Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

yvan.ni
2 parents ab76f4d7 ffc9b6f1
Showing 2 changed files with 4 additions and 4 deletions
pages/goods/goodsInfo/goodsInfo.wxml
pages/user/add_comment/add_comment.js
@@ -578,7 +578,7 @@
 							      </view>
 							    </view>
 							    <view class="xc_comment-font pj_word_size ellipsis-2">
-							     {{item.content?item.content:''}}
+                    {{item.content?item.content:'此用户没有填写评价。'}}                      
 							    </view>
 							    <view class="xc_comment-val">
 							      <view class="xc_comment-time">{{item.add_time}}</view>
@@ -795,7 +795,7 @@
             </view>
             <view class="xc-pirces">
             <view class="middle-font {{item.seeMore==true?'ellipsis-3':''}}" >
-              {{item.content?item.content:''}}
+              {{item.content?item.content:'此用户没有填写评价。'}}
             </view> 
             </view>
             <view wx:if='{{item.seeMore}}' data-index='{{cIdx}}' class="s_btn fs30 red-co" catchtap='toggleHandler'>全部显示</view>
@@ -88,8 +88,8 @@ Page({
     var a = this;
     if (!a.data.service_rank || !a.data.goods_rank || !a.data.deliver_rank)
         return getApp().my_warnning("请先打分",0,a);
-    if(a.data.content=="")
-      return getApp().my_warnning("请填写评价内容",0,a);
+    // if(a.data.content=="")
+    //   return getApp().my_warnning("请填写评价内容",0,a);
     //this.uploadPhotos(function () {
       var p_data= {