修复bug

pages/bigredrnvelope/ActivityInProgress.vue

 <template>
     <view class="ActInProBox column"
     :class="[Details.Level>0?`activeLv${Details.Level}`:'activeLv1']">
+    <!--:scroll-top="scrollTop"-->
         <scroll-view :scroll-y="true"
         style="height: 1px;flex: 1;box-sizing: border-box;"
-        @scroll="scroll"
-        :scroll-top="scrollTop">
+        @scroll="scroll">
         <view class="ActInProHeaderBox" :style="{ opacity: 100 - boxOption + '%' }"
         :class="[Details.Level>0?`activeLv${Details.Level}`:'activeLv1']">
             <headers :title="page" color="#fff"></headers>
@@ -139,7 +139,7 @@
                         <view class="ActInProListTimeR">¥{{item.Money}}</view>
                     </view>
                 </view>
-                <u-empty v-if="CustomerOrderList.length == 0" text="暂无数据" mode="data"></u-empty>
+                <u-empty v-if="CustomerOrderList.length == 0" text="暂无数据" mode="data" padding-top="0"></u-empty>
             </view>
             <view v-if="Details"
             class="RuleDetails">
@@ -243,8 +243,8 @@ export default {
                 scrollShow: false, // 新增是否显示滚动条，默认false
                 scrollAlign: 'left', // 滚动条初始位置
                 rotateLabel: false, // X轴label旋转
-                min: 0, // Y轴最小值
-                max: 150, //Y轴大值
+                // min: 0, // Y轴最小值
+                // max: 150, //Y轴大值
                 unit: '', // Y轴单位
                 enableScroll: false, // 开启滚动模式
                 color: [
@@ -256,6 +256,7 @@ export default {
                 color: ["#1890FF","#91CB74","#FAC858","#EE6666","#73C0DE","#3CA272","#FC8452","#9A60B4","#ea7ccc"],
                 padding: [25,5,10,5],
                 enableScroll: false,
+                pageScrollTop: 477,
                 legend: {
                     show: false,
                 },
@@ -290,6 +291,8 @@ export default {
                 },
             },
             isType: 2,
+            isVisible: 0,
+            scrollViewHeight: 0,
         }
     },
     watch:{
@@ -338,9 +341,30 @@ export default {
         this.msg.YearMonth = this.year + '-' + this.month
     },
     mounted() {
+        const query = uni.createSelectorQuery().in(this);
+        query.select('.ActInProCenterBox').boundingClientRect(rect => {
+            this.scrollViewHeight = rect.height; // 获取 scroll-view 内容区域高度
+        }).exec();
         this.getSignDetails()
+        this.getElementPosition()
     },
     methods: {
+         // 获取元素位置
+        getElementPosition() {
+            const query = uni.createSelectorQuery().in(this);
+            query.select('.ActInProCenTimeBox').boundingClientRect(rect => {
+                if (rect) {
+                // 计算元素相对于 scroll-view 顶部的位置
+                const relativeTop = rect.top - this.scrollTop;
+                console.log('元素相对于可视区域顶部的位置:', relativeTop);
+                
+                // 判断元素是否在可视区域内
+                const isVisible = relativeTop >= 0 && relativeTop <= this.scrollViewHeight;
+                this.isVisible = isVisible
+                console.log('元素是否可见:', isVisible);
+                }
+            }).exec();
+        },
         formatNumberWithUnit(num) {
             if (num === 0) return '0.00';
             const units = ['', 'K', 'M', 'B', 'T']; // 单位数组：千(k)、百万(M)、十亿(B)、万亿(T)
@@ -377,9 +401,7 @@ export default {
                     let data = res.data
                     this.Details = data
                     this.CustomerOrderListAll = data.CustomerOrderList
-                    this.CustomerOrderList = data.CustomerOrderList.filter(item=>{
-                       return this.msg.YearMonth == item.CreateDate.slice(0,7)
-                    })
+                    this.SelectDate(1)
                     let TotalAmount = 0
                     for(let i=0;i<this.Details.OrderMonthList.length;i++){
                         
@@ -419,8 +441,7 @@ export default {
             this.$forceUpdate()
         },
         goTisp(){
-            console.log(1111)
-            this.scrollTop = this.scrollHeight?this.scrollHeight:1000000
+            this.scrollTop = this.scrollHeight?this.scrollHeight:1000000000
         },
         confirm(e){
             uni.hideLoading()
@@ -433,11 +454,8 @@ export default {
             this.msg.QStartDate = this.year + '-' + this.month + '-01'
             this.msg.QEndDate = this.year + '-' + this.month + '-'+now.getDate()
             this.msg.YearMonth = this.year + '-' + this.month
-            this.getCustomerOrderList()
+            this.SelectDate(2)
             this.showTime = false
-            if(this.scrollTop>650){
-                this.scrollTop = 630
-            }
         },
         SelectDate(type){
             this.isType = type;
@@ -448,9 +466,6 @@ export default {
             }else{
                 this.showTime = true
             }
-            if(this.scrollTop>650){
-                this.scrollTop = 630
-            }
         },
         goUrl(){
             uni.navigateTo({

pages/bigredrnvelope/PaymentProgress.vue

@@ -37,10 +37,11 @@
                         <view>银行账号</view>
                         <view class="col">{{ authInfor.CardNum }}</view>
                     </view>
+                    <!--
                     <view class="PaymentProCText row-sbas-n">
                         <view>电话</view>
                         <view class="col">{{ authInfor.ContactNumber }}</view>
-                    </view>
+                    </view>-->
                     <view class="PaymentProCText row-sbas-n">
                         <view>服务人员</view>
                         <view class="col">{{ authInfor.EnterName }}</view>
@@ -154,7 +155,6 @@ export default {
         }
     },
     mounted() {
-        this.getInfor()
         this.getSignDetails()
     },
     methods: { 
@@ -192,6 +192,7 @@ export default {
                 if (res.resultCode == 1) {
                     let data = res.data
                     this.Details = data
+                    this.authInfor = data
                     if(this.type==2){
                         this.toExamineSteps[0].Time = data.CreateTime
                         this.toExamineSteps[1].Time = data.UpdateTime
@@ -228,11 +229,7 @@ export default {
             res=>{
                 if (res.resultCode == 1) {
                     let data = res.data
-                    this.authInfor = data
-                    if(this.type==2){
-                        if(this.authInfor.Status==1||this.authInfor.Status==3) this.StepNum = 0 
-                        else this.StepNum = 1
-                    }
+                    // this.authInfor.ContactNumber = data.ContactNumber?data.ContactNumber:''
                 }
             })
         },

pages/bigredrnvelope/SettableList.vue

@@ -84,7 +84,7 @@
                         </view>
                     </view>
                 </view>
-                <u-empty v-if="CustomerOrderList.length == 0" text="暂无数据" mode="data"></u-empty>
+                <u-empty v-if="CustomerOrderList.length == 0" text="暂无数据" mode="data" padding-top="0"></u-empty>
                 <view style="height: 20rpx;"></view>
             </scroll-view>
             
@@ -270,6 +270,7 @@ export default {
                 },
                 (res) => {
                     if(res.resultCode == 1){
+                        uni.hideLoading()
                         uni.showToast({
                             title: '提交成功',
                             icon: 'success',
@@ -280,15 +281,15 @@ export default {
                             url: `/pages/bigredrnvelope/PaymentProgress?type=3&ContractId=${this.ContractId}`
                         })
                     }
-                    uni.hideLoading()
                 },err=>{
+                    uni.hideLoading()
                     uni.showToast({
                         title: err.message,
                         icon:'none',
                         duration: 2000,	
                     })
                     this.loading = false
-                    uni.hideLoading()
+                    
                 }
             );
             
@@ -316,7 +317,7 @@ export default {
                     let data = res.data
                     this.Details = data
                     this.CustomerOrderListAll = data.CustomerOrderList
-                    this.getCustomerOrderList()
+                    this.SelectDate(1)
                     uni.hideLoading()
                     this.$forceUpdate()
                 }
@@ -351,9 +352,8 @@ export default {
             this.msg.QStartDate = this.year + '-' + this.month + '-01'
             this.msg.QEndDate = this.year + '-' + this.month + '-'+now.getDate()
             this.msg.YearMonth = this.year + '-' + this.month
-            this.getCustomerOrderList()
+            this.SelectDate(2)
             this.showTime = false
-            // this.scrollTop = 630
         },
         SelectDate(type){
             this.isType = type;
@@ -364,7 +364,6 @@ export default {
             }else{
                 this.showTime = true
             }
-            // this.scrollTop = 630
         },
         goUrl(){
             uni.navigateTo({

pages/bigredrnvelope/components/upload.vue

@@ -17,7 +17,7 @@ export default {
     components: { },
     data() {
         return {
-            action: this.host2 + "/api/File/UploadTencent",
+            // action: this.host2 + "/api/File/UploadTencent",
             access_token: '',
         }
     },
@@ -83,7 +83,7 @@ export default {
                                     if (_res.data.direction == 1) {
                                         //未定义，图片类型错误
                                         wx.showToast({
-                                            title: "图片类型错误!",
+                                            title: _res+'_22',//"图片类型错误!"
                                             icon: "none",
                                             duration: 1000,
                                         });
@@ -133,8 +133,10 @@ export default {
         //图片上传
         upFile(filePath,resCall) {
             let that = this;
+            let MallBaseId = uni.getStorageSync("mall_UserInfo").MallBaseId ? uni.getStorageSync("mall_UserInfo").MallBaseId : 1;
+            let action = this.host2 + '/api/File/UploadTencent?MallBaseId=' + MallBaseId
             uni.uploadFile({
-                url: that.action,
+                url: action,
                 filePath: filePath,
                 name: 'file',
                 formData: {
@@ -153,10 +155,10 @@ export default {
                     }
 
                 },
-                fail: function(res) {
-                    console.log(res)
+                fail: function(err) {
+                    console.log(err)
                     wx.showToast({
-                        title: '上传失败!',
+                        title: '上传失败!'+JSON.stringify(err),
                         icon: 'none',
                         duration: 1000
                     })
@@ -189,7 +191,7 @@ export default {
                 },
                 fail(res) {
                     wx.showToast({
-                        title: "图片类型错误!",
+                        title: res,//"图片类型错误!"
                         icon: "none",
                         duration: 1000,
                     });

pages/bigredrnvelope/list.vue

@@ -53,7 +53,7 @@
                                 </view>
                             </view>   
                         </view>
-                        <view class="bigRedEnvLiYou"  v-if="item.Status==3">
+                        <view class="bigRedEnvLiYou"  v-if="item.Status==3&&item.AuditContractReason">
                             驳回理由:{{ item.AuditContractReason }}
                         </view> 
                     </view>
@@ -116,9 +116,10 @@ export default {
             };
             this.showAuth = true;
         }
+        this.getList()
     },
     mounted() {
-        this.getList()
+        
     },
     methods: {
         formatAmount(value) {

pages/bigredrnvelope/rule.vue

 <template>
     <view class="bigRedEnvRule">
+        <view class="bigRedEnvRuleHead">
+            <headers></headers>
+        </view>
         <image mode="" style="height: 568rpx;" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638796333602414702.jpg"/>
         <image mode="" style="height: 939rpx;" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638796333646350233.jpg"/>
         <image mode="" style="height: 1031rpx;" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638796333741115931.jpg"/>
@@ -20,9 +23,10 @@
     </view>
 </template>
 <script>
+import headers from "@/components/header/header";
 export default {
     components: {
-        
+        headers
     },
     data() {
         return {
@@ -51,6 +55,12 @@ export default {
 </script>
 <style lang="scss" scoped>
 @import url("@/asset/css/flex.css");
+.bigRedEnvRuleHead{
+    position: fixed;
+    left: 0;
+    top: 0;
+    z-index: 1;
+}
 .bigRedEnvRule{
 }
 .bigRedEnvRule image{

pages/bigredrnvelope/signAcontract.vue

@@ -284,9 +284,14 @@
                         <view style="margin-left: 50rpx;"  @click="getUrl(3)">查看条款</view>
                     </view>
                 </view>
-                <view class="signAconNext"
-                :class="[msg.StepNum==4?'':'active']" @click="Next(4)">
-                    提交
+                <view class="row-sbs-n">
+                    <view v-if="msg.StepNum<4&&!loading" class="signAconNext signAconNextL col" @click="Prev(3)">
+                        上一步
+                    </view>
+                    <view class="signAconNext col"
+                    :class="[msg.StepNum==5||loading?'':'active']" @click="Next(5)">
+                        提交
+                    </view>
                 </view>
             </view>
         </scroll-view>
@@ -362,6 +367,7 @@ export default {
             IsRenewalContract: 0,
             ContractId: 0,
             dataInfo: null,
+            isSign: false,
         }
     },
     onLoad(options) {
@@ -371,6 +377,9 @@ export default {
         if(options.ContractId) {
             this.ContractId = options.ContractId
         }
+        if(options.isSign) {
+            this.isSign = options.isSign
+        }
     },
     onShow() {
         this.U = uni.getStorageSync("mall_UserInfo");
@@ -414,14 +423,14 @@ export default {
             if(type==1) url = `https://activity.oytour.com/html/contract/index.html?msg=${encodeURIComponent(msg)}`
             if(type==2) url = `https://activity.oytour.com/html/contract/sign.html?msg=${encodeURIComponent(msg)}`
             if(type==3) url = `https://activity.oytour.com/html/contract/index.html?ContractId=${this.msg.ContractId}`
-            if(process.env.NODE_ENV=="development") return console.log(url,"-----url")
+            // if(process.env.NODE_ENV=="development") return console.log(url,"-----url")
             if (url && url.length > 0) {
                 if(type==1||type==3){
                     uni.navigateTo({
                         url: "/pages/webbox/webbox?u=" + encodeURIComponent(url),
                     });
                 }else if(type==2){
-                    uni.reLaunch({
+                    uni.navigateTo({
                         url: "/pages/webbox/webbox?u=" + encodeURIComponent(url),
                     }); 
                 }
@@ -527,13 +536,15 @@ export default {
                 })
                 return
             }
-            if(this.msg.StepNum==4) return this.goWebUrl(1)
+            // if(this.msg.StepNum==4) return this.goWebUrl(1)
             const oldData = this.newMsg(type)
             // console.log(oldData,'--------',type,!oldData)
             // return
             if(oldData) this.setInfor(type)
-            else if(this.ContractId||type==4) this.setInfor(type)
-            else if(type!=4) this.msg.StepNum = type
+            else if(this.ContractId||type==5) this.setInfor(type)
+            else if(type!=5) {
+                this.msg.StepNum = type
+            }
         },
         onSuccess(data,type) {
             if(type==1) {
@@ -573,6 +584,10 @@ export default {
             },err=>{
                 uni.hideLoading()
                 this.loading = false
+                uni.showToast({
+                    title:err.message,
+                    icon:'none' 
+                })
                 console.log(err,'--------')
             })
         },
@@ -648,7 +663,10 @@ export default {
                         C_EndDate:data.RenewalContractEtime,//	合同结束时间
                     }
                     if(this.IsRenewalContract||this.ContractId){
-                        this.msg.StepNum = 0
+                        if(this.isSign){
+                            this.msg.StepNum = 4
+                        }else this.msg.StepNum = 0
+                        
                         if(this.IsRenewalContract==1) this.msg.ContractId = 0
                         if(this.ContractId) {
                             let ContractList = data.ContractList.filter(x=>{