Refact(优惠券):优惠券重构

pages/order/OrderSubmission/index.vue

@@ -251,6 +251,7 @@
         v-if="couponList.usable.length > 0"
         :two-list="couponList"
         @change="changeCoupons"
+        :show-tab="false"
       />
     </u-popup>
     <!-- v9 优惠券结束 -->

pages/shop/GoodsCon/index.vue

@@ -171,7 +171,7 @@
 
         <!-- v9 优惠券开始 -->
         <u-popup :show="show" :round="10" mode="bottom" closeOnClickOverlay @close="changeCoupons()">
-          <CouponsPopup :two-list="couponList" @change="changeCoupons"/>
+          <CouponsPopup :two-list="couponList" @change="changeCoupons" :showTab="false" :currentPrice="storeInfo.price" />
         </u-popup>
         <!-- v9 优惠券结束 -->
 
@@ -255,8 +255,8 @@
             </view>
             <!-- <view class="value red">销量：{{ storeInfo.sales }}</view> -->
           </view>
-
-          <view class="cell flex jc-between ai-center" v-if="storeInfo.guarantee">
+          <!-- v-if="storeInfo.guarantee" -->
+          <view class="cell flex jc-between ai-center" v-if="storeInfo.guarantee" @click="showService">
             <view class="flex ai-center" >
               <view class="after-title flex-0 v12-dark-text v12-font-28 v12-align-center">
                 <image class="logo" :src="webUrl+'/orderIcon/服务.png'" mode="" style="margin-right:0; width: 32rpx; height:32rpx"/>
@@ -447,6 +447,7 @@
           :product-value-arr="productValueArr"
           :cartNum="cart_num"
         />
+        <ServiceWin ref="serviceWin" :info="storeInfo.guarantee" />
         <StorePoster v-on:setPosterImageStatus="setPosterImageStatus" :posterImageStatus="posterImageStatus"
                      :posterData="posterData" :goodId="id"></StorePoster>
         <ShareInfo v-on:setShareInfoStatus="setShareInfoStatus" :shareInfoStatus="shareInfoStatus"></ShareInfo>
@@ -478,6 +479,7 @@ import ProductWindow from "@/components/ProductWindow";
 import StorePoster from "@/components/StorePoster";
 import ShareInfo from "@/components/ShareInfo";
 import CountDown from "@/components/CountDown";
+import ServiceWin from "@/components/ServiceWin";
 import {getCartCount, getProductCode, getProductDetail, postCartAdd} from "@/api/store";
 import {userBindParent} from "@/api/user";
 import {handleQrCode, isWeixin} from "@/utils";
@@ -501,7 +503,8 @@ export default {
     ProductWindow,
     StorePoster,
     ShareInfo,
-    CouponsPopup
+    CouponsPopup,
+    ServiceWin
   },
   mixins: [pageListenMixins],
   data: function () {
@@ -728,6 +731,9 @@ export default {
     }
   },
   methods: {
+    showService() {
+      this.$refs.serviceWin.show = true
+    },
     toQualifications() {
       const merInfo = {
         name: this.storeInfo.merName,