修改手机端的登录

jero-web/src/common/lang/en-us.js

@@ -1877,4 +1877,9 @@ module.exports = {
   clickAndSelect:'Click and select',
   phoneCreationTime:'Creation Time',
   theCurrentFormatSupportPreview:'The current format does not support preview',
+  nearlyMonth:'Nearly a month',
+  nearlyThreeMonths:'Nearly Three Months',
+  nearlySixMonths:'Nearly Six Months',
+  nearlyYear:'Nearly a Year',
+  browsingTime:'Browsing time',
 }

jero-web/src/common/lang/zh-cn.js

@@ -1978,4 +1978,9 @@ module.exports = {
   clickAndSelect:'点击选择',
   phoneCreationTime:'创建时间',
   theCurrentFormatSupportPreview:'当前格式不支持预览',
+  nearlyMonth:'近一个月',
+  nearlyThreeMonths:'近三个月',
+  nearlySixMonths:'近六个月',
+  nearlyYear:'近一年',
+  browsingTime:'浏览时间',
 }

jero-web/src/permission.js

@@ -119,9 +119,11 @@ router.beforeEach((to, from, next) => {
             router.addRoutes(store.getters.addRouters)
             let redirect = decodeURIComponent(from.query.redirect || to.path)
             if (mobile) {
-              redirect = '/phoneSearch'
+              if (redirect == '/'){
+                redirect = '/phoneSearch'
+              }
             }
-            console.log(redirect)
+
             if (to.path === redirect) {
               // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
               next({ ...to, replace: true })

jero-web/src/views/phoneView/recentBrowsing.vue

@@ -22,6 +22,9 @@
           <div class="content-text-button">
             <span>{{item.browseTypeName}}</span>
           </div>
+          <div class="content-text-button">
+          <span>{{$t('browsingTime')}}：{{item.createTime}}</span>
+          </div>
         </div>
         <div class="content-text-right">
           <van-icon name="arrow"/>

jero-web/src/views/phoneView/searchList.vue

@@ -3,22 +3,21 @@
     <div class="fixed">
       <div class="header-search">
         <van-icon @click="iconClick" class="icon" name="arrow-left"/>
-        <van-dropdown-menu v-if="activeTab == 'documentLibrary'">
+<!--        <van-dropdown-menu v-if="activeTab == 'documentLibrary'">-->
-          <van-dropdown-item @change="selectModelChange" v-model="selectModel" :options="option"/>
+<!--          <van-dropdown-item @change="selectModelChange" v-model="selectModel" :options="option"/>-->
-        </van-dropdown-menu>
+<!--        </van-dropdown-menu>-->
-        <van-search v-model="value"
+<!--        <van-search v-model="value"-->
-                    class="search-text"
+<!--                    class="search-text"-->
-                    v-if="activeTab == 'documentLibrary'"
+<!--                    v-if="activeTab == 'documentLibrary'"-->
-                    show-action
+<!--                    show-action-->
-                    left-icon="none"
+<!--                    left-icon="none"-->
-                    @search="onSearch"
+<!--                    @search="onSearch"-->
-                    @clear="onClear"
+<!--                    @clear="onClear"-->
-                    @cancel="onClear"
+<!--                    @cancel="onClear"-->
-                    :action-text="$t('reset')"
+<!--                    :action-text="$t('reset')"-->
-                    :placeholder="$t('phoneSearch')"/>
+<!--                    :placeholder="$t('phoneSearch')"/>-->
         <van-search v-model="value"
                     show-action
-                    v-else
                     @search="onSearch"
                     @clear="onClear"
                     @cancel="onClear"
@@ -37,8 +36,8 @@
     <div class="content-box">
       <div class="search-top">
         {{$t('searchScope')}}：
-        <span v-if="activeTab == 'documentLibrary' && searchValue">
+<!--        <span v-if="activeTab == 'documentLibrary' && searchValue">-->
-        {{selectModelName}}:</span>
+<!--        {{selectModelName}}:</span>-->
         <span>{{searchValue}}</span>
       </div>
 

jero-web/src/views/phoneView/toDoCenter.vue

@@ -2,7 +2,7 @@
   <div class="box">
     <div class="fixed">
       <div class="header-search">
-<!--        <van-icon class="icon" name="arrow-left"/>-->
+        <!--        <van-icon class="icon" name="arrow-left"/>-->
         <van-search v-model="value"
                     @search="onSearch"
                     @clear="onClear"
@@ -152,23 +152,24 @@
             </template>
           </van-field>
           <van-field
-            readonly
-            clickable
-            name="picker"
             :value="form.value"
             class="textarea"
             :label="$t('cutoffTime')"
-            :placeholder="$t('clickAndSelect')"
+            :placeholder="$t('clickAndSelect')">
-            @click="showPicker = true"
+            <template #input>
-          />
+              <van-dropdown-menu class="cutoffTimeClass">
-          <van-popup v-model="showPicker" position="bottom">
+                <van-dropdown-item v-model="form.selectModel" :options="columns"/>
-            <van-picker
+              </van-dropdown-menu>
-              show-toolbar
+            </template>
-              :columns="columns"
+          </van-field>
-              @confirm="onConfirm"
+          <!--          <van-popup v-model="showPicker" position="bottom">-->
-              @cancel="showPicker = false"
+          <!--            <van-picker-->
-            />
+          <!--              show-toolbar-->
-          </van-popup>
+          <!--              :columns="columns"-->
+          <!--              @confirm="onConfirm"-->
+          <!--              @cancel="showPicker = false"-->
+          <!--            />-->
+          <!--          </van-popup>-->
           <van-field name="checkboxGroup" class="textarea" :label="$t('treatmentMode')">
             <template #input>
               <div class="Mode-text">
@@ -200,14 +201,35 @@
         active: 'toDoCenter',
         show: false,
         date: '',
-        columns: ['近一个月', '近三个月', '近六个月', '近一年'],
+        columns: [
+          {
+            text: this.$t('pleaseSelect'),
+            value: '0'
+          },
+          {
+            text: this.$t('nearlyMonth'),
+            value: '1'
+          },
+          {
+            text: this.$t('nearlyThreeMonths'),
+            value: '2'
+          },
+          {
+            text: this.$t('nearlySixMonths'),
+            value: '3'
+          },
+          {
+            text: this.$t('nearlyYear'),
+            value: '4'
+          }],
         showPicker: false,
         value: '',
         activeTab: '',
         language: localStorage.getItem('language'),
         form: {
-          checked: true,
+          checked: false,
-          flowType: []
+          flowType: [],
+          selectModel:'0'
         },
         toDoProcessList: [],
         toDoProcessLoading: false,
@@ -237,10 +259,10 @@
       // this.getToDoProcess()
     },
     methods: {
-      onSearch(){
+      onSearch() {
 
       },
-      onClear(){
+      onClear() {
 
       },
       onChange(value) {
@@ -260,7 +282,8 @@
       },
       resetClick() {
         this.form = {
-          checked: true
+          checked: false,
+          selectModel:'0'
         }
         this.show = false
         if (this.activeTab == 'toDoProcess') {
@@ -826,4 +849,25 @@
     font-size: 0.38rem;
     margin-left: 0.2rem;
   }
+
+  .cutoffTimeClass {
+    width: 100%;
+  }
+  ::v-deep .cutoffTimeClass .van-dropdown-menu__item{
+    justify-content: left;
+  }
+  ::v-deep .cutoffTimeClass .van-dropdown-menu__title--active {
+    color: #21c9cc;
+  }
+
+  ::v-deep .cutoffTimeClass .van-dropdown-item__option--active {
+    color: #21c9cc;
+  }
+
+  ::v-deep .cutoffTimeClass .van-dropdown-item__option--active .van-dropdown-item__icon {
+    color: #21c9cc;
+  }
+  ::v-deep .cutoffTimeClass .van-dropdown-menu__bar{
+    box-shadow: none;
+  }
 </style>