diff --git a/app.js b/app.js
index 3b9ca60..2127815 100644
--- a/app.js
+++ b/app.js
@@ -21,7 +21,7 @@ App({
unique_key: "wechatxcx"
}).then(res => {
let data = JSON.parse(res.data);
- data.isTest = data.isTest92? true : false;
+ data.isTest = data.isTest94? true : false;
this.globalData.configJson = data
}).then(() => {
// 获取ui配置文件
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index b5e372f..36d7b71 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -288,6 +288,10 @@
景区舒适度
-->
+
+
+ 安全服务
+
@@ -298,19 +302,20 @@
行李寄存
-
+
+ 实时路况
+
+
+
-
+
-
+
- {{item.supplier_name}}
-
- {{item}}
+ {{item.shop_name}}
+
+
+ {{item}}
+
+ {{item.start_price/100}}
+
+
+
+ {{item.address}}
+ 进店看看
+
- {{item.address}}
- {{item.start_price/100}}
-
-
- {{item.title}}
+
+
+ {{goods.title}}
- {{item.price/100}}
- ￥{{item.market_price/100}}
+ {{goods.price/100}}
+ ￥{{goods.market_price/100}}
-
+
diff --git a/pages/list/feiyi/index.wxss b/pages/list/feiyi/index.wxss
index 3fe4b0d..7930846 100644
--- a/pages/list/feiyi/index.wxss
+++ b/pages/list/feiyi/index.wxss
@@ -35,6 +35,7 @@ page {
object-fit: cover;
}
.store-main-info {
+ height: 136rpx;
flex:1;
font-size: 34rpx;
}
@@ -68,12 +69,11 @@ page {
.store-main-price {
font-size: 44rpx;
color: #f9e498;
- margin-left: 20rpx;
}
.store-main-price:after {
content: "起";
font-size: 24rpx;
- margin-left: 20rpx;
+ margin-left:8rpx;
}
.store-product-list {
display: flex;
@@ -119,4 +119,28 @@ page {
font-size: 24rpx;
color: #ccc;
text-decoration: line-through;
+}
+
+.shopbtn{
+width: 120rpx;
+height: 33rpx;
+background: #C7A668;
+border-radius: 16rpx;
+font-size: 23rpx;
+font-family: PingFang SC;
+font-weight: bold;
+color: #1D3256;
+line-height: 33rpx;
+text-align: center;
+}
+.mid-box{
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+}
+.bottom-box{
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+
}
\ No newline at end of file
diff --git a/pages/list/techan/index.js b/pages/list/techan/index.js
index 607990a..aceba4c 100644
--- a/pages/list/techan/index.js
+++ b/pages/list/techan/index.js
@@ -27,7 +27,12 @@ Page({
})
this.getList();
},
- gotoDetail:function(e){
+ goodsDetail(e){
+ wx.navigateTo({
+ url: '/pages/info/postProductInfo/index?id='+e.currentTarget.dataset.goods.id,
+ })
+ },
+ goShop(e){
let id = e.currentTarget.dataset.id;
util.pagePoint({
event: 'legacy_shop',
@@ -37,7 +42,7 @@ Page({
type:'supplier'
},1)
wx.navigateTo({
- url: '../store/index?type=specialty_detail&id='+id,
+ url: '/pages/list/store/index?id='+id,
})
},
gotoProduct:function(e){
diff --git a/pages/list/techan/index.wxml b/pages/list/techan/index.wxml
index 5ba68e6..f1338c0 100644
--- a/pages/list/techan/index.wxml
+++ b/pages/list/techan/index.wxml
@@ -9,20 +9,28 @@
文创
-
-
+
+
{{item.shop_name}}
-
+
+
{{item}}
- {{item.address}}
-
￥{{(item.start_price/100)}}起
+
+
+ {{item.address}}
+
+ 进店看看
+
+
+
+
-
+
{{item.title}}
￥{{(item.price/100)}}{{item.market_price/100}}
diff --git a/pages/list/techan/index.wxss b/pages/list/techan/index.wxss
index 7377ecc..d9c7fc7 100644
--- a/pages/list/techan/index.wxss
+++ b/pages/list/techan/index.wxss
@@ -58,7 +58,7 @@ page {
display: flex;
flex-direction: column;
height: 136rpx;
- justify-content: space-around;
+ justify-content:space-between;
flex: 1;
width: 300rpx;
}
@@ -116,4 +116,28 @@ page {
font-size: 24rpx;
margin-left: 10rpx;
text-decoration: line-through;
+}
+.mid-box{
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+}
+.bottom-box{
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+}
+.btn{
+width: 120rpx;
+flex-shrink: 0;
+height: 33rpx;
+background: #C6937F;
+border-radius: 16rpx;
+line-height: 33rpx;
+text-align: center;
+
+font-size: 23rpx;
+font-family: PingFang SC;
+font-weight: 500;
+color: #FDF6E8;
}
\ No newline at end of file
diff --git a/pages/order/road/index.js b/pages/order/road/index.js
index 12379be..1446a15 100644
--- a/pages/order/road/index.js
+++ b/pages/order/road/index.js
@@ -40,7 +40,9 @@ Page({
res.data.sku = [sku];
}
res.data.sku.map(item=>{
- nums.push(0)
+ console.log(item);
+ item.stock>0?nums.push(1):nums.push(0)
+
})
for(let i=0;i
注销账号
+ 注销后账号无法恢复，请谨慎操作
diff --git a/project.private.config.json b/project.private.config.json
index eedf488..8749612 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -60,6 +60,13 @@
"pathName": "pages/pbService/group/index",
"query": "",
"scene": null
+ },
+ {
+ "name": "",
+ "pathName": "pages/supplier/index",
+ "query": "",
+ "launchMode": "default",
+ "scene": null
}
]
}