From 30c173320ac4b2675a0ee3998c80d85a58d9ca23 Mon Sep 17 00:00:00 2001
From: devil <fuxiang.gong@qq.com>
Date: Mon, 10 Aug 2020 22:16:39 +0800
Subject: [PATCH] =?UTF-8?q?qq=E6=94=AF=E4=BB=98=E9=80=82=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 extend/payment/QQ.php                        |   2 +-
 sourcecode/qq/app.js                         |   2 +-
 sourcecode/qq/images/default-toast-error.png | Bin 1975 -> 1514 bytes
 sourcecode/qq/pages/paytips/paytips.qml      |   4 ----
 4 files changed, 2 insertions(+), 6 deletions(-)
 mode change 100644 => 100755 sourcecode/qq/images/default-toast-error.png

diff --git a/extend/payment/QQ.php b/extend/payment/QQ.php
index 13fbeff80..34d9b9e66 100644
--- a/extend/payment/QQ.php
+++ b/extend/payment/QQ.php
@@ -359,7 +359,7 @@ class QQ
         $data['trade_no']       = $data['transaction_id'];  // 支付平台 - 订单号
         $data['buyer_user']     = isset($data['openid']) ? $data['openid'] : '';  // 支付平台 - 用户
         $data['out_trade_no']   = $data['out_trade_no'];    // 本系统发起支付的 - 订单号
-        $data['subject']        = isset($data['attach']) ? $data['attach'] : '';  // 本系统发起支付的 - 商品名称
+        $data['subject']        = isset($data['body']) ? $data['body'] : '';  // 本系统发起支付的 - 商品名称
         $data['pay_price']      = $data['total_fee']/100;   // 本系统发起支付的 - 总价
         return $data;
     }
