Explorar el Código

Merge branch 'master' of http://s.dev01.dkiboss.com:9001/iBOSS-2.0-Mini/iboss_wx_app

liuyao hace 1 año
padre
commit
e6f67e2b91

+ 2 - 1
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

+ 1 - 1
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 || []
         })

+ 2 - 2
pages/mine/mine.wxml

@@ -116,14 +116,14 @@
       <view class="todo-view-title" catch:tap="toSetting">{{$t['settingCommany']}}</view>
     </view>
     <!--操作手册-->
-    <view class="todo-view" style="margin-bottom: 4rpx;">
+    <!-- <view class="todo-view" style="margin-bottom: 4rpx;">
       <view style="display: flex;justify-content: space-between;">
         <view class="todo-view-title" catch:tap="toOperateGuide" data-type="pdf">{{$t['operateGuide']}}</view>
         <van-icon wx:if="{{!playFlag}}" name="play" size="20rpx" color="#1B365D" data-type="open" catch:tap="toOperateGuideVideo" />
         <van-icon wx:if="{{playFlag}}" name="cross" size="20rpx" color="#1B365D" data-type="close" catch:tap="toOperateGuideVideo" />
       </view>
       <video wx:if="{{playFlag}}" id="myVideo" src="{{videoSrc}}" class="van-uploader__preview-image" muted show-mute-btn show-fullscreen-btn enable-progress-gesture="{{false}}" autoplay="{{false}}" loop show-progress show-bottom-progress show-play-btn></video>
-    </view>
+    </view> -->
     <!-- <view class="todo-view" style="margin-bottom: 4rpx;">
       <view class="todo-view-title" catch:tap="toPay">微信支付</view>
     </view> -->