diff --git a/pages/cart/coupon/index.vue b/pages/cart/coupon/index.vue
index 9a50764..4ffe267 100644
--- a/pages/cart/coupon/index.vue
+++ b/pages/cart/coupon/index.vue
@@ -1,5 +1,8 @@
 <template>
   <div class="wrapper">
+    <u-tabs :list="list" :is-scroll="false" :active-color="lightColor" :current="current" @change="(i)=>{current = i}">
+    </u-tabs>
+
     <div class="empty" v-if="couponsList.length <= 0">
       <u-empty text="暂无优惠券" mode="coupon"></u-empty>
     </div>
@@ -19,29 +22,40 @@
         <view class="circle circle-bottom"></view>
       </view>
       <view class="right">
-        <view>
+        <view class="desc">
           <view v-if="item.scopeType">
             <span v-if="item.scopeType == 'ALL' && item.id == 'platform'">全平台</span>
             <span v-if="item.scopeType == 'PORTION_CATEGORY'">仅限品类</span>
             <view v-else>{{  item.storeName == 'platform' ? '全平台' :item.storeName+'店铺' }}使用</view>
           </view>
-          <view>有效期至：{{item.endTime}}</view>
+          <view class="reason" v-if="item.reason">{{item.reason}}</view>
+          <view class="end-time">有效期至:{{item.endTime}}</view>
         </view>
         <view class="receive" @click="clickWay(item)">
           <text>立即</text><br />
           <text>使用</text>
         </view>
-        <view class="bg-quan"> 券 </view>
+        <view class="bg-quan">券</view>
       </view>
     </view>
   </div>
 </template>
 <script>
