[水感应客户端最新]

2023-06-21 17:14:39 +08:00
commit b3b4d4dae7
187 changed files with 12997 additions and 0 deletions
--- a/pages/health/article/article.js
+++ b/pages/health/article/article.js
@@ -0,0 +1,140 @@
+ /*
+ * 手太欠
+ * 愿这世界都如故事里一样 美好而动人~
+ */
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        articleId       : '', //文章id
+        indexShow       : '', //内容
+        mallContent     : '', //简介
+        favoritesSee    : '', //收藏状态
+        favoritesNumber : '', //收藏数量
+        subscribesSee   : '', //点赞状态
+        subscribesNumber: '', //点赞数量
+        isFixedTop      : 0,
+        barHeight       : getApp().globalData.barHeight,  // 状态栏高度
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+        this.setData({
+            articleId : options.id
+        })
+
+        if(options.invite != undefined) {
+            getApp().globalData.inviteText = options.invite
+        }
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+        // 获取详情数据
+        this.indexInfo();
+    },
+
+    /**
+     * 详情数据
+     */
+    indexInfo () {
+        wx.$api.health.healthSee(this.data.articleId).then(res => {
+            this.setData({
+                indexShow       : res.data,
+                favoritesSee    : res.data.isFavorite,
+                subscribesSee   : res.data.isSubscribed,
+                favoritesNumber : res.data.favorites,
+                subscribesNumber: res.data.subscribes,
+                mallContent     : res.data.content.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display:block;"')
+            })
+            
+        }).catch(err => {})
+    },
+
+    // 操作按钮
+    toolTap(e) {
+        let newName = e.currentTarget.dataset.name
+        if(wx.getStorageSync("token") != ''){
+            // 收藏
+            if(newName == 'favorites') {
+                wx.$api.health.favorite(this.data.articleId).then(res => {
+                    this.setData({
+                        favoritesSee   : res.data.favorite,
+                        favoritesNumber: res.data.count
+                    })
+                    wx.showToast({
+                        title:'操作成功',
+                        icon:'none'
+                    })
+                }).catch(err => {})
+                return
+            }
+
+            // 点赞
+            wx.$api.health.subscribe(this.data.articleId).then(res => {
+                this.setData({
+                    subscribesSee   : res.data.subscribed,
+                    subscribesNumber: res.data.count
+                })
+                wx.showToast({
+                    title:'操作成功',
+                    icon:'none'
+                })
+            }).catch(err => {})
+        }else{
+            // 去登录
+            wx.navigateTo({
+                url: "/pages/login/index"
+            })
+        }
+    },
+
+    /**
+	 * 微信分享
+	 */
+	onShareAppMessage(){
+		return {
+			title	: this.data.indexShow.title,
+            imageUrl: this.data.indexShow.cover,
+            path	: "/pages/health/article/article?id=" + this.data.articleId + '&invite=' + wx.getStorageSync("invite")
+		}
+    },
+    
+    /**
+    * 返回上一页
+    */
+    returnGo() {
+        wx.navigateBack({
+            delta: 1,
+            fail: () => {
+                wx.switchTab({
+                    url: '/pages/index/index?invite=' + getApp().globalData.inviteText
+                })
+            }
+        })
+    },
+
+    /**
+    * 回到首页
+    */
+    returnHome() {
+        wx.switchTab({
+            url: '/pages/index/index?invite=' + getApp().globalData.inviteText
+        })
+    },
+
+    /**
+    * 监听页面滑动事件
+    */
+   onPageScroll(e) {
+        this.setData({
+            isFixedTop: parseInt(e.scrollTop)
+        });
+    },
+})
--- a/pages/health/article/article.json
+++ b/pages/health/article/article.json
@@ -0,0 +1,5 @@
+{
+    "usingComponents": {},
+    "navigationStyle": "custom",
+    "navigationBarTextStyle": "white"
+}
--- a/pages/health/article/article.wxml
+++ b/pages/health/article/article.wxml
@@ -0,0 +1,40 @@
+<view class="navigation {{isFixedTop > 0 ? 'active' : ''}}" style="padding-top:{{barHeight}}px;">
+    <image bindtap="returnGo" class="navigation-arrow" src="{{isFixedTop > 0 ? '/static/icons/returnBlack.png' : '/static/icons/returnWrite.png'}}"></image>
+    <image bindtap="returnHome" class="navigation-arrow" src="{{isFixedTop > 0 ? '/static/icons/homeBlack.png' : '/static/icons/homeWrite.png'}}"></image>
+</view>
+
+<image class="articleImg" src="{{indexShow.cover}}" mode="widthFix"></image>
+<view class="articleCont">
+    <view class="articleTop">
+        <view class="articleName">
+            <text>水感应 </text> | {{indexShow.title}}
+        </view>
+        <view class="articleTool">
+            <text>{{indexShow.created_at}}</text>
+            <text>浏览 {{indexShow.clicks}}</text>
+        </view>
+    </view>
+    <view class="articleBanner">
+        <image mode="widthFix" src="https://cdn.shuiganying.com/images/2023/05/19/e9b3e2f8c8ae59c4f4a469168d7fb43a.png"></image>
+    </view>
+    <view class="articleText">
+        <rich-text nodes="{{mallContent}}"></rich-text>
+    </view>
+</view>
+
+<view class="tool">
+    <view class="toolCont">
+        <button class="toolCont-label" open-type="share" hover-class="none">
+            <image class="toolCont-label-icon" src="https://cdn.shuiganying.com/images/2023/04/04/a56120fd3f3f4e8dc4be838ade54823f.png"></image>
+            <text>转发</text>
+        </button>
+        <view class="toolCont-label" bindtap="toolTap" data-name="favorites">
+            <image class="toolCont-label-icon" src="{{!favoritesSee ? 'https://cdn.shuiganying.com/images/2023/04/04/5923b8260fe53c9416f8689e2cfb3e97.png' : 'https://cdn.shuiganying.com/images/2023/04/04/1d4d36912f8c09c9d29596f210480ee7.png'}}"></image>
+            <text>{{favoritesNumber}}</text>
+        </view>
+        <view class="toolCont-label" bindtap="toolTap" data-name="subscribes">
+            <image class="toolCont-label-icon" src="{{!subscribesSee ? 'https://cdn.shuiganying.com/images/2023/04/04/e131a69d6ecb5d2e968b104e6ac27b06.png' : 'https://cdn.shuiganying.com/images/2023/04/04/606a29d9956e6caafeda3ed5ed1179d4.png'}}"></image>
+            <text>{{subscribesNumber}}</text>
+        </view>
+    </view>
+</view>
--- a/pages/health/article/article.wxss
+++ b/pages/health/article/article.wxss
@@ -0,0 +1,102 @@
+page {
+    background-color: #ffffff;
+}
+
+.articleImg {
+    width: 100%;
+    display: inline-block;
+}
+
+.articleCont {
+    padding: 30rpx;
+    box-sizing: border-box;
+    border-bottom: 160rpx transparent solid;
+}
+
+.articleName {
+    font-size: 36rpx;
+    margin-top: 20rpx;
+}
+
+.articleName text {
+    text-transform: uppercase;
+}
+
+.articleTool {
+    color: #666666;
+    font-size: 26rpx;
+    margin-top: 15rpx;
+}
+
+.articleTool text {
+    padding-right: 30rpx;
+    font-weight: 200;
+}
+
+.articleBanner {
+    text-align: center;
+    margin: 60rpx 0;
+}
+
+.articleBanner image {
+    width: 100%;
+}
+
+.tool {
+    position: fixed;
+    width: 100%;
+    height: 90rpx;
+    line-height: 90rpx;
+    left: 0;
+    bottom: 60rpx;
+    z-index: 99;
+    padding: 0 30rpx;
+    box-sizing: border-box;
+}
+
+.toolCont {
+    background-color: #ffffff;
+    display: flex;
+    box-shadow: 0 0 10rpx rgba(0, 0, 0, .1);
+    border-radius: 80rpx;
+}
+
+.toolCont-label {
+    flex: 3;
+    text-align: center;
+    color: #999;
+    font-size: 30rpx;
+    background-color: transparent;
+    padding: 0;
+    margin: 0;
+    line-height: 100rpx;
+    font-weight: 200;
+}
+
+.toolCont-label-icon {
+    width: 36rpx;
+    height: 36rpx;
+    margin-right: 10rpx;
+    vertical-align: -4rpx;
+}
+
+.navigation{
+    position: fixed;
+    top: 0;
+    left: 0;
+    z-index: 99;
+    width: 100%;
+    height: 90rpx;
+    background-color: transparent;
+    transition: .2s;
+}
+
+.navigation.active {
+    background-color: transparent;
+}
+
+.navigation-arrow {
+    width: 44rpx;
+    height: 44rpx;
+    margin: 20rpx 15rpx 0 20rpx;
+}
--- a/pages/health/collect/collect.js
+++ b/pages/health/collect/collect.js
@@ -0,0 +1,71 @@
+ /*
+ * 手太欠
+ * 愿这世界都如故事里一样 美好而动人~
+ */
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        categories  : [],     // 分类
+        articlesArr : [],     // 列表
+        page        : {},     // 分页信息
+        lodingStats : false,  // 加载状态
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+        // 获取列表
+        this.articlesInfo();
+    },
+
+    // 列表
+    articlesInfo(page){
+        wx.$api.health.myFavorite({
+            page : page || 1
+        }).then(res => {
+            let listArr = this.data.articlesArr,
+                newData = []
+            if(page == 1 || page == undefined) listArr = []
+            newData = listArr.concat(res.data.favorites.data)
+            this.setData({
+                articlesArr : newData,
+                page        : res.data.favorites.page,
+                lodingStats : false
+            })
+            wx.stopPullDownRefresh()
+        }).catch(err => {})
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+        // 获取列表
+		this.articlesInfo();
+    },
+
+    /**
+     * 上拉加载
+     */
+    onReachBottom(){
+        this.setData({
+            lodingStats: true
+        })
+        let pageNumber = this.data.page.current
+        if(this.data.page.has_more){
+            pageNumber++
+            // 获取列表
+		    this.articlesInfo(pageNumber);
+        }
+    }
+})
--- a/pages/health/collect/collect.json
+++ b/pages/health/collect/collect.json
@@ -0,0 +1,4 @@
+{
+    "usingComponents": {},
+    "navigationBarTitleText": "我的收藏"
+}
--- a/pages/health/collect/collect.wxml
+++ b/pages/health/collect/collect.wxml
@@ -0,0 +1,24 @@
+<!-- 健康知识 -->
+<view class="article">
+    <view class="wiki" wx:if="{{articlesArr.length > 0}}">
+        <navigator hover-class="none" url="../article/article?id={{item.favoriteable.article_id}}" class="wiki-label" wx:for="{{articlesArr}}" wx:key="listsArr">
+            <image class="wiki-label-img" mode="aspectFill" src="{{item.favoriteable.cover}}"></image>
+            <view class="wiki-label-cont">
+                <view class="nowrap wiki-label-name"><text>水感应</text> | {{item.favoriteable.title}}</view>
+                <view class="nowrap-multi wiki-label-text">{{item.favoriteable.description}}</view>
+            </view>
+        </navigator>
+        <view class="pagesLoding" wx:if="{{lodingStats}}">
+            <block wx:if="{{page.has_more}}">
+                <image class="pagesLoding-icon" src="/static/icons/refresh_loding.gif" mode="widthFix"></image>加载中...
+            </block>
+            <block wx:else>
+                没有更多了~
+            </block>
+        </view>
+    </view>
+    <view class="pack-center pages-hint" wx:else>
+        <image src="/static/imgs/text_null.png"></image>
+        <view>暂无数据</view>
+    </view>
+</view>
--- a/pages/health/collect/collect.wxss
+++ b/pages/health/collect/collect.wxss
@@ -0,0 +1,62 @@
+page {
+    padding: 0 30rpx;
+    box-sizing: border-box;
+    background-color: #f6f6f6;
+}
+
+/* 健康知识 */
+.article {
+    box-sizing: border-box;
+}
+
+.wiki {
+    margin-top: 60rpx;
+}
+
+.wiki-label {
+    background-color: #fff;
+    margin-bottom: 70rpx;
+    position: relative;
+    height: 200rpx;
+    box-shadow: 0 4rpx 30rpx 2rpx rgba(0, 0, 0, .05);
+    border-radius: 10rpx;
+}
+
+.wiki-label:last-child {
+    margin-bottom: 0;
+}
+
+.wiki-label-img {
+    width: 200rpx;
+    height: 200rpx;
+    position: absolute;
+    top: -30rpx;
+    left: 30rpx;
+    border-radius: 10rpx;
+}
+
+.wiki-label-cont {
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 100%;
+    padding: 30rpx 25rpx 0 270rpx;
+    box-sizing: border-box;
+}
+
+.wiki-label-name {
+    font-size: 32rpx;
+    color: #3b7cff;
+}
+
+.wiki-label-name text {
+    text-transform: uppercase;
+}
+
+.wiki-label-text {
+    color: #999999;
+    font-size: 28rpx;
+    margin-top: 20rpx;
+    line-height: 40rpx;
+    font-weight: 200;
+}
--- a/pages/health/index.js
+++ b/pages/health/index.js
@@ -0,0 +1,87 @@
+ /*
+ * 手太欠
+ * 愿这世界都如故事里一样 美好而动人~
+ */
+Page({
+    data: {
+        categoriesArr   : [],   // 健康分类
+        categoryId      : '',   // 分类id
+        listsArr        : [],   // 列表
+        page            : {},   // 分页信息
+        lodingStats     : false,// 加载状态
+    },
+
+    onLoad(options) {
+        // 获取健康分类
+        this.categoriesInfo();
+    },
+
+    /**
+     * 健康分类
+     */
+    categoriesInfo() {
+        wx.$api.health.healthNav().then(res => {
+            this.setData({
+                categoriesArr : res.data,
+                categoryId    : res.data[0].category_id
+            })
+            // 获取健康列表
+            this.healthInfo();
+        }).catch(err => {})
+    },
+
+    /**
+     * 分类选择
+     */
+    tabsTap(e) {
+        this.setData({
+            categoryId: e.currentTarget.dataset.id
+        })
+        // 获取健康分类
+        this.healthInfo();
+    },
+
+    /**
+     * 健康列表
+     */
+    healthInfo(page) {
+        wx.$api.health.healthList({
+            category_id: this.data.categoryId,
+            page       : page || 1
+        }).then(res => {
+            let listArr = this.data.listsArr,
+                newData = []
+            if(page == 1 || page == undefined) listArr = []
+            newData = listArr.concat(res.data.data)
+            this.setData({
+                listsArr       : newData,
+                page           : res.data.page,
+                lodingStats    : false
+            })
+            wx.stopPullDownRefresh()
+        }).catch(err => {})
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+        // 获取健康列表
+        this.healthInfo();
+    },
+
+    /**
+     * 上拉加载
+     */
+    onReachBottom(){
+        this.setData({
+            lodingStats: true
+        })
+        let pageNumber = this.data.page.current
+        if(this.data.page.has_more){
+            pageNumber++
+            // 获取健康列表
+            this.healthInfo(pageNumber);
+        }
+    }
+})
--- a/pages/health/index.json
+++ b/pages/health/index.json
@@ -0,0 +1,4 @@
+{
+    "usingComponents": {},
+    "navigationBarTitleText": "健康知识"
+}
--- a/pages/health/index.wxml
+++ b/pages/health/index.wxml
@@ -0,0 +1,33 @@
+<!-- tabs -->
+<view class="tabs">
+    <scroll-view class="tabs-scroll" scroll-x="true" scroll-with-animation>
+        <block wx:for="{{categoriesArr}}" wx:key="categoriesData">
+            <view class="tabs-scroll-name {{categoryId == item.category_id ? 'active' : ''}}" data-id="{{item.category_id}}" bindtap="tabsTap">{{item.title}}</view>
+        </block>
+    </scroll-view>
+</view>
+
+<!-- 健康知识 -->
+<view class="article">
+    <view class="wiki" wx:if="{{listsArr.length > 0}}">
+        <navigator hover-class="none" url="./article/article?id={{item.article_id}}" class="wiki-label" wx:for="{{listsArr}}" wx:key="listsArr">
+            <image class="wiki-label-img" mode="aspectFill" src="{{item.cover}}"></image>
+            <view class="wiki-label-cont">
+                <view class="nowrap wiki-label-name"><text>水感应</text> | {{item.title}}</view>
+                <view class="nowrap-multi wiki-label-text">{{item.description}}</view>
+            </view>
+        </navigator>
+        <view class="pagesLoding" wx:if="{{lodingStats}}">
+            <block wx:if="{{page.has_more}}">
+                <image class="pagesLoding-icon" src="/static/icons/refresh_loding.gif" mode="widthFix"></image>加载中...
+            </block>
+            <block wx:else>
+                没有更多了~
+            </block>
+        </view>
+    </view>
+    <view class="pack-center pages-hint" wx:else>
+        <image src="/static/imgs/text_null.png"></image>
+        <view>暂无数据</view>
+    </view>
+</view>
--- a/pages/health/index.wxss
+++ b/pages/health/index.wxss
@@ -0,0 +1,101 @@
+page {
+    background-color: #fafafa;
+}
+
+/* 分类 */
+.tabs {
+    box-shadow: 0 4rpx 10rpx rgba(0, 0, 0, .05);
+    background-color: #fff;
+}
+
+.tabs-scroll {
+    line-height: 88rpx;
+    height: 110rpx;
+    white-space: nowrap;
+}
+
+.tabs-scroll-name {
+    display: inline-block;
+    padding: 0 32rpx;
+    font-size: 30rpx;
+    position: relative;
+    color: rgb(85, 85, 85);
+}
+
+.tabs-scroll-name::after {
+    content: '';
+    position: absolute;
+    background-color: transparent;
+    left: 32%;
+    bottom: 0rpx;
+    width: 36%;
+    height: 8rpx;
+    border-radius: 60rpx;
+}
+
+.tabs-scroll-name.active {
+    color: #3b7cff;
+    font-weight: 600;
+}
+
+.tabs-scroll-name.active::after {
+    background-color: #3b7cff;
+}
+
+/* 健康知识 */
+.article {
+    padding: 10rpx 30rpx;
+    box-sizing: border-box;
+}
+
+.wiki {
+    margin-top: 60rpx;
+}
+
+.wiki-label {
+    background-color: #fff;
+    margin-bottom: 70rpx;
+    position: relative;
+    height: 200rpx;
+    box-shadow: 0 4rpx 30rpx 2rpx rgba(0, 0, 0, .05);
+    border-radius: 10rpx;
+}
+
+.wiki-label:last-child {
+    margin-bottom: 0;
+}
+
+.wiki-label-img {
+    width: 200rpx;
+    height: 200rpx;
+    position: absolute;
+    top: -30rpx;
+    left: 30rpx;
+    border-radius: 10rpx;
+}
+
+.wiki-label-cont {
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 100%;
+    padding: 30rpx 25rpx 0 270rpx;
+    box-sizing: border-box;
+}
+
+.wiki-label-name {
+    font-size: 32rpx;
+    color: #3b7cff;
+}
+
+.wiki-label-name text {
+    text-transform: uppercase;
+}
+
+.wiki-label-text {
+    color: #999999;
+    font-size: 28rpx;
+    margin-top: 20rpx;
+    line-height: 40rpx;
+    font-weight: 200;
+}
--- a/pages/health/praise/praise.js
+++ b/pages/health/praise/praise.js
@@ -0,0 +1,71 @@
+ /*
+ * 手太欠
+ * 愿这世界都如故事里一样 美好而动人~
+ */
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        categories  : [],     // 分类
+        articlesArr : [],     // 列表
+        page        : {},     // 分页信息
+        lodingStats : false,  // 加载状态
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+        // 获取列表
+        this.articlesInfo();
+    },
+
+    // 列表
+    articlesInfo(page){
+        wx.$api.health.mySubscribe({
+            page : page || 1
+        }).then(res => {
+            let listArr = this.data.articlesArr,
+                newData = []
+            if(page == 1 || page == undefined) listArr = []
+            newData = listArr.concat(res.data.subscriptions.data)
+            this.setData({
+                articlesArr : newData,
+                page        : res.data.subscriptions.page,
+                lodingStats : false
+            })
+            wx.stopPullDownRefresh()
+        }).catch(err => {})
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+        // 获取列表
+		this.articlesInfo();
+    },
+
+    /**
+     * 上拉加载
+     */
+    onReachBottom(){
+        this.setData({
+            lodingStats: true
+        })
+        let pageNumber = this.data.page.current
+        if(this.data.page.has_more){
+            pageNumber++
+            // 获取列表
+		    this.articlesInfo(pageNumber);
+        }
+    }
+})
--- a/pages/health/praise/praise.json
+++ b/pages/health/praise/praise.json
@@ -0,0 +1,4 @@
+{
+    "usingComponents": {},
+    "navigationBarTitleText": "我的点赞"
+}
--- a/pages/health/praise/praise.wxml
+++ b/pages/health/praise/praise.wxml
@@ -0,0 +1,24 @@
+<!-- 健康知识 -->
+<view class="article">
+    <view class="wiki" wx:if="{{articlesArr.length > 0}}">
+        <navigator hover-class="none" url="../article/article?id={{item.subscribable.article_id}}" class="wiki-label" wx:for="{{articlesArr}}" wx:key="listsArr">
+            <image class="wiki-label-img" mode="aspectFill" src="{{item.subscribable.cover}}"></image>
+            <view class="wiki-label-cont">
+                <view class="nowrap wiki-label-name"><text>水感应</text> | {{item.subscribable.title}}</view>
+                <view class="nowrap-multi wiki-label-text">{{item.subscribable.description}}</view>
+            </view>
+        </navigator>
+        <view class="pagesLoding" wx:if="{{lodingStats}}">
+            <block wx:if="{{page.has_more}}">
+                <image class="pagesLoding-icon" src="/static/icons/refresh_loding.gif" mode="widthFix"></image>加载中...
+            </block>
+            <block wx:else>
+                没有更多了~
+            </block>
+        </view>
+    </view>
+    <view class="pack-center pages-hint" wx:else>
+        <image src="/static/imgs/text_null.png"></image>
+        <view>暂无数据</view>
+    </view>
+</view>
--- a/pages/health/praise/praise.wxss
+++ b/pages/health/praise/praise.wxss
@@ -0,0 +1,62 @@
+page {
+    padding: 0 30rpx;
+    box-sizing: border-box;
+    background-color: #f6f6f6;
+}
+
+/* 健康知识 */
+.article {
+    box-sizing: border-box;
+}
+
+.wiki {
+    margin-top: 60rpx;
+}
+
+.wiki-label {
+    background-color: #fff;
+    margin-bottom: 70rpx;
+    position: relative;
+    height: 200rpx;
+    box-shadow: 0 4rpx 30rpx 2rpx rgba(0, 0, 0, .05);
+    border-radius: 10rpx;
+}
+
+.wiki-label:last-child {
+    margin-bottom: 0;
+}
+
+.wiki-label-img {
+    width: 200rpx;
+    height: 200rpx;
+    position: absolute;
+    top: -30rpx;
+    left: 30rpx;
+    border-radius: 10rpx;
+}
+
+.wiki-label-cont {
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 100%;
+    padding: 30rpx 25rpx 0 270rpx;
+    box-sizing: border-box;
+}
+
+.wiki-label-name {
+    font-size: 32rpx;
+    color: #3b7cff;
+}
+
+.wiki-label-name text {
+    text-transform: uppercase;
+}
+
+.wiki-label-text {
+    color: #999999;
+    font-size: 28rpx;
+    margin-top: 20rpx;
+    line-height: 40rpx;
+    font-weight: 200;
+}
--- a/pages/index-老版/assess/assess.js
+++ b/pages/index-老版/assess/assess.js
@@ -0,0 +1,193 @@
+ /*
+ * 手太欠
+ * 愿这世界都如故事里一样 美好而动人~
+ */
+
+Page({
+    data: {
+        barHeight : getApp().globalData.barHeight,  // 状态栏高度
+        openId    : '',
+        nameValue : '',    // 姓名
+        nameStatus: false, // 姓名填写弹框
+        Analyze   : '',    // 是否交钱
+        disabled  : false, // 支付按钮
+        payStatus : false, // 支付弹框
+        payPrice  : '',    // 支付金额
+    },
+
+    onLoad(options) {
+        this.setData({
+            openId: options.code
+        })
+    },
+
+    onShow() {
+        // 判断是否可检测
+        this.ifAnalyze();
+    },
+
+    /**
+     * 是否可检测
+     */
+    ifAnalyze() {
+        wx.$api.index.analyze().then(res => {
+            this.setData({
+                Analyze  : res.data.analyze,
+                payPrice : res.data.price
+            })
+            if(!res.data.is_update) {
+                this.setData({
+                    nameStatus: true
+                })
+            }
+        }).catch(err => {})
+    },
+
+    /*
+        姓名截取
+    */
+    bindinput(e) {
+        this.setData({
+            nameValue: e.detail.value.substr(0,5)
+        })
+    },
+
+    /*
+        提交信息
+    */
+    issueForm() {
+        wx.showLoading({
+            title: '信息提交中...',
+            mask : true
+        })
+        let data = {
+            name : this.data.nameValue
+        }
+        wx.$api.auth.userAdd(data).then(() => {
+            wx.hideLoading()
+            this.setData({
+                nameStatus: false
+            })
+        }).catch(err => {})
+    },
+
+    /**
+     * 开始皮肤检测
+     */
+    goAnalyze() {
+        if(this.data.Analyze) {
+            this.uploadPhoto()
+            return
+        }
+        this.setData({
+            payStatus: true
+        })
+    },
+
+    /**
+     * 上传图片信息
+     */
+    uploadPhoto() {
+        wx.chooseMedia({
+            count	: 1,
+            sourceType: ['camera'],
+            camera  : 'front',
+            success	: path => {
+                // 获取皮肤检测接口
+                wx.cropImage({
+                    src: path.tempFiles[0].tempFilePath, // 图片路径
+                    cropScale: '3:4', // 裁剪比例
+                    success: res=> {
+                        // 获取皮肤检测接口
+                        this.checkEnter(res.tempFilePath);
+                    },
+                    complete: err => {}
+                })
+            }
+        })
+    },
+
+    /**
+     * 皮肤检测接口
+     */
+    checkEnter(img) {
+        wx.$api.index.skinEnter({}, img).then(res => {
+            wx.redirectTo({
+                url: "/pages/report/detail/detail?image_id=" + res.image_id
+            })
+        })
+    },
+
+    /**
+     * 关闭支付弹窗
+     */
+    cancelAnalyze() {
+        this.setData({
+            payStatus: false
+        })
+    },
+
+    /**
+     * 创建订单
+     */
+    payFound() {
+        wx.$api.index.skinOrder().then(res => {
+            this.setData({
+                disabled : true
+            })
+            this.payBtn(res.data.order_id)
+        }).catch(err => {})
+    },
+
+    /**
+     * 确认支付1元
+     */
+    payBtn(orderid) {
+        wx.showLoading({
+            title: '支付中...',
+            mask : true
+        })
+        wx.$api.index.skinPay(orderid,{type: 'miniapp', openid: this.data.openId}).then(res=>{
+            wx.hideLoading()
+            let payInfo = JSON.parse(res.data.wechat)
+            wx.requestPayment({
+                timeStamp: payInfo.timeStamp,
+                nonceStr : payInfo.nonceStr,
+                package  : payInfo.package,
+                paySign  : payInfo.paySign,
+                signType : payInfo.signType,
+                success  : res=>{
+                    if(res.errMsg == "requestPayment:ok"){
+                        wx.showToast({
+                            title: '支付成功',
+                            icon : 'success'
+                        })
+                    }
+                    this.setData({
+                        payStatus: false
+                    })
+                    this.uploadPhoto()
+                },
+                fail  : err=>{
+                    wx.showToast({
+                        title: '支付失败',
+                        icon : 'error'
+                    })
+                    this.setData({
+                        disabled : false,
+                        payStatus: false
+                    })
+                }
+            })
+        }).catch(err => {});
+    },
+
+    /**
+    * 返回上一页
+    */
+    returnGo() {
+        wx.navigateBack({
+           delta: 1
+        })
+    },
+})
--- a/pages/index-老版/assess/assess.json
+++ b/pages/index-老版/assess/assess.json
@@ -0,0 +1,4 @@
+{
+    "usingComponents": {},
+    "navigationStyle": "custom"
+}
--- a/pages/index-老版/assess/assess.wxml
+++ b/pages/index-老版/assess/assess.wxml
@@ -0,0 +1,75 @@
+<view class="navigation {{isFixedTop > 0 ? 'active' : ''}}" style="padding-top:{{barHeight}}px;">
+    <image bindtap="returnGo" class="navigation-arrow" src="/static/icons/returnBlack.png"></image>
+</view>
+
+<!-- 顶部背景 -->
+<view class="top">
+    <image class="top-back" src="https://api.shui.shuiganying.com/storage/images/2023/04/04/c90aba5bdbda96866f1b72c9fbee6cf9.jpg" mode="aspectFill"></image>
+</view>
+
+<!-- 内容 -->
+<view class="seeCont">
+    <view class="seeCont-title">拍照注意事项</view>
+    <view class="seeCont-item">
+        <view class="seeCont-text">
+            <view class="seeCont-laebl">
+                <view class="seeCont-laebl-number">1</view>
+                <view class="seeCont-laebl-name">露出全脸</view>
+                <image src="https://api.shui.shuiganying.com/storage/images/2023/04/04/4fc50445d8947c58dbf2fc1e32f3f18f.png" class="seeCont-laebl-img"></image>
+            </view>
+            <view class="seeCont-laebl">
+                <view class="seeCont-laebl-number">2</view>
+                <view class="seeCont-laebl-name">保持素颜</view>
+                <image src="https://api.shui.shuiganying.com/storage/images/2023/04/04/f24b10c6124fa8e41a7198b15d60df92.png" class="seeCont-laebl-img"></image>
+            </view>
+            <view class="seeCont-laebl">
+                <view class="seeCont-laebl-number">3</view>
+                <view class="seeCont-laebl-name">灯光柔和</view>
+                <image src="https://api.shui.shuiganying.com/storage/images/2023/04/04/505b9fa0366590839226f895588be596.png" class="seeCont-laebl-img"></image>
+            </view>
+            <view class="seeCont-laebl">
+                <view class="seeCont-laebl-number">4</view>
+                <view class="seeCont-laebl-name">合适角度距离</view>
+                <image src="https://api.shui.shuiganying.com/storage/images/2023/04/04/6d8d2a7cb6d10573124f248fb3daf4ba.png" class="seeCont-laebl-img"></image>
+            </view>
+        </view>
+    </view>
+
+    <view class="seeBtn">
+        <view class="seeBtn-btn" bindtap="goAnalyze">{{Analyze ? '首次免费，开始测肤' : '支付' + payPrice + '元，进行测肤'}} ></view>
+    </view>
+</view>
+
+<!-- 是否有名称 -->
+<view class="namePop {{nameStatus ? 'active' : ''}}"></view>
+<view class="nameCont {{nameStatus ? 'active' : ''}}">
+    <view class="nameCont-white">
+        <view class="nameCont-top">
+            <view class="nameCont-title">请填写真实姓名</view>
+            <input class="nameCont-input" type="text" name="name" value="{{nameValue}}" placeholder="限制5个字符" bindinput="bindinput" />
+        </view>
+        <view class="nameCont-btn">
+            <view class="nameCont-btn-go" bindtap="returnGo">取消</view>
+            <view class="nameCont-btn-go" bindtap="issueForm">确定</view>
+        </view>
+    </view>
+</view>
+
+
+<!-- 支付弹出 -->
+<view class="payEject {{payStatus ? 'active' : ''}}" catchtouchmove='true'></view>
+<view class="payPop {{payStatus ? 'active' : ''}}" catchtouchmove='true'>
+    <view class="payPop-cont">
+        <view class="payPop-title">
+            <view class="payPop-title-name">AI测肤火爆进行中</view>
+            <view class="payPop-title-text">原价￥10/次，现价￥1/次即可享受并赠送水感应一年VIP权限！</view>
+        </view>
+        <image class="payPop-cont-img" src="https://api.shui.shuiganying.com/storage/images/2023/04/04/08be4dfc2d3294a8079d34fecfcc6771.png" mode="widthFix"></image>
+        <view class="payPop-price">￥1.00</view>
+        <view class="payPop-btn">
+            <view class="payPop-btn-go" bindtap="payFound" wx:if="{{!disabled}}">立即支付</view>
+            <view class="payPop-btn-go active" wx:else>立即支付</view>
+            <view class="payPop-btn-cancel" bindtap="cancelAnalyze">取消</view>
+        </view>
+    </view>
+</view>
--- a/pages/index-老版/assess/assess.wxss
+++ b/pages/index-老版/assess/assess.wxss
@@ -0,0 +1,344 @@
+page {
+    background-color: #f7faff;
+}
+
+
+
+/* 返回 */
+.navigation{
+    position: fixed;
+    top: 0;
+    left: 0;
+    z-index: 999;
+    width: 100%;
+    height: 90rpx;
+    background-color: transparent;
+    transition: .2s;
+}
+
+.navigation.active {
+  background-color: #ffffff;
+}
+
+.navigation-arrow {
+    width: 44rpx;
+    height: 44rpx;
+    margin: 20rpx 15rpx 0 20rpx;
+}
+
+/* 顶部背景 */
+.top {
+    width: 100%;
+    position: relative;
+    height: 100vh;
+    overflow: hidden;
+}
+
+.top-back {
+    position: absolute;
+    height: 100%;
+    left: 0;
+    top: 0;
+    width: 100%;
+    z-index: 1;
+}
+
+/* 内容 */
+.seeCont {
+    position: absolute;
+    top: 10%;
+    z-index: 100;
+    width: 100%;
+    padding: 80rpx 30rpx;
+    box-sizing: border-box;
+}
+
+.seeCont-title {
+    text-align: center;
+    font-size: 42rpx;
+}
+
+.seeCont-item {
+    margin-top: 60rpx;
+    position: relative;
+    width: 100%;
+    height: 700rpx;
+}
+
+.seeCont-item::after {
+    border-radius: 15rpx;
+    position: absolute;
+    content: '';
+    background-color: #ffffff;
+    width: 100%;
+    height: 100%;
+    opacity: .6;
+    left: 0;
+    top: 0;
+}
+
+.seeCont-text {
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+    z-index: 10;
+    padding: 60rpx;
+    box-sizing: border-box;
+}
+
+.seeCont-laebl {
+    display: flex;
+    line-height: 84rpx;
+    padding: 30rpx 0;
+    box-sizing: border-box;
+    position: relative;
+}
+
+.seeCont-laebl-number {
+    color: #3d7eff;
+    font-weight: 600;
+    font-size: 60rpx;
+    position: relative;
+    padding-right: 20rpx;
+    font-style:italic;
+}
+
+.seeCont-laebl-number::after {
+    position: absolute;
+    content: '';
+    right: 0;
+    top: 40rpx;
+    background-color: #3d7eff;
+    width: 4rpx;
+    height: 50rpx;
+    transform:skewX(-30deg);
+}
+
+.seeCont-laebl-name {
+    font-size: 34rpx;
+    padding-left: 60rpx;
+}
+
+.seeCont-laebl-img {
+    width: 84rpx;
+    height: 84rpx;
+    position: absolute;
+    right: 0;
+    top: 30rpx;
+}
+
+.seeBtn {
+    text-align: center;
+    width: 100%;
+}
+
+.seeBtn-btn {
+    background-color: #3d7eff;
+    display: inline-block;
+    color: #ffffff;
+    border-radius: 90rpx;
+    margin-top: 60rpx;
+    line-height: 90rpx;
+    padding: 0 80rpx;
+}
+
+
+/* 名字弹出 */
+.namePop {
+    position: fixed;
+    background-color: rgba(0, 0, 0, .5);
+    left: 0;
+    top: 0;
+    height: 100vh;
+    width: 100vw;
+    z-index: 100000;
+    display: none;
+}
+
+.namePop.active {
+    display: block;
+}
+
+.nameCont {
+    -webkit-box-orient: vertical;
+    -webkit-box-pack: center;
+    position: fixed;
+    left: 0;
+    right: 0;
+    top: 0;
+    bottom: 0;
+    z-index: 100000;
+    padding: 0 15%;
+    box-sizing: border-box;
+    display: none;
+}
+
+.nameCont.active {
+    display: -webkit-box;
+}
+
+.nameCont-white {
+    background-color: #ffffff;
+    border-radius: 15rpx;
+    overflow: hidden;
+}
+
+.nameCont-top {
+    padding: 30rpx;
+    box-sizing: border-box;
+}
+
+.nameCont-title {
+    font-size: 34rpx;
+    margin-bottom: 30rpx;
+}
+
+.nameCont-input {
+    background-color: #f3f3f3;
+    height: 90rpx;
+    line-height: 90rpx;
+    border-radius: 10rpx;
+    padding: 0 25rpx;
+    box-sizing: border-box;
+}
+
+.nameCont-btn {
+    line-height: 100rpx;
+    background-color: #f3f3f3;
+    display: flex;
+    margin-top: 30rpx;
+    border-top: 2rpx solid #dfdfdf;
+}
+
+.nameCont-btn-go {
+    text-align: center;
+    flex: 2;
+}
+
+.nameCont-btn-go:last-child {
+    position: relative;
+    color: #ff9951;
+}
+
+.nameCont-btn-go:last-child::after {
+    position: absolute;
+    content: '';
+    left: 0;
+    top: 0;
+    width: 2rpx;
+    height: 100%;
+    background-color: #dfdfdf;
+}
+
+/* 支付弹出 */
+.payEject {
+    position: fixed;
+    width: 100vw;
+    height: 100vh;
+    left: 0;
+    top: 0;
+    background-color: rgba(0, 0, 0, .6);
+    z-index: 1000;
+    display: none;
+}
+
+.payEject.active{
+    display: block;
+}
+
+.payPop {
+    width: 84%;
+    position: fixed;
+    left: 8%;
+    top: 30%;
+    z-index: 10001;
+    height: 600rpx;
+    display: none;
+}
+
+.payPop.active{
+    display: block;
+}
+
+.payPop::after {
+    border-radius: 15rpx 200rpx 15rpx 15rpx;
+    position: absolute;
+    content: '';
+    background-color: #ffffff;
+    width: 100%;
+    height: 100%;
+    opacity: .6;
+    left: 0;
+    top: 0;
+}
+
+.payPop-cont {
+    width: calc(100% - 40rpx);
+    height: calc(100% - 40rpx);
+    position: absolute;
+    left: 20rpx;
+    top: 20rpx;
+    background-color: #ffffff;
+    border-radius: 15rpx 200rpx 15rpx 15rpx;
+    z-index: 10002;
+    padding: 30rpx;
+    box-sizing: border-box;
+}
+
+.payPop-title {
+    width: 100%;
+    padding-right: 150rpx;
+    box-sizing: border-box;
+}
+
+.payPop-title-name {
+    font-size: 46rpx;
+    color: #3d7eff;
+    margin-bottom: 20rpx;
+    font-weight: 600;
+}
+
+.payPop-title-text {
+    color: #666666;
+    line-height: 44rpx;
+    font-size: 26rpx;
+}
+
+.payPop-cont-img {
+    position: absolute;
+    top: -30rpx;
+    right: -20rpx;
+    width: 42%;
+}
+
+.payPop-price {
+    text-align: center;
+    font-size: 70rpx;
+    padding: 40rpx 0;
+}
+
+.payPop-btn {
+    text-align: center;
+    width: 100%;
+}
+
+.payPop-btn-go {
+    background-image: linear-gradient(to right, #4181fe, #689aff);
+    display: inline-block;
+    color: #ffffff;
+    border-radius: 90rpx;
+    line-height: 90rpx;
+    padding: 0 100rpx;
+}
+
+.payPop-btn-go.active {
+    background-image: linear-gradient(to right, #cacaca, #bdbdbd);
+}
+
+.payPop-btn-cancel {
+    color:#3d7eff;
+    text-align: center;
+    padding-top: 30rpx;
+}
--- a/pages/index-老版/index.js
+++ b/pages/index-老版/index.js
@@ -0,0 +1,67 @@
+ /*
+ * 手太欠
+ * 愿这世界都如故事里一样 美好而动人~
+ */
+
+Page({
+    data: {
+        payCode   : '',    // code获取openid
+        openId    : '',    // openid
+        disabled  : false, // 支付按钮
+        payStatus : false, // 支付弹框
+        catchtouchmove: false
+    },
+
+    onLoad(options) {
+        if(options.invite != undefined) {
+            getApp().globalData.inviteText = options.invite
+        }
+        wx.login({
+            success: res => {
+                this.setData({
+                    payCode: res.code
+                })
+                // 获取openid
+                this.openInfo()
+            }
+        })
+    },
+
+    /**
+     * openid
+     */
+    openInfo() {
+        wx.$api.auth.codeOpenid({code: this.data.payCode}).then(res => {
+            this.setData({
+                openId: res.data
+            })
+        }).catch(err => {})
+    },
+
+    /**
+     * 处理未登录时的转跳
+     */
+    assessGo(){
+        if(wx.getStorageSync("token") != ''){
+            wx.navigateTo({
+                url: '/pages/index/assess/assess?code=' + this.data.openId
+            })
+            return
+        }
+
+        // 去登录
+        wx.navigateTo({
+            url: "/pages/login/index?type=indexDemo"
+        })
+    },
+
+    /**
+	 * 微信分享
+	 */
+	onShareAppMessage(){
+		return {
+			title	: '水感应',
+            path	: "/pages/index/index?invite=" + wx.getStorageSync("invite")
+		}
+    },
+})
--- a/pages/index-老版/index.json
+++ b/pages/index-老版/index.json
@@ -0,0 +1,4 @@
+{
+    "usingComponents": {},
+    "navigationStyle": "custom"
+}
--- a/pages/index-老版/index.wxml
+++ b/pages/index-老版/index.wxml
@@ -0,0 +1,37 @@
+<!-- 第一屏幕 -->
+<view class="indexBack">
+    <image class="indexBack-img" src="https://cdn.shuiganying.com/images/2023/03/29/403202dd3e9435d89386ffe0f443f443.png"></image>
+    <view class="indexText">
+        <view bindtap="assessGo" class="indexText-name">开始评测</view>
+        <image class="indexText-arrow" src="https://cdn.shuiganying.com/images/2023/03/29/78c8085cc12a790b5f78fb0a64f275ca.png"></image>
+    </view>
+</view>
+
+<!-- 步骤提示 -->
+<view class="indexTips">
+    <image class="indexTips-img" mode="widthFix" src="https://cdn.shuiganying.com/images/2023/03/29/c72da03ef4fa09a050f61921189f1e0e.png"></image>
+</view>
+
+<!-- 活动轮播 -->
+<view class="indexShaky">
+    <view class="indexShaky-back">
+        <view class="indexShaky-title"><text>最新活动</text></view>
+    </view>
+    <view class="indexShaky-swiper">
+        <view class="indexShaky-cont">
+            <swiper class="indexShaky-see" indicator-dots indicator-color="#3b7cff" indicator-active-color="#fff" autoplay="true">
+                <swiper-item>
+                    <image src="https://cdn.shuiganying.com/images/2023/03/29/a97550fe3f74452bd721c12cb773baa6.png" class="swiperCont-img"></image>
+                </swiper-item>
+                <swiper-item>
+                    <image src="https://cdn.shuiganying.com/images/2023/03/29/3f38403be628ee2c413b74a76b7f6d4e.png" class="swiperCont-img"></image>
+                </swiper-item>
+            </swiper>
+        </view>
+    </view>
+</view>
+
+<!-- 单图 -->
+<view class="indexSingle">
+    <image class="indexSingle-img" mode="widthFix" src="https://cdn.shuiganying.com/images/2023/04/27/7d0d0ca9ae0ae773a94f3844330e1548.jpg"></image>
+</view>
--- a/pages/index-老版/index.wxss
+++ b/pages/index-老版/index.wxss
@@ -0,0 +1,140 @@
+/* 第一屏幕 */
+.indexBack {
+    position: relative;
+    width: 100%;
+    height: 100vh;
+}
+
+.indexBack-img {
+    position: absolute;
+    width: 100%;
+    height: 100%;
+}
+
+.indexText {
+    position: absolute;
+    bottom: 20rpx;
+    left: 0;
+    text-align: center;
+    width: 100%;
+}
+
+.indexText-name {
+    background-color: #3b7cff;
+    color: #fff;
+    display: inline-block;
+    border-radius: 50rpx;
+    height: 68rpx;
+    line-height: 68rpx;
+    padding: 0 50rpx;
+}
+
+.indexText-arrow {
+    width: 74rpx;
+    height: 74rpx;
+    display: block;
+    margin: 15rpx auto 0;
+    animation: bounce-down 2s linear infinite;
+}
+
+@keyframes bounce-down {
+    25% {
+        transform: translateY(-4px);
+    }
+
+    50%,
+    100% {
+        transform: translateY(0);
+    }
+
+    75% {
+        transform: translateY(4px);
+    }
+}
+
+/* 步骤提示 */
+.indexTips {
+    width: 100%;
+    padding: 60rpx 50rpx;
+    box-sizing: border-box;
+}
+
+.indexTips-img {
+    width: 100%;
+}
+
+/* 活动轮播 */
+.indexShaky {
+    width: 100%;
+}
+
+.indexShaky-back {
+    position: relative;
+    width: 100%;
+    left: 0;
+    top: 0;
+    height: 230rpx;
+    background-color: #b8d3e8;
+    border-radius: 0 0 50rpx 50rpx;
+    text-align: center;
+}
+
+.indexShaky-title {
+    color: #1049a2;
+    position: relative;
+    font-size: 54rpx;
+    height: 100rpx;
+    padding-top: 30rpx;
+}
+
+.indexShaky-title>text {
+    width: 100%;
+    text-align: center;
+    position: absolute;
+    left: 0;
+    bottom: 0;
+    z-index: 2;
+}
+
+.indexShaky-title::after {
+    position: absolute;
+    content: '';
+    left: calc(50% - 100rpx);
+    bottom: -2rpx;
+    background-image: linear-gradient(to left, #ffffff,#ffffff 50%, transparent);
+    width: 200rpx;
+    height: 18rpx;
+}
+
+.indexShaky-swiper {
+    margin-top: -50rpx;
+    padding: 0 30rpx;
+    box-sizing: border-box;
+}
+
+.indexShaky-cont {
+    position: relative;
+    border-radius: 20rpx;
+    padding-top: 50%;
+    overflow: hidden;
+}
+
+.indexShaky-see,
+.swiperCont-img {
+    border-radius: 20rpx;
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+}
+
+/* 步骤提示 */
+.indexSingle {
+    width: 100%;
+    margin-top: 80rpx;
+}
+
+.indexSingle-img {
+    width: 100%;
+}
--- a/pages/index/assess/assess.js
+++ b/pages/index/assess/assess.js
@@ -0,0 +1,235 @@
+ /*
+ * 手太欠
+ * 愿这世界都如故事里一样 美好而动人~
+ */
+
+Page({
+    data: {
+        barHeight : getApp().globalData.barHeight,  // 状态栏高度
+        openId    : '',
+        nameValue : '',    // 姓名
+        testTitle : '',
+        nameStatus: false, // 姓名填写弹框
+        Analyze   : '',    // 是否交钱
+        disabled  : false, // 支付按钮
+        payStatus : false, // 支付弹框
+        payPrice  : '',    // 支付金额
+    },
+
+    onLoad(options) {
+        this.setData({
+            openId: options.code
+        })
+        if(options) {
+            wx.login({
+                success: res => {
+                    // 获取openid
+                    this.openInfo(res.code)
+                }
+            })
+        }
+    },
+
+    onShow() {
+        // 判断是否可检测
+        this.ifAnalyze();
+    },
+
+    
+    /**
+     * openid
+     */
+    openInfo(code) {
+        wx.$api.auth.codeOpenid({code: code}).then(res => {
+            this.setData({
+                openId: res.data
+            })
+        }).catch(err => {})
+    },
+
+    /**
+     * 是否可检测
+     */
+    ifAnalyze() {
+        wx.$api.index.analyze().then(res => {
+            if(res.data.is_first) {
+                this.setData({
+                    testTitle: '首次免费，开始测肤'
+                })
+            } else if (res.data.is_first == false && res.data.analyze == false) {
+                this.setData({
+                    testTitle: '支付' + res.data.price + '元，进行测肤'
+                })
+            } else if (res.data.is_first == false && res.data.analyze == true) {
+                this.setData({
+                    testTitle: '您已付费，进行检测'
+                })
+            }
+
+            this.setData({
+                Analyze  : res.data
+            })
+            if(!res.data.is_update) {
+                this.setData({
+                    nameStatus: true
+                })
+            }
+        }).catch(err => {})
+    },
+
+    /*
+        姓名截取
+    */
+    bindinput(e) {
+        this.setData({
+            nameValue: e.detail.value.substr(0,5)
+        })
+    },
+
+    /*
+        提交信息
+    */
+    issueForm() {
+        wx.showLoading({
+            title: '信息提交中...',
+            mask : true
+        })
+        let data = {
+            name : this.data.nameValue
+        }
+        wx.$api.auth.userAdd(data).then(() => {
+            wx.hideLoading()
+            this.setData({
+                nameStatus: false
+            })
+        }).catch(err => {})
+    },
+
+    /**
+     * 开始皮肤检测
+     */
+    goAnalyze() {
+        if(this.data.Analyze.is_first == false && this.data.Analyze.analyze == false) {
+            this.setData({
+                payStatus: true
+            })
+        } else {
+            this.uploadPhoto()
+        }
+    },
+
+    /**
+     * 上传图片信息
+     */
+    uploadPhoto() {
+        wx.chooseMedia({
+            count	: 1,
+            sourceType: ['camera'],
+            camera  : 'front',
+            success	: path => {
+                // 获取皮肤检测接口
+                wx.cropImage({
+                    src: path.tempFiles[0].tempFilePath, // 图片路径
+                    cropScale: '3:4', // 裁剪比例
+                    success: res=> {
+                        // 获取皮肤检测接口
+                        this.checkEnter(res.tempFilePath);
+                    },
+                    complete: err => {}
+                })
+            }
+        })
+    },
+
+    /**
+     * 皮肤检测接口
+     */
+    checkEnter(img) {
+        wx.$api.index.skinEnter({}, img).then(res => {
+            wx.redirectTo({
+                url: "/pages/report/detail/detail?image_id=" + res.image_id
+            })
+        })
+    },
+
+    /**
+     * 关闭支付弹窗
+     */
+    cancelAnalyze() {
+        this.setData({
+            payStatus: false
+        })
+    },
+
+    /**
+     * 创建订单
+     */
+    payFound() {
+        wx.$api.index.skinOrder().then(res => {
+            this.setData({
+                disabled : true
+            })
+            this.payBtn(res.data.order_id)
+        }).catch(err => {})
+    },
+
+    /**
+     * 确认支付1元
+     */
+    payBtn(orderid) {
+        wx.showLoading({
+            title: '支付中...',
+            mask : true
+        })
+        wx.$api.index.skinPay(orderid,{type: 'miniapp', openid: this.data.openId}).then(res=>{
+            wx.hideLoading()
+            let payInfo = JSON.parse(res.data.wechat)
+            wx.requestPayment({
+                timeStamp: payInfo.timeStamp,
+                nonceStr : payInfo.nonceStr,
+                package  : payInfo.package,
+                paySign  : payInfo.paySign,
+                signType : payInfo.signType,
+                success  : res=>{
+                    if(res.errMsg == "requestPayment:ok"){
+                        wx.showToast({
+                            title: '支付成功',
+                            icon : 'success'
+                        })
+                    }
+                    this.setData({
+                        payStatus: false
+                    })
+                    this.setData({
+                        Analyze: false
+                    })
+                    this.uploadPhoto()
+                },
+                fail  : err=>{
+                    wx.showToast({
+                        title: '支付失败',
+                        icon : 'error'
+                    })
+                    this.setData({
+                        disabled : false,
+                        payStatus: false
+                    })
+                }
+            })
+        }).catch(err => {
+            this.setData({
+                disabled : false,
+                payStatus: false
+            })
+        });
+    },
+
+    /**
+    * 返回上一页
+    */
+    returnGo() {
+        wx.navigateBack({
+           delta: 1
+        })
+    },
+})
--- a/pages/index/assess/assess.json
+++ b/pages/index/assess/assess.json
@@ -0,0 +1,4 @@
+{
+    "usingComponents": {},
+    "navigationStyle": "custom"
+}
--- a/pages/index/assess/assess.wxml
+++ b/pages/index/assess/assess.wxml
@@ -0,0 +1,75 @@
+<view class="navigation {{isFixedTop > 0 ? 'active' : ''}}" style="padding-top:{{barHeight}}px;">
+    <image bindtap="returnGo" class="navigation-arrow" src="/static/icons/returnBlack.png"></image>
+</view>
+
+<!-- 顶部背景 -->
+<view class="top">
+    <image class="top-back" src="https://api.shui.shuiganying.com/storage/images/2023/04/04/c90aba5bdbda96866f1b72c9fbee6cf9.jpg" mode="aspectFill"></image>
+</view>
+
+<!-- 内容 -->
+<view class="seeCont">
+    <view class="seeCont-title">拍照注意事项</view>
+    <view class="seeCont-item">
+        <view class="seeCont-text">
+            <view class="seeCont-laebl">
+                <view class="seeCont-laebl-number">1</view>
+                <view class="seeCont-laebl-name">露出全脸</view>
+                <image src="https://api.shui.shuiganying.com/storage/images/2023/04/04/4fc50445d8947c58dbf2fc1e32f3f18f.png" class="seeCont-laebl-img"></image>
+            </view>
+            <view class="seeCont-laebl">
+                <view class="seeCont-laebl-number">2</view>
+                <view class="seeCont-laebl-name">保持素颜</view>
+                <image src="https://api.shui.shuiganying.com/storage/images/2023/04/04/f24b10c6124fa8e41a7198b15d60df92.png" class="seeCont-laebl-img"></image>
+            </view>
+            <view class="seeCont-laebl">
+                <view class="seeCont-laebl-number">3</view>
+                <view class="seeCont-laebl-name">光线柔和</view>
+                <image src="https://api.shui.shuiganying.com/storage/images/2023/04/04/505b9fa0366590839226f895588be596.png" class="seeCont-laebl-img"></image>
+            </view>
+            <view class="seeCont-laebl">
+                <view class="seeCont-laebl-number">4</view>
+                <view class="seeCont-laebl-name">合适角度距离</view>
+                <image src="https://api.shui.shuiganying.com/storage/images/2023/04/04/6d8d2a7cb6d10573124f248fb3daf4ba.png" class="seeCont-laebl-img"></image>
+            </view>
+        </view>
+    </view>
+
+    <view class="seeBtn">
+        <view class="seeBtn-btn" bindtap="goAnalyze">{{testTitle}}</view>
+    </view>
+</view>
+
+<!-- 是否有名称 -->
+<view class="namePop {{nameStatus ? 'active' : ''}}"></view>
+<view class="nameCont {{nameStatus ? 'active' : ''}}">
+    <view class="nameCont-white">
+        <view class="nameCont-top">
+            <view class="nameCont-title">请填写真实姓名</view>
+            <input class="nameCont-input" type="text" name="name" value="{{nameValue}}" placeholder="限制5个字符" bindinput="bindinput" />
+        </view>
+        <view class="nameCont-btn">
+            <view class="nameCont-btn-go" bindtap="returnGo">取消</view>
+            <view class="nameCont-btn-go" bindtap="issueForm">确定</view>
+        </view>
+    </view>
+</view>
+
+
+<!-- 支付弹出 -->
+<view class="payEject {{payStatus ? 'active' : ''}}" catchtouchmove='true'></view>
+<view class="payPop {{payStatus ? 'active' : ''}}" catchtouchmove='true'>
+    <view class="payPop-cont">
+        <view class="payPop-title">
+            <view class="payPop-title-name">AI测肤火爆进行中</view>
+            <view class="payPop-title-text">原价￥10/次，现价￥1/次即可享受并赠送水感应一年VIP权限！</view>
+        </view>
+        <image class="payPop-cont-img" src="https://api.shui.shuiganying.com/storage/images/2023/04/04/08be4dfc2d3294a8079d34fecfcc6771.png" mode="widthFix"></image>
+        <view class="payPop-price">￥1.00</view>
+        <view class="payPop-btn">
+            <view class="payPop-btn-go" bindtap="payFound" wx:if="{{!disabled}}">立即支付</view>
+            <view class="payPop-btn-go active" wx:else>立即支付</view>
+            <view class="payPop-btn-cancel" bindtap="cancelAnalyze">取消</view>
+        </view>
+    </view>
+</view>
--- a/pages/index/assess/assess.wxss
+++ b/pages/index/assess/assess.wxss
@@ -0,0 +1,344 @@
+page {
+    background-color: #f7faff;
+}
+
+
+
+/* 返回 */
+.navigation{
+    position: fixed;
+    top: 0;
+    left: 0;
+    z-index: 999;
+    width: 100%;
+    height: 90rpx;
+    background-color: transparent;
+    transition: .2s;
+}
+
+.navigation.active {
+  background-color: #ffffff;
+}
+
+.navigation-arrow {
+    width: 44rpx;
+    height: 44rpx;
+    margin: 20rpx 15rpx 0 20rpx;
+}
+
+/* 顶部背景 */
+.top {
+    width: 100%;
+    position: relative;
+    height: 100vh;
+    overflow: hidden;
+}
+
+.top-back {
+    position: absolute;
+    height: 100%;
+    left: 0;
+    top: 0;
+    width: 100%;
+    z-index: 1;
+}
+
+/* 内容 */
+.seeCont {
+    position: absolute;
+    top: 10%;
+    z-index: 100;
+    width: 100%;
+    padding: 80rpx 30rpx;
+    box-sizing: border-box;
+}
+
+.seeCont-title {
+    text-align: center;
+    font-size: 42rpx;
+}
+
+.seeCont-item {
+    margin-top: 60rpx;
+    position: relative;
+    width: 100%;
+    height: 700rpx;
+}
+
+.seeCont-item::after {
+    border-radius: 15rpx;
+    position: absolute;
+    content: '';
+    background-color: #ffffff;
+    width: 100%;
+    height: 100%;
+    opacity: .6;
+    left: 0;
+    top: 0;
+}
+
+.seeCont-text {
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+    z-index: 10;
+    padding: 60rpx;
+    box-sizing: border-box;
+}
+
+.seeCont-laebl {
+    display: flex;
+    line-height: 84rpx;
+    padding: 30rpx 0;
+    box-sizing: border-box;
+    position: relative;
+}
+
+.seeCont-laebl-number {
+    color: #3d7eff;
+    font-weight: 600;
+    font-size: 60rpx;
+    position: relative;
+    padding-right: 20rpx;
+    font-style:italic;
+}
+
+.seeCont-laebl-number::after {
+    position: absolute;
+    content: '';
+    right: 0;
+    top: 40rpx;
+    background-color: #3d7eff;
+    width: 4rpx;
+    height: 50rpx;
+    transform:skewX(-30deg);
+}
+
+.seeCont-laebl-name {
+    font-size: 34rpx;
+    padding-left: 60rpx;
+}
+
+.seeCont-laebl-img {
+    width: 84rpx;
+    height: 84rpx;
+    position: absolute;
+    right: 0;
+    top: 30rpx;
+}
+
+.seeBtn {
+    text-align: center;
+    width: 100%;
+}
+
+.seeBtn-btn {
+    background-color: #3d7eff;
+    display: inline-block;
+    color: #ffffff;
+    border-radius: 90rpx;
+    margin-top: 60rpx;
+    line-height: 90rpx;
+    padding: 0 80rpx;
+}
+
+
+/* 名字弹出 */
+.namePop {
+    position: fixed;
+    background-color: rgba(0, 0, 0, .5);
+    left: 0;
+    top: 0;
+    height: 100vh;
+    width: 100vw;
+    z-index: 100000;
+    display: none;
+}
+
+.namePop.active {
+    display: block;
+}
+
+.nameCont {
+    -webkit-box-orient: vertical;
+    -webkit-box-pack: center;
+    position: fixed;
+    left: 0;
+    right: 0;
+    top: 0;
+    bottom: 0;
+    z-index: 100000;
+    padding: 0 15%;
+    box-sizing: border-box;
+    display: none;
+}
+
+.nameCont.active {
+    display: -webkit-box;
+}
+
+.nameCont-white {
+    background-color: #ffffff;
+    border-radius: 15rpx;
+    overflow: hidden;
+}
+
+.nameCont-top {
+    padding: 30rpx;
+    box-sizing: border-box;
+}
+
+.nameCont-title {
+    font-size: 34rpx;
+    margin-bottom: 30rpx;
+}
+
+.nameCont-input {
+    background-color: #f3f3f3;
+    height: 90rpx;
+    line-height: 90rpx;
+    border-radius: 10rpx;
+    padding: 0 25rpx;
+    box-sizing: border-box;
+}
+
+.nameCont-btn {
+    line-height: 100rpx;
+    background-color: #f3f3f3;
+    display: flex;
+    margin-top: 30rpx;
+    border-top: 2rpx solid #dfdfdf;
+}
+
+.nameCont-btn-go {
+    text-align: center;
+    flex: 2;
+}
+
+.nameCont-btn-go:last-child {
+    position: relative;
+    color: #ff9951;
+}
+
+.nameCont-btn-go:last-child::after {
+    position: absolute;
+    content: '';
+    left: 0;
+    top: 0;
+    width: 2rpx;
+    height: 100%;
+    background-color: #dfdfdf;
+}
+
+/* 支付弹出 */
+.payEject {
+    position: fixed;
+    width: 100vw;
+    height: 100vh;
+    left: 0;
+    top: 0;
+    background-color: rgba(0, 0, 0, .6);
+    z-index: 1000;
+    display: none;
+}
+
+.payEject.active{
+    display: block;
+}
+
+.payPop {
+    width: 84%;
+    position: fixed;
+    left: 8%;
+    top: 30%;
+    z-index: 10001;
+    height: 600rpx;
+    display: none;
+}
+
+.payPop.active{
+    display: block;
+}
+
+.payPop::after {
+    border-radius: 15rpx 200rpx 15rpx 15rpx;
+    position: absolute;
+    content: '';
+    background-color: #ffffff;
+    width: 100%;
+    height: 100%;
+    opacity: .6;
+    left: 0;
+    top: 0;
+}
+
+.payPop-cont {
+    width: calc(100% - 40rpx);
+    height: calc(100% - 40rpx);
+    position: absolute;
+    left: 20rpx;
+    top: 20rpx;
+    background-color: #ffffff;
+    border-radius: 15rpx 200rpx 15rpx 15rpx;
+    z-index: 10002;
+    padding: 30rpx;
+    box-sizing: border-box;
+}
+
+.payPop-title {
+    width: 100%;
+    padding-right: 150rpx;
+    box-sizing: border-box;
+}
+
+.payPop-title-name {
+    font-size: 46rpx;
+    color: #3d7eff;
+    margin-bottom: 20rpx;
+    font-weight: 600;
+}
+
+.payPop-title-text {
+    color: #666666;
+    line-height: 44rpx;
+    font-size: 26rpx;
+}
+
+.payPop-cont-img {
+    position: absolute;
+    top: -30rpx;
+    right: -20rpx;
+    width: 42%;
+}
+
+.payPop-price {
+    text-align: center;
+    font-size: 70rpx;
+    padding: 40rpx 0;
+}
+
+.payPop-btn {
+    text-align: center;
+    width: 100%;
+}
+
+.payPop-btn-go {
+    background-image: linear-gradient(to right, #4181fe, #689aff);
+    display: inline-block;
+    color: #ffffff;
+    border-radius: 90rpx;
+    line-height: 90rpx;
+    padding: 0 100rpx;
+}
+
+.payPop-btn-go.active {
+    background-image: linear-gradient(to right, #cacaca, #bdbdbd);
+}
+
+.payPop-btn-cancel {
+    color:#3d7eff;
+    text-align: center;
+    padding-top: 30rpx;
+}
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -0,0 +1,116 @@
+ /*
+ * 手太欠
+ * 愿这世界都如故事里一样 美好而动人~
+ */
+
+Page({
+    data: {
+        payCode   : '',    // code获取openid
+        openId    : '',    // openid
+        userLogin : false, // 是否登录
+        testTitle : '',    // 检测文字
+        disabled  : false, // 支付按钮
+        payStatus : false, // 支付弹框
+        catchtouchmove: false
+    },
+
+    onLoad(options) {
+        if(options.invite != undefined) {
+            getApp().globalData.inviteText = options.invite
+        }
+    },
+
+    onShow() {
+        wx.login({
+            success: res => {
+                this.setData({
+                    payCode: res.code
+                })
+                // 获取openid
+                this.openInfo()
+            }
+        })
+        
+        // 获取登录状态
+        if(wx.getStorageSync("token") != ''){
+            this.setData({
+                userLogin: true
+            })
+            // 是否可检测
+            this.ifAnalyze();
+            return
+        }
+
+        this.setData({
+            userLogin: false
+        })
+    },
+
+    /**
+     * openid
+     */
+    openInfo() {
+        wx.$api.auth.codeOpenid({code: this.data.payCode}).then(res => {
+            this.setData({
+                openId: res.data
+            })
+        }).catch(err => {})
+    },
+
+    /**
+     * 是否可检测
+     */
+    ifAnalyze() {
+        wx.$api.index.analyze().then(res => {
+            if(res.data.is_first) {
+                this.setData({
+                    testTitle: '首次免费，开始测肤'
+                })
+            } else if (res.data.is_first == false && res.data.analyze == false) {
+                this.setData({
+                    testTitle: '支付' + res.data.price + '元，进行测肤'
+                })
+            } else if (res.data.is_first == false && res.data.analyze == true) {
+                this.setData({
+                    testTitle: '您已付费，进行检测'
+                })
+            }
+
+            this.setData({
+                Analyze  : res.data
+            })
+            if(!res.data.is_update) {
+                this.setData({
+                    nameStatus: true
+                })
+            }
+        }).catch(err => {})
+    },
+
+    /**
+     * 处理未登录时的转跳
+     */
+    assessGo(){
+        if(wx.getStorageSync("token") != ''){
+            wx.navigateTo({
+                url: '/pages/index/assess/assess?code='
+            })
+            return
+        }
+
+        // 去登录
+        wx.navigateTo({
+            url: "/pages/login/index?type=indexDemo"
+        })
+    },
+
+    /**
+	 * 微信分享
+	 */
+	onShareAppMessage(){
+		return {
+			title	: '水感应',
+            path	: "/pages/index/index?invite=" + wx.getStorageSync("invite")
+		}
+    },
+})
--- a/pages/index/index.json
+++ b/pages/index/index.json
@@ -0,0 +1,4 @@
+{
+    "usingComponents": {},
+    "navigationStyle": "custom"
+}
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -0,0 +1,30 @@
+<!-- 第一屏幕 -->
+<!-- bindtap="assessGo" -->
+<view class="indexBack">
+    <image class="indexBack-img" src="https://cdn.shuiganying.com/images/2023/05/17/d8be509c6ce2bd268967388621bc095a.png"></image>
+    <view class="indexText">
+        <view class="indexText-name">下滑了解详情</view>
+        <image class="indexText-arrow" src="https://cdn.shuiganying.com/images/2023/05/16/d323c1a5d97c0c566126e3a2ff7f1827.png"></image>
+    </view>
+</view>
+
+<!-- 漂浮窗 -->
+<view class="wander" bindtap="assessGo">
+    <view class="wander-cont">
+        <image class="wander-icon" src="https://cdn.shuiganying.com/images/2023/05/16/e69134d810039f1c9bfe9111036d92fb.png" mode="widthFix"></image>
+        <view class="wander-name">检测</view>
+    </view>
+</view>
+
+<!-- 单图 -->
+<view class="indexSingle">
+    <image class="indexSingle-img" mode="widthFix" src="https://cdn.shuiganying.com/images/2023/05/18/ac3182087d2607104409f3fc988514c6.gif"></image>
+    <image class="indexSingle-img" style="margin-top: -280rpx;" mode="widthFix" src="https://cdn.shuiganying.com/images/2023/05/18/a6dee6dbb61b03ffe0ca55896a77a4d4.png"></image>
+    <image class="indexSingle-img" mode="widthFix" src="https://cdn.shuiganying.com/images/2023/05/17/d6068c61ae3d4d3ec4eb6e598a746d3c.png"></image>
+    <image class="indexSingle-img" mode="widthFix" src="https://cdn.shuiganying.com/images/2023/05/17/88be57f403db19a0413b93045bd406d8.png"></image>
+</view>
+
+<view class="testBtn">
+    <image class="indexText-arrow" src="https://cdn.shuiganying.com/images/2023/05/16/a72e053db51bc68bed00168047d2cb3e.png"></image>
+    <view class="testBtn-go" bindtap="assessGo">{{userLogin ? testTitle : '立即开启皮肤检测'}}</view>
+</view>
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -0,0 +1,125 @@
+/* 漂浮窗 */
+.wander {
+    position: fixed;
+    right: 0;
+    top: 26%;
+    background-color: #ffffff;
+    border-radius: 60rpx 0 0 60rpx;
+    height: 150rpx;
+    width: 120rpx;
+}
+
+.wander::after {
+    position: absolute;
+    left: -15rpx;
+    top: -15rpx;
+    background-color: rgba(255, 255, 255, .3);
+    content: '';
+    width: calc(100% + 30rpx);
+    height: calc(100% + 30rpx);
+    z-index: 0;
+    border-radius: 60rpx 0 0 60rpx;
+}
+
+.wander-cont {
+    padding: 25rpx 25rpx 25rpx 35rpx;
+    box-sizing: border-box;
+    position: absolute;
+    z-index: 2;
+    width: 100%;
+    height: 100%;
+    left: 0;
+    top: 0;
+    text-align: center;
+}
+
+.wander-icon {
+    width: 54rpx;
+}
+
+.wander-name {
+    color: #12428f;
+    padding-top: 5rpx;
+    font-weight: 300;
+    font-size: 26rpx;
+}
+
+/* 第一屏幕 */
+.indexBack {
+    position: relative;
+    width: 100%;
+    height: 100vh;
+}
+
+.indexBack-img {
+    position: absolute;
+    width: 100%;
+    height: 100%;
+}
+
+.indexText {
+    position: absolute;
+    bottom: 30rpx;
+    left: 0;
+    text-align: center;
+    width: 100%;
+}
+
+.indexText-name {
+    color: #fff;
+    display: inline-block;
+    border-radius: 50rpx;
+    text-shadow: 2rpx 2rpx 10rpx rgba(0, 0, 0, .3);
+    font-size: 28rpx;
+}
+
+.indexText-arrow {
+    width: 36rpx;
+    height: 36rpx;
+    display: block;
+    margin: 15rpx auto 0;
+    animation: bounce-down 2s linear infinite;
+}
+
+@keyframes bounce-down {
+    25% {
+        transform: translateY(-4px);
+    }
+
+    50%,
+    100% {
+        transform: translateY(0);
+    }
+
+    75% {
+        transform: translateY(4px);
+    }
+}
+
+
+/* 步骤提示 */
+.indexSingle {
+    width: 100%;
+}
+
+.indexSingle-img {
+    width: 100%;
+    display: block;
+}
+
+
+/* 按钮 */
+.testBtn {
+    text-align: center;
+}
+
+.testBtn-go {
+    margin: 50rpx 0 100rpx;
+    background-image: linear-gradient(to right, #3d7dfe, #6b9fff);
+    border: 14rpx solid #bdd3ff;
+    display: inline-block;
+    color: #fff;
+    line-height: 90rpx;
+    width: 75%;
+    border-radius: 110rpx;
+}
--- a/pages/login/agreement/agreement.js
+++ b/pages/login/agreement/agreement.js
@@ -0,0 +1,42 @@
+/*
+ * 手太欠
+ * 愿这世界都如故事里一样 美好而动人~
+ */
+
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        content: ''
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+
+        if(options.type == 'secret') {
+            wx.setNavigationBarTitle({
+                title: '水感应 隐私政策'
+            })
+        } else {
+            wx.setNavigationBarTitle({
+                title: '水感应 服务协议'
+            })
+        }
+
+        // 获取用户协议
+        wx.$api.auth.registeragree(options.type).then(res => {
+            this.setData({
+                content: res.data.content
+            })
+        }).catch(err => {})
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {},
+})
--- a/pages/login/agreement/agreement.json
+++ b/pages/login/agreement/agreement.json
@@ -0,0 +1,3 @@
+{
+    "usingComponents": {}
+}
--- a/pages/login/agreement/agreement.wxml
+++ b/pages/login/agreement/agreement.wxml
@@ -0,0 +1,3 @@
+<view class="agreement-content">
+    <rich-text nodes="{{content}}"></rich-text>
+</view>
--- a/pages/login/agreement/agreement.wxss
+++ b/pages/login/agreement/agreement.wxss
@@ -0,0 +1,5 @@
+.agreement-content{
+    padding: 30rpx;
+    box-sizing: border-box;
+    font-size: 32rpx;
+}
--- a/pages/login/index.js
+++ b/pages/login/index.js
@@ -0,0 +1,140 @@
+ /*
+ * 手太欠
+ * 愿这世界都如故事里一样 美好而动人~
+ */
+
+Page({
+    data: {
+        typeLogin   : '',    // 登录来源
+        loading     : false, // 加载
+        loginCode   : '',    // 微信登录code
+        checked     : false, //勾选协议
+    },
+
+    onLoad(options) {
+        this.setData({
+            typeLogin : options.type
+        })
+    },
+
+    onShow() {
+        // 获取code
+        this.gainCode();
+    },
+
+    /**
+     * 隐私协议
+     */
+    empowerTap() {
+        wx.showToast({
+            title: '请勾选用户隐私和服务协议',
+            icon: "none"
+        })
+    },
+
+    /**
+     * 微信授权手机号码
+     */
+    userPhone(e){
+        // 获取code
+        this.gainCode();
+        if(e.detail.errMsg == "getPhoneNumber:ok"){
+            this.setData({
+                loading: true
+            })
+            let enData = e.detail.encryptedData,
+                iv     = e.detail.iv
+            // 检查用户登录Code是否过期
+            wx.checkSession({
+                success: ()=>{
+                    this.userLogin(iv,enData)
+                },
+                fail: err=>{
+                    this.setData({
+                        loading: false
+                    })
+                    // 登录过期重新获取code
+                    wx.login({
+                        success: res=>{
+                            this.setData({
+                                loginCode: res.code
+                            })
+                            // 登录
+                            this.userLogin(iv,enData)
+                        }
+                    })
+                }
+            })
+        }else{
+            wx.showToast({
+                title: '拒绝了登录授权',
+                icon : 'none'
+            })
+        } 
+    },
+
+    /**
+     * 用户登录
+     */
+    userLogin(iv,enData){
+        wx.$api.auth.login({
+            code            : this.data.loginCode,
+            encryptedData   : enData,
+            iv              : iv,
+            invite          : getApp().globalData.inviteText || ''
+        }).then(res=>{
+             // 存储登录信息
+             wx.setStorage({
+                key   : 'token',
+                data  : res.data.token_type + ' ' + res.data.access_token,
+                success: () =>{
+                    // 存储邀请码
+                    wx.$api.user.userIndex().then(res => {
+                        wx.setStorage({
+                            key   : 'invite',
+                            data  : res.data.invite
+                        })
+                        if(this.data.typeLogin == "indexDemo") {
+                            wx.redirectTo({
+                                url: '/pages/index/assess/assess'
+                            })
+                            return
+                        }
+                        // 回到上一页
+                        wx.navigateBack()
+                    }).catch(err => {})
+                }
+            })
+        }).catch(err=>{})
+    },
+
+    /**
+     * 获取code
+     */
+    gainCode() {
+        wx.login({
+            success: res => {
+                this.setData({
+                    loginCode : res.code
+                })
+            }
+        })
+    },
+
+    // 勾选协议
+    radioChange() {
+        this.setData({
+            checked: !this.data.checked
+        })
+    },
+
+    // 免责声明
+    seeSm(){
+        wx.showModal({
+            title: '免责声明',
+            content: '本品不含任何除原料外的添加物，如使用中有任何问题，请遵医嘱。',
+            showCancel:false,
+            confirmText:'知道了'
+        })
+    }
+})
--- a/pages/login/index.json
+++ b/pages/login/index.json
@@ -0,0 +1,6 @@
+{
+    "usingComponents": {},
+    "navigationBarBackgroundColor": "#5283ea",
+    "navigationBarTextStyle": "white",
+    "navigationBarTitleText": "授权登录"
+}
--- a/pages/login/index.wxml
+++ b/pages/login/index.wxml
@@ -0,0 +1,31 @@
+<view class="loginTop"></view>
+<view class="loginCont">
+    <view class="loginCont-back">
+        <view class="loginCont-title">
+            <view class="loginCont-title-name">欢迎使用</view>
+            <view class="loginCont-title-text">水感应平台</view>
+        </view>
+        <view class="loginCont-see">
+            <image class="loginCont-see-img" src="https://cdn.shuiganying.com/images/2023/03/31/fefb3a48c1da3f3699b397c2bb533acd.png" mode="widthFix"></image>
+            <view class="loginCont-see-btn">
+                <button wx:if="{{checked}}" class="loginCont-see-go loginCont-see-blue" size="default" open-type="getPhoneNumber" bindgetphonenumber="userPhone" disabled="{{loading}}" loading="{{loading}}">授权登录</button>
+                <view wx:else class="loginCont-see-go loginCont-see-blue" bindtap="empowerTap">授权登录</view>
+                <navigator hover-class="none" open-type="switchTab" url="/pages/index/index" class="loginCont-see-go loginCont-see-white">回到首页</navigator>
+            </view>
+            <!-- 用户登录注册协议 -->
+            <view class="agreement">
+                <checkbox-group bindchange="radioChange">
+                    <checkbox color="#4490ff" checked="{{checked}}" size='10' class="radioGroup" />
+                </checkbox-group>
+                <view class="agreement-text">
+                    我已阅读并同意<navigator hover-class="none" url="./agreement/agreement?type=secret">《隐私政策》</navigator>和<navigator hover-class="none" url="./agreement/agreement?type=protocol">《服务协议》</navigator>和<view bindtap="seeSm">《免责声明》</view>
+                </view>
+            </view>
+        </view>
+    </view>
+</view>
+
+<!-- logo -->
+<view class="logo">
+    <image class="logo-img" src="https://cdn.shuiganying.com/images/2023/04/04/8bcb5ca48b59261de63a0c8ce82f9ffd.png" mode="widthFix"></image>
+</view>
--- a/pages/login/index.wxss
+++ b/pages/login/index.wxss
@@ -0,0 +1,119 @@
+page {
+    background-color: #f4f4f6;
+}
+
+.loginTop {
+    background-color: #5283ea;
+    width: 100%;
+    height: 200rpx;
+    border-radius: 0 0 80rpx 80rpx;
+}
+
+.loginCont {
+    padding: 0 40rpx;
+    box-sizing: border-box;
+    position: absolute;
+    top: 40rpx;
+    width: 100%;
+    z-index: 99;
+}
+
+.loginCont-back {
+    background-color: #ffffff;
+    border-radius: 20rpx;
+    padding: 40rpx 40rpx 20rpx;
+    box-sizing: border-box;
+}
+
+.loginCont-title-name {
+    color: #525252;
+}
+
+.loginCont-title-text {
+    font-size: 40rpx;
+    margin-top: 15rpx;
+    position: relative;
+    display: inline-block;
+    padding-bottom: 20rpx;
+}
+
+.loginCont-title-text::after {
+    position: absolute;
+    content: '';
+    background-color: #5283ea;
+    width: 100%;
+    height: 8rpx;
+    left: 0;
+    bottom: 0;
+    border-radius: 80rpx;
+}
+
+.loginCont-see-img {
+    width: 100%;
+    margin: 80rpx 0 60rpx;
+}
+
+.loginCont-see-btn {
+    width: 100%;
+}
+
+.loginCont-see-go {
+    height: 98rpx;
+    line-height: 98rpx !important;
+    text-align: center;
+    border-radius: 90rpx;
+    margin-bottom: 40rpx;
+    font-size: 32rpx !important;
+    border: 2rpx solid #5283ea;
+    width: 100% !important;
+}
+
+.loginCont-see-blue {
+    background-color: #5283ea;
+    color: #ffffff;
+    padding: 0 !important;
+    font-weight: normal;
+    border: none;
+    height: 104rpx !important;
+}
+
+.loginCont-see-blue[disabled] {
+    border-color: transparent;
+}
+
+.loginCont-see-white {
+    color: #5283ea;
+}
+
+.logo {
+    position: absolute;
+    z-index: 1;
+    right: -120rpx;
+    bottom: 18%;
+}
+
+
+/* 协议 */
+.agreement {
+    font-size: 26rpx;
+    color: #9d9d9d;
+    margin: 20rpx 0;
+    display: flex;
+}
+
+.radioGroup {
+    transform: scale(.6);
+    width: 55rpx;
+    text-align: left;
+}
+
+.agreement-text {
+    width: calc(100% - 55rpx);
+    line-height: 48rpx;
+}
+
+.agreement-text navigator,
+.agreement-text view {
+    color: #3b7cff;
+    display: inline-block;
+}
--- a/pages/login/personal/personal.js
+++ b/pages/login/personal/personal.js
@@ -0,0 +1,77 @@
+ /*
+ * 手太欠
+ * 愿这世界都如故事里一样 美好而动人~
+ */
+
+Page({
+    data: {
+        loading     : false, // 加载
+        nameValue   : '',
+        sexArray: [
+            {
+              id: 0,
+              name: '男'
+            },
+            {
+              id: 1,
+              name: '女'
+            },
+        ],
+        sexId: '',
+        birthday: '请选择出生年月日'
+    },
+
+    onLoad(options) {
+    },
+
+    onShow() {},
+
+    /*
+        性别选择
+    */
+    radioChange (e) {
+        const sex = this.data.sexArray
+        for (let i = 0, len = sex.length; i < len; ++i) {
+          sex[i].checked = sex[i].id == e.detail.value
+        }
+        this.setData({
+            sexArray: sex,
+            sexId   : e.detail.value
+        })
+    },
+
+    /*
+        出生年月日
+    */
+    bindDateChange(e) {
+        this.setData({
+            birthday: e.detail.value
+        })
+    },
+
+    /*
+        姓名截取
+    */
+    bindinput(e) {
+        this.setData({
+            nameValue: e.detail.value.substr(0,5)
+        })
+    },
+
+    /*
+        提交信息
+    */
+    issueForm() {
+        let data = {
+            name        : this.data.nameValue,
+            sex         : this.data.sexId,
+            birthday    : this.data.birthday
+        }
+        wx.$api.auth.userAdd(data).then(res => {
+            this.setData({
+                disabled: true
+            })
+            wx.navigateBack()
+        }).catch(err => {})
+    }
+})
--- a/pages/login/personal/personal.json
+++ b/pages/login/personal/personal.json
@@ -0,0 +1,4 @@
+{
+    "usingComponents": {},
+    "navigationBarTitleText": "基本信息"
+}
--- a/pages/login/personal/personal.wxml
+++ b/pages/login/personal/personal.wxml
@@ -0,0 +1,46 @@
+<view class="loginTop"></view>
+<view class="loginCont">
+    <view class="loginCont-back">
+        <view class="personal-title">
+            <view class="personal-title-text">请填写以下个人信息</view>
+            <view class="personal-title-name">填写以下信息，填写后的信息不可修改</view>
+        </view>
+        <form bindsubmit="issueForm" class="personal-see">
+            <view class="take-label">
+                <view class="item">
+                    <view class="name">姓名</view>
+                    <input class="entry" type="text" name="name" value="{{nameValue}}" placeholder="请输入真实姓名" bindinput="bindinput" />
+                </view>
+                <view class="item">
+                    <view class="name">性别</view>
+                    <!-- <picker class="entry" bindchange="bindPickerChange" value="{{sexIndex}}" range="{{sexArray}}" range-key="name" mode="selector">
+                        <view class="picker">
+                            {{sexArray[sexIndex].name}}
+                        </view>
+                    </picker> -->
+                    <radio-group bindchange="radioChange" class="sexSelect">
+                        <view class="radiobox" wx:for="{{sexArray}}" wx:key="name">
+                            <radio value="{{item.id}}" color="#ff9951" checked="{{item.checked}}"/>
+                            <view class="radiotxt">{{item.name}}</view>
+                        </view>
+                    </radio-group>    
+                </view>
+                <view class="item">
+                    <view class="name">出生年月日</view>
+                    <picker class="entry" mode="date" value="{{birthday}}" bindchange="bindDateChange">
+                        <view class="picker">{{birthday}}</view>
+                        <image src="/static/icons/orderArrow.png"></image>
+                    </picker>
+                </view>
+            </view>
+            <view class="userdata-btn">
+                <button class="issue-btn" form-type="submit" size="mini" disabled="{{disabled}}">提交保存</button>
+            </view>
+        </form>
+    </view>
+</view>
+
+<!-- logo -->
+<view class="logo">
+    <image class="logo-img" src="https://cdn.shuiganying.com/images/2023/04/04/8bcb5ca48b59261de63a0c8ce82f9ffd.png" mode="widthFix"></image>
+</view>
--- a/pages/login/personal/personal.wxss
+++ b/pages/login/personal/personal.wxss
@@ -0,0 +1,147 @@
+page {
+    background-color: #f4f4f6;
+}
+
+.loginTop {
+    background-color: #5283ea;
+    width: 100%;
+    height: 200rpx;
+    border-radius: 0 0 80rpx 80rpx;
+}
+
+.loginCont {
+    padding: 0 40rpx;
+    box-sizing: border-box;
+    position: absolute;
+    top: 40rpx;
+    width: 100%;
+    z-index: 99;
+}
+
+.loginCont-back {
+    background-color: #ffffff;
+    border-radius: 20rpx;
+    padding: 40rpx 40rpx 20rpx;
+    box-sizing: border-box;
+}
+
+.loginCont-see-img {
+    width: 100%;
+    margin: 80rpx 0 60rpx;
+}
+
+.loginCont-see-btn {
+    width: 100%;
+}
+
+.loginCont-see-go {
+    height: 98rpx;
+    line-height: 98rpx !important;
+    text-align: center;
+    border-radius: 90rpx;
+    margin-bottom: 40rpx;
+    font-size: 32rpx !important;
+    border: 2rpx solid #5283ea;
+    width: 100% !important;
+}
+
+.loginCont-see-blue {
+    background-color: #5283ea;
+    color: #ffffff;
+    height: 102rpx !important;
+    padding: 0 !important;
+    font-weight: normal;
+}
+
+.loginCont-see-blue[disabled] {
+    border-color: transparent;
+}
+
+.loginCont-see-white {
+    color: #5283ea;
+}
+
+.logo {
+    position: absolute;
+    z-index: 1;
+    right: -120rpx;
+    bottom: 18%;
+}
+
+.personal-title-text {
+    font-size: 36rpx;
+    font-weight: 600;
+}
+
+.personal-title-name {
+    font-size: 28rpx;
+    color: #ff9951;
+    line-height: 54rpx;
+}
+
+.personal-see {
+    display: block;
+}
+
+.item {
+    margin-top: 40rpx;
+    border-bottom: 2rpx solid #ededed;
+}
+
+.entry {
+    height: 44rpx;
+    line-height: 44rpx;
+    display: block;
+    padding: 30rpx 0;
+    position: relative;
+    color: #999999;
+}
+
+.entry image {
+    width: 44rpx;
+    height: 44rpx;
+    position: absolute;
+    right: 0;
+    top: calc(50% - 22rpx);
+}
+
+.sexSelect {
+    display: flex;
+    padding: 30rpx 0;
+    height: 44rpx;
+    line-height: 44rpx;
+    color: #999999;
+}
+
+.sexSelect radio {
+    transform: scale(.7);
+}
+
+.radiobox {
+    display: flex;
+    margin-right: 50rpx;
+}
+
+/* 按钮 */
+.userdata-btn {
+    width: 100%;
+    margin: 80rpx 0 20rpx;
+}
+
+.issue-btn {
+    background: #3b7cff;
+    text-align: center;
+    color: white;
+    height: 90rpx;
+    line-height: 90rpx !important;
+    font-weight: normal;
+    width: 100% !important;
+    margin: 0;
+    padding: 0;
+    border-radius: 10rpx;
+}
+
+.issue-btn[disabled] {
+    background: #709fff !important;
+    color: #fff !important;
+}
--- a/pages/mall/confirm/confirm.js
+++ b/pages/mall/confirm/confirm.js
@@ -0,0 +1,220 @@
+ /*
+ * 手太欠
+ * 愿这世界都如故事里一样 美好而动人~
+ */
+
+Page({
+    data: {
+        goods_id     : '',  // 店铺id
+        goods_sku    : '',  // 产品id
+        goods_qty    : '',  // 产品数量
+        address      : '',  // 地址
+        addressId    : '',  // 地址id
+        goodskData   : '',  // 数据
+        amount       : '',  // 总金额
+        freight      : '',  // 运费
+        weight       : '',  // 重量
+        disabled     : true,//按钮
+        paySuccess   : false, // 兑换成功显示
+        maxcoupon    : '',   //拥有兑换券数量
+        coupon_qty   : 1,   //兑换券数量
+        checked      : false//兑换券
+    },
+
+    onLoad(options) {
+        this.setData({
+            goods_id  : options.goodsid,
+            goods_sku : options.skuid,
+            goods_qty : options.qty
+        })
+    },
+
+    onShow() {
+        // 获取下单信息
+        this.confirmInfo()
+    },
+
+    /**
+     * 产品下单信息
+     */
+    confirmInfo (){
+        wx.$api.mall.mallPlace({
+            goods_sku_id: this.data.goods_sku,
+            address_id: this.data.addressId,
+            qty: this.data.goods_qty
+        }).then(res => {
+            this.setData({
+                address   : res.data.address,
+                addressId : res.data.address.address_id,
+                goodskData: res.data.detail,
+                amount    : res.data.amount,
+                freight   : res.data.freight,
+                weight    : res.data.weight,
+                maxcoupon : res.data.couponCount
+            })
+
+            // 计算总价格
+            this.totalPrice()
+        }).catch(err => { })
+    },
+
+    /**
+     * 产品数量加减
+     */
+    goodsNumber(e){
+        let num = this.data.goods_qty,
+            val = e.currentTarget.dataset.type
+        if (val == 'plus'){
+            num ++;
+        }else{
+            if (num > 1){
+                num --;
+                if(num < this.data.coupon_qty) {
+                    this.setData({
+                        coupon_qty: num
+                    })
+                }
+            }else{
+                wx.showToast({
+                    title   : '商品数量不能小于1',
+                    icon    : 'none'
+                })
+            }
+            this.setData({
+                goods_qty: num
+            })
+        }
+        this.setData({
+            goods_qty: num
+        })
+
+        // 计算总价格
+        this.totalPrice()
+    },
+
+    /**
+     * 是否使用兑换券
+     */
+    checkedTap() {
+        this.setData({
+            checked: !this.data.checked
+        })
+
+        // 计算总价格
+        this.totalPrice()
+    },
+
+    /**
+     * 兑换券数量加减
+     */
+    couponNumber(e){
+        let minVal = Math.min(this.data.goods_qty, this.data.maxcoupon)
+        let num = this.data.coupon_qty,
+            val = e.currentTarget.dataset.type
+        if (val == 'plus'){
+            if(num >= minVal){
+                this.setData({
+                    coupon_qty: minVal
+                })
+                wx.showToast({
+                    title: '兑换券数量超出产品数量或兑换券不足',
+                    icon : 'none'
+                })
+                return
+            }
+            num ++;
+
+        }else{
+            if (num > 1){
+                num --;
+            }else{
+                wx.showToast({
+                    title   : '兑换券数量不能小于1',
+                    icon    : 'none'
+                })
+            }
+            this.setData({
+                coupon_qty: num
+            })
+        }
+        this.setData({
+            coupon_qty: num
+        })
+
+        // 计算总价格
+        this.totalPrice()
+    },
+
+    /**
+     * 计算总价格
+     */
+    totalPrice() {
+        let couponQty  = this.data.coupon_qty
+        let goodNum    = this.data.goods_qty
+        let goodPrice  = this.data.goodskData[0].items[0].price
+        let freight    = this.data.freight
+        let totalPrice = 0
+        
+        totalPrice = this.data.checked ? 
+                    (goodNum - couponQty) * goodPrice :
+                    goodNum * goodPrice
+        if(freight > 0) totalPrice += freight
+
+        this.setData({
+            amount: totalPrice
+        })
+    },
+
+    /**
+     * 产品确认购买
+     */
+    buyTap() {
+        wx.showLoading({
+            title: '加载中...',
+        })
+        let that = this
+        let data = {
+            goods_sku_id: this.data.goods_sku,
+            qty         : this.data.goods_qty,
+            address_id  : this.data.addressId,
+            use_coupon  : this.data.checked,
+            coupon_qty  : this.data.coupon_qty
+        }
+        wx.$api.mall.mallAffirm(data).then(res => {
+            this.setData({
+                disabled: false
+            })
+            wx.hideLoading()
+
+            if(res.data.can_pay) {
+                wx.redirectTo({
+                    url: '/pages/pay/index?order_no=' + res.data.order_no + '&total=' + res.data.total
+                })
+                return
+            }
+            
+            wx.showToast({
+                title: '支付成功',
+                icon: 'none',
+                duration: 2000,
+                //显示透明蒙层，防止触摸穿透
+                mask:true,
+                success: function () {
+                    that.setData({
+                        paySuccess: true
+                    })
+                    setTimeout(()=>{
+                        wx.redirectTo({
+                            url: '/pages/order/index?state=paid'
+                        })
+                    },3000)
+                }
+            })
+
+        }).catch(err => {
+            this.setData({
+                disabled: true
+            })
+        })
+    }
+})
--- a/pages/mall/confirm/confirm.json
+++ b/pages/mall/confirm/confirm.json
@@ -0,0 +1,4 @@
+{
+    "usingComponents": {},
+    "navigationBarTitleText": "订单确认"
+}
--- a/pages/mall/confirm/confirm.wxml
+++ b/pages/mall/confirm/confirm.wxml
@@ -0,0 +1,81 @@
+<!-- 地址 -->
+<view class="address">
+    <navigator hover-class="none" url="/pages/site/index?type=goodsAddress" class="address-cont" wx:if="{{address}}">
+        <view class="address-top">
+            <view class="address-area">{{address.province.name}}{{address.city.name}}</view>
+            <view class="address-text">{{address.full_address}}</view>
+        </view>
+        <view class="address-name">
+            {{address.name}}<text>{{address.mobile}}</text>
+        </view>
+        <image class="address-arrow" src="/static/icons/orderArrow.png"></image>
+    </navigator>
+    <view class="address-add" wx:else>
+        <navigator hover-class="none" url="/pages/site/index?type=goodsAddress" class="address-go">新增收货地址 +</navigator>
+    </view>
+    <image class="address-img" src="/static/imgs/address.png" mode="widthFix"></image>
+</view>
+
+<!-- 商品 -->
+<view class="list-goods" wx:for="{{goodskData}}" wx:key="stockData">
+    <block wx:for="{{item.items}}" wx:key="items" wx:for-item="items">
+        <image class="list-goods-img" mode="aspectFill" src="{{items.cover ? items.cover : '/static/imgs/default.png'}}"></image>
+        <view class="list-goods-cont">
+            <view class="nowrap list-goods-name">{{items.title}}</view>
+            <view class="list-goods-text">
+                <text>规格 99ml</text>x1
+            </view>
+            <view class="list-goods-parice">
+                产品金额 ￥<text>{{items.price}}</text>
+            </view>
+        </view>
+    </block>
+</view>
+<!-- 规格 -->
+<view class="label">
+    <view class="label-item">
+        <view class="label-name">数量</view>
+        <view class="label-number">
+            <view class="number-btn" bindtap="goodsNumber" data-type="remove">-</view>
+            <input bindinput="goodsNumberInput" class="number-input" type="number" value="{{goods_qty}}" disabled />
+            <view class="number-btn" bindtap="goodsNumber" data-type="plus">+</view>
+        </view>
+    </view>
+    <view class="label-item">
+        <view class="label-name">快递</view>
+        <view class="label-text">{{freight == 0 ? '免邮' : freight + '元'}}</view>
+    </view>
+    <view class="coupons" wx:if="{{maxcoupon != 0}}">
+        <view class="coupons-item">
+            <view class="label-name">兑换券</view>
+            <view class="label-text">勾选使用<checkbox class="label-text-checkbox" checked="{{checked}}" bindtap="checkedTap" color="#3b7cff" style="transform:scale(.7);" /></view>
+        </view>
+        <view class="coupon-checked" wx:if="{{checked}}">
+            <view class="coupon-checked-name">使用数量</view>
+            <view class="coupon-checked-number">
+                <view class="coupon-checked-btn" bindtap="couponNumber" data-type="remove">-</view>
+                <input class="coupon-checked-input" bindblur="couponNumberInput" type="number" value="{{coupon_qty}}" disabled />
+                <view class="coupon-checked-btn" bindtap="couponNumber" data-type="plus">+</view>
+            </view>
+        </view>
+    </view>
+    <view class="label-item">
+        <view class="label-name">金额</view>
+        <view class="label-integral">￥{{amount}}</view>
+    </view>
+</view>
+
+<!-- 底部 -->
+<view class="footer">
+    <view class="number"><text>￥</text>
+        <view class="number-price">{{amount}}</view>
+        <view class="number-vip">实付金额</view>
+    </view>
+    <view class="btn" bindtap="buyTap" wx:if="{{disabled}}">立即支付</view>
+    <view class="btn active" wx:else>立即支付</view>
+</view>
+
+<view class="pack-center pages-hint grey" wx:if="{{paySuccess}}">
+    <image src="/static/icons/loadingGif.gif"></image>
+    <view>疯狂加载中...</view>
+</view>
--- a/pages/mall/confirm/confirm.wxss
+++ b/pages/mall/confirm/confirm.wxss
@@ -0,0 +1,315 @@
+page {
+    background-color: #f5f6f8;
+    padding: 30rpx;
+    box-sizing: border-box;
+}
+
+/* 地址 */
+.address {
+    background-color: #FFFFFF;
+    border-radius: 15rpx;
+    overflow: hidden;
+    position: relative;
+}
+
+.address-arrow {
+    position: absolute;
+    right: 15rpx;
+    top: 78rpx;
+    width: 50rpx;
+    height: 50rpx;
+}
+
+.address-cont {
+    padding: 30rpx;
+    box-sizing: border-box;
+}
+
+.address-top {
+    width: calc(100% - 80rpx);
+}
+
+.address-area {
+    color: #585866;
+    font-size: 28rpx;
+}
+
+.address-text {
+    font-weight: 600;
+    padding: 10px 0;
+}
+
+.address-name text {
+    color: #585866;
+    padding-left: 30rpx;
+}
+
+.address-img {
+    width: 100%;
+    display: block;
+}
+
+.address-add {
+    width: 100%;
+    text-align: center;
+    padding: 30rpx 30rpx 0;
+    box-sizing: border-box;
+}
+
+.address-go {
+    display: inline-block;
+    font-size: 28rpx;
+    line-height: 68rpx;
+    border-radius: 10rpx;
+    color: #df723a;
+    padding-bottom: 20rpx;
+}
+
+/* 商品 */
+
+.list-goods {
+    background-color: #FFFFFF;
+    margin: 30rpx 0;
+    display: flex;
+    padding: 30rpx;
+    border-radius: 15rpx;
+    box-sizing: border-box;
+}
+
+.list-goods-img {
+    width: 184rpx;
+    height: 184rpx;
+    margin-right: 30rpx;
+    border-radius: 10rpx;
+}
+
+.list-goods-cont {
+    width: calc(100% - 214rpx);
+}
+
+.list-goods-name {
+    font-size: 32rpx;
+}
+
+.list-goods-text {
+    line-height: 90rpx;
+    display: flex;
+    font-size: 28rpx;
+    color: #999999;
+}
+
+.list-goods-text text {
+    flex: 1;
+}
+
+.list-goods-parice {
+    text-align: right;
+    font-size: 26rpx;
+}
+
+.list-goods-parice text {
+    font-size: 34rpx;
+}
+
+/* 规格 */
+.label {
+    background-color: #FFFFFF;
+    border-radius: 15rpx;
+    overflow: hidden;
+    box-sizing: border-box;
+}
+
+.label-item {
+    display: flex;
+    line-height: 100rpx;
+    color: #585866;
+    font-size: 30rpx;
+    padding: 0 30rpx;
+    box-sizing: border-box;
+    border-bottom: 2rpx solid rgb(243, 243, 243);
+}
+
+.label-item:last-child {
+    border: none;
+}
+
+.label-integral {
+    color: #3b7cff;
+    font-weight: 600;
+}
+
+.label-name {
+    flex: 1;
+}
+
+.coupons {
+    border-bottom: 2rpx solid rgb(243, 243, 243);
+    padding: 0 30rpx 30rpx;
+    box-sizing: border-box;
+}
+
+.coupons-item {
+    display: flex;
+    line-height: 100rpx;
+    color: #585866;
+    font-size: 30rpx;
+}
+
+.coupon-checked {
+    background-color: #fff3ea;
+    padding: 20rpx 30rpx;
+    box-sizing: border-box;
+    border-radius: 10rpx;
+    position: relative;
+}
+
+.coupon-checked-name {
+    color: #ff9951;
+    font-size: 28rpx;
+    line-height: 42rpx;
+}
+
+.coupon-checked-number {
+    position: absolute;
+    right: 0rpx;
+    top: 0rpx;
+    display: flex;
+    background-color:transparent;
+}
+
+.coupon-checked-btn {
+    color: #db6815;
+    width: 80rpx;
+    text-align: center;
+    font-weight: 600;
+    font-size: 38rpx;
+    line-height: 78rpx;
+}
+
+.coupon-checked-input {
+    width: 60rpx;
+    border: 2rpx solid #bd5e1b;
+    border-radius: 4rpx;
+    text-align: center;
+    color: #dd620a;
+    height: 36rpx;
+    min-height: 36rpx;
+    display: inline-block;
+    margin-top: 20rpx;
+    font-size: 26rpx;
+}
+
+/*checkbox选中后样式  */
+.label-text-checkbox {
+    margin-right: -14rpx;
+    margin-left: 10rpx;
+}
+
+.label-text-checkbox .wx-checkbox-input.wx-checkbox-input-checked {
+    background: #ff9951;
+    border-color: #ff9951;
+}
+  
+.label-text-checkbox .wx-checkbox-input.wx-checkbox-input-checked::before {
+    width: 30rpx;
+    height: 30rpx;
+    line-height: 28rpx;
+    text-align: center;
+    font-size: 30rpx;
+    color: #fff;
+    background: transparent;
+    transform: translate(-50%, -50%) scale(1);
+    -webkit-transform: translate(-50%, -50%) scale(1);
+}
+
+.label-price {
+    text-align: right;
+    line-height: 90rpx;
+    font-size: 30rpx;
+    font-weight: 600;
+    padding: 0 30rpx 5rpx;
+    box-sizing: border-box;
+}
+
+.label-price text {
+    font-size: 34rpx;
+    padding: 0 10rpx;
+}
+
+.label-number {
+    display: flex;
+    margin-top: 25rpx;
+}
+
+.number-btn {
+    background-color: #f1f1f1;
+    width: 48rpx;
+    height: 48rpx;
+    line-height: 46rpx;
+    text-align: center;
+}
+
+.number-input {
+    width: 80rpx;
+    text-align: center;
+}
+
+/* 底部 */
+.footer {
+    width: 100%;
+    height: 60px;
+    background-color: #272e4f;
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    z-index: 9;
+    box-sizing: border-box;
+    display: flex;
+}
+
+.number {
+    flex: 1;
+    line-height: 60px;
+    color: #ffffff;
+    display: flex;
+    padding: 0 30rpx;
+    box-sizing: border-box;
+}
+
+.number text {
+    font-size: 28rpx;
+    padding-top: 5rpx;
+}
+
+.number-price {
+    padding: 0 5rpx;
+    font-size: 40rpx;
+}
+
+.number-vip {
+    margin-left: 20rpx;
+    color: #8d97a1;
+    font-size: 28rpx;
+}
+
+.btn {
+    height: 100%;
+    background-color: #ff9951;
+    text-align: center;
+    color: #FFFFFF;
+    padding: 0 70rpx;
+    line-height: 60px;
+}
+
+.btn.active {
+    background-color: #cacaca;
+}
+
+.detailsBrief-back{
+    width: 100%;
+}
+
+.grey {
+    background-color: #f9f9f9;
+    z-index: 99999;
+}
--- a/pages/mall/coupon/coupon.js
+++ b/pages/mall/coupon/coupon.js
@@ -0,0 +1,92 @@
+ /*
+ * 手太欠
+ * 愿这世界都如故事里一样 美好而动人~
+ */
+
+Page({
+    data: {
+        couponType  : 1,      // 兑换券类型
+        couponStatus: 1,      // 兑换券状态
+        couponArr   : [],     // 兑换券列表
+        page        : {},     // 分页信息
+        lodingStats : false,  // 加载状态
+    },
+
+    onShow() {
+        // 获取我的兑换券
+        this.couponInfo();
+    },
+
+    /**
+     * 我的兑换券
+     */
+    couponInfo(page) {
+        wx.$api.mall.mycoupon({
+            stock : this.data.couponType,
+            status: this.data.couponStatus,
+            page  : page || 1
+        }).then(res => {
+            let listArr = this.data.couponArr,
+                newData = []
+            if(page == 1 || page == undefined) listArr = []
+            newData = listArr.concat(res.data.data)
+            this.setData({
+                couponArr   : newData,
+                page        : res.data.page,
+                lodingStats : false
+            })
+            wx.stopPullDownRefresh()
+        }).catch(err => {
+            this.setData({
+                disabled: true
+            })
+        })
+        
+    },
+
+    /**
+     * 兑换券-类型
+     */
+    tabClick(e) {
+        this.setData({
+            couponType: e.currentTarget.dataset.type
+        })
+        // 获取我的兑换券
+        this.couponInfo();
+    },
+
+    /**
+     * 兑换券-状态
+     */
+    stateClick(e) {
+        this.setData({
+            couponStatus: e.currentTarget.dataset.status
+        })
+        // 获取我的兑换券
+        this.couponInfo();
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+        // 获取我的兑换券
+        this.couponInfo();
+    },
+
+    /**
+     * 上拉加载
+     */
+    onReachBottom(){
+        this.setData({
+            lodingStats: true
+        })
+        let pageNumber = this.data.page.current
+        if(this.data.page.has_more){
+            pageNumber++
+
+            // 获取我的兑换券
+            this.couponInfo(pageNumber);
+        }
+    }
+})
--- a/pages/mall/coupon/coupon.json
+++ b/pages/mall/coupon/coupon.json
@@ -0,0 +1,4 @@
+{
+    "usingComponents": {},
+    "navigationBarTitleText": "兑换券"
+}
--- a/pages/mall/coupon/coupon.wxml
+++ b/pages/mall/coupon/coupon.wxml
@@ -0,0 +1,52 @@
+<view class="orderFixed">
+    <view class="orderTab">
+        <view class="orderTab-item {{couponType == 1 ? 'active' : ''}}" bindtap="tabClick" data-type="1">
+            <text>1瓶</text>
+        </view>
+        <view class="orderTab-item {{couponType == 2 ? 'active' : ''}}" bindtap="tabClick" data-type="2">
+            <text>2瓶</text>
+        </view>
+        <view class="orderTab-item {{couponType == 3 ? 'active' : ''}}" bindtap="tabClick" data-type="3">
+            <text>3瓶</text>
+        </view>
+    </view>
+    <view class="orderState">
+        <view class="orderState-item {{couponStatus == 1 ? 'active' : ''}}" bindtap="stateClick" data-status="1">
+            <text>未使用</text>
+        </view>
+        <view class="orderState-item {{couponStatus == 2 ? 'active' : ''}}" bindtap="stateClick" data-status="2">
+            <text>已使用</text>
+        </view>
+        <view class="orderState-item {{couponStatus == 3 ? 'active' : ''}}" bindtap="stateClick" data-status="3">
+            <text>已过期</text>
+        </view>
+    </view>
+</view>
+
+<!-- 兑换券列表 -->
+<view class="coupon">
+    <view class="coupon-list" wx:if="{{couponArr.length > 0}}">
+        <navigator hover-class="none" url="" class="coupon-item {{item.status.value == 1 ? '' : 'active'}}" wx:for="{{couponArr}}" wx:key="couponArr">
+            <view class="coupon-item-name"><text>{{item.stock}}</text>瓶</view>
+            <view class="coupon-item-text">
+                <view class="coupon-item-number">{{item.number}}张</view>
+                <view class="coupon-item-time">有效期至 {{item.actived_at}}</view>
+                <view class="coupon-item-go" wx:if="{{item.status.value == 1}}">去使用</view>
+                <view class="coupon-item-go" wx:elif="{{item.status.value == 2}}">已使用</view>
+                <image class="coupon-item-img" wx:else src="https://cdn.shuiganying.com/images/2023/04/25/bae805f5a3b07b7a62ae95e9eb5eb4be.png" mode="widthFix"></image>
+            </view>
+        </navigator>
+        <view class="pagesLoding" wx:if="{{lodingStats}}">
+            <block wx:if="{{page.has_more}}">
+                <image class="pagesLoding-icon" src="/static/icons/refresh_loding.gif" mode="widthFix"></image>加载中...
+            </block>
+            <block wx:else>
+                没有更多了~
+            </block>
+        </view>
+    </view>
+    <view class="pack-center pages-hint" wx:else>
+        <image src="/static/imgs/text_null.png"></image>
+        <view>暂无数据</view>
+    </view>
+</view>
--- a/pages/mall/coupon/coupon.wxss
+++ b/pages/mall/coupon/coupon.wxss
@@ -0,0 +1,182 @@
+page {
+    background-color: #f7f9fa;
+}
+
+.orderFixed {
+    background-color: #f7f9fa;
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    z-index: 9;
+    height: 220rpx;
+}
+
+.orderTab {
+    height: 90rpx;
+    line-height: 90rpx;
+    background-color: white;
+    display: flex;
+}
+
+.orderTab-item {
+    flex: 2;
+    text-align: center;
+    position: relative;
+    color: #000000;
+}
+
+.orderTab-item::after {
+    position: absolute;
+    content: '';
+    left: calc(50% - 25rpx);
+    bottom: 0;
+    width: 50rpx;
+    height: 8rpx;
+    background-color: #3b7cff;
+    display: none;
+    border-radius: 90rpx;
+}
+
+.orderTab-item.active {
+    font-weight: 600;
+}
+
+.orderTab-item.active::after {
+    display: block;
+}
+
+.orderState {
+    display: flex;
+    padding: 40rpx 30rpx;
+    box-sizing: border-box;
+}
+
+.orderState-item {
+    background-color: white;
+    line-height: 54rpx;
+    padding: 0 25rpx;
+    border-radius: 54rpx;
+    font-size: 28rpx;
+    margin-right: 40rpx;
+}
+
+.orderState-item.active {
+    background-color: #3b7cff;
+    color: #ffffff;
+}
+
+/* 列表 */
+.coupon {
+    padding: 230rpx 30rpx 0;
+    box-sizing: border-box;
+}
+
+.coupon-item {
+    background-image: linear-gradient(to right, #fcefe5, #ffebdc);
+    border-radius: 20rpx;
+    padding: 30rpx 0;
+    box-sizing: border-box;
+    margin-bottom: 30rpx;
+    display: flex;
+    position: relative;
+}
+
+.coupon-item::after {
+    position: absolute;
+    content: '';
+    right: -18rpx;
+    top: calc(50% - 18rpx);
+    width: 36rpx;
+    height: 36rpx;
+    border-radius: 50%;
+    background-color: #f7f9fa;
+}
+
+.coupon-item-name {
+    width: 150rpx;
+    text-align: center;
+    font-size: 36rpx;
+    color: #ff9951;
+    line-height: 110rpx;
+    position: relative;
+}
+
+.coupon-item-name::after {
+    position: absolute;
+    content: '';
+    right: 0;
+    top: 0;
+    width: 2rpx;
+    height: 100%;
+    border-radius: 50%;
+    background-color: #fdd4b6;
+}
+
+.coupon-item-name text {
+    font-size: 60rpx;
+    font-weight: 600;
+}
+
+.coupon-item-text {
+    width: calc(100% - 150rpx);
+    padding: 10rpx 0 0 40rpx;
+    box-sizing: border-box;
+    position: relative;
+}
+
+.coupon-item-number {
+    color: #ff9951;
+    font-size: 38rpx;
+    margin-bottom: 10rpx;
+}
+
+.coupon-item-time {
+    font-size: 28rpx;
+    color: #c06728;
+}
+
+.coupon-item-go {
+    position: absolute;
+    right: 40rpx;
+    top: 30rpx;
+    background-color: #ff9951;
+    color: #ffffff;
+    font-size: 28rpx;
+    border-radius: 80rpx;
+    padding: 0 25rpx;
+    line-height: 58rpx;
+}
+
+.coupon-item-img {
+    position: absolute;
+    right: 40rpx;
+    top: 15rpx;
+    width: 94rpx;
+}
+
+.coupon-item-go.active {
+    background-color: #999999;
+}
+
+.coupon-item.active {
+    background-image: linear-gradient(to right, #eeeeee, #eeeeee);
+
+}
+
+.coupon-item.active .coupon-item-go {
+    background-color: #c1c1c1;
+}
+
+.coupon-item.active .coupon-item-name,
+.coupon-item.active .coupon-item-number {
+    color: #999999;
+}
+
+.coupon-item.active .coupon-item-time {
+    color: #7a7a7a;
+}
+
+.coupon-item.active .coupon-item-name::after {
+    background-color: #dbdbdb;
+}
--- a/pages/mall/details/details.js
+++ b/pages/mall/details/details.js
@@ -0,0 +1,314 @@
+ /*
+ * 手太欠
+ * 愿这世界都如故事里一样 美好而动人~
+ */
+
+Page({
+    data: {
+        isFixedTop : 0,
+        barHeight  : getApp().globalData.barHeight,  // 状态栏高度
+        goodsId    : '',     // 产品id
+        mallData   : '',     // 产品信息
+        mallContent: '',     // 产品简介
+        shareSee    : false, // 分享弹出
+        inviteText  : '',    // 自己的邀请码
+        isParent    : false, // 绑定邀请码
+        nameValue   : '',    // 上级邀请码
+    },
+
+    onLoad(options) {
+        if(options.invite != undefined) {
+            getApp().globalData.inviteText = options.invite
+        }
+        this.setData({
+            goodsId: options.id
+        })
+
+        // 初始化画布
+        wx.createSelectorQuery().select('#coverCanvas').fields({node: true, size: true}).exec(canvasNode => {
+            const canvas    = canvasNode[0].node
+            canvas.width = 375
+            canvas.height = 600
+            this.setData({
+                canvas
+            })
+        })
+    },
+
+    onShow() {
+        // 获取产品详情
+        this.mallInfo();
+
+        // 获取登录状态
+        if(wx.getStorageSync("token") != ''){
+            // 小程序码
+            this.ShareInfo();
+        }
+    },
+
+    /**
+     * 产品详情
+     */
+    mallInfo (){
+        wx.$api.mall.mallSee(this.data.goodsId).then(res => {
+            this.setData({
+                mallData    : res.data,
+                mallContent : res.data.content.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display:block;"')
+            })
+        }).catch(err => { })
+    },
+
+    /**
+     * 确认购买
+     */
+    buyTap() {
+        // 获取登录状态
+        if(wx.getStorageSync("token") != ''){
+            if(this.data.mallData.is_parent == true) {
+                wx.navigateTo({
+                    url: '/pages/mall/confirm/confirm?goodsid=' + this.data.mallData.goods_id + '&skuid=' + this.data.mallData.skus[0].sku_id + '&qty=1',
+                })
+                return
+            }
+
+            // 显示绑定邀请码弹窗
+            this.setData({
+                isParent: true
+            })
+            
+        }else{
+            // 去登录
+            wx.navigateTo({
+                url: "/pages/login/index"
+            })
+        }
+    },
+
+    /**
+     * 小程序码
+     */
+    ShareInfo() {
+        wx.$api.user.miniShare({
+            url: '/pages/index/index'
+        }).then(res => {
+            this.setData({
+                inviteCode: res.data.qrcode
+            })
+        }).catch(err => {})
+    },
+
+    /**
+     * 分享弹出
+     */
+    shareTap() {
+        // 获取登录状态
+        if(wx.getStorageSync("token") != ''){
+            this.setData({
+                shareSee: !this.data.shareSee
+            })
+        }else{
+            // 去登录
+            wx.navigateTo({
+                url: "/pages/login/index"
+            })
+        }
+    },
+
+    /**
+     * 生成海报
+     */
+    onCanvas(){
+        wx.showLoading({
+            title: '生成图片中...',
+            mask : true
+        })
+        const canvas    = this.data.canvas
+        const ctx       = canvas.getContext('2d')
+        const codeImgEl   = canvas.createImage()
+        const backBackEl  = canvas.createImage()
+
+        codeImgEl.src     = this.data.inviteCode      //二维码
+        backBackEl.src    = this.data.mallData.cover  //产品分享图片
+        const codeImgLoding = new Promise((resolve, reason) => {
+            codeImgEl.onload = () => {
+                resolve()
+            }
+        })
+        const backBackLoding = new Promise((resolve, reason) => {
+            backBackEl.onload = () => {
+                resolve()
+            }
+        })
+        Promise.all([codeImgLoding, backBackLoding]).then(() => {
+            // 绘制[二维码-白色背景]
+            ctx.fillStyle = "#ffffff";
+            ctx.fillRect(0, 0, 375, 540);
+
+            ctx.drawImage(backBackEl, 0, 0, 375, 375)
+
+            // 绘制[二维码]
+            ctx.drawImage(codeImgEl, 270, 440, 80, 80)
+
+            // 产品名称
+            ctx.font = "24px Arial"; //字体大小
+            ctx.fillStyle = "#000000"; //字体颜色
+            ctx.fillText(this.data.mallData.name, 25, 420);
+
+            // 产品价格
+            ctx.font = "bold 36px Arial"; //字体大小
+            ctx.fillStyle = "#3b7cff"; //字体颜色
+            ctx.fillText(this.data.mallData.price.price, 25, 480);
+
+            // 海报文字提示
+            ctx.font = "18px Arial"; //字体大小
+            ctx.fillStyle = "#b3b3b3"; //字体颜色
+            ctx.fillText('识别二维码进行查看', 25, 510);
+
+            wx.hideLoading()
+
+            wx.canvasToTempFilePath({
+                canvas: this.data.canvas,
+                success : res => {
+                    wx.saveImageToPhotosAlbum({
+                        filePath: res.tempFilePath,
+                        success: saveRes => {
+                            wx.showToast({
+                                title: '海报已保存至您的相册',
+                                icon : 'none'
+                            })
+                            this.setData({
+                                shareSee: false
+                            })
+                        },
+                        fail: () => {
+                            this.setData({
+                                shareSee: false
+                            })
+                            wx.hideLoading()
+                            wx.showModal({
+                                title: '提示',
+                                content: '暂未授权小程序写入您的相册，无法存储海报',
+                                confirmColor: '#e50d01',
+                                confirmText: '去设置',
+                                success: res => {
+                                    if (res.confirm) {
+                                        wx.openSetting()
+                                    }
+                                }
+                            })
+                        }
+                    })
+                },
+            })
+        }).catch(err => {
+            wx.showToast({
+                title: '图片加载失败',
+                icon : 'none'
+            })
+        })
+    },
+
+    /*
+        邀请码截取
+    */
+    bindinput(e) {
+        this.setData({
+            nameValue: e.detail.value
+        })
+    },
+
+    /**
+    * 绑定邀请码
+    */
+    nameTrue() {
+        wx.$api.mall.levelBind({
+            invite: this.data.nameValue
+        }).then(res => {
+            this.setData({
+                isParent: false
+            })
+            wx.navigateTo({
+                url: '/pages/mall/confirm/confirm?goodsid=' + this.data.mallData.goods_id + '&skuid=' + this.data.mallData.skus[0].sku_id + '&qty=1',
+            })
+        }).catch(err => {})
+    },
+
+    /**
+    * 关闭绑定邀请码弹窗
+    */
+    nameCancel() {
+        this.setData({
+            isParent: !this.data.isParent
+        })
+    },
+
+    /**
+    * 删除邀请码
+    */
+    colseTap() {
+        this.setData({
+            nameValue: ''
+        })
+    },
+
+    /**
+    * 返回上一页
+    */
+    returnGo() {
+        wx.navigateBack({
+            delta: 1,
+            fail: err => {
+                wx.switchTab({
+                    url: '/pages/index/index?invite=' + getApp().globalData.inviteText
+                })
+            }
+        })
+    },
+
+    /**
+    * 回到首页
+    */
+    returnHome() {
+        wx.switchTab({
+            url: '/pages/index/index?invite=' + getApp().globalData.inviteText
+        })
+    },
+
+    /**
+    * 监听页面滑动事件
+    */
+    onPageScroll(e) {
+        this.setData({
+            isFixedTop: parseInt(e.scrollTop)
+        });
+    },
+
+    /**
+	 * 微信分享
+	 */
+	onShareAppMessage(){
+        this.setData({
+            shareSee: false
+        })
+		return {
+			title	: this.data.mallData.name,
+            path	: "/pages/mall/details/details?id=" + this.data.goodsId + '&invite=' + wx.getStorageSync("invite"),
+			imageUrl: this.data.mallData.cover
+		}
+    },
+
+    /**
+     * 放大轮播相册图片
+     */
+    opneBanner(e){
+        let imgs  = [],
+            index = e.currentTarget.dataset.index
+        for (let img of e.currentTarget.dataset.imgs){
+            imgs.push(img)
+        }
+        wx.previewImage({
+            urls    : imgs,
+            current : imgs[index]
+        })
+    }
+})
--- a/pages/mall/details/details.json
+++ b/pages/mall/details/details.json
@@ -0,0 +1,4 @@
+{
+    "usingComponents": {},
+    "navigationStyle": "custom"
+}
--- a/pages/mall/details/details.wxml
+++ b/pages/mall/details/details.wxml
@@ -0,0 +1,144 @@
+<view class="navigation {{isFixedTop > 0 ? 'active' : ''}}" style="padding-top:{{barHeight}}px;">
+    <image bindtap="returnGo" class="navigation-arrow" src="{{isFixedTop > 0 ? '/static/icons/returnBlack.png' : '/static/icons/returnWrite.png'}}"></image>
+    <image bindtap="returnHome" class="navigation-arrow" src="{{isFixedTop > 0 ? '/static/icons/homeBlack.png' : '/static/icons/homeWrite.png'}}"></image>
+</view>
+
+<!-- 产品图 -->
+<view class="banner">
+    <swiper class="swiperCont" indicator-dots indicator-color="rgba(255,255,255,.5)" indicator-active-color="#fff" autoplay="true" circular>
+        <swiper-item data-index="{{index}}" data-imgs="{{mallData.pictures}}" bindtap="opneBanner" wx:for="{{mallData.pictures}}" wx:key="index">
+            <image class="swiperImg" src="{{item}}" mode="aspectFill"></image>
+        </swiper-item>
+    </swiper>
+</view>
+
+<!-- 商品信息 -->
+<view class="goodsCont">
+    <view class="goodsWhite goodsInfo">
+        <view class="goodsInfo-top">
+            <view class="goodsInfo-price">
+                <view class="goodsInfo-cost"><text>VIP￥</text>{{mallData.price.vip}}</view>
+                <view class="goodsInfo-vip"><text>市场指导价</text>{{mallData.price.price}}</view>
+            </view>
+        </view>
+        <view class="goodsInfo-name">
+            {{mallData.name}}
+        </view>
+        <view class="goodsInfo-share" bindtap="shareTap">
+            <image class="goodsInfo-share-image" src="/static/icons/goodsShare.png"></image>分享
+        </view>
+    </view>
+
+    <view class="vipOpen">
+        <image class="vipOpen-back" src="https://cdn.shuiganying.com/images/2023/04/01/3b939c9082c917ff01fe4f5ea2ab9dfe.jpg"></image>
+        <view class="vipOpen-cont">
+            <image class="vipOpen-cont-icon" src="https://cdn.shuiganying.com/images/2023/04/04/799f5052f307ba25da99917ee084aaa4.png"></image>
+            <view class="vipOpen-cont-name">
+                <view class="vipOpen-cont-vip">{{mallData.is_vip ? '已成为' : '开通'}}<text>VIP</text></view>
+                <view class="vipOpen-cont-tips">{{mallData.is_vip ? 'AI测肤精准分析您皮肤问题' : '完成皮肤评测成为vip/年'}}</view>
+            </view>
+        </view>
+        <navigator hover-class="none" url="/pages/index/index" open-type="switchTab" class="vipOpen-btn">{{mallData.is_vip ? '再次评测' : '立即评测'}}<image class="vipOpen-btn-arrow" src="/static/icons/vipArrow.png"></image>
+        </navigator>
+    </view>
+
+    <view class="goodsWhite goodsItem">
+        <view class="goodsItem-label">
+            <view class="goodsItem-label-name">
+                参数
+            </view>
+            <view class="goodsItem-label-see">
+                <view class="goodsItem-label-block">
+                    <view class="goodsItem-label-title">{{mallData.param.weight}}ml</view>
+                    <view class="goodsItem-label-tips">净含量</view>
+                </view>
+                <view class="goodsItem-label-block">
+                    <view class="goodsItem-label-title">{{mallData.param.product_type}}</view>
+                    <view class="goodsItem-label-tips">产品类型</view>
+                </view>
+                <!-- <view class="goodsItem-label-block">
+                    <view class="goodsItem-label-title">{{mallData.param.area}}</view>
+                    <view class="goodsItem-label-tips">产地</view>
+                </view> -->
+            </view>
+        </view>
+        <view class="goodsItem-label">
+            <view class="goodsItem-label-name">
+                快递
+            </view>
+            <view class="goodsItem-label-text">
+                免邮
+            </view>
+        </view>
+    </view>
+
+    <!-- 详情 -->
+    <view class="goodsWhite goodsBrief">
+        <rich-text nodes="{{mallContent}}"></rich-text>
+    </view>
+</view>
+
+<!-- 底部 -->
+<view class="footer">
+    <view class="number"><text>￥</text>
+        <view class="number-price">{{mallData.is_vip ? mallData.price.vip : mallData.price.price}}</view>
+        <view class="number-vip">{{mallData.is_vip ? 'VIP会员价' : '市场指导价'}}</view>
+    </view>
+    <view bindtap="buyTap" class="btn">确认购买</view>
+</view>
+
+<!-- 产品图 -->
+<view class="goodsShare {{shareSee ? 'active' : ''}}" catchtouchmove='true'>
+    <view class="goodsShare-back">
+        <image class="goodsShare-photo" src="{{mallData.cover}}" mode="widthFix"></image>
+        <view class="goodsShare-cont">
+            <view class="goodsShare-name">{{mallData.name}}</view>
+            <view class="goodsShare-see">
+                <view class="goodsShare-price">
+                    <text>￥</text>{{mallData.price.price}}
+                </view>
+                <view class="goodsShare-tips">
+                    识别二维码进行查看
+                </view>
+                <image class="goodsShare-code" src="{{inviteCode}}"></image>
+            </view>
+        </view>
+    </view>
+</view>
+
+<!-- 分享弹出 -->
+<view class="shareBack {{shareSee ? 'active' : ''}}" catchtouchmove='true'></view>
+<view class="sharePop {{shareSee ? 'active' : ''}}" catchtouchmove='true'>
+    <view class="shareCont">
+        <button class="shareCont-label codeShare-button" open-type="share" hover-class="none">
+            <image src="https://cdn.shuiganying.com/images/2023/03/28/f8b773edc2fe6db8e45f96773b9a8dc4.png"></image>
+            微信好友
+        </button>
+        <view class="shareCont-label" bindtap="onCanvas">
+            <image src="https://cdn.shuiganying.com/images/2023/03/28/cfe0efbb53eaf7911ea5211923859c65.png"></image>
+            保存二维码
+        </view>
+    </view>
+    <view class="shareCancel" bindtap="shareTap">取消</view>
+</view>
+
+<!-- 海报canvas -->
+<canvas type="2d" style="width: 375px; height: 540px;" id="coverCanvas" class="canvas-img" />
+
+<!-- 是否有上级-邀请码 -->
+<view class="namePop {{isParent ? 'active' : ''}}"></view>
+<view class="nameCont {{isParent ? 'active' : ''}}">
+    <view class="nameCont-white">
+        <view class="nameCont-top">
+            <view class="nameCont-title">您的邀请人?</view>
+            <view class="nameCont-input">
+                <input type="text" name="name" value="{{nameValue}}" placeholder="请输入邀请码或邀请人手机号" bindinput="bindinput" />
+                <image wx:if="{{nameValue.length > 1}}" class="nameCont-colse" bindtap="colseTap" src="/static/icons/reportColse_grey.png"></image>
+            </view>
+        </view>
+        <view class="nameCont-btn">
+            <view class="nameCont-btn-go" bindtap="nameCancel">暂不绑定</view>
+            <view class="nameCont-btn-go" bindtap="nameTrue">立即绑定</view>
+        </view>
+    </view>
+</view>
--- a/pages/mall/details/details.wxss
+++ b/pages/mall/details/details.wxss
@@ -0,0 +1,545 @@
+page {
+    background-color: #f7faff;
+}
+
+/* 返回 */
+.navigation {
+    position: fixed;
+    top: 0;
+    left: 0;
+    z-index: 999;
+    width: 100%;
+    height: 90rpx;
+    background-color: transparent;
+    transition: .2s;
+}
+
+.navigation.active {
+    background-color: transparent;
+}
+
+.navigation-arrow {
+    width: 44rpx;
+    height: 44rpx;
+    margin: 20rpx 15rpx 0 20rpx;
+}
+
+/* 产品图 */
+.banner {
+    overflow: hidden;
+    position: relative;
+    padding-top: 100%;
+}
+
+.swiperCont,
+.swiperImg {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+}
+
+/* 产品详情 */
+.goodsCont {
+    padding: 30rpx;
+    border-bottom: 60px solid transparent;
+    box-sizing: border-box;
+}
+
+.goodsWhite {
+    background-color: #ffffff;
+    box-sizing: border-box;
+    border-radius: 15rpx;
+    margin-bottom: 30rpx;
+}
+
+.goodsInfo {
+    padding: 30rpx;
+    box-sizing: border-box;
+    position: relative;
+}
+
+.goodsInfo-price {
+    display: flex;
+    position: relative;
+    line-height: 52rpx;
+    color: #ff9951;
+}
+
+.goodsInfo-cost {
+    font-size: 48rpx;
+}
+
+.goodsInfo-cost text {
+    font-size: 28rpx;
+}
+
+.goodsInfo-vip {
+    background-color: #fff5ed;
+    border-radius: 80rpx;
+    margin-left: 30rpx;
+    padding: 0 25rpx;
+    height: 52rpx;
+    font-size: 32rpx;
+}
+
+.goodsInfo-vip text {
+    font-size: 24rpx;
+    padding-right: 5rpx;
+}
+
+.goodsInfo-name {
+    margin-top: 20rpx;
+    font-size: 32rpx;
+}
+
+.goodsInfo-share {
+    position: absolute;
+    top: 40rpx;
+    right: 30rpx;
+    display: flex;
+    font-size: 27rpx;
+    line-height: 34rpx;
+    color: #9b9b9b;
+}
+
+.goodsInfo-share-image {
+    width: 34rpx;
+    height: 34rpx;
+    margin-right: 10rpx;
+}
+
+/* 开通vip */
+.vipOpen {
+    box-sizing: border-box;
+    position: relative;
+    padding-top: 17%;
+    overflow: hidden;
+}
+
+.vipOpen-back {
+    position: absolute;
+    width: calc(100% - 60rpx);
+    height: 100%;
+    top: 0;
+    border-radius: 20rpx 20rpx 0 0;
+    left: 30rpx;
+    z-index: 1;
+}
+
+.vipOpen-cont {
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    left: 0;
+    top: 0;
+    z-index: 9;
+    display: flex;
+    padding: 15rpx 55rpx;
+    box-sizing: border-box;
+}
+
+.vipOpen-cont-icon {
+    width: 60rpx;
+    height: 60rpx;
+}
+
+.vipOpen-cont-name {
+    padding: 0 20rpx;
+    box-sizing: border-box;
+}
+
+.vipOpen-cont-vip {
+    background-image: linear-gradient(to right, #fbf6d9, #d4af72, #c89a59);
+    -webkit-background-clip: text;
+    color: transparent;
+    font-weight: 600;
+    margin-bottom: 5rpx;
+    font-size: 34rpx;
+}
+
+.vipOpen-cont-vip text {
+    font-style: oblique;
+    padding-right: 13rpx;
+}
+
+.vipOpen-cont-tips {
+    color: #f4e1c4;
+    font-size: 26rpx;
+}
+
+.vipOpen-btn {
+    position: absolute;
+    top: 45rpx;
+    right: 50rpx;
+    display: flex;
+    z-index: 9;
+    line-height: 30rpx;
+    color: #f4e1c4;
+    font-size: 28rpx;
+}
+
+.vipOpen-btn-arrow {
+    width: 30rpx;
+    height: 30rpx;
+    margin: 2rpx 0 0 6rpx;
+}
+
+/* 参数 */
+.goodsItem {
+    padding: 30rpx 30rpx 0;
+}
+
+.goodsItem-label {
+    display: flex;
+}
+
+.goodsItem-label-name {
+    color: #999999;
+    width: 120rpx;
+    line-height: 110rpx;
+}
+
+.goodsItem-label-see {
+    display: flex;
+    width: calc(100% - 120rpx);
+    background-color: #f7faff;
+    padding: 10rpx 0;
+    border-radius: 15rpx;
+}
+
+.goodsItem-label-block {
+    flex: 3;
+    text-align: center;
+    font-size: 26rpx;
+    position: relative;
+}
+
+.goodsItem-label-block::after {
+    position: absolute;
+    content: '';
+    background-color: #d1d1d1;
+    width: 1rpx;
+    height: 60%;
+    top: 20%;
+    left: 0;
+}
+
+.goodsItem-label-block:first-child::after {
+    display: none;
+}
+
+.goodsItem-label-title {
+    color: #3b7cff;
+    line-height: 50rpx;
+}
+
+.goodsItem-label-tips {
+    color: #999999;
+}
+
+.goodsItem-label-text {
+    line-height: 110rpx;
+}
+
+/* 详情 */
+.goodsBrief {
+    padding: 30rpx;
+    box-sizing: border-box;
+}
+
+/* 底部 */
+.footer {
+    width: 100%;
+    height: 60px;
+    background-color: #ffffff;
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    z-index: 9;
+    box-sizing: border-box;
+    display: flex;
+}
+
+.number {
+    flex: 1;
+    line-height: 60px;
+    color: #ff9951;
+    display: flex;
+    padding: 0 30rpx;
+    box-sizing: border-box;
+}
+
+.number text {
+    font-size: 28rpx;
+    padding-top: 10rpx;
+}
+
+.number-price {
+    padding: 0 5rpx;
+    font-size: 52rpx;
+}
+
+.number-vip {
+    margin-left: 20rpx;
+    font-size: 26rpx;
+    color: #8d97a1;
+    padding-top: 6rpx;
+    box-sizing: border-box;
+}
+
+
+.btn {
+    height: 100%;
+    background-color: #ff9951;
+    text-align: center;
+    color: #FFFFFF;
+    padding: 0 70rpx;
+    line-height: 60px;
+}
+
+.detailsBrief-back {
+    width: 100%;
+}
+
+/* 产品分享弹窗 */
+.goodsShare {
+    width: 100%;
+    z-index: 9999;
+    position: fixed;
+    bottom: 340rpx;
+    left: 0;
+    padding: 40rpx;
+    box-sizing: border-box;
+    display: none;
+}
+
+.goodsShare.active {
+    display: block;
+}
+
+.goodsShare-back {
+    width: 80%;
+    margin: 0 auto;
+    background-color: #ffffff;
+    border-radius: 15rpx;
+    overflow: hidden;
+}
+
+.goodsShare-photo {
+    width: 100%;
+}
+
+.goodsShare-cont {
+    padding: 30rpx;
+    box-sizing: border-box;
+}
+
+.goodsShare-name {
+    font-size: 36rpx;
+}
+
+.goodsShare-price {
+    font-size: 52rpx;
+    color: #3b7cff;
+}
+
+.goodsShare-price text {
+    font-size: 30rpx;
+}
+
+.goodsShare-see {
+    position: relative;
+    padding: 40rpx 0 20rpx;
+}
+
+.goodsShare-tips {
+    font-size: 28rpx;
+    color: #b3b3b3;
+    margin-top: 10rpx;
+}
+
+.goodsShare-code {
+    width: 130rpx;
+    height: 130rpx;
+    position: absolute;
+    right: 0;
+    top: 30rpx;
+}
+
+/* 分享弹出 */
+
+.shareBack {
+    position: fixed;
+    width: 100vw;
+    height: 100vh;
+    z-index: 9900;
+    left: 0;
+    bottom: 0;
+    background-color: rgba(0, 0, 0, .6);
+    display: none;
+}
+
+.shareBack.active {
+    display: block;
+}
+
+.sharePop {
+    position: fixed;
+    width: 100%;
+    z-index: 9999;
+    left: 0;
+    bottom: 0;
+    background-color: #ffffff;
+    display: none;
+    height: 280rpx;
+}
+
+.sharePop.active {
+    display: block;
+}
+
+.shareCont-label image {
+    width: 60rpx;
+    height: 60rpx;
+    display: block;
+    margin: 0 auto 10rpx;
+}
+
+.shareCancel {
+    border-top: 2rpx solid #dddddd;
+    width: 100%;
+    text-align: center;
+    line-height: 100rpx;
+}
+
+.shareCont {
+    display: flex;
+    padding: 30rpx 0;
+}
+
+.shareCont-label {
+    flex: 2;
+    text-align: center;
+    font-size: 28rpx;
+}
+
+.codeShare-button {
+    background-color: transparent;
+    padding: 0;
+    font-weight: normal;
+}
+
+/* canvas */
+.canvas-img {
+    position: fixed;
+    left: -100000%;
+    top: 0;
+    z-index: 99;
+}
+
+
+/* 邀请码弹出 */
+.namePop {
+    position: fixed;
+    background-color: rgba(0, 0, 0, .5);
+    left: 0;
+    top: 0;
+    height: 100vh;
+    width: 100vw;
+    z-index: 100000;
+    display: none;
+}
+
+.namePop.active {
+    display: block;
+}
+
+.nameCont {
+    -webkit-box-orient: vertical;
+    -webkit-box-pack: center;
+    position: fixed;
+    left: 0;
+    right: 0;
+    top: 0;
+    bottom: 0;
+    z-index: 100000;
+    padding: 0 15%;
+    box-sizing: border-box;
+    display: none;
+}
+
+.nameCont.active {
+    display: -webkit-box;
+}
+
+.nameCont-white {
+    background-color: #ffffff;
+    border-radius: 15rpx;
+    overflow: hidden;
+}
+
+.nameCont-top {
+    padding: 30rpx;
+    box-sizing: border-box;
+}
+
+.nameCont-title {
+    font-size: 34rpx;
+    margin-bottom: 30rpx;
+}
+
+.nameCont-input {
+    height: 90rpx;
+    line-height: 90rpx;
+    position: relative;
+    background-color: #f3f3f3;
+    border-radius: 10rpx;
+    overflow: hidden;
+    padding: 0 25rpx;
+    box-sizing: border-box;
+}
+
+.nameCont-input input {
+    width: calc(100% - 40rpx);
+    height: 100%;
+    background-color: transparent;
+}
+
+.nameCont-colse {
+    width: 40rpx;
+    height: 40rpx;
+    top: 25rpx;
+    right: 20rpx;
+    position: absolute;
+    z-index: 9;
+}
+
+.nameCont-btn {
+    line-height: 100rpx;
+    background-color: #f3f3f3;
+    display: flex;
+    margin-top: 30rpx;
+    border-top: 2rpx solid #dfdfdf;
+}
+
+.nameCont-btn-go {
+    text-align: center;
+    flex: 2;
+}
+
+.nameCont-btn-go:last-child {
+    position: relative;
+    color: #ff9951;
+}
+
+.nameCont-btn-go:last-child::after {
+    position: absolute;
+    content: '';
+    left: 0;
+    top: 0;
+    width: 2rpx;
+    height: 100%;
+    background-color: #dfdfdf;
+}
--- a/pages/mall/index.js
+++ b/pages/mall/index.js
@@ -0,0 +1,32 @@
+ /*
+ * 手太欠
+ * 愿这世界都如故事里一样 美好而动人~
+ */
+
+Page({
+    data: {
+        goodsArr: []  //商品列表
+    },
+
+    onLoad(options) {
+        if(options.invite != undefined) {
+            getApp().globalData.inviteText = options.invite
+        }
+    },
+
+    onShow() {
+        // 获取产品首页
+        this.mallInfo();
+    },
+
+    /**
+     * 产品首页
+     */
+    mallInfo (){
+        wx.$api.mall.mallIndex().then(res => {
+            this.setData({
+                goodsArr: res.data.goods
+            })
+        }).catch(err => { })
+    },
+})
--- a/pages/mall/index.json
+++ b/pages/mall/index.json
@@ -0,0 +1,4 @@
+{
+    "usingComponents": {},
+    "navigationBarTitleText": "产品"
+}
--- a/pages/mall/index.wxml
+++ b/pages/mall/index.wxml
@@ -0,0 +1,67 @@
+<!-- 产品轮播 -->
+<view class="mallBanner">
+    <view class="mallBanner-cont">
+        <swiper class="mallBanner-see" autoplay="true" circular duration="500" indicator-dots>
+            <swiper-item>
+                <navigator url="/pages/user/about/about">
+                    <image src="https://cdn.shuiganying.com/images/2023/05/17/c79743b1de182fbc2dd39188a7c6938c.png" mode="aspectFill" class="mallBanner-img"></image>
+                </navigator>
+            </swiper-item>
+            <swiper-item>
+                <navigator url="/pages/user/about/about">
+                    <image src="https://cdn.shuiganying.com/images/2023/05/23/1d021dfa811e809b92fe0c49f792560e.png" mode="aspectFill" class="mallBanner-img"></image>
+                </navigator>
+            </swiper-item>
+        </swiper>
+    </view>
+</view>
+
+<!-- 使用场景 -->
+<view class="scene">
+    <view class="sceneCont">
+        <view class="sceneCont-title">使用场景</view>
+        <image src="https://cdn.shuiganying.com/images/2023/05/17/7b5db9360b5de015c526471dda937495.png" mode="widthFix" class="sceneCont-img"></image>
+        <view class="sceneCont-title">使用方法</view>
+        <view class="sceneCont-item">
+            <view class="sceneCont-label">
+                <image src="https://cdn.shuiganying.com/images/2023/05/17/cf1bafbc092493f8c2b6d2e2a8ab2607.png" mode="aspectFill" class="sceneCont-label-img"></image>
+                <view class="sceneCont-label-text">1.手握瓶身，距离肌肤15公分距离，Z字型喷在脸上；</view>
+            </view>
+            <view class="sceneCont-label">
+                <image src="https://cdn.shuiganying.com/images/2023/05/17/8c3c9abc0e3bc265195c52372ec82723.png" mode="aspectFill" class="sceneCont-label-img"></image>
+                <view class="sceneCont-label-text">2.等待自然风干或用面纸轻轻按压，吸走多余水分；</view>
+            </view>
+        </view>
+    </view>
+</view>
+
+<!-- 必Buy推荐 -->
+<view class="goods">
+    <view class="goodsTilte">必Buy推荐</view>
+    <view class="goodsCont">
+        <navigator hover-class="none" class="goodsCont-item" url="./details/details?id={{item.goods_id}}" wx:for="{{goodsArr}}" wx:key="goodsArr">
+            <image src="https://cdn.shuiganying.com/images/2023/05/17/40e80f12b27a8dc25cfb730ffaf7063b.png" mode="aspectFill" class="goodsCont-item-back"></image>
+            <view class="goodsCont-item-cont">
+                <image src="{{item.cover}}" mode="widthFix" class="goodsCont-item-photo"></image>
+                <view class="goodsCont-item-price">
+                    <image src="https://cdn.shuiganying.com/images/2023/05/17/054f6658624c4b1ed78bb834a8d3c4d6.png" mode="widthFix" class="goodsCont-item-price-back"></image>
+                    <view class="goodsCont-item-price-cont">
+                        <view class="goodsCont-item-price-left goodsCont-item-price-black">
+                            <view class="goodsCont-item-price-text">市场指导价</view>
+                            <view class="goodsCont-item-price-number">¥<text>{{item.price.price}}</text>/{{item.number}}瓶</view>
+                        </view>
+                        <view class="goodsCont-item-price-right goodsCont-item-price-white">
+                            <view class="goodsCont-item-price-text">VIP会员价</view>
+                            <view class="goodsCont-item-price-number">¥<text>{{item.price.vip}}</text>/{{item.number}}瓶</view>
+                        </view>
+                    </view>
+                </view>
+            </view>
+        </navigator>
+    </view>
+</view>
+
+<!-- 单图 -->
+<navigator hover-class="none" url="/pages/health/index" class="nurse">
+    <image class="nurse-img" mode="widthFix" src="https://cdn.shuiganying.com/images/2023/05/19/4c90b7e43fd9e25601f2dca442de34ba.jpg"></image>
+</navigator>
--- a/pages/mall/index.wxss
+++ b/pages/mall/index.wxss
@@ -0,0 +1,194 @@
+page {
+    background-color: #f7faff;
+}
+
+/* 产品轮播 */
+.mallBanner {
+    padding: 30rpx;
+    box-sizing: border-box;
+    width: 100%;
+}
+
+.mallBanner-cont {
+    position: relative;
+    border-radius: 20rpx;
+    padding-top: 45%;
+    overflow: hidden;
+    box-shadow: 0 0 20rpx rgba(0, 0, 0, .2);
+}
+
+.mallBanner-see,
+.mallBanner-img {
+    border-radius: 20rpx;
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+}
+
+/* 修改dot形状 */
+.wx-swiper-dots.wx-swiper-dots-horizontal {
+    bottom: 25rpx;
+}
+.wx-swiper-dots .wx-swiper-dot {
+    width: 32rpx;    /*宽*/
+    height: 12rpx;   /*高*/
+    border-radius: 10rpx;  /*圆角*/
+    background-color: transparent;
+    border: 4rpx solid #ffffff;
+    box-sizing: border-box;
+}
+
+.wx-swiper-dot-active {
+    background-color:#ffffff !important;
+}
+
+/* 使用场景 */
+.scene {
+    padding: 30rpx;
+    box-sizing: border-box;
+}
+
+.sceneCont {
+    background-color: #ffffff;
+    padding: 30rpx;
+    box-sizing: border-box;
+    border-radius: 20rpx;
+}
+
+.sceneCont-title {
+    text-align: center;
+    font-weight: 600;
+    font-size: 34rpx;
+}
+
+.sceneCont-img {
+    width: 100%;
+    margin: 30rpx 0;
+}
+
+.sceneCont-item {
+    display: flex;
+}
+
+.sceneCont-label {
+    flex: 2;
+    text-align: center;
+}
+
+.sceneCont-label-img {
+    width: 150rpx;
+    height: 150rpx;
+    box-shadow: 0 0 20rpx rgba(0, 0, 0, .2);
+    border-radius: 50%;
+    margin-bottom: 15rpx;
+}
+
+.sceneCont-label-text {
+    font-size: 24rpx;
+    font-weight: 300;
+    padding: 0 15rpx;
+    text-align: center;
+}
+
+/* 列表 */
+.goods {
+    padding: 30rpx;
+    box-sizing: border-box;
+}
+
+.goodsTilte {
+    font-weight: 600;
+    font-size: 36rpx;
+}
+
+.goodsCont-item {
+    position: relative;
+    border-radius: 20rpx;
+    overflow: hidden;
+    width: 100%;
+    padding-top: 100%;
+    margin-top: 30rpx;
+}
+
+.goodsCont-item-back,
+.goodsCont-item-cont {
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+}
+
+.goodsCont-item-cont {
+    padding: 30rpx 15rpx;
+    box-sizing: border-box;
+}
+
+.goodsCont-item-photo {
+    width: 100%;
+    display: block;
+}
+
+.goodsCont-item-price {
+    position: relative;
+    padding-top: 15%;
+}
+.goodsCont-item-price-back,
+.goodsCont-item-price-cont {
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+}
+
+.goodsCont-item-price-back {
+    display: block;
+}
+
+.goodsCont-item-price-cont {
+    padding: 14rpx 40rpx;
+    box-sizing: border-box;
+    display: flex;
+}
+
+.goodsCont-item-price-text {
+    font-size: 22rpx;
+}
+
+.goodsCont-item-price-left {
+    flex: 1;
+}
+
+.goodsCont-item-price-white {
+    color: #ffffff;
+}
+
+.goodsCont-item-price-number {
+    font-size: 24rpx;
+}
+
+.goodsCont-item-price-number text {
+    font-weight: 600;
+    font-size: 40rpx;
+    padding-left: 6rpx;
+}
+
+.goodsCont-item-price-right {
+    width: 26%;
+    text-align: center;
+}
+
+/* 皮肤护理 */
+.nurse {
+    width: 100%;
+    padding: 30rpx;
+    box-sizing: border-box;
+}
+
+.nurse-img {
+    border-radius: 20rpx;
+    width: 100%;
+}
--- a/pages/mall/list/list.js
+++ b/pages/mall/list/list.js
@@ -0,0 +1,62 @@
+ /*
+ * 手太欠
+ * 愿这世界都如故事里一样 美好而动人~
+ */
+
+Page({
+    data: {
+        goodsArr    : [],     // 商品列表
+        page        : {},     // 分页信息
+        lodingStats : false,  // 加载状态
+    },
+
+    onLoad(options) {
+        
+    },
+
+    onShow() {
+        // 获取产品列表
+        this.mallInfo();
+    },
+
+    /**
+     * 获取产品列表
+     */
+    mallInfo (page){
+        wx.$api.mall.mallList({page : page || 1}).then(res => {
+            let listArr = this.data.goodsArr,
+                newData = []
+            if(page == 1 || page == undefined) listArr = []
+            newData = listArr.concat(res.data.data)
+            this.setData({
+                goodsArr    : newData,
+                page        : res.data.page,
+                lodingStats : false
+            })
+            wx.stopPullDownRefresh()
+        }).catch(err => { })
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+        // 获取产品列表
+		this.mallInfo();
+    },
+
+    /**
+     * 上拉加载
+     */
+    onReachBottom(){
+        this.setData({
+            lodingStats: true
+        })
+        let pageNumber = this.data.page.current
+        if(this.data.page.has_more){
+            pageNumber++
+            // 获取产品列表
+		    this.mallInfo(pageNumber);
+        }
+    }
+})
--- a/pages/mall/list/list.json
+++ b/pages/mall/list/list.json
@@ -0,0 +1,4 @@
+{
+    "usingComponents": {},
+    "navigationBarTitleText": "产品列表"
+}
--- a/pages/mall/list/list.wxml
+++ b/pages/mall/list/list.wxml
@@ -0,0 +1,31 @@
+<!-- 产品列表 -->
+<view class="product">
+    <view class="product-list" wx:if="{{goodsArr.length > 0}}">
+        <navigator hover-class="none" url="../details/details?id={{item.goods_id}}" class="product-item" wx:for="{{goodsArr}}" wx:key="goodsArr">
+            <image class="product-item-img" mode="aspectFill" src="{{item.cover}}"></image>
+            <view class="product-item-cont">
+                <view class="nowrap product-item-title">{{item.name}}</view>
+                <view class="product-item-specs">{{item.description}}</view>
+                <view class="product-item-see">
+                    <view class="product-item-price"><text>￥</text>{{item.price.vip}}<view class="product-item-vip">VIP</view></view>
+                    <view class="product-item-number"><text>原价￥</text>{{item.price.price}}</view>
+                </view>
+                <view class="product-item-btn">
+                    立即购买<image src="https://cdn.shuiganying.com/images/2023/03/29/bf6111cde69274156b23f87dd4a812f3.png" mode="widthFix" class="product-item-arrow"></image>
+                </view>
+            </view>
+        </navigator>
+        <view class="pagesLoding" wx:if="{{lodingStats}}">
+            <block wx:if="{{page.has_more}}">
+                <image class="pagesLoding-icon" src="/static/icons/refresh_loding.gif" mode="widthFix"></image>加载中...
+            </block>
+            <block wx:else>
+                没有更多了~
+            </block>
+        </view>
+    </view>
+    <view class="pack-center pages-hint" wx:else>
+        <image src="/static/imgs/text_null.png"></image>
+        <view>暂无数据</view>
+    </view>
+</view>
--- a/pages/mall/list/list.wxss
+++ b/pages/mall/list/list.wxss
@@ -0,0 +1,121 @@
+page {
+    background-color: #f7faff;
+}
+
+/* 产品列表 */
+.product {
+    width: 100%;
+    padding: 30rpx 30rpx 0;
+    box-sizing: border-box;
+}
+
+.product-title {
+    font-size: 36rpx;
+}
+
+.product-item {
+    position: relative;
+    height: 340rpx;
+}
+
+.product-item-img {
+    position: absolute;
+    top: 0;
+    width: 300rpx;
+    height: 300rpx;
+    border-radius: 15rpx;
+}
+
+.product-item-cont {
+    height: 300rpx;
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    box-sizing: border-box;
+}
+
+.product-item-title {
+    line-height: 74rpx;
+    font-size: 32rpx;
+}
+
+.product-item-specs,
+.product-item-number {
+    font-size: 24rpx;
+    color: #999999;
+}
+
+.product-item-number {
+    float: right;
+}
+
+.product-item-see {
+    margin: 30rpx 0 20rpx;
+    line-height: 48rpx;
+    overflow: hidden;
+}
+
+.product-item-price {
+    font-size: 38rpx;
+    position: relative;
+    float: left;
+}
+
+.product-item-vip {
+    position: absolute;
+    font-size: 20rpx;
+    top: 0;
+    right: -60rpx;
+    background-color: #ff9951;
+    color: #ffffff;
+    display: inline-block;
+    border-radius: 8rpx;
+    padding: 0 10rpx;
+    line-height: 32rpx;
+    transform: scale(.8);
+}
+
+.product-item-vip:before {
+    content: "";
+    display: block;
+    position: absolute;
+    top: 50%;
+    left: -18rpx;
+    width: 0;
+    height: 0;
+    border: 10rpx solid;
+    margin-top: -10rpx;
+    border-color: transparent #ff9951 transparent transparent;
+}
+
+.product-item-price text {
+    font-size: 24rpx;
+}
+
+.product-item-btn {
+    font-size: 26rpx;
+    background-color: #ffffff;
+    border-radius: 80rpx;
+    height: 76rpx;
+    line-height: 76rpx;
+    border: 2rpx solid #000000;
+    text-align: center;
+    display: inline-block;
+    width: 96%;
+    margin-left: 2%;
+}
+
+.product-item-arrow {
+    width: 18rpx;
+    height: 18rpx;
+    margin-left: 6rpx;
+}
+
+.product-item .product-item-img {
+    left: 0;
+}
+
+.product-item .product-item-cont {
+    padding-left: 340rpx;
+}
--- a/pages/mall/webView/webView.js
+++ b/pages/mall/webView/webView.js
@@ -0,0 +1,68 @@
+// pages/mall/webView/webView.js
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        h5url: ''
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+        this.setData({
+            h5url: decodeURIComponent(options.url)
+        })
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {
+
+    }
+})
--- a/pages/mall/webView/webView.json
+++ b/pages/mall/webView/webView.json
@@ -0,0 +1,3 @@
+{
+    "usingComponents": {}
+}
--- a/pages/mall/webView/webView.wxml
+++ b/pages/mall/webView/webView.wxml
@@ -0,0 +1 @@
+<web-view src="{{h5url}}"></web-view>
--- a/pages/mall/webView/webView.wxss
+++ b/pages/mall/webView/webView.wxss
@@ -0,0 +1 @@
+/* pages/mall/webView/webView.wxss */
--- a/pages/mall/商品老版本/index.js
+++ b/pages/mall/商品老版本/index.js
@@ -0,0 +1,32 @@
+ /*
+ * 手太欠
+ * 愿这世界都如故事里一样 美好而动人~
+ */
+
+Page({
+    data: {
+        goodsArr: []  //商品列表
+    },
+
+    onLoad(options) {
+        if(options.invite != undefined) {
+            getApp().globalData.inviteText = options.invite
+        }
+    },
+
+    onShow() {
+        // 获取产品首页
+        this.mallInfo();
+    },
+
+    /**
+     * 产品首页
+     */
+    mallInfo (){
+        wx.$api.mall.mallIndex().then(res => {
+            this.setData({
+                goodsArr: res.data.goods
+            })
+        }).catch(err => { })
+    },
+})
--- a/pages/mall/商品老版本/index.json
+++ b/pages/mall/商品老版本/index.json
@@ -0,0 +1,4 @@
+{
+    "usingComponents": {},
+    "navigationBarTitleText": "产品"
+}
--- a/pages/mall/商品老版本/index.wxml
+++ b/pages/mall/商品老版本/index.wxml
@@ -0,0 +1,39 @@
+<!-- 产品轮播 -->
+<view class="mallBanner">
+    <view class="mallBanner-cont">
+        <navigator hover-class="none" url="./list/list" class="mallBannermallBanner-see">
+            <image src="https://cdn.shuiganying.com/images/2023/03/29/cc6547fe6ad1a8bc37d273053c89a546.png" mode="aspectFill" class="mallBanner-img"></image>
+        </navigator>
+        <!-- <swiper class="mallBanner-see" autoplay="true">
+            <swiper-item>
+                <image src="https://cdn.shuiganying.com/images/2023/03/29/cc6547fe6ad1a8bc37d273053c89a546.png" mode="aspectFill" class="mallBanner-img"></image>
+            </swiper-item>
+        </swiper> -->
+    </view>
+</view>
+
+<!-- 产品列表 -->
+<view class="product">
+    <view class="product-title">必Buy推荐</view>
+    <view class="product-list">
+        <navigator hover-class="none" url="./details/details?id={{item.goods_id}}" class="product-item" wx:for="{{goodsArr}}" wx:key="goodsArr">
+            <image class="product-item-img" mode="aspectFill" src="{{item.cover}}"></image>
+            <view class="product-item-cont">
+                <view class="nowrap product-item-title">{{item.name}}</view>
+                <view class="product-item-specs">{{item.description}}</view>
+                <view class="product-item-see">
+                    <view class="product-item-price"><text>￥</text>{{item.price.vip}}<view class="product-item-vip">VIP</view></view>
+                    <view class="product-item-number"><text>原价￥</text>{{item.price.price}}</view>
+                </view>
+                <view class="product-item-btn">
+                    立即购买<image src="https://cdn.shuiganying.com/images/2023/03/29/bf6111cde69274156b23f87dd4a812f3.png" mode="widthFix" class="product-item-arrow"></image>
+                </view>
+            </view>
+        </navigator>
+    </view>
+</view>
+
+<!-- 单图 -->
+<navigator hover-class="none" url="/pages/health/index" class="nurse">
+    <image class="nurse-img" mode="widthFix" src="https://cdn.shuiganying.com/images/2023/03/29/5b5f6c1de07496fcda7bb09fac177fcb.png"></image>
+</navigator>
--- a/pages/mall/商品老版本/index.wxss
+++ b/pages/mall/商品老版本/index.wxss
@@ -0,0 +1,169 @@
+page {
+    background-color: #f7faff;
+}
+
+/* 产品轮播 */
+.mallBanner {
+    padding: 30rpx;
+    box-sizing: border-box;
+    width: 100%;
+}
+
+.mallBanner-cont {
+    position: relative;
+    border-radius: 20rpx;
+    padding-top: 45%;
+    overflow: hidden;
+}
+
+.mallBanner-see,
+.mallBanner-img {
+    border-radius: 20rpx;
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+}
+
+/* 产品列表 */
+.product {
+    width: 100%;
+    padding: 10rpx 30rpx 0;
+    box-sizing: border-box;
+}
+
+.product-title {
+    font-size: 36rpx;
+}
+
+.product-list {
+    margin: 30rpx 0;
+}
+
+.product-item {
+    position: relative;
+    height: 340rpx;
+}
+
+.product-item-img {
+    position: absolute;
+    top: 0;
+    width: 300rpx;
+    height: 300rpx;
+    border-radius: 15rpx;
+}
+
+.product-item-cont {
+    height: 300rpx;
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    box-sizing: border-box;
+}
+
+.product-item-title {
+    line-height: 74rpx;
+    font-size: 32rpx;
+}
+
+.product-item-specs,
+.product-item-number {
+    font-size: 24rpx;
+    color: #999999;
+}
+
+.product-item-number {
+    float: right;
+}
+
+.product-item-see {
+    margin: 30rpx 0 20rpx;
+    line-height: 48rpx;
+    overflow: hidden;
+}
+
+.product-item-price {
+    font-size: 38rpx;
+    position: relative;
+    float: left;
+}
+
+.product-item-vip {
+    position: absolute;
+    font-size: 20rpx;
+    top: 0;
+    right: -60rpx;
+    background-color: #ff9951;
+    color: #ffffff;
+    display: inline-block;
+    border-radius: 8rpx;
+    padding: 0 10rpx;
+    line-height: 32rpx;
+    transform: scale(.8);
+}
+
+.product-item-vip:before {
+    content: "";
+    display: block;
+    position: absolute;
+    top: 50%;
+    left: -18rpx;
+    width: 0;
+    height: 0;
+    border: 10rpx solid;
+    margin-top: -10rpx;
+    border-color: transparent #ff9951 transparent transparent;
+}
+
+.product-item-price text {
+    font-size: 24rpx;
+}
+
+.product-item-btn {
+    font-size: 26rpx;
+    background-color: #ffffff;
+    border-radius: 80rpx;
+    height: 76rpx;
+    line-height: 76rpx;
+    border: 2rpx solid #000000;
+    text-align: center;
+    display: inline-block;
+    width: 96%;
+    margin-left: 2%;
+}
+
+.product-item-arrow {
+    width: 18rpx;
+    height: 18rpx;
+    margin-left: 6rpx;
+}
+
+.product-item:nth-child(odd) .product-item-img {
+    left: 0;
+}
+
+.product-item:nth-child(odd) .product-item-cont {
+    padding-left: 340rpx;
+}
+
+.product-item:nth-child(even) .product-item-img {
+    right: 0;
+}
+
+.product-item:nth-child(even) .product-item-cont {
+    padding-right: 340rpx;
+}
+
+/* 皮肤护理 */
+.nurse {
+    width: 100%;
+    padding: 0 30rpx 30rpx;
+    box-sizing: border-box;
+}
+
+.nurse-img {
+    border-radius: 20rpx;
+    width: 100%;
+}
--- a/pages/order/details/details.js
+++ b/pages/order/details/details.js
@@ -0,0 +1,133 @@
+ /*
+ * 手太欠
+ * 愿这世界都如故事里一样 美好而动人~
+ */
+
+Page({
+    data: {
+        goodsData   : '', //详情
+        canState    : '', //操作按钮
+        express     : '', //物流
+        orderNo     : ''  //订单号
+    },
+
+    onLoad(options) {
+        this.setData({
+            orderNo: options.order_no
+        })
+    },
+
+    onShow() {
+        // 获取订单详情
+        this.goodsInfo();
+    },
+
+    /**
+     * 订单详情
+    */
+    goodsInfo() {
+        wx.$api.order.goodsDet(this.data.orderNo).then(res => {
+            this.setData({
+                goodsData   : res.data,
+                canState    : res.data.can,
+                express     : res.data.express
+            })
+        }).catch(err => {})
+    },
+
+    /**
+     * 复制订单号
+    */
+    copyUrl(val) {
+        wx.setClipboardData({
+            data: val.currentTarget.dataset.no,
+            success: () => {
+                wx.showToast({
+                    title: "订单编号复制成功",
+                    icon : "none"
+                })
+            }
+        })
+    },
+
+    /**
+     * 支付订单
+    */
+    payClick() {
+        wx.navigateTo({
+            url: '/pages/pay/index?order_no=' + this.data.goodsData.order_no + '&total=' + this.data.goodsData.total
+        })
+    },
+
+    /**
+     * 订单签收
+    */
+    signClick(e) {
+        wx.showModal({
+            title   : '提示',
+            content : '是否签收',
+            success : res=> {
+                if (res.confirm) {
+                    wx.$api.order.goodsSign(this.data.goodsData.order_no).then(res => {
+                        wx.showToast({
+                        title:'签收成功',
+                        icon:'none'
+                        })
+                        
+                        // 获取订单详情
+                        this.goodsInfo();
+                    }).catch(err => {})
+                }
+            }
+        })
+    },
+
+    /**
+     * 取消订单
+    */
+    cancelClick(e) {
+        wx.showModal({
+            title   : '提示',
+            content : '是否取消订单',
+            success : res=> {
+                if (res.confirm) {
+                    wx.$api.order.goodsCancel(this.data.goodsData.order_no).then(res => {
+                        wx.showToast({
+                            title:'取消成功',
+                            icon:'none'
+                        })
+                        
+                        // 回到列表
+                        wx.navigateBack(1)
+                    }).catch(err => {})
+                }
+            }
+        })
+    },
+
+    /**
+     * 复制物流单号
+    */
+   copyExpress(val) {
+        wx.setClipboardData({
+            data: val.currentTarget.dataset.no,
+            success: () => {
+                wx.showToast({
+                    title: "物流单号复制成功",
+                    icon : "none"
+                })
+            }
+        })
+    },
+
+    // 查看物流
+    h5url() {
+        // wx.navigateTo({
+        //     url: '/pages/mall/webView/webView?url=' + this.data.goodsData.express.url,
+        // })
+        var data = JSON.stringify(this.data.goodsData.express)
+        wx.navigateTo({
+            url:  `../logistic/logistic?newData=` + encodeURIComponent(data)
+        })
+    }
+})
--- a/pages/order/details/details.json
+++ b/pages/order/details/details.json
@@ -0,0 +1,4 @@
+{
+    "usingComponents": {},
+    "navigationBarTitleText": "订单详情"
+}
--- a/pages/order/details/details.wxml
+++ b/pages/order/details/details.wxml
@@ -0,0 +1,94 @@
+<view class="orderData">
+    <view class="While">
+        <view class="orderData-cont-label">
+            <image class="orderData-cont-img" src="https://cdn.shuiganying.com/images/2023/04/04/3b3938e3a883e6b173b4d49a5242666a.png" mode="aspectFill"></image>
+            <view class="orderData-cont-text">
+                <view class="orderData-cont-name">订单编号</view>
+                <view class="orderData-cont-copy">
+                    <text class="nowrap">{{goodsData.order_no}}</text>
+                    <view bindtap="copyUrl" data-no="{{goodsData.order_no}}">复制</view>
+                </view>
+            </view>
+        </view>
+        <view class="orderData-cont-label">
+            <image class="orderData-cont-img" src="/static/icons/siteIcon.png" mode="aspectFill"></image>
+            <view class="orderData-cont-text orderData-cont-site">
+                <view class="orderData-cont-name">{{ goodsData.express.name }} <text>{{ goodsData.express.mobile }}</text></view>
+                <view class="orderData-cont-copy">
+                    {{ goodsData.express.full_address }}
+                </view>
+            </view>
+        </view>
+    </view>
+
+    <view class="While list-goods">
+        <block wx:for="{{goodsData.items}}" wx:key="items">
+            <image class="list-goods-img" mode="aspectFill" src="{{item.sku.cover}}"></image>
+            <view class="list-goods-cont">
+                <view class="nowrap list-goods-name">{{item.sku.goods_name}}</view>
+                <view class="list-goods-text">
+                    <text>规格 99ml</text>x{{item.qty}}
+                </view>
+                <view class="list-goods-parice">
+                   ￥<text>{{item.price}}</text>
+                </view>
+            </view>
+        </block>
+    </view>
+
+    <view class="While reserveCont">
+        <view class="reserveCont-title">订单信息</view>
+        <view class="reserve-label">
+            <view class="reserve-name">交易时间</view>
+            <view class="reserve-text">{{goodsData.created_at}}</view>
+        </view>
+        <view class="reserve-label">
+            <view class="reserve-name">运费</view>
+            <view class="reserve-text">{{goodsData.freight == 0 ? '免邮' : goodsData.freight + '元'}}</view>
+        </view>
+        <view class="reserve-label">
+            <view class="reserve-name">交易状态</view>
+            <view class="reserve-text reserve-status">{{goodsData.state}}</view>
+        </view>
+        <view class="reserve-label" wx:if="{{goodsData.coupon_qty != 0}}">
+            <view class="reserve-name">兑换券使用</view>
+            <view class="reserve-text">{{goodsData.coupon_qty}}张</view>
+        </view>
+        <view class="reserve-label" wx:if="{{goodsData.coupon_price != 0}}">
+            <view class="reserve-name">兑换券抵值</view>
+            <view class="reserve-text">￥{{goodsData.coupon_price}}</view>
+        </view>
+        <view class="reserve-label">
+            <view class="reserve-name">实付款</view>
+            <view class="reserve-text reserve-price">￥{{goodsData.total}}</view>
+        </view>
+    </view>
+
+    <view class="While reserveCont" wx:if="{{goodsData.express.express_no}}">
+        <view class="reserveCont-title">物流信息</view>
+        <view class="reserve-label">
+            <view class="reserve-name">物流名称</view>
+            <view class="reserve-text">{{goodsData.express.express_name}}</view>
+        </view>
+        <view class="reserve-label">
+            <view class="reserve-name">物流单号</view>
+            <view class="reserve-text reserve-text-copy">
+                {{goodsData.express.express_no}}<view bindtap="copyExpress" class="reserve-text-tap" data-no="{{goodsData.express.express_no}}">复制</view>
+            </view>
+        </view>
+        <view class="reserve-label">
+            <view class="reserve-name">查看物流信息</view>
+            <view class="reserve-text reserve-text-btn" bindtap="h5url">
+                去查看
+            </view>
+        </view>
+    </view>
+</view>
+<view class="order-data-footer">
+    <view class="list-btn">
+        <view class="order-btn" bindtap="cancelClick" wx:if="{{canState.cancel}}">取消订单</view>
+        <view class="order-btn" bindtap="payClick" wx:if="{{canState.pay}}">立即付款</view>
+        <view class="order-btn" bindtap="signClick" wx:if="{{canState.sign}}">签收订单</view>
+        <navigator hover-class="none" class="order-btn grey" open-type="navigateBack">返回订单</navigator>
+    </view>
+</view>
--- a/pages/order/details/details.wxss
+++ b/pages/order/details/details.wxss
@@ -0,0 +1,234 @@
+page {
+    background: #f3f4f6;
+    padding: 30rpx;
+    box-sizing: border-box;
+}
+
+.While {
+    border-radius: 10rpx;
+    margin-bottom: 30rpx;
+    background-color: #FFFFFF;
+    box-shadow: 0 0 10rpx rgba(0, 0, 0, .05);
+}
+
+.orderData {
+    border-bottom: 100rpx transparent solid;
+}
+
+/* 订单 */
+.orderData-cont-label {
+    padding: 40rpx 30rpx;
+    display: flex;
+    box-sizing: border-box;
+    border-bottom: #f2f2f2 2rpx solid;
+}
+
+.orderData-cont-img {
+    width: 38rpx;
+    height: 38rpx;
+    margin-top: 4rpx;
+}
+
+.orderData-cont-text {
+    width: calc(100% - 68rpx);
+    margin-left: 20rpx;
+    box-sizing: border-box;
+    font-size: 30rpx;
+}
+
+.orderData-cont-site {
+    width: calc(100% - 108rpx);
+}
+
+.orderData-cont-name {
+    margin-bottom: 10rpx;
+}
+
+.orderData-cont-name text {
+    color: #999;
+    padding-left: 20rpx;
+}
+
+.orderData-cont-copy {
+    display: flex;
+    font-size: 28rpx;
+    color: #999;
+}
+
+.orderData-cont-copy text {
+    flex: 1;
+    display: inline-block;
+    margin-right: 20rpx;
+}
+
+.orderData-cont-copy view {
+    color: #3b7cff;
+}
+
+.address-btn {
+    width: 42rpx;
+    height: 42rpx;
+    margin-top: 46rpx;
+}
+
+/* 产品 */
+.list-goods {
+    display: flex;
+    padding: 30rpx;
+    box-sizing: border-box;
+}
+
+.list-goods-img {
+    width: 184rpx;
+    height: 184rpx;
+    margin-right: 30rpx;
+    border-radius: 10rpx;
+}
+
+.list-goods-cont {
+    width: calc(100% - 214rpx);
+}
+
+.list-goods-name {
+    font-size: 32rpx;
+}
+
+.list-goods-text {
+    line-height: 90rpx;
+    display: flex;
+    font-size: 28rpx;
+    color: #999999;
+}
+
+.list-goods-text text {
+    flex: 1;
+}
+
+.list-goods-parice {
+    text-align: right;
+    font-size: 28rpx;
+}
+
+.list-goods-parice text {
+    font-size: 34rpx;
+}
+
+/* 规格 */
+.reserveCont-title {
+    padding: 30rpx;
+    font-size: 30rpx;
+}
+
+.reserve-label {
+    display: flex;
+    padding: 0 30rpx 30rpx;
+    box-sizing: border-box;
+    font-size: 28rpx;
+    line-height: 48rpx;
+}
+
+.reserve-name {
+    flex: 1;
+    width: 200rpx;
+    margin-right: 20rpx;
+    color: #7e7e7e;
+}
+
+.reserve-text {
+    width: calc(100% - 240rpx);
+    text-align: right;
+    line-height: 50rpx;
+}
+
+.reserve-text-btn {
+    width: 120rpx;
+    text-align: center;
+    color: #ffffff;
+    background-color: #3b7cff;
+    font-size: 26rpx;
+    border-radius: 10rpx;
+    line-height: 54rpx;
+}
+
+.reserve-text-copy {
+    display: contents;
+}
+
+.reserve-text-tap {
+    color: #ff9951;
+    padding-left: 30rpx;
+}
+
+.reserve-text text {
+    font-size: 24rpx;
+    display: inline-block;
+    background-image: linear-gradient(to right, #f16e06, #f34206);
+    color: #FFFFFF;
+    border-radius: 6rpx;
+    padding: 0 10rpx;
+    height: 44rpx;
+    line-height: 44rpx;
+    margin-top: 6rpx;
+}
+
+.reserve-text text.active {
+    background-image: linear-gradient(to right, #027be6, #2855f0);
+}
+
+.reserve-text.reserve-price {
+    font-weight: 600;
+    font-size: 34rpx;
+}
+
+.reserve-copy {
+    color: #3b7cff;
+    border: #3b7cff 2rpx solid;
+    display: inline-block;
+    height: 34rpx;
+    line-height: 34rpx;
+    font-size: 26rpx;
+    padding: 0 10rpx;
+    border-radius: 4rpx;
+    margin-left: 10rpx;
+}
+
+.reserve-status {
+    color: #ff8100
+}
+
+/* 底部菜单 */
+.order-data-footer {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    border-top: solid 1rpx #f2f2f2;
+    padding-top: 20rpx;
+    padding-right: 30rpx;
+    padding-left: 30rpx;
+    height: 110rpx;
+    background: white;
+    flex-wrap: wrap;
+    flex-direction: row-reverse;
+    z-index: 9;
+}
+
+.list-btn {
+    text-align: right;
+}
+
+.order-btn {
+    border: 2rpx solid #ff8100;
+    color: #ff8100;
+    border-radius: 80rpx;
+    height: 56rpx;
+    line-height: 56rpx;
+    padding: 0 20rpx;
+    display: inline-block;
+    font-size: 26rpx;
+    margin-left: 30rpx;
+}
+.order-btn.grey {
+    color: grey;
+    border-color: grey;
+}
--- a/pages/order/index.js
+++ b/pages/order/index.js
@@ -0,0 +1,141 @@
+ /*
+ * 手太欠
+ * 愿这世界都如故事里一样 美好而动人~
+ */
+
+Page({
+    data: {
+        listType        : '',   // 订单状态
+        listsArr        : [],   // 订单列表
+        page            : {},   // 分页信息
+        lodingStats     : false,// 加载状态
+    },
+
+    onLoad(options) {
+        this.setData({
+            listType: options.list_type
+        })
+    },
+
+    onShow() {
+        // 获取订单列表
+        this.listInfo()
+    },
+
+    /**
+     * 订单列表
+     */
+    listInfo(page) {
+        wx.$api.order.list({
+            state: this.data.listType,
+            page : page || 1
+        }).then(res => {
+            let listArr = this.data.listsArr,
+                newData = []
+            if(page == 1 || page == undefined) listArr = []
+            newData = listArr.concat(res.data.data)
+            this.setData({
+                listsArr       : newData,
+                page           : res.data.page,
+                lodingStats    : false
+            })
+            wx.stopPullDownRefresh()
+        }).catch(err => {})
+    },
+
+    /**
+     * 状态筛选
+     */
+    onTabs(val){
+        if(this.data.listType === val) return
+        this.setData({
+            listType: val.currentTarget.dataset.type
+        })
+        
+        // 获取订单列表
+        this.listInfo()
+    },
+    
+    /**
+     * 支付订单
+    */
+    payClick(e) {
+        wx.navigateTo({
+            url: '/pages/pay/index?order_no=' + e.currentTarget.dataset.order_no + '&total=' + e.currentTarget.dataset.total
+        })
+    },
+
+    /**
+     * 更多操作
+    */
+    operateMore(e) {
+        wx.showActionSheet({
+            itemList: ['取消订单'],
+            success: ()=> {
+                wx.showModal({
+                    title   : '提示',
+                    content : '是否取消订单',
+                    success : res=> {
+                        if (res.confirm) {
+                            wx.$api.order.goodsCancel(e.currentTarget.dataset.order_no).then(res => {
+                                wx.showToast({
+                                    title:'取消成功',
+                                    icon:'none'
+                                })
+                                // 获取订单列表
+                                this.listInfo()
+                            }).catch(err => {})
+                        }
+                    }
+                })
+            },
+            fail: err=> {}
+        })
+    },
+
+    /**
+     * 订单签收
+    */
+    signClick(e) {
+        wx.showModal({
+            title   : '提示',
+            content : '是否签收',
+            success : res=> {
+                if (res.confirm) {
+                    wx.$api.order.goodsSign(e.currentTarget.dataset.order_no).then(res => {
+                        wx.showToast({
+                           title:'签收成功',
+                           icon:'none'
+                        })
+                        
+                        // 获取订单列表
+                        this.listInfo()
+                    }).catch(err => {})
+                }
+            }
+        })
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+        // 获取订单列表
+        this.listInfo();
+    },
+
+    /**
+     * 上拉加载
+     */
+    onReachBottom(){
+        this.setData({
+            lodingStats: true
+        })
+        let pageNumber = this.data.page.current
+        if(this.data.page.has_more){
+            pageNumber++
+            // 获取订单列表
+            this.listInfo(pageNumber);
+        }
+    }
+})
--- a/pages/order/index.json
+++ b/pages/order/index.json
@@ -0,0 +1,4 @@
+{
+    "usingComponents": {},
+    "navigationBarTitleText": "我的订单"
+}
--- a/pages/order/index.wxml
+++ b/pages/order/index.wxml
@@ -0,0 +1,66 @@
+<view class="header">
+    <view class="tabs">
+        <view class="tabs-item {{listType == '' ? 'show' : ''}}" bindtap="onTabs" data-type="">全部</view>
+        <view class="tabs-item {{listType == 'unpay' ? 'show' : ''}}" bindtap="onTabs" data-type="unpay">待付款</view>
+        <view class="tabs-item {{listType == 'paid' ? 'show' : ''}}" bindtap="onTabs" data-type="paid">待发货</view>
+        <view class="tabs-item {{listType == 'delivered' ? 'show' : ''}}" bindtap="onTabs" data-type="delivered">待收货</view>
+        <view class="tabs-item {{listType == 'signed' ? 'show' : ''}}" bindtap="onTabs" data-type="signed">已签收</view>
+    </view>
+</view>
+
+<view class="list" wx:if="{{listsArr.length > 0}}">
+    <view class="list-item" wx:for="{{listsArr}}" wx:key="listsArr">
+        <view class="list-top">
+            <view class="list-top-no">订单编号{{item.order_no}}</view>
+            <view class="list-top-status">{{item.state}}</view>
+        </view>
+        <view class="list-goods" wx:for-item="goodItem" wx:for="{{item.items}}" wx:key="items">
+            <image class="list-goods-img" mode="aspectFill" src="{{goodItem.sku.cover}}"></image>
+            <view class="list-goods-cont">
+                <view class="nowrap list-goods-name">{{goodItem.sku.goods_name}}</view>
+                <view class="list-goods-text">
+                    <text>规格 99ml</text>x{{goodItem.qty}}
+                </view>
+                <view class="list-goods-parice">
+                    ￥<text>{{goodItem.sku.price}}</text>
+                </view>
+            </view>
+        </view>
+        <view class="list-total" wx:if="{{item.total != 0}}">
+            需付款 <text>￥</text>
+            <view class="list-total-price">{{item.total}}</view>
+        </view>
+        <view class="list-total active" wx:else>
+            兑换券兑换
+        </view>
+        <view class="list-tips">
+            <view class="list-tips-left">
+                <image class="list-tips-img" src="https://cdn.shuiganying.com/images/2023/04/04/d4543817b05d3aaac04dfb85ff9f8f8c.png"></image>收货城市
+            </view>
+            <view class="nowrap list-tips-right">{{item.province_city}}</view>
+        </view>
+        <view class="list-operate">
+            <view class="list-more">
+                <view class="list-more-go" bindtap="operateMore" data-order_no="{{item.order_no}}" wx:if="{{item.can.cancel}}">更多</view>
+            </view> 
+            <view class="list-btn">
+                <view class="list-btn-labor" bindtap="payClick" data-order_no="{{item.order_no}}" data-total="{{item.total}}" wx:if="{{item.can.pay}}">立即付款</view>
+                <view bindtap="signClick" data-order_no="{{item.order_no}}" class="list-btn-labor" wx:if="{{item.can.sign}}">签收订单</view>
+                <navigator hover-class="none" url="./details/details?order_no={{item.order_no}}" class="list-btn-labor grey">查看详情</navigator>
+            </view>
+        </view>
+    </view>
+    <view class="pagesLoding" wx:if="{{lodingStats}}">
+        <block wx:if="{{page.has_more}}">
+            <image class="pagesLoding-icon" src="/static/icons/refresh_loding.gif" mode="widthFix"></image>加载中...
+        </block>
+        <block wx:else>
+            没有更多了~
+        </block>
+    </view>
+</view>
+
+<view class="pack-center pages-hint" wx:else>
+    <image src="/static/imgs/text_null.png"></image>
+    <view>暂无数据</view>
+</view>
--- a/pages/order/index.wxss
+++ b/pages/order/index.wxss
@@ -0,0 +1,174 @@
+page {
+    background-color: #f7faff;
+}
+
+/* tabs */
+.header {
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    z-index: 99;
+    height: 100rpx;
+    background-color: #f7faff;
+}
+
+.tabs {
+    display: flex;
+    justify-content: space-around;
+    padding: 30rpx 10rpx;
+    font-size: 30rpx;
+    color: #3c3d3e;
+}
+
+.tabs-item.show {
+    color: #3b7cff;
+}
+
+/* 列表 */
+.list {
+    padding: 20rpx 30rpx 30rpx;
+    box-sizing: border-box;
+    margin-top: 100rpx;
+}
+
+.list-item {
+    background-color: #ffffff;
+    border-radius: 20rpx;
+    padding: 30rpx;
+    box-sizing: border-box;
+    margin-bottom: 30rpx;
+    box-shadow: 0 4rpx 30rpx 2rpx rgba(0, 0, 0, .05);
+}
+
+.list-top {
+    display: flex;
+    margin-bottom: 30rpx;
+    line-height: 48rpx;
+}
+
+.list-top-no {
+    flex: 1;
+}
+
+.list-top-status {
+    color: #ff8100;
+}
+
+.list-goods {
+    display: flex;
+}
+
+.list-goods-img {
+    width: 184rpx;
+    height: 184rpx;
+    margin-right: 30rpx;
+    border-radius: 10rpx;
+}
+
+.list-goods-cont {
+    width: calc(100% - 214rpx);
+}
+
+.list-goods-name {
+    font-size: 32rpx;
+}
+
+.list-goods-text {
+    line-height: 90rpx;
+    display: flex;
+    font-size: 28rpx;
+    color: #999999;
+}
+
+.list-goods-text text {
+    flex: 1;
+}
+
+.list-goods-parice {
+    text-align: right;
+    font-size: 28rpx;
+}
+
+.list-goods-parice text {
+    font-size: 34rpx;
+}
+
+.list-total {
+    text-align: right;
+    margin-top: 30rpx;
+    font-size: 32rpx;
+}
+
+.list-total.active {
+    color: #3b7cff;
+}
+
+.list-total text {
+    font-size: 30rpx;
+}
+
+.list-total-price {
+    display: inline-block;
+    font-weight: 600;
+    font-size: 38rpx;
+}
+
+.list-tips {
+    background-color: #f7faff;
+    display: flex;
+    padding: 20rpx 30rpx;
+    box-sizing: border-box;
+    margin: 30rpx 0 40rpx;
+    border-radius: 10rpx;
+    line-height: 44rpx;
+    font-size: 28rpx;
+}
+
+.list-tips-left {
+    display: flex;
+    margin-right: 40rpx;
+}
+
+.list-tips-img {
+    width: 44rpx;
+    height: 44rpx;
+    margin-right: 10rpx;
+}
+
+.list-tips-right {
+    color: #707070;
+    width: calc(100% - 210rpx);
+}
+
+.list-operate {
+    display: flex;
+}
+
+.list-more {
+    flex: 1;
+    line-height: 56rpx;
+    font-size: 26rpx;
+    color: #999999;
+}
+
+.list-btn {
+    text-align: right;
+}
+
+.list-btn-labor {
+    border: 2rpx solid #ff8100;
+    color: #ff8100;
+    border-radius: 80rpx;
+    height: 56rpx;
+    line-height: 56rpx;
+    padding: 0 25rpx;
+    display: inline-block;
+    font-size: 26rpx;
+    margin-left: 30rpx;
+}
+
+.list-btn-labor.grey {
+    color: grey;
+    border-color: grey;
+}
--- a/pages/order/logistic/logistic.js
+++ b/pages/order/logistic/logistic.js
@@ -0,0 +1,43 @@
+ /*
+ * 手太欠
+ * 愿这世界都如故事里一样 美好而动人~
+ */
+
+Page({
+    data: {
+        logisticArr : [],
+        expressData : '',
+    },
+
+    onLoad(options) {
+        const {
+            newData = {}
+        } = options;
+        const data = JSON.parse(decodeURIComponent(newData));
+        this.setData({
+            expressData: data
+        })
+    },
+
+    onShow() {
+        // 查看物流
+        this.h5url();
+    },
+
+    // 查看物流
+    h5url() {
+        wx.$api.order.kuaiDi({express_no: this.data.expressData.express_no}).then(res => {
+            this.setData({
+                logisticArr: res.data.data
+            })
+        }).catch(err => {})
+        // wx.request({
+        //     url: 'http://shanhe.kim/api/za/kuaidi.php?id=' + this.data.expressData.express_no, //需更换需请求数据的接口
+        //     success: res=> {
+        //         this.setData({
+        //             logisticArr: res.data.data
+        //         })
+        //     },
+        // });
+    }
+})
--- a/pages/order/logistic/logistic.json
+++ b/pages/order/logistic/logistic.json
@@ -0,0 +1,4 @@
+{
+    "usingComponents": {},
+    "navigationBarTitleText": "物流信息"
+}
--- a/pages/order/logistic/logistic.wxml
+++ b/pages/order/logistic/logistic.wxml
@@ -0,0 +1,44 @@
+<block wx:if="{{logisticArr.length > 0}}">
+    <view class="top">
+        <view class="top-logo">
+            <image src="{{expressData.express_cover}}" mode="aspectFill"></image>
+        </view>
+        <view class="top-cont">
+            <view class="top-name">
+                {{expressData.express_name}}
+                <view class="top-no">
+                    {{expressData.express_no}}
+                </view>
+            </view>
+            <view class="top-type">
+                {{expressData.name}}<text>{{expressData.mobile}}</text>
+            </view>
+        </view>
+    </view>
+    <view class="white">
+        <view class="address">
+            <view class="address-tips">
+                收
+            </view>
+            <view class="address-text">
+                {{expressData.full_address}}
+            </view>
+        </view>
+        <view class="list">
+            <view class="item" wx:for="{{logisticArr}}" wx:key="logisticArr">
+                <view class="item-name">
+                    <view class="item-time">
+                        {{item.time}}
+                    </view>
+                </view>
+                <view class="item-text">
+                    {{item.context}}
+                </view>
+            </view>
+        </view>
+    </view>
+</block>
+<view class="pack-center pages-hint" wx:else>
+    <image src="/static/imgs/cont_null.png"></image>
+    <view>暂无物流信息</view>
+</view>
--- a/pages/order/logistic/logistic.wxss
+++ b/pages/order/logistic/logistic.wxss
@@ -0,0 +1,141 @@
+.top {
+    background-color: #3b7cff;
+    padding: 30rpx 30rpx 60rpx;
+    box-sizing: border-box;
+    display: flex;
+}
+
+.top-logo {
+    background-color: #ffffff;
+    border-radius: 10rpx;
+    width: 100rpx;
+    height: 100rpx;
+    padding: 10rpx;
+    box-sizing: border-box;
+}
+
+.top-logo image {
+    width: 100%;
+    height: 100%;
+}
+
+.top-cont {
+    color: #ffffff;
+    width: calc(100% - 130rpx);
+    margin-left: 30rpx;
+}
+
+.top-name {
+    display: flex;
+    line-height: 44rpx;
+    padding: 10rpx 0;
+}
+
+.top-no {
+    font-size: 26rpx;
+    padding-left: 30rpx;
+    opacity: .9;
+}
+
+.top-type {
+    font-size: 24rpx;
+}
+
+.top-type text {
+    padding-left: 20rpx;
+}
+
+.address {
+    color: #333333;
+    font-size: 24rpx;
+    display: flex;
+    padding: 30rpx 30rpx 0;
+}
+
+.address-tips {
+    width: 54rpx;
+    text-align: center;
+    height: 54rpx;
+    line-height: 54rpx;
+    border-radius: 50%;
+    background-color: #EEEEEE;
+    margin-left: -15rpx;
+    font-size: 24rpx
+}
+
+.address-text {
+    width: calc(100% - 74rpx);
+    margin-left: 20rpx;
+    padding-top: 10rpx;
+}
+
+.white {
+    margin-top: -30rpx;
+    background-color: #ffffff;
+    border-radius: 20rpx;
+}
+
+.list {
+    padding: 0 30rpx;
+    box-sizing: border-box;
+}
+
+.item {
+    padding-bottom: 40rpx;
+    padding-left: 40rpx;
+    box-sizing: border-box;
+    position: relative;
+}
+
+.item:first-child {
+    padding-top: 30rpx;
+}
+
+.item::after {
+    position: absolute;
+    content: '';
+    background-color: #DDDDDD;
+    width: 14rpx;
+    height: 14rpx;
+    border-radius: 50%;
+    left: 0;
+    top: calc(50% - 6rpx);
+    z-index: 3;
+    border: 2rpx solid #ffffff;
+}
+
+.item::before {
+    position: absolute;
+    content: '';
+    background-color: #F0F0F0;
+    width: 2rpx;
+    height: 100%;
+    border-radius: 50%;
+    left: 8rpx;
+    top: 0;
+}
+
+.item-name {
+    display: flex;
+}
+
+.item-status {
+    font-weight: 600;
+    padding-right: 20rpx;
+}
+
+.item-time {
+    color: #868686;
+}
+
+.item-text {
+    color: #868686;
+    font-size: 24rpx;
+    line-height: 40rpx;
+    margin-top: 20rpx;
+}
+
+.item:first-child .item-time,
+.item:first-child .item-text {
+    color: #ff8100 !important;
+}
--- a/pages/pay/index.js
+++ b/pages/pay/index.js
@@ -0,0 +1,111 @@
+ /*
+ * 手太欠
+ * 愿这世界都如故事里一样 美好而动人~
+ */
+
+Page({
+    data: {
+        payCode     : '',  // code获取openid
+        openId      : '',  // openid
+        orderNo     : '',  // 订单编号
+        total       : '',  // 订单金额
+        paySuccess  : false, // 兑换成功显示
+        disabled    : true
+    },
+
+    onLoad(options) {
+        this.setData({
+            orderNo : options.order_no,
+            total   : options.total
+        })
+    },
+
+    onShow() {
+        wx.login({
+            success: res => {
+                this.setData({
+                    payCode: res.code
+                })
+
+                // 获取openid
+                this.openInfo()
+            }
+        })
+    },
+
+    /**
+     * openid
+     */
+    openInfo() {
+        wx.$api.auth.codeOpenid({code: this.data.payCode}).then(res => {
+            this.setData({
+                openId: res.data
+            })
+        }).catch(err => {})
+    },
+
+    /**
+     * 确认支付
+     */
+    payBtn() {
+        wx.showLoading({
+            title: '支付中...',
+            mask : true
+        })
+        let that = this
+        wx.$api.mall.mallPay(this.data.orderNo,{type: 'miniapp', openid: this.data.openId}).then(res=>{
+            wx.hideLoading()
+            this.setData({
+                disabled: false
+            })
+            let payInfo = JSON.parse(res.data.wechat)
+            wx.requestPayment({
+                timeStamp: payInfo.timeStamp,
+                nonceStr : payInfo.nonceStr,
+                package  : payInfo.package,
+                paySign  : payInfo.paySign,
+                signType : payInfo.signType,
+                success  : res=>{
+                    if(res.errMsg == "requestPayment:ok"){
+                        wx.showToast({
+                            title: '支付成功',
+                            icon: 'none',
+                            duration: 2000,
+                            //显示透明蒙层，防止触摸穿透
+                            mask:true,
+                            success: function () {
+                                that.setData({
+                                    paySuccess: true
+                                })
+                                setTimeout(()=>{
+                                    wx.redirectTo({
+                                        url: '/pages/order/index?state=paid'
+                                    })
+                                },3000)
+                            }
+                        })
+                    }
+                },
+                fail  : err=>{
+                    wx.showToast({
+                        title: '支付失败',
+                        icon: 'none',
+                        duration: 500,
+                        //显示透明蒙层，防止触摸穿透
+                        mask:true,
+                        success: function () {
+                            that.setData({
+                                paySuccess: true
+                            })
+                            setTimeout(()=>{
+                                wx.redirectTo({
+                                    url: '/pages/order/index?state=unpay'
+                                })
+                            },3000)
+                        }
+                    })
+                }
+            })
+        }).catch(err => {});
+    }
+})
--- a/pages/pay/index.json
+++ b/pages/pay/index.json
@@ -0,0 +1,4 @@
+{
+    "usingComponents": {},
+    "navigationBarTitleText": "支付订单"
+}
--- a/pages/pay/index.wxml
+++ b/pages/pay/index.wxml
@@ -0,0 +1,23 @@
+<view class="payTop">
+    <view class="payTop-time">支付有效期为10分钟，请尽快支付</view>
+    <view class="payTop-price"><text>￥</text>{{total}}</view>
+    <view class="payTop-text">微信支付</view>
+</view>
+
+<view class="payWay">
+    <view class="payWay-item">
+        <image class="payWay-img" src="https://cdn.shuiganying.com/images/2023/04/04/70400072de51a3157d9ead602eb3a294.png"></image>
+        <view class="payWay-name">微信支付</view>
+        <image class="payWay-icon" src="https://cdn.shuiganying.com/images/2023/04/04/2d9eed259c7a73b4d2aa4d496dbfa8a4.png"></image>
+    </view>
+</view>
+
+<view class="footer">
+    <view bindtap="payBtn" class="btn" wx:if="{{disabled}}">确认支付</view>
+    <view class="btn active" wx:else>确认支付</view>
+</view>
+
+<view class="pack-center pages-hint grey" wx:if="{{paySuccess}}">
+    <image src="/static/icons/loadingGif.gif"></image>
+    <view>疯狂加载中...</view>
+</view>
--- a/pages/pay/index.wxss
+++ b/pages/pay/index.wxss
@@ -0,0 +1,86 @@
+page {
+    background-color: #f4f4f6;
+}
+
+.payTop {
+    text-align: center;
+    padding: 140rpx 0;
+}
+
+.payTop-price {
+    font-weight: 600;
+    font-size: 78rpx;
+    line-height: 70rpx;
+    padding: 20rpx 0 0;
+}
+
+.payTop-price text {
+    font-size: 36rpx;
+}
+
+.payTop-time,
+.payTop-text {
+    font-size: 28rpx;
+    color: #666666;
+}
+
+.payWay {
+    padding: 0 30rpx;
+    box-sizing: border-box;
+}
+
+.payWay-item {
+    background-color: #ffffff;
+    border-radius: 15rpx;
+    padding: 25rpx 30rpx;
+    box-sizing: border-box;
+    display: flex;
+    line-height: 74rpx;
+    font-size: 34rpx;
+    position: relative;
+}
+
+.payWay-img {
+    width: 74rpx;
+    height: 74rpx;
+    margin-right: 20rpx;
+}
+
+.payWay-icon {
+    width: 42rpx;
+    height: 42rpx;
+    position: absolute;
+    right: 30rpx;
+    top: 40rpx;
+}
+
+
+/* 按钮 */
+.footer {
+    width: 100%;
+    height: 100px;
+    background-color: #f4f4f6;
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    z-index: 9;
+    padding: 20px 20px 50rpx;
+    box-sizing: border-box;
+}
+
+.btn {
+    line-height: 54px;
+    background-color: #3b7cff;
+    height: 100%;
+    text-align: center;
+    color: #FFFFFF;
+    border-radius: 10rpx;
+}
+.btn.active {
+    background-color: #cacaca;
+}
+
+.grey {
+    background-color: #f9f9f9;
+    z-index: 99999;
+}
--- a/pages/report/detail/detail.js
+++ b/pages/report/detail/detail.js
@@ -0,0 +1,155 @@
+ /*
+ * 手太欠
+ * 愿这世界都如故事里一样 美好而动人~
+ */
+
+var startPoint;
+const min = 0; // 最小宽度 单位px
+const max = 200; // 最大宽度  单位px
+
+Page({
+    data: {
+        barHeight  : getApp().globalData.barHeight,  // 状态栏高度
+        isFixedTop : 0,
+        loading    : true,
+        imageId    : '',  // 报告id
+        coverImg   : '',  // 上传的图片
+        analyze    : '',  // 检测结果
+        createdAt  : '', // 检测时间
+        footerPop  : '', //底部菜单优先级
+        enlargedNumber : '', // 毛孔总数量
+        sensitivityArea: '', // 敏感区域面积
+        tactfulFace  : false,  // 敏感分析
+        acneFace     : false, // 痤疮
+        oldFace      : false, //衰老分析
+        pigmentFace  : false, // 色素分析
+        pigmentFace  : false, // 黑头分析
+        poreStatus   : false, // 毛孔
+
+        zoneArea : '', // 油光占比  额头
+        leftcheekArea : '', // 油光占比  左脸颊
+        rightcheekArea : '', // 油光占比  右脸颊
+
+        buttonLeft: 100,
+        progress: 100, // 进度条的宽度，这里的单位是px，所以在wxml文件中要改为rpx
+        precent: 50 // 这个是百分比
+    },
+
+    onLoad(options) {
+        this.setData({
+            imageId:　options.image_id
+        })
+
+        // 获取检测报告结果
+        this.aiInfo(options.image_id)
+    },
+
+    /**
+    * 检测报告结果
+    */
+    aiInfo(imageid) {
+        wx.$api.health.aiSee(imageid).then(res => {
+            this.setData({
+                loading  : false,
+                createdAt: res.data.created_at,
+                coverImg: res.data.cover,
+                analyze : res.data.skin_analyze.result.result,
+                sensitivityArea: (res.data.skin_analyze.result.result.sensitivity.sensitivity_area * 100).toFixed(3),
+                enlargedNumber: res.data.skin_analyze.result.result.enlarged_pore_count.forehead_count + res.data.skin_analyze.result.result.enlarged_pore_count.chin_count + res.data.skin_analyze.result.result.enlarged_pore_count.right_cheek_count + res.data.skin_analyze.result.result.enlarged_pore_count.left_cheek_count,
+                zoneArea : (res.data.skin_analyze.result.result.oily_intensity.t_zone.area * 100).toFixed(1),
+                leftcheekArea : (res.data.skin_analyze.result.result.oily_intensity.left_cheek.area * 100).toFixed(1),
+                rightcheekArea : (res.data.skin_analyze.result.result.oily_intensity.right_cheek.area * 100).toFixed(1),
+            })
+        }).catch(err => { })
+    },
+
+    /**
+    * 返回上一页
+    */
+    returnGo() {
+        wx.navigateBack({
+           delta: 1
+        })
+    },
+
+    /**
+    * 查看检测图
+    */
+    faceSee(e) {
+        this.setData({
+            footerPop: !this.data.footerPop,
+            progress: 100,
+            precent: 50
+        })
+        let type = e.currentTarget.dataset.type
+        if(type == 'old') {
+            // 衰老
+            this.setData({
+                oldFace : !this.data.oldFace
+            })
+        } else if(type == 'acne')  {
+            // 痤疮
+            this.setData({
+                acneFace : !this.data.acneFace
+            })
+        }  else if(type == 'tactful')  {
+            // 敏感
+            this.setData({
+                tactfulFace : !this.data.tactfulFace
+            })
+        } else if(type == 'pigment')  {
+            // 色素性
+            this.setData({
+                pigmentFace : !this.data.pigmentFace
+            })
+        } else if(type == 'black')  {
+            // 黑头
+            this.setData({
+                blackFace : !this.data.blackFace
+            })
+        } else if(type == 'pore')  {
+            // 毛孔
+            this.setData({
+                poreStatus : !this.data.poreStatus
+            })
+        }
+        
+        
+    },
+
+    /**
+    * 查看检测图-状态栏
+    */
+    buttonStart (e) {
+        startPoint = e.touches[0]
+    },
+
+    moveTo(e) {
+        var endPoint = e.touches[e.touches.length - 1]
+        var translateX = endPoint.clientX - startPoint.clientX
+        startPoint = endPoint;
+        var buttonLeft = this.data.buttonLeft + translateX;
+        if (buttonLeft > max) {
+          // 滑动位置大于进度条最大宽度的时候让它为最大宽度
+          buttonLeft = max
+        }
+        if (buttonLeft < min) {
+          // 滑动位置小于进度条最大宽度的时候让它为最小宽度
+          buttonLeft = min
+        }
+        this.setData({
+          buttonLeft: buttonLeft,
+          progress: buttonLeft,
+          precent:parseInt((buttonLeft/max)*100)
+        })
+    },
+
+    /**
+    * 监听页面滑动事件
+    */
+   onPageScroll(e) {
+        this.setData({
+            isFixedTop: parseInt(e.scrollTop)
+        });
+    },
+})
--- a/pages/report/detail/detail.json
+++ b/pages/report/detail/detail.json
@@ -0,0 +1,5 @@
+{
+    "usingComponents": {},
+    "navigationStyle": "custom",
+    "navigationBarTextStyle": "white"
+}
--- a/pages/report/detail/detail.wxml
+++ b/pages/report/detail/detail.wxml
@@ -0,0 +1,388 @@
+<view class="pack-center pages-hint grey" wx:if="{{loading}}">
+    <image src="/static/icons/loadingGif.gif"></image>
+    <view>疯狂加载中</view>
+</view>
+<view wx:else>
+    <view class="navigation {{isFixedTop > 0 ? 'active' : ''}}" style="padding-top:{{barHeight}}px;" wx:if="{{!footerPop}}">
+        <image bindtap="returnGo" class="navigation-arrow" src="{{isFixedTop > 0 ? '/static/icons/returnBlack.png' : '/static/icons/returnBlue.png'}}"></image>
+    </view>
+
+    <!-- 顶部背景 -->
+    <view class="top">
+        <image class="top-back" src="https://cdn.shuiganying.com/images/2023/04/04/20f3147bad60e75d41312489d3a53f92.png" mode="widthFix"></image>
+        <view class="top-date">
+            <text>{{createdAt.m_d}}</text>
+            <text>{{createdAt.time}}</text>
+        </view>
+    </view>
+
+    <view class="seeCont">
+        <!-- 皮肤概况 -->
+        <view class="survey">
+            <view class="survey-title">
+                <text>皮肤概况</text>
+            </view>
+            <view class="survey-cont">
+                <view class="surveyTop">
+                    <!-- 4:3 -->
+                    <image class="surveyTop-img" src="{{coverImg}}" mode="aspectFill"></image>
+                    <view class="surveyTop-cont">
+                        <view class="surveyTop-cont-title">
+                            <view class="surveyTop-title-name">
+                                <block wx:if="{{analyze.skin_type.skin_type == 0}}">油性肤质</block>
+                                <block wx:elif="{{analyze.skin_type.skin_type == 1}}">干性皮肤</block>
+                                <block wx:elif="{{analyze.skin_type.skin_type == 2}}">中性皮肤</block>
+                                <block wx:else>混合性皮肤</block>
+                            </view>
+                            <view class="surveyTop-title-text">肤质</view>
+                        </view>
+                        <view class="surveyTop-cont-item">
+                            <view class="surveyTop-item-label">
+                                <view class="surveyTop-item-name">
+                                    <block wx:if="{{analyze.skintone.value == 0}}">透白</block>
+                                    <block wx:elif="{{analyze.skintone.value == 1}}">白皙</block>
+                                    <block wx:elif="{{analyze.skintone.value == 2}}">自然</block>
+                                    <block wx:elif="{{analyze.skintone.value == 3}}">小麦</block>
+                                    <block wx:else>黝黑</block>
+                                </view>
+                                <view class="surveyTop-item-text">肤色</view>
+                            </view>
+                            <view class="surveyTop-item-label">
+                                <view class="surveyTop-item-name">{{analyze.skin_age.value}}</view>
+                                <view class="surveyTop-item-text">肌龄</view>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+
+                <view class="surveyList">
+                    <view class="surveyList-title">油光占比</view>
+                    <view class="surveyList-item">
+                        <view class="surveyList-label">
+                            <view class="surveyList-label-name">额头</view>
+                            <view class="surveyList-label-thread">
+                                <view class="surveyList-label-bar" style="width: {{zoneArea + '%'}}"></view>
+                            </view>
+                            <view class="surveyList-label-number">{{zoneArea}}%</view>
+                        </view>
+                        <view class="surveyList-label">
+                            <view class="surveyList-label-name">左脸颊</view>
+                            <view class="surveyList-label-thread">
+                                <view class="surveyList-label-bar" style="width: {{leftcheekArea + '%'}}"></view>
+                            </view>
+                            <view class="surveyList-label-number">{{leftcheekArea}}%</view>
+                        </view>
+                        <view class="surveyList-label">
+                            <view class="surveyList-label-name">右脸颊</view>
+                            <view class="surveyList-label-thread">
+                                <view class="surveyList-label-bar" style="width: {{rightcheekArea + '%'}}"></view>
+                            </view>
+                            <view class="surveyList-label-number">{{rightcheekArea}}%</view>
+                        </view>
+                    </view>
+                </view>
+            </view>
+        </view>
+
+        <!-- 衰老分析 -->
+        <view class="module">
+            <view class="module-title">衰老分析</view>
+            <view class="old">
+                <view class="oldTop">
+                    <image class="oldTop-img" mode="widthFix" src="https://cdn.shuiganying.com/images/2023/04/04/b4eb69e379fedd74b6a63dcb0f4ba134.png"></image>
+                    <view class="module-check">
+                        <image class="module-check-img" src="/static/report/report-picture.png"></image>
+                        <view class="module-check-name" bindtap="faceSee" data-type="old">查看检测图</view>
+
+                        <!-- 检测图 -->
+                        <view class="face-back {{oldFace ? 'active' : ''}}"></view>
+                        <view class="face-pop {{oldFace ? 'active' : ''}}">
+                            <view class="face-cont">
+                                <view class="face-img" style="background-image: url({{coverImg}}); background-repeat: no-repeat; background-size: 396rpx 520rpx; background-position: right;background-clip: border-box; "></view>
+                                <view class="face-ai" style="background-image: url('{{ analyze.face_urls.texture_enhanced_lines}}'); background-repeat: no-repeat; background-size: 396rpx 520rpx; width: {{(100 - precent) + '%'}};background-clip: content-box;background-origin: content-box; background-position: right;"></view>
+
+                                <view class="process_wrap" style="left:{{2*progress - 4}}rpx">
+                                    <view class="line" bindtap="moveTo"></view>
+                                    <view class="spot" bindtouchmove="moveTo" catchtouchstart="buttonStart"></view>
+                                </view>
+                            </view>
+                            <view class="surveyTop-close" bindtap="faceSee" data-type="old">
+                                <image src="/static/icons/reportColse.png" mode="aspectFill"></image>
+                            </view>
+                        </view>
+
+                    </view>
+                </view>
+                <view class="oldSee">
+                    <view class="oldSee-item">
+                        <view class="oldSee-name">抬头纹：{{analyze.forehead_wrinkle.value == 0 ? '无' : '有'}}</view>
+                    </view>
+                    <view class="oldSee-item">
+                        <view class="oldSee-name">法令纹：{{analyze.nasolabial_fold.value == 0 ? '无' : '有'}}</view>
+                    </view>
+                    <view class="oldSee-item">
+                        <view class="oldSee-name">鱼尾纹：{{analyze.crows_feet.value == 0 ? '无' : '有'}}</view>
+                    </view>
+                    <view class="oldSee-item">
+                        <view class="oldSee-name">眉间纹：{{analyze.glabella_wrinkle.value == 0 ? '无' : '有'}}</view>
+                    </view>
+                    <view class="oldSee-item">
+                        <view class="oldSee-name">额头区域细纹：{{analyze.fine_line.forehead_count}}处</view>
+                    </view>
+                    <view class="oldSee-item">
+                        <view class="oldSee-name">左眼部区域细纹：{{analyze.fine_line.left_undereye_count}}处</view>
+                    </view>
+                    <view class="oldSee-item">
+                        <view class="oldSee-name">右眼部区域细纹：{{analyze.fine_line.right_undereye_count}}处</view>
+                    </view>
+                    <view class="oldSee-item">
+                        <view class="oldSee-name">额头区域深纹：{{analyze.wrinkle_count.forehead_count}}处</view>
+                    </view>
+                    <view class="oldSee-item">
+                        <view class="oldSee-name">左眼部区域深纹：{{analyze.wrinkle_count.left_undereye_count}}处</view>
+                    </view>
+                    <view class="oldSee-item">
+                        <view class="oldSee-name">右眼部区域深纹：{{analyze.wrinkle_count.right_undereye_count}}处</view>
+                    </view>
+                </view>
+            </view>
+        </view>
+
+        <!-- 眼袋 -->
+        <view class="module">
+            <view class="module-title">眼袋</view>
+            <view class="old">
+                <view class="oldTop">
+                    <image class="eye-img" mode="widthFix" src="https://cdn.shuiganying.com/images/2023/04/04/1595e206bd5fe385d34e2de952415830.png"></image>
+                    <!-- <view class="module-check">
+                    <image class="module-check-img" src="/static/report/report-picture.png"></image>
+                    <view class="module-check-name">查看检测图</view>
+                </view> -->
+                </view>
+                <view class="moduleText">
+                    <image class="moduleText-img" src="/static/report/report-face.png"></image>
+                    <view class="moduleText-tips">
+                        您{{analyze.eye_pouch.value == 0 ? '无' : '有'}}<text>眼袋</text>，{{analyze.eye_pouch.value == 0 ? '没有眼袋正常，可能个人护理比较好' : '受长期不规律作息和年龄增长，皮 肤弹性减弱影响。'}}
+                    </view>
+                </view>
+            </view>
+        </view>
+
+        <!-- 黑眼圈 -->
+        <view class="module">
+            <view class="module-title">黑眼圈</view>
+            <view class="old">
+                <view class="oldTop">
+                    <image class="eye-img" mode="widthFix" src="https://cdn.shuiganying.com/images/2023/04/04/d4659617f6964dedcbf80277b24c3394.png"></image>
+                    <!-- <view class="module-check">
+                    <image class="module-check-img" src="/static/report/report-picture.png"></image>
+                    <view class="module-check-name">查看检测图</view>
+                </view> -->
+                </view>
+                <view class="moduleText">
+                    <image class="moduleText-img" src="/static/report/report-face.png"></image>
+                    <view class="moduleText-tips">
+                        您是{{analyze.dark_circle.value == 0 ? '无' : '有'}}<text>黑眼圈</text>，{{analyze.dark_circle.value == 0 ? '没有黑眼圈通常是生活习惯比较好，主要是平时没有熬夜的习惯' : '可能由长期熬夜、日晒、年龄增长、眼周围皮肤炎症等因素导致'}}
+                    </view>
+                </view>
+            </view>
+        </view>
+
+        <!-- 敏感度分析 -->
+        <view class="module">
+            <view class="module-title">敏感度分析</view>
+            <view class="module-flex">
+                <view class="module-flex-cont">
+                    <view class="module-flex-item">
+                        <image class="module-flex-img" mode="widthFix" src="https://cdn.shuiganying.com/images/2023/04/04/f0aefddad01f4ec1d31c3a20b01c5761.png"></image>
+                        <view class="module-flex-check">
+                            <view class="module-flex-name">敏感程度</view>
+                            <view class="module-flex-number">{{analyze.sensitivity.sensitivity_intensity}}</view>
+                        </view>
+                    </view>
+                    <view class="module-flex-item">
+                        <image class="module-flex-img" mode="widthFix" src="https://cdn.shuiganying.com/images/2023/04/04/87e55f24e6cd35cffb368bc0eda6a0da.png"></image>
+                        <view class="module-flex-check">
+                            <view class="module-flex-name">敏感区域面积占比</view>
+                            <view class="module-flex-number">{{sensitivityArea}}%</view>
+                        </view>
+                    </view>
+                </view>
+                <view class="module-check">
+                    <image class="module-check-img" src="/static/report/report-picture.png"></image>
+                    <view class="module-check-name" bindtap="faceSee" data-type="tactful">查看检测图</view>
+
+                    <!-- 检测图 -->
+                    <view class="face-back {{tactfulFace ? 'active' : ''}}"></view>
+                    <view class="face-pop {{tactfulFace ? 'active' : ''}}">
+                        <view class="face-cont">
+                            <view class="face-img" style="background-image: url({{coverImg}}); background-repeat: no-repeat; background-size: 396rpx 520rpx; background-position: right;background-clip: border-box; "></view>
+                            <view class="face-ai" style="background-image: url('{{ analyze.face_urls.red_area}}'); background-repeat: no-repeat; background-size: 396rpx 520rpx; width: {{(100 - precent) + '%'}};background-clip: content-box;background-origin: content-box; background-position: right;"></view>
+                            <view class="process_wrap" style="left:{{2*progress - 4}}rpx">
+                                <view class="line" bindtap="moveTo"></view>
+                                <view class="spot" bindtouchmove="moveTo" catchtouchstart="buttonStart"></view>
+                            </view>
+                        </view>
+                        <view class="surveyTop-close" bindtap="faceSee" data-type="tactful">
+                            <image src="/static/icons/reportColse.png" mode="aspectFill"></image>
+                        </view>
+                    </view>
+                </view>
+            </view>
+        </view>
+
+        <!-- 毛孔分析 -->
+        <view class="module">
+            <view class="module-title">毛孔分析</view>
+            <view class="module-flex">
+                <view class="module-flex-cont">
+                    <view class="module-flex-item">
+                        <image class="module-flex-img" mode="widthFix" src="https://cdn.shuiganying.com/images/2023/04/04/6525be6f4924cbbd61f48996379a4887.png"></image>
+                        <view class="module-flex-check">
+                            <view class="module-flex-name">毛孔数量</view>
+                            <view class="module-flex-number">{{enlargedNumber}}</view>
+                        </view>
+                    </view>
+                </view>
+                <view class="module-check">
+                    <image class="module-check-img" src="/static/report/report-picture.png"></image>
+                    <view class="module-check-name" bindtap="faceSee" data-type="pore">查看检测图</view>
+
+                    <!-- 检测图 -->
+                    <view class="face-back {{poreStatus ? 'active' : ''}}"></view>
+                    <view class="face-pop {{poreStatus ? 'active' : ''}}">
+                        <view class="face-cont">
+                            <view class="face-img" style="background-image: url({{coverImg}}); background-repeat: no-repeat; background-size: 396rpx 520rpx; background-position: right;background-clip: border-box; "></view>
+                            <view class="face-ai" style="background-image: url('{{ analyze.face_urls.texture_enhanced_pores}}'); background-repeat: no-repeat; background-size:  396rpx 520rpx; width: {{(100 - precent) + '%'}}; background-clip: content-box;background-origin: content-box; background-position: right;"></view>
+
+                            <view class="process_wrap" style="left:{{2*progress - 4}}rpx">
+                                <view class="line" bindtap="moveTo"></view>
+                                <view class="spot" bindtouchmove="moveTo" catchtouchstart="buttonStart"></view>
+                            </view>
+                        </view>
+                        <view class="surveyTop-close" bindtap="faceSee" data-type="pore">
+                            <image src="/static/icons/reportColse.png" mode="aspectFill"></image>
+                        </view>
+                    </view>
+
+                </view>
+                <view class="moduleText">
+                    <image class="moduleText-img" src="/static/report/report-face.png"></image>
+                    <view class="pore-flex">
+                        <view class="pore-flex-item">额头粗大毛孔数：<text>{{analyze.enlarged_pore_count.forehead_count}}个</text></view>
+                        <view class="pore-flex-item">下巴粗大毛孔数：<text>{{analyze.enlarged_pore_count.chin_count}}个</text></view>
+                        <view class="pore-flex-item">右脸颊粗大毛孔数：<text>{{analyze.enlarged_pore_count.right_cheek_count}}个</text></view>
+                        <view class="pore-flex-item">左脸颊粗大毛孔数：<text>{{analyze.enlarged_pore_count.left_cheek_count}}个</text></view>
+                    </view>
+                </view>
+            </view>
+        </view>
+
+        <!-- 黑头分析 -->
+        <view class="module">
+            <view class="module-title">黑头分析</view>
+            <view class="module-flex">
+                <view class="module-flex-cont">
+                    <view class="module-flex-item">
+                        <image class="module-flex-img" mode="widthFix" src="https://cdn.shuiganying.com/images/2023/04/04/d3c0382483ea69a29b5948fd86230da0.png"></image>
+                        <view class="module-flex-check">
+                            <view class="module-flex-name">黑头分析</view>
+                            <view class="module-flex-number">{{analyze.blackhead_count}}个</view>
+                        </view>
+                    </view>
+                </view>
+                <view class="module-check">
+                    <image class="module-check-img" src="/static/report/report-picture.png"></image>
+                    <view class="module-check-name" bindtap="faceSee" data-type="black">查看检测图</view>
+                    <!-- 检测图 -->
+                    <view class="face-back {{blackFace ? 'active' : ''}}"></view>
+                    <view class="face-pop {{blackFace ? 'active' : ''}}">
+                        <view class="face-cont">
+                            <view class="face-img" style="background-image: url({{coverImg}}); background-repeat: no-repeat; background-size: 396rpx 520rpx; background-position: right;background-clip: border-box; "></view>
+                            <view class="face-ai" style="background-image: url('{{ analyze.face_urls.texture_enhanced_blackheads}}'); background-repeat: no-repeat; background-size: 396rpx 520rpx; width: {{(100 - precent) + '%'}}; background-clip: content-box;background-origin: content-box; background-position: right;"></view>
+
+                            <view class="process_wrap" style="left:{{2*progress - 4}}rpx">
+                                <view class="line" bindtap="moveTo"></view>
+                                <view class="spot" bindtouchmove="moveTo" catchtouchstart="buttonStart"></view>
+                            </view>
+                        </view>
+                        <view class="surveyTop-close" bindtap="faceSee" data-type="black">
+                            <image src="/static/icons/reportColse.png" mode="aspectFill"></image>
+                        </view>
+                    </view>
+
+                </view>
+            </view>
+        </view>
+
+        
+
+        <!-- 痤疮色素性分析 -->
+        <view class="module">
+            <view class="module-title">色素性分析</view>
+            <view class="module-flex">
+                <view class="module-flex-cont">
+                    <view class="module-flex-item">
+                        <image class="module-flex-img" mode="widthFix" src="https://cdn.shuiganying.com/images/2023/04/04/fea1902e925d424db9c9fe9d5d642fd0.png"></image>
+                        <view class="module-flex-check">
+                            <view class="module-flex-name">痤疮</view>
+                            <view class="module-flex-number">{{analyze.acne.rectangle.length}}处</view>
+                        </view>
+                    </view>
+                    <view class="module-flex-item">
+                        <image class="module-flex-img" mode="widthFix" src="https://cdn.shuiganying.com/images/2023/04/04/9c603bc9ef32e5fdb405ee213fe6660f.png"></image>
+                        <view class="module-flex-check">
+                            <view class="module-flex-name">闭口粉刺</view>
+                            <view class="module-flex-number">{{analyze.closed_comedones.rectangle.length}}处</view>
+                        </view>
+                    </view>
+                    
+                    <view class="module-flex-item">
+                        <image class="module-flex-img" mode="widthFix" src="https://cdn.shuiganying.com/images/2023/04/04/aa32dcc317286d7075c656496c55ad26.png"></image>
+                        <view class="module-flex-check">
+                            <view class="module-flex-name">色斑</view>
+                            <view class="module-flex-number">{{analyze.brown_spot.rectangle.length}}处</view>
+                        </view>
+                    </view>
+                    <view class="module-flex-item">
+                        <image class="module-flex-img" mode="widthFix" src="https://cdn.shuiganying.com/images/2023/04/04/cf30364df4cac5874f8aba438f2b3d57.png"></image>
+                        <view class="module-flex-check">
+                            <view class="module-flex-name">痣</view>
+                            <view class="module-flex-number">{{analyze.mole.rectangle.length}}处</view>
+                        </view>
+                    </view>
+                </view>
+                <view class="module-check">
+                    <image class="module-check-img" src="/static/report/report-picture.png"></image>
+                    <view class="module-check-name" bindtap="faceSee" data-type="pigment">查看检测图</view>
+
+                    <!-- 检测图 -->
+                    <view class="face-back {{pigmentFace ? 'active' : ''}}"></view>
+                    <view class="face-pop {{pigmentFace ? 'active' : ''}}">
+                        <view class="face-cont">
+                            <view class="face-img" style="background-image: url({{coverImg}}); background-repeat: no-repeat; background-size: 396rpx 520rpx; background-position: right;background-clip: border-box; "></view>
+                            <view class="face-ai" style="background-image: url('{{ analyze.face_urls.roi_outline_map}}'); background-repeat: no-repeat; background-size: 396rpx 520rpx; width: {{(100 - precent) + '%'}};background-clip: content-box;background-origin: content-box; background-position: right;"></view>
+
+                            <view class="process_wrap" style="left:{{2*progress - 4}}rpx">
+                                <view class="line" bindtap="moveTo"></view>
+                                <view class="spot" bindtouchmove="moveTo" catchtouchstart="buttonStart"></view>
+                            </view>
+                        </view>
+                        <view class="surveyTop-close" bindtap="faceSee" data-type="pigment">
+                            <image src="/static/icons/reportColse.png" mode="aspectFill"></image>
+                        </view>
+                    </view>
+
+                </view>
+            </view>
+        </view>
+    </view>
+
+    <!-- 按钮 -->
+    <view class="footer {{footerPop ? 'active' : ''}}">
+        <view class="footer-flex">
+            <navigator hover-class="none" url="../share/share" class="footer-flex-btn footer-flex-share">邀请好友</navigator>
+            <navigator hover-class="none" url="/pages/mall/index" open-type="switchTab" class="footer-flex-btn">产品推荐</navigator>
+        </view>
+    </view>
+</view>
--- a/pages/report/detail/detail.wxss
+++ b/pages/report/detail/detail.wxss
@@ -0,0 +1,619 @@
+page {
+    background-color: #f7faff;
+}
+
+
+.grey {
+    background-color: #f9f9f9;
+}
+
+/* 返回 */
+.navigation {
+    position: fixed;
+    top: 0;
+    left: 0;
+    z-index: 1999;
+    width: 100%;
+    height: 90rpx;
+    background-color: transparent;
+    transition: .2s;
+}
+
+.navigation.active {
+    background-color: transparent;
+}
+
+.navigation-arrow {
+    width: 44rpx;
+    height: 44rpx;
+    margin: 20rpx 15rpx 0 20rpx;
+}
+
+/* 顶部背景 */
+.top {
+    width: 100%;
+    position: relative;
+    height: 800rpx;
+    overflow: hidden;
+}
+
+.top-back {
+    position: absolute;
+    height: 100%;
+    left: 0;
+    top: 0;
+    width: 100%;
+    z-index: 1;
+}
+
+.top-date {
+    padding: 30rpx;
+    box-sizing: border-box;
+    position: absolute;
+    left: 0;
+    top: 370rpx;
+    width: 100%;
+    z-index: 9;
+    color: #6d9eff;
+    font-size: 28rpx;
+}
+
+.top-date text {
+    display: block;
+}
+
+.top-date::after,
+.top-date::before {
+    position: absolute;
+    content: '';
+    left: 30rpx;
+    background-color: #a7c5ff;
+    width: 100rpx;
+    height: 4rpx;
+}
+
+.top-date::after {
+    top: 15rpx;
+}
+
+.top-date::before {
+    bottom: 15rpx;
+}
+
+/* 内容 */
+.seeCont {
+    position: absolute;
+    top: 460rpx;
+    z-index: 1000;
+    width: 100%;
+    padding: 60rpx 30rpx;
+    box-sizing: border-box;
+    border-bottom: 80px solid transparent;
+}
+
+/* 皮肤概况 */
+.survey {
+    background-image: linear-gradient(90deg,rgba(255,255,255,0), transparent);
+    border-radius: 15rpx;
+    padding: 0 30rpx;
+    box-sizing: border-box;
+}
+
+.survey-title {
+    text-align: center;
+}
+
+.survey-title text {
+    display: inline-block;
+    background-color: #d3e2ff;
+    color: #3b7cff;
+    line-height: 58rpx;
+    padding: 0 30rpx;
+    border-radius: 0 0 20rpx 20rpx;
+    font-size: 28rpx;
+}
+
+.survey-cont {
+    padding: 50rpx 0 20rpx;
+    box-sizing: border-box;
+}
+
+.surveyTop {
+    position: relative;
+}
+
+.surveyTop-img {
+    width: 210rpx;
+    height: 280rpx;
+    border-radius: 15rpx;
+}
+
+.surveyTop-cont {
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 100%;
+    padding-left: 300rpx;
+    padding-right: 20rpx;
+    box-sizing: border-box;
+    text-align: center;
+}
+
+.surveyTop-cont-title {
+    margin-bottom: 40rpx;
+}
+
+.surveyTop-title-name {
+    color: #3b7cff;
+    font-size: 40rpx;
+    line-height: 70rpx;
+}
+
+.surveyTop-title-text {
+    color: #666666;
+}
+
+.surveyTop-cont-item {
+    background-color: #edf3ff;
+    border-radius: 80rpx;
+    display: flex;
+    font-size: 28rpx;
+    padding: 20rpx 0;
+}
+
+.surveyTop-item-label {
+    flex: 2;
+    text-align: center;
+    position: relative;
+}
+
+.surveyTop-item-name {
+    margin-bottom: 10rpx;
+}
+
+.surveyTop-item-label::after {
+    position: absolute;
+    content: '';
+    right: 0;
+    top: 20%;
+    background-color: #c4d8ff;
+    width: 2rpx;
+    height: 60%;
+}
+
+.surveyTop-item-label:last-child::after {
+    display: none;
+}
+
+.surveyTop-item-text {
+    color: #666666;
+}
+
+.surveyList {
+    margin-top: 30rpx;
+}
+
+.surveyList-title {
+    font-size: 34rpx;
+    font-weight: 600;
+}
+
+.surveyList-item {
+    margin-top: 20rpx;
+}
+
+.surveyList-label {
+    line-height: 80rpx;
+    display: flex;
+}
+
+.surveyList-label-name {
+    color: #111111;
+    width: 120rpx;
+}
+
+.surveyList-label-thread {
+    width: calc(100% - 220rpx);
+    height: 20rpx;
+    margin-top: 30rpx;
+    background-color: #f5f5f5;
+}
+
+.surveyList-label-bar {
+    height: 20rpx;
+    background-color: #f5f5f5;
+    position: relative;
+}
+
+.surveyList-label-bar::before {
+    position: absolute;
+    content: '';
+    height: 100%;
+    width: 100%;
+    color: #fff;
+    background-color: #2486ff;
+}
+
+.surveyList-label-bar::after {
+    position: absolute;
+    content: '';
+    width: 22rpx;
+    height: 22rpx;
+    border-radius: 50%;
+    background-color: #fff;
+    border: 4rpx solid #2486ff;
+    right: -22rpx;
+    top: -6rpx;
+}
+
+.surveyList-label-number {
+    width: 100rpx;
+    text-align: right;
+}
+
+/* 公共模块 */
+.module {
+    background-color: #ffffff;
+    margin-top: 40rpx;
+    border-radius: 15rpx;
+    overflow: hidden;
+}
+
+.module-title {
+    background-image: linear-gradient(to top, #ffffff, #ecf2ff);
+    padding: 30rpx 0;
+    box-sizing: border-box;
+    font-weight: 600;
+    font-size: 32rpx;
+    position: relative;
+    padding-left: 60rpx;
+}
+
+.module-title::after {
+    position: absolute;
+    content: '';
+    left: 30rpx;
+    top: calc(50% - 13rpx);
+    background-color: #3d7eff;
+    width: 10rpx;
+    height: 26rpx;
+    border-radius: 160rpx;
+}
+
+.module-check {
+    border: 2rpx solid #3d7eff;
+    width: 230rpx;
+    margin: 30rpx auto 0;
+    text-align: center;
+    height: 58rpx;
+    line-height: 58rpx;
+    border-radius: 90rpx;
+}
+
+.module-check-img {
+    width: 32rpx;
+    height: 32rpx;
+    margin: -2rpx 10rpx 0 0;
+    display: inline-block;
+    vertical-align: middle;
+}
+
+.module-check-name {
+    color: #3d7eff;
+    font-size: 28rpx;
+    display: inline-block;
+}
+
+.moduleText {
+    background-color: #f7faff;
+    border-radius: 15rpx;
+    padding: 25rpx;
+    box-sizing: border-box;
+    display: flex;
+    margin-top: 40rpx;
+}
+
+.moduleText-img {
+    width: 42rpx;
+    height: 42rpx;
+    margin-top: 10rpx;
+}
+
+.moduleText-tips {
+    width: calc(100% - 42rpx);
+    padding-left: 20rpx;
+    box-sizing: border-box;
+    font-size: 28rpx;
+    line-height: 38rpx;
+    text-align: justify;
+}
+
+.moduleText-tips text {
+    color: #3d7eff;
+}
+
+.module-flex {
+    padding: 30rpx;
+    box-sizing: border-box;
+}
+
+.module-flex-cont {
+    display: flex;
+}
+
+.module-flex-item {
+    flex: 2;
+    text-align: center;
+}
+
+.module-flex-img {
+    width: 100rpx;
+    height: 100rpx;
+}
+
+.module-flex-name {
+    font-size: 26rpx;
+    color: #666666;
+    line-height: 48rpx;
+}
+
+.module-flex-number {
+    font-weight: 600;
+}
+
+/* 衰老分析 */
+.old {
+    padding: 30rpx;
+    box-sizing: border-box;
+}
+
+.oldTop {
+    text-align: center;
+}
+
+.oldTop-img {
+    width: 75%;
+}
+
+.oldSee {
+    background-color: #f7faff;
+    border-radius: 15rpx;
+    padding: 15rpx;
+    box-sizing: border-box;
+    flex-wrap: wrap;
+    justify-content: flex-start;
+    margin-top: 40rpx;
+}
+
+.oldSee-item {
+    width: 50%;
+    padding-left: 10rpx;
+    box-sizing: border-box;
+    display: inline-block;
+    line-height: 60rpx;
+    color: #111111;
+}
+
+.oldSee-name {
+    position: relative;
+    padding-left: 20rpx;
+    font-size: 25rpx;
+}
+
+.oldSee-name::after {
+    position: absolute;
+    content: '';
+    left: 0;
+    top: calc(50% - 4rpx);
+    background-color: #3d7eff;
+    width: 8rpx;
+    height: 8rpx;
+}
+
+/* 眼图 */
+.eye-img {
+    width: 60%;
+}
+
+/* 毛孔 */
+.pore-flex {
+    padding-left: 20rpx;
+    width: calc(100% - 42rpx);
+}
+
+.pore-flex-item {
+    font-size: 26rpx;
+    line-height: 52rpx;
+}
+
+.pore-flex-item text {
+    font-weight: 600;
+    color: #3d7eff;
+}
+
+/* 按钮 */
+.footer {
+    width: 100%;
+    height: 80px;
+    background-color: #FFFFFF;
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    z-index: 9989;
+    padding: 20rpx 10rpx;
+    box-sizing: border-box;
+    display: block;
+}
+
+.footer.active {
+    display: none;
+}
+
+.footer-flex {
+    display: flex;
+}
+
+.footer-flex-btn {
+    flex: 2;
+    margin: 0 15rpx;
+    line-height: 40px;
+    background-color: transparent;
+    height: 40px;
+    text-align: center;
+    color: #3b7cff;
+    border-radius: 80rpx;
+    border: 2rpx solid #3b7cff;
+}
+
+.footer-flex-share {
+    background-color: #3b7cff;
+    color: #FFFFFF;
+}
+
+/* 图片弹出 */
+.face-pop {
+    position: fixed;
+    left: 10%;
+    top: calc(50% - 300rpx);
+    z-index: 9999;
+    width: 80%;
+    overflow: hidden;
+    height: 640rpx;
+    text-align: center;
+    display: none;
+}
+
+.face-pop.active {
+    display: block;
+}
+
+.face-cont {
+    position: relative;
+    width: 396rpx;
+    height: 520rpx;
+    margin: 0 auto;
+    border-radius: 15rpx;
+    overflow: hidden;
+}
+
+.face-img,
+.face-ai {
+    position: absolute;
+    top: 0;
+    width: 100%;
+    height: 100%;
+}
+
+.face-img {
+    left: 0;
+    z-index: 1000000;
+}
+
+.face-ai {
+    right: 0;
+    z-index: 1000001;
+}
+
+.face-back {
+    position: fixed;
+    left: 0;
+    top: 0;
+    z-index: 9998;
+    background-color: rgba(0, 0, 0, .5);
+    width: 100%;
+    height: 100vh;
+    display: none;
+}
+
+.face-back.active {
+    display: block;
+}
+
+.process_wrap {
+    height: 520rpx;
+    width: 4rpx;
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    z-index: 1000003;
+}
+
+.process_wrap .line {
+    position: absolute;
+    left: calc(50% + 2rpx);
+    top: 0;
+    width: 4rpx;
+    height: 100%;
+}
+
+.process_wrap .line::before,
+.process_wrap .line::after {
+    content: "";
+    position: absolute;
+    width: 100%;
+    height: calc(50% - 28rpx);
+    background: #fff;
+    left: 0;
+}
+
+.process_wrap .line::after {
+    top: 2rpx;
+}
+
+.process_wrap .line::before {
+    bottom: -8rpx;
+}
+
+.process_wrap .active_line {
+    position: absolute;
+    top: 0;
+    max-width: 8rpx;
+    height: 100%;
+}
+
+.process_wrap .spot {
+    position: absolute;
+    top: calc(50% - 28rpx);
+    left: -28rpx;
+    width: 56rpx;
+    height: 56rpx;
+    border: 2px solid #ffffff;
+    border-radius: 100%;
+    background-color: transparent;
+}
+
+.process_wrap .spot::before,
+.process_wrap .spot::after {
+    content: "";
+    position: absolute;
+    width: 0;
+    height: 0;
+    border-style: solid;
+    top: 50%;
+    margin-top: -4px;
+}
+
+.process_wrap .spot::after {
+    border-width: 4px 0 4px 8px;
+    border-color: transparent transparent transparent #ffffff;
+    right: 2px;
+}
+
+.process_wrap .spot::before {
+    left: 2px;
+    border-width: 4px 8px 4px 0;
+    border-color: transparent #ffffff transparent transparent;
+}
+
+.surveyTop-close {
+    position: absolute;
+    width: 100%;
+    left: 0;
+    bottom: 0;
+    text-align: center;
+}
+
+.surveyTop-close image {
+    width: 60rpx;
+    height: 60rpx;
+}
--- a/pages/report/index.js
+++ b/pages/report/index.js
@@ -0,0 +1,118 @@
+ /*
+ * 手太欠
+ * 愿这世界都如故事里一样 美好而动人~
+ */
+
+Page({
+    data: {
+        userLogin   : false, 
+        listArr     : [],     // 商品列表
+        page        : {},     // 分页信息
+        lodingStats : false,  // 加载状态
+        disabled    : false, // 支付按钮
+        payCode     : '',    // code获取openid
+        openId      : '',    // openid
+        payStatus   : false, // 支付弹框
+        catchtouchmove: false
+    },
+
+    onLoad(options) { 
+    },
+
+    onShow() {
+        wx.login({
+            success: res => {
+                this.setData({
+                    payCode: res.code
+                })
+                // 获取openid
+                this.openInfo()
+            }
+        })
+        
+        // 获取登录状态
+        if(wx.getStorageSync("token") != ''){
+            this.setData({
+                userLogin: true,
+                disabled : false
+            })
+
+            // 获取检测结果列表
+            this.aiInfo();
+        } else {
+            this.setData({
+                userLogin: false
+            })
+        }
+    },
+
+    /**
+     * 检测结果列表
+     */
+    aiInfo (page){
+        wx.$api.health.aiList({
+            page: page || 1
+        }).then(res => {
+            let listArr = this.data.listArr,
+                newData = []
+            if(page == 1 || page == undefined) listArr = []
+            newData = listArr.concat(res.data.data)
+            this.setData({
+                listArr     : newData,
+                page        : res.data.page,
+                lodingStats : false
+            })
+            wx.stopPullDownRefresh()
+        }).catch(err => { })
+    },
+
+    /**
+     * openid
+     */
+    openInfo() {
+        wx.$api.auth.codeOpenid({code: this.data.payCode}).then(res => {
+            this.setData({
+                openId: res.data
+            })
+        }).catch(err => {})
+    },
+
+    /**
+     * 处理未登录时的转跳
+     */
+    assessGo(){
+        if(wx.getStorageSync("token") != ''){
+            wx.navigateTo({
+                url: '/pages/index/assess/assess?code=' + this.data.openId
+            })
+        }else{
+            // 去登录
+            wx.navigateTo({
+                url: "/pages/login/index"
+            })
+        }
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+        // 获取检测结果列表
+        this.aiInfo();
+    },
+
+    /**
+     * 上拉加载
+     */
+    onReachBottom(){
+        this.setData({
+            lodingStats: true
+        })
+        let pageNumber = this.data.page.current
+        if(this.data.page.has_more){
+            pageNumber++
+            // 获取检测结果列表
+            this.aiInfo(pageNumber);
+        }
+    }
+})
--- a/pages/report/index.json
+++ b/pages/report/index.json
@@ -0,0 +1,4 @@
+{
+    "usingComponents": {},
+    "navigationBarTitleText": "报告"
+}
--- a/pages/report/index.wxml
+++ b/pages/report/index.wxml
@@ -0,0 +1,43 @@
+<block wx:if="{{userLogin}}">
+    <view class="report" wx:if="{{listArr.length > 0}}">
+        <view class="report-title">检测报告</view>
+        <view class="report-list">
+            <view class="report-item" wx:for="{{listArr}}" wx:key="listArr">
+                <view class="report-time">{{item.create_at}}</view>
+                <view class="report-tips">检测报告精准分析您皮肤问题</view>
+                <navigator hover-class="none" url="./detail/detail?image_id={{item.image_id}}" class="report-btn">查看报告</navigator>
+            </view>
+            <view class="pagesLoding" wx:if="{{lodingStats}}">
+                <block wx:if="{{page.has_more}}">
+                    <image class="pagesLoding-icon" src="/static/icons/refresh_loding.gif" mode="widthFix"></image>加载中...
+                </block>
+                <block wx:else>
+                    没有更多了~
+                </block>
+            </view>
+        </view>
+        <view class="report-point">
+            <view class="report-point-text">
+                <text>由于不同时间的生活习惯变化普遍较大</text>
+                <text>建议每年重新测试一次</text>
+            </view>
+            <view class="report-point-btn" bindtap="assessGo">再次检测</view>
+        </view>
+    </view>
+    <view class="pack-center pages-hint" wx:else>
+        <image src="https://cdn.shuiganying.com/images/2023/03/29/f01c427a1c0970cf3673d848ffc1591c.png"></image>
+        <view class="reportTips">
+            <view class="reportTips-title">暂无报告数据</view>
+            <view class="reportTips-text">进行皮肤检测后，可查看报告数据</view>
+            <view class="reportTips-btn" bindtap="assessGo">立即检测</view>
+        </view>
+    </view>
+</block>
+<view class="pack-center pages-hint" wx:else>
+    <image src="https://cdn.shuiganying.com/images/2023/04/04/40b2f4bfe2dfb828688fcd3766d6b541.png"></image>
+    <view class="reportTips">
+        <view class="reportTips-title">暂不能查看数据</view>
+        <view class="reportTips-text">登录成功后，可查看报告数据</view>
+        <view class="reportTips-btn" bindtap="assessGo">请先登录</view>
+    </view>
+</view>
--- a/pages/report/index.wxss
+++ b/pages/report/index.wxss
@@ -0,0 +1,104 @@
+page {
+    background-color: #f7faff;
+}
+
+
+/* 列表 */
+.report {
+    width: 100%;
+    padding: 30rpx 30rpx 0;
+    box-sizing: border-box;
+}
+
+.report-title {
+    font-size: 36rpx;
+}
+
+.report-list {
+    margin-top: 30rpx;
+}
+
+.report-item {
+    background-color: #fff;
+    border-radius: 20rpx;
+    padding: 30rpx;
+    box-sizing: border-box;
+    box-shadow: 0 4rpx 30rpx 2rpx rgba(0, 0, 0, .05);
+    color: #0d0d0d;
+    position: relative;
+    margin-bottom: 30rpx;
+}
+
+.report-item:last-child {
+    margin: 0;
+}
+
+.report-time {
+    font-size: 34rpx;
+}
+
+.report-tips {
+    font-size: 28rpx;
+    margin-top: 20rpx;
+    line-height: 60rpx;
+    color: #414141;
+}
+
+.report-btn {
+    position: absolute;
+    right: 30rpx;
+    bottom: 30rpx;
+    color: #3b7cff;
+    border: #3b7cff 2rpx solid;
+    font-size: 26rpx;
+    line-height: 56rpx;
+    padding: 0 30rpx;
+    border-radius: 90rpx;
+}
+
+/* 友情提示 */
+.report-point {
+    padding: 140rpx 50rpx 0;
+    box-sizing: border-box;
+    text-align: center;
+}
+
+.report-point-text {
+    color: #999999;
+    line-height: 60rpx;
+}
+
+.report-point-text text {
+    display: block;
+}
+
+.report-point-btn {
+    margin-top: 50rpx;
+    background-color: #3b7cff;
+    display: inline-block;
+    color: #fff;
+    border-radius: 80rpx;
+    line-height: 90rpx;
+    width: 60%;
+}
+
+/* 暂无数据 */
+.reportTips-title {
+    color: #000;
+    font-size: 34rpx;
+    line-height: 80rpx;
+}
+
+.reportTips-text {
+    font-size: 26rpx;
+}
+
+.reportTips-btn {
+    background-color: #3b7cff;
+    display: inline-block;
+    color: #fff;
+    line-height: 78rpx;
+    padding: 0 60rpx;
+    border-radius: 10rpx;
+    margin-top: 50rpx;
+}
--- a/pages/report/share/share.js
+++ b/pages/report/share/share.js
@@ -0,0 +1,193 @@
+// pages/report/share/share.js
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        barHeight  : getApp().globalData.barHeight,  // 状态栏高度
+        userData   : '',    // 用户信息
+        inviteCode : '',    // 二维码
+
+        //海报
+        canvas     : ''
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+        // 初始化画布
+        wx.createSelectorQuery().select('#coverCanvas').fields({node: true, size: true}).exec(canvasNode => {
+            const canvas    = canvasNode[0].node
+            canvas.width = 375
+            canvas.height = 800
+            this.setData({
+                canvas
+            })
+        })
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+        // 小程序码
+        this.ShareInfo();
+
+        // 获取用户信息
+        this.userInfo();
+    },
+
+    /**
+     * 小程序码
+     */
+    ShareInfo() {
+        wx.$api.user.miniShare({
+            url: '/pages/index/index'
+        }).then(res => {
+            this.setData({
+                inviteCode: res.data.qrcode
+            })
+        }).catch(err => {})
+    },
+
+    /**
+     * 用户信息
+     */
+    userInfo() {
+        wx.$api.user.userIndex().then(res => {
+            this.setData({
+                userData  : res.data
+            })
+        }).catch(err => {})
+    },
+
+    /**
+     * 生成海报
+     */
+    onCanvas(){
+        wx.showLoading({
+            title: '生成图片中...',
+            mask : true
+        })
+        const canvas    = this.data.canvas
+        const ctx       = canvas.getContext('2d')
+        const codeImgEl   = canvas.createImage()
+        const backBackEl  = canvas.createImage()
+
+
+        codeImgEl.src  = this.data.inviteCode  //二维码
+        backBackEl.src = 'https://cdn.shuiganying.com/images/2023/04/04/1b1781214a4b34bb37948d2adb86f142.png'  //背景素材
+
+        const codeImgLoding = new Promise((resolve, reason) => {
+            codeImgEl.onload = () => {
+                resolve()
+            }
+        })
+        const backBackLoding = new Promise((resolve, reason) => {
+            backBackEl.onload = () => {
+                resolve()
+            }
+        })
+        Promise.all([codeImgLoding, backBackLoding]).then(() => {
+            // 绘制[背景]
+            ctx.drawImage(backBackEl, 0, 0, 375, 800)
+
+            // 绘制[二维码]
+            ctx.drawImage(codeImgEl, 260, 650, 80, 80)
+
+            // 文字
+            ctx.font = "bold 20px Arial"; //字体大小
+            ctx.fillStyle = "#3b7cff"; //字体颜色
+            ctx.textAlign = "center"
+            ctx.fillText('水感应 | AI测肤', 190, 510);
+
+            // 文字
+            ctx.font = "15px Arial"; //字体大小
+            ctx.fillStyle = "#000000"; //字体颜色
+            ctx.textAlign = "center"
+            ctx.fillText('基于强大人脸算法，深度图像学习能力', 190, 543);
+
+            // 文字
+            ctx.font = "15px Arial"; //字体大小
+            ctx.fillStyle = "#000000"; //字体颜色
+            ctx.textAlign = "center"
+            ctx.fillText('准确分析皮肤状态，针对性发现皮肤问题', 188, 565);
+
+            // 文字
+            ctx.font = "14px Arial"; //字体大小
+            ctx.fillStyle = "#666666"; //字体颜色
+            ctx.textAlign = "center"
+            ctx.fillText('肤质、肤色、肤龄、皱纹、毛孔、黑头等~', 188, 595);
+
+            // 文字
+            ctx.font = "15px Arial"; //字体大小
+            ctx.fillStyle = "#000000"; //字体颜色
+            ctx.fillText('参与测试成为VIP立享VIP权益！', 145, 682);
+
+            // 文字
+            ctx.font = "15px Arial"; //字体大小
+            ctx.fillStyle = "#000000"; //字体颜色
+            ctx.fillText('活动火爆，先到先得哦~', 120, 713);
+
+            wx.hideLoading()
+            wx.canvasToTempFilePath({
+                canvas: this.data.canvas,
+                success : res => {
+                    wx.saveImageToPhotosAlbum({
+                        filePath: res.tempFilePath,
+                        success: saveRes => {
+                            wx.showToast({
+                                title: '海报已保存至您的相册',
+                                icon : 'none'
+                            })
+                            this.setData({
+                                shareSee: false
+                            })
+                        },
+                        fail: () => {
+                            wx.hideLoading()
+                            wx.showModal({
+                                title: '提示',
+                                content: '暂未授权小程序写入您的相册，无法存储海报',
+                                confirmColor: '#e50d01',
+                                confirmText: '去设置',
+                                success: res => {
+                                    if (res.confirm) {
+                                        wx.openSetting()
+                                    }
+                                }
+                            })
+                        }
+                    })
+                },
+            })
+        }).catch(err => {
+            wx.showToast({
+                title: '图片加载失败',
+                icon : 'none'
+            })
+        })
+    },
+
+    /**
+    * 返回上一页
+    */
+    returnGo() {
+        wx.navigateBack({
+        delta: 1
+        })
+    },
+
+    /**
+	 * 微信分享
+	 */
+	onShareAppMessage(){
+		return {
+			title	: this.data.userData.nickname + '：' + '邀请您一起AI测肤',
+            path	: "/pages/index/index?invite=" + wx.getStorageSync("invite"),
+			imageUrl: "https://cdn.shuiganying.com/images/2023/04/04/382850bdd565b1a687e4547c5c4de0f7.png"
+		}
+    }
+})
--- a/pages/report/share/share.json
+++ b/pages/report/share/share.json
@@ -0,0 +1,5 @@
+{
+    "usingComponents": {},
+    "navigationStyle": "custom",
+    "navigationBarTextStyle": "white"
+}
--- a/pages/report/share/share.wxml
+++ b/pages/report/share/share.wxml
@@ -0,0 +1,40 @@
+<view class="navigation {{isFixedTop > 0 ? 'active' : ''}}" style="padding-top:{{barHeight}}px;">
+    <image bindtap="returnGo" class="navigation-arrow" src="/static/icons/returnBlue.png"></image>
+</view>
+
+<!-- 顶部背景 -->
+<view class="top">
+    <image class="top-back" src="https://cdn.shuiganying.com/images/2023/05/29/7b5b013190e9e9d4fcf2a69488547322.png" mode="widthFix"></image>
+</view>
+
+<view class="seeCont">
+    <view class="seeBorder">
+        <view class="seeTop">
+            <view class="seeTop-img">
+                <image class="seeTop-img-title" src="https://cdn.shuiganying.com/images/2023/04/04/778fe6a5624f8276a9bf7804ce1bc26a.png" mode="widthFix"></image>
+                <image class="seeTop-img-line" src="/static/report/shareLine.png" mode="widthFix"></image>
+            </view>
+            <view class="seeTop-cont">
+                <view class="seeTop-cont-name">水感应 | AI测肤</view>
+                <view class="seeTop-cont-tips">基于强大人脸算法，深度图像学习能力，准确分析皮肤状态，针对性发现皮肤问题</view>
+                <view class="seeTop-cont-text">肤质、肤色、肤龄、皱纹、毛孔、黑头等~</view>
+            </view>
+            <view class="seeTop-share">
+                <view class="seeTop-share-title">
+                    <view class="seeTop-share-name">参与测试成为VIP立享VIP权益！</view>
+                    <view class="seeTop-share-text">活动火爆，先到先得哦~</view>
+                </view>
+                <view class="seeTop-share-code">
+                    <image class="seeTop-share-img" src="{{inviteCode}}" mode="widthFix"></image>
+                </view>
+            </view>
+        </view>
+    </view>
+    <view class="seeBtn">
+        <button class="seeBtn-btn seeBtn-btn-border" open-type="share" hover-class="none">微信好友</button>
+        <view class="seeBtn-btn" bindtap="onCanvas">保存海报</view>
+    </view>
+</view>
+
+<!-- 海报canvas -->
+<canvas type="2d" style="width: 375px; height: 800px;" id="coverCanvas" class="canvas-img" />
--- a/pages/report/share/share.wxss
+++ b/pages/report/share/share.wxss
@@ -0,0 +1,165 @@
+page {
+    background-color: #f7faff;
+}
+
+
+/* 返回 */
+.navigation{
+    position: fixed;
+    top: 0;
+    left: 0;
+    z-index: 999;
+    width: 100%;
+    height: 90rpx;
+    background-color: transparent;
+    transition: .2s;
+}
+
+.navigation.active {
+    background-color: transparent;
+}
+
+.navigation-arrow {
+    width: 44rpx;
+    height: 44rpx;
+    margin: 20rpx 15rpx 0 20rpx;
+}
+
+
+/* 顶部背景 */
+.top {
+    width: 100%;
+    position: relative;
+    height: 100vh;
+    overflow: hidden;
+}
+
+.top-back {
+    position: absolute;
+    height: 100%;
+    left: 0;
+    top: 0;
+    width: 100%;
+    z-index: 1;
+}
+
+/* 内容 */
+.seeCont {
+    position: absolute;
+    bottom: 0;
+    z-index: 100;
+    width: 100%;
+    padding: 60rpx 30rpx 120rpx;
+    box-sizing: border-box;
+}
+
+.seeBorder {
+    border: 4rpx solid #ffffff;
+    border-radius: 15rpx;
+    overflow: hidden;
+    width: 100%;
+    box-sizing: border-box;
+}
+
+.seeTop {
+    background-color: #ffffff;
+    opacity: .75;
+    padding: 30rpx 50rpx;
+    box-sizing: border-box;
+}
+
+.seeTop-img {
+    text-align: center;
+}
+
+.seeTop-img-title {
+    width: 78%;
+}
+
+.seeTop-img-line {
+    width: 100%;
+    margin: 20rpx 0;
+}
+
+.seeTop-cont {
+    text-align: center;
+    font-size: 28rpx;
+    border-bottom: 2rpx dashed #3b7cff;
+    padding-bottom: 40rpx;
+}
+
+.seeTop-cont-name {
+    color: #3b7cff;
+    font-weight: 600;
+    font-size: 40rpx;
+}
+
+.seeTop-cont-tips {
+    margin: 30rpx 0 15rpx;
+}
+
+.seeTop-cont-tips text {
+    color: #3b7cff;
+}
+
+.seeTop-cont-text {
+    color: #666666;
+}
+
+.seeTop-share {
+    padding-top: 40rpx;
+    box-sizing: border-box;
+    display: flex;
+}
+
+.seeTop-share-title {
+    font-size: 26rpx;
+    line-height: 58rpx;
+    flex: 1;
+}
+
+.seeTop-share-code {
+    width: 110rpx;
+    height: 110rpx;
+    box-sizing: border-box;
+}
+
+.seeTop-share-img {
+    width: 100%;
+    height: 100%;
+}
+
+.seeBtn {
+    text-align: center;
+    width: 100%;
+    display: flex;
+    margin-top: 50rpx;
+}
+
+.seeBtn-btn {
+    flex: 2;
+    background-color: #3d7eff;
+    display: inline-block;
+    color: #ffffff;
+    border-radius: 90rpx;
+    height: 90rpx !important;
+    line-height: 90rpx !important;
+    padding: 0 80rpx !important;
+    margin: 0 15rpx !important;
+    border: 2rpx solid #3d7eff;
+}
+
+.seeBtn-btn-border {
+    background-color: #ffffff;
+    color: #3d7eff;
+    font-weight: normal;
+    width: auto !important;
+}
+
+/* canvas */
+.canvas-img {
+    position: fixed;
+	left: -10000%;
+	top: 0;
+	z-index: 99;
+}
--- a/Show More
+++ b/Show More