Compare commits
7 Commits
ruanyulin_
...
main
| Author | SHA1 | Date |
|---|---|---|
 popix497f
|
77fa1e4684 | 1 year ago |
左丹妮
|
c9f9d02734 | 1 year ago |
|
左丹妮
|
cbabb525e8 | 1 year ago |
|
左丹妮
|
9ad05307ee | 1 year ago |
|
左丹妮
|
45f3e4f602 | 1 year ago |
|
左丹妮
|
3bce017032 | 1 year ago |
|
zzzzzzpppx
|
a5473a3f0b | 1 year ago |
|
After Width: | Height: | Size: 7.6 KiB |
|
After Width: | Height: | Size: 13 KiB |
|
After Width: | Height: | Size: 10 KiB |
|
After Width: | Height: | Size: 9.0 KiB |
|
After Width: | Height: | Size: 9.9 KiB |
|
After Width: | Height: | Size: 16 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 7.5 KiB |
|
After Width: | Height: | Size: 6.7 KiB |
|
After Width: | Height: | Size: 15 KiB |
|
After Width: | Height: | Size: 13 KiB |
|
Before Width: | Height: | Size: 84 KiB After Width: | Height: | Size: 1.5 MiB |
|
After Width: | Height: | Size: 1.4 MiB |
|
After Width: | Height: | Size: 1.4 MiB |
|
After Width: | Height: | Size: 1.3 MiB |
|
After Width: | Height: | Size: 1022 KiB |
|
After Width: | Height: | Size: 7.5 KiB |
|
Before Width: | Height: | Size: 98 KiB After Width: | Height: | Size: 1.4 MiB |
|
Before Width: | Height: | Size: 118 KiB After Width: | Height: | Size: 1.2 MiB |
|
Before Width: | Height: | Size: 64 KiB After Width: | Height: | Size: 1.1 MiB |
|
After Width: | Height: | Size: 1.3 MiB |
|
After Width: | Height: | Size: 1.2 MiB |
|
After Width: | Height: | Size: 1.3 MiB |
|
After Width: | Height: | Size: 1.4 MiB |
|
After Width: | Height: | Size: 1.0 MiB |
@ -1,21 +1,14 @@
|
||||
<!--pages/main/main.wxml-->
|
||||
<view class="container">
|
||||
<view class="main">
|
||||
<text>主界面</text>
|
||||
<view class="home">
|
||||
<!-- <wxs module="now" ></wxs> -->
|
||||
<view>{{filter.day(1621409888000)}}</view>
|
||||
|
||||
<text>{{date()}}</text>
|
||||
<text>选择一个妆容开始美好的一天吧！</text>
|
||||
</view>
|
||||
<view class="navi">
|
||||
<view>
|
||||
<text bindtap="bindmaiViewTap" mode="cover">首页</text>
|
||||
</view>
|
||||
<view>
|
||||
<text bindtap="bindmacViewTap" mode="cover">匹配</text>
|
||||
</view>
|
||||
<view>
|
||||
<text bindtap="bindhisViewTap" mode="cover">历史</text>
|
||||
</view>
|
||||
<view>
|
||||
<text bindtap="bindrecViewTap" mode="cover">推荐</text>
|
||||
</view>
|
||||
<view class="mainrec">
|
||||
<image bindtap="bindrec1ViewTap" mode="widthFix" src="{{r11}} "/>
|
||||
<!-- <image src="" style="height:100%"mode="widthFix"></image> -->
|
||||
</view>
|
||||
</view>
|
||||
<text>pages/main/main.wxml</text>
|
||||
@ -1 +1,4 @@
|
||||
/* pages/main/main.wxss */
|
||||
.home{
|
||||
|
||||
}
|
||||
@ -1,21 +1,17 @@
|
||||
<!--pages/match/match.wxml-->
|
||||
<view class="container">
|
||||
<view class="match_main">
|
||||
<view class="choose_way" bindtap="tipwindow" >点击开始拍照</view>
|
||||
<!-- <text class="match_display">预览</text>
|
||||
<image mode="widthFix" src="{{imgList}}"></image> -->
|
||||
|
||||
</view>
|
||||
<view class="navi">
|
||||
<view>
|
||||
<text bindtap="bindmaiViewTap" mode="cover">首页</text>
|
||||
</view>
|
||||
<view>
|
||||
<text bindtap="bindmacViewTap" mode="cover">匹配</text>
|
||||
</view>
|
||||
<view>
|
||||
<text bindtap="bindhisViewTap" mode="cover">历史</text>
|
||||
</view>
|
||||
<view>
|
||||
<text bindtap="bindrecViewTap" mode="cover">推荐</text>
|
||||
<camera device-position="front" flash="off" binderror="error" style="width: 100%; height: 400px;"></camera>
|
||||
<!-- 显示摄像头 -->
|
||||
<button type="primary" bindtap="takePhoto">拍照</button>
|
||||
<view class="match_display">
|
||||
预览
|
||||
<image mode="widthFix" src="{{src}}"></image>
|
||||
<button type="primary" bindtap="bindphoViewTap">确定</button>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<text>pages/match/match.wxml</text>
|
||||
@ -1 +1,23 @@
|
||||
/* pages/match/match.wxss */
|
||||
.match_main{
|
||||
width:auto;
|
||||
height: auto;
|
||||
background-color: #ddcfc3;
|
||||
}
|
||||
.choose_way{
|
||||
width:100%;
|
||||
height:400px;
|
||||
background-color: #ddcfc3;
|
||||
text-align: center;
|
||||
padding-top: 200px;
|
||||
}
|
||||
.match_display{
|
||||
width:auto;
|
||||
height:100px;
|
||||
background-color: #ddcfc3;
|
||||
text-align: center;
|
||||
padding-top: 50px;
|
||||
}
|
||||
.match_sure{
|
||||
text-align: center;
|
||||
}
|
||||
@ -0,0 +1,3 @@
|
||||
{
|
||||
"usingComponents": {}
|
||||
}
|
||||
@ -0,0 +1,7 @@
|
||||
<!--pages/match/photo.wxml-->
|
||||
<view class='container'>
|
||||
<view class='imgwindow'>
|
||||
<image class='imgwindow' mode='widthFix' src='{{imgFilePath}}'/>
|
||||
<!-- 图片预览 -->
|
||||
</view>
|
||||
</view>
|
||||
@ -0,0 +1 @@
|
||||
/* pages/match/photo.wxss */
|
||||
@ -1 +1,46 @@
|
||||
/* pages/recommend/rec1.wxss */
|
||||
.container{
|
||||
|
||||
}
|
||||
.rec1{
|
||||
|
||||
}
|
||||
|
||||
.text {
|
||||
/* 字体大小 */
|
||||
font-size: 20px;
|
||||
/* 字体颜色 */
|
||||
color: black;
|
||||
/* 字体风格-粗细 */
|
||||
font-weight: bold;
|
||||
/*段落排版--首字缩进*/
|
||||
text-indent: 2em;
|
||||
/*段落排版--行间距（行高）*/
|
||||
line-height: 1.5em;
|
||||
/*段落排版--中文字间距*/
|
||||
letter-spacing: 1px;
|
||||
/*字母间距*/
|
||||
word-spacing: 4px;
|
||||
/*文字对齐 right 、left 、center */
|
||||
text-align: left;
|
||||
|
||||
}
|
||||
.text2 {
|
||||
/* 字体大小 */
|
||||
font-size: 15px;
|
||||
/* 字体颜色 */
|
||||
color: black;
|
||||
/* 字体风格-粗细 */
|
||||
/*font-weight: bold;*/
|
||||
/*段落排版--首字缩进*/
|
||||
text-indent: 2em;
|
||||
/*段落排版--行间距（行高）*/
|
||||
line-height: 1.5em;
|
||||
/*段落排版--中文字间距*/
|
||||
letter-spacing: 1px;
|
||||
/*字母间距*/
|
||||
word-spacing: 4px;
|
||||
/*文字对齐 right 、left 、center */
|
||||
text-align: left;
|
||||
|
||||
}
|
||||
@ -0,0 +1,66 @@
|
||||
// pages/recommend/rec2.js
|
||||
Page({
|
||||
|
||||
/**
|
||||
* 页面的初始数据
|
||||
*/
|
||||
data: {
|
||||
r21:"../images/recom_1_2.jpg"
|
||||
},
|
||||
|
||||
/**
|
||||
* 生命周期函数--监听页面加载
|
||||
*/
|
||||
onLoad(options) {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 生命周期函数--监听页面初次渲染完成
|
||||
*/
|
||||
onReady() {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 生命周期函数--监听页面显示
|
||||
*/
|
||||
onShow() {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 生命周期函数--监听页面隐藏
|
||||
*/
|
||||
onHide() {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 生命周期函数--监听页面卸载
|
||||
*/
|
||||
onUnload() {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 页面相关事件处理函数--监听用户下拉动作
|
||||
*/
|
||||
onPullDownRefresh() {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 页面上拉触底事件的处理函数
|
||||
*/
|
||||
onReachBottom() {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 用户点击右上角分享
|
||||
*/
|
||||
onShareAppMessage() {
|
||||
|
||||
}
|
||||
})
|
||||
@ -0,0 +1,3 @@
|
||||
{
|
||||
"usingComponents": {}
|
||||
}
|
||||
@ -0,0 +1,45 @@
|
||||
/* pages/recommend/rec2.wxss */
|
||||
.container{
|
||||
|
||||
}
|
||||
.rec2{
|
||||
|
||||
}
|
||||
.text {
|
||||
/* 字体大小 */
|
||||
font-size: 20px;
|
||||
/* 字体颜色 */
|
||||
color: black;
|
||||
/* 字体风格-粗细 */
|
||||
font-weight: bold;
|
||||
/*段落排版--首字缩进*/
|
||||
text-indent: 2em;
|
||||
/*段落排版--行间距（行高）*/
|
||||
line-height: 1.5em;
|
||||
/*段落排版--中文字间距*/
|
||||
letter-spacing: 1px;
|
||||
/*字母间距*/
|
||||
word-spacing: 4px;
|
||||
/*文字对齐 right 、left 、center */
|
||||
text-align: left;
|
||||
|
||||
}
|
||||
.text2 {
|
||||
/* 字体大小 */
|
||||
font-size: 15px;
|
||||
/* 字体颜色 */
|
||||
color: black;
|
||||
/* 字体风格-粗细 */
|
||||
/*font-weight: bold;*/
|
||||
/*段落排版--首字缩进*/
|
||||
text-indent: 2em;
|
||||
/*段落排版--行间距（行高）*/
|
||||
line-height: 1.5em;
|
||||
/*段落排版--中文字间距*/
|
||||
letter-spacing: 1px;
|
||||
/*字母间距*/
|
||||
word-spacing: 4px;
|
||||
/*文字对齐 right 、left 、center */
|
||||
text-align: left;
|
||||
|
||||
}
|
||||
@ -0,0 +1,66 @@
|
||||
// pages/recommend/rec3.js
|
||||
Page({
|
||||
|
||||
/**
|
||||
* 页面的初始数据
|
||||
*/
|
||||
data: {
|
||||
r31:"../images/recom_1_3.jpg"
|
||||
},
|
||||
|
||||
/**
|
||||
* 生命周期函数--监听页面加载
|
||||
*/
|
||||
onLoad(options) {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 生命周期函数--监听页面初次渲染完成
|
||||
*/
|
||||
onReady() {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 生命周期函数--监听页面显示
|
||||
*/
|
||||
onShow() {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 生命周期函数--监听页面隐藏
|
||||
*/
|
||||
onHide() {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 生命周期函数--监听页面卸载
|
||||
*/
|
||||
onUnload() {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 页面相关事件处理函数--监听用户下拉动作
|
||||
*/
|
||||
onPullDownRefresh() {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 页面上拉触底事件的处理函数
|
||||
*/
|
||||
onReachBottom() {
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* 用户点击右上角分享
|
||||
*/
|
||||
onShareAppMessage() {
|
||||
|
||||
}
|
||||
})
|
||||
@ -0,0 +1,3 @@
|
||||
{
|
||||
"usingComponents": {}
|
||||
}
|
||||
@ -0,0 +1,39 @@
|
||||
/* pages/recommend/rec3.wxss */
|
||||
.text {
|
||||
/* 字体大小 */
|
||||
font-size: 20px;
|
||||
/* 字体颜色 */
|
||||
color: black;
|
||||
/* 字体风格-粗细 */
|
||||
font-weight: bold;
|
||||
/*段落排版--首字缩进*/
|
||||
text-indent: 2em;
|
||||
/*段落排版--行间距（行高）*/
|
||||
line-height: 1.5em;
|
||||
/*段落排版--中文字间距*/
|
||||
letter-spacing: 1px;
|
||||
/*字母间距*/
|
||||
word-spacing: 4px;
|
||||
/*文字对齐 right 、left 、center */
|
||||
text-align: left;
|
||||
|
||||
}
|
||||
.text2 {
|
||||
/* 字体大小 */
|
||||
font-size: 15px;
|
||||
/* 字体颜色 */
|
||||
color: black;
|
||||
/* 字体风格-粗细 */
|
||||
/*font-weight: bold;*/
|
||||
/*段落排版--首字缩进*/
|
||||
text-indent: 2em;
|
||||
/*段落排版--行间距（行高）*/
|
||||
line-height: 1.5em;
|
||||
/*段落排版--中文字间距*/
|
||||
letter-spacing: 1px;
|
||||
/*字母间距*/
|
||||
word-spacing: 4px;
|
||||
/*文字对齐 right 、left 、center */
|
||||
text-align: left;
|
||||
|
||||
}
|
||||
@ -1,22 +1,24 @@
|
||||
<!--pages/recommend/recommend.wxml-->
|
||||
<view class="container">
|
||||
<view class="rec_main">
|
||||
<view class="rec_main_1">
|
||||
<image bindtap="bindrec1ViewTap" src="{{rm1}} "/>
|
||||
</view>
|
||||
</view>
|
||||
<view class="rec_navi">
|
||||
<view>
|
||||
<text bindtap="bindmaiViewTap" mode="cover">首页</text>
|
||||
</view>
|
||||
<view>
|
||||
<text bindtap="bindmacViewTap" mode="cover">匹配</text>
|
||||
</view>
|
||||
<view>
|
||||
<text bindtap="bindhisViewTap" mode="cover">历史</text>
|
||||
</view>
|
||||
<swiper indicator-dots="{{indicatorDots}}"
|
||||
autoplay="{{autoplay}}" interval="{{interval}}" duration="{{duration}}">
|
||||
<block wx:for="{{imgUrls}}">
|
||||
<swiper-item>
|
||||
<image bindtap="bindrec1ViewTap" mode="widthFix" src="{{item}}" class="slide-image" />
|
||||
</swiper-item>
|
||||
</block>
|
||||
</swiper>
|
||||
<view>
|
||||
<text bindtap="bindrecViewTap" mode="cover">推荐</text>
|
||||
<text>推荐页面</text>
|
||||
</view>
|
||||
<view class="rec_main_4">
|
||||
<image bindtap="bindrec2ViewTap" mode="widthFix" src="{{rm4}} "/>
|
||||
<!-- <image src="" style="height:100%"mode="widthFix"></image> -->
|
||||
</view>
|
||||
<view class="rec_main_5">
|
||||
<image bindtap="bindrec3ViewTap" mode="widthFix" src="{{rm5}}"/>
|
||||
<!-- <image src="" style="height:100%"mode="widthFix"></image> -->
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
@ -1 +1,7 @@
|
||||
/* pages/recommend/recommend.wxss */
|
||||
|
||||
swiper{
|
||||
width: 100%;
|
||||
/* height: calc(100vw*9/16); */
|
||||
height: 350px;
|
||||
}
|
||||
|
||||