优化

miniprogram/pages/index/index.ts

@@ -201,9 +201,11 @@ Page({
       info = encodeURIComponent(info);
       wx.navigateTo({
         url: `../orders/order-detail?orderInfo=${info}`,
-      })
-      that.setData({
-        popupShow: false
+        success: () => {
+          that.setData({
+            popupShow: false
+          })
+        }
       })
     }, 500)()
   },

miniprogram/pages/orders/order-result.less

@@ -175,6 +175,26 @@ page {
   width: 202rpx;
   height: 202rpx;
 }
+
+.qrcode-text {
+  font-size: 28rpx;
+  color: #777;
+  line-height: 40rpx;
+  border-radius: 12rpx;
+  font-size: 26rpx;
+  border: 2rpx solid #F2F2F2;
+  padding: 16rpx 24rpx;
+  text-align: left;
+  margin: 30rpx 20rpx;
+  text {
+    color: #DDA64C;
+    font-weight: bold;
+  }
+  &.used {
+    color: #777;
+    border-color: #E9E6E3;
+  }
+}
 .qrcode-section {
   margin-top: 20rpx;
   padding-bottom: 32rpx;
@@ -251,24 +271,6 @@ page {
     background-color: #fff;
     padding: 6rpx;
   }
-  .qrcode-text {
-    font-size: 28rpx;
-    color: #777;
-    line-height: 40rpx;
-    border-radius: 12rpx;
-    font-size: 26rpx;
-    border: 2rpx solid #F2F2F2;
-    padding: 16rpx 24rpx;
-    text-align: left;
-    text {
-      color: #DDA64C;
-      font-weight: bold;
-    }
-    &.used {
-      color: #777;
-      border-color: #E9E6E3;
-    }
-  }
 }
 
 .order-time {

miniprogram/pages/orders/order-result.wxml

@@ -41,11 +41,12 @@
       </view>
     </view>
     <view class="order-content" wx:if="{{ (goodsInfo.wechatStatus == 'PAID' || goodsInfo.wechatStatus == 'WAIT_USE') && showCanvas }}">
-      <view class="qrcode-title" >{{ goodsInfo.wechatStatus == 'WAIT_USE' ? '请扫码激活' : '激活码已使用' }}</view>
+      <!-- <view class="qrcode-title" >{{ goodsInfo.wechatStatus == 'WAIT_USE' ? '请扫码激活' : '激活码已使用' }}</view> -->
+      <view class="qrcode-text" wx:if="{{goodsInfo.wechatStatus == 'WAIT_USE'}}"><text>扫描二维码</text>或<text>点击激活按钮</text>使用</view>
+        <view class="qrcode-text used" wx:else>登录<text>「音乐数字课堂」</text>APP，开启AI学练之旅～</view>
       <view class="qrcode-line"></view>
       <view class="qrcode-section">
-        <view class="qrcode-text" wx:if="{{goodsInfo.wechatStatus == 'WAIT_USE'}}"><text>扫描二维码</text>或<text>点击激活按钮</text>使用</view>
-        <view class="qrcode-text used" wx:else>登录<text>「音乐数字课堂」</text>APP，开启AI学练之旅～</view>
+        
         <view class="qrcode-block">
           <view class="left-text">{{goodsInfo.wechatStatus == 'WAIT_USE' ? '待使用' : '已使用'}}</view>
           <view class="qrCodeSection">