修改易购订单立即支付传值逻辑

api/contract.js

@@ -6,5 +6,7 @@ export const apiArr = {
   applyLedgerReceiver: "/api/v2/wechat/lkl-split-business/apply-ledger-receiver", //分账接收方创建申请
   applyBind: "/api/v2/wechat/lkl-split-business/apply-bind", //分账关系绑定申请
   addMer: "/api/v2/wechat/lkl-split-business/add-mer", //商户进件
+  queryMerchant: "/api/v2/wechat/lkl-split-business/query-merchant", //商户进件信息查询
   applyLedgerMer: "/api/v2/wechat/lkl-split-business/apply-ledger-mer", //商户分账业务开通申请
+  queryLedgerMer: "/api/v2/wechat/lkl-split-business/query-ledger-mer", //商户分账信息查询
 };

packages/customerService/applyBind/index.vue

@@ -15,7 +15,8 @@
 
                 <view class="form-item">
                     <label class="form-label required">分账接收方编号</label>
-                    <input type="text" class="form-input" v-model="formData.receiverNo" placeholder="请输入分账接收方编号" required>
+                    <input type="text" class="form-input" v-model="formData.receiverNo" placeholder="请输入分账接收方编号"
+                        required>
                 </view>
             </view>
 
@@ -23,7 +24,8 @@
             <view class="form-section">
                 <view class="form-item">
                     <label class="form-label required">附件名称</label>
-                    <input type="text" class="form-input" v-model="formData.entrustFileName" placeholder="请输入合作协议附件名称" required>
+                    <input type="text" class="form-input" v-model="formData.entrustFileName" placeholder="请输入合作协议附件名称"
+                        required>
                 </view>
                 <button class="upload-btn" @click="uploadEntrustFile">上传合作协议</button>
                 <view v-if="formData.entrustFilePath" class="file-info">
@@ -67,7 +69,8 @@
             <view class="popup-content">
                 <view class="popup-title">选择附件类型</view>
                 <view class="popup-list">
-                    <view class="popup-item" v-for="type in attachTypeOptions" :key="type.value" @click="selectAttachType(showAttachTypePopup, type)">
+                    <view class="popup-item" v-for="type in attachTypeOptions" :key="type.value"
+                        @click="selectAttachType(showAttachTypePopup, type)">
                         {{ type.label }}
                     </view>
                 </view>
@@ -121,7 +124,11 @@ export default {
                 entrustFileName: '',
                 entrustFilePath: '',
                 // 可选附件列表
-                attachments: []
+                attachments: [{
+                    attachType: '',
+                    attachName: '',
+                    attachStorePath: ''
+                }]
             }
         };
     },

packages/customerService/contract/index.css

@@ -1,430 +1,322 @@
-/* 全局样式重置与基础设置 */
+/* 全局样式重置 */
 * {
   margin: 0;
   padding: 0;
-    font-family: "SimSun", "宋体", serif;
-}
-
-page {
-    padding-bottom: 0;
-}
-
-.contract-container {
-    width: 100%;
-    background-color: #fff;
-    padding: 15px;
   box-sizing: border-box;
-    margin: 0 auto;
-    position: relative;
-    word-break: break-word;
-    overflow-x: hidden;
 }
 
