Merge remote-tracking branch 'origin/master'

h5app/src/views/pages/work/signin/index.vue

@@ -5,7 +5,7 @@
         <ion-buttons slot="start">
           <ion-icon :icon="arrowBackOutline()" @click="onBack"></ion-icon>
         </ion-buttons>
-        <ion-title>打卡签到</ion-title>
+        <ion-title>外出走访签到</ion-title>
       </ion-toolbar>
     </ion-header>
     <ion-content>
@@ -15,8 +15,8 @@
       <div id='signInMap' style=' width: 100%; height: 200px; z-index: 100'></div>
       <div class="bw-vue-form">
         <div class="form-select">
-          <ion-label>打卡类型<span class="danger">*</span></ion-label>
-          <ion-select interface="action-sheet" placeholder="请选择打卡类型" cancel-text="取消"
+          <ion-label>外出类型<span class="danger">*</span></ion-label>
+          <ion-select interface="action-sheet" placeholder="请选择外出类型" cancel-text="取消"
                       id="signinType" v-model="dataModel.signinType" @change="signinTypeChange()">
             <ion-select-option v-for="(record,key) in signinTypeList" :key="key"
                                v-model:value="record.value">
@@ -42,7 +42,7 @@
         </div>
       </div>
       <div class="btn-box">
-        <ion-button @click="onSave">确定打卡</ion-button>
+        <ion-button @click="onSave">确定签到</ion-button>
       </div>
     </ion-content>
 

h5app/src/views/sapp/tabMain.vue

@@ -40,11 +40,11 @@
             <div class="tool-title">岗位信息</div>
           </a>
           <a class="tool-item box-line"
-             @click="saveSysLog('推荐库（APP）', '/tabs/tabMain/recommendMgt/list', '点击菜单', router.push('/tabs/tabMain/recommendMgt/list'))">
+             @click="saveSysLog('走访签到（APP）', '/tabs/tabWork/work/signin', '点击菜单', router.push('/tabs/tabWork/work/signin'))">
             <div class="tool-img">
-              <img src="@/assets/icon/gwtj.png">
+              <img src="@/assets/icon/map.png">
             </div>
-            <div class="tool-title">推荐库</div>
+            <div class="tool-title">走访签到</div>
           </a>
           <a class="tool-item box-line"
              @click="saveSysLog('工作任务（APP）', '/tabs/tabMain/workTask/list', '点击菜单', router.push('/tabs/tabMain/workTask/list'))">

h5app/src/views/sapp/tabWork.vue

@@ -151,11 +151,11 @@
                <div class="tool-title">工作轨迹</div>
              </a>
              <a class="tool-item box-line"
-                @click="saveSysLog('打卡签到（APP）', '/tabs/tabWork/work/signin', '点击菜单', router.push('/tabs/tabWork/work/signin'))">
+                @click="saveSysLog('走访签到（APP）', '/tabs/tabWork/work/signin', '点击菜单', router.push('/tabs/tabWork/work/signin'))">
                <div class="tool-img">
                  <img src="@/assets/icon/map.png">
                </div>
-               <div class="tool-title">打卡签到</div>
+               <div class="tool-title">走访签到</div>
              </a>
            </div>
          </div>

h5app/vue.config.js

@@ -3,7 +3,7 @@ module.exports = {
 
     devServer: {
         port: 8202,
-        https: false,
+        https: true,
         client: {
             progress: true,
         },