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

api/pages/mst/printLayout.js

@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright(c) 2024 dongke All rights reserved. / Confidential
+ * 类的信息：
+ *		1.程序名称：
+ *		2.商品品牌
+ * 编辑履历：
+ *		作者				日期					版本				修改内容
+ *		周兴 	     2024-4-22     	1.00		    	新建
+ *******************************************************************************/
+module.exports = {
+  printLayoutService: {
+    // 前缀
+    prefix: 'mdm-server/mst/printLayout/',
+  },
+  routeUrl: {
+    printLayout: {
+    
+    }
+  }
+};

api/pages/sale/order.js

@@ -23,6 +23,7 @@ module.exports = {
 
   routeUrl: {
     order: {
+      docName:'销售订单',
       add: { key: 'add', url: '/package-sales/pages/order-billing/add/add'},
       editOrder: { key: 'editOrder', url: '/package-sales/pages/order-billing/add/add', idKey: 'orderId', formMode: 'edit' },
       invalid: { key: 'invalid', method: 'invalid', primaryKey: 'orderId',question:true , image:'btn-void.png'},
@@ -37,9 +38,7 @@ module.exports = {
       chooseChannel: { key: 'chooseChannel', url: '/package-base-select/pages/select-data/select-data', type: 'saleChannel' },
       choosecusFrom: { key: 'choosecusFrom', url: '/package-base-select/pages/select-data/select-data', type: 'customerFrom' },
       collection:{ key: 'collection', url: '/package-sales/pages/customer-collection/customer-collection', formMode: 'index', idKey: 'cusId',image:'btn-customer-collection.png' }, //跳转客户收款
-
-
-      printedBill:{ key: 'printedBill', url: '', formMode: 'index', idKey: 'cusId',image:'btn-printing.png' }
+      printedBill:{ key: 'printedBill', method:'printedBill', formMode: 'index', idKey: 'cusId',image:'btn-printing.png' }
     }
 
   }

app.js

@@ -71,10 +71,11 @@ const otherPayable = require('./api/pages/mac/otherPayable.js');
 const inventoryAdjustment = require('./api/pages/ivt/inventoryAdjustment.js');
 const report = require('./api/pages/mst/report.js');
 const saleReport = require('./api/pages/mst/saleReport.js');
+const printLayout = require('./api/pages/mst/printLayout.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,payment,
-  receiptPayment,inbound,inboundOther,inboundProcessing,inboundPurchaseReturn,outbound,outboundOther,outboundProcessing,outboundSaleReturn,inventory,moneyAccount,intoReturn,intoReturnItem,cusFollow,order,transfer,saleOutBound,inboundReturn,cusReceiptPayment,menuFrequency,userMenuFrequency,comMenu,saleOutBoundReturn,advertisement,check,freeze,otherReceivable,otherPayable,inventoryAdjustment,report,saleReport]
+  receiptPayment,inbound,inboundOther,inboundProcessing,inboundPurchaseReturn,outbound,outboundOther,outboundProcessing,outboundSaleReturn,inventory,moneyAccount,intoReturn,intoReturnItem,cusFollow,order,transfer,saleOutBound,inboundReturn,cusReceiptPayment,menuFrequency,userMenuFrequency,comMenu,saleOutBoundReturn,advertisement,check,freeze,otherReceivable,otherPayable,inventoryAdjustment,report,saleReport,printLayout]
 
 const util = require('./utils/util.js')
 const baseMethod = require('./api/pages/baseMethod.js')

app.json

@@ -53,7 +53,8 @@
                 "pages/role/role",
                 "pages/role/add/add",
                 "pages/org/choose-org/choose-org",
-                "pages/org/sub-org-choose/sub-org-choose"
+                "pages/org/sub-org-choose/sub-org-choose",
+                "pages/print-layout/print-layout"
             ]
         },
         {
@@ -89,6 +90,7 @@
             "root": "package-inventory",
             "name": "package-inventory",
             "pages": [
+                "pages/ivt-detail-report/ivt-detail-report",
                 "pages/choose-product/choose-product",
                 "pages/warehousing-processing/warehousing-processing",
                 "pages/warehousing-processing/detail/detail",

i18n/zh-CN.js

@@ -456,6 +456,7 @@ const goodsSku = {
   onlyCode: '唯一编码',
   skuModel: '商品型号',
   skuName: '商品名称',
+  colorNumber: '色号',
   subUnitId: '辅助单位',
   sukSpec: '商品规格',
   goodSpec: '规格',

mixins/index.js

@@ -349,6 +349,46 @@ module.exports = {
     })
   },
   /**
+   * @desc : 打印票据
+   * @author : 周兴
+   * @date : 2024/4/22
+   */
+  printedBill(row) {
+    // 查询票据
+    let docName = app.globalData['routeUrl'][this.data.routeObjName].docName
+    if (!docName  || !row || !row.id) {
+      return;
+    }
+    let service = app.globalData['printLayoutService']
+    // 查询打印票据
+    this.excute(service, service.selectByCond, { docName: docName }).then(res => {
+      if (res.data.code == Constants.SUCESS_CODE) {
+        let tableList = res.data.data.list;
+
+        if (tableList && tableList.length > 0) {
+          // 如果只有一个票据，直接调取打印
+          if (tableList.length == 1) {
+            console.log('ddd', row,this.data.primaryKey,this.data.id);
+            this.print(docName, tableList[0].layoutId, row.id)
+          }
+        }
+      }
+    });
+  },
+  /**
+  * @desc : 调取打印
+  * @author : 周兴
+  * @date : 2024/4/22
+  */
+  print(docName, layoutId, dataId) {
+    wx.navigateTo({
+      url: '/package-base-select/pages/web-view-select/web-view-select',
+      success: function (res) {
+        res.eventChannel.emit('url', 'https://s.dev01.dkiboss.com:7000/wx-print?svc_code='+ app.globalData.company.svcCode+'&doc=' + docName + '&layout_id=' + layoutId + '&data_id=' + dataId);
+      }
+    })
+  },
+  /**
    * @desc : 执行保存方法
    * @author : 周兴
    * @date : 2024/1/22

package-basic-data/pages/print-layout/print-layout.js

@@ -0,0 +1,31 @@
+/*******************************************************************************
+* Copyright(c) 2024 dongke All rights reserved. / Confidential
+* 类的信息：
+*		1.程序名称：
+*		2.功能描述：票据打印画面
+* 编辑履历：
+*		作者				日期					版本				修改内容
+*		周兴		  	2022-11-22			        1.00		   	新建
+*******************************************************************************/
+const api = require('@/utils/api.js');
+const Constants = require('@/utils/Constants.js');
+
+const app = getApp()
+Page({
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        // 加入企业的列表
+        tableList: [],
+        // 语言包
+        $t: app.globalData.lang,
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+    },
+
+})

package-basic-data/pages/print-layout/print-layout.json

@@ -0,0 +1,4 @@
+{
+    "usingComponents": {},
+    "navigationBarTitleText": "票据打印"
+}

