Merge branch 'master' into dev

src/pages/admin/add_order/pending_order/pay/index.vue

@@ -2,7 +2,7 @@
   <view class="container">
     <view class="name">立即收款</view>
     <view class="input">
-      <input v-model="val" placeholder="请输入收款金额" />
+      <input v-model="val" type="digit" placeholder="请输入收款金额" />
       <view class="line"></view>
     </view>
 

src/pages/admin/add_order/pending_order/wx_pay_code/index.scss

@@ -26,13 +26,12 @@ page {
     width: 608px;
     height: 457px;
     position: relative;
-    canvas {
+    .qrcode {
       position: absolute;
       width: 280px;
       height: 280px;
-      top: 47%;
-      left: 69%;
-      transform: translate(-50%, -50%);
+      top: 14%;
+      right: 9%;
     }
   }
 }

src/pages/admin/add_order/pending_order/wx_pay_code/index.vue

@@ -7,7 +7,7 @@
     <view class="box">
       <!-- <image :src="`https://api.pwmqr.com/qrcode/create?url=${code}`"></image> -->
       <!-- <view ref="qrcode" id="qrcode"></view> -->
-      <canvas canvas-id="qrcode" id="qrcode"></canvas>
+      <canvas class="qrcode" canvas-id="qrcode" id="qrcode"></canvas>
     </view>
   </view>
 </template>
@@ -49,9 +49,10 @@ Taro.useLoad((e) => {
 const getCode = () => {
   var qr = new UQRCode();
   qr.data = Taro.getStorageSync("pay_code");
-  qr.size = 150;
+  qr.size = 160;
+  qr.margin = 5;
   qr.make();
-  var canvasContext = Taro.createCanvasContext("qrcode");
+  const canvasContext = Taro.createCanvasContext("qrcode");
   qr.canvasContext = canvasContext;
   qr.drawCanvas();
 };