Merge branch 'main' of https://gitea.lihaink.cn/mkm/shop-applet

pages/activeCode/subsidy.vue

@@ -18,7 +18,7 @@
           <view class="price">{{info.subsidy_amount}}元</view>
           <view>
             <text v-if="info.subsidy_status" class="price">已到账</text>
-            <text v-else>未到账</text>
+            <text v-else>未激活</text>
           </view>
         </view>
       </view>
@@ -95,7 +95,7 @@
             <view class="item2">￥{{ item.extra.sale_amount }}</view>
             <view class="item3">￥{{ item.coupon_price }}</view>
             <view class="item4">
-              <text v-if="item.status!=1">未到账</text>
+              <text v-if="item.status!=1">未激活</text>
               <text v-else style="color: #FF5E0C;">已到账</text>
             </view>
           </view>