Merge branch 'master' of http://gits.hdlkeji.com:3000/qcf/wx-qhb

components/kj-flow/kj-flow.vue

@@ -7,28 +7,31 @@
 		</view>
 		<view class="u-flex" style="margin-top: 56rpx;">
 			<scroll-view scroll-y="true" class="left">
-				<view v-for="(item,idx) in 6" :key="idx" @click="changea(idx)"
+				<view v-for="(item,idx) in transportList" :key="idx" @click="changea(item,idx)"
 					style="height: 134rpx;display: flex;flex-direction: column;align-items: center;justify-content: center;"
 					:style="{background:idx==leftchange? '':'#F7F7F7'}">
-					<view class="ititle" :style="{fontWeight:idx==leftchange?'600':''}">海运散货</view>
-					<view class="itime" v-if="idx==leftchange">预计到货时间 </view>
-					<view class="itime" v-if="idx==leftchange">2023-12-31</view>
+					<view class="ititle" :style="{fontWeight:idx==leftchange?'600':''}">{{item.name}}</view>
+					<view class="itime" v-if="idx==leftchange&&containerList.length>0">预计到货时间 </view>
+					<view class="itime" v-if="idx==leftchange&&containerList.length>0">{{estimated_arrived_date}}</view>
 				</view>
 			</scroll-view>
 			<scroll-view scroll-y="true" class="right" style="margin-left: 36rpx;">
-				<view v-for="(item,idx) in 6" :key="idx" @click="change(idx)"
-					style="height: 134rpx;display: flex;flex-direction: column;align-items: center;justify-content: center;" class="iitem">
-					<view class="ititle u-flex u-row-between" style="width: 100%;" >
-						<view class="ititle">发柜时间 2023-12-15</view>
-						<view>海运1号柜</view>
+				<view v-for="(item,idx) in containerList" :key="idx" @click="change(item,idx)"
+					style="height: 134rpx;display: flex;flex-direction: column;align-items: center;justify-content: center;"
+					class="iitem">
+					<view class="ititle u-flex u-row-between" style="width: 100%;">
+						<view class="ititle">发柜时间 {{item.begin_date}}</view>
+						<view>{{item.name}}</view>
 					</view>
 					<view class="u-flex u-row-between" style="margin-top: 16rpx;width: 100%;">
 						<view class="price">
 							<text style='font-size="24rpx"'>¥</text>
-							<text style='font-size="32rpx"'>12</text>
-							<text style='font-size="28rpx"'>kg</text>
+							<text style='font-size="32rpx"' v-if="goodstype='normal'">{{item.normal_delivery_fee}}</text>
+							<text style='font-size="32rpx"' v-else>{{item.special_delivery_fee}}</text>
+							<text style='font-size="28rpx"'>/kg</text>
 						</view>
-						<u-icon v-if="idx==rightchange" name="checkbox-mark" color="rgba(248, 50, 36, 1)" size="28"></u-icon>
+						<u-icon v-if="idx==rightchange" name="checkbox-mark" color="rgba(248, 50, 36, 1)"
+							size="28"></u-icon>
 						<view v-else class="" style="width: 28px;height: 28px;"></view>
 					</view>
 				</view>
@@ -43,11 +46,25 @@
 
 <script>
 	export default {
+		props: {
+			province_id:{
+				typeof:Number
+			},
+			goodstype:{
+				typeof:''
+			}
+		},
 		name: "kj-flow",
 		data() {
 			return {
-				leftchange:0,
-				rightchange:0,
+				leftchange: 0,
+				rightchange: 0,
+				containerList: [],
+				transportList: [],
+				estimated_arrived_date:'',
+				leftname:'',
+				rightname:'',
+				dateid:''
 			};
 		},
 		computed: {
@@ -55,31 +72,72 @@
 				return this.$t('index')
 			}
 		},
