diff --git a/App.vue b/App.vue
index 910d5d8..7f21450 100644
--- a/App.vue
+++ b/App.vue
@@ -5,15 +5,15 @@
// brestUrl: 'http://192.168.3.4:9302/brest',
// imgUrl: 'https://192.168.3.4:9301/filesystem/',
//正式
- url: 'https://hsg.dctpay.com/crest',
- imgUrl: 'https://hsg.dctpay.com/filesystem/',
- brestUrl: 'https://hsg.dctpay.com/brest',
- imageWxImg: 'https://hsg.dctpay.com/filesystem/wxApplets/',
+ // url: 'https://hsg.dctpay.com/crest',
+ // imgUrl: 'https://hsg.dctpay.com/filesystem/',
+ // brestUrl: 'https://hsg.dctpay.com/brest',
+ // imageWxImg: 'https://hsg.dctpay.com/filesystem/wxApplets/',
//测试
- // url: 'https://hsgcs.dctpay.com/crest',
- // brestUrl: 'https://hsgcs.dctpay.com/brest',
- // imgUrl: 'https://hsgcs.dctpay.com/filesystem/',
- // imageWxImg: 'https://hsgcs.dctpay.com/filesystem/wxApplets/',
+ url: 'https://hsgcs.dctpay.com/crest',
+ brestUrl: 'https://hsgcs.dctpay.com/brest',
+ imgUrl: 'https://hsgcs.dctpay.com/filesystem/',
+ imageWxImg: 'https://hsgcs.dctpay.com/filesystem/wxApplets/',
userInfo: "",
brestUserInfo: '',
bresthighAgent: '',
diff --git a/pages.json b/pages.json
index acedf1c..19f70be 100644
--- a/pages.json
+++ b/pages.json
@@ -1,20 +1,20 @@
{
"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
- {
- "path": "pages/user/news/news",
- "style": {
- "navigationBarTitleText": "消息",
- "enablePullDownRefresh": false
- }
-
- }, {
+ {
"path": "pages/welcome/welcome",
"style": {
"navigationBarTitleText": "",
"enablePullDownRefresh": false
}
- }, {
+ },{
+ "path": "pages/user/news/news",
+ "style": {
+ "navigationBarTitleText": "消息",
+ "enablePullDownRefresh": false
+ }
+
+ },{
"path": "pages/tabBar/home/home",
"style": {
"navigationBarTextStyle": "white",
@@ -234,9 +234,9 @@
"path": "pages/user/coupon/coupon",
"style": {
"navigationBarTitleText": "优惠券",
- "navigationBarBackgroundColor": "#0083f5",
- "backgroundColorTop": "#0083f5",
- "navigationBarTextStyle": "white",
+ "navigationBarBackgroundColor": "#ffffff",
+ "backgroundColorTop": "#f3f3f3",
+ "backgroundColorBottom": "#ffffff",
"app-plus": {
"bounce": "none"
}
diff --git a/pages/goods/goods-list/goods-list.vue b/pages/goods/goods-list/goods-list.vue
index ff9061e..3da3e72 100644
--- a/pages/goods/goods-list/goods-list.vue
+++ b/pages/goods/goods-list/goods-list.vue
@@ -20,34 +20,35 @@
- {{item.title}}
+
+ {{item.title}}
-
-
-
- {{row.couponName}}
+
+
+
+ {{row.couponName}}
限购{{row.limitNumber}}件
-
-
+
+
+
+ ￥{{ row.discountPrice}}
-
-
+
+
+ ￥{{ row.salesPrice}}
@@ -98,9 +99,9 @@
onLoad: function(option) { //option为object类型，会序列化上个页面传递的参数
this.typeId = option.id;
this.brandid = option.brandId;
- this.goodtyid = option.goodsId;
- if(this.goodtyid == undefined){
- this.goodtyid = '';
+ this.goodtyid = option.goodsId;
+ if (this.goodtyid == undefined) {
+ this.goodtyid = '';
}
if (option.id == 1) {
uni.setNavigationBarTitle({
@@ -115,8 +116,8 @@
});
if (app.globalData.cityName == '贵州省') {
this.getListGoodsType();
- }else{
- this.getCouponListArea();
+ } else {
+ this.getCouponListArea();
}
this.getCmsContent('CMS_WX_APPLETS_GOODS_LIST');
}
@@ -126,8 +127,8 @@
});
if (app.globalData.cityName == '贵州省') {
this.getListGoodsType();
- }else{
- this.getCouponListArea();
+ } else {
+ this.getCouponListArea();
}
this.getCmsContent('CMS_WX_APPLETS_GOODS_LIST');
}
@@ -164,24 +165,24 @@
getListGoodsType(params).then(res => {
uni.hideLoading();
if (res.return_code == '000000') {
- this.cateTypeList = res.return_data.list;
- this.goodtyid = res.return_data.list[0].id;
- if (app.globalData.cityName == '贵州省') {
- this.getCouponListArea();
+ this.cateTypeList = res.return_data.list;
+ this.goodtyid = res.return_data.list[0].id;
+ if (app.globalData.cityName == '贵州省') {
+ this.getCouponListArea();
}
} else {
this.cateTypeList = [];
}
})
- },
- //切换id
- switchid(item){
- this.goodtyid = item.id;
- this.pageNum = 1;
- this.pageSize = 10;
- this.isNoMoreData = false;
- this.goodsList = [];
- this.getCouponListArea();
+ },
+ //切换id
+ switchid(item) {
+ this.goodtyid = item.id;
+ this.pageNum = 1;
+ this.pageSize = 10;
+ this.isNoMoreData = false;
+ this.goodsList = [];
+ this.getCouponListArea();
},
//获取弹出或者弹窗
getCmsContent(item) {
@@ -285,7 +286,10 @@
}
-
diff --git a/pages/goods/goods.vue b/pages/goods/goods.vue
index ac3e8de..66b9fad 100644
--- a/pages/goods/goods.vue
+++ b/pages/goods/goods.vue
@@ -29,14 +29,18 @@
{{currentSwiper+1}}/{{swiperList.length}}
-
-
- ￥{{goodsData[0].discountPrice}}
- 门市参考价:
+
+
+
+ ￥{{goodsData[0].discountPrice}}
+
+ 价格: ￥{{goodsData[0].salesPrice}}
+
+
-
+
+
限购{{goodsData[0].limitNumber}}件
-
-
+
+
+ 购买返积分
+
+
+
{{goodsData[0].couponName}}
-
+
+
+ 嗨森逛
+
+ 月销 500
@@ -69,17 +82,17 @@
点击去选择门店
{{storeName}}
-
+
-
+
———— 商品详情 ————
@@ -97,7 +110,8 @@
{{ product.highCouponModel.couponName }}
- 有效期至：{{product.highCouponModel.salesEndTime | formatDate('-')}}
+ 有效期至：{{product.highCouponModel.salesEndTime | formatDate('-')}}
+
￥{{ product.highCouponModel.discountPrice}}
-
+
待使用
已使用
已过期
+
+
+ {{item}}
+
@@ -17,11 +22,21 @@
-
- {{row.highDiscount.discountName}}
+
+
+
+
+ 折扣券
+
+
+
+ 话费券
+ {{row.highDiscount.discountName}}
- 截止时间:{{row.useEndTime | formatDate('-')}}
+ 有效期:{{row.useEndTime | formatDate('-')}}
@@ -148,7 +163,9 @@
pageSize: 10,
isNoMoreData: false,
loadingText: '',
- couponcout: 0
+ couponcout: 0,
+ orderTyplist: ['全部订单', '在线加油', '肯德基', '星巴克', '话费充值', '卡券订单'], //消息类型
+ ordertypeid: 1 //类型id
}
},
onPageScroll(e) {
@@ -248,21 +265,21 @@
uni.navigateTo({
url: '../../../subPages/recharge/recharge'
})
- } else if (e.highDiscount.useScope == 4) {
+ } else if (e.highDiscount.useScope == 4) {
app.globalData.distinguishid = 1;
uni.navigateTo({
url: '/qianzhu-KFC/buffet-order/buffet-order'
})
- } else if (e.highDiscount.useScope == 5) {
+ } else if (e.highDiscount.useScope == 5) {
app.globalData.distinguishid = 2;
uni.navigateTo({
- url: '/qianzhu-KFC/buffet-order/buffet-order'
+ url: '/qianzhu-KFC/buffet-order/buffet-order'
})
} else if (e.highDiscount.useScope == 6) {
uni.navigateTo({
url: '/member-Recharge/choicepage/choicepage'
})
- } else{
+ } else {
uni.navigateTo({
url: '../mineCouponsDestails/mineCouponsDestails?id=' + e.id
})
@@ -311,6 +328,44 @@
}
+ .srollview {
+ position: fixed;
+ z-index: 9999;
+ top: 45px;
+ height: 60px;
+ background-color: #ffffff;
+ display: flex;
+ flex-direction: row;
+ flex-wrap: nowrap;
+ white-space: nowrap;
+
+ .conent {
+ height: 24px;
+ line-height: 24px;
+ margin-top: 15px;
+ padding-left: 10px;
+ font-size: 10px;
+ padding-right: 10px;
+ border-radius: 20px;
+ margin-left: 15px;
+ display: inline-flex;
+ flex-direction: column;
+ text-align: center;
+ position: relative;
+ }
+ }
+
+
+ .frontconent {
+ background-color: #eeeeee;
+ color: #333333;
+ }
+
+ .activeconent {
+ background-color: #e8eff4;
+ color: #009DFF;
+ }
+
page {
position: relative;
background-color: #f5f5f5;
@@ -322,7 +377,7 @@
.place {
width: 100%;
- height: 95upx;
+ height: 110px;
}
.tabr {
@@ -423,7 +478,7 @@
.row {
width: 92%;
- height: 24vw;
+ height: 27vw;
margin: 20upx auto 10upx auto;
border-radius: 8upx;
// box-shadow: 0upx 0 10upx rgba(0,0,0,0.1);
@@ -491,7 +546,6 @@
width: 100%;
.title {
- padding-top: 3vw;
width: 90%;
margin: 0 5%;
font-size: 36upx;
diff --git a/pages/user/news/news.vue b/pages/user/news/news.vue
index c77240b..c089abc 100644
--- a/pages/user/news/news.vue
+++ b/pages/user/news/news.vue
@@ -5,9 +5,9 @@
{{item}}
-
+
-
+
服务通知
@@ -76,8 +76,10 @@
background-color: #f3f3f3;
}
- .srollview {
- height: 70px;
+ .srollview {
+ position: fixed;
+ top: 0px;
+ height: 70px;
background-color: #ffffff;
display: flex;
flex-direction: row;
@@ -89,9 +91,9 @@
line-height: 24px;
margin-top: 15px;
padding-left: 10px;
- font-size: 12px;
- padding-right: 10px;
- margin-left: 10px;
+ font-size: 11px;
+ padding-right: 10px;
+ margin-left: 15px;
display: inline-flex;
flex-direction: column;
text-align: center;
@@ -99,9 +101,8 @@
}
}
-
.frontconent {
- background-color: #ffffff;
+ background-color: #eeeeee;
color: #333333;
}
diff --git a/static/img/user/user15.png b/static/img/user/user15.png
new file mode 100644
index 0000000..2b5bfd6
Binary files /dev/null and b/static/img/user/user15.png differ
diff --git a/static/img/user/user16.png b/static/img/user/user16.png
new file mode 100644
index 0000000..db75cc8
Binary files /dev/null and b/static/img/user/user16.png differ
diff --git a/uni.scss b/uni.scss
index b14cbb6..a5f8b08 100644
--- a/uni.scss
+++ b/uni.scss
@@ -384,6 +384,10 @@ $uni-font-size-paragraph:30upx;
.width60 {
width: 60%
+}
+
+.width65 {
+ width: 65%
}
.width60w {