diff --git a/components/diy_goodsGroup/diy_goodsGroup.wxml b/components/diy_goodsGroup/diy_goodsGroup.wxml
index 86cd51d..ce71705 100644
--- a/components/diy_goodsGroup/diy_goodsGroup.wxml
+++ b/components/diy_goodsGroup/diy_goodsGroup.wxml
@@ -149,7 +149,7 @@
-
@@ -285,7 +285,7 @@
-
@@ -422,7 +422,7 @@
-
diff --git a/components/diy_goodsGroup/diy_goodsGroup.wxss b/components/diy_goodsGroup/diy_goodsGroup.wxss
index 0ead973..aeb3a85 100644
--- a/components/diy_goodsGroup/diy_goodsGroup.wxss
+++ b/components/diy_goodsGroup/diy_goodsGroup.wxss
@@ -145,6 +145,7 @@
height: 318rpx;
margin-top: 20rpx;
display: flex;
+ position: relative;
}
.zs_t_img_x {
@@ -236,7 +237,7 @@
height: 56rpx;
position: relative;
right: 56rpx;
- top: 234rpx;
+ top: 0rpx;
}
.zs_t1_x3 {
@@ -473,6 +474,13 @@
left: 0rpx;
top: 10rpx;
}
+.zs_t1_x4{
+ width: 56rpx;
+ height: 56rpx;
+ position: absolute;
+ right: 0rpx;
+ bottom: 10rpx;
+}
.zs_t2_3l {
width: 56rpx;
@@ -562,3 +570,5 @@
overflow: hidden;
white-space: nowrap;
}
+
+
diff --git a/components/diy_picMax/diy_picMax.wxss b/components/diy_picMax/diy_picMax.wxss
index 8886b2d..2e26ca6 100644
--- a/components/diy_picMax/diy_picMax.wxss
+++ b/components/diy_picMax/diy_picMax.wxss
@@ -1,7 +1,7 @@
.picMax{width: 100%;position: relative;}
.pic_item{display: block; top:0;left:0;float:left}
-.pic_item image{width: 100%; height: 100%}
-.width_1{width: 187.5rpx}.width_2{width: 375rpx;}.width_3{width: 562.5rpx}.width_4{width:748rpx;}
+.pic_item image{width: 100%; height: 100%; vertical-align: bottom;}
+.width_1{width: 187.5rpx}.width_2{width: 375rpx;}.width_3{width: 562.5rpx}.width_4{width:750rpx;}
/* .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;} */
diff --git a/packageA/pages/prom_list/prom_list.js b/packageA/pages/prom_list/prom_list.js
index dedca4d..5fef675 100644
--- a/packageA/pages/prom_list/prom_list.js
+++ b/packageA/pages/prom_list/prom_list.js
@@ -1569,6 +1569,12 @@ Page({
price=price.toFixed(2);
cut_pirce=cut_pirce.toFixed(2);
this.setData({dp_price: this.data.dp_price,cut_price:this.data.cut_price});
+ },
+
+ go_goods:function (e) {
+ var gid=e.currentTarget.dataset.gid;
+ var url="/pages/goods/goodsInfo/goodsInfo?goods_id="+gid;
+ getApp().goto(url);
}
diff --git a/packageA/pages/prom_list/prom_list.wxml b/packageA/pages/prom_list/prom_list.wxml
index 9a4e7cc..3ae62ef 100644
--- a/packageA/pages/prom_list/prom_list.wxml
+++ b/packageA/pages/prom_list/prom_list.wxml
@@ -6,7 +6,7 @@
-
+
@@ -26,7 +26,7 @@
-
+
diff --git a/pages/cart/cart/cart.wxss b/pages/cart/cart/cart.wxss
index 2f4dac1..9817577 100644
--- a/pages/cart/cart/cart.wxss
+++ b/pages/cart/cart/cart.wxss
@@ -346,3 +346,8 @@ radio {
.title .english .esh {
margin: 0rpx 15rpx;
}
+
+page {
+ overflow-x: hidden;
+ padding-bottom: 100rpx;
+}
diff --git a/pages/giftpack/giftpacklist/giftpacklist.js b/pages/giftpack/giftpacklist/giftpacklist.js
index 1eb560b..bedc1bb 100644
--- a/pages/giftpack/giftpacklist/giftpacklist.js
+++ b/pages/giftpack/giftpacklist/giftpacklist.js
@@ -28,6 +28,7 @@ Page({
code: "", //核销码
c_state: "0", //判断是否已经使用, 0正常 1已使用 2已过期
is_lb: 0, //是否有礼包
+ default_color:null,
},
onLoad: function(options) {
@@ -177,7 +178,8 @@ Page({
if (res.data.code == 0) {
th.setData({
giftImage: th.data.iurl + res.data.data.lbUrl,
- giftTitle: res.data.data.giftTitle
+ giftTitle: res.data.data.giftTitle,
+ default_color:res.data.data.bgcolor
})
if (res.data.data.giftRemark == '') {
th.setData({
@@ -245,7 +247,8 @@ Page({
if (res.data.code == 0) {
_this2.setData({
giftImage: th.iurl + res.data.data.lbUrl,
- giftTitle: res.data.data.giftTitle
+ giftTitle: res.data.data.giftTitle,
+ default_color:res.data.data.bgcolor
})
if (res.data.data.giftRemark == '') {
_this2.setData({
@@ -346,5 +349,29 @@ Page({
var nav_b = th.selectComponent("#nav_b"); //组件的id
nav_b.close_box();
nav_b.set_name("礼包", "/pages/giftpack/buygiftpack/giftpackbuy");
- }
+ },
+
+ //--- 分享设置 --
+ onShareAppMessage: function (e) {
+ var curPage=this;
+ var pagePath = curPage.route; //当前页面url
+ if (pagePath.indexOf('/') != 0) {
+ pagePath = '/' + pagePath;
+ }
+
+ pagePath+="?isBuy="+this.data.isBuy;
+ if(this.data.isBuy==0){
+ pagePath+="&lbId="+this.data.getGiftID;
+ }else{
+ pagePath+="&orderSn="+this.data.orderSn;
+ }
+
+ return {
+ title: "礼包详情",
+ path:pagePath,
+ }
+ },
+
+
+
});
\ No newline at end of file
diff --git a/pages/giftpack/giftpacklist/giftpacklist.wxml b/pages/giftpack/giftpacklist/giftpacklist.wxml
index 739f79a..285f8d5 100644
--- a/pages/giftpack/giftpacklist/giftpacklist.wxml
+++ b/pages/giftpack/giftpacklist/giftpacklist.wxml
@@ -1,8 +1,8 @@
-
+
-
+
{{giftTitle}}
diff --git a/pages/giftpack/mygiftpack/mygiftpack.js b/pages/giftpack/mygiftpack/mygiftpack.js
index 8ab5ca6..6138b07 100644
--- a/pages/giftpack/mygiftpack/mygiftpack.js
+++ b/pages/giftpack/mygiftpack/mygiftpack.js
@@ -116,4 +116,19 @@ Page({
},
+
+//--- 分享设置 --
+onShareAppMessage: function (e) {
+ var curPage=this;
+ var pagePath = curPage.route; //当前页面url
+ if (pagePath.indexOf('/') != 0) {
+ pagePath = '/' + pagePath;
+ }
+ return {
+ title: "专享礼包",
+ path:pagePath,
+ }
+},
+
+
});
\ No newline at end of file
diff --git a/pages/goods/categoryList/categoryList.wxss b/pages/goods/categoryList/categoryList.wxss
index 5ebac36..a717476 100644
--- a/pages/goods/categoryList/categoryList.wxss
+++ b/pages/goods/categoryList/categoryList.wxss
@@ -518,5 +518,10 @@ margin: auto;
}
+ page {
+ overflow-x: hidden;
+ padding-bottom: 40rpx;
+ }
+
/* 风格三商品列表样式引入 */
@import "../goodsList/goodsList.wxss";
\ No newline at end of file
diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index 639b954..c7418bf 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -664,6 +664,7 @@ Page({
if (t.data.data.goods_content == null) t.data.data.goods_content = "";
//-----商品详情---
+ if(!t.data.data.goods_content) t.data.data.goods_content=" ";
a.wxParse("content", "html", t.data.data.goods_content, ee, 6);
e.wxParseAddFullImageUrl(ee, "content");
diff --git a/pages/index/index/index.wxss b/pages/index/index/index.wxss
index 8c7514a..087b2b7 100644
--- a/pages/index/index/index.wxss
+++ b/pages/index/index/index.wxss
@@ -908,4 +908,9 @@
.swiper{
height: 250rpx;
padding-bottom:30rpx;
+}
+
+page {
+ overflow-x: hidden;
+ padding-bottom: 120rpx;
}
\ No newline at end of file
diff --git a/pages/store/index.js b/pages/store/index.js
index 3dbea01..8601e17 100644
--- a/pages/store/index.js
+++ b/pages/store/index.js
@@ -12,6 +12,7 @@ Page({
is_no_more:0,
key_word:'', //关键字搜索
cat_id:0, //分类ID
+ islading:0,
},
onShow:function(){
@@ -65,6 +66,8 @@ Page({
get_list:function(){
if(this.data.is_no_more==1) return false;
+ if(this.data.islading==1) return false;
+ this.data.islading=1;
var th=this,req = getApp().request;
var dd = {
store_id: o.stoid,
@@ -84,6 +87,7 @@ Page({
req.promiseGet("/api/weshop/pickup/list", {
data: dd,
}).then(res => {
+ this.data.islading=0;
wx.hideLoading();
if(res.data.code==0){
if(res.data.data.pageData.length<=0){
@@ -132,6 +136,7 @@ Page({
cid: item['cat_id']
})
this.data.page=1;
+ this.data.is_no_more=0;
this.setData({ pick_list:null})
this.get_list();
@@ -139,7 +144,8 @@ Page({
//搜索关键字
sear:function(){
- this.data.page=1;
+ this.data.page=1;
+ this.data.is_no_more=0;
this.setData({ pick_list:null})
this.get_list();
},
diff --git a/pages/store/index.wxml b/pages/store/index.wxml
index e780603..2a5c362 100644
--- a/pages/store/index.wxml
+++ b/pages/store/index.wxml
@@ -1,8 +1,8 @@
-
+
-
+
diff --git a/pages/store/index.wxss b/pages/store/index.wxss
index 23dab93..3906111 100644
--- a/pages/store/index.wxss
+++ b/pages/store/index.wxss
@@ -42,7 +42,7 @@ position: relative;
.bcolor{background-color: #f5f5f5; height: 126rpx;}
.sear_inp{width: 490rpx; background-color:#eaeaea; height: 80rpx; border-radius:5rpx; margin: 25rpx;}
-.sear_inp input{ position: relative; top:10rpx;width: 400rpx; display: inline-block;}
+.sear_inp input{width: 400rpx;}
.select{height: 80rpx; width: 220rpx;background-color:#eaeaea; margin:25rpx; font-size: 28rpx; line-height: 80rpx;text-align: center }
-.sear_btn{ width: 50rpx; height: 100%; display: inline-block;}
+.sear_btn{ width: 50rpx; height: 100%; display: flex; align-items: center;}
diff --git a/pages/user/assistance/friend_assistance.js b/pages/user/assistance/friend_assistance.js
index a85edeb..ac4c0f7 100644
--- a/pages/user/assistance/friend_assistance.js
+++ b/pages/user/assistance/friend_assistance.js
@@ -126,7 +126,8 @@ Page({
id: this.data.tasking,
storeId: os.stoid,
userId: this.data.userId,
- zlUserId: t_user_id
+ zlUserId: t_user_id,
+ isWeappUser:1, //是不是小程序的入口，不需要判断
};
console.log(data);
getApp().request.json_post("/api/weshop/marketing/help/help/task/involve/insert",
diff --git a/pages/user/index/index.wxml b/pages/user/index/index.wxml
index 3d6fa58..3cad626 100644
--- a/pages/user/index/index.wxml
+++ b/pages/user/index/index.wxml
@@ -92,12 +92,33 @@
+
+
+
+
+
+ 我的订单
+
+
+
+ 更多
+
+
+
+
待付款
{{toji.wait_pay}}
+
+
+
+ 待发货
+ {{toji.wait_send}}
+
+
待收货
@@ -115,15 +136,8 @@
-
-
-
-
- 我的订单
-
-
-
+
@@ -133,9 +147,7 @@
-
- 我的权益
-
+ 我的权益
@@ -143,6 +155,7 @@
+
@@ -178,14 +191,14 @@
-
+
工具与服务
-
+
我的拼单
diff --git a/pages/user/index/index.wxss b/pages/user/index/index.wxss
index d367144..2f178e1 100644
--- a/pages/user/index/index.wxss
+++ b/pages/user/index/index.wxss
@@ -202,13 +202,14 @@
.xc-after-sale {
width: 100%;
- height: 160rpx;
border-bottom: 10px solid #f2f2f2;
}
.xc-after-sale-left {
- width: 90%;
+ width: 96%;
height: 100%;
+ margin-top: 40rpx;
+ margin-bottom: 25rpx;
}
.xc-no-money {
@@ -300,6 +301,11 @@
height: 50rpx;
}
+.xc-send{
+ width: 50rpx;
+ height: 50rpx;
+}
+
.xc-more-click {
width: 15rpx;
height: 15rpx;
diff --git a/pages/user/userinfo/userinfo.js b/pages/user/userinfo/userinfo.js
index 3be9c02..f6b0e5a 100644
--- a/pages/user/userinfo/userinfo.js
+++ b/pages/user/userinfo/userinfo.js
@@ -639,6 +639,11 @@ Page({
a.reg_time = time;
a.birthday = birthday
+
+ if(a.address=='null' || !a.address){
+ a.address="";
+ }
+
e.setData({
phone: a.mobile,
user: a,
diff --git a/utils/auth.js b/utils/auth.js
index ca87f8b..ba086b7 100644
--- a/utils/auth.js
+++ b/utils/auth.js
@@ -51,6 +51,7 @@ module.exports = {
data: {
js_code: e,
store_id: a.globalData.setting.stoid,
+ nickname:a.globalData.getu.nickName,
},
success: function (e) {
console.log("openidandkey");
@@ -90,6 +91,7 @@ module.exports = {
data: {
js_code: e,
store_id: a.globalData.setting.stoid,
+ nickname:a.globalData.getu.nickName,
},
success: function (e) {
console.log("openidandkey");