-		methods:{
+		methods: {
+			//货柜列表
+			container(id) {
+				uni.$u.http.get('/api/container', {
+					params: {
+						is_page: 0,
+						province_id: this.province_id,
+						transport_type_id: id
+					}
+				}).then((res) => {
+					this.containerList = res
+					this.estimated_arrived_date = res[0].estimated_arrived_date
+					this.dateid = res[0].id
+					this.rightname = res[0].name
+				}).catch(() => {
+
+				})
+			},
+			transport() {
+				uni.$u.http.get('/api/transport-type').then((res) => {
+					this.transportList = res
+					console.log(res[0].id);
+					this.container(res[0].id)
+				}).catch(() => {
+
+				})
+			},
+
 			//左边切换
-			changea(index){
+			changea(item,index) {
 				this.leftchange = index
+				this.container(item.id)
+				this.leftname = item.name
 				console.log(this.leftchange);
 			},
 			//右边切换
-			change(idx){
+			change(item,idx) {
 				this.rightchange = idx
+				this.dateid = item.id
+				this.rightname = item.name
 			},
-			close(){
+			close() {
 				this.$emit('close')
 			},
-			enter(){
-				this.$emit('success')
+			enter() {
+				if(this.dateid==''){
+					this.$u.toast('请选择货柜')
+				}else{
+					this.$emit('success',{
+						dateid:this.dateid,
+						rightname:this.rightname,
+						leftname:this.leftname
+					})
+				}
+				
 			}
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
-	.iitem{
+	.iitem {
 		border-bottom: 2rpx solid rgba(151, 151, 151, 0.1);
 		box-sizing: border-box;
 	}
+
 	.price {
 		font-family: SFPro, SFPro;
 		font-weight: 500;

pageA/counter.vue

@@ -14,31 +14,59 @@
 				<image src="" mode="" style="width: 12rpx;height: 12rpx;"></image>
 			</view>
 			<view class="u-flex" style="margin-top: 24rpx;">
-				<view :class="index==idx?'left':'right'" @click="good(idx)" style="margin-right: 20rpx;"
-					v-for="(item,idx) in goods" :key="idx">{{item.name}}</view>
+				<view :class="index==idx?'left':'right'" @click="good(item,idx)" style="margin-right: 20rpx;"
+					v-for="(item,idx) in goods" :key="idx">{{item.label}}</view>
 				<!-- <view class="right" style="margin-left: 20rpx;">特殊商品</view> -->
 			</view>
 		</view>
 		<!-- 跨境物流 -->
 		<view class="logistics u-flex u-row-between">
 			<text style="font-weight: 600;">{{i18n.flow}}</text>
-			<view class="u-flex" @click="logshow=true">
-				<text class="change">{{i18n.selection}}</text>
+			<view class="u-flex" @click="changewu">
+				<text class="change">{{leftname?leftname+' |  '+rightname : i18n.selection}}</text>
 				<u-icon name="arrow-right" size='16'></u-icon>
 			</view>
 		</view>
 		<!-- 商品重量 -->
-		<view class="weight u-flex u-row-between">
-			<text style="font-weight: 600;">{{i18n.Commodity}}</text>
-			<u-number-box v-model="value">
-				<view slot="minus" class="minus">
-					<u-icon name="minus" size="12"></u-icon>
+		<view class="weight ">
+			<view class="u-flex u-row-between">
+				<text style="font-weight: 600;">{{i18n.Commodity}}</text>
+				<u-number-box v-model="value">
+					<view slot="minus" class="minus">
+						<u-icon name="minus" size="12"></u-icon>
+					</view>
+					<view slot="input"
+						style="width: 50px;text-align: center;height: 30px;line-height: 30px;background: #f5f5f5;"
+						class="input u-flex">
+						<input type="text" v-model="value" />
+						<text>kg</text>
+					</view>
+					<view slot="plus" class="plus">
+						<u-icon name="plus" size="12"></u-icon>
+					</view>
+				</u-number-box>
+			</view>
+			<view class="u-flex u-row-between" style="margin-top: 30rpx;">
+				<text style="font-weight: 600;">总体积</text>
+				<text style="font-size: 20rpx;
+color: rgba(34, 34, 34, 0.5);">补充体积预估费用更精确</text>
+			</view>
+			<view class="u-flex u-row-between" style="margin-top: 32rpx;">
+				<view class="vite u-flex">
+					<input type="text" placeholder="长" v-model="length" />
+					<text>cm</text>
 				</view>
-				<text slot="input" style="width: 50px;text-align: center;display: block;height: 30px;line-height: 30px;background: #f5f5f5;" class="input">{{value}}kg</text>
-				<view slot="plus" class="plus">
-					<u-icon name="plus"  size="12"></u-icon>
+				<view class="">*</view>
+				<view class="vite u-flex">
+					<input type="text" placeholder="宽" v-model="width" />
+					<text>cm</text>
 				</view>
-			</u-number-box>
+				<view class="">*</view>
+				<view class="vite u-flex">
+					<input type="text" placeholder="高" v-model="height" />
+					<text>cm</text>
+				</view>
+			</view>
 		</view>
 		<!-- 获取价格 -->
 		<view @click="gain" :class="gat==1?'yuan':'price'">
@@ -47,25 +75,27 @@
 		<view class="gain" v-if="gatShow">
 			<view class="">
 				<text class='weigh'>{{i18n.Calculated}}：</text>
-				<text class='weigh' style="color: rgba(34, 34, 34, 1);">30.00kg</text>
+				<text class='weigh' style="color: rgba(34, 34, 34, 1);">{{value}}kg</text>
 			</view>
 			<view class="u-flex u-row-between"
 				style="border-top: 2rpx solid #979797;margin-top: 32rpx;padding-top: 20rpx;">
 				<view class="">
 					<text class='weigh'>{{i18n.Estimated}}</text>
 					<text style="margin-left: 6rpx;" class='red'>¥</text>
-					<text class='red' style="font-size: 32rpx;">3619</text>
+					<text class='red' style="font-size: 32rpx;">{{money}}</text>
 					<text class='red'>起</text>
 				</view>
 				<view class="info" @click="logistics">{{i18n.details}}</view>
 			</view>
 		</view>
 		<!-- 地址选择 -->
-		<u-picker :show="show" ref="uPicker" :columns="columns" @confirm="confirm" @change="changeHandler"></u-picker>
+		<u-picker :show="show" ref="uPicker" keyName="name" :columns="columns" @confirm="confirm"
+			@change="changeHandler"></u-picker>
 		<!-- 跨境物流 -->
 		<u-popup round='28' :show="logshow" @close="close">
 			<view class="pop">
-				<kj-flow @success='success' @close='logshow=false'></kj-flow>
+				<kj-flow :goodstype='goodstype' :province_id='province_id' ref="child" @success='success'
+					@close='logshow=false'></kj-flow>
 			</view>
 		</u-popup>
 	</view>
@@ -84,30 +114,40 @@
 				gat: 0,
 				gatShow: false,
 				columns: [
-					['中国', '美国'],
-					['深圳', '厦门', '上海', '拉萨']
+
 				],
 				columnData: [
-					['深圳', '厦门', '上海', '拉萨'],
-					['得州', '华盛顿', '纽约', '阿拉斯加']
+
 				],
 				goods: [],
-				index: 0
+				index: 0,
+				domestic: 1,
+				province_id: '',
+				goodstype: 'normal',
+				container_id: '', //货柜id
+				leftname: '',
+				rightname: '',
+				money: '',
+				length: '',
+				width: '',
+				height: ''
 			};
 		},
 		onLoad() {
-			this.goods = [{
-					name: this.i18n.Normal
-				},
-				{
-					name: this.i18n.special
-				}
-			]
+			// this.goods = [{
+			// 		name: this.i18n.Normal
+			// 	},
+			// 	{
+			// 		name: this.i18n.special
+			// 	}
+			// ]
 		},
 		onShow() {
 			uni.setNavigationBarTitle({
-				title:this.i18n.compute
+				title: this.i18n.compute
 			})
+			// this.getarea()
+			this.goodtype()
 		},
 		computed: {
 			i18n() {
@@ -115,14 +155,83 @@
 			}
 		},
 		methods: {
-			success() {
+			//商品类型
+			goodtype() {
+				uni.$u.http.get('/api/express-goods-type', ).then((res) => {
+					console.log(res);
+					this.goods = res
+				}).catch(() => {
+
+				})
+			},
+			//物流选择
+			changewu() {
+				if (this.province_id) {
+					this.logshow = true
+					setTimeout(() => {
+						this.$refs.child.transport();
+					}, 800)
+				} else {
+					this.$u.toast('请先选择城市')
+				}
+			},
+			//物流计算器
+			calculate() {
+				if (this.container_id == '') {
+					this.$u.toast('请选择货柜')
+					return
+				}
+				uni.$u.http.get('/api/express-order/calculate', {
+					params: {
+						container_id: this.container_id, //		是	String	货柜ID
+						weight: this.value, //		是	String	重量(kg)
+						length: 1, //		是	String	长(m)
+						width: 1, //		是	String	宽(m)
+						height: 1, //		是	String	高(m)
+						type: this.goodstype, //		是	String	商品类型: normal. 普通商品, special.特殊商品
+					}
+				}).then((res) => {
+					console.log(res);
+					this.money = res
+				}).catch(() => {
+
+				})
+			},
+			//地区列表
+			getarea() {
+				this.columns = []
+				this.columnData = []
+				uni.$u.http.get('/api/area/tree', {
+					params: {
+						is_domestic: this.domestic,
+						pid: 0
+					}
+				}).then((res) => {
+					console.log(res)
+					// this.columns.splice(0,1, [{name:res[0].name}]) 
+					this.columns = [res]
+					this.columns[1] = res[0].children
+					// this.columnData[0] = res[0].children
+					res.forEach(item => {
+						this.columnData.push(item.children)
+					})
+				}).catch(() => {
+
+				})
+			},
+			success(msg) {
 				this.logshow = false
+				console.log(msg);
+				this.leftname = msg.leftname
+				this.container_id = msg.dateid
+				this.rightname = msg.rightname
 			},
 			close() {
 				this.logshow = false
 			},
 			//切换商品类型
-			good(idx) {
+			good(item, idx) {
+				this.goodstype = item.value
 				this.index = idx
 			},
 			//物流详情
@@ -133,13 +242,25 @@
 			},
 			//获取价格
 			gain() {
-				this.gat = 1
-				this.gatShow = true
+				if (this.container_id == '') {
+					this.$u.toast('请选择货柜')
+				} else {
+					this.gat = 1
+					this.gatShow = true
+					this.calculate()
+				}
 			},
 			//开启地址选择器
 			change(type) {
 				this.type = type
 				this.show = true
+				if (type == 0) {
+					this.domestic = 1
+					this.getarea()
+				} else {
+					this.domestic = 0
+					this.getarea()
+				}
 			},
 			changeHandler(e) {
 				const {
@@ -161,10 +282,11 @@
 				console.log('confirm', e)
 				this.show = false
 				if (this.type == 0) {
-					this.original = e.value[0] + '-' + e.value[1]
+					this.original = e.value[0].name + '-' + e.value[1].name
 					// console.log(e.value[0]);
 				} else {
-					this.bourn = e.value[0] + '-' + e.value[1]
+					this.bourn = e.value[0].name + '-' + e.value[1].name
+					this.province_id = e.value[1].id
 				}
 			}
 		}
@@ -172,6 +294,15 @@
 </script>
 
 <style lang="scss" scoped>
+	.vite {
+		width: 198rpx;
+		height: 60rpx;
+		background: #F4F4F4;
+		border-radius: 36rpx;
+		padding: 12rpx 28rpx;
+		box-sizing: border-box;
+	}
+
 	.pop {
 		font-family: PingFangSC, PingFang SC;
 		font-weight: 500;
@@ -281,7 +412,7 @@
 			padding: 34rpx 20rpx;
 			box-sizing: border-box;
 			width: 702rpx;
-			height: 108rpx;
+			// height: 108rpx;
 			background: #FFFFFF;
 			border-radius: 16rpx;
 			margin-top: 20rpx;
@@ -388,7 +519,7 @@
 			height: 144rpx;
 			background: #FFFFFF;
 			border-radius: 16rpx;
-			padding: 50rpx 76rpx;
+			padding: 50rpx 8rpx;
 			box-sizing: border-box;
 
 			.address {

pageA/productdetails.vue

@@ -8,7 +8,7 @@
 				<view class="u-nav-slot u-flex" slot="left" style="display: flex;">
 					<view class="u-flex">
 						<u-icon name="arrow-left" size="19" @click="navigateBack()"></u-icon>
-						<u-tabs duration='0' @click="click" :list="list1" lineColor='#fff'
+						<u-tabs :duration='duration' @click="click" :list="list1" lineColor='#fff'
 							:activeStyle=" {color:'#FF1515'}" :inactiveStyle="{
 						color:' #666666' }"></u-tabs>
 					</view>
@@ -24,23 +24,44 @@
 				</view>
 			</u-navbar>
 			<!-- 商品图片 -->
-			<image src="https://cdn.uviewui.com/uview/swiper/swiper1.png" style="width: 750rpx;height: 750rpx;" mode="">
+			<view class="uni-margin-wrap">
+				<swiper class="swiper" circular :indicator-dots="false" :autoplay="true">
+					<swiper-item v-if="goodinfo.video">
+						<video style="width: 750rpx;height: 750rpx;" :src='goodinfo.video'></video>
+					</swiper-item>
+					<swiper-item v-for="(item,idx) in goodinfo.images.split(',')" :key="idx">
+						<image src="https://cdn.uviewui.com/uview/swiper/swiper1.png"
+							style="width: 750rpx;height: 750rpx;" mode=""></image>
+					</swiper-item>
+				</swiper>
+			</view>
 			</image>
 			<view class="back">
 				<!-- 折扣 -->
 				<view class="discount">
 					<view class="top">
-						<text class='count'>{{i18n.Discounted}}</text>
+						<text class='count' v-if="goodinfo.is_discount==0">{{i18n.Discounted}}</text>
 						<text class='money'>¥</text>
-						<text class='money' style="font-size: 48rpx;">258</text>
-						<text class='money'>.00</text>
-						<text class='right'>¥328.5</text>
+						<text class='money'
+							style="font-size: 48rpx;">{{goodinfo.is_discount==0?goodinfo.discount_price.slice(0,-3):goodinfo.price.slice(0,-3)}}</text>
+						<text
+							class='money'>{{goodinfo.is_discount==0?goodinfo.discount_price.slice(-3):goodinfo.price.slice(-3)}}</text>
+						<text class='right' v-if="goodinfo.is_discount==0">¥{{goodinfo.price}}</text>
 					</view>
 					<view class="bottom">
 						<text class="tabs">{{i18n.sametype}}</text>
 						<view class="title">
-							<text class="title" selectable @longpress="onLongPress">
-								布兰德低温烘焙猫粮全价通用高端鲜肉成猫幼
+							<text class="title" selectable @longpress="onLongPress" v-if="language =='zh-CN'">
+								{{goodinfo.name_cn}}
+							</text>
+							<text class="title" selectable @longpress="onLongPress" v-if="language =='en-US'">
+								{{goodinfo.name_en}}
+							</text>
+							<text class="title" selectable @longpress="onLongPress" v-if="language =='es-ES'">
+								{{goodinfo.name_es}}
+							</text>
+							<text class="title" selectable @longpress="onLongPress" v-if="language =='it-IT'">
+								{{goodinfo.name_ita}}
 							</text>
 						</view>
 					</view>
@@ -89,9 +110,9 @@
 				<!-- 店铺 -->
 				<view class="store u-flex u-row-between">
 					<view class="u-flex">
-						<image src='../static/images/logo.png' style="width: 112rpx;height: 112rpx;" mode=""></image>
+						<image :src='goodinfo.merchant.image' style="width: 112rpx;height: 112rpx;" mode=""></image>
 						<view class="" style="margin-left: 20rpx;">
-							<view class="title">小萌优选🔥（每天0元秒杀）</view>
+							<view class="title">{{goodinfo.merchant.merchant_name}}</view>
 							<view class="" style='margin-top:20rpx'></view>
 							<view class="u-flex" style='margin-top:20rpx'>
 								<text class='num'>{{i18n.Salesvolume}} 2384w+</text>
@@ -100,7 +121,7 @@
 							</view>
 						</view>
 					</view>
-					<view class="goshop">{{i18n.stroll}}</view>
+					<view class="goshop" @click="goshop">{{i18n.stroll}}</view>
 				</view>
 				<!-- 推荐 -->
 				<view class="recommend">
@@ -109,19 +130,36 @@
 					</view>
 					<view class="">
 						<swiper style="height: 400rpx;" class="swiper" circular :indicator-dots="true" :autoplay="true">
-							<swiper-item v-for="(parent,index) in 4" :key="index">
+							<swiper-item v-for="(parent,index) in swiptlist" :key="index">
 								<view class="u-flex  swiper-item u-row-between">
-									<view class="" v-for="child in 3" @click="toinfo(child.id)">
-										<image src="/static/images/logo.png" style="width: 214rpx;height: 214rpx;"
+									<view class="" v-for="(child,idx) in parent" @click="toinfo(child.id)" :key="idx">
+										<image :src="child.image" style="width: 214rpx;height: 214rpx;"
 											mode="">
 										</image>
 										<view class="u-line-1"
-											style="width: 214rpx;margin-top: 14rpx;font-style: normal;font-size: 26rpx;">
-											布兰德烘焙猫粮预售鲜肉乌骨鸡囤货</view>
-										<view class="">
-											<span
-												style="color:rgba(204, 51, 0, 1) ;margin-top: 12rpx;font-size: 26rpx;">¥{{child.price||235.55}}</span>
+											style="width: 214rpx;margin-top: 14rpx;font-style: normal;font-size: 26rpx;"
+											v-if="language =='zh-CN'">
+											{{child.name_cn}}
+										</view>
+										<view class="u-line-1"
+											style="width: 214rpx;margin-top: 14rpx;font-style: normal;font-size: 26rpx;"
+											v-if="language =='en-US'">
+											{{child.name_en}}
 										</view>
+										<view class="u-line-1"
+											style="width: 214rpx;margin-top: 14rpx;font-style: normal;font-size: 26rpx;"
+											v-if="language =='es-ES'">
+											{{child.name_es}}
+										</view>
+										<view class="u-line-1"
+											style="width: 214rpx;margin-top: 14rpx;font-style: normal;font-size: 26rpx;"
+											v-if="language =='it-IT'">
+											{{child.name_ita}}
+										</view>
+										<view class="" style="margin-top: 12rpx;">
+											<span
+												style="color:rgba(204, 51, 0, 1) ;font-size: 26rpx;">¥{{child.price}}</span>
+										</view>   
 									</view>
 								</view>
 							</swiper-item>
@@ -131,28 +169,17 @@
 				<view class="recommend">
 					<view class="title">{{i18n.Productdetails}}</view>
 					<view class="" style="margin-top: 32rpx;margin-bottom:28rpx">{{i18n.Specification}}</view>
-					<view class="specification">
-						<view class="item u-flex" style='margin-bottom:28rpx'>
-							<view style='width:150rpx;'>{{i18n.material}}</view>
-							<text style='margin-left:58rpx'>保鲜鸡肉，鸡心，鸡肝</text>
-						</view>
-						<view class="item u-flex" style='margin-bottom:28rpx'>
-							<view style='width:150rpx;'>{{i18n.specification}}</view>
-							<text style='margin-left:58rpx'>300g</text>
-						</view>
-						<view class="item u-flex" style='margin-bottom:28rpx'>
-							<view style='width:150rpx;'>{{i18n.Shelflife}}</view>
-							<text style='margin-left:58rpx'>12个月</text>
-						</view>
-						<view class="item u-flex">
-							<view style='width:150rpx;'>{{i18n.Suitableobject}}</view>
-							<text style='margin-left:58rpx'>3个月以上的全猫种</text>
+					<view class="specification" >
+						<view class="item u-flex" style='margin-bottom:28rpx' v-for="(item,idx) in goodinfo.parameter" :key="idx">
+							<view style='width:150rpx;'>{{item.name}}</view>
+							<text style='margin-left:58rpx'>{{item.value}}</text>
 						</view>
 					</view>
+					<view class="">
+						<image :src="goodinfo.image" style="width: 710rpx;height: 580rpx;" mode=""></image>
+					</view>
 				</view>
-				<view class="">
-					<image src="../static/images/logo.png" style="width: 710rpx;height: 580rpx;" mode=""></image>
-				</view>
+
 				<view class="" style="height: 158rpx;"></view>
 				<view class="fix u-flex u-row-between">
 					<view class="u-flex" style="column-gap: 35rpx;">
@@ -334,9 +361,12 @@
 				//分享
 				share: false,
 				value: 0, //步进器的值
-				swiptlist: [],
+				swiptlist: [], //推荐列表
 				actab: 0,
-				id:'',//商品id
+				id: '', //商品id
+				language: '',
+				goodinfo: {}, //商品详情
+				duration: 0, //tabs选项
 			};
 		},
 		computed: {
@@ -348,12 +378,56 @@
 			this.id = options.id
 		},
 		onShow() {
+			if (uni.getStorageSync('language') != '') {
+				this.language = uni.getStorageSync('language')
+			}
 			this.detail(this.id)
+			this.recommend()
 		},
 		methods: {
-			detail(id){
-				detail(id).then((res)=>{
+			//评论接口
+			comment(){
+				uni.$u.http.post('/api/goods/goods_comment',{
+					merchant_goods_id:this.goodinfo.merchant_goods_id,
+					page:1,
+					limit:2
+				} ).then((res) => {
+					console.log('comment',res);
+				}).catch(() => {
+				
+				})
+			},
+			//商品推荐
+			recommend() {
+				uni.$u.http.post('/api/goods/recommend').then((res) => {
+					this.swiptlist = res.reduce((a, b) => {
+						let lastIndex = a.length - 1
+						if (a[lastIndex].length < 3) {
+							a[lastIndex].push(b)
+						} else {
+							a.push([b])
+						}
+						return a
+					}, [
+						[]
+					])
+				}).catch(() => {
+
+				})
+			},
+			//逛逛
+			goshop() {
+				uni.navigateTo({
+					url: '/pageD/homepage/homepage'
+				})
+			},
+			detail(id) {
+				uni.$u.http.get('/api/goods/detail/' + id, ).then((res) => {
 					console.log(res);
+					this.goodinfo = res
+					this.comment()
+				}).catch(() => {
+
 				})
 			},
 			scrollToPosition() {
@@ -376,20 +450,6 @@
 				this.imagea = true
 				this.share = false
 			},
-			//获取推荐
-			getSeriesBooks() {
-				this.swiptlist = res.data.reduce((a, b) => {
-					let lastIndex = a.length - 1
-					if (a[lastIndex].length < 3) {
-						a[lastIndex].push(b)
-					} else {
-						a.push([b])
-					}
-					return a
-				}, [
-					[]
-				])
-			},
 			//加入购物车
 			joincart() {
 				this.show = false
@@ -946,6 +1006,45 @@
 		}
 	}
 
+	// 轮播图
+	.uni-margin-wrap {
+		width: 750rpx;
+		width: 100%;
+
+		.swiper {
+			height: 750rpx;
+		}
+
+		.swiper-item {
+			display: block;
+			height: 300rpx;
+			line-height: 300rpx;
+			text-align: center;
+		}
+
+		.swiper-list {
+			margin-top: 40rpx;
+			margin-bottom: 0;
+		}
+
+		.uni-common-mt {
+			margin-top: 60rpx;
+			position: relative;
+		}
+
+		.info {
+			position: absolute;
+			right: 20rpx;
+		}
+
+		.uni-padding-wrap {
+			width: 550rpx;
+			padding: 0 100rpx;
+		}
+	}
+
+
+
 	::v-deep .u-popup__content data-v-17becaea {
 		align-items: center !important;
 	}

pageA/shoplist.vue

@@ -27,7 +27,7 @@
 					<image v-else src="static/images/shaixuan.png" style="width: 24rpx;height: 24rpx;" mode=""></image>
 				</view>
 			</view>
-			<liu-waterfall :dataList="data" :column="columns" @click="click"></liu-waterfall>
+			<liu-waterfall :dataList="data" :column="columns" @click="detail"></liu-waterfall>
 			<view class="pop" style="position: absolute;top:80rpx" v-if="shai&&current==4">
 				<view class=" title">{{i18n.Pricerange}}</view>
 				<view class="u-flex u-row-between">
@@ -81,115 +81,94 @@
 				current: 0,
 				curess: 0,
 				index: '',
-				list1: [{
-					name: '关注',
-				}, {
-					name: '推荐',
-				}, {
-					name: '电影'
-				}, {
-					name: '科技'
-				}, {
-					name: '音乐'
-				}, {
-					name: '美食'
-				}, {
-					name: '文化'
-				}, {
-					name: '财经'
-				}, {
-					name: '手工'
-				}],
-				data: [{
-					picUrl: 'https://cdn.pixabay.com/photo/2020/05/19/13/32/cartoon-5190837_1280.jpg',
-					title: '思考',
-					desc: '我是第1个图片',
-					id: 1,
-				}, {
-					picUrl: 'https://cdn.pixabay.com/photo/2021/07/22/11/25/rabbit-6485072_1280.jpg',
-					title: '兔子',
-					desc: '我是第2个图片',
-					id: 2,
-				}, {
-					picUrl: 'https://cdn.pixabay.com/photo/2020/05/19/13/35/cartoon-5190860_1280.jpg',
-					title: '雨天',
-					desc: '我是第3个图片',
-					id: 3,
-				}, {
-					picUrl: 'https://cdn.pixabay.com/photo/2022/03/31/14/53/camp-7103189_1280.png',
-					title: '日落',
-					desc: '我是第4个图片',
-					id: 4,
-				}, {
-					picUrl: 'https://cdn.pixabay.com/photo/2022/11/29/19/05/boho-7625140_1280.jpg',
-					title: '植物',
-					desc: '我是第5个图片',
-					id: 5,
-				}, {
-					picUrl: 'https://cdn.pixabay.com/photo/2022/08/25/23/06/woman-7411414_1280.png',
-					title: '时尚',
-					desc: '我是第6个图片',
-					id: 6,
-				}, {
-					picUrl: 'https://cdn.pixabay.com/photo/2023/03/07/12/45/child-7835677_1280.jpg',
-					title: '生活',
-					desc: '我是第7个图片',
-					id: 7,
-				}, {
-					picUrl: 'https://cdn.pixabay.com/photo/2020/05/19/13/32/cartoon-5190837_1280.jpg',
-					title: '思考',
-					desc: '我是第8个图片',
-					id: 8,
-				}, {
-					picUrl: 'https://cdn.pixabay.com/photo/2021/07/22/11/25/rabbit-6485072_1280.jpg',
-					title: '兔子',
-					desc: '我是第9个图片',
-					id: 9,
-				}, {
-					picUrl: 'https://cdn.pixabay.com/photo/2020/05/19/13/35/cartoon-5190860_1280.jpg',
-					title: '雨天',
-					desc: '我是第10个图片',
-					id: 10,
-				}, {
-					picUrl: 'https://cdn.pixabay.com/photo/2022/11/29/19/05/boho-7625140_1280.jpg',
-					title: '植物',
-					desc: '我是第11个图片',
-					id: 11,
-				}, {
-					picUrl: 'https://cdn.pixabay.com/photo/2022/08/25/23/06/woman-7411414_1280.png',
-					title: '时尚',
-					desc: '我是第12个图片',
-					id: 12,
-				}, {
-					picUrl: 'https://cdn.pixabay.com/photo/2023/03/07/12/45/child-7835677_1280.jpg',
-					title: '生活',
-					desc: '我是第13个图片',
-					id: 13,
-				}, {
-					picUrl: 'https://cdn.pixabay.com/photo/2020/05/19/13/35/cartoon-5190860_1280.jpg',
-					title: '雨天',
-					desc: '我是第14个图片',
-					id: 14,
-				}, {
-					picUrl: 'https://cdn.pixabay.com/photo/2023/03/07/12/45/child-7835677_1280.jpg',
-					title: '生活',
-					desc: '我是第15个图片',
-					id: 15,
-				}, {
-					picUrl: 'https://cdn.pixabay.com/photo/2020/05/19/13/32/cartoon-5190837_1280.jpg',
-					title: '思考',
-					desc: '我是第16个图片',
-					id: 16,
-				}],
+				list1: [],
+				data: [],
 				columns: 2,
+				goodsid: '',
+				title: '',
+				parent_id: '',
+				language:'',
+				page:1,
+				
 			};
 		},
+		onLoad(options) {
+			console.log(options);
+			this.goodsid = options.id
+			this.title = options.title
+			this.parent_id = options.parent_id
+		},
+		onShow() {
+			uni.setNavigationBarTitle({
+				title: this.title
+			})
+			this.goods(this.goodsid)
+			this.category(this.parent_id)
+			if (uni.getStorageSync('language') != '') {
+				this.language = uni.getStorageSync('language')
+			}
+		},
 		computed: {
 			i18n() {
 				return this.$t('index')
 			}
 		},
 		methods: {
+			//商品详情
+			detail(item){
+				console.log(item);
+				uni.navigateTo({
+					url:'/pageA/productdetails?id='+item.id
+				})
+			},
+			//商品分类
+			category(id) {
+				uni.$u.http.get('/api/goods/category', {
+					params: {
+						parent_id: id,
+						limit:10,
+						page:this.page
+					}
+				}).then((res) => {
+					const categoryArr = res
+					if (this.language == 'en-US') {
+						categoryArr.forEach(item => {
+							item.name = item.name_en
+						})
+					}
+					if (this.language == 'es-ES') {
+						categoryArr.forEach(item => {
+							item.name = item.name_es
+						})
+					}
+					if (this.language == 'it-IT') {
+						categoryArr.forEach(item => {
+							item.name = item.name_ita
+						})
+					}
+
+					if (this.language == 'zh-CN') {
+						categoryArr.forEach(item => {
+							item.name = item.name_cn
+						})
+					}
+					this.list1 = categoryArr
+				}).catch(() => {
+
+				})
+			},
+			//商品列表
+			goods(id) {
+				uni.$u.http.get('/api/goods', {
+					params: {
+						category_id: id
+					}
+				}).then((res) => {
+					this.data = res.data
+				}).catch(() => {
+
+				})
+			},
 			shaixuan() {
 				this.shai = true,
 					this.current = 4
@@ -197,9 +176,10 @@
 			click(item) {
 				console.log('item', item);
 				this.curess = item.index
-				uni.navigateTo({
-					url:'/pageB/delivery'
-				})
+				this.goods(item.id)
+				// uni.navigateTo({
+				// 	url: '/pageB/delivery'
+				// })
 			},
 			changei(idx) {
 				this.index = idx

pageA/shoptype.vue

@@ -5,8 +5,19 @@
 				<view class="goods">
 					<view class="goods_item" v-for="(item, index) in scroll_list" :key="index"
 						@click="clickGoods(item)">
-						<image class="goods_item_img" :src="item.icon" mode=""></image>
-						<view class="goods_item_name">{{item.name}}</view>
+						<image class="goods_item_img" :src="item.image" mode=""></image>
+						<view class="goods_item_name" v-if="language =='zh-CN'">
+							{{item.name_cn}}
+						</view>
+						<view class="goods_item_name" v-if="language =='en-US'">
+							{{item.name_en}}
+						</view>
+						<view class="goods_item_name" v-if="language =='es-ES'">
+							{{item.name_es}}
+						</view>
+						<view class="goods_item_name" v-if="language =='it-IT'">
+							{{item.name_ita}}
+						</view>
 					</view>
 				</view>
 			</template>
@@ -69,6 +80,7 @@
 						]
 					}
 				],
+				language: ''
 			}
 		},
 		onLoad() {
@@ -87,12 +99,72 @@
 			uni.setNavigationBarTitle({
 				title: this.i18n.classification
 			})
+			this.category() //商品分类
+			if (uni.getStorageSync('language') != '') {
+				this.language = uni.getStorageSync('language')
+			}
 		},
 		methods: {
 			clickGoods(item) { //点击商品
 				console.log(item);
-				uni.navigateTo({
-					url: '/pageA/shoplist'
+				if (this.language == 'en-US') {
+					uni.navigateTo({
+						url: '/pageA/shoplist?id=' + item.id + '&title=' + item.name_en + '&parent_id=' + item
+							.parent_id
+					})
+				}
+				if (this.language == 'es-ES') {
+					uni.navigateTo({
+						url: '/pageA/shoplist?id=' + item.id + '&title=' + item.name_es + '&parent_id=' + item
+							.parent_id
+					})
+				}
+				if (this.language == 'it-IT') {
+					uni.navigateTo({
+						url: '/pageA/shoplist?id=' + item.id + '&title=' + item.name_ita + '&parent_id=' + item
+							.parent_id
+					})
+				}
+				if (this.language == 'zh-CN') {
+					uni.navigateTo({
+						url: '/pageA/shoplist?id=' + item.id + '&title=' + item.name_cn + '&parent_id=' + item
+							.parent_id
+					})
+				}
+			},
+			//商品分类列表
+			category() {
+				uni.$u.http.get('/api/goods/category', {
+					params: {
+						parent_id: 0
+					}
+				}).then((res) => {
+					const categoryArr = res
+					if (this.language == 'en-US') {
+						categoryArr.forEach(item => {
+							item.name = item.name_en
+						})
+					}
+					if (this.language == 'es-ES') {
+						categoryArr.forEach(item => {
+							item.name = item.name_es
+						})
+					}
+					if (this.language == 'it-IT') {
+						categoryArr.forEach(item => {
+							item.name = item.name_ita
+						})
+					}
+
+					if (this.language == 'zh-CN') {
+						categoryArr.forEach(item => {
+							item.name = item.name_cn
+						})
+					}
+					this.list = categoryArr
+					console.log(categoryArr);
+				}).catch(() => {
+
 				})
 			},
 		},

pageA/subsidy.vue

@@ -33,52 +33,64 @@
             color: 'rgba(248, 53, 39, 1)',
             fontWeight: 'bold',
             transform: 'scale(1.05)'
-        }" :list="list1" lineColor='rgba(248, 53, 39, 1)' @click="click"></u-tabs>
+        }" :list="list1" lineColor='rgba(248, 53, 39, 1)' @change='changetab'></u-tabs>
 			</view>
-			<view class="item u-flex" v-for="(child,index) in 6">
-				<image src="../static/images/logo.png" style="width: 232rpx;height: 232rpx;" mode=""></image>
+			<view class="item u-flex" v-for="(child,index) in list" @click="todetail(child.id)">
+				<image :src="child.image" style="width: 232rpx;height: 232rpx;" mode=""></image>
 				<view class="u-row-between"
 					style="height: 232rpx;display: flex;flex-direction: column;margin-left: 20rpx;">
 					<view class="">
-						<text>得宝天然无香抽取式面巾纸9…</text>
+						<view class="titl" v-if="language =='zh-CN'">
+							{{child.name_cn}}
+						</view>
+						<view class="titl" v-if="language =='en-US'">
+							{{child.name_en}}
+						</view>
+						<view class="titl" v-if="language =='es-ES'">
+							{{child.name_es}}
+						</view>
+						<view class="titl" v-if="language =='it-IT'">
+							{{child.name_ita}}
+						</view>
 						<view class="u-flex" style="margin-top: 18rpx;column-gap: 18rpx;">
 							<text class="tabs baoyou"
-								style="background:rgba(248, 50, 36, 1) ;border: 2rpx solid rgba(248, 50, 36, 0);color:#FFFFFF ;">包邮</text>
+								style="background:rgba(248, 50, 36, 1) ;border: 2rpx solid rgba(248, 50, 36, 0);color:#FFFFFF ;">{{i18n.postage}}</text>
 							<text class="tabs" v-for="(item,idx) in 2" :key="idx">
 								{{i18n.willpay}}
 							</text>
 						</view>
 					</view>
-					<view class="backimg" style="position: relative;" >  
-						<image src="./static/images/tab.png"  
+					<view class="backimg" style="position: relative;">
+						<image src="./static/images/tab.png"
 							style="width: 100%;height: 100%;position: absolute;left: 0;top: 0;z-index: 0;" mode="">
 						</image>
 						<view v-if="show==1" class="u-flex u-row-between"
 							style="position: relative;z-index: 1;padding:0 24rpx ;text-align: center;line-height: 68rpx;">
 							<view class="">
-								<text class="textone">补贴价</text>
+								<text class="textone">{{i18n.Subsidized}}</text>
 								<text class='texttwo' style="margin-left: 12rpx;">¥</text>
-								<text class='texttwo' style="font-size: 40rpx;">16</text>
-								<text class='texttwo'>.13</text>
+								<text class='texttwo' style="font-size: 40rpx;">{{child.price.slice(0,-3)}}</text>
+								<text class='texttwo'>{{child.price.slice(-3)}}</text>
 							</view>
 							<view class="">
-								<text class="textthree">已补</text>
+								<text class="textthree">{{i18n.fill}}</text>
 								<text class='textfour' style="margin-left: 8rpx;">¥</text>
-								<text class='textfour' style="font-size:  28rpx;">25.8</text>
+								<text class='textfour'
+									style="font-size:  28rpx;">{{(child.price*1000 - child.discount_price*1000)/1000}}</text>
 							</view>
 						</view>
 						<view v-if="show==2 || show==3" class="u-flex u-row-between"
-							style="position: relative;z-index: 1;padding:0 24rpx ;text-align: center;line-height: 68rpx;">
+							style="position: relative;z-index: 1;padding:0 60rpx 0 24rpx ;text-align: center;line-height: 68rpx;">
 							<view class="">
 								<text v-if="show==2" class="textone">{{i18n.Subsidized}}</text>
-								<text v-if="show==3" class="textone">包邮价</text>
+								<text v-if="show==3" class="textone">{{i18n.postage}}</text>
 								<text class='texttwo' style="margin-left: 12rpx;">¥</text>
-								<text class='texttwo' style="font-size: 40rpx;">16</text>
-								<text class='texttwo'>.13</text>
+								<text class='texttwo' style="font-size: 40rpx;">{{child.price.slice(0,-3)}}</text>
+								<text class='texttwo'>{{child.price.slice(-3)}}</text>
 							</view>
-							<view class="">
+							<view class="u-flex">
 								<image src="static/images/qiang.png" style="width: 48rpx;height: 38rpx;" mode="">
-								</image> 
+								</image>
 							</view>
 						</view>
 					</view>
@@ -92,26 +104,11 @@
 	export default {
 		data() {
 			return {
-				list1: [{
-					name: '关注',
-				}, {
-					name: '推荐',
-				}, {
-					name: '电影'
-				}, {
-					name: '科技'
-				}, {
-					name: '音乐'
-				}, {
-					name: '美食'
-				}, {
-					name: '文化'
-				}, {
-					name: '财经'
-				}, {
-					name: '手工'
-				}],
-				show:1
+				list1: [],
+				show: 1,
+				list: [], //数据
+				Pleaseproductname: '', //搜索内容
+				language: '', //语言
 			};
 		},
 		computed: {
@@ -121,11 +118,134 @@
 		},
 		onLoad(options) {
 			this.show = options.show
+		},
+		onShow() {
+			if (uni.getStorageSync('language') != '') {
+				this.language = uni.getStorageSync('language')
+			}
+			if (this.show == 1) {
+				this.subsid() //百万补贴
+			}
+			if (this.show == 2) {
+				this.pack() //拼包好物
+			}
+			if (this.show == 3) {
+				this.shipp() //海外包邮
+			}
+			this.category()
+		},
+		methods: {
+			//跳转详情
+			todetail(id) {
+				console.log(id);
+				uni.navigateTo({
+					url: '/pageA/productdetails?id=' + id
+				})
+			},
+			//标签切换
+			changetab(e) {
+				console.log(e);
+				if (this.show == 1) {
+					this.subsid(e.id) //百万补贴
+				}
+				if (this.show == 2) {
+					this.pack(e.id) //拼包好物
+				}
+				if (this.show == 3) {
+					this.shipp(e.id) //海外包邮
+				}
+			},
+			//商品分类列表
+			category() {
+				uni.$u.http.get('/api/goods/category', {
+					params: {
+						parent_id: 0
+					}
+				}).then((res) => {
+					const categoryArr = res
+					this.list1 = [{
+						name: '',
+						category_id: ''
+					}]
+					if (this.language == 'en-US') {
+						categoryArr.forEach(item => {
+							item.name = item.name_en
+						})
+						this.list1[0].name = 'selection'
+					}
+					if (this.language == 'es-ES') {
+						categoryArr.forEach(item => {
+							item.name = item.name_es
+						})
+						this.list1[0].name = 'Una selección de'
+					}
+					if (this.language == 'it-IT') {
+						categoryArr.forEach(item => {
+							item.name = item.name_ita
+						})
+						this.list1[0].name = 'selezionate'
+					}
+
+					if (this.language == 'zh-CN') {
+						categoryArr.forEach(item => {
+							item.name = item.name_cn
+						})
+						this.list1[0].name = '精选'
+					}
+					this.list1 = this.list1.concat(categoryArr)
+				}).catch(() => {
+
+				})
+			},
+			//海外包邮接口
+			shipp(id) {
+				uni.$u.http.post('api/goods/shipping', {
+					category_id: id
+				}).then((res) => {
+					this.list = res
+				}).catch(() => {
+
+				})
+			},
+			//拼包好物接口
+			pack(id) {
+				uni.$u.http.post('/api/goods/pack', {
+					category_id: id
+				}).then((res) => {
+					this.list = res
+				}).catch(() => {
+
+				})
+			},
+			//百万补贴接口
+			subsid(id) {
+				uni.$u.http.post('/api/goods/subsidy', {
+					category_id: id
+				}).then((res) => {
+					this.list = res
+				}).catch(() => {
+
+				})
+			},
 		}
 	}
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
+	.titl {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 500;
+		font-size: 30rpx;
+		color: #444444;
+		line-height: 42rpx;
+		text-align: left;
+		font-style: normal;
+		width: 400rpx;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+
 	.box {
 		width: 750rpx;
 		height: 1266rpx;

pages/index/index.vue

@@ -35,7 +35,7 @@
 				<!-- tabs -->
 				<view class=""
 					style="display: flex;margin-top: 20rpx;align-items: center;justify-content: space-between;">
-					<u-tabs :list="list1"></u-tabs>
+					<u-tabs :list="list1" @change='changetab'></u-tabs>
 					<view class="border">
 					</view>
 					<view class="u-flex" style="margin-left: 24rpx;width: 100rpx;" @click="shoptype">
@@ -52,6 +52,7 @@
 		</view>
 		<view class="shopback">
 			<view class="u-flex u-row-between">
+				<!-- 百亿补贴 -->
 				<view class="bigbox" @click="subsidy(1)">
 					<view class="u-flex">
 						<image src="../../static/images/index/butie.png" style="width: 104rpx;height: 26rpx;" mode="">
@@ -59,11 +60,9 @@
 						<view class="biaoqian" style="background: #F35D22;">{{i18n.expensive}}</view>
 					</view>
 					<view class="u-flex" style="flex-wrap: wrap;justify-content: space-between;">
-						<view v-for="(item,idx) in 4" class="ssbox  " style="margin-top: 16rpx;">
+						<view v-for="(item,idx) in subsidylist" class="ssbox  " style="margin-top: 16rpx;">
 							<view class="" style="position: relative">
-								<image src=""
-									style="background-color: rgba(119, 119, 119, 1);width: 144rpx;height: 144rpx;"
-									mode=""></image>
+								<image :src="item.image" style="width: 144rpx;height: 144rpx;" mode=""></image>
 								<view class="u-flex u-row-center"
 									style="position: absolute;bottom: 10rpx;width: 144rpx;">
 									<view class="u-flex">
@@ -72,17 +71,18 @@
 												style="width: 28rpx;height: 28rpx;position: relative;z-index: 3;"
 												mode="">
 											</image>
-											<text>{{15 + i18n.RMB}}</text>
+											<text>{{(item.price*1000 - item.discount_price*1000)/1000 + i18n.RMB}}</text>
 										</view>
 									</view>
 								</view>
 							</view>
 							<view class="money" style="text-align: center;">
-								￥59
+								￥{{item.discount_price}}
 							</view>
 						</view>
 					</view>
 				</view>
+				<!-- 拼包好物 -->
 				<view class="">
 					<view class="smallbox" @click="subsidy(2)">
 						<view class="u-flex">
@@ -92,11 +92,9 @@
 							</view>
 						</view>
 						<view class="u-flex" style="flex-wrap: wrap;justify-content: space-between;">
-							<view v-for="(item,idx) in 2" class="ssbox  " style="margin-top: 16rpx;">
+							<view v-for="(item,idx) in packlist" class="ssbox  " style="margin-top: 16rpx;">
 								<view class="" style="position: relative">
-									<image src=""
-										style="background-color: rgba(119, 119, 119, 1);width: 144rpx;height: 144rpx;"
-										mode=""></image>
+									<image :src="item.image" style=";width: 144rpx;height: 144rpx;" mode=""></image>
 									<view class="u-flex u-row-center"
 										style="position: absolute;bottom: 10rpx;width: 144rpx;">
 										<view class="u-flex">
@@ -104,12 +102,13 @@
 													style="width: 28rpx;height: 28rpx;position: relative;z-index: 3;"
 													mode="">
 												</image> -->
-											<view class="tag u-flex" style="background-color: rgba(251, 73, 70, 1);">
+											<view v-if="item.is_discount==0" class="tag u-flex"
+												style="background-color: rgba(251, 73, 70, 1);">
 												<image src="../../static/images/index/down.png"
 													style="width: 28rpx;height: 28rpx;position: relative;z-index: 3;"
 													mode="">
 												</image>
-												<text>{{15 + i18n.RMB}}</text>
+												<text>{{(item.price*1000 - item.discount_price*1000)/1000 + i18n.RMB}}</text>
 											</view>
 										</view>
 									</view>
@@ -124,13 +123,20 @@
 							<view class="biaoqian" style="background:rgba(248, 50, 36, 1)">{{i18n.Something}}</view>
 						</view>
 						<view class="u-flex" style="flex-wrap: wrap;justify-content: space-between;">
-							<view v-for="(item,idx) in 2" class="ssbox  " style="margin-top: 8rpx;">
+							<view v-for="(item,idx) in shippList" class="ssbox  " style="margin-top: 8rpx;">
 								<view class="" style="position: relative">
-									<image src=""
-										style="background-color: rgba(119, 119, 119, 1);width: 124rpx;height: 124rpx;"
-										mode=""></image>
-									<view class="shopname">
-										纯牛奶
+									<image :src="item.image" style="width: 124rpx;height: 124rpx;" mode=""></image>
+									<view class="shopname" v-if="language =='zh-CN'">
+										{{item.name_cn}}
+									</view>
+									<view class="shopname" v-if="language =='en-US'">
+										{{item.name_en}}
+									</view>
+									<view class="shopname" v-if="language =='es-ES'">
+										{{item.name_es}}
+									</view>
+									<view class="shopname" v-if="language =='it-IT'">
+										{{item.name_ita}}
 									</view>
 								</view>
 							</view>
@@ -139,16 +145,26 @@
 				</view>
 			</view>
 			<view class="u-flex u-row-between" style="flex-wrap: wrap;">
-				<view class="bigbox" v-for="(item,index) in recomlist" style="position: relative;" @click="todetail(item.id)">
+				<view class="bigbox" v-for="(item,index) in recomlist" style="position: relative;"
+					@click="todetail(item.id)">
 					<image v-if="item.is_discount==0" src="../../static/images/index/discount.png"
 						style="width: 60rpx;height: 36rpx;position: absolute;left: 12rpx;top: 12rpx;z-index: 10;"
 						mode="">
 					</image>
 					<image :src="item.image"
 						style="width: 340rpx;height: 340rpx;;margin-left: -20rpx;margin-top: -18rpx;" mode=""></image>
-					<view class="title">
+					<view class="title" v-if="language =='zh-CN'">
 						{{item.name_cn}}
 					</view>
+					<view class="title" v-if="language =='en-US'">
+						{{item.name_en}}
+					</view>
+					<view class="title" v-if="language =='es-ES'">
+						{{item.name_es}}
+					</view>
+					<view class="title" v-if="language =='it-IT'">
+						{{item.name_ita}}
+					</view>
 					<view class="">
 						<text class="money">
 							¥{{item.price}}
@@ -199,16 +215,6 @@
 				//tabs
 				list1: [{
 					name: '推荐',
-				}, {
-					name: '数码'
-				}, {
-					name: '生鲜'
-				}, {
-					name: '美妆'
-				}, {
-					name: '生鲜'
-				}, {
-					name: '美妆'
 				}],
 				//轮播图
 				banner: [
@@ -217,7 +223,11 @@
 					'https://cdn.uviewui.com/uview/swiper/swiper3.png',
 				],
 				show: true,
-				timer: ''
+				timer: '',
+				language: 'zh-CN',
+				subsidylist: [], //百万补贴
+				packlist: [], //拼包好物
+				shippList: [], //海外包邮
 			}
 		},
 		computed: {
@@ -226,26 +236,120 @@
 			}
 		},
 		onLoad(options) {
-			this.recommend()
 			this.list = [this.i18n.border, this.i18n.shop]
 			// this.seater()
 			if (options.current) {
 				this.current = options.current
 			}
-		},
-		onShow() {
 			//商品推荐
 			this.recommend()
-			console.log(222222);
+		},
+		onShow() {
+
+			// tabs列表
+			this.category()
+			//百万补贴
+			this.subsid()
+			//拼包好物
+			this.pack()
+			//海外包邮
+			this.shipp()
+			if (uni.getStorageSync('language') != '') {
+				this.language = uni.getStorageSync('language')
+			}
 		},
 		methods: {
+			//海外包邮接口
+			shipp() {
+				uni.$u.http.post('api/goods/shipping').then((res) => {
+					this.shippList = res.splice(0, 2)
+				}).catch(() => {
+
+				})
+			},
+			//拼包好物接口
+			pack() {
+				uni.$u.http.post('/api/goods/pack').then((res) => {
+					this.packlist = res.splice(0, 2)
+				}).catch(() => {
+
+				})
+			},
+			//百万补贴接口
+			subsid() {
+				uni.$u.http.post('/api/goods/subsidy').then((res) => {
+					this.subsidylist = res.splice(0, 4)
+				}).catch(() => {
+
+				})
+			},
+			//标签切换
+			changetab(e) {
+				console.log(e);
+				if (e.index == 0) {
+					this.recommend()
+				} else {
+					this.goods(e.id)
+				}
+			},
 			//商品推荐
 			recommend() {
-				console.log(1111);
-				recom().then((res) => {
-					this.recomlist = res.data.data
+				uni.$u.http.post('/api/goods/recommend').then((res) => {
+					this.recomlist = res
+				}).catch(() => {
+
+				})
+			},
+			//商品分类列表
+			category() {
+				uni.$u.http.get('/api/goods/category', {
+					params:{parent_id: 0}
+				}).then((res) => {
+					const categoryArr = res
+					this.list1 = [{
+						name: ''
+					}]
+					if (this.language == 'en-US') {
+						categoryArr.forEach(item => {
+							item.name = item.name_en
+						})
+						this.list1[0].name = 'recommend'
+					}
+					if (this.language == 'es-ES') {
+						categoryArr.forEach(item => {
+							item.name = item.name_es
+						})
+						this.list1[0].name = 'recomendación'
+					}
+					if (this.language == 'it-IT') {
+						categoryArr.forEach(item => {
+							item.name = item.name_ita
+						})
+						this.list1[0].name = 'raccomandata'
+					}
+
+					if (this.language == 'zh-CN') {
+						categoryArr.forEach(item => {
+							item.name = item.name_cn
+						})
+						this.list1[0].name = '推荐'
+					}
+					this.list1 = this.list1.concat(categoryArr)
+				}).catch(() => {
+
+				})
+			},
+			//商品列表
+			goods(id) {
+				uni.$u.http.get('/api/goods', {
+					params:{parent_id: id}
+				}).then((res) => {
+					this.recomlist = res.data
+				}).catch(() => {
+
 				})
 			},
+			//百万补贴跳转
 			subsidy(item) {
 				uni.navigateTo({
 					url: '/pageA/subsidy?show=' + item
@@ -283,7 +387,7 @@
 			//详情
 			todetail(id) {
 				uni.navigateTo({
-					url: '/pageA/productdetails?id='+id
+					url: '/pageA/productdetails?id=' + id
 				})
 			}
 		}

uni_modules/liu-waterfall/components/liu-waterfall/liu-waterfall.vue

@@ -5,24 +5,35 @@
 				:id="'item' + childItem.id" @click.stop="click(childItem)">
 				<view class="item"
 					:style="'background-color:'+cardBgColor+';margin:'+margin+'rpx;border-radius:'+radius+'rpx;'">
-					<image :src="childItem.picUrl" mode="widthFix" lazy-load
-						:style="{height:childItem.height,width: '100%'}">
+					<image :src="childItem.image" mode="widthFix" lazy-load :style="{width: '100%'}">
 					</image>
 					<view class="title-info">
-						<view class="item-title">{{ childItem.title }}</view>
+						<view class="item-title" v-if="language =='zh-CN'">
+							{{ childItem.name_cn }}
+						</view>
+						<view class="item-title" v-if="language =='en-US'">
+							{{childItem.name_en}}
+						</view>
+						<view class="item-title" v-if="language =='es-ES'">
+							{{childItem.name_es}}
+						</view>
+						<view class="item-title" v-if="language =='it-IT'">
+							{{childItem.name_ita}}
+						</view>
 						<!-- <view class="item-desc">{{ childItem.desc }}</view> -->
 						<view class="">
-							<text class="money">¥5999.00</text>
-							<text style="margin-left: 14rpx;" class="kg">¥500g</text>
+							<text class="money">¥{{childItem.price}}</text>
+							<text v-if="childItem.weight" style="margin-left: 14rpx;"
+								class="kg">¥{{childItem.weight}}kg</text>
 						</view>
 						<view class="tabs">
-							<view class="tab">自营</view>
+							<view class="tab">{{i18n.Proprietary}}</view>
 							<view class="tab">次日达</view>
-							<view class="tab">包邮</view>
+							<view class="tab">{{i18n.postage}}</view>
 						</view>
 						<view class="">
-							<text class="name">伯纳天纯 自营旗舰店</text>
-							<text class="shop">进店</text>
+							<text class="name">{{childItem.merchant_name}}</text>
+							<!-- <text class="shop">进店</text> -->
 						</view>
 					</view>
 				</view>
@@ -72,8 +83,20 @@
 				columnData: [],
 				columnWidth: 0,
 				loading: false,
+				language: ''
 			};
 		},
+		computed: {
+			i18n() {
+				return this.$t('index')
+			}
+		},
+		mounted() {
+			if (uni.getStorageSync('language') != '') {
+				this.language = uni.getStorageSync('language')
+			}
+			console.log(this.language);
+		},
 		watch: {
 			dataList: {
 				immediate: true,
@@ -98,32 +121,32 @@
 		},
 		methods: {
 			//计算每列的高度
-			getElemHeight(index) {
-				this.$nextTick(() => {
-					var arr = [];
-					this.dataList.map((item, index) => {
-						uni.getImageInfo({
-							src: item.picUrl,
-							success: (e) => {
-								item.height = (e.height * (this.columnWidth / e.width)) + 'px'
-								this.createSelectorQuery().select('#item' + item.id)
-									.boundingClientRect(res => {
-										arr.push({
-											...{
-												itemHeight: res.height
-											},
-											...item
-										});
-										if (arr.length == this.dataList.length) {
-											this.columnData = this.distributeToNArrays(arr,
-												this.column);
-										}
-									}).exec();
-							}
-						})
-					})
-				})
-			},
+			// getElemHeight(index) {
+			// 	this.$nextTick(() => {
+			// 		var arr = [];
+			// 		this.dataList.map((item, index) => {
+			// 			uni.getImageInfo({
+			// 				src: item.picUrl,
+			// 				success: (e) => {
+			// 					item.height = (e.height * (this.columnWidth / e.width)) + 'px'
+			// 					this.createSelectorQuery().select('#item' + item.id)
+			// 						.boundingClientRect(res => {
+			// 							arr.push({
+			// 								...{
+			// 									itemHeight: res.height
+			// 								},
+			// 								...item
+			// 							});
+			// 							if (arr.length == this.dataList.length) {
+			// 								this.columnData = this.distributeToNArrays(arr,
+			// 									this.column);
+			// 							}
+			// 						}).exec();
+			// 				}
+			// 			})
+			// 		})
+			// 	})
+			// },
 			distributeToNArrays(arr, n) {
 				let sums = new Array(n).fill(0);
 				return arr.reduce(
@@ -151,7 +174,7 @@
 					Array.from(Array(this.column), () => []),
 				);
 				this.columnData = resultArray
-				this.getElemHeight()
+				// this.getElemHeight()
 			},
 			click(item) {
 				this.$emit('click', item)