Skip to content

M
mayi-mp-shop
Commit 618f414f by 李嘉林
Options

首页ui验收

parent cbffddcf
Showing with 195 additions and 30 deletions
build/webpack.dev.conf.js
...@@ -82,15 +82,15 @@ module.exports = merge(baseWebpackConfig, { ...@@ -82,15 +82,15 @@ module.exports = merge(baseWebpackConfig, {
// inject: true // inject: true
// }), // }),
new FriendlyErrorsPlugin(), new FriendlyErrorsPlugin(),
new UglifyJsPlugin({ // new UglifyJsPlugin({
sourceMap: true, // sourceMap: true,
uglifyOptions: { // uglifyOptions: {
compress: { // compress: {
warnings: false, // warnings: false,
drop_console: true, // drop_console: true,
pure_funcs: ['console.log'] // pure_funcs: ['console.log']
} // }
} // }
}) // })
] ]
}) })
package.json
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
"private": true, "private": true,
"scripts": { "scripts": {
"dev:wx": "cross-env NODE_ENV=development node build/dev-server.js wx", "dev:wx": "cross-env NODE_ENV=development node build/dev-server.js wx",
"dev:xhyx_uat": "cross-env NODE_ENV=xhyx_uat node build/dev-server.js wx",
"pro:wx": "cross-env NODE_ENV=production node build/dev-server.js wx", "pro:wx": "cross-env NODE_ENV=production node build/dev-server.js wx",
"start:wx": "npm run dev:wx", "start:wx": "npm run dev:wx",
"build:wx": "cross-env NODE_ENV=production node build/build.js wx", "build:wx": "cross-env NODE_ENV=production node build/build.js wx",
......
src/components/basicTool/transverse-label/index.vue
...@@ -593,6 +593,8 @@ export default { ...@@ -593,6 +593,8 @@ export default {
$wrapWidth: 50px; $wrapWidth: 50px;
.transverse-label { .transverse-label {
.van-tab { .van-tab {
// margin: 0 6px;
margin-right: 6px;
// padding: 0; // padding: 0;
z-index: 98; z-index: 98;
} }
...@@ -642,7 +644,7 @@ $wrapWidth: 50px; ...@@ -642,7 +644,7 @@ $wrapWidth: 50px;
.tabStyle1 { .tabStyle1 {
.van-tabs__line { .van-tabs__line {
height: 30px; height: 30px;
bottom: 6px; bottom: 4px;
border-radius: 38px; border-radius: 38px;
} }
} }
......
src/pages/index/index.vue
...@@ -221,6 +221,13 @@ export default { ...@@ -221,6 +221,13 @@ export default {
log.info('options.share-上级分销员信息',spokesmanInfo) log.info('options.share-上级分销员信息',spokesmanInfo)
this.$store.commit("setSpokesman", spokesmanInfo); this.$store.commit("setSpokesman", spokesmanInfo);
} }
if (getQueryVariable(this.link, "offlineShopCode")) {
// 存储h5url门店信息
setStoreInfo({
offlineShopCode: getQueryVariable(this.link, "offlineShopCode"),
offlineShopName: getQueryVariable(this.link, "offlineShopName"),
});
}
this.page = ""; this.page = "";
this.params = ""; this.params = "";
} else if (options.from && options.from == "h5login") { } else if (options.from && options.from == "h5login") {
......
static/nativeComponents/GoodsList/index.wxml
...@@ -150,7 +150,7 @@ ...@@ -150,7 +150,7 @@
<heap-item datas="{{datas}}"></heap-item> <heap-item datas="{{datas}}"></heap-item>
</view> </view>
<!-- 轮播滑动 --> <!-- 轮播滑动 -->
<view wx:if="{{datas.componentData.style === 'swipe'}}"> <view wx:if="{{datas.componentData.style === 'swipe'}}" style="position:relative;">
<swiper bindchange="handleSwipeChange"> <swiper bindchange="handleSwipeChange">
<block wx:for="{{swipeInfo}}"> <block wx:for="{{swipeInfo}}">
<swiper-item> <swiper-item>
......
static/nativeComponents/TimeLimitedDiscount/index.wxml
...@@ -94,8 +94,8 @@ ...@@ -94,8 +94,8 @@
<!-- <text class="price" wx:if="{{((hours-0)+(minute-0)+(second-0))!=0}}">￥{{datas.componentData.goodsList[index]!=null?datas.componentData.goodsList[index]['minPrice']:0}}</text> <!-- <text class="price" wx:if="{{((hours-0)+(minute-0)+(second-0))!=0}}">￥{{datas.componentData.goodsList[index]!=null?datas.componentData.goodsList[index]['minPrice']:0}}</text>
<text class="price" wx:else>￥{{datas.componentData.goodsList[index]!=null?datas.componentData.goodsList[index]['minPrice']:0}}</text> <text class="price" wx:else>￥{{datas.componentData.goodsList[index]!=null?datas.componentData.goodsList[index]['minPrice']:0}}</text>
<text class="delPrice" wx:if="{{((hours-0)+(minute-0)+(second-0))!=0}}">￥{{datas.componentData.goodsList[index]!=null?datas.componentData.goodsList[index]['maxPrice']:0}}</text> --> <text class="delPrice" wx:if="{{((hours-0)+(minute-0)+(second-0))!=0}}">￥{{datas.componentData.goodsList[index]!=null?datas.componentData.goodsList[index]['maxPrice']:0}}</text> -->
<view class="price">￥{{goodsList[index]!=null?goodsList[index]['minPrice']:0}}</view>
<view class="delPrice">￥{{goodsList[index]!=null?goodsList[index]['maxPrice']:0}}</view> <view class="delPrice">￥{{goodsList[index]!=null?goodsList[index]['maxPrice']:0}}</view>
<view class="price">￥{{goodsList[index]!=null?goodsList[index]['minPrice']:0}}</view>
</view> </view>
<view <view
class="btn" class="btn"
...@@ -137,11 +137,23 @@ ...@@ -137,11 +137,23 @@
</view> </view>
</view> </view>
<view class="info"> <view class="info">
<!-- <text class="price" wx:if="{{((hours-0)+(minute-0)+(second-0))!=0}}">￥{{datas.componentData.goodsList[index]!=null?datas.componentData.goodsList[index]['minPrice']:0}}</text> <view class="name">
<text class="price" wx:else>￥{{datas.componentData.goodsList[index]!=null?datas.componentData.goodsList[index]['minPrice']:0}}</text> {{goodsList[index]!=null?goodsList[index]['productName']:'名称'}}
<text class="delPrice" wx:if="{{((hours-0)+(minute-0)+(second-0))!=0}}">￥{{datas.componentData.goodsList[index]!=null?datas.componentData.goodsList[index]['maxPrice']:0}}</text> --> </view>
<view class="price">￥{{goodsList[index]!=null?goodsList[index]['minPrice']:0}}</view> <view class="allPrice">
<view>
<view class="delPrice">￥{{goodsList[index]!=null?goodsList[index]['maxPrice']:0}}</view> <view class="delPrice">￥{{goodsList[index]!=null?goodsList[index]['maxPrice']:0}}</view>
<view class="price">￥{{goodsList[index]!=null?goodsList[index]['minPrice']:0}}</view>
</view>
<view
class="btn"
data-items="{{goodsList[index]}}"
catchtap="onclickOrder"
>
<!-- 立即抢购 -->
<view class="antt ant-tianchongtianjia" style="font-size: 36rpx;"></view>
</view>
</view>
</view> </view>
</view> </view>
</view> </view>
......
static/nativeComponents/TimeLimitedDiscount/index.wxss
...@@ -92,10 +92,12 @@ ...@@ -92,10 +92,12 @@
margin: 20rpx 10rpx 0; margin: 20rpx 10rpx 0;
} }
.goods-item-child .info { .goods-item-child .info,
.goods-item .info {
padding: 10rpx 20rpx 12rpx; padding: 10rpx 20rpx 12rpx;
} }
.goods-item-child .info .name { .goods-item-child .info .name,
.goods-item .info .name {
text-align: left; text-align: left;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
...@@ -104,12 +106,12 @@ ...@@ -104,12 +106,12 @@
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
line-height: 44rpx; line-height: 44rpx;
font-size: 32rpx; font-size: 32rpx;
height: 92rpx;
} }
.goods-item-child .info .allPrice { .goods-item-child .info .allPrice,
.goods-item .info .allPrice{
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: flex-end;
} }
.price { .price {
font-weight: 600; font-weight: 600;
...@@ -122,7 +124,8 @@ ...@@ -122,7 +124,8 @@
margin-top: 10rpx; margin-top: 10rpx;
color: #999; color: #999;
} }
.goods-item-child .info .allPrice .btn { .goods-item-child .info .allPrice .btn,
.goods1 .goods-item .info .btn {
font-size: 24rpx; font-size: 24rpx;
/* background: var(--main-color); */ /* background: var(--main-color); */
padding: 8rpx; padding: 8rpx;
...@@ -133,7 +136,8 @@ ...@@ -133,7 +136,8 @@
-ms-border-radius: 10rpx; -ms-border-radius: 10rpx;
-o-border-radius: 10rpx; -o-border-radius: 10rpx;
} }
.goods-item-child .info .allPrice .btn .antt{ .goods-item-child .info .allPrice .btn .antt,
.goods1 .goods-item .info .btn .antt{
border-radius: 50%; border-radius: 50%;
-webkit-border-radius: 50%; -webkit-border-radius: 50%;
-moz-border-radius: 50%; -moz-border-radius: 50%;
...@@ -210,9 +214,6 @@ ...@@ -210,9 +214,6 @@
overflow: hidden; overflow: hidden;
background: #ffffff; background: #ffffff;
} }
.goods1 .goods-item .info {
text-align: center;
}
.goods1 .goods-item .slidebox2 { .goods1 .goods-item .slidebox2 {
box-sizing: border-box; box-sizing: border-box;
-moz-box-sizing: border-box; /* Firefox */ -moz-box-sizing: border-box; /* Firefox */
......
static/vant/tabs/index.js
...@@ -235,7 +235,7 @@ VantComponent({ ...@@ -235,7 +235,7 @@ VantComponent({
} else { } else {
lineOffsetLeft = rects lineOffsetLeft = rects
.slice(0, currentIndex) .slice(0, currentIndex)
.reduce((prev, curr) => prev + curr.width, 0); .reduce((prev, curr) => prev + curr.width + 6, 0);
lineOffsetLeft += 8; lineOffsetLeft += 8;
} }
lineWidths = rect.width; lineWidths = rect.width;
......
static/vant/tabs/index.wxss
@import '../common/index.wxss';.van-tabs{position:relative;-webkit-tap-highlight-color:transparent}.van-tabs__wrap{display:-webkit-flex;display:flex;overflow:hidden}.van-tabs__wrap--scrollable .van-tab{-webkit-flex:0 0 22%;flex:0 0 22%}.van-tabs__wrap--scrollable .van-tab--complete{-webkit-flex:1 0 auto!important;flex:1 0 auto!important;padding:0 12px}.van-tabs__wrap--scrollable .van-tabs__nav--complete{padding-right:8px;padding-left:8px}.van-tabs__scroll{background-color:#fff;background-color:var(--tabs-nav-background-color,#fff)}.van-tabs__scroll--line{box-sizing:initial;height:calc(100% + 15px)}.van-tabs__scroll--card{margin:0 16px;margin:0 var(--padding-md,16px)}.van-tabs__scroll::-webkit-scrollbar{display:none}.van-tabs__nav{position:relative;display:-webkit-flex;display:flex;-webkit-user-select:none;user-select:none}.van-tabs__nav--card{box-sizing:border-box;height:30px;height:var(--tabs-card-height,30px);border:1px solid #ee0a24;border:var(--border-width-base,1px) solid var(--tabs-default-color,#ee0a24);border-radius:2px;border-radius:var(--border-radius-sm,2px)}.van-tabs__nav--card .van-tab{color:#ee0a24;color:var(--tabs-default-color,#ee0a24);line-height:28px;line-height:calc(var(--tabs-card-height, 30px) - var(--border-width-base, 1px)*2);border-right:1px solid #ee0a24;border-right:var(--border-width-base,1px) solid var(--tabs-default-color,#ee0a24)}.van-tabs__nav--card .van-tab:last-child{border-right:none}.van-tabs__nav--card .van-tab.van-tab--active{color:#fff;color:var(--white,#fff);background-color:#ee0a24;background-color:var(--tabs-default-color,#ee0a24)}.van-tabs__nav--card .van-tab--disabled{color:#c8c9cc;color:var(--tab-disabled-text-color,#c8c9cc)}.van-tabs__line{position:absolute;bottom:0;left:0;z-index:1;height:3px;height:var(--tabs-bottom-bar-height,3px);border-radius:3px;border-radius:var(--tabs-bottom-bar-height,3px);background-color:#ee0a24;background-color:var(--tabs-bottom-bar-color,#ee0a24)}.van-tabs__track{position:relative;width:100%;height:100%}.van-tabs__track--animated{display:-webkit-flex;display:flex;transition-property:left}.van-tabs__content{overflow:hidden}.van-tabs--line .van-tabs__wrap{height:44px;height:var(--tabs-line-height,44px)}.van-tabs--card .van-tabs__wrap{height:30px;height:var(--tabs-card-height,30px)}.van-tab{position:relative;-webkit-flex:1;flex:1;box-sizing:border-box;min-width:0;padding:0 5px;text-align:center;cursor:pointer;color:#646566;color:var(--tab-text-color,#646566);font-size:14px;font-size:var(--tab-font-size,14px);line-height:44px;line-height:var(--tabs-line-height,44px)}.van-tab--active{font-weight:500;font-weight:var(--font-weight-bold,500);color:#323233;color:var(--tab-active-text-color,#323233)}.van-tab--disabled{color:#c8c9cc;color:var(--tab-disabled-text-color,#c8c9cc)}.van-tab__title__info{position:relative!important;top:-1px!important;display:inline-block;-webkit-transform:translateX(0)!important;transform:translateX(0)!important} @import "../common/index.wxss";
\ No newline at end of file .van-tabs {
position: relative;
-webkit-tap-highlight-color: transparent;
}
.van-tabs__wrap {
display: -webkit-flex;
display: flex;
overflow: hidden;
}
.van-tabs__wrap--scrollable .van-tab {
-webkit-flex: 0 0 22%;
flex: 0 0 22%;
}
.van-tabs__wrap--scrollable .van-tab--complete {
-webkit-flex: 1 0 auto !important;
flex: 1 0 auto !important;
padding: 0 12px;
}
.van-tabs__wrap--scrollable .van-tabs__nav--complete {
padding-right: 8px;
padding-left: 8px;
}
.van-tabs__scroll {
background-color: #fff;
background-color: var(--tabs-nav-background-color, #fff);
}
.van-tabs__scroll--line {
box-sizing: initial;
height: calc(100% + 15px);
}
.van-tabs__scroll--card {
margin: 0 16px;
margin: 0 var(--padding-md, 16px);
}
.van-tabs__scroll::-webkit-scrollbar {
display: none;
}
.van-tabs__nav {
position: relative;
display: -webkit-flex;
display: flex;
-webkit-user-select: none;
user-select: none;
}
.van-tabs__nav--card {
box-sizing: border-box;
height: 30px;
height: var(--tabs-card-height, 30px);
border: 1px solid #ee0a24;
border: var(--border-width-base, 1px) solid var(--tabs-default-color, #ee0a24);
border-radius: 2px;
border-radius: var(--border-radius-sm, 2px);
}
.van-tabs__nav--card .van-tab {
color: #ee0a24;
color: var(--tabs-default-color, #ee0a24);
line-height: 28px;
line-height: calc(
var(--tabs-card-height, 30px) - var(--border-width-base, 1px) * 2
);
border-right: 1px solid #ee0a24;
border-right: var(--border-width-base, 1px) solid
var(--tabs-default-color, #ee0a24);
}
.van-tabs__nav--card .van-tab:last-child {
border-right: none;
}
.van-tabs__nav--card .van-tab.van-tab--active {
color: #fff;
color: var(--white, #fff);
background-color: #ee0a24;
background-color: var(--tabs-default-color, #ee0a24);
}
.van-tabs__nav--card .van-tab--disabled {
color: #c8c9cc;
color: var(--tab-disabled-text-color, #c8c9cc);
}
.van-tabs__line {
position: absolute;
bottom: 0;
left: 0;
z-index: 1;
height: 3px;
height: var(--tabs-bottom-bar-height, 3px);
border-radius: 3px;
border-radius: var(--tabs-bottom-bar-height, 3px);
background-color: #ee0a24;
background-color: var(--tabs-bottom-bar-color, #ee0a24);
}
.van-tabs__track {
position: relative;
width: 100%;
height: 100%;
}
.van-tabs__track--animated {
display: -webkit-flex;
display: flex;
transition-property: left;
}
.van-tabs__content {
overflow: hidden;
}
.van-tabs--line .van-tabs__wrap {
height: 44px;
height: var(--tabs-line-height, 44px);
}
.van-tabs--card .van-tabs__wrap {
height: 30px;
height: var(--tabs-card-height, 30px);
}
.van-tab {
position: relative;
-webkit-flex: 1;
flex: 1;
box-sizing: border-box;
min-width: 0;
padding: 0 5px;
text-align: center;
cursor: pointer;
color: #646566;
color: var(--tab-text-color, #646566);
font-size: 14px;
font-size: var(--tab-font-size, 14px);
line-height: 38px;
/* line-height: var(--tabs-line-height, 38px); */
}
.van-tab--active {
font-weight: 500;
font-weight: var(--font-weight-bold, 500);
color: #323233;
color: var(--tab-active-text-color, #323233);
}
.van-tab--disabled {
color: #c8c9cc;
color: var(--tab-disabled-text-color, #c8c9cc);
}
.van-tab__title__info {
position: relative !important;
top: -1px !important;
display: inline-block;
-webkit-transform: translateX(0) !important;
transform: translateX(0) !important;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment