xiaoe_mp_npm 0.3.6-t220331 → 0.3.6

package/.gitlab-ci.yml

@@ -4,6 +4,7 @@ build_test:
   only:
     - dev
     - feature/live_marketing_iteration
+    - feature/remove-error-report
     - fix/record-lottery
   tags:
     - fe-group-prod-runner-2

package/miniprogram_dist/AliveInvite/LiveRoomVertical/components/friends/friends.js

@@ -5,14 +5,6 @@ import {
 } from "../../../../common/api/eLiveInvite";
 Component({
     properties: {
-        // inviteParm: {
-        //     type: String,
-        //     value: ''
-        // },
-        // roomInfo: {
-        //     type: Object,
-        //     value: {}
-        // },
         switchToControlDialogVisible:{
             type: Boolean,
             value:false
@@ -38,32 +30,21 @@ Component({
         isShowFriends: false,
         count: 0, // 邀请的好友数
         inviteParm:'',
-        friendList: [
+        total: 0,
+        refreshing: false,
+        finishedTxt: '加载中',
+        finished: false,
+        componentsState: 1,
+        page_size: 25,
+        page_index: 0,
+        friendList:[],
+        friendListMockData: [
             // {
             //     wx_avatar: '../../../images/u_6182407864819_jXJGQ1pe0d.png',
             //     wx_nickname: 'wendy'
             // }, {
             //     wx_avatar: '../../../images/u_6182407864819_jXJGQ1pe0d.png',
             //     wx_nickname: 'moira1'
-            // }, {
-            //     wx_avatar: '../../../images/u_6182407864819_jXJGQ1pe0d.png',
-            //     wx_nickname: 'moira2'
-            // }
-            // , {
-            //     wx_avatar: '../../../images/u_6182407864819_jXJGQ1pe0d.png',
-            //     wx_nickname: 'moira333333'
-            // }
-            // , {
-            //     wx_avatar: '../../../images/u_6182407864819_jXJGQ1pe0d.png',
-            //     wx_nickname: 'moira4'
-            // }
-            // , {
-            //     wx_avatar: '../../../images/u_6182407864819_jXJGQ1pe0d.png',
-            //     wx_nickname: 'moira5'
-            // }
-            // , {
-            //     wx_avatar: '../../../images/u_6182407864819_jXJGQ1pe0d.png',
-            //     wx_nickname: 'moira6'
             // }
 
         ] //邀请的好友列表
@@ -72,20 +53,43 @@ Component({
         switchToControlDialogVisible(val) {
             if(val){
                 this.showFriends()
+            }else{
+                this.closeFriends()
             }
-        //   this.setData({
-        //     isShowFriends:val
-        //   })
-        //   this.getFriendsList()
         },
       },
     ready() {
     },
     methods: {
+        onLoad(){
+            if (this._freshing) return
+            this._freshing = true
+            this.setData({
+              finished: false,
+              page_index: 0
+            })
+            this.getFriendsList()
+        },
+        onScrolltolower(){
+            console.log(this.data.finished, this._freshing )
+            if(this.scrolling){return}
+            this.scrolling = true
+            this.setData({
+              finishedTxt: this.data.finished ? "没有更多了" : "加载中"
+            })
+            if(this.data.finished || this._freshing){
+                return
+            }
+            let onScrolltolower  = true
+            this.getFriendsList(onScrolltolower)
+        },
         closeFriends() {
             this.setData({
                 isShowFriends: false
             })
+            this.setData({
+                componentsState: this.data.componentsState + 1
+            })
         },
         showFriends() {
             this.setData({
@@ -102,22 +106,14 @@ Component({
             }
             return base64.encode(JSON.stringify(params))
         },
-        getFriendsList() {
-            // let params = {
-            //     "bizData": {
-            //         "inviteParm": this.data.inviteParm,
-            //         "page": 0,
-            //         "count": 10,
-            //     },
-            //     "user_id": this.properties.userId,
-            //     "app_id": this.properties.appId
-            // };
+        getFriendsList(onScrolltolower = false) {
+            let state = this.data.componentsState 
             let inviteParams = this.generateBase64(2, 4, this.properties.aliveId, '')
             let params = {
                 "bizData": {
                     "inviteParm": inviteParams,
-                    "page": 0,
-                    "count": 10,
+                    "page": this.data.page_index,
+                    "count": this.data.page_size,
                 },
                 "user_id": this.properties.userId,
                 "app_id": this.properties.appId
@@ -125,9 +121,36 @@ Component({
             getInviteDetail(params).then(res => {
                 let DATA = res.data;
                 if (DATA.code === 0) {
-                    this.setData({
-                        friendList: DATA.data
-                    })
+                    // 关闭弹窗的时候返回的数据丢弃 // 上拉加载与下拉刷新一起触发时丢弃上拉加载数据
+                if(state !==this.data.componentsState || (this._freshing === true && onScrolltolower) ) {
+                    return
+                  }
+                  var total = DATA.inviteNum
+                  var finishedTxt = "加载中"
+                  var finished = false
+                  this.formatData(DATA.data,onScrolltolower)
+                  // 下拉加载，且数据返回空
+                  if(this._freshing && DATA.data.length === 0){
+                    finishedTxt = "no-data"
+                  }
+                  else if (this.data.friendList.length >= total || DATA.data.length === 0) {
+                      // 获取到所有数据
+                      finished = true// 没有更多了
+                      finishedTxt = "没有更多了"
+                      this.setData({finishedTxt})
+                  }
+                  else {
+                    finishedTxt = "加载中"
+                  }
+                  this.setData({
+                    refreshing: false,
+                    page_index: this.data.page_index + 1,
+                    finishedTxt,
+                    finished,
+                    total
+                  })
+                  this._freshing = false
+                  this.scrolling = false
                 } else {
                     wx.showToast({
                         title: DATA.msg,
@@ -136,10 +159,24 @@ Component({
                 }
             }).catch(err => {
                 wx.showToast({
-                    title: err.data.msg,
+                    title: err.msg,
                     icon: 'error'
                 })
             });
         },
+        formatData(data,onScrolltolower){
+            //onScrolltolower代表是上拉加载的标识，网卡的时候有上拉加载与下拉刷新同时请求，上拉加载的数据也push进去的情况。
+              let friendList = this.data.friendList
+              data.forEach((item,index) => {
+                  if (!this._freshing) {
+                    friendList.push(item)
+                  }
+                })
+                if (this._freshing && !onScrolltolower) {
+                  //下拉刷新的时候直接赋值
+                  friendList = JSON.parse(JSON.stringify(data))
+                }
+                this.setData({friendList})
+          },
     }
 })

package/miniprogram_dist/AliveInvite/LiveRoomVertical/components/friends/friends.wxml

@@ -5,19 +5,22 @@
         class="icon-left-back"
         src="../../../images/icon_arrow_up.png"
       />
-      <view class="count-style">邀请的好友{{'('+friendList.length+')'}}</view>
+      <view class="count-style">邀请的好友{{'('+total+')'}}</view>
     </view>
+    <scroll-view scroll-y="true" bindscrolltolower="onScrolltolower" refresher-triggered="{{refreshing}}" bindrefresherrefresh="onLoad" refresher-enabled="{{true}}" style="height:calc(100vh - 700rpx)">
     <view class="friend-list">
       <view
         class="friend-item"
         wx:for="{{friendList}}"
       >
         <image wx:if="{{item.wx_avatar}}" class="img-avatar" src="{{item.wx_avatar}}" />
-        <image wx:else class="img-avatar" src="//wechatavator-1252524126.cos.ap-shanghai.myqcloud.com/aaa/default.svg" />
+        <image wx:else class="img-avatar" src="//wechatavator-1252524126.cdn.xiaoeknow.com/aaa/default.svg" />
         <view class="name">
           {{ item.wx_nickname }}
         </view>
       </view>
     </view>
+    <view class="finished-text" wx:if="{{!refreshing && finishedTxt !== 'no-data'}}">{{finishedTxt}}</view>
+  </scroll-view>
   </van-popup>
 </view>

package/miniprogram_dist/AliveInvite/LiveRoomVertical/components/friends/friends.wxss

@@ -8,6 +8,13 @@
     opacity: 1;
   }
 }
+.finished-text {
+  display: flex;
+  justify-content: center;
+  color: #999;
+  font-size: 28rpx;
+  padding-bottom: 20rpx;
+}
 .container-friends {
   animation: popping ease 300ms;
   position: fixed;
@@ -17,7 +24,7 @@
   width: 750rpx;
   height: calc(100vh - 494rpx);
   background-color: #fff !important;
-  background: url("https://wechatapppro-1252524126.cos.ap-shanghai.myqcloud.com/appgwaqerxu2025/image/b_u_5b2225aa46488_oGKN7IvA/kpzb2l510aau.png?imageView2/2/w/200/q/60");
+  background: url("https://wechatapppro-1252524126.cdn.xiaoeknow.com/appgwaqerxu2025/image/b_u_5b2225aa46488_oGKN7IvA/kpzb2l510aau.png?imageView2/2/w/200/q/60");
   background-size: contain;
   background-repeat: no-repeat;
   border-radius: 16rpx 16rpx 0 0;
@@ -53,7 +60,7 @@
   padding: 32rpx;
 }
 .friend-list {
-  height: calc(100vh - 700rpx);
+  height: calc(100vh - 748rpx);
   /* flex: 1; */
   overflow: scroll;
   /* display: flex; */

package/miniprogram_dist/AliveInvite/LiveRoomVertical/components/rules/rules.wxss

@@ -17,7 +17,7 @@
   width: 750rpx;
   height: calc(100vh - 494rpx);
   background-color: #fff !important;
-  background: url("https://wechatapppro-1252524126.cos.ap-shanghai.myqcloud.com/appgwaqerxu2025/image/b_u_5b2225aa46488_oGKN7IvA/kpzb2l510aau.png?imageView2/2/w/200/q/60");
+  background: url("https://wechatapppro-1252524126.cdn.xiaoeknow.com/appgwaqerxu2025/image/b_u_5b2225aa46488_oGKN7IvA/kpzb2l510aau.png?imageView2/2/w/200/q/60");
   background-size: contain;
   background-repeat: no-repeat;
   border-radius: 16rpx 16rpx 0 0;

package/miniprogram_dist/AliveInvite/LiveRoomVertical/index.js

@@ -53,7 +53,8 @@ Component({
     timerTop3: null, // 邀请top3头像定时器
     topHeight: 0,
     rightPosition: 0,
-    hasPhoneChin:false
+    hasPhoneChin:false,
+    isAndroid: true // 判断是否安卓
   },
   ready() {
   },
@@ -120,6 +121,22 @@ Component({
     openRuleDetail() {
       this.triggerEvent('changePosterDisplay',"rulesDialog")
     },
+    checkIsAndroid(){
+      const that = this
+      wx.getSystemInfo({
+        success (res) {
+          if(res.system.includes('iOS')) {
+            that.setData({
+              isAndroid: false
+            })
+          } else if(res.system.includes('Android')){
+            that.setData({
+              isAndroid: true
+            })
+          }
+        }
+      })
+    },
     // 获取排名前三的用户
     getTop3Inviter() {
       if (!this.properties.roomInfo.app_id) {
@@ -167,7 +184,11 @@ Component({
         if (this.data.activityEndType === 1 && !this.data.isLiveOver) {
           flag = true
         } else if (this.data.activityEndType === 2) {
-          const endTime = new Date(this.data.activityEndTime)
+          this.checkIsAndroid()
+          let endTime = new Date(this.data.activityEndTime)
+          if(!this.data.isAndroid) {
+            endTime = new Date(this.data.activityEndTime.replaceAll('-', '/'))
+          }
           flag = Date.now() <= endTime.getTime()
         }
       }

package/miniprogram_dist/AliveInvite/LiveRoomVertical/index.less

@@ -1,47 +1,32 @@
+.invite-entrance-liveroom-page{
+    height:100%;
+    display:flex;
+    flex-direction: column;
+  }
 .invite-rank-page {
     animation: popping ease 300ms;
-    height: 1250rpx;
+    height: 100%;
+    flex:1;
     background-color: #fff !important;
-    background: url("https://wechatapppro-1252524126.cos.ap-shanghai.myqcloud.com/appgwaqerxu2025/image/b_u_5b2225aa46488_oGKN7IvA/kpzb2l510aau.png?imageView2/2/w/200/q/60");
+    background: url("https://wechatapppro-1252524126.cdn.xiaoeknow.com/appgwaqerxu2025/image/b_u_5b2225aa46488_oGKN7IvA/kpzb2l510aau.png?imageView2/2/w/200/q/60");
     background-size: contain;
     background-repeat: no-repeat;
     border-radius: 16px 16px 0 0;
 }
 .scrollViewHeight{
-    height:calc(100vh - 636rpx);
-}
-.scrollViewDefaultHeight{
-    height:calc(100vh - 528rpx);
-}
-.smallModelViewDefaultHeight{
-    height:calc(100vh - 508rpx);
-}
-.smallModelVeiwHeight{
-    height:calc(100vh - 630rpx);
-}
-.scrollViewPackUpDefaultHeight{
-    height:calc(100vh - 468rpx); 
-}
-.scrollViewPackUpHeight{
-    height:calc(100vh - 362rpx);
-}
-.smallModelViewPackUpDefaultHeight{
-    height:calc(100vh - 342rpx);
-}
-.smallModelVeiwPackUpHeight{
-    height:calc(100vh - 464rpx);
+    height:calc(100% - 120rpx);
 }
 .container-ranking {
     animation: popping ease 300ms;
     // height: 1035rpx;
     background-color: #fff !important;
-    background: url("https://wechatapppro-1252524126.cos.ap-shanghai.myqcloud.com/appgwaqerxu2025/image/b_u_5b2225aa46488_oGKN7IvA/kpzb2l510aau.png?imageView2/2/w/200/q/60");
+    background: url("https://wechatapppro-1252524126.cdn.xiaoeknow.com/appgwaqerxu2025/image/b_u_5b2225aa46488_oGKN7IvA/kpzb2l510aau.png?imageView2/2/w/200/q/60");
     background-size: contain;
     background-repeat: no-repeat;
     border-radius: 16px 16px 0 0;
 }
 .img-background {
-    background: url("https://wechatapppro-1252524126.cos.ap-shanghai.myqcloud.com/appgwaqerxu2025/image/b_u_5b2225aa46488_oGKN7IvA/kpzb2k2t0iqn.png?imageView2/2/w/200/q/60");
+    background: url("https://wechatapppro-1252524126.cdn.xiaoeknow.com/appgwaqerxu2025/image/b_u_5b2225aa46488_oGKN7IvA/kpzb2k2t0iqn.png?imageView2/2/w/200/q/60");
     background-size: cover;
     display: flex;
     align-items: center;

package/miniprogram_dist/AliveInvite/LiveRoomVertical/index.wxml

@@ -3,7 +3,7 @@
     <view class="invite-rank-page" wx:if="{{isShowRank}}">
         <view class="mask-layer" bindtap="closeInvitingRank"></view>
         <scroll-view scroll-y="true" 
-        class="{{!isPackUp?hasPhoneChin ?topInviter.length == 0 && !isDefaultPage?'scrollViewDefaultHeight':'scrollViewHeight':topInviter.length == 0 && !isDefaultPage?'smallModelViewDefaultHeight':'smallModelVeiwHeight':hasPhoneChin ?topInviter.length == 0 && !isDefaultPage?'scrollViewPackUpDefaultHeight':'scrollViewPackUpHeight':topInviter.length == 0 && !isDefaultPage?'smallModelViewPackUpDefaultHeight':'smallModelVeiwPackUpHeight'}}">
+        class="scrollViewHeight">
             <view class="container-ranking">
                 <view class="img-background">
                     <image
@@ -52,7 +52,7 @@
                                     <view wx:else class="num">{{ item.ranking }}</view>
                                     <view class="warp-avatar">
                                         <image wx:if="{{item.avatar}}" class="img-avatar" src="{{item.avatar}}" />
-                                        <image wx:else class="img-avatar" src="//wechatavator-1252524126.cos.ap-shanghai.myqcloud.com/aaa/default.svg" />
+                                        <image wx:else class="img-avatar" src="//wechatavator-1252524126.cdn.xiaoeknow.com/aaa/default.svg" />
                                         <view class="name">
                                             {{ item.name }}
                                         </view>

package/miniprogram_dist/AliveInvite/LiveRoomVertical/index.wxss

@@ -1,46 +1,31 @@
+.invite-entrance-liveroom-page {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+}
 .invite-rank-page {
   animation: popping ease 300ms;
-  height: 1250rpx;
+  height: 100%;
+  flex: 1;
   background-color: #fff !important;
-  background: url("https://wechatapppro-1252524126.cos.ap-shanghai.myqcloud.com/appgwaqerxu2025/image/b_u_5b2225aa46488_oGKN7IvA/kpzb2l510aau.png?imageView2/2/w/200/q/60");
+  background: url("https://wechatapppro-1252524126.cdn.xiaoeknow.com/appgwaqerxu2025/image/b_u_5b2225aa46488_oGKN7IvA/kpzb2l510aau.png?imageView2/2/w/200/q/60");
   background-size: contain;
   background-repeat: no-repeat;
   border-radius: 16px 16px 0 0;
 }
 .scrollViewHeight {
-  height: calc(100vh - 636rpx);
-}
-.scrollViewDefaultHeight {
-  height: calc(100vh - 528rpx);
-}
-.smallModelViewDefaultHeight {
-  height: calc(100vh - 508rpx);
-}
-.smallModelVeiwHeight {
-  height: calc(100vh - 630rpx);
-}
-.scrollViewPackUpDefaultHeight {
-  height: calc(100vh - 468rpx);
-}
-.scrollViewPackUpHeight {
-  height: calc(100vh - 362rpx);
-}
-.smallModelViewPackUpDefaultHeight {
-  height: calc(100vh - 342rpx);
-}
-.smallModelVeiwPackUpHeight {
-  height: calc(100vh - 464rpx);
+  height: calc(100% - 120rpx);
 }
 .container-ranking {
   animation: popping ease 300ms;
   background-color: #fff !important;
-  background: url("https://wechatapppro-1252524126.cos.ap-shanghai.myqcloud.com/appgwaqerxu2025/image/b_u_5b2225aa46488_oGKN7IvA/kpzb2l510aau.png?imageView2/2/w/200/q/60");
+  background: url("https://wechatapppro-1252524126.cdn.xiaoeknow.com/appgwaqerxu2025/image/b_u_5b2225aa46488_oGKN7IvA/kpzb2l510aau.png?imageView2/2/w/200/q/60");
   background-size: contain;
   background-repeat: no-repeat;
   border-radius: 16px 16px 0 0;
 }
 .img-background {
-  background: url("https://wechatapppro-1252524126.cos.ap-shanghai.myqcloud.com/appgwaqerxu2025/image/b_u_5b2225aa46488_oGKN7IvA/kpzb2k2t0iqn.png?imageView2/2/w/200/q/60");
+  background: url("https://wechatapppro-1252524126.cdn.xiaoeknow.com/appgwaqerxu2025/image/b_u_5b2225aa46488_oGKN7IvA/kpzb2k2t0iqn.png?imageView2/2/w/200/q/60");
   background-size: cover;
   display: flex;
   align-items: center;

package/miniprogram_dist/ConfirmOrder/components/AddressEdit/index.less

@@ -1,21 +1,21 @@
 @import '../../../common/css/theme.wxss';
 
 .address-edit-content {
-  padding-top: 2.13vmin;
+  padding-top: 16rpx;
 
   .input-wrapper {
     background: white;
 
     .van-field__label {
-      font-size: 3.73vmin;
+      font-size: 28rpx;
       color: #333333;
     }
   }
 
   .default-wrapper {
-    margin-top: 2.13vmin;
-    height: 14.93vmin;
-    padding: 0 4.27vmin;
+    margin-top: 16rpx;
+    height: 112rpx;
+    padding: 0 32rpx;
     box-sizing: border-box;
     background: white;
     display: flex;
@@ -23,7 +23,7 @@
     justify-content: space-between;
 
     .ET2 {
-      font-size: 3.73vmin;
+      font-size: 28rpx;
       color: #333333;
     }
 
@@ -33,12 +33,12 @@
 
       .van-switch__node {
         box-shadow: none;
-        border: 0.13vmin solid rgba(0, 0, 0, 0.08);
+        border: 1px solid rgba(0, 0, 0, 0.08);
         background: rgba(255, 255, 255, 1);
-        width: 2.67vmin;
-        height: 2.67vmin;
-        top: 0.13vmin;
-        left: 0.13vmin;
+        width: 20px;
+        height: 20px;
+        top: 1px;
+        left: 1px;
       }
     }
 
@@ -59,12 +59,12 @@
     z-index: 2;
 
     .finish-btn-wrapper {
-      padding: 2.13vmin 3.73vmin;
+      padding: 16rpx 28rpx;
     }
 
     .finish {
-      padding: 2.67vmin 0;
-      border-radius: 5.33vmin;
+      padding: 20rpx 0;
+      border-radius: 40rpx;
       text-align: center;
       background: #09bb07;
       color: white;
@@ -77,18 +77,18 @@
 
       .cancel-btn {
         text-align: center;
-        width: 28.27vmin;
-        padding: 2.13vmin 0;
-        margin-right: 3.2vmin;
+        width: 212rpx;
+        padding: 16rpx 0;
+        margin-right: 24rpx;
         background: rgba(255, 255, 255, 1);
-        border-radius: 5.33vmin;
-        border: 0.27vmin solid rgba(183, 183, 183, 1);
+        border-radius: 40rpx;
+        border: 2rpx solid rgba(183, 183, 183, 1);
       }
 
       .finish2 {
-        width: 60vmin;
-        padding: 2.67vmin 0;
-        border-radius: 5.33vmin;
+        width: 450rpx;
+        padding: 20rpx 0;
+        border-radius: 40rpx;
         text-align: center;
         background: #09bb07;
         color: #fff;

package/miniprogram_dist/ConfirmOrder/components/AddressEdit/index.wxml

@@ -2,10 +2,10 @@
 <view class="address-edit-content">
   <van-dialog id="van-dialog" />
   <!-- 获取微信收货地址 -->
-  <WechatAddress 
+  <!-- <WechatAddress 
     addressList="{{ addressList }}"
     bind:createAddress="saveAddress"
-  ></WechatAddress>
+  ></WechatAddress> -->
   <view class="input-wrapper">
     <van-field value="{{ address.receiver }}" label="收货人" placeholder="收货人姓名" maxlength="15" bind:change="changeMsg" data-type="receiver" />
     <van-field value="{{ address.phone }}" label="手机号码" placeholder="收货人手机号" maxlength="11" type="number" bind:change="changeTel" />

package/miniprogram_dist/ConfirmOrder/components/AddressEdit/index.wxss

@@ -15,19 +15,19 @@
   background-color: #9db8f1 !important;
 }
 .address-edit-content {
-  padding-top: 2.13vmin;
+  padding-top: 16rpx;
 }
 .address-edit-content .input-wrapper {
   background: white;
 }
 .address-edit-content .input-wrapper .van-field__label {
-  font-size: 3.73vmin;
+  font-size: 28rpx;
   color: #333333;
 }
 .address-edit-content .default-wrapper {
-  margin-top: 2.13vmin;
-  height: 14.93vmin;
-  padding: 0 4.27vmin;
+  margin-top: 16rpx;
+  height: 112rpx;
+  padding: 0 32rpx;
   box-sizing: border-box;
   background: white;
   display: flex;
@@ -35,7 +35,7 @@
   justify-content: space-between;
 }
 .address-edit-content .default-wrapper .ET2 {
-  font-size: 3.73vmin;
+  font-size: 28rpx;
   color: #333333;
 }
 .address-edit-content .default-wrapper .van-switch {
@@ -44,12 +44,12 @@
 }
 .address-edit-content .default-wrapper .van-switch .van-switch__node {
   box-shadow: none;
-  border: 0.13vmin solid rgba(0, 0, 0, 0.08);
+  border: 1px solid rgba(0, 0, 0, 0.08);
   background: #ffffff;
-  width: 2.67vmin;
-  height: 2.67vmin;
-  top: 0.13vmin;
-  left: 0.13vmin;
+  width: 20px;
+  height: 20px;
+  top: 1px;
+  left: 1px;
 }
 .address-edit-content .default-wrapper .van-switch--on {
   background-color: #1989fa;
@@ -66,11 +66,11 @@
   z-index: 2;
 }
 .address-edit-content .finish-btn .finish-btn-wrapper {
-  padding: 2.13vmin 3.73vmin;
+  padding: 16rpx 28rpx;
 }
 .address-edit-content .finish-btn .finish {
-  padding: 2.67vmin 0;
-  border-radius: 5.33vmin;
+  padding: 20rpx 0;
+  border-radius: 40rpx;
   text-align: center;
   background: #09bb07;
   color: white;
@@ -82,17 +82,17 @@
 }
 .address-edit-content .finish-btn .finish-double .cancel-btn {
   text-align: center;
-  width: 28.27vmin;
-  padding: 2.13vmin 0;
-  margin-right: 3.2vmin;
+  width: 212rpx;
+  padding: 16rpx 0;
+  margin-right: 24rpx;
   background: #ffffff;
-  border-radius: 5.33vmin;
-  border: 0.27vmin solid #b7b7b7;
+  border-radius: 40rpx;
+  border: 2rpx solid #b7b7b7;
 }
 .address-edit-content .finish-btn .finish-double .finish2 {
-  width: 60vmin;
-  padding: 2.67vmin 0;
-  border-radius: 5.33vmin;
+  width: 450rpx;
+  padding: 20rpx 0;
+  border-radius: 40rpx;
   text-align: center;
   background: #09bb07;
   color: #fff;