@@ -148,6 +158,7 @@
import GoodList from '@/components/GoodList';
import PromotionGood from '@/components/PromotionGood';
import CouponWindow from '@/components/CouponWindow';
+ import uniNoticeBar from '@/components/uni-notice-bar/uni-notice-bar.vue'
import {
getHomeData,
getShare
@@ -165,6 +176,7 @@
components: {
// swiper,
// swiperSlide,
+ uniNoticeBar,
GoodList,
PromotionGood,
CouponWindow
@@ -246,6 +258,11 @@
}
};
},
+ computed:{
+ singNew() {
+ return this.roll.length > 0 ? this.roll[0] : "你还没添加通知哦！";
+ }
+ },
onShow: function() {
this.getLocation()
let that = this;
diff --git a/pages/order/MyOrder/index.vue b/pages/order/MyOrder/index.vue
index 956e9a3..457bf3d 100644
--- a/pages/order/MyOrder/index.vue
+++ b/pages/order/MyOrder/index.vue
@@ -4,11 +4,7 @@
订单信息
-
- 累计订单：{{ orderData.orderCount || 0 }} 总消费：￥{{
- orderData.sumPrice || 0
- }}
-
+ 累计订单：{{ orderData.orderCount || 0 }} 总消费：￥{{orderData.sumPrice || 0 }}
@@ -45,7 +41,7 @@
秒杀
砍价
门店
- {{ dataFormat(order.addTime) }}
+ {{ order.createTime }}
{{ getStatus(order) }}
diff --git a/pages/order/OrderDetails/index.vue b/pages/order/OrderDetails/index.vue
index f9bc7d4..a702f58 100644
--- a/pages/order/OrderDetails/index.vue
+++ b/pages/order/OrderDetails/index.vue
@@ -5,7 +5,7 @@
{{ orderInfo._status._msg }}
-
+ {{ orderInfo.createTime }}
diff --git a/pages/order/OrderSubmission/index.vue b/pages/order/OrderSubmission/index.vue
index 88c2090..75c0336 100644
--- a/pages/order/OrderSubmission/index.vue
+++ b/pages/order/OrderSubmission/index.vue
@@ -12,7 +12,7 @@
class="item font-color-red"
:class="shipping_type === 1 ? 'on' : 'on2'"
@click="addressType(1)"
- v-if="storeSelfMention"
+ v-if="systemStore"
>
{
uni.hideLoading();
uni.showToast({
- title: err.response.data.msg || "创建订单失败",
+ title:
+ err.msg ||
+ err.response.data.msg ||
+ err.response.data.message ||
+ "创建订单失败",
icon: "none",
duration: 2000
});
diff --git a/pages/shop/GoodsCollection/index.vue b/pages/shop/GoodsCollection/index.vue
index d70f61b..3d432a0 100644
--- a/pages/shop/GoodsCollection/index.vue
+++ b/pages/shop/GoodsCollection/index.vue
@@ -14,7 +14,7 @@
{{ item.storeName }}
￥{{ item.price }}
- 删除
+ 删除
@@ -86,7 +86,7 @@ export default {
category = that.collectProductList[index].category;
getCollectDel(id, category).then(function() {
uni.showToast({
- title: "添加购物车成功",
+ title: "删除成功",
icon: "success",
duration: 2000,
complete: () => {
diff --git a/pages/user/Recharge/index.vue b/pages/user/Recharge/index.vue
index a0d4e5c..3aa036d 100644
--- a/pages/user/Recharge/index.vue
+++ b/pages/user/Recharge/index.vue
@@ -24,13 +24,13 @@
>
- {{ item.price }}
+ {{ item.value.price }}
元
-
赠送：{{ item.give_price }} 元
+
赠送：{{ item.value.give_price }} 元
-
@@ -40,7 +40,7 @@
v-model="money"
class="pic-box-money pic-number-pic"
/>
-
+ -->
提示：充值后帐户的金额不能提现
立即充值
@@ -84,8 +84,8 @@ export default {
.then(res => {
this.picList = res.data.recharge_price_ways || [];
if (this.picList[0]) {
- this.paid_price = this.picList[0].price;
- this.numberPic = this.picList[0].give_price;
+ this.paid_price = this.picList[0].value.price;
+ this.numberPic = this.picList[0].value.give_price;
}
})
.catch(res => {
@@ -107,8 +107,8 @@ export default {
this.numberPic = "";
} else {
this.money = "";
- this.paid_price = item.give_price;
- this.numberPic = item.price;
+ this.paid_price = item.value.give_price;
+ this.numberPic = item.value.price;
}
},
recharge: function() {
diff --git a/pages/user/User/index.vue b/pages/user/User/index.vue
index 9fb8849..7399541 100644
--- a/pages/user/User/index.vue
+++ b/pages/user/User/index.vue
@@ -313,6 +313,14 @@ export default {
});
return;
}
+ if (url === "/pages/orderAdmin/OrderCancellation/index" && !this.userInfo.checkStatus) {
+ uni.showToast({
+ title: "您没有核销权限,请后台店员设置！！",
+ icon: "none",
+ duration: 2000
+ });
+ return;
+ }
this.$yrouter.push({
path: this.MyMenus[index].uniapp_url
diff --git a/pages/user/UserAccount/index.vue b/pages/user/UserAccount/index.vue
index 9000191..1164f37 100644
--- a/pages/user/UserAccount/index.vue
+++ b/pages/user/UserAccount/index.vue
@@ -8,7 +8,7 @@
总资产(元)
{{ now_money }}
-
+
充值
diff --git a/pages/user/address/AddAddress/index.vue b/pages/user/address/AddAddress/index.vue
index dc0561e..2127698 100644
--- a/pages/user/address/AddAddress/index.vue
+++ b/pages/user/address/AddAddress/index.vue
@@ -177,7 +177,8 @@ export default {
this.address = {
province: values.province.name || "",
city: values.city.name || "",
- district: values.district.name || ""
+ district: values.district.name || "",
+ city_id: values.city.id
};
this.addressText = `${this.address.province}${this.address.city}${this.address.district}`;
// this.addressText =
diff --git a/pages/user/coupon/GetCoupon/index.vue b/pages/user/coupon/GetCoupon/index.vue
index 297ce3a..b2ec070 100644
--- a/pages/user/coupon/GetCoupon/index.vue
+++ b/pages/user/coupon/GetCoupon/index.vue
@@ -1,30 +1,35 @@
-
-
+
-
- ￥
- {{ item.couponPrice }}
-
-
- 购物满{{ item.useMinPrice }}元可用
-
-
- -
-
-
- 不限时
- 已领取
- 已领完
- 立即领取
-
-
-
-
+
+
+ ￥
+ {{ item.couponPrice }}
+
+
满{{ item.useMinPrice }}元可用
+
+
+
+ 通用劵
+ 商品券
+ 未知
+ {{ item.cname }}
+
+
+
{{ item.startTime }}-{{ item.endTime }}
+
不限时
+
已领取
+
已领完
+
立即领取
+
+
+