增加同城生活字段

src/views/active/index.vue

@@ -9,7 +9,7 @@
         <el-radio-button :label="1">平台优惠券</el-radio-button>
         <el-radio-button :label="2">平台秒杀</el-radio-button>
         <el-radio-button :label="3">平台限时折扣</el-radio-button>
-        <el-radio-button :label="5">交易金活动</el-radio-button>
+        <el-radio-button :label="5">消费金活动</el-radio-button>
       </el-radio-group>
     </div>
     <!-- 搜索 -->

src/views/finance/list/index.vue

@@ -45,13 +45,13 @@
         </div>
         <div>
           <div class="correlation" style="font-size: 18px;font-weight: bold;">
-            <span>交易金相关</span>
+            <span>消费金相关</span>
             <el-tooltip placement="top" effect="light">
               <div slot="content" style="font-size: 18px;">
-                交易金说明：<br />
-                交易金提现比例：{{ financialData.beeCoinRatio * 100 }}%<br />
-                可提现：客户已支付已核销订单的交易金可提现金额（按照提现比例折算）；<br />
-                待到账冻结：客户已支付未核销订单的交易金支付金额；<br /></div>
+                消费金说明：<br />
+                消费金提现比例：{{ financialData.beeCoinRatio * 100 }}%<br />
+                可提现：客户已支付已核销订单的消费金可提现金额（按照提现比例折算）；<br />
+                待到账冻结：客户已支付未核销订单的消费金支付金额；<br /></div>
               <div class="icon">
                 <i class="el-icon-warning-outline" :size="34"></i>
               </div>

src/views/order/pending/pendDetails.vue

@@ -53,7 +53,7 @@
                   <span v-else-if="order.paymentMode === 5">平台余额支付</span>
                   <span v-else-if="order.paymentMode === 6">商家余额支付</span>
                   <span v-else-if="order.paymentMode === 7">佣金支付</span>
-                  <span v-else-if="order.paymentMode === 8">交易金支付</span>
+                  <span v-else-if="order.paymentMode === 8">消费金支付</span>
                   <span v-else-if="order.paymentMode === 9">惠市宝支付</span>
                   <span v-else>--</span>
                 </p>

src/views/shop/paymentCode/index.vue

@@ -2,13 +2,14 @@
     <div class="paymentCode">
         <div class="paymentCode-left">
             <div class="paymentCode-title">商家收款码样式</div>
-            <template  v-if="canvasImg == ''">
+            <template v-if="canvasImg == ''">
                 <!-- v-if="canvasImg == ''" -->
                 <div ref="paymentCodeCanvas" id="paymentCodeCanvas">
                     <div class="paymentCode-img" ref="businessCardCanvas" id="businessCardCanvas">
+                        <div class="paymentCode-img-live">团蜂同城生活</div>
                         <div class="paymentCode-img-title">扫码消费有补贴</div>
                         <div class="img-box">
-                            <img :src="codeInfo.shopCode" alt="">
+                            <img :src="codeInfo.shopCode" alt="" crossorigin="anonymous">
                         </div>
                         <div class="img-button">{{ codeInfo.shopName }}</div>
                     </div>
@@ -78,7 +79,7 @@ export default {
                 },
                 {
                     url: require('@/assets/images/mode-img/4.png'),
-                    text: '团蜂交易金'
+                    text: '团蜂消费金'
                 },
                 {
                     url: require('@/assets/images/mode-img/5.png'),
@@ -91,13 +92,16 @@ export default {
             ],
         }
     },