diff --git a/sourcecode/qq/app.js b/sourcecode/qq/app.js
index 73b8d6e37..3c30197c7 100755
--- a/sourcecode/qq/app.js
+++ b/sourcecode/qq/app.js
@@ -544,12 +544,12 @@ App({
     if ((status || 'error') == 'success')
     {
       qq.showToast({
-        icon: 'success',
         title: msg,
         duration: 3000
       });
     } else {
       qq.showToast({
+        image: '/images/default-toast-error.png',
         title: msg,
         duration: 3000
       });
diff --git a/sourcecode/qq/images/default-toast-error.png b/sourcecode/qq/images/default-toast-error.png
old mode 100644
new mode 100755
index 920959dbefb6e53a5fe6668d7140f2becceb05db..83eadd245c91ea9e4e3c89f76da011d77cda4433
GIT binary patch
delta 1497
zcmV;~1t$8p59$k$BYy?4Nkl<ZcwX(@>v7dE5C!0~6+j0-1<*mD0-ypy1)&2%1%wKK
z3P>sdI)DmDI)Dnq>|jAAlLT8{N&E5)lOI^V(w<Mcw(pCOTj&Z<=+WokkpO}tNB{{S
zcm;wFKUaVR5WE7xho37z0tjA#;KR=qAOQrgK=9$`3XlMTSAQV*@N)%70KqE|eE7Kn
zB!J)*2tNE=0TMvJ3Y1cw0(cDI(efzg0KNb?Bch-E9@*ZJODT5&)Oy`tM(~a6MMP)4
zM$}~mD5X3D@D@NF$kqOH_$L6~MTf8ie+1wa07h`##uMiy5%J^^-NXTuQVs#UU)f6*
z{v;}bCH&8qR)5I<m5mX6_}@-j{$CWpGV?!e=>UL`2pYn#W#tJYwh~AK_;Jg!f18U?
z2zG?eH9RMx2OB5Zjk}8hXq^3*I~D@L&hTr!o)gij1OiC_d{W0JGkZ4I2!z7t`o1Be
z<2{A0Z6yKl^U{Gpr(7Zs44+H<m5BKAdiSOg01wI)0)OG~)dJwllNY;5{yTsR1RcWX
z3i16DzHhL5lUxC|T>r1_xM>8P!sptF-4Boiz<06uj@6yD>8{+*B!Z6N|Kdw+shekF
z065H23ZI$2UK#9`-Ap0q7{2Hg03S>m0IvdkHSlmtx-0iJfuM8v-}%Kgso5_MU|9vi
zBCr;I7k>az5m*er8-QpCtcKqeKokU)!|x8jI|A$B4*}p6frs#i0q};vOZY<pctPMP
z{NVtsBk&gf6aZEccnp6U0BZ=mhCda66$GBcpAJAf0`K9g0H75?gz(h>(1svN_^JSC
zK@cf?bpU1~h!(y|0J9K83|}pP(Fmf3uNuH81b_TE0JeNYdug)jkNA7|Rz2#5okZUh
zy5VtG@4C#+o^LeezSM6pS>3M{JE{*~{R&Wv+!?`&EI03BB78Fd20R^XPWYAvX2LfG
zzz70U;hO`X9D%v;O#)Dgz-0Jl0VqRYHhj|nlpru2zIgzX5tt9(1%OEiT!iliz+eP!
z!hd%KU=RXV;d=$p>xCVzmx(W_*m7G_{fj|s2h;f_-OJr@g}?=Xf#FvOZV;FUFd=+b
z2uuT*7`__>W&tP&-vt7b02GC99)URk3d1*zz!U(*;hRNZ27rO^O(HM>z)<++5U2;x
zIefmi&s*5<HdYN_K=}1%S9*T#K=tn;s(%GABK-QT+nqmmp!&A4N&q9nuTR=h5vT(&
zBmBq+Q~{V7epCc%0B8t5A_5fvG=(1x!E^u`!;geuDge#lM?o+RfQ9fQAeaKcQuy8x
z3<qE_e9s7m0<avuR|LZVcnIGkf*}Arh3^ePcK{y4_k^G;0MFrjLC_6Agz!Be=zjtr
zQux*phy#cizGVcW03wHP6@fH>V*syfF$Djb`eu&KZ!dd8L|kW)O$@*?=pO*?iuCN?
zK}>}|U?uno;6Z&u>)u*R0yqTles71av^N?400b|I=z~P9B>`}UUPyFmIfm)*J0ti=
zL_FbkZ;}A`!xaa+d-Uf3F2e7K;D0L-)ep7oD!E1guEOtxKqY_^07ttxI-B`dYaw`b
zAa*4nxdJ=`@M#ACmovW;g6BkZx}(;An~DM8BbHLm0o-foScve2o(?XE=zc?uuWcd?
zfKN>Ln>x2_p~4qHz@Ike6K;`B6u`0yY`Gs0GW;C~#IFBqAH)GH2zVvn`+ovAJstc4
zz$c9-Qg^gOro)7TEGLGq0Pw#%H+10wz@g;K?+W0Oa6U0)4E2W@`5b|luhZzk-*9qR
z>s6oQxmMq#PWZ0F)nx^kFp=^h8!M0i8Vl#8Spx8qWaBszKx5&&G)n+pl58AD0%$Cp
zmu3mTOOlP_NC1t6^U^E<cv4BSaU2Ptv2b3RB>*o;HjX0!G#1WFvjpHJ$;NRcfX2dk
zX_f%IB-uEQ1khMGFU=Bwmn0j<kpLPC=cU<i_q?jE2B^?S00000NkvXXu0mjf2da-L

literal 1975
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

diff --git a/sourcecode/qq/pages/paytips/paytips.qml b/sourcecode/qq/pages/paytips/paytips.qml
index 10cf993d0..2c1d4b8a2 100755
--- a/sourcecode/qq/pages/paytips/paytips.qml
+++ b/sourcecode/qq/pages/paytips/paytips.qml
@@ -2,10 +2,6 @@
   <image class="pay-icon" qq:if="{{params.code == '9000'}}" mode="widthFix" src="{{default_round_success_icon}}" />
   <image class="pay-icon" qq:else mode="widthFix" src="{{default_round_error_icon}}" />
   <text class="dis-block">{{params.msg}}</text>
-  <view qq:if="{{params.code == '9000'}}" class="price-box">
-    <text  class="sales-price">{{price_symbol}}{{params.total_price}}</text>
-    <text class="price-unit cr-888">元</text>
-  </view>
 </view>
 
 <view class="btn-box">