commit

App.vue

@@ -152,4 +152,10 @@ page {
 .placeholder {
     color: #999999;
 }
+
+// iphoneX 下巴手机专用占位
+.reserved{
+    height: 50rpx;
+}
+
 </style>

components/cm-module/cm-cart-product/cm-cart-product.vue

@@ -66,9 +66,9 @@
                 </view>
             </view>
             <!-- 合计价格 -->
-            <view class="total" v-if="isNormal && !isDelete">
+            <!-- <view class="total" v-if="isNormal && !isDelete">
                 <text class="title">合计：</text> <text class="price">￥{{ data.totalPrice | formatPrice }}</text>
-            </view>
+            </view> -->
         </template>
         <!-- 促销活动弹窗 -->
         <activi-popup :product="handlerPros" :popupShow="popupShow"></activi-popup>

components/cm-module/cm-goods-nav/cm-goods-nav.vue

@@ -8,6 +8,7 @@
                 :buttonGroup="buttonGroup"
                 @click="onClick"
                 @buttonClick="buttonClick"
+                :navType="navType"
             />
         </view>
         <cm-drawer :visible="countVisible" @close="drawerClose" position="bottom">
@@ -47,14 +48,16 @@ export default {
     },
     filters: {
         priceFormat(price) {
+            if (!price) return ''
             return Number(price).toFixed(2)
         }
     },
     data() {
         return {
             count: 1,
+            navType: 2,
             countVisible: false,
-            buyRetailPrice: 0,
+            buyPrice: 0,
             btnClickType: -1,
             options: [
                 {
@@ -74,33 +77,41 @@ export default {
                     infoColor: '#ffffff'
                 }
             ],
-            buttonGroup: [
-                {
-                    text: '加入购物车',
-                    backgroundColor: '#FFEFF4',
-                    color: '#FF457B'
-                },
-                {
-                    text: '立即购买',
-                    backgroundColor: 'linear-gradient(90deg, #FC32B4 0%, #F83C6C 100%)',
-                    color: '#fff'
-                }
-            ]
+
+            leftButton: {
+                text: '加入购物车',
+                price: 1000,
+                backgroundColor: '#FFEFF4',
+                color: '#FF457B'
+            },
+
+            rightButton: {
+                text: '立即购买',
+                price: 800,
+                backgroundColor: 'linear-gradient(90deg, #FC32B4 0%, #F83C6C 100%)',
+                color: '#fff'
+            }
         }
     },
     computed: {
-        ...mapGetters(['isIphoneX', 'kindCount', 'hasLogin'])
+        ...mapGetters(['isIphoneX', 'kindCount', 'hasLogin']),
+        buttonGroup() {
+            return [this.leftButton, this.rightButton]
+        },
+        buyRetailPrice() {
+            return this.processActivityPrice()
+        }
     },
     watch: {
         kindCount(newCount) {
             this.options[2].info = newCount
         },
-        count() {
-            if (!this.productInfo) return
-            this.processActivityPrice()
-        },
-        countVisible(newVal) {
-            if (newVal) this.processActivityPrice()
+        productInfo: {
+            deep: true,
+            handler: function(nVal) {
+                console.log(nVal)
+                this.resetButtonInfo()
+            }
         }
     },
     created() {
@@ -109,6 +120,21 @@ export default {
     },
     methods: {
         ...mapActions('cart', ['addToCart', 'getCartNumber']),
+
+        // 处理购买按钮信息
+        resetButtonInfo() {
+            if (this.navType === 1) {
+                this.leftButton.text = '加入购物车'
+                this.rightButton.text = '立即购买'
+            }
+            if (this.navType === 2) {
+                this.leftButton.text = '单独购买'
+                this.leftButton.price = this.buyRetailPrice
+                this.rightButton.text = '拼团购买'
+                this.rightButton.price = this.productInfo.price
+            }
+        },
+
         countChange(value) {
             this.count = value
         },
@@ -136,16 +162,24 @@ export default {
         buttonClick(e) {
             this.countVisible = true
             this.btnClickType = e.index
-            this.processActivityPrice()
         },
         // 确认
         confirm() {
             this.countVisible = false
-            const clickFns = {
-                0: this.joinCart,
-                1: this.buyNow
+            if(this.navType === 1){
+                const clickFns = {
+                    0: this.joinCart,
+                    1: this.buyNow
+                }
+                clickFns[this.btnClickType]()
+            }
+            if(this.navType === 2){
+                const clickFns = {
+                    0: this.buyNow,
+                    1: this.buyGroupNow
+                }
+                clickFns[this.btnClickType]()
             }
-            clickFns[this.btnClickType]()
         },
         // 跳转首页
         toHome() {
@@ -189,16 +223,22 @@ export default {
             )
             this.countVisible = false
         },
+        // 拼团购买
+        buyGroupNow(){
+            if (!this.hasLogin) return this.toLogin()
+            console.log('拼团购买')
+            this.countVisible = false
+        },
         //单独处理活动价格和阶梯价格
         processActivityPrice() {
-            this.buyRetailPrice = this.productInfo.price
             if (this.productInfo.activeStatus === 1 && this.productInfo.ladderList) {
                 this.productInfo.ladderList.forEach((item, index) => {
                     if (this.count >= item.buyNum) {
-                        this.buyRetailPrice = item.buyPrice
+                        return item.buyPrice
                     }
                 })
             }
+            return this.productInfo.price
         }
     }
 }

components/cm-module/cm-product-price/cm-product-price.vue

@@ -2,14 +2,17 @@
     <!-- 价格区域 -->
     <view class="cm-product-price">
         <view class="price">
-            <text class="small">￥</text><text class="big">{{ bigPrice }}</text
-            ><text class="small">{{ smallPrice }}</text>
+            <text class="small">￥</text>
+            <text class="big">{{ bigPrice }}</text>
+            <text class="small">{{ smallPrice }}</text>
+            <text class="delete">{{ productInfo.price }}</text>
         </view>
         <view class="tags">
             <view class="tag type1" v-if="productInfo.heUserId !== 0">促销</view>
             <template v-if="productInfo.activeStatus === 1">
                 <view class="tag type2" v-if="productInfo.ladderList" @click="drawerVisible = true">活动价</view>
             </template>
+            <view class="tag type1">2人拼团</view>
         </view>
 
         <cm-drawer :visible="drawerVisible" position="bottom" @close="drawerClose">
@@ -77,21 +80,30 @@ export default {
         .big {
             font-size: 48rpx;
         }
+        .delete{
+            font-size: 26rpx;
+            color: #999999;
+            text-decoration: line-through;
+            font-weight: normal;
+            margin-left: 10rpx;
+        }
     }
     .tags {
         display: flex;
         justify-content: flex-start;
         align-items: center;
         margin-left: 24rpx;
+        margin-top: 10rpx;
         .tag {
             display: flex;
             justify-content: center;
             align-items: center;
-            height: 30rpx;
+            height: 32rpx;
             margin-right: 8rpx;
             font-size: 22rpx;
+            line-height: 32rpx;
             &.type1 {
-                width: 56rpx;
+                padding: 0 8px;
                 background: #ff457b;
                 border-radius: 4rpx;
                 color: #ffffff;
@@ -99,7 +111,7 @@ export default {
             &.type2 {
                 width: 80rpx;
                 background: url(https://static.caimei365.com/app/mini-hehe/icon/icon-active.png) top center no-repeat;
-                background-size: 80rpx 30rpx;
+                background-size: 80rpx 32rpx;
                 color: #f83c6c;
             }
         }

components/cm-module/cm-product/cm-product.vue

@@ -9,14 +9,18 @@
             <!-- 标签 -->
             <view class="tags">
                 <!-- <view class="tag type1">自营</view> -->
+                <view class="tag type3">拼团价</view>
                 <view class="tag type2" v-if="data.activeStatus == 1">活动价</view>
                 <view class="tag type2" v-if="data.couponsLogo">优惠券</view>
             </view>
             <!-- 底部 -->
             <view class="footer">
                 <!-- 价格 -->
-                <view class="price">￥{{ data.price | priceFormat }}</view>
-                <!-- 加入购物车 -->
+                <view class="price">
+                    <text>￥{{ data.price | priceFormat }}</text>
+                    <text class="delete">￥{{ data.price | priceFormat }}</text>
+                </view>
+                <!-- 加入购物车 --> 
                 <view class="add-cart iconfont icon-gouwuche" @click.stop="addCart"></view>
             </view>
         </view>
@@ -45,10 +49,10 @@ export default {
             })
         },
         // 加入购物车
-        addCart(){
+        addCart() {
             this.$store.dispatch('cart/addToCart', { productId: this.data.productId })
         }
-    } 
+    }
 }
 </script>
 
@@ -119,13 +123,21 @@ $grid: 24rpx;
                 background-size: 80rpx 30rpx;
                 color: #f83c6c;
             }
+            &.type3 {
+                width: 80rpx;
+                background: linear-gradient(270deg, #ff457b 0%, #b03bb8 51%, #6431f2 100%);
+                color: #fff;
+                border-radius: 4rpx;
+            }
         }
     }
     .footer {
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
+        position: relative;
+        
         .add-cart {
+            position: absolute;
+            bottom: 0;
+            right: $grid;
             display: flex;
             justify-content: center;
             align-items: center;
@@ -136,10 +148,23 @@ $grid: 24rpx;
             border-radius: 50%;
         }
         .price {
-            flex: 1;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            display: -webkit-box;
+            -webkit-line-clamp: 1; // 这里控制几行显示省略号
+            -webkit-box-orient: vertical;
+            box-sizing: border-box;
+            padding-right: $grid;
             font-size: 26rpx;
             font-weight: 600;
             color: #f83c6c;
+            .delete{
+                font-size: 20rpx;
+                color: #999999;
+                text-decoration: line-through;
+                font-weight: normal;
+                margin-left: 10rpx;
+            }
         }
     }
 }

components/cm-module/createOrder/address.vue

@@ -80,6 +80,7 @@
 		height: auto;
 		background: #FFFFFF;
 		border-top: 1px solid #F8F8F8;
+        overflow: hidden;
 		image{
 			float: left;
 			width: 100%;

components/cm-module/createOrder/goodsList.vue

@@ -15,10 +15,13 @@
 						<view class="pros-product">
 							<view class="producttitle">{{ pros.productName }}</view>
 							<view class="productspec">规格:{{ pros.unit }}</view>
-							<view class="floor-item-act" v-if="pros.activeStatus == 1">
-								<text class="tag tag-01" v-if="!pros.heUserId">自营</text>
-								<text class="tag tag-01" v-else>促销</text>
-								<text class="tag tag-02" >活动价</text>
+							<view class="floor-item-act">
+								<template v-if="pros.activeStatus == 1">
+								    <text class="tag tag-01" v-if="!pros.heUserId">自营</text>
+								    <text class="tag tag-01" v-else>促销</text>
+								    <text class="tag tag-02" >活动价</text>
+								</template>
+                                <text class="tag tag-03" >拼团价</text>
 							</view>
 							<view class="productprice">
 								<view class="price">
@@ -274,6 +277,12 @@
 							background-color: #f83c6c;
 							border-radius: 4rpx;
 						}
+                        &.tag-03{
+                            width: 80rpx;
+                            background: linear-gradient(270deg, #ff457b 0%, #b03bb8 51%, #6431f2 100%);
+                            color: #fff;
+                            border-radius: 4rpx;
+                        }
 					}
 				}
 			}

