Merge branch 'work1.1_20190926' of http://git.vipzhuang.cn/wxd/MShopWeApp into work1.1_20190926

后端开发-许程
2 parents bbc2b008 f059f162
Showing 4 changed files with 25 additions and 40 deletions
pages/goods/goodsInfo/goodsInfo.js
pages/user/add_comment/add_comment.js
pages/user/add_comment/add_comment.json
pages/user/add_comment/add_comment.wxml
@@ -1342,7 +1342,6 @@ Page({
       parent_id: 0,
       goods_id: th.data.gid,
       commenttype: tp,
-
     }
     if(getApp().globalData.userInfo){
       req_where.userId=getApp().globalData.userInfo.user_id;
@@ -24,8 +24,6 @@ Page({
   },
   onLoad: async function (a) {
     var th = this;
-    console.log('onLoad');
-    console.log(a);
  
     await getApp().request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + a.goods_id, { 1: 1 }).then(res => {
       a.img = th.data.iurl + res.data.data.original_img
@@ -85,8 +83,12 @@ Page({
   },
   submitComment: function () {
     var a = this;
-    if (!a.data.service_rank || !a.data.goods_rank || !a.data.deliver_rank) return t.showWarning("请先打完分~");
+    if (!a.data.service_rank || !a.data.goods_rank || !a.data.deliver_rank)
+        return getApp().my_warnning("请先打分",0,a);
+
     this.uploadPhotos(function () {
+      console.log("submitComment");
+      console.log(a.data.uploadPath);
       e.post("/api/weshop/comment/savecomment", {
         data: {
           email: ' ',
@@ -109,12 +111,14 @@ Page({
       });
     });
   },
+
+
   uploadPhotos: function (t, a) {
     if (0 == this.data.filePaths.length) return t();
-    if ("number" != typeof a) a = 0; else if (a >= this.data.filePaths.length) return t();
+    if ("number" != typeof a) a = 0; else if (a >= this.data.imgs.length) return t();
     var s = this;
-    e.uploadFile("/api/user/upload_comment_img", {
-      filePath: s.data.filePaths[a],
+    e.uploadFile("api/weshop/comment/uploadCommentImg", {
+      filePath: s.data.imgs[a],
       name: "img_file",
       success: function (e) {
         s.data.uploadPath[a] = e.data.result, s.uploadPhotos(t, a + 1);
@@ -137,11 +141,6 @@ Page({
       this.setData({
         lenMore: 1
       });
-      setTimeout(function () {
-        that.setData({
-          lenMore: 0
-        });
-      }, 2500);
       return false;
     }
     wx.chooseImage({
 {
     "navigationBarTitleText": "评价宝贝",
-    "enablePullDownRefresh": false
+    "enablePullDownRefresh": false,
+    "usingComponents": {
+        "warn": "/components/long_warn/long_warn"
+    }
 }
 \ No newline at end of file
@@ -104,24 +104,10 @@
  
       </view>
  
-
-
-
-
-
-
-
     </view>
-
-
-
-
-
-
   </view>
  
   <!-- 评价等级 -->
-
   <view class="Grade">
     <!-- 宝贝评分 -->
     <view class="title flex-vertical">
@@ -134,22 +120,24 @@
       <view class="score-item flex-vertical">
         <view class="fs24">描述相符</view>
         <view class="stars flex-vertical">
-          <image data-i="{{index}}" src="{{index<goods_rank?iurl+'/miniapp/images/StarsredCk.png':iurl+'/miniapp/images/StarswhiteUnCk.png'}}" wx:for="{{5}}" wx:key="{{index}}" bindtap="checkGoodsRank"></image>
-
+          <image data-i="{{index}}" src="{{index<goods_rank?iurl+'/miniapp/images/StarsredCk.png':iurl+'/miniapp/images/StarswhiteUnCk.png'}}"
+                 wx:for="{{5}}" wx:key="{{index}}" bindtap="checkGoodsRank"></image>
         </view>
       </view>
  
       <view class="score-item flex-vertical">
         <view class="fs24">物流服务</view>
         <view class="stars flex-vertical">
-          <image bindtap="checkDeliverRank" data-i="{{index}}" src="{{index<deliver_rank?iurl+'/miniapp/images/StarsredCk.png':iurl+'/miniapp/images/StarswhiteUnCk.png'}}" wx:for="{{5}}" wx:key="{{index}}"></image>
+          <image bindtap="checkDeliverRank" data-i="{{index}}" src="{{index<deliver_rank?iurl+'/miniapp/images/StarsredCk.png':iurl+'/miniapp/images/StarswhiteUnCk.png'}}"
+                 wx:for="{{5}}" wx:key="{{index}}"></image>
  
         </view>
       </view>
       <view class="score-item flex-vertical">
         <view class="fs24">服务态度</view>
         <view class="stars flex-vertical">
-          <image src="{{index<service_rank?iurl+'/miniapp/images/StarsredCk.png':iurl+'/miniapp/images/StarswhiteUnCk.png'}}" bindtap="checkServiceRank" data-i="{{index}}" wx:for="{{5}}" wx:key="{{index}}"></image>
+          <image src="{{index<service_rank?iurl+'/miniapp/images/StarsredCk.png':iurl+'/miniapp/images/StarswhiteUnCk.png'}}"
+                 bindtap="checkServiceRank" data-i="{{index}}" wx:for="{{5}}" wx:key="{{index}}"></image>
  
  
         </view>
@@ -163,19 +151,15 @@
  
 <!-- 是否匿名评价 -->
 <view class=" Whether ">
-
   <!-- 选择是否匿名 -->
-  <view class="allClick flex-right-vertical ">
-    <icon class="radio " bindtap="checkAnonymous " color="{{is_anonymous? 'white': 'red'}} " size="15 " type="success "></icon>
+  <view class="allClick flex-right-vertical" bindtap="checkAnonymous">
+    <icon class="radio"   size="15" type="success"  color="{{is_anonymous?'red':'gainsboro'}}"></icon>
     <view class="fs24 ">匿名评价</view>
   </view>
  
   <view class="Submission flex-level ">
-    <view class="fs30 flex-level white " bindtap="submitComment ">
-      提交评价
-    </view>
+    <view class="fs30 flex-level white " bindtap="submitComment">提交评价</view>
   </view>
+</view>
  
-
-
-</view>
 \ No newline at end of file
+<warn id="warn"></warn>
 \ No newline at end of file