diff --git a/pages/order/complain/complain.vue b/pages/order/complain/complain.vue index be821f7..548b0df 100644 --- a/pages/order/complain/complain.vue +++ b/pages/order/complain/complain.vue @@ -45,13 +45,13 @@ 投诉凭证 - + - 提交 + 提交 @@ -109,7 +109,15 @@ export default { /** * 提交 */ - handleSumit() { + handleSubmit() { + if(!this.images.length && !this.complainValue){ + uni.showToast({ + title:'请上传图片凭证和投诉内容', + icon:'none' + }) + return + + } // 循环出商品 let goods = this.orderGoodsList.filter((item) => { return item.skuId == this.skuId; diff --git a/pages/order/complain/complainInfo.vue b/pages/order/complain/complainInfo.vue index 51b7027..45d55e3 100644 --- a/pages/order/complain/complainInfo.vue +++ b/pages/order/complain/complainInfo.vue @@ -49,11 +49,13 @@ export default { return { complainDetail: "", //投诉详情 statusData: { + NEW: "新投诉", NO_APPLY: "未申请", APPLYING: "申请中", - COMPLETE: "已完成,此时可申请", - EXPIRED: "已失效,不可申请", + COMPLETE: "已完成", + EXPIRED: "已失效", CANCEL: "已取消", + WAIT_ARBITRATION:"等待仲裁" }, }; }, diff --git a/pages/order/complain/complainList.vue b/pages/order/complain/complainList.vue index ccdec07..b09b75c 100644 --- a/pages/order/complain/complainList.vue +++ b/pages/order/complain/complainList.vue @@ -48,12 +48,13 @@ export default { data() { return { statusData: { - NEW: "新订单", + NEW: "新投诉", NO_APPLY: "未申请", APPLYING: "申请中", COMPLETE: "已完成", EXPIRED: "已失效", CANCEL: "已取消", + WAIT_ARBITRATION:"等待仲裁" }, show: false, content: "是否撤销投诉?", diff --git a/pages/passport/wechatMPLogin.vue b/pages/passport/wechatMPLogin.vue index 0d26346..b58c991 100644 --- a/pages/passport/wechatMPLogin.vue +++ b/pages/passport/wechatMPLogin.vue @@ -232,14 +232,14 @@ text.shop { width: 92%; margin: 0 auto 40rpx; border-radius: 100px; - animation: mymove 5s infinite; - -webkit-animation: mymove 5s infinite; /*Safari and Chrome*/ - animation-direction: alternate; /*轮流反向播放动画。*/ - animation-timing-function: ease-in-out; /*动画的速度曲线*/ - /* Safari 和 Chrome */ - -webkit-animation: mymove 5s infinite; - -webkit-animation-direction: alternate; /*轮流反向播放动画。*/ - -webkit-animation-timing-function: ease-in-out; /*动画的速度曲线*/ + // animation: mymove 5s infinite; + // -webkit-animation: mymove 5s infinite; /*Safari and Chrome*/ + // animation-direction: alternate; /*轮流反向播放动画。*/ + // animation-timing-function: ease-in-out; /*动画的速度曲线*/ + // /* Safari 和 Chrome */ + // -webkit-animation: mymove 5s infinite; + // -webkit-animation-direction: alternate; /*轮流反向播放动画。*/ + // -webkit-animation-timing-function: ease-in-out; /*动画的速度曲线*/ } .btn-callback { text-align: center;