hly
/
aluminium-trading-uniapp-240925
generated from hly/uniapp-shop-templates
1
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity
Browse Source

对接登录

master
前端-胡立永 5 months ago
parent
fb34ed582f
commit
98b2169123
8 changed files with 98 additions and 42 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +7
    -0
      components/user/productList.vue
  2. +1
    -0
      pages/index/index.vue
  3. +4
    -2
      pages/index/tradingPlatform.vue
  4. +4
    -3
      pages_order/components/product/submit.vue
  5. +4
    -8
      pages_order/order/offerOrBillLading.vue
  6. +66
    -17
      pages_order/product/productDetail.vue
  7. +8
    -8
      pages_order/tradingPlatform/nowOrder.vue
  8. +4
    -4
      uni_modules/uv-empty/components/uv-empty/props.js

+ 7
- 0
components/user/productList.vue View File

@ -1,6 +1,7 @@
<template> <template>
<view class="page"> <view class="page">
<view v-if="list.length>0" class="item" <view v-if="list.length>0" class="item"
@click="toDetail(item)"
v-for="(item, index) in list" :key="index"> v-for="(item, index) in list" :key="index">
<view class="top"> <view class="top">
<view class="service"> <view class="service">
@ -106,6 +107,12 @@
index, // 当前显示的资源序号 index, // 当前显示的资源序号
}) })
}, },
toDetail(item){
this.$store.state.productDetail = item
uni.navigateTo({
url: '/pages_order/product/productDetail'
})
},
} }
} }
</script> </script>


+ 1
- 0
pages/index/index.vue View File

