feat：续费修改

common/js/api.js

@@ -997,10 +997,11 @@ export default {
     },
 
     // 查询过期权益卡
-    getExpireEquityCard() {
+    getExpireEquityCard(data) {
         return request({
             url: '/member/wechat/getExpireEquityCard',
-            method: 'get'
+            method: 'get',
+            data:data
         })
     },
 

orderPages/activityDetail/activityDetail.vue

@@ -183,16 +183,20 @@
         </view>
 
         <scroll-view class="scrollY" scroll-y>
-          <view class="flex-row objectItem" :class="{'vBackGround': selectServiceObjectIndex === index}"
-                v-for="(item,index) in serviceObjectList" :key="index"
-                @click="selectServiceObjectIndex = index">
-            <image class="objectImage" :src="item.facePhotoUrl || '/static/ud4.png'"></image>
-            <view class="flex-col objectName ">
-              <text>{{ item.nickName }}</text>
+
+
+            <view class="flex-row objectItem" v-for="(item,index) in serviceObjectList" :key="index"  :class="{'vBackGround': selectServiceObjectIndex === index}"  @click="selectServiceObjectIndex = index">
+              <image class="objectImage" :src="item.facePhotoUrl || '/static/ud4.png'"></image>
+              <view class="flex-col objectName ">
+                <text>{{ item.nickName }}</text>
+              </view>
+              <image v-if="selectServiceObjectIndex === index" class="vImage"
+                     src="/static/index/xuanzhong.png"></image>
             </view>
-            <image v-if="selectServiceObjectIndex === index" class="vImage"
-                   src="/static/index/xuanzhong.png"></image>
-          </view>
+
+
+
+
         </scroll-view>
 
         <view class="flex-row justify-around">
@@ -236,6 +240,7 @@ export default {
       inviteOrderId: null,
       inviteActivityId:null,
       isShareMax: false,
+      renewServiceObjectId:null
     }
   },
 
