博物馆跳转修改、景点详情二维码是否继续展示

app.js

@@ -21,7 +21,7 @@ App({
       unique_key: "wechatxcx"
     }).then(res => {
       let data = JSON.parse(res.data);
-      data.isTest = data.isTest103? true : false;
+      data.isTest = data.isTest104? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件

pages/list/museum/index.js

@@ -36,16 +36,20 @@ Page({
     util.gotoDetail(item,1);
   },
   gotoDetailOther: function(e) {
-    if (e.currentTarget.dataset.id==44703) {
-      wx.navigateToMiniProgram({
-          appId: 'wxfef80ee1ab7e58a2',
-          path: 'pages/inners/main'
-        })
-        return;
-  }
-    wx.navigateTo({
-      url: '/pages/info/museumInfo/index?id='+e.currentTarget.dataset.id
+    wx.navigateToMiniProgram({
+      appId: 'wxfef80ee1ab7e58a2',
+      path: 'pages/index/index'
     })
+  //   if (e.currentTarget.dataset.id==44703) {
+  //     wx.navigateToMiniProgram({
+  //         appId: 'wxfef80ee1ab7e58a2',
+  //         path: 'pages/inners/main'
+  //       })
+  //       return;
+  // }
+  //   wx.navigateTo({
+  //     url: '/pages/info/museumInfo/index?id='+e.currentTarget.dataset.id
+  //   })
   },
   search:function(e){
     this.setData(e.detail);

pages/list/museum/index.wxml

@@ -14,7 +14,7 @@
     </view>
     <view class="info textOver" wx:else style="height:320rpx;">
       <view class="title textOver">{{item.title}}</view>
-      <view class="com-flex border">
+      <view class="com-flex border" catchtap="gotoDetailOther">
         <text>博物馆本馆</text>
         <view class="btn-yy">预约</view>
       </view>

pages/user/order/sceneOrderInfo/index.js

@@ -53,6 +53,9 @@ Page({
     let that = this,sys =wx.getSystemInfoSync(),radio = sys.screenWidth / 750,qrcode=this.data.info.order_product_list[0].qrcode,codeImgs=[],codeId=0,arr = [];
     this.data.info.order_product_list.forEach(qrcode=>{
       qrcode.qrcode.map((item,index)=>{
+        console.log(qrcode.is_force_display_code);
+        item.is_force_display_code = qrcode.is_force_display_code
+        console.log(item.is_force_display_code);
         arr.push(index)
         this.setData({
           imgLen:arr
@@ -69,6 +72,7 @@ Page({
           })
         }
         else {
+          console.log(item);
           new QRCode('damocode'+codeId,{
             text: item.use_code,
             width: 300 * radio,
@@ -77,16 +81,19 @@ 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});
+              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});
               that.setData({
                 codeImgs:codeImgs
               })
             }
           })
+          console.log(this.data.codeImgs);
           codeId = codeId + 1
         }
       }) 
     })
+    console.log(this.data.imgLen);
+    console.log(this.data.codeImgs);
   },
   prevCodeImg:function(){
     let qrcode=this.data.info.order_product_list[0].qrcode,codeIndex = this.data.codeIndex;

pages/user/order/sceneOrderInfo/index.wxml

@@ -16,8 +16,14 @@
 </view> -->
 <view class="code-box box" wx:if="{{info && codeImgs.length>0}}">
   <view bindtap="prevCodeImg" class="iconfont icon-you-copy"></view>
-  <view wx:for="{{codeImgs}}" wx:if="{{index==codeIndex}}">
+  <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-state">
+        {{item.state}}
+      </view>
+    </view>
   </view>
   <view bindtap="nextCodeImg" class="iconfont icon-you"></view>
   <view class="code-text">{{codeImgs[codeIndex].text}}:{{codeImgs[codeIndex].code}}</view>

pages/user/order/sceneOrderInfo/index.wxss

@@ -313,4 +313,29 @@ page {
 }
 .btn{
   float: right;
+}
+.text-shadow {
+  position: absolute;
+  left: 0;
+  right: 0;
+  top: 0;
+  bottom: 0;
+  margin: auto;
+  text-align: center;
+  background: rgba(0, 0, 0, .3);
+  width: 300rpx;
+  height: 300rpx;
+  /*border-radius: .3rem;*/
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  z-index: 10;
+}
+.text-shadow-state {
+  width: 200rpx;
+  height: 200rpx;
+  line-height: 200rpx;
+  background: #FFFFFF;
+  border-radius: 50%;
+  color: #0B898E;
 }