会员模块

2023-12-15 17:53:08 +08:00
commit 2a998468d9
282 changed files with 14521 additions and 0 deletions
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -0,0 +1,31 @@
+/*
+ * Eslint config file
+ * Documentation: https://eslint.org/docs/user-guide/configuring/
+ * Install the Eslint extension before using this feature.
+ */
+module.exports = {
+  env: {
+    es6: true,
+    browser: true,
+    node: true,
+  },
+  ecmaFeatures: {
+    modules: true,
+  },
+  parserOptions: {
+    ecmaVersion: 2018,
+    sourceType: 'module',
+  },
+  globals: {
+    wx: true,
+    App: true,
+    Page: true,
+    getCurrentPages: true,
+    getApp: true,
+    Component: true,
+    requirePlugin: true,
+    requireMiniProgram: true,
+  },
+  // extends: 'eslint:recommended',
+  rules: {},
+}
--- a/api/err.js
+++ b/api/err.js
@@ -0,0 +1,54 @@
+
+/**
+ * 处理错误信息
+ * @property {Object} errInfo 
+ */
+
+const errInfo = (obj) =>{
+    if(obj.status_code == 401){
+        wx.showModal({
+            title		: "登录提示",
+            content		: "长时间未操作，登录已过期，请重新登录",
+            showCancel  : false,
+            confirmColor: "#0b0041",
+            confirmText : "确定",
+            success		: ()=>{
+                // 清理客户端登录缓存
+                wx.removeStorageSync("token")
+                // 返回首页
+                wx.redirectTo({
+                    url: "/pages/login/index",
+                })
+            }
+        })
+    }else if(obj.status_code == 422){
+        wx.showToast({
+            title: obj.message,
+            icon : "none"
+        })
+    }else if(obj.status_code == 400 || obj.status_code == 0){
+        wx.showToast({
+            title: obj.message,
+            icon : "none"
+        })
+    }else if(obj.status_code == 404){
+        wx.showToast({
+            title: "接口地址不存在，请联系系统管理员",
+            icon : "none"
+        })
+    }else if(obj.status_code == 500){
+        wx.showToast({
+            title: "服务端:" + obj.message,
+            icon : "none"
+        })
+    }else {
+        wx.showToast({
+            title: "code:" + obj.status_code + ", msg:" + obj.message,
+            icon : "none"
+        })
+    }
+}
+
+module.exports = {
+    errInfo
+}
--- a/api/index.js
+++ b/api/index.js
@@ -0,0 +1,43 @@
+/*
+  * 手太欠
+  * 愿这世界都如故事里一样 美好而动人~
+*/
+
+//  授权登录
+import auth from "./interfaces/auth"
+
+//  图片上传
+import file from "./interfaces/file"
+
+//  首页
+import index from "./interfaces/index"
+
+ //  商城
+ import mall from "./interfaces/mall"
+
+//  会员
+import member from "./interfaces/member"
+
+//  库存
+import stock from "./interfaces/stock"
+
+//  我的
+import user from "./interfaces/user"
+
+//  饮水打卡
+import water from "./interfaces/water"
+
+//  健康答案
+import record from "./interfaces/record"
+
+export default {
+    auth,
+    file,
+    index,
+    mall,
+    member,
+    stock,
+    user,
+    water,
+    record
+}
--- a/api/interfaces/auth.js
+++ b/api/interfaces/auth.js
@@ -0,0 +1,31 @@
+/*
+  * 手太欠
+  * 愿这世界都如故事里一样 美好而动人~
+*/
+
+import { req } from "../request"
+
+//验证码登录
+const smsAuth = data => req({
+    url: "user/auth/sms",
+    method: "POST",
+    data: data
+})
+
+//获取验证码
+const getSms = data => req({
+    url: "user/auth/verify",
+    method: "POST",
+    data: data
+})
+
+//隐私+协议
+const registeragree = (website) => req({
+    url: "cms/pages/" + website
+})
+
+export default ({
+    smsAuth,
+    getSms,
+    registeragree
+})
--- a/api/interfaces/file.js
+++ b/api/interfaces/file.js
@@ -0,0 +1,17 @@
+/*
+ * 图图片上传公用接口
+*/
+import { upload } from "../request"
+
+//图上传
+const uploadImg = (imgPaht, data) => upload({
+    url: "storage/upload",
+    method: "POST",
+    key: "upload",
+    path: imgPaht,
+    data: data
+})
+
+export default ({
+    uploadImg
+})
--- a/api/interfaces/index.js
+++ b/api/interfaces/index.js
@@ -0,0 +1,46 @@
+ /*
+  * 手太欠
+  * 愿这世界都如故事里一样 美好而动人~
+*/
+
+import { req } from "../request"
+
+// 商城首页
+const home = () => req({
+    url: "mall"
+})
+
+// 文章-列表
+const articlesList = (data) => req({
+    url: "cms/articles",
+    data: data
+})
+
+// 文章-详情
+ const articlesSee = (article_id) => req({
+    url: "cms/articles/" + article_id
+})
+
+// 文章-分类
+const articlesClass = () => req({
+    url: "cms/categories"
+})
+
+// 文章-收藏
+const articlesFavorite = (article_id) => req({
+    url: "cms/articles/favorite/" + article_id
+})
+
+// 文章-点赞
+const articlesSubscribe = (article_id) => req({
+    url: "cms/articles/subscribe/" + article_id
+})
+
+export default ({
+    home,
+    articlesList,
+    articlesSee,
+    articlesClass,
+    articlesFavorite,
+    articlesSubscribe
+})
--- a/api/interfaces/mall.js
+++ b/api/interfaces/mall.js
@@ -0,0 +1,49 @@
+ /*
+ * 手太欠
+ * 愿这世界都如故事里一样 美好而动人~
+ */
+
+import {req} from "../request"
+
+//商城首页
+const index = () => req({url: "mall"})
+
+//商品详情
+const goodsShow = (goods) => req({url: "mall/goods/" + goods})
+
+//创建订单
+const foundOrder = (data) => req({url: "mall/buy/goods", data: data})
+
+//确认订单
+const affirmOrder = (data) => req({url: "mall/buy/goods", method: 'POST', data: data})
+
+//水滴支付
+const affirmPay = (order_no, data) => req({url: "mall/pay/" + order_no + "/score", method: 'POST', data: data})
+
+//文章详情
+const articlesSee = (article_id) => req({url: "cms/articles/" + article_id})
+
+// //文章列表
+const articlesList = (data) => req({url: "cms/articles", data: data})
+//收藏
+const favorite = (article_id) => req({url: "cms/articles/favorite/" + article_id})
+//点赞
+const subscribe = (article_id) => req({url: "cms/articles/subscribe/" + article_id})
+//文章列表-全部分类
+const classifysAll = () => req({url: "cms/categories"})
+//文章列表-全部
+const favorites = (data) => req({url: "cms/articles", data: data})
+
+export default({
+    index,
+    goodsShow,
+    foundOrder,
+    affirmOrder,
+    affirmPay,
+    articlesSee,
+    articlesList,
+    favorite,
+    subscribe,
+    classifysAll,
+    favorites
+})
--- a/api/interfaces/member.js
+++ b/api/interfaces/member.js
@@ -0,0 +1,67 @@
+ /*
+  * 手太欠
+  * 愿这世界都如故事里一样 美好而动人~
+*/
+
+import { req } from "../request"
+
+// 会员开通-前置
+const openSee = (identity) => req({
+    url: "user/identities/" + identity
+})
+
+// 会员开通-取可开通身份内容
+const identitieSee = (identity_id) => req({
+    url: "user/identities/create/" + identity_id
+})
+
+// 会员开通-提交
+const openIndex = (identity_id, data) => req({
+    url: "user/identities/create/" + identity_id,
+    method: 'POST',
+    data: data
+})
+
+// 会员开通-展示
+const openModel = () => req({
+    url: "user/identities"
+})
+
+// 会员开通-获取升级单信息
+const orderSee = (order_id) => req({
+    url: "user/identities/order/" + order_id
+})
+
+// 会员开通-编辑凭证
+const orderSubmit = (order_id, data) => req({
+    url: "user/identities/order/" + order_id,
+    method: 'POST',
+    data: data
+})
+
+// 获取小程序openid
+const openid = (data) => req({
+    url: "user/auth/mini_openid",
+    data: data
+})
+
+// 微信支付-商品
+const wechatPay = (order_no, data) => req({
+    url: "mall/pay/" + order_no + "/wechat",
+    data: data
+})
+
+// 确认开通身份
+const identityPay = (order_id, data) => req({url: "user/identities/pay/" + order_id + "/wechat", data: data})
+
+export default ({
+    openSee,
+    identitieSee,
+    openIndex,
+    openModel,
+    orderSee,
+    orderSubmit,
+    openid,
+    wechatPay,
+    identityPay
+})
--- a/api/interfaces/record.js
+++ b/api/interfaces/record.js
@@ -0,0 +1,37 @@
+ /*
+ * 手太欠
+ * 愿这世界都如故事里一样 美好而动人~
+ */
+
+import {req} from "../request"
+
+//舌诊检测
+const tongue = data => req({
+    url: "ais/tongue",
+    method: "POST",
+    data: data
+})
+
+//舌象类型详情
+const aiSee = (tongue_id) => req({
+    url: "ais/tongue/" + tongue_id
+})
+
+//舌象类型结果
+const types = (tongue_id, data) => req({
+    url: "ais/tongue/" + tongue_id + "/types",
+    data: data
+})
+
+//舌诊检测列表
+const aiList = data => req({
+    url: "ais/tongue",
+    data: data
+})
+
+export default({
+    tongue,
+    aiSee,
+    types,
+    aiList
+})
--- a/api/interfaces/stock.js
+++ b/api/interfaces/stock.js
@@ -0,0 +1,65 @@
+ /*
+  * 手太欠
+  * 愿这世界都如故事里一样 美好而动人~
+*/
+
+import { req } from "../request"
+
+//  提货-前置
+const pick = () => req({
+    url: "user/stock/pick"
+})
+
+//  提货-列表记录
+const list = (data) => req({
+    url: "user/stock",
+    data: data
+})
+
+//  提货-账变记录
+const logs = (data) => req({
+    url: "user/stock/logs",
+    data: data
+})
+
+//  提货-提交
+const pickTake = (data) => req({
+    url: "user/stock/pick",
+    method: 'POST',
+    data: data
+})
+
+//  地址-列表
+const siteList = () => req({
+    url: "mall/addresses"
+})
+
+//  地址-新增
+const siteAdd = (data) => req({
+    url: "mall/addresses",
+    method: 'POST',
+    data: data
+})
+
+//  地址-删除
+const siteDel = (address) => req({
+    url: "mall/addresses/" + address,
+    method: 'DELETE'
+})
+
+//  地址-省市区获取
+const create = (data) => req({
+    url: "mall/addresses/create",
+    data: data
+})
+
+export default ({
+    pick,
+    list,
+    logs,
+    pickTake,
+    siteList,
+    siteAdd,
+    siteDel,
+    create
+})
--- a/api/interfaces/user.js
+++ b/api/interfaces/user.js
@@ -0,0 +1,108 @@
+ /*
+  * 手太欠
+  * 愿这世界都如故事里一样 美好而动人~
+*/
+
+import { req } from "../request"
+
+//首页
+const home = () => req({
+    url: "user"
+})
+
+// 我的推广码
+const invite = () => req({
+    url: "user/invite"
+})
+
+//任务列表
+const taskList = (data) => req({
+    url: "tasks",
+    data: data
+})
+
+//任务分类
+const taskIndex = () => req({
+    url: "tasks/categories"
+})
+
+//上传头像
+const setting = (key,data) => req({
+    url: "user/setting/" + key,
+    method: 'PUT',
+    data: data
+})
+
+//小程序码
+const miniShare = (data) => req({
+    url: "user/mini_share",
+    data: data
+})
+
+//我的收藏
+const favorites = (data) => req({
+    url: "user/favorites",
+    data: data
+})
+
+//产品中心-分类
+const mallCategories = (data) => req({
+    url: "mall/categories",
+    data: data
+})
+
+//产品中心-列表
+const mallGoods = (data) => req({
+    url: "mall/goods",
+    data: data
+})
+
+//订单
+const orders = (data) => req({
+    url: "mall/orders",
+    data: data
+})
+
+//订单详情
+const goodsDet = (order_no) => req({
+    url: "mall/orders/" + order_no
+})
+
+//订单签收
+const goodsSign = (order_no) => req({
+    url: "mall/orders/" + order_no + "/sign",
+    method: 'PUT'
+})
+
+// 邀请码背景
+const poster = (data) => req({
+    url: "poster",
+    data: data
+})
+
+//水滴账户
+const score = (data) => req({url: "user/account/score", data: data})
+
+//水滴商城-列表
+const scoresGoods = (data) => req({
+    url: "mall/goods/scores",
+    data: data
+})
+
+export default ({
+    home,
+    invite,
+    taskList,
+    taskIndex,
+    setting,
+    miniShare,
+    favorites,
+    mallCategories,
+    mallGoods,
+    orders,
+    goodsDet,
+    goodsSign,
+    poster,
+    score,
+    scoresGoods
+})
--- a/api/interfaces/water.js
+++ b/api/interfaces/water.js
@@ -0,0 +1,37 @@
+/*
+  * 手太欠
+  * 愿这世界都如故事里一样 美好而动人~
+*/
+
+import { req } from "../request"
+
+//初始化接口
+const Init = () => req({
+    url: "drink/init"
+})
+
+// 基本资料初始化
+const Base = () => req({
+    url: "drink/base/init"
+})
+
+//提交基本资料
+const Store = data => req({
+    url: "drink/base/store",
+    method: "POST",
+    data: data
+})
+
+//添加饮用水
+const Drink = data => req({
+    url: "drink/drink",
+    method: "POST",
+    data: data
+})
+
+export default ({
+    Init,
+    Base,
+    Store,
+    Drink
+})
--- a/api/request.js
+++ b/api/request.js
@@ -0,0 +1,139 @@
+/*
+ * 手太欠
+ * 愿这世界都如故事里一样 美好而动人~
+*/
+
+import {errInfo} from './err'
+import {updToken} from './updateToken'
+
+// 请求方式配置
+// https://apitest.siyuankunlun.com //测试地址
+// https://api.siyuankunlun.com //正式地址
+
+// wxecf8786d25af47b3  正式appid
+const api 	 = "https://apitest.siyuankunlun.com/api/"
+// const api 	 = "https://api.siyuankunlun.com/api/"
+
+const header = {
+	"Accept"	: "application/json"
+}
+let isToken = true
+
+/**
+ * 请求
+ * @property {Object} req 
+ */
+
+const req = (obj, noToken) => {
+	// 检查是否无需要token
+	if(noToken != undefined){
+		isToken = noToken
+	}
+
+	// header
+	if(obj.token){
+		header.Authorization = obj.token || ''
+	} else {
+		header.Authorization = wx.getStorageSync("token") || ""
+	}
+
+	// 处理请求信息
+	return new Promise((resolve, reject) => {
+		// 组合header
+		obj.header = {
+			"Accept"		: "application/json",
+			"Authorization"	: wx.getStorageSync("token") || ""
+		}
+		if(!isToken){
+			obj.header.Authorization = ''
+		}
+		wx.request({
+			url		: api + obj.url,
+			header	: obj.header || {},
+			method	: obj.method || 'GET',
+			data	: obj.data   || {},
+			success	: res => {
+				// 更新token
+				if (res.header.Authorization) updToken(res.header.Authorization)
+				// 处理信息
+				if (res.data.status_code == 200) {
+					resolve(res.data)
+				} else {
+					if (res.data.status_code == 401 || res.data.status_code == 400) {
+						reject({
+							login	: false,
+							codeBeen: false
+						})
+					}
+					errInfo(res.data)
+				}
+			},
+			fail: err => {
+                console.log(err)
+				wx.showToast({
+					title : err.errMsg,
+					icon  : "none"
+				})
+				reject(err)
+			},
+			complete(){
+				if(!isToken) isToken = true
+			}
+		})
+	})
+}
+
+
+/**
+ * 上传
+ * @property {Object} upload 
+ */
+
+const upload = (obj) => {
+	// header
+	header.Authorization = wx.getStorageSync("token") || ""
+	// 处理上传信息
+	return new Promise((resolve, reject) => {
+		wx.showLoading({
+			title: "上传中..",
+			mask: true
+		})
+		wx.uploadFile({
+			url		: api + obj.url,
+			header	: header,
+			name	: obj.key || "",
+			filePath: obj.path || "",
+			formData: obj.data || {},
+			success	: res=>{
+				wx.hideLoading();
+				// 处理返回值
+				let jsonData = JSON.parse(res.data)
+				// 更新token
+				if (res.header.Authorization) updToken(res.header.Authorization)
+				// 处理信息
+				if (jsonData.status_code == 200) {
+					resolve(jsonData.data)
+				} else {
+					if (jsonData.status_code == 401) {
+						reject({
+							login: false
+						})
+					}
+					errInfo(jsonData)
+				}
+			},
+			fail	: err=>{
+				wx.showToast({
+					title : err.errMsg,
+					icon  : "none"
+				})
+				reject(err)
+			}
+		})
+	})
+}
+
+module.exports = {
+	req,
+	upload
+}
--- a/api/updateToken.js
+++ b/api/updateToken.js
@@ -0,0 +1,21 @@
+ /*
+ * 手太欠
+ * 愿这世界都如故事里一样 美好而动人~
+ */
+
+/**
+ * 更新token
+ * @property {String} updToken 
+ */
+
+const updToken = (token) =>{
+    // 更新全局存储器
+    getApp().globalData.token = token
+    // 更新客户端登录缓存
+    wx.setStorageSync('token', token)
+}
+
+module.exports = {
+    updToken
+}
+
--- a/app.js
+++ b/app.js
@@ -0,0 +1,69 @@
+/*
+ * 手太欠
+ * 愿这世界都如故事里一样 美好而动人~
+ */
+
+import api from "api/index"
+
+App({
+	onLaunch(e) {
+        let { scene } = e
+        // 检查入口场景值
+        if(scene === 1011 || scene === 1047 || scene === 1124 || scene === 1089 || scene === 1038){
+            this.globalData.isOfficial = true
+        }
+
+		// 检查用户登录状态
+		const token = wx.getStorageSync("token")
+		if(token){
+			this.globalData.isUser = true
+		}
+
+		// 检查系统更新
+		const updateManager = wx.getUpdateManager()
+		updateManager.onUpdateReady(function () {
+			wx.showModal({
+				title	: '更新提示',
+				content	: '新版本已经准备好，是否重启应用？',
+				cancelColor: '#666',
+				confirmColor: '#e50d01',
+				success	: res=> {
+					if (res.confirm) {
+						updateManager.applyUpdate()
+					}
+				}
+			})
+		})
+		updateManager.onUpdateFailed(function(){
+			wx.showModal({
+				title	: '更新提示',
+				content	: '版本更新下载失败，请检查您的网络稍后重试',
+				showCancel: false,
+				confirmColor: '#e50d01'
+			})
+		})
+		
+		// 获取系统信息
+		wx.getSystemInfo({
+			success: res=>{
+				this.globalData.systInfo = {
+					statusBarHeight: res.statusBarHeight,
+					safeArea	   : res.safeArea
+				}
+			}
+        })
+
+		// 挂载api
+        wx.$api = api
+    },
+	globalData: {
+        systInfo    : '',
+		isUser      : false,
+        token       : "",
+        isOfficial  : false,
+        invite      : "",
+        safeArea    : '',
+        statusBarHeight: wx.getSystemInfoSync().statusBarHeight,
+        jiaonangheight: wx.getMenuButtonBoundingClientRect().height
+	}
+})
--- a/app.json
+++ b/app.json
@@ -0,0 +1,84 @@
+{
+    "pages": [
+        "pages/index/index",
+        "pages/login/index",
+        "pages/login/agreement/agreement",
+        "pages/user/index",
+        "pages/record/index",
+        "pages/clock/index",
+        "pages/user/about/about",
+        "pages/user/code/code",
+        "pages/user/collect/collect",
+        "pages/order/list/index",
+        "pages/order/details/index",
+        "pages/record/list/list",
+        "pages/record/detail/detail",
+        "pages/record/share/share",
+        "pages/clock/base/base",
+        "pages/stock/index",
+        "pages/stock/site/index",
+        "pages/stock/addSite/index",
+        "pages/stock/take/index",
+        "pages/stock/list/index",
+        "pages/stock/detailed/index",
+        "pages/stock/examine/index",
+        "pages/article/index",
+        "pages/article/info/info",
+        "pages/article/articleList/index",
+        "pages/mall/buy/index",
+        "pages/mall/submit/index",
+        "pages/mall/goods/index",
+        "pages/mall/details/index",
+        "pages/member/index",
+        "pages/member/open/open",
+        "pages/member/examine/examine",
+        "pages/member/cause/cause",
+        "pages/water/index",
+        "pages/water/product/index"
+    ],
+    "window": {
+        "backgroundTextStyle": "light",
+        "navigationBarBackgroundColor": "#fff",
+        "navigationBarTitleText": "锶源昆仑",
+        "navigationBarTextStyle": "black"
+    },
+    "tabBar": {
+        "list": [
+            {
+                "pagePath": "pages/index/index",
+                "text": "锶源昆仑",
+                "iconPath": "/static/tabBarIcon/00.png",
+                "selectedIconPath": "/static/tabBarIcon/00_active.png"
+            },
+            {
+                "pagePath": "pages/record/index",
+                "text": "健康档案",
+                "iconPath": "/static/tabBarIcon/01.png",
+                "selectedIconPath": "/static/tabBarIcon/01_active.png"
+            },
+            {
+                "pagePath": "pages/clock/index",
+                "text": "饮水打卡",
+                "iconPath": "/static/tabBarIcon/02.png",
+                "selectedIconPath": "/static/tabBarIcon/02_active.png"
+            },
+            {
+                "pagePath": "pages/member/index",
+                "text": "锶源会员",
+                "iconPath": "/static/tabBarIcon/04.png",
+                "selectedIconPath": "/static/tabBarIcon/04_active.png"
+            },
+            {
+                "pagePath": "pages/user/index",
+                "text": "锶人中心",
+                "iconPath": "/static/tabBarIcon/03.png",
+                "selectedIconPath": "/static/tabBarIcon/03_active.png"
+            }
+        ],
+        "color": "#999999",
+        "selectedColor": "#111111",
+        "borderStyle": "white"
+    },
+    "style": "v2",
+    "sitemapLocation": "sitemap.json"
+}
--- a/app.wxss
+++ b/app.wxss
@@ -0,0 +1,78 @@
+/**app.wxss**/
+.container {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: space-between;
+  padding: 200rpx 0;
+  box-sizing: border-box;
+} 
+
+/* 上拉加载 */
+.pagesLoding {
+    text-align: center;
+    line-height: 90rpx;
+    color: gray;
+    font-size: 28rpx;
+}
+
+.pagesLoding-icon {
+    width: 28rpx;
+    height: 28rpx;
+    vertical-align: middle;
+    margin-right: 10rpx;
+    margin-bottom: 3rpx;
+}
+
+
+/*
+ *  文字截取
+ */
+
+.nowrap {
+    max-width: 100%;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+}
+
+.nowrap-multi {
+    display: -webkit-box;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 2;
+}
+
+/*
+ *  水平居中
+ */
+
+.pack-center {
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-box-pack: center;
+    position: absolute;
+    left: 0;
+    right: 0;
+    top: 0;
+    bottom: 0;
+    z-index: -1;
+}
+
+/*
+* 页面信息提醒
+*/
+
+.pages-hint {
+    text-align: center;
+    color: #747788;
+    font-size: 28rpx;
+    background: white;
+}
+
+.pages-hint image {
+    width: 188rpx;
+    height: 188rpx;
+}
--- a/components/milliliter-input/milliliter-input.js
+++ b/components/milliliter-input/milliliter-input.js
@@ -0,0 +1,115 @@
+// components/milliliter-input/milliliter-input.js
+
+/** 附带输入框的数字拨盘自定义组件，封装了milliliter自定义组件
+ *  在引用页面使用 this.selectComponent() 获取组件对象，调用 number 可获取组件值
+ *  careate by DH.tab
+ *  2021/07/14
+ */
+Component({
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    /** 最大值 */
+    max: { type: Number, value: 120 },
+    /** 最小值 */
+    min: { type: Number, value: 0 },
+    /** 值 */
+    value: { type: Number, value: 0 },
+    /** 单位名称 */
+    unitName: { type: String },
+    /** 单位值 */
+    unitVal: { type: String, value: '厘米' },
+    /** 是否精确到3位小数 */
+    float: { type: Boolean, value: false },
+    /** 是否不可为空 */
+    noEmpty: { type: Boolean, value: false },
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+    number: 0,
+    isblur: true,
+    first: true
+  },
+
+  attached() {
+      if(this.data.unitName == '身高') {
+        this.setData({ number: 160 })
+      } else {
+        this.setData({ number: 65 })
+      }
+  },
+
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    /** 数字拨盘值改变事件 */
+    changeNumber(e) {
+      if (this.data.first)
+        this.setData({ first: false })
+      else
+        this.setData({ number: e.detail })
+    },
+
+    // 文本框获得焦点
+    onNumberFocus(e) {
+      this.setData({ isblur: false })
+    },
+
+    // 文本框输入事件
+    onNumberInput(e) {
+      let val = e.detail.value
+
+      // 检查是否出现多个小数点
+      let a = val.toString().indexOf('.'),
+        b = val.toString().lastIndexOf('.'),
+        res = '';
+
+      if (a != b) {
+        let t = val.toString().split('')
+        t.splice(t.lastIndexOf('.'), 1)
+        res = t.join('')
+        this.setData({ number: res })
+      }
+    },
+
+    // 文本框失去焦点
+    onNumberBlur(e) {
+      let val = e.detail.value
+
+      // 检查输入值是否溢出上限或下限
+      if (parseInt(val) > this.data.max)
+        val = this.data.max
+      if (parseInt(val) < this.data.min)
+        val = this.data.min
+
+      // 检查是否需要保留2位小数
+      if (this.data.float) {
+        let t = val.toString().split('.')
+        if (t.length > 1 && t[1].length > 3)
+          val = `${t[0]}.${t[1].substr(0, 3)}`
+        this.setData({
+          value: parseFloat(val),
+          number: parseFloat(val)
+        })
+      } else {
+        let tmp = val.toString().split('.')
+        if (tmp.length > 1)
+          this.setData({
+            value: parseFloat(tmp[0] + '.' + tmp[1].substr(0, 1)),
+            number: parseFloat(tmp[0] + '.' + tmp[1].substr(0, 1))
+          })
+        else
+          this.setData({
+            value: parseFloat(val),
+            number: parseFloat(val)
+          })
+      }
+      this.setData({ isblur: true })
+    },
+  }
+})
--- a/components/milliliter-input/milliliter-input.json
+++ b/components/milliliter-input/milliliter-input.json
@@ -0,0 +1,6 @@
+{
+    "component": true,
+    "usingComponents": {
+      "milliliter": "../milliliter/milliliter"
+    }
+}
--- a/components/milliliter-input/milliliter-input.wxml
+++ b/components/milliliter-input/milliliter-input.wxml
@@ -0,0 +1,15 @@
+<!--
+  附带输入框的数字拨盘自定义组件，封装了milliliter自定义组件
+  components/milliliter-input/milliliter-input.wxml
+-->
+<view class="ctrlbox">
+    <view class="title">
+        <text wx:if="{{noEmpty}}">*</text>
+        <view class="title-name">{{unitName}}<text>*</text></view>
+        <view class="title-number">{{number + (isblur?' ':'')}}({{unitName == '体重' ? 'kg': 'cm'}})</view>
+    </view>
+    <milliliter isShow="{{true}}" isWeight="{{float}}" num="{{value}}" startNum="{{min}}" endNum="{{max}}" bind:getNum="changeNumber" />
+    <!-- <view class="numbox">
+        <input type="digit" value="{{number + (isblur?' '+unitVal:'')}}" bindinput="onNumberInput" catchtap="onNumberFocus" bindblur="onNumberBlur" data-key="height" maxlength="10" />
+    </view> -->
+</view>
--- a/components/milliliter-input/milliliter-input.wxss
+++ b/components/milliliter-input/milliliter-input.wxss
@@ -0,0 +1,78 @@
+/* components/milliliter-input/milliliter-input.wxss */
+
+.ctrlbox {
+  width: 100%;
+  /* height: calc(312rpx - 41rpx); */
+  position: relative;
+  left: 50%;
+  transform: translate(-50%, 0);
+  padding-bottom: rpx;
+  overflow: hidden;
+  /* border-bottom: 3rpx dashed #e7e7e7; */
+}
+
+.ctrlbox>.title {
+  width: 100%;
+  height: 40rpx;
+  position: relative;
+  font-size: 30rpx;
+  color: #898d8d;
+  margin-bottom: 30rpx;
+  display: flex;
+}
+
+.title-name {
+    flex: 1;
+    color: #000000;
+}
+
+.title-number {
+    color: #000000;
+}
+
+.title-name text {
+    color: red;
+    padding-left: 10rpx;
+}
+
+.ctrlbox>.numbox {
+  width: 210rpx;
+  height: 73rpx;
+  line-height: 73rpx;
+  position: relative;
+  left: 50%;
+  transform: translate(-50%, 0);
+  background: #f5f5f5;
+  border-radius: 20rpx;
+  margin-top: 10rpx;
+  display: flex;
+  justify-content: center;
+  align-content: center;
+}
+
+.ctrlbox>.numbox>input {
+  width: 100%;
+  height: 100%;
+  line-height: 73rpx;
+  font-size: 30rpx;
+  font-weight: 500;
+  text-align: center;
+  color: #898d8d;
+  position: absolute;
+  left: 0;
+}
+
+.ctrlbox>.numbox>view {
+  width: 100%;
+  height: 100%;
+  line-height: 73rpx;
+  font-size: 30rpx;
+  font-weight: 500;
+  text-align: center;
+  color: #898d8d;
+}
+
+.ctrlbox>.title>text {
+  color: #fc0000;
+  margin-right: 10rpx;
+}
--- a/components/milliliter/milliliter.js
+++ b/components/milliliter/milliliter.js
@@ -0,0 +1,122 @@
+Component({
+  properties: {
+    // 显示开关
+    isShow: { type: Boolean, value: false },
+    // 设置返回单位（true：身高单位保留3位小数点）（false：体重单位保留1位小数点）
+    isWeight: { type: Boolean, value: false },
+    // 当前指数
+    num: {
+      type: Number, value: 0, observer: function () {
+        this.init()
+      }
+    },
+    // 最短指数
+    startNum: { type: Number, value: 0 },
+    // 最长指数
+    endNum: { type: Number, value: 200 },
+  },
+
+  data: {
+    type: '',
+    scrollWidth: 0,
+    scrollLeft: 0,
+    isEditVal: false,
+    currval: 0
+  },
+
+  methods: {
+    // 初始化
+    init() {
+      let { num } = this.data
+      this.setData({ displayNum: num })
+      if (num) {
+        if (this.data.scrollWidth) {
+          // 手动修改修改指数位置
+          this.setNum()
+        } else {
+          // 初始化修改指数位置
+          this.setData({ type: 'init', scrollLeft: 1 })
+        }
+      } else {
+        this.setData({ scrollLeft: 0 })
+      }
+    },
+
+    // (初始化/手动修改) 修改指数位置
+    setNum() {
+      // 当前指数
+      let { num } = this.data
+      // 只保留一位小数
+      num = Math.floor(num * 10) / 10
+      // 总宽度
+      let { scrollWidth, startNum, endNum } = this.data
+      // 10 / 20 * 100 == 50%
+      // 50% / 100 * 20 == 10
+      // 前后宽总值
+      let restValue = 20
+      // 实际总值
+      let value = endNum - startNum
+      // 得出前后宽占总宽的百分比 [+1以勉误差]
+      let restPercent = ((restValue + 1) / (restValue + value) * 100)
+      // 实际宽度 = (总宽度 - 前后宽度)
+      let width = scrollWidth - (restPercent / 100 * scrollWidth)
+      // 得出百分比
+      let percent = (num - startNum) / value * 100
+      // 得出x距离[+1以勉误差]
+      let scrollLeft = (percent / 100 * width) + 1
+      this.data.isEditVal = true
+      this.setData({ type: '', scrollLeft: scrollLeft, currval: num })
+    },
+
+    // 监听滚动
+    bindscroll(e) {
+      let { type, startNum, endNum, isWeight } = this.data
+      let { scrollLeft, scrollWidth } = e.detail
+      if (type == 'init') {
+        this.data.scrollWidth = scrollWidth
+        this.setNum()
+      } else {
+        // 前后宽总值
+        let restValue = 20
+        // 实际总值
+        let value = endNum - startNum
+        // 得出前后宽占总宽的百分比 [+1以勉误差]
+        let restPercent = ((restValue + 1) / (restValue + value) * 100)
+        // 实际宽度 = (总宽度 - 前后宽度)
+        let width = scrollWidth - (restPercent / 100 * scrollWidth)
+        // 当前进度百分比
+        let percent = scrollLeft / width * 100
+        // 得出当前百分比对应的值
+        let val1 = (startNum + (percent / 100 * value)).toFixed(1)
+        let list = val1.split('.')
+        let decimals = (list[1] >= 5) ? '' : ''
+        // let decimals = (list[1] >= 5) ? '.5' : '.0'
+        val1 = list[0] + decimals
+        let val2 = (startNum + (percent / 100 * value)).toFixed(0)
+
+        // 保留3位小数点
+        // let val2 = (startNum + (percent / 100 * value)).toFixed(3)
+
+        if (this.data.isEditVal) {
+          val2 = this.data.displayNum
+          this.data.isEditVal = false
+        } else
+          val2 = val2 > value ? value + '' : val2
+        // console.log({
+        //   scrollLeft: '当前x距离' + scrollLeft,
+        //   scrollWidth: '总宽度' + scrollWidth,
+        //   restPercent: '前后宽占总宽的百分比' + restPercent,
+        //   width: '实际宽度' + width,
+        //   percent: '当前进度百分比' + percent,
+        //   val1: '对应的值' + val1
+        // })
+        let res = isWeight ? val2 : val1
+        if(res>=endNum){
+          res=endNum
+        }
+        this.setData({ currval: res })
+        this.triggerEvent('getNum', res);
+      }
+    },
+  },
+})
--- a/components/milliliter/milliliter.json
+++ b/components/milliliter/milliliter.json
@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}
--- a/components/milliliter/milliliter.wxml
+++ b/components/milliliter/milliliter.wxml
@@ -0,0 +1,86 @@
+<view class="content" wx:if="{{isShow}}">
+
+  <view class="box">
+    <scroll-view scroll-x class="scroll-x" id="scroll-view" enhanced="{{true}}" bounces="{{false}}"
+      scroll-left="{{scrollLeft}}" show-scrollbar="{{false}}" bindscroll="bindscroll">
+      <view class="column  long opacity-hide">
+        <view class="line"></view>
+      </view>
+      <view class="column short opacity-hide">
+        <view class="line"></view>
+      </view>
+      <view class="column short opacity-hide">
+        <view class="line"></view>
+      </view>
+      <view class="column short opacity-hide">
+        <view class="line"></view>
+      </view>
+      <view class="column short opacity-hide">
+        <view class="line"></view>
+      </view>
+      <view class="column  long opacity-hide">
+        <view class="line"></view>
+      </view>
+      <view class="column short opacity-hide">
+        <view class="line"></view>
+      </view>
+      <view class="column short opacity-hide">
+        <view class="line"></view>
+      </view>
+      <view class="column short opacity-hide">
+        <view class="line"></view>
+      </view>
+      <view class="column short opacity-hide">
+        <view class="line"></view>
+      </view>
+
+      <block wx:for="{{endNum - startNum + 1}}" wx:key="endNum">
+        <block wx:if="{{item%5 == 0}}">
+          <view class="column long">
+            <view class="line"></view>
+            <view class="val">{{item + startNum}}</view>
+          </view>
+          <view class="column short {{(item == (endNum - startNum))? 'opacity-hide' : ''}}">
+            <view class="line"></view>
+          </view>
+          <view class="column short {{(item == (endNum - startNum))? 'opacity-hide' : ''}}">
+            <view class="line"></view>
+          </view>
+          <view class="column short {{(item == (endNum - startNum))? 'opacity-hide' : ''}}">
+            <view class="line"></view>
+          </view>
+          <view class="column short {{(item == (endNum - startNum))? 'opacity-hide' : ''}}">
+            <view class="line"></view>
+          </view>
+        </block>
+      </block>
+      <view class="column  long opacity-hide">
+        <view class="line"></view>
+      </view>
+      <view class="column short opacity-hide">
+        <view class="line"></view>
+      </view>
+      <view class="column short opacity-hide">
+        <view class="line"></view>
+      </view>
+      <view class="column short opacity-hide">
+        <view class="line"></view>
+      </view>
+      <view class="column short opacity-hide">
+        <view class="line"></view>
+      </view>
+      <view class="column  long opacity-hide">
+        <view class="line"></view>
+      </view>
+    </scroll-view>
+  </view>
+  <image class="pointer" src="https://api.siyuankunlun.com/storage/images/2023/11/15/9ffb11d9bde2ede9acdcd6f5c727f33d.png"></image>
+
+  <view class="shade-left"></view>
+  <!-- <view class="shade-left-hide" style="left:-{{shadeLeftPercent}}%;"></view> -->
+  <!-- <view class="shade-left-hide" style="transform: translateX(-{{shadeLeftPercent}}%);"></view> -->
+  <!-- <view class="shade-left-hide" style="width: {{shadeLeftPercent}}px;"></view> -->
+
+  <!-- <view class="shade-right-hide"></view> -->
+  <view class="shade-right"></view>
+</view>
--- a/components/milliliter/milliliter.wxss
+++ b/components/milliliter/milliliter.wxss
@@ -0,0 +1,115 @@
+.content {
+  width: 681rpx;
+  height: 139rpx;
+  margin: 0 auto;
+  position: relative;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.content .bg {
+  width: 681rpx;
+  height: 139rpx;
+  position: absolute;
+  left: 0;
+  top: 0;
+}
+
+.content .box {
+  width: 654rpx;
+  height: 139rpx;
+  white-space: nowrap;
+}
+
+.content .scroll-x {
+  width: 100%;
+  height: 100%;
+  white-space: nowrap;
+}
+
+.content .scroll-x .column {
+  width: 4.8%;
+  height: 100%;
+  position: relative;
+  display: inline-flex;
+}
+
+.content .scroll-x .column .val {
+  position: absolute;
+  left: 0;
+  bottom: 0;
+  width: 100%;
+  font-size: 22rpx;
+  color: #898d8d;
+  text-align: center;
+}
+
+.content .scroll-x .opacity-hide {
+  opacity: 0;
+}
+
+.content .scroll-x .long .line {
+  width: 4rpx;
+  height: 86rpx;
+  position: absolute;
+  left: 50%;
+  top: 12%;
+  transform: translate(-50%, -12%);
+  background-color: #a4a7a7;
+}
+
+.content .scroll-x .short .line {
+  width: 4rpx;
+  height: 42rpx;
+  position: absolute;
+  left: 50%;
+  top: 30%;
+  transform: translate(-50%, -30%);
+  background-color: #a4a7a7;
+}
+
+.content .pointer {
+  width: 30rpx;
+  height: 100rpx;
+  position: absolute;
+  left: calc(50% + 3rpx);
+  top: 0;
+  transform: translateX(-50%);
+}
+
+.content .shade-left {
+  width: 80rpx;
+  height: 139rpx;
+  position: absolute;
+  left: 0;
+  top: 0;
+  background-image: linear-gradient(to right, #ffffff, rgba(255, 255, 255, 0.38));
+}
+
+.content .shade-left-hide {
+  width: 326rpx;
+  height: 139rpx;
+  position: absolute;
+  left: 0;
+  top: 0;
+  background-color: #fff;
+}
+
+.content .shade-right {
+  width: 80rpx;
+  height: 139rpx;
+  position: absolute;
+  right: 0;
+  top: 0;
+  background-image: linear-gradient(to right, rgba(255, 255, 255, 0.38), #ffffff);
+}
+
+.content .shade-right-hide {
+  width: 320rpx;
+  height: 139rpx;
+  position: absolute;
+  right: 0;
+  top: 0;
+  background-image: linear-gradient(to left, #ffffff, rgba(255, 255, 255, 1));
+}
--- a/pages/article/articleList/index.js
+++ b/pages/article/articleList/index.js
@@ -0,0 +1,92 @@
+ /*
+ * 手太欠
+ * 愿这世界都如故事里一样 美好而动人~
+ */
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        articlesArr : [] ,      //列表
+        page        : {},      //分页信息
+        type        : '',      //类型
+        name        : '',      //名称
+        lodingStats : false,  //加载状态
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+        console.log(options)
+        this.setData({
+            type: options.type
+        })
+        if (options.type == '1') {
+            wx.setNavigationBarTitle({
+                title: '锶源昆仑·记忆'
+            })
+            this.setData({
+                name: 'memory'
+            })
+        } else if (options.type == '2') {
+            wx.setNavigationBarTitle({
+                title: '锶源昆仑·健康百科'
+            })
+            this.setData({
+                name: 'wiki'
+            })
+        }
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+        // 获取列表
+        this.articlesInfo();
+    },
+
+    // 列表
+    articlesInfo(page){
+        wx.$api.mall.articlesList({
+            category_id : this.data.type,
+            page : page || 1
+        }).then(res => {
+            let listArr = this.data.articlesArr,
+                newData = []
+            if(page == 1 || page == undefined) listArr = []
+            newData = listArr.concat(res.data.data)
+            this.setData({
+                articlesArr : newData,
+                page        : res.data.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/article/articleList/index.json
+++ b/pages/article/articleList/index.json
@@ -0,0 +1,3 @@
+{
+    "usingComponents": {}
+}
--- a/pages/article/articleList/index.wxml
+++ b/pages/article/articleList/index.wxml
@@ -0,0 +1,25 @@
+<view class="list" wx:if="{{articlesArr.length > 0}}">
+    <navigator hover-class="none" url="../info/info?id={{item.article_id}}&type={{name}}" class="item" wx:for="{{articlesArr}}" wx:key="articlesArr">
+        <view class="itemCont">
+            <view class="nowrap itemCont-name"><text>{{item.categories[0].slug}}</text> | {{item.title}}</view>
+            <view class="nowrap itemCont-text">{{item.description}}</view>
+            <view class="itemCont-see">
+                <view class="itemCont-icon"><image src="https://api.siyuankunlun.com/storage/materials/2022/10/11/articleIcon_00.png"></image> {{item.clicks}}</view>
+                <view class="itemCont-icon"><image src="https://api.siyuankunlun.com/storage/materials/2022/10/11/articleIcon_01.png"></image>{{item.subscribes}}</view>
+            </view>
+        </view>
+        <image class="itemImg" mode="aspectFill" src="{{item.cover}}"></image>
+    </navigator>
+    <view class="pagesLoding" wx:if="{{lodingStats}}">
+        <block wx:if="{{page.has_more}}">
+            <image class="pagesLoding-icon" src="/static/icon/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/coupon_null.png"></image>
+    <view>暂无数据</view>
+</view>
--- a/pages/article/articleList/index.wxss
+++ b/pages/article/articleList/index.wxss
@@ -0,0 +1,66 @@
+page {
+    padding: 30rpx;
+    box-sizing: border-box;
+    background-color: #f6f6f6;
+}
+
+.item {
+    position: relative;
+    background-color: #ffffff;
+    border-radius: 10rpx;
+    height: 200rpx;
+    margin-bottom: 30rpx;
+}
+
+.itemImg {
+    position: absolute;
+    right: 0;
+    top: 0;
+    width: 200rpx;
+    height: 200rpx;
+    border-radius: 10rpx;
+    overflow: hidden;
+}
+
+.itemCont {
+    position: absolute;
+    left: 0;
+    top: 0;
+    padding: 25rpx 230rpx 0 30rpx;
+    box-sizing: border-box;
+    width: 100%;
+}
+
+.itemCont-name {
+    font-size: 30rpx;
+}
+
+.itemCont-name text {
+    text-transform: uppercase;
+}
+
+.itemCont-text {
+    color: #999;
+    font-size: 26rpx;
+    margin: 15rpx 0 30rpx;
+    font-weight: 200;
+}
+
+.itemCont-see {
+    color: #999;
+    display: flex;
+    font-size: 26rpx;
+    font-weight: 200;
+}
+
+.itemCont-icon {
+    display: flex;
+    margin-right: 50rpx;
+    line-height: 26rpx;
+}
+
+.itemCont-icon image {
+    width: 26rpx;
+    height: 26rpx;
+    margin-right: 10rpx;
+}
--- a/pages/article/index.js
+++ b/pages/article/index.js
@@ -0,0 +1,91 @@
+ /*
+ * 手太欠
+ * 愿这世界都如故事里一样 美好而动人~
+ */
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        articlesArr : [] ,      //列表
+        page        : {},      //分页信息
+        type        : '',      //类型
+        name        : '',      //名称
+        lodingStats : false,  //加载状态
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+        this.setData({
+            type: options.type
+        })
+        if (options.type == '1') {
+            wx.setNavigationBarTitle({
+                title: '锶源昆仑·记忆'
+            })
+            this.setData({
+                name: 'memory'
+            })
+        } else if (options.type == '2') {
+            wx.setNavigationBarTitle({
+                title: '锶源昆仑·健康百科'
+            })
+            this.setData({
+                name: 'wiki'
+            })
+        }
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+        // 获取列表
+        this.articlesInfo();
+    },
+
+    // 列表
+    articlesInfo(page){
+        wx.$api.index.articlesList({
+            category_id : this.data.type,
+            page : page || 1
+        }).then(res => {
+            let listArr = this.data.articlesArr,
+                newData = []
+            if(page == 1 || page == undefined) listArr = []
+            newData = listArr.concat(res.data.data)
+            this.setData({
+                articlesArr : newData,
+                page        : res.data.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/article/index.json
+++ b/pages/article/index.json
@@ -0,0 +1,3 @@
+{
+    "usingComponents": {}
+}
--- a/pages/article/index.wxml
+++ b/pages/article/index.wxml
@@ -0,0 +1,25 @@
+<view class="list" wx:if="{{articlesArr.length > 0}}">
+    <navigator hover-class="none" url="/pages/article/info/info?id={{item.article_id}}&type={{name}}" class="item" wx:for="{{articlesArr}}" wx:key="articlesArr">
+        <view class="itemCont">
+            <view class="nowrap itemCont-name"><text>{{item.categories[0].slug}}</text> | {{item.title}}</view>
+            <view class="nowrap itemCont-text">{{item.description}}</view>
+            <view class="itemCont-see">
+                <view class="itemCont-icon"><image src="http://cdn.siyuankunlun.com/materials/2022/10/11/articleIcon_00.png"></image> {{item.clicks}}</view>
+                <view class="itemCont-icon"><image src="http://cdn.siyuankunlun.com/materials/2022/10/11/articleIcon_01.png"></image>{{item.subscribes}}</view>
+            </view>
+        </view>
+        <image class="itemImg" mode="aspectFill" src="{{item.cover}}"></image>
+    </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>
--- a/pages/article/index.wxss
+++ b/pages/article/index.wxss
@@ -0,0 +1,66 @@
+page {
+    padding: 30rpx;
+    box-sizing: border-box;
+    background-color: #f6f6f6;
+}
+
+.item {
+    position: relative;
+    background-color: #ffffff;
+    border-radius: 10rpx;
+    height: 200rpx;
+    margin-bottom: 30rpx;
+}
+
+.itemImg {
+    position: absolute;
+    right: 0;
+    top: 0;
+    width: 200rpx;
+    height: 200rpx;
+    border-radius: 10rpx;
+    overflow: hidden;
+}
+
+.itemCont {
+    position: absolute;
+    left: 0;
+    top: 0;
+    padding: 25rpx 230rpx 0 30rpx;
+    box-sizing: border-box;
+    width: 100%;
+}
+
+.itemCont-name {
+    font-size: 30rpx;
+}
+
+.itemCont-name text {
+    text-transform: uppercase;
+}
+
+.itemCont-text {
+    color: #999;
+    font-size: 26rpx;
+    margin: 15rpx 0 30rpx;
+    font-weight: 200;
+}
+
+.itemCont-see {
+    color: #999;
+    display: flex;
+    font-size: 26rpx;
+    font-weight: 200;
+}
+
+.itemCont-icon {
+    display: flex;
+    margin-right: 50rpx;
+    line-height: 26rpx;
+}
+
+.itemCont-icon image {
+    width: 26rpx;
+    height: 26rpx;
+    margin-right: 10rpx;
+}
--- a/pages/article/info/info.js
+++ b/pages/article/info/info.js
@@ -0,0 +1,139 @@
+ /*
+ * 手太欠
+ * 愿这世界都如故事里一样 美好而动人~
+ */
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        id              : '', //文章id
+        indexShow       : '', //内容
+        mallContent     : '', //简介
+        favoritesSee    : '', //收藏状态
+        favoritesNumber : '', //收藏数量
+        subscribesSee   : '', //点赞状态
+        subscribesNumber: '', //点赞数量
+        inviteText      : '',  //邀请码
+        isFixedTop      : 0,
+        barHeight       : getApp().globalData.statusBarHeight // 状态栏高度
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+        this.setData({
+            id: options.id
+        })
+        if (options.type == 'memory') {
+            wx.setNavigationBarTitle({
+                title: '锶源昆仑·记忆'
+            })
+        } else if (options.type == 'wiki') {
+            wx.setNavigationBarTitle({
+                title: '锶源昆仑·健康百科'
+            })
+        }
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+        // 获取详情数据
+        this.indexInfo();
+
+        // 获取登录状态
+        if(wx.getStorageSync("token")){
+            // 获取推广码
+            this.inviteInfo();
+        }
+    },
+
+    /**
+     * 推广码
+     */
+    inviteInfo() {
+        wx.$api.user.invite().then(res => {
+            this.setData({
+                inviteText  : res.data.invite
+            })
+        }).catch(err => {})
+    },
+
+    /**
+     * 详情数据
+     */
+    indexInfo () {
+        wx.$api.index.articlesSee(this.data.id).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(newName == 'favorites') {
+            wx.$api.index.articlesFavorite(this.data.id).then(res => {
+                this.setData({
+                    favoritesSee   : res.data.favorite,
+                    favoritesNumber: res.data.count
+                })
+            }).catch(err => {})
+            return
+        }
+
+        // 点赞
+        wx.$api.index.articlesSubscribe(this.data.id).then(res => {
+            this.setData({
+                subscribesSee   : res.data.subscribed,
+                subscribesNumber: res.data.count
+            })
+        }).catch(err => {})
+    },
+
+    /**
+	 * 微信分享
+	 */
+	onShareAppMessage(){
+		return {
+            title	: this.data.indexShow.title,
+            path	: "/pages/index/index?invite=" + this.data.inviteText,
+			imageUrl: this.data.indexShow.cover
+		}
+    },
+    
+    // 返回上一页
+    returnGo() {
+        wx.navigateBack({
+           delta: 1
+        })
+    },
+
+    // 回到首页
+    returnHome() {
+      wx.switchTab({
+        url: '/pages/index/index'
+      })
+    },
+
+    /**
+    * 监听页面滑动事件
+    */
+   onPageScroll(e) {
+        this.setData({
+            isFixedTop: parseInt(e.scrollTop)
+        });
+    },
+})
--- a/pages/article/info/info.json
+++ b/pages/article/info/info.json
@@ -0,0 +1,5 @@
+{
+    "usingComponents": {},
+    "navigationStyle": "custom",
+    "navigationBarTextStyle": "white"
+}
--- a/pages/article/info/info.wxml
+++ b/pages/article/info/info.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/arrowBlack.png' : '/static/icons/arrowWrite.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>{{indexShow.categories[0].slug}}</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="http://cdn.siyuankunlun.com/materials/2022/10/11/articleBanner.jpg"></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="/static/icons/articleIcon_01.png"></image>
+            <text>转发</text>
+        </button>
+        <view class="toolCont-label" bindtap="toolTap" data-name="favorites">
+            <image class="toolCont-label-icon" src="{{!favoritesSee ? '/static/icons/articleIcon_02.png' : '/static/icons/articleIcon_02_active.png'}}"></image>
+            <text>{{favoritesNumber}}</text>
+        </view>
+        <view class="toolCont-label" bindtap="toolTap" data-name="subscribes">
+            <image class="toolCont-label-icon" src="{{!subscribesSee ? '/static/icons/articleIcon_03.png' : '/static/icons/articleIcon_03_active.png'}}"></image>
+            <text>{{subscribesNumber}}</text>
+        </view>
+    </view>
+</view>
--- a/pages/article/info/info.wxss
+++ b/pages/article/info/info.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: #ffffff;
+}
+
+.navigation-arrow {
+    width: 44rpx;
+    height: 44rpx;
+    margin: 20rpx 15rpx 0 20rpx;
+}
--- a/pages/clock/base/base.js
+++ b/pages/clock/base/base.js
@@ -0,0 +1,70 @@
+ /*
+ * 手太欠
+ * 愿这世界都如故事里一样 美好而动人~
+ */
+
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        baseState : false,  // 建议每日饮水量弹出
+        drinkNeed : '',     // 建议每日饮水量
+        recordnum1: 160,    // 身高
+        recordnum2: 65,     // 体重
+        dateValue : '请选择' // 生日选择
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+        
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+        
+    },
+    
+    /**
+     * 生日选择
+     */
+    birthdayChange(e) {
+        this.setData({
+            dateValue: e.detail.value
+        })
+    },
+
+    /**
+     * 提交信息
+     */
+    submitBtn() {
+        let birthday = this.data.dateValue,
+            height   = this.selectComponent('#ctrlmill1').data.number,
+            weight   = this.selectComponent('#ctrlmill2').data.number
+        wx.$api.water.Store({
+            birthday: birthday,
+            height  : height,
+            weight  : weight
+        }).then(res => {
+            console.log(res)
+            this.setData({
+                drinkNeed: res.data.drink.need,
+                baseState: true
+            })
+        }).catch(err => {})
+    },
+
+    /**
+     * 关闭弹窗-并跳走
+     */
+    perfect() {
+        wx.switchTab({
+            url: '/pages/record/index'
+        })
+    }
+})
--- a/pages/clock/base/base.json
+++ b/pages/clock/base/base.json
@@ -0,0 +1,7 @@
+{
+    "usingComponents": {
+        "milliliter": "/components/milliliter/milliliter",
+        "milliliter-input": "/components/milliliter-input/milliliter-input"
+    },
+    "navigationBarTitleText": "完善信息"
+}
--- a/pages/clock/base/base.wxml
+++ b/pages/clock/base/base.wxml
@@ -0,0 +1,39 @@
+<view class="base">
+    <view class="baseTitle">
+        <text>个人信息完善</text>
+        以下信息将帮助我们为您定制个人健康饮水计划
+    </view>
+    <view class="baseWrite">
+        <view class="baseWrite-title">生日<text>*</text></view>
+        <picker class="baseWrite-birthday" bindchange="birthdayChange" mode="date" value="{{dateValue}}" end="2023-12-30">
+            <view class="picker">{{ dateValue }}</view>
+            <image class="baseWrite-birthday-icon" src="/static/icons/userLogin_icon.png"></image>
+        </picker>
+    </view>
+    <view class="baseWrite">
+        <!-- <view class="baseWrite-title"><view class="baseWrite-title-name">身高<text>*</text></view>{{recordnum1}}(cm)</view> -->
+        <milliliter-input id="ctrlmill1" float="{{false}}" unitName="身高" unitVal="身高" max="{{200}}" val="{{recordnum1}}" value="{{recordnum1}}"></milliliter-input>
+    </view>
+    <view class="baseWrite">
+        <!-- <view class="baseWrite-title"><view class="baseWrite-title-name">体重<text>*</text></view>{{recordnum2}}(kg)</view> -->
+        <milliliter-input id="ctrlmill2" float="{{true}}" unitName="体重" unitVal="体重" max="{{200}}" val="{{recordnum2}}" value="{{recordnum2}}"></milliliter-input>
+    </view>
+
+    <view class="baseBtn" bindtap="submitBtn">提交信息</view>
+</view>
+
+<!-- 建议每日饮水量弹出 -->
+<view class="refertoEject {{baseState ? 'active' : ''}}" catchtouchmove='true'></view>
+<view class="refertoCont {{baseState ? 'active' : ''}}" catchtouchmove='true'>
+    <view class="refertoCont-text">
+        <view class="refertoCont-title">通知</view>
+        <image class="refertoCont-ls" src="https://api.siyuankunlun.com/storage/images/2023/11/20/9d8b55b1e388c8bbb17a07ceaa332b50.png" mode="widthFix"></image>
+        <view class="refertoCont-tips">
+            <!-- 建议每日饮水量：<text>{{drinkNeed}}</text>ml -->
+            已完善资料，进行舌诊检测
+        </view>
+        <view class="publicPop-btn">
+            <view class="publicPop-btn-go" bindtap="perfect">确定</view>
+        </view>
+    </view>
+</view>
--- a/pages/clock/base/base.wxss
+++ b/pages/clock/base/base.wxss
@@ -0,0 +1,159 @@
+page { 
+    padding: 30rpx;
+    box-sizing: border-box;
+    background-color: #f6f6f6;
+}
+
+.baseTitle {
+    margin-bottom: 50rpx;
+    font-size: 26rpx;
+}
+
+.baseTitle text {
+    display: block;
+    font-weight: 600;
+    font-size: 32rpx;
+    margin-bottom: 10rpx;
+}
+
+.baseWrite {
+    background-color: #ffffff;
+    padding: 30rpx;
+    box-sizing: border-box;
+    border-radius: 20rpx;
+    box-shadow: 0 0 10rpx rgba(0, 0, 0, .1);
+    margin-bottom: 30rpx;
+}
+
+.baseWrite-title {
+    margin-bottom: 30rpx;
+    display: flex;
+}
+
+.baseWrite-title-name {
+    flex: 1;
+}
+
+.baseWrite-title text {
+    color: red;
+    padding-left: 5rpx;
+}
+
+.baseWrite-birthday {
+    border: 2rpx solid #e7e7e7;
+    margin-top: 30rpx;
+    border-radius: 20rpx;
+    position: relative;
+    line-height: 74rpx;
+    padding: 0 30rpx;
+    box-sizing: border-box;
+    font-size: 30rpx;
+}
+
+.baseWrite-birthday-icon {
+    width: 34rpx;
+    height: 34rpx;
+    position: absolute;
+    right: 30rpx;
+    top: 20rpx;
+}
+
+.baseBtn {
+    text-align: center;
+    background-color: #528cff;
+    color: #ffffff;
+    line-height: 100rpx;
+    margin-top: 80rpx;
+    border-radius: 20rpx;
+    font-weight: 600;
+    font-size: 32rpx;
+    box-shadow: 0 0 10rpx rgba(12, 83, 223, .5);
+}
+
+
+/* 饮水量弹出 */
+.refertoEject {
+    position: fixed;
+    width: 100vw;
+    height: 100vh;
+    left: 0;
+    top: 0;
+    background-color: rgba(0, 0, 0, .6);
+    z-index: 10000;
+    display: none;
+}
+
+.refertoEject.active {
+    display: block;
+}
+
+.refertoCont {
+    -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;
+    text-align: center;
+    display: none;
+}
+
+.refertoCont.active {
+    display: -webkit-box;
+}
+
+.refertoCont-text {
+    background-color: #f6f9fb;
+    border-radius: 20rpx;
+    box-sizing: border-box;
+    position: relative;
+}
+
+.refertoCont-ls {
+    width: 200rpx;
+}
+
+.refertoCont-title {
+    text-align: center;
+    font-weight: 600;
+    padding: 40rpx 0;
+    font-size: 34rpx;
+    box-sizing: border-box;
+}
+
+.refertoCont-tips {
+    line-height: 48rpx;
+    text-align: center;
+    padding: 30rpx 60rpx;
+    box-sizing: border-box;
+}
+
+.refertoCont-tips text {
+    color: #528cff;
+    font-weight: 600;
+    padding-right: 10rpx;
+}
+
+.publicPop-btn {
+    line-height: 80rpx;
+    font-size: 32rpx;
+    display: flex;
+    border-top: 2rpx solid #e6e6e6;
+    padding: 30rpx 50rpx;
+    box-sizing: border-box;
+}
+
+.publicPop-btn-go {
+    width: 100%;
+    color: #ffffff;
+    background-color: #528cff;
+    text-align: center;
+    height: 90rpx;
+    line-height: 90rpx;
+    font-size: 30rpx;
+    border-radius: 90rpx;
+}
--- a/pages/clock/index.js
+++ b/pages/clock/index.js
@@ -0,0 +1,182 @@
+ /*
+ * 手太欠
+ * 愿这世界都如故事里一样 美好而动人~
+ */
+
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        needBase    : '',   // 是否需要完善资料
+        baseState   : false,// 完善资料弹出
+        Drink       : '',   // 饮用量数值
+        Element     : '',   // 摄入成分
+        type        : 'normal',   // 默认普通饮用水
+        scale       : '10', // 默认饮用量
+        number      : 100,  // 默认饮用量值
+        seeNumber   : 100,  // 弹出默认饮用量值
+        waterState  : false,// 选择饮用量
+        isFixedTop  : 0,
+        barHeight   : getApp().globalData.statusBarHeight,  // 状态栏高度
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {},
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+        // 获取登录状态
+        if(wx.getStorageSync("token")){
+            // 获取初始化
+            this.initInfo();
+        }
+    },
+
+    /**
+     * 初始化
+     */
+    initInfo () {
+        wx.$api.water.Init().then(res => {
+            let {drink, element, need_tongue} = res.data
+            if(this.data.type == 'normal') {
+                this.setData({
+                    Drink   : drink.normal
+                })
+            } else {
+                this.setData({
+                    Drink   : drink.sykl
+                })
+            }
+            this.setData({
+                Element : element,
+                needBase: need_tongue
+            })
+        }).catch(err => {})
+    },
+
+    /**
+     * 滑动选择器
+     */
+    slider3change(e) {
+        this.setData({
+            number: e.detail.value,
+            scale: (e.detail.value / 10)
+        })
+    },
+
+    /**
+     * 兑换券数量加减
+     */
+    scaleNumber(e){
+        let num = this.data.number,
+            val = e.currentTarget.dataset.type
+        if (val == 'plus'){
+            num = num + 10;
+        }else{
+            if (num > 100){
+                num = num - 10;
+            }
+            this.setData({
+                number: num
+            })
+        }
+        this.setData({
+            number: num,
+            scale: num / 10
+        })
+    },
+
+    /**
+     * 选择饮品
+     */
+    drinkSelect(e) {
+        this.setData({
+            type : e.currentTarget.dataset.type
+        })
+        // 获取登录状态
+        if(wx.getStorageSync("token")){
+            // 获取初始化
+            this.initInfo();
+        }
+    },
+
+    /**
+     * 喝水打卡
+     */
+    drinkTap() {
+        // 获取登录状态
+        if(wx.getStorageSync("token")){
+            // 是否需要完善资料
+            if(this.data.needBase) {
+                this.setData({
+                    baseState: true
+                })
+                return
+            }
+            this.setData({
+                waterState  : true,
+                number      : 100,
+                scale       : 100 / 10
+            })
+            return
+        }
+
+        // 去登录
+        wx.navigateTo({
+            url: "/pages/login/index"
+        })
+    },
+
+    /**
+     * 关闭选择饮品弹窗
+     */
+    drinkCancel() {
+        this.setData({
+            waterState  : false
+        })
+    },
+
+    /**
+     * 确认饮用量
+     */
+    drinkSure() {
+        wx.$api.water.Drink({
+            type: this.data.type,
+            ml  : this.data.number
+        }).then(res => {
+            this.setData({
+                waterState: false
+            })
+            
+            // 获取初始化
+            this.initInfo();
+        }).catch(err => {})
+    },
+
+    /**
+     * 关闭完善资料弹出
+     */
+    establish() {
+        this.setData({
+            baseState: false
+        })
+    },
+
+    /**
+     * 完善资料跳转
+     */
+    perfect() {
+        this.setData({
+            baseState: false
+        })
+        wx.switchTab({
+            url: '/pages/record/index'
+        })
+    }
+})
--- a/pages/clock/index.json
+++ b/pages/clock/index.json
@@ -0,0 +1,5 @@
+{
+    "usingComponents": {},
+    "navigationStyle": "custom",
+    "navigationBarTextStyle": "white"
+}
--- a/pages/clock/index.wxml
+++ b/pages/clock/index.wxml
@@ -0,0 +1,135 @@
+<view class="navigation {{isFixedTop > 50 ? 'active' : ''}}" style="padding-top:{{barHeight}}px;">
+    <image class="navigation-arrow" src="https://api.siyuankunlun.com/storage/images/2023/11/15/54dcd352eff2d8ad1f985a8374df09cd.png" mode="widthFix"></image>
+</view>
+
+<view class="monster" style="padding-top: {{barHeight + 60}}px">
+    <view class="monsterBack">
+        <image class="monsterImg" src="https://api.siyuankunlun.com/storage/images/2023/11/14/b2687f50c2829ea28ba5efa598699382.png" mode="aspectFill"></image>
+        <view class="monsterBar" style="height: {{Drink.rate}}%;"></view>
+    </view>
+    <view class="monsterMark">
+        <view class="monsterMark-total">{{Drink.rate ? Drink.rate : '0'}}%</view>
+        <view class="monsterMark-see"><text>{{Drink.current ? Drink.current : '0'}}</text> / {{Drink.need ? Drink.need : '0'}}ml</view>
+    </view>
+</view>
+
+<!-- 摄入成分 -->
+<view class="monsterPart">
+    <view class="monsterPart-name">摄入成分</view>
+    <scroll-view class="monsterPart-list" scroll-x="true" scroll-with-animation>
+        <block wx:if="{{type == 'sykl'}}">
+            <view class="monsterPart-item">
+                <view class="monsterPart-item-name">{{Element.sr ? Element.sr : '0'}}mg</view>
+                <view class="monsterPart-item-text">锶</view>
+            </view>
+            <view class="monsterPart-item">
+                <view class="monsterPart-item-name">{{Element.mg ? Element.mg : '0'}}mg</view>
+                <view class="monsterPart-item-text">镁</view>
+            </view>
+            <view class="monsterPart-item">
+                <view class="monsterPart-item-name">{{Element.k ? Element.k : '0'}}mg</view>
+                <view class="monsterPart-item-text">钾</view>
+            </view>
+            <view class="monsterPart-item">
+                <view class="monsterPart-item-name">{{Element.ca ? Element.ca : '0'}}mg</view>
+                <view class="monsterPart-item-text">钙</view>
+            </view>
+            <view class="monsterPart-item">
+                <view class="monsterPart-item-name">{{Element.na ? Element.na : '0'}}mg</view>
+                <view class="monsterPart-item-text">钠</view>
+            </view>
+        </block>
+        <block wx:else>
+            <view class="monsterPart-item">
+                <view class="monsterPart-item-name">0mg</view>
+                <view class="monsterPart-item-text">锶</view>
+            </view>
+            <view class="monsterPart-item">
+                <view class="monsterPart-item-name">0mg</view>
+                <view class="monsterPart-item-text">镁</view>
+            </view>
+            <view class="monsterPart-item">
+                <view class="monsterPart-item-name">0mg</view>
+                <view class="monsterPart-item-text">钾</view>
+            </view>
+            <view class="monsterPart-item">
+                <view class="monsterPart-item-name">0mg</view>
+                <view class="monsterPart-item-text">钙</view>
+            </view>
+            <view class="monsterPart-item">
+                <view class="monsterPart-item-name">0mg</view>
+                <view class="monsterPart-item-text">钠</view>
+            </view>
+        </block>
+    </scroll-view>
+</view>
+
+<!-- 选择饮品 -->
+<view class="drink">
+    <view class="drinkCont">
+        <view class="drinkCont-name">点击选择饮品</view>
+        <view class="drinkCont-list">
+            <view class="drinkCont-item {{type == 'normal' ? 'active' : ''}}" bindtap="drinkSelect" data-type="normal">
+                <image class="drinkCont-item-img" src="https://api.siyuankunlun.com/storage/images/2023/11/14/ada23c13f22a726653c106fb52f31697.png" mode="widthFix"></image>
+                <view class="drinkCont-item-name">普通饮用水</view>
+            </view>
+            <view class="drinkCont-item {{type == 'sykl' ? 'active' : ''}}" bindtap="drinkSelect" data-type="sykl">
+                <image class="drinkCont-item-img" src="https://api.siyuankunlun.com/storage/images/2023/11/14/fe52208e765917ffdf29150cf82dc49f.png" mode="widthFix"></image>
+                <view class="drinkCont-item-name">锶源昆仑天然水</view>
+            </view>
+        </view>
+    </view>
+</view>
+
+<view class="drinkBtn">
+    <view class="drinkBtn-go" bindtap="drinkTap">喝水</view>
+</view>
+
+<!-- 饮水弹出 -->
+<view class="waterBack {{waterState ? 'active' : ''}}"></view>
+<view class="waterPop {{waterState ? 'active' : ''}}">
+    <View class="waterPop-top">
+        <view class="waterPop-top-label waterPop-top-cancel" bindtap="drinkCancel">取消</view>
+        <view class="waterPop-top-label waterPop-name">选择饮用量</view>
+        <view class="waterPop-top-label waterPop-sure" bindtap="drinkSure">确定</view>
+    </View>
+
+    <view class="waterPop-type">
+        <image src="{{type == 'sykl' ? 'https://api.siyuankunlun.com/storage/images/2023/11/14/fe52208e765917ffdf29150cf82dc49f.png' : 'https://api.siyuankunlun.com/storage/images/2023/11/14/ada23c13f22a726653c106fb52f31697.png'}}" class="waterPop-type-cont-img" mode="widthFix"></image>
+        <view class="waterPop-type-cont">
+            <view class="waterPop-type-name">{{type == 'sykl' ? '锶源昆仑天然水' : '普通饮用水'}}</view>
+            <view class="waterPop-type-text">饮用量：{{Drink.current ? Drink.current : '0'}}ml - {{Drink.need ? Drink.need : '0'}}ml</view>
+        </view>
+    </view>
+
+    <view class="waterPop-scale">
+        <view class="waterPop-scale-pot">
+            <image class="waterPop-scale-pot-back" src="https://api.siyuankunlun.com/storage/images/2023/11/14/7cc458841f443badade6e9558a833ad5.png"></image>
+            <view class="waterPop-scale-pot-grey"></view>
+            <view class="waterPop-scale-pot-ruler" style="height: {{scale}}%;">
+                <view class="waterPop-scale-pot-number">{{number}}ml</view>
+            </view>
+        </view>
+    </view>
+    <view class="waterPop-scale-grow">
+        <view class="waterPop-scale-grow-btn waterPop-scale-grow-cut" bindtap="scaleNumber" data-type="remove">-</view>
+        <slider class="waterPop-scale-grow-slider" bindchange="slider3change" block-size="20" value="{{number}}" step="10" min="100" max="1000" backgroundColor="#eeeeee" block-color="#3c7dff" selected-color="#3c7dff" />
+        <view class="waterPop-scale-grow-btn waterPop-scale-grow-add" bindtap="scaleNumber" data-type="plus">+</view>
+    </view>
+</view>
+
+<!-- 是否完善资料弹出 -->
+<view class="refertoEject {{baseState ? 'active' : ''}}" catchtouchmove='true'></view>
+<view class="refertoCont {{baseState ? 'active' : ''}}" catchtouchmove='true'>
+    <view class="refertoCont-text">
+        <view class="refertoCont-title">健康档案提示</view>
+        <image class="refertoCont-ls" src="https://api.siyuankunlun.com/storage/images/2023/11/20/9d8b55b1e388c8bbb17a07ceaa332b50.png" mode="widthFix"></image>
+        <view class="refertoCont-tips">
+            您还没有建立健康档案
+        </view>
+        <view class="publicPop-btn">
+            <view class="publicPop-btn-go" bindtap="establish">暂不建立</view>
+            <view class="publicPop-btn-go publicPop-btn-border" bindtap="perfect">去建立</view>
+        </view>
+    </view>
+</view>
--- a/pages/clock/index.wxss
+++ b/pages/clock/index.wxss
@@ -0,0 +1,455 @@
+page {
+    background-color: #ffffff;
+}
+
+/* 顶部 */
+.navigation {
+    position: fixed;
+    top: 0;
+    left: 0;
+    z-index: 999;
+    width: 100%;
+    height: 90rpx;
+    background-color: transparent;
+    transition: .5s;
+}
+
+.navigation.active {
+    background-color: #ffffff;
+}
+
+.navigation-arrow {
+    width: 120rpx;
+    margin-left: 40rpx;
+}
+
+/* 小水怪 */
+.monster {
+    background-color: #ffffff;
+    padding: 40rpx 80rpx;
+    box-sizing: border-box;
+}
+
+.monsterBack {
+    background-color: #eeeeee;
+    position: relative;
+    padding-top: 100%;
+}
+
+.monsterImg {
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+    display: block;
+    z-index: 2;
+}
+
+.monsterBar {
+    position: absolute;
+    left: 0;
+    bottom: 0;
+    z-index: 1;
+    width: 100%;
+    transition: 1s;
+}
+
+.monsterBar::after {
+    position: absolute;
+    content: '';
+    width: 100%;
+    height: 100%;
+    margin: auto;
+    bottom: 0;
+    background-color: #c9dbff;
+    border-radius: 0%;
+    transition: .2s ease-in-out;
+}
+
+.monsterMark {
+    position: absolute;
+    margin-top: -120rpx;
+    left: 40rpx;
+    z-index: 3;
+    color: #3c7dff;
+}
+
+.monsterMark-total {
+    font-weight: 600;
+    font-size: 60rpx;
+}
+
+.monsterMark-see text {
+    font-weight: 600;
+}
+
+.monsterPart {
+    padding: 0 30rpx;
+    box-sizing: border-box;
+}
+
+.monsterPart-name {
+    margin-bottom: 30rpx;
+}
+
+.monsterPart-list {
+    white-space: nowrap;
+    background-color: #f6f6f6;
+    padding: 20rpx;
+    box-sizing: border-box;
+    border-radius: 15rpx;
+}
+
+.monsterPart-item {
+    display: inline-block;
+    background-color: #ffffff;
+    margin-right: 20rpx;
+    padding: 10rpx 30rpx 10rpx 50rpx;
+    box-sizing: border-box;
+    border-radius: 10rpx;
+    flex: 5;
+    font-size: 26rpx;
+    position: relative;
+    box-sizing: border-box;
+}
+
+.monsterPart-item::after {
+    position: absolute;
+    content: '';
+    left: 25rpx;
+    top: 20rpx;
+    width: 10rpx;
+    height: 10rpx;
+    border-radius: 50%;
+    background-color: #3c7dff;
+}
+
+.monsterPart-item:last-child {
+    margin-right: 0;
+}
+
+.monsterPart-item:nth-child(2)::after {
+    background-color: #d60000;
+}
+
+.monsterPart-item:nth-child(3)::after {
+    background-color: #00c700;
+}
+
+.monsterPart-item:nth-child(4)::after {
+    background-color: #f5d72e;
+}
+
+.monsterPart-item:nth-child(5)::after {
+    background-color: #9721da;
+}
+
+.monsterPart-item-text {
+    color: #919191;
+}
+
+/* 选择饮品 */
+.drink {
+    padding: 30rpx;
+    box-sizing: border-box;
+}
+
+.drinkCont {
+    background-color: #f6f6f6;
+    border-radius: 15rpx;
+    padding: 30rpx 0;
+    text-align: center;
+}
+
+.drinkCont-name {
+    font-weight: 600;
+    margin-bottom: 30rpx;
+    font-size: 34rpx;
+}
+
+.drinkCont-list {
+    display: flex;
+}
+
+.drinkCont-item {
+    flex: 2;
+    text-align: center;
+}
+
+.drinkCont-item-img {
+    width: 120rpx;
+    border: 2rpx solid #f6f6f6;
+    border-radius: 50%;
+}
+
+.drinkCont-item-name {
+    font-size: 28rpx;
+}
+
+.drinkCont-item.active .drinkCont-item-img {
+    border-color: #3c7dff;
+}
+
+.drinkCont-item.active .drinkCont-item-name {
+    color: #3c7dff;
+}
+
+/* 喝水按钮 */
+.drinkBtn {
+    width: 100%;
+    padding: 0 30rpx 30rpx;
+    box-sizing: border-box;
+}
+
+.drinkBtn-go {
+    width: 100%;
+    background-color: #3c7dff;
+    text-align: center;
+    color: #ffffff;
+    line-height: 90rpx;
+    border-radius: 15rpx;
+}
+
+/* 饮水弹出 */
+.waterBack {
+    position: fixed;
+    width: 100vw;
+    height: 100vh;
+    left: 0;
+    top: 0;
+    z-index: 9;
+    background-color: rgba(0, 0, 0, .5);
+    display: none;
+}
+
+.waterBack.active {
+    display: block;
+}
+
+.waterPop {
+    position: fixed;
+    width: 100vw;
+    bottom: -100%;
+    left: 0;
+    background-color: #ffffff;
+    z-index: 9;
+    border-radius: 20rpx 20rpx 0 0;
+    padding: 0 40rpx 60rpx;
+    box-sizing: border-box;
+    transition: .5s;
+}
+
+.waterPop.active {
+    bottom: 0;
+}
+
+.waterPop-top {
+    display: flex;
+}
+
+.waterPop-top-label {
+    font-size: 32rpx;
+    flex: 3;
+    line-height: 110rpx;
+    border-bottom: 2rpx solid #eeeeee;
+}
+
+.waterPop-name {
+    text-align: center;
+}
+
+.waterPop-sure {
+    color: #548dff;
+    text-align: right;
+}
+
+.waterPop-type {
+    position: relative;
+    padding: 20rpx 0;
+    box-sizing: border-box;
+}
+
+.waterPop-type-cont-img {
+    width: 140rpx;
+}
+
+.waterPop-type-cont {
+    position: absolute;
+    left: 0;
+    top: 0;
+    padding: 40rpx 0 0 140rpx;
+    box-sizing: border-box;
+    width: 100%;
+}
+
+.waterPop-type-text {
+    margin-top: 20rpx;
+    font-size: 28rpx;
+    color: #919191;
+}
+
+.waterPop-scale {
+    padding: 20rpx 25% 40rpx;
+    box-sizing: border-box;
+}
+
+.waterPop-scale-pot {
+    text-align: center;
+    position: relative;
+    padding-top: 130%;
+    width: 100%;
+}
+
+.waterPop-scale-pot-back {
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+    z-index: 10;
+    display: block;
+}
+
+.waterPop-scale-pot-ruler {
+    position: absolute;
+    left: 0;
+    bottom: 0;
+    background-color: #548dff;
+    width: 100%;
+    transition: .8s;
+}
+
+.waterPop-scale-pot-number {
+    position: absolute;
+    top: -50rpx;
+    font-weight: 600;
+    color: #3c7dff;
+    text-align: center;
+    width: 100%;
+    font-size: 32rpx;
+    z-index: 100;
+}
+
+.waterPop-scale-pot-grey {
+    position: absolute;
+    left: 0;
+    bottom: 0;
+    background-color: #eef4ff;
+    width: 100%;
+    height: 100%;
+}
+
+.waterPop-scale-grow {
+    display: flex;
+    line-height: 50rpx;
+}
+
+.waterPop-scale-grow-btn {
+    width: 40rpx;
+    height: 40rpx;
+    line-height: 36rpx;
+    text-align: center;
+    background-color: #528cff;
+    color: #ffffff;
+    border-radius: 50%;
+    font-weight: 600;
+    font-size: 32rpx;
+}
+
+.waterPop-scale-grow-slider {
+    width: calc(100% - 170rpx);
+    margin: 5rpx 30rpx 0 40rpx;
+}
+
+/* 完善信息弹出 */
+.refertoEject {
+    position: fixed;
+    width: 100vw;
+    height: 100vh;
+    left: 0;
+    top: 0;
+    background-color: rgba(0, 0, 0, .6);
+    z-index: 10000;
+    display: none;
+}
+
+.refertoEject.active {
+    display: block;
+}
+
+.refertoCont {
+    -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;
+    text-align: center;
+    display: none;
+}
+
+.refertoCont.active {
+    display: -webkit-box;
+}
+
+.refertoCont-text {
+    background-color: #f6f9fb;
+    border-radius: 20rpx;
+    box-sizing: border-box;
+    position: relative;
+}
+
+.refertoCont-ls {
+    width: 260rpx;
+}
+
+.refertoCont-title {
+    text-align: center;
+    font-weight: 600;
+    padding: 40rpx 0;
+    font-size: 34rpx;
+    box-sizing: border-box;
+}
+
+.refertoCont-tips {
+    line-height: 48rpx;
+    text-align: center;
+    padding: 0 60rpx 30rpx;
+    box-sizing: border-box;
+}
+
+.publicPop-btn {
+    line-height: 80rpx;
+    font-size: 32rpx;
+    display: flex;
+    border-top: 2rpx solid #e6e6e6;
+}
+
+
+.publicPop-btn-go {
+    width: 50%;
+    text-align: center;
+    height: 100rpx;
+    line-height: 100rpx;
+    font-size: 30rpx;
+}
+
+.publicPop-btn-border {
+    color: #528cff;
+    position: relative;
+}
+
+.publicPop-btn-border::after {
+    position: absolute;
+    content: '';
+    left: 0;
+    top: 0;
+    width: 2rpx;
+    height: 100rpx;
+    background-color: #e6e6e6;
+}
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -0,0 +1,105 @@
+ /*
+ * 手太欠
+ * 愿这世界都如故事里一样 美好而动人~
+ */
+
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        videoState   : true, //第一个视频是否加载
+        videoFlx     : false, //视频定位
+        videos       : '',
+        isFixedTop   : 0,
+        barHeight    : getApp().globalData.statusBarHeight,  // 状态栏高度
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad (options) {
+        // 邀请码
+        if(options.invite) {
+            this.setData({
+                inviteCode   : options.invite
+            })
+            wx.setStorage({
+                key     : 'inviteData',
+                data    : options.invite
+            })
+        }
+        console.log(wx.getStorageSync("inviteData"))
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow () {
+        // 获取首页数据
+        this.indexInfo();
+    },
+
+    /**
+     * 首页数据
+     */
+    indexInfo () {
+        wx.$api.index.home().then(res => {
+            this.setData({
+                goodsArr    : res.data.goods,
+                videos      : res.data.videos[0],
+                healthsArr  : res.data.healths,
+                datas       : res.data.memories,
+                categories  : res.data.categories
+            })
+        }).catch(err => {})
+    },
+
+    /**
+     * 监听页面滚动
+     */
+    bestScroll(e){
+        if(e.detail.scrollTop >= this.data.systInfo.safeArea.width && !this.data.videoFlx){
+            this.setData({
+                videoFlx: true
+            })
+        }else if(e.detail.scrollTop < this.data.systInfo.safeArea.width && this.data.videoFlx){
+            this.setData({
+                videoFlx: false
+            })
+        }
+    },
+
+    // 第一个播放进度变化时触发
+    bindloadedOne() {
+        this.setData({
+            videoState: false
+        })
+    },
+
+    // 第二个播放进度变化时触发
+    bindloadedTwo() {
+        this.setData({
+            videoFilex: false
+        })
+    },
+
+    /**
+    * 监听页面滑动事件
+    */
+    onPageScroll(e) {
+        this.setData({
+            isFixedTop: parseInt(e.scrollTop)
+        });
+    },
+
+    /**
+     * 跳转文章列表
+     */
+    tapMore(e){
+        wx.navigateTo({
+            url: '/pages/article/index?type=' + e.currentTarget.dataset.type
+        })
+    },
+})
--- a/pages/index/index.json
+++ b/pages/index/index.json
@@ -0,0 +1,5 @@
+{
+    "usingComponents": {},
+    "navigationStyle": "custom",
+    "navigationBarTextStyle": "white"
+}
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -0,0 +1,113 @@
+<view class="navigation {{isFixedTop > 50 ? 'active' : ''}}" style="padding-top:{{barHeight}}px;">
+    <image class="navigation-arrow" src="https://api.siyuankunlun.com/storage/images/2023/11/15/54dcd352eff2d8ad1f985a8374df09cd.png" mode="widthFix"></image>
+</view>
+
+<!-- 背景视屏 -->
+<view class="page-section">
+    <image class="videoCover" wx:if="{{videoState}}" src="http://cdn.siyuankunlun.com/materials/2022/10/13/cover.png"></image>
+    <video class="page-swiper" show-fullscreen-btn="{{false}}" show-play-btn="{{false}}" custom-cache="{{false}}" controls="{{false}}" bindloadedmetadata="bindloadedOne" object-fit="fill" loop autoplay picture-in-picture-mode="pop" src="http://cdn.siyuankunlun.com/videos/2022/10/11/5899a6029e623ef523ff67354ee3f698.mp4"></video>
+    <image class="indexTop" src="/static/icons/indextop.png"></image>
+</view>
+
+<view class="pageWrite" wx:if="{{isFixedTop > 800}}"></view>
+
+<view class="layout">
+    <!-- 商品 -->
+    <view class="goods">
+        <image class="goodsBack" src="https://api.siyuankunlun.com/storage/images/2023/11/13/4834ef56bbfe2f6802d90ab8bbfcc17b.jpg" mode="widthFix"></image>
+        <view class="goodsCont">
+            <view class="goodsCont-title">
+                <view class="goodsCont-title-word">siyuankunlun</view>
+                <view class="goodsCont-title-text">古海冰泉<text>造就不凡</text></view>
+            </view>
+            <navigator class="goodsCont-product" wx:for="{{goodsArr}}" wx:key="goodsArr" hover-class="none" url="/pages/mall/buy/index?id={{item.goods_id}}">
+                <image class="goodsCont-product-img" src="https://api.siyuankunlun.com/storage/images/2023/11/13/16ea3d4adfd3f9f067541628a6cfd240.png" mode="widthFix"></image>
+                <view class="goodsCont-product-title">
+                    <view class="nowrap goodsCont-product-name">{{item.name}}</view>
+                    <view class="nowrap goodsCont-product-tips">市场统一指导价</view>
+                    <view class="goodsCont-product-price">￥<text>{{item.price.show}}</text></view>
+                    <view class="goodsCont-product-btn">立即抢购</view>
+                </view>
+            </navigator>
+        </view>
+    </view>
+
+    <!-- 健康饮水指南 -->
+    <view class="other">
+        <view class="goodsCont-title">
+            <view class="goodsCont-title-word">Health guide</view>
+            <view class="goodsCont-title-text">健康饮水指南</view>
+        </view>
+        <view class="guide">
+            <view class="guide-label">
+                <view class="guide-top">水温饮用最佳效果</view>
+                <view class="guide-text">
+                    <view class="guide-cell">
+                        <text>40-50度</text>
+                    </view>
+                </view>
+                <image class="guide-icon" src="https://api.siyuankunlun.com/storage/images/2023/11/13/0a7d6a36108d5774bd75f06188dadc6e.png"></image>
+            </view>
+            <view class="guide-label">
+                <view class="guide-top">每日最佳用水数量</view>
+                <view class="guide-text">
+                    <text>4瓶-6瓶</text>
+                    <text>(2000毫升-3000毫升)</text>
+                </view>
+                <image class="guide-icon" src="https://api.siyuankunlun.com/storage/images/2023/11/13/bf9765f82806e47249cf2d9c2305782c.png"></image>
+            </view>
+            <view class="guide-label">
+                <view class="guide-top">每日最佳用水时间</view>
+                <view class="guide-text">
+                    <text>早间 7点-9点</text>
+                    <text>午间 12点-14点</text>
+                    <text>晚间 18点-21点</text>
+                </view>
+                <image class="guide-icon" src="https://api.siyuankunlun.com/storage/images/2023/11/13/7483be8398048e1491fd941b0f695c45.png"></image>
+            </view>
+            <view class="guide-label">
+                <view class="guide-top">用水特别注意事项</view>
+                <view class="guide-text">
+                    <text>禁用泡茶</text>
+                    <text>开瓶后48小时内需饮用</text>
+                </view>
+                <image class="guide-icon" src="https://api.siyuankunlun.com/storage/images/2023/11/13/58980c186077cd39b96f7bb4024aa4fa.png"></image>
+            </view>
+        </view>
+    </view>
+
+    <!-- 健康百科 -->
+    <view class="sciences">
+        <view class="goodsCont-title" bindtap="tapMore" data-type="{{categories.health}}">
+            <view class="goodsCont-title-word">all sciences</view>
+            <view class="goodsCont-title-text">健康百科<image class="article-more" mode="widthFix" src="http://cdn.siyuankunlun.com/materials/2022/10/11/hotline_more.png"></image></view>
+        </view>
+        <view class="list">
+            <navigator hover-class="none" url="/pages/article/info/info?id={{item.article_id}}&type=wiki" class="item" wx:for="{{healthsArr}}" wx:key="healthsArr">
+                <view class="itemCont">
+                    <view class="itemCont-tips">{{item.sub_title}}</view>
+                    <view class="nowrap itemCont-name">{{item.title}}</view>
+                </view>
+                <image class="itemImg" src="{{item.cover}}" mode="aspectFill"></image>
+            </navigator>
+        </view>
+    </view>
+
+    <!-- 视频 -->
+    <view class="brief">
+        <image class="briefImg" src="https://api.siyuankunlun.com/storage/images/2023/11/13/f113410acf6d4b37fd82f63b8c9ec2b4.jpg" mode="widthFix"></image>
+        <view class="briefCont">
+            <view class="briefCont-title">
+                <view class="briefCont-title-word">— The miracle of nature —</view>
+                <view class="briefCont-title-name">都兰圣地 源水活取</view>
+                <view class="briefCont-title-text">由昆仑山远古冰川和柴达木远古深海自然涌出</view>
+            </view>
+            <view class="videos" id="video">
+                <view class="videos-filex-view {{videoFlx ? 'filex' : ''}}">
+                    <image class="videos-cover" wx:if="{{videoFilex}}" src="http://cdn.siyuankunlun.com/images/2022/09/29/10defdd282968b28203e2a9c5b6e7806.png"></image>
+                    <video class="video" bindloadedmetadata="bindloadedTwo" object-fit="cover" custom-cache="{{false}}" loop autoplay picture-in-picture-mode="pop" src="{{videos.path}}"></video>
+                </view>
+            </view>
+        </view>
+    </view>
+</view>
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -0,0 +1,342 @@
+/* 顶部 */
+.navigation {
+    position: fixed;
+    top: 0;
+    left: 0;
+    z-index: 999;
+    width: 100%;
+    height: 90rpx;
+    background-color: transparent;
+    transition: .5s;
+}
+
+.navigation.active {
+    background-color: #ffffff;
+}
+
+.navigation-arrow {
+    width: 120rpx;
+    margin-left: 40rpx;
+}
+
+.page-section {
+    position: fixed;
+    width: 100vw;
+    height: 100vh;
+    left: 0;
+    top: 0;
+    z-index: -1;
+}
+
+.videoCover,
+.page-swiper {
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+}
+
+.indexTop {
+    position: absolute;
+    bottom: 30rpx;
+    left: calc(50% - 42rpx);
+    transform: rotate(180deg);
+    width: 84rpx;
+    height: 84rpx;
+    opacity: .5;
+}
+
+/* 白色背景 */
+.pageWrite {
+    position: fixed;
+    height: 80vh;
+    top: 20vh;
+    left: 0;
+    width: 100%;
+    background-color: #ffffff;
+    z-index: 1;
+}
+
+/* 布局 */
+.layout {
+    position: absolute;
+    top: 100vh;
+    left: 0;
+    z-index: 9;
+    width: 100vw;
+    background-color: #ffffff;
+}
+
+/* 商品 */
+.goods {
+    position: relative;
+    padding-top: 100%;
+}
+.goodsBack,
+.goodsCont {
+    width: 100%;
+    height: 100%;
+    display: block;
+    position: absolute;
+    left: 0;
+    top: 0;
+}
+
+.goodsCont {
+    padding: 50rpx 40rpx;
+    box-sizing: border-box;
+}
+
+.goodsCont-title-word {
+    text-transform: uppercase;
+    font-size: 36rpx;
+}
+
+.goodsCont-title-text {
+    font-size: 40rpx;
+    line-height: 64rpx;
+}
+
+.goodsCont-title-text .article-more {
+    width: 32rpx;
+    height: 32rpx;
+    margin-left: 15rpx;
+    margin-top: 4rpx;
+}
+
+.goodsCont-title-text text {
+    padding-left: 20rpx;
+}
+
+.goodsCont-product {
+    display: flex;
+    position: absolute;
+    bottom: 15%;
+    left: 0;
+}
+
+.goodsCont-product-img {
+    width: 340rpx;
+    display: block;
+}
+
+.goodsCont-product-name {
+    font-weight: 600;
+    font-size: 34rpx;
+}
+
+.goodsCont-product-tips {
+    margin: 15rpx 0 20rpx;
+}
+
+.goodsCont-product-price {
+    font-weight: 600;
+}
+
+.goodsCont-product-price text {
+    font-size: 60rpx;
+}
+
+.goodsCont-product-btn {
+    background-color: #333333;
+    display: inline-block;
+    color: #ffffff;
+    border-radius: 100rpx;
+    line-height: 72rpx;
+    padding: 0 40rpx;
+    margin-top: 30rpx;
+    font-size: 30rpx;
+}
+
+/* 用水指南 */
+.other {
+    padding: 0 30rpx;
+    box-sizing: border-box;
+}
+
+.guide {
+    overflow: hidden;
+    margin: 30rpx -10rpx;
+}
+
+.guide-label {
+    width: calc(50% - 20rpx);
+    margin: 0 10rpx 20rpx;
+    float: left;
+    background-image: linear-gradient(#f6f6f6, #f6f6f6);
+    border-radius: 15rpx;
+    padding: 25rpx 30rpx;
+    box-sizing: border-box;
+    position: relative;
+}
+
+.guide-top {
+    position: relative;
+    margin-bottom: 20rpx;
+}
+
+.guide-english {
+    text-transform: uppercase;
+    color: #dfdedf;
+    font-size: 34rpx;
+}
+
+.guide-name {
+    font-size: 32rpx;
+    position: absolute;
+    top: 18rpx;
+    left: 0;
+    z-index: 9;
+}
+
+.guide-text {
+    vertical-align: middle;
+    height: 94rpx;
+    display: table;
+    line-height: 32rpx;
+}
+
+.guide-cell {
+    display: table-cell;
+    vertical-align: middle;
+}
+
+.guide-text text {
+    display: block;
+    font-size: 26rpx;
+    color: #333333;
+    font-weight: 200;
+}
+
+.guide-icon {
+    position: absolute;
+    width: 70rpx;
+    height: 70rpx;
+    right: 25rpx;
+    bottom: 25rpx;
+}
+
+/* 健康百科 */
+.sciences {
+    padding: 40rpx 30rpx;
+    box-sizing: border-box;
+    background-color: #f6f6f6;
+}
+
+.list {
+    margin-top: 30rpx;
+}
+
+.item {
+    background-color: #222222;
+    height: 200rpx;
+    display: flex;
+    margin-bottom: 30rpx;
+}
+
+.itemCont {
+    width: calc(100% - 300rpx);
+    padding: 30rpx;
+    box-sizing: border-box;
+    color: #ffffff;
+    height: 200rpx;
+    position: relative;
+}
+
+.itemCont-tips {
+    color: #acacac;
+    font-size: 28rpx;
+}
+
+.itemImg {
+    width: 300rpx;
+    height: 200rpx;
+}
+
+.itemCont-name {
+    position: absolute;
+    bottom: 40rpx;
+    left: 0;
+    font-weight: 300;
+    padding: 0 30rpx;
+    box-sizing: border-box;
+}
+
+/* 短视频 */
+.brief {
+    position: relative;
+    width: 100vw;
+}
+
+.briefImg,
+.briefCont {
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 100%;
+}
+
+.briefCont {
+    padding: 60rpx 30rpx;
+    box-sizing: border-box;
+}
+
+.briefCont-title {
+    color: #ffffff;
+    text-align: center;
+}
+
+.briefCont-title-word {
+    font-weight: 300;
+    text-transform: uppercase;
+    font-size: 28rpx;
+}
+
+.briefCont-title-name {
+    font-size: 48rpx;
+    margin: 25rpx 0;
+}
+
+.briefCont-title-text {
+    font-weight: 300;
+    font-size: 28rpx;
+}
+
+.videos {
+    margin-top: 60rpx;
+}
+
+.videos-filex-view {
+    position: relative;
+    width: 100%;
+    padding-top: 52%;
+    border-radius: 10rpx;
+    overflow: hidden;
+}
+
+.videos-cover {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    z-index: 2;
+}
+
+.videos video {
+    position: absolute;
+    border-radius: 10rpx;
+    overflow: hidden;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+}
+
+.videos-filex-view.filex {
+    position: fixed;
+    top: 0;
+    left: 0;
+    z-index: 99;
+}
--- a/pages/login/agreement/agreement.js
+++ b/pages/login/agreement/agreement.js
@@ -0,0 +1,31 @@
+/*
+ * 手太欠
+ * 愿这世界都如故事里一样 美好而动人~
+ */
+
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        content: ''
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+        // 获取用户协议
+        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,166 @@
+ /*
+ * 手太欠
+ * 愿这世界都如故事里一样 美好而动人~
+ */
+
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        phone	: "",
+        code	: "",
+        parentId: "",    //邀请码
+        newUser : '',    //是否为新用户
+        checked : false, //勾选协议
+        codename: '获取验证码',
+        getSms	: false,
+        inviteata: ''
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+        // 是否有邀请码
+        if(options) {
+            this.setData({
+                channelId : options.channel || ''
+            })
+        }
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+        if(wx.getStorageSync("inviteData")) {
+            this.setData({
+                parentId: wx.getStorageSync("inviteData")
+            })
+        }
+    },
+
+    /**
+     * 手机号码
+     */
+    bindInput(e) {
+        this.setData({
+            phone: e.detail.value
+        })
+    },
+
+    /**
+     * 短信验证码
+     */
+    bindCode(e) {
+        this.setData({
+            code: e.detail.value
+        })
+    },
+
+    /**
+     * 获取短信验证码
+     */
+    getPhoneCode(e) {
+        let mobile = this.data.phone,
+            myreg    = /^(14[0-9]|13[0-9]|15[0-9]|17[0-9]|18[0-9])\d{8}$$/
+
+        var _this    = this
+
+        if  (mobile == "") {
+            wx.showToast({
+                title     : '手机号不能为空',
+                icon      : 'none',
+                duration  : 1000
+            })
+            return false;
+        }else if (!myreg.test(mobile)) {
+            wx.showToast({
+                title     : '请输入正确的手机号',
+                icon      : 'none',
+                duration  : 1000
+            })
+            return false;
+        }else{
+            wx.$api.auth.getSms({
+                mobileNo: mobile
+            }).then(res=>{
+                _this.setData({
+                    newUser   : res.data.new,
+                    getSms    : true
+                })
+            
+                wx.showToast({
+                    title   : '发送成功',
+                    icon    : 'success',
+                    duration: 2000
+                })
+                var num = 60;
+                var timer = setInterval(function () {
+                    num--;
+                    if (num <= 0) {
+                        clearInterval(timer);
+                        _this.setData({
+                            codename    : '重新发送',
+                            getSms      : false
+                        })
+          
+                    } else {
+                        _this.setData({
+                            codename    : num + "s后重新获取",
+                            getSms      : true
+                        })
+                    }
+                }, 1000)
+            }).catch(err=>{}) 
+        }
+    },
+
+    /**
+     * 邀请码
+     */
+    parentInput(e) {
+        this.setData({
+            parentId: e.detail.value
+        })
+    },
+
+    /**
+     * 用户登录
+     */
+    login() {
+        if(this.data.checked) {
+            wx.$api.auth.smsAuth({
+                mobileNo	: this.data.phone,
+                code		: this.data.code,
+                invite  	: this.data.parentId,
+                channel     : this.data.channelId
+            }).then(res=>{
+                // 写入缓存
+                wx.setStorage({
+                    key   : 'token',
+                    data  : res.data.token_type + ' ' + res.data.access_token
+                })
+    
+                // 回到首页
+                wx.switchTab({
+                    url: '/pages/index/index'
+                })
+            }).catch(err=>{}) 
+        } else {
+            wx.showToast({
+                title: '请勾选用户隐私和服务协议',
+                icon: "none"
+            })
+        }
+    },
+
+    // 勾选协议
+    radioChange() {
+        this.setData({
+            checked: !this.data.checked
+        })
+    }
+})
--- a/pages/login/index.json
+++ b/pages/login/index.json
@@ -0,0 +1,4 @@
+{
+    "usingComponents": {},
+    "navigationBarTitleText": "锶源昆仑"
+}
--- a/pages/login/index.wxml
+++ b/pages/login/index.wxml
@@ -0,0 +1,28 @@
+<view class="login-top">
+    <view class="top-logo-content">
+        手机号快捷登录
+    </view>
+    未注册的手机号码将自动注册
+</view>
+<!-- 输入手机号相关 -->
+<view class="inputs phone">
+    <label class="label">+86</label>
+    <input type="number" placeholder="输入您的手机号码" maxlength="11" name="phone" bindinput="bindInput" class="inputs-phone" />
+</view>
+<view class="inputs sms">
+    <input type="number" placeholder="输入短信验证码" maxlength="4" name="code" class="inputs-sms" bindinput="bindCode"  />
+    <button class="sms-btn" type="default" size="mini" disabled="{{phone == '' || getSms}}" bindtap="getPhoneCode">{{codename}}</button>
+</view>
+<view class="inputs" wx:if="{{newUser}}">
+    <input placeholder="邀请码 (选填)" maxlength="10" value="{{parentId}}" bindinput="parentInput" />
+</view>
+<button class="btn" type="default" disabled="{{phone == '' || code == ''}}" bindtap="login">登录</button>
+<!-- 用户登录注册协议 -->
+<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>
+</view>
--- a/pages/login/index.wxss
+++ b/pages/login/index.wxss
@@ -0,0 +1,164 @@
+page {
+    height: 100vh;
+    width: 100vw;
+    padding: 90rpx 60rpx;
+    box-sizing: border-box;
+    background: white;
+}
+
+.login-top {
+    height: 17vh;
+    width: 100%;
+    flex-direction: row;
+    align-items: flex-end;
+    justify-content: center;
+    box-sizing: border-box;
+    position: relative;
+    color: #919191;
+}
+
+.top-bg {
+    position: absolute;
+    bottom: 30rpx;
+    z-index: 2;
+    width: 740rpx;
+}
+
+.top-logo-content {
+    box-sizing: border-box;
+    color: #000;
+    font-weight: 600;
+    font-size: 40rpx;
+    margin-bottom: 10rpx;
+}
+
+.top-logo {
+    margin-bottom: 20rpx;
+    width: 146rpx;
+    height: 146rpx;
+}
+
+.inputs {
+    background: rgba(68, 144, 255, 0.05);
+    border: solid 1rpx #f2f2f2;
+    position: relative;
+    margin-top: 30rpx;
+    height: 80rpx;
+    line-height: 80rpx;
+}
+
+.inputs input {
+    width: 100%;
+    height: 80rpx;
+    line-height: 80rpx;
+    padding: 0 30rpx;
+    border: none;
+    box-sizing: border-box;
+    font-size: 30rpx;
+}
+
+input.inputs-phone {
+    padding-left: 150rpx;
+}
+
+input.inputs-sms {
+    padding-right: 200rpx;
+}
+
+.label {
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 120rpx;
+    text-align: center;
+    border-right: solid 1rpx #f2f2f2;
+    font-size: 30rpx;
+}
+
+.sms-btn[size='mini'] {
+    font-weight: normal;
+    height: 77rpx;
+    line-height: 77rpx;
+    position: absolute;
+    top: 1rpx;
+    right: 1rpx;
+    padding: 0 20rpx;
+    margin: 0;
+    border-radius: 0;
+    border-left: solid 1rpx #f2f2f2;
+    color: #4490ff !important;
+    font-size: 30rpx;
+    background-color: transparent !important;
+}
+
+.sms-btn::after {
+    border: none;
+}
+
+.sms-btn[disabled] {
+    color: rgba(68, 144, 255, .6) !important;
+}
+
+.title {
+    text-align: center;
+    font-size: 38rpx;
+    font-weight: bold;
+    color: #2a2a2a;
+    margin-bottom: 100rpx;
+}
+
+.btn {
+    background: #4490ff !important;
+    width: 100% !important;
+    color: white !important;
+    border-radius: 0;
+    margin-top: 30rpx;
+    font-size: 32rpx;
+    line-height: 90rpx;
+    height: 90rpx;
+    font-weight: bold;
+    padding: 0;
+}
+
+.btn::after {
+    border: none;
+}
+
+.btn[disabled] {
+    background: rgba(68, 144, 255, .6) !important;
+}
+
+.beianNo {
+    font-size: 26rpx;
+    color: #9d9d9d;
+    text-align: center;
+    padding-top: 60rpx;
+    position: fixed;
+    width: 100%;
+    left: 0;
+    bottom: 50rpx;
+}
+
+/* 协议 */
+.agreement {
+    font-size: 26rpx;
+    color: #9d9d9d;
+    margin-top: 20rpx;
+    display: flex;
+}
+
+.radioGroup {
+    transform: scale(.6);
+    width: 55rpx;
+    text-align: left;
+}
+
+.agreement-text {
+    width: calc(100% - 55rpx);
+    line-height: 48rpx;
+}
+
+.agreement-text navigator {
+    color: #000;
+    display: inline-block;
+}
--- a/pages/mall/buy/index.js
+++ b/pages/mall/buy/index.js
@@ -0,0 +1,105 @@
+/*
+ * 手太欠
+ * 愿这世界都如故事里一样 美好而动人~
+ */
+
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        avatar      : '', //用户头像
+        nickName    : '', //用户昵称
+        identity    : '', //用户身份
+        goodId      : '', //商品id
+        goodType    : '', //商品类型
+        surplus     : '', //我的水滴
+        mallData    : '', //商品详情
+        mallContent : '', //商品介绍
+        userLogin   : '',   //登录状态
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+        console.log(options.type)
+        this.setData({
+            goodId  : options.id,
+            goodType: options.type
+        })
+
+        // 获取商品详情
+        this.goodInfo(options.id);
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+        if(wx.getStorageSync("token")){
+            this.setData({
+                userLogin: true
+            })
+            // 获取用户信息
+            this.userInfo();
+        }
+    },
+
+    /**
+     * 用户信息
+     */
+    userInfo() {
+        wx.$api.user.home().then(res => {
+            this.setData({
+                avatar          : res.data.avatar,
+                nickName        : res.data.nickname,
+                identity        : res.data.identity,
+                surplus         : res.data.account.score.surplus
+            })
+        }).catch(err => {})
+    },
+
+    /**
+     * 商品详情
+     */
+    goodInfo(id) {
+        wx.$api.mall.goodsShow(id).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 => {})
+    },
+
+
+    /**
+     * 放大轮播相册图片
+     */
+    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]
+        })
+    },
+
+    // 购买
+    buyTap(e) {
+        if(wx.getStorageSync("token")){
+            wx.navigateTo({
+                url: '../submit/index?skuid=' + this.data.mallData.skus[0].sku_id + '&goodsid=' + this.data.mallData.goods_id + '&qty=' + 1 + '&goodtype=' + this.data.goodType
+            })
+        }else {
+            // 去登录
+            wx.navigateTo({
+                url: "/pages/login/index"
+            })
+        }
+    }
+})
--- a/pages/mall/buy/index.json
+++ b/pages/mall/buy/index.json
@@ -0,0 +1,4 @@
+{
+    "usingComponents": {},
+    "navigationBarTitleText": "锶源商城"
+}
--- a/pages/mall/buy/index.wxml
+++ b/pages/mall/buy/index.wxml
@@ -0,0 +1,74 @@
+<!-- 轮播 -->
+<view class="banner">
+    <swiper class="swiperCont" indicator-color="rgba(255,255,255,.5)" indicator-active-color="#fff" autoplay="true">
+        <swiper-item data-index="{{index}}" data-imgs="{{mallData.pictures}}" bindtap="opneBanner" wx:for="{{mallData.pictures}}" wx:key="arr">
+            <image class="swiperImg" src="{{item}}" mode="aspectFill"></image>
+        </swiper-item>
+    </swiper>
+
+    <!-- 用户 -->
+    <view class="user-cont" wx:if="{{userLogin}}">
+        <view class="user-head">
+            <image class="user-avatar" src="{{avatar || '/static/imgs/default_myHead.png'}}" mode="aspectFill"></image>
+            <!-- <image wx:if="{{identity.order != '1'}}" class="user-ancrown" src="http://api.siyuankunlun.com/storage/materials/2022/09/14/ancrown.png" mode=""></image> -->
+        </view>
+        <view class="user-text">
+            <view class="user-top">
+                <view class="user-name">
+                    {{nickName ? nickName : '---'}}
+                </view>
+                <view class="user-icon">
+                    <image wx:if="{{userData.is_partner}}" src="/static/icons/userIcon_01.png" mode="widthFix"></image>
+                </view>
+            </view>
+            <image wx:if="{{identity.order == '2'}}" class="user-identity" src="/static/icons/member_02.png" mode="widthFix"></image>
+            <image wx:elif="{{identity.order == '3'}}" class="user-identity" src="/static/icons/member_03.png" mode="widthFix"></image>
+            <image wx:elif="{{identity.order == '4'}}" class="user-identity" src="/static/icons/member_04.png" mode="widthFix"></image>
+            <!-- <image wx:elif="{{identity.order == '5'}}" class="user-identity" src="/static/icons/member_05.png" mode="widthFix"></image> -->
+            <image wx:else src="/static/icons/member_01.png" class="user-identity" mode="widthFix"></image>
+        </view>
+        <view class="water" wx:if="{{goodType == 'waterType'}}">
+            <image src="/static/icons/waterDrop.png"></image>{{surplus}}
+        </view>
+    </view>
+</view>
+
+<!-- 商品信息 -->
+<view class="goodsInfo">
+    <view class="goodsInfo-name">
+        {{mallData.name}}
+    </view>
+    <view class="goodsInfo-info">
+        <view class="goodsInfo-price">
+            <block wx:if="{{goodType == 'waterType'}}">
+                {{mallData.price.show}} <view class="goodsInfo-price-symbol">水滴</view>
+            </block>
+            <block wx:else>
+                <view class="goodsInfo-price-symbol">￥</view>{{mallData.price.show}}
+            </block>
+        </view>
+    </view>
+</view>
+
+<!-- 产品详情 -->
+<view class="detailsBrief">
+    <view class="detailsBrief-title">
+        产品详情
+    </view>
+    <view class="detailsBrief-img">
+        <!-- <view class="detailsBrief-text">{{mallData.description}}</view> -->
+        <!-- <view class="detailsBrief-back" wx:if="{{mallData.content.length > 0}}">
+            <image src="{{item}}" data-index="{{index}}" data-imgs="{{mallData.content}}" bindtap="opneImg" mode="widthFix" wx:for="{{mallData.content}}" wx:key="content"></image>
+        </view> -->
+        <view class="detailsBrief-back">
+            <rich-text nodes="{{mallContent}}"></rich-text>
+        </view>
+    </view>
+    <view class="goods-info-footer {{barHeight > 30 ? 'iphoneX':''}}">已经到底拉，在往上逛一逛吧</view>
+</view>
+
+<view class="footer">
+    <view class="number" wx:if="{{goodType == 'waterType'}}">需<text>{{mallData.price.show}}</text>水滴</view>
+    <view class="number" wx:else>￥<text>{{mallData.price.show}}</text></view>
+    <view bindtap="buyTap" class="btn">{{goodType == 'waterType' ? '立即兑换' : '立即购买'}}</view>
+</view>
--- a/pages/mall/buy/index.wxss
+++ b/pages/mall/buy/index.wxss
@@ -0,0 +1,233 @@
+page {
+    background-color: #f3f3f5;
+}
+
+/* 产品轮播 */
+
+.banner {
+    overflow: hidden;
+    position: relative;
+    padding-top: 100%;
+}
+
+.swiperCont,
+.swiperImg {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+}
+
+/* 用户 */
+.user-cont {
+    width: 100%;
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    z-index: 99;
+    padding: 20rpx 30rpx;
+    display: flex;
+    box-sizing: border-box;
+}
+
+.user-head {
+    position: relative;
+    width: 90rpx;
+    height: 90rpx;
+    border-radius: 50%;
+    border: 6rpx solid #ffe0a8;
+    margin-top: 10rpx;
+}
+
+.user-avatar {
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    border-radius: 50%;
+}
+
+.user-ancrown {
+    position: absolute;
+    width: 48rpx;
+    height: 48rpx;
+    right: 0;
+    top: -34rpx;
+}
+
+.user-text {
+    height: 120rpx;
+    width: calc(100% - 120rpx);
+    padding-left: 20rpx;
+    box-sizing: border-box;
+}
+
+.user-top {
+    display: flex;
+    line-height: 58rpx;
+}
+
+.user-name {
+    color: #ffffff;
+    padding-right: 10rpx;
+}
+
+.user-icon image {
+    width: 32rpx;
+    height: 32rpx;
+    margin: 12rpx 0 0 5rpx;
+}
+
+.user-identity {
+    margin-top: 5rpx;
+    width: 120rpx;
+}
+
+.water {
+    background-color: rgba(0, 0, 0, .3);
+    border-radius: 30rpx 30rpx 30rpx 0;
+    padding: 0 15rpx 0 10rpx;
+    height: 60rpx;
+    line-height: 60rpx;
+    display: flex;
+    position: absolute;
+    right: 30rpx;
+    top: 50rpx;
+    color: #ffffff;
+}
+
+.water image {
+    width: 46rpx;
+    height: 46rpx;
+    margin: 6rpx 5rpx 0 0;
+}
+
+/* 商品信息 */
+.goodsInfo {
+    background-color: #ffffff;
+    padding: 30rpx;
+    width: 100%;
+    box-sizing: border-box;
+    font-weight: 600;
+    font-size: 32rpx;
+}
+
+.goodsInfo-name {
+    margin-bottom: 20rpx;
+}
+
+.goodsInfo-info {
+    display: flex;
+    line-height: 44rpx;
+}
+
+.goodsInfo-price {
+    font-size: 36rpx;
+    color: #df723a;
+    flex: 1;
+}
+
+.goodsInfo-price-symbol {
+    font-size: 28rpx;
+    display: inline-block;
+    margin-right: 5rpx;
+}
+
+.goodsInfo-price-see {
+    font-weight: normal;
+    color: #959595;
+    font-size: 28rpx;
+}
+
+/* 产品详情 */
+.detailsBrief {
+    padding: 30rpx 0;
+    box-sizing: border-box;
+    background-color: #ffffff;
+    margin-top: 20rpx;
+    /* border-bottom: 60px solid transparent; */
+}
+
+.detailsBrief-title {
+    position: relative;
+    font-size: 32rpx;
+    height: 70rpx;
+    margin-bottom: 10rpx;
+    font-weight: 600;
+    text-align: center;
+}
+
+.goods-info-footer {
+    line-height: 40rpx;
+    text-align: center;
+    font-size: 24rpx;
+    color: #747788;
+    padding-top: 20rpx;
+}
+
+.detailsBrief-text {
+    padding: 30rpx;
+    box-sizing: border-box;
+    line-height: 44rpx;
+}
+
+.detailsBrief-back {
+    text-align: center;
+    padding: 0 30rpx;
+    box-sizing: border-box;
+}
+
+.cardcase-like-online {
+    font-weight: normal;
+    font-size: 24rpx;
+    border: solid 2rpx #d8c283;
+    color: #c7a232;
+    border-radius: 4rpx;
+    display: inline-block;
+    height: 32rpx;
+    line-height: 32rpx;
+    padding: 0 10rpx;
+    margin: 2rpx 10rpx;
+}
+
+/* 底部 */
+.footer {
+    width: 100%;
+    height: 60px;
+    background-color: #FFFFFF;
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    z-index: 9;
+    padding: 8px 30rpx;
+    box-sizing: border-box;
+    display: flex;
+}
+
+.number {
+    flex: 1;
+    line-height: 44px;
+    color: #6c78f8;
+}
+
+.number text {
+    padding: 0 5rpx;
+    font-weight: 600;
+    font-size: 38rpx;
+}
+
+.btn {
+    height: 36px;
+    line-height: 36px;
+    background-color: #6c78f8;
+    text-align: center;
+    color: #FFFFFF;
+    border-radius: 60rpx;
+    font-size: 28rpx;
+    padding: 0 30rpx;
+    margin-top: 8rpx;
+}
+
+.detailsBrief-back {
+    width: 100%;
+}
--- a/pages/mall/details/index.js
+++ b/pages/mall/details/index.js
@@ -0,0 +1,77 @@
+ /*
+ * 手太欠
+ * 愿这世界都如故事里一样 美好而动人~
+ */
+
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        goodsData   : '', //详情
+        sign        : '', //签收
+        express     : '', //物流
+        orderNo     : ''  //订单号
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+        this.setData({
+            orderNo: options.orderNo
+        })
+
+        // 订单详情
+        this.goodsInfo(options.orderNo);
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {},
+
+    // 获取订单详情
+    goodsInfo(orderNo) {
+        wx.$api.user.goodsDet(orderNo).then(res => {
+            this.setData({
+                goodsData   : res.data,
+                sign        : res.data.can.sign,
+                express     : res.data.express
+            })
+        }).catch(err => {})
+    },
+
+    // 复制订单号
+    copyUrl(val) {
+        wx.setClipboardData({
+            data: val.currentTarget.dataset.no,
+            success: () => {
+                wx.showToast({
+                    title: "复制成功",
+                    icon : "none"
+                })
+            }
+        })
+    },
+
+    // 订单签收
+    signClick() {
+        wx.showModal({
+            title   : '提示',
+            content : '是否签收',
+            success : res=> {
+                if (res.confirm) {
+                    wx.$api.user.goodsSign(this.data.orderNo).then(res => {
+                        wx.showToast({
+                           title:'签收成功',
+                           icon:'none'
+                        })
+                        wx.navigateBack()
+                    }).catch(err => {})
+                }
+            }
+        })
+    }
+})
--- a/pages/mall/details/index.json
+++ b/pages/mall/details/index.json
@@ -0,0 +1,4 @@
+{
+    "usingComponents": {},
+    "navigationBarTitleText": "订单详情"
+}
--- a/pages/mall/details/index.wxml
+++ b/pages/mall/details/index.wxml
@@ -0,0 +1,80 @@
+<view class="orderData">
+    <view class="While">
+        <view class="orderData-cont-label">
+            <image class="orderData-cont-img" src="/static/icons/orderIcon_01.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/orderIcon_00.png" mode="aspectFill"></image>
+            <view class="orderData-cont-text">
+                <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 orderGoods">
+        <view class="orderGoods-wares" wx:for="{{goodsData.items}}" wx:key="items">
+            <!-- 先默认固定图 -->
+            <image class="orderGoods-img" src="http://api.siyuankunlun.com/storage/materials/2022/09/14/photo.png" mode="widthFix"></image>
+            <view class="orderGoods-cont">
+                <view class="nowrap orderGoods-name">{{ item.sku.goods_name }}</view>
+                <view class="orderGoods-price">
+                    <view class="orderGoods-number">{{ item.price }}</view><text>x{{ item.qty }}</text>
+                </view>
+            </view>
+        </view>
+    </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 reserve-red">{{ goodsData.amount }}</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 green">{{ goodsData.state }}</view>
+        </view>
+    </view>
+    <view class="While reserveCont" wx:if="{{express.express_name}}">
+        <view class="reserveCont-title">物流信息</view>
+        <view class="reserve-label">
+            <view class="reserve-name">物流公司</view>
+            <view class="reserve-text">{{ express.express_name }}</view>
+        </view>
+        <view class="reserve-label">
+            <view class="reserve-name">收货姓名</view>
+            <view class="reserve-text green">{{ express.name }}</view>
+        </view>
+        <view class="reserve-label">
+            <view class="reserve-name">收货电话</view>
+            <view class="reserve-text green">{{ express.mobile }}</view>
+        </view>
+        <view class="reserve-label">
+            <view class="reserve-name">物流单号</view>
+            <view class="reserve-text">{{ express.express_no }}<view class="reserve-copy" bindtap="copyUrl" data-no="{{express.express_no}}">复制</view>
+            </view>
+        </view>
+    </view>
+</view>
+<view class="order-data-footer">
+    <navigator hover-class="none" class="order-btn" open-type="navigateBack">返回订单</navigator>
+    <view class="order-btn" bindtap="signClick" wx:if="{{sign}}">签收订单</view>
+</view>
--- a/pages/mall/details/index.wxss
+++ b/pages/mall/details/index.wxss
@@ -0,0 +1,202 @@
+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: 70rpx transparent solid;
+
+}
+
+/* 订单 */
+.orderData-cont-label {
+    padding: 40rpx 30rpx;
+    display: flex;
+    box-sizing: border-box;
+    border-bottom: #f2f2f2 2rpx solid;
+}
+
+.orderData-cont-img {
+    width: 48rpx;
+    height: 48rpx;
+    vertical-align: middle;
+}
+
+.orderData-cont-text {
+    width: calc(100% - 68rpx);
+    margin-left: 20rpx;
+    box-sizing: border-box;
+}
+
+.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: #eb504c;
+}
+
+/* 产品 */
+.orderGoods {
+    padding: 30rpx;
+    box-sizing: border-box;
+}
+
+.orderGoods-wares {
+    position: relative;
+}
+
+.orderGoods-img {
+    width: 100rpx;
+    height: 100rpx;
+    border: 2rpx solid #dddddd;
+    border-radius: 10rpx;
+}
+
+.orderGoods-cont {
+    position: absolute;
+    width: 100%;
+    left: 0;
+    padding-left: 130rpx;
+    box-sizing: border-box;
+    top: 0;
+}
+
+.orderGoods-text {
+    margin: 20rpx 0 30rpx;
+    color: #666666;
+    font-size: 26rpx;
+}
+
+.orderGoods-price {
+    display: flex;
+    color: #555555;
+    margin-top: 15rpx;
+}
+
+.orderGoods-number {
+    flex: 1;
+    color: #000;
+    font-weight: 600;
+}
+
+.orderGoods-price text {
+    color: #999;
+}
+
+.reserve-red {
+    font-weight: 600;
+    color: #1d37e2;
+}
+
+.orderGoods-brief {
+    display: flex;
+    padding-top: 30rpx;
+}
+
+.orderGoods-brief view {
+    flex: 1;
+    color: #333333;
+}
+
+.orderGoods-brief text {
+    font-weight: 600;
+}
+
+/* 规格 */
+.reserveCont-title {
+    font-weight: 600;
+    padding: 30rpx;
+}
+
+.reserve-label {
+    display: flex;
+    padding: 0 30rpx 30rpx;
+    box-sizing: border-box;
+    font-size: 28rpx;
+}
+
+.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.reserve-price {
+    font-weight: 600;
+    color: #1d37e2;
+}
+
+.reserve-copy {
+    color: #6774ff;
+    border: #6774ff 2rpx solid;
+    display: inline-block;
+    height: 34rpx;
+    line-height: 34rpx;
+    font-size: 26rpx;
+    padding: 0 10rpx;
+    border-radius: 4rpx;
+    margin-left: 10rpx;
+}
+
+/* 底部菜单 */
+.order-data-footer {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    border-top: solid 1rpx #f2f2f2;
+    padding-top: 17rpx;
+    padding-right: 30rpx;
+    padding-left: 30rpx;
+    height: 83rpx;
+    background: white;
+    display: flex;
+    flex-wrap: wrap;
+    flex-direction: row-reverse;
+    z-index: 9;
+}
+
+.order-btn {
+    margin-left: 20rpx;
+    height: 58rpx;
+    line-height: 58rpx;
+    box-sizing: border-box;
+    border: solid 1rpx #747788;
+    padding: 0 20rpx;
+    font-size: 26rpx;
+    border-radius: 10rpx;
+    margin-top: 5rpx;
+}
--- a/pages/mall/goods/index.js
+++ b/pages/mall/goods/index.js
@@ -0,0 +1,94 @@
+ /*
+ * 手太欠
+ * 愿这世界都如故事里一样 美好而动人~
+ */
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        categorieArr: [],       //分类
+        articlesArr : [] ,      //列表
+        page        : {},      //分页信息
+        listType    : '',      //类型
+        lodingStats : false,  //加载状态
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+        // 获取列表分类
+        this.categoriesInfo();
+    },
+
+    // 列表分类
+    categoriesInfo(){
+        wx.$api.user.mallCategories({
+            parent_id : this.data.listType
+        }).then(res => {
+            this.setData({
+                categorieArr: res.data,
+                listType    : res.data[0].category_id
+            })
+             // 获取列表
+            this.articlesInfo();
+        }).catch(err => {})
+    },
+
+    // 列表
+    articlesInfo(page){
+        wx.$api.user.mallGoods({
+            category_id : this.data.listType,
+            page : page || 1
+        }).then(res => {
+            let listArr = this.data.articlesArr,
+                newData = []
+            if(page == 1 || page == undefined) listArr = []
+            newData = listArr.concat(res.data.data)
+            this.setData({
+                articlesArr : 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.articlesInfo();
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    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/mall/goods/index.json
+++ b/pages/mall/goods/index.json
@@ -0,0 +1,4 @@
+{
+    "usingComponents": {},
+    "navigationBarTitleText": "产品中心"
+}
--- a/pages/mall/goods/index.wxml
+++ b/pages/mall/goods/index.wxml
@@ -0,0 +1,31 @@
+<!-- <view class="header">
+    <scroll-view class="header-view" scroll-x="true" bindscroll="scroll">
+        <view wx:for="{{categorieArr}}" wx:key="categorieArr" class="tabs-item {{listType == item.category_id ? 'show' : ''}}" bindtap="onTabs" data-type="{{item.category_id}}">{{item.name}}</view>
+    </scroll-view>
+</view> -->
+
+<view class="list" wx:if="{{articlesArr.length > 0}}">
+    <navigator hover-class="none" url="/pages/mall/buy/index?id={{item.goods_id}}" wx:for="{{articlesArr}}" wx:key="articlesArr" class="item">
+        <image class="itemImg" mode="aspectFill" src="{{item.cover}}"></image>
+        <view class="itemCont">
+            <view class="nowrap itemCont-name">{{item.name}}</view>
+            <view class="nowrap itemCont-text">{{item.description}}</view>
+            <view class="itemCont-price">
+                <!-- <image src="/static/icons/newIcon_03.png"></image> -->
+                ￥{{item.price.price_max}}
+            </view>
+        </view>
+    </navigator>
+    <view class="pagesLoding" wx:if="{{lodingStats}}">
+        <block wx:if="{{page.has_more}}">
+            <image class="pagesLoding-icon" src="/static/icon/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/coupon_null.png"></image>
+    <view>暂无数据</view>
+</view>
--- a/pages/mall/goods/index.wxss
+++ b/pages/mall/goods/index.wxss
@@ -0,0 +1,108 @@
+page {
+    background-color: #f6f6f6;
+}
+
+.list {
+    background-color: #ffffff;
+    padding: 30rpx;
+    box-sizing: border-box;
+    margin-top: 30rpx;
+}
+
+.item {
+    position: relative;
+    height: 180rpx;
+    margin-bottom: 30rpx;
+    border-bottom: 2rpx solid #eeeeee;
+    padding-bottom: 30rpx;
+}
+
+.item:last-child {
+    margin-bottom: 0;
+    padding-bottom: 0;
+    border: none;
+}
+
+.itemImg {
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 180rpx;
+    height: 180rpx;
+    border-radius: 10rpx;
+    overflow: hidden;
+}
+
+.itemCont {
+    position: absolute;
+    left: 0;
+    top: 0;
+    padding-left: 210rpx;
+    box-sizing: border-box;
+    width: 100%;
+}
+
+.itemCont-name {
+    line-height: 48rpx;
+    font-size: 30rpx;
+}
+
+.itemCont-text {
+    color: #999;
+    font-size: 26rpx;
+    margin: 15rpx 0 35rpx;
+    font-weight: 200;
+}
+
+.itemCont-price {
+    color: #f3ad47;
+    font-size: 36rpx;
+}
+
+.itemCont-price image {
+    width: 22rpx;
+    height: 22rpx;
+    padding-right: 5rpx;
+}
+
+/* tabs */
+.header {
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    z-index: 99;
+    background-color: #ffffff;
+    line-height: 78rpx;
+}
+
+.header-view {
+    padding: 0 30rpx;
+    box-sizing: border-box;
+    font-size: 30rpx;
+}
+
+.tabs {
+    display: flex;
+    justify-content: space-around;
+    background: white;
+    padding: 15rpx 0;
+    font-size: 30rpx;
+    color: #9d9d9d;
+    height: 74rpx;
+}
+
+.tabs-item {
+    display: inline-block;
+    padding: 0 50rpx;
+}
+
+.tabs-item.show {
+    color: #1d37e2;
+    background-color: #f6f6f6;
+    border-radius: 10rpx 10rpx 0 0;
+}
+
+/* .list {
+    margin-top: 110rpx;
+} */
--- a/pages/mall/submit/index.js
+++ b/pages/mall/submit/index.js
@@ -0,0 +1,300 @@
+ /*
+ * 手太欠
+ * 愿这世界都如故事里一样 美好而动人~
+ */
+
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        goodId       : '', //店铺id
+        goodType     : '', //商品类型
+        skuId        : '', //产品id
+        num          : 1,  //数量默认1
+        address      : '', //地址
+        addressId    : '', //地址id
+        stockData    : '', //数据
+        amount       : '', //总金额
+        freight      : '', //运费
+        weight       : '', //重量
+        remark       : '', //备注
+        exchangeSee  : false, //是否兑换
+        disabled     : false,
+        orderNo      : '',  // 订单编号
+        surplus      : '',  // 水滴数量
+        paySuccess  : false, // 兑换成功显示
+        payType      : 'wechat'  //支付类型  wechat微信  water水滴兑换
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+        this.setData({
+            goodId  : options.goodsid,
+            goodType: options.goodtype,
+            skuId   : options.skuid,
+            num     : options.qty
+        })
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+        // 获取订单前置
+        this.orderShow()
+
+        // 获取用户信息
+        this.userInfo();
+    },
+
+    /**
+     * 用户信息
+     */
+    userInfo() {
+        wx.$api.user.home().then(res => {
+            this.setData({
+                surplus : res.data.account.score.surplus
+            })
+        }).catch(err => {})
+    },
+
+    /**
+     * 订单前置
+     */
+    orderShow() {
+        wx.$api.mall.foundOrder({
+            goods_sku_id: this.data.skuId,
+            address_id   : this.data.addressId,
+            qty         : this.data.num
+        }).then(res => {
+            this.setData({
+                address   : res.data.address,
+                addressId : res.data.address.address_id,
+                stockData : res.data.detail,
+                amount    : res.data.amount,
+                freight   : res.data.freight,
+                weight    : res.data.weight
+            })
+        }).catch(err => {})
+    },
+
+    /**
+     * 商品数量加减
+     */
+    goodsNumber(e){
+        let num = this.data.num,
+            val = e.currentTarget.dataset.type
+        if (val == 'plus'){
+            num ++;
+        }else{
+            if (num > 1){
+                num --;
+            }else{
+                wx.showToast({
+                    title   : '商品数量不能小于1',
+                    icon    : 'none'
+                })
+            }
+            this.setData({
+                num: num
+            })
+        }
+        this.setData({
+            num: num
+        })
+
+        // 获取订单前置
+        this.orderShow()
+    },
+
+    /**
+     * 输入商品数量
+     */
+    goodsNumberInput(e) {
+        let goodsNum = e.detail.value;
+        if (goodsNum > 0) {
+            this.setData({
+                num: goodsNum
+            })
+        } else {
+            wx.showToast({
+                title: '商品数量不能小于1',
+                icon: 'none'
+            });
+            this.setData({
+                num: 1
+            })
+        }
+
+    },
+
+    /**
+     * 选择支付方式
+     */
+    radioChange(e) {
+        this.setData({
+            payType   : e.detail.value
+        })
+    },
+
+    /**
+     * 是否确认兑换
+     */
+    exchangeShow() {
+        let newQty = this.data.num
+        let data = {
+            goods_sku_id: this.data.skuId,
+            remark      : this.data.remark,
+            qty         : newQty,
+            address_id  : this.data.address.address_id
+        }
+        wx.$api.mall.affirmOrder(data).then(res => {
+            this.setData({
+                orderNo: res.data.order_no
+            })
+            // this.data.current == wechat 为微信支付
+            // if(this.data.payType == 'wechat') {
+            //     this.wxPay()
+            //     return
+            // }
+
+            // this.data.payType == water 为水滴兑换
+            if(this.data.goodType == 'waterType') {
+                this.setData({
+                    exchangeSee: !this.data.exchangeSee
+                })
+                return
+            }
+
+            // 微信支付
+            this.wxPay()
+            
+        }).catch(err => {})
+    },
+
+    /**
+     * 水滴兑换确认订单
+     */
+    goodsForm() {
+        this.waterPay();
+    },
+
+    /**
+     * 关闭兑换弹出
+     */
+    goodsCancel() {
+        this.setData({
+            exchangeSee: false
+        })
+    },
+
+    // 微信支付
+    wxPay() {
+        wx.showLoading({
+            title: '支付中...',
+            mask : true
+        })
+        let that = this
+        wx.login({
+            success: res => {
+                wx.$api.member.openid(res).then(openidRes => {
+                    wx.$api.member.wechatPay(this.data.orderNo, {
+                        type   : 'miniapp',
+                        openid : openidRes.data
+                    }).then(PayRes => {
+                        wx.hideLoading()
+                        this.setData({
+                            disabled   : true
+                        })
+                        
+                        let payInfo = JSON.parse(PayRes.data.wechat)
+                        wx.requestPayment({
+                            timeStamp: payInfo.timeStamp,
+                            nonceStr : payInfo.nonceStr,
+                            package  : payInfo.package,
+                            paySign  : payInfo.paySign,
+                            signType : payInfo.signType,
+                            success  : payInfoRes=>{
+                                if(payInfoRes.errMsg == "requestPayment:ok"){
+                                    wx.showToast({
+                                        title: '支付成功',
+                                        icon: 'none',
+                                        duration: 2000,
+                                        //显示透明蒙层，防止触摸穿透
+                                        mask:true,
+                                        success: function () {
+                                            that.setData({
+                                                paySuccess: true
+                                            })
+                                            setTimeout(()=>{
+                                                wx.redirectTo({
+                                                    url: '/pages/order/list/index?listType=paid'
+                                                })
+                                            },3000)
+                                        }
+                                    })
+                                }
+                            },
+                            fail  : res=>{
+                                wx.showToast({
+                                    title: '支付失败',
+                                    icon: 'none',
+                                    duration: 500,
+                                    //显示透明蒙层，防止触摸穿透
+                                    mask:true,
+                                    success: function () {
+                                        that.setData({
+                                            paySuccess: true
+                                        })
+                                        setTimeout(()=>{
+                                            wx.redirectTo({
+                                                url: '/pages/order/list/index?listType=unpay'
+                                            })
+                                        },3000)
+                                    }
+                                })
+                            }
+                        })
+                    }).catch(err => {})
+                }).catch(err => {})
+            }
+        })
+    },
+
+    // 水滴兑换
+    waterPay() {
+        wx.showLoading({
+            title: '兑换中...',
+            mask : true
+        })
+        let that = this
+        wx.$api.mall.affirmPay(this.data.orderNo, {gateway: 'miniapp'}).then(res => {
+            wx.hideLoading()
+            this.setData({
+                exchangeSee: false,
+                disabled   : true
+            })
+            wx.showToast({
+                title: '兑换成功',
+                icon: 'none',
+                duration: 2000,
+                //显示透明蒙层，防止触摸穿透
+                mask:true,
+                success: function () {
+                    that.setData({
+                        paySuccess: true
+                    })
+                    setTimeout(()=>{
+                        wx.redirectTo({
+                            url: '/pages/order/list/index?listType=paid'
+                        })
+                    },3000)
+                }
+            })
+        }).catch(err => {})
+    }
+})
--- a/pages/mall/submit/index.json
+++ b/pages/mall/submit/index.json
@@ -0,0 +1,4 @@
+{
+    "usingComponents": {},
+    "navigationBarTitleText": "确认订单"
+}
--- a/pages/mall/submit/index.wxml
+++ b/pages/mall/submit/index.wxml
@@ -0,0 +1,109 @@
+<view style="border-bottom: 60px solid transparent;">
+    <!-- 地址 -->
+    <view class="address">
+        <navigator hover-class="none" url="/pages/stock/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/userLogin_icon.png"></image>
+        </navigator>
+        <view class="address-add" wx:else>
+            <navigator hover-class="none" url="/pages/stock/site/index?type=goodsAddress" class="address-go">新增收货地址 +</navigator>
+        </view>
+        <image class="address-img" src="/static/imgs/address.png" mode="widthFix"></image>
+    </view>
+
+    <!-- 商品 -->
+    <view class="good" wx:for="{{stockData}}" wx:key="stockData">
+        <block wx:for="{{item.items}}" wx:key="items" wx:for-item="items">
+            <image class="good-img" src="{{items.cover ? items.cover : '/static/imgs/default.png'}}" mode="aspectFill"></image>
+            <view class="good-cont">
+                <view class="good-name nowrap">{{items.title}}</view>
+                <view class="good-tips">x{{items.qty}}</view>
+                <!-- <view class="good-tips">24瓶/箱</view> -->
+                <view class="good-price" wx:if="{{goodType == 'waterType'}}">{{items.price}}<text>水滴</text></view>
+                <view class="good-price" wx:else><text>￥</text>{{items.price}}</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="text" value="{{num}}" 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">免邮</view>
+        </view>
+        <view class="label-item">
+            <view class="label-name">重量</view>
+            <view class="label-text">{{weight}}ml</view>
+        </view>
+        <view class="label-item" wx:if="{{goodType == 'waterType'}}">
+            <view class="label-name">水滴兑换</view>
+            <view class="label-integral">需{{amount}}水滴</view>
+        </view>
+    </view>
+
+    <!-- 购买方式 -->
+    <!-- <view class="label payWay" wx:if="{{surplus > 0}}">
+        <view class="label-name">购买方式</view>
+        <view class="cashierCont-pay-way">
+            <radio-group bindchange="radioChange" style="width: 100%; display: block; height: 270rpx;">
+                <view class="cashierCont-way-label {{ payType == 'wechat' ? 'active' : ''}}">
+                    <view class="payContList-label-name">
+                        <image class="payContList-label-img" src="/static/imgs/wx.jpg"></image>
+                        <text>微信支付</text>
+                    </view>
+                    <radio class="radio" value="wechat"></radio>
+                </view>
+                <view class="cashierCont-way-label {{ payType == 'water' ? 'active' : ''}}">
+                    <view class="payContList-label-name">
+                        <image class="payContList-label-img" src="/static/imgs/wqb.jpg"></image>
+                        <text>水滴兑换</text>
+                    </view>
+                    <radio class="radio" value="water"></radio>
+                </view>
+            </radio-group>
+        </view>
+    </view> -->
+</view>
+
+<!-- 底部 -->
+<view class="footer">
+    <!-- <view class="number">{{payType == 'wechat' ? '￥' : '需要'}}<text>{{amount}}</text>{{payType == 'wechat' ? '' : '水滴'}}</view>
+    <button class="btn" bindtap="exchangeShow" disabled="{{disabled}}">{{payType == 'wechat' ? '立即购买' : '立即兑换'}}</button> -->
+    <view class="number">{{goodType == 'waterType' ? '需要' : '￥'}}<text>{{amount}}</text>{{payType == 'waterType' ? '水滴' : ''}}</view>
+    <button class="btn" bindtap="exchangeShow" disabled="{{disabled}}">{{goodType == 'waterType' ? '立即兑换' : '立即购买'}}</button>
+</view>
+
+<!-- 是否确认兑换商品弹出 -->
+<view class="exchangePop {{exchangeSee ? 'active' : ''}}"></view>
+<view class="exchangeCont {{exchangeSee ? 'active' : ''}}">
+    <view class="exchange-title">
+        确认兑换产品吗？
+    </view>
+    <view class="exchange-number">
+        <image class="exchange-img" src="/static/imgs/waterIcon.png"></image>
+        需要<text>{{amount}}</text>个水滴
+    </view>
+    <view class="exchange-btn">
+        <view class="exchange-item" bindtap="goodsCancel">取消</view>
+        <view class="exchange-item" bindtap="goodsForm">确定</view>
+    </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/submit/index.wxss
+++ b/pages/mall/submit/index.wxss
@@ -0,0 +1,342 @@
+page {
+    background-color: #f5f6f8;
+    padding: 30rpx;
+    box-sizing: border-box;
+}
+
+/* 地址 */
+.address {
+    background-color: #FFFFFF;
+    border-radius: 20rpx;
+    overflow: hidden;
+    position: relative;
+}
+
+.address-arrow {
+    position: absolute;
+    right: 30rpx;
+    top: 80rpx;
+    width: 38rpx;
+    height: 38rpx;
+}
+
+.address-cont {
+    padding: 30rpx 30rpx 0;
+    box-sizing: border-box;
+}
+
+.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%;
+}
+
+.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;
+}
+
+/* 商品 */
+.good {
+    background-color: #FFFFFF;
+    border-radius: 20rpx;
+    overflow: hidden;
+    margin: 30rpx 0;
+    position: relative;
+    padding: 30rpx;
+}
+
+.good-img {
+    width: 160rpx;
+    height: 160rpx;
+}
+
+.good-cont {
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 100%;
+    padding: 30rpx 30rpx 0 220rpx;
+    box-sizing: border-box;
+}
+
+.good-name {
+    font-size: 30rpx;
+}
+
+.good-price {
+    color: #df723a;
+}
+
+.good-price text {
+    font-size: 26rpx;
+    padding-right: 5rpx;
+}
+
+.label-integral {
+    color: #6c78f8;
+    font-weight: 600;
+}
+
+.good-tips {
+    margin: 10rpx 0 25rpx;
+    color: #585866;
+    font-size: 28rpx;
+}
+
+/* 规格 */
+.label {
+    background-color: #FFFFFF;
+    border-radius: 20rpx;
+    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-name {
+    flex: 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;
+}
+
+/* 购买方式 */
+.payWay {
+    margin-top: 30rpx;
+    padding: 30rpx;
+    box-sizing: border-box;
+}
+
+.cashierCont-pay-way {
+    padding: 40rpx 0;
+    height: 270rpx;
+    box-sizing: border-box;
+}
+
+.cashierCont-way-label {
+    float: left;
+    border: 2rpx solid #e8e8e8;
+    box-sizing: border-box;
+    padding: 30rpx 0;
+    border-radius: 10rpx;
+    width: calc(50% - 84rpx);
+    text-align: center;
+    margin: 0 40rpx;
+    font-size: 30rpx;
+    position: relative;
+    color: #999999;
+}
+
+.cashierCont-way-label.active {
+    border-color: #d5a56d;
+    color: #df723a;
+    box-shadow: 0 4rpx 20rpx rgba(204, 6, 29, 0.2);
+}
+
+.cashierCont-way-label radio {
+    opacity: 0;
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    left: 0;
+    top: 0;
+}
+
+.cashierCont-way-label image {
+    width: 78rpx;
+    height: 78rpx;
+    display: block;
+    margin: 0 auto 20rpx;
+}
+
+/* 底部 */
+.footer {
+    width: 100%;
+    height: 60px;
+    background-color: #FFFFFF;
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    z-index: 9;
+    padding: 8px 30rpx;
+    box-sizing: border-box;
+    display: flex;
+}
+
+.number {
+    flex: 1;
+    line-height: 44px;
+    color: #6c78f8;
+}
+
+.number text {
+    padding: 0 5rpx;
+    font-weight: 600;
+    font-size: 38rpx;
+}
+
+.btn {
+    height: 36px;
+    line-height: 36px;
+    background-color: #6c78f8;
+    text-align: center;
+    color: #FFFFFF;
+    border-radius: 60rpx;
+    font-size: 28rpx;
+    padding: 0 30rpx !important;
+    width: auto !important;
+    margin-top: 8rpx;
+}
+
+/* 兑换弹出 */
+.exchangePop {
+    position: fixed;
+    width: 100%;
+    height: 100%;
+    background-color: rgba(0, 0, 0, .5);
+    left: 0;
+    top: 0;
+    display: none;
+    z-index: 9;
+}
+
+.exchangePop.active {
+    display: block;
+}
+
+.exchangeCont {
+    left: 10%;
+    top: 50%;
+    width: 80%;
+    margin-top: -200rpx;
+    position: fixed;
+    z-index: 100;
+    background-color: #FFFFFF;
+    border-radius: 20rpx;
+    overflow: hidden;
+    text-align: center;
+    padding: 40rpx;
+    display: none;
+    box-sizing: border-box;
+}
+
+.exchangeCont.active {
+    display: block;
+}
+
+.exchange-title {
+    text-align: center;
+    color: #2b2b2b;
+    font-weight: 600;
+    font-size: 34rpx;
+}
+
+.exchange-number {
+    font-size: 28rpx;
+    margin: 30rpx 0;
+}
+
+.exchange-number text {
+    color: #f31d23;
+    font-weight: 600;
+    padding: 0 5rpx;
+}
+
+.exchange-img {
+    display: block;
+    width: 80rpx;
+    height: 80rpx;
+    margin: 10rpx auto;
+}
+
+.exchange-btn {
+    display: flex;
+}
+
+.exchange-item {
+    line-height: 78rpx;
+    flex: 2;
+    text-align: center;
+    margin: 0 15rpx;
+    border: 2rpx solid #000;
+    border-radius: 50rpx;
+    background-color: #FFFFFF;
+}
+
+.exchange-item:last-child {
+    background-color: #f31d23;
+    color: #FFFFFF;
+    border-color: #f31d23;
+}
+
+
+.grey {
+    background-color: #f9f9f9;
+    z-index: 99999;
+    position: fixed;
+}
--- a/pages/member/cause/cause.js
+++ b/pages/member/cause/cause.js
@@ -0,0 +1,99 @@
+ /*
+ * 手太欠
+ * 愿这世界都如故事里一样 美好而动人~
+ */
+
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        service     : '',
+        orderId     : '',
+        identityId  : '',
+        username    : '',   //用户
+        price       : '',   //打款金额
+        name        : '',
+        card_no     : '',
+        //打款凭证
+        showpath    : '',
+        path	    : '',
+        disabled    : false ,// 提交按钮状态
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+        this.setData({
+            orderId     : options.order_id,
+            identityId  : options.identity_id
+        })
+
+        // 获取银行+账号
+        wx.$api.member.identitieSee(options.identity_id).then(res => {
+            this.setData({
+                service: res.data.identity.service,
+                price  : res.data.identity.price
+            })
+        }).catch(err => {})
+
+        // 获取账户+凭证
+        wx.$api.member.orderSee(options.order_id).then(res => {
+            this.setData({
+                username  : res.data.name,
+                showpath  : res.data.cover,
+                path      : res.data.cover,
+            })
+        }).catch(err => {})
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+    },
+
+    // 上传图片
+    openImg(){
+        wx.chooseMedia({
+            count	: 1,
+            success	: path => {
+                // 上传图片
+                wx.$api.file.uploadImg(path.tempFiles[0].tempFilePath, {}).then(res=>{
+                    this.setData({
+                        showpath: res.url,
+                        path    : res.path
+                    })
+                })
+            }
+        })
+    },
+    
+    // 提交表单
+    issueForm(e) {
+        let value    = e.detail.value;
+        let data = {
+            name       : value.name,
+            price      : value.price,
+            cover      : this.data.path
+        }
+        wx.$api.member.orderSubmit(this.data.orderId, data).then(res => {
+            wx.showToast({
+                title: '提交成功',
+                icon: 'none',
+                duration: 2000
+            })
+            setTimeout(()=>{
+                wx.redirectTo({
+                    url: '/pages/member/examine/examine'
+                })
+            },3000)
+            this.setData({
+                disabled: true
+            })
+            
+        }).catch(err => {})
+    }
+})
--- a/pages/member/cause/cause.json
+++ b/pages/member/cause/cause.json
@@ -0,0 +1,3 @@
+{
+    "usingComponents": {}
+}
--- a/pages/member/cause/cause.wxml
+++ b/pages/member/cause/cause.wxml
@@ -0,0 +1,40 @@
+<form bindsubmit="issueForm" class="take">
+    <view class="take-label">
+        <view class="item">
+            <view class="name">
+                <image src="/static/icons/takeIcon_00.png" mode="widthFix"></image>收款银行
+            </view>
+            <view class="time">{{service.bank}}</view>
+        </view>
+        <view class="item">
+            <view class="name">
+                <image src="/static/icons/takeIcon_01.png" mode="widthFix"></image>收款银行帐号
+            </view>
+            <view class="time">{{service.bank_no}}</view>
+        </view>
+        <view class="item">
+            <view class="name">
+                <image src="/static/icons/takeIcon_02.png" mode="widthFix"></image>打款金额
+            </view>
+            <input class="entry" type="text" value="{{price}}" name="price" placeholder="请输入打款金额" />
+        </view>
+        <view class="item">
+            <view class="name">
+                <image src="/static/icons/takeIcon_03.png" mode="widthFix"></image>转款账户
+            </view>
+            <input class="entry" type="text" name="name" value="{{username}}" placeholder="请输入转款人账户名" />
+        </view>
+        <view class="item">
+            <view class="name">
+                <image src="/static/icons/takeIcon_04.png" mode="widthFix"></image>打款凭证
+            </view>
+            <view class="issueNew" bindtap="openImg">
+                <image class="issueNew-icon" src="{{showpath || '/static/imgs/cover_img.png'}}" mode="aspectFill"></image>
+                <view class="issueNew-text">请上传转款电子回单</view>
+            </view>
+        </view>
+    </view>
+    <view class="userdata-btn">
+        <button class="issue-btn" form-type="submit" size="mini" disabled="{{disabled}}">提交审核</button>
+    </view>
+</form>
--- a/pages/member/cause/cause.wxss
+++ b/pages/member/cause/cause.wxss
@@ -0,0 +1,96 @@
+page {
+    background-color: #f4f4f4;
+}
+
+.take-label {
+    padding: 30rpx 30rpx 0;
+    box-sizing: border-box;
+    border-bottom: 160rpx solid transparent;
+}
+
+.item {
+    padding:25rpx 20rpx 30rpx;
+    box-sizing: border-box;
+    background-color: #FFFFFF;
+    border-bottom: 2rpx solid #f3f3f3;
+    font-size: 32rpx;
+    margin-bottom: 30rpx;
+    border-radius: 30rpx;
+}
+
+.name {
+    width: 100%;
+    display: flex;
+    line-height: 44rpx;
+    margin-bottom: 20rpx;
+}
+
+.name image {
+    width: 44rpx;
+    height: 44rpx;
+    margin-right: 15rpx;
+}
+
+.time {
+    width: 100%;
+    color: #9d9d99;
+}
+
+.entry {
+    width: 100%;
+    background-color: #f4f4f4;
+    font-size: 30rpx;
+    padding: 0 30rpx;
+    height: 84rpx;
+    line-height: 84rpx;
+    box-sizing: border-box;
+    border-radius: 10rpx;
+    color: #9d9d99;
+}
+
+.issueNew {
+    text-align: center;
+    margin-top: 20rpx;
+}
+
+.issueNew-icon {
+    width: 200rpx;
+    height: 200rpx;
+}
+
+.issueNew-text {
+    font-size: 28rpx;
+    color: #9d9d9d;
+}
+
+/* 按钮 */
+.userdata-btn {
+    width: 100%;
+    box-sizing: border-box;
+    padding: 30rpx;
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    z-index: 99;
+    right: 0;
+    background: white;
+}
+
+.issue-btn {
+    background: #1d37e2;
+    text-align: center;
+    color: white;
+    height: 90rpx;
+    line-height: 90rpx !important;
+    font-size: 34rpx;
+    font-weight: normal;
+    width: 100% !important;
+    margin: 0;
+    padding: 0;
+    border-radius: 10rpx;
+}
+
+.issue-btn[disabled] {
+    background: #9b9b9b !important;
+    color: #fff !important;
+}
--- a/pages/member/examine/examine.js
+++ b/pages/member/examine/examine.js
@@ -0,0 +1,66 @@
+// pages/member/examine/examine.js
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {
+
+    }
+})
--- a/pages/member/examine/examine.json
+++ b/pages/member/examine/examine.json
@@ -0,0 +1,4 @@
+{
+    "usingComponents": {},
+    "navigationBarTitleText": "审核"
+}
--- a/pages/member/examine/examine.wxml
+++ b/pages/member/examine/examine.wxml
@@ -0,0 +1,10 @@
+<view class="pack-center pages-hint">
+    <image src="/static/imgs/time.png"></image>
+    <view class="tips">
+        <view class="tips-name">开通会员审核已提交</view>
+        <view class="tips-text">请耐心等待，可随时关注会会员状态</view>
+    </view>
+    <navigator hover-class="none" url="/pages/member/index" open-type="switchTab" class="btn">
+        知道了
+    </navigator>
+</view>
--- a/pages/member/examine/examine.wxss
+++ b/pages/member/examine/examine.wxss
@@ -0,0 +1,26 @@
+.tips {
+    margin: 30rpx 0;
+}
+
+.tips-name {
+    color: #000000;
+    font-weight: 600;
+    font-size: 36rpx;
+    margin-bottom: 20rpx;
+}
+
+.tips-text {
+    font-size: 30rpx;
+}
+
+.btn {
+    background-color: #0074ff;
+    color: #ffffff;
+    display: inline-block;
+    width: 50%;
+    line-height: 96rpx;
+    border-radius: 60rpx;
+    font-size: 30rpx;
+    margin-top: 80rpx;
+    box-shadow: 0 0 20rpx 6rpx rgba(0, 116, 255, .5);
+}
--- a/pages/member/index.js
+++ b/pages/member/index.js
@@ -0,0 +1,204 @@
+// pages/member/index.js
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        userLogin       : '',   //登录状态
+        avatar          : '',   //头像
+        nickName        : '',   //昵称
+        identityId      : '',   //用户id
+        identityShow    : '',   //身份有效期
+        tabType         : 2,    // 会员选项
+        identitiesData  : [],
+        interestData    : '',     // 会员权益
+        vipsData        : '',    //会员公告
+        barHeight       : getApp().globalData.statusBarHeight, // 状态栏高度
+        jiaonangheight  : getApp().globalData.jiaonangheight, //胶囊高度
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {},
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+        // 获取登录状态
+        if(wx.getStorageSync("token")){
+            this.setData({
+                userLogin: true
+            })
+
+            // 获取用户信息
+            this.userInfo();
+        }
+        // 获取身份前置
+        this.identityInfo();
+
+        // 获取身份权益
+        this.openTab();
+    },
+
+    /**
+     * 用户信息
+     */
+    userInfo() {
+        wx.$api.user.home().then(res => {
+            this.setData({
+                userData        : res.data,
+                avatar          : res.data.avatar,
+                nickName        : res.data.nickname,
+                identityId      : res.data.identity.id,
+                identityShow    : res.data.identityShow
+            })
+            
+        }).catch(err => {})
+    },
+
+    /**
+     * 身份前置
+     */
+    identityInfo(){
+        wx.$api.member.openModel().then(res => {
+            this.setData({
+                identitiesData : res.data.identities,
+                vipsData       : res.data.vips
+            })
+            
+        }).catch(err => {})
+    },
+
+    /**
+     * 切换身份
+     */
+    typeClick(e) {
+        this.setData({
+            tabType: e.currentTarget.dataset.type
+        })
+        // 获取身份权益
+        this.openTab();
+    },
+
+    /**
+     * 身份权益
+     */
+    openTab() {
+        // 3为金卡,4为钻卡
+        wx.$api.member.openSee(this.data.tabType).then(res => {
+            this.setData({
+                interestData: res.data
+            })
+        }).catch(err => {})
+    },
+
+    /**
+     * 截获竖向滑动
+     */
+    catchTouchMove(){
+        return false
+    },
+
+    /**
+     * 处理未登录时的转跳
+     */
+    userNav(e){
+        let pageUrl = e.currentTarget.dataset.url
+        if(wx.getStorageSync("token")){
+            // 微信支付-线上支付
+            if(this.data.interestData.channel.value == 1) {
+                this.wxPay();
+                return
+            }
+            // 上传打款凭证
+            wx.navigateTo({
+                url: pageUrl
+            })
+        }else{
+            // 去登录
+            wx.navigateTo({
+                url: "/pages/login/index"
+            })
+        }
+    },
+
+    /**
+     * 立即续费
+     */
+    renewTap() {
+        // 微信支付-线上支付
+        if(this.data.interestData.channel.value == 1) {
+            this.wxPay();
+            return
+        }
+        // 上传打款凭证-线下支付
+        wx.navigateTo({
+            url: "/pages/member/open/open?identity_id=" + this.data.interestData.identity_id
+        })
+    },
+
+    // 微信支付
+    wxPay() {
+        wx.showLoading({
+            title: '支付中...',
+            mask : true
+        })
+        let that = this
+        wx.login({
+            success: res => {
+                wx.$api.member.openid(res).then(openidRes => {
+                    wx.$api.member.openIndex(that.data.interestData.identity_id,{}).then(memberRes => {
+                        wx.hideLoading()
+                        wx.$api.member.identityPay(memberRes.data.order_id, {
+                            channel: 'miniapp',
+                            openid : openidRes.data
+                        }).then(PayRes => {
+                            let payInfo = JSON.parse(PayRes.data.wechat)
+                            wx.requestPayment({
+                                timeStamp: payInfo.timeStamp,
+                                nonceStr : payInfo.nonceStr,
+                                package  : payInfo.package,
+                                paySign  : payInfo.paySign,
+                                signType : payInfo.signType,
+                                success  : payInfoRes=>{
+                                    if(payInfoRes.errMsg == "requestPayment:ok"){
+                                        wx.showToast({
+                                            title: '支付成功',
+                                            icon : 'success'
+                                        })
+                                        setTimeout(()=>{
+                                            wx.switchTab({
+                                                url: '/pages/user/index'
+                                            })
+                                        },3000)
+                                    }
+                                },
+                                fail  : res=>{
+                                    wx.showToast({
+                                        title: '取消支付',
+                                        icon: 'none'
+                                    })
+                                }
+                            })
+                        }).catch(err => {})
+                    }).catch(err => {})
+                }).catch(err => {})
+            }
+        })
+    },
+
+    /**
+     * 查看驳回原因
+     */
+    tapCause(e) {
+        wx.showModal({
+            title   : '驳回原因',
+            content : e.currentTarget.dataset.text,
+            showCancel: false,
+            success : res=> {}
+        })
+    }
+})
--- a/pages/member/index.json
+++ b/pages/member/index.json
@@ -0,0 +1,4 @@
+{
+    "usingComponents": {},
+    "navigationStyle": "custom"
+}
--- a/pages/member/index.wxml
+++ b/pages/member/index.wxml
@@ -0,0 +1,105 @@
+<view class="Usetop">
+    <image class="Usetop-back" mode="widthFix" src="/static/imgs/uaer_back.png"></image>
+    <view class="Usetop-range" style="padding-top:{{barHeight + jiaonangheight}}px;">
+        <view class="Usetop-cont" wx:if="{{userLogin}}">
+            <view class="Usetop-head {{identityId == '1' ? 'active' : ''}}">
+                <image class="Usetop-head-avatar" bindtap="updImg" src="{{avatar ? avatar : '/static/imgs/default_myHead.png'}}" mode="aspectFill"></image>
+            </view>
+            <view class="Usetop-text">
+                <view class="Usetop-text-name">
+                    {{nickName}}
+                    <!--1为游客  2为普通会员  3为金卡会员  4为钻卡会员  5为年卡会员 -->
+                    <image wx:if="{{identityId == '2'}}" src="/static/icons/member_02.png" mode="widthFix"></image>
+                    <image wx:elif="{{identityId == '3'}}" src="/static/icons/member_03.png" mode="widthFix"></image>
+                    <image wx:elif="{{identityId == '4'}}" src="/static/icons/member_04.png" mode="widthFix"></image>
+                    <!-- <image wx:elif="{{identityId == '5'}}" src="/static/icons/member_05.png" mode="widthFix"></image> -->
+                    <image wx:else src="/static/icons/member_01.png" mode="widthFix"></image>
+                </view>
+                <view class="Usetop-text-time" wx:if="{{identityId != '1' || identityId == '2'}}">
+                    {{identityShow.times.name}}会员有效期至 {{identityShow.times.ended_at}}
+                </view>
+                <view class="Usetop-text-time" wx:else>
+                    暂未开通会员
+                </view>
+            </view>
+        </view>
+        <view class="Usetop-cont" wx:else>
+            <view class="Usetop-head">
+                <image class="Usetop-head-avatar" bindtap="updImg" src="../../static/imgs/default_myHead.png" mode="aspectFill"></image>
+            </view>
+            <view class="Usetop-text">
+                <navigator hover-class="none" url="/pages/login/index" class="Usetop-text-name">
+                    请先登录
+                </navigator>
+                <view class="Usetop-text-time">
+                    登录后开通会员
+                </view>
+            </view>
+        </view>
+    </view>
+</view>
+
+<!-- 公告 -->
+<view class="notice" style="display: none;">
+    <view class="notice-cont">
+        <swiper class="notice-cont-swiper" autoplay vertical interval="4000" circular duration="1000">
+            <block wx:for="{{vipsData}}" wx:key="vipsData">
+                <swiper-item catchtouchmove="catchTouchMove">
+                    <view class="swiper-item">
+                        <image class="notice-cont-avatar" src="{{item.avatar ? item.avatar : '/static/imgs/default_myHead.png'}}" mode="aspectFill"></image>
+                        <view class="notice-cont-name">用户<text>{{item.nickname}}</text>成为了{{item.identity.name}}</view>
+                    </view>
+                </swiper-item>
+            </block>
+        </swiper>
+    </view>
+</view>
+
+<!-- 权益 -->
+<view class="interest">
+    <view class="interest-title">开通会员立享<text>{{interestData.rules.length}}</text>大权益</view>
+    <view class="interest-cont">
+        <scroll-view class="monsterPart-list" scroll-x="true" scroll-with-animation>
+            <view class="interest-label" wx:for="{{interestData.rules}}" wx:key="rules">
+                <image class="interest-label-icon" src="{{item.cover}}" mode="widthFix"></image>
+                <view class="interest-label-name">{{item.text}}</view>
+            </view>
+        </scroll-view>
+        <view class="interest-tab">
+            <view class="interest-tab-title">会员充值</view>
+            <view class="interest-tab-item">
+                <view class="interest-tab-label {{tabType == item.identity_id ? 'active' : ''}}" bindtap="typeClick" data-type="{{item.identity_id}}" wx:for="{{identitiesData}}" wx:key="identitiesData">
+                    <view class="interest-tab-name">
+                        锶享会·{{item.name}}
+                    </view>
+                    <view class="interest-tab-number">
+                        <text>￥</text>{{item.price}}
+                    </view>
+                    <view class="interest-tab-text">{{item.bottle}}瓶({{item.stock}}箱)</view>
+                </view>
+            </view>
+        </view>
+    </view>
+</view>
+
+<!-- 按钮 -->
+<view class="open">
+    <block wx:if="{{userLogin}}">
+        <view class="open-btn" bindtap="userNav" data-url="./open/open?identity_id={{interestData.identity_id}}" wx:if="{{interestData.can.open}}"><text>￥{{interestData.price}}</text>立即开通</view>
+        <block wx:else>
+            <view bindtap="renewTap" class="open-btn" wx:if="{{interestData.can.renew}}">
+                立即续费
+            </view>
+            <block wx:else>
+                <block wx:if="{{interestData.can.reopen}}">
+                    <navigator url="./cause/cause?identity_id={{interestData.identity_id}}&order_id={{interestData.identity_order.order_id}}" hover-class="none" class="open-btn">修改{{interestData.buttonText}}</navigator>
+                    <view class="seeCause" data-text="{{interestData.identity_order.reject_reason}}" bindtap="tapCause">查看驳回原因</view>
+                </block>
+                <view class="open-btn active" wx:else>
+                    {{interestData.buttonText}}
+                </view>
+            </block>
+        </block>
+    </block>
+    <navigator class="open-btn" url="/pages/login/index" wx:else><text>￥{{interestData.price}}</text>立即开通</navigator>
+</view>
--- a/pages/member/index.wxss
+++ b/pages/member/index.wxss
@@ -0,0 +1,241 @@
+/* 头部 */
+.Usetop {
+    width: 100%;
+    position: relative;
+    padding-top: 42%;
+}
+
+.Usetop-back,
+.Usetop-range {
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+    box-sizing: border-box;
+}
+
+.Usetop-back {
+    z-index: 1;
+}
+
+.Usetop-range {
+    z-index: 2;
+}
+
+.Usetop-cont {
+    padding: 20rpx 0 0 50rpx;
+    box-sizing: border-box;
+    display: flex;
+}
+
+.Usetop-head {
+    width: 100rpx;
+    height: 100rpx;
+    border-radius: 50%;
+    border: 6rpx solid #ffffff;
+    position: relative;
+}
+
+.Usetop-head-avatar {
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    border-radius: 50%;
+}
+
+.Usetop-text {
+    width: calc(100% - 110rpx);
+    padding: 0 30rpx;
+    box-sizing: border-box;
+}
+
+.Usetop-text-name {
+    font-size: 36rpx;
+    display: flex;
+    margin-top: 6rpx;
+}
+
+.Usetop-text image {
+    width: 130rpx;
+    margin-left:20rpx;
+    vertical-align: middle;
+}
+
+.Usetop-text-time {
+    font-size: 28rpx;
+    margin-top: 10rpx;
+}
+
+/* 公告 */
+.notice {
+    padding: 0 30rpx;
+    box-sizing: border-box;
+}
+
+.notice-cont {
+    background-color: #ffffff;
+    border-radius: 80rpx;
+    padding: 20rpx 30rpx;
+    box-sizing: border-box;
+    box-shadow: 0rpx 3rpx 20rpx 4rpx rgba(13, 81, 177, .05);
+    height: 100rpx;
+}
+
+.notice-cont-swiper {
+    height: 100%;
+}
+
+.notice-cont-avatar {
+    width: 60rpx;
+    height: 60rpx;
+    border-radius: 50%;
+}
+
+.swiper-item {
+    display: flex;
+    font-size: 28rpx;
+    line-height: 64rpx;
+}
+
+.notice-cont-name {
+    width: calc(100% - 60rpx);
+    padding-left: 20rpx;
+    box-sizing: border-box;
+}
+
+.notice-cont-name text {
+    color: #3b7cff;
+}
+
+/* 权益 */
+.interest {
+    padding: 0 15rpx 30rpx;
+    box-sizing: border-box;
+}
+
+.interest-title {
+    text-align: center;
+    color: #4683ff;
+    font-size: 34rpx;
+}
+
+.interest-cont {
+    padding: 40rpx 0;
+}
+
+.monsterPart-list {
+    width: 100%;
+    white-space: nowrap;
+    padding-bottom: 30rpx;
+}
+
+.interest-label {
+    display: inline-block;
+    font-size: 26rpx;
+    text-align: center;
+    margin: 0 20rpx;
+}
+
+.interest-label-icon {
+    width: 120rpx;
+}
+
+.interest-tab {
+    position: relative;
+    padding: 40rpx 0 30rpx;
+    box-sizing: border-box;
+}
+
+.interest-tab::after {
+    position: absolute;
+    content: '';
+    left: 15rpx;
+    top: 0;
+    width: calc(100% - 30rpx);
+    height: 2rpx;
+    background-color: #f1f4f9;
+}
+
+.interest-tab-title {
+    font-weight: 600;
+    font-size: 34rpx;
+    padding: 0 15rpx;
+}
+
+.interest-tab-item {
+    margin-top: 30rpx;
+    display: flex;
+}
+
+.interest-tab-label {
+    flex: 3;
+    text-align: center;
+    box-shadow: 0rpx 0rpx 20rpx 4rpx rgba(13, 81, 177, .05);
+    margin: 0 15rpx;
+    padding: 30rpx 0;
+    box-sizing: border-box;
+    border-radius: 20rpx;
+    font-size: 30rpx;
+    border: 4rpx solid #ffffff;
+}
+
+.interest-tab-label.active {
+    border-color: #3b7cff;
+}
+
+.interest-tab-name {
+    color: #666666;
+    font-size: 24rpx;
+}
+
+.interest-tab-number {
+    color: #3b7cff;
+    margin: 20rpx 0;
+    font-size: 40rpx;
+    font-weight: 600;
+}
+
+.interest-tab-number text {
+    font-size: 26rpx;
+    font-weight: normal;
+}
+
+.interest-tab-text {
+    font-size: 26rpx;
+    color: #999999;
+}
+
+/* 按钮 */
+.open {
+    padding: 0 30rpx 30rpx;
+    box-sizing: border-box;
+}
+
+.open-btn {
+    width: 100%;
+    line-height: 100rpx;
+    background-color: #3b7cff;
+    color: #ffffff;
+    border-radius: 60rpx;
+    overflow: hidden;
+    text-align: center;
+    font-size: 34rpx;
+}
+
+.open-btn.active {
+    background-color: rgb(156, 156, 156);
+}
+
+.seeCause {
+    text-align: center;
+    line-height: 90rpx;
+    font-size: 28rpx;
+    color: #8a5400;
+    text-decoration: underline;
+}
+
+.open-btn text {
+    padding-right: 20rpx;
+    font-weight: 600;
+}
--- a/pages/member/open/open.js
+++ b/pages/member/open/open.js
@@ -0,0 +1,93 @@
+ /*
+ * 手太欠
+ * 愿这世界都如故事里一样 美好而动人~
+ */
+
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        service : '',
+        username: '',   //用户手机号
+        price   : '',   //打款金额
+        name    : '',
+        card_no : '',
+        //打款凭证
+        showpath: '',
+        path	: '',
+        disabled : false ,// 提交按钮状态
+        identityId: ''
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+        this.setData({
+            identityId: options.identity_id
+        })
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+        wx.$api.user.home().then(res => {
+            this.setData({
+                username: res.data.username
+            })
+        }).catch(err => {})
+        
+        wx.$api.member.identitieSee(this.data.identityId).then(res => {
+            this.setData({
+                service: res.data.identity.service,
+                price  : res.data.identity.price
+            })
+        }).catch(err => {})
+    },
+
+    // 上传图片
+    openImg(){
+        wx.chooseMedia({
+            count	: 1,
+            success	: path => {
+                // 上传图片
+                wx.$api.file.uploadImg(path.tempFiles[0].tempFilePath, {}).then(res=>{
+                    this.setData({
+                        showpath: res.url,
+                        path    : res.path
+                    })
+                })
+            }
+        })
+    },
+    
+    // 提交表单
+    issueForm(e) {
+        let value    = e.detail.value;
+        let data = {
+            name       : value.name,
+            price      : value.price,
+            cover      : this.data.path
+        }
+        wx.$api.member.openIndex(this.data.identityId, data).then(res => {
+            wx.showToast({
+                title: '提交成功',
+                icon: 'none',
+                duration: 2000
+            })
+            setTimeout(()=>{
+                wx.redirectTo({
+                    url: '/pages/member/examine/examine'
+                })
+            },3000)
+            this.setData({
+                disabled: true
+            })
+            
+        }).catch(err => {
+        })
+    }
+})
--- a/pages/member/open/open.json
+++ b/pages/member/open/open.json
@@ -0,0 +1,3 @@
+{
+    "usingComponents": {}
+}
--- a/pages/member/open/open.wxml
+++ b/pages/member/open/open.wxml
@@ -0,0 +1,40 @@
+<form bindsubmit="issueForm" class="take">
+    <view class="take-label">
+        <view class="item">
+            <view class="name">
+                <image src="/static/icons/takeIcon_00.png" mode="widthFix"></image>收款银行
+            </view>
+            <view class="time">{{service.bank}}</view>
+        </view>
+        <view class="item">
+            <view class="name">
+                <image src="/static/icons/takeIcon_01.png" mode="widthFix"></image>收款银行帐号
+            </view>
+            <view class="time">{{service.bank_no}}</view>
+        </view>
+        <view class="item">
+            <view class="name">
+                <image src="/static/icons/takeIcon_02.png" mode="widthFix"></image>打款金额
+            </view>
+            <input class="entry" type="text" value="{{price}}" name="price" placeholder="请输入打款金额" />
+        </view>
+        <view class="item">
+            <view class="name">
+                <image src="/static/icons/takeIcon_03.png" mode="widthFix"></image>转款账户
+            </view>
+            <input class="entry" type="text" name="name" placeholder="请输入转款人账户名" />
+        </view>
+        <view class="item">
+            <view class="name">
+                <image src="/static/icons/takeIcon_04.png" mode="widthFix"></image>打款凭证
+            </view>
+            <view class="issueNew" bindtap="openImg">
+                <image class="issueNew-icon" src="{{showpath || '/static/imgs/cover_img.png'}}" mode="aspectFill"></image>
+                <view class="issueNew-text">请上传转款电子回单</view>
+            </view>
+        </view>
+    </view>
+    <view class="userdata-btn">
+        <button class="issue-btn" form-type="submit" size="mini" disabled="{{disabled}}">提交审核</button>
+    </view>
+</form>
--- a/pages/member/open/open.wxss
+++ b/pages/member/open/open.wxss
@@ -0,0 +1,96 @@
+page {
+    background-color: #f4f4f4;
+}
+
+.take-label {
+    padding: 30rpx 30rpx 0;
+    box-sizing: border-box;
+    border-bottom: 160rpx solid transparent;
+}
+
+.item {
+    padding:25rpx 20rpx 30rpx;
+    box-sizing: border-box;
+    background-color: #FFFFFF;
+    border-bottom: 2rpx solid #f3f3f3;
+    font-size: 32rpx;
+    margin-bottom: 30rpx;
+    border-radius: 30rpx;
+}
+
+.name {
+    width: 100%;
+    display: flex;
+    line-height: 44rpx;
+    margin-bottom: 20rpx;
+}
+
+.name image {
+    width: 44rpx;
+    height: 44rpx;
+    margin-right: 15rpx;
+}
+
+.time {
+    width: 100%;
+    color: #9d9d99;
+}
+
+.entry {
+    width: 100%;
+    background-color: #f4f4f4;
+    font-size: 30rpx;
+    padding: 0 30rpx;
+    height: 84rpx;
+    line-height: 84rpx;
+    box-sizing: border-box;
+    border-radius: 10rpx;
+    color: #9d9d99;
+}
+
+.issueNew {
+    text-align: center;
+    margin-top: 20rpx;
+}
+
+.issueNew-icon {
+    width: 200rpx;
+    height: 200rpx;
+}
+
+.issueNew-text {
+    font-size: 28rpx;
+    color: #9d9d9d;
+}
+
+/* 按钮 */
+.userdata-btn {
+    width: 100%;
+    box-sizing: border-box;
+    padding: 30rpx;
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    z-index: 99;
+    right: 0;
+    background: white;
+}
+
+.issue-btn {
+    background: #1d37e2;
+    text-align: center;
+    color: white;
+    height: 90rpx;
+    line-height: 90rpx !important;
+    font-size: 34rpx;
+    font-weight: normal;
+    width: 100% !important;
+    margin: 0;
+    padding: 0;
+    border-radius: 10rpx;
+}
+
+.issue-btn[disabled] {
+    background: #9b9b9b !important;
+    color: #fff !important;
+}
--- a/pages/order/details/index.js
+++ b/pages/order/details/index.js
@@ -0,0 +1,77 @@
+ /*
+ * 手太欠
+ * 愿这世界都如故事里一样 美好而动人~
+ */
+
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        goodsData   : '', //详情
+        sign        : '', //签收
+        express     : '', //物流
+        orderNo     : ''  //订单号
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+        this.setData({
+            orderNo: options.orderNo
+        })
+
+        // 订单详情
+        this.goodsInfo(options.orderNo);
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {},
+
+    // 获取订单详情
+    goodsInfo(orderNo) {
+        wx.$api.user.goodsDet(orderNo).then(res => {
+            this.setData({
+                goodsData   : res.data,
+                sign        : res.data.can.sign,
+                express     : res.data.express
+            })
+        }).catch(err => {})
+    },
+
+    // 复制订单号
+    copyUrl(val) {
+        wx.setClipboardData({
+            data: val.currentTarget.dataset.no,
+            success: () => {
+                wx.showToast({
+                    title: "复制成功",
+                    icon : "none"
+                })
+            }
+        })
+    },
+
+    // 订单签收
+    signClick() {
+        wx.showModal({
+            title   : '提示',
+            content : '是否签收',
+            success : res=> {
+                if (res.confirm) {
+                    wx.$api.user.goodsSign(this.data.orderNo).then(res => {
+                        wx.showToast({
+                           title:'签收成功',
+                           icon:'none'
+                        })
+                        wx.navigateBack()
+                    }).catch(err => {})
+                }
+            }
+        })
+    }
+})
--- a/pages/order/details/index.json
+++ b/pages/order/details/index.json
@@ -0,0 +1,4 @@
+{
+    "usingComponents": {},
+    "navigationBarTitleText": "订单详情"
+}
--- a/pages/order/details/index.wxml
+++ b/pages/order/details/index.wxml
@@ -0,0 +1,88 @@
+<view class="orderData">
+    <view class="While">
+        <view class="orderData-cont-label">
+            <image class="orderData-cont-img" src="/static/icons/orderIcon_01.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/orderIcon_00.png" mode="aspectFill"></image>
+            <view class="orderData-cont-text">
+                <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 orderGoods">
+        <view class="orderGoods-wares" wx:for="{{goodsData.items}}" wx:key="items">
+            <!-- 先默认固定图 -->
+            <image class="orderGoods-img" src="{{ item.sku.cover }}" mode="widthFix"></image>
+            <view class="orderGoods-cont">
+                <view class="nowrap orderGoods-name">{{ item.sku.goods_name }}</view>
+                <view class="orderGoods-price">
+                    <text>￥{{ item.price }}</text>
+                    x{{ item.qty }}
+                </view>
+            </view>
+        </view>
+    </view>
+
+    <view class="While reserveCont">
+        <view class="reserveCont-title">订单信息</view>
+        <view class="reserve-label">
+            <view class="reserve-name">订单类型</view>
+            <view class="reserve-text">
+                <text class="active" wx:if="{{goodsData.type == '积分兑换'}}">兑换订单</text>
+                <text wx:else>提货订单</text>
+            </view>
+        </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">{{ goodsData.state }}</view>
+        </view>
+        <view class="reserve-label" wx:if="{{goodsData.type == '积分兑换'}}">
+            <view class="reserve-name">水滴数量</view>
+            <view class="reserve-text green">{{ goodsData.total }} 水滴</view>
+        </view>
+    </view>
+    <view class="While reserveCont" wx:if="{{express.express_name}}">
+        <view class="reserveCont-title">物流信息</view>
+        <view class="reserve-label">
+            <view class="reserve-name">物流公司</view>
+            <view class="reserve-text">{{ express.express_name }}</view>
+        </view>
+        <view class="reserve-label">
+            <view class="reserve-name">收货姓名</view>
+            <view class="reserve-text green">{{ express.name }}</view>
+        </view>
+        <view class="reserve-label">
+            <view class="reserve-name">收货电话</view>
+            <view class="reserve-text green">{{ express.mobile }}</view>
+        </view>
+        <view class="reserve-label">
+            <view class="reserve-name">物流单号</view>
+            <view class="reserve-text">{{ express.express_no }}<view class="reserve-copy" bindtap="copyUrl" data-no="{{express.express_no}}">复制</view>
+            </view>
+        </view>
+    </view>
+</view>
+<view class="order-data-footer">
+    <navigator hover-class="none" class="order-btn" open-type="navigateBack">返回订单</navigator>
+    <view class="order-btn" bindtap="signClick" wx:if="{{sign}}">签收订单</view>
+</view>
--- a/pages/order/details/index.wxss
+++ b/pages/order/details/index.wxss
@@ -0,0 +1,213 @@
+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: 70rpx transparent solid;
+
+}
+
+/* 订单 */
+.orderData-cont-label {
+    padding: 40rpx 30rpx;
+    display: flex;
+    box-sizing: border-box;
+    border-bottom: #f2f2f2 2rpx solid;
+}
+
+.orderData-cont-img {
+    width: 48rpx;
+    height: 48rpx;
+    vertical-align: middle;
+}
+
+.orderData-cont-text {
+    width: calc(100% - 68rpx);
+    margin-left: 20rpx;
+    box-sizing: border-box;
+    font-size: 30rpx;
+}
+
+.orderData-cont-name {
+    margin-bottom: 10rpx;
+}
+
+.orderData-cont-name text {
+    color: #999;
+    padding-left: 20rpx;
+}
+
+.orderData-cont-copy {
+    display: flex;
+    font-size: 26rpx;
+    color: #999;
+}
+
+.orderData-cont-copy text {
+    flex: 1;
+    display: inline-block;
+    margin-right: 20rpx;
+}
+
+.orderData-cont-copy view {
+    color: #eb504c;
+}
+
+/* 产品 */
+.orderGoods {
+    padding: 30rpx;
+    box-sizing: border-box;
+}
+
+.orderGoods-wares {
+    position: relative;
+}
+
+.orderGoods-img {
+    width: 100rpx;
+    height: 100rpx;
+    border: 2rpx solid #dddddd;
+    border-radius: 10rpx;
+}
+
+.orderGoods-cont {
+    position: absolute;
+    width: calc(100% - 130rpx);
+    left: 130rpx;
+    top: 0;
+    font-size: 30rpx;
+}
+
+.orderGoods-text {
+    margin: 20rpx 0 30rpx;
+    color: #666666;
+    font-size: 26rpx;
+}
+
+.orderGoods-price {
+    display: flex;
+    color: #555555;
+    margin-top: 15rpx;
+}
+
+.orderGoods-price text {
+    flex: 1;
+    color: #000;
+}
+
+.orderGoods-brief {
+    display: flex;
+    padding-top: 30rpx;
+}
+
+.orderGoods-brief view {
+    flex: 1;
+    color: #333333;
+}
+
+.orderGoods-brief text {
+    font-weight: 600;
+}
+
+/* 规格 */
+.reserveCont-title {
+    font-weight: 600;
+    padding: 30rpx;
+    font-size: 30rpx;
+}
+
+.reserve-label {
+    display: flex;
+    padding: 0 30rpx 30rpx;
+    box-sizing: border-box;
+    font-size: 26rpx;
+}
+
+.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 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;
+    color: #1d37e2;
+}
+
+.reserve-text.green{
+    color: #eb504c;
+}
+
+.reserve-copy {
+    color: #6774ff;
+    border: #6774ff 2rpx solid;
+    display: inline-block;
+    height: 34rpx;
+    line-height: 34rpx;
+    font-size: 26rpx;
+    padding: 0 10rpx;
+    border-radius: 4rpx;
+    margin-left: 10rpx;
+}
+
+/* 底部菜单 */
+.order-data-footer {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    border-top: solid 1rpx #f2f2f2;
+    padding-top: 17rpx;
+    padding-right: 30rpx;
+    padding-left: 30rpx;
+    height: 83rpx;
+    background: white;
+    display: flex;
+    flex-wrap: wrap;
+    flex-direction: row-reverse;
+    z-index: 9;
+}
+
+.order-btn {
+    margin-left: 20rpx;
+    height: 58rpx;
+    line-height: 58rpx;
+    box-sizing: border-box;
+    border: solid 1rpx #747788;
+    padding: 0 20rpx;
+    font-size: 26rpx;
+    border-radius: 10rpx;
+    margin-top: 5rpx;
+}
--- a/pages/order/list/index.js
+++ b/pages/order/list/index.js
@@ -0,0 +1,246 @@
+ /*
+ * 手太欠
+ * 愿这世界都如故事里一样 美好而动人~
+ */
+
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        listType    : 'unpay', //unpay待付款, paid待发货，delivered已发货，signed已签收 completed已完成
+        orderArr    : [],   //订单列表
+        disabled    : false,
+        surplus      : '',  // 水滴数量
+        orderNo     : '',  // 订单编号
+        payEject    : false, // 支付弹出
+        payType     : 'wechat'  //支付类型  wechat微信  water水滴兑换
+        
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+        this.setData({
+            listType: options.listType
+        })
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+        // 获取订单列表
+        this.ordersInfo();
+
+        // 获取用户信息
+        this.userInfo();
+    },
+
+    /**
+     * 用户信息
+     */
+    userInfo() {
+        wx.$api.user.home().then(res => {
+            this.setData({
+                surplus : res.data.account.score.surplus
+            })
+        }).catch(err => {})
+    },
+
+    /**
+     * 订单列表
+     */
+    ordersInfo(page) {
+        wx.$api.user.orders({
+            state: this.data.listType,
+            page : page
+        }).then(res => {
+            let listArr = this.data.orderArr,
+                newData = []
+            if(page == 1 || page == undefined) listArr = []
+            newData = listArr.concat(res.data.data)
+            this.setData({
+                orderArr    : 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.ordersInfo();
+    },
+
+    /**
+     * 选择支付方式
+     */
+    radioChange(e) {
+        this.setData({
+            payType   : e.detail.value
+        })
+    },
+
+    /**
+     * 立即付款
+     */
+    payTap(e) {
+        this.setData({
+            orderNo: e.currentTarget.dataset.no,
+            payEject: true
+        })
+    },
+
+    /**
+     * 立即付款-弹出关闭
+     */
+    payClose() {
+        this.setData({
+            payEject: false
+        })
+    },
+
+    // 支付提交
+    paySubmit() {
+        this.setData({
+            payEject: false
+        })
+
+        if(this.data.payType == 'wechat') {
+            this.wxPay()
+            return
+        }
+        // this.data.payType == water 为水滴兑换
+        this.waterPay()
+    },
+
+    // 微信支付
+    wxPay() {
+        wx.showLoading({
+            title: '支付中...',
+            mask : true
+        })
+        let that = this
+
+        wx.login({
+            success: res => {
+                wx.$api.member.openid(res).then(openidRes => {
+                    wx.$api.member.wechatPay(this.data.orderNo, {
+                        type   : 'miniapp',
+                        openid : openidRes.data
+                    }).then(PayRes => {
+                        wx.hideLoading()
+                        this.setData({
+                            disabled   : true
+                        })
+                        let payInfo = JSON.parse(PayRes.data.wechat)
+                        wx.requestPayment({
+                            timeStamp: payInfo.timeStamp,
+                            nonceStr : payInfo.nonceStr,
+                            package  : payInfo.package,
+                            paySign  : payInfo.paySign,
+                            signType : payInfo.signType,
+                            success  : payInfoRes=>{
+                                if(payInfoRes.errMsg == "requestPayment:ok"){
+                                    wx.showToast({
+                                        title: '支付成功',
+                                        icon: 'none',
+                                        duration: 2000,
+                                        //显示透明蒙层，防止触摸穿透
+                                        mask:true,
+                                        success: function () {
+                                            // 获取订单列表
+                                            that.ordersInfo();
+                                        }
+                                    })
+                                }
+                            },
+                            fail  : res=>{
+                                wx.showToast({
+                                    title: '支付失败',
+                                    icon: 'none',
+                                    duration: 500,
+                                    //显示透明蒙层，防止触摸穿透
+                                    mask:true,
+                                    success: function () {
+                                        // 获取订单列表
+                                        that.ordersInfo();
+                                        that.setData({
+                                            listType: 'unpay'
+                                        })
+                                    }
+                                })
+                            }
+                        })
+                    }).catch(err => {})
+                }).catch(err => {})
+            }
+        })
+    },
+
+    // 水滴兑换
+    waterPay() {
+        wx.showLoading({
+            title: '水滴兑换中...',
+            mask : true
+        })
+        let that = this
+
+        wx.$api.mall.affirmPay(this.data.orderNo, {gateway: 'miniapp'}).then(res => {
+            wx.hideLoading()
+            this.setData({
+                disabled   : true
+            })
+            wx.showToast({
+                title: '兑换成功',
+                icon: 'none',
+                duration: 2000,
+                //显示透明蒙层，防止触摸穿透
+                mask:true,
+                success: function () {
+                    // 获取订单列表
+                    that.ordersInfo();
+
+                    that.setData({
+                        listType: 'unpay'
+                    })
+                }
+            })
+        }).catch(err => {})
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+        // 获取订单列表
+        this.ordersInfo();
+    },
+
+    /**
+     * 上拉加载
+     */
+    onReachBottom(){
+        this.setData({
+            lodingStats: true
+        })
+        let pageNumber = this.data.page.current
+        if(this.data.page.has_more){
+            pageNumber++
+            // 获取订单列表
+            this.ordersInfo(pageNumber);
+        }
+    }
+})
--- a/pages/order/list/index.json
+++ b/pages/order/list/index.json
@@ -0,0 +1,4 @@
+{
+    "usingComponents": {},
+    "navigationBarTitleText": "我的订单"
+}
--- a/pages/order/list/index.wxml
+++ b/pages/order/list/index.wxml
@@ -0,0 +1,84 @@
+<view class="header">
+    <view class="tabs">
+        <view class="item {{listType == 'paid' ? 'show' : ''}}" bindtap="onTabs" data-type="paid">待发货</view>
+        <view class="item {{listType == 'unpay' ? 'show' : ''}}" bindtap="onTabs" data-type="unpay">待付款</view>
+        <view class="item {{listType == 'delivered' ? 'show' : ''}}" bindtap="onTabs" data-type="delivered">已发货</view>
+        <view class="item {{listType == 'signed' ? 'show' : ''}}" bindtap="onTabs" data-type="signed">已签收</view>
+        <!-- <view class="item {{listType == 'completed' ? 'show' : ''}}" bindtap="onTabs" data-type="completed">已完成</view> -->
+    </view>
+</view>
+
+<view class="order" wx:if="{{orderArr.length > 0}}">
+    <view class="While order-list" wx:for="{{orderArr}}" wx:key="orderArr">
+        <view class="order-top">
+            <view class="order-top-number">{{ item.order_no }}</view>
+            <view class="order-top-tips">{{ item.state }}</view>
+        </view>
+        <view class="order-name" wx:for-item="goodItem" wx:for="{{item.items}}" wx:key="items">
+            <!-- 先默认固定图 -->
+            <image class="order-img" src="{{ goodItem.sku.cover }}" mode="widthFix"></image>
+            <view class="order-goods">
+                <view class="order-label">
+                    <view class="nowrap order-label-name">
+                        {{ goodItem.sku.goods_name }}
+                    </view>
+                    <view class="order-label-price">
+                        {{goodItem.sku.price != 0 ? '￥' + goodItem.sku.price : '兑换'}}
+                    </view>
+                </view>
+                <view class="order-specs">
+                    x{{ goodItem.qty }}
+                </view>
+            </view>
+        </view>
+        <view class="order-text">
+            <view class="order-time">下单时间：{{ item.created_at }}</view>
+        </view>
+        <view class="order-btn">
+            <!-- <view class="order-btn-type">
+                <text class="active" wx:if="{{item.type == '积分兑换'}}">兑换订单</text>
+                <text wx:else>提货订单</text>
+            </view> -->
+
+            <view class="order-btn-atn order-btn-go" bindtap="payTap" data-no="{{item.order_no}}" wx:if="{{item.can.pay}}">去付款</view>
+            <navigator hover-class="none" url="../details/index?orderNo={{item.order_no}}" class="order-btn-atn">订单详情</navigator>
+        </view>
+    </view>
+    <view class="pagesLoding" wx:if="{{lodingStats}}">
+        <block wx:if="{{page.has_more}}">
+            <image class="pagesLoding-icon" src="/static/icon/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/coupon_null.png"></image>
+    <view>暂无数据</view>
+</view>
+
+<!-- 支付弹出 -->
+<view class="payPop {{payEject ? 'active' : ''}}"></view>
+<view class="payCont {{payEject ? 'active' : ''}}">
+    <image class="payCont-label-close" src="/static/icons/reportColse_grey.png" bindtap="payClose"></image>
+    <radio-group bindchange="radioChange" style="width: 100%; display: block;">
+        <view class="payCont-label {{ payType == 'wechat' ? 'active' : ''}}">
+            <view class="payContList-label-name">
+                <image class="payCont-label-img" src="/static/imgs/wx.jpg"></image>
+                <text>微信支付</text>
+            </view>
+            <image class="payContList-label-arrow" src="{{ payType == 'wechat' ? '/static/icons/check_icon.png' : '/static/icons/userLogin_icon.png'}}"></image>
+            <radio class="radio" value="wechat"></radio>
+        </view>
+        <view class="payCont-label {{ payType == 'water' ? 'active' : ''}}" wx:if="{{surplus > 0}}">
+            <view class="payContList-label-name">
+                <image class="payCont-label-img" src="/static/imgs/wqb.jpg"></image>
+                <text>水滴兑换</text>
+            </view>
+            <image class="payContList-label-arrow" src="{{ payType == 'water' ? '/static/icons/check_icon.png' : '/static/icons/userLogin_icon.png'}}"></image>
+            <radio class="radio" value="water"></radio>
+        </view>
+    </radio-group>
+    <view class="payCont-btn" bindtap="paySubmit">{{ payType == 'wechat' ? '立即支付' : '立即兑换'}}</view>
+</view>
--- a/pages/order/list/index.wxss
+++ b/pages/order/list/index.wxss
@@ -0,0 +1,278 @@
+page {
+    overflow: hidden;
+    background: #f3f4f6;
+    padding: 30rpx;
+    box-sizing: border-box;
+}
+
+.While {
+    border-radius: 10rpx;
+    margin-bottom: 30rpx;
+    background-color: #FFFFFF;
+    padding: 0 30rpx;
+    box-sizing: border-box;
+    box-shadow: 0 0 10rpx rgba(0, 0, 0, .05);
+}
+
+.order {
+    position: absolute;
+    width: 100%;
+    left: 0;
+    top: 0;
+    padding: 120rpx 30rpx 30rpx;
+    box-sizing: border-box;
+    height: 100%;
+    overflow-y: scroll;
+}
+
+.order-top {
+    line-height: 90rpx;
+    box-sizing: border-box;
+    display: flex;
+    font-size: 28rpx;
+    border-bottom: 2rpx #f2f2f2 solid;
+}
+
+.order-top-number {
+    flex: 1;
+}
+
+.order-top-tips {
+    font-size: 26rpx;
+    color: #eb504c;
+}
+
+.order-name {
+    padding: 20rpx 0;
+    box-sizing: border-box;
+    position: relative;
+}
+
+.order-img {
+    width: 90rpx;
+    height: 90rpx;
+    margin-right: 20rpx;
+    border-radius: 10rpx;
+}
+
+.order-goods {
+    position: absolute;
+    width: 100%;
+    left: 0;
+    top: 0;
+    padding: 20rpx 20rpx 20rpx 110rpx;
+    box-sizing: border-box;
+}
+
+.order-label {
+    display: flex;
+    font-size: 30rpx;
+    margin-bottom: 15rpx;
+}
+
+.order-label-name {
+    flex: 1;
+    margin-right: 30rpx;
+}
+
+.order-label-price {
+    font-size: 26rpx;
+    color: #999;
+}
+
+.order-specs {
+    font-size: 24rpx;
+    color: #919191;
+    display: flex;
+}
+
+.order-specs text {
+    display: inline-block;
+    flex: 1;
+}
+
+.order-text {
+    font-size: 28rpx;
+    line-height: 40rpx;
+    display: flex;
+    padding-bottom: 20rpx;
+    border-top: 2rpx solid #f2f2f2;
+    border-bottom: 2rpx solid #f2f2f2;
+    padding-top: 20rpx;
+}
+
+.order-time {
+    color: #919191;
+    font-size: 24rpx;
+    flex: 1;
+}
+
+.order-price text {
+    font-weight: 600;
+    color: #1d37e2;
+}
+
+.order-btn {
+    padding: 30rpx 0;
+    box-sizing: border-box;
+    position: relative;
+    font-size: 24rpx;
+    text-align: right;
+}
+
+.order-btn-type {
+    flex: 1;
+}
+
+.order-btn-type text {
+    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;
+}
+
+.order-btn-type text.active {
+    background-image: linear-gradient(to right, #027be6, #2855f0);
+}
+
+.order-btn-atn {
+    border: 2rpx solid #f2f2f2;
+    border-radius: 40rpx;
+    padding: 0 30rpx;
+    height: 52rpx;
+    line-height: 52rpx;
+    color: #767676;
+    display: inline-block;
+    margin-left: 15rpx;
+}
+
+.order-btn-go {
+    color: #eb504c;
+    border-color: #eb504c;
+}
+
+.order-btn-atn.active {
+    color: #1d37e2;
+    border-color: #bfc5ff;
+}
+
+/* tabs */
+.header {
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    z-index: 99;
+}
+
+.tabs {
+    display: flex;
+    justify-content: space-around;
+    background: white;
+    padding: 15rpx 0;
+    font-size: 30rpx;
+    color: #9d9d9d;
+}
+
+.item {
+    height: 60rpx;
+    line-height: 60rpx;
+}
+
+.item.show {
+    color: #1d37e2;
+    border-bottom: solid 4rpx #1d37e2;
+}
+.payPop {
+    position: fixed;
+    width: 100%;
+    height: 100vh;
+    background-color: rgba(0, 0, 0, .3);
+    left: 0;
+    top: 0;
+    z-index: 998;
+    display: none;
+}
+
+.payPop.active {
+    display: block;
+}
+
+.payCont {
+    position: fixed;
+    width: 100vw;
+    background-color: #FFFFFF;
+    border-radius: 20rpx 20rpx 0 0;
+    box-sizing: border-box;
+    left: 0;
+    bottom: -10000%;
+    z-index: 999;
+    padding: 100rpx 40rpx 40rpx;
+    transition: .2s;
+}
+
+.payCont-label-close {
+    width: 40rpx;
+    height: 40rpx;
+    position: absolute;
+    top: 30rpx;
+    right: 40rpx;
+    z-index: 1000;
+}
+
+.payCont.active {
+    bottom: 0;
+}
+
+.payCont-label {
+    display: flex;
+    height: 80rpx;
+    line-height: 80rpx;
+    margin-bottom: 40rpx;
+    border-top: 2rpx solid #ececec;
+    padding-top: 40rpx;
+    position: relative;
+}
+
+.payCont-label-img {
+    width: 64rpx;
+    height: 64rpx;
+    margin-top: 8rpx;
+    margin-right: 20rpx;
+}
+
+.payContList-label-name {
+    line-height: 80rpx;
+    display: flex;
+    flex: 1;
+    font-weight: 600;
+}
+
+.payCont-label radio {
+    opacity: 0;
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    left: 0;
+    top: 0;
+}
+
+.payContList-label-arrow {
+    width: 38rpx;
+    height: 38rpx;
+    margin-top: 18rpx;
+}
+
+.payCont-btn {
+    width: 100%;
+    text-align: center;
+    margin: 80rpx 0 40rpx;
+    background-color: #1d37e2;
+    line-height: 100rpx;
+    border-radius: 10rpx;
+    color: #FFFFFF;
+}
--- a/pages/record/detail/detail.js
+++ b/pages/record/detail/detail.js
@@ -0,0 +1,148 @@
+ /*
+ * 手太欠
+ * 愿这世界都如故事里一样 美好而动人~
+ */
+
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        userData     : '', // 用户信息
+        goodsData   : '', // 商品信息
+        aiSeeData   : '', // 检测结果
+        baseData    : '', // 基本资料
+        typesType   : '', // 类型分类
+        typesData   : '', // 舌象类型
+        resultData  : '', // 舌象类型结果
+        imageId     : '', // 结果id
+        typesState  : false,// 舌象类型结果弹出
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+        this.setData({
+            imageId:　options.tongue_id
+        })
+
+        // 获取用户信息
+        this.userInfo();
+
+        // 获取基本资料初始化
+        this.baseInfo();
+        
+        // 获取检测报告结果
+        this.aiInfo(options.tongue_id)
+
+        // 获取舌象类型结果
+        wx.$api.record.types(this.data.imageId, {type: ''}).then(res => {
+            this.setData({
+                typesData : res.data
+            })
+        }).catch(err => { });
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {},
+
+    /**
+     * 用户信息
+     */
+    userInfo() {
+        wx.$api.user.home().then(res => {
+            this.setData({
+                userData: res.data
+            })
+        }).catch(err => {})
+    },
+
+    /**
+     * 基本资料初始化
+     */
+    baseInfo() {
+        wx.$api.water.Base().then(res => {
+            this.setData({
+                baseData: res.data.base
+            })
+        }).catch(err => {})
+    },
+
+    /**
+    * 检测报告结果
+    */
+    aiInfo(imageid) {
+        wx.$api.record.aiSee(imageid).then(res => {
+            let {goods, tongue} = res.data
+            this.setData({
+                goodsData: goods,
+                aiSeeData: tongue
+            })
+        }).catch(err => { })
+    },
+
+    /**
+    * 舌象类型分类
+    */
+    assayTap(e) {
+        this.setData({
+            typesType: e.currentTarget.dataset.type,
+            typesState: true
+        })
+
+        // 获取舌象类型结果
+        this.typesInfo();
+    },
+
+    /**
+    * 舌象类型结果
+    */
+    typesInfo() {
+        wx.$api.record.types(this.data.imageId, {type: this.data.typesType}).then(res => {
+            switch (this.data.typesType){
+                case 'shexing':
+                    this.setData({
+                        resultData: res.data.shexing
+                    })
+                    break;
+                case 'shese':
+                    this.setData({
+                        resultData: res.data.shese
+                    })
+                    break;
+                case 'taizhi':
+                    this.setData({
+                        resultData: res.data.taizhi
+                    })
+                    break;
+                default:
+                    this.setData({
+                        resultData: res.data.taise
+                    })
+            }
+        }).catch(err => { })
+    },
+
+    /**
+    * 舌象类型结果-关闭
+    */
+    perfect() {
+        this.setData({
+            typesState: false
+        })
+    },
+
+    /**
+    * 查看检测原图
+    */
+    previewImg(e) {
+        wx.previewImage({
+            urls     : [e.currentTarget.dataset.imgs], //需要预览的图片http链接列表，注意是数组
+            current  : '' // 当前显示图片的http链接，默认是第一个
+        })  
+    }
+})
--- a/pages/record/detail/detail.json
+++ b/pages/record/detail/detail.json
@@ -0,0 +1,4 @@
+{
+    "usingComponents": {},
+    "navigationBarTitleText": "评估报告"
+}
--- a/pages/record/detail/detail.wxml
+++ b/pages/record/detail/detail.wxml
@@ -0,0 +1,199 @@
+<image class="detailBack" src="https://api.siyuankunlun.com/storage/images/2023/11/14/cb73932e17282c5b0bf88ae404fb106b.png" mode="widthFix"></image>
+<view class="detailCont">
+    <view class="top">
+        <view class="top-title">舌诊评估报告</view>
+        <image class="top-img" src="https://api.siyuankunlun.com/storage/images/2023/11/14/420c97db1d51c883e943a2b89dbf1648.png" mode="widthFix"></image>
+    </view>
+
+    <!-- 舌诊评估报告 -->
+    <view class="assay">
+        <view class="assayUser">
+            <view class="assayUser-top">
+                <image class="assayUser-top-head" src="{{userData.avatar ? userData.avatar : '/static/imgs/default_myHead.png'}}" mode="aspectFill"></image>
+                <view class="assayUser-top-name">Hi~{{userData.nickname}}</view>
+            </view>
+            <view class="assayUser-odds">
+                您有{{aiSeeData.ext.probability}}%的概率为：<text>{{aiSeeData.tizhi_name}}</text>
+            </view>
+        </view>
+        <view class="assayInfo" wx:if="{{baseData.height != '' && baseData.weight != '' && baseData.birthday != ''}}">
+            <view class="assayInfo-label">
+                <view class="assayInfo-label-name">身高(CM)</view>
+                <view class="assayInfo-label-text">{{baseData.height}}</view>
+            </view>
+            <view class="assayInfo-label">
+                <view class="assayInfo-label-name">体重(KG)</view>
+                <view class="assayInfo-label-text">{{baseData.weight}}</view>
+            </view>
+            <view class="assayInfo-label">
+                <view class="assayInfo-label-name">年龄(岁)</view>
+                <view class="assayInfo-label-text">{{baseData.age}}</view>
+            </view>
+        </view>
+        <view class="assayReport">
+            <image class="assayReport-back" src="https://api.siyuankunlun.com/storage/images/2023/11/20/567421eb85729d6cbdd8f5c1cab7e0b1.png"></image>
+            <view class="locateOne" bindtap="assayTap" data-type="taise">
+                <view class="locateOne-name">{{typesData.taise.name}}<image src="https://api.siyuankunlun.com/storage/images/2023/11/15/ea663baf0b9f8175250c9cd5fab8f8be.png" mode="widthFix"></image>
+                </view>
+                <view wx:if="{{ typesData.taise.match.length > 0}}">
+                    <block wx:if="{{ typesData.taise.match.length == 1}}">
+                        <view class="locateOne-tips" wx:for="{{ typesData.taise.match}}" wx:key="match">{{item.name}}</view>
+                    </block>
+                    <view class="locateOne-tips" wx:else>{{'有' + typesData.taise.count + '个结果'}}</view>
+                </view>
+                <view class="locateOne-tips" wx:else>正常</view>
+            </view>
+            <view class="locateTwo" bindtap="assayTap" data-type="taizhi">
+                <view class="locateOne-name">{{typesData.taizhi.name}}<image src="https://api.siyuankunlun.com/storage/images/2023/11/15/ea663baf0b9f8175250c9cd5fab8f8be.png" mode="widthFix"></image>
+                </view>
+                <view wx:if="{{ typesData.taizhi.match.length > 0}}">
+                    <block wx:if="{{ typesData.taizhi.match.length == 1}}">
+                        <view class="locateOne-tips" wx:for="{{ typesData.taizhi.match}}" wx:key="match">{{item.name}}</view>
+                    </block>
+                    <view class="locateOne-tips" wx:else>{{'有' + typesData.taizhi.count + '个结果'}}</view>
+                </view>
+                <view class="locateOne-tips" wx:else>正常</view>
+            </view>
+            <view class="locateThree" bindtap="assayTap" data-type="shese">
+                <view class="locateOne-name">{{typesData.shese.name}}<image src="https://api.siyuankunlun.com/storage/images/2023/11/15/ea663baf0b9f8175250c9cd5fab8f8be.png" mode="widthFix"></image>
+                </view>
+                <view wx:if="{{ typesData.shese.match.length > 0}}">
+                    <block wx:if="{{ typesData.shese.match.length == 1}}">
+                        <view class="locateOne-tips" wx:for="{{ typesData.shese.match}}" wx:key="match">{{item.name}}</view>
+                    </block>
+                    <view class="locateOne-tips" wx:else>{{'有' + typesData.shese.count + '个结果'}}</view>
+                </view>
+                <view class="locateOne-tips" wx:else>正常</view>
+            </view>
+            <view class="locateFour" bindtap="assayTap" data-type="shexing">
+                <view class="locateOne-name">{{typesData.shexing.name}}<image src="https://api.siyuankunlun.com/storage/images/2023/11/15/ea663baf0b9f8175250c9cd5fab8f8be.png" mode="widthFix"></image>
+                </view>
+                <view wx:if="{{ typesData.shexing.match.length > 0}}">
+                    <block wx:if="{{ typesData.shexing.match.length == 1}}">
+                        <view class="locateOne-tips" wx:for="{{ typesData.shexing.match}}" wx:key="match">{{item.name}}</view>
+                    </block>
+                    <view class="locateOne-tips" wx:else>{{'有' + typesData.shexing.count + '个结果'}}</view>
+                </view>
+                <view class="locateOne-tips" wx:else>正常</view>
+            </view>
+        </view>
+        <view class="assayMaster">
+            <view class="assayMaster-cont" bindtap="previewImg" data-imgs="{{aiSeeData.cut_image}}">查看检测原图</view>
+        </view>
+        <view class="assayResult">
+            <view class="assayResult-name">常见表现：</view>
+            <view class="assayResult-text">{{aiSeeData.changjianbiaoxian}}</view>
+        </view>
+        <view class="assayResult">
+            <view class="assayResult-name">微量元素匮乏：</view>
+            <view class="assayResult-text">{{aiSeeData.drink_water.ext.elements}}</view>
+        </view>
+    </view>
+
+    <!-- 对比 -->
+    <view class="assay">
+        <view class="ratioTop">
+            <view class="ratioTop-see">
+                <image class="ratioTop-img" src="https://api.siyuankunlun.com/storage/images/2023/11/14/85aa4d04fc050b44dfedeb839a60b965.png" mode="widthFix"></image>
+                <image class="ratioTop-img" src="https://api.siyuankunlun.com/storage/images/2023/11/14/8b96a34c64646c22a1a4b48cc8b12442.png" mode="widthFix"></image>
+            </view>
+            <view class="ratioTop-vs">VS</view>
+        </view>
+        <view class="ratioData">
+            <view class="ratioData-label">
+                <view class="ratioData-label-name" wx:for="{{aiSeeData.drink_water.pt}}" wx:key="pt">{{item}}</view>
+            </view>
+            <view class="ratioData-label">
+                <view class="ratioData-label-name" wx:for="{{aiSeeData.drink_water.sy}}" wx:key="sy">{{item}}</view>
+            </view>
+        </view>
+        <view class="ratioSuggest">
+            <view class="ratioSuggest-title">日常饮水建议</view>
+            <view class="ratioSuggest-text" wx:for="{{aiSeeData.drink_water.jy}}" wx:key="jy"><text>{{item.name}}：</text>{{item.value}}</view>
+        </view>
+    </view>
+
+    <!-- 方案 -->
+    <view class="assay">
+        <view class="planTitle">
+            <view class="planTitle-name">饮用锶源昆仑最佳方案</view>
+        </view>
+        <view class="planCont">
+            <image src="https://api.siyuankunlun.com/storage/images/2023/11/14/031abe2163684a131eb11c7713efbdcc.png" class="planCont-img" mode="widthFix"></image>
+            <view class="planCont-brief">
+                <view class="planCont-brief-name">温水饮用锶源昆仑更好哦~</view>
+                <view class="planCont-brief-text">40~45℃水温饮用最佳，从中医角度来说，我们饮 用水的温度最好比自己体温要高，经常喝冷饮会损 耗体内的阳气，导致阴阳不平衡。</view>
+            </view>
+        </view>
+    </view>
+
+    <!-- 其他建议 -->
+    <view class="assay">
+        <view class="otherTitle">其他建议：</view>
+        <block wx:if="{{aiSeeData.shiliao.yc != '' && aiSeeData.shiliao.sc != ''}}">
+            <view class="otherLabel">
+                <view class="otherLabel-name">宜吃</view>
+                <view class="otherLabel-text">{{aiSeeData.shiliao.yc}}</view>
+            </view>
+            <view class="otherLabel red">
+                <view class="otherLabel-name">慎吃</view>
+                <view class="otherLabel-text">{{aiSeeData.shiliao.sc}}</view>
+            </view>
+        </block>
+        <view class="otherLabel" wx:else>
+            <view class="otherLabel-text">{{aiSeeData.shiliao.qt}}</view>
+        </view>
+    </view>
+
+    <!-- 产品 -->
+    <view class="assay">
+        <navigator class="goods" hover-class="none" url="/pages/mall/buy/index?id={{goodsData.goods_id}}">
+            <image class="goodsImg" src="{{goodsData.cover}}" mode="aspectFill"></image>
+            <view class="goodsCont">
+                <view class="goodsCont-name">{{goodsData.name}}</view>
+                <view class="goodsCont-specs">规格 500ml</view>
+                <view class="goodsCont-price">￥<text>{{goodsData.price.show}}</text></view>
+                <view class="goodsCont-btn">buy</view>
+            </view>
+        </navigator>
+    </view>
+
+    <!-- 温馨提示 -->
+    <view class="tips">*建议遵循为您定制的健康建议，逐步改善饮食和生活习惯。</view>
+
+    <!-- 机器人提示 -->
+    <view class="robot">
+        <image class="robotImg" src="https://api.siyuankunlun.com/storage/images/2023/11/14/2378a3c781d23ab4a104bf6a709b53ba.png" mode="widthFix"></image>
+        <view class="robotCont">
+            <view class="robotCont-name">建议您1个月后<text>（已明显改善生活习惯或有新的 体检结果后）</text></view>
+            <view class="robotCont-text">再次测试获得新的营养补充方案</view>
+        </view>
+    </view>
+</view>
+
+<!-- 按钮 -->
+<view class="footer">
+    <view class="footer-flex">
+        <navigator hover-class="none" open-type="navigateBack" delta="1" class="footer-flex-btn">返回</navigator>
+        <navigator hover-class="none" url="/pages/record/share/share" class="footer-flex-btn footer-flex-share">邀请好友测试</navigator>
+    </view>
+</view>
+
+<!-- 舌象类型结果弹出 -->
+<view class="refertoEject {{typesState ? 'active' : ''}}" catchtouchmove='true'></view>
+<view class="refertoCont {{typesState ? 'active' : ''}}">
+    <view class="refertoCont-text">
+        <view class="refertoCont-title">{{resultData.name}}</view>
+        <view class="refertoCont-tips">
+            <block wx:if="{{resultData.match.length > 0}}">
+                <view class="refertoCont-tips-label" wx:for="{{resultData.match}}" wx:key="match">
+                    <view class="refertoCont-tips-item">{{item.alias_name}}</view>{{item.description}}
+                </view>
+            </block>
+            <block wx:else>{{resultData.name + '正常'}}</block>
+        </view>
+        <view class="publicPop-btn">
+            <view class="publicPop-btn-go" bindtap="perfect">确定</view>
+        </view>
+    </view>
+</view>
--- a/Show More
+++ b/Show More