package-basic-data/pages/print-layout/print-layout.wxml

@@ -0,0 +1,8 @@
+<view style="background-color: white;width: 100%; height: 100%;">
+	<view style="font-size: 26px;margin-bottom: 30rpx;padding-top: 100rpx;padding-left: 20rpx;">
+		{{$t['ticketPirnt']}}
+	</view>
+	<view wx:for="{{tableList}}" wx:key="index" data-item="{{item}}" data-index="{{index}}" catch:tap="clickCompany">
+		<van-cell  title-class="title-class" title="{{item.cpName}}" is-link />
+	</view>
+</view>

package-basic-data/pages/print-layout/print-layout.wxss

@@ -0,0 +1,4 @@
+.title-class{
+	font-size: 18px;
+	padding: 10rpx;
+}

package-inventory/pages/ivt-detail-report/ivt-detail-report.js

@@ -0,0 +1,346 @@
+/*******************************************************************************
+ * Copyright(c) 2022 dongke All rights reserved. / Confidential
+ * 类的信息：
+ *		1.程序名称：选品
+ * 编辑履历：
+ *		作者				日期					版本				修改内容
+ *		于继渤		 2024-1-23			1.00		    选品
+ *******************************************************************************/
+const Constants = require('@/utils/Constants.js');
+const util = require('@/utils/util.js')
+const mixins = require('@/mixins/index.js')
+const app = getApp()
+Page({
+  mixins: [mixins],
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    firstFlag: true,
+    orderBy: [
+      {
+        "text": "可售量升序",
+        "value": 1
+      },
+      {
+        "text": "可售量降序",
+        "value": 2
+      }
+    ],
+    routeObjName: 'goodsSku',
+    dataItem: null,
+    choosedGoodsList: [],
+    commonService: app.globalData['commonService'],
+    inventoryService: app.globalData['inventoryService'],
+    typeList: [
+      {
+        catName: '全部分类'
+      }
+    ],
+    catId: null,
+    active: 0,
+     
+    popupTopObj: [{ leftTitle: '库存量', leftCode: 'usableQty', rightTitle: '可售量', rightCode: 'invQty' }],
+    // 确定按钮
+    buttonList: [{
+      name: 'confirm',
+      title: '确定'
+    }],
+    contentList: [],
+    item: Constants.billType.out,
+  },
+  selectedProduct(e) {
+    this.setData({
+      active: e.currentTarget.dataset.active
+    })
+  },
+  onClickLeft() {
+    wx.navigateBack({
+      data: 1
+    })
+  },
+  /**
+   * @desc : 加载数据
+   * @date : 2024/2/1 15:49
+   * @author : 姜永辉
+   */
+  loadInit() {
+    this.setData({
+      billType: this.data.item
+    })
+    //销售选品
+    console.log(this.data.item)
+    if (this.data.item == Constants.billType.sale || this.data.item == Constants.billType.saleOut) {
+      let buttonList = this.data.buttonList
+      buttonList = [{ name: 'confirm', title: '结算', color: '#CAA977' }]
+      this.setData({
+        buttonList: buttonList,
+        contentList: [
+          { code: 'need', title: mixins.$t("totalAmount"), type: 'str' },
+          { code: 'amount', content: 0, type: 'number' },
+          { type: 'count', code: 'count', quantity: 0 }
+        ]
+      })
+    }
+    if (this.data.item == Constants.billType.saleOut) {
+      this.setData({
+        popContent: [{ code: 'itemQty', type: 'step', title: mixins.$t("count"), required: true },
+        { code: 'priceOut', type: 'number', title: mixins.$t("priceSale"), required: true, readonly: false },
+        {
+          code: 'whId', name: 'whName', choosePopupType: 'inventorySku', title: mixins.$t("warehouseId"), type: 'choose', urlKey: 'selectInventorySku',
+        },
+        { code: 'nonStdCode', title: mixins.$t("goodsBatch"), type: 'str', },]
+      })
+    }
+    let controlFlags = this.data.controlFlags
+    //根据传过来的 控制标识实现对应的逻辑  wyj 不懂问我 
+    if (controlFlags) {
+      //controlFlags.paramsByWhId 查询商品列表 是否开启顶部选择库区的 库区id 作为参数查询  
+      //controlFlags.choosewhReadonly 顶部的选择库区是否可点击选择  直接用布尔值在xml控制了
+      //controlFlags.chooseWhByUserDefault 顶部的选择库区是否选择用户默认的库区
+    }
+
+  },
+  /**
+    * @desc : 顶部切换
+    * @date : 2024/2/1 15:49
+    * @author : 于继渤
+    */
+  changeTag(e) {
+    this.setData({
+      active: e.detail.index
+    })
+  },
+  /**
+  * @desc : 分类切换
+  * @date : 2024/2/1 15:49
+  * @author : 于继渤
+  */
+  changeSidebar(e) {
+    console.log(e.detail)
+    let index = e.detail
+    let typeList = this.data.typeList
+    this.setData({
+      catId: typeList[index].catId
+    })
+    this.searchData()
+  },
+
+
+  /**
+   * @desc : 设置查询参数
+   * @author : 于继渤
+   * @date : 2024/1/23 9:16
+   */
+  setSearchParams(params) {
+    params.categoryId = this.data.catId //种类id
+    let controlFlags = this.data.controlFlags
+    //顶部的选择库区是否选择用户默认的库区
+    let form = this.data.form || {}
+    form.whId = app.globalData.user.defaultWhId
+    form.whName = app.globalData.user.defaultWhName
+    this.setData({
+      form: form
+    })
+    params.whId = this.data.form.whId //仓库 
+    this.setData({
+      firstFlag: false
+    })
+    return params
+  },
+  /**
+   * @desc : 查询
+   * @date : 2024/2/1 15:49
+   * @author : 于继渤
+   */
+  getData(params) {
+    if (this.data.item == Constants.billType.sale) {
+      return this.excute(this.data.commonService, this.data.commonService.getGoodsForOrderByPage, params);
+    } else if (this.data.item == Constants.billType.out || this.data.item == Constants.billType.purReturn) {
+      return this.excute(this.data.inventoryService, this.data.inventoryService.selectByCond, params);
+    } else if (this.data.item == Constants.billType.saleOut) {
+      return this.excute(this.data.commonService, this.data.commonService.getGoodsForOrder, params);
+    } else {
+      return this.excute(this.data.service, this.data.service.selectByCond, params);
+    }
+  },
+
+  /**
+     * @desc :   处理接口返回数据
+     * @date : 2024/2/1 15:49
+     * @author : 于继渤
+     */
+  handleSearchData(tableData) {
+    //设置默认仓库
+    if (this.data.item != "out") {
+      tableData.forEach(res => {
+        res.whId = app.globalData.user.defaultWhId
+        res.whName = app.globalData.user.defaultWhName
+      })
+      this.setData({
+        tableData: tableData
+      })
+    }
+
+     
+
+  },
+  /**
+* @desc : 获取种类
+* @date : 2024/2/1 15:49
+* @author : 于继渤
+*/
+  getGoodsCategoryNoPage() {
+    return this.excute(this.data.commonService, this.data.commonService.getGoodsCategoryNoPage, {}).then(res => {
+      console.log('goodsCategoryListBy', res.data.data)
+      this.setData({
+        typeList: this.data.typeList.concat(res.data.data)
+      })
+    })
+  },
+  /**
+* @desc : 打开商品
+* @date : 2024/2/1 15:49
+* @author : 于继渤
+*/
+  openAddItemInfo(e) {
+    console.log('openAddItemInfo', e)
+    
+  },
+
+  /**
+    * @desc : 查询库存
+    * @date : 2024/2/1 15:49
+    * @author : 于继渤
+    */
+  getInventory(params) {
+    return this.excute(this.data.commonService, this.data.commonService.getInventory, params);
+  },
+  /**
+    * @desc : 商品确认事件
+    * @date : 2024/2/1 15:49
+    * @author : 于继渤
+    */
+  editItems(e) {
+    let choosedGoodsList = this.data.choosedGoodsList
+    choosedGoodsList.push(e.detail.form)
+    this.setData({
+      choosedGoodsList: choosedGoodsList
+    })
+    //销售订单需要计算底部按钮
+    if (this.data.item == Constants.billType.sale || this.data.item == Constants.billType.saleOut) {
+      this.calculateParameters()
+    }
+  },
+
+
+
+  /**
+  * @desc : 计算数量金额 销售用
+  * @date : 2024/2/1 15:49
+  * @author : 于继渤
+  */
+  calculateParameters() {
+    let contentList = this.data.contentList
+    let choosedGoodsList = this.data.choosedGoodsList
+    let sumAmt = Number(0)
+    let sumQty = Number(0)
+    choosedGoodsList.forEach(res => {
+      sumAmt += (res.priceStandard * res.itemQty)
+      sumQty += res.itemQty
+    })
+    contentList[1].content = sumAmt
+    contentList[2].quantity = sumQty
+    this.setData({
+      contentList: contentList
+    })
+  },
+
+
+
+  /**
+    * @desc : 结算按钮
+    * @date : 2024/2/1 15:49
+    * @author : 于继渤
+    */
+  submit() {
+    const eventChannel = this.getOpenerEventChannel();
+    const choosedGoodsList = this.data.choosedGoodsList
+    const chooseRoute = this.data.chooseRoute
+    let that = this
+    if (chooseRoute) { //跳转到上一个页面传过来的url
+      wx.navigateTo({
+        url: chooseRoute,
+        events: {
+          // 回调后
+          bindData: function (data) { }
+        },
+        success: function (res) {
+          let data = { item: choosedGoodsList }
+          if (that.data.formType == 'customer-reception') { //客户接待跳转过来
+            data['formItem'] = that.data.formItem
+          }
+          // 通过eventChannel向被打开页面传送数据
+          res.eventChannel.emit('params', data)
+        }
+      })
+    } else {
+      eventChannel.emit('bindData', { choosedGoodsList })
+      wx.navigateBack({
+        delta: 1
+      })
+    }
+
+  },
+
+  /**
+   * @desc : 下拉多选事件
+   * @author : 于继渤
+   * @date : 2022/5/26 12:16
+   */
+  dropdowncommit(e) {
+    this.setData({
+      whFlag: true
+    })
+  },
+  /**
+ * @desc : 下拉多选确定
+ * @author : 王英杰
+ * @date : 2023年9月8日
+ */
+  mutiSearch(e) {
+    let id = e.target.id
+    let form = this.data.form || {}
+
+    if (id === 'warehouse') {
+      form.whId = e.detail.item.id
+      form.whName = e.detail.item.name
+      this.setData({
+        whFlag: false,
+        form: form
+      })
+      this.selectComponent("#statusItemWareHouse").toggle(false)
+      this.searchData()
+    }
+  },
+  muticlose() {
+    this.selectComponent("#statusItemWareHouse").toggle(true)
+  },
+  /**
+    * @desc : 初始化
+    * @date : 2024/2/1 15:49
+    * @author : 于继渤
+    */
+  onLoad() {
+    this.getGoodsCategoryNoPage()
+    let _this = this;
+    wx.getSystemInfo({
+      success: function (res) {
+        _this.setData({
+          windowHeight: res.windowHeight,
+          windowWidth: res.windowWidth
+        })
+      }
+    })
+  },
+})

