修复bug
This commit is contained in:
parent
f4f5a471e6
commit
b63f6f4336
|
@ -10,7 +10,8 @@
|
||||||
|
|
||||||
<view class="content-one">
|
<view class="content-one">
|
||||||
<view class="content-one-img">
|
<view class="content-one-img">
|
||||||
<image :src="item.mer_info&&item.mer_info.mer_avatar" mode="aspectFit"></image>
|
<!-- <image :src="item.mer_info&&item.mer_info.mer_avatar" mode="aspectFit"></image> -->
|
||||||
|
<image :src="item.entrust_mer_info&&item.entrust_mer_info.mer_avatar" mode="aspectFill"></image>
|
||||||
</view>
|
</view>
|
||||||
<view class="content-text">
|
<view class="content-text">
|
||||||
<view class="flex" style="justify-content: space-between;">
|
<view class="flex" style="justify-content: space-between;">
|
||||||
|
@ -570,7 +571,9 @@
|
||||||
width: 148rpx;
|
width: 148rpx;
|
||||||
height: 148rpx;
|
height: 148rpx;
|
||||||
margin-right: 28rpx;
|
margin-right: 28rpx;
|
||||||
border: 1px solid;
|
// border: 1px solid;
|
||||||
|
border-radius: 10rpx;
|
||||||
|
overflow: hidden;
|
||||||
|
|
||||||
image {
|
image {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
<view class="content-content" v-for="(item,i) in orderList" :key="i" @click="nav(item)">
|
<view class="content-content" v-for="(item,i) in orderList" :key="i" @click="nav(item)">
|
||||||
<view class="content-one">
|
<view class="content-one">
|
||||||
<view class="content-one-img">
|
<view class="content-one-img">
|
||||||
<image :src="item.mer_info&&item.mer_info.mer_avatar" mode="aspectFit"></image>
|
<image :src="item.mer_info&&item.mer_info.mer_avatar" mode="aspectFill"></image>
|
||||||
</view>
|
</view>
|
||||||
<view class="content-text">
|
<view class="content-text">
|
||||||
<view class="flex" style="justify-content: space-between;">
|
<view class="flex" style="justify-content: space-between;">
|
||||||
|
@ -515,7 +515,9 @@
|
||||||
width: 148rpx;
|
width: 148rpx;
|
||||||
height: 148rpx;
|
height: 148rpx;
|
||||||
margin-right: 28rpx;
|
margin-right: 28rpx;
|
||||||
border: 1px solid;
|
// border: 1px solid;
|
||||||
|
border-radius: 10rpx;
|
||||||
|
overflow: hidden;
|
||||||
flex-shrink: 0;
|
flex-shrink: 0;
|
||||||
|
|
||||||
image {
|
image {
|
||||||
|
|
|
@ -84,7 +84,7 @@
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<priceComponent :product_id="product_id" v-if="showCommodity"></priceComponent>
|
<priceComponent :product_id="product_id" :bar_code="code" v-if="showCommodity"></priceComponent>
|
||||||
|
|
||||||
<!-- <view class="popup_group">
|
<!-- <view class="popup_group">
|
||||||
<view class="radio">
|
<view class="radio">
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
components: {
|
components: {
|
||||||
selectForm
|
selectForm
|
||||||
},
|
},
|
||||||
props: ['product_id'],
|
props: ['product_id', 'bar_code'],
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
singleSpecification: {
|
singleSpecification: {
|
||||||
|
@ -108,12 +108,12 @@
|
||||||
|
|
||||||
watch: {
|
watch: {
|
||||||
singleSpecification: {
|
singleSpecification: {
|
||||||
handler(val) {
|
handler(val, old) {
|
||||||
this.singleSpecification = val;
|
this.singleSpecification = val;
|
||||||
this.saveSingleSpecification();
|
this.saveSingleSpecification();
|
||||||
},
|
},
|
||||||
deep: true
|
deep: true
|
||||||
}
|
},
|
||||||
},
|
},
|
||||||
// onLoad(option) {
|
// onLoad(option) {
|
||||||
// console.log(option);
|
// console.log(option);
|
||||||
|
@ -148,6 +148,7 @@
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
this.singleSpecification.bar_code = this.$props.bar_code;
|
||||||
// if (!this.$props.product_id) {
|
// if (!this.$props.product_id) {
|
||||||
// this.formList.push({
|
// this.formList.push({
|
||||||
// id: 10,
|
// id: 10,
|
||||||
|
|
|
@ -25,7 +25,8 @@
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<view class="top-two_content">
|
<view class="top-two_content">
|
||||||
<textarea :value="listobj.content" placeholder="" style="height: auto;" />
|
<!-- <textarea :value="listobj.content" placeholder="" style="height: auto;" /> -->
|
||||||
|
<view>{{listobj.content}}</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="top-two_img">
|
<view class="top-two_img">
|
||||||
|
|
||||||
|
@ -118,6 +119,7 @@
|
||||||
getCommunityshow,
|
getCommunityshow,
|
||||||
getCommunityaddCart
|
getCommunityaddCart
|
||||||
} from '@/api/trading-floor.js'
|
} from '@/api/trading-floor.js'
|
||||||
|
import { Toast } from '../../../libs/uniApi';
|
||||||
export default {
|
export default {
|
||||||
|
|
||||||
|
|
||||||
|
@ -159,9 +161,12 @@
|
||||||
uni.navigateTo({
|
uni.navigateTo({
|
||||||
url: '/pages/users/order_confirm/index?cartId=' + res.data.cart_id.toString()
|
url: '/pages/users/order_confirm/index?cartId=' + res.data.cart_id.toString()
|
||||||
})
|
})
|
||||||
|
}else {
|
||||||
|
Toast(res.message)
|
||||||
}
|
}
|
||||||
}).catch((err) => {
|
}).catch((err) => {
|
||||||
console.log(err)
|
console.log(err)
|
||||||
|
Toast(err)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue