Merge remote-tracking branch 'origin/develop' into develop

fix: 修复页面高度适配问题

.env.development

@@ -1,12 +1,16 @@
 
 #调用后台地址
-# 公司
+# 贝英斯公司
-VITE_APP_BASE_URL = 'http://118.186.13.120:31302'
+# VITE_APP_BASE_URL = 'http://118.186.13.120:31302'
 # VITE_APP_BASE_URL = "http://192.168.236.71:31302"
 # VITE_APP_BASE_URL = "http://123.57.20.168:3000"
 
-# 友晟外网
+# 友晟test外网
 # VITE_APP_BASE_URL = 'https://app-test.718yousheng.com/app'
-# 友晟内网
+# 友晟test内网
 # VITE_APP_BASE_URL = 'https://appi-test.718yousheng.com/app'
 
+# 友晟线上内网
+# VITE_APP_BASE_URL = 'https://appi.718yousheng.com/app'
+# 友晟线上外网网
+VITE_APP_BASE_URL = 'https://app.718yousheng.com/app'

.env.production

@@ -1,11 +1,16 @@
 
 #调用后台地址
-# 公司
+# 贝英斯公司
 # VITE_APP_BASE_URL = 'http://118.186.13.120:31302'
 # VITE_APP_BASE_URL = "http://192.168.236.71:31302"
 # VITE_APP_BASE_URL = "http://123.57.20.168:3000"
 
-# 友晟外网
+# 友晟test外网
-VITE_APP_BASE_URL = 'https://app-test.718yousheng.com/app'
+# VITE_APP_BASE_URL = 'https://app-test.718yousheng.com/app'
-# 友晟内网
+# 友晟test内网
 # VITE_APP_BASE_URL = 'https://appi-test.718yousheng.com/app'
+
+# 友晟线上内网
+# VITE_APP_BASE_URL = 'https://appi.718yousheng.com/app'
+# 友晟线上外网网
+VITE_APP_BASE_URL = 'https://app.718yousheng.com/app'

src/pages/business/CRM/customer/changeCustomerOwner.vue

@@ -149,27 +149,19 @@ const mescrollInit = (mescroll) => {
 
 // 下拉刷新
 const downCallback = async (mescroll) => {
-  try {
   uni.showLoading();
   cssFlag.value = true;
   setTimeout(async () => {
     // 重置页码为第一页
     const res = await getList(1, mescroll.size || upOption.page.size);
-      list.value = res.list;
     cssFlag.value = false;
+    list.value = res.list;
     // 正确传递 total 参数
     mescroll.endSuccess(res.list.length, res.total >= mescroll.size);
-      uni.hideLoading();
-
   }, 500);
-  } catch (error) {
-    console.log(error)
-    mescroll.endErr();
-  }
 }
 // 上拉加载更多
 const upCallback = async (mescroll) => {
-  try {
   uni.showLoading();
   setTimeout(async () => {
     // 使用 mescroll 提供的页码和大小参数
@@ -181,12 +173,7 @@ const upCallback = async (mescroll) => {
     }
     // 正确判断是否还有更多数据
     mescroll.endSuccess(res.list.length, res.total >= mescroll.size);
-      uni.hideLoading();
   }, 500);
-  } catch (error) {
-    console.log(error)
-    mescroll.endErr();
-  }
 }
 
 // 获取数据列表
@@ -197,12 +184,17 @@ const getList = (pageIndex, pageSize) => {
       pageSize,
       searchContent: searchValue.value
     }
-
+    try {
       let res = await SearchForAllPerson(param);
       resolve({
         list: res.rows,
         total: res.total
       });
+    } catch (e) {
+      console.log(e, '数据获取失败');
+    } finally {
+      uni.hideLoading();
+    }
   });
 }
 
