소스 검색

feat:登陆修改,隐藏信号源管理,

ljc 1 개월 전
부모
커밋
70f84cd796
5개의 변경된 파일155개의 추가작업 그리고 148개의 파일을 삭제
  1. 2 2
      components/cwg-match-media.vue
  2. 1 1
      composables/useMenuSplit.ts
  3. 135 141
      pages/login/index.vue
  4. 10 4
      pages/mine/improveImmediately.vue
  5. 7 0
      static/scss/global/global.scss

+ 2 - 2
components/cwg-match-media.vue

@@ -1,7 +1,7 @@
 <template>
-    <view v-if="shouldShow">
+    <template v-if="shouldShow">
         <slot />
-    </view>
+    </template>
 </template>
 
 <script setup lang="ts">

+ 1 - 1
composables/useMenuSplit.ts

@@ -231,7 +231,7 @@ export function useMenuSplit(handleClick1: (item: MenuItem) => void) {
             children: [
                 { path: '/pages/ib/customer', label: 'Ib.Custom.Manage3', icon: 'icon-deposit' },
                 { path: '/pages/ib/subsList', label: 'Ib.Custom.Manage2', icon: 'icon-deposit' },
-                { path: '/pages/ib/agentList', label: 'Documentary.console.item23', icon: 'icon-deposit' },
+                // { path: '/pages/ib/agentList', label: 'Documentary.console.item23', icon: 'icon-deposit' },
                 { path: '/pages/ib/accountList', label: 'Ib.Custom.Manage1', icon: 'icon-deposit' }
             ],
         },

+ 135 - 141
pages/login/index.vue

