huanggang 7 年之前
父節點
當前提交
0b0c057c51

+ 0 - 1
src/components/blocks/block_list.vue

@@ -75,7 +75,6 @@
                 let _self = this;
                 this.isload = true;
                 this.$http.jsonp(this.datasLink + '&curpage=' + this.curpage, {_timeout: 5000}).then(function (res) {
-                    console.log(res);
                     this.isload = false;
                     if (res.body.code != 200) {
                         this.$vux.toast.show({

+ 3 - 3
src/components/blocks/horizongoods_item.vue

@@ -6,7 +6,7 @@
                 <p class="title">{{item.title}}</p>
                 <p>
                     <span class="bonus_icon"></span>
-                    <span class="bouns_price">{{goods_price}}</span>
+                    <span class="bouns_price">{{parseFloat(goods_price)}}</span>
                 </p>
             </div>
         </router-link>
@@ -49,7 +49,7 @@
     .bonus_icon {
         display: inline-block;
         width: 20px;
-        height: 24px;
+        height: 25px;
         background: url("../../assets/small_bonus_icon.png") no-repeat;
         background-size: 100%;
         margin-right: 4px;
@@ -70,6 +70,6 @@
 
     .bouns_price {
         color: #FF4E4E;
-        font-size: 32px;
+        font-size: 33px;
     }
 </style>

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

@@ -18,11 +18,11 @@
                 </div>
             </div>
             <group>
-                <x-input title="红包支付" class="weui-vcode" style="padding-top: 21px; padding-bottom: 21px;">
+                <x-input title="红包支付" class="weui-vcode" style="padding-top: 21px; padding-bottom: 21px;" :disabled="true">
                     <p slot="left"></p>
                     <icon slot="right" type="success-circle" style="color: #EB4E4F"></icon>
                 </x-input>
-                <x-input title="微信支付" class="weui-vcode" style="padding-top: 21px; padding-bottom: 21px;">
+                <x-input title="微信支付" class="weui-vcode" style="padding-top: 21px; padding-bottom: 21px;" :disabled="true">
                     <icon slot="right" type="success-circle" style="color: #EB4E4F"></icon>
                 </x-input>
             </group>

+ 2 - 2
src/components/goods/goods_detail.vue

@@ -11,7 +11,7 @@
             </div>
             <flexbox style="margin-top: 20px;">
                 <flexbox-item :class="{goods_bonus_price:true}">
-                    <span class="bonus_icon" style="position: relative;bottom: 16px;"></span>
+                    <span class="bonus_icon" style="position: relative;bottom: 16px; width: 25px;height: 32px;"></span>
                     <span class="bonus_price">{{getOneSummary['act_type'] !== 1?getOneSummary.bonus_price:datas['groupbuy'][0]['promotion_price']}}</span>
                     <div style="display: inline-block;">
                         <span class="discount" v-if="getOneSummary['act_type'] !== 1">{{getOneSummary.bonus_price/getOneSummary.goods_price*10 == 10 ? "无折扣" : (getOneSummary.bonus_price/getOneSummary.goods_price*10).toFixed(1)+'折'}}</span>
@@ -82,7 +82,7 @@
                     </div>
                 </flexbox-item>
                 <flexbox-item>
-                    <div><span class="bonus_icon popup_bonus_icon" style="vertical-align: text-bottom;"></span><span style="color: #EB4E4F;font-size: 36px;">{{getOneSummary['act_type'] !== 1?getOneSummary.bonus_price:datas['groupbuy'][0]['promotion_price']}}</span>&nbsp;&nbsp;<span style="color: #a7a7a7;">{{getOneSummary.goods_price}}</span></div>
+                    <div><span class="bonus_icon popup_bonus_icon" style="position: relative;bottom: 6px;"></span><span style="color: #EB4E4F;font-size: 36px;">{{getOneSummary['act_type'] !== 1?getOneSummary.bonus_price:datas['groupbuy'][0]['promotion_price']}}</span>&nbsp;&nbsp;<span style="color: #a7a7a7;">{{getOneSummary.goods_price}}</span></div>
                     <div>已售{{getOneSummary.goods_salenum}}件/库存{{getOneSummary.goods_storage}}件</div>
                 </flexbox-item>
             </flexbox>

+ 3 - 3
src/components/main/shop-car/shopping_cart.vue

@@ -69,12 +69,12 @@
                     </div>
                 </flexbox-item>
                 <flexbox-item class="price">
-                    <p class="info_data">红包抵扣后</p>
+                    <p class="info_data" style="line-height:22px;">红包抵扣后</p>
                     <p class="bonus_price">应付:¥{{total()}}</p>
                 </flexbox-item>
                 <flexbox-item>
                     <div class="buy_btn" @click="just_buy">
-                        立即购买
+                        查看信息
                     </div>
                 </flexbox-item>
             </flexbox>
@@ -323,7 +323,7 @@
         width: 78%;
         height: 21px;
         display: inline-block;
-        line-height: 21px;
+        line-height: 23px;
         margin-right: 10px;
     }
 

+ 12 - 3
src/components/order/orderPaySn.vue

@@ -2,11 +2,11 @@
     <div v-if="datas != ''">
         <div v-document_title>立即支付</div>
         <group>
-            <x-input title="红包支付" class="weui-vcode" style="padding-top: 21px; padding-bottom: 21px;">
+            <x-input title="红包支付" class="weui-vcode" style="padding-top: 21px; padding-bottom: 21px;" :disabled="true">
                 <p slot="left"></p>
                 <icon slot="right" type="success-circle" style="color: #EB4E4F"></icon>
             </x-input>
-            <x-input title="微信支付" class="weui-vcode" style="padding-top: 21px; padding-bottom: 21px;">
+            <x-input title="微信支付" class="weui-vcode" style="padding-top: 21px; padding-bottom: 21px;" :disabled="true">
                 <icon slot="right" type="success-circle" style="color: #EB4E4F"></icon>
             </x-input>
         </group>
@@ -57,7 +57,7 @@
                     <flexbox-item :span="4/6" style="text-align: center;line-height: 93px; font-size: 30px;">应付: <span
                             class="letter_warn">¥ {{datas.order.order_info['pay_cash']}}</span></flexbox-item>
                     <flexbox-item :span="2/6"
-                                  style="text-align: center;background:#EB4E4F;color: #fff;line-height: 93px; font-size: 32px; "><p>去付款</p></flexbox-item>
+                                  style="text-align: center;background:#EB4E4F;color: #fff;line-height: 93px; font-size: 32px; "><p @click="just_pay">去付款</p></flexbox-item>
                 </flexbox>
             </div>
         </div>
@@ -78,6 +78,15 @@
                 this.datas = res.body.datas;
             })
         },
+        methods:{
+            just_pay(){
+                this.$vux.toast.show({
+                    type: 'text',
+                    text: "请至APP完成支付",
+                    position: 'middle'
+                });
+            }
+        },
         components: {
             Flexbox,
             FlexboxItem,

+ 1 - 0
src/lib/api.js

@@ -121,6 +121,7 @@ class Api {
     static paySn(pay_sn) {
         return this.host() + `/mobile/index.php?act=member_order&op=pay_info&curpage=1&pay_sn=${pay_sn}&client_type=ajax`;
     }
+
 }
 
 export default Api

+ 1 - 3
src/main.js

@@ -111,9 +111,7 @@ const router = new VueRouter({
 });
 //
 router.beforeEach(function (to, from, next) {
-    if(to.path =='/confirm_order') {
-        window
-    }
+
     if (to.path.indexOf("schema") !== -1) {
         let schema = base64.decode(to.query.schema);
         let urlObj = CommonUtil.parseURL(schema);