Skip to content

肖康 / H5_2.0

Go to a project
Commit 7be471b2 by 肖康
Options

Merge branch 'master' of http://git.ichunt.net/xiaokang/H5_2.0

parents 665afa4e 132cfcb6
Inline Side-by-side
Showing with 19 additions and 78 deletions
assets/css/mine/dome.scss
...@@ -115,6 +115,7 @@ ...@@ -115,6 +115,7 @@
.pic { .pic {
width: 144rpx; width: 144rpx;
height: 81rpx; height: 81rpx;
overflow: hidden;
margin-bottom: 16rpx; margin-bottom: 16rpx;
box-sizing: border-box; box-sizing: border-box;
} }
...@@ -175,6 +176,10 @@ ...@@ -175,6 +176,10 @@
font-size: 26rpx; font-size: 26rpx;
color: #1969f9; color: #1969f9;
margin-bottom: 2rpx; margin-bottom: 2rpx;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
width: 250rpx;
} }
.t2 { .t2 {
font-size: 24rpx; font-size: 24rpx;
......
pages/mine/dome.vue
...@@ -57,77 +57,18 @@ ...@@ -57,77 +57,18 @@
<view class="cooperation"> <view class="cooperation">
<view class="uni-swiper-wrap"> <view class="uni-swiper-wrap">
<swiper class="swiper" circular :indicator-dots="indicatorDots" :autoplay="autoplay" :interval="interval" :duration="duration"> <swiper class="swiper" circular :indicator-dots="indicatorDots" :autoplay="autoplay" :interval="interval" :duration="duration">
<swiper-item> <swiper-item v-for="(item, index) in detail.h5_domestic_strategic_partner" :key="index">
<view class="box row avarage"> <view class="box row avarage"><image mode="aspectFill" v-for="(v, i) in item" :key="i" :src="v.images" lazy-load="true" class="pic"></image></view>
<image mode="aspectFill" src="https://img.ichunt.com/images/ichunt/202305/27/58c2e7a3d42ed265a2c763bf704d807a.jpg" lazy-load="true" class="pic"></image>
<image mode="aspectFill" src="https://img.ichunt.com/images/ichunt/202305/27/2ddce4486082a8b825f3026fe3e715aa.jpg" lazy-load="true" class="pic"></image>
<image mode="aspectFill" src="https://img.ichunt.com/images/ichunt/202305/27/58c2e7a3d42ed265a2c763bf704d807a.jpg" lazy-load="true" class="pic"></image>
<image mode="aspectFill" src="https://img.ichunt.com/images/ichunt/202305/27/2ddce4486082a8b825f3026fe3e715aa.jpg" lazy-load="true" class="pic"></image>
<image mode="aspectFill" src="https://img.ichunt.com/images/ichunt/202305/27/58c2e7a3d42ed265a2c763bf704d807a.jpg" lazy-load="true" class="pic"></image>
<image mode="aspectFill" src="https://img.ichunt.com/images/ichunt/202305/27/2ddce4486082a8b825f3026fe3e715aa.jpg" lazy-load="true" class="pic"></image>
<image mode="aspectFill" src="https://img.ichunt.com/images/ichunt/202305/27/58c2e7a3d42ed265a2c763bf704d807a.jpg" lazy-load="true" class="pic"></image>
<image mode="aspectFill" src="https://img.ichunt.com/images/ichunt/202305/27/2ddce4486082a8b825f3026fe3e715aa.jpg" lazy-load="true" class="pic"></image>
</view>
</swiper-item>
<swiper-item>
<view class="box row avarage">
<image mode="aspectFill" src="https://img.ichunt.com/images/ichunt/202305/27/58c2e7a3d42ed265a2c763bf704d807a.jpg" lazy-load="true" class="pic"></image>
<image mode="aspectFill" src="https://img.ichunt.com/images/ichunt/202305/27/2ddce4486082a8b825f3026fe3e715aa.jpg" lazy-load="true" class="pic"></image>
<image mode="aspectFill" src="https://img.ichunt.com/images/ichunt/202305/27/58c2e7a3d42ed265a2c763bf704d807a.jpg" lazy-load="true" class="pic"></image>
<image mode="aspectFill" src="https://img.ichunt.com/images/ichunt/202305/27/2ddce4486082a8b825f3026fe3e715aa.jpg" lazy-load="true" class="pic"></image>
</view>
</swiper-item> </swiper-item>
</swiper> </swiper>
</view> </view>
</view> </view>
<view class="title row rowCenter verCenter">国产热门型号</view> <view class="title row rowCenter verCenter">国产热门型号</view>
<view class="content"> <view class="content" v-for="(item, index) in detail.h5_domestic_hot_goods" :key="index">
<view class="head row bothSide verCenter">
<view class="left">
<image src="https://img.ichunt.com/images/ichunt/202305/27/58c2e7a3d42ed265a2c763bf704d807a.jpg" mode="aspectFill" class="pic"></image>
<text class="tt">发光二极管</text>
</view>
<view class="right row verCenter">
<text class="iconfont icon-a-juxing1"></text>
<text class="tt">排名热度前10</text>
</view>
</view>
<view class="list row bothSide">
<view class="box row" v-for="(item, index) in 10" :key="index">
<view class="index-class">{{ index + 1 }}</view>
<view class="text column">
<text class="t1">FTZ15N35G</text>
<text class="t2">ABLIC</text>
</view>
</view>
</view>
</view>
<view class="content">
<view class="head row bothSide verCenter">
<view class="left">
<image src="https://img.ichunt.com/images/ichunt/202305/27/58c2e7a3d42ed265a2c763bf704d807a.jpg" mode="aspectFill" class="pic"></image>
<text class="tt">发光二极管</text>
</view>
<view class="right row verCenter">
<text class="iconfont icon-a-juxing1"></text>
<text class="tt">排名热度前10</text>
</view>
</view>
<view class="list row bothSide">
<view class="box row" v-for="(item, index) in 10" :key="index">
<view class="index-class">{{ index + 1 }}</view>
<view class="text column">
<text class="t1">FTZ15N35G</text>
<text class="t2">ABLIC</text>
</view>
</view>
</view>
</view>
<view class="content">
<view class="head row bothSide verCenter"> <view class="head row bothSide verCenter">
<view class="left"> <view class="left">
<image src="https://img.ichunt.com/images/ichunt/202305/27/58c2e7a3d42ed265a2c763bf704d807a.jpg" mode="aspectFill" class="pic"></image> <image :src="item.images" mode="aspectFill" class="pic"></image>
<text class="tt">有源晶振</text> <text class="tt">{{ item.title }}</text>
</view> </view>
<view class="right row verCenter"> <view class="right row verCenter">
<text class="iconfont icon-a-juxing1"></text> <text class="iconfont icon-a-juxing1"></text>
...@@ -135,11 +76,11 @@ ...@@ -135,11 +76,11 @@
</view> </view>
</view> </view>
<view class="list row bothSide"> <view class="list row bothSide">
<view class="box row" v-for="(item, index) in 10" :key="index"> <view class="box row" v-for="(v, i) in item.sku_list" :key="i">
<view class="index-class">{{ index + 1 }}</view> <view class="index-class">{{ i + 1 }}</view>
<view class="text column"> <view class="text column">
<text class="t1">FTZ15N35G</text> <text class="t1">{{ v.goods_name }}</text>
<text class="t2">ABLIC</text> <text class="t2">{{ v.standard_brand_name }}</text>
</view> </view>
</view> </view>
</view> </view>
...@@ -150,7 +91,7 @@ ...@@ -150,7 +91,7 @@
</template> </template>
<script> <script>
import { Api_Url } from '@/util/api.js'; import { Api_Url, Ichunt_Api } from '@/util/api.js';
import navElement from '@/components/nav.vue'; import navElement from '@/components/nav.vue';
import wx from 'jweixin-module'; import wx from 'jweixin-module';
export default { export default {
...@@ -164,10 +105,10 @@ export default { ...@@ -164,10 +105,10 @@ export default {
indicatorDots: true, indicatorDots: true,
autoplay: true, autoplay: true,
interval: 20000, interval: 20000,
duration: 500 duration: 500,
detail: {}
}; };
}, },
onLoad(options) {},
onShow() { onShow() {
this.getData(); this.getData();
}, },
...@@ -250,9 +191,9 @@ export default { ...@@ -250,9 +191,9 @@ export default {
}); });
}, },
getData(type) { getData(type) {
this.request(Api_Url + '/article/getArticleList', 'POST', this.searchParams, true, true).then(res => { this.request(Ichunt_Api + '/api/Domestic/index', 'GET', {}, true, true).then(res => {
if (res.err_code === 0) { if (res.err_code === 0) {
} else { this.detail = res.data;
} }
}); });
} }
......
uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue
...@@ -53,11 +53,6 @@ export default { ...@@ -53,11 +53,6 @@ export default {
text: '复制链接', text: '复制链接',
icon: 'https://img.ichunt.com/images/ichunt/202305/27/726bff17f48ad6866f9e6956c19cb1a8.png', icon: 'https://img.ichunt.com/images/ichunt/202305/27/726bff17f48ad6866f9e6956c19cb1a8.png',
name: 'link' name: 'link'
},
{
text: '二维码',
icon: 'https://img.ichunt.com/images/ichunt/202305/27/8478b5b31e6bc6f84676369ff18a9556.png',
name: 'code'
} }
] ]
}; };
......
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 sign in to comment