1、修改问题

app.json

@@ -57,6 +57,7 @@
                 "pages/org/choose-org/choose-org",
                 "pages/org/sub-org-choose/sub-org-choose",
                 "pages/activity/activity",
+                "pages/activity/detail/detail",
                 "pages/print-layout/print-layout"
             ]
         },

app.wxss

@@ -37,6 +37,15 @@ page {
   color: #d9001b !important;
 }
 
+.edit-class{
+  display: flex;
+    justify-content: center;
+    align-items: center;
+    padding: 20rpx;
+    width: 100rpx;
+    height: 100rpx;
+}
+
 
 /*
 hxd 列表样式

components/dkbase/dk-tag/dk-tag.wxml

@@ -1,3 +1,3 @@
-<van-tag catchtap="tapClick" type="{{type}}" color="{{color}}" size="{{size}}" plain="{{plain}}" round="{{round}}" closeable="{{closeable}}" text-color="{{textColor}}" class="tagStyle" style="--fontSize--:{{fontSize}};--fontWeight--:{{fontWeight}}; --radius--:{{roundFlag? (radius + ' ' + radius): (radius + ' ' + 0)}};--border--:{{border}};--height--:{{height}};--marginRight--:{{marginRight}};--padding--:{{padding}};--padding-left--:{{paddingLeft}};--padding-right--:{{paddingRight}}">
+<van-tag catchtap="tapClick" type="{{type}}"  size="{{size}}" plain="{{plain}}" round="{{round}}" closeable="{{closeable}}" text-color="{{textColor}}" class="tagStyle" style="--fontSize--:{{fontSize}};--fontWeight--:{{fontWeight}}; --radius--:{{roundFlag? (radius + ' ' + radius): (radius + ' ' + 0)}};--border--:{{border}};--height--:{{height}};--marginRight--:{{marginRight}};--padding--:{{padding}};--padding-left--:{{paddingLeft}};--padding-right--:{{paddingRight}};--color--:{{color}}">
   {{displayValue}}
 </van-tag>

components/dkbase/dk-tag/dk-tag.wxss

@@ -16,4 +16,5 @@
   line-height:var(--height--) !important;
   padding:var(--padding--) !important;
   font-weight: var(--fontWeight--) !important;
+  background: var(--color--) !important;
 }

i18n/zh-CN.js

@@ -508,6 +508,8 @@ const org = {
   newSubOrg: '新建子部门',
   newStaff: '新建员工',
   org: '部门详情',
+  std:'免费版',
+  pro:'专业版',
 }
 // 供应商
 const supplier = {

mixins/index.js

@@ -995,7 +995,6 @@ module.exports = {
       var currentPage = pages[pages.length - 1];
       let formData = this.data.formData
       let formValue = app.globalData[currentPage.route];
-      console.log('ffff',formData,formValue);
       if (formValue && formData && formData != formValue) {
         Dialog.confirm({
           message: '是否加载缓存数据',
@@ -1147,7 +1146,7 @@ module.exports = {
         }
         if (data.formMode == Constants.formMode.add) {
           // 加载暂存数据
-          _this.loadTempData();
+          // _this.loadTempData();
         }
       })
     } else {

package-accounts-manage/pages/collection-category/collection-category.wxml

@@ -103,10 +103,14 @@
 
 
 <!-- 底部加号 -->
-<view style="position: fixed;bottom: 230rpx;right: 30rpx;">
+<!-- <view style="position: fixed;bottom: 230rpx;right: 30rpx;">
 <view bind:tap="toAdd" style="background: #CAA977;border-radius: 50%;display: flex;justify-content: center;align-items: center;padding:20rpx;box-shadow: 0px 17px 22px 0px #1B365D33;">
   <van-icon name="plus" color="#FFFFFF" size="60rpx" />
 </view>
+</view> -->
+
+<view style="position: fixed;bottom: 230rpx;right: 30rpx;z-index: 99;" bindtap="toAdd">
+  <image src="{{imageUrl + 'btn-new.png'}} " class="edit-class"  />
 </view>
 
 

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

@@ -45,6 +45,10 @@
   </view>
 </view>
 
+<!-- <view style="position: fixed;bottom: 230rpx;right: 30rpx;z-index: 99;" bindtap="toAdd" wx:if="{{addUrl || (popContent && popContent.length > 0)}}">
+  <image src="{{imageUrl + 'btn-new.png'}} " class="edit-class"  />
+</view> -->
+
 
 <dk-popup id="popup" type="basic" validFlag="{{true}}" priceTitle="" title="{{popTitle}}" value="{{dataItem}}" show="{{showPop}}" routeObjName="{{routeObjNamePop}}" contentObj="{{popContent}}" bind:commit="editItems">
 </dk-popup>

package-basic-data/pages/activity/activity.js

@@ -135,6 +135,12 @@ Page({
         summaryInfo.staffInfo = '可配置手机端授权' + wxNum + '个；电脑端授权' + webNum + '个（包含当前用户）'
         summaryInfo.webMaxNum = webNum
         summaryInfo.wxMaxNum = wxNum
+        summaryInfo.buyBeginDate = new Date(this.data.cpEndDate).addDays(1).toDateStr();
+        summaryInfo.extendDays = new Date(summaryInfo.endDate).dayDiff(new Date(this.data.cpEndDate).addDays(1));
+        // 计算一授权一天的单价
+        let price = (summaryInfo.amount / (webNum + wxNum) / summaryInfo.extendDays).toFixed(2);
+        summaryInfo.priceInfo = price
+
         this.setData({
             summaryInfo: summaryInfo
         })
@@ -161,6 +167,16 @@ Page({
         this.countSummaryAmount();
     },
     /**
+     * @desc : 保存
+     * @author : 周兴
+     * @date : 2024/4/1
+     */
+    handleSave() {
+        let summaryInfo = this.data.summaryInfo
+        let staffInfo = [{ wxMaxNum: this.data.wxMaxNum, webMaxNum: this.data.webMaxNum, title: '当前授权', wxTitle: '手机授权', webTitle: '电脑授权' },{wxMaxNum: summaryInfo.wxMaxNum, webMaxNum: summaryInfo.webMaxNum, title: '续费授权', wxTitle: '手机授权', webTitle: '电脑授权'}]
+        this.save({ saveFlag: false, url: '/package-basic-data/pages/activity/detail/detail?staffInfo=' + JSON.stringify(staffInfo) });
+    },
+    /**
      * @desc : 校验
      * @author : 周兴
      * @date : 2024/4/1
@@ -194,11 +210,11 @@ Page({
         params.cpId = app.globalData.company.cpId
         params.tradeNo = this.generateRandomNo();
         params.wxUserId = app.globalData.user.userId
-        params.tradeAmount =  summaryInfo.amount
-        console.log('cpEndDate',cpEndDate);
-        params.buyBeginDate = new Date(cpEndDate).addDays(1).toDateStr();
+        params.tradeAmount = summaryInfo.amount
+        console.log('cpEndDate', cpEndDate);
+        params.buyBeginDate = summaryInfo.buyBeginDate;
         params.buyEndDate = summaryInfo.endDate
-        params.extendDays = new Date(params.buyEndDate).dayDiff( new Date(cpEndDate).addDays(1));
+        params.extendDays = summaryInfo.extendDays;
         params.buyLong = curentAdItem.activityItemName
         return params;
     },
@@ -208,8 +224,8 @@ Page({
      * @date : 2024/5/17
      */
     saveData(params) {
-        return this.excute(this.data.service, this.data.service.reNewCompany, this.data.params).then(res=>{
-            if(res.data.code == Constants.SUCESS_CODE){
+        return this.excute(this.data.service, this.data.service.reNewCompany, this.data.params).then(res => {
+            if (res.data.code == Constants.SUCESS_CODE) {
                 // 成功后跳转支付
                 this.toPay(res.data.data);
             }
@@ -246,8 +262,8 @@ Page({
             companyName: app.globalData.company.cpName,
             staffName: app.globalData.user.staffName,
             cpEndDate: app.globalData.company.endDate,
-            webMaxNum:app.globalData.company.webMaxNum,
-            wxMaxNum:app.globalData.company.wxMaxNum,
+            webMaxNum: app.globalData.company.webMaxNum,
+            wxMaxNum: app.globalData.company.wxMaxNum,
         })
         // 获取活动
         this.getActivity();

package-basic-data/pages/activity/activity.wxml

@@ -8,7 +8,7 @@
 		<!-- 头像 -->
 		<open-data type="userAvatarUrl" class='wx-avatar'></open-data>
 		<view style="margin-left: 30rpx;">
-			<view class="cp-class">{{companyName}}</view>
+			<view class="cp-class">{{companyName}} <dk-tag style="margin-left: 20rpx;" type="primary" padding="0 10rpx" height="30rpx" color="linear-gradient(77.62deg, #CAA977 12.58%, #FFDA7A 85.49%),conic-gradient(from 154.5deg at 29.17% -8.33%, #FFE8BA -0.56deg, rgba(255, 230, 165, 0) 0.26deg, rgba(227, 184, 73, 0.34) 17.37deg, rgba(240, 187, 253, 0.23) 347.83deg, rgba(186, 234, 255, 0.38) 353.78deg, #FFE8BA 359.44deg, rgba(255, 230, 165, 0) 360.26deg);" textColor="#1B365D" radius="10rpx" fontSize="9px"  value="{{gradeCode == 'STD'?$t['std']:$t['pro']}}" catchtap="expandCard" data-item="{{card}}" data-index="{{cardIndex}}"></dk-tag></view>
 			<view class="staff-class">{{staffName + (staffPhone?(' | ' + staffPhone):'')}}</view>
 			<view class="end-date-class">{{$t['cpEndDate'] + '：' + cpEndDate}}</view>
 			<view class="staff-count-class">{{'手机端授权：' + wxMaxNum + '个，电脑端授权' + webMaxNum + '个' }}</view>
@@ -70,6 +70,8 @@
 	<view class="summary-item-class">{{summaryInfo.amountInfo}}</view>
 	<view class="summary-item-class">截止日期：{{summaryInfo.endDate}}</view>
 	<view class="summary-item-class" wx:if="{{staffCount.maxNum || staffCount.webMaxNum || staffCount.wxMaxNum}}">{{summaryInfo.staffInfo}}</view>
+	<view class="summary-item-class" style="display: flex;justify-content: flex-end;" wx:if="{{staffCount.maxNum || staffCount.webMaxNum || staffCount.wxMaxNum}}">
+		折合<dk-cell fontSize="14" left="5rpx" fontWeight="bold" height="45rpx" contentColor="#FF7B1A" content="{{summaryInfo.priceInfo}}"></dk-cell>/天/授权</view>
 </view>
 
 <!--注册须知-->
@@ -88,4 +90,4 @@
 <view style="height: 200rpx;"></view>
 
 <!--  保存 -->
-<dk-save-button btnAutoWidthFlag="{{true}}" buttonList="{{buttonSaveList}}" bind:open="save"></dk-save-button>
+<dk-save-button btnAutoWidthFlag="{{true}}" buttonList="{{buttonSaveList}}" bind:open="handleSave"></dk-save-button>

package-basic-data/pages/activity/activity.wxss

@@ -12,9 +12,11 @@ page {
 }
 
 .cp-class {
-	font-size: 15px;
+	font-size: 16px;
 	font-weight: 600;
 	margin: 10rpx 0;
+	display: flex;
+	align-items: center;
 }
 
 .staff-class {

package-basic-data/pages/activity/detail/detail.js

@@ -0,0 +1,48 @@
+/*******************************************************************************
+ * Copyright(c) 2024 dongke All rights reserved. / Confidential
+ * 类的信息：
+ *		1.程序名称：续费明细 
+ * 编辑履历：
+ *		作者				日期					版本				修改内容
+ *		周兴		       2024-5-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: {
+        // 企业名称
+        staffInfo: null,
+        active: 0,
+        tagList: [{ title: "手机授权", code: 'wx' }, { title: "电脑授权", code: 'web' }],
+        contentList: [
+            { name: 'staffCode', title: mixins.$t('staffCode') },
+            { name: 'staffPhone', title: mixins.$t('staffPhone') },
+            { name: 'orgName', title: mixins.$t('orgId') },
+            { name: 'roleNames', title: mixins.$t('roleName') },
+        ],
+    },
+    /**
+    * @desc : 切换，查询用户
+    * @date : 2024/5/23 15:49
+    * @author : 周兴
+    */
+    onChangeTabs(e) {
+        let code = e.detail.detail.code
+        this.setData({
+            outStatus: code,
+        })
+        this.searchData()
+    },
+    onLoad(options) {
+        console.log('op', options);
+        this.setData({
+            staffInfo: JSON.parse(options.staffInfo)
+        })
+    }
+})

package-basic-data/pages/customer-list/add/add.js

@@ -33,13 +33,9 @@ Page({
       ],
       center: [
         { code: 'channelId', name: 'channelName', required: true, title: mixins.$t('saleChannel'), type: 'choose', urlKey: 'chooseChannel' },
-
-
         { code: 'staffId', name: 'staffName', type: 'choose', required: true, title: mixins.$t('saleStaff'), urlKey: 'chooseStaff' },
         { code: 'orgId', name: 'orgName', type: 'choose', required: true, title: mixins.$t('saleOrg'), urlKey: 'chooseOrg' },
-        { code: 'initialDebt', type: 'number', required: false, title: '初始欠款' },
-
-
+        { code: 'startAmount', type: 'number', required: false, title: '初始欠款' },
       ],
       remarks: [
         { code: 'remarks', type: 'textarea', title: mixins.$t('remarks') }
@@ -113,6 +109,16 @@ Page({
     this.setData({
       formData: JSON.stringify(data)
     })
+    // 控制初始欠款不允许编辑
+    let contentObj = this.data.contentObj;
+    let filters =  contentObj.center.filter(it=>it.code == 'startAmount')
+
+    if(filters && filters.length > 0){
+      filters[0].readonly = true;
+    }
+    this.setData({
+      contentObj:contentObj
+    })
   },
 
   /**

package-basic-data/pages/customer-list/detail/detail.wxml

@@ -1,7 +1,7 @@
 <!-- 前台导入wxmlUtil.wxs -->
 <wxs src='/utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
 <loading wx:if="{{loading}}"></loading>
-<view class="detail-top" data-item="{{item}}" bind:tap="toDetail">
+<view class="detail-top" data-item="{{item}}" >
   <image class="scan-image" fit="fill" src="{{imageUrl+'/customer_detail_04.png'}}"></image>
   <view class="detail-top-sup" style="display: flex;">
     <view>
@@ -14,6 +14,7 @@
     <view style="padding-left: 20rpx;">
       <dk-tag border="1rpx solid #FF7B1A" height="30rpx" color="transparent" textColor="#FF7B1A" radius="10rpx" roundFlag="{{true}}" marginRight="20rpx" value="{{item.saleStatusName}}"></dk-tag>
     </view>
+    <image src="{{imageUrl + 'edit.png'}} "  style="width: 60rpx;height: 60rpx;position: absolute; right: 20rpx;" bind:tap="toDetail"/>
   </view>
   <view class="detail-top-color" style="display: flex;">
     <view>
@@ -916,4 +917,5 @@
     </view>
 
   </van-tab>
-</van-tabs>
+</van-tabs>
+

package-basic-data/pages/customer-reception/detail/detail.wxml

@@ -10,8 +10,6 @@
 
 
 <!-- 底部加号 -->
-<view style="position: fixed;bottom: 230rpx;right: 30rpx;" >
-  <view bind:tap="toEdit" class="btn-add-class">
-    <van-icon name="edit" color="#FFFFFF" size="60rpx" />
-  </view>
+<view style="position: fixed;bottom: 230rpx;right: 30rpx;z-index: 99;" bindtap="toEdit">
+  <image src="{{imageUrl + 'edit.png'}} " class="edit-class"  />
 </view>

package-basic-data/pages/product-file/product-file.js

@@ -79,7 +79,7 @@ Page({
    * @author : 王英杰
    * @date : 2024/1/23 9:16
    */
-  loadInit() {
+  onShow() {
     // 获取品牌
     this.getGoodsBrandNoPage().then(res=>{
       let item = this.data.item
@@ -162,6 +162,16 @@ Page({
     })
     this.searchData()
   },
-
+  onLoad(){
+    let _this = this;
+    wx.getSystemInfo({
+      success: function (res) {
+        _this.setData({
+          windowHeight: res.windowHeight,
+          windowWidth: res.windowWidth
+        })
+      }
+    })
+  }
 
 })

package-inventory/pages/inventory-freeze/add/add.wxml

@@ -8,10 +8,8 @@ bind:editItems="editItems" sumAmountColFlag="{{false}}"  iconCol="imagesUrl" bin
 <view style="height: 200rpx;"></view>
 
 <!-- 底部加号 -->
-<view style="position: fixed;bottom: 230rpx;right: 30rpx;" wx:if="{{formMode =='detail'}}">
-  <view bind:tap="toEdit" class="btn-add-class">
-    <van-icon name="edit" color="#FFFFFF" size="60rpx" />
-  </view>
+<view wx:if="{{formMode =='detail'}}" style="position: fixed;bottom: 230rpx;right: 30rpx;z-index: 99;" bindtap="toEdit">
+  <image src="{{imageUrl + 'edit.png'}} " class="edit-class"  />
 </view>
 
 <!-- 新建按钮 -->

package-inventory/pages/outbound-processing/detail/detail.wxml

@@ -8,10 +8,8 @@
 <view style="height: 200rpx;"></view>
 
 <!-- 底部加号 -->
-<view style="position: fixed;bottom: 230rpx;right: 30rpx;" wx:if="{{flgEdit}}" >
-  <view bind:tap="toEdit" class="btn-add-class">
-    <van-icon name="edit" color="#FFFFFF" size="60rpx" />
-  </view>
+<view wx:if="{{flgEdit}}" style="position: fixed;bottom: 230rpx;right: 30rpx;z-index: 99;" bindtap="toEdit">
+  <image src="{{imageUrl + 'edit.png'}} " class="edit-class"  />
 </view>
 
 <!-- 新建按钮 -->

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

@@ -55,10 +55,8 @@
 <view style="height: 200rpx;"></view>
 
 <!-- 底部加号 -->
-<view style="position: fixed;bottom: 230rpx;right: 30rpx;" wx:if="{{flgEdit}}">
-  <view bind:tap="toEdit" class="btn-add-class">
-    <van-icon name="edit" color="#FFFFFF" size="60rpx" />
-  </view>
+<view wx:if="{{flgEdit}}" style="position: fixed;bottom: 230rpx;right: 30rpx;z-index: 99;" bindtap="toEdit">
+  <image src="{{imageUrl + 'edit.png'}} " class="edit-class"  />
 </view>
 
 <!-- 新建按钮 -->

package-sales/pages/order-return/add/add.wxml

@@ -1,7 +1,7 @@
 <!-- 前台导入wxmlUtil.wxs -->
 <wxs src='/utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
 <loading wx:if="{{loading}}"></loading>
-
+<van-dialog id="van-dialog" />
 <!-- priceStd -->
 <dk-form-bill type="saleOutReturn" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}" titleTagCol="" titleCol="skuModel"  subCol="calculationFormula" descCol="skuName" priceCol="priceOut" quantityCol="outingQty" sumAmountCol="sumAmount" discountStandardCol="saleDiscount" pupPriceCol="sumPrice" contentObj="{{contentObj}}"  iconCol="imagesUrl"  model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" bind:setGoods="setGoods"   table="{{table}}"
 bind:editItems="setGoods" readonly="{{formMode == 'detail' && formType =='detail'}}"  bind:openChoosedItemInfo="openChoosedItemInfo" deleteName="deleteItemList"
@@ -22,15 +22,13 @@ titpsItemColorFlagKey="titpsItemColorFlagKey"
 titpsLabel="titpsLabel"
 >
 </dk-form-bill>
-<van-dialog id="van-dialog" />
+
 <view style="height: 200rpx;"></view>
 
 
 <!-- 底部加号 -->
-<view style="position: fixed;bottom: 230rpx;right: 30rpx;" wx:if="{{formMode == 'detail'}}">
-  <view bind:tap="toEdit" class="btn-add-class">
-    <van-icon name="edit" color="#FFFFFF" size="60rpx" />
-  </view>
+<view wx:if="{{formMode =='detail'}}" style="position: fixed;bottom: 230rpx;right: 30rpx;z-index: 99;" bindtap="toEdit">
+  <image src="{{imageUrl + 'edit.png'}} " class="edit-class"  />
 </view>
 
 

package-sales/pages/order-return/add/add.wxss

@@ -365,17 +365,6 @@
   padding-right: 20rpx;
   flex-direction: column;
 }
-.van-button__text{
-  color:white;
-}
-
-
-
-
-
-
-
-
 .contents{
   width:100%;
   min-height: 100%;

package-sales/pages/sales-outbound/add/add.wxml

@@ -3,16 +3,14 @@
 <loading wx:if="{{loading}}"></loading>
 
 
-<dk-form-bill type="saleOut" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}"  titleCol="skuModel" subCol="calculationFormula" descCol="skuName" priceCol="priceOut" quantityCol="outingQty" sumAmountCol="sumAmount" iconCol="imagesUrl" discountStandardCol="saleDiscount" contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" bind:setGoods="setGoods" readonly="{{formMode == 'detail'}}" table="{{table}}" pupPriceCol="sumPrice" bind:editItems="editItems" bind:openChoosedItemInfo="openChoosedItemInfo" deleteName="deleteItemList" bind:onCloseDel="deleteItemList" bind:customersChoose="customersChoose" popType="sale"   staff="staff" org="org" popupTopObj="{{popupTopObj}}" cardContentList="{{cardContentList}}" quantityRedTitle="可售量：" quantityRedCol="usableQty" quantityRedColFlagKey="usableQtyInsufficientFlag" goodsTagText="{{goodsTagText}}" goodsTagColor="{{goodsTagColor}}" titpsFlag="{{titpsFlag}}" titpsItemColorFlagKey="titpsItemColorFlagKey" titpsLabel="titpsLabel">
+<dk-form-bill type="saleOut" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}" titleCol="skuModel" subCol="calculationFormula" descCol="skuName" priceCol="priceOut" quantityCol="outingQty" sumAmountCol="sumAmount" iconCol="imagesUrl" discountStandardCol="saleDiscount" contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" bind:setGoods="setGoods" readonly="{{formMode == 'detail'}}" table="{{table}}" pupPriceCol="sumPrice" bind:editItems="editItems" bind:openChoosedItemInfo="openChoosedItemInfo" deleteName="deleteItemList" bind:onCloseDel="deleteItemList" bind:customersChoose="customersChoose" popType="sale" staff="staff" org="org" popupTopObj="{{popupTopObj}}" cardContentList="{{cardContentList}}" quantityRedTitle="可售量：" quantityRedCol="usableQty" quantityRedColFlagKey="usableQtyInsufficientFlag" goodsTagText="{{goodsTagText}}" goodsTagColor="{{goodsTagColor}}" titpsFlag="{{titpsFlag}}" titpsItemColorFlagKey="titpsItemColorFlagKey" titpsLabel="titpsLabel">
 </dk-form-bill>
 <van-dialog id="van-dialog" />
 <view style="height: 200rpx;"></view>
 
 <!-- 底部加号" -->
-<view wx:if="{{formMode =='detail'}}" style="position: fixed;bottom: 230rpx;right: 30rpx;" >
-  <view bind:tap="toEdit" class="btn-add-class">
-    <van-icon name="edit" color="#FFFFFF" size="60rpx" />
-  </view>
+<view wx:if="{{formMode =='detail'}}" style="position: fixed;bottom: 230rpx;right: 30rpx;z-index: 99;" bindtap="toEdit">
+  <image src="{{imageUrl + 'edit.png'}} " class="edit-class"  />
 </view>