From ac7a12e33b64f713f80015083b2169d5011d10e1 Mon Sep 17 00:00:00 2001
From: Enzo <1284707383@qq.com>
Date: Fri, 23 Jul 2021 18:06:23 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=8E=A5=E5=8F=A3=20?=
 =?UTF-8?q?=E5=85=B3=E4=BA=8E=E6=88=91=E4=BB=AC=E6=8E=A5=E5=8F=A3=E5=AF=B9?=
 =?UTF-8?q?=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/api.js                            | 17 +++++++++-
 common/http.interceptor.js               |  1 +
 common/http.js                           |  6 +++-
 components/lf-waterfall/lf-waterfall.vue | 16 +++++-----
 manifest.json                            |  4 +--
 pages/about/index.vue                    |  6 ++--
 pages/collect/index.vue                  | 25 ++++++++-------
 pages/index/index.vue                    | 40 ++++++++++++++++--------
 8 files changed, 75 insertions(+), 40 deletions(-)

diff --git a/common/api.js b/common/api.js
index ecc4462..346edbb 100644
--- a/common/api.js
+++ b/common/api.js
@@ -1,5 +1,20 @@
 // appId: 正式 null | 测试 wxb35ef055a4dd8ad4
 export const DEV = "dev"; // dev 测试 | prod 正式
 export const VERSION = '1.0.0'; // 版本号
-export const DEVURL = 'https://gxsky.lanzulive.com'; // 测试服请求地址
+export const DEVURL = 'http://hainan.com'; // 测试服请求地址
 export const PRODURL = ''; // 正式服请求地址
