消费金=》消费券

src/pages.json

@@ -227,13 +227,13 @@
 		{
 			"path": "pages/consumerGold/index",
 			"style": {
-				"navigationBarTitleText": "消费金电商"
+				"navigationBarTitleText": "消费券电商"
 			}
 		},
 		{
 			"path": "pages/consumerGold/specialCategory",
 			"style": {
-				"navigationBarTitleText": "消费金电商"
+				"navigationBarTitleText": "消费券电商"
 			}
 		}
 	],
@@ -440,7 +440,7 @@
 				{
 					"path": "accountDetails/ConsumptionCharge",
 					"style": {
-						"navigationBarTitleText": "消费金明细"
+						"navigationBarTitleText": "消费券明细"
 					}
 				},
 				{
@@ -623,7 +623,7 @@
 				{
 					"path": "consumerGold/exchange",
 					"style": {
-						"navigationBarTitleText": "消费金兑换"
+						"navigationBarTitleText": "消费券兑换"
 					}
 				}
 			]
@@ -657,7 +657,7 @@
 				"pagePath": "pages/consumerGold/index",
 				"iconPath": "static/nav/local_.png",
 				"selectedIconPath": "static/nav/local.png",
-				"text": "消费金电商"
+				"text": "消费券电商"
 			},
 			// {
 			// 	"pagePath": "pages/sign/index",

src/pages/consumerGold/index.vue

@@ -101,7 +101,7 @@
               </view>
               <view class="product-txt">
                 <text class="product-price-favour">￥{{ i.market_price }}</text>
-                <text class="product-text">消费金抵</text>
+                <text class="product-text">消费券抵</text>
                 <span class="corFE2C15">￥{{ Number(i.consume) }}</span>
               </view>
               <!-- <view class="product-txt" v-if="i.type == 1">赠送{{ i.give_integral + "批发券" }}</view> -->

src/pages/consumerGold/specialCategory.vue

@@ -23,7 +23,7 @@
           </view>
           <view class="product-txt" v-if="type == 4">
             <text class="product-price-favour">{{ i.market_price }}</text>
-            <text class="product-text">消费金抵</text>
+            <text class="product-text">消费券抵</text>
             <span class="corFE2C15">￥{{ Number(i.consume) }}</span>
           </view>
           <!-- <view class="product-txt" v-if="type == 1">赠送{{ i.give_integral + "批发券" }}</view> -->

src/pages/index/index.vue

@@ -71,7 +71,7 @@
                         </view>
                         <view class="product-txt" v-if="i.type == 4">
                             <text class="product-price-favour">{{i.market_price}}</text>
-                            <text class="product-text">消费金抵</text>
+                            <text class="product-text">消费券抵</text>
                             <span class="corFE2C15">￥{{ Number(i.consume) }}</span>
                         </view>
                         <!-- <view class="product-txt" v-if="i.type == 1">赠送{{ i.give_integral + "批发券" }}</view> -->

src/pages/my/index.vue

@@ -81,7 +81,7 @@
                     
                     <div class="i_num flex_c flex_ac" @click="goto('/pagesB/accountDetails/ConsumptionCharge')">
                         <p class="flex_r flex_ac flex_jc">
-                            <image src="/static/wallet/3.png" class="ico" /><span>消费金</span></p>
+                            <image src="/static/wallet/3.png" class="ico" /><span>消费券</span></p>
                         <p class="dinB tc">{{localInfo.integral||0}}</p>
                     </div>
                     <!-- <div class="i_num flex_c flex_ac" @click="goto('/pages/accountDetails/teaBaby')">

src/pages/pay-agreement/index.vue

@@ -36,7 +36,7 @@ export default {
     } else if(option.type == 7) {
       this.type = 29;
       uni.setNavigationBarTitle({
-        title: "消费金兑换协议",
+        title: "消费券兑换协议",
       });
     }
     this.loadData();

src/pages/product/p_details.vue

@@ -13,7 +13,7 @@
             <view v-else-if="type == 7" class="price">
                 <span v-if="Number(detail.cost_price) != 0">{{ detail.cost_price }}元</span>
                 <span v-if="Number(detail.consume) != 0 && Number(detail.cost_price) != 0">+</span>
