diff --git a/app.js b/app.js
index 3535dee..0df5ad2 100644
--- a/app.js
+++ b/app.js
@@ -35,30 +35,32 @@ App({
"selectedColor": "#f23030",//文字被选择后color
"borderStyle": "white",//
"backgroundColor": "#ffffff",//背景color
+ "iscustom":'',
+ "url":"",
"list": [
{
"weappurl": "/pages/index/index/index",
"nav_name": "首页",
- "src": "/images/bar/index.png",
- "src_sele": "/images/bar/index_on.png"
+ "src": "/miniapp/images/bar/index.png",
+ "src_sele": "/miniapp/images/bar/index_on.png"
},
{
"weappurl": "/pages/goods/categoryList/categoryList",
"nav_name": "分类",
- "src": "/images/bar/fl.png",
- "src_sele": "/images/bar/fl_on.png"
+ "src": "/miniapp/images/bar/fl.png",
+ "src_sele": "/miniapp/images/bar/fl_on.png"
},
{
"weappurl": "/pages/cart/cart/cart",
"nav_name": "购物车",
- "src": "/images/bar/car.png",
- "src_sele": "/images/bar/car_on.png"
+ "src": "/miniapp/images/bar/car.png",
+ "src_sele": "/miniapp/images/bar/car_on.png"
},
{
"weappurl": "/pages/user/index/index",
"nav_name": "我的",
- "src": "/images/bar/user.png",
- "src_sele": "/images/bar/user_on.png"
+ "src": "/miniapp/images/bar/user.png",
+ "src_sele": "/miniapp/images/bar/user_on.png"
}
]
},
diff --git a/app.json b/app.json
index 50ef4a2..7b1d17e 100644
--- a/app.json
+++ b/app.json
@@ -83,15 +83,15 @@
"pages/user/assistance/assistance_success",
"pages/user/assistance/assistance",
"pages/video/index",
- "pages/template/index"
+ "pages/template/index",
+ "pages/store/index"
],
"subPackages": [{
"root": "packageA/",
"name":"pack1",
- "pages": [
- "pages/store/index",
+ "pages": [
"pages/prom_list/prom_list",
"pages/quan_list/quan_list",
"pages/quan_pro/quan_pro"
@@ -111,7 +111,38 @@
"backgroundColor": "#ffffff",
"enablePullDownRefresh": true
},
-
+ "tabBar": {
+ "color": "#6e6d6b",
+ "selectedColor": "#f23030",
+ "borderStyle": "white",
+ "backgroundColor": "#ffffff",
+ "list": [
+ {
+ "pagePath": "pages/index/index/index",
+ "text": "首页",
+ "iconPath": "packageA/images/bar/index.png",
+ "selectedIconPath": "packageA/images/bar/index_on.png"
+ },
+ {
+ "pagePath": "pages/goods/categoryList/categoryList",
+ "text": "分类",
+ "iconPath": "packageA/images/bar/fl.png",
+ "selectedIconPath": "packageA/images/bar/fl_on.png"
+ },
+ {
+ "pagePath": "pages/cart/cart/cart",
+ "text": "购物车",
+ "iconPath": "packageA/images/bar/car.png",
+ "selectedIconPath": "packageA/images/bar/car_on.png"
+ },
+ {
+ "pagePath": "pages/user/index/index",
+ "text": "我的",
+ "iconPath": "packageA/images/bar/user.png",
+ "selectedIconPath": "packageA/images/bar/user_on.png"
+ }
+ ]
+ },
"debug": false,
"sitemapLocation": "sitemap.json"
}
\ No newline at end of file
diff --git a/packageA/pages/prom_list/prom_list.wxml b/packageA/pages/prom_list/prom_list.wxml
index 636ecc3..9a4e7cc 100644
--- a/packageA/pages/prom_list/prom_list.wxml
+++ b/packageA/pages/prom_list/prom_list.wxml
@@ -46,7 +46,7 @@
搭配价￥{{filters.toFix(data.shop_price+dp_price,2)}}
- 已省￥{{cut_price}}
+ 已省￥{{filters.toFix(cut_price,2)}}
立即购买
diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js
index 0e836d6..698cb94 100644
--- a/pages/cart/cart/cart.js
+++ b/pages/cart/cart/cart.js
@@ -55,9 +55,9 @@ Page({
},
onShow: function() {
var th = this;
- th.setData({
- isTabBar: getApp().globalData.isTabBar,
- });
+ //th.setData({
+ // isTabBar: getApp().globalData.isTabBar,
+ //});
t.editTabBar(); //显示自定义的底部导航
this.getCardList();
@@ -78,7 +78,6 @@ Page({
})
}
});
- isTabBar
},
@@ -1191,8 +1190,9 @@ Page({
}).then(res=>{
if(res.data.code==0) discount=res.data.data;
})
- //---如果有打折的信息，赠送的信息---
- if(discount && discount['goods_id']){
+
+ //---如果有打折的信息，赠送的信息,赠送的时候要判断是不是限购数量---
+ if(discount && discount['goods_id'] && discount.limit_num>=discount.bs && discount.gift_storecount>=discount.bs){
var o=discount.goodsinfo;
var newd = {
goods_id: o.goods_id,
diff --git a/pages/cart/cart/cart.wxml b/pages/cart/cart/cart.wxml
index e6e30ec..725c2da 100644
--- a/pages/cart/cart/cart.wxml
+++ b/pages/cart/cart/cart.wxml
@@ -183,7 +183,7 @@
-
+
\ No newline at end of file
diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js
index 1644ffd..b5f4cf1 100644
--- a/pages/cart/cart2/cart2.js
+++ b/pages/cart/cart2/cart2.js
@@ -695,9 +695,9 @@ Page({
//--看有没有减价--
if(item_map.prom_price && item_map.price-item_map.prom_price){
if(cart_item.prom_pt_json){
- cart_item.prom_pt_json.push({"prom_id":item_map.prom_id,"dis":item_map.price-item_map.prom_price,"ispt":0})
+ cart_item.prom_pt_json.push({"prom_id":item_map.prom_id,"dis":(item_map.price-item_map.prom_price).toFixed(2),"ispt":0})
}else{
- cart_item.prom_pt_json=[{"prom_id":item_map.prom_id,"dis":item_map.price-item_map.prom_price,"ispt":0}];
+ cart_item.prom_pt_json=[{"prom_id":item_map.prom_id,"dis":(item_map.price-item_map.prom_price).toFixed(2),"ispt":0}];
}
o_price-=(item_map.price-item_map.prom_price);
@@ -840,12 +840,12 @@ Page({
if(o_price>=freight_free && freight_free>0 && !is_good_no_by && th.data.is_no_by[pickid]!=1){
continue;
}
-
//--如果是包邮券使用的情况下，如果商品是包邮的，那么就不进行计算--
if(th.data.using_quan[pickid] && th.data.using_quan[pickid].isby==1 && !is_good_no_by){
continue;
}
+
//----------------如果是选择了物流---------------------
if(cart_item.exp_type == 0 && item[j].is_free_shipping==0){
//如果地址不为空
@@ -1365,8 +1365,8 @@ Page({
//--判断优惠活动的提交--
if(th.data.formData.cut_price>0){
- order_prom_list.discount_amount=th.data.formData.cut_price;
- var ob=[{"prom_id":th.data.bn_goods.prom_id,"dis":th.data.formData.cut_price,"ispt":0}]
+ order_prom_list.discount_amount=th.data.formData.cut_price.toFixed(2);
+ var ob=[{"prom_id":th.data.bn_goods.prom_id,"dis":th.data.formData.cut_price.toFixed(2),"ispt":0}]
order_prom_list.prom_pt_json=JSON.stringify(ob);
}
if(th.data.formData.give_integral>0){
@@ -1512,7 +1512,7 @@ Page({
}
//--判断优惠活动的提交--
if(t_item.cut_price>0){
- order_prom_list.discount_amount=t_item.cut_price;
+ order_prom_list.discount_amount=t_item.cut_price.toFixed(2);
order_prom_list.prom_pt_json=JSON.stringify(t_item.prom_pt_json);
}
if(t_item.s_intValue>0){
@@ -2364,6 +2364,7 @@ Page({
//-----获取购物车进来的劵-------
get_cart_quan:function () {
var th=this;
+ var is_xz_yh=1;
//等待值的出现
getApp().waitfor2(this,"g_cart_q_time","order_prom_list_cart",async function () {
var arr=th.data.order_prom_list_cart;
@@ -2387,6 +2388,7 @@ Page({
//如果有限制使用优惠券，就要返回
if(gd.prom_type==3){
if(th.data.prom_goods_map[pickup_id][gd.prom_id].is_xz_yh) continue;
+ is_xz_yh=0;
th.data.prom_goods_map[pickup_id][gd.prom_id].coupon_sele=1;
}
var item_price=gd.goods_price*gd.goods_num;
@@ -2418,7 +2420,7 @@ Page({
arr[ind].check_quan_price_list=check_quan_price_list;
//是否关闭使用优惠券
- if (th.data.is_close_quan != 1) {
+ if (th.data.is_close_quan != 1 && !is_xz_yh) {
//--调用接口，获取优惠券的列表，3秒钟内控制接口请求--
var url="/api/weshop/couponList/getUseCouponList";
await app.request.promiseGet(url,{ data:{storeId:oo.stoid,userId:app.globalData.user_id,BuySum:ckeck_quan_price,WareIds:check_quan_ware_list,pageSize:100}}).then(res=>{
diff --git a/pages/goods/categoryList/categoryList.js b/pages/goods/categoryList/categoryList.js
index 7a9c684..bd4bd2f 100644
--- a/pages/goods/categoryList/categoryList.js
+++ b/pages/goods/categoryList/categoryList.js
@@ -535,6 +535,15 @@ Page({
this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
},
+
+
+ //---图片失败，默认图片---
+ bind_Goodsbnerr: function (e) {
+ var _errImg = e.target.dataset.errorimg;
+ var _errObj = {};
+ _errObj[_errImg] ="/miniapp/images/default_g_img.gif";
+ this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
+ },
// 新的版本分类点击一级分类
click_classify:function(e){
clearInterval(this.data.timer);
diff --git a/pages/goods/categoryList/categoryList.wxml b/pages/goods/categoryList/categoryList.wxml
index 179e969..f2997a4 100644
--- a/pages/goods/categoryList/categoryList.wxml
+++ b/pages/goods/categoryList/categoryList.wxml
@@ -382,7 +382,7 @@
-
+
{{item.goods_name}}
@@ -487,7 +487,7 @@
-
+
\ No newline at end of file
diff --git a/pages/index/index/index.js b/pages/index/index/index.js
index 2dfce43..d25120c 100644
--- a/pages/index/index/index.js
+++ b/pages/index/index/index.js
@@ -102,38 +102,43 @@ Page({
is_disgraceful: 0
})
},
+
async onShow() {
var th = this;
//获取底部导航
- await getApp().request.promiseGet("/api/weshop/storeFooter/get/"+o.stoid, {
+ // await getApp().request.promiseGet("/api/weshop/storeFooter/get/"+o.stoid, {
- }).then(res => {
- var e = res;
- console.log(e)
- if(e.data.code != -1){
- getApp().globalData.isTabBar = true
- //console.log(JSON.parse(e))
- var itemList = e.data.data.data;
+ // }).then(res => {
+ // var e = res;
+ // console.log(e)
+ // if(e.data.code != -1){
+ // getApp().globalData.isTabBar = true
+ // //console.log(JSON.parse(e))
+ // var itemList = e.data.data.data;
- itemList = JSON.parse(itemList)
- for(var i=0; i -->
-
-
+
diff --git a/pages/tabbar/tabbar.js b/pages/tabbar/tabbar.js
new file mode 100644
index 0000000..2371de0
--- /dev/null
+++ b/pages/tabbar/tabbar.js
@@ -0,0 +1,67 @@
+// pages/tabbar.js
+var d = getApp().globalData;
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ isTabBar:d.isTabBar
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad: function (options) {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload: function () {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh: function () {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom: function () {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage: function () {
+
+ }
+})
\ No newline at end of file
diff --git a/pages/tabbar/tabbar.json b/pages/tabbar/tabbar.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/pages/tabbar/tabbar.json
@@ -0,0 +1,3 @@
+{
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/pages/tabbar/tabbar.wxml b/pages/tabbar/tabbar.wxml
new file mode 100644
index 0000000..b5e6a70
--- /dev/null
+++ b/pages/tabbar/tabbar.wxml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+ {{item.nav_name}}
+
+
+
+
diff --git a/pages/tabbar/tabbar.wxss b/pages/tabbar/tabbar.wxss
new file mode 100644
index 0000000..979f504
--- /dev/null
+++ b/pages/tabbar/tabbar.wxss
@@ -0,0 +1 @@
+/* pages/tabbar.wxss */
\ No newline at end of file
diff --git a/pages/user/index/index.wxml b/pages/user/index/index.wxml
index ae205cd..b6c3cfd 100644
--- a/pages/user/index/index.wxml
+++ b/pages/user/index/index.wxml
@@ -297,7 +297,7 @@
-
+
\ No newline at end of file
diff --git a/pages/user/order_detail/order_detail.js b/pages/user/order_detail/order_detail.js
index 2ddd364..2193860 100644
--- a/pages/user/order_detail/order_detail.js
+++ b/pages/user/order_detail/order_detail.js
@@ -235,15 +235,13 @@ Page({
if(!e.confirm) return false;
//如果是秒杀和拼单的商品，取消订单要返回redis,并取消订单
//if(is_skill==1 || is_zsorder>=2){
-
- getApp().request.delete("/api/weshop/order/cancelTeamOrder/"+os.stoid+"/"+o,{
+ getApp().request.post("/api/weshop/order/cancelOrder/"+os.stoid+"/"+o+"/"+getApp().globalData.user_id,{
data:{},
success: function(t) {
if(t.data.code==0)
th.requestOrderDetail(o), wx.setStorageSync("order:order_list:update", !0);
},
})
-
/*----
}else{
getApp().request.put("/api/weshop/order/updatebyId", {
diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js
index 7e87bc6..bf1d6dd 100644
--- a/pages/user/order_list/order_list.js
+++ b/pages/user/order_list/order_list.js
@@ -261,7 +261,7 @@ Page({
//如果是秒杀和拼单的商品，取消订单要返回redis,并取消订单
if (t.confirm) {
//if(is_skill==1 || is_zsorder>=2){
- getApp().request.delete("/api/weshop/order/cancelTeamOrder/" + os.stoid + "/" + a, {
+ getApp().request.post("/api/weshop/order/cancelOrder/"+os.stoid+"/"+a+"/"+getApp().globalData.user_id, {
data: {},
success: function(t) {
if (t.data.code == 0) {
@@ -600,6 +600,7 @@ Page({
pay_next(e){
+ var th=this;
if (e.order_amount == 0) {
var dd = {
parent_sn: e.order_sn,