修改

miniprogram/config.ts

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

miniprogram/pages/orders/order-result.ts

@@ -91,7 +91,7 @@ Page({
             code: item.activationCodeInfo.activationCode,
             originalPrice: this.formatPrice(item.paymentCashAmount, 'ALL'),
             typeName: this.formatPeriod(item.activationCodeInfo?.times || 1, item.activationCodeInfo.type),
-            giftLongTime: item.giftFlag ? this.formatGiftPeriod(item.giftVipDay, item.giftPeriod) : ''
+            giftLongTime: this.formatGiftPeriod(item.giftVipDay, item.giftPeriod)
           })
         })
         let refundStyleStr = ''

miniprogram/pages/orders/order-result.wxml

@@ -22,7 +22,7 @@
           <view class="goods-type">
             <view class="innerGroup">
               <view class="goods-card" wx:if="{{ item.typeName }}">{{item.typeName}}</view>
-              <view wx:if="{{ item.giftFlag && item.giftStatus === 'GIFTED' }}" class="innerFree">已<text>赠{{ item.giftLongTime }}</text></view>
+              <view wx:if="{{ item.giftStatus === 'GIFTED' }}" class="innerFree">已<text>赠{{ item.giftLongTime }}</text></view>
             </view>
             <view class="goods-num">x{{item.goodsNum}}</view>
           </view>
@@ -45,7 +45,7 @@
     </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-text" wx:if="{{goodsInfo.wechatStatus == 'WAIT_USE'}}"><text>扫描二维码</text>或<text>点击激活按钮</text>使用<block wx:if="{{ goodsInfo.giftFlag && goodsInfo.giftStatus === 'WAIT_GIFT' }}">
+      <view class="qrcode-text" wx:if="{{goodsInfo.wechatStatus == 'WAIT_USE'}}"><text>扫描二维码</text>或<text>点击激活按钮</text>使用<block wx:if="{{ goodsInfo.giftStatus === 'WAIT_GIFT' }}">
         ，<text class="free">当天激活</text><text class="free blod">赠{{ goodsInfo.giftLongTime }}</text>
       </block>
       </view>

miniprogram/pages/orders/orders.ts

@@ -110,7 +110,7 @@ Page({
             student.originalPrice = this.formatPrice(student.paymentCashAmount, 'ALL');
             student.typeName = this.formatPeriod(student.activationCodeInfo?.times || 1, student.activationCodeInfo?.type);
             // 格式化赠送内容
-            student.giftLongTime = student.giftFlag ? this.formatGiftPeriod(student.giftVipDay, student.giftPeriod) : '';
+            student.giftLongTime = this.formatGiftPeriod(student.giftVipDay, student.giftPeriod);
           })
           item.studentPaymentOrderDetails = studentPaymentOrderDetails
         });

miniprogram/pages/orders/orders.wxml

@@ -26,10 +26,8 @@
                 <view class="goods-type">
                   <view class="innerGroup">
                     <view class="goods-card" wx:if="{{ item.typeName }}">{{item.typeName}}</view>
-                    <block wx:if="{{ item.giftFlag }}">
-                      <view class="innerFree" wx:if="{{ item.giftStatus === 'WAIT_GIFT' }}">当天激活<text>赠{{ item.giftLongTime }}</text></view>
-                      <view class="innerFree" wx:if="{{ item.giftStatus === 'GIFTED' }}">已<text>赠{{ item.giftLongTime }}</text></view>
-                    </block>
+                    <view class="innerFree" wx:if="{{ item.giftStatus === 'WAIT_GIFT' }}">当天激活<text>赠{{ item.giftLongTime }}</text></view>
+                    <view class="innerFree" wx:if="{{ item.giftStatus === 'GIFTED' }}">已<text>赠{{ item.giftLongTime }}</text></view>
                   </view>
                   <view class="goods-num">x{{item.goodsNum}}</view>
                 </view>