diff --git a/README.md b/README.md index d7273e7..762c8f6 100644 --- a/README.md +++ b/README.md @@ -44,9 +44,9 @@ unescapeHTML(temp){} /** * 上传文件(只能单文件上传) * @param { String } url 服务器 url +* @param { String } name 上传类型 goods-商品图片 avatar-用户头像 video-视频 store_logo-店铺logo store_banner-店铺banner store_avatar-店铺头像 * @param { String } filePath 要上传文件资源的路径 -* @param { String } type 上传文件验证类型 默认: img 可选: video * @return { object } promise 对象 resolve 返回文件服务器地址 reject 返回错误信息 */ -uploadFile({ url, filePath, type = 'img' } = {}) {} +uploadFile({ url, name, filePath }) {} ``` \ No newline at end of file diff --git a/common/api/user.js b/common/api/user.js index 48b4f37..b96416f 100644 --- a/common/api/user.js +++ b/common/api/user.js @@ -216,7 +216,7 @@ export default { page: page, }); }, - // 意见反馈列表 + // 意见反馈列表 getFeedbackList({ page }) { return vm.$u.post('Member/feedbackList', { page: page, @@ -230,14 +230,15 @@ export default { }); }, // 订单列表 - getOrderList({ page, type }) { + getOrderList({ page, type, refund_state }) { let params = { page: page }; - if(type >= 0) Object.assign(params, {state_type: type}) - return vm.$u.post('Goods/orderList', params); + if(type >= 0 || typeof type == 'string') Object.assign(params, {state_type: type}); + if(refund_state) Object.assign(params, {refund_state: refund_state}); + return vm.$u.post('Order/orderList', params); }, // 订单详情 getOrderInfo({ order_id }) { - return vm.$u.post('Goods/orderInfo', { order_id: order_id }); + return vm.$u.post('Order/orderInfo', { order_id: order_id }); }, // 查询订单的评价信息 getOrderEvaluateInfo({ id }) { @@ -245,23 +246,15 @@ export default { }, // 订单评价/修改评价 updateOrderEvaluate({ id, content, scores_one, scores_two, scores_three, file }) { - return vm.$u.post('Order/orderEvaluate', { + let params = { id: id, content: content, scores_one: scores_one, scores_two: scores_two, scores_three: scores_three, - file: file, - }); - }, - // 上传图片视频 - uploadfile({ file }) { - const params = { - file: file } - console.log(params); - - return vm.$u.post('Upload/uploadfile', params); + if(file) Object.assign(params, { file: file }); + return vm.$u.post('Order/orderEvaluate', params); }, // 信息模块 messageIndex({ }) { diff --git a/components/mine/order-item/index.vue b/components/mine/order-item/index.vue index cc7cb64..eda2f40 100644 --- a/components/mine/order-item/index.vue +++ b/components/mine/order-item/index.vue @@ -5,10 +5,10 @@ {{ order.extend_store.store_name }} - {{ order.order_state | viewState }} + {{ state }} - + {{ goods.goods_name }} @@ -17,72 +17,65 @@ 总价：￥99.00，实付款￥99 - 2020.05.17 + {{ order.add_time | date }} - 查看物流 - 立即评价 + 查看物流 + 立即评价 + 取消支付 立即支付 - 联系官方客服 - 提交官方审核 + 联系官方客服 + 提交官方审核 @@ -184,6 +177,9 @@ export default { .logistics, .comment, .payment { @include btn-class($width: 160rpx, $color: rgba(255,119,15,1)); } + .calcel { + @include btn-class($width: 160rpx, $color: rgba(155,153,153,1)); + } .service { @include btn-class($width: 216rpx, $color: rgba(155,153,153,1)); } diff --git a/pageB/search/index.vue b/pageB/search/index.vue index c781c58..d5ce68b 100644 --- a/pageB/search/index.vue +++ b/pageB/search/index.vue @@ -6,7 +6,9 @@ 'font-size':'32rpx', 'color':'#FF780F', 'overflow':'unset' - }"> + }" + @search="search" + > 搜索发现 @@ -23,6 +25,18 @@ export default { return{ keyword:"" } + }, + methods:{ + search(value){ + // console.log(value) + this.$u.route({ + url:"/pageB/search/out", + params:{ + value, + type:"shop" + } + }) + } } } diff --git a/pageB/search/out.vue b/pageB/search/out.vue index a161faf..f50b8ca 100644 --- a/pageB/search/out.vue +++ b/pageB/search/out.vue @@ -4,8 +4,8 @@ - - + + @@ -25,6 +25,18 @@ + + 销量 + + 价格 + + + + + + 好评 + + \ No newline at end of file diff --git a/pageE/mine/EditUserInfo.vue b/pageE/mine/EditUserInfo.vue index 91fc9c1..c5276bd 100644 --- a/pageE/mine/EditUserInfo.vue +++ b/pageE/mine/EditUserInfo.vue @@ -80,7 +80,8 @@ export default { this.avatar = res.tempFilePaths[0]; common.uploadFile({ url: url, - filePath: res.tempFilePaths[0] + name: 'avatar', + filePath: res.tempFilePaths[0] }).then(result => { this.avatar = result; }, error => { diff --git a/pageE/mine/MemberServe.vue b/pageE/mine/MemberServe.vue index 575dfa1..af082c6 100644 --- a/pageE/mine/MemberServe.vue +++ b/pageE/mine/MemberServe.vue @@ -17,7 +17,10 @@ 预计进度 - {{ memberInfo.next_grade_exppoints_diff }} + + + + @@ -151,6 +154,10 @@ export default { font-size: 48rpx; font-weight: 500; color: rgba(255,255,255,1); + > image { + width: 52rpx; + height: 35rpx; + } } } } diff --git a/pageE/more/Complaints.vue b/pageE/more/Complaints.vue index 7c99502..4bd99e3 100644 --- a/pageE/more/Complaints.vue +++ b/pageE/more/Complaints.vue @@ -1,33 +1,30 @@ \ No newline at end of file diff --git a/pageE/tool/ManicureOrder.vue b/pageE/tool/ManicureOrder.vue index c0bf180..c8db2d9 100644 --- a/pageE/tool/ManicureOrder.vue +++ b/pageE/tool/ManicureOrder.vue @@ -1,14 +1,18 @@