修改冲突

src/pages/login/login.vue

@@ -1,7 +1,7 @@
 <template>
     <z-paging ref="paging" bgColor="rgba(0,0,0,0)">
         <template #top>
-            <up-navbar :fixed="false" title="登录">
+            <up-navbar :fixed="false" title="登录注册">
                 <template #left>
                     <!-- <image @click="$u.route({ type: 'switchTab', url: '/pages/list/index' })" class="home_icon" src="https://ta.zycpzs.cn/oss-file/smart-trace/szyy/images/common/home.png" mode="widthFix" /> -->
                     <up-icon @click="homeBack()" name="arrow-left" color="#333" size="40rpx"></up-icon>
@@ -26,20 +26,16 @@
                 <template v-if="isBindPhone">
                     <up-button class="mb-40" @click="handleLogin" color="#28A94B" type="primary" shape="circle">
                         <view class="d-flex a-c j-c">
-                            <!-- <image class="base-icon mr-20"
-                                src="https://ta.zycpzs.cn/oss-file/smart-trace/szyy/images/login/weixin_logo.png"
-                                mode="widthFix" /> -->
-                            手机号快捷登录
+                            <image class="w-45 mr-10" src="https://ta.zycpzs.cn/oss-file/smart-trace/szyy/images/login/weixin_logo.png" mode="widthFix" />
+                            一键登录
                         </view>
                     </up-button>
                 </template>
                 <template v-else>
                     <up-button class="mb-40" color="#28A94B" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber" type="primary" shape="circle">
                         <view class="d-flex a-c j-c">
-                            <!-- <image class="base-icon mr-20"
-                                src="https://ta.zycpzs.cn/oss-file/smart-trace/szyy/images/login/weixin_logo.png"
-                                mode="widthFix" /> -->
-                            手机号快捷登录
+                            <image class="w-45 mr-10" src="https://ta.zycpzs.cn/oss-file/smart-trace/szyy/images/login/weixin_logo.png" mode="widthFix" />
+                            一键登录
                         </view>
                     </up-button>
                 </template>

src/plant/base/gap-base-info/index.vue

@@ -20,8 +20,8 @@
             <template>
                 <view class="pl-25 pr-25">
                     <up-swipe-action>
-                        <up-swipe-action-item v-for="item in list" :name="item?.id" :key="item?.id" :options="optionsAction" @click="clickSwipe" class="mb-20">
-                            <view class="b-radius bg-#fff pd-20">
+                        <up-swipe-action-item v-for="item in list" :name="item?.id" :key="item?.id" :options="optionsAction" @click="clickSwipe" class="mb-20 b-radius">
+                            <view class="b-radius bg-#fff pd-20 p-rtv">
                                 <view class="c-#333 f-s-34 f-w-5 pb-5">{{ item?.gapBaseName }}</view>
                                 <view class="c-#999 f-s-24 pb-20">{{ item?.ratedDate }}获评</view>
                                 <view class="d-flex pb-5">
@@ -34,14 +34,17 @@
                                         <text class="c-#333 f-s-28 f-w-5">{{ item?.area }}</text>
                                     </view>
                                 </view>
-                                <view class="border-bottom-#f7f7f7 pb-20">
+                                <view class="pb-20">
                                     <text class="c-#666 f-s-28">基地地址:</text>
                                     <text class="c-#333 f-s-28 f-w-5">{{ item?.address }}</text>
                                 </view>
-                                <view class="pl-5 pr-5 pt-20 pb-20 border-top-#f7f7f7 c-#FC333F">
+                                <view v-if="+item?.res == 2" class="pl-5 pr-5 pt-20 pb-20 border-top-#f7f7f7 c-#FC333F">
                                     <text class="f-s-28">审核不通过原因:</text>
                                     <text class="f-s-28">{{ item?.msg }}</text>
                                 </view>
+                                <image v-if="+item?.res == 2" class="w-145" src="/static/images/plant/resFailed.png" style="position: absolute; top: 0; right: 0" mode="widthFix" />
+                                <image v-if="+item?.res == 0" class="w-100" src="/static/images/plant/resPendingReview.png" style="position: absolute; top: 0; right: 0" mode="widthFix" />
+                                <image v-if="+item?.res == 1" class="w-90" src="/static/images/plant/resEffective.png" style="position: absolute; top: 0; right: 0" mode="widthFix" />
                             </view>
                         </up-swipe-action-item>
                     </up-swipe-action>
@@ -98,7 +101,7 @@ interface MedicineBase {
         url: string;
         fileSize: number;
     }>;
-    res: string;
+    res: string; // 0-待审核 1-通过 2-审核不通过
     auditor: number;
     msg: string;
     coordinates: Array<