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

fix: 主归属人变更审核
Merge branch 'develop' of http://123.57.20.168:4000/admin/ys-app into develop
2025-09-16 18:06:13 +08:00 · 2025-09-16 18:06:00 +08:00 · 2025-09-16 15:08:33 +08:00 · 2025-09-16 15:08:25 +08:00 · 2025-09-16 14:20:50 +08:00 · 2025-09-16 14:20:38 +08:00
15 changed files with 265 additions and 229 deletions
--- a/.env.development
+++ b/.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'
--- a/.env.production
+++ b/.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"

-# 友晟外网
-VITE_APP_BASE_URL = 'https://app-test.718yousheng.com/app'
-# 友晟内网
+# 友晟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'
--- a/src/pages/business/CRM/customer/changeCustomerOwner.vue
+++ b/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;
-  height: calc(100vh - 75px);
+  top: 160rpx;
+  height: calc(100vh - 160rpx);
  /* #endif */
  /* #ifndef APP-PLUS */
-  top: 120rpx;
-  height: calc(100vh);
+  top: 116rpx;
+  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>
--- a/src/pages/business/CRM/customer/customerAudit.vue
+++ b/src/pages/business/CRM/customer/customerAudit.vue
@@ -17,10 +17,10 @@
      <view class="all-body">
        <!-- 搜索-->
        <view class="search">
-<!--          <uni-search-bar class="custom-search" radius="28" placeholder="请输入客户人员名称" clearButton="auto"-->
-<!--                          cancelButton="none" bgColor="#6FA2F8" textColor="#ffffff"-->
-<!--                          v-model="searchValue"-->
-<!--          />-->
+          <!--          <uni-search-bar class="custom-search" radius="28" placeholder="请输入客户人员名称" clearButton="auto"-->
+          <!--                          cancelButton="none" bgColor="#6FA2F8" textColor="#ffffff"-->
+          <!--                          v-model="searchValue"-->
+          <!--          />-->
          <view class="custom-search"></view>
        </view>

@@ -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;
-  height: calc(100vh - 75px);
+  top: 160rpx;
+  height: calc(100vh - 160rpx);
  /* #endif */
  /* #ifndef APP-PLUS */
-  top: 120rpx;
-  height: calc(100vh);
+  top: 116rpx;
+  height: calc(100vh - 116rpx);
  /* #endif */
 }

--- a/src/pages/business/CRM/customer/customerUserBelong.vue
+++ b/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);
+      mescroll.endSuccess(res.list.length, res.total >= mescroll.size);
    } 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) {
@@ -184,13 +184,12 @@ const upCallback = async (mescroll) => {
        list.value.push(...res.list);
      }
      // 正确判断是否还有更多数据
-      mescroll.endBySize(res.list.length, res.total)
+      mescroll.endSuccess(res.list.length, res.total >= mescroll.size);
      // 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();
+    }
+
  });
 }

@@ -224,7 +229,7 @@ let handleDetail = (item) => {
        res.eventChannel.emit('editCusData', {param: item, isAdd: false})
      }
    })
