Merge branch 'test' of http://git.vipzhuang.cn/wxd/MShopWeApp into qa

WXD-SEASON\season
2 parents 929bcec7 b67f6cf0
Showing 2 changed files with 12 additions and 3 deletions
packageE/pages/cart/cart2/cart2.js
pages/template/index.js
@@ -8165,7 +8165,7 @@ Page({
     if (arr.length <= 0) return false;
     if (arr.length == 1) {
       var idx = arr[0].idx;
-      t_item.goods[idx].quan_num = Math.floor(coupon_price * 100) / 100;
+      t_item.goods[idx].quan_num =coupon_price;
       t_item.goods[idx].quan_no = t_item.quan_no;
       return false;
     }
@@ -58,15 +58,21 @@ Page({
         wx.setNavigationBarTitle({
           title: getApp().globalData.config.store_name,
         });
+        // th.setData({
+        //   nav_title: getApp().globalData.config.store_name
+        // })
         th.setData({
-          nav_title: getApp().globalData.config.store_name
+          nav_title: th.data.share_title 
         })
       } else {
         wx.setNavigationBarTitle({
           title: getApp().globalData.setting.appName,
         });
+        // th.setData({
+        //   nav_title: getApp().globalData.setting.appName,
+        // })
         th.setData({
-          nav_title: getApp().globalData.setting.appName,
+          nav_title: th.data.share_title 
         })
       };
     });
@@ -124,6 +130,9 @@ Page({
         wx.setNavigationBarTitle({
           title: temp_data.page_title,
         });
+        th.setData({
+          nav_title: temp_data.page_title,
+        })
         var t_arr = JSON.parse(temp_data.json_str);
         //增加判断是否是满屏
         let is_full_screen_navigation = false