components/uni-components/uni-goods-nav/uni-goods-nav.vue

@@ -58,16 +58,31 @@
                 </template>
             </view>
             <view :class="{ 'uni-tab__right': fill }" class="flex uni-tab__cart-sub-right ">
-                <view
-                    v-for="(item, index) in buttonGroup"
-                    :key="index"
-                    :style="{ background: item.backgroundColor, color: item.color }"
-                    class="flex uni-tab__cart-button-right"
-                    @click="buttonClick(index, item)"
-                    ><text :style="{ color: item.color }" class="uni-tab__cart-button-right-text">{{
-                        item.text
-                    }}</text></view
-                >
+                <!-- 按钮类型1 -->
+                <template v-if="navType === 1">
+                    <view
+                        v-for="(item, index) in buttonGroup"
+                        :key="index"
+                        :style="{ background: item.backgroundColor, color: item.color }"
+                        class="flex uni-tab__cart-button-right"
+                        @click="buttonClick(index, item)"
+                    >
+                        <text :style="{ color: item.color }" class="uni-tab__cart-button-right-text">{{ item.text }}</text>
+                    </view>
+                </template>
+                <!-- 按钮类型2 -->
+                <template v-if="navType === 2">
+                    <view
+                        v-for="(item, index) in buttonGroup"
+                        :key="index"
+                        :style="{ background: item.backgroundColor, color: item.color }"
+                        class="flex uni-tab__cart-button-right"
+                        @click="buttonClick(index, item)"
+                    >
+                        <text :style="{ color: item.color }" class="uni-tab__cart-button-right-text has-price">{{ item.price }}</text>
+                        <text :style="{ color: item.color }" class="uni-tab__cart-button-right-text has-price">{{ item.text }}</text>
+                    </view>
+                </template>
             </view>
         </view>
     </view>
