黄琪勇 4 månader sedan
förälder
incheckning
f97c317059

+ 1 - 0
miniprogram/pages/address/addressList.json

@@ -1,4 +1,5 @@
 {
+  "disableScroll": true,
   "usingComponents": {
     "navigation-bar": "/components/navigation-bar/navigation-bar",
     "addAddress": "../address/addAddress"

+ 1 - 0
miniprogram/pages/index/index.json

@@ -1,4 +1,5 @@
 {
+  "disableScroll": true,
   "usingComponents": {
     "navigation-bar": "/components/navigation-bar/navigation-bar",
     "service": "/components/service/service",

+ 8 - 4
miniprogram/pages/index/index.less

@@ -174,6 +174,7 @@ page {
     border-radius: 32rpx 32rpx 0rpx 0rpx;
     padding: 40rpx 0 56rpx;
     box-sizing: border-box;
+    height: 1080rpx;
 
     .topTit {
       font-weight: 600;
@@ -184,11 +185,14 @@ page {
     }
 
     .iconClose {
+      right: 24rpx;
+      top: 34rpx;
       position: absolute;
-      right: 40rpx;
-      top: 50rpx;
-      width: 32rpx;
-      height: 32rpx;
+      width: 64rpx;
+      height: 64rpx;
+      background: url("https://oss.dayaedu.com/ktyq/1739847605228.png") no-repeat;
+      background-size: 32rpx 32rpx;
+      background-position: center center;
     }
 
     .product-section {

+ 3 - 3
miniprogram/pages/index/index.wxml

@@ -1,5 +1,5 @@
 <!--index.wxml-->
-<scroll-view class="scrollarea" scroll-y="{{popupShow ? false : true}}" type="list" bindscroll="onScroll" enable-passive="true">
+<scroll-view enhanced="{{true}}" bounces="{{false}}" class="scrollarea" scroll-y="{{popupShow ? false : true}}" type="list" bindscroll="onScroll" enable-passive="true">
   <view class="container">
 
     <view class="goodsSection">
@@ -21,7 +21,7 @@
       <view class="popup-mask" bind:tap="onClose"></view>
       <view class="popup-container">
         <view class="topTit">选择规格</view>
-        <image bind:tap="onClose" src="./images/icon-close.png" class="iconClose"></image>
+        <view bind:tap="onClose" class="iconClose"></view>
         <view class="memberBox {{isShowMemberInfoTip?'showMemberInfoTip':''}}">
           <view wx:if="{{ !memberInfo.id }}" class="memberCon" bind:tap="onMemberInfo">
             <image class="memberImg" src="./images/member.png"></image>
@@ -93,7 +93,7 @@
       <view class="popup-mask" bind:tap="onCloseMember"></view>
       <view class="popup-container">
         <view class="topTit">选择会员</view>
-        <image bind:tap="onCloseMember" src="./images/icon-close.png" class="iconClose"></image>
+        <view bind:tap="onCloseMember" class="iconClose"></view>
         <scroll-view scroll-y class="memberListCon">
           <view wx:for="{{ memberList }}" wx:key="index" bind:tap="onSelect" data-item="{{ item }}" class="memberInfo {{ item.id === memberInfo.id?'active':'' }}">
             <image class="radioImg" wx:if="{{item.id === memberInfo.id}}" src="../member/images/radioAct.png"></image>

+ 1 - 0
miniprogram/pages/login/login.json

@@ -1,4 +1,5 @@
 {
+  "disableScroll": true,
   "usingComponents": {
     "navigation-bar": "/components/navigation-bar/navigation-bar"
   }

+ 1 - 0
miniprogram/pages/member/addMember.json

@@ -1,4 +1,5 @@
 {
+  "disableScroll": true,
   "usingComponents": {
     "navigation-bar": "/components/navigation-bar/navigation-bar",
     "van-popup": "@vant/weapp/popup/index",

+ 1 - 1
miniprogram/pages/member/addMember.less

@@ -38,7 +38,7 @@
       align-items: center;
 
       .labelLeft {
-        margin-top: 12rpx;
+        margin-top: 24rpx;
         display: flex;
         flex-direction: column;
 

+ 18 - 3
miniprogram/pages/member/addMember.ts

@@ -84,6 +84,8 @@ Page({
     classList: [] as any,
     classId: "",
     className: "",
+
+    isSaveDisable: false
   },
   async onLoad(options: any) {
     const { redirectUrl, id } = options;
@@ -153,7 +155,7 @@ Page({
             values: classListData,
             defaultIndex: classIndex,
           },
-          gradeClassIndexs:[gradeIndex, classIndex]
+          gradeClassIndexs: [gradeIndex, classIndex]
         })
       }
     } catch (e: any) {
@@ -613,13 +615,18 @@ Page({
         })
         return
       }
-
+      if (this.data.isSaveDisable) {
+        return
+      }
       const pages = getCurrentPages();
       const prevPage = pages[pages.length - 2]; // 获取上一个页面实例
       wx.showLoading({
         mask: true,
         title: "",
       });
+      this.setData({
+        isSaveDisable: true
+      })
       // 编辑
       if (params.id) {
         await api_userBeneficiaryUpdate({
@@ -651,8 +658,16 @@ Page({
         title: '保存成功',
         icon: 'none'
       })
-      setTimeout(() => { wx.navigateBack() }, 1000)
+      setTimeout(() => {
+        wx.navigateBack()
+        this.setData({
+          isSaveDisable: false
+        })
+      }, 1000)
     } catch {
+      this.setData({
+        isSaveDisable: false
+      })
       wx.hideLoading()
       // 
     }

+ 2 - 0
miniprogram/pages/member/memberList.json

@@ -1,4 +1,6 @@
+
 {
+  "disableScroll": true,
   "usingComponents": {
     "navigation-bar": "/components/navigation-bar/navigation-bar"
   }

+ 1 - 0
miniprogram/pages/orders/order-detail.json

@@ -1,4 +1,5 @@
 {
+  "disableScroll": true,
   "usingComponents": {
     "navigation-bar": "/components/navigation-bar/navigation-bar",
     "service": "/components/service/service",

+ 7 - 4
miniprogram/pages/orders/order-detail.less

@@ -386,11 +386,14 @@
     }
 
     .iconClose {
+      right: 24rpx;
+      top: 34rpx;
       position: absolute;
-      right: 40rpx;
-      top: 50rpx;
-      width: 32rpx;
-      height: 32rpx;
+      width: 64rpx;
+      height: 64rpx;
+      background: url("https://oss.dayaedu.com/ktyq/1739847605228.png") no-repeat;
+      background-size: 32rpx 32rpx;
+      background-position: center center;
     }
 
     .btnSections {

+ 1 - 1
miniprogram/pages/orders/order-detail.wxml

@@ -134,7 +134,7 @@
       <view class="popup-mask" bind:tap="onCloseAddress"></view>
       <view class="popup-container">
         <view class="topTit">收货信息</view>
-        <image bind:tap="onCloseAddress" src="../index/images/icon-close.png" class="iconClose"></image>
+        <view bind:tap="onCloseAddress" class="iconClose"></view>
         <scroll-view scroll-y class="memberListCon">
           <block wx:if="{{ addressList.length }}">
             <view wx:for="{{ addressList }}" wx:key="index" bind:tap="onSelectAddress" data-item="{{ item }}" class="memberListInfo {{ item.id === addressInfo.id?'active':'' }}">

+ 1 - 0
miniprogram/pages/orders/order-result.json

@@ -1,4 +1,5 @@
 {
+  "disableScroll": true,
   "usingComponents": {
     "navigation-bar": "/components/navigation-bar/navigation-bar",
     "service": "/components/service/service",

+ 1 - 0
miniprogram/pages/orders/orders.json

@@ -1,4 +1,5 @@
 {
+  "disableScroll": true,
   "usingComponents": {
     "navigation-bar": "/components/navigation-bar/navigation-bar",
     "apply-refound": "/components/apply-refound/apply-refound",