Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/H5/threeSide

落日与鲸

2025-02-25 cb9fd84f07662a1215c2f04a70517a42c4dcf1a1

Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/H5/threeSide

 H5/pages/list/list.vue

@@ -71,11 +71,11 @@
                </view>

                <view class="mt-27 ml-40 mr-40 br-19 bgColor4 pt-34 pb-34 fs-27 pl-27 pr-27 flex a-center j-between">

                    <text>{{ item.location || '' }}</text>

                    <image src="../../static/position@2x.png" mode="aspectFill" class="w-31 h-31 ml-10 shrink0"></image>

                    <image src="../../static/position@2x.png" class="w-31 h-31 ml-10 shrink0"></image>

                </view>

                <view class="ml-40 mr-40 mt-31 flex j-between a-center fs-27 txt-center">

                    <view class="">

                        <view class="">

                        <view class="font-bold">

                            问题类型

                        </view>

                        <view class="tip">

@@ -83,7 +83,7 @@
                        </view>

                    </view>

                    <view class="">

                        <view class="">

                        <view class="font-bold">

                            群众姓名

                        </view>

                        <view class="mt-10">

@@ -91,7 +91,7 @@
                        </view>

                    </view>

                    <view class="">

                        <view class="">

                        <view class="font-bold">

                            联系电话

                        </view>

                        <view class="mt-10">

@@ -100,7 +100,7 @@
                    </view>

                </view>

                <view v-if="item.status != '3'" class="fs-27 mt-31 ml-40 mr-40">

                    <view class="">

                    <view class="font-bold">

                        问题描述

                    </view>

                    <view class="mt-10 lh-38">

@@ -108,7 +108,7 @@
                    </view>

                </view>

                <view v-if="item.status != '3' && item.images" class="fs-27 mt-31 ml-40">

                    <view class="">

                    <view class="font-bold">

                        描述图片

                    </view>

                    <view class="mt-19 flex wrap a-center">

@@ -124,7 +124,7 @@
                        创建时间：{{ item.createTime | formatTime }}

                    </view>

                    <view v-if="!['3','5'].includes(item.status)" class="flex a-center j-center fs-23 mt-29 txt-center">

                        <view @click="addProgress(item.id)" class="h-58 lh-58 bgColor5 w-192 br-29 color7">

                        <view @click="addProgress(item.id)" class="h-58 lh-58 bgColor5 w-192 br-29 color10">

                            添加办理进度

                        </view>

                        <view @click="addResult(item.id)" class="ml-38 h-58 lh-58 bgColor6 w-192 br-29 color8">

@@ -266,6 +266,7 @@
    .tip {

        height: 40rpx;

        background-color: #FFFBE6;

        border: 2rpx solid #FFF1B8;

        border-radius: 8rpx;

        color: #FAAD14;

        text-align: center;

@@ -319,6 +320,10 @@
    .color9 {

        color: #999999;

    }

	
    .color10 {

        color: #636363;

    }



    .bgColor1 {

        background: linear-gradient(270deg, #FFB318 0%, #FF330D 100%);