@@ -1,3 +1,135 @@
+<template>
+  <view class="login-page" :isHeaderFixed="true" :isLoginPage="true">
+    <view class="fixed" />
+    <view class="main-content">
+<!--      <cwg-match-media :min-width="991">-->
+<!--        <view class="global-header-bar pc-header">-->
+<!--          <view class="header-inner">-->
+<!--            <view class="logo-placeholder"></view> &lt;!&ndash; 左侧可预留放logo或留空 &ndash;&gt;-->
+<!--            <LoginHeaderGroup text-color="#fff" icon-color="#fff" />-->
+<!--          </view>-->
+<!--        </view>-->
+<!--      </cwg-match-media>-->
+
+      <!-- 移动端顶部栏:悬浮在上方,深色文字 -->
+<!--      <cwg-match-media :max-width="991">-->
+<!--        <view class="mobile-header-bar">-->
+<!--          &lt;!&ndash;          <view class="fixed"/>&ndash;&gt;-->
+
+<!--          <LoginHeaderGroup text-color="#141d22" icon-color="#141d22" />-->
+<!--        </view>-->
+<!--      </cwg-match-media>-->
+
+      <uni-row class="demo-uni-row">
+        <cwg-match-media :min-width="991" style="height: 100%;">
+          <uni-col :xs="24" :sm="24" :md="12" :lg="14" :xl="16" style="height: 100%">
+            <view class="left-bg">
+              <view class="left-box">
+                <view class="inner">
+                  <view class="title w-700">
+                    {{ `${t('newLoop.item12')} ` }}
+                    <text class="color-white" v-t="'newLoop.item13'"></text>
+                  </view>
+                  <view class="text-white" v-t="'newLoop.item14'"></view>
+                </view>
+                <image src="/static/images/trust-pilot.png" class="img-fluid mt--10" mode="widthFix"></image>
+                <view class="left-content">
+                  <view class="des text-white">
+                    <text v-html="t('newSignin.item12')"></text>
+                    <br />
+                    <text v-html="t('newSignin.item12_1')"></text>
+                    <br />
+                    <text v-html="t('newSignin.item10')"></text>
+                    <br />
+                    <text v-html="t('newSignin.item11')"></text>
+                    <br />
+                    <text v-t="'newSignin.item13'"></text>
+                    <cwg-link type="pdf" :title="'newSignin.item13_1'"
+                              :url="`pdf/Risk-Disclosures-and-Acknowledgements-2020-08.pdf`" target="_blank"
+                              v-t="'newSignin.item13_1'" class="doc-link" />
+                    <text v-t="'newSignin.item13_2'"></text>
+                    <!-- <view v-t="'newSignin.item13_3'"></view>
+                    <text v-t="'newSignin.item13_4'"></text> -->
+                  </view>
+                </view>
+              </view>
+            </view>
+          </uni-col>
+        </cwg-match-media>
+        <uni-col :xs="24" :sm="24" :md="12" :lg="10" :xl="8" class="right-f">
+          <view class="account">
+            <cwg-match-media :max-width="991">
+              <view class="company u-flex-y u-flex-y-center">
+                <image src="/static/images/logo-full.svg" class="company-icon" mode="widthFix"></image>
+              </view>
+            </cwg-match-media>
+            <view class="title">
+              <view class="tit1">{{ t('newSignin.item1') }}</view>
+              <view class="tit2">{{ t('newSignin.item2') }}</view>
+            </view>
+            <view>
+              <up-form :model="form" ref="uFormRef">
+                <up-form-item label="" prop="loginName">
+                  <up-input :customStyle="customStyle" v-model="form.loginName" border="none"
+                            :placeholder="t('signin.form.email')">
+                    <template #prefix>
+                      <cwg-icon name="email-outline" :size="20" color="#000" />
+                    </template>
+                  </up-input>
+                </up-form-item>
+
+                <up-form-item label="" prop="password">
+                  <up-input :customStyle="customStyle" v-model="form.password" :type="inputType" border="none"
+                            :placeholder="t('signin.form.password')">
+                    <template #prefix>
+                      <cwg-icon name="lock-outline" :size="20" color="#000" />
+                    </template>
+                  </up-input>
+                </up-form-item>
+              </up-form>
+            </view>
+            <view class="u-flex u-flex-between u-flex-y-center mb1">
+              <view class="check-box">
+                <up-checkbox-group v-model="remenber" @change="checkboxChange">
+                  <up-checkbox size="14" labelSize="14" labelColor="#666666" activeColor="#ea002a"
+                               :label="t('newSignin.item5')" name="记住我" class="wcg-checkbox"></up-checkbox>
+                </up-checkbox-group>
+              </view>
+              <navigator url="/pages/login/reset" class="account-tip">
+                <text>{{ t('signin.forget') }}</text>
+              </navigator>
+            </view>
+            <view class="cwg-button">
+              <u-button type="primary" class="" @click="submit">
+                {{ t('signin.login') }}
+              </u-button>
+            </view>
+            <navigator url="/pages/login/regist" class="account-tip">
+              {{ t('signin.words') }}
+              <text>{{ t('signin.signup') }}</text>
+            </navigator>
+            <cwg-match-media :min-width="791">
+
+
+              <!-- <view class="qr-container">
+                <view class="qr-title">
+                  <view class="line"></view>
+                  <view class="qr-tit2">{{ t('newSignin.item2') }}</view>
+                  <view class="line"></view>
+                </view>
+                <QrCode width="200" height="200" text="cardGuide" :logo="logoImage"></QrCode>
+              </view> -->
+            </cwg-match-media>
+          </view>
+        </uni-col>
+      </uni-row>
+    </view>
+    <view class="chat-icon" :class="{ 'chat-icon-expanded': isChatIconExpanded, 'chat-icon-hidden': type == 'chat' }"
+          @click="handleChatIconClick">
+      <cwg-icon name="chat" color="#fff" />
+    </view>
+  </view>
+</template>
 <script setup>
 import { ref, onMounted, computed } from 'vue'
 import QrCode from '@/components/QrCode.vue'
@@ -195,143 +327,6 @@ const handleChatIconClick = () => {
 }
 </script>
 