@@ -306,16 +298,14 @@ let handleCopyInfo = (item) => {
 <style lang="scss" scoped>
 .all-body {
   /* #ifdef APP-PLUS */
-  top: 150rpx;
+  top: 160rpx;
-  height: calc(100vh - 75px);
+  height: calc(100vh - 160rpx);
   /* #endif */
   /* #ifndef APP-PLUS */
-  top: 120rpx;
+  top: 116rpx;
-  height: calc(100vh);
+  height: calc(100vh - 116rpx);
   /* #endif */
 }
-
-
 .search .btn-search {
   border: none;
   background: none;
@@ -331,15 +321,6 @@ let handleCopyInfo = (item) => {
   display: none;
 }
 
-.scroll-h {
-  /* #ifdef APP-PLUS */
-  height: calc(100vh - 120px);
-  /* #endif */
-  /* #ifndef APP-PLUS */
-  height: calc(100vh - 110px);
-  /* #endif */
-}
-
 .white-bg {
   padding-bottom: 10rpx;
 
@@ -348,10 +329,4 @@ let handleCopyInfo = (item) => {
   }
 }
 
-.white-bg:hover {
-  //background-color: #f1f1f1;
-  background-color: #f1f1f1; /* Chrome, Safari, Opera */
-  box-shadow: 0px 0px 5rpx white;
-  //filter: rgba(237, 242, 250, 0.5);
-}
 </style>

src/pages/business/CRM/customer/customerAudit.vue

@@ -112,7 +112,7 @@ const upOption = ref({
   noMoreSize: 5,
   empty: {
     tip: '~ 空空如也 ~',
-    icon: "../../static/images/mescroll-empty.png"
+    icon: "../../../../static/images/mescroll-empty.png"
   },
   textLoading: '加载中...',
   textNoMore: '已经到底了'
@@ -133,10 +133,11 @@ const mescrollInit = (mescroll) => {
 
 // 下拉刷新
 const downCallback = async (mescroll) => {
-  try {
+
   uni.showLoading();
   cssFlag.value = true;
   setTimeout(async () => {
+    try {
       // 重置页码为第一页
       const res = await getList(1, mescroll.size || upOption.page.size);
 
@@ -144,17 +145,21 @@ const downCallback = async (mescroll) => {
       // 正确传递 total 参数
       mescroll.endSuccess(res.list.length, res.total > (mescroll.size || upOption.page.size));
       uni.hideLoading();
-      cssFlag.value = false;
+
-    }, 500);
     } catch (error) {
       console.log(error)
       mescroll.endErr();
+    } finally {
+      cssFlag.value = false;
     }
+  }, 500);
+
 }
 // 上拉加载更多
 const upCallback = async (mescroll) => {
-  try {
+
   setTimeout(async () => {
+    try {
       // 使用 mescroll 提供的页码和大小参数
       const res = await getList(mescroll.num, mescroll.size);
       if (mescroll.num === 1) {
@@ -165,11 +170,11 @@ const upCallback = async (mescroll) => {
       mescroll.endBySize(res.list.length, res.total);
       // 正确判断是否还有更多数据
       mescroll.endSuccess(res.list.length, res.total > mescroll.num * mescroll.size);
-    }, 500);
     } catch (error) {
-    console.log(error)
       mescroll.endErr();
     }
+  }, 500);
+
 }
 
 // 获取数据列表
@@ -180,12 +185,17 @@ const getList = (pageIndex, pageSize) => {
       pageSize,
       searchContent: searchValue.value
     }
-
+    try {
       let res = await getCusUserApprovalList(param);
       resolve({
         list: res.rows,
         total: res.total
       });
+    } catch (e) {
+      console.log(e, "客户人员审核任务列表获取失败");
+    } finally {
+      uni.hideLoading();
+    }
   });
 }
 
@@ -210,12 +220,12 @@ let handleDetail = (item) => {
 <style scoped>
 .all-body {
   /* #ifdef APP-PLUS */
-  top: 150rpx;
+  top: 160rpx;
-  height: calc(100vh - 75px);
+  height: calc(100vh - 160rpx);
   /* #endif */
   /* #ifndef APP-PLUS */
-  top: 120rpx;
+  top: 116rpx;
-  height: calc(100vh);
+  height: calc(100vh - 116rpx);
   /* #endif */
 }
 

src/pages/business/CRM/customer/customerUserBelong.vue

@@ -134,7 +134,7 @@ const upOption = ref({
   noMoreSize: 5,
   empty: {
     tip: '~ 空空如也 ~',
-    icon: "../../static/images/mescroll-empty.png"
+    icon: "../../../../static/images/mescroll-empty.png"
   },
   textLoading: '加载中...',
   textNoMore: '已经到底了'
@@ -155,27 +155,27 @@ const mescrollInit = (mescroll) => {
 
 // 下拉刷新
 const downCallback = async (mescroll) => {
-  try {
   cssFlag.value = true;
   uni.showLoading();
   setTimeout(async () => {
+    try {
       // 重置页码为第一页
       const res = await getList(1, mescroll.size || upOption.page.size);
-      cssFlag.value = false;
       list.value = res.list;
       // 正确传递 total 参数
       mescroll.endSuccess(res.list.length, res.total > (mescroll.size || upOption.page.size));
-      uni.hideLoading();
-    }, 500);
     } catch (error) {
-    console.log(error)
       mescroll.endErr();
+    } finally {
+      cssFlag.value = false;
     }
+  }, 500);
+
 }
 // 上拉加载更多
 const upCallback = async (mescroll) => {
-  try {
   setTimeout(async () => {
+    try {
       // 使用 mescroll 提供的页码和大小参数
       const res = await getList(mescroll.num, mescroll.size);
       if (mescroll.num === 1) {
@@ -186,11 +186,10 @@ const upCallback = async (mescroll) => {
       // 正确判断是否还有更多数据
       mescroll.endBySize(res.list.length, res.total)
       // mescroll.endSuccess(res.list.length, res.total > mescroll.num * mescroll.size);
-    }, 500);
     } catch (error) {
-    console.log(error)
       mescroll.endErr();
     }
+  }, 500);
 }
 
 // 获取数据列表
@@ -201,12 +200,18 @@ const getList = (pageIndex, pageSize) => {
       pageSize,
       searchContent: searchValue.value
     }
-
+    try {
       let res = await SearchForAllCustomersSalesperson(param);
       resolve({
         list: res.rows,
         total: res.total
       });
+    } catch (e) {
+      console.log(e, "获取所有客户人员所属失败");
+    } finally {
+      uni.hideLoading();
+    }
+
   });
 }
 
@@ -278,16 +283,15 @@ let handleDelete = async (item) => {
 <style lang="scss" scoped>
 .all-body {
   /* #ifdef APP-PLUS */
-  top: 150rpx;
+  top: 160rpx;
-  height: calc(100vh - 75px);
+  height: calc(100vh - 160rpx);
   /* #endif */
   /* #ifndef APP-PLUS */
-  top: 120rpx;
+  top: 116rpx;
-  height: calc(100vh);
+  height: calc(100vh - 116rpx);
   /* #endif */
 }
 
-
 .search .btn-search {
   border: none;
   background: none;

src/pages/business/CRM/customer/selectCustomer.vue

@@ -82,7 +82,7 @@ const upOption = ref({
   noMoreSize: 5,
   empty: {
     tip: '~ 空空如也 ~',
-      icon: "../../static/images/mescroll-empty.png"
+    icon: "../../../../static/images/mescroll-empty.png"
   },
   textLoading: '加载中...',
   textNoMore: '已经到底了'
@@ -195,15 +195,14 @@ const radioChange = (e) => {
 <style lang="scss" scoped>
 .all-body {
   /* #ifdef APP-PLUS */
-  top: 150rpx;
+  top: 160rpx;
-  height: calc(100vh - 75px);
+  height: calc(100vh - 160rpx);
   /* #endif */
   /* #ifndef APP-PLUS */
-  top: 120rpx;
+  top: 116rpx;
-  height: calc(100vh);
+  height: calc(100vh - 116rpx);
   /* #endif */
 }
-
 .search .btn-search {
   border: none;
   background: none;

src/pages/business/CRM/mainOwner/audit/mainOwnerChangeAudit.vue

@@ -33,7 +33,9 @@
             <view class="report-list" @click.stop="handleDetail(item)">
               <view class="r-list title">
                 {{ item.cusName }}
-                <view class="r-right" :class="item.auditStatus ? '' : 'btn-pink' ">{{item.auditStatus?'':'待您审批'}}</view>
+                <view class="r-right" :class="item.auditStatus ? '' : 'btn-pink' ">
+                  {{ item.auditStatus ? '' : '待您审批' }}
+                </view>
               </view>
               <view class="r-list">
                 <view class="r-left">客户人员名称</view>
@@ -122,7 +124,10 @@ let list = ref([]);
 const upOption = ref({
   page: {num: 0, size: 10},
   noMoreSize: 5,
-  empty: {tip: '~ 空空如也 ~'},
+  empty: {
+    tip: '~ 空空如也 ~',
+    icon: "../../../../../static/images/mescroll-empty.png"
+  },
   textLoading: '加载中...',
   textNoMore: '已经到底了'
 });
@@ -142,28 +147,28 @@ const mescrollInit = (mescroll) => {
 
 // 下拉刷新
 const downCallback = async (mescroll) => {
-  try {
   cssFlag.value = true;
   uni.showLoading();
   setTimeout(async () => {
+    try {
       // 重置页码为第一页
       const res = await getList(1, mescroll.size || upOption.page.size);
-
       list.value = res.list;
-      cssFlag.value = false;
       // 正确传递 total 参数
       mescroll.endSuccess(res.list.length, res.total > (mescroll.size || upOption.page.size));
-      uni.hideLoading();
-    }, 500);
     } catch (error) {
       console.log(error)
       mescroll.endErr();
+    } finally {
+      cssFlag.value = false;
     }
+  }, 500);
+
 }
 // 上拉加载更多
 const upCallback = async (mescroll) => {
-  try {
   setTimeout(async () => {
+    try {
       // 使用 mescroll 提供的页码和大小参数
       const res = await getList(mescroll.num, mescroll.size);
       if (mescroll.num === 1) {
@@ -173,11 +178,11 @@ const upCallback = async (mescroll) => {
       }
       // 正确判断是否还有更多数据
       mescroll.endSuccess(res.list.length, res.total > mescroll.num * mescroll.size);
-    }, 500);
     } catch (error) {
       console.log(error)
       mescroll.endErr();
     }
+  }, 500);
 }
 
 // 获取数据列表
@@ -188,12 +193,16 @@ const getList = (pageIndex, pageSize) => {
       pageSize,
       searchContent: searchValue.value
     }
-
+    try {
       let res = await personnelAwaitingReviewForChange(param);
       resolve({
         list: res.rows,
         total: res.total
       });
+    } catch (e) {
+    } finally {
+      uni.hideLoading();
+    }
   });
 }
 
@@ -218,12 +227,12 @@ let handleDetail = (item) => {
 <style scoped>
 .all-body {
   /* #ifdef APP-PLUS */
-  top: 150rpx;
+  top: 160rpx;
-  height: calc(100vh - 75px);
+  height: calc(100vh - 160rpx);
   /* #endif */
   /* #ifndef APP-PLUS */
-  top: 120rpx;
+  top: 116rpx;
-  height: calc(100vh);
+  height: calc(100vh - 116rpx);
   /* #endif */
 }
 
@@ -250,11 +259,6 @@ let handleDetail = (item) => {
   width: 80%;
 
 }
-
-.search .custom-search.uni-searchbar {
-  padding-right: 0 !important;
-}
-
 .scroll-h {
   /* #ifdef APP-PLUS */
   height: calc(100vh - 120px);
@@ -264,8 +268,14 @@ let handleDetail = (item) => {
   /* #endif */
 }
 
+.search .custom-search.uni-searchbar {
+  padding-right: 0 !important;
+}
+
+
 .white-bg {
   padding-bottom: 10rpx;
+
   .title {
     align-items: flex-start;
   }

src/pages/business/CRM/mainOwner/view/viewMainOwner.vue

@@ -157,7 +157,7 @@ const upOption = ref({
   noMoreSize: 5,
   empty: {
     tip: '~ 空空如也 ~',
-      icon: "../../static/images/mescroll-empty.png"
+    icon: "../../../../../static/images/mescroll-empty.png"
   },
   textLoading: '加载中...',
   textNoMore: '已经到底了'
@@ -184,12 +184,12 @@ function showDetail(item) {
 
 .all-body {
   /* #ifdef APP-PLUS */
-  top: 150rpx;
+  top: 160rpx;
-  height: calc(100vh - 75px);
+  height: calc(100vh - 160rpx);
   /* #endif */
   /* #ifndef APP-PLUS */
-  top: 120rpx;
+  top: 116rpx;
-  height: calc(100vh);
+  height: calc(100vh - 116rpx);
   /* #endif */
 }
 

src/pages/business/CRM/mainOwner/view/viewMainOwnerDetail.vue

@@ -138,6 +138,18 @@ function getCrmCusUserNewChangeOwnerList() {
 /*  min-height: 100vh; */
 }
 
+.all-body {
+  /* #ifdef APP-PLUS */
+  top: 160rpx;
+  height: calc(100vh - 160rpx);
+  /* #endif */
+  /* #ifndef APP-PLUS */
+  top: 116rpx;
+  height: calc(100vh - 116rpx);
+  /* #endif */
+  overflow-y: auto;
+}
+
 .white-bg {
   padding-bottom: 10rpx;
 }

src/pages/business/CRM/marketActivity/visitReport.vue

@@ -27,14 +27,16 @@
                       :up="upOption" :down="downOption" :fixed="false" textColor="#ffffff" bgColor="#ffffff"
                       class="scroll-h" :class="{ 'loading-scroll': cssFlag }">
           <view class="white-bg margin-bottom20" v-for="(item, index) in list" :key="index"
-                @touchstart.prevent="touchstart(item)" @touchend.prevent="touchend">
+                @longpress="touchstart(item)"
+                @tap="touchend"
+                >
             <view>
               <view class="report-list">
                 <view class="title">客户：{{ item.cusName }}</view>
                 <view class="r-list">
                   <view class="r-name">{{ item.visistCode }}</view>
-                  <view @touchstart.stop="handleStatusTouchStart"
+                  <view
-                        @touchend.stop="handleStatusTouchEnd" @click.stop="chooseStatus(item)">
+                        @click.stop="chooseStatus(item)">
                     <view v-if="item.status == '驳回'" class="r-right btn-orange" size="mini">
                       {{ item.status == '驳回' ? '再次提交' : item.status }}
                     </view>
@@ -211,8 +213,6 @@ const getVisitorReportList = (pageNum, pageSize) => {
 }
 
 
-let Loop = ref(0)
-let now
 const visistId = ref();
 const cusName = ref();
 const cusId = ref();
@@ -223,9 +223,6 @@ function touchstart(item) {
   cusName.value = item.cusName
   cusId.value = item.cusId
   status.value = item.status
-  now = new Date();
-  clearInterval(Loop.value); //再次清空定时器，防止重复注册定时器
-  Loop.value = setTimeout(() => {
     uni.showModal({
       title: '删除',
       content: '请问要删除本条消息吗？',
@@ -257,21 +254,25 @@ function touchstart(item) {
         }
       }
     });
-  }, 750);
 
 }
-
+let isLongPressed = ref(false);
 function touchend() {
-  let endDate = new Date();
+  // 如果未触发长按，则执行点击逻辑
-  console.log('结束时间', endDate)
+  if (!isLongPressed.value) {
-  let cha = endDate.getTime() - now.getTime();
-  console.log(cha, 'casd')
-  if (cha < 750) {
     uni.navigateTo({
-      url: "/pages/business/CRM/marketActivity/visitorReportEnter?visistId=" + visistId.value + '&cusName=' + cusName.value + '&cusId=' + cusId.value + '&status=' + status.value
+      url: "/pages/business/CRM/marketActivity/visitorReportEnter?visistId="
+          + visistId.value
+          + '&cusName='
+          + cusName.value
+          + '&cusId='
+          + cusId.value
+          + '&status='
+          + status.value
     })
   }
-  clearInterval(Loop.value);
+  // 重置状态（避免影响下次事件）
+  isLongPressed.value = false;
 }
 
 //点击状态按钮

src/pages/business/CRM/plan/myPlan.vue

@@ -56,7 +56,9 @@
         </view>
         <view class='bottom-spliter bg-gray'></view>
       </block>
-
+      <view v-else style="text-align: center; margin-top: 50%; color: white">
+        暂无数据
+      </view>
       <!-- 底部加高度来避免tabbar遮挡 -->
       <!-- <view class="bottom-height bg-gray"></view> -->
     </view>
@@ -282,7 +284,7 @@ function handleEdit(index) {
 }
 
 .con-bg {
-  height: 445rpx;
+  /*height: 445rpx;*/
 }
 
 .nav-list {

src/pages/business/CRM/plan/planEdit.vue

@@ -130,12 +130,12 @@ let instance = null;
 let initCreate = (params)=>{
   const {itemList, selectIndex} = params;
   // 获取用户信息
-  getUserInfo().then(res => {
+  // getUserInfo().then(res => {
-    userInfo.value = res.user;
+  //   userInfo.value = res.user;
-    console.log(route.path, "：用户信息获取成功");
+  //   console.log(route.path, "：用户信息获取成功");
-  }).catch(err => {
+  // }).catch(err => {
-    console.warn(err, "用户信息获取失败")
+  //   console.warn(err, "用户信息获取失败")
-  });
+  // });
   console.log(route.path,`：创建${itemList[selectIndex]}计划`);
   title.value="创建周计划";
   currentEditDate.value.yearMonth = getDate({format: true}).substring(0, 7); // 只要年月