Merge branch 'develop' of http://123.57.20.168:4000/admin/ys-app into develop

src/api/crm/activity/map.js

@@ -3,7 +3,7 @@ import request from "@/utils/request";
 //新增地图开始签到接口
 export function addStartMap(data) {
   return request.post({
-    url: "/crm/app/appVisistMap/Startadd",
+    url: "/crm/jys/app/appVisistMap/Startadd",
     data,
   },{
     isTransformResponse:false
@@ -13,7 +13,7 @@ export function addStartMap(data) {
 //出差打卡接口
 export function businessTripClockIn(data) {
   return request.post({
-    url: '/crm/app/appVisistMap/businessTripClockIn',
+    url: '/crm/jys/app/appVisistMap/businessTripClockIn',
     data
   },{isTransformResponse:false});
 }
@@ -21,7 +21,7 @@ export function businessTripClockIn(data) {
 //新增地图开始打卡接口
 export function addStartMapForClockIn(data) {
   return request.post({
-    url: "/crm/app/appVisistMap/StartaddForClockIn",
+    url: "/crm/jys/app/appVisistMap/StartaddForClockIn",
     data,
   },{
     isTransformResponse:false

src/pages/business/CRM/map/addRearkSignIn.vue

@@ -8,12 +8,19 @@
 			<view class="top-height" :style="{ paddingTop: navBarPaddingTop + 'px' }"></view>
 
 			<view class="inner-box">
-				<view class="cu-form-group">
+				<view class="cu-form-group" style="height: 200px;padding:10px;">
-					<textarea v-model="form.remark" placeholder="请输入签到备注内容" name="input"></textarea>
+					<uni-forms ref="formRef" :model="form" label-width="100px">
-				</view>
+						<uni-forms-item label="签到备注内容" name="understandTheWay"
-				<view class="btn-box">
+							class="uni-forms-item is-direction-top is-top">
+							<uni-easyinput type="textarea" autoHeight v-model="form.remark" placeholder="请输入签到备注内容"
+								class="form-texarea" />
+						</uni-forms-item>
+					</uni-forms>
+
+					<view class="btn-box" style="padding-top: 50px;">
 					<button type="primary" @click="addInsertMapClockIn">签到</button>
 				</view>
+				</view>
 			</view>
 		</view>
 	</view>
@@ -27,20 +34,20 @@ import { parseTime } from '@/utils/datetime.js';
 import { onLoad } from '@dcloudio/uni-app';
 import { getNavBarPaddingTop } from '@/utils/system.js'
 let form = reactive({
-		addressForStart: null,
+	addressForStart: null,
-		addressForEnd: null,
+	addressForEnd: null,
-		createId: null,
+	createId: null,
-		staffName: null,
+	staffName: null,
-		visistCode: null,
+	visistCode: null,
-		visistId: null,
+	visistId: null,
-		mapId: null,
+	mapId: null,
-		remark: null
+	remark: null
-	})
+})
 
 // 获取导航栏高度用于内容区域padding
 const navBarPaddingTop = ref(0);
 onMounted(() => {
-    navBarPaddingTop.value = getNavBarPaddingTop() * 2;
+	navBarPaddingTop.value = getNavBarPaddingTop() * 2;
 })
 
 onLoad(option => {

src/pages/business/CRM/map/vistorCheckin.vue

@@ -28,7 +28,7 @@
                      :content="form.addressForStart"
                      closeTip="轻触空白处关闭"
                      cancelText="出差"
-                     confirmText="打卡"
+                     confirmText="未出差"
                      contentAlign="center"
                      @confirm="handleConfirm"
                      @cancel="handleCancel"/>