diff --git a/.env b/.env index 6294f13..5984ec7 100644 --- a/.env +++ b/.env @@ -2,12 +2,13 @@ SHOPRO_VERSION = v1.8.3 # 后端接口 - 正式环境（通过 process.env.NODE_ENV 非 development） -SHOPRO_BASE_URL = https://www.zzpower.net + SHOPRO_BASE_URL = https://www.zzpower.net +# SHOPRO_BASE_URL = http://192.168.2.14:48080 # 后端接口 - 测试环境（通过 process.env.NODE_ENV = development） -# SHOPRO_DEV_BASE_URL = http://192.168.2.12:48080 + SHOPRO_DEV_BASE_URL = http://192.168.2.14:48080 # SHOPRO_DEV_BASE_URL = http://2a2b9f7b.r11.cpolar.top - SHOPRO_DEV_BASE_URL = https://www.zzpower.net +# SHOPRO_DEV_BASE_URL = https://www.zzpower.net # 后端接口前缀（一般不建议调整） SHOPRO_API_PATH = /app-api diff --git a/common/config/config.js b/common/config/config.js index b9057e1..a38f73f 100644 --- a/common/config/config.js +++ b/common/config/config.js @@ -5,8 +5,8 @@ const appname = "换电商用车"; const profiles = { dev: { - baseURL: "https://www.zzpower.net/", - // baseURL: "http://192.168.2.12:48080/", + // baseURL: "https://www.zzpower.net/", + baseURL: "http://192.168.2.14:48080/", // baseURL: "http://2a2b9f7b.r11.cpolar.top/", api_miniapp: "service-miniapp/", api_baseinfo: "service-baseinfo/", @@ -14,6 +14,7 @@ const profiles = { }, //服务器生产环境地址 prod: { + // baseURL: "http://192.168.2.14:48080/", baseURL: "https://www.zzpower.net/", api_miniapp: "service-miniapp/", api_baseinfo: "service-baseinfo/", @@ -30,24 +31,6 @@ const profiles = { style:0, }, - // - qinou: { - baseURL: "https://www.zzpower.net/", - api_miniapp: "service-miniapp/", - api_baseinfo: "service-baseinfo/", - api_pay: "service-pay/", - appIcon: "", - facilitator: '', - address: '', - powerProtocol: '', - iPhone: '17757285870', - email: '', - api_recognition:'service-openapi/', - api_userinfo: "service-userinfo/", - mqtt:'', - style:1, - }, - }; // 服务器域名 diff --git a/common/request/request.js b/common/request/request.js index 132347f..19011f6 100644 --- a/common/request/request.js +++ b/common/request/request.js @@ -27,9 +27,12 @@ const request = (options) => { uni.removeStorageSync("teamId"); uni.removeStorageSync("realNameAuthFlag"); uni.removeStorageSync("version"); - uni.navigateBack({ - delta: 1 - }); + // uni.navigateBack({ + // delta: 1 + // }); + uni.reLaunch({ + url: '/pagesCenter/login/enter' + }) } }); diff --git a/components/piaoyi-text-animate3/piaoyi-text-animate3.vue b/components/piaoyi-text-animate3/piaoyi-text-animate3.vue new file mode 100644 index 0000000..729eee9 --- /dev/null +++ b/components/piaoyi-text-animate3/piaoyi-text-animate3.vue @@ -0,0 +1,166 @@ + + + + + diff --git a/components/search-destination/search-destination.vue b/components/search-destination/search-destination.vue index c795b81..4388357 100644 --- a/components/search-destination/search-destination.vue +++ b/components/search-destination/search-destination.vue @@ -47,6 +47,41 @@ + + + + + + + 导航 + + + + + + + 营业中 + + {{searchStationName}} + + + + + {{searchAreaName}} + + + {{searchDistance == null? '--': searchDistance.toFixed(2) }}km + + + + + 查询详情 + + + + + + @@ -74,7 +109,7 @@ }) const popup_mean = ref(null) - + const bottom_popup = ref(false) const bdlongitude = ref() const bdlatitude = ref() const stationName = ref() @@ -87,7 +122,7 @@ const searchStationName = ref() const searchAreaName = ref() - const searchDistance = ref() + const searchDistance = ref(null) const showPoints = reactive({ pointList: [] @@ -131,6 +166,10 @@ } + const handle_close_popup = () => { + bottom_popup.value.close() + } + const handle_maps_now = async () => { let data = { latitude: latitude.value, @@ -318,8 +357,8 @@ searchDistance.value = showInf[0].distance searchNo.value = showInf[0].stationNo searchID.value = showInf[0].id - // popup_mean.value.open('bottom') - showToast.value = !showToast.value + bottom_popup.value.open('bottom') + // showToast.value = !showToast.value } const handle_open = (showInf) => { @@ -410,4 +449,27 @@ .scrollView { height: calc(100vh - 100rpx); } + + .line_tops { + width: 20%; + height: 10rpx; + margin: 20rpx auto; + background: #e5e5e5; + border-radius: 5rpx; + } + + .position_right_tops { + width: 100rpx; + height: 100rpx; + background: #2bbd69; + border-radius: 50%; + position: absolute; + right: 20rpx; + top: 10rpx; + color: #fff; + display: flex; + flex-direction: column; + justify-content: space-evenly; + align-items: center; + } \ No newline at end of file diff --git a/package.json b/package.json index 0fb2495..a4c4cd6 100644 --- a/package.json +++ b/package.json @@ -1,21 +1,18 @@ { - "id": "zw-tabbar", - "displayName": "zw-tabbar自定义tabbar", - "version": "1.1", - "description": "由于原生Tabbar不支持中间凸起显示大图标和灵活的自定义，所以弄了个通用组件方便使用。", + "id": "piaoyi-text-animate3", + "name": "动画特效-华为充电动画", + "displayName": "动画特效-华为充电动画", + "version": "1.0.0", + "description": "动画特效-华为充电动画，全端兼容，动图是压缩过的所以看起来模糊，实际效果是正常的", "keywords": [ - "tabbar", - "底部选项卡", - "底部菜单" + "动画特效", + "华为充电动画", + "全端兼容" ], "dcloudext": { "category": [ "前端组件", "通用组件" ] - }, - "name": "zw-tabbar自定义tabbar", - "scripts": { - "dev:mp-weixin": "pnpm run dev -- --miniprogram mp-weixin" } } \ No newline at end of file diff --git a/pages.json b/pages.json index c7ce654..f9ee339 100644 --- a/pages.json +++ b/pages.json @@ -31,8 +31,9 @@ { "path": "pages/userCenter/userCenter", "style": { - "navigationBarTitleText": "个人中心", - "navigationBarBackgroundColor": "#E4EFFF" + "navigationBarTitleText": "", + "navigationBarBackgroundColor": "#2cc06c", + "navigationBarTextStyle": "white" } }, { @@ -129,6 +130,14 @@ "enablePullDownRefresh": false } + }, + { + "path": "pages/order/chargorder/detailInf/detail", + "style": { + "navigationBarTitleText": "充电单详情", + "enablePullDownRefresh": false + } + }, { @@ -282,14 +291,15 @@ "backgroundColor": "#ffffff", "color": "#999999", "selectedColor": "#2a82e4", - "list": [{ + "list": [ + { "pagePath": "pages/index/index", "text": "首页", "iconPath": "static/tabbar/home.png", "selectedIconPath": "static/tabbar/home_hl.png" }, { - "pagePath": "pages/userCenter/userCenter", + "pagePath": "pages/userCenter/about/about", "text": "个人中心", "iconPath": "static/tabbar/me.png", "selectedIconPath": "static/tabbar/me_hl.png" diff --git a/pages/index/index.scss b/pages/index/index.scss new file mode 100644 index 0000000..c16a9c2 --- /dev/null +++ b/pages/index/index.scss @@ -0,0 +1,392 @@ +.mainBg { + width: 100vw; + position: fixed; + top: 0; + height: 100vh; + background: linear-gradient(180deg, #4C91FF 0%, #3698FD 11.35%, #73CBFD 21.65%, #94EBFF 37.35%, #EAF4F8 97.71%); + z-index: -1; + } + + .change_version { + display: flex; + align-items: center; + color: #000; + } + + .tab_headers { + line-height: 80rpx; + width: 100%; + text-align: center; + color: #fff; + font-size: 14px; + font-weight: 600; + } + + .topNav { + position: absolute; + top: 180rpx; + left: 50%; + transform: translateX(-50%); + z-index: 999; + background: #fff; + width: 90%; + display: flex; + align-items: center; + border-radius: 15rpx; + } + .notice_position { + // width: 100%; + position: absolute; + top: 280rpx; + left: 50%; + transform: translateX(-50%); + z-index: 999; + width: 90%; + } + + .posi_imgs { + position: absolute; + // background: #fff; + // padding: 5rpx; + right: 30rpx; + bottom: -10rpx; + z-index: 999; + } + + .cu-bar { + color: #fff; + + .search-form { + // width: 300rpx; + background-color: #E2E2E2; + margin: unset; + } + + .searchPoint { + // width: 500rpx; + height: 36rpx; + } + } + + .tabList { + .stateStyle { + padding: 8rpx 16rpx; + color: #808A96; + background-color: #E2E2E2; + margin-left: 16rpx; + font-size: 28rpx; + } + } + + + + + .titleName { + color: #333333; + font-weight: 400; + font-size: 36rpx; + // letter-spacing: 1px; + } + + .addressInf { + width: 442rpx; + color: #666666; + font-size: 28rpx; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; + // margin:16rpx 0 0rpx 0; + } + + .listInf { + width: 490rpx; + flex-direction: column; + justify-content: space-between; + height: 178rpx; + } + + .mapBtn { + height: 178rpx; + align-items: flex-end; + // background-color: greenyellow; + } + + .goMap { + width: 24rpx; + height: 24rpx; + background: url('/static/home/goMap.svg') no-repeat; + background-size: 100% 100%; + } + + .moreLocal { + margin-left: 10rpx; + } + + .regionName { + letter-spacing: 3rpx; + } + + .stateImg { + width: 164rpx; + height: 164rpx; + background-color: #eee; + border-radius: 8rpx; + + .titleImg { + border-radius: 8rpx; + } + } + + + .searchImg { + width: 72rpx; + height: 72rpx; + background: url('../../static/home/search.svg') no-repeat; + background-size: 100% 100%; + } + + .chargeImg { + width: 72rpx; + height: 72rpx; + background: url('../../static/home/pay.svg') no-repeat; + background-size: 100% 100%; + } + + .subscribeImg { + width: 72rpx; + height: 72rpx; + background: url('../../static/home/subscribe.svg') no-repeat; + background-size: 100% 100%; + position: relative; + + .cu-tag { + background-color: #F2634F; + font-size: 24rpx; + font-weight: 400; + } + + .cu-tag.badge { + border: 1px solid #fff; + right: -17rpx; + height: 34rpx; + } + + } + + .wrap { + width: 100%; + } + + + .stateFlex { + flex: 1; + display: flex; + flex-direction: column; + justify-content: space-between; + margin-left: 16rpx; + } + + .cu-card>.cu-item { + margin: 0 32rpx 16rpx 32rpx; + } + + .stateImg .cu-tag.badge { + width: 100rpx; + height: 40rpx; + top: 0rpx; + left: 0rpx; + right: 90rpx; + padding: 8rpx 0rpx; + background-image: linear-gradient(to right bottom, #A5C7FF, #2690FB); + border-radius: 4px; + font-size: 24rpx; + text-align: center; + } + + .bg-blue { + background-image: linear-gradient(to right bottom, #A5C7FF, #2690FB); + } + + .stateImg .cu-tag .bgPlane { + padding: 0rpx 8rpx; + background: rgba(255, 255, 255, 0); + } + + .column { + display: flex; + flex-direction: column; + } + + .card-nav { + padding: 32rpx; + + .navStyle { + border-radius: 16rpx; + } + } + + .swiperCard { + margin: 16rpx 32rpx 0rpx 32rpx; + position: relative; + + + } + + .cu-bar .search-form { + background-color: #fff; + } + + .cu-card .cu-item, + .radius { + border-radius: 16rpx; + } + + .none-box { + width: 100vw; + display: flex; + justify-content: center; + + .image-none { + width: 320rpx; + height: 452rpx; + } + } + + .battery-num { + width: 20rpx; + height: 32rpx; + } + + .bat-use { + font-size: 32rpx; + font-weight: 400; + letter-spacing: 1px; + color: #333333; + margin-left: 16rpx; + line-height: 28rpx; + } + + .bat-total { + font-size: 28rpx; + font-weight: 400; + letter-spacing: 1px; + color: #333333; + line-height: 26rpx; + } + + .card-box { + padding: 32rpx; + box-shadow: -2px 2px 8px 0px #7AA7D026; + + } + + .planeIcon { + width: 32rpx; + height: 32rpx; + margin-right: 12rpx; + } + + .planeNum { + font-size: 28rpx; + line-height: 28rpx; + font-weight: 400; + color: #4C91FF; + + } + + .panel { + padding: 32rpx; + } + + .notification { + margin-top: 16rpx; + + ::v-deep .u-notice-bar { + border-radius: 16rpx; + } + + ::v-deep .u-icon text { + color: #808080 !important; + } + } + + .section { + // height: 100%; + } + + .map_content { + position: relative; + + .marker_map { + height: 100vh; + } + } + + .circle { + width: 80rpx; + height: 80rpx; + border-radius: 40rpx; + // background-image: url("https://picsum.photos/40/40"); + background-size: 100% 100%; + margin: 10rpx 20rpx; + } + + .scan_views { + width: 100%; + position: absolute; + bottom: 100rpx; + left: 0; + display: flex; + justify-content: center; + align-items: center; + + .left_cicle, + .right_cicle { + width: 70rpx; + height: 70rpx; + border-radius: 50%; + background-color: #fff; + margin: 0 30rpx; + } + + .scan_btns { + color: #fff; + font-size: 14px; + width: 240rpx; + line-height: 80rpx; + border-radius: 40rpx; + text-align: center; + background: linear-gradient(to right, #38d07a, #24b35f); + } + } + + .public_flex { + display: flex; + align-items: center; + justify-content: center; + } + + .position_right_order { + position: absolute; + top: 360rpx; + right: 5%; + width: 80rpx; + // height: 400rpx; + padding: 20rpx 0; + background: #fff; + border-radius: 10rpx; + z-index: 999; + display: flex; + flex-direction: column; + font-size: 12px; + justify-content: space-evenly; + align-items: center; + + >view { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + margin: 15rpx 0; + } + } \ No newline at end of file diff --git a/pages/index/index.vue b/pages/index/index.vue index b4eae84..b02e1ee 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -1,70 +1,62 @@