Selaa lähdekoodia

Merge branch 'feature_20260304_日报分享有两个细节优化点' into uat(dev)

# Conflicts:
#	src/views/storeManagement/storeAdd.vue
zhujindu 6 päivää sitten
vanhempi
commit
2f456fabe1

+ 1 - 1
src/views/storeManagement/storeAdd.vue

@@ -1769,6 +1769,7 @@ export default {
       this.fromValue.orderProductStoreList = arrList;
       this.toastLoading(0, '上传中...', true);
       var fromValue = this.fromValue;
+      var telrg = /^1[123456789]\d{9}$/;
       if (
         this.fromValue.storeCompetitorList == null ||
         this.fromValue.storeCompetitorList == undefined
@@ -1776,7 +1777,6 @@ export default {
         this.fromValue.storeCompetitorList = [];
       }
       this.activatedStoreCompetitor = [];
-      var telrg = /^1[123456789]\d{9}$/;
       if (fromValue.orgId == '') {
         this.$toast('部门未选择');
         return;

+ 6 - 6
src/views/week/dailyDetails.vue

@@ -12,7 +12,7 @@
               <van-icon name="share" />
               <div class="vedioLinks" @click.stop="shareVedioLinks">
                 <span>一键分享日报,</span>
-                <span class="linkSpan">点击查看操作视频</span><van-icon name="play" />
+                <span class="linkSpan">点击查看</span><van-icon name="play" />
               </div>
             </div>
           </template>
@@ -1034,8 +1034,8 @@ export default {
   width: 100%;
   height: 100%;
   .shareBtn {
-    width: 22px;
-    height: 22px;
+    width: 30px;
+    height: 30px;
     border-radius: 50%;
     background: #666;
     display: flex;
@@ -1046,9 +1046,9 @@ export default {
       color: #fff;
     }
     .vedioLinks {
-      max-width: vw(205);
+      max-width: vw(150);
       position: absolute;
-      bottom: -13px;
+      bottom: -6px;
       background: #dae7f6;
       padding: 2px 7px;
       /* word-break: keep-all; */
@@ -1057,7 +1057,7 @@ export default {
       right: 0;
       border-radius: 5px;
       font-size: 10px;
-      right: 28px;
+      right: 40px;
       display: flex;
       flex-direction: column;
       justify-content: center;

+ 6 - 6
src/views/week/dailyHistoricalDetails.vue

@@ -19,7 +19,7 @@
               <van-icon name="share" />
               <div class="vedioLinks" @click.stop="shareVedioLinks">
                 <span>一键分享日报,</span>
-                <span class="linkSpan">点击查看操作视频</span><van-icon name="play" />
+                <span class="linkSpan">点击查看</span><van-icon name="play" />
               </div>
             </div>
           </template>
@@ -1147,8 +1147,8 @@ export default {
     background: #fff;
   }
   .shareBtn {
-    width: 22px;
-    height: 22px;
+    width: 30px;
+    height: 30px;
     border-radius: 50%;
     background: #666;
     display: flex;
@@ -1159,9 +1159,9 @@ export default {
       color: #fff;
     }
     .vedioLinks {
-      max-width: vw(205);
+      max-width: vw(150);
       position: absolute;
-      bottom: -13px;
+      bottom: -6px;
       background: #dae7f6;
       padding: 2px 7px;
       /* word-break: keep-all; */
@@ -1170,7 +1170,7 @@ export default {
       right: 0;
       border-radius: 5px;
       font-size: 10px;
-      right: 28px;
+      right: 40px;
       display: flex;
       flex-direction: column;
       justify-content: center;