shish 2 anni fa
parent
commit
1d1472a377

+ 9 - 3
ghsApp/src/admin/billing/toPay.vue

@@ -16,8 +16,12 @@
         </block>
         </block>
         <view>
         <view>
           <view style="text-align:center;margin:10upx auto 10upx auto;">
           <view style="text-align:center;margin:10upx auto 10upx auto;">
-            <view class="balance" style="margin-bottom:25upx;">扫客户二维码收款</view>
-            <view style="margin-bottom:20upx;">
+            <view class="balance" style="margin-bottom:25upx;" v-if="goPay == 0">扫客户二维码收款</view>
+            <view class="balance" style="margin-bottom:25upx;" v-if="goPay == 1">请求中</view>
+            <view style="text-algin:center;">
+              <image style="width:40upx;height:40upx;margin:0 auto;" :src="`${constant.imgUrl}/icon/loading.gif`" v-if="goPay == 1" mode="scaleToFill" />
+            </view>
+            <view style="margin-top:20upx;">
                 <button style="width:25vh;" @click="beginScan()" class="admin-button-com big blue">点击扫码</button>
                 <button style="width:25vh;" @click="beginScan()" class="admin-button-com big blue">点击扫码</button>
             </view>
             </view>
             <view style="margin-top:20upx;">
             <view style="margin-top:20upx;">
@@ -59,7 +63,8 @@ export default {
       INT:null,
       INT:null,
       orderInfo:{orderType:0},
       orderInfo:{orderType:0},
       expire:0,
       expire:0,
-      T:null
+      T:null,
+      goPay:0
     };
     };
   },
   },
   mounted() {
   mounted() {
@@ -89,6 +94,7 @@ export default {
     //付款
     //付款
     requestCodePay(authCode){
     requestCodePay(authCode){
         let that = this
         let that = this
+        this.goPay = 1
         codePay({id:this.orderId,authCode:authCode}).then(res=>{
         codePay({id:this.orderId,authCode:authCode}).then(res=>{
             if(res.code == 1){
             if(res.code == 1){
                 if(res.data.returnStatus == 'SUCCESS'){
                 if(res.data.returnStatus == 'SUCCESS'){

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

@@ -5,7 +5,7 @@
                 <image class="img" :src="`${constant.imgUrl}/icon/scan/scan.png`" mode="scaleToFill" />
                 <image class="img" :src="`${constant.imgUrl}/icon/scan/scan.png`" mode="scaleToFill" />
                 <view style="margin-top:20upx;font-weight:bold;font-size:35upx;color:black;">¥{{price}}</view>
                 <view style="margin-top:20upx;font-weight:bold;font-size:35upx;color:black;">¥{{price}}</view>
                 <view class="show-code" v-if="goPay == 0">请出示付款码</view>
                 <view class="show-code" v-if="goPay == 0">请出示付款码</view>
-                <view class="paying" v-if="goPay == 1">付款中</view>
+                <view class="paying" v-if="goPay == 1">请求中</view>
                 <image style="width:40upx;height:40upx;position:absolute;top:200upx;left:165upx;" :src="`${constant.imgUrl}/icon/loading.gif`" v-if="goPay == 1" mode="scaleToFill" />
                 <image style="width:40upx;height:40upx;position:absolute;top:200upx;left:165upx;" :src="`${constant.imgUrl}/icon/loading.gif`" v-if="goPay == 1" mode="scaleToFill" />
                 <view style="margin-top:30upx;">
                 <view style="margin-top:30upx;">
                     <view @click="cancelPayFn" class="btn-default">取消</view>
                     <view @click="cancelPayFn" class="btn-default">取消</view>

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

@@ -5,7 +5,7 @@
                 <image class="img" :src="`${constant.imgUrl}/icon/scan/scan.png`" mode="scaleToFill" />
                 <image class="img" :src="`${constant.imgUrl}/icon/scan/scan.png`" mode="scaleToFill" />
                 <view style="margin-top:20upx;font-weight:bold;font-size:35upx;color:black;">¥{{price}}</view>
                 <view style="margin-top:20upx;font-weight:bold;font-size:35upx;color:black;">¥{{price}}</view>
                 <view class="show-code" v-if="goPay == 0">请出示付款码</view>
                 <view class="show-code" v-if="goPay == 0">请出示付款码</view>
-                <view class="paying" v-if="goPay == 1">付款中</view>
+                <view class="paying" v-if="goPay == 1">请求中</view>
                 <image style="width:40upx;height:40upx;position:absolute;top:200upx;left:165upx;" :src="`${constant.imgUrl}/icon/loading.gif`" v-if="goPay == 1" mode="scaleToFill" />
                 <image style="width:40upx;height:40upx;position:absolute;top:200upx;left:165upx;" :src="`${constant.imgUrl}/icon/loading.gif`" v-if="goPay == 1" mode="scaleToFill" />
                 <view style="margin-top:30upx;">
                 <view style="margin-top:30upx;">
                     <view @click="cancelPayFn" class="btn-default">取消</view>
                     <view @click="cancelPayFn" class="btn-default">取消</view>