diff --git a/App.vue b/App.vue index f19e471..8ed9f82 100644 --- a/App.vue +++ b/App.vue @@ -38,11 +38,11 @@ const updateManagerFn = () => { const listenNetworkChange = () => { uni.onNetworkStatusChange((res) => { if (res.isConnected) { - uni.showToast({ - title: "网络已连接", - icon: "none", - duration: 3000, - }); + // uni.showToast({ + // title: "网络已连接", + // icon: "none", + // duration: 3000, + // }); } else { uni.showToast({ title: "当前无网络连接", @@ -171,6 +171,13 @@ page { // } } +:deep(.uv-radio__icon-wrap){ + border-width: 5rpx!important; +} + +.uni-tabbar{ + display: none; +} view, text { diff --git a/README.md b/README.md index dc08500..3fae995 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,4 @@ # Introduction -uniapp 金刚跟顺丰的微服务H5 \ No newline at end of file +uniapp 金刚跟顺丰的微服务H5 + +通过点击顺丰软件的微应用，跳转到该H5页面 \ No newline at end of file diff --git a/components/myCustomtTabBar.vue b/components/myCustomtTabBar.vue index cd1652b..ced8c99 100644 --- a/components/myCustomtTabBar.vue +++ b/components/myCustomtTabBar.vue @@ -1,20 +1,111 @@ @@ -135,6 +139,19 @@ const afterRead = async (event) => { diff --git a/components/uv-pickerself/package.json b/components/uv-pickerself/package.json new file mode 100644 index 0000000..0d62d7e --- /dev/null +++ b/components/uv-pickerself/package.json @@ -0,0 +1,90 @@ +{ + "id": "uv-picker", + "displayName": "uv-picker 选择器 全面兼容vue3+2、app、h5、小程序等多端", + "version": "1.0.14", + "description": "uv-picker 此选择器用于单列，多列，多列联动的选择场景...", + "keywords": [ + "uv-picker", + "uvui", + "uv-ui", + "picker", + "联动选择" +], + "repository": "", + "engines": { + "HBuilderX": "^3.1.0" + }, + "dcloudext": { + "type": "component-vue", + "sale": { + "regular": { + "price": "0.00" + }, + "sourcecode": { + "price": "0.00" + } + }, + "contact": { + "qq": "" + }, + "declaration": { + "ads": "无", + "data": "插件不采集任何数据", + "permissions": "无" + }, + "npmurl": "" + }, + "uni_modules": { + "dependencies": [ + "uv-ui-tools", + "uv-popup", + "uv-loading-icon", + "uv-toolbar" + ], + "encrypt": [], + "platforms": { + "cloud": { + "tcb": "y", + "aliyun": "y" + }, + "client": { + "Vue": { + "vue2": "y", + "vue3": "y" + }, + "App": { + "app-vue": "y", + "app-nvue": "y" + }, + "H5-mobile": { + "Safari": "y", + "Android Browser": "y", + "微信浏览器(Android)": "y", + "QQ浏览器(Android)": "y" + }, + "H5-pc": { + "Chrome": "y", + "IE": "y", + "Edge": "y", + "Firefox": "y", + "Safari": "y" + }, + "小程序": { + "微信": "y", + "阿里": "y", + "百度": "y", + "字节跳动": "y", + "QQ": "y", + "钉钉": "u", + "快手": "u", + "飞书": "u", + "京东": "u" + }, + "快应用": { + "华为": "u", + "联盟": "u" + } + } + } + } +} \ No newline at end of file diff --git a/components/uv-pickerself/readme.md b/components/uv-pickerself/readme.md new file mode 100644 index 0000000..c9dd0b9 --- /dev/null +++ b/components/uv-pickerself/readme.md @@ -0,0 +1,21 @@ +## Picker 选择器 + +> **组件名：uv-picker** + +此选择器用于单列，多列，多列联动的选择场景。 + +`uv-datetime-picker`等组件也用到了该组件，功能完善，需要特别注意的是`columns`参数的形式是数组嵌套。 + +# 查看文档 + +## [下载完整示例项目](https://ext.dcloud.net.cn/plugin?name=uv-ui) （请不要 下载插件ZIP） + +### [更多插件，请关注uv-ui组件库](https://ext.dcloud.net.cn/plugin?name=uv-ui) + + + +![image](https://mp-a667b617-c5f1-4a2d-9a54-683a67cff588.cdn.bspapp.com/uv-ui/banner.png) + + + +#### 如使用过程中有任何问题反馈，或者您对uv-ui有一些好的建议，欢迎加入uv-ui官方交流群：官方QQ群 \ No newline at end of file diff --git a/index.html b/index.html index 3d17cb5..31d5acc 100644 --- a/index.html +++ b/index.html @@ -77,7 +77,7 @@ // checkAndRedirect(); // }); - 金刚迷你仓 + 城市迷你仓 diff --git a/locale/zh-Hans.json b/locale/zh-Hans.json index 597f8ec..28cf464 100644 --- a/locale/zh-Hans.json +++ b/locale/zh-Hans.json @@ -206,8 +206,8 @@ "detail.viewQuotation": "查看报价单", "detail.quotationFail": "生成报价单失败", "detail.quotationSuccess": "请手动保存或转发报价单", - "detail.scrollRead": "請在同意前閱讀所有條款", - "detail.agreeTerm": "同意條款", + "detail.scrollRead": "请在同意前阅读所有条款", + "detail.agreeTerm": "同意条款", "detail.points": "积分", "detail.PointsRedemption": "积分抵扣", "detail.AvailablePoints": "可用积分", diff --git a/manifest.json b/manifest.json index 6219641..db8a58d 100644 --- a/manifest.json +++ b/manifest.json @@ -1,5 +1,5 @@ { - "name" : "金刚迷你仓", + "name" : "城市迷你仓", "appid" : "__UNI__FB6F2F3", "description" : "", "versionName" : "1.0.0", diff --git a/package.json b/package.json index 8557776..1e0d5dc 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { - "name": "金刚迷你仓", + "name": "城市迷你仓", "version": "1.0.0", - "description": "金刚迷你仓", + "description": "城市迷你仓", "main": "main.js", "scripts": { "test": "echo \"Error: no test specified\" && exit 1" diff --git a/pages.json b/pages.json index c82a454..950601d 100644 --- a/pages.json +++ b/pages.json @@ -49,7 +49,7 @@ { "path": "validationInfo/index", "style": { - "navigationBarTitleText": "实名验证" + "navigationBarTitleText": "城市迷你仓" } }, { @@ -80,7 +80,7 @@ { "path": "pages/index/index", "style": { - "navigationBarTitleText": "首页", + "navigationBarTitleText": "城市迷你仓", "mp-weixin": { "usingComponents": { "player-component": "plugin://player/video" @@ -128,13 +128,13 @@ { "path": "pages/unlock/index", "style": { - "navigationBarTitleText": "订单" + "navigationBarTitleText": "城市迷你仓" } }, { "path": "pages/personal/index", "style": { - "navigationBarTitleText": "我的" + "navigationBarTitleText": "城市迷你仓" } }, { diff --git a/pages/index/index.vue b/pages/index/index.vue index b3efcad..abf3938 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -7,8 +7,7 @@ {{ unitTypeData[0]?.city }}·{{ unitTypeData[0]?.district }} - 更多分店 - + 更多分店 @@ -65,10 +93,24 @@ const couponRef = ref(); const getRecommendApi = useRecommend(); const getAuthApi = authInfoApi(); const { t } = useI18n(); +const openPopupRef = ref(); + +const closePopup = () => { + openPopupRef.value.close(); +} +const openPopup = () => { + openPopupRef.value.open(); +} + onShow(() => { uni.hideTabBar(); }) +const callPhone = ()=>{ + window.location.href = `tel:${projectInfo.callPhone}`; + closePopup(); +} + const goVaild = () => { navigateTo('/pagesb/validationInfo/index'); } @@ -79,6 +121,70 @@ const goOrder = () => { diff --git a/pagesb/validationInfo/index.vue b/pagesb/validationInfo/index.vue index 64702a6..a6d025f 100644 --- a/pagesb/validationInfo/index.vue +++ b/pagesb/validationInfo/index.vue @@ -9,28 +9,28 @@ - + - - + - + - + - + @@ -71,18 +71,18 @@ - + - + - - + + @@ -90,11 +90,11 @@ - + {{ $t("verification.vailFail") }} - {{ $t("verification.vailSuccess") }} @@ -117,15 +117,17 @@ 返回主页 - + + 返回订单 + - + @@ -146,6 +148,7 @@ const { themeInfo, storeState,getUserInfo } = useMainStore(); import { useI18n } from 'vue-i18n'; import { useLoginApi } from "@/Apis/login.js"; import { authInfoApi } from "@/Apis/validInfo.js"; +import { navigateTo } from '@/utils/navigateTo'; import dayjs from 'dayjs'; const { t } = useI18n(); const app = getApp(); @@ -155,6 +158,10 @@ const getAuthApi = authInfoApi(); const agree = ref(true) +const goOrder = () => { + navigateTo('/pages/unlock/index'); +} + const typePickerRef = ref(); const canGetCode = ref(); @@ -412,7 +419,7 @@ const verifyPerson = () => { state.showAuthModal = true; if (res.data && pages.length >= 2) { - if (pages[pages.length - 2].route == 'pages/setOrder/index') { + if (pages[pages.length - 2].route == 'pages/index/index') { navigateBack() return } @@ -518,6 +525,12 @@ const updateAuthInfo = () => {