package-inventory/pages/ivt-detail-report/ivt-detail-report.json

@@ -0,0 +1,4 @@
+{
+    "usingComponents": {},
+    "navigationBarTitleText":"库存查询"
+}

package-inventory/pages/ivt-detail-report/ivt-detail-report.wxml

@@ -0,0 +1,153 @@
+<wxs src='/utils/numberFormat.wxs' module="numberFormat"></wxs>
+<wxs src='/utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
+<loading wx:if="{{loading}}"></loading>
+<van-dialog id="van-dialog" />
+
+<van-sticky offset-top="{{ 0 }}">
+  <view style="display: flex;">
+    <view style="width: 85%;">
+      <!-- 查询条件 -->
+      <dk-dropdown-menu model:value="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['skuName','onlyCode','colorNumber'])}}">
+      </dk-dropdown-menu>
+    </view>
+
+    <view class="scan-class" style="width: 15%;display: flex;align-items: center;">
+      <image class="scan-image" fit="fill" src="{{imageUrl+'/scan_image.png'}}"></image>
+    </view>
+  </view>
+
+
+  <van-dropdown-menu active-color="#1B365D" style=" width: calc(100% ) !important; ">
+    <!-- 库区 -->
+    <van-dropdown-item id="statusItemWareHouse" disabled="{{controlFlags.choosewhReadonly}}" title="{{ form.whName ? form.whName:'仓库' }}" bind:open="dropdowncommit">
+    </van-dropdown-item>
+    <!-- 可售量排序 -->
+    <van-dropdown-item title="{{ orderBy.text?orderBy.text:'可售量升序' }}" value="{{value}}" options="{{ orderBy }}" bind:change="onSwitchChange">
+    </van-dropdown-item>
+  </van-dropdown-menu>
+
+</van-sticky>
+
+<view style="height:100%;background: #F8F9FD ;">
+  <!--出库商品 列表 走库存-->
+  <view style="height:calc({{windowHeight+'px'}} - 295rpx);overflow: scroll;">
+    <scroll-view scroll-y='{{true}}' bindscrolltolower='scrollToLower' lower-threshold='100'>
+      <view wx:for="{{tableData}}" wx:key="index" catch:tap="openAddItemInfo" data-item="{{item}}" class="main-class" style="width: 75%;margin-left: 166rpx;">
+        <view class="main-foot" style="border-radius:15rpx;">
+          <view>
+            <view class="table-content-row">
+              <view style="display:flex;width:100%;">
+                <view data-item="{{item}}" style="display:flex;font-size: 15px;">
+                  <dk-text style="font-size:30rpx;" fontWeight="nomal" value="{{item.skuName}}"></dk-text>
+                </view>
+              </view>
+            </view>
+
+            <!-- 商品名称 -->
+            <view class="table-row">
+              <view class="table-content-row">
+                <view style="display: flex;">
+                  <view class="table-content-row-font">
+                    <dk-text fontSize="14px" color="#95A8CB" fontWeight="nomal" value="商品编码" copyValue="{{item.skuCode}}"></dk-text>
+                  </view>
+                  <view class="table-content-class">
+                    {{item.skuName?item.skuName:''}}
+                  </view>
+                </view>
+              </view>
+            </view>
+
+            <!-- 库区 -->
+            <view class="table-content-row">
+              <view style="display: flex;">
+                <view class="table-content-row-font">
+                  <dk-text layoutFlag="{{true}}" fontSize="14px" color="#95A8CB" fontWeight="nomal" value="库区" copyValue="{{item.whName}}"></dk-text>
+                </view>
+                <view class="table-content-class">
+                  {{item.whName?item.whName:''}}
+                </view>
+              </view>
+            </view>
+
+            <!-- 库区色号 -->
+            <view class="table-content-row">
+              <view style="display: flex; justify-content:space-between;">
+
+
+                <view style="display: flex;">
+                  <view class="table-content-row-font">
+                    <dk-text layoutFlag="{{true}}" fontSize="14px" color="#95A8CB" fontWeight="nomal" value="色号" copyValue="{{item.nonStdCode}}"></dk-text>
+                  </view>
+                  <view class="table-content-class">
+                    {{item.nonStdCode?item.nonStdCode:''}}
+                  </view>
+                </view>
+
+                 
+              </view>
+            </view>
+            <!-- 分割线 -->
+            <dk-divider marginTop="20rpx"></dk-divider>
+            <!-- 下半部分 -->
+            <view class="table-content-row">
+              <view style="display: flex;justify-content:space-between">
+                <view style="display: flex;">
+                  <view class="table-content-row-font">
+                    <dk-text layoutFlag="{{true}}" fontSize="14px" color="#95A8CB" fontWeight="nomal" value="库存量"></dk-text>
+                  </view>
+                  <view style="font-size: 13px;color: #CAA977;">
+                    {{item.invQty}}
+                  </view>
+                </view>
+
+                <view style="display: flex;">
+                  <view class="table-content-row-font">
+                    <dk-text layoutFlag="{{true}}" fontSize="14px" color="#95A8CB" fontWeight="nomal" value="可售量"></dk-text>
+                  </view>
+                  <view style="font-size: 13px;color: #CAA977;">
+                    {{item.usableQty }}
+                  </view>
+                </view>
+              </view>
+              
+            </view>
+            <view class="table-content-row">
+              <view style="display: flex;justify-content:space-between">
+                <view style="display: flex;">
+                  <view class="table-content-row-font">
+                    <dk-text layoutFlag="{{true}}" fontSize="14px" color="#95A8CB" fontWeight="nomal" value="占库量"></dk-text>
+                  </view>
+                  <view style="font-size: 13px;color: #CAA977;">
+                    {{item.outingQty}}
+                  </view>
+                </view>
+
+                <view style="display: flex;">
+                  <view class="table-content-row-font">
+                    <dk-text layoutFlag="{{true}}" fontSize="14px" color="#95A8CB" fontWeight="nomal" value="冻结量"></dk-text>
+                  </view>
+                  <view style="font-size: 13px;color: #CAA977;">
+                    {{item.freezeQty }}
+                  </view>
+                </view>
+              </view>
+              
+            </view>
+          </view>
+        </view>
+      </view>
+
+    </scroll-view>
+
+  </view>
+</view>
+
+<van-sidebar activeKey="{{sideKey}}" bindchange="changeSidebar" custom-class="{{active == 0 ? 'left-class' : 'right-class'}}">
+  <view wx:if="{{active != 1}}" class="{{controlFlags.choosewhFlag?'addsidebar':''}}" style=" height:calc({{windowHeight+'px'}} - {{active == 1 ? '270rpx' :'270rpx' }});overflow: scroll;">
+    <van-sidebar-item wx:key="index" custom-class="{{sideKey - 1 == index? 'sidebar-item-before': (sideKey + 1 == index?'sidebar-item-next':'sidebar-item')}}" title="{{item.catName}}" data-id="{{item.catId}}" wx:for="{{typeList}}" />
+  </view>
+</van-sidebar>
+  
+<!-- 仓库 -->
+<dk-single-dropdown-item show="{{whFlag}}" content="{{form.whName}}" id='warehouse' typeName='warehouse' bind:commit='mutiSearch' bind:close='muticlose'>
+</dk-single-dropdown-item>

