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

api/pages/ivt/inbound.js

@@ -37,7 +37,9 @@ module.exports = {
       chooseOrg: { key: 'chooseOrg',url: '/package-base-select/pages/select-data/select-data',type:'org' }, 
       chooseWh: { key: 'chooseWh', url: '/package-base-select/pages/select-data/select-data',type:'warehouse'  },
       choosePurchaseOrder: { key: 'choosePurchaseOrder', url: '/package-purchase/pages/purchase-receipt/choose-purchase-order/choose-purchase-order'  },
-    
+      detailSup:{
+        key:'detailSup',url:'/package-purchase/pages/supplier-list/detail/detail'
+      },
     }
   } 
 };

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

@@ -31,6 +31,7 @@ Page({
      * 生命周期函数--监听页面加载
      */
     onLoad(options) {
+        console.log("app.globalData.company.funPackage",app.globalData.company.funPackage);
         // 用户到期日期
         if (app.globalData.company.userEndDate) {
             this.setData({
@@ -114,7 +115,7 @@ Page({
     * @date : 2024/4/1
     */
     setParams(params) { 
-        let funPackage = app.globalData.company.funPackage || []
+        let funPackage =  [...app.globalData.company.funPackage] || []
         params.endDate = app.globalData.company.endDate
         params.userEndDate = this.data.userEndDate
         params.gradeCode = app.globalData.company.gradeCode

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

@@ -41,7 +41,7 @@ Page({
     /**
      * 生命周期函数--监听页面加载
      */
-    onLoad(options) {
+    onLoad(options) { 
         this.setData({
             regionsHavedBuyUuids: app.globalData.company.funPackage || []
         })

package-basic-data/pages/register/company-register/company-register.js

@@ -1,7 +1,9 @@
 const mixins = require('@/mixins/index.js')
 const util = require('@/utils/util.js')
 const Constants = require('@/utils/Constants.js');
+
 const api = require('@/utils/api.js');
+const config = require('@/config/config.js');
 
 const app = getApp()
 
@@ -333,6 +335,88 @@ Page({
     return true
   },
   /**
+  * @desc : 用户协议
+  * @date : 2024/7/12 13:48
+  * @author : 刘尧
+  */
+  openUserAgreement() {
+    let url = config.image_url + '/agreement/userAgreement.pdf'
+    let toUrl = null;
+    if (url) {
+      // 看下是否包括http,http就跳转到product页面
+      if (url.indexOf('http') >= 0) {
+        // toUrl = '/pages/product/product'
+        wx.downloadFile({
+          url: url,
+          success(e) {
+            wx.openDocument({
+              filePath: e.tempFilePath,
+              showMenu: true,
+              fileType: 'pdf',
+              success(e) {
+                console.log('success', e);
+              },
+              fail(e) {
+                console.log('fail', e);
+              }
+            })
+          }
+        })
+      } else {
+        // 说明是跳本产品
+        toUrl = url;
+        wx.navigateTo({
+          url: toUrl,
+          success: function (res) {
+            res.eventChannel.emit('url', url);
+          }
+        })
+      }
+    }
+  },
+
+  /**
+  * @desc : 隐私协议
+  * @date : 2024/7/11 13:49
+  * @author : 周兴
+  */
+  openPrivacyAgreement() {
+    let url = config.image_url + '/agreement/privacyAgreement.pdf'
+
+    let toUrl = null;
+    if (url) {
+      // 看下是否包括http,http就跳转到product页面
+      if (url.indexOf('http') >= 0) {
+        // toUrl = '/pages/product/product'
+        wx.downloadFile({
+          url: url,
+          success(e) {
+            wx.openDocument({
+              filePath: e.tempFilePath,
+              showMenu: true,
+              fileType: 'pdf',
+              success(e) {
+                console.success('openFile', e);
+              },
+              fail(e) {
+                console.fail('openFile', e);
+              }
+            })
+          }
+        })
+      } else {
+        // 说明是跳本产品
+        toUrl = url;
+        wx.navigateTo({
+          url: toUrl,
+          success: function (res) {
+            res.eventChannel.emit('url', url);
+          }
+        })
+      }
+    }
+  },
+  /**
   * @desc : 初始化加载
   * @date : 2024/5/30 15:49
   * @author : 周兴

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

@@ -82,8 +82,8 @@
 	<view class="notice-item-class">{{noticeInfo.cpSize}}</view>
 	<view class="notice-item-class" style="display: flex;padding-top: 20rpx;">
 		<van-checkbox shape="square" value="{{flgPrimary}}" label-class="checkbox-class" bind:change="handleChangeCheckbox">我已阅读并同意</van-checkbox>
-		<view style="color: #CE9965;">《注册须知》</view>
-		<view style="color: #CE9965;">《免责条款》</view>
+		<view bind:tap="openUserAgreement" style="color: #CE9965;text-decoration: underline;">《用户协议》</view>和
+		<view bind:tap="openPrivacyAgreement" style="color: #CE9965;text-decoration: underline;">《隐私条款》</view>
 	</view>
 </view>
 <view style="height: 200rpx;"></view>

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

@@ -27,7 +27,7 @@ Page({
       { code: 'warehouse', title: mixins.$t('reservoirArea'), dropType: 'warehouse' },
       {
         code: 'choose',
-        title: mixins.$t("choose"),
+        title: '过滤',
         searchType: Constants.searchType.pick
       }
     ],

package-purchase/pages/supplier-list/detail/detail.wxss

@@ -250,7 +250,8 @@ page {
 
 .scan-image {
   width: 200rpx;
-  height: 200rpx;
+  height: 100%;
+  max-height: 200rpx;
   position: absolute;
   right: 0;
   bottom: 0;

pages/mine/mine.wxml

@@ -40,10 +40,10 @@
         </view>
         <!--到期日期 续费-->
         <view class="endDate" wx:if="{{cpEndDate}}">
-          <view style="display: flex;">
+          <view style="display: flex;flex-direction: row;">
             <view wx:if="{{!contains2099}}">{{$t['cpEndDate'] + '：' + cpEndDate}}
-              <view wx:if="{{dueFlag}}" style="color:#e00808;margin-left: 20rpx;">{{dueFlag?$t['dueText']:''}}</view>
             </view>
+            <view wx:if="{{dueFlag}}" style="color:#e00808;margin-left: 20rpx;">{{dueFlag?$t['dueText']:''}}</view>
           </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>