liudan 7 months ago
parent 3431a0921b
commit bc9d8b6ec8
  1. 10
      pages/index/component/goodList.vue
  2. 2
      pages/index/component/headerSerch.vue
  3. 2
      pages/index/component/swiperBg.vue
  4. 3
      pages/user/index.vue
  5. 4
      pages/users/order_confirm/index.vue

@ -22,7 +22,7 @@
<view v-if="priceShow" class="price acea-row" :style="'color:'+priceColor"> <view v-if="priceShow" class="price acea-row" :style="'color:'+priceColor">
<view> <view>
¥ ¥
<text>{{ item.price }}</text> <text>{{ item.price }}</text><text>+积分{{ item.point }}</text>
</view> </view>
</view> </view>
</view> </view>
@ -42,7 +42,7 @@
<view class="text-info"> <view class="text-info">
<view v-if="titleShow" class="title line1">{{ item.store_name }}</view> <view v-if="titleShow" class="title line1">{{ item.store_name }}</view>
<view v-if="priceShow" class="price acea-row" :style="'color:'+priceColor"> <view v-if="priceShow" class="price acea-row" :style="'color:'+priceColor">
<view>¥<text>{{ item.price }}</text></view> <view>¥<text>{{ item.price }}</text><text>+积分{{ item.point }}</text></view>
</view> </view>
</view> </view>
</view> </view>
@ -62,7 +62,7 @@
<view v-if="titleShow" class="title line1">{{ item.store_name }}</view> <view v-if="titleShow" class="title line1">{{ item.store_name }}</view>
<view v-if="priceShow" class="price"> <view v-if="priceShow" class="price">
<view v-if="priceShow" :style="'color:'+priceColor"> <view v-if="priceShow" :style="'color:'+priceColor">
¥<text>{{ item.price }}</text> ¥<text>{{ item.price }}</text><text>+积分{{ item.point }}</text>
</view> </view>
</view> </view>
</view> </view>
@ -81,7 +81,7 @@
<view v-if="priceShow || opriceShow" class="price"> <view v-if="priceShow || opriceShow" class="price">
<view v-if="priceShow" :style="'color:'+priceColor"> <view v-if="priceShow" :style="'color:'+priceColor">
<text></text> <text></text>
{{ item.price }} {{ item.price }}<text>+积分{{ item.point }}</text>
</view> </view>
</view> </view>
</view> </view>
@ -274,7 +274,7 @@ export default {
font-size: 26rpx; font-size: 26rpx;
align-items: center; align-items: center;
text { text {
font-size: 36rpx; font-size: 28rpx;
font-weight: 550; font-weight: 550;
} }
.ot-price{ .ot-price{

@ -162,7 +162,7 @@
.serch-wrapper { .serch-wrapper {
display: flex; display: flex;
align-items: center; align-items: center;
padding: 24rpx 20rpx 0 20rpx; padding: 24rpx 20rpx;
position: relative; position: relative;
.box{ .box{
flex: 1; flex: 1;

@ -8,7 +8,7 @@
</block> </block>
<block v-else> <block v-else>
<view class="swiper page_swiper" :class="[docConfig == 1 ? 'square' : docConfig == 0 ? 'circular' : 'nodoc',imgConfig ? '' : 'fillet','dot'+txtStyle]" <view class="swiper page_swiper" :class="[docConfig == 1 ? 'square' : docConfig == 0 ? 'circular' : 'nodoc',imgConfig ? '' : 'fillet','dot'+txtStyle]"
:style="'padding:10px 15px 12px 15px'" :style="'padding:0px 15px 12px 15px'"
v-if="imgUrls.length"> v-if="imgUrls.length">
<swiper <swiper
indicator-dots="true" indicator-dots="true"

@ -780,7 +780,7 @@
} }
.nameFlag{ .nameFlag{
width: 90rpx; min-width: 90rpx;
height: 40rpx; height: 40rpx;
background: #FFB424; background: #FFB424;
border-radius: 20rpx 0rpx 20rpx 0px; border-radius: 20rpx 0rpx 20rpx 0px;
@ -791,6 +791,7 @@
text-align: center; text-align: center;
line-height: 36rpx; line-height: 36rpx;
margin-left:20rpx; margin-left:20rpx;
padding: 0 10rpx;
} }
.num { .num {
display: flex; display: flex;

@ -343,7 +343,7 @@
</view> </view>
</form> </form>
</view> </view>
<view class="orderType" v-if="productType!=2"> <view class="orderType" v-if="productType==1">
<view class="orderTypeTitle"> <view class="orderTypeTitle">
订单类型 订单类型
</view> </view>
@ -1583,7 +1583,7 @@
title: '请阅读并勾选协议,否则无法进行操作' title: '请阅读并勾选协议,否则无法进行操作'
}); });
} }
if(!that.orderType&&that.productType!=2){ if(!that.orderType&&that.productType==1){
return that.$util.Tips({ return that.$util.Tips({
title: '请选择订单类型' title: '请选择订单类型'
}); });

Loading…
Cancel
Save