chenkainan
/
flavorOfTimeSz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' into dev_delivery

dev_delivery
jiazhipeng 3 weeks ago
parent
00de5f6d9f b0e5be2643
commit
3b19eb482e
4 changed files with 12 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      subPackages/food/detail.vue
  2. 5
      subPackages/search/techanResult.vue
  3. 5
      subPackages/techan/detail.vue
  4. 5
      subPackages/techan/index.vue

5
subPackages/food/detail.vue
View File

@ -133,7 +133,7 @@
<view> <view>
<view class="sp">规格</view> <view class="sp">规格</view>
<view class="sp-container" style=""> <view class="sp-container" style="">
<view style="position:relative;width: 100%;" v-for="(botItem,botIndex) in sku" :key="botIndex"> <view style="position:relative;max-width: 100%;" v-for="(botItem,botIndex) in sku" :key="botIndex">
<view :class="['botProduct','text-overflow',{'noStore':botItem.store==0},{'botProducts':productIndex==botIndex}]" <view :class="['botProduct','text-overflow',{'noStore':botItem.store==0},{'botProducts':productIndex==botIndex}]"
@click="changeProduct(botItem,botIndex)"> @click="changeProduct(botItem,botIndex)">
<image :src="showImg(botItem.headimg)"></image> <image :src="showImg(botItem.headimg)"></image>
@ -709,7 +709,7 @@
margin-bottom: 34rpx; margin-bottom: 34rpx;
max-width: 100%; max-width: 100%;
padding-right:15rpx; padding-right:15rpx;
min-width: 340rpx; min-width: 320rpx;
background: #EFEFEF; background: #EFEFEF;
display: flex; display: flex;
align-items: center; align-items: center;
@ -727,6 +727,7 @@
padding-left: 15rpx; padding-left: 15rpx;
white-space: normal; white-space: normal;
font-size: 27rpx; font-size: 27rpx;
word-break: break-all;
} }
} }
.noStore{ .noStore{

5
subPackages/search/techanResult.vue
View File

@ -101,7 +101,7 @@
<view style="max-height: 600rpx;overflow-y: auto;"> <view style="max-height: 600rpx;overflow-y: auto;">
<view class="sp">规格</view> <view class="sp">规格</view>
<view class="sp-container"> <view class="sp-container">
<view style="position:relative;width: 100%;" v-for="(botItem,botIndex) in sku" :key="botIndex"> <view style="position:relative;max-width: 100%;" v-for="(botItem,botIndex) in sku" :key="botIndex">
<view :class="['botProduct','text-overflow',{'noStore':botItem.store==0},{'botProducts':productIndex==botIndex}]" <view :class="['botProduct','text-overflow',{'noStore':botItem.store==0},{'botProducts':productIndex==botIndex}]"
@click="changeProduct(botItem,botIndex)"> @click="changeProduct(botItem,botIndex)">
<image :src="showImg(botItem.headimg)"></image> <image :src="showImg(botItem.headimg)"></image>
@ -564,7 +564,7 @@
margin-bottom: 34rpx; margin-bottom: 34rpx;
max-width: 100%; max-width: 100%;
padding-right:15rpx; padding-right:15rpx;
min-width: 340rpx; min-width: 320rpx;
background: #EFEFEF; background: #EFEFEF;
display: flex; display: flex;
align-items: center; align-items: center;
@ -582,6 +582,7 @@
padding-left: 15rpx; padding-left: 15rpx;
white-space: normal; white-space: normal;
font-size: 27rpx; font-size: 27rpx;
word-break: break-all;
} }
} }
.noStore{ .noStore{

5
subPackages/techan/detail.vue
View File

@ -144,7 +144,7 @@
<view> <view>
<view class="sp">规格</view> <view class="sp">规格</view>
<view class="sp-container" style=""> <view class="sp-container" style="">
<view style="position:relative;width: 100%;" v-for="(botItem,botIndex) in sku" :key="botIndex"> <view style="position:relative;max-width: 100%;" v-for="(botItem,botIndex) in sku" :key="botIndex">
<view :class="['botProduct','text-overflow',{'noStore':botItem.store==0},{'botProducts':productIndex==botIndex}]" <view :class="['botProduct','text-overflow',{'noStore':botItem.store==0},{'botProducts':productIndex==botIndex}]"
@click="changeProduct(botItem,botIndex)"> @click="changeProduct(botItem,botIndex)">
<image :src="showImg(botItem.headimg)"></image> <image :src="showImg(botItem.headimg)"></image>
@ -759,7 +759,7 @@
margin-bottom: 34rpx; margin-bottom: 34rpx;
max-width: 100%; max-width: 100%;
padding-right:15rpx; padding-right:15rpx;
min-width: 340rpx; min-width: 320rpx;
background: #EFEFEF; background: #EFEFEF;
display: flex; display: flex;
align-items: center; align-items: center;
@ -777,6 +777,7 @@
padding-left: 15rpx; padding-left: 15rpx;
white-space: normal; white-space: normal;
font-size: 27rpx; font-size: 27rpx;
word-break: break-all;
} }
} }
.noStore{ .noStore{

5
subPackages/techan/index.vue
View File

@ -210,7 +210,7 @@
<view style="max-height: 600rpx;overflow-y: auto;"> <view style="max-height: 600rpx;overflow-y: auto;">
<view class="sp">规格</view> <view class="sp">规格</view>
<view class="sp-container"> <view class="sp-container">
<view style="position:relative;width: 100%;" v-for="(botItem,botIndex) in sku" :key="botIndex"> <view style="position:relative;max-width: 100%;" v-for="(botItem,botIndex) in sku" :key="botIndex">
<view :class="['botProduct','text-overflow',{'noStore':botItem.store==0},{'botProducts':productIndex==botIndex}]" <view :class="['botProduct','text-overflow',{'noStore':botItem.store==0},{'botProducts':productIndex==botIndex}]"
@click="changeProduct(botItem,botIndex)"> @click="changeProduct(botItem,botIndex)">
<image :src="showImg(botItem.headimg)"></image> <image :src="showImg(botItem.headimg)"></image>
@ -983,7 +983,7 @@
margin-bottom: 34rpx; margin-bottom: 34rpx;
max-width: 100%; max-width: 100%;
padding-right:15rpx; padding-right:15rpx;
min-width: 340rpx; min-width: 320rpx;
background: #EFEFEF; background: #EFEFEF;
display: flex; display: flex;
align-items: center; align-items: center;
@ -1001,6 +1001,7 @@
padding-left: 15rpx; padding-left: 15rpx;
white-space: normal; white-space: normal;
font-size: 27rpx; font-size: 27rpx;
word-break: break-all;
} }
} }
.noStore{ .noStore{

Write Preview
Loading…
Cancel
Save