From 396e7959434880abc297ee0eb55f57085e49a79f Mon Sep 17 00:00:00 2001 From: luyuan <1162963624@qq.com> Date: Wed, 8 Jul 2020 08:43:39 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pageB/search/index.vue | 16 +++++++++++++++- pageB/search/out.vue | 9 +++++++-- pages/shop/index.vue | 10 +++++++++- 3 files changed, 31 insertions(+), 4 deletions(-) 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..26d0aeb 100644 --- a/pageB/search/out.vue +++ b/pageB/search/out.vue @@ -4,7 +4,8 @@ - + + @@ -81,7 +82,8 @@ export default { ], current: 0, swiperCurrent: 0, - keyword:"" + keyword:"", + type:"" } }, methods: { tabsChange(index) { @@ -97,6 +99,9 @@ export default { this.swiperCurrent = current; this.current = current; } + }, + onLoad(o){ + this.type = o.type } } \ No newline at end of file diff --git a/pages/shop/index.vue b/pages/shop/index.vue index 15447f0..7445999 100644 --- a/pages/shop/index.vue +++ b/pages/shop/index.vue @@ -6,7 +6,9 @@ {{ area }} - + + + @@ -91,6 +93,12 @@ export default { this.getGoodsRecommend(); }, methods: { + sousuo(){ + // console.log(123) + this.$u.route({ + url:"pageB/search/index" + }) + }, getShopTopList() { this.$u.api.getShopTopList().then((res)=>{ if (res.errCode == 0) { From a5b83f31a85f7505d9eeab8ed7bd795255d5d8aa Mon Sep 17 00:00:00 2001 From: ghusermoon <2673031505@qq.com> Date: Fri, 10 Jul 2020 09:03:19 +0800 Subject: [PATCH 2/4] upload file --- README.md | 4 +- common/api/user.js | 11 +----- components/mine/order-item/index.vue | 8 +++- pageE/mine/EditUserInfo.vue | 3 +- pageE/mine/MemberServe.vue | 9 ++++- pageE/more/Complaints.vue | 37 ++++++++--------- pageE/more/WriteComments.vue | 31 +++++++++------ pageE/order/Details.vue | 29 +++++++------- pageE/order/Index.vue | 10 ++--- pageE/setting/Index.vue | 6 ++- pageE/setting/ShieldUsers.vue | 59 ++++++++++++++++++++++++++++ pageE/tool/ManicureOrder.vue | 30 ++++++++++---- pages.json | 13 ++++++ pages/mine/index.vue | 4 +- static/js/common.js | 13 +++--- 15 files changed, 183 insertions(+), 84 deletions(-) create mode 100644 pageE/setting/ShieldUsers.vue 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 a2bf0a0..547978c 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, @@ -254,15 +254,6 @@ export default { file: file, }); }, - // 上传图片视频 - uploadfile({ file }) { - const params = { - file: file - } - console.log(params); - - return vm.$u.post('Upload/uploadfile', params); - }, } } } \ No newline at end of file diff --git a/components/mine/order-item/index.vue b/components/mine/order-item/index.vue index cc7cb64..8000b77 100644 --- a/components/mine/order-item/index.vue +++ b/components/mine/order-item/index.vue @@ -17,7 +17,7 @@ 总价：￥99.00，实付款￥99 - 2020.05.17 + {{ order.add_time | date }} @@ -25,6 +25,7 @@ 查看物流 立即评价 + 取消支付 立即支付 联系官方客服 提交官方审核 @@ -70,7 +71,7 @@ export default { methods: { toDetailsPage() { uni.navigateTo({ - url: '/pageE/order/Details?order.order_state=' + this.order.order_state + url: '/pageE/order/Details?id=' + this.order.order_id }); }, toLogistics() { @@ -184,6 +185,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/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..4366878 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 @@ \ No newline at end of file From 7cff88b5d6d0d1162696495af8826a0a5dd676d9 Mon Sep 17 00:00:00 2001 From: ghusermoon <2673031505@qq.com> Date: Fri, 10 Jul 2020 17:38:21 +0800 Subject: [PATCH 4/4] order --- common/api/user.js | 16 ++-- components/mine/order-item/index.vue | 70 ++++++++---------- package-lock.json | 6 +- package.json | 2 +- pageE/more/Complaints.vue | 5 +- pageE/more/WriteComments.vue | 56 ++++++++------ pageE/order/Comment.vue | 51 ++++++++++--- pageE/order/Details.vue | 107 ++++++++++++++++++++------- pageE/order/Index.vue | 14 ++-- pages.json | 2 +- static/js/common.js | 2 +- 11 files changed, 215 insertions(+), 116 deletions(-) diff --git a/common/api/user.js b/common/api/user.js index 547978c..39b4728 100644 --- a/common/api/user.js +++ b/common/api/user.js @@ -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,14 +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, - }); + } + if(file) Object.assign(params, { file: file }); + return vm.$u.post('Order/orderEvaluate', params); }, } } diff --git a/components/mine/order-item/index.vue b/components/mine/order-item/index.vue index 8000b77..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 }} @@ -23,67 +23,59 @@ - 查看物流 - 立即评价 + 查看物流 + 立即评价 取消支付 立即支付 - 联系官方客服 - 提交官方审核 + 联系官方客服 + 提交官方审核 diff --git a/package-lock.json b/package-lock.json index 59f01b1..5a8d228 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,9 +5,9 @@ "requires": true, "dependencies": { "uview-ui": { - "version": "1.4.3", - "resolved": "https://registry.npm.taobao.org/uview-ui/download/uview-ui-1.4.3.tgz?cache=0&sync_timestamp=1593581462515&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fuview-ui%2Fdownload%2Fuview-ui-1.4.3.tgz", - "integrity": "sha1-iZXwicmK50MPu87vgbDDTBmm8eE=" + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/uview-ui/-/uview-ui-1.5.0.tgz", + "integrity": "sha512-1UdMUGJqWx60ALbXXXs3rQHKUNBARDIV5XHc06mKFxpccO/i0tzoSqS6RuPdmYwXU1q59wnIU+NLABvcU5u4vw==" } } } diff --git a/package.json b/package.json index 2734381..d8e4866 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,6 @@ "author": "", "license": "ISC", "dependencies": { - "uview-ui": "^1.4.3" + "uview-ui": "^1.5.0" } } diff --git a/pageE/more/Complaints.vue b/pageE/more/Complaints.vue index 4366878..4bd99e3 100644 --- a/pageE/more/Complaints.vue +++ b/pageE/more/Complaints.vue @@ -8,13 +8,13 @@ - + 后台回复： {{ item.reply_content }} - {{ reply_time }} + {{ item.fb_time }} @@ -56,6 +56,7 @@ export default { .complaints-box { padding: 30rpx; background-color: #ffffff; + margin-bottom: 20rpx; .suggestions { .text { font-size: 26rpx; diff --git a/pageE/more/WriteComments.vue b/pageE/more/WriteComments.vue index f28426c..f2c064c 100644 --- a/pageE/more/WriteComments.vue +++ b/pageE/more/WriteComments.vue @@ -5,11 +5,13 @@ @@ -17,6 +19,7 @@ 发表意见 +