Merge branch 'qa' into 'master'

Qa See merge request !87

Merge branch 'qa' into 'master'
Qa See merge request !87
后端研发-苏明海
2 parents 53452c43 fbfb4dcd
Showing 5 changed files with 22 additions and 16 deletions
app.js
components/diy_assist/diy_assist.wxss
components/diy_nav/diy_nav.js
components/diy_picMax/diy_picMax.wxss
pages/cart/cart2/cart2.js
@@ -278,9 +278,13 @@ App({
     //----智能跳转，判断 非tabBar,tabBar页面的跳转----
     goto:function (url) {
         var arr_tabbar=["/pages/index/index/index","/pages/goods/categoryList/categoryList",
+                       "/pages/goods/categoryList/categoryList?type=2",
+                       "/pages/goods/categoryList/categoryList?type=1",
                        "/pages/cart/cart/cart","/pages/user/index/index"];
         if(arr_tabbar.indexOf(url)!=-1){
-            wx.switchTab({ url: url, })  //跳到tabbar页
+             if(url.indexOf("categoryList?type=1")!=-1) this.globalData.cat_type=1;
+             if(url.indexOf("categoryList?type=2")!=-1) this.globalData.cat_type=2;
+             wx.switchTab({ url: url, })  //跳到tabbar页
         }else{
             wx.navigateTo({ url: url, })  //跳到非tabbar页
         }
 .assist{
   width: 100%;
   min-height:90rpx;
-  border:1px solid #00F;
+  /*border:1px solid #00F;*/
 }
 \ No newline at end of file
@@ -31,13 +31,13 @@ Component({
     // 这里是一个自定义方法,判断图片路径，并加载
     pd_navicon:function(g_id){
-      var item={};
-      var nav_strs=g_id;
+      var item={},nav_strs=g_id,th=this;
       for (var i=0;i<nav_strs.length;i++){
         if (!(nav_strs[i].navicon.indexOf("/public/static/images/model/tag-icon.png"))){
-          nav_strs[i].navicon ="../../../../../images/nav-icon.png";
+          nav_strs[i].navicon = th.data.imghost+"/miniapp/images/nav-icon.png";
         }
       }
+
       this.setData({
        nav_list:nav_strs,
       });
-.picMax{width: 100%; padding: 0 10rpx;position: relative;}
+.picMax{width: 100%;position: relative;}
 .pic_item{position: absolute; top:0;left:0;}
 .pic_item image{width: 100%; height: 100%}
-.width_1{width: 187rpx}.width_2{width: 374rpx;}.width_3{width: 561rpx}.width_4{width:748rpx;}
-.height_1{height: 187rpx;}.height_2{height: 374rpx;}.height_3{height: 561rpx}.height_4{height: 748rpx;}
-.mar_x1{margin-left:187rpx;}.mar_x2{margin-left:374rpx;}.mar_x3{margin-left:561rpx}.mar_x4{margin-left: 748rpx;}
-.mar_y1{margin-top: 187rpx;}.mar_y2{margin-top: 374rpx;}.mar_y3{margin-top:  561rpx}.mar_y4{margin-top: 748rpx;}
+.width_1{width: 187.5rpx}.width_2{width: 375rpx;}.width_3{width: 562.5rpx}.width_4{width:748rpx;}
+.height_1{height: 187.5rpx;}.height_2{height: 375rpx;}.height_3{height: 562.5rpx}.height_4{height: 748rpx;}
+.mar_x1{margin-left:187.5rpx;}.mar_x2{margin-left:375rpx;}.mar_x3{margin-left:562.5rpx}.mar_x4{margin-left: 748rpx;}
+.mar_y1{margin-top: 187.5rpx;}.mar_y2{margin-top: 375rpx;}.mar_y3{margin-top:  562.5rpx}.mar_y4{margin-top: 748rpx;}
 .picMax-clear{clear: both;}
 \ No newline at end of file
@@ -625,6 +625,8 @@ Page({
               th.data.cartlist[i].user_money = umoney;
               umoney=0;
             }
+          }else{
+              th.data.cartlist[i].user_money=0;
           }
           th.data.cartlist[i].user_money = parseFloat(th.data.cartlist[i].user_money).toFixed(2);
@@ -635,12 +637,12 @@ Page({
           th.data.cartlist[i].goods_price = o_price.toFixed(2);
           th.data.cartlist[i].order_amount= th.data.cartlist[i].order_amount- th.data.cartlist[i].user_money;         //会员使用余额
-          all_price += o_price;
-          all_total_m += th.data.cartlist[i].total_amount;
-          all_shipping_m += th.data.cartlist[i].shipping_price;
-          all_order_m += th.data.cartlist[i].order_amount;
-          all_user_m += th.data.cartlist[i].user_money;
-          all_coupon_price_m+=th.data.cartlist[i].coupon_price;
+          all_price += parseFloat(o_price);
+          all_total_m +=  parseFloat(th.data.cartlist[i].total_amount);
+          all_shipping_m +=  parseFloat(th.data.cartlist[i].shipping_price);
+          all_order_m +=  parseFloat(th.data.cartlist[i].order_amount);
+          all_user_m +=  parseFloat(th.data.cartlist[i].user_money);
+          all_coupon_price_m+= parseFloat(th.data.cartlist[i].coupon_price);
         }