From 3f0c1c220b2ae1ae72809dbb3478ca1bed8a2070 Mon Sep 17 00:00:00 2001 From: chenlong Date: Fri, 8 Sep 2023 19:07:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/draw.js | 8 + components/RightNav/index.vue | 31 +++- pages/ChatDetail/index.vue | 16 +- pages/Draw/index.vue | 167 ++++++++++-------- .../OrderPage/components/index.scss | 4 + pages/Index/components/OrderPage/index.vue | 49 ++--- .../mp-weixin/components/FooterNav/Index.js | 59 +++---- .../mp-weixin/components/HeaderNav/Index.js | 2 +- .../mp-weixin/components/RightNav/Index.js | 27 ++- .../dist/dev/mp-weixin/pages/Addr/index.js | 2 +- .../dev/mp-weixin/pages/ChatDetail/index.js | 10 +- .../dev/mp-weixin/pages/ChatDetail/index.wxml | 2 +- .../pages/Index/components/ChatPage/Index.js | 51 ++++-- .../Index/components/ChatPage/Index.json | 4 +- .../Index/components/ChatPage/Index.wxml | 2 +- .../pages/Index/components/HomePage/Index.js | 4 +- .../pages/Index/components/OrderPage/Index.js | 86 +++++---- .../Index/components/OrderPage/Index.wxml | 2 +- .../Index/components/OrderPage/Index.wxss | 4 + .../pages/Index/components/UserPage/Index.js | 9 +- .../dist/dev/mp-weixin/pages/Index/index.js | 75 ++++++-- .../dist/dev/mp-weixin/pages/Index/index.wxml | 2 +- .../dev/mp-weixin/pages/UserCoupons/index.js | 2 +- .../dev/mp-weixin/project.private.config.json | 17 ++ 24 files changed, 408 insertions(+), 227 deletions(-) create mode 100644 api/draw.js diff --git a/api/draw.js b/api/draw.js new file mode 100644 index 0000000..e1020bb --- /dev/null +++ b/api/draw.js @@ -0,0 +1,8 @@ +import request from "@/utils/request"; + +export function drawList(){ + return request({ + url:'draw/drawgoods-list', + method:'post', + }) +} \ No newline at end of file diff --git a/components/RightNav/index.vue b/components/RightNav/index.vue index c3c19a5..a642fbf 100644 --- a/components/RightNav/index.vue +++ b/components/RightNav/index.vue @@ -1,8 +1,6 @@ @@ -13,15 +11,22 @@ return { title: 'Hello', loading: true, - staticImage:{ - wechat: imghost + "/static/image/right-button-wechat.png", - chat: imghost + "/static/image/right-button-chat.png", - phone: imghost + "/static/image/right-button-phone.png", - } + buttonGroup:[ + { + image:imghost+"/static/image/right-button-wechat.png", + type:'wechat' + },{ + image:imghost+"/static/image/right-button-chat.png", + type:'chat' + },{ + image:imghost+"/static/image/right-button-phone.png", + type:'phone' + }, + ] } }, onLoad() { - + }, methods: { callPhone(phone){ @@ -29,6 +34,14 @@ phoneNumber: phone.toString() }); }, + handle(type){ + switch (type) { + case 'chat': + uni.navigateTo({ + url:"/pages/ChatDetail/index?id=" + 0 + }) + } + } } } diff --git a/pages/ChatDetail/index.vue b/pages/ChatDetail/index.vue index d590f86..4dc8d6e 100644 --- a/pages/ChatDetail/index.vue +++ b/pages/ChatDetail/index.vue @@ -12,9 +12,9 @@ - + {{ item.create_time }} - {{ item.info }} + {{ item.info }} @@ -49,7 +49,7 @@ - + { + getToken(order_id){ + getToken(order_id, this.$store.state.userInfo.store_id ? 2 : 1).then(data => { this.chat_id = data.data.chat_id; this.type = data.data.type; this.user_id = data.data.user_id; @@ -166,6 +166,7 @@ data:this.message }); uni.hideLoading(); + this.message = ''; }, 50); }else{ uni.sendSocketMessage({ @@ -179,6 +180,7 @@ }) }); uni.hideLoading(); + this.message = ''; } } }, diff --git a/pages/Draw/index.vue b/pages/Draw/index.vue index b7e9bdf..f81091e 100644 --- a/pages/Draw/index.vue +++ b/pages/Draw/index.vue @@ -6,20 +6,24 @@ - - - - - {{item.title}} - - - - - - {{item.title}} - - - + @@ -76,6 +80,8 @@ import HeaderNav from '@/components/HeaderNav/Index.vue'; import FooterNav from '@/components/FooterNav/Index.vue'; import RightNav from '@/components/RightNav/Index.vue'; import MzButton from '../../components/MzButton/Index.vue'; +import {drawList} from "@/api/draw"; +import log from "@/utils/log"; export default { components: { @@ -121,40 +127,13 @@ export default { isTop: false, pagePadding: 100, petImage: imghost + '/static/image/pet_avatar1.jpeg', - drawList: [ - { - img:imghost+'/static/image/banner.png', - title:'优惠券' - },{ - img:imghost+'/static/image/banner.png', - title:'优惠券' - },{ - img:imghost+'/static/image/banner.png', - title:'优惠券' - },{ - img:imghost+'/static/image/banner.png', - title:'优惠券' - },{ - img:imghost+'/static/image/banner.png', - title:'开始抽奖' - },{ - img:imghost+'/static/image/banner.png', - title:'优惠券' - },{ - img:imghost+'/static/image/banner.png', - title:'优惠券' - },{ - img:imghost+'/static/image/banner.png', - title:'优惠券' - },{ - img:imghost+'/static/image/banner.png', - title:'优惠券' - }, - ], + defaultImage: imghost + '/static/image/banner.png', + drawList: [], + loopIndex:0, } }, onLoad() { - + this.getDrawList(); }, methods: { navTo(url) { @@ -163,36 +142,82 @@ export default { }) }, drawAni(){ - let that = this; - if(that.drawButton === false){ - return; - } - that.drawButton = false; - that.drawOrder = []; - for(let i=2;i<=3;i++){ - for(let index in that.drawOrderDefault){ - if(i===3 && that.drawId === that.drawOrderDefault[index]){ - break; - }else{ - that.drawOrder.push(that.drawOrderDefault[index]) + let draw = Math.round((Math.random() * 7)); // 奖品 + let loopIndex = 0; + let checkIndex = [0, 1, 2, 4, 7, 6, 5, 3]; + let speed = 3; // 初始步数，每轮翻倍 + let length = 500; // 最大步数 + let current = 0; // 当前步数 + let t = setInterval(() => { + if ((current++ % speed) === 0){ + this.checked = checkIndex[loopIndex++]; + if (loopIndex >= 8) { + loopIndex = 0; + speed *= 2; + } } - } - } - console.log(that.drawOrder) - let index = 0; - let ani = setInterval(()=>{ - that.checked = that.drawOrder[index] - index++; - if(index>=that.drawOrder.length){ - clearInterval(ani); - that.drawButton = true; - that.drawShadow = true; - } - },200) + if (current > length && draw === loopIndex){ + clearInterval(t) + } + }, 10) + + // // let t1 = this.loop(50); + // // setTimeout(() => { + // // clearInterval(t1); + // // let t2 = this.loop(100); + // // setTimeout(() => { + // // clearInterval(t2) + // // let t3 = this.loop(200) + // // setTimeout(() => clearInterval(t3), 2000) + // // }, 2000); + // // },3000); + // + // return; + // + // let that = this; + // if(that.drawButton === false){ + // return; + // } + // that.drawButton = false; + // that.drawOrder = []; + // for(let i=2;i<=3;i++){ + // for(let index in that.drawOrderDefault){ + // if(i===3 && that.drawId === that.drawOrderDefault[index]){ + // break; + // }else{ + // that.drawOrder.push(that.drawOrderDefault[index]) + // } + // } + // } + // console.log(that.drawOrder) + // let index = 0; + // let ani = setInterval(()=>{ + // that.checked = that.drawOrder[index] + // index++; + // if(index>=that.drawOrder.length){ + // clearInterval(ani); + // that.drawButton = true; + // that.drawShadow = true; + // } + // },200) }, closeDrawShadow(){ this.drawShadow = false; - } + }, + getDrawList(){ + drawList().then(data => { + log(data) + this.drawList = data.data.goodslists; + + if (this.drawList.length < 8){ + this.drawList.push(...Array(8 - this.drawList.length).fill({ + logo:this.defaultImage, + title:'谢谢惠顾' + })); + } + + }) + } }, onPageScroll(res) { if (res.scrollTop <= 20) { diff --git a/pages/Index/components/OrderPage/components/index.scss b/pages/Index/components/OrderPage/components/index.scss index e821ccd..0b209a7 100644 --- a/pages/Index/components/OrderPage/components/index.scss +++ b/pages/Index/components/OrderPage/components/index.scss @@ -42,6 +42,7 @@ line-height: 53rpx; color:#646464; font-weight: 400; + position: relative; &.active{ color:#000000; font-size: 32rpx; @@ -54,6 +55,9 @@ display: none; align-items: center; justify-content: center; + position: absolute; + top: 90rpx; + left: 12rpx; .img{ width:37rpx; } diff --git a/pages/Index/components/OrderPage/index.vue b/pages/Index/components/OrderPage/index.vue index 3e9ba6b..0a53c4a 100644 --- a/pages/Index/components/OrderPage/index.vue +++ b/pages/Index/components/OrderPage/index.vue @@ -53,25 +53,24 @@ - {{item.title}} + {{item.addr}} - 刷毛 - 洗澡 + {{ server }} - 上门：{{item.do_time}} + 上门：{{item.do_date}} {{ item.do_time }} 下单时间：{{item.create_time}} - + - + { - log(data); + this.orderList = data.data; }) - } + }, + dayActiveToggle(daySign){ + this.dayActive = daySign; + }, + statusActiveToggle(statusSign){ + this.statusActive = statusSign; + }, + }, onPageScroll(res) { if(res.scrollTop <= 20){ diff --git a/unpackage/dist/dev/mp-weixin/components/FooterNav/Index.js b/unpackage/dist/dev/mp-weixin/components/FooterNav/Index.js index 08d8e55..d8eb024 100644 --- a/unpackage/dist/dev/mp-weixin/components/FooterNav/Index.js +++ b/unpackage/dist/dev/mp-weixin/components/FooterNav/Index.js @@ -1,44 +1,28 @@ "use strict"; -const config_host = require("../../config/host.js"); const common_vendor = require("../../common/vendor.js"); const _sfc_main = { - props: {}, + props: { + footGroup: { + type: Object, + default: {} + }, + footCheck: { + type: Number, + default: 0 + } + }, data() { return { - footCheck: "home", - title: "Hello", - loading: true, - buttonGroup: [ - { - image: config_host.imghost + "/static/image/foot-nav-button-one", - url: "/pages/index/index", - name: "home", - title: "汪汪行天下" - }, - { - image: config_host.imghost + "/static/image/foot-nav-button-two", - url: "/pages/order/index", - name: "order", - title: "订单" - }, - { - image: config_host.imghost + "/static/image/foot-nav-button-three", - url: "/pages/chatList/index", - name: "chat", - title: "在线沟通" - }, - { - image: config_host.imghost + "/static/image/foot-nav-button-four", - url: "/pages/user/index", - name: "user", - title: "" - } - ] + check: 0 }; }, onLoad() { }, methods: { + selectItem(index) { + this.current = index; + this.$emit("change", index); + }, commitFootCheck(item) { this.$store.commit("footCheck", item.name); this.$store.commit("title", item.title); @@ -47,6 +31,9 @@ const _sfc_main = { isFootCheck() { } }, + mounted() { + this.check = this.footCheck; + }, watch: { "$store.state.footCheck": { handler(newVal, oldVal) { @@ -57,12 +44,12 @@ const _sfc_main = { }; function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) { return { - a: common_vendor.f($data.buttonGroup, (item, index, i0) => { + a: common_vendor.f($props.footGroup, (item, index, i0) => { return { - a: item.name == $data.footCheck ? 1 : "", - b: "url(" + item.image + (item.name == $data.footCheck ? "-active" : "") + ".png)", - c: "auto " + (item.name == $data.footCheck ? "81" : "54") + "rpx", - d: common_vendor.o(($event) => $options.commitFootCheck(item)) + a: item.name === $props.footCheck ? 1 : "", + b: "url(" + item.image + (index === $props.footCheck ? "-active" : "") + ".png)", + c: "auto " + (index === $props.footCheck ? "81" : "54") + "rpx", + d: common_vendor.o(($event) => $options.selectItem(index)) }; }) }; diff --git a/unpackage/dist/dev/mp-weixin/components/HeaderNav/Index.js b/unpackage/dist/dev/mp-weixin/components/HeaderNav/Index.js index 8818f4e..eeeafc8 100644 --- a/unpackage/dist/dev/mp-weixin/components/HeaderNav/Index.js +++ b/unpackage/dist/dev/mp-weixin/components/HeaderNav/Index.js @@ -36,7 +36,7 @@ const _sfc_main = { console.log("this.headerPadding", this.headerPadding); }, navBack() { - common_vendor.wx$1.navigateBack({ + common_vendor.index.navigateBack({ delta: 1 }); } diff --git a/unpackage/dist/dev/mp-weixin/components/RightNav/Index.js b/unpackage/dist/dev/mp-weixin/components/RightNav/Index.js index 38f61a3..d6d6ac5 100644 --- a/unpackage/dist/dev/mp-weixin/components/RightNav/Index.js +++ b/unpackage/dist/dev/mp-weixin/components/RightNav/Index.js @@ -1,6 +1,6 @@ "use strict"; -const config_host = require("../../config/host.js"); const common_vendor = require("../../common/vendor.js"); +const config_host = require("../../config/host.js"); const _sfc_main = { data() { return { @@ -8,20 +8,37 @@ const _sfc_main = { loading: true, buttonGroup: [ { - image: config_host.imghost + "/static/image/right-button-wechat.png" + image: config_host.imghost + "/static/image/right-button-wechat.png", + type: "wechat" }, { - image: config_host.imghost + "/static/image/right-button-chat.png" + image: config_host.imghost + "/static/image/right-button-chat.png", + type: "chat" }, { - image: config_host.imghost + "/static/image/right-button-phone.png" + image: config_host.imghost + "/static/image/right-button-phone.png", + type: "phone" } ] }; }, onLoad() { }, - methods: {} + methods: { + callPhone(phone) { + common_vendor.index.makePhoneCall({ + phoneNumber: phone.toString() + }); + }, + handle(type) { + switch (type) { + case "chat": + common_vendor.index.navigateTo({ + url: "/pages/ChatDetail/index?id=0" + }); + } + } + } }; function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) { return { diff --git a/unpackage/dist/dev/mp-weixin/pages/Addr/index.js b/unpackage/dist/dev/mp-weixin/pages/Addr/index.js index dca5801..cf97d5a 100644 --- a/unpackage/dist/dev/mp-weixin/pages/Addr/index.js +++ b/unpackage/dist/dev/mp-weixin/pages/Addr/index.js @@ -113,7 +113,7 @@ const _sfc_main = { }); }, navTo(url) { - common_vendor.wx$1.navigateTo({ + common_vendor.index.navigateTo({ url }); }, diff --git a/unpackage/dist/dev/mp-weixin/pages/ChatDetail/index.js b/unpackage/dist/dev/mp-weixin/pages/ChatDetail/index.js index a7c8988..3ee8421 100644 --- a/unpackage/dist/dev/mp-weixin/pages/ChatDetail/index.js +++ b/unpackage/dist/dev/mp-weixin/pages/ChatDetail/index.js @@ -35,12 +35,12 @@ const _sfc_main = { user_id: 0, messageList: [] }, - onLoad() { - this.getToken(); + onLoad(options) { + this.getToken(options.id); }, methods: { - getToken() { - api_chat.getToken(5, 1).then((data) => { + getToken(order_id) { + api_chat.getToken(order_id, this.$store.state.userInfo.store_id ? 2 : 1).then((data) => { this.chat_id = data.data.chat_id; this.type = data.data.type; this.user_id = data.data.user_id; @@ -92,6 +92,7 @@ const _sfc_main = { data: this.message }); common_vendor.index.hideLoading(); + this.message = ""; }, 50); } else { common_vendor.index.sendSocketMessage({ @@ -105,6 +106,7 @@ const _sfc_main = { }) }); common_vendor.index.hideLoading(); + this.message = ""; } } }, diff --git a/unpackage/dist/dev/mp-weixin/pages/ChatDetail/index.wxml b/unpackage/dist/dev/mp-weixin/pages/ChatDetail/index.wxml index a53ecf2..3fbc667 100644 --- a/unpackage/dist/dev/mp-weixin/pages/ChatDetail/index.wxml +++ b/unpackage/dist/dev/mp-weixin/pages/ChatDetail/index.wxml @@ -1 +1 @@ -{{item.c}}{{item.d}} \ No newline at end of file +{{item.c}}{{item.d}} \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/pages/Index/components/ChatPage/Index.js b/unpackage/dist/dev/mp-weixin/pages/Index/components/ChatPage/Index.js index c9476f0..fcde41f 100644 --- a/unpackage/dist/dev/mp-weixin/pages/Index/components/ChatPage/Index.js +++ b/unpackage/dist/dev/mp-weixin/pages/Index/components/ChatPage/Index.js @@ -29,14 +29,10 @@ const _sfc_main = { chatLTBgImage: config_host.imghost + "/static/image/chat-list-lt-background.png", bodyBackground: config_host.imghost + "/static/image/background.png" }, - user: { - avatar: config_host.imghost + "/static/image/banner.png", - nickname: "清晨的风", - coupons: 221, - id: 88685 - }, isTop: false, - chatList: [] + chatList: [], + status: "loadmore", + page: 1 }; }, mounted() { @@ -44,16 +40,29 @@ const _sfc_main = { }, methods: { chatDetail(item) { - common_vendor.wx$1.navigateTo({ + common_vendor.index.navigateTo({ url: "/pages/ChatDetail/index?id=" + item.id }); }, - getChatList(page = 1) { - api_chat.chatList(page, this.$store.state.userInfo.store_id !== null).then((data) => { - this.chatList = data.data; + getChatList() { + if (this.status === "nomre") { + return false; + } + this.status = "loading"; + api_chat.chatList(this.page, this.$store.state.userInfo.store_id !== null).then((res) => { + this.chatList.push.apply(this.chatList, res.data); + if (res.data.length === 0) { + this.status = "nomore"; + } else { + this.status = "loadmore"; + } + this.page++; }); } }, + onReachBottom() { + this.getChatList(); + }, onPageScroll(res) { if (res.scrollTop <= 20) { common_vendor.index.$emit("isTop", true); @@ -64,6 +73,14 @@ const _sfc_main = { created() { } }; +if (!Array) { + const _easycom_u_loadmore2 = common_vendor.resolveComponent("u-loadmore"); + _easycom_u_loadmore2(); +} +const _easycom_u_loadmore = () => "../../../../uni_modules/uview-plus/components/u-loadmore/u-loadmore.js"; +if (!Math) { + _easycom_u_loadmore(); +} function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) { return { a: "url(" + $data.staticImage.bodyBackground + ")", @@ -77,7 +94,17 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) { }; }), c: "url(" + $data.staticImage.chatLTBgImage + ")", - d: "url(" + $data.staticImage.chatBgImage + ")" + d: "url(" + $data.staticImage.chatBgImage + ")", + e: common_vendor.o(($event) => $options.getChatList()), + f: common_vendor.p({ + status: $data.status, + fontSize: "28", + color: "#ACB4B6", + line: true, + ["line-color"]: "#ACB4B6", + marginBottom: "30", + marginTop: "30" + }) }; } const Component = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__file", "D:/phpstudy_pro/WEB/pet_uni/pages/Index/components/ChatPage/Index.vue"]]); diff --git a/unpackage/dist/dev/mp-weixin/pages/Index/components/ChatPage/Index.json b/unpackage/dist/dev/mp-weixin/pages/Index/components/ChatPage/Index.json index e8cfaaf..8f9337c 100644 --- a/unpackage/dist/dev/mp-weixin/pages/Index/components/ChatPage/Index.json +++ b/unpackage/dist/dev/mp-weixin/pages/Index/components/ChatPage/Index.json @@ -1,4 +1,6 @@ { "component": true, - "usingComponents": {} + "usingComponents": { + "u-loadmore": "../../../../uni_modules/uview-plus/components/u-loadmore/u-loadmore" + } } \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/pages/Index/components/ChatPage/Index.wxml b/unpackage/dist/dev/mp-weixin/pages/Index/components/ChatPage/Index.wxml index c68c4d6..b250c5f 100644 --- a/unpackage/dist/dev/mp-weixin/pages/Index/components/ChatPage/Index.wxml +++ b/unpackage/dist/dev/mp-weixin/pages/Index/components/ChatPage/Index.wxml @@ -1 +1 @@ -{{item.b}}{{item.c}}{{item.d}} — 没有更多内容了 — \ No newline at end of file +{{item.b}}{{item.c}}{{item.d}} \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/pages/Index/components/HomePage/Index.js b/unpackage/dist/dev/mp-weixin/pages/Index/components/HomePage/Index.js index a14fedb..f600b32 100644 --- a/unpackage/dist/dev/mp-weixin/pages/Index/components/HomePage/Index.js +++ b/unpackage/dist/dev/mp-weixin/pages/Index/components/HomePage/Index.js @@ -60,12 +60,12 @@ const _sfc_main = { }, methods: { userCouponsPage() { - common_vendor.wx$1.navigateTo({ + common_vendor.index.navigateTo({ url: "/pages/UserCoupons/index" }); }, navTo(url) { - common_vendor.wx$1.navigateTo({ + common_vendor.index.navigateTo({ url }); }, diff --git a/unpackage/dist/dev/mp-weixin/pages/Index/components/OrderPage/Index.js b/unpackage/dist/dev/mp-weixin/pages/Index/components/OrderPage/Index.js index c76915c..7d21637 100644 --- a/unpackage/dist/dev/mp-weixin/pages/Index/components/OrderPage/Index.js +++ b/unpackage/dist/dev/mp-weixin/pages/Index/components/OrderPage/Index.js @@ -3,7 +3,7 @@ const common_vendor = require("../../../../common/vendor.js"); const config_host = require("../../../../config/host.js"); const utils_functions = require("../../../../utils/functions.js"); const api_order = require("../../../../api/order.js"); -const utils_log = require("../../../../utils/log.js"); +require("../../../../utils/log.js"); require("../../../../utils/qqmap-wx-jssdk.min.js"); require("../../../../utils/request.js"); const HeaderNav = () => "../../../../components/HeaderNav/Index.js"; @@ -21,6 +21,21 @@ const _sfc_main = { return { title: "Hello", loading: true, + screenCheck: 0, + screenMenu: [ + { + name: "全部", + value: "" + }, + { + name: "待服务", + value: "1" + }, + { + name: "已完成", + value: "2" + } + ], staticImage: { screenActiveImg: config_host.imghost + "/static/image/order-screen-active.png", orderCardBackground: config_host.imghost + "/static/image/order-card-background.png", @@ -39,27 +54,19 @@ const _sfc_main = { isTop: false, pagePadding: 100, petImage: config_host.imghost + "/static/image/pet_avatar1.jpeg", - orderCardList: [ - { - title: "成都市武侯区丰德国际4栋...", - tags: ["刷毛", "洗澡"], - do_time: "2023/05/03 15—17时", - create_time: "2023/03/03 15:23:22" - }, - { - title: "成都市武侯区丰德国际4栋...", - tags: ["刷毛", "洗澡"], - do_time: "2023/05/03 15—17时", - create_time: "2023/03/03 15:23:22" - } - ] + orderList: [], + dayActive: 1, + statusActive: 1 }; }, onLoad() { }, methods: { + selectScreen(index) { + this.screenCheck = index; + }, navTo(url) { - common_vendor.wx$1.navigateTo({ + common_vendor.index.navigateTo({ url }); }, @@ -72,8 +79,14 @@ const _sfc_main = { filter.page = page; filter.limit = 10; api_order.getOrderList(filter).then((data) => { - utils_log.log(data); + this.orderList = data.data; }); + }, + dayActiveToggle(daySign) { + this.dayActive = daySign; + }, + statusActiveToggle(statusSign) { + this.statusActive = statusSign; } }, onPageScroll(res) { @@ -96,35 +109,48 @@ if (!Array) { } function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) { return { - a: $data.staticImage.screenActiveImg, + a: common_vendor.f($data.screenMenu, (item, index, i0) => { + return { + a: common_vendor.t(item.name), + b: index === $data.screenCheck ? 1 : "", + c: common_vendor.o(($event) => $options.selectScreen(index)) + }; + }), b: $data.staticImage.screenActiveImg, c: $data.staticImage.screenActiveImg, - d: common_vendor.f($data.orderCardList, (item, k0, i0) => { + d: $data.staticImage.screenActiveImg, + e: common_vendor.f(_ctx.orderCardList, (item, k0, i0) => { return { - a: common_vendor.t(item.title), - b: common_vendor.t(item.do_time), - c: common_vendor.t(item.create_time), - d: "e3c278e4-0-" + i0, - e: "e3c278e4-1-" + i0 + a: common_vendor.t(item.addr), + b: common_vendor.f(item.services, (server, k1, i1) => { + return { + a: common_vendor.t(server) + }; + }), + c: common_vendor.t(item.do_date), + d: common_vendor.t(item.do_time), + e: common_vendor.t(item.create_time), + f: "e3c278e4-0-" + i0, + g: common_vendor.o(($event) => $options.navTo("/pages/ChatDetail/index?id=" + item.id)), + h: "e3c278e4-1-" + i0, + i: common_vendor.o(($event) => $options.navTo("/pages/FeedLog/index?pet_id=" + item.pet_id)) }; }), - e: $data.petImage, - f: common_vendor.p({ + f: $data.petImage, + g: common_vendor.p({ title: "立即沟通", ["font-color"]: "#3E3221", ["button-color"]: "#F7E1C3", ["button-width"]: "255rpx" }), - g: common_vendor.o(($event) => $options.navTo("/pages/ChatDetail/index")), h: common_vendor.p({ title: "喂养档案", ["font-color"]: "#FFFFFF", ["button-color"]: "#4DC3B8", ["button-width"]: "255rpx" }), - i: common_vendor.o(($event) => $options.navTo("/pages/FeedLog/index")), - j: "url(" + $data.staticImage.orderCardBackground + ")", - k: "url(" + $data.staticImage.wallpaperBgImage + ")" + i: "url(" + $data.staticImage.orderCardBackground + ")", + j: "url(" + $data.staticImage.wallpaperBgImage + ")" }; } const Component = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__file", "D:/phpstudy_pro/WEB/pet_uni/pages/Index/components/OrderPage/Index.vue"]]); diff --git a/unpackage/dist/dev/mp-weixin/pages/Index/components/OrderPage/Index.wxml b/unpackage/dist/dev/mp-weixin/pages/Index/components/OrderPage/Index.wxml index c801743..d32a150 100644 --- a/unpackage/dist/dev/mp-weixin/pages/Index/components/OrderPage/Index.wxml +++ b/unpackage/dist/dev/mp-weixin/pages/Index/components/OrderPage/Index.wxml @@ -1 +1 @@ - 全部 待服务 已完成 全部 明天 后天 05/06-08-03 时间 {{item.a}}刷毛洗澡上门：{{item.b}}下单时间：{{item.c}} \ No newline at end of file +{{item.a}} 全部 明天 后天 05/06-08-03 时间 {{item.a}}{{server.a}}上门：{{item.c}} {{item.d}}下单时间：{{item.e}} \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/pages/Index/components/OrderPage/Index.wxss b/unpackage/dist/dev/mp-weixin/pages/Index/components/OrderPage/Index.wxss index 17ea9f7..b787e49 100644 --- a/unpackage/dist/dev/mp-weixin/pages/Index/components/OrderPage/Index.wxss +++ b/unpackage/dist/dev/mp-weixin/pages/Index/components/OrderPage/Index.wxss @@ -61,6 +61,7 @@ line-height: 53rpx; color: #646464; font-weight: 400; + position: relative; } .app-wallpaper .order-screen-container .order-screen.active { color: #000000; @@ -74,6 +75,9 @@ display: none; align-items: center; justify-content: center; + position: absolute; + top: 90rpx; + left: 12rpx; } .app-wallpaper .order-screen-container .order-screen .order-screen-active .img { width: 37rpx; diff --git a/unpackage/dist/dev/mp-weixin/pages/Index/components/UserPage/Index.js b/unpackage/dist/dev/mp-weixin/pages/Index/components/UserPage/Index.js index 6ea8d1e..11a288c 100644 --- a/unpackage/dist/dev/mp-weixin/pages/Index/components/UserPage/Index.js +++ b/unpackage/dist/dev/mp-weixin/pages/Index/components/UserPage/Index.js @@ -67,18 +67,17 @@ const _sfc_main = { }, methods: { navTo(url) { - common_vendor.wx$1.navigateTo({ + common_vendor.index.navigateTo({ url }); }, userDetail() { - common_vendor.wx$1.navigateTo({ + common_vendor.index.navigateTo({ url: "/pages/UserDetail/index" }); }, orderPage() { - this.$store.commit("footCheck", "order"); - this.$store.commit("title", "订单"); + this.$emit("tabNavTo", 1); }, showNumber() { api_user.userExtends().then((data) => { @@ -87,7 +86,7 @@ const _sfc_main = { }); }, userCouponsPage() { - common_vendor.wx$1.navigateTo({ + common_vendor.index.navigateTo({ url: "/pages/UserCoupons/index" }); }, diff --git a/unpackage/dist/dev/mp-weixin/pages/Index/index.js b/unpackage/dist/dev/mp-weixin/pages/Index/index.js index f3df758..5012ff0 100644 --- a/unpackage/dist/dev/mp-weixin/pages/Index/index.js +++ b/unpackage/dist/dev/mp-weixin/pages/Index/index.js @@ -1,9 +1,6 @@ "use strict"; const common_vendor = require("../../common/vendor.js"); -require("../../utils/functions.js"); -require("../../utils/log.js"); -require("../../utils/qqmap-wx-jssdk.min.js"); -require("../../config/host.js"); +const config_host = require("../../config/host.js"); const FooterNav = () => "../../components/FooterNav/Index.js"; const RightNav = () => "../../components/RightNav/Index.js"; const HeaderNav = () => "../../components/HeaderNav/Index.js"; @@ -23,15 +20,48 @@ const _sfc_main = { }, data() { return { + current: 0, footCheck: "home", show: false, title: "标题", - content: "uview-plus的目标是成为uni-app生态最优秀的UI框架" + content: "uview-plus的目标是成为uni-app生态最优秀的UI框架", + footGroup: [ + { + image: config_host.imghost + "/static/image/foot-nav-button-one", + name: "home", + title: "汪汪行天下" + }, + { + image: config_host.imghost + "/static/image/foot-nav-button-two", + name: "order", + title: "订单" + }, + { + image: config_host.imghost + "/static/image/foot-nav-button-three", + name: "chat", + title: "在线沟通" + }, + { + image: config_host.imghost + "/static/image/foot-nav-button-four", + name: "user", + title: "" + } + ], + rightShow: false }; }, - onLoad() { + onLoad(option) { + if (option == null ? void 0 : option.foot_check) { + this.footSelect(option.foot_check); + } }, methods: { + footSelect(index) { + this.current = index; + this.footCheck = this.footGroup[index].name; + this.title = this.footGroup[index].title; + this.rightShow = this.footCheck === "home" || this.footCheck === "user"; + }, userLogin() { common_vendor.index.navigateTo({ url: "/pages/Login/index" @@ -88,30 +118,43 @@ if (!Math) { _easycom_u_modal(); } function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) { - return { + return common_vendor.e({ a: common_vendor.p({ title: $data.title }), - b: $data.footCheck === "home", + b: $data.footCheck === "home" + }, $data.footCheck === "home" ? {} : {}, { c: $data.footCheck === "home" ? 1 : "", - d: $data.footCheck === "order", + d: $data.footCheck === "order" + }, $data.footCheck === "order" ? {} : {}, { e: $data.footCheck === "order" ? 1 : "", - f: $data.footCheck === "chat", + f: $data.footCheck === "chat" + }, $data.footCheck === "chat" ? {} : {}, { g: $data.footCheck === "chat" ? 1 : "", - h: $data.footCheck === "user", - i: $data.footCheck === "user" ? 1 : "", - j: common_vendor.o($options.userLogin), - k: common_vendor.o(($event) => { + h: $data.footCheck === "user" + }, $data.footCheck === "user" ? { + i: common_vendor.o($options.footSelect) + } : {}, { + j: $data.footCheck === "user" ? 1 : "", + k: $data.rightShow + }, $data.rightShow ? {} : {}, { + l: common_vendor.o($options.footSelect), + m: common_vendor.p({ + ["foot-group"]: $data.footGroup, + footCheck: $data.current + }), + n: common_vendor.o($options.userLogin), + o: common_vendor.o(($event) => { this.show = false; }), - l: common_vendor.p({ + p: common_vendor.p({ show: $data.show, title: "登录", content: "当前未登录是否前往登录", closeOnClickOverlay: true, showCancelButton: true }) - }; + }); } const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__file", "D:/phpstudy_pro/WEB/pet_uni/pages/Index/index.vue"]]); _sfc_main.__runtimeHooks = 1; diff --git a/unpackage/dist/dev/mp-weixin/pages/Index/index.wxml b/unpackage/dist/dev/mp-weixin/pages/Index/index.wxml index 5e05aa1..aa86be3 100644 --- a/unpackage/dist/dev/mp-weixin/pages/Index/index.wxml +++ b/unpackage/dist/dev/mp-weixin/pages/Index/index.wxml @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/pages/UserCoupons/index.js b/unpackage/dist/dev/mp-weixin/pages/UserCoupons/index.js index 841d1d2..2b7e267 100644 --- a/unpackage/dist/dev/mp-weixin/pages/UserCoupons/index.js +++ b/unpackage/dist/dev/mp-weixin/pages/UserCoupons/index.js @@ -67,7 +67,7 @@ const _sfc_main = { }, methods: { navTo(url) { - common_vendor.wx$1.navigateTo({ + common_vendor.index.navigateTo({ url }); }, diff --git a/unpackage/dist/dev/mp-weixin/project.private.config.json b/unpackage/dist/dev/mp-weixin/project.private.config.json index 302bae0..8c04abe 100644 --- a/unpackage/dist/dev/mp-weixin/project.private.config.json +++ b/unpackage/dist/dev/mp-weixin/project.private.config.json @@ -4,5 +4,22 @@ "setting": { "compileHotReLoad": true, "urlCheck": false + }, + "condition": { + "miniprogram": { + "list": [ + { + "name": "", + "pathName": "pages/Draw/index", + "query": "", + "launchMode": "default", + "scene": null, + "partialCompile": { + "enabled": true, + "pages": [] + } + } + ] + } } } \ No newline at end of file