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

api/pages/mst/activity.js

@@ -18,6 +18,8 @@ module.exports = {
 
   routeUrl: {
     activity: {
+      buyUpgrade: { key: 'buyUpgrade', url: '/package-basic-data/pages/activity/activity?upgrade=true' ,},
+      buyHistory: { key: 'buyHistory', url: '/package-basic-data/pages/func-buy/added/added' ,},
     }
   }
 };

api/pages/other/setting.js

@@ -22,6 +22,7 @@ module.exports = {
             companyRegister: { key: 'companyRegister', url: '/package-basic-data/pages/register/company-register/company-register' },
             companyParamSetting: { key: 'companyRegister', url: '/package-basic-data/pages/register/company-param-setting/company-param-setting' },
             productDetail: { key: 'productDetail', url: '/package-basic-data/pages/register/product-detail/product-detail' },
+            buy: { key: 'buy', url: '/package-basic-data/pages/activity/activity?buyUser=true' ,}
         }
     }
 };

components/dkbase/dk-form-bill/dk-form-bill.js

@@ -1239,6 +1239,7 @@ Component({
      * @date   : 2024/1/26 11:46
      */
     openChooseItems(e) {
+      const noWarehouseFlag = e.currentTarget.dataset.item.noWarehouseFlag
       if (this.data.selectGoodsUrl) {
         this.setData({
           item: null
@@ -1259,12 +1260,13 @@ Component({
           },
           success: function (res) {
             // 通过eventChannel向被打开页面传送数据
-            res.eventChannel.emit('params', {
-              choose: true,
-              item: e.currentTarget.dataset.type ? e.currentTarget.dataset.type : _this.data.type,
-              popContent: _this.data.popContent,
-              controlFlags: _this.data.controlFlags
-            })
+              res.eventChannel.emit('params', {
+                choose: true,
+                item: e.currentTarget.dataset.type ? e.currentTarget.dataset.type : _this.data.type,
+                noWarehouseFlag: !noWarehouseFlag ? '': noWarehouseFlag,
+                popContent: _this.data.popContent,
+                controlFlags: _this.data.controlFlags
+              })
           }
         })
       }

components/dkbase/dk-form-bill/dk-form-bill.wxml

@@ -47,7 +47,7 @@
   </view>
   <!-- 单据信息 -->
   <view wx:for="{{cardList}}" wx:for-item="card" data-item="{{card}}" wx:for-index="cardIndex"
-   wx:if="{{contentObj[card.name] && contentObj[card.name].length > 0}}">
+   wx:if="{{card.name == 'items' || contentObj[card.name] && contentObj[card.name].length > 0}}">
     <view style="display: flex;justify-content: center;align-items: center;" id="{{card.name}}">
       <view wx:if="{{ card.name == 'items' && !readonly && chooseVisible && card.chooseGoodsItemFlag}}" style="margin:10rpx 15rpx;text-align: center;flex: 1;">
         <van-button icon="{{imageUrl + 'choose_goods_sale.png'}}" size="normal" color="#3E69F6" catchtap="openChooseItems" data-item="{{card}}" custom-style="height:70rpx;border-radius:15rpx;width:100%;padding:0" data-index="{{cardIndex}}" type="info">选商品

components/dkbase/dk-list/dk-list.js

@@ -43,6 +43,10 @@ Component({
     title: {
       type: String,
     },
+    // 显示员工身份
+    roleValue: {
+      type: String,
+    },
     // 状态
     status: {
       type: String,

components/dkbase/dk-list/dk-list.wxml

@@ -20,6 +20,7 @@
               <!-- 标题 -->
               <view class="title-class" style="width: {{(statusFlag &&  item[status] || switchFlag || flgPoint)?'100%':'100%'}}">
                 <dk-text catchtap="toTitle" data-item="{{item}}" textDecoration="underline" fontSize="15px" value="{{item[title]}}"></dk-text>
+                <view wx:if="{{item && item[roleValue]}}" type="warning" class="tag-view" plain style="margin-left: 15rpx;" size="large">负责人</view>
               </view>
             </view>
             <view style="display: flex; align-items: center;">

components/dkbase/dk-list/dk-list.wxss

@@ -271,3 +271,11 @@
   padding: 0 !important;
 }
 
+.tag-view{
+  border: #FF7B1A 1rpx solid;
+  color: #FF7B1A;
+  padding: 5rpx;
+  font-size: 22rpx;
+  border-radius: 10rpx;
+}
+

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

@@ -24,6 +24,9 @@ Component({
       type: Array,
       value: [],
     },
+    sortMenuObject: {
+      type: Object
+    },
     // 是否开启大查询
     flgSearchText: {
       type: Boolean,

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

@@ -1,8 +1,22 @@
 <view>
-  <van-search wx:if="{{flgSearchText}}" readonly="{{searchReadonly}}" model:value="{{ form.searchText }}" bind:change="onSearchText" bind:search="doSearch" use-action-slot placeholder="{{searchTextPlaceholder}}">
+  <view style="width:100%;display: flex;flex-direction: row;">
+    <view style="width: 100%;"> 
+      <van-search wx:if="{{flgSearchText}}" readonly="{{searchReadonly}}" model:value="{{ form.searchText }}" bind:change="onSearchText" bind:search="doSearch" use-action-slot placeholder="{{searchTextPlaceholder}}">
+      </van-search>
+      <van-search wx:if="{{flgSearchFlag}}" readonly="{{true}}" model:value="{{ flgSearchTextSearchText }}" use-action-slot placeholder="{{searchTextPlaceholder}}">
+      </van-search>
+    </view>
+    <!-- 组件排序 当sortMenuObject不为空时显示，显示内容为传参options的内容 数值绑定为 title-->
+    <view wx:if="{{ sortMenuObject }}" class="dropdown-view">
+      <van-dropdown-menu>
+        <van-dropdown-item value="{{sortMenuObject.title}}" options="{{ sortMenuObject.options }}" bind:change="onChange" data-item="{{sortMenuObject}}" ></van-dropdown-item>
+      </van-dropdown-menu>
+    </view>
+  </view>
+  <!-- <van-search wx:if="{{flgSearchText}}" readonly="{{searchReadonly}}" model:value="{{ form.searchText }}" bind:change="onSearchText" bind:search="doSearch" use-action-slot placeholder="{{searchTextPlaceholder}}">
   </van-search>
   <van-search wx:if="{{flgSearchFlag}}" readonly="{{true}}" model:value="{{ flgSearchTextSearchText }}" use-action-slot placeholder="{{searchTextPlaceholder}}">
-  </van-search>
+  </van-search> -->
   <van-dropdown-menu active-color="#3E69F6" wx:if="{{menuList.length > 0}}">
     <!--查询条件-->
     <van-dropdown-item wx:for="{{menuList}}" data-index="{{index}}" title="{{item.title}}" data-item="{{item}}" id="{{item.code}}" options="{{item.options}}" value="{{item.value}}" bind:open="openDropdown" bind:change="onChange">
@@ -37,5 +51,4 @@
   </dk-side-pull-menu>
 
   <dk-dropdown-date-day show="{{dropDateFlag}}" bind:dateCommit="pickDateCommit"></dk-dropdown-date-day>
-
 </view>

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

@@ -20,6 +20,12 @@
 	font-weight: normal;
 }
 
+.dropdown-view{
+  width: 30%;
+  display: flex;
+  justify-content: flex-start;
+}
+
 .cell-value-class-no-select {
 	font-style: normal;
 	font-weight: 400;

i18n/zh-CN.js

@@ -248,7 +248,7 @@ const home = {
   waitAddCom: '等待加入企业中...',
   selectCompany: '请选择进入企业',
   buyUser:'购买授权',
-  buyHistory:'购买历史',
+  buyHistory:'已购记录',
   buyUpgrade:'升级更便宜',
 }
 

mixins/index.js

@@ -1243,6 +1243,12 @@ module.exports = {
             controlFlags: data.controlFlags
           })
         }
+        // 控制选择商品页面是否显示去入库
+        if(data.noWarehouseFlag){
+          _this.setData({
+            noWarehouseFlag:data.noWarehouseFlag
+          })
+        }
 
         if (data.item) {
           _this.setData({

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

@@ -21,12 +21,12 @@
   <dk-navbar titleFontColor="#000000" navbarTitle="选择商品" bind:clickBack="onClickLeft" operateShow="{{false}}" bind:getNavbarHeight="getNavbarHeight" />
 
   <view style="display: flex;">
-    <view style="width: 85%;">
+    <view style="{{!noWarehouseFlag? 'width: 85%;': 'width: 100%;'}}">
       <!-- 查询条件 -->
       <dk-dropdown-menu model:value="{{searchForm}}" menuList="{{searchContent}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['skuName','skuModel'])}}">
       </dk-dropdown-menu>
     </view>
-    <view bind:tap="toAddGoods" class="scan-class">
+    <view bind:tap="toAddGoods" wx:if="{{!noWarehouseFlag}}" class="scan-class">
       <view  class="scan-background-class">
         <view>
           <image class="scan-image" fit="fill" src="{{imageUrl+'/goods_add_icon_2.png'}}"></image>

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

@@ -9,6 +9,7 @@
 const Constants = require('@/utils/Constants.js');
 const util = require('@/utils/util.js')
 const mixins = require('@/mixins/index.js');
+const config = require('@/config/config.js');
 const app = getApp()
 Page({
     mixins: [mixins],
@@ -16,6 +17,7 @@ Page({
      * 页面的初始数据
      */
     data: {
+        imageUrl: config.image_url + '/static/img/',
         // 是否加载完毕
         loadFlag: false,
         // 是否显示vip
@@ -51,7 +53,42 @@ Page({
         buttonSaveList: [
             { code: 'save', title: mixins.$t('save'), width: '120rpx' }
         ],
-        noticeInfo: Constants.noticeInfo
+        noticeInfo: Constants.noticeInfo,
+        funcMenu: [
+            {
+                title: '订单开单',
+                icon: 'btn-account-receivable.png',
+            },
+            {
+                title: '销售出库',
+                icon: 'btn-shipped.png',
+            },
+            {
+                title: '销售退货',
+                icon: 'btn-stored.png',
+            },
+            {
+                title: '销售跟踪',
+                icon: 'btn-shipped-out.png',
+            },
+            {
+                title: '采购订单',
+                icon: 'btn-account-receivable.png',
+            },
+            {
+                title: '采购入库',
+                icon: 'btn-shipped.png',
+            },
+            {
+                title: '采购退货',
+                icon: 'btn-stored.png',
+            },
+            {
+                title: '以销定采',
+                icon: 'btn-shipped-out.png',
+            },
+        ],
+        funcMenuFlg: false,
     },
     /**
      * @desc : 选择活动明细
@@ -327,10 +364,10 @@ Page({
     validData() {
         // 专业版校验
         if (this.data.gradeCode == Constants.gradeCode.PRO) {
-            if (!this.data.readFlag) {
-                util.showToast('请勾选阅读须知');
-                return false;
-            }
+            // if (!this.data.readFlag) {
+            //     util.showToast('请勾选阅读须知');
+            //     return false;
+            // }
             let curentAdItem = this.data.curentAdItem;
             if (!curentAdItem) {
                 util.showToast('请选择活动');
@@ -570,4 +607,134 @@ Page({
         // 获取当前用户授权数
         this.getStaffCount();
     },
+    /**
+     * 六大功能的切换
+     */
+    funcClick(e) {
+        let funcMenuFlg = !this.data.funcMenuFlg
+        if (funcMenuFlg) {
+            this.setData({
+                funcMenu: [
+                    {
+                        title: '订单开单',
+                        icon: 'btn-account-receivable.png',
+                    },
+                    {
+                        title: '销售出库',
+                        icon: 'btn-shipped.png',
+                    },
+                    {
+                        title: '销售退货',
+                        icon: 'btn-stored.png',
+                    },
+                    {
+                        title: '销售跟踪',
+                        icon: 'btn-shipped-out.png',
+                    },
+                    {
+                        title: '采购订单',
+                        icon: 'btn-account-receivable.png',
+                    },
+                    {
+                        title: '采购入库',
+                        icon: 'btn-shipped.png',
+                    },
+                    {
+                        title: '采购退货',
+                        icon: 'btn-stored.png',
+                    },
+                    {
+                        title: '以销定采',
+                        icon: 'btn-shipped-out.png',
+                    },
+                    {
+                        title: '库存查询',
+                        icon: 'btn-account-receivable.png',
+                    },
+                    {
+                        title: '入库办理',
+                        icon: 'btn-shipped.png',
+                    },
+                    {
+                        title: '出库办理',
+                        icon: 'btn-stored.png',
+                    },
+                    {
+                        title: '库存盘点',
+                        icon: 'btn-shipped-out.png',
+                    },
+                    {
+                        title: '资金账户',
+                        icon: 'btn-account-receivable.png',
+                    },
+                    {
+                        title: '资金转账',
+                        icon: 'btn-shipped.png',
+                    },
+                    {
+                        title: '收款单',
+                        icon: 'btn-stored.png',
+                    },
+                    {
+                        title: '付款单',
+                        icon: 'btn-shipped-out.png',
+                    },
+                    {
+                        title: '日结对账',
+                        icon: 'btn-account-receivable.png',
+                    },
+                    {
+                        title: '资金日记账',
+                        icon: 'btn-shipped.png',
+                    },
+                    {
+                        title: '供应商往来',
+                        icon: 'btn-stored.png',
+                    },
+                     
+                ],
+            })
+        } else {
+            this.setData({
+                funcMenu: [
+                    {
+                        title: '订单开单',
+                        icon: 'btn-account-receivable.png',
+                    },
+                    {
+                        title: '销售出库',
+                        icon: 'btn-shipped.png',
+                    },
+                    {
+                        title: '销售退货',
+                        icon: 'btn-stored.png',
+                    },
+                    {
+                        title: '销售跟踪',
+                        icon: 'btn-shipped-out.png',
+                    },
+                    {
+                        title: '采购订单',
+                        icon: 'btn-account-receivable.png',
+                    },
+                    {
+                        title: '采购入库',
+                        icon: 'btn-shipped.png',
+                    },
+                    {
+                        title: '采购退货',
+                        icon: 'btn-stored.png',
+                    },
+                    {
+                        title: '以销定采',
+                        icon: 'btn-shipped-out.png',
+                    },
+                ],
+            })
+        }
+
+        this.setData({
+            funcMenuFlg
+        })
+    },
 })

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

@@ -9,7 +9,8 @@
 			<!-- 头像 -->
 			<open-data type="userAvatarUrl" class='wx-avatar'></open-data>
 			<view style="margin-left: 30rpx;">
-				<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 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">{{cpManager + (cpPhone?(' | ' + cpPhone):'')}}</view>
 				<view class="end-date-class" wx:if="{{gradeCode != 'STD' && !upgradeFlag}}">{{$t['cpEndDate'] + '：' + cpEndDate}}</view>
@@ -20,7 +21,7 @@
 	</view>
 
 	<!--活动（专业版）-->
-	<view class="func" wx:if="{{gradeCode != 'STD'}}">
+	<view class="func" wx:if="{{gradeCode != 'STD' && !funcMenuFlg}}">
 		<view style="display:flex;flex-wrap: wrap;">
 			<view class="{{(curentAdItem && curentAdItem.itemId == item.itemId)?'func-card-selected':'func-card'}}" wx:for="{{activityTable}}" wx:for-item="item" wx:key="index" data-item="{{item}}" catchtap="chooseAdItem">
 				<!-- 标题 -->
@@ -66,7 +67,7 @@
 	</view>
 
 	<!--用户数-->
-	<view class="card-class" wx:if="{{gradeCode != 'STD'}}">
+	<view class="card-class" wx:if="{{gradeCode != 'STD' && !funcMenuFlg}}">
 		<!--用户数量-->
 		<van-cell border="{{ false }}" title-class="cell_title">
 			<view slot="title" style="display: flex;">
@@ -100,7 +101,7 @@
 	</view>
 
 	<!--合计（专业版）-->
-	<view class="summary-class" wx:if="{{gradeCode != 'STD'}}">
+	<view class="summary-class" wx:if="{{gradeCode != 'STD' && curentAdItem!=null && !funcMenuFlg}}">
 		<view class="summary-item-class">订单详情：</view>
 		<view class="summary-item-class">{{summaryInfo.amountInfo}}</view>
 		<view class="summary-item-class">截止日期：{{summaryInfo.endDate}}</view>
@@ -119,8 +120,8 @@
 			折合<dk-cell fontSize="14" left="5rpx" fontWeight="bold" height="45rpx" contentColor="#FF7B1A" content="{{summaryInfo.priceInfo}}"></dk-cell>/天/授权</view>
 	</view>
 
-	<!--注册须知-->
-	<view class="notice-class" wx:if="{{gradeCode != 'STD'}}">
+	<!--注册须知 240704 去除 用功能模块代替-->
+	<!-- <view class="notice-class" wx:if="{{gradeCode != 'STD'}}">
 		<view class="notice-item-class" style="font-size: 16px;font-weight: bold;">{{noticeInfo.title}}</view>
 		<view class="notice-item-class">{{noticeInfo.cpName}}</view>
 		<view class="notice-item-class">{{noticeInfo.contact}}</view>
@@ -130,8 +131,21 @@
 			<view style="color: #CE9965;">《注册须知》</view>
 			<view style="color: #CE9965;">《免责条款》</view>
 		</view>
+	</view> -->
+
+	<!--   功能模块 -->
+	<view class="notice-class" wx:if="{{upgradeFlag}}" catch:tap="funcClick">
+		<view class="notice-item-class" style="color: #FF7B1ACC; font-size: 16px;font-weight: bold;text-align: center;">{{noticeInfo.proTitle}}</view>
+		<view style="display: flex;flex-wrap: wrap;padding: 10rpx 0 20rpx 0;">
+			<view class="app-item" style="width:25%;text-align: center;margin-top: 15rpx;margin-bottom: 15rpx;" wx:for="{{funcMenu}}" wx:for-item="item"  wx:key="i">				 
+				<image src="{{imageUrl + item.icon }}" style="height: 85rpx;width:85rpx;"></image>
+				<view class="index-grid-item-text-class" style="font-size: 12px;">{{item.title}}</view>
+			</view>
+		</view>
 	</view>
 
+
+
 	<view style="height: 200rpx;"></view>
 </view>
 

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

@@ -106,7 +106,7 @@ page {
 	border-radius: 19rpx;
 }
 
-.func-card-selected{
+.func-card-selected {
 	margin: 15rpx 1.15%;
 	width: 30.5%;
 	height: 215rpx;
@@ -115,7 +115,7 @@ page {
 	border: 3rpx solid #CE9965;
 }
 
-.func-card-std{
+.func-card-std {
 	margin: 15rpx 30rpx;
 	width: 50%;
 	height: 215rpx;
@@ -124,7 +124,7 @@ page {
 	border: 3rpx solid #CE9965;
 }
 
-.func-card-vip-std-selected{
+.func-card-vip-std-selected {
 	margin: 15rpx 10rpx 15rpx 0;
 	width: 38%;
 	height: 215rpx;
@@ -133,7 +133,7 @@ page {
 	border: 3rpx solid #CE9965;
 }
 
-.func-card-vip-std{
+.func-card-vip-std {
 	margin: 15rpx 10rpx 15rpx 0;
 	width: 38%;
 	height: 215rpx;
@@ -162,9 +162,9 @@ page {
 	font-weight: 600;
 }
 
-.card-title-std{
+.card-title-std {
 	margin-top: 10rpx;
-	margin-left:20rpx;
+	margin-left: 20rpx;
 	display: flex;
 	height: 54rpx;
 	align-items: center;
@@ -174,7 +174,7 @@ page {
 	font-weight: 600;
 }
 
-.card-desc{
+.card-desc {
 	margin-top: 10rpx;
 	display: flex;
 	height: 54rpx;
@@ -185,7 +185,7 @@ page {
 	font-size: 11px;
 }
 
-.card-desc-std{
+.card-desc-std {
 	margin: 10rpx 20rpx;
 	display: flex;
 	height: 54rpx;
@@ -196,50 +196,51 @@ page {
 	font-size: 14px;
 }
 
-.card-class{
+.card-class {
 	margin: 0 30rpx;
 	border-radius: 16rpx;
 	background: #ffffff;
 }
 
-.cell_title{
+.cell_title {
 	color: #e00808;
 }
 
-.summary-class{
+.summary-class {
 	margin: 0 30rpx;
 	margin-top: 30rpx;
 	padding: 10rpx 20rpx;
 	border-radius: 16rpx;
 	background: #ffffff;
-	color:#CE9965;
+	color: #CE9965;
 	font-size: 14px;
 }
 
-.notice-class{
+.notice-class {
 	margin: 0 30rpx;
 	margin-top: 30rpx;
 	padding: 10rpx 20rpx;
 	border-radius: 16rpx;
 	background: #ffffff;
-	color:#1B365D;
+	color: #1B365D;
 }
 
-.checkbox-class{
-	color:#1B365D !important;
+.checkbox-class {
+	color: #1B365D !important;
 }
 
-.van-checkbox__icon--square{
+.van-checkbox__icon--square {
 	border-radius: 10rpx;
 }
 
-.notice-item-class{
+.notice-item-class {
 	margin: 20rpx 0;
 	font-size: 14px;
 	font-weight: 400;
 }
+ 
 
-.summary-item-class{
+.summary-item-class {
 	margin: 8rpx 0;
 }
 
@@ -274,4 +275,57 @@ page {
 	align-items: center;
 	padding: 20rpx;
 	box-shadow: 0px 17px 22px 0px #1B365D33;
+}
+
+
+
+.todo-view-app {
+	padding-top: 24rpx;
+	display: -webkit-box;
+	overflow: auto;
+	width: 100%;
+}
+
+.todo-view-app-item {
+	width: 25%;
+	display: grid;
+	justify-items: center;
+}
+
+.todo-view-app-item-icon {
+	width: 85rpx;
+	height: 85rpx;
+	/* background-color: #B280E4; */
+	display: flex;
+	align-items: center;
+	justify-content: center; 
+	position: relative;
+}
+
+.todo-view-app-item-icon-tip {
+	position: absolute;
+	width: 85rpx;
+	height: 85rpx;
+	top: -6rpx;
+	right: -6rpx;
+	font-size: 9px;
+	font-family: 'PingFang SC';
+	background: #FF594E;
+	border: 1px solid #FFFFFF;
+	border-radius: 50%;
+	color: #fff;
+	text-align: center;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.todo-view-app-item-name {
+	font-style: normal;
+	font-weight: 400;
+	font-size: 14px;
+	font-family: 'PingFang SC';
+	/* font-family: 'SimSun'; */
+	color: #1B365D;
+	margin-top: 10rpx;
 }

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

@@ -46,7 +46,7 @@ Page({
 		params.flgValid = true;
 		params.currentPage = 1;
 		params.pageSize = Constants.MAX_PAGE_SIZE;
-		if(this.data.gradeCode == Constants.gradeCode.STD){
+		if (this.data.gradeCode == Constants.gradeCode.STD) {
 			// 标准版需要排除掉 企业授权的那个用户
 			params.flgInit = false;
 		}
@@ -72,7 +72,11 @@ Page({
 		// 过滤出手机授权（默认展示）
 		tableData = tableData.filter(it => it.loginType == Constants.loginType.loginTypeWx
 			|| it.loginType == Constants.loginType.loginTypeWxPc);
-
+		tableData.forEach(it => {
+			if (it.flgInit) {
+				it.staffName = staffName + '(负责人)'
+			}
+		})
 		this.setData({
 			tableData: tableData
 		})
@@ -125,7 +129,12 @@ Page({
 	* @author : 周兴
 	*/
 	handleStaff(e) {
-		let staffId = e.detail.item.staffId
+		let item = e.detail.item
+		if (item.flgInit) {
+			util.showToast('责任人不能取消授权')
+			return
+		}
+		let staffId = item.staffId
 		return this.excute(this.data.staffService, this.data.staffService.disable, staffId).then(res => {
 			if (res.data.code == Constants.SUCESS_CODE) {
 				wx.showToast({

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

@@ -1,3 +1,5 @@
 {
-    "usingComponents": {}
+    "usingComponents": {},
+    "navigationBarTitleText": "授权"
+
 }

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

@@ -29,7 +29,7 @@
 <dk-tabs wx:if="{{gradeCode != 'STD'}}" active="{{active}}" list="{{tagList}}" bind:onChange="onChangeTabs"></dk-tabs>
 
 <!-- 列表区 -->
-<dk-list list="{{tableData}}" title="staffName" content="{{contentList}}" routeObjName="{{routeObjName}}" flgPoint="{{false}}" titleBtnText="不再续费" bind:clickTitleBtn="handleStaff"></dk-list>
+<dk-list list="{{tableData}}" title="staffName" content="{{contentList}}" routeObjName="{{routeObjName}}" flgPoint="{{false}}" titleBtnText="取消授权" bind:clickTitleBtn="handleStaff"></dk-list>
 
 <view style="height: 200rpx;"></view>
 

package-basic-data/pages/func-buy/add-confirm/add-confirm.js

@@ -116,8 +116,7 @@ Page({
     * @author : 周兴
     * @date : 2024/4/1
     */
-    setParams(params) {
-        debugger
+    setParams(params) { 
         let funPackage = app.globalData.company.funPackage || []
         params.endDate = app.globalData.company.endDate
         params.userEndDate = this.data.userEndDate

package-basic-data/pages/func-buy/add/add.js

@@ -17,10 +17,14 @@ Page({
      */
     data: {
         regions: [],
+        regionsHavedBuyUuids: [], // 已经购买的数组
         functionItems: [],
+        regionsIsBuy: [],
         funIds: [],
         imageUrl: config.image_url + '/static/img/',
         btnFormData: null,
+        // 路由
+        routeObjName: 'activity',
         // 底部保存按钮
         buttonFootList: [
             {
@@ -31,12 +35,16 @@ Page({
                 code: 'buyHistory',
                 title: mixins.$t('buyHistory')
             }],
+
     },
 
     /**
      * 生命周期函数--监听页面加载
      */
     onLoad(options) {
+        this.setData({
+            regionsHavedBuyUuids: app.globalData.company.funPackage || []
+        })
         // 查询活动
         this.getActivity()
     },
@@ -61,20 +69,28 @@ Page({
             if (res.data.code == Constants.SUCESS_CODE) {
                 console.log("activityService", res);
                 if (res.data && res.data.data) {
-                    let regions = res.data.data;
+                    let regions = [];
+                    let regionsAll = res.data.data;
+                    let regionsIsBuy = []
                     let funIds = []
                     let functionItems = []
-                    regions.forEach(element => {
+                    regionsAll.forEach(element => {
+                        let activityIds = this.data.regionsHavedBuyUuids.map(it => it.activityId)
                         functionItems.push(element.activityItemDescribe)
                         let fids = JSON.parse(element.funIds.value)
                         fids.forEach(it => {
                             it.imageUrl = this.data.imageUrl + it.object_icon + '.png'
                         })
                         element.funIds = fids
-
+                        if (activityIds.indexOf(element.activityId) > -1) {
+                            regionsIsBuy.push(element)
+                            return
+                        }
+                        regions.push(element)
                     });
                     this.setData({
                         regions: regions,
+                        regionsIsBuy,
                         functionItems: functionItems,
                         funIds: funIds,
                     })
@@ -83,14 +99,54 @@ Page({
             }
         });
     },
-
     /**
-  * @desc : 保存数据服务-跳转收款页面
-  * @date : 2024/2/1 15:49
-  * @author : 姜永辉
-  */
+    * @desc : 升级和已购记录查询
+    * @date : 2024/2/1 15:49
+    * @author : 姜永辉
+    */
     open(e) {
-        let item = e.currentTarget.dataset.item 
+        console.log(e);
+        let _this = this
+        let code = e.detail.name
+        // 升级
+        if (code == 'buyUpgrade') {
+            wx.navigateTo({
+                url: '/package-basic-data/pages/activity/activity?upgrade=true',
+                events: {
+                    // 回调后
+                    refresh: function (data) {
+                    }
+                },
+                success: function (res) {
+                    // 通过eventChannel向被打开页面传送数据 
+                    res.eventChannel.emit('params', {})
+                }
+            })
+        }
+        // 已购记录查询
+        else if (code == 'buyHistory') {
+            wx.navigateTo({
+                url: '/package-basic-data/pages/func-buy/added/added',
+                events: {
+                    // 回调后
+                    refresh: function (data) {
+                    }
+                },
+                success: function (res) {
+                    // 通过eventChannel向被打开页面传送数据 
+                    res.eventChannel.emit('params', { item: _this.data.regionsIsBuy })
+                }
+            })
+        }
+    },
+
+    /**
+    * @desc : 保存数据服务-跳转收款页面
+    * @date : 2024/2/1 15:49
+    * @author : 姜永辉
+    */
+    buyFunc(e) {
+        let item = e.currentTarget.dataset.item
         let _this = this
         wx.navigateTo({
             url: '/package-basic-data/pages/func-buy/add-confirm/add-confirm',

package-basic-data/pages/func-buy/add/add.wxml

@@ -20,12 +20,14 @@
 				<view>元/年</view>
 			</view>
 			<view style="margin-right:30rpx;margin-left:30rpx;">
-				<van-button data-item="{{item}}" color="#FF7B1A" type="info" custom-style="width: 190rpx;height: 70rpx;" round bindtap="open">购买</van-button>
+				<van-button data-item="{{item}}" color="#FF7B1A" type="info" custom-style="width: 190rpx;height: 70rpx;" round bindtap="buyFunc">购买</van-button>
 			</view>
 		</view>
 	</view>
 
 </view>
 
+<!-- 暂无数据 -->
+<van-empty wx:if="{{regions.length<=0}}" description="{{$t['nodata']}}" />
 
 <dk-save-button model:value="{{btnFormData}}" btnAutoWidthFlag="{{true}}" btnRightFlag="{{true}}" buttonList="{{buttonFootList}}" contentList="{{contentnFootList}}" bind:open="open"></dk-save-button>

package-basic-data/pages/func-buy/added/added.js

@@ -1,66 +1,62 @@
-// package-basic-data/pages/func-buy/added/added.js
+/*******************************************************************************
+ * Copyright(c) 2022 dongke All rights reserved. / Confidential
+ * 类的信息：
+ *		1.程序名称：增值定制
+ * 编辑履历：
+ *		作者				日期					版本				修改内容
+ *		周兴		       2024-5-15	            1.00		   	   新建 
+ *******************************************************************************/
+const Constants = require('@/utils/Constants.js');
+const mixins = require('@/mixins/index.js');
+const config = require('@/config/config.js');
+const app = getApp()
 Page({
-
+    mixins: [mixins],
     /**
      * 页面的初始数据
      */
     data: {
-
+        regions: [],
+        functionItems: [],
+        funIds: [],
+        imageUrl: config.image_url + '/static/img/',
+        userEndDate: null,
+        userEndDateFlg: false,
+        userEndDateString: '',
+        factAmt: 0,
+        routeObjName: 'company',
     },
 
     /**
      * 生命周期函数--监听页面加载
      */
     onLoad(options) {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面初次渲染完成
-     */
-    onReady() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面显示
-     */
-    onShow() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面隐藏
-     */
-    onHide() {
-
     },
 
     /**
-     * 生命周期函数--监听页面卸载
-     */
-    onUnload() {
+    * 生命周期函数--加载数据
+    */
+    loadInit() {
+        let regions = this.data.item || []
+        let functionItems = []
+        regions.forEach(element => {
+            functionItems.push(element.activityItemDescribe)
+            if (element.trade && element.trade.value) {
+                let trades = JSON.parse(element.trade.value)
+                let trade = (trades && trades.length > 0) ? trades[0] : {}
+                element.buyBeginDate = trade.buy_begin_date
+                element.buyEndDate = trade.buy_end_date
+                element.tradeDesc = trade.trade_desc
+                element.tradeAmount = trade.trade_amount
+            }
 
+        })
+        this.setData({
+            regions: regions,
+            functionItems,
+        })
     },
 
-    /**
-     * 页面相关事件处理函数--监听用户下拉动作
-     */
-    onPullDownRefresh() {
-
-    },
 
-    /**
-     * 页面上拉触底事件的处理函数
-     */
-    onReachBottom() {
-
-    },
-
-    /**
-     * 用户点击右上角分享
-     */
-    onShareAppMessage() {
 
-    }
 })

package-basic-data/pages/func-buy/added/added.json

@@ -1,3 +1,4 @@
 {
-    "usingComponents": {}
+    "usingComponents": {},
+    "navigationBarTitleText": "已购记录"
 }

package-basic-data/pages/func-buy/added/added.wxml

@@ -1,2 +1,51 @@
-<!--package-basic-data/pages/func-buy/added/added.wxml-->
-<text>package-basic-data/pages/func-buy/added/added.wxml</text>
+<!-- 应用集合 -->
+<view class="panel-class" wx:for="{{regions}}" data-item="{{item}}" wx:key="index" title="{{item.activityItemDescribe}}">
+	<view class="app-name">{{item.activityItemDescribe}} </view>
+	<view style="background: #fff;border-radius: 15rpx;">
+		<view style="display: flex;flex-wrap: wrap;padding: 43rpx 0;">
+			<view class="app-item" style="width:25%;text-align: center;" icon-class="index-grid-item-icon-class" text-class="index-grid-item-text-class" content-class="index-grid-item-class" wx:for="{{item.funIds}}" wx:for-item="item2" data-code="{{item2.FunctionCode}}" data-url="{{item2.FormName}}" data-item="{{item2}}" wx:key="i">
+				<view wx:if="{{item2.isVip}}" class="vip-icon-view">
+					<image src="{{imageUrl + 'diamond.png'}} " class="icon-title_diamond" />
+				</view>
+				<view style="display: flex;justify-content: center;margin-left: {{editFlag?'20rpx':''}};">
+					<image src="{{item2.imageUrl}}" style="height: 80rpx;width:80rpx;margin-bottom: 11rpx;"></image>
+
+				</view>
+				<view class="index-grid-item-text-class">{{item2.menu_name}}</view>
+			</view>
+		</view>
+		<view class="view-margin">
+			<view style="display: flex;justify-content: space-between;align-items: center;">
+				<view>订单详情 </view>
+				<view>{{item.tradeDesc}}</view>
+			</view>
+		</view>
+		<view class="view-margin">
+			<view style="display: flex;justify-content: space-between;align-items: center;">
+				<view>购买日期 </view>
+				<view>
+					<dk-cell fontSize="14" amount="{{false}}" contentColor="#140201" content="{{item.buyBeginDate}}"></dk-cell>
+				</view>
+			</view>
+		</view>
+		<view class="view-margin" style="margin-top: -25rpx;">
+			<view style="display: flex;justify-content: space-between;align-items: center;">
+				<view>截止日期 </view>
+				<view>
+					<dk-cell fontSize="14" amount="{{false}}" contentColor="#FF1810" content="{{item.buyEndDate}}"></dk-cell>
+				</view>
+			</view>
+		</view>
+
+
+		<view class="view-margin" style="margin-top: -25rpx;">
+			<view style="display: flex;justify-content:  flex-end;align-items: center;">
+				<view>实付款：</view>
+				<dk-cell fontSize="16" contentColor="#FF7B1A" content="{{item.tradeAmount}}"></dk-cell>
+			</view>
+		</view>
+	</view>
+</view>
+
+<!-- 暂无数据 -->
+<van-empty wx:if="{{regions.length<=0}}" description="{{$t['nodata']}}" />

package-basic-data/pages/func-buy/added/added.wxss

@@ -1 +1,173 @@
-/* package-basic-data/pages/func-buy/added/added.wxss */
+page {
+	width: 100%;
+	margin: 0;
+	background-color: #f8f9fd;
+}
+
+.custom-class {
+	width: 100% !important;
+}
+
+.top {
+	position: fixed;
+	top: 2rpx;
+}
+
+.title {
+	display: flex;
+}
+
+.title-label-class {
+	font-size: 16px;
+	font-weight: 500;
+	color: #002340
+}
+
+.expand-class {
+	margin-left: 20rpx;
+	display: flex;
+}
+
+.panel-class {
+	margin-top: 44rpx;
+	width: 92vw;
+	margin-left: 4vw;
+}
+
+.van-dropdown-menu__item {
+	flex: 0.7 !important;
+}
+
+.menu-box {
+	width: 100%;
+	box-sizing: border-box;
+	padding: 0 0 0 22rpx;
+	display: flex;
+	align-items: center;
+	background: white;
+}
+
+.title-class {
+	width: 100% !important;
+
+}
+
+.van-ellipsis {
+	font-size: 32rpx;
+}
+
+.field-class {
+	height: 60rpx;
+	width: 100% !important;
+	padding: 0;
+	display: flex;
+	align-items: center;
+}
+
+.van-search--withaction {
+	padding-right: 0;
+	width: 488rpx !important;
+}
+
+.van-field__input--center {
+	text-align: left !important;
+}
+
+
+.index-grid-item-class {
+	background: transparent !important;
+}
+
+.index-grid-item-text-class {
+	color: #191919 !important;
+	font-style: normal;
+	font-weight: 400;
+	font-size: 12px;
+	/* line-height: 34px; */
+}
+
+.van-search__content {
+	border: 3rpx solid #00000038;
+}
+
+.icon-title_diamond {
+	width: 35rpx;
+	height: 35rpx;
+	position: relative;
+	left: 5rpx;
+	top: 5rpx;
+}
+
+.index-grid-item-icon-class {
+	width: 80rpx !important;
+	height: 80rpx !important;
+	background: red;
+}
+
+.grid {
+	border-radius: 15rpx !important;
+}
+
+.app-name {
+	font-weight: 500;
+	font-size: 16px;
+	color: #002340;
+	line-height: 40rpx;
+	margin-bottom: 21rpx;
+}
+
+/* .app-item{
+	display: flex;
+	justify-content: center;
+  } */
+
+.app-item:nth-child(n+5) {
+	margin-top: 50rpx;
+}
+
+.vip-icon-view {
+	width: 100%;
+	position: relative;
+	z-index: 1000;
+}
+
+.icon-title_diamond {
+	width: 40rpx;
+	height: 40rpx;
+	position: absolute;
+	left: 35rpx;
+}
+
+.buy-class {
+	height: 90rpx;
+	width: 100%;
+	display: flex;
+	justify-content: flex-end;
+	align-items: center;
+}
+
+.bottom-class {
+	background: #fff;
+	position: fixed;
+	bottom: 0;
+	width: 100%;
+	height: 302rpx;
+	border-top: 1px solid #efefef;
+	padding: 20rpx;
+	z-index: 7;
+}
+
+.bottom-class-button {
+	background: #fff;
+	position: fixed;
+	bottom: 0;
+	width: 100%;
+	z-index: 2;
+	margin-bottom: 45rpx;
+}
+.view-margin{
+	margin: 1rpx 0 15rpx 0;
+	margin-right: 15rpx;
+	padding-left: 15rpx;
+	font-size: 13px;
+}

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

@@ -15,7 +15,7 @@
 
 
 <!-- 列表区 -->
-<dk-list list="{{tableData}}" title="staffName" status="hrStatusName" content="{{contentList}}" bind:toDetail="toDetail" bind:toPoint="toPoint" routeObjName="{{routeObjName}}" buttonList="{{buttonList}}" bind:open="open" switchFlag="{{switchFlag}}"flgValidOnFlag="{{false}}"></dk-list>
+<dk-list list="{{tableData}}" title="staffName" roleValue="flgInit" status="hrStatusName" content="{{contentList}}" bind:toDetail="toDetail" bind:toPoint="toPoint" routeObjName="{{routeObjName}}" buttonList="{{buttonList}}" bind:open="open" switchFlag="{{switchFlag}}"flgValidOnFlag="{{false}}"></dk-list>
 <van-divider wx:if="{{noMore}}" contentPosition="center" borderColor="#DCDCDC">{{$t['noMore']}}</van-divider>
 <!--留白-->
 <view style="height: 200rpx;"></view> 

package-business-analysis/pages/cus-rec-pay-report/cus-rec-pay-report.js

@@ -19,24 +19,22 @@ Page({
    */
   data: {
     placeholder: "请输入客户名称/电话/地址",
-    searchContent: [{
-      code: 'makeTime',
-      title: mixins.$t('currentMonth'),
-      searchType: Constants.searchType.date
-    }, {
-      code: 'staff',
-      title: mixins.$t('staffId'),
-      dropType: 'staff'
-    }, {
-      code: 'org',
-      title: mixins.$t('orgId'),
-      dropType: 'org'
+    searchContent: [],
+    sortMenuObject: {
+      code: 'sort', 
+      title: 'down',
+      searchType:Constants.searchType.radio, 
+      options: [
+        {
+          "text": "欠款升序",
+          "value": 'order'
+        },
+        {
+          "text": "欠款降序",
+          "value": 'down'
+        }
+      ],
     },
-    {
-      code: 'choose',
-      title: mixins.$t("choose"),
-      searchType: Constants.searchType.pick
-    }],
     // 查询条件-筛选
     pullMenuList: [{
       code: 'recType',

package-business-analysis/pages/cus-rec-pay-report/cus-rec-pay-report.wxml

@@ -1,13 +1,13 @@
 <view>
   <van-sticky scroll-top="0">
     <dk-navbar titleFontColor="#000000" navbarTitle="客户收支表" bind:clickBack="handleNavBack" operateShow="{{ guideUrl ? true: false}}" operateUrl="{{guideUrl}}" bind:getNavbarHeight="getNavbarHeight"/>
-    <dk-dropdown-menu model:value="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" navBarHeight="{{navBarHeight}}" bind:search="searchData" searchTextPlaceholder="{{placeholder}}"></dk-dropdown-menu>
+    <dk-dropdown-menu model:value="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" navBarHeight="{{navBarHeight}}" sortMenuObject="{{sortMenuObject}}" bind:search="searchData" searchTextPlaceholder="{{placeholder}}"></dk-dropdown-menu>
   </van-sticky>
   <view class="content">
     <view class="item-card">
       <view class="card-title">
         <view class="name-title">
-          <view class="name"> 公司概况 </view>
+          <view class="name" style="font-size: 28rpx;"> 公司概况 </view>
         </view>
         <view class="time-title">
           截止日期：{{ titleData.date }}
@@ -35,17 +35,16 @@
       <view class="card-title">
         <view class="name-title">
             <view class="name">{{item.cusName}}</view>
-            <view class="telephone">/{{item.cusPhone}}</view>
-        </view>
+            <view class="telephone">/{{item.cusPhone}}</view></view>
         <view class="money-title">
           <view class="money-title-content">
             <view style="font-size: 20rpx;">
-              实际欠款
+              欠款
             </view>
             <view class="icon-view">
-              <van-icon size="12px" name="question-o" />
+              <!-- <van-icon size="12px" name="question-o" /> -->
             </view>
-            <dk-cell left="0rpx" height="45rpx" contentRight="{{false}}" contentFontSize="14" contentColor="#002340" contentFontWeight="bold" content="{{item.arrears}}"></dk-cell>
+            <dk-cell left="0rpx" height="45rpx" contentRight="{{false}}" contentFontSize="17" contentColor="#002340" contentFontWeight="bold" content="{{item.arrears}}"></dk-cell>
           </view>
         </view>
       </view>

package-business-analysis/pages/cus-rec-pay-report/cus-rec-pay-report.wxss

@@ -14,13 +14,13 @@
 }
 
 .name-title{
-  width: 300rpx;
+  width: 50%;
   display: flex;
   color: #1B365D;
   font-weight: 600;
   flex-direction: row;
-  font-size: 28rpx;
-  text-align: center;
+  font-size: 20rpx;
+  text-align: left;
   justify-content: start;
   align-content: center;
   word-wrap:break-word; 
@@ -28,11 +28,12 @@
 }
 
 .name-title .name{
-  font-size: 34rpx;
+  font-size: 32rpx;
 }
 
 .name-title .telephone{
   align-self:flex-end;
+  font-size: 28rpx;
 }
 
 .card-title{

package-inventory/pages/cost-check/cost-check.wxml

@@ -12,7 +12,6 @@
       </dk-dropdown-menu>
     </view>
     <view class="scan-class" bind:tap="openCreatetime">
-
       <view style="font-size:30rpx;">{{dateDefault.text}}</view>
       <view style="display: flex;align-items: center;margin-left: 14rpx;">
         <van-icon color="#1B365D" size="12px" name="arrow-down" />

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

@@ -64,6 +64,7 @@ Page({
             title: mixins.$t('goodsDetail'), //'商品明细',
             color: '#E4002B',
             controls: [{ card: 'relation', code: 'sourceNo' }],
+            noWarehouseFlag: true,// 控制是否隐藏去库存按钮
             displayNum: 2
         }, {
             name: 'other',

package-sales/pages/customer-collection/customer-collection.js

@@ -57,7 +57,7 @@ Page({
     buttonSaveList: [{ code: 'add', title: mixins.$t("add") }],
     // 路由
     routeObjName: 'cusReceiptPayment',
-    refreshByAdd:true,
+    refreshByAdd:false,
     // 弹出按钮
     buttonList: [],
   },

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

@@ -488,7 +488,7 @@ Page({
         // 通过eventChannel向被打开页面传送数据 
         res.eventChannel.emit('params', {
           item: _this.data.formData,
-          formReturnMode:this_.data.formReturnMode,
+          formReturnMode:_this.data.formReturnMode,
           formType: 10
         })
       }

pages/mine/mine.js

@@ -161,17 +161,17 @@ Page({
         let valueAmounts = []
         valueAmounts.push({
           title: '销售金额(元)',
-          flgAmount:true,
+          flgAmount: true,
           value: data.amtShouldSumAmount ? data.amtShouldSumAmount : 0.00
         })
         valueAmounts.push({
           title: '收款金额(元)',
-          flgAmount:true,
+          flgAmount: true,
           value: data.amtRecSumAmount ? data.amtRecSumAmount : 0.00
         })
         valueAmounts.push({
           title: '订单数(单)',
-          flgAmount:false,
+          flgAmount: false,
           value: data.orderQuantity ? data.orderQuantity : 0
         })
         this.setData({
@@ -222,6 +222,17 @@ Page({
     })
   },
   /**
+  * @desc : 跳转至增加授权
+  * @author : 刘尧
+  * @date : 2024/7/4
+  */
+  toAddRole() {
+    const item = {detail:{
+      customUrl: undefined,
+      name: "buy"}}
+    this.open(item)
+  },
+  /**
   * @desc : 升级
   * @author : 周兴
   * @date : 2024/4/9

pages/mine/mine.wxml

@@ -45,6 +45,7 @@
           </view>
           <!--到期日期前15天显示续费-->
           <dk-tag wx:if="{{dueButtonFlag}}" padding="0 20rpx" height="30rpx" color="#FF7B1A" textColor="#FFFFFF" radius="5rpx" roundFlag="{{true}}" marginRight="12rpx" value="续费" catchtap="handleRecharge"></dk-tag>
+          <dk-tag wx:else="{{!dueButtonFlag}}" padding="0 20rpx" height="30rpx" color="#3E69F6" textColor="#FFFFFF" radius="5rpx" roundFlag="{{true}}" marginRight="12rpx" value="增加授权" catchtap="toAddRole"></dk-tag>
         </view>
       </view>
     </view>

utils/Constants.js

@@ -160,6 +160,7 @@ module.exports = {
   },
 
   noticeInfo: {
+    proTitle:'六大模块功能',
     title: '注册须知：',
     cpName: '用于登录系统时显示公司信息。',
     contact: '负责人和联系电话：用于开通系统电话确认核实信息。',