Merge remote-tracking branch 'origin/master'

rk

2025-09-28 2304d7b140c5c5b4bf3a83f9ced8bff37d20c42e

Merge remote-tracking branch 'origin/master'

 small-program/pages/demand-hall/demand-hall.vue

@@ -253,7 +253,7 @@
                this.status = -1
            }
            console.log(getApp().globalData,this.status ,"=====================================")
            this.typeViewId = 0
            // this.typeViewId = 0
            if(this.token && this.token != '' && this.userInfo && JSON.stringify(this.userInfo) != '{}'){
                console.log('已登陆')
                this.isLogin = true
@@ -267,6 +267,7 @@
                } */
            } else {
                this.isLogin = false
                this.typeViewId = 0
                console.log('未登陆')
            }
            if(this.isLogin){

 small-program/pages/order-details/order-details.vue

@@ -14,8 +14,8 @@
            <view class="order-head-info" v-else >{{getStatusInfo()}}</view> 
        </view>
        <view class="order-quxiao">
            <view class="order-quxiao-btn" @click="show = true" v-if="(isAcceptor && info.status ===2) || (isPushlishor  &&  info.isUpdate!=1 &&  info.status ===2)">取消订单</view>
            <view class="order-quxiao-btn1" v-if="isPushlishor && info.type!=2 &&  info.isUpdate!=1 &&   info.status ===2 " @click="jumpEdit()">修改订单</view>
            <view class="order-quxiao-btn" @click="show = true" v-if="(isAcceptor && info.status ===2) || (isPushlishor  &&  info.isUpdate!=1 &&  info.status ===2&&  info.canStart ===1)">取消订单</view>
            <view class="order-quxiao-btn1" v-if="isPushlishor && info.type!=2 &&  info.isUpdate!=1 &&   info.status ===2 &&  info.canStart ===1" @click="jumpEdit()">修改订单</view>
        </view>
        <view class="order-user"  v-if="isPushlishor && info.acceptMemberId">
            <view class="order-user-info">
@@ -239,7 +239,7 @@
        </view>
        <view style="width: 100%; height: calc(108rpx + env(safe-area-inset-bottom));" v-if="![99].includes(info.status)"></view>
        <view class="order-footer" v-if="![99].includes(info.status)">
            <template v-if="isPushlishor && info.isUpdate != 1 && info.status === 2 && canStart==1">
            <template v-if="isPushlishor && info.isUpdate != 1 && info.status === 2 && info.canStart===1">
                <sunui-mverify v-if="1==2" hint="开始作业" @change="getaccept($event)"></sunui-mverify>
                <view class="order-footer-btn" v-if="comparisonTime(info.startDate)"> 
                    <view class="order-footer-btn-b" @click="show8 = true">开始作业</view>