YoGo/SFH5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: YoGo:eccd39959cf10823f5dd68adf4dac0960d8c7bdc
Branches Tags
YoGo:main
YoGo:Branch_新手指引
..
compare: YoGo:70f375c3f1764265ddbd9eb6d60fefbe1cc03fba
Branches Tags
YoGo:Branch_新手指引
YoGo:main

No commits in common. "eccd39959cf10823f5dd68adf4dac0960d8c7bdc" and "70f375c3f1764265ddbd9eb6d60fefbe1cc03fba" have entirely different histories.
eccd39959c ... 70f375c3f1

12 changed files with 80 additions and 235 deletions
Show Stats Expand all files Collapse all files

7
App.vue
View File

@ -86,12 +86,7 @@ export default {
this.globalData.statusBarHeight = statusBarHeight || 20;
// #endif
// authCode url 存在 就直接登陆
console.log(window.location.href,"window.location.href")
const authCode = getQueryParam('authCode');
const sfId = getQueryParam('sfId');
if(sfId) {
uni.setStorageSync("sfId", sfId);
}
if(authCode){
let source = window.sf.isSfApp() ? 2 : 1;
getApi.ShunFengLogin({
@ -212,7 +207,7 @@ text {
.uni-tabbar__label {
color: #000;
font-size: 24rpx !important;
margin-top: 4rpx;
margin-top: 12rpx;
}
.uni-tabbar__item.call-phone-item {

2
index.html
View File

@ -12,7 +12,7 @@
<!-- <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, viewport-fit=cover" /> -->
<link rel="icon" href="/favicon.ico" />
<script src="./config.js"></script>
<script src="/client/config.js"></script>
<script src="https://ucmp-static.sf-express.com/assets/sdks/microservice-1.0.4.min.js"></script>
<script>
const sf = new SFUIP.SfMicroservice(window?.config?.ENV??'sit')

2
manifest.json
View File

@ -75,7 +75,7 @@
"vueVersion" : "3",
"h5" : {
"router" : {
"base" : "./"
"base" : "/client/"
},
"devServer" : {
"port" : 8999,

201
pages/index/index.vue
View File

@ -31,19 +31,19 @@
<text class="address font26 fontb textGary">{{ unitTypeData[0]?.sitdAddress }}</text>
</view>
</view>
<view class="unitType card" v-if="unitTypeData.length">
<view class="unitType card">
<view class="title font32 fontb mgb20">
仓型选择
</view>
<view class="swiper" >
<view class="swiper">
<view class="info">
<view class="left arrow">
<view class="arrowIcon" @click="prev" v-if="unitTypeData.length > 1">
<image src="/static/home/jiantouleft.svg" style="width: 64rpx;height: 64rpx;" class="icon"></image>
</view>
</view>
<view class="swiper-container" >
<swiper class="warehouse-detail" circular style="height: 300rpx;" :indicator-dots="false"
<view class="swiper-container">
<swiper class="warehouse-detail" circular style="height: 300rpx;" :indicator-dots="false"
:autoplay="false" @change="changeMove" :current="state.active">
<swiper-item v-for="(item, index) in unitTypeData" :key="index">
<view class="warehouse-detail-items">
@ -52,7 +52,6 @@
</view>
</swiper-item>
</swiper>
</view>
<view class="right arrow">
<view class="arrowIcon" @click="next" v-if="unitTypeData.length > 1">
@ -71,9 +70,6 @@
<view class="font26 fontb textGary">({{ unitTypeData[state.active].description }})</view>
</view>
</view>
<view class="empt font32 fontb" v-if="unitTypeData.length === 0" style="text-align: center;margin-top: 20rpx;">
暂无可用仓型，请选择其他门店～
</view>
<view class="orderInfo sflist card" v-if="unitTypeData.length">
<ul>
<li @click="showUnitPopup">
@ -97,13 +93,7 @@
<view class="left"><text class="font32 fontb">租金</text></view>
<view class="right font26 fontb" :class="{textGary:!state.priceData?.price}"><text>{{ state.priceData?.price ? `￥ ${state.priceData?.price}` :
'--'
}} </text>
</view>
</li>
<li @click="showCalendar">
<view class="left"><text class="font32 fontb">开始时间</text></view>
<view class="right font26 fontb"><text>{{ dayjs(state.startDate).format("YYYY/MM/DD") }}</text>
<image src="/static/home/jiantou.svg" style="width: 24rpx;height: 24rpx;" class="icon"></image>
}} </text>
</view>
</li>
<li @click="goVaild">
@ -135,8 +125,8 @@
<view class="left " >
<text class="price fontb" :class="{ overMaxFont: String(state.priceData?.expense).length>6 }"> {{ state.priceData.expense ? `￥${state.priceData.expense}` : '￥--'
}}</text>
<view class="detail" v-if="state.priceData.expense" @click="showPayPopup"><text class="detail1" :class="{ overMaxFont:String(state.priceData?.expense).length>6 }" v-if="state.priceData?.expense">￥{{ state.priceData.leaseOriginalPrice }}</text><text class="detail2">明细</text>
<image src="/static/home/jiantouup.svg" style="height: 10rpx;margin-left: 10rpx;" mode="heightFix" class="icon"></image>
<view class="detail" v-if="state.priceData.expense" @click="showPayPopup"><text style="margin-right: 10rpx;font-weight: 600;" :class="{ overMaxFont:String(state.priceData?.expense).length>6 }" v-if="state.priceData?.expense">￥{{ state.priceData.leaseOriginalPrice }}</text><text>明细</text>
<image src="/static/home/jiantouup.svg" style="height: 12rpx;margin-left: 10rpx;" mode="heightFix" class="icon"></image>
</view>
</view>
<view class="right">
@ -153,6 +143,10 @@
</view>
</view>
<view class="empt font32 fontb" v-if="unitTypeData.length === 0" style="text-align: center;margin-top: 20rpx;">
暂无可用仓型，请选择其他门店～
</view>
</template>
<template v-else>
<!-- <view style="margin-top: 40vh;" @click="goSite">
@ -354,7 +348,7 @@
<view class="left font28">
<text class="price fontb" :class="{ overMaxFont: String(state.priceData?.expense).length>6 }"> {{ state.priceData.expense ? `￥${state.priceData.expense}` : '--'
}}</text>
<view class="detail" v-if="state.priceData.expense" @click="hidePayPopup"><text class="detail1" :class="{ overMaxFont: String(state.priceData?.expense).length>6 }" v-if="state.priceData?.expense">￥{{ state.priceData.leaseOriginalPrice }}</text><text class="detail2">明细</text>
<view class="detail" v-if="state.priceData.expense" @click="hidePayPopup"><text style="margin-right: 10rpx;font-weight: 600;" :class="{ overMaxFont: String(state.priceData?.expense).length>6 }" v-if="state.priceData?.expense">￥{{ state.priceData.leaseOriginalPrice }}</text><text class="font28">明细</text>
<image src="/static/home/jiantouup.svg" style="height: 12rpx;margin-left: 10rpx;" mode="heightFix" class="icon"></image>
</view>
</view>
@ -428,19 +422,6 @@
</view>
</view>
</uv-popup>
<uv-calendar
:safeAreaInsetBottom="false" :closeOnClickOverlay="false"
ref="calendars"
:minDate="state.minDate"
:date = "state.startDate"
confirmText="确定"
cancelText="取消"
title="开始时间"
:maxDate="state.maxDate"
:showSubtitle="false"
@confirm="calendarConfirm"
color="#FB322E"
/>
</view>
</template>
@ -486,7 +467,6 @@ const openPopupRef = ref(null);
const unitPopupRef = ref(null);
const monthPopupRef = ref(null);
const payPopupRef = ref(null);
const calendars = ref(null);
// 导航栏高度
const navHeight = ref(0);
const language = ref("");
@ -531,31 +511,6 @@ const state = ref({
p: 'margin: 0.8rem 0;',
},
});
const showCalendar = () => {
calendars.value.open();
};
const calendarConfirm = (e) => {
const fullDate = dayjs(e[0]); // 保持 dayjs 对象
if (state.value.zhuangxiuzhong) {
const limitDate = dayjs(state.value.lockData.preSaleTime);
if (fullDate.isBefore(limitDate)) {
uni.showModal({
title: t("common.title"),
content: t("storeRenovationNotice", {
limitDate: limitDate.format("YYYY/MM/DD")
}),
showCancel: false,
});
return;
} else {
state.value.startDate = fullDate.format("YYYY/MM/DD");
}
} else {
state.value.startDate = fullDate.format("YYYY/MM/DD");
}
};
const closePopup = () => {
openPopupRef.value.close();
@ -569,8 +524,6 @@ const callPhone = ()=>{
closePopup();
}
const goOrder = async () => {
if (!state.value.lockerId) {
return uni.showToast({
@ -617,8 +570,7 @@ const goOrder = async () => {
lockerId: state.value.lockerId,
startTime,
month: state.value.month,
source,
sfId: uni.getStorageSync("sfId"),
source
})
.then((res) => {
uni.hideLoading();
@ -859,7 +811,6 @@ const prev = () => {
} else {
state.value.active = unitTypeData.value.length - 1; // 如果是第一张，跳到最后一张
}
state.value.unitTypeId = unitTypeData.value[state.value.active].id;
}
// 切换到下一张
const next = () => {
@ -868,7 +819,6 @@ const next = () => {
} else {
state.value.active = 0; // 如果是最后一张，跳到第一张
}
state.value.unitTypeId = unitTypeData.value[state.value.active].id;
}
onShareAppMessage((res) => {
@ -932,7 +882,7 @@ const getSiteDetail = () => {
district,
}).then(res => {
if (res.code === 200) {
list = mergeFiveGoatStores(res.data.filter(item => !item.isSoldOut && item.city.indexOf("广州") !== -1));
list = mergeFiveGoatStores(res.data);
if (locationState?.latitude && locationState?.longitude) {
const { latitude, longitude } = locationState;
list.forEach(item => {
@ -941,17 +891,13 @@ const getSiteDetail = () => {
item.distanceNumber = number;
});
list.sort((a, b) => a.distanceNumber - b.distanceNumber);
// 优先冼村店
const xiancundian = list.find(item => item.id == "2030892603720994816")
if (list[0]?.id) {
state.value.siteId =xiancundian?xiancundian.id:list[0]?.id
state.value.siteId = list[0]?.id
reset();
getUnitTypeBySiteId();
}
} else {
// 优先冼村店
const xiancundian = list.find(item => item.id == "2030892603720994816")
state.value.siteId = xiancundian?xiancundian.id:list[0]?.id
state.value.siteId = list[0]?.id
reset();
getUnitTypeBySiteId();
}
@ -1177,10 +1123,11 @@ const gotoPage = (url) => {
// tab
const current = ref(0);
const unitTypeData = ref([]);
const tabs = ref([]);
function changeMove(event) {
state.value.active = event.detail.current;
state.value.unitTypeId = unitTypeData.value[state.value.active].id;
current.value = event.detail.current;
state.value.unitTypeId = unitTypeData.value[current.value].id;
}
</script>
@ -1282,60 +1229,32 @@ function changeMove(event) {
color: #FFFFFF;
.left {
color: #E9CBA1;
display: flex;
align-items: center;
font-size: 38rpx;
.price {
color: #E9CBA1;
display: flex;
align-items: center;
font-size: 38rpx;
&::first-letter{
font-size: 30rpx;
.price {
&.overMaxFont{
font-size: 32rpx;
}
}
&.overMaxFont{
font-size: 30rpx;
&::first-letter{
.detail {
display: flex;
align-items: center;
margin-left: 16rpx;
color: #FFFFFF;
font-size: 28rpx;
font-weight: normal;
.overMaxFont{
font-size: 24rpx;
}
image {
margin-left: 10rpx;
transform: rotate(180deg);
}
}
}
}
.detail {
display: flex;
align-items: center;
color: #d0d1d2;
margin-left: 16rpx;
font-size: 28rpx;
font-weight: normal;
// .overMaxFont{
// font-size: 24rpx;
// }
.detail1{
font-size: 28rpx;
}
.detail2{
padding-left: 10rpx;
font-size: 26rpx;
display: flex;
align-items: center;
// border-left:1px solid #4a4d51;
&::before{
content: '';
display: block;
width: 1px;
height: 30rpx;
border-radius: 50%;
background-color: #4a4d51;
margin-right: 10rpx;
}
}
image{
margin-left: 10rpx;
transform: rotate(180deg);
}
}
}
}
.right {
display: flex;
@ -1528,7 +1447,7 @@ function changeMove(event) {
display: flex;
width: 100%;
padding-bottom: 16rpx;
padding-left: 36rpx;
padding-left: 40rpx;
.check-wrap {
pointer-events: none;
@ -1621,51 +1540,21 @@ function changeMove(event) {
align-items: center;
font-size: 38rpx;
.price {
font-size: 38rpx;
&::first-letter{
font-size: 30rpx;
}
&.overMaxFont{
font-size: 30rpx;
&::first-letter{
font-size: 28rpx;
font-weight: normal;
}
font-size: 32rpx;
}
}
.detail {
display: flex;
align-items: center;
color: #d0d1d2;
color: #FFFFFF;
margin-left: 16rpx;
font-size: 28rpx;
font-weight: normal;
// .overMaxFont{
// font-size: 24rpx;
// }
.detail1{
font-size: 28rpx;
}
.detail2{
padding-left: 10rpx;
font-size: 26rpx;
display: flex;
align-items: center;
// border-left:1px solid #4a4d51;
&::before{
content: '';
display: block;
width: 1px;
height: 30rpx;
border-radius: 50%;
background-color: #4a4d51;
margin-right: 10rpx;
}
.overMaxFont{
font-size: 24rpx;
}
image{
margin-left: 10rpx;
transform: rotate(180deg);
}
}
@ -1828,12 +1717,12 @@ function changeMove(event) {
.bottom {
display: flex;
image {
margin-top: 4rpx;
}
.address {
word-wrap: break-word;
word-break: break-all;
flex: 1;
line-height: 32rpx;
}
}
}

7
pages/site/index.vue
View File

@ -122,7 +122,7 @@ onLoad((params) => {
const getCityData = () => {
getApi.GetCityAll().then(res => {
if(res.code === 200) {
state.value.cityData = res.data.filter(item=>item.indexOf("广州") !== -1);
state.value.cityData = res.data;
state.value.cityData.unshift("全部");
// 首次直接选择全部
state.value.city = state.value.cityData[0];
@ -161,7 +161,7 @@ const getCityData = () => {
district,
}).then(res => {
if (res.code === 200) {
siteData.list = mergeFiveGoatStores(res.data.filter(item => !item.isSoldOut && item.city.indexOf("广州") !== -1));
siteData.list = mergeFiveGoatStores(res.data);
if (locationState?.latitude && locationState?.longitude) {
const { latitude, longitude } = locationState;
siteData.list.forEach(item => {
@ -205,9 +205,6 @@ onShow(() => {
height: 100vh;
padding-bottom: 100rpx;
position: relative;
.content{
padding-bottom: 200rpx;
}
}
.selectSite {

12
pages/unlock/index.vue
View File

@ -1,6 +1,6 @@
<template>
<view class="header">
<uv-tabs @change="handleChange" :current="state.current" :activeStyle="{fontWeight:600,color: '#000000',fontSize: '32rpx'}" :inactiveStyle="{ color: '#000000',fontSize: '32rpx' }" lineWidth="80rpx" lineHeight="6rpx"
<uv-tabs @change="handleChange" :current="state.current" :activeStyle="{fontWeight:600}" lineWidth="80rpx" lineHeight="6rpx"
lineColor="#FF1E2E" :scrollable="false" :list="list">
</uv-tabs>
</view>
@ -99,14 +99,14 @@
</view>
<view class="empt font32 fontb"
style="text-align: center;position: absolute; top: 50%;left: 50%;transform: translate(-50%, -50%);"
v-if="currentOrderList.length === 0">
v-if="state.orderList.length === 0">
暂无订单
</view>
<view class="footer">
<myCustomtTabBar direction="horizontal" :show-icon="true" :selected="1" @onTabItemTap="onTabItemTap">
</myCustomtTabBar>
</view>
<uv-popup ref="detailPopupRef" zIndex="999" round="24px" :safeAreaInsetBottom="false">
<uv-popup ref="detailPopupRef" zIndex="999" round="24px">
<view class="popupBox popupBoxW710">
<view class="orderList">
<view class="orderInfo">
@ -354,7 +354,7 @@
state.priceData.expense ? `￥${state.priceData.expense}`
: '--' }}</text>
<view class="detail" v-if="state.priceData.expense" @click="hidePayPopup"><text
class="detail1"
style="margin-right: 10rpx;font-weight: 600;"
:class="{ overMaxFont: String(state.priceData?.expense).length > 6 }"
v-if="state.priceData?.expense">￥{{ state.priceData.leaseOriginalPrice }}</text>
<!-- <text
@ -1363,7 +1363,7 @@ onShow(() => {
border-radius: 999rpx;
display: flex;
justify-content: space-between;
// align-items: center;
align-items: center;
background-color: #0D1118;
color: #FFFFFF;
@ -1383,7 +1383,7 @@ onShow(() => {
display: flex;
align-items: center;
margin-left: 20rpx;
color: #d0d1d2;
color: #FFFFFF;
font-size: 28rpx;
.overMaxFont {

7
pagesb/validationInfo/index.vue
View File

@ -17,7 +17,7 @@
<uv-input placeholder="请选择" placeholderStyle="font-weight: 600;font-size: 28rpx;color:#A8AAAC;" v-model="state.cardTypeText" disabled disabledColor="#ffffff"
border="none"></uv-input>
<template #right>
<image src="/static/home/jiantou.svg" style="width: 22rpx;height: 24rpx;" class="icon"></image>
<image src="/static/home/jiantou.svg" style="width: 44rpx;height: 24rpx;" class="icon"></image>
</template>
</uv-form-item>
@ -512,7 +512,7 @@ const updateAuthInfo = () => {
state.showAuthModal = true;
if (res.data && requestData.type !== 2) {
if (pages.length >= 2) {
if (pages[pages.length - 2].route == 'pages/index/index') {
if (pages[pages.length - 2].route == 'pages/setOrder/index') {
navigateBack()
return
}
@ -564,8 +564,7 @@ const updateAuthInfo = () => {
}
:deep(.uv-form-item__body) {
padding: 20rpx 0;
padding: 20rpx;
}
.ImgUpload{
// margin-left: auto; /* 左边自动占满 → 右对齐 */

21
uni_modules/uv-calendar/components/uv-calendar/header.vue
View File

@ -1,5 +1,5 @@
<template>
<view class="uv-calendar-header uv-border-bottom" style="padding: 20rpx;">
<view class="uv-calendar-header uv-border-bottom">
<text
class="uv-calendar-header__title"
v-if="showTitle"
@ -9,13 +9,13 @@
v-if="showSubtitle"
>{{ subtitle }}</text>
<view class="uv-calendar-header__weekdays">
<text class="uv-calendar-header__weekdays__weekday">一</text>
<text class="uv-calendar-header__weekdays__weekday">二</text>
<text class="uv-calendar-header__weekdays__weekday">三</text>
<text class="uv-calendar-header__weekdays__weekday">四</text>
<text class="uv-calendar-header__weekdays__weekday">五</text>
<text class="uv-calendar-header__weekdays__weekday">六</text>
<text class="uv-calendar-header__weekdays__weekday">日</text>
<text class="uv-calendar-header__weekdays__weekday">Sun</text>
<text class="uv-calendar-header__weekdays__weekday">Mon</text>
<text class="uv-calendar-header__weekdays__weekday">Tue</text>
<text class="uv-calendar-header__weekdays__weekday">Wed</text>
<text class="uv-calendar-header__weekdays__weekday">Thu</text>
<text class="uv-calendar-header__weekdays__weekday">Fri</text>
<text class="uv-calendar-header__weekdays__weekday">Sat</text>
</view>
</view>
</template>
@ -71,9 +71,9 @@
padding-bottom: 4px;
&__title {
font-size: 36rpx;
font-weight: bold;
font-size: 16px;
color: $uv-main-color;
text-align: center;
height: 42px;
line-height: 42px;
font-weight: bold;
@ -91,7 +91,6 @@
&__weekdays {
@include flex;
justify-content: space-between;
font-weight: 600;
&__weekday {
font-size: 13px;

6
uni_modules/uv-calendar/components/uv-calendar/month.vue
View File

@ -481,12 +481,11 @@
.uv-calendar-month {
&__title {
font-size: 28rpx;
font-size: 14px;
line-height: 42px;
height: 42px;
color: $uv-main-color;
// text-align: center;
padding-left: 20rpx;
text-align: center;
font-weight: bold;
}
@ -494,7 +493,6 @@
position: relative;
@include flex;
flex-wrap: wrap;
font-weight: 600;
&__month-mark-wrapper {
position: absolute;

18
uni_modules/uv-calendar/components/uv-calendar/uv-calendar.vue
View File

@ -3,9 +3,9 @@
ref="calendarPopup"
mode="bottom"
closeable
:round="round"
:closeOnClickOverlay="closeOnClickOverlay"
@change="popupChange"
width="750rpx" zIndex="999" round="24px"
>
<view class="uv-calendar">
<uvHeader
@ -20,8 +20,6 @@
@scroll="onScroll"
:scroll-top="scrollTop"
:scrollIntoView="scrollIntoView"
style="background-color: #F8F9FB;box-sizing: border-box;padding: 0 20rpx;"
>
<uvMonth
:color="color"
@ -52,12 +50,6 @@
<uv-button
shape="circle"
:text="buttonDisabled ? confirmDisabledText : confirmText"
:customStyle="{
height: '86rpx',
color: '#fff',
fontSize: '32rpx',
width: '500rpx',
}"
:color="color"
@click="confirm"
:disabled="buttonDisabled"
@ -390,15 +382,9 @@ export default {
</script>
<style lang="scss" scoped>
::deep(.uv-popup__content){
border-radius: 24rpx;
}
.uv-calendar {
&__confirm {
display: flex;
justify-content: center;
padding:20rpx;
padding-bottom: 40rpx;
padding: 7px 18px;
}
}
</style>

6
uni_modules/uv-popup/components/uv-popup/uv-popup.vue
View File

@ -45,8 +45,8 @@
>
<uv-icon
name="close"
color="#000000"
size="32rpx"
color="#909399"
size="18"
bold
></uv-icon>
</view>
@ -499,7 +499,7 @@
}
&__close {
position: absolute;
margin-top: 12rpx;
&--hover {
opacity: 0.4;
}

26
utils/common.js
View File

@ -261,17 +261,10 @@ export const parseUrlParams = (url) => {
// 顺丰参数
export const shunfenLogin = async (code) => {
// 授权参数（请根据实际情况修改）reserved 传原参
let successUrl = window?.config?.BACK_URL ?? "https://uat.kingkongcang.com/client/"
// 如果顺丰员工Id 存在 就把sfId 传过去 怕授权的时候url参数丢失
const sfId = uni.getStorageSync("sfId");
if(sfId){
successUrl = successUrl+"?sfId="+sfId
}
console.log(successUrl,"successUrl")
const authOptions = {
const authOptions = {
appId: window?.config?.SF_APP_ID ??"202603041358374970", // 第三方接入ID
scope: ["sf_userinfo", "sf_mobile", "sf_base", "sf_emp", "sf_channelId"],
successUrl, // 当前页面地址
successUrl: window?.config?.BACK_URL ?? "https://uat.kingkongcang.com/client/", // 当前页面地址
};
window.sf.getAuthCode({
...authOptions,
@ -314,17 +307,6 @@ export const shunfenLogin = async (code) => {
}
// 获取url 参数
export const getQueryParam = (name, url = window.location.href) => {
const u = new URL(url)
// 优先从正常 query 取
let params = new URLSearchParams(u.search)
let value = params.get(name)
if (value) return value
// 再从 hash 取
const hash = u.hash.split('?')[1]
if (!hash) return null
params = new URLSearchParams(hash)
return params.get(name)
const params = new URL(url).searchParams;
return params.get(name);
}