-/* 导航栏样式 */
+body {
-.nav {
+  font-family: 'SimSun', '宋体', serif;
+  font-size: 28rpx;
+  color: #333;
+  line-height: 1.5;
+  background-color: #fff;
+}
+
+page{
+  padding-bottom: 0rpx;
+}
+
+/* 合同容器 */
+.contract-container {
+  max-width: 1200rpx;
+  margin: 0 auto;
+  padding: 140rpx 30rpx 40rpx;
+  background-color: #fff;
+}
+
+/* 提交申请按钮样式 */
+.submit-container {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin: 40rpx 0;
+  padding: 20rpx;
+}
+
+.submit-btn {
+  width: 80%;
+  max-width: 400rpx;
+  height: 80rpx;
+  background-color: #007bff;
+  color: #fff;
+  border: none;
+  border-radius: 10rpx;
+  font-size: 32rpx;
+  font-weight: bold;
+  cursor: pointer;
+  transition: background-color 0.3s;
+}
+
+.submit-btn:hover {
+  background-color: #0056b3;
+}
+
+.submit-btn:active {
+  background-color: #004085;
+}
+
+.header{
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  z-index: 1000;
   display: flex;
   justify-content: space-between;
   align-items: center;
+  margin-bottom: 30rpx;
+  background-color: #fff;
   padding: 20rpx 30rpx;
-    border-bottom: 1px solid #e5e5e5;
+  box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.1);
-    background-color: #fafafa;
-}
-
-.nav-title {
-    font-size: 32rpx;
-    font-weight: bold;
-    color: #333333;
-}
-
-.save-btn {
-    font-size: 26rpx;
-    color: #0066cc;
-    background: transparent;
-    padding: 0;
-    margin: 0;
-}
-
-/* 滚动容器样式 */
-.contract-scroll {
-    width: 100%;
-    padding: 20rpx 30rpx;
-    box-sizing: border-box;
-}
-
-/* 合同内容区基础样式 */
-.contract-content {
-    width: 100%;
-    line-height: 1.8;
-    font-size: 28rpx;
-    color: #333333;
-}
-
-/* 合同头部样式 */
-.header {
-    margin-bottom: 40rpx;
-    /* text-align: center; */
-}
-
-.qrcode-tip {
-    font-size: 24rpx;
-    color: #666666;
-    margin-bottom: 20rpx;
 }
 
+/* 合同标题 */
 .contract-title {
   font-size: 36rpx;
   font-weight: bold;
-    margin: 20rpx 0;
+  text-align: center;
-    color: #333333;
+  margin-bottom: 40rpx;
+  color: #333;
 }
 
+.header-title{
+  font-size: 36rpx;
+}
+
+.print-btn{
+  padding: 2rpx 20rpx;
+  background-color: #007bff;
+  color: #fff;
+  border: none;
+  border-radius: 8rpx;
+  font-size: 28rpx;
+  cursor: pointer;
+}
+
+/* 甲乙双方信息 */
 .party-info {
-    text-align: left;
-    margin: 30rpx 0;
-    line-height: 2;
-}
-
-.preamble {
-    text-indent: 56rpx;
-    /* 首行缩进2字符（28rpx*2） */
-    margin-bottom: 20rpx;
-}
-
-/* 条款通用样式 */
-.clauses {
-    margin-bottom: 60rpx;
-}
-
-.clause {
   margin-bottom: 40rpx;
 }
 
