Browse Source

feat: 切换系统,开户链接

ljc 1 month ago
parent
commit
0d27554bdc

+ 21 - 7
components/cwg-system.vue

@@ -144,11 +144,8 @@ function switchSystem(item: SystemItem) {
 
 
 async function confirmSwitchSystem(item: SystemItem) {
 async function confirmSwitchSystem(item: SystemItem) {
   try {
   try {
-    const res: any = await customApi.switchSystem({ sysCode: item.sysCode })
-    if (res && res.code === Code.StatusOK) {
-      const accessToken = res.data
-      const token = typeof accessToken === 'string' ? accessToken : String(accessToken || '')
-      const baseUrl = `${item.sysUrl}/#/signin?sysLoginToken=${btoa(token)}`
+    if (props.eventSource === 'login'){
+      const baseUrl = `${item.sysUrl}/#/signin`
       console.log(baseUrl)
       console.log(baseUrl)
       // #ifdef H5
       // #ifdef H5
       window.location.replace(baseUrl)
       window.location.replace(baseUrl)
@@ -157,10 +154,27 @@ async function confirmSwitchSystem(item: SystemItem) {
       // #ifndef H5
       // #ifndef H5
       uni.showToast({ title: '仅支持在H5端切换系统', icon: 'none' })
       uni.showToast({ title: '仅支持在H5端切换系统', icon: 'none' })
       // #endif
       // #endif
-    } else {
-      uni.showToast({ title: (res && (res.msg || res.message)) || '切换系统失败', icon: 'none' })
+    }else{
+      const res: any = await customApi.switchSystem({ sysCode: item.sysCode })
+      if (res && res.code === Code.StatusOK) {
+        const accessToken = res.data
+        const token = typeof accessToken === 'string' ? accessToken : String(accessToken || '')
+        const baseUrl = `${item.sysUrl}/#/signin?sysLoginToken=${btoa(token)}`
+        console.log(baseUrl)
+        // #ifdef H5
+        window.location.replace(baseUrl)
+        // #endif
+
+        // #ifndef H5
+        uni.showToast({ title: '仅支持在H5端切换系统', icon: 'none' })
+        // #endif
+      } else {
+        uni.showToast({ title: (res && (res.msg || res.message)) || '切换系统失败', icon: 'none' })
+      }
     }
     }
+
   } catch (e) {
   } catch (e) {
+    console.log(e)
     uni.showToast({ title: '切换系统失败', icon: 'none' })
     uni.showToast({ title: '切换系统失败', icon: 'none' })
   }
   }
 }
 }

+ 1 - 1
hooks/useRouter.ts

@@ -89,7 +89,7 @@ export default function useRouter() {
         ...options
         ...options
       });
       });
     } else {
     } else {
-      uni.navigateBack({ delta });
+      uni.navigateBack({ delta })
     }
     }
   };
   };
 
 

+ 2 - 2
pages/ib/linkList.vue

@@ -60,13 +60,13 @@
               @change="(val) => handleAccountTypeChange('cent', '8', val)" :placeholder="t('placeholder.choose')" />
               @change="(val) => handleAccountTypeChange('cent', '8', val)" :placeholder="t('placeholder.choose')" />
 
 
             <view class="btn-top">
             <view class="btn-top">
-              <button style="width: 150px" class="crm-cursor" @click="CreateLink">{{ t('Ib.Index.CreateLink') }}
+              <button style="width: 150px" class="crm-cursor btn btn-dark btn-sm waves-effect waves-light btn-outline-dark1" @click="CreateLink">{{ t('Ib.Index.CreateLink') }}
               </button>
               </button>
             </view>
             </view>
             <view class="link qrCode" v-if="link">
             <view class="link qrCode" v-if="link">
               <QrCode ref="qrCode" :text="link" :width="200" :height="200" />
               <QrCode ref="qrCode" :text="link" :width="200" :height="200" />
               <view class="btn-top">
               <view class="btn-top">
