This commit is contained in:
weipengfei 2023-11-10 18:02:00 +08:00
parent d87a8929a9
commit b5d9be778e
9 changed files with 47 additions and 8 deletions

View File

@ -49,7 +49,7 @@
<text class="tags_item ticket" v-if="item.issetCoupon">领券</text> <text class="tags_item ticket" v-if="item.issetCoupon">领券</text>
<text class="tags_item delivery" v-if="item.delivery_free == 1">包邮</text> <text class="tags_item delivery" v-if="item.delivery_free == 1">包邮</text>
</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" @click.stop="goShop(item.merchant.mer_id)"> <view class="company" v-if="item.merchant" @click.stop="goShop(item.merchant.mer_id)">
<text class="line1">{{item.merchant.mer_name}}</text> <text class="line1">{{item.merchant.mer_name}}</text>
<view class="flex" v-if="isStore != '1'"> <view class="flex" v-if="isStore != '1'">

View File

@ -30,6 +30,9 @@
</view> </view>
<view class="relase-two"> <view class="relase-two">
{{item.merchant&&item.merchant.distance}} {{item.merchant&&item.merchant.distance}}
</view>
<view class="relase-two">
{{item.merchant&&item.merchant.street_name}}
</view> </view>
</view> </view>
<!-- <view class="item-info"> <!-- <view class="item-info">
@ -147,9 +150,10 @@
.relase { .relase {
display: flex; display: flex;
flex-wrap: wrap;
margin-left: 21rpx; margin-left: 21rpx;
margin-top: 12rpx; margin-top: 12rpx;
height: 26rpx; min-height: 26rpx;
line-height: 26rpx; line-height: 26rpx;
.relase-one { .relase-one {

View File

@ -295,6 +295,16 @@
} }
}, },
{
"path": "supply_chain/supplierB",
"style": {
"enablePullDownRefresh": true,
"navigationBarTitleText": "",
"navigationBarBackgroundColor": "#e93323",
"navigationStyle": "custom"
}
},
{ {
"path": "supply_chain/suppliers", "path": "supply_chain/suppliers",
"style": { "style": {
@ -349,6 +359,14 @@
"enablePullDownRefresh": true "enablePullDownRefresh": true
} }
}, {
"path": "cloud_entrepot/indexb",
"style": {
"navigationStyle": "custom",
"navigationBarTitleText": "里海云仓",
"enablePullDownRefresh": true
}
}, { }, {
"path": "teach_video/teach_video", "path": "teach_video/teach_video",
"style": { "style": {

View File

@ -98,7 +98,7 @@
<text class="tags_item delivery" v-if="item.delivery_free == 1">包邮</text> <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 class="ticket-big" v-if="!is_switch && item.issetCoupon">领券满{{item.issetCoupon.use_min_price}}{{item.issetCoupon.coupon_price}}</view> -->
</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"> <view class="company" v-if="item.merchant && hide_mer_status==0">
<text class='name line1'>{{item.merchant.mer_name}}</text> <text class='name line1'>{{item.merchant.mer_name}}</text>

View File

@ -994,6 +994,7 @@
ChangeAttr: function(res) { ChangeAttr: function(res) {
let productSelect = this.productValue[res]; let productSelect = this.productValue[res];
if (productSelect) this.$set(this, "uniqueValue", productSelect.unique); if (productSelect) this.$set(this, "uniqueValue", productSelect.unique);
console.log(productSelect, this.storeInfo);
if (productSelect && productSelect.stock > 0) { if (productSelect && productSelect.stock > 0) {
this.$set(this.attr.productSelect, "image", productSelect.image ? productSelect.image : this this.$set(this.attr.productSelect, "image", productSelect.image ? productSelect.image : this
.storeInfo .storeInfo

View File

@ -186,7 +186,7 @@
</view> </view>
<!-- 购物车 --> <!-- 购物车 -->
<view class="card" :style="`bottom:${appInfo.bottom+10}px`" <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="left">
<view class="cart" :class="{ act_cart: act_cart }" style="position: relative; z-index: 9999999"> <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" <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'; let src = 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13';
return { return {
skuform: {}, skuform: {},
location: null, location: null,
source: null,
defaInd: [0, 0], defaInd: [0, 0],
showPicker: false, showPicker: false,
columnData: [], columnData: [],
@ -421,6 +422,7 @@
onLoad(e) { onLoad(e) {
// this.cartFn() // this.cartFn()
this.location = e.location; this.location = e.location;
this.source = e.source;
this.appInfo = this.$appInfo.safeAreaInsets this.appInfo = this.$appInfo.safeAreaInsets
this.winHeight = this.$appInfo.windowHeight this.winHeight = this.$appInfo.windowHeight
this.street_code = e.street this.street_code = e.street
@ -634,6 +636,7 @@
product_id: this.skuform.product_id, product_id: this.skuform.product_id,
product_type: this.skuform.product_type, product_type: this.skuform.product_type,
spread_id: "", spread_id: "",
source: this.source
}).then((res, err) => { }).then((res, err) => {
this.cartFn() this.cartFn()
uni.showToast({ uni.showToast({
@ -779,6 +782,7 @@
product_id: item.product_id, product_id: item.product_id,
product_type: item.product_type, product_type: item.product_type,
spread_id: "", spread_id: "",
source: this.source
} }
let that = this let that = this

View File

@ -147,6 +147,10 @@
<u--image :showLoading="true" src="/static/images/GXSC/DH.png" width="33.85rpx" <u--image :showLoading="true" src="/static/images/GXSC/DH.png" width="33.85rpx"
height="33.85rpx"></u--image> height="33.85rpx"></u--image>
<text> {{item.service_phone}}</text> <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>
<view class="li" style="align-items: center;"> <view class="li" style="align-items: center;">
<u--image :showLoading="true" src="/static/images/GXSC/SJ.png" width="33.85rpx" <u--image :showLoading="true" src="/static/images/GXSC/SJ.png" width="33.85rpx"
@ -1148,6 +1152,7 @@
} }
.right { .right {
flex: 1;
.head { .head {
font-weight: bold; font-weight: bold;
// color: red; // color: red;
@ -1155,6 +1160,7 @@
} }
.li { .li {
width: 100%;
display: flex; display: flex;
font-size: 26.29rpx; font-size: 26.29rpx;
margin-bottom: 10rpx; margin-bottom: 10rpx;

View File

@ -220,6 +220,7 @@
loadend: false, // loadend: false, //
loadTitle: '加载更多', // loadTitle: '加载更多', //
product_type: 0, product_type: 0,
source: null, //(103)
isFooter: false, isFooter: false,
cartCount: 0, cartCount: 0,
goodsHidden: true, goodsHidden: true,
@ -252,7 +253,6 @@
productSelect: {} productSelect: {}
}, },
isOpen: false, // isOpen: false, //
source: '',
attrImage: '', attrImage: '',
isCart: true, isCart: true,
cart_id: '', cart_id: '',
@ -274,6 +274,7 @@
mounted: function() {}, mounted: function() {},
onLoad: function(options) { onLoad: function(options) {
this.product_type = options.product_type || 0; this.product_type = options.product_type || 0;
this.source = options.source || null;
}, },
onShow: function() { onShow: function() {
this.appInfo = this.$appInfo.safeAreaInsets this.appInfo = this.$appInfo.safeAreaInsets
@ -578,8 +579,10 @@
}) })
}) })
if (selectValue.length > 0) { 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({ uni.navigateTo({
url: '/pages/users/order_confirm/index?cartId=' + selectValue.join(',') + '&product_type=' + this.product_type url: url
}); });
} else { } else {
return this.$util.Tips({ return this.$util.Tips({

View File

@ -658,6 +658,7 @@
is_take: '', is_take: '',
domain: HTTP_REQUEST_URL, domain: HTTP_REQUEST_URL,
product_type: '', product_type: '',
source: null,
interest_rate: '', // interest_rate: '', //
settle_cycle: '', // settle_cycle: '', //
type_id: '', // type_id: '', //
@ -680,6 +681,7 @@
onLoad: function(options) { onLoad: function(options) {
this.type_id = options.type_id this.type_id = options.type_id
this.product_type = options.product_type this.product_type = options.product_type
this.source = options.source
this.seckillId = options.seckillId this.seckillId = options.seckillId
// #ifdef H5 // #ifdef H5
this.from = this.$wechat.isWeixin() ? 'weixin' : 'h5' this.from = this.$wechat.isWeixin() ? 'weixin' : 'h5'
@ -1030,7 +1032,8 @@
takes: that.take, takes: that.take,
use_coupon: that.subCoupon, use_coupon: that.subCoupon,
use_integral: that.use_integral, use_integral: that.use_integral,
product_type: that.product_type product_type: that.product_type,
source: that.source
}).then(res => { }).then(res => {
// //
that.product_type=res.data.order_type that.product_type=res.data.order_type