last merge

fore-end/API/appraise.js

@@ -27,7 +27,8 @@ const API = {
     getGoodsDetailURL: '/goods/detail',
     postReviseOrder: '/order/revise',
 	getRecommendUrl: '/goods/recommend',
-	getUserAllGoodsUrl:'/goods/user'
+	getUserAllGoodsUrl:'/goods/user',
+	initRecommendURL:'/user/rec/new'
 }
 
 //查询列表时传参---注意参数数据类型
@@ -254,6 +255,18 @@ function getRecommend(data) {
     )
 }
 
+/**
+ * 初始化用户推荐数据
+ * @param {Array} cIds 分类Id
+ * @param {number} uid 用户Id
+ * @returns
+ */
+function initRecommend(data) {
+	return request.post(API.initRecommendURL,{
+		data:data
+	})
+}
+
 module.exports = {
     createCommont,
 	getCommentList,
@@ -281,5 +294,6 @@ module.exports = {
 	loginURl: API.loginURL,
     registerURL: API.registerURL,
     postOrderChange,
-    getRecommend
+	getRecommend,
+	initRecommend
 }

fore-end/app.js

@@ -36,7 +36,7 @@ var infoOption = {
 	//检测缓存是否有token
 	// console.log(wx.getStorageSync('token'));
 	if(wx.getStorageSync('token') == ''){
-		// console.log('token不存在');
+		console.log('token不存在');
 		// 登录
 		wxLogin().then((res)=>{
 			console.log(res);
@@ -59,7 +59,7 @@ var infoOption = {
 	}else{
 		getUserInfo(infoOption).then(res => {
 			// console.log(res);
-			// console.log('token有效');
+			console.log('token有效');
 			wx.setStorageSync('uid', res.data.data.uid);
 			wx.setStorageSync('avatarUrl', res.data.data.avatar);
 			wx.setStorageSync('nickName', res.data.data.name);

fore-end/app.json

@@ -33,8 +33,8 @@
 		"pages/classify_detail/classify_detail",
 		"pages/chat/chat",
 		"pages/com_search/com_search",
-		"pages/hobbyPicking/hobbyPicking",
-		"pages/order_detail/order_detail"
+		"pages/order_detail/order_detail",
+		"pages/hobbyPicking/hobbyPicking"
 	],
 	"window": {
 		"backgroundTextStyle": "light",

fore-end/pages/hobbyPicking/hobbyPicking.js

@@ -1,6 +1,6 @@
 // pages/hobbyPicking/hobbyPicking.js
-const { getCategoryAPI } = require('../../API/appraise')
-
+const { getCategoryAPI,initRecommend } = require('../../API/appraise')
+var clientWidth = wx.getSystemInfoSync().windowWidth;
 
 Page({
 
@@ -8,7 +8,8 @@ Page({
      * 页面的初始数据
      */
     data: {
-        classifyList: []
+		classifyList: [],
+		left:clientWidth/2-40+'px'
     },
 
     //获取点击分类的id
@@ -23,16 +24,21 @@ Page({
      * 生命周期函数--监听页面加载
      */
     onLoad(options) {
-        this.getClassifyList()
+		this.getClassifyList();
     },
 
     getClassifyList() {
 		getCategoryAPI(this.data)
 		.then((res) => {
-            const { code, data, mesage } = res.data;
+			const { code, data, mesage } = res.data;
+			data.map((item)=>{
+				console.log(item);
+				item['checked'] = false;
+			})
             this.setData({
                 classifyList: data
-            })
+			})
+			
         })
     },
     /**
@@ -82,5 +88,43 @@ Page({
      */
     onShareAppMessage() {
 
-    }
+	},
+	
+	onHobbyChange:function(e) {
+		let $id = e.currentTarget.dataset.id;
+		let _this = this.data;
+		_this.classifyList.map((item) => {
+			if(item.Id === $id)
+			{
+				item.checked = e.detail;
+			}
+		})
+		this.setData({
+			classifyList:_this.classifyList
+		})
+	},
+
+	initRecommendTap:function(e) {
+		let _this = this.data;
+		let cIds = [];//分类Id（用户选择）
+		for(let i of _this.classifyList)
+		{
+			if(i.checked === true)
+			{
+				cIds.push(i.Id);
+			}
+		}
+		let initRecommendOption = {
+			cIds:cIds,
+			uid:wx.getStorageSync('uid')
+		}
+		initRecommend(initRecommendOption).then((res) => {
+			console.log(res);
+			wx.switchTab({
+			  url: '/pages/home/home',
+			})
+		}).catch((err) => {
+			console.log(err);
+		})
+	}
 })

fore-end/pages/hobbyPicking/hobbyPicking.wxml

@@ -2,15 +2,18 @@
 <view>
     <!-- 标题 -->
 	<view class="classify_skip">跳过</view>
-    <view class="classify_topic">分类</view>
+    <view class="classify_topic">偏好选择</view>
     <!-- 展示分类 -->
     <view class="classify_list">
         <view class="categories" wx:for="{{classifyList}}" wx:key="Id">
             <view class="categories_card" bind:tap="detailClassifyTo" data-num='{{item.Id}}' data-title='{{item.Name}}'>
                 <van-image width="90" height="90" fit="cover" src="{{item.Pic}}" />
             </view>
-			<van-checkbox value="{{ checked }}" icon-size="25px">复选框</van-checkbox>
-			<view class="text">{{item.Name}}</view>
+			<van-checkbox value="{{ item.checked }}" icon-size="25px" class="text" bind:change="onHobbyChange" data-id="{{item.Id}}">{{item.Name}}</van-checkbox>
         </view>
     </view>
+	<!-- 确认按钮 -->
+	<view>
+		<van-button type="default" round color="linear-gradient(to right, #4bb0ff, #6149f6)" custom-style="width:80px;position:relative;left:{{left}};margin-top:15px;" bind:tap="initRecommendTap">确认</van-button>
+	</view>
 </view>

fore-end/pages/register/register.js

@@ -152,9 +152,9 @@ Page({
 									message: '登陆成功',
 									context:this,
 									onClose: () => {
-										wx.switchTab({
-											url: '/pages/home/home',
-										  })
+										wx.navigateTo({
+										  url: '/pages/hobbyPicking/hobbyPicking',
+										})
 									},
 								  });
 							})