diff --git a/packageA/pages/cardList/cardList.js b/packageA/pages/cardList/cardList.js
index 7a2ad2a..60c419c 100644
--- a/packageA/pages/cardList/cardList.js
+++ b/packageA/pages/cardList/cardList.js
@@ -217,4 +217,12 @@ Page({
var url = "/packageA/pages/goodsInfo/goodsInfo?goods_id=" + gid;
app.goto(url);
},
+
+ //图片失败,默认图片
+ bind_bnerr: function(e) {
+ var _errImg = e.target.dataset.errorimg;
+ var _errObj = {};
+ _errObj[_errImg] = "/miniapp/images/default_g_img.gif";
+ this.setData(_errObj); //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
+ },
})
\ No newline at end of file
diff --git a/packageA/pages/cardList/cardList.wxml b/packageA/pages/cardList/cardList.wxml
index 8a60054..2f5d45a 100644
--- a/packageA/pages/cardList/cardList.wxml
+++ b/packageA/pages/cardList/cardList.wxml
@@ -1,6 +1,6 @@
+
-
@@ -9,12 +9,14 @@
-
+
{{item.serviceName}}
- 有效天数:{{item.validDays}}
+ 有效天数:{{item.validDays?item.validDays:0}}
{{item.money}}
@@ -24,20 +26,21 @@
-
-
+
-
+
-
+
+
{{item.serviceName}}
- 有效天数:{{item.validDays}}
+ 有效天数:{{item.validDays?item.validDays:0}}
{{item.money}}
@@ -47,9 +50,10 @@
-
+
- 已经到底了 -
+
@@ -61,12 +65,15 @@
-
+
{{item.serviceName}}
- 有效天数:{{item.validDays}}
+ 有效天数:{{item.validDays?item.validDays:0}}
{{item.money}}
diff --git a/packageA/pages/cardList/cardList.wxss b/packageA/pages/cardList/cardList.wxss
index 1e3b0d4..168bec7 100644
--- a/packageA/pages/cardList/cardList.wxss
+++ b/packageA/pages/cardList/cardList.wxss
@@ -1,13 +1,10 @@
/* pages/i_service/cardList/cardList.wxss */
-page,
+page{ background-color: #f2f2f2;}
+
+
.page {
height: 100%;
}
-
-page {
- background-color: #f2f2f2;
-}
-
.scroll-view {
height: calc(100% - 300rpx);
}
@@ -69,9 +66,16 @@ page {
.list_item{ display: inline-block;}
.w100{ width: 100%;}
.w50{ width: 49%; }
-.w50.ml{margin-left: 15rpx;}
+.w50.ml{margin-left: 12rpx;}
.w50 image{ width: 100%; height: 340rpx; }
.flex-set{display: flex;flex-wrap: wrap;}
-.b-bottom{ border-bottom:1rpx solid #fff}
\ No newline at end of file
+.b-bottom{ border-bottom:1rpx solid #fff}
+.bg_view{
+ display: block;
+ min-height: 100%;
+ width: 100%;
+ position: absolute;
+ left: 0;top: 0;z-index: 1;
+}
\ No newline at end of file
diff --git a/packageA/pages/cart2_ser/cart2_ser.js b/packageA/pages/cart2_ser/cart2_ser.js
index a22f10c..fc0f10c 100644
--- a/packageA/pages/cart2_ser/cart2_ser.js
+++ b/packageA/pages/cart2_ser/cart2_ser.js
@@ -41,7 +41,11 @@ Page({
//判断页面是返回回来的还是 首次进入的
yuer:0,
},
- onLoad: function(t) {
+ onLoad: function(t) {
+ wx.setNavigationBarTitle({
+ title: "填写订单",
+ });
+
var appD=getApp().globalData.service_now;
this.data.postdata=appD;
this.data.param=t;
diff --git a/packageA/pages/goodsInfo/goodsInfo.js b/packageA/pages/goodsInfo/goodsInfo.js
index 7260ba1..75fe01a 100644
--- a/packageA/pages/goodsInfo/goodsInfo.js
+++ b/packageA/pages/goodsInfo/goodsInfo.js
@@ -399,6 +399,7 @@ Page({
'data.goods_id': t.data.data.id,
'data.id': t.data.data.id,
'data.sales_sum': t.data.data.sales_sum,
+ 'data.storageId':t.data.data.storageId
});
@@ -803,7 +804,7 @@ Page({
if(sto_list){
for (var k = 0; k < e.data.data.pageData.length; k++) {
var it=e.data.data.pageData[k];
- if (sto_list.indexof(it.keyid)==-1) {
+ if (sto_list.indexOf(it.keyid)==-1) {
//删除
e.data.data.pageData.splice(k--, 1);
}
diff --git a/packageA/pages/goodsInfo/goodsInfo.wxml b/packageA/pages/goodsInfo/goodsInfo.wxml
index dd454e5..cf0f2e5 100644
--- a/packageA/pages/goodsInfo/goodsInfo.wxml
+++ b/packageA/pages/goodsInfo/goodsInfo.wxml
@@ -40,7 +40,7 @@
销量:{{data.sales_sum}}
- 有效天数:{{data.validDays}}
+ 有效天数:{{data.validDays?data.validDays:0}}