-                <span v-if="Number(detail.consume) != 0">{{ detail.consume }}消费金</span>
+                <span v-if="Number(detail.consume) != 0">{{ detail.consume }}消费券</span>
             </view>
             <view v-else-if="type == 1" class="price flex_c">
                 <text class="p_favour_teac" v-if="type == 1">￥: {{ $h.Add(detail.teac,$h.Mul(detail.trade_teac, 2))||0 }} TeaC +{{ detail.treasure_price||0 }} 茶宝</text>
@@ -33,7 +33,7 @@
                 <text class="p_trade" v-if="(type == 3 || type == 4)">送 {{detail.give_cha_bao}} 茶宝</text>
                 <view v-if="type == 4">
                     <text class="un_p_favour un_p">{{ detail.cost_price }}</text>
-                    <text class="p_trade">消费金抵扣 {{detail.consume}}</text>
+                    <text class="p_trade">消费券抵扣 {{detail.consume}}</text>
                 </view>
             </view>
             <view class="price_span flex_r flex_ac flex_je">
@@ -96,7 +96,7 @@
                         <view class="goods_msg" v-if="type == 1">￥: {{ $h.Add(detail.teac,$h.Mul(detail.trade_teac, 2))||0 }}TeaC + {{ detail.treasure_price }}茶宝</view>
                         <view class="goods_smsg" v-if="type == 1">寄卖服务费：{{$h.Mul(detail.service,2)}} 元</view>
                         <view class="goods_msg" v-else-if="type == 2">{{ detail.trade_price }}元+{{ detail.trade_num }}批发券+{{ detail.treasure_price }}茶宝</view>
-                        <view class="goods_msg" v-else-if="type == 7">{{ detail.cost_price }}元+{{ detail.consume }}消费金</view>
+                        <view class="goods_msg" v-else-if="type == 7">{{ detail.cost_price }}元+{{ detail.consume }}消费券</view>
                         <view class="goods_msg" v-else>￥{{ afterSpecPrice }}</view>
                         <view class="num_con flex_r flex_je" v-if="type != 6">
                             <uni-number-box :min="1" @change="bindChange" :value="buyNum"></uni-number-box>
@@ -149,7 +149,7 @@
                         我已阅读同意<text @tap.stop="getProPage" v-if="type != 5 && type != 6 && type != 7">《购买协议》</text>
                         <text @tap.stop="getProPage" v-else-if="type == 5">《兑换协议》</text>
                         <text @tap.stop="getProPage" v-else-if="type == 6">《天天捡漏协议》</text>
-                        <text @tap.stop="getProPage" v-else-if="type == 7">《消费金兑换协议》</text>
+                        <text @tap.stop="getProPage" v-else-if="type == 7">《消费券兑换协议》</text>
                     </label>
                 </checkbox-group>
                 <view class="confim flex_r flex_ac flex_jc" v-if="type == 1" @tap="ToPayPage">立即支付</view>

src/pages/product/productRetail.vue

@@ -15,7 +15,7 @@
                     </view>
                     <view class="product-txt" v-if="type == 4">
                         <text class="product-price-favour">{{i.market_price}}</text>
-                        <text class="product-text">消费金抵</text>
+                        <text class="product-text">消费券抵</text>
                         <span class="corFE2C15">￥{{ Number(i.consume) }}</span>
                     </view>
                     <!-- <view class="product-txt" v-if="type == 1">赠送{{ i.give_integral + "批发券" }}</view> -->

src/pages/sign/index.vue

@@ -75,7 +75,7 @@
                     </view>
                     <view class="product-txt" v-if="i.type == 4">
                         <text class="product-price-favour">{{i.market_price}}</text>
-                        <text class="product-text">消费金抵</text>
+                        <text class="product-text">消费券抵</text>
                         <span class="corFE2C15">￥{{ Number(i.consume) }}</span>
                     </view>
                     <!-- <view class="product-txt" v-if="i.type == 1">赠送{{ i.give_integral + "批发券" }}</view> -->
@@ -193,7 +193,7 @@ export default {
                     return ""
             }
         },