-.clause-num {
+.party-info p {
+  margin-bottom: 20rpx;
+  font-size: 28rpx;
+}
+
+/* 合同内容 */
+.contract-content {
+  margin-bottom: 40rpx;
+}
+
+.contract-intro {
+  margin-bottom: 30rpx;
+  text-align: justify;
+  font-size: 28rpx;
+}
+
+/* 标题样式 */
+h2 {
+  font-size: 32rpx;
+  font-weight: bold;
+  margin-bottom: 30rpx;
+  color: #333;
+}
+
+h3 {
   font-size: 30rpx;
   font-weight: bold;
-    margin: 20rpx 0;
-    color: #333333;
-}
-
-.clause-content {
-    margin-left: 40rpx;
-    line-height: 1.8;
-}
-
-/* 服务项样式 */
-.service-item {
-    font-size: 28rpx;
-    font-weight: 600;
-    margin: 20rpx 0 10rpx 0;
-    display: block;
-}
-
-.service-desc {
-    text-indent: 56rpx;
-    margin: 10rpx 0;
-    display: block;
-}
-
-.service-list {
-    list-style: disc;
-    margin-left: 50rpx;
   margin-bottom: 20rpx;
-    padding-left: 20rpx;
+  color: #333;
 }
 
-.service-list li {
+/* 章节样式 */
+.section {
+  margin-top: 20rpx;
+  margin-bottom: 40rpx;
+}
+
+.section-desc input {
+  display: inline-block;
+}
+
+.section-desc {
+  margin-bottom: 20rpx;
+  font-size: 28rpx;
+}
+
+.section-desc {
+  line-height: 1.5;
+}
+
+.input-field {
+  width: 40px;
+  vertical-align: middle;
+}
+
+.subsection {
+  margin-bottom: 30rpx;
+  margin-left: 40rpx;
+}
+
+.subsection p {
   margin-bottom: 15rpx;
-    line-height: 1.8;
+  font-size: 28rpx;
-    display: block;
 }
 
-/* 表格通用样式 */
+.subsection-item view {
-.fee-table,
+  display: flex;
-.info-table {
+  align-items: center;
+}
+
+.subsection-item input {
+  display: inline-block;
+}
+
+/* 复选框组 */
+.checkbox-group {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 20rpx;
+  margin-bottom: 20rpx;
+}
+
+.checkbox-item {
+  display: flex;
+  align-items: center;
+  font-size: 28rpx;
+  cursor: pointer;
+}
+
+.checkbox-label {
+  margin-right: 10rpx;
+}
+
+/* 输入框样式 */
+.input-field1 {
+  width: 500rpx;
+  height: 60rpx;
+  border: 1rpx solid #ccc;
+  border-radius: 8rpx;
+  padding: 0 20rpx;
+  font-size: 28rpx;
+  margin: 0 10rpx;
+}
+
+.input-field {
+  width: 200rpx;
+  height: 40rpx;
+  border: 1rpx solid #ccc;
+  border-radius: 8rpx;
+  padding: 0 20rpx;
+  font-size: 28rpx;
+  margin: 0 10rpx;
+}
+
+.input-field.small {
+  width: 100rpx;
+}
+
+.input-field.very-small {
+  width: 100rpx;
+}
+
+/* 费用标准样式 */
+.fee-standard {
+  display: flex;
+  flex-direction: column;
+  gap: 20rpx;
+  margin-bottom: 20rpx;
+}
+
+.fee-standard .checkbox-item {
+  display: flex;
+  align-items: center;
+  font-size: 28rpx;
+  cursor: pointer;
+  flex-wrap: wrap;
+}
+
+/* 表格样式 */
+.fee-table {
   width: 100%;
   border-collapse: collapse;
-    margin: 20rpx 0;
+  margin-bottom: 30rpx;
-    font-size: 26rpx;
+  font-size: 28rpx;
+}
+
+.wrap-text {
+    word-wrap: break-word;
+    word-break: break-all;
+    max-width: 100%;
 }
 
 .fee-table th,
-.fee-table td,
+.fee-table td {
-.info-table th,
+  display: flex;
-.info-table td {
+  justify-content: center;
-    border: 1px solid #333333;
+  align-items: center;
-    padding: 12rpx 8rpx;
+  border: 1rpx solid #ccc;
+  padding: 20rpx;
   text-align: center;
 }
 
-.fee-table th,
+.fee-table th {
-.info-table th,
-.info-table .table-label {
   background-color: #f5f5f5;
   font-weight: bold;
 }
 
-/* 填写项样式 */
+.fee-table tr:nth-child(even) {
-.fill-input {
+  background-color: #fafafa;
-    border: 1px solid #ddd;
-    border-radius: 4rpx;
-    padding: 0 8px;
-    margin: 0 4rpx;
-    font-size: 13px;
-    color: #333333;
-    background-color: #ffffff;
-    flex-shrink: 0;
-    height: 28px;
-    width: 80px;
-    box-sizing: border-box;
-    vertical-align: middle;
 }
 
-.fill-tiny {
+/* 响应式设计 */
-    width: 60px;
+@media (max-width: 750rpx) {
-    /* 小尺寸输入框（如百分比、台数） */
+  .contract-container {
-    text-align: center;
+    padding: 20rpx 15rpx;
-}
+  }
 
-.fill-small {
+  .contract-title {
-    width: 140px;
-    /* 中尺寸输入框（如银行名称、其他说明） */
-}
-
-.fill-normal {
-    width: 300rpx;
-    /* 常规尺寸输入框（如商户名称、地址） */
-}
-
-.fill-date {
-    width: 220rpx;
-    /* 日期输入框 */
-    text-align: center;
-}
-
-.fill-table {
-    width: 100%;
-    /* 表格内输入框：填满单元格 */
-    margin: 0;
-    box-sizing: border-box;
-}
-
-/* 单选/多选样式 */
-.radio-label,
-.checkbox-label {
-    margin-right: 25rpx;
-    margin-bottom: 15rpx;
-    display: inline-flex;
-    align-items: center;
-    font-size: 26rpx;
-    color: #333;
-    flex-wrap: wrap;
-    gap: 8rpx;
-    line-height: 1.6;
-}
-
-/* 单选/多选组容器：控制整体间距 */
-.radio-group-container,
-.checkbox-group-container {
-    display: flex;
-    flex-direction: column;
-    gap: 15rpx;
-    margin: 15rpx 0;
-    width: 100%;
-}
-
-/* 单个单选/多选选项：垂直居中对齐，统一高度 */
-.radio-label,
-.checkbox-label {
-    display: flex;
-    align-items: flex-start;
-    margin-right: 0;
-    margin-bottom: 0;
-    word-break: break-word;
-    max-width: 100%;
-    flex-wrap: wrap;
-    gap: 8rpx;
-    /* radio/checkbox 与文本的间距 */
-    font-size: 26rpx;
-    color: #333;
-    padding: 8rpx 0;
-    line-height: 1.8;
-}
-
-/* 商户更名输入框：仅在选中时显示，与文本对齐 */
-#input-original-name {
-    margin-left: 10rpx;
-    /* 与“商户更名”文本的间距 */
-    margin-top: 0;
-    /* 清除默认margin，确保垂直居中 */
-}
-
-/* 备注/说明文本样式 */
-.note,
-.mode-note,
-.risk-note,
-.deduct-note,
-.table-note,
-.appendix-footnote {
-    font-size: 24rpx;
-    color: #666666;
-    margin: 10rpx 0;
-    text-indent: 56rpx;
-}
-
-/* 签字区域样式 */
-.sign-main,
-.sign-appendix {
-    display: flex;
-    justify-content: space-between;
-    margin: 60rpx 0;
-    padding: 0 40rpx;
-}
-
-.sign-party {
-    text-align: center;
-    width: 45%;
-    line-height: 2.2;
-}
-
-/* 附件通用样式 */
-.appendix {
-    margin: 80rpx 0;
-    padding: 20rpx;
-    border-top: 1px dashed #cccccc;
-}
-
-.appendix-title {
     font-size: 32rpx;
-    font-weight: bold;
+  }
-    text-align: center;
-    margin: 30rpx 0;
-    color: #333333;
-}
 
-.appendix-subtitle {
+  h2 {
     font-size: 28rpx;
-    font-weight: bold;
+  }
-    margin: 30rpx 0 15rpx;
-    color: #333333;
-}
 
-.appendix-note {
+  h3 {
-    font-size: 24rpx;
-    color: #666666;
-    text-align: right;
-    margin-bottom: 30rpx;
-}
-
-/* 授权书内容样式 */
-.authorization-content {
-    text-indent: 56rpx;
-    margin: 15rpx 0;
-    line-height: 1.8;
-}
-
-/* 提交按钮样式 */
-.submit-btn {
-    width: 90%;
-    margin: 0 auto;
-    background-color: #0066cc;
-    color: #ffffff;
-    font-size: 32rpx;
-    padding: 18rpx 0;
-    border-radius: 12rpx;
-    font-weight: 600;
-}
-
-/* 适配小程序端滚动条样式（隐藏默认滚动条） */
-::-webkit-scrollbar {
-    width: 0;
-    height: 0;
-    color: transparent;
-}
-
-/* 补充样式优化 */
-.radio-group-container {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 20rpx;
-    margin: 10rpx 0;
-}
-
-.radio-label,
-.checkbox-label {
-    display: inline-flex;
-    align-items: center;
-    margin-right: 25rpx;
-    margin-bottom: 10rpx;
     font-size: 26rpx;
-}
+  }
 
-.checkbox-group {
+  .input-field {
-    display: flex;
+    width: 250rpx;
-    flex-wrap: wrap;
+    height: 50rpx;
-    gap: 15rpx;
-}
-
-.service-list li {
-    margin-bottom: 15rpx;
-    line-height: 1.6;
-}
-
-.fee-label {
-    display: block;
-    margin: 8rpx 0;
-}
-
-.mode-item {
-    margin: 15rpx 0;
-    text-indent: 56rpx;
-}
-
-.mode-note {
-    font-size: 24rpx;
-    color: #666;
-    margin: 10rpx 0;
-    text-indent: 56rpx;
-}
-
-.table-note {
-    font-size: 24rpx;
-    color: #666;
-    margin: 10rpx 0 5rpx 0;
-}
-
-.authorization-content {
-    text-indent: 56rpx;
-    margin: 15rpx 0;
-    line-height: 1.8;
-}
-
-.sign-appendix {
-    display: flex;
-    flex-direction: column;
-    gap: 20rpx;
-    margin: 40rpx 0;
-    padding: 0 20rpx;
-}
-
-.sign-appendix p {
-    line-height: 2;
     font-size: 26rpx;
-    display: flex;
+  }
-    align-items: center;
+
-    gap: 10rpx;
+  .input-field.small {
+    width: 150rpx;
+  }
+
+  .input-field.very-small {
+    width: 80rpx;
+  }
+
+  .fee-table th,
+  .fee-table td {
+    padding: 15rpx;
+    font-size: 26rpx;
+  }
 }
 
-/* 优化表格内输入框 */
+/* 打印样式 */
-.info-table .fill-input,
+@media print {
-.fee-table .fill-input {
+  .contract-container {
-    box-sizing: border-box;
+    max-width: 100%;
-    border: 1px solid #0066cc;
+    padding: 0;
-    margin: 2rpx;
+  }
-}
 
-/* 优化单选/多选按钮对齐 */
+  .input-field {
-radio,
+    border: 1rpx solid #000;
-checkbox {
+  }
-    margin-right: 8rpx;
-    vertical-align: middle;
 }

packages/customerService/establishAcceptor/index.vue

@@ -172,8 +172,8 @@ export default {
 
             // 账户类型选项
             accountTypeOptions: [
-                { value: 'PERSONAL', label: '个人账户' },
+                { value: '57', label: '对公' },
-                { value: 'COMPANY', label: '企业账户' }
+                { value: '58', label: '对私' }
             ],
 
             // 附件类型选项

packages/customerService/sign/index.vue

@@ -134,6 +134,7 @@ export default {
   data() {
     return {
       formData: {
+        mch_id: '000',
         ec_type_code: 'Ec007',
         cert_type: '',
         cert_name: '',
@@ -176,6 +177,22 @@ export default {
     if (options.ec_content) {
       this.formData.ec_content_parameters = options.ec_content;
     }
+    
+    // 监听协议签署成功事件
+    uni.$on('agreementSigned', (data) => {
+      if (data && data.ec_content) {
+        this.formData.ec_content_parameters = data.ec_content;
+        uni.showToast({
+          title: '协议签署成功',
+          icon: 'success'
+        });
+      }
+    });
+  },
+  
+  // 页面卸载时移除事件监听
+  onUnload() {
+    uni.$off('agreementSigned');
   },
   methods: {
     //下载合同

packages/myOrders/groupOrders/index.vue

@@ -141,15 +141,15 @@ export default {
   data() {
     return {
       categoryList: [
-        { category_name: "全部" },
+        { category_name: "全部", status: "" },
-        { category_name: "待付款" },
+        { category_name: "待付款", status: 1 },
-        { category_name: "备货中" },
+        { category_name: "备货中", status: 3 },
-        // { category_name: "待自提" },
+        // { category_name: "待自提", status: 4 },
-        // { category_name: "已完成" },
+        // { category_name: "已完成", status: 5 },
-        { category_name: "已取消" },
+        { category_name: "已取消", status: 6 },
-        { category_name: "待评价" },
+        { category_name: "待评价", evaluateStatus: 2, status: "" },
-        { category_name: "已评价" },
+        { category_name: "已评价", evaluateStatus: 1, status: "" },
-        { category_name: "售后" },
+        { category_name: "售后", status: "" },
       ],
       selectedTab: 0,
       // orderData: orderMockData,
@@ -169,19 +169,8 @@ export default {
   methods: {
     selectTab(index, item) {
       this.selectedTab = index;
-      if (index == 6) {
+      this.selectStatus = item.status || '';
-        this.evaluateStatus = 2;
+      this.evaluateStatus = item.evaluateStatus || '';
-        this.selectStatus = ''
-      } else if (index == 7) {
-        this.evaluateStatus = 1;
-        this.selectStatus = ''
-      } else if (index == 2) {
-        this.selectStatus = 3;
-        this.evaluateStatus = ''
-      } else {
-        this.selectStatus = index > 2 ? index + 1 : index;
-        this.evaluateStatus = ''
-      }
       this.getOrderList();
     },
     // 取消订单

packages/myOrders/index/index.vue

@@ -142,15 +142,15 @@ export default {
   data() {
     return {
       categoryList: [
-        { category_name: "全部" },
+        { category_name: "全部", status: "" },
-        { category_name: "待付款" },
+        { category_name: "待付款", status: 1 },
-        { category_name: "待发货" },
+        { category_name: "待发货", status: 3 },
-        // { category_name: "配送中" },
+        // { category_name: "配送中", status: 4 },
-        // { category_name: "已完成" },
+        // { category_name: "已完成", status: 5 },
-        { category_name: "已取消" },
+        { category_name: "已取消", status: 6 },
-        { category_name: "待评价" },
+        { category_name: "待评价", evaluateStatus: 2, status: "" },
-        { category_name: "已评价" },
+        { category_name: "已评价", evaluateStatus: 1, status: "" },
-        { category_name: "售后" },
+        { category_name: "售后", status: "" },
       ],
       selectedTab: 0,
       // orderData: orderMockData,
@@ -169,20 +169,10 @@ export default {
   },
   methods: {
     selectTab(index, item) {
+      console.log("🚀 ~ item:", item)
       this.selectedTab = index;
-      if (index == 6) {
+      this.selectStatus = item.status || '';
-        this.evaluateStatus = 2;
+      this.evaluateStatus = item.evaluateStatus || '';
-        this.selectStatus = ''
-      } else if (index == 7) {
-        this.evaluateStatus = 1;
-        this.selectStatus = ''
-      } else if (index == 2) {
-        this.selectStatus = 3;
-        this.evaluateStatus = ''
-      } else {
-        this.selectStatus = index > 2 ? index + 1 : index;
-        this.evaluateStatus = ''
-      }
       this.getOrderList();
     },
     // 取消订单

packages/shop/goodsSubmit/index.vue

@@ -371,21 +371,28 @@ export default {
                     user_id: uni.getStorageSync('userId'),
                     // 先判断shopCarList数据中是否包含isAdver且为true
                     order_cate: this.carList.some(item => item.isAdver === true) ? 3 : 1,
-                    goods_list: [{
+                    goods_list: Object.values(this.orderList.reduce((acc, item) => {
-                        supplier_id: this.orderList[0].supplier_id,
+                        const supplierId = item.supplier_id;
-                        supplier_name: this.orderList[0].supplier_name || '',
+                        if (!acc[supplierId]) {
-                        is_same_day: this.orderList[0].commodity_goods_info.is_same_day,
+                            acc[supplierId] = {
+                                supplier_id: supplierId,
+                                supplier_name: item.supplier_name || '',
+                                is_same_day: item.commodity_goods_info.is_same_day,
                                 receiving_name: this.defAddress.name,
                                 receiving_phone: this.defAddress.phone,
                                 receiving_address: this.defAddress.address + this.defAddress.house_number,
                                 merchant_id: this.defAddress.address_id,
-                        goods_and_count: this.orderList.map(item => ({
+                                goods_and_count: []
+                            };
+                        }
+                        acc[supplierId].goods_and_count.push({
                             goods_id: item.goods_id,
                             count: item.count,
                             price: item.commodity_goods_info.sales_price,
                             freight: item.commodity_goods_info.freight,
-                        }))
+                        });
-                    }]
+                        return acc;
+                    }, {}))
                 }
 
                 request(apiArr.createOrder, "POST", params).then(resVal => {

packages/storeManagement/index/index.vue

@@ -132,6 +132,16 @@ export default {
 					name: "电子签约",
 					url: "/packages/customerService/sign/index",
 				},
+				{
+					image: "https://static.hshuishang.com/contract.png",
+					name: "商户进件",
+					url: "/packages/customerService/addMer/index",
+				},
+				{
+					image: "https://static.hshuishang.com/contract.png",
+					name: "分账开通",
+					url: "/packages/customerService/applyLedgerMer/index",
+				},
 				{
 					image: "https://static.hshuishang.com/contract.png",
 					name: "创建接收方",
@@ -141,16 +151,6 @@ export default {
 					image: "https://static.hshuishang.com/contract.png",
 					name: "申请绑定",
 					url: "/packages/customerService/applyBind/index",
-				},
-				{
-					image: "https://static.hshuishang.com/contract.png",
-					name: "商户进件",
-					url: "/packages/customerService/addMer/index",
-				},
-				{
-					image: "https://static.hshuishang.com/contract.png",
-					name: "分账申请",
-					url: "/packages/customerService/applyLedgerMer/index",
 				}
 			],
 			walletInfo: {},

pages/index/index.vue

@@ -402,12 +402,12 @@ export default {
       }
 
       // 如果没有热词，不启动滚动
-      if (this.hotWord.length === 0) {
+      if (!this.hotWord || this.hotWord.length === 0) {
         return;
       }
 
       let index = 0;
-      const totalHeight = this.hotWord.length * this.itemHeight;
+      const totalHeight = this.hotWord && this.hotWord.length * this.itemHeight;
       const containerHeight = this.itemHeight; // 容器高度，只显示一项
 
       this.scrollInterval = setInterval(() => {
@@ -685,8 +685,8 @@ export default {
         page_size: 10
       }, { silent: false });
 
-      if (res.rows.length) {
+      if (res.rows && res.rows.length) {
-        let filterRes = this.filterShowList(res?.rows, 1);
+        let filterRes = this.filterShowList(res.rows, 1);
         filterRes.forEach(item => {
           item.pic_src = picUrl + item.pic_src
         })
@@ -705,11 +705,11 @@ export default {
         page_num: 1,
         page_size: 10
       }, { silent: false });
-      if (!res.rows.length) {
+      if (!res.rows || !res.rows.length) {
         this.serverLeftList = []
       }
 
-      if (res.rows.length) {
+      if (res.rows && res.rows.length) {
         this.serverLeftList = res.rows
         let filterRes = this.filterShowList(res?.rows, 1);
         filterRes.forEach(item => {
@@ -733,10 +733,10 @@ export default {
           page_num: 1,
           page_size: 10
         }, { silent: false });
-        if (!res.rows.length) {
+        if (!res.rows || !res.rows.length) {
           this.serverRightList = []
         }
-        if (res.rows.length) {
+        if (res.rows && res.rows.length) {
           let filterRes = this.filterShowList(res?.rows, 1);
           filterRes.forEach(item => {
             item.pic_src = picUrl + item.pic_src
@@ -756,7 +756,7 @@ export default {
         page_num: 1,
         page_size: 10
       }, { silent: false });
-      if (res.rows.length) {
+      if (res.rows && res.rows.length) {
         let filterRes = this.filterShowList(res?.rows, 1);
         filterRes.forEach(item => {
           item.pic_src = picUrl + item.pic_src
@@ -778,7 +778,7 @@ export default {
           page_num: 1,
           page_size: 10
         }, { silent: false });
-        if (res.rows.length) {
+        if (res.rows && res.rows.length) {
           // let firstItem = res.rows[0];
           // firstItem.pic_src = picUrl + firstItem.pic_src;
           // rightList.push(firstItem);
@@ -941,10 +941,10 @@ export default {
         page_num: this.bottomPageNum,
         page_size: this.bottomPageSize
       }, { silent: val ? false : true });
-      if (res.rows.length === 0) {
+      if (!res.rows || res.rows.length === 0) {
         return [];
       };
-      if (res.rows.length == this.bottomPageSize) {
+      if (res.rows && res.rows.length == this.bottomPageSize) {
         this.flag = true
       } else {
         this.flag = false
@@ -992,7 +992,7 @@ export default {
         isShop: 1,
       }
       const res = await request(apiArr2.getCateList, "POST", params, { slice: false });
-      if (res.rows.length) {
+      if (res.rows && res.rows.length) {
         this.currentCategoryId = res.rows[0].id
         this.activeCategoryId = `category-${this.currentCategoryId}`
         this.getMechantList()
@@ -1013,8 +1013,8 @@ export default {
         let latitude = uni.getStorageSync("location").lat;
         let longitude = uni.getStorageSync("location").lng;
         res.rows.forEach((item) => {
-          item.bigImg = item.album_images.split(",");
+          item.bigImg = item.album_images?.split(",");
-          item.showImg = picUrl + item.album_images.split(",")[0];
+          item.showImg = picUrl + item.album_images?.split(",")[0];
           const distanceInKm = calculateDistance(
             latitude,
             longitude,
@@ -1042,7 +1042,7 @@ export default {
           return valueA - valueB;
         });
 
-        if (res.rows.length == this.page_size) {
+        if (res.rows && res.rows.length == this.page_size) {
           this.page_num = this.page_num + 1;
           this.flag = true;
         } else {
@@ -1069,8 +1069,9 @@ export default {
      * @returns {Array} 返回符合条件的数组内容
     */
     filterShowList(list, type) {
-      if (list && list.length == 0) return [];
+      if (list && list.length) {
         return list.filter((item) => item.show_status == type);
+      } return [];
     },
 
     async showSearch() {
@@ -1081,7 +1082,7 @@ export default {
     async getSearchVal() {
       const res = await request(apiArr.hotWord, "POST", {}, { slice: false });
       // 支持英文逗号和中文逗号分割
-      this.hotWord = res.search_hot_word.split(/[,，]/)
+      this.hotWord = res.search_hot_word ? res.search_hot_word.split(/[,，]/) : []
     },
 
     async switchCategory(id) {
@@ -1170,7 +1171,7 @@ export default {
   watch: {
     hotWord: {
       handler(newVal) {
-        if (newVal.length > 0) {
+        if (newVal && newVal.length > 0) {
           this.startScrollAnimation();
         }
       },