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

network/shopApi.js

@@ -0,0 +1,23 @@
+import {
+	request
+} from "./http.js";
+//商品推荐
+function recom() {
+	return request({
+		url: "/goods/recommend",
+		method: "post",
+	});
+}
+//商品详情
+function detail(data) {
+	return request({
+		url: "/goods/detail/" + data,
+		method: "get",
+		data: data,
+	});
+}
+
+export {
+	recom,
+	detail
+}

pageA/productdetails.vue

@@ -312,6 +312,9 @@
 </template>
 
 <script>
+	import {
+		detail
+	} from "@/network/shopApi.js";
 	export default {
 		data() {
 			return {
@@ -332,7 +335,8 @@
 				share: false,
 				value: 0, //步进器的值
 				swiptlist: [],
-				actab: 0
+				actab: 0,
+				id:'',//商品id
 			};
 		},
 		computed: {
@@ -340,7 +344,18 @@
 				return this.$t('index')
 			}
 		},
+		onLoad(options) {
+			this.id = options.id
+		},
+		onShow() {
+			this.detail(this.id)
+		},
 		methods: {
+			detail(id){
+				detail(id).then((res)=>{
+					console.log(res);
+				})
+			},
 			scrollToPosition() {
 				console.log(111);
 				// 使用$refs获取目标位置的DOM元素

pages/index/index.vue

@@ -139,27 +139,27 @@
 				</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">
-					<image src="../../static/images/index/discount.png"
+				<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=""
-						style="width: 340rpx;height: 340rpx;background-color: rgba(119, 119, 119, 1) ;margin-left: -20rpx;margin-top: -18rpx;"
-						mode=""></image>
+					<image :src="item.image"
+						style="width: 340rpx;height: 340rpx;;margin-left: -20rpx;margin-top: -18rpx;" mode=""></image>
 					<view class="title">
-						INSTINCT天然百利狗粮 无谷泰迪去
+						{{item.name_cn}}
 					</view>
 					<view class="">
 						<text class="money">
-							¥258.00
+							¥{{item.price}}
 						</text>
 						<text class="weight">
-							¥2kg
+							¥{{item.weight}}kg
 						</text>
 					</view>
 					<view class="u-flex" style="flex-wrap: wrap;margin-top: 18rpx;column-gap: 12px;overflow: hidden;">
-						<view class="taber" style="border: 1rpx solid #E5BC78;color: #E5BC78;">{{i18n.postage}}
+						<view v-if="item.is_shipping == 0" class="taber"
+							style="border: 1rpx solid #E5BC78;color: #E5BC78;">{{i18n.postage}}
 						</view>
 						<view class="taber" style="border: 1rpx solid rgba(237, 9, 9, 1);color: rgba(237, 9, 9, 1);">
 							{{i18n.Trade}}
@@ -180,12 +180,15 @@
 				</view>
 			</view>
 		</u-popup>
-		<view class="" style="height: 160rpx;"></view>
+		<!-- <view class="" style="height: 160rpx;" v-if="recomlist.length >3"></view> -->
 		<kj-tabbar :value1=1></kj-tabbar>
 	</view>
 </template>
 
 <script>
+	import {
+		recom
+	} from "../../network/shopApi.js";
 	export default {
 		data() {
 			return {
@@ -223,6 +226,7 @@
 			}
 		},
 		onLoad(options) {
+			this.recommend()
 			this.list = [this.i18n.border, this.i18n.shop]
 			// this.seater()
 			if (options.current) {
@@ -232,13 +236,14 @@
 		onShow() {
 			//商品推荐
 			this.recommend()
+			console.log(222222);
 		},
 		methods: {
 			//商品推荐
 			recommend() {
 				console.log(1111);
-				uni.$u.http.post('/api/goods/recommend', {}).then(res => {
-					this.recomlist = res.data
+				recom().then((res) => {
+					this.recomlist = res.data.data
 				})
 			},
 			subsidy(item) {
@@ -276,9 +281,9 @@
 				}
 			},
 			//详情
-			todetail() {
+			todetail(id) {
 				uni.navigateTo({
-					url: '/pageA/productdetails'
+					url: '/pageA/productdetails?id='+id
 				})
 			}
 		}