shish пре 2 недеља
родитељ
комит
a83b9371df

+ 2 - 2
ghsPad/src/pages/home/components/toPay.vue

@@ -18,7 +18,7 @@
                 <view class="show-code" v-if="goPay == 0">请出示付款码</view>
                 <view class="paying" v-if="goPay == 1">请求中</view>
                 <view style="font-size:18upx;margin:8upx auto;color:red;font-weight:bold;text-align:center;" v-if="goPay == 2">
-                    <view style="font-size:18upx;line-height:1.3;max-width:90%;margin:0 auto;">{{ remindText }}</view>
+                    <view style="font-size:16upx;line-height:1.3;max-width:90%;margin:0 auto;">{{ remindText }}</view>
                     <view style="margin-top:6upx;display:flex;justify-content:center;" v-if="returnCode=='BBS11105' || returnCode=='BBS10000'">
                         <text style="color:green;border:1upx solid green;border-radius:8upx;padding:4upx 12upx;font-size:18upx;font-weight:bold;line-height:1.2;background-color:transparent;" @click="checkOrder">
                             查询结果
@@ -46,7 +46,7 @@
                 <view style="margin-bottom:40upx;text-align: center;font-size:24upx;">{{ cancelText }}</view>
                 <view style="text-align:center;">
                     <button class="admin-button-com mini-btn default" @click="returnCancel">返回</button>
-                    <button class="admin-button-com mini-btn default" @click="confirmToCancel" style="margin-left:30upx;">确认取消</button>
+                    <button class="admin-button-com mini-btn default" @click="confirmToCancel" style="margin-left:30upx;">确认</button>
                 </view>
             </view>
         </uni-popup>

+ 1 - 1
hdPad/src/pages/home/components/toPay.vue

@@ -7,7 +7,7 @@
                 <view class="show-code" v-if="goPay == 0">请出示付款码</view>
                 <view class="paying" v-if="goPay == 1">请求中</view>
                 <view style="font-size:18upx;margin:8upx auto;color:red;font-weight:bold;text-align:center;" v-if="goPay == 2">
-                    <view style="font-size:18upx;line-height:1.3;max-width:90%;margin:0 auto;">{{ remindText }}</view>
+                    <view style="font-size:16upx;line-height:1.3;max-width:90%;margin:0 auto;">{{ remindText }}</view>
                     <view style="margin-top:6upx;display:flex;justify-content:center;" v-if="returnCode=='BBS11105' || returnCode=='BBS10000'">
                         <text style="color:green;border:1upx solid green;border-radius:8upx;padding:4upx 12upx;font-size:18upx;font-weight:bold;line-height:1.2;background-color:transparent;" @click="checkOrder">
                             查询结果