修改样式

miniprogram/pages/index/index.ts

@@ -84,7 +84,7 @@ Page({
       YEAR: "年卡"
     }
     if(type === "YEAR" && num >= 99) {
-      return '终生卡'
+      return '永久卡'
     }
     return num + template[type]
   },

miniprogram/pages/login/login.wxml

@@ -7,7 +7,7 @@
   </view>
   <view class="login-section">
     <view class="btnSection">
-      <button type="primary" disabled="{{ !isAgree }}" open-type="getPhoneNumber" bindgetphonenumber="getLogin">微信一键登录</button>
+      <button type="primary" disabled="{{ !isAgree }}" open-type="getUserInfo" bindgetuserinfo="getLogin">微信一键登录</button>
     </view>
     <view class="protocol-section">
       <image wx:if="{{isAgree}}" bind:tap="onAgree" src="./images/radio-active.png" class="radio"></image>

miniprogram/pages/orders/order-result.less

@@ -103,7 +103,13 @@ page {
   }
 
 }
-
+.only_canvas {
+  position: absolute;
+  left: -300rpx;
+  top: 0;
+  width: 202rpx;
+  height: 202rpx;
+}
 .qrcode-section {
   margin-top: 28rpx;
   border-top: 2rpx solid #F0F0F0;

miniprogram/pages/orders/order-result.ts

@@ -48,8 +48,7 @@ Page({
     showCanvas: false, // 是否显示二维码
     canvasImg: "" as string,
     showService: false,
-    refoundStatus: false,
-    refoundValue: "" // 退款内容
+    refoundStatus: false
   },
 
   /**
@@ -136,7 +135,7 @@ Page({
       YEAR: "年卡"
     }
     if(type === "YEAR" && num >= 99) {
-      return '终生卡'
+      return '永久卡'
     }
     return num + template[type]
   },

miniprogram/pages/orders/order-result.wxml

@@ -27,13 +27,16 @@
       </view>
       <view class="qrcode-section" wx:if="{{ (goodsInfo.wechatStatus == 'PAID' || goodsInfo.wechatStatus == 'WAIT_USE') && showCanvas }}">
         <view class="qrcode-wrap">
-          <canvas class='my_draw_canvas' data-type="image" canvas-id='canvasCode' id="canvasCode"></canvas>
+          <!-- <canvas class='my_draw_canvas' data-type="image" canvas-id='canvasCode' id="canvasCode"></canvas> -->
+          <image src="{{canvasImg}}" mode="scaleToFill" class='my_draw_canvas' style="opacity: {{ goodsInfo.wechatStatus == 'PAID' ? 0.4 : 1 }};" show-menu-by-longpress="true"></image>
         </view>
         <view class="qrcode-text" wx:if="{{goodsInfo.wechatStatus == 'WAIT_USE'}}">请扫描二维码激活使用</view>
         <view class="qrcode-text used" wx:else>二维码已使用</view>
       </view>
     </view>
 
+    <canvas class='my_draw_canvas only_canvas' data-type="image" canvas-id='canvasCode' id="canvasCode"></canvas>
+
     <view class="order-time">
       <view class="order-item">
         <view class="title">订单号</view>

miniprogram/pages/orders/orders.ts

@@ -158,7 +158,7 @@ Page({
       YEAR: "年卡"
     }
     if(type === "YEAR" && num >= 99) {
-      return '终生卡'
+      return '永久卡'
     }
     return num + template[type]
   },