@@ -92,6 +107,10 @@ export default {
     name: 'UniGoodsNav',
     emits: ['click', 'buttonClick'],
     props: {
+        navType: {
+            type: Number,
+            default: 1
+        },
         options: {
             type: Array,
             default() {
@@ -234,6 +253,9 @@ export default {
 .uni-tab__cart-button-right-text {
     font-size: $uni-font-size-base;
     color: #fff;
+    &.has-price{
+        font-size: 26rpx;
+    }
 }
 
 .uni-tab__cart-button-right:active {

pages.json

@@ -197,6 +197,49 @@
                     }
                 }
             ]
+        },
+        {
+            "root": "pages/fight-order",
+            "pages": [{
+                "path": "fight-detail",
+                "style": {
+                    "navigationBarTitleText": "拼单详情"
+                }
+            }, {
+                "path": "fight-share-entry",
+                "style": {
+                    "navigationBarTitleText": "拼单"
+                }
+            }]
+        },
+        // 新订单模块
+        {
+            "root": "pages/order",
+            "pages": [{
+                    "path": "create-order",
+                    "style": {
+                        "navigationBarTitleText": "创建订单"
+                    }
+                },
+                {
+                    "path": "order-list",
+                    "style": {
+                        "navigationBarTitleText": "订单列表"
+                    }
+                },
+                {
+                    "path": "order-detail",
+                    "style": {
+                        "navigationBarTitleText": "订单详情"
+                    }
+                },
+                {
+                    "path": "order-logistics",
+                    "style": {
+                        "navigationBarTitleText": "物流信息"
+                    }
+                }
+            ]
         }
     ],
 

pages/goods/product-detail.vue

@@ -66,13 +66,13 @@
             </view>
         </template>
         <!-- 商品导航 -->
-        <cm-goods-nav :productInfo="productInfo"></cm-goods-nav>
+        <cm-goods-nav :product-info="productInfo"></cm-goods-nav>
         <!-- 回到顶部 -->
         <tui-scroll-top :scrollTop="scrollTop" :bottom="0" :duration="500"></tui-scroll-top>
         <!-- 商品参数 -->
         <cm-product-params
             :visible="paramsVisible"
-            :productInfo="productInfo"
+            :product-info="productInfo"
             @close="paramsVisible = false"
         ></cm-product-params>
         <!-- 优惠券列表 TODO-->

pages/goods/search.vue

@@ -58,11 +58,15 @@
                         <view class="product-name tui-ellipsis-2">{{ pro.name }}</view>
                         <view class="product-unit">规格：{{ pro.unit }}</view>
                         <view class="product-tags">
+                            <view class="tag type3">拼团价</view>
                             <text class="tag type2" v-if="pro.activeStatus === 1">活动价</text>
                             <text class="tag type2" v-if="pro.couponsLogo">优惠券</text>
                         </view>
                         <view class="product-price">
-                            <view class="price">￥{{ pro.price | PriceFormat }}</view>
+                            <view class="price">
+                                <text>￥{{ pro.price | PriceFormat }}</text>
+                                <text class="delete">￥{{ pro.price | PriceFormat }}</text>
+                            </view>
                             <text class="carts-add iconfont icon-gouwuche" @click.stop="handAddCarts(pro)"></text>
                         </view>
                     </view>
@@ -561,6 +565,12 @@ page {
                         no-repeat;
                     background-size: contain;
                 }
+                &.type3 {
+                    width: 80rpx;
+                    background: linear-gradient(270deg, #ff457b 0%, #b03bb8 51%, #6431f2 100%);
+                    color: #fff;
+                    border-radius: 4rpx;
+                }
             }
         }
         .product-price {
@@ -573,6 +583,15 @@ page {
                 color: #f83c6c;
                 font-weight: bold;
                 line-height: $font-size-26;
+                
+                .delete{
+                    font-size: 20rpx;
+                    color: #999999;
+                    text-decoration: line-through;
+                    font-weight: normal;
+                    margin-left: 10rpx;
+                }
+                
             }
             .carts-add {
                 width: 44rpx;

pages/tabBar/cart/index.vue

@@ -4,14 +4,16 @@
         <template v-if="!isEmpty">
             <template v-if="!isshowDelbtn">
                 <!-- 商品统计 / 批量删除商品 -->
-                <view class="cart-top" :class="{ fixed: cartTopFixed }">
-                    <view class="count">共{{ kindCount }}件商品</view>
-                    <view class="btn" @click="showDelManager">删除</view>
-                </view>
-                <!-- TODO -->
-                <view class="receive-coupon">
-                    <view class="tip-text">{{ couponTipText }}</view>
-                    <view class="btn" @click="receiveCoupon">领券</view>
+                <view :class="{ fixed: cartTopFixed }">
+                    <view class="cart-top">
+                        <view class="count">共{{ kindCount }}件商品</view>
+                        <view class="btn" @click="showDelManager">删除</view>
+                    </view>
+                    <!-- TODO -->
+                    <view class="receive-coupon">
+                        <view class="tip-text">{{ couponTipText }}</view>
+                        <view class="btn" @click="receiveCoupon">领券</view>
+                    </view>
                 </view>
             </template>
             <!-- 购物车列表 -->
@@ -44,7 +46,11 @@
                 <template v-if="!isshowDelbtn">
                     <view class="center">
                         <view class="row">
-                            <text>总价：</text> <text class="total-price">￥{{ allPrice | NumFormat }}</text>
+                            <text>总价：</text> 
+                            <text class="total-price">
+                                <text>￥{{ allPrice | NumFormat }}</text>
+                                <text class="delete">￥9999.99</text>
+                            </text>
                         </view>
                         <!-- TODO -->
                         <view class="row" v-if="currentCouponIndex > -1 && currentCoupon">
@@ -101,7 +107,11 @@
                         <text>优惠券</text> <text class="red">-￥{{ currentCoupon.couponAmount | NumFormat }}</text>
                     </view>
                     <view class="row total">
-                        <text>总计</text> <text>￥{{ finallyPrice | NumFormat }}</text>
+                        <text>总计</text> 
+                        <text class="price"> 
+                            <text>￥{{ finallyPrice | NumFormat }}</text>
+                            <text class="delete">9999.99</text>
+                        </text>
                     </view>
                     <view class="tip"> 实际订单金额以结算页为准 </view>
                 </view>
@@ -525,7 +535,13 @@ export default {
     min-height: 100%;
     box-sizing: border-box;
     &.hasPaddingTop {
-        padding-top: 80rpx;
+        padding-top: 170rpx;
+    }
+    .fixed {
+        position: fixed;
+        top: 0;
+        flex: 0;
+        z-index: 9999;
     }
     .cart-top {
         display: flex;
@@ -536,12 +552,7 @@ export default {
         height: 80rpx;
         background: #f7f7f7;
         box-sizing: border-box;
-        &.fixed {
-            position: fixed;
-            top: 0;
-            flex: 0;
-            z-index: 9999;
-        }
+        
         .count {
             font-size: 30rpx;
             color: #333333;
@@ -616,6 +627,13 @@ export default {
                 color: #333333;
                 .total-price {
                     color: #ff457b;
+                    .delete{
+                        font-size: 20rpx;
+                        color: #999999;
+                        text-decoration: line-through;
+                        font-weight: normal;
+                        margin-left: 10rpx;
+                    }
                 }
             }
             &:nth-child(2) {
@@ -709,6 +727,15 @@ export default {
             &.total {
                 font-size: 30rpx;
                 font-weight: 600;
+                .price{
+                    .delete{
+                        font-size: 24rpx;
+                        color: #999999;
+                        text-decoration: line-through;
+                        font-weight: normal;
+                        margin-left: 10rpx;
+                    }
+                }
             }
         }
         .tip {

pages/user/activity/activity.vue

@@ -13,11 +13,16 @@
                 <view class="product-list-msg">
                     <view class="product-msg-name">{{ pro.name }}</view>
                     <view class="product-list-tag" v-if="pro.activeStatus === 1">
-                        <text class="tag tag-01">促销</text> <text class="tag tag-02">活动价</text>
+                        <text class="tag tag-03">拼团价</text>
+                        <text class="tag tag-01">促销</text> 
+                        <text class="tag tag-02">活动价</text>
                         <text class="tag tag-02" v-if="pro.couponsLogo">优惠券</text>
                     </view>
                     <view class="product-list-pri">
-                        <view class="price">￥{{ pro.price | priceFormat }}</view>
+                        <view class="price">
+                            <text>￥{{ pro.price | priceFormat }}</text>
+                            <text class="delete">￥{{ pro.price | priceFormat }}</text>
+                        </view>
                         <view class="carts" @click.stop="handAddCarts(pro)">
                             <view class="carts-add"> <text class="iconfont icon-gouwuche"></text> </view>
                         </view>
@@ -258,26 +263,40 @@ page {
                         background-color: #f83c6c;
                         border-radius: 4rpx;
                     }
+                    &.tag-03 {
+                        width: 80rpx;
+                        background: linear-gradient(270deg, #ff457b 0%, #b03bb8 51%, #6431f2 100%);
+                        color: #fff;
+                        border-radius: 4rpx;
+                    }
                 }
             }
             .product-list-pri {
                 width: 100%;
                 height: 44rpx;
-                float: left;
                 position: absolute;
                 bottom: 16rpx;
                 left: 0;
                 box-sizing: border-box;
                 padding: 0 24rpx;
                 .price {
-                    float: left;
                     font-size: $font-size-26;
                     color: #f83c6c;
                     font-weight: bold;
                     line-height: 44rpx;
+                    
+                    .delete{
+                        font-size: 20rpx;
+                        color: #999999;
+                        text-decoration: line-through;
+                        font-weight: normal;
+                        margin-left: 10rpx;
+                    }
                 }
                 .carts {
-                    float: right;
+                    position: absolute;
+                    right: 24px;
+                    bottom: 0;
                     .carts-add {
                         width: 44rpx;
                         height: 44rpx;

pages/user/activity/coupon-find-list.vue

@@ -36,15 +36,15 @@
             <template v-slot:content>
                 <view class="content">
                     <view class="row">
-                        <view class="dt">好友分享券</view>
+                        <view class="dt">好友邀请券</view>
                         <view class="dd">
-                            登录用户可通过分享商城给好友，当好友注册登录成功后，您可以领取一张好友分享券。
+                            登录用户可将商城分享给好友，邀请好友进行注册登录，当好友成功登录后，您就可以获得一张好邀请券的领券资格。
                         </view>
                     </view>
                     <view class="row">
                         <view class="dt">好友消费券</view>
                         <view class="dd">
-                            邀请成功的好友每消费一笔订单，您将可以领取一张好友消费券。
+                            您邀请成功的好友每消费一笔订单，您就可以获得一张好友消费券的领券资格。
                         </view>
                     </view>
                 </view>

pages/user/order/create-order.vue

@@ -6,7 +6,7 @@
             <choice-address ref="choiceAddress" :addressData="addressData"></choice-address>
             <!-- 商品 -->
             <goodsList ref="goods" :goodsData="goodsData" @handleGoodList="handChangeInputGoodsList"></goodsList>
-            <!-- 选择优惠券 TODO-->
+            <!-- 选择优惠券 -->
             <view class="select-coupon" @click="couponVisible = true" v-if="receiveCouponList.length > 0">
                 <view class="left-title">优惠券</view>
                 <view class="right-content">
@@ -14,7 +14,21 @@
                     <view class="iconfont icon-chakangengduo"></view>
                 </view>
             </view>
-            <!-- 优惠券列表 TODO-->
+            <!-- 分享减免 TODO-->
+            <view class="share-reduce">
+                <template v-if="false">
+                    <view class="left-title high">金额满100元，分享可立减10元</view>
+                    <view class="right-content"> <view class="share-btn">点击分享</view> </view>
+                </template>
+                <template v-else>
+                    <view class="left-title">分享减免</view>
+                    <view class="right-content">
+                        <view class="reduce-amount">-￥200.00</view> <view class="iconfont icon-chakangengduo"></view>
+                    </view>
+                </template>
+            </view>
+
+            <!-- 优惠券列表 -->
             <cm-coupon-list
                 title="优惠券"
                 listType="use"
@@ -350,7 +364,8 @@ page {
     }
 }
 
-.select-coupon {
+.select-coupon,
+.share-reduce {
     display: flex;
     justify-content: space-between;
     align-items: center;
@@ -362,12 +377,17 @@ page {
         font-weight: bold;
         color: #333333;
         font-size: 28rpx;
+        .high{
+            color: #ff457b;
+        }
     }
     .right-content {
         display: flex;
         justify-content: flex-start;
         align-items: center;
-        .coupon-amount {
+        .coupon-amount,
+        .reduce-amount,
+        .share-btn {
             font-size: 28rpx;
             color: #ff457b;
             margin-right: 12rpx;

services/config.env.js

@@ -5,8 +5,8 @@ if (process.env.NODE_ENV === 'development') {
     // URL_CONFIG = 'http://192.168.2.67:8011'	 //裴裴联调地址
     // URL_CONFIG = 'http://192.168.2.68:8011'	 //涛涛联调地址
     // URL_CONFIG = 'http://127.0.0.1:8011'	 //本地联调地址
-    // URL_CONFIG = 'https://mall2c-b.caimei365.com'
-    URL_CONFIG = 'https://mall2c.caimei365.com'
+    URL_CONFIG = 'https://mall2c-b.caimei365.com'
+    // URL_CONFIG = 'https://mall2c.caimei365.com'
 } else {
     // 生产环境
     URL_CONFIG = 'https://mall2c.caimei365.com'

services/order.service.js

@@ -27,7 +27,7 @@ export default class OrderService {
         return this.AjaxService.get({
             url: '/order/list',
             data,
-            isLoading: true,
+            isLoading: false,
         })
     }
     /* 分销者订单列表 */