package-inventory/pages/ivt-detail-report/ivt-detail-report.wxss

@@ -0,0 +1,143 @@
+.main-good-class {
+	background-color: #FFFFFF;
+	border-radius: 0px 16px 0px 0px;
+}
+
+.search-class {
+	color: #ADB7C9;
+}
+
+.van-search {
+	background-color: transparent !important;
+}
+
+.van-nav-bar {
+	background-color: transparent !important;
+	color: #191919 !important;
+}
+
+.van-search__content {
+	background: #F8F9FD;
+	border: 1px solid #ffffff;
+	border-radius: 15rpx !important;
+}
+
+.van-tab-active-left {
+	background-color: #FFFFFF !important;
+	color: #002340 !important;
+	font-size: 28rpx;
+	border-radius: 8px;
+
+}
+
+.left-class {
+	color: #3E69F6 !important;
+	position: fixed;
+	top: 236rpx;
+	width: 130rpx !important;
+	z-index: 1 !important;
+	border-radius: 16rpx !important;
+}
+
+.van-sidebar-item--selected {
+	border-color: #3E69F6 !important;
+	color: #333333 !important;
+	font-weight: 600 !important;
+}
+
+.sidebar-item {
+	padding: 30rpx 25rpx 20rpx 35rpx !important;
+	font-size: 13px !important;
+	color: #666666 !important;
+	font-weight: 600;
+}
+
+.goods-class {
+	position: fixed;
+	left: 20rpx;
+	top: 324rpx;
+	background-color: #fff;
+	border-radius: 0rpx 16rpx 0rpx 0rpx;
+	border-radius: 16px 0px 0px 0px;
+}
+
+.tags-class {
+	margin-top: 20rpx;
+}
+
+.cell-width {
+	width: 85%;
+	margin-right: 10rpx;
+}
+
+.goods-cell-class {
+	margin: 32rpx 32rpx 32rpx 32rpx;
+	padding: 20rpx;
+	box-shadow: 0px 10px 20px 0px #0000000D;
+	border-radius: 16rpx;
+}
+
+/**产品条目的图片**/
+.goods-item-image {
+	width: 170rpx;
+	height: 170rpx;
+	left: 6rpx;
+	top: calc((100% - 166rpx)/2);
+}
+
+/**产品条目的样式**/
+.goods-item-class {
+	display: flex;
+	text-align: left;
+	padding-top: 20rpx;
+}
+
+/* 图标 */
+.van-icon-class {
+	display: flex;
+	align-items: flex-end;
+}
+
+
+
+.selected-product {
+	color: #191919;
+	font-size: 28rpx;
+	padding: 18rpx 52rpx 18rpx 52rpx;
+	border-radius: 8px 8px 0px 0px;
+	width: 50%;
+	text-align: center;
+}
+
+.selected-product-color-01 {
+	background-color: #FFFFFF;
+}
+
+.selected-product-color-02 {
+	background-color: #FFFFFF4D;
+}
+
+.goods-selected-class {
+	/* padding-top: 98rpx; */
+	/* height: 100%; */
+	background-color: #fff;
+	border-radius: 0px 16px 0px 0px;
+}
+
+.scan-image {
+	width: 66rpx;
+	height: 66rpx;
+}
+
+.width-80 {
+	width: 100%;
+}
+
+.goods-cell-class {
+	padding: 0 20rpx 30rpx 20rpx !important;
+}
+
+.van-nav-bar__title {
+	color: #002340 !important;
+	font-size: 15px !important;
+}

