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

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

@@ -163,7 +163,7 @@ const downCallback = async (mescroll) => {
       const res = await getList(1, mescroll.size || upOption.page.size);
       list.value = res.list;
       // 正确传递 total 参数
-      mescroll.endSuccess(res.list.length, res.total > (mescroll.size || upOption.page.size));
+      mescroll.endSuccess(res.list.length, res.total >= mescroll.size);
     } catch (error) {
       mescroll.endErr();
     } finally {
@@ -184,7 +184,7 @@ 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);
     } catch (error) {
       mescroll.endErr();

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(){

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

@@ -33,8 +33,8 @@
             <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 class="r-right no-wrap" :class="item.auditStatus ? 'btn-blue' : 'btn-pink' ">
+                  {{ item.auditStatus ?  item.auditStatus : '待审核' }}
                 </view>
               </view>
               <view class="r-list">
@@ -261,10 +261,12 @@ let handleDetail = (item) => {
 }
 .scroll-h{
   /* #ifdef APP-PLUS */
-  height: calc(100vh - 120px);
+  top: 160rpx;
+  height: calc(100vh - 160rpx);
   /* #endif */
   /* #ifndef APP-PLUS */
-  height: calc(100vh - 110px);
+  top: 116rpx;
+  height: calc(100vh - 116rpx);
   /* #endif */
 }
 
@@ -272,7 +274,6 @@ let handleDetail = (item) => {
   padding-right: 0 !important;
 }
 
-
 .white-bg {
   padding-bottom: 10rpx;
 
@@ -281,7 +282,11 @@ let handleDetail = (item) => {
   }
 }
 
-.btn-pink {
+.no-wrap{
   white-space: nowrap;
 }
+
+.btn-blue{
+  border-radius: 10rpx;
+}
 </style>