Переглянути джерело

Merge branch 'dev/v1.1.11_yf' of jianyu/web into feature/v1.1.11

yangfeng 1 місяць тому
батько
коміт
096a6f6495

+ 23 - 11
apps/bigmember_pc/src/views/order/components/analysis-report/form.vue

@@ -2,7 +2,9 @@
   <div class="analysis-report-order-form">
     <!-- pc端单日限量包不需要填写邮箱手机号,直接导出excel。但是移动端需要 -->
     <SelectorCard class="vip-sub-list-item" cardType="line">
-      <div slot="header" class="vip-sub-item-title">邮箱地址</div>
+      <div slot="header" class="vip-sub-item-title">
+        <i class="star">*</i>邮箱地址
+      </div>
       <div class="vip-sub-item-content">
         <el-form
           :model="ruleForm"
@@ -12,7 +14,7 @@
           @validate="updateFormState"
           :inline="true"
         >
-          <el-form-item  prop="email">
+          <el-form-item prop="email">
             <el-input
               v-model="ruleForm.email"
               placeholder="请输入您的邮箱地址"
@@ -32,9 +34,9 @@ import { validateEmail } from '@/utils/functions/check'
 export default {
   name: 'analysis-report-order-form',
   components: {
-    SelectorCard,
+    SelectorCard
   },
-  data () {
+  data() {
     return {
       ruleForm: {
         email: '',
@@ -42,16 +44,18 @@ export default {
       },
       rules: {
         email: [{ required: true, validator: validateEmail, trigger: 'change' }]
-      },
+      }
     }
   },
   computed: {
     pass() {
-      const emailPass = this.ruleForm.email && /\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/.test(this.ruleForm.email)
+      const emailPass =
+        this.ruleForm.email &&
+        /\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/.test(this.ruleForm.email)
       return Boolean(emailPass)
     }
   },
-  created () {
+  created() {
     this.getUserInfo()
   },
   methods: {
@@ -69,10 +73,14 @@ export default {
         this.ruleForm = Object.assign(
           {
             phone: this.ruleForm.phone,
-            email: this.ruleForm.email,
+            email: this.ruleForm.email
           },
           this.ruleForm,
-          { phone: token ? phone : data.phone, reportMail: data.reportMail, email: data.reportMail || '' }
+          {
+            phone: token ? phone : data.phone,
+            reportMail: data.reportMail,
+            email: data.reportMail || ''
+          }
         )
         this.updateFormState()
       }
@@ -84,7 +92,7 @@ export default {
         read: true,
         email: this.pass
       })
-    },
+    }
   }
 }
 </script>
@@ -94,7 +102,7 @@ export default {
   padding: 24px 30px;
   .vip-sub-item-title {
     &::before {
-      content: "*";
+      content: '*';
       color: #ff3a20;
       margin-right: 4px;
     }
@@ -104,6 +112,10 @@ export default {
       content: unset !important;
     }
   }
+  .star {
+    margin-right: 2px;
+    color: #ff3a20;
+  }
   ::v-deep {
     .selector-card.s-line {
       padding: 0;

+ 3 - 3
apps/mobile/index.html

@@ -27,7 +27,7 @@
     <link
       rel="preload"
       as="style"
-      href="//cdn-common.jianyu360.com/cdn/assets/iconfont/mobile/24.2.28/iconfont.css"
+      href="//cdn-common.jianyu360.com/cdn/assets/iconfont/mobile/25.7.9/iconfont.css"
     />
     <link
       rel="preload"
@@ -75,7 +75,7 @@
     <!-- 按优先级加载  -->
     <link
       rel="stylesheet"
-      href="//cdn-common.jianyu360.com/cdn/assets/iconfont/mobile/24.7.16/iconfont.css"
+      href="//cdn-common.jianyu360.com/cdn/assets/iconfont/mobile/25.7.9/iconfont.css"
     />
 
     <% if (!isDev) { %>
@@ -98,7 +98,7 @@
 
     <script
       defer
-      src="//cdn-common.jianyu360.com/cdn/assets/iconfont/mobile/24.7.16/iconfont.js"
+      src="//cdn-common.jianyu360.com/cdn/assets/iconfont/mobile/25.7.9/iconfont.js"
     ></script>
     <script
       defer

+ 5 - 1
apps/mobile/src/views/article/components/ActionCollection.vue

@@ -172,4 +172,8 @@ export default {
 }
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.icon-shoucang_weishoucang {
+  color: #9b9ca3;
+}
+</style>

+ 5 - 17
apps/mobile/src/views/article/components/ActionDownloadReport.vue

@@ -22,17 +22,17 @@
           class="action-monitor"
           @click.native.stop="changePopoverState"
         >
-          <van-icon
+          <!-- <van-icon
             slot="icon"
             :name="showPopover ? 'custom-report-active' : 'custom-report'"
-          ></van-icon>
-          <!-- <AppIcon
+          ></van-icon> -->
+          <AppIcon
             slot="icon"
-            name="xiazaixiangmubaogao"
+            name="normal"
             :color="showPopover ? '#2ABED1' : '#9B9CA3'"
             svg
             size="20"
-          ></AppIcon> -->
+          ></AppIcon>
           <template #text>
             <span :class="{ 'highlight-text': showPopover }">下载报告</span>
           </template>
@@ -285,18 +285,6 @@ export default {
   .tab-action-item {
     height: 100%;
   }
-  .van-icon.van-icon-custom-report {
-    width: 1em;
-    height: 1em;
-    background-image: url('@/assets/image/icon/report@2x.png');
-    background-size: cover;
-  }
-  .van-icon.van-icon-custom-report-active {
-    width: 1em;
-    height: 1em;
-    background-image: url('@/assets/image/icon/report-active@2x.png');
-    background-size: cover;
-  }
 }
 </style>
 <style lang="scss">

+ 6 - 1
apps/mobile/src/views/article/components/ActionShareToWorkmate.vue

@@ -6,7 +6,12 @@
     @click.native.stop="shareToWorkmate"
     v-bound-phone="bindPhoneShareToWorkmate()"
   >
-    <AppIcon slot="icon" name="fenxiang" color="#2ABED1" size="20"></AppIcon>
+    <AppIcon
+      slot="icon"
+      name="fenxiang"
+      :color="showIframe ? '#2ABED1' : '#9B9CA3'"
+      size="20"
+    ></AppIcon>
     <template #text>
       <p>转给同事</p>
       <iframe