From 2e3ab7fbbb336cf11ed37b8b0a7871976d597564 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期三, 22 四月 2026 20:06:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
small-program/App.vue | 131 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 127 insertions(+), 4 deletions(-)
diff --git a/small-program/App.vue b/small-program/App.vue
index 9e4c240..4735960 100644
--- a/small-program/App.vue
+++ b/small-program/App.vue
@@ -61,7 +61,7 @@
isHighAccuracy: true,
success: function (addr) {
const locParam = { latitude: addr.latitude, longitude: addr.longitude };
- uni.setStorageSync('address', locParam);
+ // uni.setStorageSync('address', locParam);
var address = null
var myAmapFun = new amapFile.AMapWX({ key: 'e4d46c87adf151dca20060317592b1b6' });
myAmapFun.getRegeo({
@@ -74,10 +74,13 @@
var ta = info.name || '鍦板潃鑾峰彇澶辫触';
locParam.address = ta
const resCity = await that.$u.api.getCityByName({ cityName: locParam.city })
- if (resCity.code === 200) {
+ if (resCity.code === 200 && resCity.data) {
locParam.cityId = resCity.data.id
- }
- that.$store.commit('setPosition', locParam)
+ that.$store.commit('setPosition', locParam)
+ } else {
+ that.$store.commit('setPosition', locParam)
+ that.$store.commit('clearCityId')
+ }
that.$isResolve()
},
fail: function(err) {
@@ -207,4 +210,124 @@
width: 500px !important;
font-size: 14px !important;
}
+ /*姣忎釜椤甸潰鍏叡css */
+ .tc {
+ width: calc(100vw - 148rpx);
+ .tc-btn {
+ width: 100%;
+ height: 102rpx;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ border-top: 1rpx solid #EEEEEE;
+ .tc-btn-item {
+ flex: 1;
+ height: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ font-weight: 400;
+ font-size: 32rpx;
+ color: #666666;
+ border-right: 1rpx solid #EEEEEE;
+ &:last-child {
+ border: none !important;
+ }
+ }
+ }
+ .tc-contemt {
+ width: 100%;
+ padding: 40rpx 0;
+ box-sizing: border-box;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ flex-direction: column;
+ .tc-contemt-title {
+ width: 100%;
+ text-align: center;
+ font-weight: 600;
+ font-size: 32rpx;
+ color: #111111;
+ }
+ .tc-contemt-nr {
+ width: 472rpx;
+ text-align: center;
+ font-weight: 400;
+ font-size: 28rpx;
+ color: #333333;
+ margin-top: 40rpx;
+ }
+ }
+ }
+ .nomore{
+ margin-top: 30rpx;
+ width: 100%;
+ text-align: center;
+ font-size: 24rpx;
+ color: #666666;
+ }
+ .phone {
+ width: 100%;
+ padding-top: 40rpx;
+ box-sizing: border-box;
+ .phone-botton {
+ width: 100%;
+ height: 88rpx;
+ line-height: 88rpx;
+ text-align: center;
+ font-weight: 500;
+ font-size: 32rpx;
+ color: #FFFFFF;
+ background: #00BC12;
+ border-radius: 44rpx;
+ margin-top: 60rpx;
+ }
+ .phone-head {
+ width: 100%;
+ text-align: center;
+ justify-content: space-between;
+ margin-bottom: 40rpx;
+ text {
+ font-weight: 800;
+ font-size: 32rpx;
+ color: #222222;
+ }
+ }
+
+ .phone-item {
+ width: 100%;
+ text-align: center;
+ display: flex;
+ justify-content: center;
+ flex-direction: column;
+ // border-bottom: 1rpx solid #eeeeee;
+ line-height: 78rpx;
+ button{
+ border: 1rpx white solid;
+ display: inline;
+ width: 300rpx;
+ font-weight: 500;
+ font-size: 32rpx;
+ line-height: 32rpx;
+ color: #222222;
+ }
+ image{
+ width: 28rpx;
+ height: 28rpx;
+ margin-right: 30rpx;
+ }
+ .line{
+ width: 100%;
+ height: 1rpx;
+ background-color: #f2f2f2
+ }
+ text {
+ font-weight: 500;
+ font-size: 28rpx;
+ line-height: 28rpx;
+ color: #222222;
+ }
+ }
+ }
</style>
\ No newline at end of file
--
Gitblit v1.9.3