Merge branch 'bd-dev' of gitee.com:cabbage_qd/web-base-h5 into bd-region-select

components/share/DefaultSharePage.vue

@@ -1,51 +1,42 @@
 <template>
   <view class="default-share-page">
     <!-- 背景图片，替代CSS background -->
-    <image
+    <img
       class="share-bg-image"
       src="/static/images/share-bg.jpg"
-      mode="scaleToFill"
       crossorigin="anonymous"
       @load="onBackgroundImageLoad"
       @error="onBackgroundImageError"
-    ></image>
+    />
-
+    <view class="qr-code-outer">
-    <view class="share-wrapper">
+      <image
-      <view class="portal-frame" :class="{ 'is-loaded': isLoaded }">
+        class="qr-code"
-        <!-- 二维码样式区域 - 用户自定义样式位置 -->
+        :src="qrCodeImage"
-        <view class="qr-code-outer">
+        mode="aspectFit"
-          <image
+        v-if="qrCodeImage"
-            class="qr-code"
+      ></image>
-            :src="qrCodeImage"
+      <view v-else class="qr-code-placeholder">
-            mode="aspectFit"
+        <view class="loader"></view>
-            v-if="qrCodeImage"
-          ></image>
-          <view v-else class="qr-code-placeholder">
-            <view class="loader"></view>
-          </view>
-        </view>
-
-        <!-- 会员编号样式区域 - 用户自定义样式位置 -->
-        <text
-          class="member-code-text"
-          style="
-            font-size: 30rpx;
-            color: #fff;
-            font-weight: bold;
-            margin-top: 20rpx;
-          "
-          >{{ desensitization(userInfo.memberCode) }}</text
-        >
-
-        <!-- 下载按钮 - 仅在非微信环境显示 -->
-        <!-- <button class="share-button">长按保存图片</button> -->
       </view>
     </view>
+    <view class="member-code-outer">
+      <text
+        class="member-code-text"
+        style="
+          font-size: 30rpx;
+          color: #fff;
+          font-weight: bold;
+          margin-top: 20rpx;
+        "
+        >{{ desensitization(userInfo.memberCode) }}</text
+      >
+    </view>
   </view>
 </template>
 
 <script>
 import html2canvas from 'html2canvas'
