{{ storeItems.name }}
@@ -69,10 +53,7 @@
-
+
积分抵扣
@@ -124,33 +105,21 @@
支付方式
-
+
微信支付
微信快捷支付
-
+
微信支付
微信快捷支付
-
+
余额支付
@@ -185,392 +154,396 @@
立即结算
-
-
+
+
diff --git a/pages/orderAdmin/AdminOrder/index.vue b/pages/orderAdmin/AdminOrder/index.vue
index 1937543..bc1809c 100644
--- a/pages/orderAdmin/AdminOrder/index.vue
+++ b/pages/orderAdmin/AdminOrder/index.vue
@@ -66,9 +66,10 @@
下单时间:
-
-
-
+
+ {{ orderInfo.createTime }}
+
+
支付状态:
diff --git a/pages/orderAdmin/AdminOrderList/index.vue b/pages/orderAdmin/AdminOrderList/index.vue
index 0f32994..ad161ba 100644
--- a/pages/orderAdmin/AdminOrderList/index.vue
+++ b/pages/orderAdmin/AdminOrderList/index.vue
@@ -12,9 +12,9 @@
订单号:{{ item.orderId }}
-
+
下单时间:
-
+ {{ item.createTime }}
@@ -38,10 +38,7 @@
共{{ item.totalNum }}件商品,应支付
¥{{ item.payPrice }}
- ( 邮费 ¥{{
- item.totalPostage
- }}
- )
+ ( 邮费 ¥{{item.totalPostage}})
diff --git a/pages/shop/GoodsCollection/index.vue b/pages/shop/GoodsCollection/index.vue
index 3d432a0..92970e8 100644
--- a/pages/shop/GoodsCollection/index.vue
+++ b/pages/shop/GoodsCollection/index.vue
@@ -47,6 +47,7 @@ export default {
return {
page: 1,
limit: 20,
+ type:'collect',
collectProductList: [],
loadTitle: "",
loading: false,
@@ -71,7 +72,7 @@ export default {
if (that.loading) return; //阻止下次请求(false可以进行请求);
if (that.loadend) return; //阻止结束当前请求(false可以进行请求);
that.loading = true;
- getCollectUser(that.page, that.limit).then(res => {
+ getCollectUser(that.page, that.limit,that.type).then(res => {
that.loading = false;
//apply();js将一个数组插入另一个数组;
that.collectProductList.push.apply(that.collectProductList, res.data);
diff --git a/pages/shop/GoodsCon/index.vue b/pages/shop/GoodsCon/index.vue
index 5c68e9c..4852dad 100644
--- a/pages/shop/GoodsCon/index.vue
+++ b/pages/shop/GoodsCon/index.vue
@@ -1,21 +1,17 @@
+
+
+
¥
{{ storeInfo.price }}
- ¥{{ storeInfo.vipPrice }}
-
+ ¥{{ storeInfo.vipPrice }}
+
@@ -25,22 +21,17 @@
库存:{{ storeInfo.stock }}{{ storeInfo.unitName }}
销量:{{ storeInfo.sales }}{{ storeInfo.unitName }}
-
+
优惠券:
- 满{{ item.use_min_price }}减{{ item.coupon_price }}
+ 满{{ item.use_min_price }}减{{ item.coupon_price }}
+
+
+
{{ attrTxt }}:
@@ -55,6 +47,8 @@
+
+
门店信息
@@ -76,15 +70,14 @@
-
+
距离{{systemStore.distance}}千米
+
+
用户评价({{ replyCount }})
@@ -95,6 +88,8 @@
+
+
@@ -120,12 +115,27 @@
+
+
产品介绍
+
+
+
+
+
-
+
+
+
+
@@ -185,516 +197,574 @@
diff --git a/pages/shop/GoodsFoot/index.vue b/pages/shop/GoodsFoot/index.vue
new file mode 100644
index 0000000..0c13202
--- /dev/null
+++ b/pages/shop/GoodsFoot/index.vue
@@ -0,0 +1,102 @@
+
+
+
+
+
+
+
+
+ {{ item.storeName }}
+
+ ¥{{ item.price }}
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/shop/Live/LiveList/index.vue b/pages/shop/Live/LiveList/index.vue
new file mode 100644
index 0000000..287f01a
--- /dev/null
+++ b/pages/shop/Live/LiveList/index.vue
@@ -0,0 +1,182 @@
+
+
+
+
+
+ {{ tab.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/shop/ShoppingCart/index.vue b/pages/shop/ShoppingCart/index.vue
index 36f2a7e..8404e51 100644
--- a/pages/shop/ShoppingCart/index.vue
+++ b/pages/shop/ShoppingCart/index.vue
@@ -17,19 +17,13 @@
购物数量
{{ count }}
- {{ footerswitch ? '取消' : '管理' }}
+
+ {{ footerswitch ? '取消' : '管理' }}
-
+
@@ -46,31 +40,19 @@
{{ item.productInfo.storeName }}
- 属性:{{ item.productInfo.attrInfo.sku }}
+ 属性:{{ item.productInfo.attrInfo.sku }}
¥{{ item.truePrice }}
- -
+ -
{{ item.cartNum }}
- +
- +
+ +
+ @click.prevent="plus(cartListValidIndex)">+
@@ -78,25 +60,15 @@
- 失效商品
+ 失效商品
清空
-
-
+
+
失效
@@ -104,10 +76,8 @@
{{ item.productInfo.storeName }}
- 属性:{{ item.productInfo.attrInfo.sku }}
+ 属性:{{ item.productInfo.attrInfo.sku }}
+
该商品已下架
@@ -160,77 +130,96 @@
-
+
diff --git a/pages/shop/StoreList/index.vue b/pages/shop/StoreList/index.vue
index e5f6c78..434a77f 100644
--- a/pages/shop/StoreList/index.vue
+++ b/pages/shop/StoreList/index.vue
@@ -16,7 +16,7 @@
-
+
@@ -35,7 +35,7 @@
diff --git a/pages/user/PersonalData/index.vue b/pages/user/PersonalData/index.vue
index 65d8a3e..b8d4416 100644
--- a/pages/user/PersonalData/index.vue
+++ b/pages/user/PersonalData/index.vue
@@ -43,20 +43,23 @@
-
+ -->
保存修改
+
退出登录
+
diff --git a/pages/user/User/index.vue b/pages/user/User/index.vue
index fcde74a..32402eb 100644
--- a/pages/user/User/index.vue
+++ b/pages/user/User/index.vue
@@ -18,14 +18,17 @@
ID:{{ userInfo.uid || 0}}
-
@@ -36,11 +39,7 @@
我的余额
{{ userInfo.nowMoney || 0 }}
-
+
当前佣金
{{ userInfo.brokeragePrice || 0 }}
@@ -65,50 +64,40 @@
- {{ userInfo.orderStatusNum.unpaidCount }}
+ {{ userInfo.orderStatusNum.unpaidCount }}
待付款
- {{ userInfo.orderStatusNum.unshippedCount }}
+ {{ userInfo.orderStatusNum.unshippedCount }}
待发货
- {{ userInfo.orderStatusNum.receivedCount }}
+ {{ userInfo.orderStatusNum.receivedCount }}
待收货
- {{ userInfo.orderStatusNum.evaluatedCount }}
+ {{ userInfo.orderStatusNum.evaluatedCount }}
待评价
- {{ userInfo.orderStatusNum.refundCount }}
+ {{ userInfo.orderStatusNum.refundCount }}
售后/退款
@@ -144,262 +133,279 @@
:login_type="userInfo.login_type"
>-->
-
+
diff --git a/pages/user/UserAccount/index.vue b/pages/user/UserAccount/index.vue
index 9000191..0b6cfbc 100644
--- a/pages/user/UserAccount/index.vue
+++ b/pages/user/UserAccount/index.vue
@@ -8,7 +8,7 @@
总资产(元)
{{ now_money }}
-
+ 充值
@@ -31,12 +31,12 @@
消费记录
-
+
@@ -54,6 +54,7 @@ export default {
props: {},
data: function() {
return {
+ is_hide: "1",
now_money: 0,
orderStatusSum: 0,
recharge: 0,
@@ -82,6 +83,7 @@ export default {
that.now_money = res.data.now_money;
that.orderStatusSum = res.data.orderStatusSum;
that.recharge = res.data.recharge;
+ this.is_hide = res.data.is_hide;
},
err => {
uni.showToast({
diff --git a/pages/user/address/AddAddress/index.vue b/pages/user/address/AddAddress/index.vue
index 06c97eb..394a268 100644
--- a/pages/user/address/AddAddress/index.vue
+++ b/pages/user/address/AddAddress/index.vue
@@ -13,12 +13,7 @@
所在地区
-
+
@@ -47,7 +42,7 @@
diff --git a/pages/user/promotion/Poster/index.vue b/pages/user/promotion/Poster/index.vue
index 81ec453..b27c54c 100644
--- a/pages/user/promotion/Poster/index.vue
+++ b/pages/user/promotion/Poster/index.vue
@@ -4,12 +4,7 @@
-
+
@@ -18,143 +13,143 @@
-
diff --git a/pages/user/promotion/UserCash/index.vue b/pages/user/promotion/UserCash/index.vue
index 9b641f4..c9d1169 100644
--- a/pages/user/promotion/UserCash/index.vue
+++ b/pages/user/promotion/UserCash/index.vue
@@ -1,17 +1,20 @@
-
-
+
+
+
+
+ {{item.name}}
+
+
@@ -55,158 +58,198 @@
+
diff --git a/pages/user/promotion/UserPromotion/index.vue b/pages/user/promotion/UserPromotion/index.vue
index d228770..fd7cb9a 100644
--- a/pages/user/promotion/UserPromotion/index.vue
+++ b/pages/user/promotion/UserPromotion/index.vue
@@ -20,7 +20,6 @@
-
diff --git a/static/images/logo_bg.png b/static/images/logo_bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..636f1c12ee8776ff06453dc43b549047a20491fa
GIT binary patch
literal 7966
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