diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js index 9ec51eb..6f50925 100644 --- a/pages/goods/goodsInfo/goodsInfo.js +++ b/pages/goods/goodsInfo/goodsInfo.js @@ -387,7 +387,7 @@ Page({ if(fir_com){ for(var ind in fir_com){ if(fir_com[ind].head_pic=="") fir_com[ind].head_pic= ee.data.iurl+"/miniapp/images/hui_hear_pic.png"; - if (fir_com[ind].img) fir_com[ind].img = ut.unserialize(fir_com[ind].img); + if (fir_com[ind].img) fir_com[ind].img = ut.unserialize(fir_com[ind].img); } } diff --git a/pages/user/add_comment/add_comment.js b/pages/user/add_comment/add_comment.js index 749739c..4d40b38 100644 --- a/pages/user/add_comment/add_comment.js +++ b/pages/user/add_comment/add_comment.js @@ -8,8 +8,8 @@ Page({ resourceUrl: a.resourceUrl, iurl: a.imghost, defaultPhoto: a.resourceUrl + "/static/images/camera.png", - filePaths: [], - uploadPath: [], + + uploadPath: [], //上传后文件路径 maxWord: 0, is_anonymous: !1, goods_rank: 0, @@ -19,7 +19,7 @@ Page({ options: null, isLongPress: !1, userinfo: null, - imgs: [], + imgs: [], //本地文件再上传时的路径 lenMore:0 }, onLoad: async function (a) { @@ -85,24 +85,33 @@ 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); this.uploadPhotos(function () { - console.log("submitComment"); - console.log(a.data.uploadPath); + var p_data= { + email: ' ', + is_show: 1, + goods_rank: a.data.goods_rank, + service_rank: a.data.service_rank, + deliver_rank: a.data.deliver_rank, + content: a.data.content, + goods_id: a.data.options.goods_id, + order_id: a.data.options.order_id, + user_id: oo.user_id, + store_id: os.stoid, + username: a.data.userinfo.nickname, + source_type:1 + } + if(a.data.uploadPath){ + p_data['weapp_img']=JSON.stringify(a.data.uploadPath); + } + if(a.data.is_anonymous){ + p_data['is_anonymous']=1; + } + e.post("/api/weshop/comment/savecomment", { - data: { - email: ' ', - is_show: 1, - goods_rank: a.data.goods_rank, - service_rank: a.data.service_rank, - deliver_rank: a.data.deliver_rank, - content: a.data.content, - goods_id: a.data.options.goods_id, - order_id: a.data.options.order_id, - user_id: oo.user_id, - store_id: os.stoid, - username: a.data.userinfo.nickname - }, + data:p_data, success: function (a) { wx.setStorageSync("user:comment:update", !0), t.showSuccess("评论成功", function () { wx.navigateBack(); @@ -114,14 +123,17 @@ Page({ uploadPhotos: function (t, a) { - if (0 == this.data.filePaths.length) return t(); + if (0 == this.data.imgs.length) return t(); if ("number" != typeof a) a = 0; else if (a >= this.data.imgs.length) return t(); var s = this; - e.uploadFile("api/weshop/comment/uploadCommentImg", { + e.uploadFile("/api/weshop/comment/uploadCommentImg", { filePath: s.data.imgs[a], - name: "img_file", + name: "file", success: function (e) { - s.data.uploadPath[a] = e.data.result, s.uploadPhotos(t, a + 1); + console.log("uploadPhotos"); + console.log(e.data); + if(e.data.code==0) + s.data.uploadPath[a] = e.data.data, s.uploadPhotos(t, a + 1); } }); }, @@ -192,5 +204,11 @@ Page({ }) }, + txtInpt:function (e) { + this.setData({ + content: e.detail.value + }) + } + }); \ No newline at end of file diff --git a/pages/user/add_comment/add_comment.wxml b/pages/user/add_comment/add_comment.wxml index 5042362..40be451 100644 --- a/pages/user/add_comment/add_comment.wxml +++ b/pages/user/add_comment/add_comment.wxml @@ -54,7 +54,7 @@ - + {{options.goods_name}}我弄饭v的v哦女v绝我弄饭v的v哦女v绝望愤怒冻死我弄饭v的v哦女v绝望愤怒冻死望愤怒冻死 @@ -63,7 +63,7 @@ - {{options.price}}3333.00 + {{options.price}} @@ -81,7 +81,9 @@ - + @@ -130,7 +132,6 @@ - @@ -138,8 +139,6 @@ - - @@ -153,7 +152,7 @@ - + 匿名评价 diff --git a/pages/user/order_list/order_list.wxml b/pages/user/order_list/order_list.wxml index 53f5ac7..7d8d543 100644 --- a/pages/user/order_list/order_list.wxml +++ b/pages/user/order_list/order_list.wxml @@ -84,10 +84,16 @@ - - + + + + + + - + diff --git a/utils/request.js b/utils/request.js index 351a1be..affbf49 100644 --- a/utils/request.js +++ b/utils/request.js @@ -43,7 +43,10 @@ module.exports = { filePath: e.filePath, name: e.name, success: function(t) { - i.hideLoading(), console.log("app.request", t), t.data = JSON.parse(i.filterJsonData(t.data)), + i.hideLoading(); + if(t.statusCode==200) + t.data = JSON.parse(i.filterJsonData(t.data)); + else { t={code:-1,msg:'调用接口失败'};} i.doSuccess(e, t); }, fail: function(t) {