commit

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

@@ -50,7 +50,7 @@ export default {
     data() {
         return {
             count: 1,
-            navType: 2,
+            navType: 1,
             countVisible: false,
             buyPrice: 0,
             btnClickType: -1,
@@ -111,6 +111,7 @@ export default {
     },
     created() {
         this.options[2].info = this.kindCount
+        this.navType = this.productInfo.collageStatus ? 2 : 1
         // this.initBuyPrice()
     },
     methods: {

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

@@ -5,14 +5,14 @@
             <text class="small">￥</text>
             <text class="big">{{ bigPrice }}</text>
             <text class="small">{{ smallPrice }}</text>
-            <text class="delete">{{ productInfo.price }}</text>
+            <text class="delete" v-if="showDeletedPrice">{{ productInfo.price }}</text>
         </view>
         <view class="tags">
             <view class="tag type1" v-if="productInfo.heUserId !== 0">促销</view>
-            <template v-if="productInfo.activeStatus === 1">
+            <template v-if="productInfo.activeStatus === 1 && productInfo.collageStatus === 0">
                 <view class="tag type2" v-if="productInfo.ladderList" @click="drawerVisible = true">活动价</view>
             </template>
-            <view class="tag type1">2人拼团</view>
+            <view class="tag type1" v-if="productInfo.collageStatus === 1">2人拼团</view>
         </view>
 
         <cm-drawer :visible="drawerVisible" position="bottom" @close="drawerClose">
@@ -54,6 +54,9 @@ export default {
         },
         smallPrice() {
             return '.' + this.price.split('.')[1]
+        },
+        showDeletedPrice(){
+            return this.productInfo.activeStatus === 1 || this.productInfo.collageStatus === 1
         }
     },
     methods: {

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

@@ -9,8 +9,8 @@
             <!-- 标签 -->
             <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 type3" v-if="data.collageStatus">拼团价</view>
+                <view class="tag type2" v-if="data.activeStatus == 1 && data.collageStatus === 0">活动价</view>
                 <view class="tag type2" v-if="data.couponsLogo">优惠券</view>
             </view>
             <!-- 底部 -->

pages/goods/cart.vue

@@ -51,12 +51,12 @@
                 <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">￥{{ allPrice | formatPrice }}</text>
                         </view>
                         <!-- TODO -->
                         <view class="row" v-if="currentCouponIndex > -1 && currentCoupon">
                             <text>共减</text>
-                            <text class="discounted-price">￥{{ currentCoupon.couponAmount | NumFormat }}</text>
+                            <text class="discounted-price">￥{{ currentCoupon.couponAmount | formatPrice }}</text>
                             <text @click="showDiscountedDetail">优惠明细</text>
                             <text
                                 class="iconfont"

pages/user/activity/activity.vue

@@ -13,9 +13,9 @@
                 <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-03">拼团价</text>
-                        <text class="tag tag-01">促销</text> 
-                        <text class="tag tag-02">活动价</text>
+                        <text class="tag tag-03" v-if="pro.collageStatus === 1">拼团价</text>
+                        <!-- <text class="tag tag-01">促销</text> -->
+                        <text class="tag tag-02" v-if="pro.collageStatus === 0">活动价</text>
                         <text class="tag tag-02" v-if="pro.couponsLogo">优惠券</text>
                     </view>
                     <view class="product-list-pri">
@@ -289,7 +289,7 @@ page {
                 }
                 .carts {
                     position: absolute;
-                    right: 24px;
+                    right: 24rpx;
                     bottom: 0;
                     .carts-add {
                         width: 44rpx;

services/config.env.js

@@ -3,9 +3,9 @@ if (process.env.NODE_ENV === 'development') {
     // 开发环境
     // URL_CONFIG = 'http://192.168.2.75:8011'	 //采美测试地址
     // URL_CONFIG = 'http://192.168.2.67:8011'	 //裴裴联调地址
-    // URL_CONFIG = 'http://192.168.2.68: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-b.caimei365.com'
     // URL_CONFIG = 'https://mall2c.caimei365.com'
 } else {
     // 生产环境