切换公司逻辑完善

src/pages/common/groupbuy/order-confirm.vue

@@ -27,15 +27,15 @@
 
     <view class='bottom-view c-flex-row'>
       <sqb-pay @bindnavigateTo='navigateTo'
-               :return_url='payParams.return_url'
-               :total_amount='payParams.total_amount'
-               :terminal_sn='payParams.terminal_sn'
-               :client_sn='payParams.client_sn'
-               :subject='payParams.subject'
-               :subject_img='payParams.subject_img '
-               :merchant_name='payParams.merchant_name'
-               :notify_url='payParams.notify_url'
-               :sign='payParams.sign'>
+               :return_url='buildSqbParams.return_url'
+               :total_amount='buildSqbParams.total_amount'
+               :terminal_sn='buildSqbParams.terminal_sn'
+               :client_sn='buildSqbParams.client_sn'
+               :subject='buildSqbParams.subject'
+               :subject_img='buildSqbParams.subject_img '
+               :merchant_name='buildSqbParams.merchant_name'
+               :notify_url='buildSqbParams.notify_url'
+               :sign='buildSqbParams.sign'>
         <button class='confirm-button' @click='payment'>支付</button>
       </sqb-pay>
     </view>
@@ -54,34 +54,15 @@ const userState = useUserStore();
 const { terminalInfo } = storeToRefs(userState);
 
 const orderBean = ref<OrderBean>();
-const payParams = ref({
-  return_url: '',
-  total_amount: '',
-  client_sn: '',
-  terminal_sn: '',
-  subject: '',
-  subject_img: '',
-  merchant_name: '',
-  notify_url: '',
-  sign: ''
-});
 
 onLoad((e: any) => {
   orderBean.value = JSON.parse(decodeURIComponent(e?.orderBean));
-
-  let signParams = buildSignParams.value;
-  const signStr = parseParameter(signParams) + '&key=' + terminalInfo.value.terminalKey;
-  const sign = hexMD5(signStr).toUpperCase();
-  payParams.value = {
-    ...signParams,
-    sign: sign
-  };
 });
 
-const buildSignParams = computed(() => {
-  return sortASCII({
+const buildSqbParams = computed(() => {
+  const params = sortASCII({
     client_sn: orderBean.value?.id || '',
-    return_url: '/pages/payResult/index',
+    return_url: '/pages/common/payresult/index',
     total_amount: ((orderBean.value?.totalPrice || 0) * 100).toString(),
     terminal_sn: terminalInfo.value.terminalSn,
     subject: '商品团购券',
@@ -89,6 +70,11 @@ const buildSignParams = computed(() => {
     merchant_name: terminalInfo.value.companyName,
     notify_url: 'https://www.baidu.com'
   }, true);
+
+  return {
+    ...params,
+    sign: hexMD5(parseParameter(params) + '&key=' + terminalInfo.value.terminalKey).toUpperCase()
+  };
 });
 
 const navigateTo = (e: any) => {
@@ -105,7 +91,7 @@ const navigateTo = (e: any) => {
 const payment = () => {
   const params = {
     'id': orderBean.value?.id,
-    'orderSn': buildSignParams.value.client_sn,
+    'orderSn': buildSqbParams.value.client_sn,
     'terminal_key': terminalInfo.value.terminalKey,
     'terminal_sn': terminalInfo.value.terminalSn
   };