wxd / MShopWeApp

Commit d4334649c6b2844555e2f089292294bdfa762c5f

Authored by season
2 parents 6dd8370d df744169

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

Inline Side-by-side
Showing 2 changed files with 12 additions and 3 deletions
packageE/pages/cart/cart2/cart2.js
  View file @d433464
... ... @@ -8165,7 +8165,7 @@ Page({
8165 8165 if (arr.length <= 0) return false;
8166 8166 if (arr.length == 1) {
8167 8167 var idx = arr[0].idx;
8168   - t_item.goods[idx].quan_num = Math.floor(coupon_price * 100) / 100;
  8168 + t_item.goods[idx].quan_num =coupon_price;
8169 8169 t_item.goods[idx].quan_no = t_item.quan_no;
8170 8170 return false;
8171 8171 }
... ...
pages/template/index.js
  View file @d433464
... ... @@ -58,15 +58,21 @@ Page({
58 58 wx.setNavigationBarTitle({
59 59 title: getApp().globalData.config.store_name,
60 60 });
  61 + // th.setData({
  62 + // nav_title: getApp().globalData.config.store_name
  63 + // })
61 64 th.setData({
62   - nav_title: getApp().globalData.config.store_name
  65 + nav_title: th.data.share_title
63 66 })
64 67 } else {
65 68 wx.setNavigationBarTitle({
66 69 title: getApp().globalData.setting.appName,
67 70 });
  71 + // th.setData({
  72 + // nav_title: getApp().globalData.setting.appName,
  73 + // })
68 74 th.setData({
69   - nav_title: getApp().globalData.setting.appName,
  75 + nav_title: th.data.share_title
70 76 })
71 77 };
72 78 });
... ... @@ -124,6 +130,9 @@ Page({
124 130 wx.setNavigationBarTitle({
125 131 title: temp_data.page_title,
126 132 });
  133 + th.setData({
  134 + nav_title: temp_data.page_title,
  135 + })
127 136 var t_arr = JSON.parse(temp_data.json_str);
128 137 //增加判断是否是满屏
129 138 let is_full_screen_navigation = false
... ...