feat：优惠券修改

myPages/myActivityDetail/myActivityDetail.vue

@@ -61,7 +61,8 @@
 
           <view class="flex-row ticketList" v-for="(i,index) in activity.couponList">
             <view class="h-text flex-col justify-center ">
-              <text class="money">{{i.discountsPrice}}</text>
+              <text class="money" v-if="i.discountsType == 2">{{i.discount}}折</text>
+              <text class="money" v-else>{{i.discountsPrice}}</text>
               <text class="desc">满{{ i.reachPrice }}可用</text>
             </view>
 

orderPages/activityDetail/activityDetail.vue

@@ -61,7 +61,9 @@
 
           <view class="flex-row ticketList" v-for="(i,index) in activity.couponList">
             <view class="h-text flex-col justify-center ">
-              <text class="money">{{i.discountsPrice}}</text>
+              <text class="money" v-if="i.discountsType == 2">{{i.discount}}折</text>
+              <text class="money" v-else>{{i.discountsPrice}}</text>
+
               <text class="desc">满{{ i.reachPrice }}可用</text>
             </view>
 
@@ -153,14 +155,22 @@
       </view>
     </view>
 
+
+
     <view class="flex-row justify-center inBtnView" >
-      <view class="inBtn" @click="commitOrder" v-if="!isActivityCheck">立即参与</view>
+      <view class="inBtn" @click="beforeCommitOrder" v-if="!isActivityCheck">立即参与</view>
       <view class="inBtn" v-else>已参与</view>
     </view>
 
     <myPay ref="myPay" :selectBlPay="userInfo.balance *1 >= activity.salePrice *1" :balance="userInfo.balance" :totalAmount="activity.salePrice"  :lovePay="false" :blPay="false"
            :orderNo="subOrderNo" @payResult="payResult" @improperClose="improperClose"></myPay>
 
+    <view>
+      <u-picker :show="show" title="选择服务对象" :closeOnClickOverlay="true" @close="show = false" :columns="serviceObjectList"
+                keyName="nickName" @cancel="show = false" @confirm="confirm"></u-picker>
+    </view>
+
+
 
   </view>
 </template>
@@ -179,6 +189,9 @@ export default {
       activity:{},
       requestStatus:false,
       isActivityCheck:true, //是否参与过该活动
+      serviceObjectList:[],
+      show: false,
+      serviceObjectId:null
     }
   },
   onLoad(e) {
@@ -187,9 +200,25 @@ export default {
     console.log('上一个页面传递过来的活动ID',this.id)
     this.activityDetail()
     this.activityCheck()
+    this.listServiceObject()
   },
   methods: {
 
+
+    // 查询服务对像信息列表
+    listServiceObject() {
+      let serviceObjectList = []
+      this.$api.listServiceObject(this.reqParm).then((res) => {
+        res.data.data.forEach(i => {
+          if (i.isSelf != 1) {
+            serviceObjectList.push(i)
+          }
+        })
+        this.serviceObjectList[0] = serviceObjectList
+
+      })
+    },
+
     //支付结果回调
     payResult(e){
       console.log(e)
@@ -212,12 +241,28 @@ export default {
 
     },
 
+    beforeCommitOrder(){
+      if (this.activity.isAddServiceObject == 1){
+        this.show = true
+      }else {
+        this.commitOrder()
+      }
+    },
+
+    confirm(e){
+      console.log(e)
+      this.serviceObjectId = e.value[0].id
+      this.show = false
+
+      this.commitOrder()
+    },
+
 
     //提交订单
     commitOrder() {
-      if (this.subOrderNo){
-        this.$refs.myPay.openPopup()
-      }else {
+      // if (this.subOrderNo){
+      //   this.$refs.myPay.openPopup()
+      // }else {
 
         if (this.requestStatus) {
           return;
@@ -228,6 +273,7 @@ export default {
         });
         this.$api.commonGeneralOrder({
           orderType: 7,
+          serviceObjectId:this.serviceObjectId,
           activityId: this.activity.id,
         }).then(res => {
           console.log('++++++++++++++++++订单提交+++++++++++', res)
@@ -238,7 +284,7 @@ export default {
         }).catch(err => {
           this.requestStatus = false
         })
-      }
+      // }
     },
 
 

orderPages/myCoupon/module/mescrollUni-item.vue

@@ -14,7 +14,8 @@
 					<view class="flex-row justify-start quan" :class="item.state == '0'?'row-list':'listBackground'">
 						<view class="h-text flex-col justify-center ">
 							<view class="money">
-								<text>{{item.discountsPrice}}</text>
+                <text class="money" v-if="item.discountsType == 2">{{item.discount}}折</text>
+                <text class="money" v-else>{{item.discountsPrice}}</text>
 							</view>
 							<view class="desc">
 								<text>满{{item.reachPrice}}可用</text>

orderPages/receiveCoupons/index.vue

@@ -13,7 +13,8 @@
         <view class="row-list flex-row justify-start">
           <view class="h-text flex-col justify-center ">
             <view class="money">
-              <text>{{ item.discountsPrice }}</text>
+              <text class="money" v-if="item.discountsType == 2">{{item.discount}}折</text>
+              <text class="money" v-else>{{item.discountsPrice}}</text>
             </view>
             <view class="desc">
               <text>满{{ item.reachPrice }}可用</text>