|
@@ -563,12 +563,7 @@
|
|
|
@copyLink="copyLink" @saveToAlbum="saveToAlbum" @closeModal="shareShow = false">
|
|
@copyLink="copyLink" @saveToAlbum="saveToAlbum" @closeModal="shareShow = false">
|
|
|
</uni-share>
|
|
</uni-share>
|
|
|
<!-- 自定义加载动画 -->
|
|
<!-- 自定义加载动画 -->
|
|
|
- <u-overlay :show="loadingShow" style="background-color: rgba(255, 255, 255, 0.6);">
|
|
|
|
|
- <view class="dis f-c a-c j-c " style="height: 100%;">
|
|
|
|
|
- <u-loading-icon></u-loading-icon>
|
|
|
|
|
- <text style="color: #909399;" class="mt-1">{{loadingText}}</text>
|
|
|
|
|
- </view>
|
|
|
|
|
- </u-overlay>
|
|
|
|
|
|
|
+ <global-loading :show="loadingShow" :text="loadingText"></global-loading>
|
|
|
</view>
|
|
</view>
|
|
|
</template>
|
|
</template>
|
|
|
<script>
|
|
<script>
|
|
@@ -810,7 +805,7 @@
|
|
|
const navDelay = 1000; //成功后「正在前往支付页面」展示时长(毫秒)
|
|
const navDelay = 1000; //成功后「正在前往支付页面」展示时长(毫秒)
|
|
|
// 查询前:loading「查询支付码中」转1秒再请求接口
|
|
// 查询前:loading「查询支付码中」转1秒再请求接口
|
|
|
await new Promise(resolve => setTimeout(resolve, preDelay));
|
|
await new Promise(resolve => setTimeout(resolve, preDelay));
|
|
|
- let qrCode = await this.$http.get('/order/qrCode/getQrCode?orderNo=' + this.ordersNo);
|
|
|
|
|
|
|
+ let qrCode = await this.$http.get('/order/qrCode/getQrCode?orderNo=' + encodeURIComponent(this.ordersNo));
|
|
|
if (qrCode.code == '200') {
|
|
if (qrCode.code == '200') {
|
|
|
// 成功后:loading文字改为"正在前往支付页面",再转1秒后跳转
|
|
// 成功后:loading文字改为"正在前往支付页面",再转1秒后跳转
|
|
|
this.loadingText = "正在前往支付页面";
|
|
this.loadingText = "正在前往支付页面";
|