-    updated() {
-        this.generateImage()
-    },
+    // updated() {
+    //     this.generateImage()
+    // },
     methods: {
         async generateCode() {
             const res = await getQrcode({ codeType: 1, state: 1 })
             this.codeInfo = res.data
+            this.$nextTick(()=>{
+                this.generateImage()
+            })
         },
         generateImage() {
             html2canvas(this.$refs.paymentCodeCanvas, {
@@ -204,19 +208,25 @@ img {
             background-color: #EF530E;
             border-radius: 10px;
             position: relative;
-
+            .paymentCode-img-live{
+                font-size: 28px;
+                color: #fff;
+                font-weight: 700;
+                font-style: italic;
+                margin-top: 15px;
+            }
             .paymentCode-img-title {
                 display: block !important;
                 width: 100%;
-                height: 76px !important;
+                height: 56px !important;
                 color: #fff !important;
                 font-size: 50px !important;
-                margin: 32px 0 24px !important;
+                margin: 20px 0 24px !important;
                 font-weight: 700 !important;
                 font-style: italic !important;
                 box-sizing: border-box;
                 text-align: center;
-                line-height: 76px;
+                line-height: 56px;
             }
 
             .img-box {

src/views/shop/storeCode/index.vue

@@ -6,6 +6,7 @@
                 <!-- v-if="canvasImg == ''" -->
                 <div ref="paymentCodeCanvas" id="paymentCodeCanvas">
                     <div class="paymentCode-img" ref="businessCardCanvas" id="businessCardCanvas">
+                        <div class="paymentCode-img-live">团蜂同城生活</div>
                         <div class="paymentCode-img-title">扫码消费有补贴</div>
                         <div class="img-box">
                             <img :src="codeInfo.shopCode" alt="">
@@ -38,14 +39,14 @@ import QRCode from 'qrcode';
 import Cookies from 'js-cookie'
 import html2canvas from 'html2canvas'
 export default {
-    created () {
+    created() {
         this.generateCode()
     },
     data() {
         return {
             codeInfo: {
-                shopName:'',
-                shopCode:''
+                shopName: '',
+                shopCode: ''
             },
             canvasImg: '',
             srcList: [],
@@ -65,7 +66,7 @@ export default {
                 },
                 {
                     url: require('@/assets/images/mode-img/4.png'),
-                    text: '团蜂交易金'
+                    text: '团蜂消费金'
                 },
                 {
                     url: require('@/assets/images/mode-img/5.png'),
@@ -78,7 +79,7 @@ export default {
             ],
             //  没有 logo 的二维码图片
             qCodeImg: '',
-            shopLogo:''
+            shopLogo: ''
         }
     },
     // updated() {
@@ -111,15 +112,15 @@ export default {
                 ctx.drawImage(logo, logoX, logoY, logoSize, logoSize);
                 // 将生成的二维码插入到页面中
                 this.codeInfo.shopCode = qrCodeCanvas.toDataURL();
-                this.$nextTick(()=>{
+                this.$nextTick(() => {
                     this.generateImage()
                 })
             };
         },
         async generateCode() {
-            const res = await shopSysGetById({ })
-            this.codeInfo.shopName =  res.data.shopName
-            this.shopLogo =  res.data.shopLogo
+            const res = await shopSysGetById({})
+            this.codeInfo.shopName = res.data.shopName
+            this.shopLogo = res.data.shopLogo
             //  生成 qCode 二维码
             this.setQRcode()
         },
@@ -228,18 +229,26 @@ img {
             border-radius: 10px;
             position: relative;
 
+            .paymentCode-img-live {
+                font-size: 28px;
+                color: #fff;
+                font-weight: 700;
+                font-style: italic;
+                margin-top: 15px;
+            }
+
             .paymentCode-img-title {
                 display: block !important;
                 width: 100%;
-                height: 76px !important;
+                height: 56px !important;
                 color: #fff !important;
                 font-size: 50px !important;
-                margin: 32px 0 24px !important;
+                margin: 20px 0 24px !important;
                 font-weight: 700 !important;
                 font-style: italic !important;
                 box-sizing: border-box;
                 text-align: center;
-                line-height: 76px;
+                line-height: 56px;
             }
 
             .img-box {

vue.config.js

@@ -41,7 +41,8 @@ module.exports = {
     proxy: {
       '/businessapi': {
         // target: 'http://192.168.0.91:9104',
-        target: 'https://nsbusinessapitest.tuanfengkeji.cn',
+        // target: 'https://nsbusinessapitest.tuanfengkeji.cn',
+        target: 'https://nsbusinessapi.tuanfengkeji.cn',
         changeOrigin: true,
         pathRewrite: {
           '^/businessapi': ''