1、修改问题

i18n/zh-CN.js

@@ -294,7 +294,7 @@ const basicData = {
   profitLossSys: '基础资料-盈亏原因',
   lossReasonName: '盈亏原因',
   saleStaff: '销售人员',
-  initialPayment: '初始款项',
+  initialRPayment: '初始款项',
   saleOrg: '销售部门',
   initialDebtOwed: '初始欠款',
   initialPayment: '初始预收',
@@ -478,6 +478,8 @@ const customer = {
   uploadDrawings: '上传图纸',
   addDrawings: '添加空间图纸',
   defaultInfo: '已存在默认，是否替换默认',
+  reportOrg :'报备部门',
+  reportStaff:'报备人'
 }
 // 提示信息
 const messages = {

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

@@ -1032,7 +1032,6 @@ Page({
  * @author : 刘尧
  */
   handleSearchData(tableData) {
-    console.log('tte',this.data.addItem,this.data.tableData,this.data.valueKey);
     let addItem = this.data.addItem
     let valueKey = this.data.valueKey
     let choosedData = this.data.choosedData

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

@@ -32,10 +32,10 @@ Page({
         { code: 'contactPhone', type: 'str', title: mixins.$t('cpPhone'), required: false },
       ],
       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: 'initialPaymentId', name: 'initialPayment', type: 'choose', title: mixins.$t('initialPayment'), urlKey: 'chooseInitialPaymentType' },
+        // { 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: 'initialPaymentId', name: 'initialPayment', type: 'choose', title: mixins.$t('initialRPayment'), urlKey: 'chooseInitialPaymentType' },
       ],
       remarks: [
         { code: 'remarks', type: 'textarea', title: mixins.$t('remarks') }
@@ -87,35 +87,17 @@ Page({
       formData.initialPaymentId = data.id
       formData.initialPayment = data.name
       let contentObj = this.data.contentObj;
+      let center = contentObj.center
+      center = center.filter(it=>it.code != 'startAmount' && it.code != 'macId')
       // 初始款项-欠款
       if (data.id == Constants.initialPayType.debt) {
-        contentObj.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: 'initialPaymentId', name: 'initialPayment', type: 'choose', title: mixins.$t('initialPayment'), urlKey: 'chooseInitialPaymentType' },
-          { code: 'startAmount', type: 'number', required: true, title: mixins.$t('initialDebtOwed') },
-        ]
-
+        center.push({ code: 'startAmount', type: 'number', required: true, title: mixins.$t('initialDebtOwed') })
       } else if (data.id == Constants.initialPayType.payment) {
         // 初始款项-预收
-        contentObj.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: 'initialPaymentId', name: 'initialPayment', type: 'choose', title: mixins.$t('initialPayment'), urlKey: 'chooseInitialPaymentType' },
-          { code: 'startAmount', type: 'number', required: true, title: mixins.$t('initialPayment') },
-          { code: 'macId', name: 'macName', type: 'choose', required: true, title: mixins.$t('moneyAccount'), urlKey: 'chooseMoneyAccount' },
-        ]
-      } else {
-        // 初始款项-无
-        contentObj.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: 'initialPaymentId', name: 'initialPayment', type: 'choose', title: mixins.$t('initialPayment'), urlKey: 'chooseInitialPaymentType' },
-        ]
+        center.push({ code: 'startAmount', type: 'number', required: true, title: mixins.$t('initialPayment') })
+        center.push({ code: 'macId', name: 'macName', type: 'choose', required: true, title: mixins.$t('moneyAccount'), urlKey: 'chooseMoneyAccount' })
       }
+      contentObj.center = center
       this.setData({
         contentObj: contentObj
       })
@@ -238,7 +220,9 @@ Page({
         { code: 'contactName', type: 'str', required: false, title: mixins.$t('contactName') },
         { code: 'contactPhone', type: 'str', title: mixins.$t('cpPhone'), required: false },
       ]
-
+      contentObj.center = [
+        { code: 'initialPaymentId', name: 'initialPayment', type: 'choose', title: mixins.$t('initialRPayment'), urlKey: 'chooseInitialPaymentType' },
+      ]
 
     } else if (this.data.gradeCode == Constants.gradeCode.PRO) {
 
@@ -251,6 +235,11 @@ Page({
         { code: 'contactName', type: 'str', required: false, title: mixins.$t('contactName') },
         { code: 'contactPhone', type: 'str', title: mixins.$t('cpPhone'), required: false },
       ]
+      contentObj.center = [
+        { code: 'staffId', name: 'staffName', type: 'choose', required: true, title: mixins.$t('reportStaff'), urlKey: 'chooseStaff' },
+        { code: 'orgId', name: 'orgName', type: 'choose', required: true, title: mixins.$t('reportOrg'), urlKey: 'chooseOrg' },
+        { code: 'initialPaymentId', name: 'initialPayment', type: 'choose', title: mixins.$t('initialRPayment'), urlKey: 'chooseInitialPaymentType' },
+      ]
     }
     this.setData({
       contentObj: contentObj

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

@@ -152,10 +152,10 @@ Page({
   setValuesByEdit(data) {
     data.name = 'edit'
     this.setData({
-      item: data
+      item: data,
     })
 
-    this.getCusFollowList(data.cusId)
+    this.getCusFollowList(this.data.id)
   },
   /**
   * @desc : 切换tab
@@ -163,26 +163,26 @@ Page({
   * @author : 周兴
   */
   onChange(e) {
-    let data = this.data.item
     let name = e.detail.name
+    let cusId = this.data.id
     if (name == 'follow') {
-      this.getCusFollowList(data.cusId)
+      this.getCusFollowList(cusId)
     }
     else if (name == 'deal') {
       // 标准版查销售出库
       if (this.data.gradeCode == Constants.gradeCode.STD) {
-        this.getOrderOut(data.cusId, Constants.outType.sale)
+        this.getOrderOut(cusId, Constants.outType.sale)
       } else {
-        this.getOrderList(data.cusId)
+        this.getOrderList(cusId)
       }
     }
     // 收款
     else if (name == 'receipt') {
-      this.getPayRecords(data.cusId, '收付款类型-收款')
+      this.getPayRecords(cusId, '收付款类型-收款')
     }
     // 退款
     else if (name == 'payment') {
-      this.getPayRecords(data.cusId, '收付款类型-退收款')
+      this.getPayRecords(cusId, '收付款类型-退收款')
     }
   },
   /**

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

@@ -300,7 +300,7 @@
                         </dk-text>
                       </view>
                       <view class="out-oreder-detail">
-                        品类数
+                        种类数
                       </view>
                     </view>
 
@@ -329,27 +329,19 @@
                     <view wx:for="{{item.orderItemResponseList}}" data-item="{{item}}" wx:for-item="item" wx:key="index" wx:for-index="childindex" border="{{ true }}">
 
                       <van-card data-item="{{item}}" data-index="{{index}}">
-
                         <view slot="thumb">
                           <van-image radius="5px" width="80" height="80" src="{{item.imagesUrl }}" />
                         </view>
                         <view slot="title" style="display: flex;">
-
                           <view style="display: flex;">
-
                             <dk-title titleTag="{{item.brandName}}" title="{{item.skuModel}}"></dk-title>
                           </view>
-
-
                         </view>
-
                         <view slot="desc">
                           <view style="display:flex;width: 100%;">
                             <view style="width: 80%;">
                               <dk-text fontWeight="nomal" value="{{item.skuName}}"></dk-text>
-
                             </view>
-
                           </view>
                         </view>
                         <view slot="price">
@@ -360,72 +352,7 @@
                             <view style="width: 100%;text-align: right;font-size: 3.5vw;color: #95A8CB;">x <span style="line-height:56rpx;">{{item.itemQty}}</span></view>
                           </view>
                         </view>
-
-
-
-
-                        <view slot="footer">
-                          <view style="margin-top: 15rpx;" wx:if="{{item.bomItems.length > 0}}">
-                            <view style="width: 100%;display: flex;">
-                              <view style="font-size: 14px;width: 50%;text-align: left;color: #95A8CB;">
-                                明细
-                              </view>
-                              <view style="font-size: 14px;width: 50%;text-align: right;color: #95A8CB;" data-item="{{item}}" data-big="{{index}}" data-index="{{childindex}}" catchtap="onPriceOpenGoodsList">
-                                {{item.packageDetailsFlag ? '收起' :'展开'}}
-                                <van-icon name="{{item.packageDetailsFlag ? 'arrow-up' :'arrow-down' }}" />
-                              </view>
-                            </view>
-
-                            <view wx:if="{{item.packageDetailsFlag}}">
-
-                              <view wx:for="{{item.bomItems}}" data-item="{{item2}}" wx:for-item="item2" wx:key="index2">
-                                <view style="text-align: left;width: 100%; padding-left: 15rpx;padding-top:15rpx;">
-                                  <view style="display: flex;">
-                                    <view>
-                                      <van-image radius="5px" width="65" height="65" src="{{item2.iconThumPath }}" />
-                                    </view>
-                                    <view style="margin-left:5px;width: 66vw;">
-
-                                      <view style="display: flex;">
-
-
-                                        <dk-title titleTag="{{item2.titleTag}}" title="{{item2.skuModel}}"></dk-title>
-                                      </view>
-
-                                      <view style="display: flex;font-size:3.2vw; ">
-                                        <text decode>{{item2.skuName}}</text>
-                                      </view>
-
-                                      <view style="display: flex;font-size:3.2vw; ">
-                                        <text decode>{{' '}}</text>
-                                      </view>
-                                      <view slot="footer" style="width:100%;justify-content: flex-end;margin-top:20rpx;text-align:right;align-self: flex-end;">
-                                        <view style="display: flex;width: 100%;flex-direction: row;">
-                                          <view style="color: red;font-size: 4vw;width: 100%;text-align: left;">
-                                            <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="16" contentColor="#FF7B1A" fontWeight="600" title="" content="{{numberFormat.toThousandCents(item2.priceSale)}}"></dk-cell>
-                                          </view>
-                                          <view style="width: 100%;text-align: right;font-size: 3.5vw;color: #95A8CB;">x <span style="line-height:56rpx;">{{item2.itemQuantity }}</span></view>
-                                        </view>
-                                      </view>
-                                    </view>
-                                  </view>
-                                </view>
-                              </view>
-
-                            </view>
-                          </view>
-                          <view class="hr"></view>
-                          <view style="display: flex;width: 100%;margin-top:5px;" data-index="{{index}}">
-                            <view style="width: 70%;text-align: left;font-size: 3.5vw;color: #95A8CB;">
-                              备注：<span style="line-height:56rpx;">{{item.remarks ? item.remarks : ''}}</span>
-                            </view>
-
-                          </view>
-
-                        </view>
-
                       </van-card>
-
                       <van-divider />
                     </view>
 
@@ -475,7 +402,7 @@
                         </dk-text>
                       </view>
                       <view class="out-oreder-detail">
-                        品类数
+                        种类数
                       </view>
                     </view>
 
@@ -520,12 +447,20 @@
                         </view>
                       </view>
                     </view>
+                    <view slot="price-top" style="display: flex;justify-content: space-between;" wx:if="{{cItem.skuId}}">
+                      <view>
+                        规格：{{cItem.skuSpec}}
+                      </view>
+                      <view>
+                        色号：{{cItem.nonStdCode}}
+                      </view>
+                    </view>
                     <view slot="price">
                       <view style="display: flex;width: 100%;flex-direction: row;">
-                        <view style="color: red;font-size: 4vw;width: 100%;">
-                          <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="16" contentColor="#FF7B1A" fontWeight="600" title="" content="{{cItem.priceOut}}"></dk-cell>
+                        <view style="color: red;font-size: 14px;width: 100%;">
+                          <dk-cell center="left" height="46rpx" spaceWidth="1rpx" left="0" fontSize="16" contentColor="#FF7B1A" fontWeight="600" title="" content="{{cItem.outAmt + cItem.outingAmt}}"></dk-cell>
                         </view>
-                        <view style="width: 100%;text-align: right;font-size: 3.5vw;color: #95A8CB;">x <span style="line-height:56rpx;">{{cItem.outQty}}</span></view>
+                        <view style="width: 100%;text-align: right;font-size: 3.5vw;color: #95A8CB;">x <span style="line-height:56rpx;">{{(cItem.outQty  + cItem.outingQty) + (cItem.packBoxText? ('(' + cItem.packBoxText + ')'):'') }}</span></view>
                       </view>
                     </view>
                   </van-card>
@@ -571,7 +506,7 @@
                         </dk-text>
                       </view>
                       <view class="out-oreder-detail">
-                        品类数
+                        种类数
                       </view>
                     </view>
 
@@ -602,29 +537,32 @@
                       <van-image radius="5px" width="80" height="80" src="{{cItem.imagesUrl }}" />
                     </view>
                     <view slot="title" style="display: flex;">
-
                       <view style="display: flex;">
-
                         <dk-title titleTag="{{cItem.brandName}}" title="{{cItem.skuModel}}"></dk-title>
                       </view>
-
                     </view>
 
                     <view slot="desc">
                       <view style="display:flex;width: 100%;">
                         <view style="width: 80%;">
                           <dk-text fontWeight="nomal" value="{{cItem.skuName}}"></dk-text>
-
                         </view>
-
+                      </view>
+                    </view>
+                    <view slot="price-top" style="display: flex;justify-content: space-between;" wx:if="{{cItem.skuId}}">
+                      <view>
+                        规格：{{cItem.skuSpec}}
+                      </view>
+                      <view>
+                        色号：{{cItem.nonStdCode}}
                       </view>
                     </view>
                     <view slot="price">
                       <view style="display: flex;width: 100%;flex-direction: row;">
-                        <view style="color: red;font-size: 4vw;width: 100%;">
-                          <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="16" contentColor="#FF7B1A" fontWeight="600" title="" content="{{cItem.priceOut}}"></dk-cell>
+                        <view style="color: red;font-size: 14px;width: 100%;">
+                          <dk-cell center="left" height="46rpx" spaceWidth="1rpx" left="0" fontSize="16" contentColor="#FF7B1A" fontWeight="600" title="" content="{{cItem.outAmt}}"></dk-cell>
                         </view>
-                        <view style="width: 100%;text-align: right;font-size: 3.5vw;color: #95A8CB;">x <span style="line-height:56rpx;">{{cItem.outQty}}</span></view>
+                        <view style="width: 100%;text-align: right;font-size: 3.5vw;color: #95A8CB;">x <span style="line-height:56rpx;">{{cItem.outQty + (cItem.packBoxText? ('(' + cItem.packBoxText + ')'):'')}}</span></view>
                       </view>
                     </view>
                   </van-card>

package-basic-data/pages/register/company-setting/company-setting.wxml

@@ -5,7 +5,7 @@
 <view class="task-progress">
   <view class="task-progress-header">
     <view class="task-progress-header-name">{{$t['cpInfo']}}</view>
-    <view class="task-progress-header-name" >
+    <view class="task-progress-header-name"  wx:if="{{gradeCode != 'STD'}}">
       <van-button size='small' bind:click="paramSetting" type="default">{{$t['paramSetting']}}
       </van-button>
     </view>

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

@@ -30,7 +30,7 @@
         <!-- 日期 -->
         <view wx:if="{{item.intoType == $t['purIntoType']}}" style="display: flex; width: 100%; padding-top: 16rpx;padding-bottom: 15rpx;padding-right: 15rpx; justify-content: space-between; font-size: 24rpx;">
           <view style="display: flex;  line-height: 36rpx;">
-            {{$t['makingTime']}}：{{ itemData.makeTime?itemData.makeTime:'' }}
+            {{$t['makingTime']}}：{{ itemData.makeTime?wxmlUtil.formatDate(itemData.makeTime):'' }}
           </view>
           <view style="display: flex;  line-height: 36rpx;" catchtap="openData">
             {{$t['intoDate']}}：{{ itemData.intoDate?itemData.intoDate:'' }}

package-purchase/pages/supplier-list/add/add.js

@@ -78,25 +78,7 @@ Page({
         title: mixins.$t("returnAddress"),
       }
       ],
-      staff: [{ //采购人员
-        code: 'staffId',
-        name: 'staffName',
-        title: mixins.$t("procureStaff"),
-        type: 'choose',
-        urlKey: 'chooseStaff',
-        required: true,
-      }, { //业务部门
-        code: 'orgId',
-        name: 'orgName',
-        title: mixins.$t("orgId"),
-        type: 'choose',
-        urlKey: 'chooseOrg',
-        required: true,
-      }, { // todo: 目前 表里 缺这个字段 先不弄
-        code: 'startAmount',
-        type: 'number',
-        title: '初始欠款',
-      }],
+      staff: [],
 
       other: [{
         code: 'Remarks',
@@ -423,6 +405,27 @@ Page({
         title: mixins.$t("returnAddress"),
       }
       ]
+      contentObj.staff = [
+        { //采购人员
+          code: 'staffId',
+          name: 'staffName',
+          title: mixins.$t("procureStaff"),
+          type: 'choose',
+          urlKey: 'chooseStaff',
+          required: true,
+        }, { //业务部门
+          code: 'orgId',
+          name: 'orgName',
+          title: mixins.$t("orgId"),
+          type: 'choose',
+          urlKey: 'chooseOrg',
+          required: true,
+        }, { // todo: 目前 表里 缺这个字段 先不弄
+          code: 'startAmount',
+          type: 'number',
+          title: '初始欠款',
+        }
+      ]
       formData.supType = Constants.kindCode.supplierPur//"供应商类别-采购"
       formData.supTypeName = mixins.$t("procurementSupplier") //采购供应商" 
     }

pages/home-page/home-page.js

@@ -163,9 +163,9 @@ Page({
     let toUrl = null;
     if (url) {
       // 看下是否包括http,http就跳转到product页面
-      if(url.indexOf('http') >= 0){
+      if (url.indexOf('http') >= 0) {
         toUrl = '/pages/product/product'
-      }else{
+      } else {
         // 说明是跳本产品
         toUrl = url;
       }
@@ -273,19 +273,19 @@ Page({
       if (res.data.code == Constants.SUCESS_CODE) {
         let comMenuList = res.data.data
         // 如果标准版把销售出库 修改为订单开单
-        if(app.globalData.company.gradeCode == Constants.gradeCode.STD){
-          let filters =  comMenuList.filter(it=>it.objectCode == 'order-out');
-          if(filters && filters.length > 0){
-           filters[0].menuName = '订单开单'
-           filters[0].name = '订单开单'
+        if (app.globalData.company.gradeCode == Constants.gradeCode.STD) {
+          let filters = comMenuList.filter(it => it.objectCode == 'order-out');
+          if (filters && filters.length > 0) {
+            filters[0].menuName = '订单开单'
+            filters[0].name = '订单开单'
           }
-           // 出库明细表修改为销售明细表
-           filters = comMenuList.filter(it => it.objectCode == 'out-detail-report');
-           if (filters && filters.length > 0) {
-               filters[0].menuName = '销售明细表'
-               filters[0].name = '销售明细表'
-           }
-       }
+          // 出库明细表修改为销售明细表
+          filters = comMenuList.filter(it => it.objectCode == 'out-detail-report');
+          if (filters && filters.length > 0) {
+            filters[0].menuName = '销售明细表'
+            filters[0].name = '销售明细表'
+          }
+        }
         // 增加全部列表
         let allMenu = {
           menuUuid: '-1',
@@ -402,19 +402,21 @@ Page({
     this.getComMenu();
     // 查询应收和收款额(本周) 本周数据点击首页就能刷新
     this.getReceivableAccountSum('week');
+    // 查询应收和收款额(本月)
+    this.getReceivableAccountSum('month');
   },
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-      // 如果企业还有15天到期给出提示信息
-      let company = app.globalData.company;
-      if(company && company.endDate){
-        let endD = new Date(company.endDate);
-        let nowD = new Date(new Date().toDateStr()).addDays(Constants.CP_ALERT_TIME);
-        if (endD < nowD) {
-            util.showToast(mixins.$t('companyAlertInfo') + '【'+ company.endDate + '】',5000);
-        }
+    // 如果企业还有15天到期给出提示信息
+    let company = app.globalData.company;
+    if (company && company.endDate) {
+      let endD = new Date(company.endDate);
+      let nowD = new Date(new Date().toDateStr()).addDays(Constants.CP_ALERT_TIME);
+      if (endD < nowD) {
+        util.showToast(mixins.$t('companyAlertInfo') + '【' + company.endDate + '】', 5000);
+      }
     }
     let res = wx.getSystemInfoSync();
     let statusHeight = res.statusBarHeight
@@ -437,8 +439,6 @@ Page({
     this.tauchSwiper('swiperList');
     // 查询广告数据
     this.getAdvertisement();
-    // 查询应收和收款额(本月)
-    this.getReceivableAccountSum('month');
     // options 中的 scene  todo.. 先不要删除日志
     console.log("homepage---", options.scene);
     if (options.scene) {
@@ -466,7 +466,7 @@ Page({
     // 获取功能卡片模块高度 以便设置水印蒙版高度
     const that = this;
     let query = wx.createSelectorQuery();
-    query.select('.func').boundingClientRect(rect=>{
+    query.select('.func').boundingClientRect(rect => {
       let height = rect.height;
       let width = rect.width;
       console.log('组件高度', height);
@@ -489,55 +489,55 @@ Page({
    * @author 刘尧
    * @date 2024.5.30
    * */
-  drawWatermark(canvasName, watermarkText, width, height) {  
+  drawWatermark(canvasName, watermarkText, width, height) {
     const ctx = wx.createCanvasContext(canvasName); // 创建 canvas 上下文  
     // 水印配置  
-    const watermarkConfiguration = {  
+    const watermarkConfiguration = {
       watermarkText: watermarkText, // 水印文本  
       watermarkFontSize: 14, // 水印字体大小  
       watermarkColor: '#aaa', // 水印字体颜色  
       watermarkAngle: -25, // 水印倾斜度数  
       watermarkOpacity: 0.5, // 水印透明度  
       watermarkInterval: 50, // 水印之间的间隔  
-    };  
+    };
     const canvasWidth = width; // canvas 宽度  
     const canvasHeight = height; // canvas 高度  
     // 设置 canvas 样式和全局属性  
-    ctx.setGlobalAlpha(watermarkConfiguration.watermarkOpacity);  
-    ctx.setFontSize(watermarkConfiguration.watermarkFontSize);  
-    ctx.setFillStyle(watermarkConfiguration.watermarkColor);  
+    ctx.setGlobalAlpha(watermarkConfiguration.watermarkOpacity);
+    ctx.setFontSize(watermarkConfiguration.watermarkFontSize);
+    ctx.setFillStyle(watermarkConfiguration.watermarkColor);
     // 计算单个水印文本的宽度和高度  
-    const textWidth = ctx.measureText(watermarkConfiguration.watermarkText).width;  
-    const textHeight = watermarkConfiguration.watermarkFontSize;  
+    const textWidth = ctx.measureText(watermarkConfiguration.watermarkText).width;
+    const textHeight = watermarkConfiguration.watermarkFontSize;
     // 计算可以放置水印的行数和列数  
-    const numColumns = Math.floor(canvasWidth / (textWidth + watermarkConfiguration.watermarkInterval));  
-    const numRows = Math.floor(canvasHeight / (textHeight + watermarkConfiguration.watermarkInterval));  
+    const numColumns = Math.floor(canvasWidth / (textWidth + watermarkConfiguration.watermarkInterval));
+    const numRows = Math.floor(canvasHeight / (textHeight + watermarkConfiguration.watermarkInterval));
     // 绘制水印  
-    for (let i = 0; i < numRows; i++) {  
-      for (let j = 0; j < numColumns; j++) {  
+    for (let i = 0; i < numRows; i++) {
+      for (let j = 0; j < numColumns; j++) {
         // 计算水印位置  
-        const x = j * (textWidth + watermarkConfiguration.watermarkInterval);  
-        const y = i * (textHeight + watermarkConfiguration.watermarkInterval);  
+        const x = j * (textWidth + watermarkConfiguration.watermarkInterval);
+        const y = i * (textHeight + watermarkConfiguration.watermarkInterval);
         // 保存当前状态  
-        ctx.save();  
+        ctx.save();
         // 旋转坐标系以绘制倾斜的水印  
-        ctx.translate(x + textWidth / 2, y + textHeight / 2); 
-        ctx.rotate(watermarkConfiguration.watermarkAngle * Math.PI / 180);  
-        ctx.fillText(watermarkConfiguration.watermarkText, -textWidth / 2, -textHeight / 2);  
+        ctx.translate(x + textWidth / 2, y + textHeight / 2);
+        ctx.rotate(watermarkConfiguration.watermarkAngle * Math.PI / 180);
+        ctx.fillText(watermarkConfiguration.watermarkText, -textWidth / 2, -textHeight / 2);
         // 恢复之前保存的状态  
-        ctx.restore();  
-      }  
-    }  
-    
+        ctx.restore();
+      }
+    }
+
     // 绘制到 canvas 上  
-    ctx.draw();  
+    ctx.draw();
   },
   /**
    * 水印点击事件
    * @author 刘尧
    * @date 2024.5.30
    */
-  masksClick(){
+  masksClick() {
     wx.navigateTo({
       url: '/package-basic-data/pages/register/product-detail/product-detail',
     })

pages/mine/mine.js

@@ -651,8 +651,7 @@ Page({
     if(this.data.gradeCode == Constants.gradeCode.STD){
       waitMenuFlag = false
     }
-    let dates = util.timeForMat(7)
-    this.getHomeOrderRecCost(dates[0], dates[1])
+
     this.setData({
       waitMenuFlag: waitMenuFlag,
       companyName: app.globalData.company.cpName,
@@ -687,6 +686,9 @@ Page({
         menuBtnInfo: wx.getMenuButtonBoundingClientRect()
       })
     }
+    // 查询门店助手
+    let dates = util.timeForMat(7)
+    this.getHomeOrderRecCost(dates[0], dates[1])
   },
   /**
    * 页面相关事件处理函数--监听用户下拉动作

pages/mine/mine.wxml

@@ -34,9 +34,9 @@
         <!-- 部门 -->
         <view class="store">
           <view> {{orgName?orgName:''}}</view>
-          <view wx:if="{{version}}" style="width:77vw;text-align-last: right;font-size: 11px;display: flex; justify-content: flex-end;"> 当前版本号: {{version}}
+          <!-- <view wx:if="{{version}}" style="width:77vw;text-align-last: right;font-size: 11px;display: flex; justify-content: flex-end;"> 当前版本号: {{version}}
             <van-icon name="upgrade" size="20px" bind:click="checkHasManualUpdate" />
-          </view>
+          </view> -->
         </view>
         <!--到期日期 续费-->
         <view class="endDate" wx:if="{{cpEndDate}}">
@@ -116,14 +116,18 @@
     <!-- <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" style="display: flex;justify-content:space-between;align-items: center;margin-bottom: 4rpx;" wx:if="{{gradeCode == 'STD'}}">
       <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 wx:if="{{version}}" class="todo-view" style="margin-bottom: 4rpx;display: flex;justify-content: space-between;">
+      <view class="todo-view-title" catch:tap="toSetting">当前版本号: {{version}}</view>
+      <van-icon name="upgrade" size="20px" bind:click="checkHasManualUpdate" />
+    </view>
   </view>
 
 </view>