Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss_wx_app

api/pages/ivt/inboundOther.js

@@ -13,7 +13,8 @@ module.exports = {
     prefix: 'mdm-server/ivt/inbound_other/',
     otherInboundInsert: 'inbound_insert',
     otherInboundUpdate: 'inbound_update',
-    inBoundHandle: 'inbound_handle'
+    inBoundHandle: 'inbound_handle',
+    inboundRepeal: 'repeal/',
   },
 
   routeUrl: {

api/pages/ivt/inboundProcessing.js

@@ -9,32 +9,34 @@
  *******************************************************************************/
 module.exports = {
   inboundProcessingService: {
-      // 前缀
-      prefix: 'mdm-server/ivt/inbound_purchase/',   
-      inBoundHandle:'inbound_handle',
-      inboundInsert:'inbound_insert',
-      inboundUpdate:'inbound_update',
-      
+    // 前缀
+    prefix: 'mdm-server/ivt/inbound_purchase/',
+    inBoundHandle: 'inbound_handle',
+    inboundInsert: 'inbound_insert',
+    inboundUpdate: 'inbound_update',
+    inboundRepeal: 'repeal/',
   },
 
   routeUrl: {
-    inboundProcessing: { 
-      addReturn:{
-        key:'addReturn',url:'/package-purchase/pages/purchase-return/add/add',formMode:'edit'
+    inboundProcessing: {
+      invaidOrder: { key: 'invaidOrder', method: 'invaidOrder' },
+      editOrder: { key: 'editOrder', method: 'editOrder', primaryKey: 'intoId' },
+      addReturn: {
+        key: 'addReturn', url: '/package-purchase/pages/purchase-return/add/add', formMode: 'edit'
       },
-      detailInProcessing: { key: 'detailInProcessing', url: '/package-inventory/pages/warehousing-processing/detail/detail' , },
-      detail: { key: 'detail', url: '/package-purchase/pages/purchase-receipt/detail/detail'  },
-      add: { key: 'add', url: '/package-purchase/pages/purchase-receipt/add/add'  },
-      edit: { key: 'edit', url: '/package-inventory/pages/warehousing-processing/detail/detail'  },
-      addOther: { key: 'addOther', url: '/package-inventory/pages/other-warehousing/other-warehousing'  },
-      chooseSupplier: { key: 'chooseSupplier', url: '/package-base-select/pages/select-data/select-data',type:'supplier'  },
-      chooseStaff: { key: 'chooseStaff', url: '/package-base-select/pages/select-data/select-data',type:'staff'  },
-      staffadd: { key: 'staffadd', url: '/package-basic-data/pages/staff/add/add'  },
-      chooseOrg: { key: 'chooseOrg',url: '/package-base-select/pages/select-data/select-data',type:'org' }, 
-      chooseWh: { key: 'chooseWh', url: '/package-base-select/pages/select-data/select-data',type:'warehouse'  },
-      choosePurchaseOrder: { key: 'choosePurchaseOrder', url: '/package-purchase/pages/purchase-receipt/choose-purchase-order/choose-purchase-order'  },
-      
-    
+      detailInProcessing: { key: 'detailInProcessing', url: '/package-inventory/pages/warehousing-processing/detail/detail', },
+      detail: { key: 'detail', url: '/package-purchase/pages/purchase-receipt/detail/detail' },
+      add: { key: 'add', url: '/package-purchase/pages/purchase-receipt/add/add' },
+      edit: { key: 'edit', url: '/package-inventory/pages/warehousing-processing/detail/detail' },
+      addOther: { key: 'addOther', url: '/package-inventory/pages/other-warehousing/other-warehousing' },
+      chooseSupplier: { key: 'chooseSupplier', url: '/package-base-select/pages/select-data/select-data', type: 'supplier' },
+      chooseStaff: { key: 'chooseStaff', url: '/package-base-select/pages/select-data/select-data', type: 'staff' },
+      staffadd: { key: 'staffadd', url: '/package-basic-data/pages/staff/add/add' },
+      chooseOrg: { key: 'chooseOrg', url: '/package-base-select/pages/select-data/select-data', type: 'org' },
+      chooseWh: { key: 'chooseWh', url: '/package-base-select/pages/select-data/select-data', type: 'warehouse' },
+      choosePurchaseOrder: { key: 'choosePurchaseOrder', url: '/package-purchase/pages/purchase-receipt/choose-purchase-order/choose-purchase-order' },
+
+
     }
-  } 
+  }
 };

api/pages/ivt/inboundPurchaseReturn.js

@@ -11,7 +11,8 @@ module.exports = {
   inboundSaleReturnService: {
     // 前缀
     prefix: 'mdm-server/ivt/inbound_purchase_return/',
-    inBoundHandle: 'inbound_handle'
+    inBoundHandle: 'inbound_handle',
+    inboundRepeal: 'repeal/',
   },
 
   routeUrl: {

api/pages/mst/advertisement.js

@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright(c) 2024 dongke All rights reserved. / Confidential
+ * 类的信息：
+ *		1.程序名称：
+ *		2.功能描述：广告查询方法
+ * 编辑履历：
+ *		作者				日期					版本				修改内容
+ *		周兴		    2024-4-1     1.00		       	新建
+ *******************************************************************************/
+module.exports = {
+
+  advertisementService: {
+    // 前缀
+    prefix: 'oauth-server/advertisement/',
+  },
+
+  routeUrl: {
+    advertisement: {
+    }
+  }
+};

app.js

@@ -64,10 +64,11 @@ const menuFrequency = require('./api/pages/mst/menuFrequency.js');
 const userMenuFrequency = require('./api/pages/mst/userMenuFrequency.js');
 const comMenu = require('./api/pages/mst/comMenu.js');
 const saleOutBoundReturn = require('./api/pages/ivt/saleOutBoundReturn.js');
+const advertisement = require('./api/pages/mst/advertisement.js');
 
 // api服务路由文件
 var apiList = [common, oauth,setting, company, wechatPay,user, staff, staffRight, staffPurview, settingValue, customer, role, roleFun, org, roleSensitive, goodsBrand, goodsCategory, goodsSeries, unit, supplier, warehouse, saleChannel, goodsSku, basicData,customerMst,purchase,account,
-  receiptPayment,inbound,inboundOther,inboundProcessing,inboundPurchaseReturn,outbound,outboundOther,outboundProcessing,outboundSaleReturn,inventory,moneyAccount,intoReturn,intoReturnItem,cusFollow,order,transfer,income,saleOutBound,inboundReturn,cusReceiptPayment,menuFrequency,userMenuFrequency,comMenu,saleOutBoundReturn]
+  receiptPayment,inbound,inboundOther,inboundProcessing,inboundPurchaseReturn,outbound,outboundOther,outboundProcessing,outboundSaleReturn,inventory,moneyAccount,intoReturn,intoReturnItem,cusFollow,order,transfer,income,saleOutBound,inboundReturn,cusReceiptPayment,menuFrequency,userMenuFrequency,comMenu,saleOutBoundReturn,advertisement]
 
 const util = require('./utils/util.js')
 const baseMethod = require('./api/pages/baseMethod.js')

components/dkbusiness/dk-dropdown-menu/dk-dropdown-menu.js

@@ -177,8 +177,11 @@ Component({
      * @date : 2024/1/26 12:16
      */
     onSearchText(e) {
+      let form = this.data.form
+      form.searchText = e.detail
       this.setData({
-        searchText: e.detail,
+        form:form,
+        value:JSON.stringify(form),
         searchTextFlag: e.detail ? true : false//TOP搜索输入标识
       })
     },
@@ -191,13 +194,15 @@ Component({
       let form = null;
       // 大查询
       if (this.data.searchTextFlag) {
-        form = {
-          searchText: this.data.searchText
-        }
+        // form = {
+        //   searchText: this.data.searchText
+        // }
+        form = this.data.form
       } else {
         form = this.data.form
         form.searchText = undefined
       }
+      console.log('form',form);
       this.setData({
         form: form,
         value: JSON.stringify(form)
@@ -245,6 +250,7 @@ Component({
       let code = e.detail.code
       let menuList = this.data.menuList
       let form = this.data.form
+      console.log("switchCommit",e);
       form[code + 'List'] = e.detail.values
       if (this.data.index || this.data.index == 0) {
         if (menuList.length > this.data.index) {

components/dkbusiness/dk-dropdown-menu/dk-dropdown-menu.wxml

@@ -1,5 +1,5 @@
 <view>
-  <van-search wx:if="{{flgSearchText}}" model:value="{{ searchText }}" bind:change="onSearchText" bind:search="doSearch" use-action-slot placeholder="{{searchTextPlaceholder}}">
+  <van-search wx:if="{{flgSearchText}}" model:value="{{ form.searchText }}" bind:change="onSearchText" bind:search="doSearch" use-action-slot placeholder="{{searchTextPlaceholder}}">
   </van-search>
   <van-dropdown-menu active-color="#1B365D" wx:if="{{menuList.length > 0}}">
     <!--查询条件-->

i18n/zh-CN.js

@@ -2,6 +2,7 @@
 const button = {
   close: '关闭',
   add: '新建',
+  edit: '编辑',
   cancel: '取消',
   search: '搜索',
   enable: '启用',
@@ -57,6 +58,10 @@ const mac = {
 const ivt = {
   warehousingProcessing: '待入库',
   outboundProcessing: '待出库',
+  addOtherInWh:'新建其他入库',
+  editOtherInWh:'编辑其他入库',
+  addOtherOutWh:'新建其他出库',
+  editOtherOutWh:'编辑其他出库',
   checkined: '已入库',
   checkouted: '已出库',
   intoDate: '入库日期',
@@ -371,6 +376,7 @@ const org = {
 const supplier = {
   supplierCode: '供应商编码',
   supplierName: '供应商名称',
+  supName: '供应商',
   supplierType: '供应商类别',
   brandId: '供应品牌',
   contactPhone: '联系电话',

mixins/index.js

@@ -178,6 +178,7 @@ module.exports = {
     }
     // 如果需要分页
     if (this.data.pageFlag) {
+      console.log("zhehsisha",this.data.pageInfo,params,this.data.searchForm);
       params.pageSize = this.data.pageInfo.pageSize;
       params.currentPage = this.data.pageInfo.currentPage;
     }

package-base-select/pages/select-data/select-data.js

@@ -148,14 +148,16 @@ Page({
                     name: item.orgName
                 }
                 break;
-                // 员工
+            // 员工
             case Constants.chooseType.staff:
                 data = {
                     id: item.staffId,
-                    name: item.staffName
+                    name: item.staffName,
+                    orgId: item.orgId,
+                    orgName: item.orgName,
                 }
                 break;
-                // 供应商
+            // 供应商
             case Constants.chooseType.supplier:
                 data = {
                     id: item.supId,
@@ -163,7 +165,7 @@ Page({
                     item: item
                 }
                 break;
-                // 对象类型
+            // 对象类型
             case Constants.chooseType.objectType:
                 data = {
                     id: item.objId,
@@ -172,7 +174,7 @@ Page({
                 }
                 break;
 
-                // 仓库
+            // 仓库
             case Constants.chooseType.warehouse:
                 data = {
                     id: item.whId,
@@ -180,27 +182,27 @@ Page({
                 }
                 break;
             case Constants.chooseType.inventorySku:
-                  data = {
-                      id: item.whId,
-                      name: item.whName,
-                      item: item
+                data = {
+                    id: item.whId,
+                    name: item.whName,
+                    item: item
                 }
                 break;
-                    // 品牌
+            // 品牌
             case Constants.chooseType.brand:
                 data = {
                     id: item.brandId,
                     name: item.brandName
                 }
                 break;
-                // 系统数据
+            // 系统数据
             case Constants.chooseType.kindData:
                 data = {
                     id: item.kindCode,
                     name: item.kindName
                 }
                 break;
-                // 数据字典
+            // 数据字典
             case Constants.chooseType.dictionary:
                 data = {
                     id: item.dataId,
@@ -210,7 +212,7 @@ Page({
                     flgDefault: item.flgDefault,
                 }
                 break;
-                // 系统数据
+            // 系统数据
             case Constants.chooseType.kindType:
                 data = {
                     id: item.id,
@@ -258,10 +260,10 @@ Page({
             }
         }
         //跟据非标号公司skuid判断库存
-        if(chooseType == Constants.chooseType.inventorySku){
-          params.skuId = this.data.item.skuId
-          params.nonStdCode = this.data.item.nonStdCode
-          params.cpId =  app.globalData.user.cpId
+        if (chooseType == Constants.chooseType.inventorySku) {
+            params.skuId = this.data.item.skuId
+            params.nonStdCode = this.data.item.nonStdCode
+            params.cpId = app.globalData.user.cpId
         }
         return params
     },
@@ -283,7 +285,7 @@ Page({
      * @author : 周兴
      */
     getData(params) {
-      console.log('this.data.routeObjName',this.data.method)
+        console.log('this.data.routeObjName', this.data.method)
         let service = app.globalData[this.data.routeObjName + 'Service'];
         return this.excute(service, service[this.data.method], params);
     },
@@ -336,11 +338,11 @@ Page({
                     contentList: [{
                         name: 'orgCode',
                         title: '部门编码'
-                    }, ],
+                    },],
                     placeholder: ['orgName']
                 })
                 break;
-                // 员工
+            // 员工
             case Constants.chooseType.staff:
                 title = "员工"
                 this.setData({
@@ -349,18 +351,18 @@ Page({
                     method: 'getStaff',
                     title: 'staffName',
                     contentList: [{
-                            name: 'staffCode',
-                            title: '员工编码'
-                        },
-                        {
-                            name: 'orgName',
-                            title: '部门'
-                        },
+                        name: 'staffCode',
+                        title: '员工编码'
+                    },
+                    {
+                        name: 'orgName',
+                        title: '部门'
+                    },
                     ],
                     placeholder: ['staffName']
                 })
                 break;
-                // 供应商
+            // 供应商
             case Constants.chooseType.supplier:
                 title = "供应商"
                 this.setData({
@@ -372,13 +374,13 @@ Page({
                     labelKey: 'supName',
                     chooseFlag: route.chooseFlag,
                     contentList: [{
-                            name: 'supTypeName',
-                            title: '供应商类别'
-                        },
-                        {
-                            name: 'returnAddress',
-                            title: '供应商地址'
-                        },
+                        name: 'supTypeName',
+                        title: '供应商类别'
+                    },
+                    {
+                        name: 'returnAddress',
+                        title: '供应商地址'
+                    },
                     ],
                     placeholder: ['supplier']
                 })
@@ -395,7 +397,7 @@ Page({
                     })
                 }
                 break;
-                // 仓库
+            // 仓库
             case Constants.chooseType.warehouse:
                 title = "仓库"
                 this.setData({
@@ -404,28 +406,28 @@ Page({
                     method: 'warehouseListBy',
                     title: 'whName',
                     contentList: [{
-                            name: 'supervisor',
-                            title: '仓库主管'
-                        },
-                        {
-                            name: 'contactPhone',
-                            title: '联系电话'
-                        },
+                        name: 'supervisor',
+                        title: '仓库主管'
+                    },
+                    {
+                        name: 'contactPhone',
+                        title: '联系电话'
+                    },
                     ],
                     placeholder: ['whName']
                 })
                 break;
-                case Constants.chooseType.inventorySku:
+            case Constants.chooseType.inventorySku:
                 title = "库存"
                 this.setData({
                     routeObjName: 'common',
                     method: 'getInventory',
                     title: 'staffName',
                     contentList: [
-                      {
-                        name: 'whName',
-                        title: '仓库名称'
-                    },{
+                        {
+                            name: 'whName',
+                            title: '仓库名称'
+                        }, {
                             name: 'skuName',
                             title: '商品名称'
                         },
@@ -434,19 +436,19 @@ Page({
                             title: '商品编码'
                         },
                         {
-                          name: 'usableQty',
-                          title: '可售量'
-                      },
-                      {
-                        name: 'invQty',
-                        title: '库存量'
-                    },
-                      
+                            name: 'usableQty',
+                            title: '可售量'
+                        },
+                        {
+                            name: 'invQty',
+                            title: '库存量'
+                        },
+
                     ],
                     placeholder: ['whName']
                 })
                 break;
-                // 品牌
+            // 品牌
             case Constants.chooseType.brand:
                 title = "品牌"
                 this.setData({
@@ -457,18 +459,18 @@ Page({
                     repeatFlag: route.repeatFlag,
                     title: 'brandName',
                     contentList: [{
-                            name: 'brandCode',
-                            title: '品牌编码'
-                        },
-                        {
-                            name: 'brandName',
-                            title: '品牌名称'
-                        },
+                        name: 'brandCode',
+                        title: '品牌编码'
+                    },
+                    {
+                        name: 'brandName',
+                        title: '品牌名称'
+                    },
                     ],
                     placeholder: ['brandName']
                 })
                 break;
-                // 数据字典
+            // 数据字典
             case Constants.chooseType.dictionary:
                 title = "数据字典"
                 this.setData({
@@ -481,18 +483,18 @@ Page({
                     valueKey: 'dataId',
                     title: 'dataValue',
                     contentList: [{
-                            name: 'dataCode',
-                            title: '数据编码'
-                        },
-                        {
-                            name: 'dictCode',
-                            title: '字典项目'
-                        },
+                        name: 'dataCode',
+                        title: '数据编码'
+                    },
+                    {
+                        name: 'dictCode',
+                        title: '字典项目'
+                    },
                     ],
                     placeholder: ['orgName']
                 })
                 break;
-                // 系统数据
+            // 系统数据
             case Constants.chooseType.kindData:
                 title = "系统数据"
                 this.setData({
@@ -504,18 +506,18 @@ Page({
                     chooseFlag: route.chooseFlag,
                     repeatFlag: route.repeatFlag,
                     contentList: [{
-                            name: 'kindCode',
-                            title: '数据代码'
-                        },
-                        {
-                            name: 'kindName',
-                            title: '数据名称'
-                        },
+                        name: 'kindCode',
+                        title: '数据代码'
+                    },
+                    {
+                        name: 'kindName',
+                        title: '数据名称'
+                    },
                     ],
                     placeholder: ['sensitiveName']
                 })
                 break;
-                // 对象类型
+            // 对象类型
             case Constants.chooseType.objectType:
                 title = "对象类型"
                 this.setData({
@@ -523,32 +525,34 @@ Page({
                     method: 'getSupplierAndCustomerData',
                     title: 'objName',
                     contentList: [{
-                            name: 'objCode',
-                            title: '对象编码'
-                        },
-                        {
-                            name: 'objTypeName',
-                            title: '对象'
-                        },
-                        {
-                            name: 'addressFull',
-                            title: '地址'
-                        },
+                        name: 'objCode',
+                        title: '对象编码'
+                    },
+                    {
+                        name: 'objTypeName',
+                        title: '对象'
+                    },
+                    {
+                        name: 'addressFull',
+                        title: '地址'
+                    },
                     ],
                     searchContent: [{
-                            code: 'supplier-customer',
-                            title: '选择对象',
-                            searchType: Constants.searchType.switch,
-                            list: [{
-                                    code: 'supplier',
-                                    title: '供应商'
-                                },
-                                {
-                                    code: 'customer',
-                                    title: '客户'
-                                }
-                            ]
+                        code: 'supplier-customer',
+                        title: '选择对象',
+                        searchType: Constants.searchType.switch,
+                        list: [{
+                            code: 'supplier',
+                            title: '供应商',
+                            value: 1,
                         },
+                        {
+                            code: 'customer',
+                            title: '客户',
+                            value: 2
+                        }
+                        ]
+                    },
 
                     ],
                     placeholder: ['customerName', 'supplierName', 'address', 'telephone']

package-inventory/pages/other-warehousing/other-warehousing.js

@@ -143,16 +143,40 @@ Page({
             }]
         },
         // 路由
-        routeObjName: 'inboundOther', 
+        routeObjName: 'inboundOther',
         table: Constants.tables.inbound,
 
     },
-     /**
-     * @desc : 给表单赋值
-     * @date : 2024/2/1 15:49
-     * @author : 姜永辉
-     */
-    setValuesByEdit(data) { 
+
+    /**
+   * @desc : 页面加载数据方法
+   * @date : 2024/2/1 15:49
+   * @author : 姜永辉
+   */
+    loadInit() {
+        if (this.data.formMode == Constants.formMode.edit) {
+            wx.setNavigationBarTitle({
+                title: mixins.$t('editOtherInWh'),
+            })
+        } else {
+            wx.setNavigationBarTitle({
+                title: mixins.$t('addOtherInWh'),
+            })
+            // 新增
+            if (this.data.formData == '{}') {
+                this.setData({
+                    formData: JSON.stringify({ intoDate: new Date().toDateStr() })
+                })
+            }
+        }
+    },
+
+    /**
+    * @desc : 给表单赋值
+    * @date : 2024/2/1 15:49
+    * @author : 姜永辉
+    */
+    setValuesByEdit(data) {
         let cardList_ = this.data.cardList
         let contentList_ = this.data.contentList
         let sumitemAmt = 0
@@ -201,7 +225,7 @@ Page({
         })
 
         // 刷新商品明细 显示 查看更多
-        let card = this.data.cardList.filter(it => it.name == 'items'); 
+        let card = this.data.cardList.filter(it => it.name == 'items');
         this.selectComponent('#' + this.data.formName).handleContentObj(card[0])
 
         this.setData({
@@ -219,14 +243,16 @@ Page({
      * @author : 姜永辉
      * @date   : 2024年3月12日
      */
-    chooseData(e) { 
-        let formData = JSON.parse(this.data.formData) 
+    chooseData(e) {
+        let formData = JSON.parse(this.data.formData)
         let code = e.detail.code
-        let data = e.detail.data.data 
-       
+        let data = e.detail.data.data
+
         if (code == "staffId") { //员工
             formData.staffId = data.id
             formData.staffName = data.name
+            formData.orgId = data.orgId
+            formData.orgName = data.orgName
         }
         if (code == "orgId") { //部门
             formData.orgId = data.id
@@ -241,7 +267,7 @@ Page({
             formData.intoObjectName = data.name
             formData.objType = data.objType
         }
-        this.setData({ 
+        this.setData({
             formData: JSON.stringify(formData)
         })
     },
@@ -278,7 +304,7 @@ Page({
                 //合计金额
                 card.itemAmt = totalAmout
             }
-        }) 
+        })
         this.setData({
             contentList: contentList_,
             cardList,
@@ -312,7 +338,7 @@ Page({
             }
             if (element.itemQty == null || element.itemQty == '' || element.itemQty == 0) {
                 wx.showToast({
-                    title:  mixins.$t("inputWords") + "[" + element.skuCode + "]" + mixins.$t("count"),
+                    title: mixins.$t("inputWords") + "[" + element.skuCode + "]" + mixins.$t("count"),
                     icon: 'none'
                 })
                 return false
@@ -355,7 +381,7 @@ Page({
             it.itemIndex = (i++)
         })
         params.itemList = formData.goodsList //商品明细
-        params.annexPaths = formData.annexPaths|| [] //附件 
+        params.annexPaths = formData.annexPaths || [] //附件 
         return params
     },
 
@@ -364,16 +390,16 @@ Page({
     * @date : 2024/2/1 15:49
     * @author : 姜永辉
     */
-    saveData() { 
-        if (this.data.formMode == Constants.formMode.edit){            
+    saveData() {
+        if (this.data.formMode == Constants.formMode.edit) {
             return this.excute(this.data.service, this.data.service.otherInboundUpdate, this.data.params)
-        }else{
+        } else {
             return this.excute(this.data.service, this.data.service.otherInboundInsert, this.data.params)
         }
-        
+
     },
 
 
 
-    
+
 })

package-inventory/pages/warehousing-processing/detail/detail.js

@@ -62,7 +62,7 @@ Page({
         // 路由
         routeObjName: 'inboundProcessing',
         inboundOtherService: app.globalData['inboundOtherService'],
-        inboundPurchaserReturnService: app.globalData['inboundPurchaserReturnService'],
+        inboundReturnService: app.globalData['inboundReturnService'],
         // 主键Id
         primaryKey: 'intoId',
         table: Constants.tables.inbound,
@@ -314,7 +314,7 @@ Page({
             } else if (this.data.item.intoType == Constants.intoType.other) {
                 return this.excute(this.data.inboundOtherService, this.data.inboundOtherService.inBoundHandle, this.data.params)
             } else {
-                return this.excute(this.data.inboundPurchaserReturnService, this.data.inboundPurchaserReturnService.inBoundHandle, this.data.params)
+                return this.excute(this.data.inboundReturnService, this.data.inboundReturnService.returnHandle, this.data.params)
             }
         } else {
             wx.navigateBack({

package-inventory/pages/warehousing-processing/warehousing-processing.js

@@ -54,13 +54,9 @@ Page({
         code: 'addressFull',
       },
 
+
       {
-        code: 'makeTime',
-        title: 'makeTime',
-        dataType: 'date'
-      },
-      {
-        code: 'supplierName',
+        code: 'supName',
       },
       {
         code: 'staffName',
@@ -149,12 +145,17 @@ Page({
     // 弹出按钮
     buttonList: [
       {
-        name: 'customerRefundList',
+        name: 'invaidOrder',
         title: mixins.$t('invaidOrder'),
+
       }, {
-        name: 'customerRefundList',
+        name: 'ticketPirnt',
         title: mixins.$t('ticketPirnt'),
       }
+      , {
+        name: 'editOrder',
+        title: mixins.$t('edit'),
+      }
     ],
     // 底部保存按钮
     buttonFootList: [{
@@ -178,7 +179,9 @@ Page({
     // 底部的按钮数据
     btnFormData: null,
     // 路由
-    routeObjName: 'inbound',
+    routeObjName: 'inboundProcessing',
+    inboundOtherService: app.globalData['inboundOtherService'],
+    inboundReturnService: app.globalData['inboundReturnService'],
     // active
     active: 0,
     // 主键Id
@@ -278,8 +281,8 @@ Page({
           it.intoObject = it.cusName != null ? it.cusName : it.supplierName
         }
       })
-    }   
-  
+    }
+
     contentnFootList.forEach(it => {
       if (it.type == 'count') {
         it.bill = tableData.length
@@ -297,4 +300,100 @@ Page({
     })
   },
 
+  /**
+    * @desc : （编辑）
+    * @date : 2024/2/1 15:49
+    * @author : 姜永辉
+    */
+  editOrder(e) {
+    let item = e
+    let id = item.intoId
+    // 采购入库
+    if (item.intoType == Constants.intoType.pur) {
+      wx.navigateTo({
+        url: this.data.route.add.url,
+        events: {
+          // 回调后，在这里给页面赋值
+          bandData: function (e) { }
+        },
+        success: function (res) {
+          res.eventChannel.emit('params', {
+            id: id,
+            formMode: Constants.formMode.edit
+          })
+        }
+      })
+    }
+    // 其他入库
+    else if (item.intoType == Constants.intoType.other) {
+      wx.navigateTo({
+        url: this.data.route.addOther.url,
+        events: {
+          // 回调后，在这里给页面赋值
+          bandData: function (e) { }
+        },
+        success: function (res) {
+          res.eventChannel.emit('params', {
+            id: id,
+            formMode: Constants.formMode.edit
+          })
+        }
+      })
+      // 采购退货
+    } else {
+      wx.navigateTo({
+        url: this.data.route.addReturn.url,
+        events: {
+          // 回调后，在这里给页面赋值
+          bandData: function (e) { }
+        },
+        success: function (res) {
+          res.eventChannel.emit('params', {
+            id: id,
+            formMode: Constants.formMode.edit
+          })
+        }
+      })
+    }
+
+  },
+
+  /**
+    * @desc : 作废
+    * @date : 2024/2/1 15:49
+    * @author : 姜永辉
+    */
+  invaidOrder(e) {
+    let item = e
+    let id = item.intoId
+    // 采购入库
+    if (item.intoType == Constants.intoType.pur) {
+      this.excute(this.data.service, this.data.service.inboundRepeal + id, null).then(res => {
+        if (res.data.code == Constants.SUCESS_CODE) {
+          // 重新查询
+          this.searchData()
+        }
+      })
+    }
+    // 其他入库
+    else if (item.intoType == Constants.intoType.other) {
+      this.excute(this.data.inboundOtherService, this.data.inboundOtherService.inboundRepeal + id, null).then(res => {
+        if (res.data.code == Constants.SUCESS_CODE) {
+          // 重新查询
+          this.searchData()
+        }
+      })
+      // 采购退货
+    } else {
+      this.excute(this.data.inboundReturnService, this.data.inboundReturnService.inboundReturnCancel, { intoId: id }).then(res => {
+        if (res.data.code == Constants.SUCESS_CODE) {
+          // 重新查询
+          this.searchData()
+        }
+      })
+    }
+
+  },
+
+
 })

package-purchase/pages/purchase-receipt/add/add.js

@@ -198,7 +198,9 @@ Page({
        
         }
         if (code == "sourceNo") { //来源单  
-            this.calculateTotal(data.chooosepurchaseItemResponseList)
+           
+            this.calculateTotal(data.chooosepurchaseItemResponseList) 
+
             return
         }
 
@@ -313,6 +315,7 @@ Page({
         let purIdArray_ = this.data.purIdArray //来源单id
         let cardList_ = this.data.cardList
         let contentList_ = this.data.contentList //底部按钮上的合计金额
+        let contentObj_ = this.data.contentObj
         formData.goodsList = choooseItemList
         // 提取purNo字段为数组，并去重
         const purNoArray = [...new Set(formData.goodsList.map(item => item.purNo))];
@@ -320,7 +323,7 @@ Page({
         // 将数组元素转换为逗号分隔的字符串
         formData.fromNo = purNoArray.join(','); //来源单号
         purIdArray_ = purIdArray.join(',');
-
+    
         formData.goodsList.forEach(element => {
             element.intoingAmt = element.itemAmt
             element.intoingQty = element.itemQty
@@ -349,11 +352,18 @@ Page({
             if (card.code === 'amount') {
                 card.content = formData.goodsList.sum("sumAmt")
             }
-        })
+        }) 
+            contentObj_["relation"].forEach(element => {
+               if(element.code == "sourceNo"){ //来源单号
+                element.purNo = purNoArray.join(',')
+                element.chooseList =  formData.goodsList
+               }
+            }); 
         this.setData({
             contentList: contentList_,
             purIdArray: purIdArray_,
             cardList: cardList_,
+            contentObj:contentObj_,
             formData: JSON.stringify(formData)
         })
     },

package-purchase/pages/purchase-receipt/choose-purchase-order/choose-purchase-order.js

@@ -7,20 +7,22 @@ Page({
    * 页面的初始数据
    */
   data: {
-       // 弹出按钮
-       buttonList: [{
-        name: 'merge',
-        title: mixins.$t("confirm"), //'保存'
+    // 弹出按钮
+    buttonList: [{
+      name: 'merge',
+      title: mixins.$t("confirm"), //'保存'
     }],
-    contentList: [{
-        code: 'flag',
-        title: mixins.$t("allChoose"), //'全选',
-        type: 'checkbox'
-    },  {
-        code: 'amount',
-        content: 0,
-        title: mixins.$t("totalAmount"), //'合计金额',
-        type: 'number'
+    contentList: [
+    //   {
+    //   code: 'flag',
+    //   title: mixins.$t("allChoose"), //'全选',
+    //   type: 'checkbox'
+    // },
+     {
+      code: 'amount',
+      content: 0,
+      title: mixins.$t("totalAmount"), //'合计金额',
+      type: 'number'
     }],
     btnFormData: null,
     returnTotalAmount: 0,
@@ -29,6 +31,7 @@ Page({
     routeObjName: 'purchase',
     tableData: [],
     chooosepurchaseItemResponseList: [],
+    isfirst: true,
   },
   /**
    * @desc :   加载数据源
@@ -38,7 +41,7 @@ Page({
   getData(params) {
     return this.excute(this.data.service, this.data.service.selectListByItem, params);
   },
-   
+
 
   /**
    * @desc :   父级商品信息选择
@@ -81,13 +84,13 @@ Page({
   },
 
   /**
-    * @desc :  全退
-    * @date : 2024/2/1 15:49
-    * @author : 王英杰
-    */
+   * @desc :  全退
+   * @date : 2024/2/1 15:49
+   * @author : 王英杰
+   */
   onCheckboxChange(e) {
     let btnFormData = this.data.btnFormData ? JSON.parse(this.data.btnFormData) : ''
-    let checked =  btnFormData ? btnFormData.flag : false
+    let checked = btnFormData ? btnFormData.flag : false
     let tableData = this.data.tableData
     tableData.forEach(res => {
       res.checked = checked
@@ -104,10 +107,10 @@ Page({
   },
 
   /**
-    * @desc :   计算金额/过滤出已选数据
-    * @date : 2024/2/1 15:49
-    * @author : 王英杰
-    */
+   * @desc :   计算金额/过滤出已选数据
+   * @date : 2024/2/1 15:49
+   * @author : 王英杰
+   */
   calculateTotal() {
     let tableData = this.data.tableData
     let chooosepurchaseItemResponseList = []
@@ -117,7 +120,6 @@ Page({
       if (res.purchaseItemResponseList && res.purchaseItemResponseList.length > 0) {
         res.purchaseItemResponseList.forEach(item => {
           if (item.checked) {
-        
             chooosepurchaseItemResponseList.push(item)
           }
         })
@@ -125,41 +127,97 @@ Page({
     })
     if (chooosepurchaseItemResponseList && chooosepurchaseItemResponseList.length > 0) {
       chooosepurchaseItemResponseList.forEach(res => {
-        returnTotalAmount += Number(res.itemAmt)
+        returnTotalAmount += (Number(res.itemAmt*res.itemQty))
       })
-    } 
- let contentList = this.data.contentList
- contentList.forEach(element => {
-    if(element.code == 'amount'){
-      element.content = returnTotalAmount
     }
-   });
+    let contentList = this.data.contentList
+    contentList.forEach(element => {
+      if (element.code == 'amount') {
+        element.content = returnTotalAmount
+      }
+    });
     this.setData({
       chooosepurchaseItemResponseList: chooosepurchaseItemResponseList,
       returnTotalAmount: returnTotalAmount,
-      contentList:contentList
+      contentList: contentList
     })
   },
   /**
-  * @desc :   跳转回到新建入库
-  * @date : 2024/2/1 15:49
-  * @author : 王英杰
-  */
+   * @desc :   跳转回到新建入库
+   * @date : 2024/2/1 15:49
+   * @author : 王英杰
+   */
   toAdd() {
-    let chooosepurchaseItemResponseList = this.data.chooosepurchaseItemResponseList
+    let chooosepurchaseItemResponseList = this.data.chooosepurchaseItemResponseList 
     let that = this
-   let formData = that.data.formData
-   let item = that.data.item
- 
-   const eventChannel = this.getOpenerEventChannel(); 
-   eventChannel.emit('bindData', { data: {chooosepurchaseItemResponseList:chooosepurchaseItemResponseList} })
-   wx.navigateBack({
-     delta: 1
-   }) 
- 
-  },
-
- 
+    let formData = that.data.formData
+    let item = that.data.item 
+    const eventChannel = this.getOpenerEventChannel();
+    eventChannel.emit('bindData', {
+      data: {
+        chooosepurchaseItemResponseList: chooosepurchaseItemResponseList
+      }
+    })
+    wx.navigateBack({
+      delta: 1
+    })
 
+  },
+  /**
+   * @desc :设置查询参数
+   * @date : 2024/2/1 15:49
+   * @author : 王英杰
+   */
+  setSearchParams(params) {
+    console.log('ddd', this.data.item);
+    let item = this.data.item
+    let isfirst = this.data.isfirst
+    if (isfirst) { //第一次进入 取传过来的  
+      let searchForm = this.data.searchForm ? JSON.parse(this.data.searchForm) : {}
+      searchForm.searchText = item.purNo||''
+      this.setData({
+        chooseList: item.chooseList||[],
+        searchForm: JSON.stringify(searchForm),
+        searchText: item.purNo ||'',
+      })
+      params.searchForm = JSON.stringify(searchForm)
+      params.searchText = item.purNo
+    }
+    this.setData({
+      isfirst: false
+    })  
+    return params 
+  },
+   /**
+     * @desc :   处理接口返回数据 (根据入库页面传过来的已选商品 回显)
+     * @date : 2024年3月8日
+     * @author : 王英杰
+     */
+    handleSearchData(tableData) { 
+      let  chooseList = this.data.chooseList||[]
+      if(chooseList.length>0){
+        let tableData = this.data.tableData
+        let chooseNum = 0
+        tableData.forEach(element => {
+           if(element.purNo == chooseList[0].purNo){
+            element.purchaseItemResponseList.forEach(item => { 
+              chooseList.forEach(chooseitem => { 
+                if(item.itemId==chooseitem.itemId){
+                  item.checked = true
+                  chooseNum++
+                }
+               });
+             });
+             if(chooseNum ==  element.purchaseItemResponseList.length){
+              element.checked = true
+             }
+           }
+        });
+        this.setData({
+          tableData
+        })
+        this.calculateTotal()
+      }  
+    },
 
 })

package-purchase/pages/purchase-receipt/choose-purchase-order/choose-purchase-order.wxml

@@ -3,7 +3,8 @@
 
 <van-sticky scroll-top="0">
   <!-- 查询条件 -->
-  <dk-dropdown-menu model:value="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['roleName','roleCode'])}}">
+  <dk-dropdown-menu model:value="{{searchForm}}" searchText
+  ='{{searchText}}' menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['orderNo'])}}">
   </dk-dropdown-menu>
  
 </van-sticky>

pages/home-page/home-page.js

@@ -21,9 +21,11 @@ Page({
    * 页面的初始数据
    */
   data: {
+    swiperIndex: 0,
+    advertisementList: [], // 广告数据
     // 分页flg
     pageFlag: false,
-    comMenuList:[],// 常用功能
+    comMenuList: [],// 常用功能
     companyName: '沈阳东科软件有限公司',
     transactionAmount: '￥11,850.00',
     collectionAmount: '￥10,850.00',
@@ -200,37 +202,68 @@ Page({
       },
     ],
   },
+  // 轮播特效果一
+  swiperChange(e) {
+    this.setData({
+      swiperIndex: e.detail.current
+    })
+  },
+  /**
+  * @desc : 查询广告
+  * @author : 周兴
+  * @date : 2024/4/1
+  */
+  getAdvertisement() {
+    let params = {
+      appCode: Constants.APP_CODE,
+    }
+    let service = app.globalData['advertisementService']
+    api.request(service.prefix + service.selectByCond, 'POST', params).then(res => {
+      if (res.data.code == Constants.SUCESS_CODE) {
+        console.log('res', res.data);
+        if(res.data && res.data.data){
+          let advertisementList = res.data.data
+          advertisementList.forEach(it=>{
+            it.adPath = config.image_url + it.adPath
+          })
+          this.setData({
+            advertisementList:advertisementList
+          })
+        }
+      }
+    });
+  },
   /**
   * @desc : 查询常用功能以及频率高的功能
   * @author : 周兴
   * @date : 2024/3/30
   */
- getComMenu() {
-  let staffId = app.globalData.user.staffId;
-  if(!staffId){
-    return;
-  }
-  let params = {
-    staffId: app.globalData.user.staffId,
-    appCode: Constants.APP_CODE,
-  }
-  let service = app.globalData['comMenuService']
-  api.request(service.prefix + service.selectMenu, 'POST', params).then(res => {
-    if (res.data.code == Constants.SUCESS_CODE) {
-      let comMenuList = res.data.data
-      // 增加全部列表
-      let allMenu = {
-        menuUuid:'-1',
-        menuName:'全部应用',
-        objectIcon:'customer.png'
-      }
-      comMenuList.push(allMenu);
-      this.setData({
-        comMenuList: comMenuList,
-      })
+  getComMenu() {
+    let staffId = app.globalData.user.staffId;
+    if (!staffId) {
+      return;
+    }
+    let params = {
+      staffId: staffId,
+      appCode: Constants.APP_CODE,
     }
-  });
-},
+    let service = app.globalData['comMenuService']
+    api.request(service.prefix + service.selectMenu, 'POST', params).then(res => {
+      if (res.data.code == Constants.SUCESS_CODE) {
+        let comMenuList = res.data.data
+        // 增加全部列表
+        let allMenu = {
+          menuUuid: '-1',
+          menuName: '全部应用',
+          objectIcon: 'customer.png'
+        }
+        comMenuList.push(allMenu);
+        this.setData({
+          comMenuList: comMenuList,
+        })
+      }
+    });
+  },
   /**
    * @desc : 跳转到功能页面
    * @author : 于继渤
@@ -239,7 +272,7 @@ Page({
   toApp(e) {
     let item = e.currentTarget.dataset.item
     // 如果点击全部应用跳转到应用页面
-    if(item.menuUuid == '-1'){
+    if (item.menuUuid == '-1') {
       wx.reLaunch({
         url: '/pages/index/index',
       })
@@ -251,13 +284,13 @@ Page({
     let menuList = app.globalData.menus
     if (menuList && menuList.length > 0) {
       // 查看该功能是否有权限
-      let filters = menuList.filter(it=>it.objectCode == (item.objectCode|| item.code));
-      if(filters && filters.length > 0){
+      let filters = menuList.filter(it => it.objectCode == (item.objectCode || item.code));
+      if (filters && filters.length > 0) {
         menuUuid = filters[0].menuUuid
         hasRightFlag = true;
       }
     }
-    if(!hasRightFlag){
+    if (!hasRightFlag) {
       wx.showToast({
         title: "没有该功能权限",
         image: '/static/image/warning.png',
@@ -265,13 +298,13 @@ Page({
       })
       return;
     }
-    console.log('ree',item);
+    console.log('ree', item);
     // 打开页面
-    if(item.objectPath || item.url){
+    if (item.objectPath || item.url) {
       wx.navigateTo({
-        url: item.objectPath?item.objectPath:item.url,
-        success: function(res) {
-          res.eventChannel.emit('params', { formMode:'index',menuUuid:menuUuid })
+        url: item.objectPath ? item.objectPath : item.url,
+        success: function (res) {
+          res.eventChannel.emit('params', { formMode: 'index', menuUuid: menuUuid })
         }
       })
     }
@@ -280,7 +313,6 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onShow: function name(params) {
-    console.log('ffff',app.globalData.comMenuList);
     // 获取常用菜单
     this.getComMenu();
   },
@@ -288,7 +320,6 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-
     let _this = this;
     wx.getSystemInfo({
       success: function (res) {
@@ -298,7 +329,8 @@ Page({
         })
       }
     })
-
+    // 查询广告数据
+    this.getAdvertisement();
     console.log("homepage", options);
     // options 中的 scene  
     if (options.scene) {

pages/home-page/home-page.wxml

@@ -38,46 +38,19 @@
     </view>
   </view>
 
-  <!-- 组合套餐 -->
-  <view class="combined-card" wx:if="{{combinedList && combinedList.length > 0}}">
-    <!-- 顶部 -->
-    <view style="height: 46rpx; padding:26rpx 30rpx; display: flex;align-items: baseline;">
-      <image src="/static/img/zan.png" style="width: 30rpx;height: 30rpx;" />
-      <view class="top-big-text">热销产品</view>
-    </view>
-
-    <!-- 横向滚动 -->
-    <scroll-view scroll-x="true" class="scroll-view">
-      <view class="combined" wx:for="{{combinedList}}" data-item="{{item}}" wx:key="index">
-        <view style="padding: 28rpx;">
-          <view class="combined-imgs-view">
-            <view wx:for="{{item.imageInfo}}" data-item="{{item2}}" wx:for-item="item2" wx:key="index2">
-              <van-image show-error width="125rpx" height="125rpx" radius="15rpx;" src="{{item2.path}}" />
-            </view>
-            <van-image wx:if="{{item.imageInfo.length == 0}}" show-error width="125rpx" height="125rpx" radius="15rpx;" src="" />
-          </view>
-          <view class="combined-name">
-            {{item.priceName}}
-          </view>
-          <view class="combined-detail">
-            {{item.activityNames}}
-          </view>
-          <view class="combined-button-view">
-            <view class="combined-button">
-              搭配价
-              <view style="font-size: 15rpx;margin: 4rpx 0 0 6rpx;">￥</view>
-              <view style="font-size: 29rpx;margin-right: 6rpx;align-items: baseline;margin-bottom: 8rpx;">{{numberFormat.toThousandCents(item.sumPrice)}}</view>起
-              <van-icon name="arrow" size="18rpx" color="#FFFFFF" style="margin: 0 0 4rpx 4rpx;" />
-            </view>
-            <image src="/static/img/cart.png" style="width:40rpx;height:40rpx;" data-promotionType="2" data-item="{{item}}" catchtap="openAddItemInfo" />
-          </view>
-        </view>
-      </view>
-
-    </scroll-view>
+  <!--广告-->
+  <view wx:if="{{advertisementList && advertisementList.length > 0}}">
+    <swiper indicator-dots="{{true}}" autoplay="true" interval="3000" bindchange="swiperChange">
+      <block wx:for="{{advertisementList}}" wx:key="{{index}}" wx:for-item="item">
+        <swiper-item>
+          <image src="{{item.adPath}}" mode="aspectFill" />
+        </swiper-item>
+      </block>
+    </swiper>
   </view>
 
-  <view wx:if="{{combinedList && combinedList.length == 0}}" style="margin-top: 50rpx;"></view>
+
+  <view wx:if="{{advertisementList && advertisementList.length == 0}}" style="margin-top: 50rpx;"></view>
 
   <!-- 功能卡片 -->
 

pages/home-page/home-page.wxss

@@ -2,53 +2,59 @@ page {
   width: 100%;
   margin: 0;
   background: #F8F9FD;
-} 
+}
+
 .head {
-  z-index: 1; 
+  z-index: 1;
   height: 340rpx;
-  width: 100%; 
+  width: 100%;
   background: #A51006;
   position: fixed;
-  top:0;
+  top: 0;
 }
-.company{
+
+.company {
   width: 100%;
   position: absolute;
   left: 40rpx;
   top: 120rpx;
   color: #F8F9FD;
 }
-.current_month_week{ 
+
+.current_month_week {
   width: 80%;
   margin-top: 40rpx;
   font-size: 28rpx;
   display: flex;
-  justify-content:space-around; 
-  align-items: center; 
+  justify-content: space-around;
+  align-items: center;
 }
-.current_month_week_amount{ 
+
+.current_month_week_amount {
   width: 80%;
   margin-top: 20rpx;
   font-size: 28rpx;
   display: flex;
-  justify-content:space-around; 
-  align-items: center; 
+  justify-content: space-around;
+  align-items: center;
 }
-.index-grid-item-text-class{
-  color:#1B365D !important;
+
+.index-grid-item-text-class {
+  color: #1B365D !important;
   font-style: normal;
   font-weight: 400;
-  font-size: 12px; 
+  font-size: 12px;
   color: #1B365D;
 }
-.combined-card{
-  margin:10px 2%;
+
+.combined-card {
+  margin: 10px 2%;
   height: 430rpx;
   background-color: #99A8E4;
   border-radius: 15rpx;
 }
 
-.top-big-text{
+.top-big-text {
   font-family: 'PingFang HK';
   font-style: normal;
   font-weight: 600;
@@ -57,7 +63,8 @@ page {
   color: #FFFFFF;
   margin-left: 18rpx;
 }
-.top-small-text{
+
+.top-small-text {
   font-family: 'PingFang HK';
   font-style: normal;
   font-weight: 400;
@@ -67,11 +74,12 @@ page {
   margin-left: 12rpx;
 }
 
-.card-bottom{
+.card-bottom {
   margin-left: 20rpx;
   margin-top: 10rpx;
 }
-.card-bottom-button{
+
+.card-bottom-button {
   width: 100%;
   /* background: #B7DBFF; */
   height: 70rpx;
@@ -80,7 +88,8 @@ page {
   justify-content: left;
   border-radius: 15rpx;
 }
-.card-bottom-button-font{
+
+.card-bottom-button-font {
   font-family: 'PingFang HK';
   font-style: normal;
   font-weight: 500;
@@ -88,21 +97,22 @@ page {
   color: #1B365D;
 }
 
-.card-bottom-button-blue{
+.card-bottom-button-blue {
   background: #B7DBFF;
   color: #1B365D;
 }
 
-.card-bottom-button-purple{
+.card-bottom-button-purple {
   background: #C3D0FF;
   color: #606EB2;
 }
 
-.scroll-view{
-  white-space: nowrap; 
+.scroll-view {
+  white-space: nowrap;
   display: flex;
 }
-.combined{
+
+.combined {
   background-color: #FFFFFF;
   border-radius: 15rpx;
   display: inline-block;
@@ -110,7 +120,8 @@ page {
   width: 75%;
   margin: 0 30rpx;
 }
-.combined-name{
+
+.combined-name {
   margin-top: 12rpx;
   font-family: 'PingFang HK';
   font-style: normal;
@@ -119,7 +130,8 @@ page {
   line-height: 28rpx;
   color: #1B365D;
 }
-.combined-detail{
+
+.combined-detail {
   font-family: 'PingFang HK';
   font-style: normal;
   font-weight: 400;
@@ -127,12 +139,14 @@ page {
   line-height: 25rpx;
   color: #CAA977;
 }
-.combined-button-view{
+
+.combined-button-view {
   margin-top: 15rpx;
   display: flex;
-  justify-content:flex-end;
+  justify-content: flex-end;
 }
-.combined-button{
+
+.combined-button {
   padding: 4rpx 17rpx 0 17rpx;
   margin-right: 17rpx;
   height: 42rpx;
@@ -148,83 +162,106 @@ page {
   align-items: center;
 }
 
-.combined-imgs-view{
+.combined-imgs-view {
   display: flex;
   align-items: center;
-  justify-content:space-between
-} 
+  justify-content: space-between
+}
 
-.func{
+.func {
   width: 100%;
-  height: 490rpx; 
+  height: 540rpx;
   background: #F8F9FD;
-  border-radius: 40rpx 40rpx 0 0; 
+  border-radius: 40rpx 40rpx 0 0;
+  margin-bottom: 20rpx;
 
 }
-.func-card-blue{
-  margin: 20rpx 10rpx;
+
+.func-card-blue {
+  margin: 20rpx 10rpx 0 10rpx;
   width: 30%;
   height: 240rpx;
   background: linear-gradient(209.99deg, #E6F2FE 14.33%, #D7EAFF 73.85%);
   border-radius: 19rpx;
 }
-.func-card-purple{
+
+.func-card-purple {
   width: 47%;
   height: 198rpx;
   background: linear-gradient(209.99deg, #E2E8FF 14.33%, #D5DDFF 73.85%);
   border-radius: 19rpx;
 }
-.card-title{
-  margin-top:24rpx;
+
+.card-title {
+  margin-top: 24rpx;
   display: flex;
   height: 54rpx;
   align-items: center;
   width: 100%;
   /* justify-content: center; */
 }
-.card-name{
+
+.card-name {
   font-family: 'PingFang HK';
   font-style: normal;
   font-weight: 600;
   font-size: 32rpx;
   line-height: 48rpx;
-  margin-left:16rpx
+  margin-left: 16rpx
 }
-.card-name-blue{
+
+.card-name-blue {
   color: #1B365D;
 }
-.card-name-purple{
+
+.card-name-purple {
   color: #606EB2;
 }
-.icon-arrow{
+
+.icon-arrow {
   width: 32rpx;
-  height:32rpx;
-  border-radius:16rpx;
-  margin-left:20rpx;
+  height: 32rpx;
+  border-radius: 16rpx;
+  margin-left: 20rpx;
   display: flex;
-  justify-content: center; 
+  justify-content: center;
   align-items: center;
 }
-.icon-blue{
-  background-color:#B7DBFF;
+
+.icon-blue {
+  background-color: #B7DBFF;
 }
-.icon-purple{
-  background-color:#C3D0FF;
+
+.icon-purple {
+  background-color: #C3D0FF;
 }
 
-.icon-title{
-  width:76rpx;
-  height:84rpx;
-  margin-top:20rpx;
-  margin-left:20rpx
+.icon-title {
+  width: 76rpx;
+  height: 84rpx;
+  margin-top: 20rpx;
+  margin-left: 20rpx
 }
-.icon-title_diamond{
+
+.icon-title_diamond {
   width: 40rpx;
   height: 40rpx;
   position: absolute;
   left: 5rpx;
-  top: -20rpx; 
+  top: -20rpx;
 }
 
-
- 
+/* 设置swiper组件的宽高 */
+swiper{
+  margin-top: 25rpx;
+  margin-bottom: 0;
+  margin-right: 2vw;
+  margin-left: 2vw;
+  width: 96vw;
+  height: 320rpx;
+}
+/* 设置swiper组件里面图片的宽高 */
+swiper image{
+  width: 100%;
+  height: 320rpx;
+}