wangmingchuan
/
yanzong_qianduan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

合并冲突

Browse Source
h5
wangdong 6 months ago
parent 695d775abc 1ba71b1464
commit 94a9d2a25e
6 changed files with 168 additions and 130 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 32
      pages/cart/index.vue
  2. 4
      pages/goods/detail.vue
  3. 28
      pages/goods/list.vue
  4. 15
      pages/index/index.vue
  5. 2
      pages/search/index.vue
  6. 15
      pages/user/index.vue

32
pages/cart/index.vue
Unescape View File

@ -20,8 +20,10 @@
<!-- 购物车商品列表 -->
<view v-if="list.length" class="cart-list">
<view class="cart-item" v-for="(item, index) in list" :key="index">
<view v-if="storeVersion == 1 && item.goods.merchant_id > 0 && item.goods.merchant" class="merchant-name" @click="toShop(item)">
<image :src="item.goods.merchant.logoImage && item.goods.merchant.logoImage[0].external_url" mode="aspectFill"></image>
<view v-if="storeVersion == 1 && item.goods.merchant_id > 0 && item.goods.merchant"
class="merchant-name" @click="toShop(item)">
<image :src="item.goods.merchant.logoImage && item.goods.merchant.logoImage[0].external_url"
mode="aspectFill"></image>
<text>{{ item.goods.merchant.shop_name }}</text>
<image src="@/static/arrow-right.png" mode="aspectFill"></image>
</view>
@ -104,7 +106,7 @@
{{item.cmmdty_model}}
</view>
</view> -->
<!-- <view class="goodsSend">
<view class="goodsSend">
<view class="sendLeft">
<view class="left_1">
{{item.goods_source}}
@ -122,7 +124,7 @@
<text v-if="item.delivery_time==5">30天内发货</text>
<text v-if="item.delivery_time==6">45天内发货</text>
</view>
</view> -->
</view>
</view>
<!-- </template> -->
<!-- <template v-slot:right="{rightList}">
@ -302,7 +304,9 @@
methods: {
getSuggest() {
// 获取推荐商品
Api.recommendedNew({ page: this.recommendPage++ }).then(res => {
Api.recommendedNew({
page: this.recommendPage++
}).then(res => {
console.log(res);
let arr = res.data.goodsList.data
if (arr && arr.length > 0) {
@ -540,22 +544,30 @@
margin: 0rpx 0 20rpx 0;
.pic {
position: relative;
width: 100%;
align-items: center;
display: flex;
height: 256rpx;
overflow: hidden;
width: 100%;
height: 0;
padding-bottom: 100%;
overflow: hidden;
image {
width: 100%;
height: 100%;
object-fit: cover;
position: absolute;
left: 0;
top: 0
}
}
.goodsInfo {
margin-bottom: 12rpx;
height: 60rpx;
.title {
display: flex;
align-items: center;
@ -628,6 +640,7 @@
}
}
}
.finished {
font-size: 28rpx;
line-height: 100rpx;
@ -680,21 +693,25 @@
border-radius: 12rpx;
padding: 30rpx 16rpx;
margin-bottom: 24rpx;
.merchant-name {
font-size: 30rpx;
color: #333;
font-weight: bold;
>text {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
max-width: calc(100% - 73rpx);
}
>image {
margin-left: 10rpx;
width: 13rpx;
height: 24rpx;
flex-shrink: 0;
&:first-child {
width: 40rpx;
height: 40rpx;
@ -702,6 +719,7 @@
}
}
}
>view {
display: flex;
align-items: center;

4
pages/goods/detail.vue
Unescape View File

@ -128,10 +128,10 @@
</picker>
</view>
<view v-if="goods.goods_no" class="operaImg" @click="copyNum(goods.goods_no)">
<!-- <view class="left_1">
<view class="left_1">
{{goods.goods_source}}
</view>
<text style="color: #8A8A8A;font-size: 28rpx;">{{goods.goods_no}}</text> -->
<text style="color: #8A8A8A;font-size: 28rpx;">{{goods.goods_no}}</text>
<image :src="$picUrl+'/static/detail/copy.png'"
style="width: 30rpx;height: 30rpx;margin-left: 14rpx;"></image>
</view>

28
pages/goods/list.vue
Unescape View File

@ -57,13 +57,13 @@
</view>
</view>
<!-- <view class="sort-item" :class="{ active: sortType === 'city' }"
<view class="sort-item" :class="{ active: sortType === 'city' }"
@click="handleSortType('city')">
<picker mode="selector" @change="multiChange" value="{{multiIndex}}" :range="multiArray"
range-key="name">
<text>类型</text>
<text>渠道</text>
</picker>
</view> -->
</view>
<!-- <view class="show-view btnOpera" @click="handleShowView">
<text class="iconfont icon-view-tile" v-if="showView"></text>
<text class="iconfont icon-view-list" v-else></text>
@ -143,7 +143,7 @@
{{item.cmmdty_model}}
</view>
</view> -->
<!-- <view class="goodsSend">
<view class="goodsSend">
<view class="sendLeft">
<view class="left_1">
{{item.goods_source}}
@ -161,7 +161,7 @@
<text v-if="item.delivery_time==5">30天内发货</text>
<text v-if="item.delivery_time==6">45天内发货</text>
</view>
</view> -->
</view>
</view>
</view>
</view>
@ -281,19 +281,25 @@
tabbar: [],
multiArray: [{
value: 'JD',
name: 'JD'
name: '京东 '
}, {
value: 'SN',
name: 'SN'
name: '苏宁'
}, {
value: 'GC',
name: 'GC'
name: '工厂'
}, {
value: 'CC',
name: 'CC '
name: '仓储'
}, {
value: 'ZC',
name: 'ZC'
name: '自采'
}, {
value: 'TM',
name: '天猫'
}, {
value: 'PF',
name: '批发平台'
}],
multiIndex: -1,
blheight: 0,
@ -462,7 +468,7 @@
page: pageNo,
// keywords: keywords.length > 0 ? keywords.join(',') : '',
keyword: app.options.search || '',
// goods_source: this.multiIndex > -1 ? this.multiArray[this.multiIndex].value : ''
goods_source: this.multiIndex > -1 ? this.multiArray[this.multiIndex].value : ''
}
return new Promise((resolve, reject) => {
GoodsApi.list(param)

15
pages/index/index.vue
Unescape View File

@ -289,7 +289,7 @@
{{item.cmmdty_model}}
</view>
</view> -->
<!-- <view class="goodsSend">
<view class="goodsSend">
<view class="sendLeft">
<view class="left_1">
{{item.goods_source}}
@ -307,7 +307,7 @@
<text v-if="item.delivery_time==5">30天内发货</text>
<text v-if="item.delivery_time==6">45天内发货</text>
</view>
</view> -->
</view>
</view>
<!-- </template> -->
<!-- <template v-slot:right="{rightList}">
@ -2061,16 +2061,23 @@
margin: 0rpx 0 20rpx 0;
.pic {
position: relative;
width: 100%;
align-items: center;
display: flex;
height: 256rpx;
overflow: hidden;
width: 100%;
height: 0;
padding-bottom: 100%;
overflow: hidden;
image {
width: 100%;
height: 100%;
object-fit: cover;
position: absolute;
left: 0;
top: 0
}
}

2
pages/search/index.vue
Unescape View File

@ -2,7 +2,7 @@
<view class="container">
<view class="search">
<image :src="$picUrl+'/static/home/search.png'" mode="" class="searchIcon"></image>
<input v-model="searchValue" class="input" focus="true" placeholder="iPhone15" type="text" />
<input v-model="searchValue" confirm-type="搜索" show-confirm-bar @confirm="getSearchInfo" class="input" focus="true" placeholder="iPhone15" type="text" />
<view class="searchBtn" @click="getSearchInfo">
搜索
</view>

15
pages/user/index.vue
Unescape View File

@ -582,7 +582,7 @@
{{item.cmmdty_model}}
</view>
</view> -->
<!-- <view class="goodsSend">
<view class="goodsSend">
<view class="sendLeft">
<view class="left_1">
{{item.goods_source}}
@ -600,7 +600,7 @@
<text v-if="item.delivery_time==5">30天内发货</text>
<text v-if="item.delivery_time==6">45天内发货</text>
</view>
</view> -->
</view>
</view>
</view>
<!-- </template> -->
@ -1393,16 +1393,23 @@
margin: 0 0 20rpx 0;
.pic {
position: relative;
width: 100%;
align-items: center;
display: flex;
height: 256rpx;
overflow: hidden;
width: 100%;
height: 0;
padding-bottom: 100%;
overflow: hidden;
image {
width: 100%;
height: 100%;
object-fit: cover;
position: absolute;
left: 0;
top: 0
}
}

Write Preview
Loading…
Cancel
Save