yangjun
/
sadjv3_user
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_user

This commit is contained in:
Mr.jiang 2024-06-27 21:51:29 +08:00
parent f58be261bf dc4010dab9
commit e710aef4d2
7 changed files with 112 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
index.html
View File

@ -21,16 +21,15 @@
window._AMapSecurityConfig = {
//securityJsCode: "js秘钥",
// serviceHost: 'https://wx.sjajk.com/_AMapService',
serviceHost: 'http://sauser.blxinchuang.com/_AMapService'
// serviceHost: 'http://120.46.52.165/_AMapService',
serviceHost: 'http://sauser.blxinchuang.com/_AMapService',
//serviceHost: 'http://120.46.52.165/_AMapService',
// serviceHost: 'http://192.168.2.222:8187/_AMapService',
};
</script>
<!-- 高德 -->
<!-- <script src="https://webapi.amap.com/maps?v=2.0&key=2acf1b8c3d1aaf0070472dec19018d96"></script> -->
<script src="https://webapi.amap.com/maps?v=2.0&key=32c22db939160ba44394eb187f7897ae"></script>
<script src="https://webapi.amap.com/loader.js"></script>
<!-- <script type="text/javascript">
<!-- <script src="https://webapi.amap.com/loader.js"></script>
<script type="text/javascript">
AMapLoader.load({
key: "2acf1b8c3d1aaf0070472dec19018d96", //申请好的Web端开发者key，调用 load 时必填
version: "2.0", //指定要加载的 JS API 的版本，缺省时默认为 1.4.15
@ -41,6 +40,8 @@
console.error("高德地图加载失败！");
console.error(e); //加载错误提示
});
</script>
<script>
</script> -->
</head>
<body>

6
manifest.json
View File

