V1.0.4

pages/seller/order/components/details/cm-goods-temp.vue

@@ -115,10 +115,14 @@
 						<view class="price-view-le">运费：</view>
 						<view class="price-view-ri">{{ orderInfo.postageInfo }}</view>
 					</view>
-					<view class="pros-price-view" v-if="orderInfo.eachDiscount > 0"
-						>> <view class="price-view-le">优惠：</view>
+					<view class="pros-price-view" v-if="orderInfo.eachDiscount > 0">
+						<view class="price-view-le">优惠：</view>
 						<view class="price-view-ri">￥{{ orderInfo.eachDiscount | NumFormat }}</view>
 					</view>
+					<view class="pros-price-view" v-if="orderInfo.totalAmount > 0">
+						<view class="price-view-le">促销满减：</view>
+						<view class="price-view-ri">￥{{ orderInfo.totalAmount | NumFormat }}</view>
+					</view>
 					<view class="pros-price-view">
 						<view class="price-view-le">订单总额：</view>
 						<view class="price-view-ri">￥{{ orderInfo.totalAmount | NumFormat }}</view>

pages/tabBar/user/user.vue

@@ -340,17 +340,19 @@
                         </view>
                     </view>
                     <view class="list-cell-item">
-                        <view class="list-cell" hover-class="cell-hover" :hover-stay-time="50">
-                            <view class="cell-icon">
-                                <image
-                                    class="cell-icon-image"
-                                    src="https://static.caimei365.com/app/img/icon/icon_club_5@2x.png"
-                                    mode=""
-                                ></image>
-                            </view>
-                            <text class="cell-tit cont">联系我们</text>
-                            <text class="cell-more cont" @click="toPhone">{{ contactNumber }}</text>
-                        </view>
+						<!-- #ifdef MP-WEIXIN -->
+						<button class="list-cell" open-type="contact" @bindcontact="handleContact">
+							<view class="cell-icon">
+							    <image
+							        class="cell-icon-image"
+							        src="https://static.caimei365.com/app/img/icon/icon_club_5@2x.png"
+							        mode=""
+							    ></image>
+							</view>
+							<text class="cell-tit"> 官方客服 </text>
+							<text class="cell-more iconfont icon-xiangyou"></text>
+						</button>
+						<!-- #endif -->
                         <view
                             class="list-cell"
                             @click="this.$api.navigateTo('/pages/user/about/about')"
@@ -1168,6 +1170,7 @@ page {
         font-size: $font-size-28;
         color: #666666;
         margin-right: 10rpx;
+		text-align: left;
         &.cont {
             width: 300rpx;
         }

pages/user/order/components/cm-freight-popup.vue

@@ -11,9 +11,9 @@
 			<template v-if="supplier.postageFlag === 1 && supplier.designatedFlag === 1">
 				<view class="freight-main">
 					<view class="freight-left">运费:</view>
-					<view class="freight-right" @click.stop="handlePupShow">
+					<view class="freight-right">
 						<view class="freight-text">¥{{ handleTotalPostage | NumFormat }}</view>
-						<view class="select"><text class="iconfont icon-xiayibu"></text></view>
+						<!-- <view class="select"><text class="iconfont icon-xiayibu"></text></view> -->
 					</view>
 				</view>
 			</template>
@@ -25,7 +25,7 @@
 			>
 				<view class="freight-main">
 					<view class="freight-left">运费:</view>
-					<view class="freight-right" @click.stop="handlePupShow">
+					<view class="freight-right">
 						<template v-if="handlePostageFlag === 1">
 							<view class="freight-text">¥{{ handleTotalPostage | NumFormat }}</view>
 						</template>
@@ -33,7 +33,7 @@
 							<view v-if="handleSupplier.isColdChina" class="freight-text" >¥{{ handleTotalPostage | NumFormat }}</view>
 							<view v-else class="freight-text">到付</view>
 						</template>
-						<view class="select"><text class="iconfont icon-xiayibu"></text></view>
+						<!-- <view class="select"><text class="iconfont icon-xiayibu"></text></view> -->
 					</view>
 				</view>
 			</template>

pages/user/order/components/details/cm-goods-temp.vue

@@ -119,6 +119,10 @@
 						<view class="price-view-le">优惠：</view>
 						<view class="price-view-ri">￥{{ orderInfo.eachDiscount | NumFormat }}</view>
 					</view>
+					<view class="pros-price-view" v-if="orderInfo.totalAmount > 0">
+						<view class="price-view-le">促销满减：</view>
+						<view class="price-view-ri">￥{{ orderInfo.totalAmount | NumFormat }}</view>
+					</view>
 					<view class="pros-price-view">
 						<view class="price-view-le">订单总额：</view>
 						<view class="price-view-ri">￥{{ orderInfo.totalAmount | NumFormat }}</view>