Browse Source

1.享好物(消费券电商):“数智余额”改“我的余额”
2.所有订单下单界面“消费券额”错误,应该为:“订单金额”或“消费金额”
3.替换一下酒店背景图

xiaomei 1 year ago
parent
commit
1ad59eccf3

+ 1 - 1
src/pages/product/p_details.vue

@@ -53,7 +53,7 @@
                 </view>
             </view>
             <view class="goods_teac flex_r" v-if="['4'].includes(type)">
-                <view class="product-txt">赠{{ detail.teac }}TeaC</view>
+                <view class="product-txt" v-if="detail.teac>0">赠 {{ detail.teac }} TeaC</view>
                 <!-- <view class="product-txt fenxiang" style="margin-left: 30rpx; background-color: rgba(0, 0, 0, 0);">
                     <text class="iconfont red">&#xe62b;</text>
                     <text class="red">{{ detail.first_teac }}</text>

+ 2 - 2
src/pages/to-pay-list/index.vue

@@ -175,7 +175,7 @@
                 <view class="list_con g_color">¥{{ userinfo.user_money }}</view>
             </view>
             <view class="order_list flex_r flex_ac flex_jb" v-if="['2','3', '4'].includes(Data.type) && isAct">
-                <view class="list_name">数智余额</view>
+                <view class="list_name">我的余额</view>
                 <view class="list_con g_color">¥{{ localInfo.property }}</view>
             </view>
             <view class="order_list flex_r flex_ac flex_jb" v-if="Data.type == 1">
@@ -193,7 +193,7 @@
         </view>
         <view class="msginfo" v-if="Data.type == 1">
             <view class="title">特别提示</view>
-            <view>1、寄卖服务费只能使用数智余额抵扣或微信支付</view>
+            <view>1、寄卖服务费只能使用您的余额抵扣或微信支付</view>
         </view>
         <!-- 订单信息-end -->
         <!-- 底部操作栏 -->

+ 1 - 1
src/pagesB/cinema/cinemaTicket.vue

@@ -78,7 +78,7 @@
             </div>
             <div class="money card">
                 <div class="li flex_r flex_jb">
-                    <span>消费额</span>
+                    <span>消费额</span>
                     <span>¥{{ order.order_amount || 0 }}</span>
                 </div>
                 <div class="li flex_r flex_jb">

+ 1 - 1
src/pagesB/cinema/confirmOrder.vue

@@ -20,7 +20,7 @@
         </div>
         <div class="money card">
             <div class="li flex_r flex_jb">
-                <span>消费额</span>
+                <span>消费额</span>
                 <span>¥{{ cartTotal || 0 }}</span>
             </div>
             <div class="li flex_r flex_jb">

+ 1 - 1
src/pagesB/directCharge/coupon.vue

@@ -30,7 +30,7 @@
             </div>
             <div class="money card">
                 <div class="li flex_r flex_jb">
-                    <span>消费额</span>
+                    <span>消费额</span>
                     <span>¥{{ cartTotal || 0 }}</span>
                 </div>
                 <div class="li flex_r flex_jb">

+ 1 - 1
src/pagesB/directCharge/orderDetail.vue

@@ -26,7 +26,7 @@
                 <span>x {{ order.number }}</span>
             </div>
             <div class="li flex_r flex_jb">
-                <span>消费额</span>
+                <span>消费额</span>
                 <span>¥{{ order.order_amount || 0 }}</span>
             </div>
             <div class="li flex_r flex_jb">

+ 1 - 1
src/pagesB/directCharge/payment.vue

@@ -21,7 +21,7 @@
         <template v-if="cartTotal>0">
             <div class="money card">
                 <div class="li flex_r flex_jb">
-                    <span>消费额</span>
+                    <span>消费额</span>
                     <span>¥{{ cartTotal || 0 }}</span>
                 </div>
                 <div class="li flex_r flex_jb">

+ 1 - 1
src/pagesB/hotel/hotelDetail.vue

@@ -59,7 +59,7 @@
         </div>
         <div class="money card">
             <div class="li flex_r flex_jb">
-                <span>消费额</span>
+                <span>消费额</span>
                 <span>¥{{ cartTotal || 0 }}</span>
             </div>
             <div class="li flex_r flex_jb">

+ 3 - 3
src/pagesB/hotel/index.vue

@@ -66,8 +66,8 @@
             </div>
         </dev>
         <div class="footimg">
-            <image @click="search" class="btn" src="http://teaclub.oss-cn-chengdu.aliyuncs.com/CloudShop/head_pic/7603bae2564783682b68b025003cae9012f917dcpng" mode="widthFix">
-            <image class="img" src="http://teaclub.oss-cn-chengdu.aliyuncs.com/CloudShop/head_pic/2fd3f66be733feca588418d4a9537b3b1560431cpng" mode="widthFix">
+            <image @click="search" class="btn" src="http://teaclub.oss-cn-chengdu.aliyuncs.com/CloudShop/head_pic/7603bae2564783682b68b025003cae9012f917dcpng" mode="widthFix" />
+            <image class="img" src="https://teaclub.oss-cn-chengdu.aliyuncs.com/CloudShop/head_pic/0c39d34eef6c35fa1ce63101a6f2ff8.jpg" mode="widthFix" />
         </div>
     </div>
 </template>