-  }else{
+  } else {
    uni.showToast({
      title: '已完成审核，不可修改',
      icon: 'none'
@@ -278,16 +283,15 @@ let handleDelete = async (item) => {
 <style lang="scss" scoped>
 .all-body {
  /* #ifdef APP-PLUS */
-  top: 150rpx;
-  height: calc(100vh - 75px);
+  top: 160rpx;
+  height: calc(100vh - 160rpx);
  /* #endif */
  /* #ifndef APP-PLUS */
-  top: 120rpx;
-  height: calc(100vh);
+  top: 116rpx;
+  height: calc(100vh - 116rpx);
  /* #endif */
 }

-
 .search .btn-search {
  border: none;
  background: none;
--- a/src/pages/business/CRM/customer/selectCustomer.vue
+++ b/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;
-  height: calc(100vh - 75px);
+  top: 160rpx;
+  height: calc(100vh - 160rpx);
  /* #endif */
  /* #ifndef APP-PLUS */
-  top: 120rpx;
-  height: calc(100vh);
+  top: 116rpx;
+  height: calc(100vh - 116rpx);
  /* #endif */
 }
-
 .search .btn-search {
  border: none;
  background: none;
--- a/src/pages/business/CRM/mainOwner/audit/confirmForm.vue
+++ b/src/pages/business/CRM/mainOwner/audit/confirmForm.vue
@@ -602,11 +602,11 @@ let handleReject = () => {
    async success(res){
      if(res.confirm){
        if(res.content){
-          let res = await changeOfPrimaryOwnershipNoApproved({
+          let response = await changeOfPrimaryOwnershipNoApproved({
            opinionOwn: res.content,
            userId: formData.value.userId
          })
-          if(res.code==200){
+          if(response.code===200){
            uni.showToast({
              title: '操作成功',
              success(){
--- a/src/pages/business/CRM/mainOwner/audit/mainOwnerChangeAudit.vue
+++ b/src/pages/business/CRM/mainOwner/audit/mainOwnerChangeAudit.vue
@@ -31,9 +31,11 @@
        >
          <view class="white-bg margin-bottom20" v-for="(item, index) in list" :key="index">
            <view class="report-list" @click.stop="handleDetail(item)">
-              <view class="r-list title" >
+              <view class="r-list title">
                {{ item.cusName }}
-                <view class="r-right" :class="item.auditStatus ? '' : 'btn-pink' ">{{item.auditStatus?'':'待您审批'}}</view>
+                <view class="r-right no-wrap" :class="item.auditStatus ? 'btn-blue' : 'btn-pink' ">
+                  {{ item.auditStatus ?  item.auditStatus : '待审核' }}
+                </view>
              </view>
              <view class="r-list">
                <view class="r-left">客户人员名称</view>
@@ -113,7 +115,7 @@ let handleSearch = () => {
 watch(searchValue, (newValue, oldValue) => {
  handleSearch()
 })
-let clearSearchValue = ()=>{
+let clearSearchValue = () => {
  searchValue.value = '';
 }
 // 查询列表
@@ -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();
+    }
  });
 }

@@ -203,11 +212,11 @@ let handleDetail = (item) => {
  uni.navigateTo({
    url: "/pages/business/CRM/mainOwner/audit/confirmForm",
    events: {
-      refreshOwnerChangeList(){
+      refreshOwnerChangeList() {
        handleSearch();
      }
    },
-    success(res){
+    success(res) {
      res.eventChannel.emit('auditCusOwner', {data: {userId}, editable: false})
    }
  })
@@ -218,12 +227,12 @@ let handleDetail = (item) => {
 <style scoped>
 .all-body {
  /* #ifdef APP-PLUS */
-  top: 150rpx;
-  height: calc(100vh - 75px);
+  top: 160rpx;
+  height: calc(100vh - 160rpx);
  /* #endif */
  /* #ifndef APP-PLUS */
-  top: 120rpx;
-  height: calc(100vh);
+  top: 116rpx;
+  height: calc(100vh - 116rpx);
  /* #endif */
 }

@@ -250,28 +259,34 @@ let handleDetail = (item) => {
  width: 80%;

 }
+.scroll-h{
+  /* #ifdef APP-PLUS */
+  top: 160rpx;
+  height: calc(100vh - 160rpx);
+  /* #endif */
+  /* #ifndef APP-PLUS */
+  top: 116rpx;
+  height: calc(100vh - 116rpx);
+  /* #endif */
+}

 .search .custom-search.uni-searchbar {
  padding-right: 0 !important;
 }

-.scroll-h {
-  /* #ifdef APP-PLUS */
-  height: calc(100vh - 120px);
-  /* #endif */
-  /* #ifndef APP-PLUS */
-  height: calc(100vh - 110px);
-  /* #endif */
-}
-
 .white-bg {
  padding-bottom: 10rpx;
-  .title{
+
+  .title {
    align-items: flex-start;
  }
 }

-.btn-pink{
+.no-wrap{
  white-space: nowrap;
 }
+
+.btn-blue{
+  border-radius: 10rpx;
+}
 </style>
--- a/src/pages/business/CRM/mainOwner/view/viewMainOwner.vue
+++ b/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;
-  height: calc(100vh - 75px);
+  top: 160rpx;
+  height: calc(100vh - 160rpx);
  /* #endif */
  /* #ifndef APP-PLUS */
-  top: 120rpx;
-  height: calc(100vh);
+  top: 116rpx;
+  height: calc(100vh - 116rpx);
  /* #endif */
 }

--- a/src/pages/business/CRM/mainOwner/view/viewMainOwnerDetail.vue
+++ b/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;
 }
--- a/src/pages/business/CRM/marketActivity/visitReport.vue
+++ b/src/pages/business/CRM/marketActivity/visitReport.vue
@@ -27,14 +27,17 @@
                      :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)"
+                longpress-time="1500"
+                @tap="touchend(item)"
+                >
            <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"
-                        @touchend.stop="handleStatusTouchEnd" @click.stop="chooseStatus(item)">
+                  <view
+                        @click.stop="chooseStatus(item)">
                    <view v-if="item.status == '驳回'" class="r-right btn-orange" size="mini">
                      {{ item.status == '驳回' ? '再次提交' : item.status }}
                    </view>
@@ -211,8 +214,6 @@ const getVisitorReportList = (pageNum, pageSize) => {
 }


-let Loop = ref(0)
-let now
 const visistId = ref();
 const cusName = ref();
 const cusId = ref();
@@ -223,9 +224,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 +255,29 @@ function touchstart(item) {
        }
      }
    });
-  }, 750);

 }
-
-function touchend() {
-  let endDate = new Date();
-  console.log('结束时间', endDate)
-  let cha = endDate.getTime() - now.getTime();
-  console.log(cha, 'casd')
-  if (cha < 750) {
+let isLongPressed = ref(false);
+function touchend(item) {
+  visistId.value = item.visistId
+  cusName.value = item.cusName
+  cusId.value = item.cusId
+  status.value = item.status
+  // 如果未触发长按，则执行点击逻辑
+  if (!isLongPressed.value) {
    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;
 }

 //点击状态按钮
--- a/src/pages/business/CRM/plan/myPlan.vue
+++ b/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 {
--- a/src/pages/business/CRM/plan/planEdit.vue
+++ b/src/pages/business/CRM/plan/planEdit.vue
@@ -130,12 +130,12 @@ let instance = null;
 let initCreate = (params)=>{
  const {itemList, selectIndex} = params;
  // 获取用户信息
-  getUserInfo().then(res => {
-    userInfo.value = res.user;
-    console.log(route.path, "：用户信息获取成功");
-  }).catch(err => {
-    console.warn(err, "用户信息获取失败")
-  });
+  // getUserInfo().then(res => {
+  //   userInfo.value = res.user;
+  //   console.log(route.path, "：用户信息获取成功");
+  // }).catch(err => {
+  //   console.warn(err, "用户信息获取失败")
+  // });
  console.log(route.path,`：创建${itemList[selectIndex]}计划`);
  title.value="创建周计划";
  currentEditDate.value.yearMonth = getDate({format: true}).substring(0, 7); // 只要年月
--- a/src/pages/deviceAuth/deviceAuth.vue
+++ b/src/pages/deviceAuth/deviceAuth.vue
@@ -407,7 +407,9 @@ const handleSubmit=()=>{
 .container .bg-h{
    background:url('@/static/images/PicLogoTxt2@2x.png') center bottom 10rpx no-repeat;
    background-size:487rpx 214rpx;
+    /* #ifdef APP-PLUS */
    width: 100vw;
+    /* #endif */
    height: calc(100vh - 110px) ;
    margin:0 auto;
 }
--- a/src/pages/login/login.vue
+++ b/src/pages/login/login.vue
@@ -264,9 +264,9 @@ const submitForm = () => {

            // #ifdef H5
            //h5测试用 内网-sn123456
-            //公司外网 'f3fca83f-bf56-47f4-a98b-a602ed8bddee'
+            //公司外网 'f3fca83f-bf56-47f4-a98b-a602ed8bddee' 529a5543-6957-401e-b090-13df6dee5429
            //友晟外网 'b97527c8-2ad4-493c-a01c-5f9d0aabaff2' 
-            param.uniqCode = 'f3fca83f-bf56-47f4-a98b-a602ed8bddee';
+            param.uniqCode = 'b97527c8-2ad4-493c-a01c-5f9d0aabaff2';
            let res = await login(param);
            userStore.login(res);
            uni.switchTab({ url: '/pages/home/home' })
@@ -362,7 +362,9 @@ page{
 .login-con .bg-h{
    background:url('@/static/images/login-txt.png') center bottom 10rpx no-repeat;
    background-size:654rpx 121rpx;
+    /* #ifdef APP-PLUS */
    width: 100vw;
+    /* #endif */
    height: calc(100vh - 10px) ;
    margin:0 auto;
 }
Author	SHA1	Message	Date
wangzhuo	933714be60	Merge remote-tracking branch 'origin/develop' into develop	2025-09-16 18:06:13 +08:00
wangzhuo	24d35be511	fix: 主归属人变更审核	2025-09-16 18:06:00 +08:00
xuli3099	5f39625d20	Merge branch 'develop' of http://123.57.20.168:4000/admin/ys-app into develop	2025-09-16 15:08:33 +08:00
xuli3099	b42a4456bd	修改样式	2025-09-16 15:08:25 +08:00
wangyang	57ed355def	Merge remote-tracking branch 'origin/develop' into develop	2025-09-16 14:20:50 +08:00
wangyang	2c2950003c	CRM-走访查看-优化新增走访报告报错问题	2025-09-16 14:20:38 +08:00
wangzhuo	b8e8a59da2	Merge remote-tracking branch 'origin/develop' into develop	2025-09-16 08:58:44 +08:00
wangzhuo	20f1c9b857	fix: 客户人员审核	2025-09-16 08:58:29 +08:00
wangyang	842781b8d5	CRM-走访查看-点击查看详情和长按删除事件的优化	2025-09-15 12:55:23 +08:00
wangzhuo	f90bcac11a	Merge remote-tracking branch 'origin/develop' into develop	2025-09-12 16:57:18 +08:00
wangzhuo	d36cadd06f	fix: 修复网络超时loading提示不隐藏的问题 fix: 修复页面高度适配问题	2025-09-12 16:57:00 +08:00
wangzhuo	19fa062229	fix: 周计划-创建-取消获取当前用户信息	2025-09-12 16:54:04 +08:00
xuli3099	ee228475a9	地址修改提交	2025-09-12 13:14:52 +08:00