更新
This commit is contained in:
weipengfei
parent
d87a8929a9
commit
b5d9be778e
@ -49,7 +49,7 @@
|
||||
<text class="tags_item ticket" v-if="item.issetCoupon">领券</text>
|
||||
<text class="tags_item delivery" v-if="item.delivery_free == 1">包邮</text>
|
||||
</view>
|
||||
<view class="score">{{item.rate}}评分 {{item.reply_count}}条评论</view>
|
||||
<view class="score">{{item.rate}}评分 {{item.reply_count}}条评论 <text v-if="item.merchant">{{' '+item.merchant.street_name}}</text></view>
|
||||
<view class="company" v-if="item.merchant" @click.stop="goShop(item.merchant.mer_id)">
|
||||
<text class="line1">{{item.merchant.mer_name}}</text>
|
||||
<view class="flex" v-if="isStore != '1'">
|
||||
|
||||
@ -30,6 +30,9 @@
|
||||
</view>
|
||||
<view class="relase-two">
|
||||
{{item.merchant&&item.merchant.distance}}
|
||||
</view>
|
||||
<view class="relase-two">
|
||||
{{item.merchant&&item.merchant.street_name}}
|
||||
</view>
|
||||
</view>
|
||||
<!-- <view class="item-info">
|
||||
@ -147,9 +150,10 @@
|
||||
|
||||
.relase {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
margin-left: 21rpx;
|
||||
margin-top: 12rpx;
|
||||
height: 26rpx;
|
||||
min-height: 26rpx;
|
||||
line-height: 26rpx;
|
||||
|
||||
.relase-one {
|
||||
|
||||
18
pages.json
18
pages.json
@ -295,6 +295,16 @@
|
||||
}
|
||||
|
||||
},
|
||||
{
|
||||
"path": "supply_chain/supplierB",
|
||||
"style": {
|
||||
"enablePullDownRefresh": true,
|
||||
"navigationBarTitleText": "",
|
||||
"navigationBarBackgroundColor": "#e93323",
|
||||
"navigationStyle": "custom"
|
||||
}
|
||||
|
||||
},
|
||||
{
|
||||
"path": "supply_chain/suppliers",
|
||||
"style": {
|
||||
@ -349,6 +359,14 @@
|
||||
"enablePullDownRefresh": true
|
||||
}
|
||||
|
||||
}, {
|
||||
"path": "cloud_entrepot/indexb",
|
||||
"style": {
|
||||
"navigationStyle": "custom",
|
||||
"navigationBarTitleText": "里海云仓",
|
||||
"enablePullDownRefresh": true
|
||||
}
|
||||
|
||||
}, {
|
||||
"path": "teach_video/teach_video",
|
||||
"style": {
|
||||
|
||||
@ -98,7 +98,7 @@
|
||||
<text class="tags_item delivery" v-if="item.delivery_free == 1">包邮</text>
|
||||
<!-- <view class="ticket-big" v-if="!is_switch && item.issetCoupon">领券满{{item.issetCoupon.use_min_price}}减{{item.issetCoupon.coupon_price}}</view> -->
|
||||
</view>
|
||||
<view class="score">{{item.rate}}评分 {{item.reply_count}}条评论</view>
|
||||
<view class="score">{{item.rate}}评分 {{item.reply_count}}条评论 <text v-if="item.merchant">{{item.merchant.street_name}}</text></view>
|
||||
<view class="company" v-if="item.merchant && hide_mer_status==0">
|
||||
<text class='name line1'>{{item.merchant.mer_name}}</text>
|
||||
|
||||
|
||||
@ -994,6 +994,7 @@
|
||||
ChangeAttr: function(res) {
|
||||
let productSelect = this.productValue[res];
|
||||
if (productSelect) this.$set(this, "uniqueValue", productSelect.unique);
|
||||
console.log(productSelect, this.storeInfo);
|
||||
if (productSelect && productSelect.stock > 0) {
|
||||
this.$set(this.attr.productSelect, "image", productSelect.image ? productSelect.image : this
|
||||
.storeInfo
|
||||
|
||||
@ -186,7 +186,7 @@
|
||||
</view>
|
||||
<!-- 购物车 -->
|
||||
<view class="card" :style="`bottom:${appInfo.bottom+10}px`"
|
||||
@click="navgo('/pages/order_addcart/order_addcart?product_type=98')">
|
||||
@click="navgo('/pages/order_addcart/order_addcart?product_type=98&source='+source)">
|
||||
<view class="left">
|
||||
<view class="cart" :class="{ act_cart: act_cart }" style="position: relative; z-index: 9999999">
|
||||
<u--image :showLoading="true" src="/static/images/LHYC/GWC.png" width="63.09rpx"
|
||||
@ -357,7 +357,8 @@
|
||||
let src = 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13';
|
||||
return {
|
||||
skuform: {},
|
||||
location: null,
|
||||
location: null,
|
||||
source: null,
|
||||
defaInd: [0, 0],
|
||||
showPicker: false,
|
||||
columnData: [],
|
||||
@ -421,6 +422,7 @@
|
||||
onLoad(e) {
|
||||
// this.cartFn()
|
||||
this.location = e.location;
|
||||
this.source = e.source;
|
||||
this.appInfo = this.$appInfo.safeAreaInsets
|
||||
this.winHeight = this.$appInfo.windowHeight
|
||||
this.street_code = e.street
|
||||
@ -634,6 +636,7 @@
|
||||
product_id: this.skuform.product_id,
|
||||
product_type: this.skuform.product_type,
|
||||
spread_id: "",
|
||||
source: this.source
|
||||
}).then((res, err) => {
|
||||
this.cartFn()
|
||||
uni.showToast({
|
||||
@ -779,6 +782,7 @@
|
||||
product_id: item.product_id,
|
||||
product_type: item.product_type,
|
||||
spread_id: "",
|
||||
source: this.source
|
||||
}
|
||||
let that = this
|
||||
|
||||
|
||||
@ -147,6 +147,10 @@
|
||||
<u--image :showLoading="true" src="/static/images/GXSC/DH.png" width="33.85rpx"
|
||||
height="33.85rpx"></u--image>
|
||||
<text> {{item.service_phone}}</text>
|
||||
<!-- <image src="../../../static/images/MYTC/SJicon.png"></image> -->
|
||||
<u--image :showLoading="true" src="/static/images/address.png" width="33.85rpx"
|
||||
height="33.85rpx"></u--image>
|
||||
<view >{{item.street_name}}</view>
|
||||
</view>
|
||||
<view class="li" style="align-items: center;">
|
||||
<u--image :showLoading="true" src="/static/images/GXSC/SJ.png" width="33.85rpx"
|
||||
@ -1148,6 +1152,7 @@
|
||||
}
|
||||
|
||||
.right {
|
||||
flex: 1;
|
||||
.head {
|
||||
font-weight: bold;
|
||||
// color: red;
|
||||
@ -1155,6 +1160,7 @@
|
||||
}
|
||||
|
||||
.li {
|
||||
width: 100%;
|
||||
display: flex;
|
||||
font-size: 26.29rpx;
|
||||
margin-bottom: 10rpx;
|
||||
|
||||
@ -220,6 +220,7 @@
|
||||
loadend: false, //是否加载完毕
|
||||
loadTitle: '加载更多', //提示语
|
||||
product_type: 0,
|
||||
source: null, //云商品标记(103)
|
||||
isFooter: false,
|
||||
cartCount: 0,
|
||||
goodsHidden: true,
|
||||
@ -252,7 +253,6 @@
|
||||
productSelect: {}
|
||||
},
|
||||
isOpen: false, //是否打开属性组件
|
||||
source: '',
|
||||
attrImage: '',
|
||||
isCart: true,
|
||||
cart_id: '',
|
||||
@ -274,6 +274,7 @@
|
||||
mounted: function() {},
|
||||
onLoad: function(options) {
|
||||
this.product_type = options.product_type || 0;
|
||||
this.source = options.source || null;
|
||||
},
|
||||
onShow: function() {
|
||||
this.appInfo = this.$appInfo.safeAreaInsets
|
||||
@ -578,8 +579,10 @@
|
||||
})
|
||||
})
|
||||
if (selectValue.length > 0) {
|
||||
let url = '/pages/users/order_confirm/index?cartId=' + selectValue.join(',') + '&product_type=' + this.product_type;
|
||||
if(this.source) url = url + '&source=' + this.source;
|
||||
uni.navigateTo({
|
||||
url: '/pages/users/order_confirm/index?cartId=' + selectValue.join(',') + '&product_type=' + this.product_type
|
||||
url: url
|
||||
});
|
||||
} else {
|
||||
return this.$util.Tips({
|
||||
|
||||
@ -658,6 +658,7 @@
|
||||
is_take: '',
|
||||
domain: HTTP_REQUEST_URL,
|
||||
product_type: '',
|
||||
source: null,
|
||||
interest_rate: '', //利率
|
||||
settle_cycle: '', // 周期
|
||||
type_id: '', //店铺类型
|
||||
@ -680,6 +681,7 @@
|
||||
onLoad: function(options) {
|
||||
this.type_id = options.type_id
|
||||
this.product_type = options.product_type
|
||||
this.source = options.source
|
||||
this.seckillId = options.seckillId
|
||||
// #ifdef H5
|
||||
this.from = this.$wechat.isWeixin() ? 'weixin' : 'h5'
|
||||
@ -1030,7 +1032,8 @@
|
||||
takes: that.take,
|
||||
use_coupon: that.subCoupon,
|
||||
use_integral: that.use_integral,
|
||||
product_type: that.product_type
|
||||
product_type: that.product_type,
|
||||
source: that.source
|
||||
}).then(res => {
|
||||
// 默认选中
|
||||
that.product_type=res.data.order_type
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user