diff --git a/components/AddressWindow.vue b/components/AddressWindow.vue
index 4614d71..ae97a79 100644
--- a/components/AddressWindow.vue
+++ b/components/AddressWindow.vue
@@ -28,7 +28,7 @@
-
+
新加地址
diff --git a/components/CouponListWindow.vue b/components/CouponListWindow.vue
index 1ad7b45..2a126b3 100644
--- a/components/CouponListWindow.vue
+++ b/components/CouponListWindow.vue
@@ -35,7 +35,7 @@
-
+
diff --git a/components/CouponPop.vue b/components/CouponPop.vue
index dab6fc3..1fe65d4 100644
--- a/components/CouponPop.vue
+++ b/components/CouponPop.vue
@@ -31,7 +31,7 @@
-
+
diff --git a/components/GoodList.vue b/components/GoodList.vue
index c3eec40..18c5cce 100644
--- a/components/GoodList.vue
+++ b/components/GoodList.vue
@@ -3,9 +3,9 @@
-
-
-
+
+
+
diff --git a/components/ShareInfo.vue b/components/ShareInfo.vue
index 1369b3f..8c44ed0 100644
--- a/components/ShareInfo.vue
+++ b/components/ShareInfo.vue
@@ -1,7 +1,7 @@
-
+
diff --git a/components/ShareRedPackets.vue b/components/ShareRedPackets.vue
index ec36277..fc20ea9 100644
--- a/components/ShareRedPackets.vue
+++ b/components/ShareRedPackets.vue
@@ -6,7 +6,7 @@
>
-
+
会员分享返
¥{{ priceName }}
diff --git a/components/StorePoster.vue b/components/StorePoster.vue
index c1071ee..41e47bb 100644
--- a/components/StorePoster.vue
+++ b/components/StorePoster.vue
@@ -3,7 +3,7 @@
-
+
-
-
+
+
diff --git a/pages.json b/pages.json
index c136dbe..f3c8459 100644
--- a/pages.json
+++ b/pages.json
@@ -39,7 +39,7 @@
{
"path": "pages/home/index",
"style": {
- "navigationBarTitleText": "home"
+ "navigationBarTitleText": "yshop商城"
}
},
{
diff --git a/pages/NotDefined/index.vue b/pages/NotDefined/index.vue
index 3d8f402..ea94742 100644
--- a/pages/NotDefined/index.vue
+++ b/pages/NotDefined/index.vue
@@ -1,6 +1,6 @@
-
+
页面未找到
抱歉!您访问的页面不存在,请返回上一级或点击下方按钮返回首页...
diff --git a/pages/activity/DargainDetails/index.vue b/pages/activity/DargainDetails/index.vue
index a4290b5..ece9c6c 100644
--- a/pages/activity/DargainDetails/index.vue
+++ b/pages/activity/DargainDetails/index.vue
@@ -81,11 +81,11 @@
-
+
砍价帮
-
+
@@ -119,11 +119,11 @@
-
+
商品详情
-
+
@@ -132,18 +132,18 @@
-
+
活动规则
-
+
-
+
diff --git a/pages/activity/GoodsBargain/index.vue b/pages/activity/GoodsBargain/index.vue
index 3d5e532..abda130 100644
--- a/pages/activity/GoodsBargain/index.vue
+++ b/pages/activity/GoodsBargain/index.vue
@@ -1,7 +1,7 @@
-
+
diff --git a/pages/activity/GoodsGroup/index.vue b/pages/activity/GoodsGroup/index.vue
index 80c4b68..bec96e2 100644
--- a/pages/activity/GoodsGroup/index.vue
+++ b/pages/activity/GoodsGroup/index.vue
@@ -1,7 +1,7 @@
-
+
diff --git a/pages/activity/GoodsSeckill/index.vue b/pages/activity/GoodsSeckill/index.vue
index 8c24e2d..3ba878b 100644
--- a/pages/activity/GoodsSeckill/index.vue
+++ b/pages/activity/GoodsSeckill/index.vue
@@ -45,7 +45,7 @@
-
+
@@ -235,4 +235,4 @@
.flash-sale .list .item .grab {
background-color: #999;
}
-
+
diff --git a/pages/activity/GroupRule/index.vue b/pages/activity/GroupRule/index.vue
index 120f789..abd9e24 100644
--- a/pages/activity/GroupRule/index.vue
+++ b/pages/activity/GroupRule/index.vue
@@ -39,7 +39,7 @@
-
+
@@ -50,7 +50,7 @@
我要参团
再次开团
-
+
取消开团
@@ -134,11 +134,11 @@
}
});
})
- .catch(err => {
- uni.showToast({
- title: err.msg || err.response.data.msg,
- icon: 'none',
- duration: 2000
+ .catch(err => {
+ uni.showToast({
+ title: err.msg || err.response.data.msg,
+ icon: 'none',
+ duration: 2000
});
});
},
@@ -217,4 +217,4 @@
}
}
};
-
+
diff --git a/pages/home/index.vue b/pages/home/index.vue
index 730a67d..595ac33 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -16,7 +16,7 @@
-
+
@@ -266,4 +266,4 @@ export default {
.swiper-item {
height: 100%;
}
-
+
diff --git a/pages/order/Logistics/index.vue b/pages/order/Logistics/index.vue
index 3848808..deff0b5 100644
--- a/pages/order/Logistics/index.vue
+++ b/pages/order/Logistics/index.vue
@@ -79,7 +79,7 @@
-
+
diff --git a/pages/order/MyOrder/index.vue b/pages/order/MyOrder/index.vue
index 5a72e3a..f98eb62 100644
--- a/pages/order/MyOrder/index.vue
+++ b/pages/order/MyOrder/index.vue
@@ -160,7 +160,7 @@
-
+
diff --git a/pages/order/OrderDetails/index.vue b/pages/order/OrderDetails/index.vue
index 2ce4a9a..685bd1f 100644
--- a/pages/order/OrderDetails/index.vue
+++ b/pages/order/OrderDetails/index.vue
@@ -75,7 +75,7 @@
-
+
@@ -128,7 +128,7 @@
-
+
diff --git a/pages/order/OrderSubmission/index.vue b/pages/order/OrderSubmission/index.vue
index 2a34030..f09f6c5 100644
--- a/pages/order/OrderSubmission/index.vue
+++ b/pages/order/OrderSubmission/index.vue
@@ -34,7 +34,7 @@
-
+
@@ -484,7 +484,7 @@
let form = {}
if (this.$deviceType == 'app') {
form.form = 'app'
- }
+ }
console.log(this.orderGroupInfo.orderKey, {
realName: this.contacts,
phone: this.contactsTel,
@@ -517,7 +517,7 @@
shippingType: parseInt(shipping_type) + 1,
...form
})
- .then(res => {
+ .then(res => {
console.log(res)
uni.hideLoading();
const data = res.data;
@@ -563,7 +563,7 @@
}, 100);
break;
case "WECHAT_PAY":
- weappPay(data.result.jsConfig).then(res => {
+ weappPay(data.result.jsConfig).then(res => {
console.log(res)
this.$yrouter.replace({
path: "/pages/order/OrderDetails/index",
@@ -592,4 +592,4 @@
}
}
};
-
+
diff --git a/pages/order/ReturnList/index.vue b/pages/order/ReturnList/index.vue
index 0dbd107..ed8d65a 100644
--- a/pages/order/ReturnList/index.vue
+++ b/pages/order/ReturnList/index.vue
@@ -35,7 +35,7 @@
-
+
diff --git a/pages/orderAdmin/AdminOrder/index.vue b/pages/orderAdmin/AdminOrder/index.vue
index 25c8995..cdfa0ab 100644
--- a/pages/orderAdmin/AdminOrder/index.vue
+++ b/pages/orderAdmin/AdminOrder/index.vue
@@ -20,7 +20,7 @@
{{ orderInfo.userAddress }}
-
+
{{ delivery.userAddress }}
-
+
diff --git a/pages/orderAdmin/OrderCancellation/index.vue b/pages/orderAdmin/OrderCancellation/index.vue
index e88efc7..6d89077 100644
--- a/pages/orderAdmin/OrderCancellation/index.vue
+++ b/pages/orderAdmin/OrderCancellation/index.vue
@@ -8,7 +8,7 @@
立即核销
-
+
diff --git a/pages/shop/GoodSearch/index.vue b/pages/shop/GoodSearch/index.vue
index 510b0a9..e356804 100644
--- a/pages/shop/GoodSearch/index.vue
+++ b/pages/shop/GoodSearch/index.vue
@@ -25,7 +25,7 @@
-
+
diff --git a/pages/shop/GoodsCollection/index.vue b/pages/shop/GoodsCollection/index.vue
index 965f64a..d70f61b 100644
--- a/pages/shop/GoodsCollection/index.vue
+++ b/pages/shop/GoodsCollection/index.vue
@@ -26,7 +26,7 @@
v-if="collectProductList.length < 1 && page > 1"
>
-
+
diff --git a/pages/shop/GoodsCon/index.vue b/pages/shop/GoodsCon/index.vue
index a95ee82..02cb523 100644
--- a/pages/shop/GoodsCon/index.vue
+++ b/pages/shop/GoodsCon/index.vue
@@ -7,7 +7,7 @@
¥
{{ storeInfo.price }}
¥{{ storeInfo.vipPrice }}
-
+
@@ -62,9 +62,9 @@
-
+
优品推荐
-
+
diff --git a/pages/shop/GoodsList/index.vue b/pages/shop/GoodsList/index.vue
index 2e5bd44..b91d082 100644
--- a/pages/shop/GoodsList/index.vue
+++ b/pages/shop/GoodsList/index.vue
@@ -21,15 +21,15 @@
>{{ title ? title : "默认" }}
价格
-
-
-
+
+
+
销量
-
-
-
+
+
+
新品
@@ -70,7 +70,7 @@
v-if="productList.length === 0 && where.page > 1"
>
-
+
diff --git a/pages/shop/ShoppingCart/index.vue b/pages/shop/ShoppingCart/index.vue
index 07cde0b..6e253d0 100644
--- a/pages/shop/ShoppingCart/index.vue
+++ b/pages/shop/ShoppingCart/index.vue
@@ -96,7 +96,7 @@
-
+
@@ -497,4 +497,4 @@ export default {
}
}
};
-
+
diff --git a/pages/shop/news/NewsList/index.vue b/pages/shop/news/NewsList/index.vue
index 06e0c23..2112185 100644
--- a/pages/shop/news/NewsList/index.vue
+++ b/pages/shop/news/NewsList/index.vue
@@ -15,7 +15,7 @@
-
+
diff --git a/pages/user/Login/index.vue b/pages/user/Login/index.vue
index dad9947..b047c86 100644
--- a/pages/user/Login/index.vue
+++ b/pages/user/Login/index.vue
@@ -2,7 +2,7 @@
-
+
@@ -136,7 +136,7 @@
current: 0,
account: "",
password: "",
- captcha: "",
+ captcha: "",
inviteCode:"",
formItem: 1,
type: "login"
@@ -338,4 +338,4 @@
}
}
};
-
+
diff --git a/pages/user/PersonalData/index.vue b/pages/user/PersonalData/index.vue
index af4c0c7..3c789ab 100644
--- a/pages/user/PersonalData/index.vue
+++ b/pages/user/PersonalData/index.vue
@@ -33,7 +33,7 @@
-->
diff --git a/pages/user/Register/index.vue b/pages/user/Register/index.vue
index fa6feea..3f676df 100644
--- a/pages/user/Register/index.vue
+++ b/pages/user/Register/index.vue
@@ -2,7 +2,7 @@
-
+
diff --git a/pages/user/RetrievePassword/index.vue b/pages/user/RetrievePassword/index.vue
index 1d91a47..e312430 100644
--- a/pages/user/RetrievePassword/index.vue
+++ b/pages/user/RetrievePassword/index.vue
@@ -2,7 +2,7 @@
-
+
diff --git a/pages/user/User/index.vue b/pages/user/User/index.vue
index 8f97098..323455b 100644
--- a/pages/user/User/index.vue
+++ b/pages/user/User/index.vue
@@ -55,35 +55,35 @@
-
+
{{ userInfo.orderStatusNum.unpaidCount }}
待付款
-
+
{{ userInfo.orderStatusNum.unshippedCount }}
待发货
-
+
{{ userInfo.orderStatusNum.receivedCount }}
待收货
-
+
{{ userInfo.orderStatusNum.evaluatedCount }}
待评价
-
+
{{ userInfo.orderStatusNum.refundCount }}
售后/退款
@@ -110,7 +110,7 @@
-
+
-
+
diff --git a/pages/user/coupon/UserCoupon/index.vue b/pages/user/coupon/UserCoupon/index.vue
index d6fb017..cc61e69 100644
--- a/pages/user/coupon/UserCoupon/index.vue
+++ b/pages/user/coupon/UserCoupon/index.vue
@@ -26,7 +26,7 @@
v-if="couponsList.length === 0 && loading === true"
>
-
+
diff --git a/pages/user/promotion/CashAudit/index.vue b/pages/user/promotion/CashAudit/index.vue
index b044897..fdc53cf 100644
--- a/pages/user/promotion/CashAudit/index.vue
+++ b/pages/user/promotion/CashAudit/index.vue
@@ -1,7 +1,7 @@
-
+
提现申请已提交,等待人工审核
{{ time }}
diff --git a/pages/user/promotion/PromoterList/index.vue b/pages/user/promotion/PromoterList/index.vue
index ec41541..79ce0a0 100644
--- a/pages/user/promotion/PromoterList/index.vue
+++ b/pages/user/promotion/PromoterList/index.vue
@@ -34,21 +34,21 @@
团队排序
-
-
-
+
+
+
金额排序
-
-
-
+
+
+
订单排序
-
-
-
+
+
+
diff --git a/pages/user/signIn/Integral/index.vue b/pages/user/signIn/Integral/index.vue
index aeb7a49..3e1646c 100644
--- a/pages/user/signIn/Integral/index.vue
+++ b/pages/user/signIn/Integral/index.vue
@@ -43,18 +43,18 @@
:key="listIndex"
>
- {{ item.title }}
+ {{ item.title }}
- +{{ item.number }}
- -{{ item.number }}
+ +{{ item.number }}
+ -{{ item.number }}
-
+
@@ -62,7 +62,7 @@
-
+
@@ -131,7 +131,8 @@ export default {
that.loaded = res.data.length < that.where.limit;
that.loadTitle = that.loaded ? "人家是有底线的" : "上拉加载更多";
that.where.page = that.where.page + 1;
- that.list.push.apply(that.list, res.data);
+ that.list.push.apply(that.list, res.data);
+ console.log(that.list)
},
err => {
uni.showToast({
diff --git a/pages/user/signIn/Sign/index.vue b/pages/user/signIn/Sign/index.vue
index 4b8db3e..4907ca6 100644
--- a/pages/user/signIn/Sign/index.vue
+++ b/pages/user/signIn/Sign/index.vue
@@ -1,211 +1,183 @@
-
-
-
-
-
- {{ item.day }}
-
- +{{ item.signNum }}
-
-
-
- {{ userInfo.isDaySign ? "已签到" : "立即签到" }}
-
-
-
- 已累计签到
-
- {{ item || 0 }}
- 天
-
- 据说连续签到第{{ day }}天可获得超额积分,一定要坚持签到哦~~~
-
-
-
- {{ item.title }}
- {{ item.addTime }}
-
- +{{ item.number }}
-
-
- 点击加载更多
-
-
-
-
-
-
-
-
-
- 签到成功
- 获得{{ integral }}积分
- 好的
-
-
-
-
+
+
+
+
+
+ {{ item.day }}
+
+ +{{ item.sign_num }}
+
+
+
+ {{ userInfo.isDaySign ? "已签到" : "立即签到" }}
+
+
+
+ 已累计签到
+
+ {{ item || 0 }}
+ 天
+
+ 据说连续签到第{{ day }}天可获得超额积分,一定要坚持签到哦~~~
+
+
+
+ {{ item.title }}
+ {{ item.addTime }}
+
+ +{{ item.number }}
+
+
+ 点击加载更多
+
+
+
+
+
+
+
+
+
+ 签到成功
+ 获得{{ integral }}积分
+ 好的
+
+
+
+
+ export default {
+ name: "Sign",
+ components: {},
+ props: {},
+ data: function() {
+ return {
+ userInfo: {},
+ integral: 0,
+ signCount: [],
+ sign_index: 0,
+ signSystemList: [],
+ signList: [],
+ page: 1,
+ limit: 3,
+ active: false,
+ day: ""
+ };
+ },
+ mounted: function() {
+ this.signUser();
+ this.signConfig();
+ this.getSignList();
+ },
+ methods: {
+ goSignRecord() {
+ this.$yrouter.push("/pages/user/signIn/SignRecord/index");
+ },
+ // js给数字补0;num:需要补0的数字,length:长度(补到多少位);
+ PrefixInteger: function(num, length) {
+ return (Array(length).join("0") + num).slice(-length).split("");
+ },
+ //数字转中文
+ Rp: function(n) {
+ var cnum = ["零", "一", "二", "三", "四", "五", "六", "七", "八", "九"];
+ var s = "";
+ n = "" + n; // 数字转为字符串
+ for (var i = 0; i < n.length; i++) {
+ s += cnum[parseInt(n.charAt(i))];
+ }
+ return s;
+ },
+ // 获取用户信息
+ signUser: function() {
+ let that = this;
+ postSignUser({
+ sign: 1
+ }).then(res => {
+ res.data.integral = parseInt(res.data.integral);
+ var sumSginDay = res.data.sumSignDay;
+ that.userInfo = res.data;
+ that.signCount = that.PrefixInteger(sumSginDay, 4);
+ that.sign_index = parseInt(res.data.signNum);
+ });
+ },
+ // 签到配置
+ signConfig: function() {
+ let that = this;
+ getSignConfig().then(res => {
+ that.signSystemList = res.data;
+ that.day = that.Rp(that.signSystemList.length);
+ });
+ },
+ // 用户签到
+ goSign: function() {
+ let that = this,
+ sumSginDay = that.userInfo.sumSignDay;
+ if (that.userInfo.is_day_sgin) {
+ uni.showToast({
+ title: "您今日已签到!",
+ icon: "none",
+ duration: 2000
+ });
+ return
+ }
+ postSignIntegral().then(res => {
+ that.active = true;
+ that.integral = res.data.integral;
+ let sign_index = parseInt(that.sign_index + 1);
+ that.sign_index =
+ sign_index > that.signSystemList.length ? 1 : sign_index;
+ that.signCount = that.PrefixInteger(sumSginDay + 1, 4);
+ that.userInfo.is_day_sgin = true;
+ that.userInfo.integral = add(that.userInfo.integral, res.data.integral);
+ that.getSignList();
+ });
+ },
+ // 获取签到列表;
+ getSignList: function() {
+ let that = this;
+ getSignList(that.page, that.limit).then(res => {
+ that.signList = res.data;
+ });
+ },
+ close: function() {
+ this.active = false;
+ }
+ }
+ };
+
diff --git a/static/icon-cart-hot.png b/static/icon-cart-hot.png
old mode 100644
new mode 100755
index 66bb910..0863747
Binary files a/static/icon-cart-hot.png and b/static/icon-cart-hot.png differ
diff --git a/static/icon-class-hot.png b/static/icon-class-hot.png
old mode 100644
new mode 100755
index ebc1e51..6ee5948
Binary files a/static/icon-class-hot.png and b/static/icon-class-hot.png differ
diff --git a/static/icon-home-hot.png b/static/icon-home-hot.png
old mode 100644
new mode 100755
index 3370aad..f1ec56c
Binary files a/static/icon-home-hot.png and b/static/icon-home-hot.png differ
diff --git a/static/icon-user-hot.png b/static/icon-user-hot.png
old mode 100644
new mode 100755
index ef8411d..0329868
Binary files a/static/icon-user-hot.png and b/static/icon-user-hot.png differ
diff --git a/static/images/404.png b/static/images/404.png
index 6fb0f8b..5319898 100755
Binary files a/static/images/404.png and b/static/images/404.png differ
diff --git a/static/images/close.gif b/static/images/close.gif
deleted file mode 100755
index 4de18b4..0000000
Binary files a/static/images/close.gif and /dev/null differ
diff --git a/static/images/group.png b/static/images/group.png
index c7ddbd5..acfbfad 100755
Binary files a/static/images/group.png and b/static/images/group.png differ
diff --git a/static/images/h5.png b/static/images/h5.png
index bc115ca..cc17881 100755
Binary files a/static/images/h5.png and b/static/images/h5.png differ
diff --git a/static/images/light.png b/static/images/light.png
index efa9208..acfa32a 100755
Binary files a/static/images/light.png and b/static/images/light.png differ
diff --git a/static/images/noAddress.png b/static/images/noAddress.png
index bb6e363..12e9a6c 100755
Binary files a/static/images/noAddress.png and b/static/images/noAddress.png differ
diff --git a/static/images/noCart.png b/static/images/noCart.png
index 2321258..d7ba570 100755
Binary files a/static/images/noCart.png and b/static/images/noCart.png differ
diff --git a/static/images/noCollection.png b/static/images/noCollection.png
index f967720..d102553 100755
Binary files a/static/images/noCollection.png and b/static/images/noCollection.png differ
diff --git a/static/images/noCoupon.png b/static/images/noCoupon.png
index e2da350..ee102a9 100755
Binary files a/static/images/noCoupon.png and b/static/images/noCoupon.png differ
diff --git a/static/images/noEvaluate.png b/static/images/noEvaluate.png
index de6f538..9fe6d12 100755
Binary files a/static/images/noEvaluate.png and b/static/images/noEvaluate.png differ
diff --git a/static/images/noExpress.png b/static/images/noExpress.png
index 4cb2e3f..588e49c 100755
Binary files a/static/images/noExpress.png and b/static/images/noExpress.png differ
diff --git a/static/images/noGood.png b/static/images/noGood.png
index fb39ca2..eade689 100755
Binary files a/static/images/noGood.png and b/static/images/noGood.png differ
diff --git a/static/images/noNews.png b/static/images/noNews.png
index 755d206..88b8f11 100755
Binary files a/static/images/noNews.png and b/static/images/noNews.png differ
diff --git a/static/images/noOrder.png b/static/images/noOrder.png
index 425aaca..ab0c123 100755
Binary files a/static/images/noOrder.png and b/static/images/noOrder.png differ
diff --git a/static/images/noSearch.png b/static/images/noSearch.png
index e4fa660..69e5e9b 100755
Binary files a/static/images/noSearch.png and b/static/images/noSearch.png differ
diff --git a/static/images/noShopper.png b/static/images/noShopper.png
index e26ed19..d7ba570 100755
Binary files a/static/images/noShopper.png and b/static/images/noShopper.png differ
diff --git a/static/images/open.gif b/static/images/open.gif
deleted file mode 100755
index 4943b52..0000000
Binary files a/static/images/open.gif and /dev/null differ
diff --git a/static/images/posters.jpg b/static/images/posters.jpg
deleted file mode 100755
index 0e3781d..0000000
Binary files a/static/images/posters.jpg and /dev/null differ
diff --git a/static/images/posters2.jpg b/static/images/posters2.jpg
deleted file mode 100755
index 84f55c1..0000000
Binary files a/static/images/posters2.jpg and /dev/null differ
diff --git a/static/images/pricetitle.jpg b/static/images/pricetitle.jpg
index 1451364..0f77545 100755
Binary files a/static/images/pricetitle.jpg and b/static/images/pricetitle.jpg differ
diff --git a/static/images/public.png b/static/images/public.png
index 81d2b61..f05a127 100755
Binary files a/static/images/public.png and b/static/images/public.png differ
diff --git a/static/images/scan.gif b/static/images/scan.gif
deleted file mode 100755
index 95ed7fa..0000000
Binary files a/static/images/scan.gif and /dev/null differ
diff --git a/static/images/share-info.png b/static/images/share-info.png
deleted file mode 100755
index dd001cb..0000000
Binary files a/static/images/share-info.png and /dev/null differ
diff --git a/static/images/value.jpg b/static/images/value.jpg
index b47d08d..f5b9293 100755
Binary files a/static/images/value.jpg and b/static/images/value.jpg differ
diff --git a/static/images/writeOffBg.jpg b/static/images/writeOffBg.jpg
index 9226ee4..204432d 100755
Binary files a/static/images/writeOffBg.jpg and b/static/images/writeOffBg.jpg differ