diff --git a/app.json b/app.json
index 7484fea..20db1d4 100644
--- a/app.json
+++ b/app.json
@@ -50,7 +50,8 @@
"pages/login/register",
"pages/shop/shop",
"pages/store/store",
- "pages/order/payment"
+ "pages/order/payment",
+ "pages/store/myStore"
],
"window": {
"backgroundTextStyle": "light",
diff --git a/app.wxss b/app.wxss
index 6b26058..a976369 100644
--- a/app.wxss
+++ b/app.wxss
@@ -167,8 +167,8 @@ page {
margin-left: 10px;
}
button[type="warn"] {
-color:#FFFFFF;
-background-color:#d9002f;
+ color:#FFFFFF;
+ background-color:#d9002f;
}
/* /加载页面/ */
diff --git a/images/123123@2x.png b/images/123123@2x.png
deleted file mode 100644
index 380c355..0000000
Binary files a/images/123123@2x.png and /dev/null differ
diff --git a/images/147852@2x(2).png b/images/147852@2x(2).png
deleted file mode 100644
index 7eb364d..0000000
Binary files a/images/147852@2x(2).png and /dev/null differ
diff --git a/images/456654@2x(3).png b/images/456654@2x(3).png
deleted file mode 100644
index d9db04b..0000000
Binary files a/images/456654@2x(3).png and /dev/null differ
diff --git a/images/4566@2x(1).png b/images/4566@2x(1).png
deleted file mode 100644
index 5d30e35..0000000
Binary files a/images/4566@2x(1).png and /dev/null differ
diff --git a/images/back-8@2x.png b/images/back-8@2x.png
deleted file mode 100644
index 82a1ad0..0000000
Binary files a/images/back-8@2x.png and /dev/null differ
diff --git a/images/back_home.png b/images/back_home.png
new file mode 100644
index 0000000..3bcc6f7
Binary files /dev/null and b/images/back_home.png differ
diff --git a/images/blueRight.png b/images/blueRight.png
new file mode 100644
index 0000000..9d87423
Binary files /dev/null and b/images/blueRight.png differ
diff --git a/images/f.png b/images/f.png
deleted file mode 100644
index 03108d1..0000000
Binary files a/images/f.png and /dev/null differ
diff --git a/images/fx.png b/images/fx.png
new file mode 100644
index 0000000..98356ce
Binary files /dev/null and b/images/fx.png differ
diff --git a/images/goods_shopImg.png b/images/goods_shopImg.png
new file mode 100644
index 0000000..9fbee7b
Binary files /dev/null and b/images/goods_shopImg.png differ
diff --git a/images/gw.png b/images/gw.png
new file mode 100644
index 0000000..3684ce7
Binary files /dev/null and b/images/gw.png differ
diff --git a/images/icon_dz.png b/images/icon_dz.png
new file mode 100644
index 0000000..dc537c8
Binary files /dev/null and b/images/icon_dz.png differ
diff --git a/images/kefu.png b/images/kefu.png
index 46b4984..adc3f74 100644
Binary files a/images/kefu.png and b/images/kefu.png differ
diff --git a/images/kefu1.png b/images/kefu1.png
deleted file mode 100644
index 98805e7..0000000
Binary files a/images/kefu1.png and /dev/null differ
diff --git a/images/xinghei.png b/images/xinghei.png
new file mode 100644
index 0000000..ace28ed
Binary files /dev/null and b/images/xinghei.png differ
diff --git a/images/xinghui.png b/images/xinghui.png
new file mode 100644
index 0000000..ec279f0
Binary files /dev/null and b/images/xinghui.png differ
diff --git a/pages/category/category.wxml b/pages/category/category.wxml
index 1dfa667..1537c66 100644
--- a/pages/category/category.wxml
+++ b/pages/category/category.wxml
@@ -1,72 +1,71 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
- {{item.cate_name}}
+
+
-
-
-
-
-
-
-
-
-
-
-
-
- {{item.name}}
-
+
+
+
+
+
+
+
+
+
+
+ {{item.cate_name}}
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.name}}
+
+
+
+
+
+ 该分类暂无数据
+
-
- 该分类暂无数据
-
-
-
-
+
\ No newline at end of file
diff --git a/pages/collection/collection.js b/pages/collection/collection.js
index 65b9c1a..8127395 100644
--- a/pages/collection/collection.js
+++ b/pages/collection/collection.js
@@ -29,39 +29,24 @@ Page({
content: '确定要清除全部商品吗？',
success: function (res) {
if (res.confirm) {
- wx.request({
- url: app.d.ceshiUrl + '&action=addFavorites&m=alldel',
- method: 'post',
- data: {
- openid: app.globalData.userInfo.openid,
- },
- header: {
- 'Content-Type': 'application/x-www-form-urlencoded'
- },
- success: function (res) {
- var status = res.data.status
- if (status == 1) {
- wx.showToast({
- title: '清理成功！',
- duration: 2000
- });
- that.setData({
- list: []
- });
- } else {
- wx.showToast({
- title: '清理失败!',
- duration: 2000
- });
- }
- },
- error: function (e) {
+ WXAPI.delallFavorites({
+ accessId: app.globalData.accessId,
+ storeId: 239,
+ storeType: 1,
+ }).then(res => {
+ if (res.code == 200) {
wx.showToast({
- title: '网络异常！',
+ title: '清理成功！',
+ duration: 2000
+ });
+ that.collection();
+ } else {
+ wx.showToast({
+ title: res.message,
duration: 2000
});
}
- });
+ });
} else if (res.cancel) {
console.log('用户点击取消')
}
@@ -70,36 +55,18 @@ Page({
},
collection: function () {
var that = this;
- wx.request({
- url: app.d.ceshiUrl + '&action=addFavorites&m=collection',
- method: 'post',
- data: {
- openid: app.globalData.userInfo.openid,
- },
- header: {
- 'Content-Type': 'application/x-www-form-urlencoded'
- },
- success: function (res) {
- var status = res.data.status
- if (status == 1) {
- that.setData({
- list: res.data.list,
- bgcolor: app.d.bf_color,
- remind: ''
- });
- } else {
- wx.showToast({
- title: '暂时还没有收藏!',
- duration: 2000,
- remind: ''
- });
- }
- },
- error: function (e) {
- wx.showToast({
- title: '网络异常！',
- duration: 2000
- });
+ WXAPI.favorites({
+ accessId: app.globalData.accessId,
+ storeId: 239,
+ storeType: 1,
+ type: 1
+ }).then(res => {
+ if (res.code == 200) {
+ var data = res.data
+ that.setData({
+ list: data.list,
+ remind: ''
+ })
}
});
},
@@ -107,43 +74,30 @@ Page({
removeFavorites: function (e) {
console.log(e)
var that = this;
- var id = e.currentTarget.dataset.favId;
+ var collection_id = e.currentTarget.dataset.favId;
wx.showModal({
title: '提示',
- content: '你确认移除吗',
+ content: '你确认取消收藏吗',
success: function (res) {
- res.confirm && wx.request({
- url: app.d.ceshiUrl + '&action=addFavorites&m=removeFavorites',
- method: 'post',
- data: {
- id: id,
- openid: app.globalData.userInfo.openid,
- },
- header: {
- 'Content-Type': 'application/x-www-form-urlencoded'
- },
- success: function (res) {
- var status = res.data.status;
- if (status == 1) {
- wx.showToast({
- title: res.data.succ,
- duration: 2000
- });
- that.collection();
- } else {
- wx.showToast({
- title: res.data.err,
- duration: 2000
- });
- }
- },
- error: function (e) {
+ res.confirm && WXAPI.removeFavorites({
+ accessId: app.globalData.accessId,
+ storeId: 239,
+ storeType: 1,
+ collection: collection_id,
+ }).then(res => {
+ if (res.code == 200) {
+ wx.showToast({
+ title: res.data.succ,
+ duration: 2000
+ });
+ that.collection();
+ } else {
wx.showToast({
- title: '网络异常！',
+ title: res.message,
duration: 2000
});
}
- });
+ });
}
});
}
diff --git a/pages/distribution/detail.wxml b/pages/distribution/detail.wxml
index e69dfe6..2357b1a 100644
--- a/pages/distribution/detail.wxml
+++ b/pages/distribution/detail.wxml
@@ -109,7 +109,7 @@
-
+
diff --git a/pages/distribution/list.wxml b/pages/distribution/list.wxml
index 6771964..1aa8ba2 100644
--- a/pages/distribution/list.wxml
+++ b/pages/distribution/list.wxml
@@ -98,7 +98,7 @@
1
- -我是有底线的-
+ -我是有底线的-
\ No newline at end of file
diff --git a/pages/distribution/user.wxss b/pages/distribution/user.wxss
index 1e015f3..8756a60 100644
--- a/pages/distribution/user.wxss
+++ b/pages/distribution/user.wxss
@@ -95,9 +95,7 @@ contact-button{
display:flex;
flex-direction:column;
}
-.hh{
- /* margin-top: 15px; */
-}
+
.dibu{
background-color: #48474c;
width: 100%;
@@ -197,10 +195,6 @@ contact-button{
font-size:28rpx;
font-weight:bold;
}
-.obtain_bt_3{
-}
-
-
@keyframes rise{
0% {opacity: 0;transform: translate3d(0,100%,0);}
diff --git a/pages/footprint/footprint.js b/pages/footprint/footprint.js
index 4fd2240..7e0b509 100644
--- a/pages/footprint/footprint.js
+++ b/pages/footprint/footprint.js
@@ -73,33 +73,16 @@ Page({
// 查看足迹
footprint: function(){
var that = this;
- wx.request({
- url: app.d.ceshiUrl + '&action=footprint&m=index',
- method: 'post',
- data: {
- openid: app.globalData.userInfo.openid,
- },
- header: {
- 'Content-Type': 'application/x-www-form-urlencoded'
- },
- success: function (res) {
- var status = res.data.status
- if (status == 1) {
- that.setData({
- arr: res.data.arr
- });
- } else {
- wx.showToast({
- title: '暂时还没有记录!',
- duration: 2000
- });
- }
- },
- error: function (e) {
- wx.showToast({
- title: '网络异常！',
- duration: 2000
- });
+ WXAPI.footprint({
+ accessId: app.globalData.accessId,
+ storeId: 239,
+ storeType: 1,
+ }).then(res => {
+ if (res.code == 200) {
+ var data = res.data
+ that.setData({
+ arr: data.arr
+ })
}
});
}
diff --git a/pages/footprint/footprint.wxml b/pages/footprint/footprint.wxml
index fe84ef7..361aec5 100644
--- a/pages/footprint/footprint.wxml
+++ b/pages/footprint/footprint.wxml
@@ -29,7 +29,7 @@
暂时还没有记录/(ㄒoㄒ)/~~
-
+
{{item.time}}
diff --git a/pages/group_buy/cantuan.wxml b/pages/group_buy/cantuan.wxml
index 3388947..f053c6e 100644
--- a/pages/group_buy/cantuan.wxml
+++ b/pages/group_buy/cantuan.wxml
@@ -49,7 +49,7 @@
-
+
@@ -88,7 +88,7 @@
-
@@ -161,7 +161,7 @@
diff --git a/pages/group_buy/detail.wxml b/pages/group_buy/detail.wxml
index 7dff581..e432f2e 100644
--- a/pages/group_buy/detail.wxml
+++ b/pages/group_buy/detail.wxml
@@ -195,7 +195,7 @@
单独购买
-