Merge branch 'dev-1.0' of…

Merge branch 'dev-1.0' of https://gitlab.infra.miyatech.com/pengguangpu/doublescreen-back into dev-1.0

Merge branch 'dev-1.0' of…
Merge branch 'dev-1.0' of https://gitlab.infra.miyatech.com/pengguangpu/doublescreen-back into dev-1.0
2332955b · jiangjiantao · 4cefb5c8 · 88742e15 · 2332955b
Commit 2332955b authored Mar 04, 2020 by jiangjiantao
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

index.axml pages/index/index.axml +1 -1

No files found.
--- a/pages/index/index.axml
+++ b/pages/index/index.axml
@@ -344,7 +344,7 @@
              </view>
            </view>
            <view hidden="{{isPrinting}}">
-              <button type="primary" style="height:60rpx;margin-top:8rpx;border-radius:5rpx;background-color:#007AFF;border-color:#007AFF;opacity: 0.7;width:252rpx;line-height:60rpx;text-align:center;font-size:24rpx;" size="mini" hover-class="loginButtonHover" onTap="onNextPayFromPayResult">继续收款</button>
+              <button type="primary" style="height:60rpx;margin-top:8rpx;border-radius:5rpx;background-color:#007AFF;border-color:#007AFF;opacity: 0.7;width:252rpx;line-height:60rpx;text-align:center;font-size:24rpx;" size="mini" hover-class="loginButtonHover" onTap="onNextPayFromPayResult">完成</button>
            </view>
          </block>
          <block a:else>