From 917ae930b20c038059bfdbf66f73e69ae5f80a25 Mon Sep 17 00:00:00 2001
From: 396316021 <396316021@qq.com>
Date: Wed, 22 Nov 2023 16:41:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/CardDetail/index.vue  | 11 +++++++++--
 pages/OrderPage/index.vue   | 20 ++++++++++++++------
 pages/UserCoupons/index.vue |  5 ++++-
 3 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/pages/CardDetail/index.vue b/pages/CardDetail/index.vue
index f49dd80..ff0ce8a 100644
--- a/pages/CardDetail/index.vue
+++ b/pages/CardDetail/index.vue
@@ -94,7 +94,8 @@
       </view>
       <view class="foot-menu-title">
         <text @click="readInfo = !readInfo">我已阅读并同意</text>
-        <text class="foot-menu-url" @click="showAgreement">《付费权益卡协议》</text>
+        <text class="foot-menu-url" v-if="cardDetail.order_type === 1" @click="showAgreement">《付费权益卡协议》</text>
+        <text class="foot-menu-url" v-else @click="showAgreement">《上门洗护次卡协议》</text>
       </view>
     </view>
     <view>
@@ -321,8 +322,14 @@ export default {
       this.petChecked.splice(index, 1);
     },
     showAgreement() {
+      let type;
+      if(this.type == 1){
+        type = 'PayCardPolicy';
+      }else{
+        type = 'bathe_card';
+      }
       getConfig('PayCardPolicy').then(res => {
-        this.PayCardPolicy = res.data.PayCardPolicy;
+        this.PayCardPolicy = res.data[type];
       })
       this.$refs.agreement.open();
     },
diff --git a/pages/OrderPage/index.vue b/pages/OrderPage/index.vue
index 655140c..9e8aacf 100644
--- a/pages/OrderPage/index.vue
+++ b/pages/OrderPage/index.vue
@@ -90,7 +90,7 @@
               </view>
               <view class="item-content row col">
                 <view class="item-content-text" v-if="coupons.length === 0">
-                  <u-text text="请选择优惠券" size="28" color="#636363" @click="navTo('/pages/UserCoupons/index?type=select')"></u-text>
+                  <u-text text="请选择优惠券" size="28" color="#636363" @click="navTo('/pages/UserCoupons/index?type=select&order_type='+type)"></u-text>
                 </view>
                 <view class="item-content-text" v-else>
                   <view class="item-content-tag" style="margin-bottom:10rpx;" v-for="(item,index) in coupons">
@@ -218,7 +218,7 @@
           ></u-checkbox>
         </view>
         <view class="foot-menu-title">
-          <text @click="readInfo = !readInfo">阅读并同意</text><text class="foot-menu-url" @click="showAgreement">《上门喂养协议》</text>
+          <text @click="readInfo = !readInfo">阅读并同意</text><text class="foot-menu-url" @click="showAgreement">《上门{{ type==1?'喂养':'洗护' }}协议》</text>
         </view>
       </view>
     </view>
@@ -271,13 +271,15 @@
 
 <!--        <u-text text="协议内容" size="38" color="#191919"></u-text>-->
         <view class="" style="position: relative;display:inline-block;">
-          <view style="color:#191919;font-size:38rpx;display:inline-block;position: relative;z-index: 2;">喂养协议</view>
+          <view v-if="type===1" style="color:#191919;font-size:38rpx;display:inline-block;position: relative;z-index: 2;">喂养协议</view>
+          <view v-else style="color:#191919;font-size:38rpx;display:inline-block;position: relative;z-index: 2;">洗护协议</view>
           <view class="background" style="width:100%;height:50%;position: absolute;bottom:0;left:0;background-color:rgba(227, 191, 119, 0.6);display:inline-block;z-index:1;"></view>
         </view>
       </view>
     </view>
     <view style="padding:30rpx;max-height:700rpx;overflow: auto;">
-      <view style="height:200rpx;display: flex;align-items: center;">是否同意 <text @click="showAgreement" style="color:#4DC3B8;">《上门喂养协议》</text></view>
+      <view v-if="type == 1" style="height:200rpx;display: flex;align-items: center;">是否同意 <text @click="showAgreement" style="color:#4DC3B8;">《上门喂养协议》</text></view>
+      <view v-else style="height:200rpx;display: flex;align-items: center;">是否同意 <text @click="showAgreement" style="color:#4DC3B8;">《上门洗护协议》</text></view>
       <MzButton title="确认" @click="agreeHandle" button-color="#4DC3B8" font-color="#fff"></MzButton>
     </view>
   </uv-popup>
@@ -850,8 +852,14 @@
         this.$refs.doDatePopup.open();
       },
       showAgreement(){
-        getConfig('FeedPolicy').then(res => {
-          this.feedPolicy = res.data.FeedPolicy;
+        let type;
+        if(this.type == 1){
+          type = 'FeedPolicy';
+        }else{
+          type = 'bathe_info';
+        }
+        getConfig(type).then(res => {
+          this.feedPolicy = res.data[type];
         })
         this.$refs.agreement.open();
       },
diff --git a/pages/UserCoupons/index.vue b/pages/UserCoupons/index.vue
index 8b77bdd..afc01f5 100644
--- a/pages/UserCoupons/index.vue
+++ b/pages/UserCoupons/index.vue
@@ -150,10 +150,12 @@
 				status:'loadmore',
         navToUrl:'',
         couponsContent:'',
+        order_type:1,
 			}
 		},
 		onLoad(option) {
       this.type = option.type||'lists'
+      this.order_type = option.order_type|| 1
       console.log(this.type)
       this.navToUrl = option.url || ''
 		},
@@ -192,7 +194,8 @@
         userCoupons({
           page:page,
 					limit:10,
-					is_buy:this.couponType
+					is_buy:this.couponType,
+          order_type:this.order_type,
         }).then((res) => {
 					let couponsList = res.data.map((row) => {
 						return {