+
+
+export const API_WXLOGIN = '/api/login'; //登录
+
+
+
+export const API_INDEX = '/api/index'; //首页
+
+
+
+
+
+//系统
+export const API_ABOUTUS = '/api/agent_info/about'; //关于我们
+export const API_COLLECT_LIST = '/api/fav/list'; //收藏列表
diff --git a/common/http.interceptor.js b/common/http.interceptor.js
index dbf0892..afdc05c 100644
--- a/common/http.interceptor.js
+++ b/common/http.interceptor.js
@@ -16,6 +16,7 @@ const install = (Vue, vm) => {
 	
 	// 请求前拦截, 现在不做拦截
 	Vue.prototype.$u.http.interceptor.request = config => {
+		console.log(config)
 		return true;
 	};
 	
diff --git a/common/http.js b/common/http.js
index 50b0f44..c59a91b 100644
--- a/common/http.js
+++ b/common/http.js
@@ -89,8 +89,12 @@ function $http(url, data = {}, options = {}){
 			that.$u.http.setConfig({showLoading: options.showLoading});
 		}
 		
+		//商户id
+		options.appid = 'wx0e8ebcd9ca9e4b97'
+		
+		options.Authentication = 'c4ca4238a0b923820dcc509a6f75849b'
 		// 发起请求
-		that.$u.post(url, data).then(res => {
+		that.$u.post(url, data, options).then(res => {
 			resolve(res);
 		}).catch(err => {
 			reject(err);
diff --git a/components/lf-waterfall/lf-waterfall.vue b/components/lf-waterfall/lf-waterfall.vue
index 34f0077..0b91423 100644
--- a/components/lf-waterfall/lf-waterfall.vue
+++ b/components/lf-waterfall/lf-waterfall.vue
@@ -3,34 +3,34 @@
 		<u-waterfall v-model="list">
 			<template v-slot:left="{leftList}">
 				<view class="list-warter" v-for="(item, index) in leftList" :key="index" @click="onClick">
-					<u-lazy-load threshold="-450" border-radius="8px 8px 0 0" :image="item.image" :index="index">
-						<view class="list-label">已售8777</view>
+					<u-lazy-load threshold="-450" border-radius="8px 8px 0 0" :image="item.product.picture" :index="index">
+						<view class="list-label">已售{item.saleitem.sale}</view>
 					</u-lazy-load>
 					<view class="lf-p-20">
 						<view class="list-title">
-							{{item.title}}
+							{{item.product.title}}
 						</view>
 						<view class="list-price">
 							<!-- <text>{{item.price}}元</text> -->
 							<lf-price :price="item.price"></lf-price>
-							<text class="lf-m-l-20 lf-font-24 lf-color-666 lf-line-through">¥399.00</text>
+							<text class="lf-m-l-20 lf-font-24 lf-color-666 lf-line-through">{{item.original_price}}</text>
 						</view>
 					</view>
 				</view>
 			</template>
 			<template v-slot:right="{rightList}">
 				<view class="list-warter" v-for="(item, index) in rightList" :key="index" @click="onClick">
-					<u-lazy-load threshold="-450" border-radius="8px 8px 0 0" :image="item.image" :index="index">
-						<view class="list-label">已售8777</view>
+					<u-lazy-load threshold="-450" border-radius="8px 8px 0 0" :image="item.product.picture" :index="index">
+						<view class="list-label">已售{item.sale}</view>
 					</u-lazy-load>
 					<view class="lf-p-20">
 						<view class="list-title">
-							{{item.title}}
+							{{item.product.title}}
 						</view>
 						<view class="list-price">
 							<!-- <text>{{item.price}}元</text> -->
 							<lf-price :price="item.price"></lf-price>
-							<text class="lf-m-l-20 lf-font-24 lf-color-666 lf-line-through">¥399.00</text>
+							<text class="lf-m-l-20 lf-font-24 lf-color-666 lf-line-through">{{item.original_price}}</text>
 						</view>
 					</view>
 				</view>
diff --git a/manifest.json b/manifest.json
index 9822a65..603e5b4 100644
--- a/manifest.json
+++ b/manifest.json
@@ -50,10 +50,10 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wxb35ef055a4dd8ad4",
+        "appid" : "wx0e8ebcd9ca9e4b97",
         "setting" : {
             "urlCheck" : false,
-            "es6" : true,
+            "es6" : false,
             "postcss" : true
         },
         "usingComponents" : true
diff --git a/pages/about/index.vue b/pages/about/index.vue
index 74a5e74..c884ce7 100644
--- a/pages/about/index.vue
+++ b/pages/about/index.vue
@@ -15,12 +15,12 @@
 			}
 		},
 		onLoad(){
-			// this.getData();
+			this.getData();
 		},
 		methods: {
 			getData(){
-				this.$http(this.API.API_ARTICLE_QA).then(res => {
-					this.content = res.data?.content;
+				this.$http(this.API.API_ABOUTUS).then(res => {
+					this.content = res.data?.about;
 				})
 			}
 		}
diff --git a/pages/collect/index.vue b/pages/collect/index.vue
index c29c466..5cf6b1f 100644
--- a/pages/collect/index.vue
+++ b/pages/collect/index.vue
@@ -46,22 +46,23 @@
 		},
 		methods: {
 			getCollectList(){
-				this.list = [{
-					id: 1,
-					goods: {cover: '', name: '小毛驴', store: {name: '家具家电'}},
-					is_collect: true,
-					created_at_text: '2021.07.07'
-				},{
-					id: 2,
-					goods: {cover: '', name: '小毛驴', store: {name: '家具家电'}},
-					is_collect: true,
-					created_at_text: '2021.07.07'
-				}];
+				// this.list = [{
+				// 	id: 1,
+				// 	goods: {cover: '', name: '小毛驴', store: {name: '家具家电'}},
+				// 	is_collect: true,
+				// 	created_at_text: '2021.07.07'
+				// },{
+				// 	id: 2,
+				// 	goods: {cover: '', name: '小毛驴', store: {name: '家具家电'}},
+				// 	is_collect: true,
+				// 	created_at_text: '2021.07.07'
+				// }];
 				
-				return;
+				// return;
 				this.$http(this.API.API_COLLECT_LIST).then(res => {
 					this.skeletonLoading = false;
 					this.isPage = res.data.has_more_page;
+					console.log(res)
 					let list = res.data.items.map(item => {
 						item.is_collect = true; // 默认都收藏了
 						return item;
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 1d2984f..293c50a 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,19 +1,16 @@
 <template>
 	<view>
 		<swiper class="head" :current="banner_current" >
-			<swiper-item @click="clickBanner">
-				<image src="https://picsum.photos/375/360" class="swipe-img"></image>
-			</swiper-item>
-			<swiper-item @click="clickBanner">
-				<image src="https://picsum.photos/375/360" class="swipe-img"></image>
+			<swiper-item @click="clickBanner" v-for="(item,index) of banner">
+				<image :src="item.url" class="swipe-img" mode="aspectFill"></image>
 			</swiper-item>
 		</swiper>
 		<view class="content">
 			<!-- 消息模块 -->
-			<view class="lf-row-between lf-m-b-34 message-box">
+			<view class="lf-row-between lf-m-b-34 message-box" v-for="(item,index) of notice">
 				<view class="lf-flex">
 					<text class="lf-iconfont lf-icon-tongzhi lf-text-vertical"></text>
-					<view class="lf-m-l-12 lf-line-1" style="max-width: 510rpx;">国庆优惠大促，快来看看吧！</view>
+					<view class="lf-m-l-12 lf-line-1" style="max-width: 510rpx;">{{item.title}}</view>
 				</view>
 				<view class="message-btn" hover-class="lf-opacity" @click="$url('/pages/notice/article')">详情</view>
 			</view>
@@ -26,9 +23,9 @@
 				</view>
 			</view>
 			<view class="lf-flex-wrap">
-				<view class="channel-item" v-for="(item, index) in 7" @click="$url('/pages/goodsList/index')">
-					<image src="../../static/logo.png" class="channel-mask" mode="aspectFill"></image>
-					<view class="lf-row-center channe-text lf-font-bold">冲浪</view>
+				<view class="channel-item" v-for="(item, index) in channel_list" @click="$url('/pages/goodsList/index')">
+					<image :src="item.icon" class="channel-mask" mode="aspectFill"></image>
+					<view class="lf-row-center channe-text lf-font-bold">{{item.name}}</view>
 					<!-- <view>
 						<u-icon name="lock-fill lf-text-vertical"></u-icon>
 					</view> -->
@@ -119,11 +116,14 @@
 		},
 		data() {
 			return {
+				banner: [],
 				banner_current: 0,
 				recomm_list: [],
+				channel_list: [],
 				current: 0,
 				loading_class: false,
 				loading_text: '已加载全部数据~',
+				home_ad1: '',
 				list: [
 				 {
 				  price: 35,
@@ -161,11 +161,13 @@
 				  title: '江山如此多娇，引无数英雄竞折腰',
 				  image: 'http://pic1.sc.chinaz.com/Files/pic/pic9/202002/zzpic23346_s.jpg',
 				 }
-				]
+				],
+				notice: []
 			}
 		},
 		onLoad() {
-			this.addRandomData();
+			// this.addRandomData();
+			this.getIndexData()
 		},
 		methods: {
 			// 瀑布流随机模拟数据
@@ -178,7 +180,19 @@
 					this.recomm_list.push(item);
 				}
 			},
-			// tabs标签切换时件，现已费弃
+			getIndexData() {
+				this.$http(this.API.API_INDEX).then(res => {
+					this.notice = res.data?.notice
+					this.recomm_list = res.data?.hots
+					this.banner = res.data?.slide
+					this.channel_list = res.data?.my_channels
+					this.home_ad1 = res.data?.home_ad1
+					console.log(res)
+				}).catch(err => {
+					
+				})
+			},
+ 			// tabs标签切换时件，现已费弃
 			tabChange(current){
 				this.current = current;
 			},