diff --git a/pages.json b/pages.json
index 8fe10ee..b23f753 100644
--- a/pages.json
+++ b/pages.json
@@ -1,16 +1,6 @@
{
"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
{
- "path": "pages/goods/goods-list/goods-list",
- "style": {
- "navigationBarBackgroundColor": "#0083f5",
- "backgroundColorTop": "#0083f5",
- "navigationBarTextStyle": "white",
- "app-plus": {
- "bounce": "none"
- }
- }
- },{
"path": "pages/tabBar/home/home",
"style": {
"navigationBarTextStyle": "black",
@@ -80,8 +70,17 @@
}
},
-
-
+ {
+ "path": "pages/goods/goods-list/goods-list",
+ "style": {
+ "navigationBarBackgroundColor": "#0083f5",
+ "backgroundColorTop": "#0083f5",
+ "navigationBarTextStyle": "white",
+ "app-plus": {
+ "bounce": "none"
+ }
+ }
+ },
{
"path": "pages/goods/store-list/store-list",
"style": {
@@ -419,34 +418,29 @@
"backgroundColorBottom": "#ffffff"
}
- },{
- "path" : "pages/user/positioning/positioning",
- "style" :
- {
- "navigationBarTitleText": "地区选择",
- "enablePullDownRefresh": false
- }
-
+ }, {
+ "path": "pages/user/positioning/positioning",
+ "style": {
+ "navigationBarTitleText": "地区选择",
+ "enablePullDownRefresh": false
+ }
+
+ }, {
+ "path": "pages/tabBar/order/order",
+ "style": {
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": false
+ }
+
+ }, {
+ "path": "pages/qianZhuPay/qianZhuPay",
+ "style": {
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": false
+ }
+
}
- ,{
- "path" : "pages/tabBar/order/order",
- "style" :
- {
- "navigationBarTitleText": "",
- "enablePullDownRefresh": false
- }
-
- }
- ,{
- "path" : "pages/qianZhuPay/qianZhuPay",
- "style" :
- {
- "navigationBarTitleText": "",
- "enablePullDownRefresh": false
- }
-
- }
- ],
+ ],
"globalStyle": {
"navigationBarTextStyle": "black",
diff --git a/pages/goods/goods-list/goods-list.vue b/pages/goods/goods-list/goods-list.vue
index a4375c8..f937441 100644
--- a/pages/goods/goods-list/goods-list.vue
+++ b/pages/goods/goods-list/goods-list.vue
@@ -19,8 +19,92 @@
-
-
+
+
+
+ 报税区直发发生的发生山东省丰盛的但是
+ 限购5件
+
+
+
+
+ 200
+
+
+
+
+ 100
+
+
+
+
+
+
+
+
+ 报税区直发发生的发生山东省丰盛的但是
+ 限购5件
+
+
+
+
+ 200
+
+
+
+
+ 100
+
+
+
+
+
+
+
+
+ 报税区直发发生的发生山东省丰盛的但是
+ 限购5件
+
+
+
+
+ 200
+
+
+
+
+ 100
+
+
+
+
+
+
+
+
+ 报税区直发发生的发生山东省丰盛的但是
+ 限购5件
+
+
+
+
+ 200
+
+
+
+
+ 100
+
+
+
@@ -112,7 +196,7 @@
display: flex;
justify-content: center;
margin-top: 20px;
-
+ margin-bottom: 20px;
.swiper-box {
width: 92%;
height: 150px;
@@ -160,7 +244,40 @@
}
.goodsimg {
- width: 80px;
- height: 80px;
+ width: 90px;
+ height: 90px;
+ }
+
+ .goodsli {
+ margin-left: 100px;
+ padding-top: 5px;
+ }
+
+ .goodsxg {
+ margin-top: 5px;
+ border: 1px solid #eb5823;
+ border-radius: 5px;
+ color: #eb5823;
+ width: 50px;
+ }
+ .info {
+ display: flex;
+ justify-content: space-between;
+ align-items: flex-end;
+ width: 100%;
+
+ .price {
+ color: #e65339;
+ font-size: 30upx;
+ font-weight: 600;
+ width: 50%;
+ }
+
+ .slogan {
+ width: 50%;
+ color: #807c87;
+ font-size: 24upx;
+ text-decoration: line-through;
+ }
}
diff --git a/pages/goods/goods.vue b/pages/goods/goods.vue
index 6b8f420..a871ed5 100644
--- a/pages/goods/goods.vue
+++ b/pages/goods/goods.vue
@@ -29,9 +29,32 @@
{{currentSwiper+1}}/{{swiperList.length}}
+
+
+ ￥{{goodsData[0].discountPrice}}
+ 门市参考价: ￥{{goodsData[0].salesPrice}}
+
+
+
+
+ {{goodsData[0].discountPrice}}
+
+ 门市参考价:
+ {{goodsData[0].salesPrice}}
+
+
+ 限购200件
+
+
+
- ￥{{goodsData[0].discountPrice}} ￥{{goodsData[0].discountPrice}} ￥{{goodsData[0].salesPrice}}
@@ -46,12 +69,13 @@
src="data:image/png;base64,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">
{{goodsData[0].salesPrice*100}}
-
-
+ -->
+
{{goodsData[0].couponName}}
-
- 库存 : {{goodsData[0].stockCount}}件
+
+ 有效期至: 2020-02-02
+ 库存 : {{goodsData[0].stockCount}}件
@@ -262,59 +286,59 @@
// });
let that = this;
// wx.login({
- // success(res) {
- // if (res.code) {
- //发起网络请求
- // var code = res.code;
- // 获取微信用户信息
- uni.getUserProfile({
- desc: '登录中...',
- success: function(res) {
- let params = {
- openId: app.globalData.openId,
- iv: res.iv,
- encryptedData: res.encryptedData
- }
- getUserInfo(params).then(res => {
- if (res.return_code == '000000') {
- uni.hideLoading();
- that.user = res.return_data.object.highUser;
- app.globalData.userInfo = res
- .return_data
- .object
- .highUser;
- app.globalData.token = res
- .return_data.uniqueCode;
- uni.setStorage({
- key: "user",
- data: res.return_data
- .object
- .highUser
- })
- uni.setStorage({
- key: "token",
- data: res.return_data
- .uniqueCode
- })
- that.buy();
- } else {
- uni.hideLoading();
- uni.showToast({
- title: res.return_msg,
- icon: 'none',
- duration: 2000
- })
- }
- });
- },
- fail: res => {
- uni.hideLoading();
- uni.showToast({
- title: "微信登录授权失败",
- icon: "none"
- });
- }
- })
+ // success(res) {
+ // if (res.code) {
+ //发起网络请求
+ // var code = res.code;
+ // 获取微信用户信息
+ uni.getUserProfile({
+ desc: '登录中...',
+ success: function(res) {
+ let params = {
+ openId: app.globalData.openId,
+ iv: res.iv,
+ encryptedData: res.encryptedData
+ }
+ getUserInfo(params).then(res => {
+ if (res.return_code == '000000') {
+ uni.hideLoading();
+ that.user = res.return_data.object.highUser;
+ app.globalData.userInfo = res
+ .return_data
+ .object
+ .highUser;
+ app.globalData.token = res
+ .return_data.uniqueCode;
+ uni.setStorage({
+ key: "user",
+ data: res.return_data
+ .object
+ .highUser
+ })
+ uni.setStorage({
+ key: "token",
+ data: res.return_data
+ .uniqueCode
+ })
+ that.buy();
+ } else {
+ uni.hideLoading();
+ uni.showToast({
+ title: res.return_msg,
+ icon: 'none',
+ duration: 2000
+ })
+ }
+ });
+ },
+ fail: res => {
+ uni.hideLoading();
+ uni.showToast({
+ title: "微信登录授权失败",
+ icon: "none"
+ });
+ }
+ })
// } else {
// uni.showToast({
// title: "微信登录授权失败",
@@ -509,6 +533,21 @@
}
}
+ .xgnum {
+ background-color: #FFFFFF;
+ color: #ff722e;
+ height: 30px;
+ line-height: 30px;
+ font-size: 13px;
+ width: 60%;
+ padding-left: 5%;
+ padding-right: 5%;
+ border-radius: 15px;
+ margin-top: 15px;
+ text-align: center;
+ font-weight: 600;
+ }
+
@keyframes showPopup {
0% {
opacity: 0;
@@ -694,36 +733,6 @@
}
}
- // .swiper-box {
- // position: relative;
- // width: 100%;
-
- // swiper {
- // width: 100%;
-
- // swiper-item {
- // image {
- // width: 100%;
- // height: 100vw;
- // }
- // }
- // }
-
- // .indicator {
- // display: flex;
- // justify-content: center;
- // align-items: center;
- // padding: 0 25upx;
- // height: 40upx;
- // border-radius: 40upx;
- // font-size: 22upx;
- // position: absolute;
- // bottom: 20upx;
- // right: 20upx;
- // color: #fff;
- // background-color: rgba(0, 0, 0, 0.2);
- // }
- // }
.swiper-box {
position: relative;
width: 100%;
@@ -759,9 +768,9 @@
.info-box {
width: 92%;
- padding: 20upx 4%;
- background-color: #fff;
- margin-bottom: 20upx;
+ padding: 4%;
+ background-color: #fff;
+ margin-bottom: 20rpx;
}
.goods-info {
@@ -1260,4 +1269,4 @@
}
}
-
+
diff --git a/uni.scss b/uni.scss
index 70437a8..52ece5f 100644
--- a/uni.scss
+++ b/uni.scss
@@ -230,6 +230,11 @@ $uni-font-size-paragraph:30upx;
background-color: #f6f6f6;
}
+//渐变
+.backcorlr{
+ background: linear-gradient(to right, #fe1a1a, #ff722e);
+}
+
.backcor9 {
background-color: #f6f6f6;
}
@@ -364,6 +369,10 @@ $uni-font-size-paragraph:30upx;
height: 100px;
}
+.height110 {
+ height: 110px;
+}
+
.height120{
height: 120px;
}
@@ -513,6 +522,10 @@ $uni-font-size-paragraph:30upx;
padding-top: 25px;
}
+.paddleft5 {
+ padding-left: 5px;
+}
+
.paddleft10 {
padding-left: 10px;
}