1

miniprogram/app.ts

@@ -38,9 +38,6 @@ App<IAppOption>({
     const deviceNum = deviceInfo.brand + '-' + deviceInfo.model + '-' + deviceInfo.platform + '-' + deviceInfo.system
     this.globalData.deviceNum = deviceNum
   },
-  // userInfoReadyCallback(result) {
-  //   console.log(result, 'result')
-  // }
   /** 微信登录 */
   async onLogin(code: string) {
     wx.showLoading({

miniprogram/pages/buyerInformation/index.less

@@ -196,7 +196,7 @@ toolbar-confirm {
 .empty-box {
   padding-top: 12rpx;
   box-sizing: border-box;
-  height: 176px;
+  height: 220px;
   text-align: center;
   font-size: 32rpx;
   font-family: PingFangSC-Regular, PingFang SC;

miniprogram/pages/buyerInformation/index.wxml

@@ -18,7 +18,7 @@
         <van-field model:value="{{ name }}" placeholder="请输入学生姓名" input-align="right" maxlength="14">
           <view class="required" slot="label"><text>*</text>学生姓名</view>
         </van-field>
-        <van-field border="{{ false }}" input-align="right">
+        <van-field input-align="right">
           <view class="required" slot="label"><text>*</text>学生性别</view>
           <view class="gender-section" slot="input">
             <view class="gender-item {{ gender === '1' ? 'active' : '' }}" bind:tap="onCheckGender" data-gender="1">男</view>

miniprogram/pages/orders/order-result.ts

@@ -1,7 +1,7 @@
 // pages/orders/order-detail.ts
 import { api_userPaymentOrderDetail } from "../../api/login";
 import { formatPrice, GRADE_ENUM } from "../../utils/util";
-
+const app = getApp<IAppOption>()
 // 获取应用实例
 Page({
   /**
@@ -58,12 +58,25 @@ Page({
       });
     }
   },
-  onShow() {
-    if(this.data.orderNo) {
+  onTimeing() {
+    if (!app.globalData.isLogin) {
+      setTimeout(() => {
+        this.onTimeing()
+      }, 500);
+    } else {
       this.getDetail(this.onTimeout)
     }
   },
+  onShow() {
+    // if(this.data.orderNo) {
+    //   this.getDetail(this.onTimeout)
+    // }
+    this.onTimeing()
+  },
   async getDetail(callback?: any) {
+    if (!this.data.orderNo) {
+      return
+    }
     try {
       const { data } = await api_userPaymentOrderDetail(this.data.orderNo, {
         version: 'V2'
@@ -98,13 +111,13 @@ Page({
 
         const allDiscountPrice: any = formatPrice(result.originalPrice - result.paymentCashAmount)
         const allAfterPrice: any = formatPrice(result.paymentCashAmount)
-        
+
         const goodsInfo = {
           discountIntegerPart: allDiscountPrice.integerPart,
           discountDecimalPart: allDiscountPrice.decimalPart,
           paymentCashAmount: result.paymentCashAmount,
           originalPrice: result.originalPrice,
-          integerPart:  allAfterPrice.integerPart,
+          integerPart: allAfterPrice.integerPart,
           decimalPart: allAfterPrice.decimalPart,
           orderNo: result.orderNo,
           createTime: result.createTime,
@@ -175,10 +188,10 @@ Page({
     wx.setClipboardData({
       data: e.currentTarget.dataset.orderno,
       success: () => {
-        wx.showToast({title: '复制成功', icon: 'none'})
+        wx.showToast({ title: '复制成功', icon: 'none' })
       },
       fail: () => {
-        wx.showToast({title: '复制失败，请稍后再试', icon: 'none'})
+        wx.showToast({ title: '复制失败，请稍后再试', icon: 'none' })
       }
     })
   },

miniprogram/pages/orders/orders.less

@@ -168,7 +168,7 @@
         background: #FFF1E0;
         border-radius: 6rpx;
         font-size: 26rpx;
-        color: #FE2451;
+        color: #FE4600;
         line-height: 40rpx;
         padding: 0 12rpx;
       }
@@ -180,7 +180,6 @@
 
         text {
           padding-left: 4rpx;
-          font-weight: bold;
         }
       }
     }

miniprogram/pages/select-goods/index.less

@@ -396,7 +396,6 @@
           padding-bottom: 2rpx;
           font-size: 24rpx;
           color: #AAAAAA;
-          font-weight: bold !important;
           text {
             padding-right: 4rpx;
             font-weight: 400 !important;

project.private.config.json

@@ -16,34 +16,6 @@
           "scene": null
         },
         {
-          "name": "pages/select-goods/index",
-          "pathName": "pages/select-goods/index",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "pages/orders/order-result",
-          "pathName": "pages/orders/order-result",
-          "query": "orderNo=1889588449653125122&tabIdx=0",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "pages/address/index",
-          "pathName": "pages/address/index",
-          "query": "receiveAddress=",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "pages/orders/order-detail",
-          "pathName": "pages/orders/order-detail",
-          "query": "orderInfo=%257B%25220%2522%253A%257B%2522pic%2522%253A%2522https%253A%252F%252Foss.dayaedu.com%252Fktyq%252Fbasic%252F1739175447189.png%2522%252C%2522name%2522%253A%2522%25E7%25BB%2588%25E8%25BA%25AB%2522%252C%2522originalPrice%2522%253A%25223888.00%2522%252C%2522salePrice%2522%253A3680.01%252C%2522shopId%2522%253A%25221860977507241574402%2522%252C%2522id%2522%253A%25221861228127462633474%2522%252C%2522goodsType%2522%253A%2522ACTIVATION_CODE%2522%257D%252C%25221%2522%253A%257B%2522pic%2522%253A%2522https%253A%252F%252Foss.dayaedu.com%252Fktyq%252Fbasic%252F1739174280217.png%2522%252C%2522name%2522%253A%2522%25E5%25BE%25B7%25E5%25BC%258F%25E7%25AB%2596%25E7%25AC%259B%2522%252C%2522originalPrice%2522%253A199%252C%2522salePrice%2522%253A99%252C%2522shopId%2522%253A%25221860977507241574402%2522%252C%2522id%2522%253A%25221888860066698870786%2522%252C%2522goodsType%2522%253A%2522INSTRUMENTS%2522%257D%257D&userBeneficiaryId=1889266174420692993",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
           "name": "pages/login/login",
           "pathName": "pages/login/login",
           "query": "",