package-sales/pages/order-billing/order-billing.js

@@ -103,8 +103,8 @@ Page({
       bill: 0,
       quantity: 0
     }],
-    outStatus: []
-
+    outStatus: [],
+    primaryKey:'orderId'
   },
   /**
   * @desc :   处理接口返回数据

pages/home-page/home-page.wxml

@@ -61,7 +61,7 @@
   </view>
 
   <!--广告-->
-  <!-- <view wx:if="{{advertisementList && advertisementList.length > 0}}">
+  <view wx:if="{{advertisementList && advertisementList.length > 0}}">
     <swiper indicator-dots="{{true}}" autoplay="true" interval="3000">
       <block wx:for="{{advertisementList}}" wx:key="{{index}}" wx:for-item="item">
         <swiper-item>
@@ -69,7 +69,7 @@
         </swiper-item>
       </block>
     </swiper>
-  </view> -->
+  </view>
 
   <!-- 功能卡片 -->
   <view wx:if="{{advertisementList && advertisementList.length == 0}}" style="margin-top: 10rpx;"></view>

pages/index/index.js

@@ -373,12 +373,6 @@ Page({
     this.filterFunction();
     // 查询常用功能
     this.getComMenu();
-    // wx.navigateTo({
-    //   url: '/package-base-select/pages/web-view-select/web-view-select',
-    //   success: function (res) {
-    //     res.eventChannel.emit('url', 'https://s.dev01.dkiboss.com:7000/wx-print?svc_code=dkic_b1&doc=sa&layout_id=6caa8bc8-6ad8-45af-8e80-881e4081d27b&data_id=10112024-0412-0000-0000-00002fd1d7b4');
-    //   }
-    // })
   },
 
   /* 点击icon事件 */

pages/login/login.wxml

@@ -2,22 +2,22 @@
 <view style="height: 100vh;width:100%;">
   <image style=" height: 100%;width:100%;" mode="scaleToFill" src="{{imageUrl + 'login.png'}}" />
   <view class="base-absolute">
-    <view style="font-size: 24px;margin-top: 60rpx;"> 
+    <view style="font-size: 24px;margin-top: 60rpx;">
       {{$t['homeTitle']}}
     </view>
     <view style="margin-top: 190rpx; display: flex;">
-      <van-button custom-style="border-radius: 30rpx;  height:60rpx;width:180rpx; " size="small" color="#1B365D" type="default" bindtap="freeClick"> {{$t['homeFreeLogin']}}</van-button>
-      <van-button custom-style="border-radius: 30rpx; margin-left:30rpx;height:60rpx;width:180rpx; " size="small" color="#1B365D" type="default" bindtap="productClick">{{$t['homeProduct']}}</van-button>
+      <van-button custom-style="border-radius: 30rpx;  height:68rpx;width:180rpx; color: #131313;font-weight:500 " size="small" color="#ffffff" type="default" bindtap="freeClick"> {{$t['homeFreeLogin']}}</van-button>
+      <van-button custom-style="border-radius: 30rpx; margin-left:30rpx;height:68rpx;width:180rpx;border: 1rpx solid #FFFFFF " size="small" color="transparent" type="default" bindtap="productClick">{{$t['homeProduct']}}</van-button>
 
     </view>
 
     <view style="margin-top: 60rpx; display: flex;">
-      <van-button size="small" custom-style="border-radius: 30rpx; margin-left:10rpx;height:60rpx;width:180rpx; " type="default" data-company='add' bind:click="addCompany" open-type="{{openType}}" bindgetphonenumber="handleGetPhoneNumber">{{$t['homeAddCompany']}}</van-button>
+      <van-button size="small" custom-style="border-radius: 30rpx; margin-left:10rpx;height:60rpx;width:180rpx;" type="default" data-company='add' bind:click="addCompany" open-type="{{openType}}" bindgetphonenumber="handleGetPhoneNumber">{{$t['homeAddCompany']}}</van-button>
       <van-button size="small" open-type="{{openType}}" data-company='create' bind:click="addCompany" bindgetphonenumber="handleGetPhoneNumber" custom-style="border-radius: 30rpx;margin-left:30rpx ;height:60rpx;width:180rpx; " type="default"> {{$t['homeCreateCompany']}}</van-button>
     </view>
 
     <view class="foot-agreement-privacy">
-      <van-checkbox value="{{agreementPrivacy}}" bind:change="onCheckboxChange" />
+      <van-checkbox custom-class="checkbox-class" shape="square" value="{{agreementPrivacy}}" bind:change="onCheckboxChange" />
       <view style="padding-left: 10rpx;"> {{$t['agreementPrivacy']}}</view>
     </view>
   </view>

pages/login/login.wxss

@@ -33,4 +33,14 @@ page {
 	width: 100%;
 	display: flex;
 	align-items: center;
+}
+
+.van-checkbox__icon{
+	font-size: 15px !important;
+    border-radius: 6rpx 6rpx;
+}
+
+.van-button__text{
+	font-size: 14px;
+	font-weight: 500;
 }

pages/mine/mine.js

