From 1b78b00bab64dca3649723447340dcc4e1e75278 Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Tue, 26 Mar 2024 13:52:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                     | 2 +-
 pages/user/order/sceneOrderInfo/index.js   | 2 +-
 pages/user/order/sceneOrderInfo/index.wxml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app.js b/app.js
index b1cb39c..7e06a32 100644
--- a/app.js
+++ b/app.js
@@ -21,7 +21,7 @@ App({
       unique_key: "wechatxcx"
     }).then(res => {
       let data = JSON.parse(res.data);
-      data.isTest = data.isTest104? true : false;
+      data.isTest = data.isTest105? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/user/order/sceneOrderInfo/index.js b/pages/user/order/sceneOrderInfo/index.js
index 66dd20f..a1a6e93 100644
--- a/pages/user/order/sceneOrderInfo/index.js
+++ b/pages/user/order/sceneOrderInfo/index.js
@@ -81,7 +81,7 @@ Page({
             correctLevel: QRCode.CorrectLevel.H, // 二维码可辨识度
             callback: (res) => {
               console.log(res);
-              codeImgs.push({img:res.path,code:item.use_code,text:item.use_code_display_text,state:item.stateText,is_force_display_code:item.is_force_display_code});
+              codeImgs.push({img:res.path,code:item.use_code,text:item.use_code_display_text,state:item.stateText,is_force_display_code:item.is_force_display_code,flag:item.state});
               that.setData({
                 codeImgs:codeImgs
               })
diff --git a/pages/user/order/sceneOrderInfo/index.wxml b/pages/user/order/sceneOrderInfo/index.wxml
index 604c2f7..4bccaf9 100644
--- a/pages/user/order/sceneOrderInfo/index.wxml
+++ b/pages/user/order/sceneOrderInfo/index.wxml
@@ -19,7 +19,7 @@
   <view wx:for="{{codeImgs}}" wx:if="{{index==codeIndex}}" style="position: relative;">
     <image src="{{item.img}}" mode="widthFix" style="width:300rpx;"></image>
     <!-- 代表核销后是否继续展示二维码（0否1是） -->
-    <view class="text-shadow" wx:if="{{item.is_force_display_code == 0}}">
+    <view class="text-shadow" wx:if="{{item.is_force_display_code != 1 && item.flag != 0}}">
       <view class="text-shadow-state">
         {{item.state}}
       </view>