-        // 获取消费金电商
+        // 获取消费券电商
         goodsDay() {
             let that = this;
             let data = { page, type: 4 };

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

@@ -99,10 +99,10 @@
             </view>
             <view class="order_list flex_r flex_ac flex_jb" v-if="Data.type == 7">
                 <view class="flex_r flex_ac">
-                    <view class="list_name">消费金</view>
+                    <view class="list_name">消费券</view>
                     <view class="list_con p_color">(可用{{ localInfo.integral }})</view>
                 </view>
-                <view class="list_con">{{ $h.Mul(goodsInfo.consume, Data.num) }} 消费金</view>
+                <view class="list_con">{{ $h.Mul(goodsInfo.consume, Data.num) }} 消费券</view>
             </view>
             <view class="order_list flex_r flex_ac flex_jb" v-if="Data.type == 2">
                 <view class="flex_r flex_ac">
@@ -118,7 +118,7 @@
                 </view>
                 <view class="order_list flex_r flex_ac flex_jb">
                     <view class="flex_r flex_ac">
-                        <view class="list_name">消费金抵</view>
+                        <view class="list_name">消费券抵</view>
                         <view class="list_con p_color">(可用 {{ parseFloat(localInfo.integral) }})</view>
                     </view>
                     <view class="list_con p_color">-￥{{ goldNum }}</view>
@@ -224,7 +224,7 @@ export default {
             wholesalePriceTotal: 0, //批发总价
             obligation: 0, //待支付 （可以理解为必须微信支付的）
             freight: 0, //运费
-            goldNum: 0, //消费金抵扣
+            goldNum: 0, //消费券抵扣
             amountTotal: 0, //合计
 
             userinfo: uni.getStorageSync("userinfo"),
@@ -354,12 +354,12 @@ export default {
                 }
                 else if (type == 4) {
                     if (this.isAct) {
-                        let up = this.localInfo.integral; //数智生活消费金
-                        let goldnum = this.$h.Mul(this.goodsInfo.consume, num); //商品消费金 可抵金额
-                        this.goldNum = up > goldnum ? goldnum : up; //可抵金额，消费金不够及余额多少抵多少
+                        let up = this.localInfo.integral; //数智生活消费券
+                        let goldnum = this.$h.Mul(this.goodsInfo.consume, num); //商品消费券 可抵金额
+                        this.goldNum = up > goldnum ? goldnum : up; //可抵金额，消费券不够及余额多少抵多少
                         let sp = this.$h.Sub(ps, this.goldNum); //抵扣后价格
                         this.CommodityPrice = sp; this.amountTotal = sp;
-                        let b2 = this.$h.Sub(sp, um); //消费金电商  可以使用数智生活佣金支付
+                        let b2 = this.$h.Sub(sp, um); //消费券电商  可以使用数智生活佣金支付
                         obligation = b2 > 0 ? b2 : 0;
                     } else obligation = a;
                 }

src/pagesB/accountDetails/ConsumptionCharge.vue

@@ -14,7 +14,7 @@
         </div>
         <div class="zanwu" v-else>
             <img src="http://teaclub.oss-cn-chengdu.aliyuncs.com/CloudShop/head_pic/5a3c6b1e2d098aa6695394c927c38586545188b8png" alt="" class="zanwuimg">
-            <view class="zanwutxt">暂无消费金明细</view>
+            <view class="zanwutxt">暂无消费券明细</view>
         </div>
     </div>
 </template>

src/pagesB/cinema/cinemaTicket.vue

@@ -78,11 +78,11 @@
             </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">
-                    <span>消费金抵扣<span class="corg">{{Integral}}%</span></span>
+                    <span>消费券抵扣<span class="corg">{{Integral}}%</span></span>
                     <span class="corg">-￥{{ deduction || 0 }}</span>
                 </div>
                 <div class="li flex_r flex_jb">

src/pagesB/cinema/confirmOrder.vue

@@ -20,11 +20,11 @@
         </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">
-                <span>消费金抵扣<span class="corg">{{Integral}}%</span></span>
+                <span>消费券抵扣<span class="corg">{{Integral}}%</span></span>
                 <span class="corg">-￥{{ deduction || 0 }}</span>
             </div>
             <div class="li flex_r flex_jb">

src/pagesB/directCharge/coupon.vue

@@ -30,11 +30,11 @@
             </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">
-                    <span>消费金抵扣<span class="corg" v-if="selectitem.custom_price==0">{{Integral}}%</span></span>
+                    <span>消费券抵扣<span class="corg" v-if="selectitem.custom_price==0">{{Integral}}%</span></span>
                     <span class="corg">-￥{{ deduction || 0 }}</span>
                 </div>
                 <div class="li flex_r flex_jb">

src/pagesB/directCharge/orderDetail.vue

@@ -26,11 +26,11 @@
                 <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">
-                <span>消费金抵扣<span class="corg" v-if="!order.deduct_amount">{{Integral}}%</span></span>
+                <span>消费券抵扣<span class="corg" v-if="!order.deduct_amount">{{Integral}}%</span></span>
                 <span class="corg">-￥{{ deduction || 0 }}</span>
             </div>
             <div class="li flex_r flex_jb">

src/pagesB/directCharge/payment.vue

@@ -21,11 +21,11 @@
         <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">
-                    <span>消费金抵扣<span class="corg" v-if="selectitem.custom_price==0">{{Integral}}%</span></span>
+                    <span>消费券抵扣<span class="corg" v-if="selectitem.custom_price==0">{{Integral}}%</span></span>
                     <span class="corg">-￥{{ deduction || 0 }}</span>
                 </div>
                 <div class="li flex_r flex_jb">

src/pagesB/hotel/hotelDetail.vue

@@ -59,11 +59,11 @@
         </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">
-                <span>消费金抵扣<span class="corg">{{Integral}}%</span></span>
+                <span>消费券抵扣<span class="corg">{{Integral}}%</span></span>
                 <span class="corg">-￥{{ deduction || 0 }}</span>
             </div>
             <div class="li flex_r flex_jb">

src/pagesB/hotel/orderDetail.vue

@@ -66,11 +66,11 @@
         <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">
-                    <span>消费金抵扣<span class="corg">{{Integral}}%</span></span>
+                    <span>消费券抵扣<span class="corg">{{Integral}}%</span></span>
                     <span class="corg">-￥{{ deduction || 0 }}</span>
                 </div>
                 <div class="li flex_r flex_jb">

src/pagesB/my/myWallet.vue

@@ -4,7 +4,7 @@
             <view class="flex_r flex_jb acc_row">
                 <!-- <div class="i_num" @click="goto('/pagesB/accountDetails/ConsumptionCharge')">
                     <p class="flex_r flex_ac flex_jc">
-                        <image src="@/static/wallet/3.png" class="ico" /><span>消费金</span></p>
+                        <image src="@/static/wallet/3.png" class="ico" /><span>消费券</span></p>
                     <p class="dinB">{{localInfo.integral}}</p>
                 </div>
                 <div class="i_num" @click="goto('/pagesB/my/shuZhiWallet')">

src/pagesB/orderingfood/detail.vue

@@ -88,7 +88,7 @@
                         </view>
                         <view class="goods">
                             <view class="infoBox">
-                                <view class="title" :style="'color:'+template.color.color3">优惠抵扣<text>(消费金)</text></view>
+                                <view class="title" :style="'color:'+template.color.color3">优惠抵扣<text>(消费券)</text></view>
                             </view>
                             <view class="number"></view>
                             <view class="price" :style="'color:'+template.color.color3">-¥{{deduction}}</view>

src/pagesB/orderingfood/payTheBill.vue

@@ -22,11 +22,11 @@
         </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">
-                <span>消费金抵扣<span class="corg">{{Integral}}%</span></span>
+                <span>消费券抵扣<span class="corg">{{Integral}}%</span></span>
                 <span class="corg">-￥{{ deduction || 0 }}</span>
             </div>
             <div class="li flex_r flex_jb">

src/pagesB/prepaidRefill/index.vue

@@ -15,11 +15,11 @@
         </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">
-                <span>消费金抵扣</span>
+                <span>消费券抵扣</span>
                 <span class="corg">-￥{{ selectItem.custom_integral || 0 }}</span>
             </div>
             <div class="li flex_r flex_jb">

src/pagesB/prepaidRefill/orderDetail.vue

@@ -5,11 +5,11 @@
         </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">
-                <span>消费金抵扣</span>
+                <span>消费券抵扣</span>
                 <span class="corg">-￥{{ order.attachment.custom_integral || 0 }}</span>
             </div>
             <div class="li flex_r flex_jb">

src/pagesB/scenicSpotTicket/orderDetail.vue

@@ -10,11 +10,11 @@
                 <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">
-                <span>消费金抵扣<span class="corg">{{Integral}}%</span></span>
+                <span>消费券抵扣<span class="corg">{{Integral}}%</span></span>
                 <span class="corg">-￥{{ deduction || 0 }}</span>
             </div>
             <div class="li flex_r flex_jb">

src/pagesB/scenicSpotTicket/scenicDetail.vue

@@ -37,11 +37,11 @@
         </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">
-                <span>消费金抵扣<span class="corg">{{Integral}}%</span></span>
+                <span>消费券抵扣<span class="corg">{{Integral}}%</span></span>
                 <span class="corg">-￥{{ deduction || 0 }}</span>
             </div>
             <div class="li flex_r flex_jb">

src/pagesC/consumerGold/exchange.vue

@@ -9,7 +9,7 @@
                     <view></view>
                     <span v-if="Number(item.price) != 0">{{ item.price }}元</span>
                     <span v-if="Number(item.cha_bao_price) != 0 && Number(item.price) != 0">+</span>
-                    <span v-if="Number(item.cha_bao_price) != 0">{{ item.consume_price }}消费金</span>
+                    <span v-if="Number(item.cha_bao_price) != 0">{{ item.consume_price }}消费券</span>
                 </view>
                 <view class="info_btn_con flex_r flex_ae flex_je">
                     <!-- <view class="product-txt fenxiang">

src/pagesC/invi-img/index.vue

@@ -26,7 +26,7 @@ export default {
             WIDTH: 600,
             HEIGHT: 952,
             E_WIDTH: 316,
-            E_HEIGHT: 316,
+            E_HEIGHT: 359,
             imgUrl: "",
             bgImgList: [],
             bgSrc: "",
@@ -112,7 +112,7 @@ export default {
                 success: function(ret) {
                     path = ret.path;
                     const ctx = uni.createCanvasContext("myCanvas");
-                    let EWM_Y = HEIGHT - E_WIDTH - 316;
+                    let EWM_Y = HEIGHT - E_WIDTH - 336;
 
                     ctx.save();
                     ctx.drawImage(bgSrc, 0, 0, WIDTH, HEIGHT);
@@ -121,7 +121,7 @@ export default {
                     ctx.setFontSize(26); //设置标题字体大小
                     ctx.setFillStyle('#333'); //设置标题文本颜色
                     ctx.textAlign = 'center';
-                    ctx.fillText(that.title, 300, (HEIGHT / 2 + E_HEIGHT / 2 + 42))
+                    ctx.fillText(that.title, 300, (HEIGHT / 2 + E_HEIGHT / 2 + 20))
                     ctx.restore();
 
                     ctx.draw(false, function(e) {

src/pagesC/settledMerchant/pay.vue

@@ -23,7 +23,7 @@
         </div>
         <div class="money card">
             <div class="li flex_r flex_jb">
-                <span>消费金抵扣</span>
+                <span>消费券抵扣</span>
                 <span>{{ discounts.discount || 0 }}</span>
             </div>
             <div class="li flex_r flex_jb">

src/static/js/tabs.js

@@ -52,7 +52,7 @@ export default [
 //   {
 //       ico: "http://teaclub.oss-cn-chengdu.aliyuncs.com/CloudShop/head_pic/26e490aca87654a65d5e1a8b4bb2702e6f835ef6png",
 //       url: "/pages/product/productRetail?type=4",
-//       tit: "消费金电商"
+//       tit: "消费券电商"
 //   },
 //   {
 //       ico: "http://teaclub.oss-cn-chengdu.aliyuncs.com/CloudShop/head_pic/4089ec6a9c87e91d4ed8207562b87e9bd48b8c9dpng",

src/utils/myfun.js

@@ -73,10 +73,10 @@ 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 "消费金兑换";
+        case 7: return "消费券兑换";
         default: return ""
     }
 }