-<template>
-  <view class="login-page" :isHeaderFixed="true" :isLoginPage="true">
-
-    <view class="fixed" />
-    <view class="main-content">
-      <cwg-match-media :min-width="991">
-        <view class="global-header-bar pc-header">
-          <view class="header-inner">
-            <view class="logo-placeholder"></view> <!-- 左侧可预留放logo或留空 -->
-            <LoginHeaderGroup text-color="#fff" icon-color="#fff" />
-          </view>
-        </view>
-      </cwg-match-media>
-
-      <!-- 移动端顶部栏:悬浮在上方,深色文字 -->
-      <cwg-match-media :max-width="991">
-        <view class="mobile-header-bar">
-          <!--          <view class="fixed"/>-->
-
-          <LoginHeaderGroup text-color="#141d22" icon-color="#141d22" />
-        </view>
-      </cwg-match-media>
-
-      <uni-row class="demo-uni-row">
-        <cwg-match-media :min-width="991">
-          <uni-col :xs="24" :sm="24" :md="12" :lg="14" :xl="16">
-            <view class="left-bg">
-              <view class="left-box">
-                <view class="inner">
-                  <view class="section-title">
-                    <text class="bg-secondary-opacity subtitle w-40" v-t="'newLoop.item11'"></text>
-                  </view>
-                  <view class="title w-700">
-                    {{ `${t('newLoop.item12')} ` }}
-                    <text class="color-white" v-t="'newLoop.item13'"></text>
-                  </view>
-                  <view class="text-white" v-t="'newLoop.item14'"></view>
-                </view>
-                <image src="/static/images/trust-pilot.png" class="img-fluid mt--10" mode="widthFix"></image>
-                <view class="left-content">
-                  <view class="des text-white">
-                    <text v-html="t('newSignin.item12')"></text>
-                    <br />
-                    <text v-html="t('newSignin.item12_1')"></text>
-                    <br />
-                    <text v-html="t('newSignin.item10')"></text>
-                    <br />
-                    <text v-html="t('newSignin.item11')"></text>
-                    <br />
-                    <text v-t="'newSignin.item13'"></text>
-                    <cwg-link type="pdf" :title="'newSignin.item13_1'"
-                      :url="`pdf/Risk-Disclosures-and-Acknowledgements-2020-08.pdf`" target="_blank"
-                      v-t="'newSignin.item13_1'" class="doc-link" />
-                    <text v-t="'newSignin.item13_2'"></text>
-                    <!-- <view v-t="'newSignin.item13_3'"></view>
-                    <text v-t="'newSignin.item13_4'"></text> -->
-                  </view>
-                </view>
-              </view>
-            </view>
-          </uni-col>
-        </cwg-match-media>
-        <uni-col :xs="24" :sm="24" :md="12" :lg="10" :xl="8" class="right-f">
-          <view class="account">
-            <cwg-match-media :max-width="991">
-              <view class="company u-flex-y u-flex-y-center">
-                <image src="/static/images/logo-full.svg" class="company-icon" mode="widthFix"></image>
-              </view>
-            </cwg-match-media>
-            <view class="title">
-              <view class="tit1">{{ t('newSignin.item1') }}</view>
-              <view class="tit2">{{ t('newSignin.item2') }}</view>
-            </view>
-            <view>
-              <up-form :model="form" ref="uFormRef">
-                <up-form-item label="" prop="loginName">
-                  <up-input :customStyle="customStyle" v-model="form.loginName" border="none"
-                    :placeholder="t('signin.form.email')">
-                    <template #prefix>
-                      <cwg-icon name="email-outline" :size="20" color="#000" />
-                    </template>
-                  </up-input>
-                </up-form-item>
-
-                <up-form-item label="" prop="password">
-                  <up-input :customStyle="customStyle" v-model="form.password" :type="inputType" border="none"
-                    :placeholder="t('signin.form.password')">
-                    <template #prefix>
-                      <cwg-icon name="lock-outline" :size="20" color="#000" />
-                    </template>
-                  </up-input>
-                </up-form-item>
-              </up-form>
-            </view>
-            <view class="u-flex u-flex-between u-flex-y-center mb1">
-              <view class="check-box">
-                <up-checkbox-group v-model="remenber" @change="checkboxChange">
-                  <up-checkbox size="14" labelSize="14" labelColor="#666666" activeColor="#ea002a"
-                    :label="t('newSignin.item5')" name="记住我" class="wcg-checkbox"></up-checkbox>
-                </up-checkbox-group>
-              </view>
-              <navigator url="/pages/login/reset" class="account-tip">
-                <text>{{ t('signin.forget') }}</text>
-              </navigator>
-            </view>
-            <view class="cwg-button">
-              <u-button type="primary" class="" @click="submit">
-                {{ t('signin.login') }}
-              </u-button>
-            </view>
-            <navigator url="/pages/login/regist" class="account-tip">
-              {{ t('signin.words') }}
-              <text>{{ t('signin.signup') }}</text>
-            </navigator>
-            <cwg-match-media :min-width="791">
-
-
-              <!-- <view class="qr-container">
-                <view class="qr-title">
-                  <view class="line"></view>
-                  <view class="qr-tit2">{{ t('newSignin.item2') }}</view>
-                  <view class="line"></view>
-                </view>
-                <QrCode width="200" height="200" text="cardGuide" :logo="logoImage"></QrCode>
-              </view> -->
-            </cwg-match-media>
-          </view>
-        </uni-col>
-      </uni-row>
-    </view>
-    <view class="chat-icon" :class="{ 'chat-icon-expanded': isChatIconExpanded, 'chat-icon-hidden': type == 'chat' }"
-      @click="handleChatIconClick">
-      <cwg-icon name="chat" color="#fff" />
-    </view>
-  </view>
-</template>
-
 <style lang="scss" scoped>
 @import "@/uni.scss";
 