@@ -249,7 +254,12 @@ export default {
     }
   },
   onLoad(e) {
-    console.log(e)
+    console.log('+++++++++++e+++++++++++++',e)
+
+    if (e.renewServiceObjectId){
+      this.renewServiceObjectId = e.renewServiceObjectId
+    }
+
     if (e.id) {
       this.id = e.id
       console.log('上一个页面传递过来的活动ID===>', this.id)
@@ -326,8 +336,17 @@ export default {
       return this.$api.listServiceObject(this.reqParm).then((res) => {
         let serviceObjectList = [];
         res.data.data.forEach(i => {
-          if (i.isSelf != 1) {
-            serviceObjectList.push(i);
+
+          if (this.renewServiceObjectId){
+            if (i.isSelf != 1) {
+              if (this.renewServiceObjectId == i.id){
+                serviceObjectList.push(i);
+              }
+            }
+          }else {
+            if (i.isSelf != 1) {
+              serviceObjectList.push(i);
+            }
           }
         });
         this.$set(this.serviceObjectList, 0, serviceObjectList);
@@ -376,7 +395,7 @@ export default {
         });
         this.isActivityCheck = true
         setTimeout(() => {
-          uni.navigateTo({
+          uni.reLaunch({
             url: '/myPages/myActivity/myActivity'
           })
         }, 2000)
@@ -508,10 +527,14 @@ export default {
       console.log(this.id, '活动ID')
       const data = {
         id: this.id,
-        inviteActivityId:this.inviteActivityId,
         inviteUserId:this.inviteUserId,
         inviteOrderId:this.inviteOrderId,
       }
+
+      if (this.inviteActivityId){
+        data.inviteActivityId = this.inviteActivityId
+      }
+
       this.$api.activityDetail(data).then(res => {
         console.log(res)
         this.activity = res.data.data

orderPages/activityList/activityList.vue

@@ -1,6 +1,6 @@
 <template>
   <view class="page">
-    <mescroll-item ref="MescrollItem" :i="0"  :index="0" :height="windowHeight">
+    <mescroll-item ref="MescrollItem" :i="0"  :index="0" :height="windowHeight" :renewServiceObjectId="renewServiceObjectId">
     </mescroll-item>
   </view>
 </template>
@@ -16,9 +16,16 @@ export default {
   data() {
     return {
       windowHeight: '',
+      renewServiceObjectId: null
+
+
     }
   },
   onLoad(e) {
+    console.log('+++++++++++e++++++++++++++',e)
+    if (e.renewServiceObjectId){
+      this.renewServiceObjectId = e.renewServiceObjectId
+    }
     let sysInfo = uni.getSystemInfoSync()
     this.windowHeight = sysInfo.windowHeight + 'px'
   },
@@ -29,4 +36,4 @@ export default {
 <style lang="scss" scoped>
 @import '/common/css/common.css';
 @import './index.rpx.scss';
-</style>
+</style>

orderPages/activityList/module/mescrollUni-item.vue

@@ -89,6 +89,14 @@ export default {
 		},
 		height: [Number, String], // mescroll的高度
 
+    renewServiceObjectId:{
+      type:String,
+      default(){
+        return null
+      }
+
+    }
+
 	},
 	watch: {
 
@@ -101,7 +109,7 @@ export default {
 
     goDetail(e){
       uni.navigateTo({
-        url:'/orderPages/activityDetail/activityDetail?id=' + e.id
+        url:'/orderPages/activityDetail/activityDetail?id=' + e.id + '&renewServiceObjectId=' + this.renewServiceObjectId
       })
     },
 

orderPages/bookService/index.vue

@@ -297,7 +297,6 @@
 				})
 			},1000*60*5)
 
-      this.getExpireEquityCard();
 		},
 		onShow() {
 
@@ -349,12 +348,32 @@
 
       },
 
-      getExpireEquityCard(){
-        this.$api.getExpireEquityCard().then((res)=>{
+      getExpireEquityCard(serviceObjectId){
+        this.$api.getExpireEquityCard({
+          serviceObjectId:serviceObjectId
+        }).then((res)=>{
           this.expireEquityCard = res.data.data;
           if (this.expireEquityCard.length > 0){
-            this.$refs.showExpireEquityCard.open()
+            uni.showModal({
+              title:'温馨提示',
+              content:'您有' + this.expireEquityCard.length + '张权益卡即将到期',
+              confirmText:'立即续费',
+              success:(res)=>{
+                if (res.confirm) {
+                  console.log('用户点击确定');
+                  uni.navigateTo({
+                    url:'/storePages/myRights/index'
+                  })
+                } else if (res.cancel) {
+                  console.log('用户点击取消');
+                }
+              }
+            })
           }
+
+          // if (this.expireEquityCard.length > 0){
+          //   this.$refs.showExpireEquityCard.open()
+          // }
         })
       },
 
@@ -618,6 +637,7 @@
 					}
 
 				} else {
+          this.getExpireEquityCard(item.id)
 					this.$api.getServicePersonTime({
 						personId: this.serviceTeacherList[0].personId,
 						date: this.periodDate.label,

orderPages/orderDetail/index.vue

@@ -558,7 +558,7 @@
         let discountAmount = 0 //计算订单总优惠金额
         for (const child of this.order.child) {
           if (child.status == 1 || child.status == 8){
-            payAmount += child.payAmount - 0
+            payAmount += child.payAmount ? child.payAmount - 0 : child.servicePrice -0
             discountAmount += child.discountAmount - 0
           }
         }

orderPages/storeService/index.vue

@@ -129,7 +129,7 @@
                 服务对象：{{ item.serviceObjectName || '' }}
               </view>
               <view class="title">
-                适用门店：{{ item.useStoreDesc || '' }} {{ item.use_store_desc || '' }} {{ item.useStoreDesc || '' }} {{ item.useStoreDesc || '' }}
+                适用门店：{{ item.useStoreDesc || '' }}
               </view>
               <view class="title">
                 到期时间：{{ item.effectiveEndTime.slice(0,10) }}
@@ -220,7 +220,6 @@
 				})
 			},1000*60*5)
 
-      this.getExpireEquityCard();
 		},
 		onShow() {
 
@@ -270,12 +269,31 @@
 
       },
 
-      getExpireEquityCard(){
-        this.$api.getExpireEquityCard().then((res)=>{
+      getExpireEquityCard(serviceObjectId){
+        this.$api.getExpireEquityCard({
+          serviceObjectId:serviceObjectId
+        }).then((res)=>{
           this.expireEquityCard = res.data.data;
           if (this.expireEquityCard.length > 0){
-            this.$refs.showExpireEquityCard.open()
+            uni.showModal({
+              title:'温馨提示',
+              content:'您有' + this.expireEquityCard.length + '张权益卡即将到期',
+              confirmText:'立即续费',
+              success:(res)=>{
+                if (res.confirm) {
+                  console.log('用户点击确定');
+                  uni.navigateTo({
+                    url:'/storePages/myRights/index'
+                  })
+                } else if (res.cancel) {
+                  console.log('用户点击取消');
+                }
+              }
+            })
           }
+          // if (this.expireEquityCard.length > 0){
+          //   this.$refs.showExpireEquityCard.open()
+          // }
         })
       },
 
@@ -444,6 +462,7 @@
 					this.orderParam.childService = this.orderParam.childService.filter(selectServiceObject =>
 						selectServiceObject.serviceObjectId !== item.id)
 				} else {
+          this.getExpireEquityCard(item.id)
 					let periodTimeList = JSON.parse(JSON.stringify(this.periodTimeList))
 					periodTimeList.forEach(i=>{
 						this.orderParam.childService.forEach(i1=>{

storePages/myRights/index.vue

@@ -100,20 +100,21 @@
       },
 
       navigateTo(item){
+        console.log('+++++++++++++++++++++++++++++++',item)
         if(item.activityId){
           let list = item.activityId.split(',')
           if (list.length == 1){
             uni.navigateTo({
-              url:'/orderPages/activityDetail/activityDetail?id=' + item.activityId
+              url:'/orderPages/activityDetail/activityDetail?id=' + item.activityId +'&renewServiceObjectId=' + item.serviceObjectId
             })
           }else {
             uni.navigateTo({
-              url:'/orderPages/activityList/activityList'
+              url:'/orderPages/activityList/activityList?renewServiceObjectId=' + item.serviceObjectId
             })
           }
         }else{
           uni.navigateTo({
-            url:'/orderPages/activityList/activityList'
+            url:'/orderPages/activityList/activityList?renewServiceObjectId=' + item.serviceObjectId
           })
         }