-                <button class="crm-cursor" @click="downloadQrCode()">{{ t('Btn.item9') }}
+                <button class="crm-cursor btn btn-dark btn-sm waves-effect waves-light btn-outline-dark1" @click="downloadQrCode()">{{ t('Btn.item9') }}
                 </button>
                 </button>
               </view>
               </view>
             </view>
             </view>

+ 8 - 2
pages/ib/recording.vue

@@ -222,6 +222,9 @@
           title: t('Msg.Success'),
           title: t('Msg.Success'),
           icon: 'success',
           icon: 'success',
         })
         })
+        nextTick(() => {
+          tableRef.value?.refreshTable?.()
+        })
       } else {
       } else {
         uni.showToast({
         uni.showToast({
           title: res.msg,
           title: res.msg,
@@ -229,7 +232,10 @@
         })
         })
       }
       }
     } catch (err) {
     } catch (err) {
-
+      uni.showToast({
+        title: err.msg,
+        icon: 'none',
+      })
     }
     }
   }
   }
 
 
@@ -252,6 +258,6 @@
   .cancel-btn{
   .cancel-btn{
     display: block;
     display: block;
     width: px2rpx(50);
     width: px2rpx(50);
-    line-height: px2rpx(10) !important;
+    line-height: px2rpx(14) !important;
   }
   }
 </style>
 </style>

+ 6 - 6
pages/mine/improveImmediately.vue

@@ -6,7 +6,7 @@
         <!-- 第一步:个人信息 -->
         <!-- 第一步:个人信息 -->
         <view v-show="currentStep === 1" class="form-section">
         <view v-show="currentStep === 1" class="form-section">
           <h3 class="section-title">{{ t('ImproveImmediately.Title.BasicInformation') }}</h3>
           <h3 class="section-title">{{ t('ImproveImmediately.Title.BasicInformation') }}</h3>
-          <uni-row class="demo-uni-row uni-row1">
+          <uni-row class="demo-uni-row uni-row1" :gutter="20">
             <!-- 客户类型 -->
             <!-- 客户类型 -->
             <uni-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8">
             <uni-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8">
               <uni-forms-item :label="t('ImproveImmediately.Label.CustomerType')">
               <uni-forms-item :label="t('ImproveImmediately.Label.CustomerType')">
@@ -155,7 +155,7 @@
         <!-- 第二步:财务背景 -->
         <!-- 第二步:财务背景 -->
         <view v-show="currentStep === 2" class="form-section">
         <view v-show="currentStep === 2" class="form-section">
           <h3 class="section-title">{{ t('ImproveImmediately.Title.FinancialBackground') }}</h3>
           <h3 class="section-title">{{ t('ImproveImmediately.Title.FinancialBackground') }}</h3>
-          <uni-row class="demo-uni-row uni-row1">
+          <uni-row class="demo-uni-row uni-row1" :gutter="20">
             <uni-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8">
             <uni-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8">
               <uni-forms-item name="level" :label="t('ImproveImmediately.Label.Education')">
               <uni-forms-item name="level" :label="t('ImproveImmediately.Label.Education')">
                 <cwg-combox :clearable="false" v-model:value="formData.level" :options="educationOptions"
                 <cwg-combox :clearable="false" v-model:value="formData.level" :options="educationOptions"
@@ -223,7 +223,7 @@
         <!-- 第三步:身份证明 -->
         <!-- 第三步:身份证明 -->
         <view v-show="currentStep === 3" class="form-section">
         <view v-show="currentStep === 3" class="form-section">
 
 
-          <uni-row class="demo-uni-row uni-row1">
+          <uni-row class="demo-uni-row uni-row1" :gutter="20">
             <uni-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
             <uni-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
               <view class="crm-title-box">
               <view class="crm-title-box">
                 <text class="tit">{{ t('ImproveImmediately.Title.ProofIdentityUpdate') }}</text>
                 <text class="tit">{{ t('ImproveImmediately.Title.ProofIdentityUpdate') }}</text>
@@ -241,7 +241,7 @@
                 <cwg-combox :clearable="false" v-model:value="formData.cardType" :options="cardTypeOptions"
                 <cwg-combox :clearable="false" v-model:value="formData.cardType" :options="cardTypeOptions"
                   :placeholder="t('placeholder.choose')" />
                   :placeholder="t('placeholder.choose')" />
               </uni-forms-item>
               </uni-forms-item>
