huanggang 7 лет назад
Родитель
Сommit
743a6f2882

+ 3 - 2
src/components/confirm_order/confirm_order.vue

@@ -119,6 +119,7 @@
             let iscart = this.$route.query["iscart"];
             let cart_id = this.$route.query["cart_id"] ? this.$route.query["cart_id"] : '';
             this.$http.jsonp(Api.step_first(iscart, cart_id, goods_id, goods_num),{_timeout:5000}).then(function (res) {
+                this.$store.commit('updateLoadingStatus', {isLoading: false});
                 if (res.body.datas == null && res.body.code !== '200') {
                     this.$vux.toast.show({
                         type: 'warn',
@@ -131,14 +132,14 @@
                 else {
                     this.datas = res.body['datas'];
                     this.proxy.addData(res.body.datas);
-                    this.$store.commit('updateLoadingStatus', {isLoading: false});
                 }
             },(err) => {
                 this.$vux.toast.show({
                 type: 'text',
                 text: "网络错误",
                 position: 'middle'
-            })
+            });
+                this.$store.commit('updateLoadingStatus', {isLoading: false});
         })
         },
         beforeDestroy(){

+ 5 - 3
src/components/goods/goods_detail.vue

@@ -202,8 +202,9 @@
                 this.openBuyPopup(true);
             },
             check_submit(quantity,goods_id){
-                this.$store.commit('updateLoadingStatus', {isLoading: true});
+                this.showPopup=false;
                 if(this.isCart) {
+                    this.$store.commit('updateLoadingStatus', {isLoading: true});
                     this.$http.jsonp(Api.shoppingCartAdd(quantity,goods_id),{_timeout:5000}).then(function(res){
                         this.$store.commit('updateLoadingStatus', {isLoading: false});
                         if(res.body.code == 200) {
@@ -227,11 +228,12 @@
                         type: 'text',
                         text: "网络错误",
                         position: 'middle'
-                    })
+                    });
+                        this.$store.commit('updateLoadingStatus', {isLoading: false});
                 })
                 }
                 else {
-                    this.$router.push({path:'/confirm_order',query:{goods_id:goods_id,iscart:0,num:this.goodsNumber}})
+                    this.$router.push({path:'/confirm_order',query:{goods_id:goods_id,iscart:0,num:this.goodsNumber}});
                 }
             },
             goods_num_handle(type,goods_storage,act_type){

+ 4 - 4
src/components/order/list/OrderList.vue

@@ -267,7 +267,7 @@
                                     </FlexboxItem>
                                     <Flexbox orient="vertical">
                                         <FlexboxItem >
-                                            <p class="titleRight">${goods_item.getGoodsPrice}</p>
+                                            <p class="titleRight">¥{goods_item.goods_pay_price}</p>
                                         </FlexboxItem>
                                         <FlexboxItem >
                                             <p class="titleRight">x{goods_item.goods_num}</p>
@@ -287,10 +287,10 @@
 
                     const bottom = () => {
                         return <Flexbox orient="vertical">
-                            <FlexboxItem class="vux-1px-b">
+                            <FlexboxItem>
                                 <p class="titleRight">共{item.order_goods.length}件
-                                    合计:${item.order_info.order_amount}
-                                    (含运费${item.order_info.shipping_fee})
+                                    合计:¥{item.order_info.order_amount}
+                                    (含运费¥{item.order_info.shipping_fee})
                                 </p>
                             </FlexboxItem>
                             <FlexboxItem >

+ 2 - 0
src/components/order/list/OrderTabs.vue

@@ -57,6 +57,8 @@
         top: 0;
         left: 0;
         width: 100%;
+        z-index: 999;
+        background: #fff;
     }
 
     .order_container {