Merge branch 'feature_20250722_金牌店档案收集' into uat(dev)

src/views/home/bottomBtn.vue

@@ -2,9 +2,10 @@
   <div class="bottomBtn">
     <div style="color: #999; font-size: 12px; margin: 0 10px">
       <!--      昨日新增的数据统一在上午9点更新.-->
-      <span v-if="reportInfoData.newUser"
-        ><van-icon name="info-o" />&nbsp;新人入职后5个工作日不用提交日报.</span
-      >
+      <span v-if="reportInfoData.newUser">
+        <van-icon name="info-o" />
+        &nbsp;新人入职后5个工作日不用提交日报.
+      </span>
     </div>
     <div class="lineGrey"></div>
     <div v-if="approvalButton && !GZdata" class="contentborder">
@@ -90,6 +91,20 @@
       >
     </div>
     <!-- <p class="updataTime" v-if="type != 4 && tabVal != '-1'">更新时间:{{ updataTime }}</p> -->
+    <div class="ownerBirthdayRemind" v-if="ownerBirthdayBoxFlag">
+      <div class="ownerBirthdayBox">
+        <div class="title">金牌店生日提醒</div>
+        <div class="content">
+          请及时送上生日祝福!{{
+            this.reportInfoData.ownerBirthdayRemind
+          }}将在3日后生日,请及时送上生日祝福!
+        </div>
+        <img :src="require('@/assets/dangao.png')" />
+      </div>
+      <div class="close" @click="ownerBirthdayBoxFlag = false">
+        <img :src="require('@/assets/close.png')" />
+      </div>
+    </div>
   </div>
 </template>
 <script>
@@ -114,6 +129,7 @@ export default {
       isCommit: null,
       updataTime: '',
       type: '-1',
+      ownerBirthdayBoxFlag: false,
     };
   },
   activated() {
@@ -150,6 +166,13 @@ export default {
           }
           this.approvalPendingNum = res.data.approvalPendingNum;
           this.type = res.data.userType;
+          // 金牌店老板生日提醒
+          if (res.data.ownerBirthdayRemind) {
+            this.ownerBirthdayBoxFlag = true;
+            this.reportInfoData.ownerBirthdayRemind = res.data.ownerBirthdayRemind.join(',');
+          } else {
+            this.ownerBirthdayBoxFlag = false;
+          }
         } else {
           this.$toast(res.msg);
         }
@@ -189,4 +212,59 @@ export default {
   },
 };
 </script>
-<style scoped lang="scss"></style>
+<style scoped lang="scss">
+.bottomBtn {
+  .ownerBirthdayRemind {
+    width: 100%;
+    height: 100%;
+    position: fixed;
+    top: 0;
+    z-index: 999999;
+    background: rgba(0, 0, 0, 0.5);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    flex-direction: column;
+    .ownerBirthdayBox {
+      width: 90%;
+      // height: 369px;
+      background: url('../../assets/ownerBirthdayBG.png') no-repeat center center;
+      background-size: 100% 100%;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      .title {
+        text-align: center;
+        font-size: 20px;
+        color: #99443b;
+        // margin-top: 30px;
+        font-weight: bold;
+        height: 68px;
+        display: flex;
+        align-items: end;
+      }
+      .content {
+        width: 75%;
+        line-height: 30px;
+        font-size: 16px;
+        color: #555555;
+        text-align: center;
+        margin-top: 20px;
+      }
+      img {
+        width: 75%;
+        height: 160px;
+        margin-top: 20px;
+        margin-bottom: 30px;
+      }
+    }
+    .close {
+      img {
+        width: 35px;
+        height: 35px;
+        margin-top: 10px;
+      }
+    }
+  }
+}
+</style>

src/views/storeManagement/JPattributeEditor.vue

@@ -220,6 +220,7 @@ export default {
         this.toastLoading().clear();
         if (res.code == 200) {
           this.$toast(res.msg);
+          this.$router.go(-1);
         } else {
           this.$toast(res.msg);
         }
@@ -252,7 +253,7 @@ export default {
       border-bottom: 1px solid #ccc;
     }
     .van-field__label {
-      width: 10em;
+      width: 9em;
     }
     .sendCode {
       border: none !important;
@@ -263,6 +264,7 @@ export default {
     }
     .van-checkbox--horizontal {
       margin-bottom: 10px;
+      width: 100%;
     }
     .van-radio--horizontal {
       margin-bottom: 10px;

src/views/storeManagement/storeDetail.vue

@@ -9,8 +9,8 @@
           </template>
           <template v-else>
             <!-- 金牌店 编辑属性信息 当前门店是否是我覆盖的:myCover -->
-            <!-- <template v-if="list.myCover"> -->
             <template>
+              <!-- <template v-if="list.myCover"> -->
               <span style="color: #0057ba" v-if="type != 'address'" @click="attributeEditor">
                 编辑
               </span>