shish 4 anni fa
parent
commit
c1150911c8

+ 2 - 2
ghsApp/src/store/modules/merchant.js

@@ -1,4 +1,4 @@
-import { getShopInfo } from "@/api/common/index";
+import { getShopInfoApi } from "@/api/common/index";
 export default {
 	state: {
 		merchantInfo: null //商家信息
@@ -11,7 +11,7 @@ export default {
 	actions: {
 		async initMerchantInfo({ commit }) {
 			try {
-				const { data } = await getShopInfo();
+				const { data } = await getShopInfoApi();
 				commit("UPDATE_MERCHANT_INFO", data);
 				return data;
 			} catch (error) {

+ 8 - 2
mallApp/src/pages/callback/index.vue

@@ -22,7 +22,7 @@
         <block v-if="pageStatus == 1 || pageStatus == 2">
           <div class="price">
             <span>¥</span>
-            <span class="app-size-36 app-bold">{{ option.totalPrice?parseFloat(option.totalPrice):0 }}</span>
+            <span class="app-size-36 app-bold">{{ totalPrice }}</span>
           </div>
           <div class="order-num app-color-3">订单号: {{ option.orderSn }}</div>
         </block>
@@ -151,7 +151,8 @@ export default {
       },
       payCallData: {},
       merchantInfo: {},
-      setPassModal: false
+      setPassModal: false,
+      totalPrice:0
     };
   },
   computed: {
@@ -160,6 +161,11 @@ export default {
   onLoad() {},
   methods: {
     init() {
+
+      if(this.option.totalPrice){
+        this.totalPrice = parseFloat(Number(this.option.totalPrice))
+      }
+
       this.pageStatus = this.option.pageStatus;
       this.payDiscountPrice = this.option.payDiscountPrice;
       this.payDiscountType = this.option.payDiscountType;