Merge branch 'develop' of http://101.37.147.115:3000/mz666/bocai_supplyChain into develop

pages/billDetail/index.js

@@ -619,6 +619,10 @@ Page({
         // 驻场信息样式统一
         userinfo.newZhuchang = userinfo.onSiteInfo.replaceAll("；", "\n");
         userinfo.totalZC = userinfo.prevRecordId || (!userinfo.prevRecordId && !userinfo.nextRecordId) ? userinfo.newZhuchang : "";
+
+        console.log(userinfo.totalZC)
+
+
         if (userinfo.upOnSiteInfo) {
           userinfo.totalZC = userinfo.upOnSiteInfo || !userinfo.prevRecordId ? userinfo.upOnSiteInfo.replaceAll("；", "\n") + "\n" + userinfo.totalZC : userinfo.totalZC;
 

pages/billDetail/index.wxml

@@ -553,30 +553,6 @@
           <text style="min-width:90px" class="dib tr">代理政策：</text>
           <text>{{recordDetail.policy || '-'}}</text>
         </view>
-
-        <!-- <view class="f16 c3 mb8">
-              <text style="min-width:90px" class="dib tr">面试时间：</text>
-              <text>{{interviewTime}}</text>
-        </view>-->
-        <!-- <view class="f16 c3 mb8" wx:if="{{isTimeShowDbl && status != 30  && status != 48 && status != 50 && status != 35}}">
-              <text style="min-width:90px" class="dib tr">{{timeText2}}：</text>
-              <text>{{timeStr2}}</text>
-            </view>
-
-            <view class="f16 c3 mb8" wx:if="{{isTimeShow}}">
-              <text style="min-width:90px" class="dib tr">{{timeText}}：</text>
-              <text>{{timeStr}}</text>
-            </view>
-
-            <view class="f16 c3 mb8"  wx:if="{{isTimeShowDbl && (status == 30 ||  status == 48)}}">
-              <text style="min-width:90px" class="dib tr">{{timeText2}}：</text>
-              <text>{{timeStr2}}</text>
-        </view>-->
-
-        <!-- <view class="weui-cell" wx:if="{{item.isTimeShowDbl && (item.status == 30 ||  item.status == 48)}}">
-          <view class="weui-cell__hd"><label class="weui-label c085">{{item.timeText2}}</label></view>
-          <view class="weui-cell__bd tr">{{item.timeStr2}}</view>
-        </view>-->
       </view>
       <view class="weui-dialog__ft">
         <view aria-role="button" class="weui-dialog__btn weui-dialog__btn_default" bindtap="copyClose2">复制文本</view>

project.miniapp.json

@@ -1,7 +1,8 @@
 {
   "miniVersion": "v2",
   "name": "伯才供应链",
-  "version": "1.1.11",
+  "version": "1.2.0",
+
   "i18nFilePath": "i18n",
   "mini-android": {
     "sdkVersion": "1.6.2",
@@ -107,5 +108,9 @@
       "customImage": "/Users/zhangshaokang/Desktop/伯才供应链app上架相关图片/安卓启动页及图标/画板备份 12.png"
     }
   },
+<<<<<<< HEAD
+  "versionCode": 120
+=======
   "versionCode": 125
+>>>>>>> f9e7a56bed4415c8dc3372ab13fd25ed5ac6d5ee
 }