From 24b30dbd2fb8887c48f0d1abcd13c39c74501c56 Mon Sep 17 00:00:00 2001
From: Gaoxs <704041637@qq.com>
Date: Tue, 12 Jan 2021 20:09:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=BC=E5=AE=B9=E6=99=AE=E9=80=9A=E5=95=86?=
 =?UTF-8?q?=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/OrderDetails/index.vue    |  2 +-
 pages/order/OrderSubmission/index.vue | 17 ++++++++++-------
 pages/shop/GoodsCon/index.vue         |  2 +-
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/pages/order/OrderDetails/index.vue b/pages/order/OrderDetails/index.vue
index 385da6f..e123b33 100644
--- a/pages/order/OrderDetails/index.vue
+++ b/pages/order/OrderDetails/index.vue
@@ -114,7 +114,7 @@
         <image src="@/static/images/line.jpg" />
       </view>
     </template>
-    <OrderGoods :evaluate="status.type || 0" isIntegral :cartInfo="orderInfo.cartInfo || []"></OrderGoods>
+    <OrderGoods :evaluate="status.type || 0" :isIntegral="isIntegral" :cartInfo="orderInfo.cartInfo || []"></OrderGoods>
     <view class="wrapper">
       <view class="item acea-row row-between">
         <view>订单编号：</view>
diff --git a/pages/order/OrderSubmission/index.vue b/pages/order/OrderSubmission/index.vue
index 18c1109..96e1e74 100644
--- a/pages/order/OrderSubmission/index.vue
+++ b/pages/order/OrderSubmission/index.vue
@@ -44,7 +44,7 @@
         <image src="@/static/images/line.jpg" />
       </view>
     </view>
-    <OrderGoods :evaluate="0" isIntegral :cartInfo="orderGroupInfo.cartInfo"></OrderGoods>
+    <OrderGoods :evaluate="0" :isIntegral="isIntegral" :cartInfo="orderGroupInfo.cartInfo"></OrderGoods>
     <view class="wrapper">
       <view class="item acea-row row-between-wrapper" @click="couponTap" v-if="deduction === false  && !isIntegral">
         <view>优惠券</view>
@@ -53,7 +53,7 @@
           <text class="iconfont icon-jiantou"></text>
         </view>
       </view>
-      <view class="item acea-row row-between-wrapper" v-if="deduction === false && enableIntegral === true">
+      <view class="item acea-row row-between-wrapper" v-if="!isIntegral && deduction === false && enableIntegral === true">
         <view>积分抵扣</view>
         <view class="discount">
           <view class="select-btn">
@@ -65,7 +65,7 @@
                     当前积分
                     <text class="num font-color-red">{{ userInfo.integral || 0 }}</text>
                   </text>
-                  <checkbox value="true" v-if="!isIntegral" :checked="useIntegral ? true : false"></checkbox>
+                  <checkbox value="true" :checked="useIntegral ? true : false"></checkbox>
                 </label>
               </checkbox-group>
             </view>
@@ -101,25 +101,25 @@
         <textarea v-model="mark"></textarea>
       </view>
     </view>
-    <view class="wrapper" v-if="!isIntegral">
+    <view class="wrapper">
       <view class="item">
         <view>支付方式</view>
         <view class="list">
-          <view class="payItem acea-row row-middle" :class="active === 'weixin' ? 'on' : ''" @click="payItem('weixin')"
+          <view class="payItem acea-row row-middle" v-if="!isIntegral" :class="active === 'weixin' ? 'on' : ''" @click="payItem('weixin')"
             v-show="isWeixin">
             <view class="name acea-row row-center-wrapper">
               <view class="iconfont icon-weixin2" :class="active === 'weixin' ? 'bounceIn' : ''"></view>微信支付
             </view>
             <view class="tip">微信快捷支付</view>
           </view>
-          <view class="payItem acea-row row-middle" :class="active === 'weixin' ? 'on' : ''" @click="payItem('weixin')"
+          <view class="payItem acea-row row-middle" v-if="!isIntegral" :class="active === 'weixin' ? 'on' : ''" @click="payItem('weixin')"
             v-show="!isWeixin">
             <view class="name acea-row row-center-wrapper">
               <view class="iconfont icon-weixin2" :class="active === 'weixin' ? 'bounceIn' : ''"></view>微信支付
             </view>
             <view class="tip">微信快捷支付</view>
           </view>
-          <view class="payItem acea-row row-middle" :class="active === 'yue' ? 'on' : ''" @click="payItem('yue')">
+          <view class="payItem acea-row row-middle" v-if="!isIntegral" :class="active === 'yue' ? 'on' : ''" @click="payItem('yue')">
             <view class="name acea-row row-center-wrapper">
               <view class="iconfont icon-icon-test" :class="active === 'yue' ? 'bounceIn' : ''"></view>余额支付
             </view>
@@ -357,6 +357,9 @@
       }
       this.isIntegral = that.$yroute.query.isIntegral == 'true'
       this.useIntegral = this.isIntegral
+      if(this.isIntegral){
+        this.active='integral'
+      }
       if (that.$yroute.query.id !== undefined) {
         that.cartid = that.$yroute.query.id;
         console.log(that.cartid);
diff --git a/pages/shop/GoodsCon/index.vue b/pages/shop/GoodsCon/index.vue
index d4d8edb..1e9c5ff 100644
--- a/pages/shop/GoodsCon/index.vue
+++ b/pages/shop/GoodsCon/index.vue
@@ -184,7 +184,7 @@
       <!-- 优惠券 -->
       <CouponPop v-on:changeFun="changeFun" :coupon="coupon"></CouponPop>
       <!-- 商品规格弹窗 -->
-      <ProductWindow isIntegral v-on:changeFun="changeFun" :attr="attr" :cartNum="cart_num"></ProductWindow>
+      <ProductWindow :isIntegral="isIntegral" v-on:changeFun="changeFun" :attr="attr" :cartNum="cart_num"></ProductWindow>
       <!-- 分享海报 -->
       <StorePoster v-on:setPosterImageStatus="setPosterImageStatus" :posterImageStatus="posterImageStatus"
         :posterData="posterData" :goodId="id"></StorePoster>