@@ -425,10 +420,6 @@ const handleChatIconClick = () => {
 .main-content {
   flex: 1;
   overflow: hidden;
-  background-image: url(/static/images/login-bg.gif);
-  background-repeat: no-repeat;
-  background-size: cover;
-  background-position: center center;
 }
 
 .demo-uni-row {
@@ -438,6 +429,9 @@ const handleChatIconClick = () => {
   .left-bg {
     height: 100%;
     min-height: calc(100vh - 120px);
+    background-image: url(/static/images/login-bg.gif);
+    background-size: cover;
+    background-position: center;
     display: flex;
     flex-direction: column;
     align-items: center;

+ 10 - 4
pages/mine/improveImmediately.vue

@@ -408,7 +408,8 @@
         </view>
         <!-- 第四步:地址证明 -->
         <view v-show="currentStep === 4" class="form-section">
-          <uni-row class="demo-uni-row uni-row1">
+<!--去掉地址证明-->
+<!--          <uni-row class="demo-uni-row uni-row1">
             <uni-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
               <view class="crm-title-box">
                 <text class="tit">{{ t('ImproveImmediately.Title.ProofAddress') }}</text>
@@ -479,7 +480,7 @@
               <view class="con-box">
                 <view class="box">
                   <cwg-icon name="icon_mobile" :size="50"/>
-<!--                  <image class="mobile" :src="icon_mobile" />-->
+&lt;!&ndash;                  <image class="mobile" :src="icon_mobile" />&ndash;&gt;
                   <image class="arrow" :src="icon_arrowR" />
                   <image
                     class="img_mobile"
@@ -487,7 +488,7 @@
                       display: inline-block;
                       width: 120px;
                       height: 120px;
-                      border: 8px solid var(--color-gray);
+                      border: 8px solid var(&#45;&#45;color-gray);
                     "
                     :src="mobile"
                   >
@@ -500,7 +501,7 @@
               </view>
 
             </uni-col>
-          </uni-row>
+          </uni-row>-->
           <uni-row class="demo-uni-row uni-row1">
             <uni-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
               <view class="crm-title-box">
@@ -564,6 +565,7 @@
                         <u-button
                           style="margin-right: 20px;"
                           :disabled="item.status == 2"
+                          @click.stop="showFile(item)"
                         >
                           <a
                             :href="updateUrl + (item.againPath || item.path)"
@@ -1117,6 +1119,10 @@
       getCustomFileList();
     }
   }
+  const showFile = (file)=>{
+    // console.log(file)
+    window.open(updateUrl + (file.againPath || file.path), '_blank')
+  }
 
   async function fileOtherDelete(id) {
     uni.showModal({

+ 7 - 0
static/scss/global/global.scss

@@ -139,6 +139,7 @@
     --status-danger-border: var(--color-pink-300);
     --status-expired-border: var(--color-slate-400);
     --status-cancelled-border: var(--color-slate-300);
+  --bs-secondary:#ef4223;
 }
 
 .dark {
@@ -254,6 +255,7 @@
     --text-sm-plus: .9375rem;
     --text-sm-plus--line-height: 1.375rem;
     --animate-shimmer: shimmer 2s linear infinite;
+  --bs-secondary:#ef4223;
 }
 
 .uni-select__input-box {
@@ -1549,4 +1551,9 @@ uni-content.collapsed {
 
 .crm-cursor {
     cursor: pointer;
+}
+
+::selection {
+  background-color: var(--bs-secondary);
+  color: #fff;
 }