-import { useCoupon, getMemberCanUse } from "@/api/trade.js";
+import { useCoupon } from "@/api/trade.js";
 
 export default {
   data() {
     return {
+      lightColor: this.$lightColor,
+      current: 0,
+      list: [
+        {
+          name: "可用优惠券",
+        },
+        {
+          name: "不可能优惠券",
+        },
+      ],
       couponsList: [], //优惠券集合
       params: {
         //传参
@@ -55,36 +69,26 @@ export default {
       routerVal: "", //上级传参
     };
   },
-  /**
-   * 赋值
-   */
-  onLoad(val) {
-    this.routerVal = val;
-    this.params.scopeId = val.skuId;
-    this.params.storeId = val.storeId;
+  watch: {
+    current(val) {
+      console.log(this.$store.state.cantUseCoupons);
+      val == 0
+        ? (this.couponsList = this.$store.state.canUseCoupons)
+        : (this.couponsList = this.$store.state.cantUseCoupons);
+    },
   },
+
   mounted() {
-    uni.getStorage({
-      key: "totalPrice",
-      success: (res) => {
-        this.params.totalPrice = res.data;
-        this.getCoupons();
-      },
-    });
+    this.init();
   },
 
   methods: {
     /**
-     * 获取优惠券数量
+     * 从vuex中拿取优惠券信息
      */
-    getCoupons() {
-      getMemberCanUse(this.params).then((res) => {
-        if (res.data.success) {
-          this.couponsList = res.data.result.records;
-        }
-      });
+    init() {
+      this.couponsList = this.$store.state.canUseCoupons;
     },
-
     /**
      * 领取优惠券
      */
@@ -109,6 +113,19 @@ export default {
 };
 </script>
 <style scoped lang="scss">
+.desc {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+}
+.end-time,
+.reason {
+  color: #999;
+  line-height: 1.5;
+  font-size: 24rpx;
+}
+
 .empty {
   margin-top: 20px;
   text-align: center;
diff --git a/pages/cart/payment/popup/goods.vue b/pages/cart/payment/popup/goods.vue
index fe906b4..2f7ecec 100644
--- a/pages/cart/payment/popup/goods.vue
+++ b/pages/cart/payment/popup/goods.vue
@@ -1,19 +1,21 @@
 <template>
   <div class="wrapper">
-    <u-popup class="popup" v-model="buyMask" :height="setup.height" closeable :mode="setup.mode" :mask-close-able="isClose" :mask="isMask" :border-radius="setup.radius" @close="closeMask()">
+    <u-popup class="popup" v-model="buyMask" :height="setup.height" closeable :mode="setup.mode"
+      :mask-close-able="isClose" :mask="isMask" :border-radius="setup.radius" @close="closeMask()">
       <!-- 商品 -->
       <view class="goods-box bottom">
         <view class="goods-header">
           <view class="goods-img">
-            <u-image width="200rpx" border-radius="20" class="uimage" height="200rpx" :src="selectedSpecImg ? selectedSpecImg : goodsDetail.thumbnail"></u-image>
+            <u-image width="200rpx" border-radius="20" class="uimage" height="200rpx"
+              :src="selectedSpecImg ? selectedSpecImg : goodsDetail.thumbnail"></u-image>
           </view>
           <view class="goods-skus">
-
             <!-- 有活动商品价格 -->
             <view class="goods-price " v-if="goodsDetail.promotionPrice">
               <span>
                 ￥
-                <span class="goods-price-promotionShow goods-price-bigshow" v-if="goodsDetail.promotionPrice">{{ formatPrice(goodsDetail.promotionPrice)[0] }}</span>
+                <span class="goods-price-promotionShow goods-price-bigshow"
+                  v-if="goodsDetail.promotionPrice">{{ formatPrice(goodsDetail.promotionPrice)[0] }}</span>
                 .{{ formatPrice(goodsDetail.promotionPrice)[1] }}
                 <span></span>
               </span>
@@ -34,7 +36,6 @@
                 formatPrice(goodsDetail.price)[0]
               }}</span>
                 .{{ formatPrice(goodsDetail.price)[1] }}
-
               </span>
             </view>
             <view class="goods-check-skus">
@@ -52,21 +53,24 @@
           <view class="goods-skus-view" :key="specIndex" v-for="(spec, specIndex) in formatList">
             <view class="skus-view-list">
               <view class="view-class-title">{{ spec.name }}</view>
-              <view :class="{ active: spec_val.value == currentSelceted[specIndex] }" class="skus-view-item" v-for="(spec_val, spec_index) in spec.values" :key="spec_index"
+              <view :class="{ active: spec_val.value == currentSelceted[specIndex] }" class="skus-view-item"
+                v-for="(spec_val, spec_index) in spec.values" :key="spec_index"
                 @click="handleClickSpec(spec, specIndex, spec_val)">{{ spec_val.value }}</view>
             </view>
           </view>
           <!-- 数量 -->
           <view class="goods-skus-number">
             <view class="view-class-title">数量</view>
-            <u-number-box :bg-color="numberBox.bgColor" :color="numberBox.color" :input-width="numberBox.width" :input-height="numberBox.height" :size="numberBox.size" :min="1" v-model="num">
+            <u-number-box :bg-color="numberBox.bgColor" :color="numberBox.color" :input-width="numberBox.width"
+              :input-height="numberBox.height" :size="numberBox.size" :min="1" v-model="num">
             </u-number-box>
           </view>
         </view>
         <!-- 按钮 -->
         <view class="btns">
 
-          <view class="box-btn card" v-if="buyType != 'PINTUAN' && goodsDetail.goodsType!='VIRTUAL_GOODS'" @click="addToCartOrBuy('cart')">加入购物车</view>
+          <view class="box-btn card" v-if="buyType != 'PINTUAN' && goodsDetail.goodsType!='VIRTUAL_GOODS'"
+            @click="addToCartOrBuy('cart')">加入购物车</view>
           <view class="box-btn buy" @click="addToCartOrBuy('buy')">立即购买</view>
         </view>
       </view>
@@ -218,6 +222,24 @@ export default {
         });
       }
     },
+
+    /**
+     * 直接购买
+     */
+    buy(data) {
+      API_trade.addToCart(data).then((res) => {
+        if (res.data.success) {
+          uni.navigateTo({
+            url: `/pages/order/fillorder?way=${
+              data.cartType
+            }&addr=${""}&parentOrder=${encodeURIComponent(
+              JSON.stringify(this.parentOrder)
+            )}`,
+          });
+        }
+      });
+    },
+
     formatSku(list) {
       // 格式化数据
 
diff --git a/pages/mine/signIn.vue b/pages/mine/signIn.vue
index 8f2a366..82b2b95 100644
--- a/pages/mine/signIn.vue
+++ b/pages/mine/signIn.vue
@@ -50,16 +50,7 @@
         <text class="close" @click="close">×</text>
       </view>
       <view class="mask-con">
-        <view class="keep-sign">
-          本月已连续签到
-          <text>{{ continuity }}</text>
-          天
-        </view>
         <u-icon size="120" style="margin: 50rpx 0" color="#ff9f28" name="checkmark"></u-icon>
-        <view class="mark">
-          <view>获得积分</view>
-          <text>{{ continuityPoint }}</text>
-        </view>
         <text class="text">连续签到可获得额外奖励哦！</text>
       </view>
     </view>
@@ -71,8 +62,7 @@ import { sign, signTime } from "@/api/point.js";
 export default {
   data() {
     return {
-      continuity: 1, //本月连续签到天数
-      continuityPoint: 2, //获得的积分
+  
       signFlag: false,
       animationData: {},
       maskFlag: false, //
@@ -488,7 +478,7 @@ page {
 
     .mask-con {
       width: 540rpx;
-      height: 460rpx;
+      height: 380rpx;
       background: #fff;
       display: flex;
       flex-direction: column;
diff --git a/pages/order/fillorder.vue b/pages/order/fillorder.vue
index 3eb5c7f..c8a9674 100644
--- a/pages/order/fillorder.vue
+++ b/pages/order/fillorder.vue
@@ -10,7 +10,8 @@
               {{ address.name }}
               <span>
                 {{ address.mobile | secrecyMobile }}
-                <u-tag v-if="address.isDefault" text="默认" style="margin-left: 24rpx" mode="plain" type="error" size="mini" />
+                <u-tag v-if="address.isDefault" text="默认" style="margin-left: 24rpx" mode="plain" type="error"
+                  size="mini" />
               </span>
             </div>
             <div class="userAdress">
@@ -52,17 +53,20 @@
       </view>
       <view class="group">
         <view>
-          <u-image borderRadius="50%" shape="square" class="head-img" width="81rpx" height="81rpx" :src="masterWay.face || '/static/missing-face.png'"></u-image>
+          <u-image borderRadius="50%" shape="square" class="head-img" width="81rpx" height="81rpx"
+            :src="masterWay.face || '/static/missing-face.png'"></u-image>
           <view class="btn-one">团长</view>
         </view>
         <view class="line"> </view>
         <view>
           <!-- 如果有最后一名，显示最后一名，没有最后一名，显示等待参团 -->
-          <u-image class="head-img" v-if="endWay.face" :src="endWay.face" borderRadius="50%" shape="square" width="81rpx" height="81rpx">
+          <u-image class="head-img" v-if="endWay.face" :src="endWay.face" borderRadius="50%" shape="square"
+            width="81rpx" height="81rpx">
             <view slot="loading"></view>
           </u-image>
 
-          <u-image class="head-img" borderRadius="50%" shape="square" v-else width="81rpx" height="81rpx" :src="endWay.face || '/static/missing-face.png'"></u-image>
+          <u-image class="head-img" borderRadius="50%" shape="square" v-else width="81rpx" height="81rpx"
+            :src="endWay.face || '/static/missing-face.png'"></u-image>
 
           <view class="wait">{{ endWay.nickname || "等待参团" }}</view>
         </view>
@@ -78,14 +82,18 @@
       </u-row>
       <div class="promotionNotice">{{ item.promotionNotice }}</div>
       <u-row class="goodsBorder" v-for="(val, i) in item.skuList" :key="i">
-        <u-col class="tabL" :offset="0" @click="navigateTo('/pages/product/goods?id=' + val.goodsSku.id+'&goodsId='+val.goodsSku.goodsId)" :span="3">
+        <u-col class="tabL" :offset="0"
+          @click="navigateTo('/pages/product/goods?id=' + val.goodsSku.id+'&goodsId='+val.goodsSku.goodsId)" :span="3">
           <u-image borderRadius="10rpx" :src="val.goodsSku.thumbnail" alt />
         </u-col>
-        <u-col :span="9" @click="navigateTo('/pages/product/goods?id=' + val.goodsSku.id+'&goodsId='+val.goodsSku.goodsId)" class="tabC">
+        <u-col :span="9"
+          @click="navigateTo('/pages/product/goods?id=' + val.goodsSku.id+'&goodsId='+val.goodsSku.goodsId)"
+          class="tabC">
           <div style="overflow: hidden">
             <p class="sp_name">{{ val.goodsSku.goodsName }}</p>
             <p class="sp_promotion" v-if="val.promotion_tags">
-              <view class="sp_tag sp_tag_plain" v-for="(promotion_item, promotion_index) in val.promotion_tags" :key="promotion_index">{{ promotion_item }}</view>
+              <view class="sp_tag sp_tag_plain" v-for="(promotion_item, promotion_index) in val.promotion_tags"
+                :key="promotion_index">{{ promotion_item }}</view>
             </p>
             <span class="nums">x{{ val.num }}</span>
           </div>
@@ -120,20 +128,22 @@
     <!-- 优惠券 -->
     <div class="box box4">
       <u-row>
-        <u-col v-if="orderMessage.cartTypeEnum != 'VIRTUAL'" :offset="0" :span="9" @click="shippingFlag = true">配送方式</u-col>
+        <u-col v-if="orderMessage.cartTypeEnum != 'VIRTUAL'" :offset="0" :span="9" @click="shippingFlag = true">配送方式
+        </u-col>
         <u-col v-if="orderMessage.cartTypeEnum != 'VIRTUAL'" :span="3" textAlign="right" @click="shippingFlag = true">
-          {{   shippingMethod.find(e=>{  return e.value == shippingText; }).label }}
+          {{shippingMethod.find(e=>{  return e.value == shippingText; }).label }}
         </u-col>
       </u-row>
       <u-row>
         <u-col :offset="0" :span="9" @click="GET_Discount()">优惠券</u-col>
 
-        <u-col :span="3" v-if="orderMessage.priceDetailDTO && orderMessage.priceDetailDTO.couponPrice" textAlign="right" @click="GET_Discount()">
-          <span class="main-color">-{{orderMessage.priceDetailDTO.couponPrice | unitPrice}}</span>
+        <u-col :span="3" v-if="orderMessage.priceDetailDTO && orderMessage.priceDetailDTO.couponPrice" textAlign="right"
+          @click="GET_Discount()">
+          <span class="main-color">-￥{{orderMessage.priceDetailDTO.couponPrice | unitPrice}}</span>
         </u-col>
         <!--  orderMessage.priceDetailDTO.couponPrice | unitPrice  -->
         <u-col :span="3" v-else textAlign="right" @click="GET_Discount()">
-          {{ couponNums || "0" }}张可用
+          {{ orderMessage.canUseCoupons.length || "0" }}张可用
           <u-icon name="arrow-right"></u-icon>
         </u-col>
       </u-row>
@@ -153,7 +163,8 @@
         <u-row>
           <u-col v-if="orderMessage.cartTypeEnum != 'VIRTUAL'" :span="7">运费</u-col>
           <u-col v-if="orderMessage.cartTypeEnum != 'VIRTUAL'" :span="5" class="tr tipsColor" textAlign="right">
-            <u-tag v-if="orderMessage.priceDetailDTO.freightPrice == 0" style="margin-right: 20rpx" color="#FF6262" text="包邮" type="warning" size="mini" mode="plain" shape="circle" />
+            <u-tag v-if="orderMessage.priceDetailDTO.freightPrice == 0" style="margin-right: 20rpx" color="#FF6262"
+              text="包邮" type="warning" size="mini" mode="plain" shape="circle" />
             <span v-else>￥{{
                 orderMessage.priceDetailDTO.freightPrice | unitPrice
               }}</span>
@@ -171,8 +182,9 @@
         <u-row>
           <u-col :span="6">活动优惠</u-col>
           <u-col :span="6" class="tr tipsColor" textAlign="right">
-            <u-tag style="margin-right: 20rpx" v-if="orderMessage.priceDetailDTO.discountPrice != 0" color="#FF6262" :text="`优惠 ${orderMessage.priceDetailDTO.discountPrice} 元`" type="warning"
-              size="mini" mode="plain" shape="circle" />
+            <u-tag style="margin-right: 20rpx" v-if="orderMessage.priceDetailDTO.discountPrice != 0" color="#FF6262"
+              :text="`优惠 ${orderMessage.priceDetailDTO.discountPrice} 元`" type="warning" size="mini" mode="plain"
+              shape="circle" />
             <span>{{
               orderMessage.priceDetailDTO.discountPrice | unitPrice
             }}</span>
@@ -183,7 +195,8 @@
 
     <!-- 配送地区没有提示 -->
     <div class="notSupportFreight" v-if="notSupportFreight.length !=0">
-      <u-notice-bar style="width:100%" :volume-icon="false" mode="horizontal" :list="notSupportFreightGoodsList"></u-notice-bar>
+      <u-notice-bar style="width:100%" :volume-icon="false" mode="horizontal" :list="notSupportFreightGoodsList">
+      </u-notice-bar>
     </div>
 
     <!-- 结账 -->
@@ -194,7 +207,8 @@
           ¥
           <span>{{ orderMessage.priceDetailDTO.flowPrice | unitPrice }}</span>
         </span>
-        <span v-else class="number"><span style="margin-right:10rpx;">{{orderMessage.priceDetailDTO.payPoint | unitPrice }}</span>积分</span>
+        <span v-else class="number"><span
+            style="margin-right:10rpx;">{{orderMessage.priceDetailDTO.payPoint | unitPrice }}</span>积分</span>
       </div>
       <div class="navRiv" @click="createTradeFun()">
         <!-- #ifndef MP-WEIXIN -->
@@ -278,7 +292,6 @@ export default {
     },
   },
 
-
   /**
    * 监听返回
    */
@@ -512,8 +525,6 @@ export default {
 
     // 获取结算参数
     getOrderList() {
-      // 获取购物车可用优惠券
-      this.getCartsCouponNums();
       // 获取结算参数
       API_Trade.getCheckoutParams(this.routerVal.way).then((res) => {
         res.data.result.cartList.forEach((item, index) => {
@@ -523,6 +534,12 @@ export default {
           };
         });
         this.orderMessage = res.data.result;
+        /**
+         * 为了避免路径传值在h5中超出限制问题
+         * 这块将可用的优惠券以及不可用的优惠券放入到vuex里面进行存储
+         */
+        this.$store.state.canUseCoupons = res.data.result.canUseCoupons;
+        this.$store.state.cantUseCoupons = res.data.result.cantUseCoupons;
 
         if (!res.data.result.memberAddress.id) {
           // 获取会员默认地址
@@ -546,15 +563,6 @@ export default {
       });
     },
 
-    /**购物车可用优惠券 */
-    getCartsCouponNums() {
-      API_Trade.getCartCouponNum(this.routerVal.way).then((res) => {
-        if (res.data.success) {
-          this.couponNums = res.data.result;
-        }
-      });
-    },
-
     //
   },
 };
diff --git a/pages/promotion/bargain/detail.vue b/pages/promotion/bargain/detail.vue
index e75862e..6c692fa 100644
--- a/pages/promotion/bargain/detail.vue
+++ b/pages/promotion/bargain/detail.vue
@@ -15,7 +15,8 @@
                 {{bargainDetail.goodsName}}
               </div>
               <div class="flex price-box">
-                <div class="purchase-price">当前:<span>￥{{ activityData.surplusPrice == 0 ? this.bargains.purchasePrice :  activityData.surplusPrice | unitPrice}}</span>
+                <div class="purchase-price">
+                  当前:<span>￥{{ activityData.surplusPrice == 0 ? this.bargains.purchasePrice :  activityData.surplusPrice | unitPrice}}</span>
                 </div>
                 <div class="max-price">原价:<span>￥{{ bargainDetail.price | unitPrice}}</span>
 
@@ -26,7 +27,8 @@
           </div>
           <!-- 砍价进度 -->
           <div class="bargain-progress">
-            <u-line-progress class="line" :active-color="lightColor" striped striped-active :percent="totalPercent"></u-line-progress>
+            <u-line-progress class="line" :active-color="lightColor" striped striped-active :percent="totalPercent">
+            </u-line-progress>
             <div class="flex tips">
               <div>已砍{{cutPrice}}元</div>
               <div>还剩{{activityData.surplusPrice}}元</div>
@@ -37,10 +39,11 @@
             邀请砍价
           </div>
           <!-- 立即购买 -->
-
           <div class="buy" v-else @click="getGoodsDetail">
             立即购买
           </div>
+          <!-- 我要开团 -->
+          <div class="start" v-if="activityData.memberId != $options.filters.isLogin().id"  @click="startOpenGroup">我要开团</div>
         </div>
       </div>
       <!-- 帮砍列表 -->
@@ -73,9 +76,11 @@
       </div>
 
       <!-- 砍价 -->
-      <u-modal title="恭喜您砍掉了" v-model="Bargaining" mask-close-able :show-confirm-button="false" :title-style="{color: lightColor}">
+      <u-modal title="恭喜您砍掉了" v-model="Bargaining" mask-close-able :show-confirm-button="false"
+        :title-style="{color: lightColor}">
         <view class="slot-content">
-          <u-count-to :start-val="0" ref="uCountTo" font-size="100" :color="lightColor" :end-val="kanjiaPrice" :decimals="2" :autoplay="autoplay"></u-count-to><span class="price">元</span>
+          <u-count-to :start-val="0" ref="uCountTo" font-size="100" :color="lightColor" :end-val="kanjiaPrice"
+            :decimals="2" :autoplay="autoplay"></u-count-to><span class="price">元</span>
         </view>
       </u-modal>
       <!-- 帮砍 -->
@@ -88,13 +93,14 @@
       </u-modal>
 
       <!-- 分享 -->
-      <shares @close="closeShare" :link="'/pages/promotion/bargain/detail?id='+routerVal.id+'&activityId='+activityData.id" type="kanjia" :thumbnail="bargainDetail.thumbnail"
-        :goodsName="bargainDetail.goodsName" v-if="shareFlage " />
+      <shares @close="closeShare"
+        :link="'/pages/promotion/bargain/detail?id='+routerVal.id+'&activityId='+activityData.id" type="kanjia"
+        :thumbnail="bargainDetail.thumbnail" :goodsName="bargainDetail.goodsName" v-if="shareFlage " />
 
       <!-- 购买 -->
 
-      <popupGoods  ref="popupGoods" :buyMask="maskFlag" @closeBuy="closePopupBuy" :goodsDetail="bargainDetail" :goodsSpec="goodsSpec" v-if="bargainDetail.id "
-        @handleClickSku="getGoodsDetail" />
+      <popupGoods ref="popupGoods" :buyMask="maskFlag" @closeBuy="closePopupBuy" :goodsDetail="bargainDetail"
+        :goodsSpec="goodsSpec" v-if="bargainDetail.id " @handleClickSku="getGoodsDetail" />
 
       <!-- 产品详情 -->
       <div class=" box4">
@@ -201,6 +207,12 @@ export default {
     },
   },
   methods: {
+    // 跳转选择商品页面
+    startOpenGroup() {
+      uni.redirectTo({
+        url: `/pages/promotion/bargain/list`,
+      });
+    },
     closePopupBuy(val) {
       this.maskFlag = false;
     },
@@ -360,7 +372,23 @@ page {
     font-weight: bold;
   }
 }
+.bargaining,
+.buy,
+.start {
+  font-size: 24rpx;
 
+  width: 80%;
+  margin: 50rpx auto 0 auto;
+  text-align: center;
+
+  font-size: 30rpx;
+  padding: 18rpx;
+  border-radius: 100px;
+}
+.start {
+  border: 1rpx solid $main-color;
+  color: $main-color;
+}
 .bargaining,
 .buy {
   font-size: 24rpx;