@ -83,9 +83,9 @@
"ad" : {},
"maps" : {
"amap" : {
"name" : "amapljwK72nl",
"appkey_ios" : "eb38bf53409f58cbf43f383cb5733747",
"appkey_android" : "305e629f46669724c6184a187b279fec"
"name" : "amapAfvorp8OK",
"appkey_ios" : "078d73c3d9a2dfa551108b1f7e80e4d5",
"appkey_android" : "ddd9f8703b3696ce47216ff7783bbe38"
}
},
"push" : {

21
my/address/address.vue
View File

@ -18,7 +18,7 @@
</view>
<view style="margin-top: 30rpx;height: 1rpx;background-color: #f7f7f7;margin-bottom: 10upx;"></view>
<view style="display: flex;padding: 0 5upx 0 0;font-size: 26upx;">
<radio-group name="openWay" style="text-align: left;width: 70%;">
<radio-group name="openWay" style="text-align: left;width: 70%; margin-top:15rpx;">
<label class="tui-radio">
<radio :checked="item.isDefault == 1 ? true : false" color="#019c88" :disabled='item.isDefault == 1 ? false : true'
style="transform:scale(0.6);" />
@ -190,14 +190,15 @@
margin-left: 10px;
}
.delete-view{
width: 85rpx;
width: 120rpx;
text-align: center;
background: #FFFFFF;
border-radius: 18rpx;
border: 1px solid #4D4D4D;
background: #e5e7eb;
border-radius: 30rpx;
border: 1px solid #cdd2db;
font-weight: 400;
font-size: 23rpx;
color: #4D4D4D;
font-size: 30rpx;
color: #666;
padding: 8rpx 10rpx;
}
.address-list-img{
width: 91rpx;
@ -231,12 +232,12 @@
.shouhuo{
margin: 16rpx 30upx;
position: fixed;
bottom: -7upx;
bottom: -2upx;
width: 92%;
height: 92rpx;
height: 80rpx;
background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
border-radius: 46rpx;
line-height: 92rpx;
line-height: 80rpx;
font-weight: 400;
font-size: 36rpx;
color: #FFFFFF;

22
my/order/payModifyTc.vue
View File

@ -11,7 +11,7 @@
</view>
<view class="head-bottom margin-left-sm">
<view class="flex head-title-right">
<view class="margin-right-xs text-df u-skeleton-fillet head-title">
<view class="margin-right-xs u-skeleton-fillet head-title">
{{orderXm.title}}
</view>
@ -76,7 +76,7 @@
<view v-if="couponDataList" class="" style="margin-right: 5px;">
<span>-￥{{couponDataList}}</span>
</view>
<span v-else>选择优惠劵</span>
<span v-else >选择优惠劵</span>
<image class="fuwu-img" src="../../static/images/my/jiantou.png" mode=""></image>
</view>
</view>
@ -1277,11 +1277,12 @@
background-color: #ffffff;
border-radius: 24rpx;
padding: 29rpx;
margin-top: 10px;
}
.pay-title{
font-weight: bold;
font-size: 28rpx;
font-size: 38rpx;
color: #333333;
margin-bottom: 5px;
}
@ -1313,6 +1314,7 @@
display: flex;
flex-direction: column;
position: relative;
margin: 8px auto;
}
.detail-foot-title{
width: 115px;
@ -1321,7 +1323,7 @@
background-repeat: no-repeat;
background-size: 100% 100%;
font-weight: 400;
font-size: 12px;
font-size: 13px;
color: #FFFFFF;
text-align: right;
line-height: 32px;
@ -1391,8 +1393,8 @@
}
.detail-foot-list-top span:nth-child(3){
font-weight: 400;
font-size: 22rpx;
color: #777777;
font-size: 28rpx;
color: #029d88;
}
.detail-foot-mian{
@ -2002,12 +2004,12 @@
margin: 0 auto;
text-align: center;
background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
height:68rpx;
border-radius: 60rpx;
height:80rpx;
border-radius: 80rpx;
color: #ffffff;
line-height: 68rpx;
line-height: 80rpx;
font-size: 32rpx;
}
.serverAddress {
display: flex;
justify-content: space-between;

1
pages/index/index.vue
View File

@ -3,6 +3,7 @@
<view class="index-head">
<view class="index-top">
<view class="index-top-left font-size-34">盛安到家</view>
<view class="index-top-left font-size-34" style="display: none;">-{{latitude}}-{{longitude}}-</view>
<view class="index-top-mian">
<view class="index-top-mian-text">

70
pages/my/cureOderDrtail.vue
View File

@ -38,6 +38,23 @@
</view>
</view>
<view class="header-bottom-foot">
<view class="header-bottom-foot-cont">
<view class="header-fubz">保障</view>
<view class="header-bottom-foot-view">
<image class="header-bottom-foot-view-img1" src="../../static/servicePackage/idCard.png" mode=""></image>
<span>未服务全额退款</span>
</view>
<view class="header-bottom-foot-view" style="margin: 0px 7px;">
<image class="header-bottom-foot-view-img2" src="../../static/servicePackage/money.png" mode=""></image>
<span>不满意重做</span>
</view>
<view class="header-bottom-foot-view">
<image class="header-bottom-foot-view-img3" src="../../static/servicePackage/shuangyue.png" mode=""></image>
<span>最快30分钟上门</span>
</view>
</view>
</view>
<!--<view class="header-bottom-foot">
<view class="header-bottom-foot-title">服务保障</view>
<view class="header-bottom-foot-cont">
<view class="header-bottom-foot-view">
@ -53,7 +70,7 @@
<span>最快30分钟上门</span>
</view>
</view>
</view>
</view>-->
</view>
</view>
<view class="detail-foot">
@ -170,21 +187,25 @@
}
</script>
<style scoped>
.header-fubz{
font-size: 26rpx;
color: #029c88;
font-weight: bold;
}
.header-bottom-title-liao{
display: inline-block;
padding: 0 7px;
padding: 3px 7px;
height: 16px;
line-height: 16px;
text-align: center;
background: linear-gradient(-90deg, #FF6F48, #FF9E69);
border-radius: 7px;
margin-left: 5px;
font-weight: bold;
font-size: 8px;
margin-left: 5px;
font-size: 11px;
border-top-left-radius: 20px;
border-bottom-right-radius: 20px;
color: #fff;
}
}
.detail-btn{
width:95%;
height: 92rpx;
@ -239,8 +260,7 @@
width: 100%;
display: flex;
flex-direction: row;
font-weight: bold;
font-size: 22rpx;
font-size: 26rpx;
}
.header-bottom-title-bottom span{
font-weight: bold;
@ -287,15 +307,15 @@
display: flex;
flex-direction: column;
position: relative;
margin-bottom: 10px;
margin-bottom: 15px;
}
.detail-foot{
width: 100%;
display: flex;
flex-direction: column;
align-items: center;
padding: 15px 0px;
}
padding: 5rpx 0rpx;
}
.tese span:nth-child(1){
font-weight: bold;
@ -346,6 +366,7 @@
background-color: #fff;
border-radius: 21rpx;
padding: 15px;
margin-bottom: 10px;
}
.jianjie{
font-weight: 400;
@ -378,16 +399,16 @@
height: 29.86rpx;
}
.header-bottom-foot-view-img1{
width: 22.92rpx;
height: 17.36rpx;
width: 30rpx;
height: 30rpx;
}
.header-bottom-foot-view-img2{
width: 16.67rpx;
height: 16.67rpx;
width: 23rpx;
height: 23rpx;
}
.header-bottom-foot-view-img3{
width: 15.97rpx;
height: 18.06rpx;
width: 26rpx;
height: 26rpx;
}
.header-bottom-foot-view image{
margin-right: 3px;
@ -397,14 +418,14 @@
flex-direction: row;
align-items: center;
justify-content: center;
padding: 0 5px;
padding: 1px 8px;
height: 22px;
line-height: 22px;
background-color: rgba(8, 162, 138, 0.1);
border-radius: 8px;
background-color: rgba(230, 246, 243, 1);
border-radius: 15px;
font-weight: 400;
font-size: 8px;
color: #029D88;
font-size: 10px;
color: #029c88;
}
.header-bottom-foot-title{
width:100%;
@ -428,9 +449,9 @@
display: flex;
flex-direction: column;
align-items: center;
margin-top: 26rpx;
}
.header-bottom-money-jia{
font-weight: bold;
font-size: 28rpx;
color: #848484;
line-height: 37rpx;
@ -444,7 +465,7 @@
font-size: 25rpx;
}
.header-bottom-money-zhen span:nth-child(2){
font-size:36.81rpx;
font-size:45.81rpx;
font-weight: bold;
}
.header-bottom-money-zhen span:nth-child(3){
@ -503,6 +524,7 @@
padding: 15px;
display: flex;
flex-direction: column;
margin-bottom: 20rpx;
}
.header-top image{
width: 706.25rpx;

70
pages/my/serviceOderDrtail.vue
View File

@ -770,16 +770,15 @@
line-height: 80rpx;
}
.detail-btn{
width:95%;
height: 92rpx;
line-height: 92rpx;
background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
border-radius: 46rpx;
margin: 0 auto;
text-align: center;
font-weight: 400;
font-size: 42rpx;
color: #FFFFFF;
width: 90%;
margin: 0 auto;
text-align: center;
background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
height:80rpx;
border-radius: 80rpx;
color: #ffffff;
line-height: 80rpx;
font-size: 38rpx;
}
.header-top image{
width: 706.25rpx;
@ -815,7 +814,7 @@
}
.detail-foot-nav-text{
font-weight: bold;
font-size: 32rpx;
font-size: 34rpx;
color: #000000;
}
.detail-foot-nav{
@ -831,7 +830,7 @@
background-repeat: no-repeat;
background-size: 100% 100%;
font-weight: 400;
font-size: 12px;
font-size: 13px;
color: #FFFFFF;
text-align: right;
line-height: 32px;
@ -866,12 +865,11 @@
.tese span:nth-child(1){
font-weight: bold;
font-size: 22rpx;
color: #333333;
font-size: 28rpx;
color: #666;
}
.tese span:nth-child(2){
font-weight: 400;
font-size: 22rpx;
font-size: 28rpx;
color: #8D9194;
}
.tese{
@ -881,6 +879,7 @@
-webkit-line-clamp: 2; /* 显示的行数，可以根据需要修改 */
overflow: hidden;
text-overflow: ellipsis;
margin-top: 8px;
}
.detail-foot-list-top span:nth-child(1){
font-weight: bold;
@ -900,9 +899,8 @@
margin: 0px 25px 0px 5px;
}
.detail-foot-list-top span:nth-child(3){
font-weight: 400;
font-size: 22rpx;
color: #777777;
font-size: 30rpx;
color: #029d88;
}
.detail-foot-mian{
@ -911,6 +909,7 @@
flex-direction: column;
justify-content: center;
align-items: center;
margin-top: 8px;
}
.jianjie{
font-weight: 400;
@ -927,10 +926,7 @@
}
.header-bottom-mian-title{
width: 100%;
display: flex;
flex-direction: row;
align-items: center;
margin-bottom: 6px;
margin-bottom: 3px;
}
.header-bottom-mian-title span{
font-weight: 400;
@ -944,16 +940,16 @@
height: 29.86rpx;
}
.header-bottom-foot-view-img1{
width: 22.92rpx;
height: 17.36rpx;
width: 30rpx;
height: 30rpx;
}
.header-bottom-foot-view-img2{
width: 16.67rpx;
height: 16.67rpx;
width: 28rpx;
height: 28rpx;
}
.header-bottom-foot-view-img3{
width: 15.97rpx;
height: 18.06rpx;
width: 30rpx;
height: 30rpx;
}
.header-bottom-foot-view image{
margin-right: 3px;
@ -963,13 +959,13 @@
flex-direction: row;
align-items: center;
justify-content: center;
width: 69px;
width: 80px;
height: 22px;
line-height: 22px;
background-color: rgba(8, 162, 138, 0.1);
border-radius: 8px;
font-weight: 400;
font-size: 8px;
font-size: 11px;
color: #029D88;
}
.header-bottom-foot-title{
@ -978,8 +974,8 @@
line-height: 22px;
text-align: left;
font-weight: 600;
font-size: 23rpx;
color: #08A28A;
font-size: 30rpx;
color: #029d88;
}
.header-bottom-foot{
width: 100%;
@ -1001,7 +997,7 @@
font-size: 25rpx;
}
.header-bottom-money-zhen span:nth-child(2){
font-size:36.81rpx;
font-size:40rpx;
font-weight: bold;
}
.header-bottom-money-zhen span:nth-child(3){
@ -1018,7 +1014,7 @@
display: flex;
flex-direction: row;
justify-content: space-between;
margin-top:5px;
margin-top:8px;
}
.header-bottom-money{
width: 100%;
@ -1028,7 +1024,7 @@
}
.header-bottom-title-num span{
font-weight: bold;
font-size: 25rpx;
font-size: 30rpx;
}
.header-bottom-title-num span:nth-child(1){
color: #08A28A;
@ -1057,7 +1053,7 @@
.header-bottom{
width: 100%;
background-color: #fff;
padding: 15px;
padding: 15px 20px;
display: flex;
flex-direction: column;
}