提测bug修改

miniprogram/components/navigation-bar/navigation-bar.ts

@@ -69,7 +69,7 @@ Component({
         ios: !isAndroid,
         innerPaddingRight: `padding-right: ${wxWindowInfo.windowWidth - rect.left}px;`,
         leftWidth: `width: ${wxWindowInfo.windowWidth - rect.left }px;`,
-        safeAreaTop: isDevtools || isAndroid ? `height: calc(var(--height) + ${wxWindowInfo.safeArea.top}px); padding-top: ${wxWindowInfo.safeArea.top}px;` : ``
+        safeAreaTop: isDevtools || isAndroid ? `height: calc(var(--height) + ${wxWindowInfo.safeArea.top || 26}px); padding-top: ${wxWindowInfo.safeArea.top || 26}px;` : ``
       })
     },
   },

miniprogram/config.ts

@@ -1,4 +1,4 @@
-const environmentVariable = "dev";
+const environmentVariable = "test";
 const apiUrlInfo = {
   dev: "https://dev.kt.colexiu.com",
   test: "https://test.kt.colexiu.com",

miniprogram/pages/address/addressList.wxml

@@ -1,47 +1,49 @@
-<view class="memberList">
-  <navigation-bar title="选择收货信息"></navigation-bar>
-  <view class="appBg"></view>
-  <scroll-view scroll-y class="memberListCon">
-    <view wx:for="{{ addressList }}" wx:key="index" bind:tap="onSelect" data-item="{{ item }}" class="memberInfo {{ item.id === id?'active':'' }}">
-      <view class="infoCon">
-        <image class="tip" src="../orders/images/member.png" />
-        <text class="name">{{item.name}}</text>
-        <text class="phone">{{item.phoneNumber}}</text>
-      </view>
-      <view class="schoolInfoCon">
-        <text class="schoolInfo">收货地址</text><text class="schoolInfoDes">{{
+<page-meta page-style="{{ addAddressPopupShow ? 'overflow: hidden;' : '' }}" style="height: 100vh;">
+  <view class="memberList">
+    <navigation-bar title="选择收货信息"></navigation-bar>
+    <view class="appBg"></view>
+    <scroll-view scroll-y class="memberListCon">
+      <view wx:for="{{ addressList }}" wx:key="index" bind:tap="onSelect" data-item="{{ item }}" class="memberInfo {{ item.id === id?'active':'' }}">
+        <view class="infoCon">
+          <image class="tip" src="../orders/images/member.png" />
+          <text class="name">{{item.name}}</text>
+          <text class="phone">{{item.phoneNumber}}</text>
+        </view>
+        <view class="schoolInfoCon">
+          <text class="schoolInfo">收货地址</text><text class="schoolInfoDes">{{
           item.provinceName + item.cityName + item.regionName + item.detailAddress
         }}
-        </text>
-      </view>
-      <view class="operateCon">
-        <view class="radio">
-          <image wx:if="{{item.id === id}}" src="../login/images/radio-active.png"></image>
-          <image wx:else src="../login/images/radio-default.png"></image>
-          <text>{{ item.id === id ? "当前选中" : "未选中"}}</text>
+          </text>
         </view>
-        <view class="operate">
-          <view catch:tap="onDel" data-id="{{ item.id }}">删除</view>
-          <view catch:tap="onEdit" data-id="{{ item.id }}">编辑</view>
+        <view class="operateCon">
+          <view class="radio">
+            <image wx:if="{{item.id === id}}" src="../login/images/radio-active.png"></image>
+            <image wx:else src="../login/images/radio-default.png"></image>
+            <text>{{ item.id === id ? "当前选中" : "未选中"}}</text>
+          </view>
+          <view class="operate">
+            <view catch:tap="onDel" data-id="{{ item.id }}">删除</view>
+            <view catch:tap="onEdit" data-id="{{ item.id }}">编辑</view>
+          </view>
         </view>
       </view>
+    </scroll-view>
+    <view class="submitCon">
+      <view class="subBtn" bind:tap="onAdd">
+        <image src="../member/images/user.png" />
+        新增收货信息
+      </view>
     </view>
-  </scroll-view>
-  <view class="submitCon">
-    <view class="subBtn" bind:tap="onAdd">
-      <image src="../member/images/user.png" />
-      新增收货信息
-    </view>
-  </view>
-  <view class="popup-section" wx:if="{{popupShow}}">
-    <view class="popup-mask" bind:tap="onDialogClose"></view>
-    <view class="popup-container">
-      <view class="tit">请确认是否删除该收货信息</view>
-      <view class="btnCon">
-        <view bind:tap="onDialogClose">取消</view>
-        <view bind:tap="onDialogOk">确认</view>
+    <view class="popup-section" wx:if="{{popupShow}}">
+      <view class="popup-mask" bind:tap="onDialogClose"></view>
+      <view class="popup-container">
+        <view class="tit">请确认是否删除该收货信息</view>
+        <view class="btnCon">
+          <view bind:tap="onDialogClose">取消</view>
+          <view bind:tap="onDialogOk">确认</view>
+        </view>
       </view>
     </view>
+    <addAddress editId="{{editId}}" popupShow='{{addAddressPopupShow}}' bind:addAddress="onAddAddress"></addAddress>
   </view>
-  <addAddress editId="{{editId}}" popupShow='{{addAddressPopupShow}}' bind:addAddress="onAddAddress"></addAddress>
-</view>
+</page-meta>

miniprogram/pages/member/addMember.wxml

@@ -1,103 +1,105 @@
-<view class="addMember">
-  <navigation-bar title=""></navigation-bar>
-  <view class="appBg"></view>
-  <scroll-view scroll-y class="addMemberCon">
-    <view class="labelCon">
-      <view class="labelLeft">
-        <image src="./images/label1.png"></image>
-        <text>为了提供更好的服务，请您耐心填写以下内容</text>
-      </view>
-      <image class="labelRight" src="./images/label2.png"></image>
-    </view>
-    <view class="fromBox firstFromBox">
-      <view class="fromCon">
-        <text class="fromTit">联系电话</text>
-        <view class="fromIpt">
-          <van-field maxlength="11" model:value="{{ phone }}" input-align="right" type="{{ 'number' }}" placeholder="请输入联系电话" border="{{ false }}" />
+<page-meta page-style="{{ showArea || showSchool || showGrade || showClass ? 'overflow: hidden;' : '' }}" style="height: 100vh;">
+  <view class="addMember">
+    <navigation-bar title=""></navigation-bar>
+    <view class="appBg"></view>
+    <scroll-view scroll-y class="addMemberCon">
+      <view class="labelCon">
+        <view class="labelLeft">
+          <image src="./images/label1.png"></image>
+          <text>为了提供更好的服务，请您耐心填写以下内容</text>
         </view>
+        <image class="labelRight" src="./images/label2.png"></image>
       </view>
-      <view class="fromCon">
-        <text class="fromTit">学生姓名</text>
-        <view class="fromIpt">
-          <van-field maxlength="14" model:value="{{ name }}" input-align="right" placeholder="请输入学生姓名" border="{{ false }}" />
+      <view class="fromBox firstFromBox">
+        <view class="fromCon">
+          <text class="fromTit">联系电话</text>
+          <view class="fromIpt">
+            <van-field maxlength="11" model:value="{{ phone }}" input-align="right" type="{{ 'number' }}" placeholder="请输入联系电话" border="{{ false }}" />
+          </view>
         </view>
-      </view>
-      <view class="fromCon">
-        <text class="fromTit">学生性别</text>
-        <view class="fromIpt genderIpt">
-          <view class="gender {{gender==='1'?'active':''}}" bind:tap="onCheckGender" data-gender="1">男</view>
-          <view class="gender {{gender==='0'?'active':''}}" bind:tap="onCheckGender" data-gender="0">女</view>
+        <view class="fromCon">
+          <text class="fromTit">学生姓名</text>
+          <view class="fromIpt">
+            <van-field maxlength="14" model:value="{{ name }}" input-align="right" placeholder="请输入学生姓名" border="{{ false }}" />
+          </view>
         </view>
-      </view>
-    </view>
-    <view class="fromBox">
-      <view class="fromCon">
-        <text class="fromTit">学校地区</text>
-        <view class="fromIpt">
-          <van-field placeholder="请选择学校地区" value="{{  provinceName  + cityName  + regionName}}" input-align="right" bind:tap="onShowAreaList" border="{{ false }}" is-link readonly />
+        <view class="fromCon">
+          <text class="fromTit">学生性别</text>
+          <view class="fromIpt genderIpt">
+            <view class="gender {{gender==='1'?'active':''}}" bind:tap="onCheckGender" data-gender="1">男</view>
+            <view class="gender {{gender==='0'?'active':''}}" bind:tap="onCheckGender" data-gender="0">女</view>
+          </view>
         </view>
       </view>
-      <view class="fromCon">
-        <text class="fromTit">所在学校</text>
-        <view class="fromIpt">
-          <van-field placeholder="请选择学校" value="{{ schoolAreaName }}" input-align="right" bind:tap="onSelectSchool" border="{{ false }}" is-link readonly />
+      <view class="fromBox">
+        <view class="fromCon">
+          <text class="fromTit">学校地区</text>
+          <view class="fromIpt">
+            <van-field placeholder="请选择学校地区" value="{{  provinceName  + cityName  + regionName}}" input-align="right" bind:tap="onShowAreaList" border="{{ false }}" is-link readonly />
+          </view>
         </view>
-      </view>
-      <view class="fromCon">
-        <text class="fromTit">所在年级</text>
-        <view class="fromIpt">
-          <van-field placeholder="请选择年级" value="{{ gradeName }}" input-align="right" bind:tap="onSelectGrade" border="{{ false }}" is-link readonly />
+        <view class="fromCon">
+          <text class="fromTit">所在学校</text>
+          <view class="fromIpt">
+            <van-field placeholder="请选择学校" value="{{ schoolAreaName }}" input-align="right" bind:tap="onSelectSchool" border="{{ false }}" is-link readonly />
+          </view>
         </view>
-      </view>
-      <view class="fromCon">
-        <text class="fromTit">所在班级</text>
-        <view class="fromIpt">
-          <van-field placeholder="请选择班级" value="{{ className }}" input-align="right" bind:tap="onSelectClass" border="{{ false }}" is-link readonly />
+        <view class="fromCon">
+          <text class="fromTit">所在年级</text>
+          <view class="fromIpt">
+            <van-field placeholder="请选择年级" value="{{ gradeName }}" input-align="right" bind:tap="onSelectGrade" border="{{ false }}" is-link readonly />
+          </view>
+        </view>
+        <view class="fromCon">
+          <text class="fromTit">所在班级</text>
+          <view class="fromIpt">
+            <van-field placeholder="请选择班级" value="{{ className }}" input-align="right" bind:tap="onSelectClass" border="{{ false }}" is-link readonly />
+          </view>
         </view>
       </view>
+      <view class="botBox"></view>
+    </scroll-view>
+    <view class="submitCon">
+      <view class="subBtn" bind:tap="onSubmit">保存</view>
     </view>
-    <view class="botBox"></view>
-  </scroll-view>
-  <view class="submitCon">
-    <view class="subBtn" bind:tap="onSubmit">保存</view>
-  </view>
-  <!-- 地区 -->
-  <van-popup round="{{true}}" lock-scroll="{{true}}" z-index="{{103}}" show="{{showArea}}" position="bottom" safe-area-inset-bottom="{{false}}" bind:close="onCloseAreaList">
-    <van-area wx:if="{{showArea}}" areaList="{{areaList}}" visible-item-count="6" item-height="46" value="{{  regionCode || cityCode }}" bind:cancel="onCloseAreaList" bind:confirm="submitArea" />
-  </van-popup>
-  <!-- 学校 -->
-  <van-popup round="{{true}}" lock-scroll="{{true}}" z-index="{{102}}" show="{{showSchool}}" position="bottom" safe-area-inset-bottom="{{false}}" bind:close="onCloseSchool">
-    <block wx:if="{{showSchool}}">
-      <view class="toolbar-top">
-        <view class="toolbar-cancel" bind:tap="onCloseSchool">取消</view>
-        <view class="toolbar-confirm" bind:tap="onSubmitSchool">确认</view>
-      </view>
-      <view class="areaListOpen" bind:tap="onShowAreaList">
-        <text>{{ provinceName  + " " + cityName + " " + regionName}}</text>
-        <image src="./images/chevron-down.png" />
-      </view>
-      <view class="searchList">
-        <van-search use-left-icon-slot use-action-slot show-action placeholder="请输入学校名称关键字" value="{{ searchName }}" bind:search="onSearch" bind:change="onSearchChange" bind:clear="onSearch">
-          <image slot="left-icon" src="./images/icon-search.png" class="icon-search" />
-          <view slot="action" class="searchBtn" bind:tap="onSearch">搜索</view>
-        </van-search>
-      </view>
-      <van-picker wx:if="{{schoolAreaList.length}}" loading="{{ schoolLoading }}" columns="{{ schoolAreaList }}" bind:change="onChangeSchool" visible-item-count="6" default-index="{{ schoolAreaIndex }}">
+    <!-- 地区 -->
+    <van-popup round="{{true}}" lock-scroll="{{true}}" z-index="{{103}}" show="{{showArea}}" position="bottom" safe-area-inset-bottom="{{false}}" bind:close="onCloseAreaList">
+      <van-area wx:if="{{showArea}}" areaList="{{areaList}}" visible-item-count="6" item-height="46" value="{{  regionCode || cityCode }}" bind:cancel="onCloseAreaList" bind:confirm="submitArea" />
+    </van-popup>
+    <!-- 学校 -->
+    <van-popup round="{{true}}" lock-scroll="{{true}}" z-index="{{102}}" show="{{showSchool}}" position="bottom" safe-area-inset-bottom="{{false}}" bind:close="onCloseSchool">
+      <block wx:if="{{showSchool}}">
+        <view class="toolbar-top">
+          <view class="toolbar-cancel" bind:tap="onCloseSchool">取消</view>
+          <view class="toolbar-confirm" bind:tap="onSubmitSchool">确认</view>
+        </view>
+        <view class="areaListOpen" bind:tap="onShowAreaList">
+          <text>{{ provinceName  + " " + cityName + " " + regionName}}</text>
+          <image src="./images/chevron-down.png" />
+        </view>
+        <view class="searchList">
+          <van-search use-left-icon-slot use-action-slot show-action placeholder="请输入学校名称关键字" value="{{ searchName }}" bind:search="onSearch" bind:change="onSearchChange" bind:clear="onSearch">
+            <image slot="left-icon" src="./images/icon-search.png" class="icon-search" />
+            <view slot="action" class="searchBtn" bind:tap="onSearch">搜索</view>
+          </van-search>
+        </view>
+        <van-picker wx:if="{{schoolAreaList.length}}" loading="{{ schoolLoading }}" columns="{{ schoolAreaList }}" bind:change="onChangeSchool" visible-item-count="6" default-index="{{ schoolAreaIndex }}">
+        </van-picker>
+        <view wx:else class="empty-box">
+          <image src="https://oss.dayaedu.com/ktyq/1739278149891.png"></image>
+          <view class="empty-text">暂无数据</view>
+        </view>
+      </block>
+    </van-popup>
+    <!-- 年级 -->
+    <van-popup round="{{true}}" lock-scroll="{{true}}" z-index="{{102}}" show="{{showGrade}}" position="bottom" safe-area-inset-bottom="{{false}}" bind:close="onCloseGrade">
+      <van-picker wx:if="{{ showGrade }}" columns="{{ gradeList }}" visible-item-count="6" show-toolbar bind:cancel="onCloseGrade" bind:confirm="onSubmitGrade" default-index="{{ gradeIndex }}">
       </van-picker>
-      <view wx:else class="empty-box">
-        <image src="https://oss.dayaedu.com/ktyq/1739278149891.png"></image>
-        <view class="empty-text">暂无数据</view>
-      </view>
-    </block>
-  </van-popup>
-  <!-- 年级 -->
-  <van-popup round="{{true}}" lock-scroll="{{true}}" z-index="{{102}}" show="{{showGrade}}" position="bottom" safe-area-inset-bottom="{{false}}" bind:close="onCloseGrade">
-    <van-picker wx:if="{{ showGrade }}" columns="{{ gradeList }}" visible-item-count="6" show-toolbar bind:cancel="onCloseGrade" bind:confirm="onSubmitGrade" default-index="{{ gradeIndex }}">
-    </van-picker>
-  </van-popup>
-  <!-- 班级 -->
-  <van-popup round="{{true}}" lock-scroll="{{true}}" z-index="{{102}}" show="{{showClass}}" position="bottom" safe-area-inset-bottom="{{false}}" bind:close="onCloseClass">
-    <van-picker wx:if="{{ showClass }}" columns="{{ classList }}" visible-item-count="6" show-toolbar bind:cancel="onCloseClass" bind:confirm="onSubmitClass" default-index="{{ classIndex }}">
-    </van-picker>
-  </van-popup>
-</view>
+    </van-popup>
+    <!-- 班级 -->
+    <van-popup round="{{true}}" lock-scroll="{{true}}" z-index="{{102}}" show="{{showClass}}" position="bottom" safe-area-inset-bottom="{{false}}" bind:close="onCloseClass">
+      <van-picker wx:if="{{ showClass }}" columns="{{ classList }}" visible-item-count="6" show-toolbar bind:cancel="onCloseClass" bind:confirm="onSubmitClass" default-index="{{ classIndex }}">
+      </van-picker>
+    </van-popup>
+  </view>
+</page-meta>

miniprogram/pages/orders/order-detail.wxml

@@ -1,9 +1,10 @@
 <!--pages/orders/order-detail.wxml-->
-<view class="container">
-  <navigation-bar title="订单确认"></navigation-bar>
+<page-meta page-style="{{ popupShow ? 'overflow: hidden;' : '' }}" style="height: 100vh;">
+  <view class="container">
+    <navigation-bar title="订单确认"></navigation-bar>
 
-  <scroll-view class="record-list" type="list" scroll-y>
-    <!-- <view class="order-status">
+    <scroll-view class="record-list" type="list" scroll-y>
+      <!-- <view class="order-status">
       <view class="status">
         <image src="{{ statusList[status].logo }}"></image>
         <text>{{ statusList[status].title }}</text>
@@ -11,94 +12,94 @@
       <view class="tips">{{ statusList[status].content }}</view>
     </view> -->
 
-    <view wx:if="{{ instrumentsInfo.id }}" class="memberBox {{isAddressInfoTip?'showMemberInfoTip':''}}">
-      <view wx:if="{{ !addressInfo.id }}" class="memberCon" bind:tap="onAddressInfo">
-        <image class="memberImg" src="./images/member.png"></image>
-        <text class="info">请填写收货信息</text>
-        <image class="chevronImg" src="../index/images/chevron.png"></image>
-      </view>
-      <view wx:else class="memberCon" bind:tap="onAddressInfo">
-        <view class="memberInfoCon">
-          <view class="infoCon">
-            <image class="tip" src="./images/member.png" />
-            <text class="name">{{addressInfo.name}}</text>
-            <text class="phone">{{addressInfo.phoneNumber}}</text>
-          </view>
-          <view class="schoolInfoCon">
-            <text class="schoolInfo">收货地址</text><text class="schoolInfoDes">{{addressInfo.addressDes}}</text>
+      <view wx:if="{{ instrumentsInfo.id }}" class="memberBox {{isAddressInfoTip?'showMemberInfoTip':''}}">
+        <view wx:if="{{ !addressInfo.id }}" class="memberCon" bind:tap="onAddressInfo">
+          <image class="memberImg" src="./images/member.png"></image>
+          <text class="info">请填写收货信息</text>
+          <image class="chevronImg" src="../index/images/chevron.png"></image>
+        </view>
+        <view wx:else class="memberCon" bind:tap="onAddressInfo">
+          <view class="memberInfoCon">
+            <view class="infoCon">
+              <image class="tip" src="./images/member.png" />
+              <text class="name">{{addressInfo.name}}</text>
+              <text class="phone">{{addressInfo.phoneNumber}}</text>
+            </view>
+            <view class="schoolInfoCon">
+              <text class="schoolInfo">收货地址</text><text class="schoolInfoDes">{{addressInfo.addressDes}}</text>
+            </view>
           </view>
+          <image class="chevronImg" src="../index/images/chevron.png"></image>
         </view>
-        <image class="chevronImg" src="../index/images/chevron.png"></image>
       </view>
-    </view>
 
-    <view class="order-content">
-      <view class="titTip">订单详情</view>
-      <view class="item-content first-item-content">
-        <image class='goods-icon' src="{{ goodsInfo.pic }}" mode="" />
-        <view class="goods-desc">
-          <view class="goodsInfo">
-            <view class="goods-name">{{ goodsInfo.name }}</view>
-            <view class="goods-price">
-              <text class="stuff">¥ </text>
-              <text class="priceZ">{{ my.formatValue(goodsInfo.originalPrice) }}</text>
+      <view class="order-content">
+        <view class="titTip">订单详情</view>
+        <view class="item-content first-item-content">
+          <image class='goods-icon' src="{{ goodsInfo.pic }}" mode="" />
+          <view class="goods-desc">
+            <view class="goodsInfo">
+              <view class="goods-name">{{ goodsInfo.name }}</view>
+              <view class="goods-price">
+                <text class="stuff">¥ </text>
+                <text class="priceZ">{{ my.formatValue(goodsInfo.originalPrice) }}</text>
+              </view>
+            </view>
+            <view class="goods-type">
+              <view class="goods-card">{{ goodsInfo.typeName }}</view>
+              <view class="goods-num">x1</view>
             </view>
-          </view>
-          <view class="goods-type">
-            <view class="goods-card">{{ goodsInfo.typeName }}</view>
-            <view class="goods-num">x1</view>
           </view>
         </view>
-      </view>
-      <view wx:if="{{ instrumentsInfo.id }}" class="item-content">
-        <image class='goods-icon' src="{{ instrumentsInfo.pic }}" mode="" />
-        <view class="goods-desc">
-          <view class="goodsInfo">
-            <view class="goods-name">{{ instrumentsInfo.name }}</view>
-            <view class="goods-price">
-              <text class="stuff">¥ </text>
-              <text class="priceZ">{{ my.formatValue(instrumentsInfo.originalPrice) }}</text>
+        <view wx:if="{{ instrumentsInfo.id }}" class="item-content">
+          <image class='goods-icon' src="{{ instrumentsInfo.pic }}" mode="" />
+          <view class="goods-desc">
+            <view class="goodsInfo">
+              <view class="goods-name">{{ instrumentsInfo.name }}</view>
+              <view class="goods-price">
+                <text class="stuff">¥ </text>
+                <text class="priceZ">{{ my.formatValue(instrumentsInfo.originalPrice) }}</text>
+              </view>
+            </view>
+            <view class="goods-type">
+              <view class="goods-card"></view>
+              <view class="goods-num">x1</view>
             </view>
           </view>
-          <view class="goods-type">
-            <view class="goods-card"></view>
-            <view class="goods-num">x1</view>
+        </view>
+        <view wx:if="{{goodsInfo.originalPrice + (instrumentsInfo.originalPrice || 0) - (goodsInfo.salePrice + (instrumentsInfo.salePrice || 0)) > 0 }}" class="discountCon">
+          <view class="discountTip">
+            <image src="./images/discount.png"></image>
+            <text>优惠活动</text>
           </view>
+          <view class="discount">
+            <text>-¥ </text>
+            <text>{{my.formatValue(goodsInfo.originalPrice + (instrumentsInfo.originalPrice || 0) - (goodsInfo.salePrice + (instrumentsInfo.salePrice || 0)))}}</text>
+          </view>
+        </view>
+        <view class="totalPic">
+          <text class="titPic">合计</text>
+          <text class="stuff">¥</text>
+          <numberDisplay number="{{ goodsInfo.salePrice + (instrumentsInfo.salePrice || 0) }}" />
         </view>
       </view>
-      <view wx:if="{{goodsInfo.originalPrice + (instrumentsInfo.originalPrice || 0) - (goodsInfo.salePrice + (instrumentsInfo.salePrice || 0)) > 0 }}" class="discountCon">
-        <view class="discountTip">
-          <image src="./images/discount.png"></image>
-          <text>优惠活动</text>
+      <view class="order-content">
+        <view class="titTip">会员信息</view>
+        <view class="memberInfo">
+          <text>姓名</text>
+          <text>{{ memberInfo.name }}</text>
         </view>
-        <view class="discount">
-          <text>-¥ </text>
-          <text>{{my.formatValue(goodsInfo.originalPrice + (instrumentsInfo.originalPrice || 0) - (goodsInfo.salePrice + (instrumentsInfo.salePrice || 0)))}}</text>
+        <view class="memberInfo">
+          <text>联系电话</text>
+          <text>{{ memberInfo.phone }}</text>
+        </view>
+        <view class="memberInfo">
+          <text>学校信息</text>
+          <text>{{ memberInfo.schoolInfo }}</text>
         </view>
       </view>
-      <view class="totalPic">
-        <text class="titPic">合计</text>
-        <text class="stuff">¥</text>
-        <numberDisplay number="{{ goodsInfo.salePrice + (instrumentsInfo.salePrice || 0) }}" />
-      </view>
-    </view>
-    <view class="order-content">
-      <view class="titTip">会员信息</view>
-      <view class="memberInfo">
-        <text>姓名</text>
-        <text>{{ memberInfo.name }}</text>
-      </view>
-      <view class="memberInfo">
-        <text>联系电话</text>
-        <text>{{ memberInfo.phone }}</text>
-      </view>
-      <view class="memberInfo">
-        <text>学校信息</text>
-        <text>{{ memberInfo.schoolInfo }}</text>
-      </view>
-    </view>
 
-    <!-- <view class="order-time">
+      <!-- <view class="order-time">
       <view class="order-item">
         <view class="title">订单号</view>
         <view class="value">2133442226668</view>
@@ -108,23 +109,24 @@
         <view class="value">2023-07-12 18:12:45</view>
       </view>
     </view> -->
-  </scroll-view>
+    </scroll-view>
 
-  <view class="order-btn">
-    <view class="priceCon">
-      <view class="price">
-        <view class="desc">待支付：</view>
-        <text class="stuff">¥</text>
-        <numberDisplay number="{{ goodsInfo.salePrice + (instrumentsInfo.salePrice || 0) }}" />
+    <view class="order-btn">
+      <view class="priceCon">
+        <view class="price">
+          <view class="desc">待支付：</view>
+          <text class="stuff">¥</text>
+          <numberDisplay number="{{ goodsInfo.salePrice + (instrumentsInfo.salePrice || 0) }}" />
+        </view>
+        <text wx:if="{{goodsInfo.originalPrice + (instrumentsInfo.originalPrice || 0) - (goodsInfo.salePrice + (instrumentsInfo.salePrice || 0)) > 0 }}" class="discountVal">已优惠 ¥{{my.formatValue(goodsInfo.originalPrice + (instrumentsInfo.originalPrice || 0) - (goodsInfo.salePrice + (instrumentsInfo.salePrice || 0)))}}</text>
       </view>
-      <text wx:if="{{goodsInfo.originalPrice + (instrumentsInfo.originalPrice || 0) - (goodsInfo.salePrice + (instrumentsInfo.salePrice || 0)) > 0 }}" class="discountVal">已优惠 ¥{{my.formatValue(goodsInfo.originalPrice + (instrumentsInfo.originalPrice || 0) - (goodsInfo.salePrice + (instrumentsInfo.salePrice || 0)))}}</text>
+      <button type="primary" bind:tap="onSubmit">{{ goodsInfo.orderNo ? '继续支付' : '去支付' }}</button>
     </view>
-    <button type="primary" bind:tap="onSubmit">{{ goodsInfo.orderNo ? '继续支付' : '去支付' }}</button>
+    <addAddress popupShow='{{popupShow}}' bind:addAddress="onAddAddress"></addAddress>
+    <!-- 客服 -->
+    <!-- <service wx:if="{{serviceShow}}"></service> -->
   </view>
-  <addAddress popupShow='{{popupShow}}' bind:addAddress="onAddAddress"></addAddress>
-  <!-- 客服 -->
-  <!-- <service wx:if="{{serviceShow}}"></service> -->
-</view>
+</page-meta>
 <wxs module="my">
   var formatValue = function (value) {
     return parseFloat(value).toFixed(2);

miniprogram/pages/orders/orders.ts

@@ -259,6 +259,7 @@ Page({
         if (res.data.code === 200) {
           this.onPaying(paymentType, res.data.data.reqParams, orderNo)
         } else {
+          this.getList()
           this.onPayError(res.data.message)
         }
       },