-              <uni-row class="demo-uni-row uni-row1">
+              <uni-row class="demo-uni-row uni-row1" :gutter="20">
                 <uni-col :xs="24" :sm="24" :md="10" :lg="10" :xl="10">
                 <uni-col :xs="24" :sm="24" :md="10" :lg="10" :xl="10">
                   <cwg-file-picker-wrapper v-model="fileListID1.path" :editable="fileListID1.status != 2" :limit="1"
                   <cwg-file-picker-wrapper v-model="fileListID1.path" :editable="fileListID1.status != 2" :limit="1"
                     :fileMediatype="'all'" uploadUrl="/custom/file/upload/1" :baseUrl="updateUrl" :imageWidth="150"
                     :fileMediatype="'all'" uploadUrl="/custom/file/upload/1" :baseUrl="updateUrl" :imageWidth="150"
@@ -463,12 +463,12 @@
 
 
             </uni-col>
             </uni-col>
           </uni-row>-->
           </uni-row>-->
-          <uni-row class="demo-uni-row uni-row1">
+          <uni-row class="demo-uni-row uni-row1" :gutter="20">
             <uni-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
             <uni-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
               <view class="crm-title-box">
               <view class="crm-title-box">
                 <text class="tit">{{ t('PersonalManagement.Title.AttachedFile') }}</text>
                 <text class="tit">{{ t('PersonalManagement.Title.AttachedFile') }}</text>
               </view>
               </view>
-              <uni-row class="demo-uni-row uni-row1">
+              <uni-row class="demo-uni-row uni-row1" :gutter="20">
                 <uni-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
                 <uni-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
                   <cwg-file-picker :limit="9" :multiple="true" :editable="true" :fileMediatype="'all'"
                   <cwg-file-picker :limit="9" :multiple="true" :editable="true" :fileMediatype="'all'"
                     uploadUrl="/custom/file/upload/10" :baseUrl="updateUrl" :imageWidth="100" :imageHeight="60"
                     uploadUrl="/custom/file/upload/10" :baseUrl="updateUrl" :imageWidth="100" :imageHeight="60"

+ 6 - 6
static/scss/global/global.scss

@@ -1630,17 +1630,17 @@ uni-content.collapsed {
     font-size: var(--font-size-24);
     font-size: var(--font-size-24);
     font-weight: 500;
     font-weight: 500;
     line-height: 1.5;
     line-height: 1.5;
-    color: #6b7280;
-    background-color: #f3f4f6;
-    border: 1px solid var(--color-rose-500);
+    color: #333;
+    background-color: var(--btn-color);
+    border: 1px solid var(--btn-color);
     cursor: pointer;
     cursor: pointer;
     transition: all var(--default-transition-duration) var(--default-transition-timing-function);
     transition: all var(--default-transition-duration) var(--default-transition-timing-function);
     white-space: nowrap;
     white-space: nowrap;
 
 
     &:hover {
     &:hover {
-        color: var(--color-white);
-        background-color: var(--color-rose-500);
-        border-color: var(--color-rose-500);
+        color: #000;
+        background-color: var(--btn-color);
+        border-color:var(--btn-color);
     }
     }
 
 
     // 添加点击效果
     // 添加点击效果

+ 5 - 0
static/scss/global/vu.css

@@ -3391,6 +3391,11 @@ textarea.form-control-lg {
   --bs-btn-disabled-border-color: #0C243C;
   --bs-btn-disabled-border-color: #0C243C;
   --bs-gradient: none;
   --bs-gradient: none;
 }
 }
+.btn-outline-dark1{
+    background-color: var(--btn-color) !important;
+    color: var(--bs-emphasis-color) !important;
+    border-color: var(--btn-color) !important;
+}
 
 
 .btn-outline-white {
 .btn-outline-white {
   --bs-btn-color: #ffffff;
   --bs-btn-color: #ffffff;