@@ -252,7 +252,7 @@ export default {
 .hotel {
     width: 100%;
     height: 1350rpx;
-    background-image: url("http://teaclub.oss-cn-chengdu.aliyuncs.com/CloudShop/head_pic/d81f521c3f0e885edabe6bf86f9d5a0853f64cb0jpg");
+    background-image: url("https://teaclub.oss-cn-chengdu.aliyuncs.com/CloudShop/head_pic/78b6d4099023da41dd44706cea7381a.jpg");
     background-size: 100% 100%;
     position: relative;
 }

+ 1 - 1
src/pagesB/hotel/orderDetail.vue

@@ -66,7 +66,7 @@
         <template v-else>
             <div class="money card">
                 <div class="li flex_r flex_jb">
-                    <span>消费额</span>
+                    <span>消费额</span>
                     <span>¥{{ order.order_amount || 0 }}</span>
                 </div>
                 <div class="li flex_r flex_jb">

+ 4 - 4
src/pagesB/my/myWallet.vue

@@ -17,11 +17,11 @@
                         <image src="/static/wallet/6.png" class="ico" /><span>茶宝</span></p>
                     <p class="dinB">{{userinfo.cha_bao}}</p>
                 </div>
-                <div class="i_num" @click="goto('/pagesB/accountDetails/TeaC')">
+                <!-- <div class="i_num" @click="goto('/pagesB/accountDetails/TeaC')">
                     <p class="flex_r flex_ac flex_jc">
                         <image src="/static/wallet/8.png" class="ico" /><span>TeaC {{ teacCountCny }}</span></p>
                     <p class="dinB">{{userinfo.teac}}</p>
-                </div>
+                </div> -->
                 <div class="i_num" @click="goto('/pagesB/accountDetails/OriginalShares')">
                     <p class="flex_r flex_ac flex_jc">
                         <image src="/static/wallet/5.png" class="ico" /><span>OE {{ equityCountCny }}</span></p>
@@ -97,7 +97,7 @@ export default {
     .i_num {
         font-size: 30rpx;
         text-align: center;
-        width: 33%;
+        width: 50%;
         
         p {
             color: #BE7329;
@@ -115,7 +115,7 @@ export default {
         }
     }
     .acc_row{
-        margin-bottom: 38rpx;
+        // margin-bottom: 38rpx;
     }
 }
 </style>

+ 1 - 1
src/pagesB/orderingfood/payTheBill.vue

@@ -22,7 +22,7 @@
         </div>
         <div class="money card">
             <div class="li flex_r flex_jb">
-                <span>消费额</span>
+                <span>消费额</span>
                 <span>¥{{ cartTotal || 0 }}</span>
             </div>
             <div class="li flex_r flex_jb">

+ 1 - 1
src/pagesB/prepaidRefill/index.vue

@@ -15,7 +15,7 @@
         </div>
         <div class="money card">
             <div class="li flex_r flex_jb">
-                <span>消费额</span>
+                <span>消费额</span>
                 <span>¥{{ selectItem.custom_price == 0 ? selectItem.money : selectItem.custom_price }}</span>
             </div>
             <div class="li flex_r flex_jb">

+ 1 - 1
src/pagesB/prepaidRefill/orderDetail.vue

@@ -5,7 +5,7 @@
         </div>
         <div class="money card">
             <div class="li flex_r flex_jb">
-                <span>消费额</span>
+                <span>消费额</span>
                 <span>¥{{ order.attachment.custom_price || 0 }}</span>
             </div>
             <div class="li flex_r flex_jb">

+ 1 - 1
src/pagesB/scenicSpotTicket/orderDetail.vue

@@ -10,7 +10,7 @@
                 <span>x {{ order.number }}</span>
             </div>
             <div class="li flex_r flex_jb">
-                <span>消费额</span>
+                <span>消费额</span>
                 <span>¥{{ order.order_amount || 0 }}</span>
             </div>
             <div class="li flex_r flex_jb">

+ 1 - 1
src/pagesB/scenicSpotTicket/scenicDetail.vue

@@ -37,7 +37,7 @@
         </div>
         <div class="money card">
             <div class="li flex_r flex_jb">
-                <span>消费额</span>
+                <span>消费额</span>
                 <span>¥{{ cartTotal || 0 }}</span>
             </div>
             <div class="li flex_r flex_jb">

+ 1 - 1
src/utils/myfun.js

@@ -73,7 +73,7 @@ export function tidyTpye(va) {
         case 1: return "数智云店";
         case 2: return "批发专区";
         case 3: return "云宝货易";
-        case 4: return "消费券电商";
+        case 4: return "享好物";//消费券电商
         case 5: return "茶宝兑换";
         case 6: return "天天捡漏";
         case 7: return "消费券兑换";