+import { snapdom } from '@zumer/snapdom'
 
 export default {
   name: 'DefaultSharePage',
@@ -139,30 +130,23 @@ export default {
               return
             }
 
-            console.log(
+            const scale = 3
-              '开始html2canvas截取，容器尺寸:',
-              element.offsetWidth,
-              'x',
-              element.offsetHeight
-            )
-
             html2canvas(element, {
               useCORS: true,
-              allowTaint: true,
+              // allowTaint: true,
               backgroundColor: null,
-              scale: 2,
+              scale,
-              dpi: 400,
+              // canvas,
-              logging: true,
               width: element.offsetWidth,
               height: element.offsetHeight,
-              windowWidth: element.offsetWidth,
-              windowHeight: element.offsetHeight,
-              scrollX: 0,
-              scrollY: 0,
-              x: 0,
-              y: 0,
             })
               .then(canvas => {
+                const context = canvas.getContext('2d')
+                // context.scale(2, 2)
+                context.mozImageSmoothingEnabled = false
+                context.webkitImageSmoothingEnabled = false
+                context.msImageSmoothingEnabled = false
+                context.imageSmoothingEnabled = false
                 const dataUrl = canvas.toDataURL('image/jpeg', 1)
                 this.$emit('share-generated', dataUrl)
                 resolve()
@@ -232,8 +216,8 @@ export default {
 
 /* 二维码样式区域 - 用户自定义样式位置 */
 .qr-code-outer {
-  width: 400rpx;
+  width: 140rpx;
-  height: 400rpx;
+  height: 140rpx;
   background: rgba(255, 255, 255, 0.98);
   border-radius: 20rpx;
   box-shadow: 0px 8rpx 20rpx rgba(50, 50, 90, 0.06);
@@ -243,6 +227,10 @@ export default {
   justify-content: center;
   padding: 12rpx;
   box-sizing: border-box;
+  position: absolute;
+  bottom: 460rpx;
+  right: 130rpx;
+  z-index: 10;
 }
 
 .qr-code,
@@ -280,6 +268,15 @@ export default {
 .member-code-text {
   /* 用户可以在这里自定义会员编号的样式 */
 }
+.member-code-outer {
+  position: absolute;
+  bottom: 160rpx;
+  width: 500rpx;
+  text-align: center;
+  background: rgb(217, 24, 25);
+  border-radius: 20rpx;
+  z-index: 10;
+}
 
 /* 下载按钮样式 */
 .share-button {

pages/mine/share/index.vue

@@ -85,10 +85,10 @@ export default {
         this.canvasHeight = res.windowHeight
       },
     })
-    uni.showLoading({
+    // uni.showLoading({
-      title: '加载中...',
+    //   title: '加载中...',
-      mask: true,
+    //   mask: true,
-    })
+    // })
   },
   onReady() {
     // 短暂延迟后启用加载动画

pages/other/index.vue

@@ -322,7 +322,7 @@
 
       <view class="pad">
         <view class="disFlex justBwn">
-          <view class="tit3">{{ '商品金额总计' }}(¥)：</view>
+          <view class="tit3">{{ '商品金额总计' }}：</view>
           <view class="tit1">{{
             allGoodsData.priceAmount | numberToCurrency
           }}</view>

pages/pay/hiPay.vue

@@ -11,7 +11,7 @@
       <template>
         <view class="tit">{{ '待支付金额' }}</view>
         <view class="tit1">
-          ￥{{ paramsPost.orderAmount | numberToCurrency }}
+          {{ paramsPost.orderAmount | numberToCurrency }}
         </view>
         <!-- <view class="tit2"
           >{{ '请在' }} <view class="tit3">{{ countDown }}</view

pages/pay/index.vue

@@ -20,8 +20,7 @@
       <template v-else>
         <view class="tit">{{ '待支付金额' }}</view>
         <view class="tit1">
-          {{ userInfo.currencyIcon
+          {{ orderData.orderAmount | numberToCurrency }}
-          }}{{ orderData.orderAmount | numberToCurrency }}
         </view>
         <view class="tit2"
           >{{ '请在' }} <view class="tit3">{{ countDown }}</view
@@ -51,130 +50,106 @@
               <view class="tTit">{{ '消费账户' }}</view>
               <view class="lan">
                 <view>
-                  {{ payDetail.account1 | numberToCurrency | isLocal }}
+                  {{ payDetail.account1 | numberToCurrency }}
-                </view>
-                <view>
-                  -{{ payDetail.payAccount1 | numberToCurrency | isLocal }}
                 </view>
+                <view> -{{ payDetail.payAccount1 | numberToCurrency }} </view>
               </view>
             </view>
             <view class="quan_i" v-show="payDetail.payAccount2 > 0">
               <view class="tTit">{{ '现金账户' }}</view>
               <view class="lan">
                 <view>
-                  {{ payDetail.account2 | numberToCurrency | isLocal }}
+                  {{ payDetail.account2 | numberToCurrency }}
-                </view>
-                <view>
-                  -{{ payDetail.payAccount2 | numberToCurrency | isLocal }}
                 </view>
+                <view> -{{ payDetail.payAccount2 | numberToCurrency }} </view>
               </view>
             </view>
             <view class="quan_i" v-show="payDetail.payAccount3 > 0">
               <view class="tTit">{{ '政策账户' }}</view>
               <view class="lan">
                 <view>
-                  {{ payDetail.account3 | numberToCurrency | isLocal }}
+                  {{ payDetail.account3 | numberToCurrency }}
-                </view>
-                <view>
-                  -{{ payDetail.payAccount3 | numberToCurrency | isLocal }}
                 </view>
+                <view> -{{ payDetail.payAccount3 | numberToCurrency }} </view>
               </view>
             </view>
             <view class="quan_i" v-show="payDetail.payAccount4 > 0">
               <view class="tTit">{{ '奖金账户' }}</view>
               <view class="lan">
                 <view>
-                  {{ payDetail.account4 | numberToCurrency | isLocal }}
+                  {{ payDetail.account4 | numberToCurrency }}
-                </view>
-                <view>
-                  -{{ payDetail.payAccount4 | numberToCurrency | isLocal }}
                 </view>
+                <view> -{{ payDetail.payAccount4 | numberToCurrency }} </view>
               </view>
             </view>
             <view class="quan_i" v-show="payDetail.payAccount5 > 0">
               <view class="tTit">{{ '重消账户' }}</view>
               <view class="lan">
                 <view>
-                  {{ payDetail.account5 | numberToCurrency | isLocal }}
+                  {{ payDetail.account5 | numberToCurrency }}
-                </view>
-                <view>
-                  -{{ payDetail.payAccount5 | numberToCurrency | isLocal }}
                 </view>
+                <view> -{{ payDetail.payAccount5 | numberToCurrency }} </view>
               </view>
             </view>
             <view class="quan_i" v-show="payDetail.payAccount6 > 0">
               <view class="tTit">{{ '积分账户' }}</view>
               <view class="lan">
                 <view>
-                  {{ payDetail.account6 | numberToCurrency | isLocal }}
+                  {{ payDetail.account6 | numberToCurrency }}
-                </view>
-                <view>
-                  -{{ payDetail.payAccount6 | numberToCurrency | isLocal }}
                 </view>
+                <view> -{{ payDetail.payAccount6 | numberToCurrency }} </view>
               </view>
             </view>
             <view class="quan_i" v-show="payDetail.payAccount7 > 0">
               <view class="tTit">{{ '鼓励账户' }}</view>
               <view class="lan">
                 <view>
-                  {{ payDetail.account7 | numberToCurrency | isLocal }}
+                  {{ payDetail.account7 | numberToCurrency }}
-                </view>
-                <view>
-                  -{{ payDetail.payAccount7 | numberToCurrency | isLocal }}
                 </view>
+                <view> -{{ payDetail.payAccount7 | numberToCurrency }} </view>
               </view>
             </view>
             <view class="quan_i" v-show="payDetail.payAccount8 > 0">
               <view class="tTit">{{ '复购券账户' }}</view>
               <view class="lan">
                 <view>
-                  {{ payDetail.account8 | numberToCurrency | isLocal }}
+                  {{ payDetail.account8 | numberToCurrency }}
-                </view>
-                <view>
-                  -{{ payDetail.payAccount8 | numberToCurrency | isLocal }}
                 </view>
+                <view> -{{ payDetail.payAccount8 | numberToCurrency }} </view>
               </view>
             </view>
             <view class="quan_i" v-show="payDetail.payAccount9 > 0">
               <view class="tTit">{{ '全球积分' }}</view>
               <view class="lan">
                 <view>
-                  {{ payDetail.account9 | numberToCurrency | isLocal }}
+                  {{ payDetail.account9 | numberToCurrency }}
-                </view>
-                <view>
-                  -{{ payDetail.payAccount9 | numberToCurrency | isLocal }}
                 </view>
+                <view> -{{ payDetail.payAccount9 | numberToCurrency }} </view>
               </view>
             </view>
             <view class="quan_i" v-show="payDetail.payAccount10 > 0">
               <view class="tTit">{{ '车奖积分' }}</view>
               <view class="lan">
                 <view>
-                  {{ payDetail.account10 | numberToCurrency | isLocal }}
+                  {{ payDetail.account10 | numberToCurrency }}
-                </view>
-                <view>
-                  -{{ payDetail.payAccount10 | numberToCurrency | isLocal }}
                 </view>
+                <view> -{{ payDetail.payAccount10 | numberToCurrency }} </view>
               </view>
             </view>
             <view class="quan_i" v-show="payDetail.payAccount12 > 0">
               <view class="tTit">{{ '法宝券' }}</view>
               <view class="lan">
                 <view> </view>
-                <view>
+                <view> -{{ payDetail.payAccount12 | numberToCurrency }} </view>
-                  -{{ payDetail.payAccount12 | numberToCurrency | isLocal }}
-                </view>
               </view>
             </view>
             <view class="quan_i" v-show="payDetail.payAccount13 > 0">
               <view class="tTit">{{ '海豆账户' }}</view>
               <view class="lan">
                 <view>
-                  {{ payDetail.account13 | numberToCurrency | isLocal }}
+                  {{ payDetail.account13 | numberToCurrency }}
-                </view>
-                <view>
-                  -{{ payDetail.payAccount13 | numberToCurrency | isLocal }}
                 </view>
+                <view> -{{ payDetail.payAccount13 | numberToCurrency }} </view>
               </view>
             </view>
           </u-collapse-item>

pages/regiest/index.vue

@@ -429,7 +429,7 @@
 
       <view class="pad">
         <view class="disFlex justBwn">
-          <view class="tit3">{{ '商品金额总计' }}(¥)：</view>
+          <view class="tit3">{{ '商品金额总计' }}：</view>
           <view class="tit1">{{
             allGoodsData.priceAmount | numberToCurrency
           }}</view>

util/index.js

@@ -104,10 +104,10 @@ function formatCurrency(value) {
   // 判断是否有小数部分
   if (truncated % 1 === 0) {
     // 整数，不显示小数位，但添加千分位分隔符
-    return addThousandSeparator(truncated)
+    return addThousandSeparator(numValue)
   } else {
     // 有小数，保留两位，并为整数部分添加千分位分隔符
-    const fixedValue = truncated.toFixed(2)
+    const fixedValue = numValue.toFixed(2)
     const parts = fixedValue.split('.')
     parts[0] = addThousandSeparator(parts[0])
     return parts.join('.')