@@ -27,6 +27,7 @@ Page({
     staffName: 'null',
     orgName: null,
     waitMenuFlag:true, // 是否显示待办工作区
+    statusHeight: 0, // 状态栏高度
     // 路由
     routeObjName: 'setting',
     wechatPayService: app.globalData['wechatPayService'],
@@ -69,51 +70,27 @@ Page({
         title: '待收款',
         code: 'cus-receipt',
         path: '/package-sales/pages/customer-collection/customer-collection',
-        icon: 'order-billing.png',
+        icon: 'btn-account-receivable.png',
       },
       {
         title: '待发货',
         code: 'order',
         path: '/package-sales/pages/order-billing/order-billing',
-        icon: 'order-billing.png',
+        icon: 'btn-shipped.png',
       },
       {
         title: '待入库',
         code: 'entry-handle',
         path: '/package-inventory/pages/warehousing-processing/warehousing-processing',
-        icon: 'order-billing.png',
+        icon: 'btn-stored.png',
       },
       {
         title: '待出库',
         code: 'out-handle',
         path: '/package-inventory/pages/outbound-processing/outbound-processing',
-        icon: 'order-billing.png',
+        icon: 'btn-shipped-out.png',
       },
     ],
-    functionItems_mine: [
-      {
-        FunctionName: '我的开单',
-        FormName: '/package4/pages/order-billing/order-billing',
-        ImageUri: '/static/image/order-billing.png',
-        PFunctionCode: '01',
-        FunctionCode: '0101'
-      },
-      {
-        FunctionName: '我的客户',
-        FormName: '/package3/pages/customer/customer',
-        ImageUri: '/static/image/customer.png',
-        PFunctionCode: '01',
-        FunctionCode: '0102'
-      },
-
-      {
-        FunctionName: '客户收款',
-        FormName: '/package4/pages/collection/add/add',
-        ImageUri: '/static/image/collection.png',
-        PFunctionCode: '01',
-        FunctionCode: '0103'
-      },
-    ]
   },
   /**
   * @desc : 切换公司
@@ -562,6 +539,11 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+    let res = wx.getSystemInfoSync();
+    let statusHeight = res.statusBarHeight
+    this.setData({
+      statusHeight: statusHeight * 2 + 20
+    })
     let waitMenu = this.data.waitMenu;
     let waitMenuFlag = false;
     waitMenu.forEach(it => {

pages/mine/mine.wxml

@@ -2,10 +2,13 @@
 <wxs src='/utils/numberFormat.wxs' module="numberFormat"></wxs>
 <!-- 加载图层 -->
 <loading wx:if="{{loading}}"></loading>
-<view class="head">
-  <view class="company">
-    <view style="display: flex;align-items: center;"  catchtap="changeCp">
-      <view style="margin-right: 10rpx;">
+<!-- 顶部 -->
+<view>
+  <image src="{{imageUrl + 'home-back.png'}}" class="head-image"></image>
+  <!-- 公司 -->
+  <view class="company" style="top:{{statusHeight + 'rpx'}}">
+    <view style="display: flex;align-items: center;" catchtap="changeCp">
+      <view class="company-change-class">
         {{companyName?companyName:''}}
       </view>
       <image src="/static/image/triangle.png" style="width: 28rpx;height:28rpx;"></image>
@@ -38,14 +41,14 @@
   </view>
 </view>
 
-<!-- 待办 -->
-<view style="background-color:#f8f9fd;border-radius:40rpx 40rpx 0rpx 0rpx;margin-top: -57rpx;" >
-  <view style="height: 35rpx;"></view>
+<!--内容-->
+<view class="content" style="padding-top: {{ (statusHeight + 210) + 'rpx'}};">
+  <!--待办工作-->
   <view class="todo-view" wx:if="{{waitMenuFlag}}">
     <view class="todo-view-title">待办工作</view>
     <view class="todo-view-app">
       <view class="todo-view-app-item" wx:for="{{waitMenu}}" wx:for-item="item" data-item="{{item}}" catchtap="toApp" wx:if="{{item.show}}">
-        <view class="todo-view-app-item-icon" >
+        <view class="todo-view-app-item-icon">
           <!-- 待办角标提醒 -->
           <view class="todo-view-app-item-icon-tip" wx:if="{{item.count}}">{{item.count?item.count:0}}</view>
           <image src="{{imageUrl + item.icon}}" style="width:100%;height:100%;" />
@@ -55,6 +58,7 @@
     </view>
   </view>
 
+  <!--门店助手-->
   <van-tabs animated active="{{ active }}" swipeable nav-class="mine-tabs-custom-class" bind:change="onChange">
     <van-tab title="标签 1" name="store">
       <!-- 助手 -->
@@ -209,10 +213,8 @@
         </view>
 
       </view>
-
     </van-tab>
 
-
     <van-tab title="标签 2" name="staff" wx:if="{{false}}">
       <!-- 助手2 -->
       <view class="helper-out-view">
@@ -369,7 +371,6 @@
     </van-tab>
   </van-tabs>
 
-
   <view class="swiper-controller" wx:if="{{showStoreFlag}}">
     <view data-type="store" catchtap="swiperChange">
       <van-icon name="play" style="transform: rotate(180deg);" size="20rpx" color="#1B365D" />
@@ -379,38 +380,45 @@
     </view>
   </view>
 
+  <view style="margin-top: 30rpx;">
+
+    <view class="todo-view" style="margin-bottom: 4rpx;">
+      <view class="todo-view-title" catch:tap="toSetting">{{$t['settingCommany']}}</view>
+    </view>
+    <view class="todo-view" style="margin-bottom: 4rpx;">
+      <view class="todo-view-title" catch:tap="toPay">微信支付</view>
+    </view>
+    <view class="todo-view" style="margin-bottom: 4rpx;">
+      <view class="todo-view-title" catch:tap="toTestExample">toTestExample</view>
+    </view>
+    <view class="todo-view" style="display: flex;justify-content:space-between;align-items: center;margin-bottom: 4rpx;">
+      <view class="todo-view-title ">标准版</view>
+      <view class="todo-view-title" style="display: flex;justify-content:space-between;align-items: center;">
+        <image src="{{imageUrl + 'diamond.png'}}" style="width:40rpx;height:40rpx; margin-right: 10rpx;" />
+        升级专业版
+      </view>
+    </view>
+    <view class="todo-view" style="display: flex;justify-content:space-between;align-items: center;margin-bottom: 4rpx;">
+      <view class="todo-view-title">{{$t['recommendedGifts']}}</view>
+      <view style="font-size: 12px;color: grey;">积分：3500</view>
+    </view>
+  </view>
+
+</view>
+
+<!-- 待办 -->
+<view style="background-color:#f8f9fd;border-radius:40rpx 40rpx 0rpx 0rpx;margin-top: -57rpx;">
+
+
   <!-- <view style="height: 39rpx;"></view>
   <view class="todo-view">
     <view class="todo-view-title" catch:tap="register">{{$t['registerCommany']}}</view>
   </view> -->
   <view style="height: 30rpx;"></view>
-  <view class="todo-view">
-    <view class="todo-view-title" catch:tap="toSetting">{{$t['settingCommany']}}</view>
-  </view>
 
-  <view style="height: 30rpx;"></view>
-  <view class="todo-view">
-    <view class="todo-view-title" catch:tap="toPay">微信支付</view>
-  </view>
-  <view style="height: 30rpx;"></view>
-  <view class="todo-view">
-    <view class="todo-view-title" catch:tap="toTestExample">toTestExample</view>
-  </view>
-  
-  <view style="height: 30rpx;"></view>
-  <view class="todo-view" style="display: flex;justify-content:space-between;align-items: center;">
-    <view class="todo-view-title ">标准版</view>
 
-    <view class="todo-view-title" style="display: flex;justify-content:space-between;align-items: center;">
-      <image src="{{imageUrl + 'diamond.png'}}" style="width:40rpx;height:40rpx; margin-right: 10rpx;" />
-      升级专业版
-    </view>
-  </view>
   <view style="height: 30rpx;"></view>
-  <view class="todo-view" style="display: flex;justify-content:space-between;align-items: center;">
-    <view class="todo-view-title">{{$t['recommendedGifts']}}</view>
-    <view style="font-size: 12px;color: grey;">积分：3500</view>
-  </view>
+
   <view style="height: 59rpx;"></view>
   <view style="padding: 30rpx;">
     <dk-button style="width: 100%; background: red;" size="large" type="danger" bind:tap="logout">退出 </dk-button>

pages/mine/mine.wxss

@@ -1,25 +1,25 @@
 page {
 	background-color: #f8f9fd;
-  }
-  
-  .head {
-   
-  
-	z-index: 1; 
+}
+
+.head {
+
+
+	z-index: 1;
 	height: 384rpx;
-	width: 100%; 
+	width: 100%;
 	background: #A51006;
-  }
-  
-  .head-center {
+}
+
+.head-center {
 	position: absolute;
 	width: 78rpx;
 	height: 80rpx;
 	left: 39rpx;
 	top: 204rpx;
-  }
-  
-  .nick-name {
+}
+
+.nick-name {
 	width: 70% !important;
 	position: absolute;
 	width: 64rpx;
@@ -32,11 +32,13 @@ page {
 	font-size: 28rpx;
 	line-height: 45rpx;
 	color: #FFFFFF;
-  }
-  .head-name {
+}
+
+.head-name {
 	margin-left: 23rpx;
-  }
-  .store{
+}
+
+.store {
 	position: absolute;
 	width: 364rpx;
 	height: 34rpx;
@@ -48,72 +50,72 @@ page {
 	font-size: 24rpx;
 	line-height: 34rpx;
 	color: white;
-  } 
-  
-  .setting {
+}
+
+.setting {
 	text-align: center;
 	padding: 20rpx;
-  }
-  
-  .head-center-ercode {
+}
+
+.head-center-ercode {
 	width: 30rpx;
 	height: 30rpx;
-  }
-  
-  .wx-avatar {
+}
+
+.wx-avatar {
 	overflow: hidden;
 	display: block;
 	width: 80rpx;
 	height: 80rpx;
 	border-radius: 50%;
 	border: 1px solid #95a8cb;
-  }
-  
-  .applications {
+}
+
+.applications {
 	color: #fff;
 	margin-top: 70rpx;
 	width: 100%;
-  }
-  
-  .application-block {
+}
+
+.application-block {
 	width: 25%;
 	text-align: center;
 	float: left;
-  }
-  
-  .application-number {
+}
+
+.application-number {
 	display: flex;
 	justify-content: center;
-  }
-  
-  .application-name {
+}
+
+.application-name {
 	display: flex;
 	font-size: 25rpx;
 	font-family: 'PingFang SC';
 	justify-content: center;
 	margin-top: 5rpx;
-  }
-  
-  .panel-class {
+}
+
+.panel-class {
 	margin-bottom: 20rpx;
-  }
-  
-  .menu-class {
+}
+
+.menu-class {
 	background: white;
 	justify-content: center;
-  }
-  
-  
-  
-  
-  /* 沈博 2022年7月29日14:37:16 */
-  .mb-left {
+}
+
+
+
+
+/* 沈博 2022年7月29日14:37:16 */
+.mb-left {
 	width: 200px;
 	display: flex;
 	align-items: center;
-  }
-  
-  .notice-view {
+}
+
+.notice-view {
 	width: 45rpx;
 	height: 45rpx;
 	background: #FFFFFF;
@@ -123,40 +125,39 @@ page {
 	align-items: center;
 	justify-content: center;
 	position: relative;
-  }
-  
-  .todo-view {
-	margin-left: 34rpx;
-	width: calc(100% - 68rpx - 48rpx);
+}
+
+.todo-view {
+	position: relative;
 	background: #FFFFFF;
 	box-shadow: 0px 10px 20px rgba(225, 229, 238, 0.6);
 	border-radius: 15rpx;
 	padding: 24rpx;
 	/* margin-top: 35rpx; */
-	z-index: 2;
-  }
-  
-  .todo-view-title {
+	z-index: 22;
+}
+
+.todo-view-title {
 	font-style: normal;
 	font-weight: 500;
 	font-size: 16px;
 	font-family: 'PingFang SC';
-  }
-  
-  .todo-view-app {
+}
+
+.todo-view-app {
 	padding-top: 24rpx;
 	display: -webkit-box;
 	overflow: auto;
 	width: 100%;
-  }
-  
-  .todo-view-app-item {
+}
+
+.todo-view-app-item {
 	width: 25%;
 	display: grid;
 	justify-items: center;
-  }
-  
-  .todo-view-app-item-icon {
+}
+
+.todo-view-app-item-icon {
 	width: 66rpx;
 	height: 66rpx;
 	/* background-color: #B280E4; */
@@ -165,9 +166,9 @@ page {
 	justify-content: center;
 	border-radius: 50%;
 	position: relative;
-  }
-  
-  .todo-view-app-item-icon-tip {
+}
+
+.todo-view-app-item-icon-tip {
 	position: absolute;
 	width: 26rpx;
 	height: 26rpx;
@@ -183,9 +184,9 @@ page {
 	display: flex;
 	align-items: center;
 	justify-content: center;
-  }
-  
-  .todo-view-app-item-name {
+}
+
+.todo-view-app-item-name {
 	font-style: normal;
 	font-weight: 400;
 	font-size: 14px;
@@ -193,33 +194,31 @@ page {
 	/* font-family: 'SimSun'; */
 	color: #1B365D;
 	margin-top: 10rpx;
-  }
-  
-  .helper-view {
-	margin-left: 34rpx;
-	width: calc(100% - 68rpx - 48rpx);
+}
+
+.helper-view {
 	background: #FFFFFF;
 	box-shadow: 0px 10px 20px rgba(225, 229, 238, 0.6);
 	border-radius: 15rpx;
 	padding: 24rpx;
 	margin-top: 30rpx;
-  }
-  
-  .helper-view-header {
+}
+
+.helper-view-header {
 	display: flex;
 	justify-content: space-between;
 	align-items: center;
-  }
-  
-  .helper-view-content {
+}
+
+.helper-view-content {
 	display: flex;
 	flex-flow: wrap;
 	justify-content: space-between;
 	margin-top: 44rpx;
-  }
+}
 
-  
-  .help-view-content-item {
+
+.help-view-content-item {
 	border-radius: 15rpx;
 	position: relative;
 	display: grid;
@@ -228,13 +227,13 @@ page {
 	height: 108rpx;
 	background: #F8F8F8;
 	filter: blur(var(--filterBlur--));
-  }
-  
-  .help-view-content-item:nth-child(n+4) {
+}
+
+.help-view-content-item:nth-child(n+4) {
 	margin-top: 12rpx;
-  }
-  
-  .help-view-content-item-absolute {
+}
+
+.help-view-content-item-absolute {
 	color: #1B365D;
 	background-color: #EBEEF3;
 	font-size: 10px;
@@ -246,10 +245,10 @@ page {
 	position: absolute;
 	right: 4.3rpx;
 	top: 4.3rpx;
-  
-  }
-  
-  .help-view-content-item-important {
+
+}
+
+.help-view-content-item-important {
 	font-weight: 600;
 	font-size: 16px;
 	font-family: 'PingFang SC';
@@ -257,41 +256,41 @@ page {
 	justify-content: center;
 	display: flex;
 	align-items: center;
-  }
-  
-  .help-view-content-item-important-small {
+}
+
+.help-view-content-item-important-small {
 	font-style: normal;
 	font-weight: 400;
 	font-size: 10px;
 	font-family: 'PingFang SC';
-  }
-  
-  .help-view-content-item-text {
+}
+
+.help-view-content-item-text {
 	font-style: normal;
 	font-weight: 400;
 	font-size: 10px;
 	color: #95A8CB;
 	text-align: center;
 	font-family: 'PingFang SC';
-  }
-  
-  
-  .mine-tabs-custom-class {
+}
+
+
+.mine-tabs-custom-class {
 	display: none !important;
-  }
-  
-  .van-tabs__wrap {
+}
+
+.van-tabs__wrap {
 	display: none !important;
-  }
-  
-  .swiper-controller {
+}
+
+.swiper-controller {
 	display: flex;
 	justify-content: space-between;
 	align-items: center;
 	padding: 39rpx 38% 0 38%;
-  }
-  
-  .swiper-controller>view:nth-child(n) {
+}
+
+.swiper-controller>view:nth-child(n) {
 	background: #D1DCF1;
 	border-radius: 50%;
 	width: 35rpx;
@@ -299,66 +298,65 @@ page {
 	display: flex;
 	justify-content: center;
 	align-items: center;
-  }
-  
-  
-  .task-progress {
-	margin-left: 34rpx;
-	width: calc(100% - 68rpx);
+}
+
+
+.task-progress {
 	background: #FFFFFF;
 	box-shadow: 0px 10px 20px rgba(225, 229, 238, 0.6);
 	border-radius: 15rpx;
 	margin-top: 30rpx;
-  }
-  
-  .task-progress-header {
+}
+
+.task-progress-header {
 	display: flex;
 	background: linear-gradient(90.12deg, #9BCBEB 0.13%, #D9F0FF 99.92%);
 	padding: 24rpx;
 	border-radius: 15rpx 15rpx 0px 0px;
 	align-items: center;
 	justify-content: space-between;
-  }
-  
-  .task-progress-header-name {
+}
+
+.task-progress-header-name {
 	font-style: normal;
 	font-weight: 500;
 	font-size: 16px;
 	color: #FFFFFF;
 	font-family: 'PingFang SC';
-  }
-  
-  .task-progress-content {
+}
+
+.task-progress-content {
 	display: flex;
 	justify-content: space-between;
 	padding: 24rpx 24rpx 0 24rpx;
 	position: relative;
-  }
-  .task-progress-content-left {
+}
+
+.task-progress-content-left {
 	filter: blur(var(--filterBlur--));
 	padding: 20rpx 0;
-  }
-  
-  .task-progress-content-left>view:nth-child(1) {
+}
+
+.task-progress-content-left>view:nth-child(1) {
 	font-style: normal;
 	font-weight: 600;
 	font-family: 'PingFang SC';
 	font-size: 25px;
 	color: #1B365D;
-  }
-  
-  
-  .task-progress-content-left>view:nth-child(2) {
+}
+
+
+.task-progress-content-left>view:nth-child(2) {
 	font-style: normal;
 	font-weight: 400;
 	font-size: 14px;
 	color: #95A8CB;
 	font-family: 'PingFang SC';
 	margin-top: 13rpx;
-  }
-  
-  
-  .task-progress-content-left>view:nth-child(3) {
+}
+
+
+.task-progress-content-left>view:nth-child(3) {
 	font-style: normal;
 	font-weight: 400;
 	font-size: 10px;
@@ -368,32 +366,34 @@ page {
 	line-height: 40rpx;
 	font-family: 'PingFang SC';
 	margin-top: 11rpx;
-  }
-  
-  .task-progress-content-left>view:nth-child(3)>view:nth-child(n), .task-progress-content-left>view:nth-child(3)>view:nth-child(n)>view:nth-child(n){
+}
+
+.task-progress-content-left>view:nth-child(3)>view:nth-child(n),
+.task-progress-content-left>view:nth-child(3)>view:nth-child(n)>view:nth-child(n) {
 	display: flex;
 	align-items: center;
-  }
-  
-  .task-progress-content-left>view:nth-child(3)>view:nth-child(2){
+}
+
+.task-progress-content-left>view:nth-child(3)>view:nth-child(2) {
 	margin-left: 19rpx;
-  }
-  
-  .task-progress-content-right{
+}
+
+.task-progress-content-right {
 	padding: 20rpx 0;
 	display: grid;
 	filter: blur(var(--filterBlur--));
-  }
-  .task-progress-content-right>view:nth-child(1) {
+}
+
+.task-progress-content-right>view:nth-child(1) {
 	font-style: normal;
 	font-weight: 400;
 	font-size: 14px;
 	color: #1B365D;
 	text-align: right;
 	font-family: 'PingFang SC';
-  }
-  
-  .task-progress-content-right>view:nth-child(2) {
+}
+
+.task-progress-content-right>view:nth-child(2) {
 	font-style: normal;
 	font-weight: 400;
 	font-size: 10px;
@@ -401,33 +401,55 @@ page {
 	margin-bottom: 12rpx;
 	text-align: right;
 	font-family: 'PingFang SC';
-  }
-  
-  .task-progress-content-right>view:nth-child(3) {
+}
+
+.task-progress-content-right>view:nth-child(3) {
 	font-style: normal;
 	font-weight: 400;
 	font-size: 10px;
 	color: #95A8CB;
 	text-align: right;
 	font-family: 'PingFang SC';
-  }
-  
-  .small-cny{
+}
+
+.small-cny {
 	font-size: 12px;
 	color: green;
-  }
-   .small-cny_red{
+}
+
+.small-cny_red {
 	font-size: 12px;
 	color: red;
-  }
-  .small-small-font{
+}
+
+.small-small-font {
 	font-size: 10px;
 	line-height: 16px;
-  }
-  .company{
+}
+
+.company {
 	width: 100%;
-	position: absolute;
+	position: fixed;
 	left: 40rpx;
-	top: 120rpx;
+	top: 60rpx;
 	color: #F8F9FD;
-  }
+}
+
+.company-change-class {
+	margin-right: 10rpx;
+	font-size: 16px;
+	font-weight: 500;
+}
+
+.head-image {
+	width: 100%;
+	position: fixed;
+	height: 580rpx;
+}
+
+.content {
+	margin-left: 40rpx;
+	margin-right: 40rpx;
+	width: calc(100% - 80rpx);
+	background: #FFFFFF;
+}