347617796@qq.com před 4 roky
rodič
revize
7cfcd81828

+ 2 - 2
app.js

@@ -1,8 +1,8 @@
 import { showToast } from './utils/feedback'
 import { formatTime, arrRemoveObj, getTypeItem } from './utils/util'
 
-// const baseUrl = "https://test-ding.g107.com/";//测试
-const baseUrl = "https://ding.insys.g107.com/";//正式
+const baseUrl = "https://test-ding.g107.com/";//测试
+// const baseUrl = "https://ding.insys.g107.com/";//正式
 var that;
 var yearArr = [];
 var year = formatTime(new Date()).year;

+ 2 - 2
pages/statistics/prizeBuckleDetail/prizeBuckleDetail.axml

@@ -62,11 +62,11 @@
       </view>
     </view>
   </view>
-  <!-- <view class="bottom flex-box flex-flex-center-center" a:if="{{dataDetail.applyor_id==userId&&dataDetail.process.length==1&&(dataDetail.event_type==3||dataDetail.event_type==4)}}">
+  <view class="bottom flex-box flex-flex-center-center" a:if="{{dataDetail.recorder_id==userId&&dataDetail.process.length==1&&(dataDetail.event_type==3||dataDetail.event_type==4)}}">
       <text class="flex-2 fontColorF">撤销后数据将不可恢复</text>
       <view></view>
       <view class="flex-1 blueBtn" catchTap="openCx">撤销奖扣</view>
-  </view> -->
+  </view>
   <!-- 调用过程组件 -->
   <view class="">
     <process process="{{dataDetail.process}}" a:if="{{dataDetail.process.length>0}}"/>