Browse Source

茶币=>付宝

xiaomei 1 year ago
parent
commit
9bc9380aa4

+ 0 - 7
src/pages.json

@@ -242,13 +242,6 @@
 				"navigationBarTitleText": "享好物"
 			}
 		}
-		// {
-		// 	"path": "pages/shoppingMall/index",
-		// 	"style": {
-		// 		"navigationBarTitleText": "商城购物",
-		// 		"navigationStyle": "custom"
-		// 	}
-		// }
 	],
 	"subPackages": [
 		{

+ 1 - 1
src/pages/my/index.vue

@@ -75,7 +75,7 @@
                     <div class="i_num flex_c flex_ac">
                         <!-- <div class="i_num flex_c flex_ac" @click="goto('/pagesB/my/shuZhiWallet')"> -->
                         <p class="flex_r flex_ac flex_jc">
-                            <image src="/static/wallet/6.png" class="ico" /><span>茶币</span></p>
+                            <image src="/static/wallet/6.png" class="ico" /><span>付宝</span></p>
                         <p class="dinB tc">{{localInfo.property||0}}</p>
                     </div>
                     

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

@@ -182,7 +182,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', '5', '7', '8'].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">
@@ -194,13 +194,13 @@
                 <view class="list_con g_color">{{ userinfo.cha_bao }}</view>
             </view>
             <view class="order_list flex_r flex_ac flex_jb" v-if="Data.type == 1">
-                <view class="list_name">茶币</view>
+                <view class="list_name">付宝</view>
                 <view class="list_con g_color">¥{{ localInfo.property }}</view>
             </view>
         </view>
         <view class="msginfo" v-if="Data.type == 1">
             <view class="title">特别提示</view>
-            <view>1、寄卖服务费只能使用您的茶币抵扣或微信支付</view>
+            <view>1、寄卖服务费只能使用您的付宝抵扣或微信支付</view>
         </view>
         <!-- 订单信息-end -->
         <!-- 底部操作栏 -->
@@ -344,9 +344,9 @@ export default {
                     this.amountTotal = this.$h.Add(wpt,this.amountTotal)
                     ps = this.$h.Add(ps, wp);
                 }
-                let um = 0; //可用茶币
-                if (this.isAct) um = this.localInfo.property; //可用茶币
-                let userBalance = this.$h.Add(this.userinfo.user_money, um); //用户总余额(可用茶币+云宝)
+                let um = 0; //可用付宝
+                if (this.isAct) um = this.localInfo.property; //可用付宝
+                let userBalance = this.$h.Add(this.userinfo.user_money, um); //用户总余额(可用付宝+云宝)
     
                 let b = this.$h.Sub(a, userBalance); //待支付金额
                 let b1 = this.$h.Sub(ps, userBalance); //待支付金额 - 零售&批发&云宝货易 运费必须现金支付
@@ -355,7 +355,7 @@ export default {
                 if (type == 1) {
                     // b1 = this.$h.Sub(ps, this.userinfo.user_money); //用云宝计算后 待支付价格
                     b1 = this.$h.Sub(ps,um); // 寄卖服务待支付价格不使用云宝
-                    let sp = this.$h.Sub(wy,um);  //寄卖服务费只能用数智生活茶币抵扣或微信支付
+                    let sp = this.$h.Sub(wy,um);  //寄卖服务费只能用数智生活付宝抵扣或微信支付
                     obligation = b1 > 0 ? b1 : 0; 
                     obligation = this.$h.Add(obligation,sp > 0 ? sp : 0);
                 }

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

@@ -84,11 +84,11 @@ export default {
             let that = this
             let localInfo = uni.getStorageSync("localInfo");
             let um = localInfo.property;
-            let str = um > this.actuallypaid ? "将优先使用茶币抵扣" : "将使用茶币抵扣部分支付"
+            let str = um > this.actuallypaid ? "将优先使用付宝抵扣" : "将使用付宝抵扣部分支付"
             if(um > 0){
                 uni.showModal({
                     title: "温馨提示",
-                    content: `您的可用茶币为 ${um},` + str,
+                    content: `您的可用付宝为 ${um},` + str,
                     showCancel: true,
                     confirmText: "确认",
                     confirmColor: "#f02f2f",

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

@@ -138,11 +138,11 @@ export default {
             let that = this
             let localInfo = uni.getStorageSync("localInfo");
             let um = localInfo.property;
-            let str = um > this.actuallypaid ? "将优先使用茶币抵扣" : "将使用茶币抵扣部分支付"
+            let str = um > this.actuallypaid ? "将优先使用付宝抵扣" : "将使用付宝抵扣部分支付"
             if(um > 0){
                 uni.showModal({
                     title: "温馨提示",
-                    content: `您的可用茶币为 ${um},` + str,
+                    content: `您的可用付宝为 ${um},` + str,
                     showCancel: true,
                     confirmText: "确认",
                     confirmColor: "#f02f2f",

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

@@ -117,11 +117,11 @@ export default {
             let that = this
             let localInfo = uni.getStorageSync("localInfo");
             let um = localInfo.property;
-            let str = um > this.actuallypaid ? "将优先使用茶币抵扣" : "将使用茶币抵扣部分支付"
+            let str = um > this.actuallypaid ? "将优先使用付宝抵扣" : "将使用付宝抵扣部分支付"
             if(um > 0){
                 uni.showModal({
                     title: "温馨提示",
-                    content: `您的可用茶币为 ${um},` + str,
+                    content: `您的可用付宝为 ${um},` + str,
                     showCancel: true,
                     confirmText: "确认",
                     confirmColor: "#f02f2f",

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

@@ -173,11 +173,11 @@ export default {
             let that = this
             let localInfo = uni.getStorageSync("localInfo");
             let um = localInfo.property;
-            let str = um > this.actuallypaid ? "将优先使用茶币抵扣" : "将使用茶币抵扣部分支付"
+            let str = um > this.actuallypaid ? "将优先使用付宝抵扣" : "将使用付宝抵扣部分支付"
             if(um > 0){
                 uni.showModal({
                     title: "温馨提示",
-                    content: `您的可用茶币为 ${um},` + str,
+                    content: `您的可用付宝为 ${um},` + str,
                     showCancel: true,
                     confirmText: "确认",
                     confirmColor: "#f02f2f",

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

@@ -9,7 +9,7 @@
                 </div>
                 <div class="i_num" @click="goto('/pagesB/my/shuZhiWallet')">
                     <p class="flex_r flex_ac flex_jc">
-                        <image src="@/static/wallet/4.png" class="ico" /><span>我的茶币</span></p>
+                        <image src="@/static/wallet/4.png" class="ico" /><span>我的付宝</span></p>
                     <p class="dinB">{{localInfo.property}}</p>
                 </div> -->
                 <div class="i_num" @click="goto('/pages/accountDetails/teaBaby')">

+ 1 - 1
src/pagesB/my/shuZhiWallet.vue

@@ -9,7 +9,7 @@
         </view>
         <div class="h_top">
             <div class="balance_box">
-                <div class="b_teg">我的茶币(元)</div>
+                <div class="b_teg">我的付宝(元)</div>
                 <div class="dinB balance">{{ localInfo.property }}</div>
             </div>
         </div>

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

@@ -128,11 +128,11 @@ export default {
             let that = this
             let localInfo = uni.getStorageSync("localInfo");
             let um = localInfo.property;
-            let str = um > this.actuallypaid ? "将优先使用茶币抵扣" : "将使用茶币抵扣部分支付"
+            let str = um > this.actuallypaid ? "将优先使用付宝抵扣" : "将使用付宝抵扣部分支付"
             if(um > 0){
                 uni.showModal({
                     title: "温馨提示",
-                    content: `您的可用茶币为 ${um},` + str,
+                    content: `您的可用付宝为 ${um},` + str,
                     showCancel: true,
                     confirmText: "确认",
                     confirmColor: "#f02f2f",

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

@@ -119,11 +119,11 @@ export default {
             let that = this
             let localInfo = uni.getStorageSync("localInfo");
             let um = localInfo.property;
-            let str = um > this.selectItem.actual_price ? "将优先使用茶币抵扣" : "将使用茶币抵扣部分支付"
+            let str = um > this.selectItem.actual_price ? "将优先使用付宝抵扣" : "将使用付宝抵扣部分支付"
             if(um > 0){
                 uni.showModal({
                     title: "温馨提示",
-                    content: `您的可用茶币为 ${um},` + str,
+                    content: `您的可用付宝为 ${um},` + str,
                     showCancel: true,
                     confirmText: "确认",
                     confirmColor: "#f02f2f",

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

@@ -167,11 +167,11 @@ export default {
             let that = this
             let localInfo = uni.getStorageSync("localInfo");
             let um = localInfo.property;
-            let str = um > this.actuallypaid ? "将优先使用茶币抵扣" : "将使用茶币抵扣部分支付"
+            let str = um > this.actuallypaid ? "将优先使用付宝抵扣" : "将使用付宝抵扣部分支付"
             if(um > 0){
                 uni.showModal({
                     title: "温馨提示",
-                    content: `您的可用茶币为 ${um},` + str,
+                    content: `您的可用付宝为 ${um},` + str,
                     showCancel: true,
                     confirmText: "确认",
                     confirmColor: "#f02f2f",

+ 4 - 4
src/pagesC/settledMerchant/pay.vue

@@ -31,7 +31,7 @@
                 <span>{{ discounts.chabao || 0 }}</span>
             </div>
             <div class="li flex_r flex_jb">
-                <span>可用茶币</span>
+                <span>可用付宝</span>
                 <span>{{ user_money || 0 }}</span>
             </div>
         </div>
@@ -41,7 +41,7 @@
                 <span class="p color fw-700">待支付</span>
             </div>
             <div class="li flex_r flex_ac flex_jb color right">
-                <span class="dis">茶币抵扣:{{ user_money }}</span>
+                <span class="dis">付宝抵扣:{{ user_money }}</span>
                 <span class=" fw-700">
                     ¥{{ (Math.floor(((Number(Body.money) - Number(user_money) - Number(discounts.discount))) * 100) / 100 >= 0
                     ? Math.floor(((Number(Body.money) - Number(user_money) - Number(discounts.discount))) * 100) / 100 : 0) || 0 }}
@@ -58,7 +58,7 @@
         <!-- <div class="subBtn flex_r flex_ac flex_jb">
             <div class="subBtn_left flex_c">
                 <span class="sum">合计:<span class="yuan">¥</span>{{ Math.floor((Number(Body.money) - Number(discounts.discount)) * 100) / 100 || 0 }}</span>
-                <span class="dis">茶币抵扣:{{ user_money }}</span>
+                <span class="dis">付宝抵扣:{{ user_money }}</span>
             </div>
             <div class="subBtn_center">
                 <span class="yuan">¥</span><span>
@@ -138,7 +138,7 @@ export default {
             let that = this
             uni.showModal({
                 title: "温馨提示",
-                content: "你将支付该订单,请核对支付金额正确后点击“确认”。\r\n 请注意:平台茶币抵扣无需密码,点击“确认”就会支付成功。",
+                content: "你将支付该订单,请核对支付金额正确后点击“确认”。\r\n 请注意:平台付宝抵扣无需密码,点击“确认”就会支付成功。",
                 showCancel: true,
                 confirmText: "确认",
                 confirmColor: "#f02f2f",

+ 0 - 0
src/pages/shoppingMall/index.vue → src/pagesC/shoppingMall/index.vue


+ 1 - 1
src/pagesC/shoppingMallType/index.vue

@@ -35,7 +35,7 @@
     <div class="head" v-show="head">
       <image
         class="back"
-        src="/static/preview/arrow-right.png"
+        src="https://teaclub.oss-cn-chengdu.aliyuncs.com/CloudShop/icon/arrow-right.png"
         mode="widthFix"
         @click="onBack"
       />

BIN
src/static/preview/arrow-right.png