@ -84,6 +84,7 @@
}, },
goToPage(titleIndex) { goToPage(titleIndex) {
this.$store.state.orderDetail = {}
uni.navigateTo({ uni.navigateTo({
url: '/pages_order/order/offerOrBillLading?titleIndex=' + titleIndex url: '/pages_order/order/offerOrBillLading?titleIndex=' + titleIndex
}) })


+ 4
- 2
pages/index/tradingPlatform.vue View File

@ -38,6 +38,7 @@
</view> </view>
<view class="productList"> <view class="productList">
<productList :list="list" @previewVideo="previewVideo"/> <productList :list="list" @previewVideo="previewVideo"/>
<uv-empty mode="list" v-if="list.length == 0"></uv-empty>
</view> </view>
</view> </view>
</view> </view>
@ -274,9 +275,10 @@
<style scoped lang="scss"> <style scoped lang="scss">
.trading-platform { .trading-platform {
background-color: #000;
background-image: url('../../static/image/index/1.png'); background-image: url('../../static/image/index/1.png');
padding-bottom: 100rpx; padding-bottom: 100rpx;
min-height: 100vh;
.frame { .frame {
display: flex; display: flex;
@ -293,7 +295,7 @@
.supplier { .supplier {
// height: 70%; // height: 70%;
padding: 20rpx 20rpx; padding: 20rpx 20rpx;
background-image: url('../../static/image/index/1.png');
// background-image: url('../../static/image/index/1.png');
color: #FFF; color: #FFF;
font-size: 32rpx; font-size: 32rpx;


+ 4
- 3
pages_order/components/product/submit.vue View File

@ -1,6 +1,6 @@
<template> <template>
<view class="submit"> <view class="submit">
<view class=""
<!-- <view class=""
@click="$emit('share')"> @click="$emit('share')">
<uv-icon <uv-icon
size="40rpx" size="40rpx"
@ -17,7 +17,7 @@
<view class=""> <view class="">
购物车 购物车
</view> </view>
</view>
</view> -->
<view class="btn" <view class="btn"
@click="$emit('submit')"> @click="$emit('submit')">
{{ submiitTitle }} {{ submiitTitle }}
@ -30,7 +30,7 @@
name:"submit", name:"submit",
props : { props : {
submiitTitle : { submiitTitle : {
default : '立即租赁',
default : '立即购买',
type : String, type : String,
} }
}, },
@ -57,6 +57,7 @@
justify-content: center; justify-content: center;
align-items: center; align-items: center;
font-size: 24rpx; font-size: 24rpx;
z-index: 99;
.btn{ .btn{
background: $uni-color; background: $uni-color;
width: 600rpx; width: 600rpx;


+ 4
- 8
pages_order/order/offerOrBillLading.vue View File

@ -84,12 +84,8 @@
<view class="item" <view class="item"
@click="$refs.productTypePicker.open()"> @click="$refs.productTypePicker.open()">
<view>商品类型</view> <view>商品类型</view>
<view class=""
v-if="form.productType != 0 && !form.productType">
请选择类型
</view>
<view v-else>
{{ form.productType == -1 ? '请选择类型' : productType[form.productType] }}
<view>
{{ form.productType == 2 ? '请选择类型' : productType[form.productType] }}
</view> </view>
<view class="icon"> <view class="icon">
<uv-icon name="arrow-right" size="30rpx"></uv-icon> <uv-icon name="arrow-right" size="30rpx"></uv-icon>
@ -285,7 +281,7 @@
this.titleIndex = options.titleIndex || 0;//默认供应商报价 this.titleIndex = options.titleIndex || 0;//默认供应商报价
this.type = options.type this.type = options.type
if(options.type = 'edit'){
if(options.type == 'edit'){
this.form = this.$store.state.orderDetail this.form = this.$store.state.orderDetail
@ -334,7 +330,7 @@
"num": 1, "num": 1,
"price": '', "price": '',
"transactionTime": dayjs(new Date()).format("YYYY-MM-DD"), "transactionTime": dayjs(new Date()).format("YYYY-MM-DD"),
productType : 0,
productType : 2,
}, },
address: { address: {
name: '请选择地址', name: '请选择地址',


+ 66
- 17
pages_order/product/productDetail.vue View File

@ -4,25 +4,26 @@
<view class="swipe"> <view class="swipe">
<uv-swiper <uv-swiper
:list="productDetail.image.split(',')"
v-if="productDetail.picDetail"
:list="productDetail.picDetail.split(',')"
indicator indicator
height="350rpx"></uv-swiper> height="350rpx"></uv-swiper>
</view> </view>
<view class="info"> <view class="info">
<view class="title"> <view class="title">
桌布租赁
{{ productDetail.specsName }}
</view> </view>
<view class="info-line"> <view class="info-line">
<view class="price"> <view class="price">
￥<text>45.9</text>起
单价￥<text>{{ productDetail.price }}</text>
</view> </view>
<view class="num"> <view class="num">
已售1000+
<image src="../static/product/like.png" mode=""></image>
库存{{ productDetail.num }}
<!-- <image src="../static/product/like.png" mode=""></image> -->
</view> </view>
</view> </view>
<view class="tips">
<!-- <view class="tips">
<view class="tip"> <view class="tip">
专业设备 专业设备
</view> </view>
@ -32,10 +33,10 @@
<view class="tip"> <view class="tip">
质量保证 质量保证
</view> </view>
</view>
</view> -->
</view> </view>
<view class="info-unit">
<!-- <view class="info-unit">
<uv-cell title="是否有桌布" isLink> <uv-cell title="是否有桌布" isLink>
<template #icon> <template #icon>
<text class="text">桌布</text> <text class="text">桌布</text>
@ -53,22 +54,60 @@
<text>上门取件·送货上门</text> <text>上门取件·送货上门</text>
</template> </template>
</uv-cell> </uv-cell>
</view> -->
<!-- <uv-parse :content="productDetail.content"></uv-parse> -->
<view class="content"
v-if="productDetail.video">
<view class="title">
商品视频
</view>
<view class="list-video">
<view class="video"
:key="index"
v-for="(item, index) in productDetail.video.split(',')">
<video :src="item"></video>
</view>
</view>
</view>
<view class="content"
v-if="productDetail.report">
<view class="title">
检测报告
</view>
<view class=""
style="padding: 0 30rpx;">
<uv-album
:urls="productDetail.report.split(',')"></uv-album>
</view>
</view> </view>
<view class="content">
<view class="content"
v-if="productDetail.reportVideo">
<view class="title"> <view class="title">
商品详情
检测视频
</view>
<view class="list-video">
<view class="video"
:key="index"
v-for="(item, index) in productDetail.reportVideo.split(',')">
<video :src="item"></video>
</view>
</view> </view>
<uv-parse :content="productDetail.content"></uv-parse>
</view> </view>
<!-- 分享和租赁按钮 --> <!-- 分享和租赁按钮 -->
<submit <submit
@submit="$refs.submitUnitSelect.open()"
@submit="submit"
@share="share"/> @share="share"/>
<!-- 选择规格 --> <!-- 选择规格 -->
<submitUnitSelect ref="submitUnitSelect"/>
<!-- <submitUnitSelect ref="submitUnitSelect"/> -->
</view> </view>
</template> </template>
@ -83,13 +122,11 @@
data() { data() {
return { return {
productDetail : { productDetail : {
image : 'https://cdn.uviewui.com/uview/swiper/swiper3.png,https://cdn.uviewui.com/uview/swiper/swiper2.png',
content : '',
} }
} }
}, },
onLoad(args) { onLoad(args) {
console.log(args);
this.productDetail = this.$store.state.productDetail
}, },
methods: { methods: {
// 分享商品 // 分享商品
@ -98,7 +135,9 @@
}, },
// 选择完成规格立即租赁下单 // 选择完成规格立即租赁下单
submit(){ submit(){
uni.navigateTo({
url: `/pages_order/tradingPlatform/nowOrder`,
});
} }
} }
} }
@ -106,6 +145,7 @@
<style scoped lang="scss"> <style scoped lang="scss">
.page{ .page{
padding-bottom: 120rpx;
.swipe{ .swipe{
} }
@ -165,5 +205,14 @@
padding: 30rpx; padding: 30rpx;
} }
} }
.list-video{
display: flex;
flex-wrap: wrap;
video{
width: 750rpx;
height: 420rpx;
}
}
} }
</style> </style>

+ 8
- 8
pages_order/tradingPlatform/nowOrder.vue View File

@ -2,12 +2,12 @@
<view class="now-order"> <view class="now-order">
<navbar :title="$t('pageTitle.immediateOrder')" leftClick @leftClick="$utils.navigateBack" /> <navbar :title="$t('pageTitle.immediateOrder')" leftClick @leftClick="$utils.navigateBack" />
<uv-swiper
<!-- <uv-swiper
v-if="fatherData.picDetail" v-if="fatherData.picDetail"
:list="fatherData.picDetail.split(',')" :list="fatherData.picDetail.split(',')"
height="420rpx" height="420rpx"
> >
</uv-swiper>
</uv-swiper> -->
<view class="frame"> <view class="frame">
<view class="title"> <view class="title">
@ -34,7 +34,7 @@
</view> </view>
</view> --> </view> -->
<!--详情视频--> <!--详情视频-->
<view class="item"
<!-- <view class="item"
v-if="fatherData.video"> v-if="fatherData.video">
<view>详情视频</view> <view>详情视频</view>
<view class="list-video"> <view class="list-video">
@ -44,18 +44,18 @@
<video :src="item"></video> <video :src="item"></video>
</view> </view>
</view> </view>
</view>
</view> -->
<!--检测报告--> <!--检测报告-->
<view class="item"
<!-- <view class="item"
v-if="fatherData.report"> v-if="fatherData.report">
<view>检测报告</view> <view>检测报告</view>
<view> <view>
<uv-album :urls="fatherData.report.split(',')"></uv-album> <uv-album :urls="fatherData.report.split(',')"></uv-album>
</view> </view>
</view>
</view> -->
<!--检测视频--> <!--检测视频-->
<view class="item"
<!-- <view class="item"
v-if="fatherData.reportVideo"> v-if="fatherData.reportVideo">
<view>检测视频</view> <view>检测视频</view>
<view class="list-video"> <view class="list-video">
@ -65,7 +65,7 @@
<video :src="item"></video> <video :src="item"></video>
</view> </view>
</view> </view>
</view>
</view> -->
<!--<uv-divider text="" :hairline="true"></uv-divider>--> <!--<uv-divider text="" :hairline="true"></uv-divider>-->


+ 4
- 4
uni_modules/uv-empty/components/uv-empty/props.js View File

@ -18,7 +18,7 @@ export default {
// 文字大小 // 文字大小
textSize: { textSize: {
type: [String, Number], type: [String, Number],
default: 14
default: 30
}, },
// 图标的颜色 // 图标的颜色
iconColor: { iconColor: {
@ -28,7 +28,7 @@ export default {
// 图标的大小 // 图标的大小
iconSize: { iconSize: {
type: [String, Number], type: [String, Number],
default: 90
default: 180
}, },
// 选择预置的图标类型 // 选择预置的图标类型
mode: { mode: {
@ -38,12 +38,12 @@ export default {
// 图标宽度，单位px // 图标宽度，单位px
width: { width: {
type: [String, Number], type: [String, Number],
default: 160
default: 320
}, },
// 图标高度，单位px // 图标高度，单位px
height: { height: {
type: [String, Number], type: [String, Number],
default: 160
default: 320
}, },
// 是否显示组件 // 是否显示组件
show: { show: {


Write Preview
Loading…
Cancel
Save