diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/.eslintrc.js b/锶源昆仑饮水项目/锶源昆仑-改版/.eslintrc.js
new file mode 100644
index 0000000..115cc02
--- /dev/null
+++ 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: {},
+}
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/api/err.js b/锶源昆仑饮水项目/锶源昆仑-改版/api/err.js
new file mode 100644
index 0000000..bbfd4b5
--- /dev/null
+++ 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
+}
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/api/index.js b/锶源昆仑饮水项目/锶源昆仑-改版/api/index.js
new file mode 100644
index 0000000..94b98ec
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/api/index.js
@@ -0,0 +1,35 @@
+/*
+  * 手太欠
+  * 愿这世界都如故事里一样 美好而动人~
+*/
+
+//  授权登录
+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"
+
+export default {
+    auth,
+    file,
+    index,
+    mall,
+    member,
+    stock,
+    user
+}
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/api/interfaces/auth.js b/锶源昆仑饮水项目/锶源昆仑-改版/api/interfaces/auth.js
new file mode 100644
index 0000000..00d6c7e
--- /dev/null
+++ 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
+})
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/api/interfaces/file.js b/锶源昆仑饮水项目/锶源昆仑-改版/api/interfaces/file.js
new file mode 100644
index 0000000..0f903f6
--- /dev/null
+++ 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
+})
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/api/interfaces/index.js b/锶源昆仑饮水项目/锶源昆仑-改版/api/interfaces/index.js
new file mode 100644
index 0000000..496edd9
--- /dev/null
+++ 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
+})
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/api/interfaces/mall.js b/锶源昆仑饮水项目/锶源昆仑-改版/api/interfaces/mall.js
new file mode 100644
index 0000000..5de45b0
--- /dev/null
+++ 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
+})
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/api/interfaces/member.js b/锶源昆仑饮水项目/锶源昆仑-改版/api/interfaces/member.js
new file mode 100644
index 0000000..de0bd5a
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/api/interfaces/member.js
@@ -0,0 +1,63 @@
+ /*
+  * 手太欠
+  * 愿这世界都如故事里一样 美好而动人~
+*/
+
+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
+})
+
+export default ({
+    openSee,
+    identitieSee,
+    openIndex,
+    openModel,
+    orderSee,
+    orderSubmit,
+    openid,
+    wechatPay
+})
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/api/interfaces/stock.js b/锶源昆仑饮水项目/锶源昆仑-改版/api/interfaces/stock.js
new file mode 100644
index 0000000..8bc56ec
--- /dev/null
+++ 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
+})
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/api/interfaces/user.js b/锶源昆仑饮水项目/锶源昆仑-改版/api/interfaces/user.js
new file mode 100644
index 0000000..e08b60a
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/api/interfaces/user.js
@@ -0,0 +1,90 @@
+ /*
+  * 手太欠
+  * 愿这世界都如故事里一样 美好而动人~
+*/
+
+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'
+})
+
+export default ({
+    home,
+    invite,
+    taskList,
+    taskIndex,
+    setting,
+    miniShare,
+    favorites,
+    mallCategories,
+    mallGoods,
+    orders,
+    goodsDet,
+    goodsSign
+})
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/api/request.js b/锶源昆仑饮水项目/锶源昆仑-改版/api/request.js
new file mode 100644
index 0000000..0cd406c
--- /dev/null
+++ 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
+}
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/api/updateToken.js b/锶源昆仑饮水项目/锶源昆仑-改版/api/updateToken.js
new file mode 100644
index 0000000..86f5ec3
--- /dev/null
+++ 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
+}
+
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/app.js b/锶源昆仑饮水项目/锶源昆仑-改版/app.js
new file mode 100644
index 0000000..efddcdf
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/app.js
@@ -0,0 +1,96 @@
+/*
+ * 手太欠
+ * 愿这世界都如故事里一样 美好而动人~
+ */
+
+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
+
+        // 获取微信步数-云开发
+        // wx.cloud.init({
+        //     traceUser: true,
+        // })
+    },
+
+    // 统一分享
+    // overShare () {
+    //     let newInvite = wx.getStorageSync("inviteData")
+    //     wx.onAppRoute(() =>{
+    //       let pages = getCurrentPages(),
+    //         view = pages[pages.length - 1]
+    //         if (view) {
+    //             wx.showShareMenu({
+    //                 withShareTicket: true,
+    //                 menus: ['shareAppMessage', 'shareTimeline'],
+    //             })
+    //             view.onShareAppMessage = function () {
+    //                 return {
+    //                     title: '分享标题',
+    //                     imageUrl: "http://cdn.siyuankunlun.com/materials/2022/09/14/code.jpg",
+    //                     path: '/pages/index/index?invite=' + newInvite
+    //                 };
+    //             }
+    //         }
+    //     })
+    // },
+	globalData: {
+        systInfo    : '',
+		isUser      : false,
+        token       : "",
+        isOfficial  : false,
+        invite      : "",
+        safeArea    : '',
+        statusBarHeight: wx.getSystemInfoSync().statusBarHeight,
+        jiaonangheight: wx.getMenuButtonBoundingClientRect().height
+	}
+})
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/app.json b/锶源昆仑饮水项目/锶源昆仑-改版/app.json
new file mode 100644
index 0000000..63f4b60
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/app.json
@@ -0,0 +1,58 @@
+{
+    "pages": [
+        "pages/index/index",
+        "pages/member/index",
+        "pages/user/index",
+        "pages/login/index",
+        "pages/article/index",
+        "pages/article/info/info",
+        "pages/article/articleList/index",
+        "pages/member/open/open",
+        "pages/login/agreement/agreement",
+        "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/user/about/about",
+        "pages/user/code/code",
+        "pages/user/collect/collect",
+        "pages/member/examine/examine",
+        "pages/member/cause/cause",
+        "pages/mall/buy/index",
+        "pages/mall/submit/index",
+        "pages/mall/goods/index",
+        "pages/mall/details/index",
+        "pages/order/list/index",
+        "pages/order/details/index"
+    ],
+    "window": {
+        "backgroundTextStyle": "light",
+        "navigationBarBackgroundColor": "#fff",
+        "navigationBarTitleText": "锶源昆仑",
+        "navigationBarTextStyle": "black"
+    },
+    "tabBar": {
+        "list": [
+            {
+                "pagePath": "pages/index/index",
+                "text": "锶源商城",
+                "iconPath": "/static/tabBarIcon/04.png",
+                "selectedIconPath": "/static/tabBarIcon/04_active.png"
+            },
+            {
+                "pagePath": "pages/user/index",
+                "text": "锶人中心",
+                "iconPath": "/static/tabBarIcon/02.png",
+                "selectedIconPath": "/static/tabBarIcon/02_active.png"
+            }
+        ],
+        "color": "#b6b9bb",
+        "selectedColor": "#6c78f8",
+        "borderStyle": "white"
+    },
+    "style": "v2",
+    "sitemapLocation": "sitemap.json"
+}
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/app.wxss b/锶源昆仑饮水项目/锶源昆仑-改版/app.wxss
new file mode 100644
index 0000000..682b9f5
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/app.wxss
@@ -0,0 +1,79 @@
+/**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;
+}
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/article/articleList/index.js b/锶源昆仑饮水项目/锶源昆仑-改版/pages/article/articleList/index.js
new file mode 100644
index 0000000..71a2032
--- /dev/null
+++ 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);
+        }
+    }
+})
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/article/articleList/index.json b/锶源昆仑饮水项目/锶源昆仑-改版/pages/article/articleList/index.json
new file mode 100644
index 0000000..3928faa
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/pages/article/articleList/index.json
@@ -0,0 +1,3 @@
+{
+    "usingComponents": {}
+}
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/article/articleList/index.wxml b/锶源昆仑饮水项目/锶源昆仑-改版/pages/article/articleList/index.wxml
new file mode 100644
index 0000000..59702ee
--- /dev/null
+++ 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>
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/article/articleList/index.wxss b/锶源昆仑饮水项目/锶源昆仑-改版/pages/article/articleList/index.wxss
new file mode 100644
index 0000000..4d5cdc1
--- /dev/null
+++ 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;
+}
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/article/index.js b/锶源昆仑饮水项目/锶源昆仑-改版/pages/article/index.js
new file mode 100644
index 0000000..5bfc7bf
--- /dev/null
+++ 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);
+        }
+    }
+})
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/article/index.json b/锶源昆仑饮水项目/锶源昆仑-改版/pages/article/index.json
new file mode 100644
index 0000000..3928faa
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/pages/article/index.json
@@ -0,0 +1,3 @@
+{
+    "usingComponents": {}
+}
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/article/index.wxml b/锶源昆仑饮水项目/锶源昆仑-改版/pages/article/index.wxml
new file mode 100644
index 0000000..4b49d2c
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/pages/article/index.wxml
@@ -0,0 +1,25 @@
+<view class="list" wx:if="{{articlesArr.length > 0}}">
+    <navigator hover-class="none" url="../articleInfo/index?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>
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/article/index.wxss b/锶源昆仑饮水项目/锶源昆仑-改版/pages/article/index.wxss
new file mode 100644
index 0000000..4d5cdc1
--- /dev/null
+++ 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;
+}
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/article/info/info.js b/锶源昆仑饮水项目/锶源昆仑-改版/pages/article/info/info.js
new file mode 100644
index 0000000..33646ce
--- /dev/null
+++ 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)
+        });
+    },
+})
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/article/info/info.json b/锶源昆仑饮水项目/锶源昆仑-改版/pages/article/info/info.json
new file mode 100644
index 0000000..f0f1934
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/pages/article/info/info.json
@@ -0,0 +1,5 @@
+{
+    "usingComponents": {},
+    "navigationStyle": "custom",
+    "navigationBarTextStyle": "white"
+}
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/article/info/info.wxml b/锶源昆仑饮水项目/锶源昆仑-改版/pages/article/info/info.wxml
new file mode 100644
index 0000000..1aac6f5
--- /dev/null
+++ 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>
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/article/info/info.wxss b/锶源昆仑饮水项目/锶源昆仑-改版/pages/article/info/info.wxss
new file mode 100644
index 0000000..e0f9696
--- /dev/null
+++ 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;
+}
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/index/index.js b/锶源昆仑饮水项目/锶源昆仑-改版/pages/index/index.js
new file mode 100644
index 0000000..29c6692
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/pages/index/index.js
@@ -0,0 +1,253 @@
+ /*
+ * 手太欠
+ * 愿这世界都如故事里一样 美好而动人~
+ */
+
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        BarHeight    : '',
+        indicatorDots: false,
+        vertical     : false,
+        autoplay     : false,
+        interval     : 2000,
+        duration     : 500,
+        previousmargin: '40rpx',//前边距
+        nextmargin    : '40rpx',//后边距
+        otherCurrent  : 1,
+        goodsArr     : [], //商品
+        bannersArr   : [],  //轮播商品
+        surplus      : '',  //水滴量
+        healthsArr   : [], //健康文章
+        centerInfo   : [], //体验官介绍
+        serviceMobile: '', //客服电话
+        categories   : '', //详情分类
+        userLogin    : '', //是否登录
+        videos       : '',
+        videoFlx     : false, //视频定位
+        showGoods    : '',  //默认商品
+        waterMobile  : '', //电话
+        memoryCurrent: 0,
+        videoState   : true, //第一个视频是否加载
+        videoFilex   : true, //第二个视频是否加载
+
+        // 记忆
+        startX      : 0,
+        endX        : 0,
+        iCenter     : 3,
+        datas: [],
+        order: []
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+        this.setData({
+            BarHeight: getApp().globalData.systInfo.statusBarHeight + wx.getMenuButtonBoundingClientRect().height
+        })
+
+        // 邀请码
+        if(options.invite) {
+            this.setData({
+                inviteCode   : options.invite
+            })
+            wx.setStorage({
+                key     : 'inviteData',
+                data    : options.invite
+            })
+        }
+        
+        this.__set__();
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+        // 获取首页数据
+        this.indexInfo();
+
+        // 获取登录状态
+        if(wx.getStorageSync("token")){
+            this.setData({
+                userLogin: true
+            })
+
+            // 获取用户信息
+            this.userInfo();
+        }
+    },
+
+    /**
+     * 首页数据
+     */
+    indexInfo (e) {
+        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,
+                waterMobile : res.data.water_mobile
+            })
+            this.move();
+        }).catch(err => {})
+    },
+
+    /**
+     * 用户信息
+     */
+    userInfo() {
+        wx.$api.user.home().then(res => {
+            this.setData({
+                surplus        : res.data.account.score.surplus
+            })
+        }).catch(err => {})
+    },
+
+    /**
+     * 轮播图的切换事件
+     */
+    swiperOther (e) {
+        this.setData({
+            otherCurrent: e.detail.current //获取当前轮播图片的下标
+        })
+    },
+    
+    /**
+     * 拨打电话
+     */
+    phoneCall(){
+        wx.makePhoneCall({
+            phoneNumber: this.data.waterMobile
+        });
+    },
+
+    /**
+     * 跳转文章列表
+     */
+    tapMore(e){
+        wx.navigateTo({
+            url: '/pages/article/index?type=' + e.currentTarget.dataset.type
+        })
+    },
+
+    /**
+     * 处理未登录时的转跳
+     */
+    userNav(e){
+        let pageUrl = e.currentTarget.dataset.url
+        if(wx.getStorageSync("token")){
+            wx.navigateTo({
+                url: pageUrl
+            })
+        }else{
+            // 去登录
+            wx.navigateTo({
+                url: "/pages/login/index"
+            })
+        }
+    },
+
+     /**
+     * 监听页面滚动
+     */
+    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
+            })
+        }
+    },
+
+    move () {
+        var datas = this.data.datas;
+        /*图片分布*/
+        for (var i = 0; i < datas.length; i++) {
+            var data = datas[i];
+            var animation = wx.createAnimation({
+            duration: 200
+         });
+         animation.translateX(data.left).step();
+            this.setData({
+                ["datas[" + i + "].animation"]: animation.export(),
+                ["datas[" + i + "].zIndex"]: data.zIndex
+            })
+        }
+    },
+    /**左箭头 */
+    left: function () {
+        var last = this.data.datas.pop(); //获取数组的最后一个
+        this.data.datas.unshift(last);//放到数组的第一个
+        var orderFirst = this.data.order.shift();
+        this.data.order.push(orderFirst);
+        this.move();
+    },
+    /** */
+    right: function () {
+        var first = this.data.datas.shift(); //获取数组的第一个
+        this.data.datas.push(first);//放到数组的最后一个位置
+        var orderLast = this.data.order.pop();
+        this.data.order.unshift(orderLast);
+        this.move();
+    },
+    /**新的排列复制到新的数组中 */
+    __set__: function () {
+        var that = this;
+        var order = that.data.order;
+        var datas = that.data.datas;
+        for (var i = 0; i < datas.length; i++) {
+            that.setData({
+                ["order[" + i + "]"]: datas[i].id
+            })
+        }
+    },
+    //手指触发开始移动
+    moveStart (e) {
+        var startX = e.changedTouches[0].pageX;
+        this.setData({
+            startX    : startX
+        });
+
+    },
+    //手指触摸后移动完成触发事件
+    moveItem (e) {
+        var that = this;
+        var endX = e.changedTouches[0].pageX;
+        this.setData({
+            endX: endX
+        });
+        //计算手指触摸偏移剧距离
+        var moveX = this.data.startX - this.data.endX;
+        //向左移动
+        if (moveX > 20) {
+            this.left();
+        }
+        if (moveX < -20) {
+            this.right();
+        }
+    },
+
+    // 第一个播放进度变化时触发
+    bindloadedOne() {
+        this.setData({
+            videoState: false
+        })
+    },
+
+    // 第二个播放进度变化时触发
+    bindloadedTwo() {
+        this.setData({
+            videoFilex: false
+        })
+    },
+})
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/index/index.json b/锶源昆仑饮水项目/锶源昆仑-改版/pages/index/index.json
new file mode 100644
index 0000000..f0f1934
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/pages/index/index.json
@@ -0,0 +1,5 @@
+{
+    "usingComponents": {},
+    "navigationStyle": "custom",
+    "navigationBarTextStyle": "white"
+}
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/index/index.wxml b/锶源昆仑饮水项目/锶源昆仑-改版/pages/index/index.wxml
new file mode 100644
index 0000000..28c47d9
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/pages/index/index.wxml
@@ -0,0 +1,165 @@
+<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="drift" style="top: {{BarHeight}}px" wx:if="{{userLogin}}">
+    <view class="title">
+        <text>水滴</text>
+    </view>
+    <view class="balance">
+        <image src="/static/icons/waterDrop.png"></image>{{surplus}}
+    </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 class="other">
+    <view class="content">
+        <view class="publicTitle">
+            <text>water</text>
+            <view class="lighter">锶源昆仑天然饮用水</view>
+            <image class="goldenLogo" mode="widthFix" src="http://cdn.siyuankunlun.com/materials/2022/10/11/goldenLogo.png"></image>
+        </view>
+        <view class="other-swiper">
+            <swiper previous-margin="{{previousmargin}}" circular centeredSlides="true" next-margin="{{nextmargin}}" bindchange="swiperOther" current="{{otherCurrent}}">
+                <navigator hover-class="none" url="/pages/mall/buy/index?id={{item.goods_id}}" wx:for="{{goodsArr}}" wx:key="goodsArr">
+                    <swiper-item class="slide-image">
+                        <view class="box">
+                            <image class="{{index == otherCurrent ? ' active' : ''}}" src="{{item.cover}}" mode="aspectFill"></image>
+                        </view>
+                        <view class="otherText">古海冰泉造就不凡</view>
+                        <view class="othertitle">{{item.name}}</view>
+                        <!-- <view class="name">{{item.price.show}}元/箱</view> -->
+                    </swiper-item>
+                </navigator>
+            </swiper>
+        </view>
+    </view>
+</view>
+
+<!-- 用水指南 -->
+<view class="other">
+    <view class="content">
+        <view class="publicTitle">
+            <text>guide</text>
+            <view class="lighter">用水指南</view>
+            <image class="goldenLogo" mode="widthFix" src="http://cdn.siyuankunlun.com/materials/2022/10/11/guideLogo.png"></image>
+        </view>
+        <view class="guide">
+            <view class="guide-label">
+                <view class="guide-top">
+                    <view class="guide-english">temperature</view>
+                    <view class="guide-name">最佳水温饮用</view>
+                </view>
+                <view class="guide-text">
+                    <view class="guide-cell">
+                        <text>加热至40-50度</text>
+                    </view>
+                </view>
+                <image class="guide-icon" src="http://cdn.siyuankunlun.com/materials/2022/10/11/guide_01.png"></image>
+            </view>
+            <view class="guide-label">
+                <view class="guide-top">
+                    <view class="guide-english">quantity</view>
+                    <view class="guide-name">最佳饮水量</view>
+                </view>
+                <view class="guide-text">
+                    <text>每日饮用4瓶~6瓶</text>
+                    <text>(2000mL-3000ml)</text>
+                </view>
+                <image class="guide-icon" src="http://cdn.siyuankunlun.com/materials/2022/10/11/guide_02.png"></image>
+            </view>
+            <view class="guide-label">
+                <view class="guide-top">
+                    <view class="guide-english">time</view>
+                    <view class="guide-name">最佳饮水时间</view>
+                </view>
+                <view class="guide-text">
+                    <text>早：7点-9点</text>
+                    <text>午：12点-14点</text>
+                    <text>晚：18点-21点</text>
+                </view>
+                <image class="guide-icon" src="http://cdn.siyuankunlun.com/materials/2022/10/11/guide_03.png"></image>
+            </view>
+            <view class="guide-label">
+                <view class="guide-top">
+                    <view class="guide-english">special</view>
+                    <view class="guide-name">注意事项</view>
+                </view>
+                <view class="guide-text">
+                    <text>不建议冷冻保存</text>
+                    <text>开瓶后24小时内饮用最佳</text>
+                </view>
+                <image class="guide-icon" src="http://cdn.siyuankunlun.com/materials/2022/10/11/guide_04.png"></image>
+            </view>
+        </view>
+    </view>
+</view>
+
+<!-- 订购热线 -->
+<view class="other hotline">
+    <view class="content">
+        <view class="hotline-cont">
+            <image class="hotline-head" mode="aspectFill" src="http://cdn.siyuankunlun.com/materials/2022/10/11/hotline_head.png"></image>
+            <view class="hotline-text">
+                <view class="hotline-name">锶源昆仑·线下订购热线</view>
+                <view class="hotline-tips">Hi！需要订水，请联系我们~</view>
+            </view>
+            <image bindtap="phoneCall" class="hotline-tel" src="http://cdn.siyuankunlun.com/materials/2022/10/11/hotline_tel.png"></image>
+        </view>
+    </view>
+</view>
+
+<!-- 锶源昆仑·记忆 -->
+<view class="article" wx:if="{{datas.length > 0}}">
+    <view class="publicTitle">
+        <text>memory</text>
+        <view class="lighter">锶源昆仑·记忆<image class="article-more" mode="widthFix" src="http://cdn.siyuankunlun.com/materials/2022/10/11/hotline_more.png" bindtap="tapMore" data-type="{{categories.memory}}"></image>
+        </view>
+    </view>
+    <view class="memory">
+        <view class="clearfix teachers_b">
+            <view class="slide" id="slide">
+                <block wx:for="{{datas}}" wx:key="datas">
+                    <navigator bindtouchstart='moveStart' bindtouchend='moveItem' hover-class="none" class="memoryLable" url="/pages/article/info/info?id={{item.id}}&type=memory" animation="{{item.animation}}" style="z-index: {{item.zIndex}};" data-index="{{index}}">
+                        <image class="memory-img" src="{{item.image}}"></image>
+                        <view class="memory-cont">
+                            <view class="memory-title">
+                                <view class="nowrap memory-name">{{item.title}}</view>
+                                <view class="memory-go">GO ></view>
+                            </view>
+                            <view class="nowrap memory-text">{{item.description}}</view>
+                        </view>
+                    </navigator>
+                </block>
+            </view>
+        </view>
+    </view>
+</view>
+
+<!-- 健康百科 -->
+<view class="article" wx:if="{{healthsArr.length > 0}}">
+    <view class="publicTitle">
+        <text>Health</text>
+        <view class="lighter">锶源昆仑·健康百科<image class="article-more" mode="widthFix" src="http://cdn.siyuankunlun.com/materials/2022/10/11/hotline_more.png" bindtap="tapMore" data-type="{{categories.health}}"></image>
+        </view>
+    </view>
+    <view class="wiki">
+        <navigator hover-class="none" url="/pages/article/info/info?id={{item.article_id}}&type=wiki" class="wiki-label" wx:for="{{healthsArr}}" wx:key="healthsArr" wx:if="{{index < 3}}">
+            <image class="wiki-label-img" mode="aspectFill" src="{{item.cover}}"></image>
+            <view class="wiki-label-cont">
+                <view class="nowrap wiki-label-name"><text>Health</text> | {{item.title}}</view>
+                <view class="nowrap-multi wiki-label-text">{{item.description ? item.description : '源自万山之祖昆仑山脉,绵延华夏龙之 脉中川流的“圣血”'}}</view>
+            </view>
+        </navigator>
+    </view>
+</view>
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/index/index.wxss b/锶源昆仑饮水项目/锶源昆仑-改版/pages/index/index.wxss
new file mode 100644
index 0000000..081f8c0
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/pages/index/index.wxss
@@ -0,0 +1,560 @@
+page {
+    background-color: #f3f3f5;
+}
+
+/* 轮播 */
+.page-section {
+    position: relative;
+    width: 100%;
+    height: 100vh;
+}
+
+.videoCover {
+    position: absolute;
+    width: 100%;
+    height: 100vh;
+    z-index: 1;
+}
+
+.page-swiper {
+    position: absolute;
+    width: 100%;
+    height: 100vh;
+}
+
+.page-swiper image {
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+}
+
+/* 头部 */
+.drift {
+    position: fixed;
+    left: 0;
+    width: 100%;
+    padding: 30rpx 0;
+    box-sizing: border-box;
+    z-index: 99;
+    color: #ffffff;
+    display: flex;
+}
+
+.drift .title {
+    flex: 1;
+    font-weight: 600;
+    position: relative;
+    padding-bottom: 20rpx;
+    padding-left: 30rpx;
+    font-size: 40rpx;
+    text-shadow: 0 6rpx 6rpx rgba(0, 0, 0, .6);
+}
+
+.drift .title::after {
+    position: absolute;
+    content: '';
+    left: 45rpx;
+    bottom: 0;
+    background-color: #df723a;
+    width: 40rpx;
+    height: 6rpx;
+    border-radius: 10rpx;
+}
+
+.drift .balance {
+    font-size: 34rpx;
+    background-color: rgba(0, 0, 0, .3);
+    border-radius: 30rpx 0 0 30rpx;
+    padding: 0 20rpx;
+    height: 60rpx;
+    line-height: 60rpx;
+    display: flex;
+    box-shadow: 0 6rpx 6rpx rgba(0, 0, 0, .3);
+    text-shadow: 0 6rpx 6rpx rgba(0, 0, 0, .6);
+}
+
+.drift .balance image {
+    width: 46rpx;
+    height: 46rpx;
+    margin: 6rpx 5rpx 0 0;
+}
+
+/* 按钮 */
+.backView {
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    z-index: 98;
+    background-color: rgba(0, 0, 0, .05);
+}
+
+.tips {
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    text-align: center;
+    z-index: 99;
+    padding: 40rpx 0 90rpx;
+    box-sizing: border-box;
+    background-image: linear-gradient(to bottom, transparent, #26252a);
+}
+
+.tips .btn {
+    background-color: #ffffff;
+    display: inline-block;
+    border-radius: 80rpx;
+    padding: 0 50rpx;
+    line-height: 74rpx;
+    margin: 0 15rpx;
+    border: 2rpx solid transparent;
+    font-size: 30rpx;
+}
+
+.tips .btn.number {
+    background-color: rgba(0, 0, 0, .2);
+    border-color: #fff;
+    color: #fff;
+}
+
+.tips .btn.number image {
+    width: 48rpx;
+    height: 48rpx;
+    vertical-align: -12rpx;
+    margin-right: 5rpx;
+}
+
+.indexTop {
+    position: absolute;
+    bottom: 15rpx;
+    left: calc(50% - 27rpx);
+    width: 54rpx;
+    height: 54rpx;
+    z-index: 99;
+    opacity: .5;
+}
+
+/* 内容 */
+.other {
+    padding: 0 30rpx 30rpx;
+    box-sizing: border-box;
+}
+
+.content {
+    background-color: #ffffff;
+    border-radius: 10rpx;
+    padding: 30rpx 30rpx 10rpx;
+    box-sizing: border-box;
+}
+
+.publicTitle {
+    margin-bottom: 30rpx;
+    position: relative;
+}
+
+.publicTitle text {
+    display: block;
+    text-transform: uppercase;
+    font-size: 42rpx;
+    margin-bottom: 5rpx;
+}
+
+.publicTitle .lighter {
+    display: flex;
+    font-weight: 200;
+}
+
+.publicTitle .lighter .article-more {
+    width: 32rpx;
+    height: 32rpx;
+    margin-left: 15rpx;
+    margin-top: 4rpx;
+}
+
+.goldenLogo {
+    position: absolute;
+    right: 0;
+    top: 10rpx;
+    width: 130rpx;
+}
+
+.other-swiper swiper {
+    background: #fff;
+    height: 400rpx;
+    /* height: 450rpx; */
+}
+
+.other-swiper .slide-image image {
+    position: absolute;
+    width: 100%;
+    height: calc(100% - 40rpx);
+    left: 0;
+    top: 0;
+    margin-top: 20rpx;
+    border-radius: 12rpx;
+    transition: .2s;
+    display: block;
+}
+
+/*图片的容器*/
+.slide-image {
+    padding: 0 10rpx;
+    box-sizing: border-box;
+}
+
+.other-swiper .box {
+    display: inline-block;
+    width: 100%;
+    padding-top: 50%;
+    position: relative;
+}
+
+.other-swiper .slide-image image.active {
+    height: 100% !important;
+    margin: 0;
+}
+
+.other-swiper .othertitle {
+    width: 100%;
+    text-align: center;
+    margin-bottom: 10rpx;
+}
+
+.other-swiper .otherText {
+    font-weight: 200;
+    width: 100%;
+    font-size: 26rpx;
+    text-align: center;
+    line-height: 68rpx;
+    color: #999999;
+    position: relative;
+}
+
+.other-swiper .otherText::after,
+.other-swiper .otherText::before {
+    position: absolute;
+    content: '';
+    width: 90rpx;
+    top: calc(50% - 1rpx);
+    background-color: #bdbdbd;
+    height: 2rpx;
+}
+
+.other-swiper .otherText::after {
+    left: 40rpx;
+}
+
+.other-swiper .otherText::before {
+    right: 40rpx;
+}
+
+.other-swiper .name {
+    width: 100%;
+    text-align: center;
+    color: #d5a56d;
+    font-size: 25rpx;
+    font-weight: normal;
+}
+
+/* 视频 */
+.videos {
+    padding: 30rpx;
+}
+
+.videos-filex-view {
+    position: relative;
+    width: 100%;
+    padding-top: 50%;
+    border-radius: 20rpx;
+    overflow: hidden;
+}
+
+.videos-cover {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    z-index: 2;
+}
+
+.videos video {
+    position: absolute;
+    border-radius: 20rpx;
+    overflow: hidden;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+}
+
+.videos-filex-view.filex {
+    position: fixed;
+    top: 0;
+    left: 0;
+    z-index: 99;
+}
+
+/* 用水指南 */
+.guide {
+    overflow: hidden;
+    margin: 0 -10rpx;
+}
+
+.guide-label {
+    width: calc(50% - 20rpx);
+    margin: 0 10rpx 20rpx;
+    float: left;
+    background-image: linear-gradient(#f6f6f7, #f5f6fe);
+    border-radius: 15rpx;
+    padding: 10rpx 20rpx;
+    box-sizing: border-box;
+    position: relative;
+}
+
+.guide-top {
+    position: relative;
+    margin-bottom: 30rpx;
+}
+
+.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: 90rpx;
+    display: table;
+    line-height: 28rpx;
+}
+
+.guide-cell {
+    display: table-cell;
+    vertical-align: middle;
+}
+
+.guide-text text {
+    display: block;
+    font-size: 22rpx;
+    color: #333333;
+    font-weight: 200;
+}
+
+.guide-icon {
+    position: absolute;
+    width: 60rpx;
+    height: 60rpx;
+    right: 20rpx;
+    bottom: 20rpx;
+}
+
+/* 申请体验官 */
+.brief-img {
+    border-radius: 10rpx;
+    overflow: hidden;
+    position: relative;
+    padding-top: 50%;
+}
+
+.brief-img image {
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+}
+
+.brief-btn {
+    background-color: #6c78f8;
+    color: #fff;
+    border-radius: 40rpx;
+    text-align: center;
+    line-height: 84rpx;
+    margin: 30rpx 0 20rpx;
+    font-size: 28rpx;
+}
+
+/* 订购热线 */
+.hotline .content {
+    padding: 30rpx;
+}
+
+.hotline-cont {
+    display: flex;
+}
+
+.hotline-head {
+    width: 90rpx;
+    height: 90rpx;
+}
+
+.hotline-text {
+    width: calc(100% - 184rpx);
+    margin: 0 20rpx;
+}
+
+.hotline-name {
+    margin-bottom: 15rpx;
+    line-height: 44rpx;
+}
+
+.hotline-tips {
+    color: #999999;
+    font-size: 24rpx;
+    font-weight: 200;
+}
+
+.hotline-tel {
+    width: 54rpx;
+    height: 54rpx;
+    margin-top: 20rpx;
+}
+
+/* 文章列表 */
+.article {
+    padding: 0 30rpx 30rpx;
+    box-sizing: border-box;
+}
+
+/* 健康百科 */
+.wiki {
+    margin-top: 60rpx;
+}
+
+.wiki-label {
+    background-color: #fff;
+    margin-bottom: 60rpx;
+    position: relative;
+    height: 150rpx;
+    border-radius: 10rpx;
+}
+
+.wiki-label:last-child {
+    margin-bottom: 0;
+}
+
+.wiki-label-img {
+    width: 160rpx;
+    height: 160rpx;
+    position: absolute;
+    top: -30rpx;
+    left: 20rpx;
+    border-radius: 10rpx 10rpx 0 0;
+}
+
+.wiki-label-cont {
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 100%;
+    padding: 20rpx 25rpx 20rpx 200rpx;
+    box-sizing: border-box;
+}
+
+.wiki-label-name {
+    font-size: 30rpx;
+}
+
+.wiki-label-name text {
+    text-transform: uppercase;
+}
+
+.wiki-label-text {
+    color: #999999;
+    font-size: 25rpx;
+    margin-top: 10rpx;
+    line-height: 30rpx;
+    font-weight: 200;
+}
+
+/* 记忆 */
+.memory {
+    width: 100%;
+    background-size: cover;
+    position: relative;
+    overflow: hidden;
+}
+
+.teachers_b {
+    position: relative;
+}
+
+#slide {
+    margin: 0 auto;
+    width: 100%;
+    height: 530rpx;
+    position: relative;
+}
+
+.memoryLable {
+    background-color: #fff;
+    position: absolute;
+    width: 580rpx;
+    border-radius: 10rpx;
+    overflow: hidden;
+}
+
+.memory-img {
+    width: 580rpx;
+    height: 387rpx;
+    border-radius: 10rpx;
+    overflow: hidden;
+}
+
+.memory-cont {
+    padding: 20rpx 20rpx 30rpx;
+    box-sizing: border-box;
+}
+
+.memory-title {
+    display: flex;
+}
+
+.memory-name {
+    font-size: 30rpx;
+    flex: 1;
+    line-height: 40rpx;
+    margin-right: 20rpx;
+}
+
+.memory-go {
+    background-color: #f8f8f8;
+    font-size: 26rpx;
+    color: #d5a56d;
+    padding: 0 10rpx;
+    line-height: 40rpx;
+    border-radius: 10rpx;
+}
+
+.memory-text {
+    font-size: 26rpx;
+    color: #999;
+    margin-top: 10rpx;
+    font-weight: 200;
+}
+
+.slide_right {
+    padding: 40px;
+    -webkit-box-flex: 1;
+    -webkit-flex: 1;
+    flex: 1;
+    min-width: 0;
+}
+
+.slide_right dl {
+    padding-top: 10px;
+}
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/login/agreement/agreement.js b/锶源昆仑饮水项目/锶源昆仑-改版/pages/login/agreement/agreement.js
new file mode 100644
index 0000000..6d51d02
--- /dev/null
+++ 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() {},
+})
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/login/agreement/agreement.json b/锶源昆仑饮水项目/锶源昆仑-改版/pages/login/agreement/agreement.json
new file mode 100644
index 0000000..3928faa
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/pages/login/agreement/agreement.json
@@ -0,0 +1,3 @@
+{
+    "usingComponents": {}
+}
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/login/agreement/agreement.wxml b/锶源昆仑饮水项目/锶源昆仑-改版/pages/login/agreement/agreement.wxml
new file mode 100644
index 0000000..7fd32b1
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/pages/login/agreement/agreement.wxml
@@ -0,0 +1,3 @@
+<view class="agreement-content">
+    <rich-text nodes="{{content}}"></rich-text>
+</view>
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/login/agreement/agreement.wxss b/锶源昆仑饮水项目/锶源昆仑-改版/pages/login/agreement/agreement.wxss
new file mode 100644
index 0000000..3f2d3bf
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/pages/login/agreement/agreement.wxss
@@ -0,0 +1,5 @@
+.agreement-content{
+    padding: 30rpx;
+    box-sizing: border-box;
+    font-size: 32rpx;
+}
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/login/index.js b/锶源昆仑饮水项目/锶源昆仑-改版/pages/login/index.js
new file mode 100644
index 0000000..b21bb27
--- /dev/null
+++ 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
+        })
+    }
+})
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/login/index.json b/锶源昆仑饮水项目/锶源昆仑-改版/pages/login/index.json
new file mode 100644
index 0000000..5f59c44
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/pages/login/index.json
@@ -0,0 +1,4 @@
+{
+    "usingComponents": {},
+    "navigationBarTitleText": "锶源昆仑"
+}
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/login/index.wxml b/锶源昆仑饮水项目/锶源昆仑-改版/pages/login/index.wxml
new file mode 100644
index 0000000..889ba1e
--- /dev/null
+++ 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>
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/login/index.wxss b/锶源昆仑饮水项目/锶源昆仑-改版/pages/login/index.wxss
new file mode 100644
index 0000000..90a9e4b
--- /dev/null
+++ 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;
+}
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/mall/buy/index.js b/锶源昆仑饮水项目/锶源昆仑-改版/pages/mall/buy/index.js
new file mode 100644
index 0000000..538d0c9
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/pages/mall/buy/index.js
@@ -0,0 +1,103 @@
+/*
+ * 手太欠
+ * 愿这世界都如故事里一样 美好而动人~
+ */
+
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        avatar      : '', //用户头像
+        nickName    : '', //用户昵称
+        identity    : '', //用户身份
+        goodId      : '', //商品id
+        surplus     : '', //我的水滴
+        mallData    : '', //商品详情
+        mallContent : '', //商品介绍
+        userLogin   : '',   //登录状态
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+        this.setData({
+            goodId: options.id
+        })
+
+        // 获取商品详情
+        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 => {
+            console.log(res.data)
+            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,
+            })
+        }else {
+            // 去登录
+            wx.navigateTo({
+                url: "/pages/login/index"
+            })
+        }
+    }
+})
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/mall/buy/index.json b/锶源昆仑饮水项目/锶源昆仑-改版/pages/mall/buy/index.json
new file mode 100644
index 0000000..30d4806
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/pages/mall/buy/index.json
@@ -0,0 +1,4 @@
+{
+    "usingComponents": {},
+    "navigationBarTitleText": "锶源商城"
+}
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/mall/buy/index.wxml b/锶源昆仑饮水项目/锶源昆仑-改版/pages/mall/buy/index.wxml
new file mode 100644
index 0000000..ac7c22c
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/pages/mall/buy/index.wxml
@@ -0,0 +1,70 @@
+<!-- 轮播 -->
+<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}}
+                </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 == '1'}}" class="user-identity" src="/static/icons/member_01.png" mode="widthFix"></image>
+            <image wx:elif="{{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_06.png" class="user-identity" mode="widthFix"></image>
+        </view>
+        <view class="water">
+            <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">
+            <view class="goodsInfo-price-symbol">￥</view>{{mallData.price.show}}
+        </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">需<text>{{mallData.price.show}}</text>水滴</view>  之前就是隐藏的
+    <view class="number">￥<text>{{mallData.price.show}}</text></view>
+    <view bindtap="buyTap" class="btn">立即购买</view>
+</view> -->
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/mall/buy/index.wxss b/锶源昆仑饮水项目/锶源昆仑-改版/pages/mall/buy/index.wxss
new file mode 100644
index 0000000..083d0b1
--- /dev/null
+++ 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%;
+}
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/mall/details/index.js b/锶源昆仑饮水项目/锶源昆仑-改版/pages/mall/details/index.js
new file mode 100644
index 0000000..c8f9c74
--- /dev/null
+++ 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 => {})
+                }
+            }
+        })
+    }
+})
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/mall/details/index.json b/锶源昆仑饮水项目/锶源昆仑-改版/pages/mall/details/index.json
new file mode 100644
index 0000000..7418a99
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/pages/mall/details/index.json
@@ -0,0 +1,4 @@
+{
+    "usingComponents": {},
+    "navigationBarTitleText": "订单详情"
+}
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/mall/details/index.wxml b/锶源昆仑饮水项目/锶源昆仑-改版/pages/mall/details/index.wxml
new file mode 100644
index 0000000..0b38456
--- /dev/null
+++ 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>
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/mall/details/index.wxss b/锶源昆仑饮水项目/锶源昆仑-改版/pages/mall/details/index.wxss
new file mode 100644
index 0000000..65adaa4
--- /dev/null
+++ 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;
+}
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/mall/goods/index.js b/锶源昆仑饮水项目/锶源昆仑-改版/pages/mall/goods/index.js
new file mode 100644
index 0000000..58f6de1
--- /dev/null
+++ 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);
+        }
+    }
+})
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/mall/goods/index.json b/锶源昆仑饮水项目/锶源昆仑-改版/pages/mall/goods/index.json
new file mode 100644
index 0000000..0e633c7
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/pages/mall/goods/index.json
@@ -0,0 +1,4 @@
+{
+    "usingComponents": {},
+    "navigationBarTitleText": "产品中心"
+}
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/mall/goods/index.wxml b/锶源昆仑饮水项目/锶源昆仑-改版/pages/mall/goods/index.wxml
new file mode 100644
index 0000000..2707fa3
--- /dev/null
+++ 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>
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/mall/goods/index.wxss b/锶源昆仑饮水项目/锶源昆仑-改版/pages/mall/goods/index.wxss
new file mode 100644
index 0000000..753edff
--- /dev/null
+++ 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;
+} */
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/mall/submit/index.js b/锶源昆仑饮水项目/锶源昆仑-改版/pages/mall/submit/index.js
new file mode 100644
index 0000000..1d25e90
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/pages/mall/submit/index.js
@@ -0,0 +1,291 @@
+ /*
+ * 手太欠
+ * 愿这世界都如故事里一样 美好而动人~
+ */
+
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        goodId       : '', //店铺id
+        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,
+            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 为水滴兑换
+            this.setData({
+                exchangeSee: !this.data.exchangeSee
+            })
+        }).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 => {})
+    }
+})
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/mall/submit/index.json b/锶源昆仑饮水项目/锶源昆仑-改版/pages/mall/submit/index.json
new file mode 100644
index 0000000..db7dae0
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/pages/mall/submit/index.json
@@ -0,0 +1,4 @@
+{
+    "usingComponents": {},
+    "navigationBarTitleText": "确认订单"
+}
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/mall/submit/index.wxml b/锶源昆仑饮水项目/锶源昆仑-改版/pages/mall/submit/index.wxml
new file mode 100644
index 0000000..a450a95
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/pages/mall/submit/index.wxml
@@ -0,0 +1,105 @@
+<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">24瓶/箱</view>
+                <view class="good-price"><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}}</view>
+        </view>
+        <view class="label-item">
+            <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>
+
+<!-- 是否确认兑换商品弹出 -->
+<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>
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/mall/submit/index.wxss b/锶源昆仑饮水项目/锶源昆仑-改版/pages/mall/submit/index.wxss
new file mode 100644
index 0000000..62100e6
--- /dev/null
+++ 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;
+}
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/member/cause/cause.js b/锶源昆仑饮水项目/锶源昆仑-改版/pages/member/cause/cause.js
new file mode 100644
index 0000000..0d8dbfa
--- /dev/null
+++ 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 => {})
+    }
+})
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/member/cause/cause.json b/锶源昆仑饮水项目/锶源昆仑-改版/pages/member/cause/cause.json
new file mode 100644
index 0000000..3928faa
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/pages/member/cause/cause.json
@@ -0,0 +1,3 @@
+{
+    "usingComponents": {}
+}
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/member/cause/cause.wxml b/锶源昆仑饮水项目/锶源昆仑-改版/pages/member/cause/cause.wxml
new file mode 100644
index 0000000..26ce946
--- /dev/null
+++ 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>
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/member/cause/cause.wxss b/锶源昆仑饮水项目/锶源昆仑-改版/pages/member/cause/cause.wxss
new file mode 100644
index 0000000..e0ecbdb
--- /dev/null
+++ 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;
+}
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/member/examine/examine.js b/锶源昆仑饮水项目/锶源昆仑-改版/pages/member/examine/examine.js
new file mode 100644
index 0000000..03f816d
--- /dev/null
+++ 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() {
+
+    }
+})
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/member/examine/examine.json b/锶源昆仑饮水项目/锶源昆仑-改版/pages/member/examine/examine.json
new file mode 100644
index 0000000..254cc25
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/pages/member/examine/examine.json
@@ -0,0 +1,4 @@
+{
+    "usingComponents": {},
+    "navigationBarTitleText": "审核"
+}
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/member/examine/examine.wxml b/锶源昆仑饮水项目/锶源昆仑-改版/pages/member/examine/examine.wxml
new file mode 100644
index 0000000..77abe17
--- /dev/null
+++ 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>
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/member/examine/examine.wxss b/锶源昆仑饮水项目/锶源昆仑-改版/pages/member/examine/examine.wxss
new file mode 100644
index 0000000..47d3e4f
--- /dev/null
+++ 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);
+}
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/member/index.js b/锶源昆仑饮水项目/锶源昆仑-改版/pages/member/index.js
new file mode 100644
index 0000000..e4bcf4f
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/pages/member/index.js
@@ -0,0 +1,135 @@
+// pages/member/index.js
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        userLogin       : '',   //登录状态
+        avatar          : '',   //头像
+        nickName        : '',   //昵称
+        identityId      : '',   //用户id
+        identityShow    : '',   //身份有效期
+        tabType         : 3,    // 会员选项
+        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为月卡,5为年卡
+        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")){
+            wx.navigateTo({
+                url: pageUrl
+            })
+        }else{
+            // 去登录
+            wx.navigateTo({
+                url: "/pages/login/index"
+            })
+        }
+    },
+
+    /**
+     * 查看驳回原因
+     */
+    tapCause(e) {
+        console.log(e.currentTarget.dataset.text)
+        wx.showModal({
+            title   : '驳回原因',
+            content : e.currentTarget.dataset.text,
+            showCancel: false,
+            success : res=> {}
+        })
+    }
+})
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/member/index.json b/锶源昆仑饮水项目/锶源昆仑-改版/pages/member/index.json
new file mode 100644
index 0000000..7af8b0a
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/pages/member/index.json
@@ -0,0 +1,4 @@
+{
+    "usingComponents": {},
+    "navigationStyle": "custom"
+}
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/member/index.wxml b/锶源昆仑饮水项目/锶源昆仑-改版/pages/member/index.wxml
new file mode 100644
index 0000000..28dca43
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/pages/member/index.wxml
@@ -0,0 +1,107 @@
+<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">
+    <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">
+        <swiper class="interest-item" interval="4000" circular duration="1000">
+            <swiper-item>
+                <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>
+            </swiper-item>
+        </swiper>
+        <view class="interest-tab">
+            <view class="interest-tab-title">会员充值</view>
+            <view class="interest-tab-item">
+                <view class="interest-tab-label {{tabType == item.id ? 'active' : ''}}" bindtap="typeClick" data-type="{{item.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>
+            <navigator hover-class="none" url="./open/open?identity_id={{interestData.identity_id}}" class="open-btn" wx:if="{{interestData.can.renew}}">
+                立即续费
+            </navigator>
+            <block wx:else>
+                <block wx:if="{{interestData.can.re_open}}">
+                    <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>
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/member/index.wxss b/锶源昆仑饮水项目/锶源昆仑-改版/pages/member/index.wxss
new file mode 100644
index 0000000..5c91c39
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/pages/member/index.wxss
@@ -0,0 +1,239 @@
+/* 头部 */
+.Usetop {
+    width: 100%;
+    position: relative;
+    padding-top: 45%;
+}
+
+.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: 50rpx 15rpx 30rpx;
+    box-sizing: border-box;
+}
+
+.interest-title {
+    text-align: center;
+    color: #4683ff;
+    font-size: 34rpx;
+}
+
+.interest-cont {
+    padding: 30rpx 0;
+}
+
+.interest-item {
+    height: 200rpx;
+}
+
+.interest-label {
+    float: left;
+    width: calc(20% - 30rpx);
+    margin: 0 15rpx;
+    font-size: 28rpx;
+    text-align: center;
+}
+
+.interest-label-icon {
+    width: 100%;
+}
+
+.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;
+}
+
+.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;
+}
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/member/open/open.js b/锶源昆仑饮水项目/锶源昆仑-改版/pages/member/open/open.js
new file mode 100644
index 0000000..0c964fb
--- /dev/null
+++ 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 => {
+        })
+    }
+})
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/member/open/open.json b/锶源昆仑饮水项目/锶源昆仑-改版/pages/member/open/open.json
new file mode 100644
index 0000000..3928faa
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/pages/member/open/open.json
@@ -0,0 +1,3 @@
+{
+    "usingComponents": {}
+}
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/member/open/open.wxml b/锶源昆仑饮水项目/锶源昆仑-改版/pages/member/open/open.wxml
new file mode 100644
index 0000000..7a93e36
--- /dev/null
+++ 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>
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/member/open/open.wxss b/锶源昆仑饮水项目/锶源昆仑-改版/pages/member/open/open.wxss
new file mode 100644
index 0000000..e0ecbdb
--- /dev/null
+++ 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;
+}
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/order/details/index.js b/锶源昆仑饮水项目/锶源昆仑-改版/pages/order/details/index.js
new file mode 100644
index 0000000..c8f9c74
--- /dev/null
+++ 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 => {})
+                }
+            }
+        })
+    }
+})
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/order/details/index.json b/锶源昆仑饮水项目/锶源昆仑-改版/pages/order/details/index.json
new file mode 100644
index 0000000..7418a99
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/pages/order/details/index.json
@@ -0,0 +1,4 @@
+{
+    "usingComponents": {},
+    "navigationBarTitleText": "订单详情"
+}
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/order/details/index.wxml b/锶源昆仑饮水项目/锶源昆仑-改版/pages/order/details/index.wxml
new file mode 100644
index 0000000..8334d4d
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/pages/order/details/index.wxml
@@ -0,0 +1,84 @@
+<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 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>
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/order/details/index.wxss b/锶源昆仑饮水项目/锶源昆仑-改版/pages/order/details/index.wxss
new file mode 100644
index 0000000..2712a66
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/pages/order/details/index.wxss
@@ -0,0 +1,209 @@
+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-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;
+}
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/order/list/index.js b/锶源昆仑饮水项目/锶源昆仑-改版/pages/order/list/index.js
new file mode 100644
index 0000000..5f9e44d
--- /dev/null
+++ 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);
+        }
+    }
+})
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/order/list/index.json b/锶源昆仑饮水项目/锶源昆仑-改版/pages/order/list/index.json
new file mode 100644
index 0000000..e3130c7
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/pages/order/list/index.json
@@ -0,0 +1,4 @@
+{
+    "usingComponents": {},
+    "navigationBarTitleText": "我的订单"
+}
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/order/list/index.wxml b/锶源昆仑饮水项目/锶源昆仑-改版/pages/order/list/index.wxml
new file mode 100644
index 0000000..eb21759
--- /dev/null
+++ 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>
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/order/list/index.wxss b/锶源昆仑饮水项目/锶源昆仑-改版/pages/order/list/index.wxss
new file mode 100644
index 0000000..3783d94
--- /dev/null
+++ 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;
+}
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/addSite/index.js b/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/addSite/index.js
new file mode 100644
index 0000000..e906fcf
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/addSite/index.js
@@ -0,0 +1,183 @@
+ /*
+ * 手太欠
+ * 愿这世界都如故事里一样 美好而动人~
+ */
+
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        name      : '',  // 姓名
+        mobile    : '',  // 电话
+        address   : '',  // 地址
+        defaultVal: '',  // 默认地址
+        // 省份选择
+        areasArr   : [],
+        areaId     : '',
+        areaIndex  : 0,
+                
+        // 市级选择
+        cityArr    : [],
+        cityId     : 0,
+        cityIndex  : 0,
+                
+        // 区域选择
+        regiArr    : [],
+        regiId     : 0,
+        regiIndex  : 0,
+
+        disabled   : false
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+        this.setData({
+            experience: options.experience
+        })
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+        if(this.data.experience != false) {
+            this.setData({
+                areaIndex: 18
+            })
+        }
+
+        // 获取省市区列表
+        this.createInfo();
+    },
+
+    /**
+     * 省市区列表
+     */
+    createInfo() {
+        wx.$api.stock.create().then(res => {
+            let areas         =  res.data,
+                areaIndex     =  this.data.areaIndex
+
+            this.setData({
+                areasArr : areas,
+                areaId   : areas[areaIndex].id,
+
+            })
+            this.citylist(areas[areaIndex].id)
+        }).catch(err => {})
+    },
+
+    /**
+     * 所在省份-下拉
+     */
+    areasChange(e) {
+        let area     = this.data.areasArr,
+            index    = e.detail.value,
+            atcode   = area[index].id
+        if (index != this.data.areaIndex) {
+            this.setData({
+                areaIndex : index,
+                areaId    : atcode
+            })
+            // 获取市级列表
+            this.citylist(atcode)
+        }
+    },
+
+    /**
+     * 市级列表
+     */
+    citylist(cityId) {
+        wx.$api.stock.create({
+            parent_id: cityId
+        }).then(res=>{
+            let cityArr = res.data
+            // 从体验官入口进入 默认为深圳
+            if(this.data.experience) {
+               this.setData({
+                    cityId    : cityArr[2].id,
+                    cityIndex : 2,
+                    cityArr   : cityArr
+                })
+                this.regilist(cityArr[2].id)
+                return
+            }
+
+            this.setData({
+                cityId    : cityArr[0].id,
+                cityIndex : 0,
+                cityArr   : cityArr
+            })
+            
+            // 获取区级列表
+            this.regilist(cityArr[0].id)
+        })
+    },
+
+    /**
+     * 市级下拉筛选
+     */
+    cityDrop(e) {
+        let city     = this.data.cityArr,
+            index    = e.detail.value,
+            citycode = city[index].id
+        if (index != this.data.areaIndex) {
+            this.setData({
+                cityIndex : index,
+                qcityId   : citycode
+            })
+            
+            // 获取市级列表
+            this.regilist(citycode)
+        }
+    },
+    
+    /**
+     * 区列表
+     */
+    regilist(areaId) {
+        wx.$api.stock.create({
+            parent_id: areaId
+        }).then(res=>{
+            this.setData({
+                regiArr   : res.data,
+                regiId    : res.data[0].id,
+                regiIndex : 0
+            })
+        })
+    },
+    
+    /**
+     * 区下拉筛选
+     */
+    regiDrop(e) {
+        let newIndex = e.detail.value
+        this.setData({
+            regiIndex  : newIndex,
+            regiId     : this.data.regiArr[newIndex].id
+        })
+    },
+    
+    // 提交表单
+    siteform(e) {
+        let value = e.detail.value
+        let data = {
+            name        : value.name,
+            mobile      : value.mobile,
+            address     : value.address,
+            province_id : this.data.areaId,
+            city_id     : this.data.cityId,	
+            district_id : this.data.regiId
+        }
+        wx.$api.stock.siteAdd(data).then(res => {
+            this.setData({
+                disabled: true
+            })
+            wx.navigateBack()
+        }).catch(err => {})
+    }
+})
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/addSite/index.json b/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/addSite/index.json
new file mode 100644
index 0000000..9b706f4
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/addSite/index.json
@@ -0,0 +1,4 @@
+{
+    "usingComponents": {},
+    "navigationBarTitleText": "新增地址"
+}
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/addSite/index.wxml b/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/addSite/index.wxml
new file mode 100644
index 0000000..a043359
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/addSite/index.wxml
@@ -0,0 +1,48 @@
+<form bindsubmit="siteform" class="site-form">
+    <view class="site-input">
+        <label>收货人</label>
+        <input placeholder="请输入收货人姓名" name="name"></input>
+    </view>
+    <view class="site-input">
+        <label>手机号码</label>
+        <input placeholder="请输入手机号码" maxlength="11" name="mobile" type="number"></input>
+    </view>
+    <view class="site-input">
+        <label>所在省份</label>
+        <picker bindchange="areasChange" value="{{areaIndex}}" range="{{areasArr}}" range-key="name">
+            <view class="picker">
+                {{ areasArr[areaIndex].name }}
+            </view>
+            <image src="/static/icons/userLogin_icon.png"></image>
+        </picker>
+    </view> 
+    <view class="site-input">
+        <label>所在城市</label>
+        <picker bindchange="cityDrop" value="{{cityIndex}}" range="{{cityArr}}" range-key="name" class="conneColor">
+            <view class="picker">
+                {{ cityArr[cityIndex].name }}
+            </view>
+            <image src="/static/icons/userLogin_icon.png"></image>
+        </picker>
+    </view>
+    <view class="site-input">
+        <label>所在区域</label>
+        <picker bindchange="regiDrop" value="{{regiIndex}}" range="{{regiArr}}" range-key="name" class="conneColor">
+            <view class="picker">
+                {{ regiArr[regiIndex].name }}
+            </view>
+            <image src="/static/icons/userLogin_icon.png"></image>
+        </picker>
+    </view>
+    <view class="site-input">
+        <label>收货地址</label>
+        <input placeholder="请输入详细地址" name="address"></input>
+    </view>
+    <!-- <view class="site-switch">
+        <text>设置默认地址</text>
+        <switch style='zoom:.6;' bindchange="addressDefault" color="#eb504c" />
+    </view> -->
+    <view class="site-btn">
+        <button form-type="submit" size="mini" disabled="{{disabled}}">保存</button>
+    </view>
+</form>
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/addSite/index.wxss b/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/addSite/index.wxss
new file mode 100644
index 0000000..784d196
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/addSite/index.wxss
@@ -0,0 +1,79 @@
+.site-form {
+    background: white;
+    display: block;
+}
+
+.site-input {
+    padding: 0 30rpx 0 200rpx;
+    position: relative;
+    line-height: 110rpx;
+    min-height: 110rpx;
+    border-bottom: 2rpx solid #f3f3f3;
+}
+
+.site-input::before {
+    position: absolute;
+    bottom: 0;
+    left: 30rpx;
+    right: 0;
+    height: 1rpx;
+    content: "";
+    background: #e4e6f2;
+}
+
+.site-input:last-child::before {
+    display: none;
+}
+
+.site-input label {
+    position: absolute;
+    left: 30rpx;
+    top: 0;
+}
+
+.site-input input {
+    height: 110rpx;
+}
+
+.site-input image {
+    width: 38rpx;
+    height: 38rpx;
+    position: absolute;
+    right: 20rpx;
+    top: calc(50% - 19rpx);
+}
+
+.site-btn {
+    padding: 20rpx 30rpx;
+    margin-top: 100rpx;
+}
+
+.site-btn button[size="mini"] {
+    width: 100%;
+    background: #1d37e2;
+    height: 88rpx;
+    line-height: 88rpx;
+    font-size: 30rpx;
+    color: white;
+    padding: 0;
+}
+
+.site-btn button[disabled] {
+    background: #7789ff !important;
+    color: #fff !important;
+}
+
+.site-switch {
+    font-size: 32rpx;
+    margin: 30rpx;
+    display: flex;
+    line-height: 40rpx;
+}
+
+.site-switch text {
+    flex: 1;
+}
+
+.site-switch-active {
+    color: #797979;
+}
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/detailed/index.js b/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/detailed/index.js
new file mode 100644
index 0000000..d09f62f
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/detailed/index.js
@@ -0,0 +1,87 @@
+ /*
+ * 手太欠
+ * 愿这世界都如故事里一样 美好而动人~
+ */
+
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        stockData   : '',      //前置
+        logsArr     : [],      // 提货列表数据
+        page        : {},      //下一页
+        lodingStats : false,   //加载状态
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {},
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+        // 获取提货前置
+        this.pickInfo();
+            
+        // 获取账变记录
+        this.logsList();
+    },
+
+    /**
+     * 提货前置
+     */
+    pickInfo (){
+        wx.$api.stock.pick().then(res => {
+            this.setData({
+                stockData : res.data.stockData
+            })
+        }).catch(err => {})
+    },
+
+    /**
+     * 账变记录
+     */
+    logsList (page){
+        wx.$api.stock.logs({
+            page: page
+        }).then(res => {
+            let listArr = this.data.logsArr,
+                newData = []
+            if(page == 1 || page == undefined) listArr = []
+            newData = listArr.concat(res.data.data)
+            this.setData({
+                logsArr     : newData,
+                page        : res.data.page,
+                lodingStats : false
+            })
+            wx.stopPullDownRefresh()
+        }).catch(err => {})
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+        // 获取账变记录
+        this.logsList();
+    },
+
+    /**
+     * 上拉加载
+     */
+    onReachBottom(){
+        this.setData({
+            lodingStats: true
+        })
+        let pageNumber = this.data.page.current
+        if(this.data.page.has_more){
+            pageNumber++
+            // 获取账变记录
+            this.logsList(pageNumber);
+        }
+    }
+})
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/detailed/index.json b/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/detailed/index.json
new file mode 100644
index 0000000..c77ab60
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/detailed/index.json
@@ -0,0 +1,4 @@
+{
+    "usingComponents": {},
+    "navigationBarTitleText": "库存明细"
+}
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/detailed/index.wxml b/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/detailed/index.wxml
new file mode 100644
index 0000000..25ad739
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/detailed/index.wxml
@@ -0,0 +1,44 @@
+<view class="top">
+    <image class="top-img" src="http://api.siyuankunlun.com/storage/materials/2022/09/14/stock_list.png" mode="aspectFill"></image>
+    <view class="top-back">
+        <view class="top-item">
+            <view class="item-name">库存总量</view>
+            <view class="item-number">{{stockData.stock}}<text>箱</text></view>
+        </view>
+        <view class="top-item">
+            <view class="item-name">提货量</view>
+            <view class="item-number">{{stockData.hold}}<text>箱</text></view>
+        </view>
+    </view>
+</view>
+
+<view class="list">
+    <view class="list-name">库存明细</view>
+    <block wx:if="{{logsArr.length > 0}}">
+        <view class="item" wx:for="{{logsArr}}" wx:key="logsArr">
+            <view class="title">
+                <view class="name">
+                    <image src="/static/icons/stockList_01.png" mode="widthFix"></image>{{item.type}}
+                </view>
+                <view class="number reduce">
+                    {{item.variable}}
+                </view>
+            </view>
+            <view class="time">
+                {{item.created_at}}
+            </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>
+    </block>
+    <view class="pages-no" wx:else>
+        <image src="/static/imgs/text_null.png" mode="widthFix"></image>
+        <view>~暂无数据哦~</view>
+    </view>
+</view>
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/detailed/index.wxss b/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/detailed/index.wxss
new file mode 100644
index 0000000..788ea3c
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/detailed/index.wxss
@@ -0,0 +1,107 @@
+/* 头部 */
+.top {
+    position: relative;
+    height: 200rpx;
+}
+
+.top-img {
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    left: 0;
+    top: 0;
+}
+
+.top-back {
+    position: absolute;
+    padding: 45rpx 30rpx 0 90rpx;
+    box-sizing: border-box;
+    width: 100%;
+    height: 100%;
+    left: 0;
+    top: 0;
+    color: #FFFFFF;
+    display: flex;
+}
+
+.top-item {
+    flex: 2;
+}
+
+.item-name {
+    font-size: 28rpx;
+    margin-bottom: 10rpx;
+    opacity: .8;
+}
+
+.item-number {
+    font-size:54rpx;
+}
+
+.item-number text {
+    font-size: 26rpx;
+    padding-left: 10rpx;
+}
+
+/* 列表 */
+.list {
+    padding: 30rpx;
+    box-sizing: border-box;
+}
+
+.list-name {
+    color: #13234a;
+    font-weight: 600;
+    margin-bottom: 40rpx;
+    font-size: 36rpx;
+}
+
+.item {
+    margin-bottom: 30rpx;
+    padding-bottom: 30rpx;
+    border-bottom: 2rpx solid #f3f3f3;
+}
+
+.title {
+    display: flex;
+    margin-bottom: 20rpx;
+}
+
+.name {
+    flex: 1;
+    font-weight: 600;
+    font-size: 30rpx;
+    display: flex;
+    line-height: 28rpx;
+}
+
+.name  image {
+    width: 28rpx;
+    height: 28rpx;
+    margin-right: 20rpx;
+}
+
+.number {
+    font-weight: 600;
+    color: #175ad6;
+    line-height: 28rpx;
+}
+.reduce {
+    color: #ef5555;
+}
+
+.time {
+    color: #676767;
+    font-size: 28rpx;
+}
+
+.pages-no {
+    text-align: center;
+    padding: 120rpx 0 30rpx;
+    color: #9d9d9d;
+    font-size: 28rpx;
+}
+
+.pages-no image {
+    width: 180rpx;
+}
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/examine/index.js b/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/examine/index.js
new file mode 100644
index 0000000..6130cdc
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/examine/index.js
@@ -0,0 +1,66 @@
+// pages/stock/examine/index.js
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {
+
+    }
+})
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/examine/index.json b/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/examine/index.json
new file mode 100644
index 0000000..d5796cd
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/examine/index.json
@@ -0,0 +1,4 @@
+{
+    "usingComponents": {},
+    "navigationBarTitleText": "等待审核"
+}
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/examine/index.wxml b/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/examine/index.wxml
new file mode 100644
index 0000000..4e19979
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/examine/index.wxml
@@ -0,0 +1,9 @@
+<view class="examine">
+    <image src="http://api.siyuankunlun.com/storage/materials/2022/09/14/examine.png" mode="widthFix"></image>
+    <view class="text">
+        <view class="title">审核中</view>
+        <view class="time">预计审核时间：1个工作日</view>
+        <view class="time">审核结果会微信消息提醒，请您耐心等待</view>
+    </view>
+    <navigator hover-class="none" open-type="navigateBack" class="return">返回</navigator>
+</view>
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/examine/index.wxss b/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/examine/index.wxss
new file mode 100644
index 0000000..8506aba
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/examine/index.wxss
@@ -0,0 +1,33 @@
+.examine {
+    padding: 240rpx 0 30rpx;
+    box-sizing: border-box;
+    text-align: center;
+}
+
+.examine image {
+    width: 35%;
+    margin: 0 auto 30rpx;
+}
+
+.title {
+    font-weight: 600;
+    font-size: 42rpx;
+    margin-bottom: 30rpx;
+}
+
+.time {
+    color: #999999;
+    line-height: 50rpx;
+}
+
+.return {
+    display: inline-block;
+    margin-top: 80rpx;
+    background-color: #1d37e2;
+    padding: 0 180rpx;
+    height: 90rpx;
+    line-height: 90rpx;
+    border-radius: 10rpx;
+    box-shadow: 0 3rpx 6rpx 4rpx rgba(6, 34, 214, .6);
+    color: #FFFFFF;
+}
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/index.js b/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/index.js
new file mode 100644
index 0000000..9304ccf
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/index.js
@@ -0,0 +1,109 @@
+ /*
+ * 手太欠
+ * 愿这世界都如故事里一样 美好而动人~
+ */
+
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        stockData: '',      //数据
+        address  : '',      //地址
+        listArr     : [],   //提货列表数据
+        avatar      : '',   //头像
+        identity    : '',   //身份
+        page        : {},   //下一页
+        lodingStats : false,//加载状态
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+        // 获取用户信息
+        this.userInfo();
+
+        // 获取提货前置
+        this.pickInfo();
+
+        // 获取提货列表
+        this.pickList();
+    },
+
+    /**
+     * 用户信息
+     */
+    userInfo() {
+        wx.$api.user.home().then(res => {
+            this.setData({
+                avatar   : res.data.avatar,
+                identity : res.data.identity
+            })
+        }).catch(err => {})
+    },
+
+    /**
+     * 提货前置
+     */
+    pickInfo (){
+        wx.$api.stock.pick().then(res => {
+            this.setData({
+                stockData : res.data.stockData,
+                address   : res.data.address
+            })
+        }).catch(err => {})
+    },
+
+    /**
+     * 提货列表
+     */
+    pickList (page){
+        wx.$api.stock.list({
+            page: page
+        }).then(res => {
+            let listArr = this.data.listArr,
+                newData = []
+            if(page == 1 || page == undefined) listArr = []
+            newData = listArr.concat(res.data.data)
+            this.setData({
+                listArr     : newData,
+                page        : res.data.page,
+                lodingStats : false
+            })
+            wx.stopPullDownRefresh()
+            
+        }).catch(err => {})
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+        // 获取提货列表
+        this.pickList();
+    },
+
+    /**
+     * 上拉加载
+     */
+    onReachBottom(){
+        this.setData({
+            lodingStats: true
+        })
+        let pageNumber = this.data.page.current
+        if(this.data.page.has_more){
+            pageNumber++
+            // 获取提货列表
+            this.pickList(pageNumber);
+        }
+    }
+})
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/index.json b/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/index.json
new file mode 100644
index 0000000..539ef6d
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/index.json
@@ -0,0 +1,4 @@
+{
+    "usingComponents": {},
+    "navigationBarTitleText": "库存量"
+}
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/index.wxml b/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/index.wxml
new file mode 100644
index 0000000..3a2eb5c
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/index.wxml
@@ -0,0 +1,90 @@
+<view class="user">
+    <navigator hover-class="none" url="./detailed/index" class="user-order">
+        <image src="/static/icons/stock_order.png" mode=""></image>
+    </navigator>
+    <image class="user-head" src="{{avatar ? avatar : '/static/imgs/default_myHead.png'}}"></image>
+    <view class="user-member" wx:if="{{identity.order == '2'}}">
+        <image src="/static/icons/stock_icon.png" mode=""></image>
+    </view>
+</view>
+
+<view class="stock-top">
+    <view class="top-title">
+        <text>库存总数量</text>(单位：箱)
+    </view>
+    <view class="top-number">
+        <image src="/static/icons/water.png" mode="widthFix"></image>{{stockData.residue}}
+    </view>
+</view>
+
+<view class="stock-label">
+    <view class="stock-cont">
+        <view class="stock-item">
+            <image class="stock-icon" src="/static/icons/stock_icon_01.png" mode="widthFix"></image>
+            <view class="stock-number">{{stockData.hold}}<text>箱</text></view>
+            <view class="stock-tips">已提数量</view>
+        </view>
+        <view class="stock-item">
+            <image class="stock-icon" src="/static/icons/stock_icon_02.png" mode="widthFix"></image>
+            <view class="stock-number">{{stockData.residue}}<text>箱</text></view>
+            <view class="stock-tips">待提数量</view>
+        </view>
+        <view class="stock-btn">
+            <navigator hover-class="none" url="./take/index" class="btn">
+                <text>申请提货</text>
+                <image src="/static/icons/arrow.png"></image>
+            </navigator>
+            <navigator hover-class="none" url="./site/index" class="btn">
+                <text>地址管理</text>
+                <image src="/static/icons/arrow_grey.png"></image>
+            </navigator>
+        </view>
+    </view>
+</view>
+
+<view class="record">
+    <view class="title">
+        <view class="name">
+            <image src="/static/icons/stock_nav.png" mode="widthFix"></image> 提货记录
+        </view>
+        <navigator hover-class="none" url="./list/index" class="more" wx:if="{{listArr.length > 0}}">
+            查看全部
+            <image src="/static/icons/arrow_more.png"></image>
+        </navigator>
+    </view>
+    <view class="list" wx:if="{{listArr.length > 0}}">
+        <view class="item" wx:for="{{listArr}}" wx:key="listArr">
+            <view class="item-top">
+                <view class="item-name">
+                    提货量
+                </view>
+                <view class="item-number">
+                    {{item.items[0].qty}}<text>(箱)</text>
+                </view>
+            </view>
+            <view class="item-label">
+                <view class="item-left">申请时间</view>
+                <view class="item-right">{{item.created_at}}</view>
+            </view>
+            <view class="item-label">
+                <view class="item-left">申请状态</view>
+                <view class="item-right item-state green" wx:if="{{item.can.cancel}}">{{item.state}}</view>
+                <view class="item-right item-state yellow" wx:elif="{{item.can.sign}}">{{item.state}}</view>
+                <view class="item-right item-state" wx:else>{{item.state}}</view>
+            </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="recommend-hint" wx:else>
+		<image src="/static/imgs/text_null.png"></image>
+		<view>~抱歉，暂无内容~</view>
+	</view>
+</view>
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/index.wxss b/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/index.wxss
new file mode 100644
index 0000000..8df4325
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/index.wxss
@@ -0,0 +1,261 @@
+/* 用户 */
+.user {
+    text-align: right;
+    box-sizing: border-box;
+    position: relative;
+    height: 150rpx;
+}
+
+.user-order {
+    position: absolute;
+    left: 55rpx;
+    top: 30rpx;
+    background-color: #e9eaef;
+    width: 80rpx;
+    height: 80rpx;
+    text-align: center;
+    border-radius: 50%;
+    padding: 16rpx;
+    box-sizing: border-box;
+}
+
+.user-order image {
+    width: 100%;
+    height: 100%;
+}
+
+.user-head {
+    width: 80rpx;
+    height: 80rpx;
+    border-radius: 50%;
+    position: absolute;
+    right: 30rpx;
+    top: 30rpx;
+    border: 2rpx solid #efefef;
+}
+
+.user-member {
+    position: absolute;
+    right: 80rpx;
+    top: 84rpx;
+    width: 30rpx;
+    height: 30rpx;
+    line-height: 26rpx;
+    text-align: center;
+    background-color: #1835c1;
+    border-radius: 50%;
+}
+
+.user-member image {
+    width: 16rpx;
+    height: 16rpx;
+}
+
+.stock-top {
+    padding: 0 30rpx 30rpx 60rpx;
+    box-sizing: border-box;
+}
+
+.top-title {
+    color: #82828e;
+    margin-bottom: 20rpx;
+    display: flex;
+    line-height: 34rpx;
+    font-size: 32rpx;
+}
+
+.top-title text {
+    flex: 1;
+}
+
+.top-number {
+    font-size: 72rpx;
+    color: #333657;
+}
+
+.top-number image {
+    width: 32rpx;
+    height: 32rpx;
+    margin-right: 10rpx;
+}
+
+.stock-label {
+    padding-left: 60rpx;
+    box-sizing: border-box;
+    background: #ecf4f6;
+    padding-top: 40rpx;
+    height: 430rpx;
+}
+
+.stock-cont {
+    background-color: #1d37e2;
+    border-radius: 60rpx 0 0 60rpx;
+    padding: 60rpx 30rpx 90rpx 90rpx;
+    box-sizing: border-box;
+    display: flex;
+    position: relative;
+}
+
+.stock-item {
+    color: #FFFFFF;
+    flex: 2;
+}
+
+.stock-icon {
+    width: 34rpx;
+    height: 34rpx;
+}
+
+.stock-number {
+    font-size: 50rpx;
+    margin-bottom: 10rpx;
+
+}
+
+.stock-numbe text {
+    font-size: 28rpx;
+    padding-left: 10rpx;
+}
+
+.stock-tips {
+    font-size: 28rpx;
+    color: #8999ff;
+}
+
+.stock-btn {
+    position: absolute;
+    bottom: -40rpx;
+    right: 0;
+    display: flex;
+}
+
+.btn {
+    background-color: #FFFFFF;
+    height: 80rpx;
+    line-height: 80rpx;
+    margin-right: 30rpx;
+    padding: 0 40rpx;
+    border-radius: 30rpx;
+}
+
+.btn:first-child {
+    color: #FFFFFF;
+    background-color: #4d70fe;
+    box-shadow: 0 3rpx 6rpx 2rpx rgba(79, 99, 226, .6);
+}
+
+.btn:last-child {
+    color: #8a5400;
+    background-color: #f9d093;
+    box-shadow: 0 3rpx 6rpx 2rpx rgba(255, 192, 92, .6);
+}
+
+.btn text {
+    padding-right: 10rpx;
+}
+
+.btn image {
+    width: 24rpx;
+    height: 24rpx;
+}
+
+.record {
+    padding: 30rpx;
+    box-sizing: border-box;
+}
+
+.title {
+    display: flex;
+}
+
+.name {
+    flex: 1;
+    font-weight: 600;
+    display: flex;
+}
+
+.name image {
+    width: 42rpx;
+    height: 42rpx;
+    margin-right: 10rpx;
+}
+
+.more {
+    font-size: 30rpx;
+    color: #9d9d9d;
+    line-height: 42rpx;
+}
+
+.more image {
+    width: 24rpx;
+    height: 24rpx;
+}
+
+.list {
+    margin-top: 30rpx;
+}
+
+.item {
+    border: 2rpx solid #f3f3f3;
+    padding: 30rpx 30rpx 20rpx;
+    box-sizing: border-box;
+    border-radius: 30rpx;
+    margin-bottom: 30rpx;
+}
+
+.item-top {
+    display: flex;
+    margin-bottom: 20rpx;
+}
+
+.item-name {
+    flex: 1;
+    font-weight: 600;
+}
+
+.item-number {
+    color: #2487ff;
+    font-weight: 600;
+}
+
+.item-number text {
+    font-size: 26rpx;
+    padding-left: 10rpx;
+    font-weight: normal;
+}
+
+.item-label {
+    line-height: 60rpx;
+    display: flex;
+    font-size: 28rpx;
+    color: #9d9d9d;
+}
+
+.item-left {
+    flex: 1;
+}
+
+.item-state {
+    color: #eb504c;
+}
+
+.item-state.green {
+    color: #03af03;
+}
+
+.item-state.yellow {
+    color: #8a5400;
+}
+
+/* 暂无内容 */
+.recommend-hint {
+    text-align: center;
+    color: #999;
+    padding: 100rpx 0;
+    font-size: 28rpx;
+}
+
+.recommend-hint image {
+    width: 160rpx;
+    height: 160rpx;
+}
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/list/index.js b/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/list/index.js
new file mode 100644
index 0000000..b84e823
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/list/index.js
@@ -0,0 +1,73 @@
+ /*
+ * 手太欠
+ * 愿这世界都如故事里一样 美好而动人~
+ */
+
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        listArr     : [],   //提货列表数据
+        page        : {},   //下一页
+        lodingStats : false,//加载状态
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {},
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+        // 获取提货列表
+        this.pickList();
+    },
+
+    /**
+     * 提货列表
+     */
+    pickList (page){
+        wx.$api.stock.list({
+            page: page
+        }).then(res => {
+            let listArr = this.data.listArr,
+                newData = []
+            if(page == 1 || page == undefined) listArr = []
+            newData = listArr.concat(res.data.data)
+            this.setData({
+                listArr     : newData,
+                page        : res.data.page,
+                lodingStats : false
+            })
+            wx.stopPullDownRefresh()
+            
+        }).catch(err => { })
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+        // 获取提货列表
+        this.pickList();
+    },
+
+    /**
+     * 上拉加载
+     */
+    onReachBottom(){
+        this.setData({
+            lodingStats: true
+        })
+        let pageNumber = this.data.page.current
+        if(this.data.page.has_more){
+            pageNumber++
+            // 获取提货列表
+            this.pickList(pageNumber);
+        }
+    }
+})
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/list/index.json b/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/list/index.json
new file mode 100644
index 0000000..783d4c8
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/list/index.json
@@ -0,0 +1,4 @@
+{
+    "usingComponents": {},
+    "navigationBarTitleText": "提货记录"
+}
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/list/index.wxml b/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/list/index.wxml
new file mode 100644
index 0000000..012e6ad
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/list/index.wxml
@@ -0,0 +1,35 @@
+<view class="list" wx:if="{{listArr.length > 0}}">
+    <view class="item" wx:for="{{listArr}}" wx:key="listArr">
+        <view class="item-top">
+            <view class="item-name">
+                提货量
+            </view>
+            <view class="item-number">
+                {{item.items[0].qty}}<text>(箱)</text>
+            </view>
+        </view>
+        <view class="item-label">
+            <view class="item-left">申请时间</view>
+            <view class="item-right">{{item.created_at}}</view>
+        </view>
+        <view class="item-label">
+            <view class="item-left">申请状态</view>
+            <view class="item-right item-state green" wx:if="{{item.can.cancel}}">{{item.state}}</view>
+            <view class="item-right item-state yellow" wx:elif="{{item.can.sign}}">{{item.state}}</view>
+            <view class="item-right item-state" wx:else>{{item.state}}</view>
+        </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="recommend-hint" wx:else>
+    <image src="/static/imgs/text_null.png"></image>
+    <view>~抱歉，暂无内容~</view>
+</view>
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/list/index.wxss b/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/list/index.wxss
new file mode 100644
index 0000000..735c499
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/list/index.wxss
@@ -0,0 +1,69 @@
+
+.list {
+    margin-top: 30rpx;
+}
+
+.item {
+    border: 2rpx solid #f3f3f3;
+    padding: 30rpx 30rpx 20rpx;
+    box-sizing: border-box;
+    border-radius: 30rpx;
+    margin-bottom: 30rpx;
+}
+
+.item-top {
+    display: flex;
+    margin-bottom: 20rpx;
+}
+
+.item-name {
+    flex: 1;
+    font-weight: 600;
+}
+
+.item-number {
+    color: #2487ff;
+    font-weight: 600;
+}
+
+.item-number text {
+    font-size: 26rpx;
+    padding-left: 10rpx;
+    font-weight: normal;
+}
+
+.item-label {
+    line-height: 60rpx;
+    display: flex;
+    font-size: 28rpx;
+    color: #9d9d9d;
+}
+
+.item-left {
+    flex: 1;
+}
+
+.item-state {
+    color: #eb504c;
+}
+
+.item-state.green {
+    color: #03af03;
+}
+
+.item-state.yellow {
+    color: #8a5400;
+}
+
+/* 暂无内容 */
+.recommend-hint {
+    text-align: center;
+    color: #999;
+    padding: 100rpx 0;
+    font-size: 28rpx;
+}
+
+.recommend-hint image {
+    width: 160rpx;
+    height: 160rpx;
+}
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/site/index.js b/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/site/index.js
new file mode 100644
index 0000000..50e259b
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/site/index.js
@@ -0,0 +1,80 @@
+ /*
+ * 手太欠
+ * 愿这世界都如故事里一样 美好而动人~
+ */
+
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        type        : '',    //类型
+        listArr     : []    //收货地址
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+        this.setData({
+            type: options.type
+        })
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+        // 获取地址列表
+        this.listInfo();
+    },
+
+    /**
+     * 地址列表
+     */
+    listInfo (){
+        wx.$api.stock.siteList().then(res => {
+            this.setData({
+                listArr: res.data
+            })
+        }).catch(err => { })
+    },
+
+    /**
+     * 删除地址
+     */
+    addressRemove(e){
+        let newid    = e.currentTarget.dataset.id
+        wx.showModal({
+            title   : '提示',
+            content : '是否删除地址',
+            success : res=> {
+                if (res.confirm) {
+                    wx.showLoading({
+                        title: '删除中',
+                    })
+                    wx.$api.stock.siteDel(newid).then(res=>{
+                        // 获取地址列表
+                        this.listInfo();
+                        wx.hideLoading()
+                    })
+                }
+            }
+        })
+    },
+    
+    /**
+     * 选择地址
+     */
+    selectAddress(e){
+        let atAdds = this.data.listArr[e.currentTarget.dataset.index]
+        let pages = getCurrentPages(),
+            prepage = pages[pages.length-2]
+            prepage.setData({
+                address: atAdds,
+                addressId: atAdds.address_id
+            })
+         wx.navigateBack()
+    }
+})
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/site/index.json b/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/site/index.json
new file mode 100644
index 0000000..f30802c
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/site/index.json
@@ -0,0 +1,4 @@
+{
+    "usingComponents": {},
+    "navigationBarTitleText": "地址管理"
+}
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/site/index.wxml b/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/site/index.wxml
new file mode 100644
index 0000000..c18c42d
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/site/index.wxml
@@ -0,0 +1,27 @@
+<view class="list" wx:if="{{listArr.length > 0}}">
+    <view class="address" wx:for="{{listArr}}" wx:key="listArr">
+        <view class="address-name">
+            <view class="defaultEdit" wx:if="{{item.default}}">默认</view><text>{{item.name}}</text>{{item.mobile}}
+        </view>
+        <view class="address-info">
+            {{item.full_address}}
+        </view>
+        <view class="address-tool">
+            <view class="address-tool-btn" bindtap="addressRemove" data-id="{{item.address_id}}">
+                <image src="/static/icons/address_01.png" mode="widthFix"></image>删除
+            </view>
+        </view>
+        <view class="select" wx:if="{{type == 'goodsAddress'}}">
+            <view class="select-btn" bindtap="selectAddress" data-index="{{index}}">
+                选择地址
+            </view>
+        </view>
+    </view>
+</view>
+<view class="edit-no" wx:else>
+    <image src="http://api.siyuankunlun.com/storage/materials/2022/09/14/site_no.png"></image>
+    <view>暂无地址</view>
+</view>
+<view class="footer">
+    <navigator hover-class="none" url="../addSite/index?experience={{Experience}}" class="btn">添加地址</navigator>
+</view>
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/site/index.wxss b/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/site/index.wxss
new file mode 100644
index 0000000..863377c
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/site/index.wxss
@@ -0,0 +1,123 @@
+page{
+    background-color: #f4f4f4;
+}
+
+.list {
+    border-bottom: 60px solid transparent;
+    padding: 30rpx;
+    box-sizing: border-box;
+}
+
+.address {
+    background-color: #FFFFFF;
+    margin-bottom: 30rpx;
+    padding: 30rpx;
+    box-sizing: border-box;
+    border-radius: 30rpx;
+}
+
+.address:last-child {
+    margin-bottom: 0;
+}
+
+.address-name {
+    display: flex;
+    font-weight: 600;
+}
+
+.address-name text {
+    font-weight: normal;
+    font-size: 34rpx;
+    flex: 1;
+    display: block;
+}
+
+.defaultEdit {
+    font-size: 26rpx;
+    height: 36rpx;
+    line-height: 36rpx;
+    border: 2rpx solid #eb504c;
+    color: #eb504c;
+    padding: 0 10rpx;
+    margin-right: 20rpx;
+    margin-top: 4rpx;
+    border-radius: 10rpx;
+}
+
+.address-info {
+    margin: 20rpx 0;
+    font-size: 30rpx;
+    color: #9d9d9d;
+}
+
+.address-tool {
+    border-top: 2rpx solid #f3f3f3;
+    padding-top: 20rpx;
+    font-size: 28rpx;
+    text-align: right;
+}
+
+.address-tool-btn {
+    display: inline-block;
+    color: #666666;
+    margin-left: 60rpx;
+}
+
+.address-tool-btn image {
+    width: 28rpx;
+    height: 28rpx;
+    vertical-align: -2rpx;
+    margin-right: 10rpx;
+}
+
+.select {
+    text-align: center;
+    border: 2rpx solid #e64248;
+    color: #e64248;
+    font-size: 28rpx;
+    margin-top: 30rpx;
+    line-height: 72rpx;
+    font-weight: 600;
+    border-radius: 10rpx;
+}
+
+.footer {
+    width: 100%;
+    height: 60px;
+    background-color: #FFFFFF;
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    z-index: 9;
+    padding: 8px;
+    box-sizing: border-box;
+}
+
+.btn {
+    line-height: 44px;
+    background-color: #1d37e2;
+    height: 100%;
+    text-align: center;
+    color: #FFFFFF;
+    border-radius: 10rpx;
+}
+
+/* 无列表 */
+.edit-no {
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-box-pack: center;
+    position: absolute;
+    left: 0;
+    right: 0;
+    top: 0;
+    bottom: 0;
+    z-index: 1;
+    text-align: center;
+    color: #9d9d9d;
+}
+
+.edit-no image {
+    width: 240rpx;
+    height: 240rpx;
+}
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/take/index.js b/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/take/index.js
new file mode 100644
index 0000000..0acd2d9
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/take/index.js
@@ -0,0 +1,133 @@
+ /*
+ * 手太欠
+ * 愿这世界都如故事里一样 美好而动人~
+ */
+
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        num          : 1,  //数量默认1
+        address      : '', //地址
+        stockData    : '', //数据
+        disabled     : false
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+        // 获取提货前置
+        this.pickInfo();
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {},
+
+    /**
+     * 提货前置
+     */
+    pickInfo (){
+        wx.$api.stock.pick().then(res => {
+            this.setData({
+                address      : res.data.address,
+                stockData    : res.data.stockData,
+                isExperience : res.data.dientity.is_experience
+            })
+        }).catch(err => {})
+    },
+
+    /**
+     * 商品数量加减
+     */
+    goodsNumber(e){
+        let num = this.data.num,
+            val = e.currentTarget.dataset.type
+        if (val == 'plus'){
+            num ++;
+            if(num > this.data.stockData.stock ){
+                wx.showToast({
+                    title: '商品数量不能大于库存量',
+                    icon: 'none'
+                });
+                num = this.data.stockData.stock
+            }
+            
+        }else{
+            if (num > 1){
+                num --;
+            }else{
+                wx.showToast({
+                    title   : '商品数量不能小于1',
+                    icon    : 'none'
+                })
+            }
+            this.setData({
+                num: num
+            })
+        }
+        this.setData({
+            num: num
+        })
+    },
+
+    /**
+     * 输入商品数量
+     */
+    goodsNumberInput(e) {
+        let goodsNum = e.detail.value;
+        if (goodsNum > 0) {
+            if(goodsNum > this.data.stockData.stock ){
+                wx.showToast({
+                    title: '商品数量不能大于库存量',
+                    icon: 'none'
+                });
+                this.setData({
+                    num: this.data.stockData.stock
+                })
+                return
+            }
+            this.setData({
+                num: goodsNum
+            })
+        } else {
+            wx.showToast({
+                title: '商品数量不能小于1',
+                icon: 'none'
+            });
+            this.setData({
+                num: 1
+            })
+        }
+    },
+
+    /**
+     * 申请提货
+     */
+    stockForm(e) {
+        let newQty = this.data.num
+        if(this.data.isExperience) {
+            newQty = this.data.stockData.stock
+        }
+        let data = {
+            remark      : e.detail.value.remark,
+            qty         : newQty,
+            address_id  : this.data.address.address_id
+        }
+
+        wx.$api.stock.pickTake(data).then(res => {
+            this.setData({
+                disabled: true
+            })
+            
+            // 跳到审核页面
+            wx.redirectTo({
+              url: '../examine/index'
+            })
+        }).catch(err => {})
+    }
+})
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/take/index.json b/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/take/index.json
new file mode 100644
index 0000000..f0b269f
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/take/index.json
@@ -0,0 +1,4 @@
+{
+    "usingComponents": {},
+    "navigationBarTitleText": "申请提现"
+}
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/take/index.wxml b/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/take/index.wxml
new file mode 100644
index 0000000..1033829
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/take/index.wxml
@@ -0,0 +1,69 @@
+<form bindsubmit="stockForm" class="take">
+    <view class="take">
+        <view class="take-label" wx:if="{{isExperience}}">
+            <view class="reminder">
+                <view class="reminder-tips">
+                    <image src="/static/icons/reminder_tips.png"></image>温馨提示
+                </view>
+                <text>收货地址只限制广东省深圳市地区</text>
+            </view>
+        </view>
+        
+        <view class="take-label">
+            <view class="item" wx:if="{{isExperience}}">
+                <view class="name">
+                    <image src="/static/icons/takeIcon_01.png" mode="widthFix"></image>提货数量
+                </view>
+                <view class="time stock">
+                    {{stockData.stock}}<text>箱</text>
+                </view>
+            </view>
+            <view class="item" wx:else>
+                <view class="name">
+                    <image src="/static/icons/takeIcon_01.png" mode="widthFix"></image>提货数量
+                </view>
+                <view class="number">
+                    <view class="btn" bindtap="goodsNumber" data-type="remove">-</view>
+                    <input bindinput="goodsNumberInput" class="see" type="text" value="{{num}}" />
+                    <view class="btn" bindtap="goodsNumber" data-type="plus">+</view>
+                </view>
+            </view>
+            <view class="item">
+                <view class="name">
+                    <image src="/static/icons/takeIcon_02.png" mode="widthFix"></image>备注信息
+                </view>
+                <textarea class="remarks" name="remark" placeholder="请输入备注信息~" />
+            </view>
+        </view>
+
+        <view class="take-label">
+            <view class="item site {{address == '' ? 'active' : ''}}" wx:if="{{address}}">
+                <view class="site-title">
+                    {{address.name}}<text>{{address.mobile}}</text>
+                </view>
+                <view class="site-text">
+                    {{address.full_address}}
+                </view>
+                <navigator hover-class="none" wx:if="{{isExperience}}" url="../site/index?type=selectAddress&experience={{isExperience}}" class="site-change">
+                    更改地址
+                </navigator>
+                <navigator hover-class="none" wx:else="" url="../site/index?type=selectAddress" class="site-change">
+                    更改地址
+                </navigator>
+            </view>
+            <view class="edit-no" wx:else>
+                <image src="http://api.siyuankunlun.com/storage/materials/2022/09/14/site_no_add.png"></image>
+                <navigator wx:if="{{isExperience}}" hover-class="none" url="../site/index?type=selectAddress&experience={{isExperience}}" class="site-change">
+                    新增地址
+                </navigator>
+                <navigator wx:else hover-class="none" url="../site/index?type=selectAddress" class="site-change">
+                    新增地址
+                </navigator>
+            </view>
+        </view>
+    </view>
+
+    <view class="site-btn">
+        <button form-type="submit" disabled="{{disabled}}">提交申请</button>
+    </view>
+</form>
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/take/index.wxss b/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/take/index.wxss
new file mode 100644
index 0000000..0fa4099
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/pages/stock/take/index.wxss
@@ -0,0 +1,196 @@
+.take {
+    border-bottom: 180rpx solid transparent;
+}
+
+.take-label {
+    padding: 30rpx 10rpx 0;
+    box-sizing: border-box;
+}
+
+.item {
+    padding: 30rpx;
+    box-sizing: border-box;
+    background-color: #FFFFFF;
+    border-bottom: 2rpx solid #f3f3f3;
+    position: relative;
+    font-size: 30rpx;
+}
+
+.name {
+    display: flex;
+    flex: 1;
+}
+
+.name image {
+    width: 44rpx;
+    height: 44rpx;
+    margin-right: 15rpx;
+}
+
+.time {
+    color: #565656;
+    position: absolute;
+    right: 30rpx;
+    top: 30rpx;
+}
+
+.stock {
+    font-weight: 600;
+}
+
+.stock text {
+    padding-left: 5rpx;
+}
+
+.number {
+    display: flex;
+    position: absolute;
+    right: 30rpx;
+    top: 30rpx;
+}
+
+.btn {
+    width: 40rpx;
+    height: 40rpx;
+    line-height: 34rpx;
+    font-weight: 600;
+    border-radius: 50%;
+    color: #1d37e2;
+    border: #1d37e2 2rpx solid;
+    text-align: center;
+}
+
+.see {
+    width: 60rpx;
+    text-align: center;
+    padding: 0 20rpx;
+    line-height: 42rpx;
+    font-size: 32rpx;
+    display: inline-block;
+}
+
+.remarks {
+    margin-top: 30rpx;
+    background-color: #f4f4f4;
+    font-size: 30rpx;
+    padding: 20rpx 30rpx;
+    box-sizing: border-box;
+    border-radius: 10rpx;
+    color: #9d9d9d;
+    width: 100%;
+}
+
+.site {
+    padding: 30rpx 40rpx 30rpx 100rpx;
+    position: relative;
+}
+
+.site::after {
+    position: absolute;
+    content: '';
+    left: 40rpx;
+    top: 60rpx;
+    background-color: #FFFFFF;
+    border: #e64248 solid 6rpx;
+    width: 12rpx;
+    height: 12rpx;
+    border-radius: 50%;
+}
+
+.site.active::after {
+    display: none;
+}
+
+.site-title {
+    margin-bottom: 10rpx;
+    font-weight: 600;
+    font-size: 32rpx;
+
+}
+
+.site-title text {
+    padding-left: 10rpx;
+}
+
+.site-text {
+    color: #565656;
+}
+
+.site-change {
+    border: 2rpx solid #e64248;
+    text-align: center;
+    line-height: 74rpx;
+    color: #e64248;
+    border-radius: 10rpx;
+    margin-top: 30rpx;
+}
+
+/* 按钮 */
+.site-btn {
+    width: 100%;
+    box-sizing: border-box;
+    padding: 30rpx;
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    z-index: 99;
+    right: 0;
+    background: white;
+}
+
+.site-btn button {
+    background: #1d37e2;
+    text-align: center;
+    color: white;
+    height: 88rpx;
+    line-height: 88rpx;
+    font-size: 32rpx;
+    font-weight: normal;
+    width: 100% !important;
+    margin: 0;
+    padding: 0;
+    border-radius: 10rpx;
+}
+
+.site-btn button[disabled] {
+    background: #7789ff !important;
+    color: #fff !important;
+}
+
+.edit-no {
+    text-align: center;
+    color: #9d9d9d;
+    padding: 30rpx;
+    box-sizing: border-box;
+}
+
+.edit-no image {
+    width: 240rpx;
+    height: 240rpx;
+}
+
+/* 温馨提示 */
+.reminder {
+    background-color: #eef0ff;
+    color: #001bca;
+    padding: 30rpx;
+    box-sizing: border-box;
+}
+
+.reminder text {
+    font-size: 30rpx;
+    padding-left: 44rpx;
+}
+
+.reminder-tips {
+    font-weight: 600;
+    margin-bottom: 10rpx;
+    display: flex;
+    line-height: 34rpx;
+}
+
+.reminder-tips image {
+    width: 34rpx;
+    height: 34rpx;
+    margin-right: 10rpx;
+}
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/user/about/about.js b/锶源昆仑饮水项目/锶源昆仑-改版/pages/user/about/about.js
new file mode 100644
index 0000000..c526e93
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/pages/user/about/about.js
@@ -0,0 +1,28 @@
+ /*
+ * 手太欠
+ * 愿这世界都如故事里一样 美好而动人~
+ */
+
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+
+    },
+})
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/user/about/about.json b/锶源昆仑饮水项目/锶源昆仑-改版/pages/user/about/about.json
new file mode 100644
index 0000000..5f59c44
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/pages/user/about/about.json
@@ -0,0 +1,4 @@
+{
+    "usingComponents": {},
+    "navigationBarTitleText": "锶源昆仑"
+}
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/user/about/about.wxml b/锶源昆仑饮水项目/锶源昆仑-改版/pages/user/about/about.wxml
new file mode 100644
index 0000000..eab3aa4
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/pages/user/about/about.wxml
@@ -0,0 +1 @@
+<image class="product" src="http://api.siyuankunlun.com/storage/materials/2022/09/05/productimg.jpg" mode="widthFix"></image>
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/user/about/about.wxss b/锶源昆仑饮水项目/锶源昆仑-改版/pages/user/about/about.wxss
new file mode 100644
index 0000000..dcd130d
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/pages/user/about/about.wxss
@@ -0,0 +1,3 @@
+.product {
+    width: 100%;
+}
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/user/code/code.js b/锶源昆仑饮水项目/锶源昆仑-改版/pages/user/code/code.js
new file mode 100644
index 0000000..d5eb3f4
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/pages/user/code/code.js
@@ -0,0 +1,250 @@
+ /*
+ * 手太欠
+ * 愿这世界都如故事里一样 美好而动人~
+ */
+
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        shareSee    : false, //分享弹出
+        identity    : '',     //1为普通
+        userInfo    : '',   //用户信息
+        inviteText  : '',     //邀请码
+        inviteCode  : '',    //二维码
+
+        //海报
+        posterDatas: {
+            width       : 375, //画布宽度
+            height      : 800, //画布高度
+            // 缓冲区，无需手动设定
+            pic         : null,
+            buttonType  : 1,
+            show        : false, // 显示隐藏海报弹窗
+            success     : false, // 是否成功生成过海报
+            canvas      : null, // 画布的节点
+            ctx         : null, // 画布的上下文
+            dpr         : 1, // 设备的像素比
+        },
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+        //生成海报初始化
+        var that = this;
+        var posterDatas = that.data.posterDatas
+        const query = wx.createSelectorQuery()
+        query.select('#firstCanvas').fields({
+            node: true,
+            size: true
+        },
+        function (res) {
+            const canvas = res.node
+            const ctx = canvas.getContext('2d')
+            const dpr = wx.getSystemInfoSync().pixelRatio
+            canvas.width = posterDatas.width * dpr
+            canvas.height = posterDatas.height * dpr
+            ctx.scale(dpr, dpr)
+            posterDatas.canvas = canvas
+            posterDatas.ctx = ctx
+            posterDatas.dpr = dpr
+            //存储
+            that.setData({
+                posterDatas
+            })
+        }).exec()
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+        // 获取推广码
+        this.inviteInfo();
+
+        // 小程序码
+        this.ShareInfo();
+    },
+
+    /**
+     * 推广码
+     */
+    inviteInfo() {
+        wx.$api.user.invite().then(res => {
+            this.setData({
+                identity    : res.data.code,
+                userInfo    : res.data.user_info,
+                inviteText  : res.data.invite
+            })
+        }).catch(err => {})
+    },
+
+    /**
+     * 小程序码
+     */
+    ShareInfo() {
+        wx.$api.user.miniShare({
+            url: '/pages/login/index'
+        }).then(res => {
+            this.setData({
+                inviteCode: res.data.qrcode
+            })
+        }).catch(err => {})
+    },
+
+    //海报生成  //画布 生成 海报[海报]
+    saveImg () {
+        var that = this;
+        var posterDatas = that.data.posterDatas
+        var canvas = posterDatas.canvas
+        var ctx = posterDatas.ctx
+        wx.showLoading({
+            title: '海报生成中',
+            mask: true
+        });
+
+        //二维码
+        var codeImg = new Promise(function (resolve, reject) {
+            const photo = canvas.createImage();
+            photo.src = that.data.inviteCode;
+            photo.onload = (e) => {
+                resolve(photo);
+            }
+        });
+
+        //背景素材
+        var backImg = new Promise(function (resolve, reject) {
+            const photo = canvas.createImage();
+            photo.src = "https://api.siyuankunlun.cn/storage/images/2023/03/14/7777441f7a2b25353f2d6de61452418c.png";
+            photo.onload = (e) => {
+                resolve(photo);
+            }
+        });
+        Promise.all([codeImg, backImg]).then(res => {
+             
+            //  绘制背景
+            ctx.drawImage(res[1], 0, 0, posterDatas.width, posterDatas.height);
+
+            // 绘制[二维码-白色背景]
+            ctx.fillStyle = "#ffffff";
+            ctx.fillRect(200, 540, 120, 120);
+
+            // 绘制[二维码-白色背景黑框]
+            ctx.strokeStyle = "black";
+            ctx.strokeRect(199, 539, 122, 122);
+
+            // 绘制[二维码]
+            ctx.drawImage(res[0], 210, 550, 100, 100);
+
+            // 文字
+            ctx.font = "bold 14px Arial"; //字体大小
+            ctx.fillStyle = "#000"; //字体颜色
+            ctx.textAlign = "center"
+            ctx.fillText('扫描二维码了解更多', 260, 690);
+
+            // 关闭loading
+            wx.hideLoading();
+            //显示海报
+            posterDatas.success = true;
+
+            that.setData({
+                posterDatas
+            })
+
+            this.onDownloadImges();
+
+        }).catch(err=>{})
+    },
+    
+    //下载图片[海报]
+    onDownloadImges () {
+        wx.showLoading({
+            title: '保存中',
+            mask: true
+        });
+        var that = this;
+        var posterDatas = that.data.posterDatas;
+        if (!posterDatas.pic) {
+            that.onCanvasBuildImges();
+            return;
+        }
+        //可写成函数调用 这里不做解释
+        wx.saveImageToPhotosAlbum({
+            filePath: posterDatas.pic,
+            success(res) {
+                wx.hideLoading();
+                wx.showToast({
+                    icon: 'none',
+                    title: '已保存到相册，快去分享吧',
+                })
+                that.setData({
+                    posterDatas,
+                    shareSee: !that.data.shareSee
+                })
+            },
+            fail() {
+                wx.hideLoading();
+                wx.showToast({
+                    icon: 'none',
+                    title: '进入设置页，开启“保存到相册”',
+                })
+                that.setData({
+                    posterDatas
+                })
+                return;
+            }
+        })
+    },
+
+    //画布 转 图片[海报]
+    onCanvasBuildImges () {
+        var that = this;
+        var posterDatas = that.data.posterDatas;
+        wx.canvasToTempFilePath({
+            canvas: posterDatas.canvas,
+            width: posterDatas.width,
+            height: posterDatas.height,
+            destWidth: posterDatas.width * 3,
+            destHeight: posterDatas.height * 3,
+            success: res=> {
+                posterDatas["pic"] = res.tempFilePath;
+                that.setData({
+                posterDatas
+                })
+                that.onDownloadImges();
+            },
+            fail() {
+                wx.hideLoading();
+                wx.showToast({
+                    icon: 'none',
+                    title: 'sorry 保存失败,请稍后再试.',
+                })
+                return;
+            }
+        });
+    },
+
+    /**
+     * 分享弹出
+     */
+    shareTap() {
+        this.setData({
+            shareSee: !this.data.shareSee
+        })
+    },
+
+    /**
+	 * 微信分享
+	 */
+	onShareAppMessage(){
+		return {
+			title	: this.data.userInfo.nickname + '邀请您了解锶源昆仑',
+            path	: "/pages/index/index?invite=" + this.data.userInfo.inviteText,
+			imageUrl: "http://cdn.siyuankunlun.com/materials/2022/09/14/code.jpg"
+		}
+    }
+})
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/user/code/code.json b/锶源昆仑饮水项目/锶源昆仑-改版/pages/user/code/code.json
new file mode 100644
index 0000000..2392939
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/pages/user/code/code.json
@@ -0,0 +1,4 @@
+{
+    "usingComponents": {},
+    "navigationBarTitleText": "邀请码"
+}
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/user/code/code.wxml b/锶源昆仑饮水项目/锶源昆仑-改版/pages/user/code/code.wxml
new file mode 100644
index 0000000..fcc691e
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/pages/user/code/code.wxml
@@ -0,0 +1,32 @@
+<view class="code">
+    <image src="https://api.siyuankunlun.cn/storage/images/2023/03/14/7777441f7a2b25353f2d6de61452418c.png" class="code-back"></image>
+    <view class="code-cont">
+        <view class="code-img">
+            <image src="{{inviteCode}}" mode="widthFix"></image>
+        </view>
+        <view class="code-text"><text>扫描二维码了解更多</text></view>
+    </view>
+    <view class="code-share" bindtap="shareTap">
+        <image src="/static/icons/share.png"></image>
+        <view class="code-share-name">分享</view>
+    </view>
+</view>
+
+<!-- 海报canvas -->
+<!-- <canvas class="canvasImg" canvas-id="qrcodeCard"></canvas> -->
+<canvas type="2d" id="firstCanvas" class="canvasImg" style="width:{{posterDatas.width}}px;height:{{posterDatas.height}}px;"></canvas>
+
+<!-- 分享弹出 -->
+<view class="sharePop {{shareSee ? 'active' : ''}}">
+    <view class="shareCont">
+        <button class="shareCont-label codeShare-button" open-type="share" hover-class="none">
+            <image src="https://card.ysd-bs.com/storage/materials/2021/09/01/code_icon_00.png"></image>
+            微信好友
+        </button>
+        <view class="shareCont-label" bindtap="saveImg">
+            <image src="https://card.ysd-bs.com/storage/materials/2021/09/01/code_icon_02.png"></image>
+            保存二维码
+        </view>
+    </view>
+    <view class="shareCancel" bindtap="shareTap">取消</view>
+</view>
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/user/code/code.wxss b/锶源昆仑饮水项目/锶源昆仑-改版/pages/user/code/code.wxss
new file mode 100644
index 0000000..e617fb2
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/pages/user/code/code.wxss
@@ -0,0 +1,164 @@
+.code {
+    width: 100vw;
+    height: 100vh;
+    position: relative;
+}
+
+.code-back {
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+}
+
+.code-cont {
+    width: 450rpx;
+    position: absolute;
+    z-index: 9;
+    text-align: center;
+    right: 0;
+    bottom: 13%;
+}
+
+.code-img{
+    margin: 0 auto 20rpx;
+    overflow: hidden;
+    width: 220rpx;
+    height: 220rpx;
+    border: 4rpx solid #000;
+    background-color: #ffffff;
+    padding: 10rpx;
+    box-sizing: border-box;
+}
+
+.code-img image {
+    width: 100%;
+}
+
+.code-text {
+    color: #000;
+    font-size: 26rpx;
+    font-weight: 600;
+}
+
+.code-share {
+    position: absolute;
+    z-index: 10;
+    right: 0;
+    bottom: 40%;
+    background: linear-gradient(to right, #3f7fff, #568fff);
+    width: 50rpx;
+    text-align: center;
+    border-radius: 26rpx 0 0 26rpx;
+    padding: 24rpx 4rpx 24rpx 10rpx;
+    box-shadow: 0 0 6rpx 6rpx rgba(0, 0, 0, .2);
+}
+
+.code-share-name {
+    writing-mode:vertical-rl;
+    font-size: 28rpx;
+    padding-left: 4rpx;
+    color: #fff;
+}
+
+.code-share image {
+    width: 30rpx;
+    height: 30rpx;
+    margin-bottom: 5rpx;
+}
+
+.sharePop {
+    position: fixed;
+    width: 100%;
+    z-index: 99;
+    left: 0;
+    bottom: 0;
+    background-color: #0a1930;
+    display: none;
+}
+
+.sharePop.active {
+    display: block;
+}
+
+.shareCont-label image {
+    width: 60rpx;
+    height: 60rpx;
+    display: block;
+    margin: 0 auto 10rpx;
+}
+
+.shareCancel {
+    border-top: 2rpx solid #0e2c58;
+    color: #ffffff;
+    width: 100%;
+    text-align: center;
+    line-height: 100rpx;
+}
+
+.shareCont{
+    display: flex;
+    padding: 30rpx 0;
+}
+
+.shareCont-label {
+    color: #ffffff;
+    flex: 2;
+    text-align: center;
+    font-size: 28rpx;
+}
+
+.codeShare-button {
+    background-color: transparent;
+    padding: 0;
+    font-weight: normal;
+}
+
+/* canvas */
+.canvasImg {
+    position: absolute;
+    left: -1000%;
+    height: 800px;
+    width: 375px;
+}
+
+/* 何院士样式 */
+.newCode-cont {
+    width: 70%;
+    height: 200rpx;
+    position: absolute;
+    z-index: 9;
+    text-align: center;
+    left: 15%;
+    bottom: 19.5%;
+    background: linear-gradient(to top, #a09084, #a58367);
+    padding: 15rpx;
+    box-sizing: border-box;
+    border-radius: 30rpx;
+}
+
+.newCode-img {
+    height: 170rpx;
+    margin: 0 auto;
+    background: linear-gradient(to top, #e9d1bd, #c49b7a);
+    border: 4rpx solid #f3c49d;
+    border-radius: 30rpx;
+    display: flex;
+    padding: 10rpx 30rpx 10rpx 10rpx;
+    box-sizing: border-box;
+}
+
+.newCode-img-title {
+    width: calc(100% - 140rpx);
+}
+
+.newCode-img-title image {
+    width: 80%;
+    margin-top: 15rpx;
+}
+
+.newCode-img-code {
+    width: 140rpx;
+    height: 140rpx;
+}
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/user/collect/collect.js b/锶源昆仑饮水项目/锶源昆仑-改版/pages/user/collect/collect.js
new file mode 100644
index 0000000..3d708d8
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/pages/user/collect/collect.js
@@ -0,0 +1,88 @@
+ /*
+ * 手太欠
+ * 愿这世界都如故事里一样 美好而动人~
+ */
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        categories  : '',       //分类
+        articlesArr : [] ,      //列表
+        page        : {},      //分页信息
+        listType    : 1,      //类型
+        name        : '',      //名称
+        lodingStats : false,  //加载状态
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+        // 获取列表
+        this.articlesInfo();
+    },
+
+    // 列表
+    articlesInfo(page){
+        wx.$api.user.favorites({
+            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.favorites.data)
+            this.setData({
+                categories  : res.data.categories,
+                articlesArr : newData,
+                page        : res.data.favorites.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);
+        }
+    }
+})
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/user/collect/collect.json b/锶源昆仑饮水项目/锶源昆仑-改版/pages/user/collect/collect.json
new file mode 100644
index 0000000..32e11d1
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/pages/user/collect/collect.json
@@ -0,0 +1,4 @@
+{
+    "usingComponents": {},
+    "navigationBarTitleText": "我的收藏"
+}
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/user/collect/collect.wxml b/锶源昆仑饮水项目/锶源昆仑-改版/pages/user/collect/collect.wxml
new file mode 100644
index 0000000..39995a8
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/pages/user/collect/collect.wxml
@@ -0,0 +1,31 @@
+<view class="header">
+    <view class="tabs">
+        <view wx:for="{{categories}}" wx:key="categories" class="tabs-item {{listType == item.category_id ? 'show' : ''}}" bindtap="onTabs" data-type="{{item.category_id}}">{{item.title}}</view>
+    </view>
+</view>
+
+<view class="list" wx:if="{{articlesArr.length > 0}}">
+    <navigator hover-class="none" url="/pages/article/info/info?id={{item.favoriteable.article_id}}&type={{name}}" class="item" wx:for="{{articlesArr}}" wx:key="articlesArr">
+        <view class="itemCont">
+            <view class="nowrap itemCont-name"><text>{{item.favoriteable.categories[0].slug}}</text> | {{item.favoriteable.title}}</view>
+            <view class="nowrap itemCont-text">{{item.favoriteable.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.favoriteable.clicks}}</view>
+                <view class="itemCont-icon"><image src="http://cdn.siyuankunlun.com/materials/2022/10/11/articleIcon_01.png"></image>{{item.favoriteable.subscribes}}</view>
+            </view>
+        </view>
+        <image class="itemImg" mode="aspectFill" src="{{item.favoriteable.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/text_null.png"></image>
+    <view>暂无数据</view>
+</view>
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/user/collect/collect.wxss b/锶源昆仑饮水项目/锶源昆仑-改版/pages/user/collect/collect.wxss
new file mode 100644
index 0000000..95ffcf7
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/pages/user/collect/collect.wxss
@@ -0,0 +1,99 @@
+page {
+    padding: 30rpx;
+    box-sizing: border-box;
+    background-color: #f6f6f6;
+}
+
+
+/* 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;
+}
+
+.tabs-item {
+    height: 60rpx;
+    line-height: 60rpx;
+}
+
+.tabs-item.show {
+    color: #1d37e2;
+    border-bottom: solid 4rpx #1d37e2;
+}
+
+.list {
+    margin-top: 90rpx;
+}
+
+.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;
+}
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/user/index.js b/锶源昆仑饮水项目/锶源昆仑-改版/pages/user/index.js
new file mode 100644
index 0000000..6eff4ea
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/pages/user/index.js
@@ -0,0 +1,269 @@
+ /*
+ * 手太欠
+ * 愿这世界都如故事里一样 美好而动人~
+ */
+
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        userData        : '',   //用户信息
+        identity        : '',   //用户身份
+        identityShow    : '',
+        userLogin       : '',   //登录状态
+        avatar          : '',   //头像
+        nickName        : '',   //昵称
+        sign            : '',   //喝水打卡
+        nowStatus       : '',   //判断状态
+        identityData    : '',   //会员身份信息
+        caseOrder       : '',   //订单
+        account         : '',  //账户
+        count           : '',  //数值
+        nameState       : false,
+        memberType      : false,
+        serviceMobile   : '',
+        waterMobile     : '',
+        inviteCount     : '',   //激活码
+        waterState      : false, //水滴状态
+        barHeight       : getApp().globalData.statusBarHeight, // 状态栏高度
+        jiaonangheight  : getApp().globalData.jiaonangheight, //胶囊高度
+        listType        : '1', //任务类型
+        rightShow       : false, //右侧菜单
+        taskSort        : [],   //任务分类
+        taskArr         : []   //任务列表
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {},
+
+    onKf(){
+        wx.openCustomerServiceChat({
+            extInfo: {
+                url: "https://work.weixin.qq.com/kfid/kfc4a885307836763a9"
+            },
+            corpId: "wwf556e3ad41f44c3a",
+            success: res => {},
+            fail: err => {
+                console.log(err)
+            }
+        })
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+        // 获取登录状态
+        if(wx.getStorageSync("token")){
+            this.setData({
+                userLogin: true
+            })
+
+            // 获取用户信息
+            this.userInfo();
+        }
+
+        // 获取任务列表
+        this.taskEntry();
+
+        // 获取任务分类
+        this.taskInfo();
+    },
+
+    /**
+     * 用户信息
+     */
+    userInfo() {
+        wx.$api.user.home().then(res => {
+            this.setData({
+                userData        : res.data,
+                account         : res.data.account,
+                avatar          : res.data.avatar,
+                nickName        : res.data.nickname,
+                identity        : res.data.identity,
+                identityShow    : res.data.identityShow,
+                caseOrder       : res.data.case,
+                inviteCount     : res.data.invite_count || ''
+            })
+        }).catch(err => {})
+    },
+
+    /**
+     * 任务分类
+     */
+    taskInfo() {
+        wx.$api.user.taskIndex().then(res => {
+            this.setData({
+                taskSort : res.data
+            })
+        }).catch(err => {})
+    },
+
+    /**
+     * 任务列表
+     */
+    taskEntry() {
+        wx.$api.user.taskList({
+            category_id: this.data.listType
+        }).then(res => {
+            this.setData({
+                taskArr : res.data
+            })
+        }).catch(err => {})
+    },
+
+    /**
+     * 头像上传
+     */
+    updImg(){
+        wx.chooseMedia({
+            count	: 1, 
+            success	: path => {
+                // 上传图片
+                wx.$api.file.uploadImg(path.tempFiles[0].tempFilePath, {}).then(res=>{
+                    this.setData({
+                        avatar:res.url
+                    })
+                    this.settingInfo('avatar', res.path)
+                })
+            }
+        })
+    },
+
+    /**
+     * 上传用户信息
+     */
+    settingInfo(key, value) {
+        wx.$api.user.setting(key, {
+            value: value
+        }).then(() => {
+            this.nameState = false
+        }).catch(err => {})
+    },
+
+    /**
+     * 流程判断
+     */
+    judge() {
+        if(wx.getStorageSync("token")){
+            // 开通会员
+            wx.switchTab({
+                url: '/pages/member/index'
+            })
+        }else {
+            // 去登录
+            wx.navigateTo({
+                url: "/pages/login/index"
+            })
+        }
+    },
+
+    /**
+     * 处理未登录时的转跳
+     */
+    userNav(e){
+        let pageUrl = e.currentTarget.dataset.url
+        if(wx.getStorageSync("token")){
+            wx.navigateTo({
+                url: pageUrl
+            })
+        }else{
+            // 去登录
+            wx.navigateTo({
+                url: "/pages/login/index"
+            })
+        }
+        this.setData({
+            rightShow: false
+        })
+    },
+
+    /**
+     * 退出登录
+     */
+    outLogin() {
+        // 清理客户端登录缓存
+        wx.removeStorageSync("token")
+        this.setData({
+            rightShow: false
+        })
+        this.setData({
+            userLogin: false
+        })
+
+        // 清理客户端登录缓存
+        wx.removeStorageSync("inviteData")
+    },
+
+    /**
+     * 选择任务类型
+     */
+    onTabs(e) {
+        this.setData({
+            listType: e.currentTarget.dataset.type
+        })
+        
+        // 获取任务列表
+        this.taskEntry();
+    },
+
+    /**
+     * 显示右侧导航内容
+     */
+    rightBind() {
+        this.setData({
+            rightShow: !this.data.rightShow
+        })
+    },
+
+    /**
+     * 敬请期待
+     */
+    await() {
+        wx.showToast({
+            title   : '开发中，敬请期待',
+            icon    : 'none',
+            duration: 2000
+        })
+    },
+
+    // 任务分类跳转
+    JumpUrl(open) {
+        let newState = open.currentTarget.dataset.state,
+            newKey   = open.currentTarget.dataset.key
+        if(newState == 1) return
+        if(newKey == 'steps'){
+            // 获取微信运动
+            this.getWeRun()
+            return
+        }
+        if(wx.getStorageSync("token")){
+            let newUrl   = open.currentTarget.dataset.url,
+                newType  = open.currentTarget.dataset.type
+            switch(newType){
+                case 'switchTab': 
+                    wx.switchTab({
+                        url: newUrl
+                    })
+                    break; 
+                case 'web':
+                    // 跳转web
+                    break;
+                case 'mini':
+                    wx.navigateTo({
+                        url: newUrl
+                    })
+                    break;
+            }
+        } else{
+            // 去登录
+            wx.navigateTo({
+                url: "/pages/login/index"
+            })
+        }
+    },
+})
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/user/index.json b/锶源昆仑饮水项目/锶源昆仑-改版/pages/user/index.json
new file mode 100644
index 0000000..9780afd
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/pages/user/index.json
@@ -0,0 +1,5 @@
+{
+    "usingComponents": {},
+    "navigationStyle": "custom",
+    "navigationBarTextStyle": "black"
+}
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/user/index.wxml b/锶源昆仑饮水项目/锶源昆仑-改版/pages/user/index.wxml
new file mode 100644
index 0000000..dac13e7
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/pages/user/index.wxml
@@ -0,0 +1,220 @@
+<view class="Usetop">
+    <image class="Usetop-back" mode="aspectFill" src="http://cdn.siyuankunlun.com/materials/2022/10/14/uaer_back.jpg"></image>
+    <view class="Usetop-range" style="padding-top:{{barHeight + jiaonangheight}}px;">
+        <view class="Usetop-cont" wx:if="{{userLogin}}">
+            <view class="Usetop-head {{identity.order == '1' ? 'active' : ''}}">
+                <image class="Usetop-head-avatar" bindtap="updImg" src="{{avatar ? avatar : '../../static/imgs/default_myHead.png'}}" mode="aspectFill"></image>
+                <image wx:if="{{identity.order == '1'}}" class="Usetop-head-ancrown" src="http://api.siyuankunlun.com/materials/2022/09/19/ancrown_pt.png" mode=""></image>
+                <image wx:else class="Usetop-head-ancrown" src="http://api.siyuankunlun.com/materials/2022/09/14/ancrown.png" mode=""></image>
+            </view>
+            <view class="Usetop-text">
+                {{nickName}}
+                <image wx:if="{{identity.order == '1'}}" src="/static/icons/member_01.png" mode="widthFix"></image>
+                <image wx:elif="{{identity.order == '2'}}" src="/static/icons/member_02.png" mode="widthFix"></image>
+                <image wx:elif="{{identity.order == '3'}}" src="/static/icons/member_03.png" mode="widthFix"></image>
+                <image wx:elif="{{identity.order == '4'}}" src="/static/icons/member_04.png" mode="widthFix"></image>
+                <image wx:elif="{{identity.order == '5'}}" src="/static/icons/member_05.png" mode="widthFix"></image>
+                <image wx:else src="/static/icons/member_06.png" mode="widthFix"></image>
+            </view>
+        </view>
+        <view class="Usetop-cont" wx:else>
+            <view class="Usetop-head active">
+                <image class="Usetop-head-avatar" bindtap="updImg" src="../../static/imgs/default_myHead.png" mode="aspectFill"></image>
+            </view>
+            <navigator hover-class="none" url="../login/index" class="Usetop-text">
+                请先登录
+            </navigator>
+        </view>
+    </view>
+    <view class="Usetop-see">
+        <view bindtap="userNav" data-url="/pages/water/index" class="Usetop-see-label">
+            <image class="Usetop-see-icon" src="http://cdn.siyuankunlun.com/materials/2022/10/14/userSee_01.png"></image>
+            <view class="nowrap Usetop-see-name">
+                水滴
+                <text>{{account.score.surplus ? account.score.surplus : '0'}}</text>
+            </view>
+        </view>
+        <view bindtap="userNav" data-url="/pages/coupons/organize/index" class="Usetop-see-label">
+            <image class="Usetop-see-icon" src="http://cdn.siyuankunlun.com/materials/2022/10/14/userSee_02.png"></image>
+            <view class="Usetop-see-name">
+                券
+                <text>{{count.coupon ? count.coupon : '0'}}</text>
+            </view>
+        </view>
+        <view bindtap="userNav" data-url="/pages/account/index/index" class="Usetop-see-label">
+            <image class="Usetop-see-icon" src="http://cdn.siyuankunlun.com/materials/2022/10/14/userSee_03.png"></image>
+            <view class="Usetop-see-name">
+                余额
+                <text>{{account.balance ? account.balance : '0'}}</text>
+            </view>
+        </view>
+    </view>
+</view>
+
+<view class="matter">
+    <view class="matter-text matter-left">
+        <view class="matter-text-label">
+            PH 7.8
+        </view>
+        <view class="matter-text-label">
+            锶≥3<text>(mg/L)</text>
+        </view>
+        <view class="matter-text-label">
+            镁≥100<text>(mg/L)</text>
+        </view>
+    </view>
+    <image class="matter-center" mode="widthFix" src="http://cdn.siyuankunlun.com/materials/2022/10/14/userGif.gif"></image>
+    <view class="matter-text matter-right">
+        <view class="matter-text-label">
+            钙≥200<text>(mg/L)</text>
+        </view>
+        <view class="matter-text-label">
+            钾≥18<text>(mg/L)</text>
+        </view>
+        <view class="matter-text-label">
+            钠≥100<text>(mg/L)</text>
+        </view>
+    </view>
+</view>
+
+<!-- 会员 -->
+<view class="member" catchtap="judge" style="display: none;">
+    <image class="member-image" src="/static/imgs/member.png" mode="aspectFill"></image>
+    <view class="member-text">
+        <view class="member-text-top">
+            <image class="member-text-top-icon" mode="widthFix" src="/static/ls/memberIcon.png"></image>
+            <image class="member-text-top-title" mode="widthFix" src="/static/ls/memberTitle.png"></image>
+        </view>
+        <view class="member-text-tips">
+            <view class="member-text-name" wx:if="{{userLogin}}">
+                {{identity.id == '1' ? '开通锶享会员' : identity.name}}
+            </view>
+            <view class="member-text-name" wx:else>
+                开通锶享会员
+            </view>
+            <view class="member-text-more">
+                <text wx:if="{{!userLogin}}">立即登录</text>
+                <text wx:elif="{{identity.id == '1'}}">立即开通</text>
+                <text wx:else>查看权益</text>
+                <image src="/static/ls/memberArrow.png" mode="widthFix"></image>
+            </view>
+            <view class="member-text-time" wx:if="{{userLogin}}">
+                <block wx:if="{{identity.id != '1'}}">
+                    <text>{{identityShow.times.serial}}</text>
+                    有效期： {{identityShow.times.ended_at}}
+                </block>
+            </view>
+        </view>
+    </view>
+</view>
+
+<!-- 入口 -->
+<view class="entry">
+    <view bindtap="userNav" data-url="./collect/collect" class="entry-label entry-collect">
+        <image class="entry-label-img" mode="aspectFill" src="http://cdn.siyuankunlun.com/materials/2022/10/14/entryBack_01.jpg"></image>
+        <view class="entry-label-title">
+            <view class="entry-label-english">collect</view>
+            <text>探索 收藏</text>
+            <view class="entry-label-more">
+                查看收藏<image src="http://cdn.siyuankunlun.com/materials/2022/10/14/entryArr.png" mode="widthFix"></image>
+            </view>
+        </view>
+    </view>
+    <!-- <view bindtap="await" class="entry-label entry-goods"> -->
+    <navigator hover-class="none" url="/pages/mall/goods/index" class="entry-label entry-goods">
+        <image class="entry-label-img" mode="aspectFill" src="http://cdn.siyuankunlun.com/materials/2022/10/14/entryBack_02.jpg"></image>
+        <view class="entry-label-title">
+            <text>产品中心</text>
+            <image class="entry-goods-icon" src="http://cdn.siyuankunlun.com/materials/2022/10/14/entryName.png" mode="widthFix"></image>
+        </view>
+        <image class="entry-goods-img" src="http://cdn.siyuankunlun.com/materials/2022/10/14/entryImg.png" mode="widthFix"></image>
+    </navigator>
+</view>
+
+<!-- 每日任务 -->
+<view class="task">
+    <view class="taskCont">
+        <view class="taskCont-tab">
+            <text>水滴任务</text>
+        </view>
+        <!-- <view class="taskCont-tab">
+            <view class="taskCont-tab-label {{listType == item.category_id ? 'active' : ''}}" bindtap="onTabs" data-type="{{item.category_id}}" wx:for="{{taskSort}}" wx:key="taskSort"><text>{{item.title}}</text></view>
+        </view> -->
+
+        <!-- 健康任务 -->
+        <view class="taskCont-list">
+            <!-- await 敬请期待 -->
+            <block wx:if="{{taskArr.length > 0}}">
+                <view class="taskCont-item" bindtap="JumpUrl" wx:for="{{taskArr}}" wx:key="taskArr" data-url="{{item.linker.path}}" data-type="{{item.linker.openType}}" data-state="{{item.user.finish}}" data-key="{{item.key}}">
+                    <view class="taskCont-item-icon">
+                        <image src="{{item.ico}}"></image>
+                    </view>
+                    <view class="taskCont-item-text">
+                        <view class="taskCont-item-title">{{item.title}}</view>
+                        <view class="taskCont-item-tips"><text>+</text>{{item.tips}}</view>
+                    </view>
+                    <view class="taskCont-item-go">
+                        <view class="taskCont-item-number {{item.user.finish == 1 ? 'active' : ''}}">{{item.user.total}}/{{item.user.all}}</view>
+                        <image class="taskCont-item-more" src=" {{item.user.finish == 1 ? '/static/ls/taskIcon_05_active.png' : '/static/ls/taskIcon_05.png'}}"></image>
+                    </view>
+                </view>
+            </block>
+            <view class="taskCont-no" wx:else>
+                <image src="http://cdn.siyuankunlun.com/materials/2022/10/26/noContent.png"></image>
+                <text>~暂无任务~</text>
+            </view>
+        </view>
+    </view>
+</view>
+
+<!-- 右侧导航 -->
+<view class="rightBack {{rightShow ? 'active' : ''}}" bindtap="rightBind"></view>
+<view class="rightNav {{rightShow ? 'active' : ''}}">
+    <image class="rightIcon" src="/static/ls/userTap.png" mode="widthFix" bindtap="rightBind"></image>
+    <view class="rightCont" style="padding-top:{{barHeight + jiaonangheight}}px;">
+        <view class="rightCont-text">
+            <view class="rightCont-text-top">
+                <image class="rightCont-top-img" mode="widthFix" src="http://cdn.siyuankunlun.com/materials/2022/10/11/guideLogo.png"></image>
+                <view class="rightCont-top-name"><text>管理模块</text></view>
+                <view class="rightCont-top-text">用户管理模块工具</view>
+            </view>
+            <scroll-view class="rightCont-text-label" style="height: calc(100vh - {{barHeight + jiaonangheight}}px - 240rpx);" scroll-y="true">
+                <block wx:if="{{userLogin}}">
+                    <view bindtap="userNav" data-url="/pages/stock/index" class="rightCont-text-item">
+                        <image class="rightCont-text-icon" src="/static/ls/userIcon_01.png"></image>
+                        <view class="rightCont-text-name">库存量</view>
+                        <view class="rightCont-text-tips">库存量信息</view>
+                        <view class="rightCont-text-number" wx:if="{{ caseOrder.residue}}">{{ caseOrder.residue}}</view>
+                    </view>
+                    <view bindtap="userNav" data-url="./code/code" class="rightCont-text-item">
+                        <image class="rightCont-text-icon" src="/static/ls/userIcon_03.png"></image>
+                        <view class="rightCont-text-name">邀请码</view>
+                        <view class="rightCont-text-tips">邀请好友加入</view>
+                    </view>
+                </block>
+                <view bindtap="userNav" data-url="/pages/order/list/index?listType=paid" class="rightCont-text-item">
+                    <image class="rightCont-text-icon" src="/static/ls/taskIcon_12.png"></image>
+                    <view class="rightCont-text-name">我的订单</view>
+                    <view class="rightCont-text-tips">锶源昆仑纯净水</view>
+                </view>
+                <navigator hover-class="none" url="./about/about" class="rightCont-text-item">
+                    <image class="rightCont-text-icon" src="/static/ls/userIcon_09.png"></image>
+                    <view class="rightCont-text-name">锶源昆仑</view>
+                    <view class="rightCont-text-tips">锶源昆仑纯净水</view>
+                </navigator>
+
+                <view class="rightCont-text-item">
+                    <image class="rightCont-text-icon" src="/static/ls/userIcon_11.png"></image>
+                    <button class="rightCont-text-name" bindtap="onKf">锶源客服</button>
+                    <view class="rightCont-text-tips">企业微信客服</view>
+                </view>
+
+                <view class="rightCont-text-item" bindtap="outLogin" wx:if="{{userLogin}}">
+                    <image class="rightCont-text-icon" src="/static/ls/userIcon_10.png"></image>
+                    <view class="rightCont-text-name">退出登录</view>
+                    <view class="rightCont-text-tips">清空数据缓存</view>
+                </view>
+            </scroll-view>
+        </view>
+    </view>
+</view>
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/pages/user/index.wxss b/锶源昆仑饮水项目/锶源昆仑-改版/pages/user/index.wxss
new file mode 100644
index 0000000..8a67034
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/pages/user/index.wxss
@@ -0,0 +1,765 @@
+page {
+    background-color: #f8f8fa;
+}
+
+::-webkit-scrollbar {
+    display: none;
+    width: 0;
+    height: 0;
+    color: transparent;
+  }
+
+/* 头部 */
+.Usetop {
+    width: 100%;
+    position: relative;
+    padding-top: 48%;
+}
+
+.Usetop-back,
+.Usetop-range {
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+}
+
+.Usetop-back {
+    z-index: 1;
+}
+
+.Usetop-range {
+    z-index: 2;
+}
+
+.Usetop-see {
+    position: absolute;
+    left: 0;
+    width: 100%;
+    z-index: 3;
+    bottom: -30rpx;
+    display: flex;
+    padding: 0 15rpx;
+    box-sizing: border-box;
+}
+
+.Usetop-see-label {
+    flex: 3;
+    text-align: center;
+    background-color: #ffffff;
+    border-radius: 60rpx;
+    margin: 0 15rpx;
+    height: 60rpx;
+    line-height: 60rpx;
+    display: flex;
+    font-size: 26rpx;
+    padding: 0 20rpx;
+    box-sizing: border-box;
+}
+
+.Usetop-see-icon {
+    width: 26rpx;
+    height: 26rpx;
+    margin: 17rpx 10rpx 0 0;
+}
+
+.Usetop-see-name {
+    color: #404145;
+}
+
+.Usetop-see-name text {
+    font-size: 600;
+    color: #6c79fb;
+}
+
+.Usetop-cont {
+    padding: 40rpx 0 0 50rpx;
+    box-sizing: border-box;
+    display: flex;
+}
+
+.Usetop-head {
+    width: 100rpx;
+    height: 100rpx;
+    border-radius: 50%;
+    border: 6rpx solid #ffe0a8;
+    position: relative;
+}
+
+.Usetop-head.active {
+    border-color: rgb(223, 223, 223);
+}
+
+.Usetop-head-avatar {
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    border-radius: 50%;
+}
+
+.Usetop-head-ancrown {
+    position: absolute;
+    width: 48rpx;
+    height: 48rpx;
+    right: 0;
+    top: -34rpx;
+}
+
+.Usetop-text {
+    width: calc(100% - 110rpx);
+    padding: 0 30rpx;
+    box-sizing: border-box;
+    line-height: 100rpx;
+    font-size: 34rpx;
+    padding-top: 10rpx;
+    display: flex;
+}
+
+.Usetop-text image {
+    width: 110rpx;
+    margin: 34rpx 0 0 15rpx;
+}
+
+/* 物质含量 */
+.matter {
+    padding: 50rpx 30rpx 0;
+    box-sizing: border-box;
+    display: flex;
+}
+
+.matter-center {
+    width: 42%;
+    height: auto;
+}
+
+.matter-text {
+    width: 29%;
+    font-size: 24rpx;
+    padding-top: 60rpx;
+}
+
+.matter-text-label {
+    position: relative;
+    height: 64rpx;
+    line-height: 64rpx;
+    box-sizing: border-box;
+}
+
+.matter-text-label::after {
+    position: absolute;
+    content: '';
+    top: calc(50% - 7rpx);
+    width: 14rpx;
+    height: 14rpx;
+    background-color: #6970fc;
+    border: 4rpx solid #dde0ff;
+    border-radius: 50%;
+    box-sizing: border-box;
+}
+
+.matter-text-label text {
+    font-size: 22rpx;
+    color: #ababab;
+    font-weight: 300;
+}
+
+.matter-left {
+    text-align: right;
+}
+
+.matter-left .matter-text-label {
+    padding-right: 30rpx;
+}
+
+.matter-right .matter-text-label {
+    padding-left: 30rpx;
+}
+
+.matter-left .matter-text-label::after {
+    right: 0;
+}
+
+.matter-right .matter-text-label::after {
+    left: 0;
+}
+
+/* 会员 */
+.member {
+    margin: 0 30rpx;
+    box-sizing: border-box;
+    position: relative;
+    padding-top: 28%;
+    border-radius: 10rpx;
+    overflow: hidden;
+}
+
+.member-image {
+    position: absolute;
+    left: 0;
+    top: 0;
+    overflow: hidden;
+    width: 100%;
+    height: 100%;
+}
+
+.member-text {
+    position: absolute;
+    height: 100%;
+    width: 100%;
+    left: 0;
+    top: 0;
+    z-index: 1;
+    padding: 50rpx 40rpx 0 40rpx;
+    box-sizing: border-box;
+}
+
+.member-text-time {
+    display: flex;
+    color: #6059e1;
+    margin-top: 20rpx;
+    font-size: 22rpx;
+    opacity: .7;
+}
+
+.member-text-time text {
+    flex: 1;
+}
+
+.member-text-top {
+    display: flex;
+}
+
+.member-text-top-icon {
+    width: 35rpx;
+    margin-right: 15rpx;
+}
+
+.member-text-top-title {
+    width: 160rpx;
+}
+
+.member-text-tips {
+    color: #c1bbeb;
+    font-size: 24rpx;
+    margin-top: 25rpx;
+}
+
+.member-text-name {
+    display: inline-block;
+    padding-right: 10rpx;
+}
+
+.member-text-more {
+    display: inline-block;
+}
+
+.member-text-tips text {
+    color: #6059e1;
+}
+
+.member-text-tips image {
+    width: 22rpx;
+    vertical-align: -3rpx;
+    margin-left: 10rpx;
+}
+
+
+/* 入口 */
+.entry {
+    padding: 30rpx 15rpx;
+    box-sizing: border-box;
+    display: flex;
+}
+
+.entry-label {
+    flex: 2;
+    margin: 0 15rpx;
+    background-color: #ffffff;
+    border-radius: 10rpx;
+    position: relative;
+    padding-top: 30%;
+    overflow: hidden;
+}
+
+.entry-label-img,
+.entry-label-title {
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+}
+
+.entry-label-title {
+    z-index: 9;
+    padding: 25rpx 30rpx;
+    box-sizing: border-box;
+}
+
+.entry-label-title text {
+    display: block;
+}
+
+.entry-label-english {
+    text-transform: uppercase;
+    margin-bottom: 10rpx;
+}
+
+.entry-collect .entry-label-title text {
+    font-size: 25rpx;
+}
+
+.entry-label-more {
+    font-size: 25rpx;
+    color: #999999;
+    margin-top: 30rpx;
+    font-weight: 300;
+}
+
+.entry-label-more image {
+    width: 110rpx;
+    display: block;
+    margin-top: 2rpx;
+}
+
+.entry-goods .entry-label-title {
+    color: #ffffff;
+    text-shadow: 0 0 8rpx rgba(0, 0, 0, .4);
+}
+
+.entry-goods-icon {
+    width: 100rpx;
+    margin-top: 10rpx;
+}
+
+.entry-goods-img {
+    position: absolute;
+    right: 30rpx;
+    bottom: 15rpx;
+    width: 145rpx;
+    animation: rot 3s steps(28) infinite;
+}
+
+@keyframes rot {
+    0%,
+    65% {
+        -webkit-transform: rotate(0deg);
+        transform: rotate(0deg);
+    }
+    70% {
+        -webkit-transform: rotate(4deg);
+        transform: rotate(4deg);
+    }
+    75% {
+        -webkit-transform: rotate(-4deg);
+        transform: rotate(-4deg);
+    }
+    80% {
+        -webkit-transform: rotate(4deg);
+        transform: rotate(4deg);
+    }
+    85% {
+        -webkit-transform: rotate(-4deg);
+        transform: rotate(-4deg);
+    }
+    90% {
+        -webkit-transform: rotate(4deg);
+        transform: rotate(4deg);
+    }
+    95% {
+        -webkit-transform: rotate(-4deg);
+        transform: rotate(-4deg);
+    }
+    100% {
+        -webkit-transform: rotate(0deg);
+        transform: rotate(0deg);
+    }
+}
+
+@-webkit-keyframes rot {
+    0%,
+    65% {
+        -webkit-transform: rotate(0deg);
+        transform: rotate(0deg);
+    }
+    70% {
+        -webkit-transform: rotate(4deg);
+        transform: rotate(4deg);
+    }
+    75% {
+        -webkit-transform: rotate(-4deg);
+        transform: rotate(-4deg);
+    }
+    80% {
+        -webkit-transform: rotate(4deg);
+        transform: rotate(4deg);
+    }
+    85% {
+        -webkit-transform: rotate(-4deg);
+        transform: rotate(-4deg);
+    }
+    90% {
+        -webkit-transform: rotate(4deg);
+        transform: rotate(4deg);
+    }
+    95% {
+        -webkit-transform: rotate(-4deg);
+        transform: rotate(-4deg);
+    }
+    100% {
+        -webkit-transform: rotate(0deg);
+        transform: rotate(0deg);
+    }
+}
+
+
+
+/* 每日任务 */
+.task {
+    padding: 0 30rpx 30rpx;
+    box-sizing: border-box;
+}
+
+.taskCont {
+    background-color: #ffffff;
+    border-radius: 10rpx;
+    overflow: hidden;
+    padding: 0 5rpx;
+    box-sizing: border-box;
+}
+
+.taskCont-tab {
+    display: flex;
+    font-size: 26rpx;
+    line-height: 100rpx;
+    height: 100rpx;
+    color: #585858;
+    padding-left: 30rpx;
+    font-weight: 600;
+}
+
+.taskCont-tab-label {
+    flex: 4;
+    text-align: center;
+    position: relative;
+}
+
+.taskCont-tab-label text {
+    display: inline-block;
+    position: absolute;
+    left: 0;
+    top: 0;
+    text-align: center;
+    width: 100%;
+    z-index: 9;
+}
+
+.taskCont-tab-label::after {
+    position: absolute;
+    content: '';
+    left: 15%;
+    bottom: 24rpx;
+    background-image: linear-gradient(to right,#ffffff, #ffffff);
+    width: 70%;
+    height: 16rpx;
+    border-radius: 30rpx;
+    z-index: 0;
+}
+
+.taskCont-tab-label.active::after {
+    background-image: linear-gradient(to right,#e2e4fe, #ffffff);
+}
+
+.taskCont-tab-label.active {
+    color: #000;
+    font-weight: 500;
+}
+
+.taskCont-list {
+    padding: 20rpx 0;
+}
+
+.taskCont-item {
+    display: flex;
+    margin-bottom: 50rpx;
+    width: 100%;
+}
+
+.taskCont-item:last-child {
+    margin-bottom: 20rpx;
+}
+
+.taskCont-item-icon {
+    width: 100rpx;
+    text-align: center;
+    margin-top: 5rpx;
+}
+
+.taskCont-item-icon image {
+    width: 40rpx;
+    height: 40rpx;
+}
+
+.taskCont-item-text {
+    width: calc(100% - 200rpx);
+}
+
+.taskCont-item-title {
+    font-size: 26rpx;
+}
+
+.taskCont-item-tips {
+    color: #949494;
+    font-size: 24rpx;
+    font-weight: 300;
+    margin-top: 10rpx;
+}
+
+.taskCont-item-tips text {
+    font-size: 22rpx;
+}
+
+.taskCont-item-go {
+    width: 100rpx;
+    text-align: center;
+}
+
+.taskCont-item-number {
+    font-size: 22rpx;
+    color: #afafaf;
+    margin-bottom: 10rpx;
+}
+
+.taskCont-item-number.active {
+    color: #d8d8d8;
+}
+
+.taskCont-item-more {
+    width: 34rpx;
+    height: 34rpx;
+}
+
+.taskCont-no {
+    text-align: center;
+    font-size: 25rpx;
+    color: #999;
+    padding-bottom: 30rpx;
+}
+
+.taskCont-no image {
+    width: 140rpx;
+    height: 140rpx;
+    display: block;
+    margin: 0 auto 10rpx;
+}
+
+/* 右侧导航 */
+.rightBack {
+    position: fixed;
+    top: 0;
+    right: 0;
+    width: 100vw;
+    height: 100vh;
+    z-index: 98;
+    background-color: transparent;
+    display: none;
+}
+
+.rightBack.active {
+    display: block;
+}
+
+.rightNav {
+    position: fixed;
+    top: 0;
+    right: 0;
+    width: auto;
+    height: 100%;
+    z-index: 99;
+    display: flex;
+}
+
+.rightIcon {
+    margin-top: 400rpx;
+    width: 80rpx;
+    display: block;
+    margin-right: -2rpx;
+}
+
+.rightCont {
+    background-color: #f9f9f9;
+    height: 100%;
+    box-sizing: border-box;
+    width: 0;
+    transition: .4s;
+}
+
+.rightNav.active .rightCont {
+    width: auto;
+}
+
+.rightCont-text {
+    padding: 30rpx 20rpx 0;
+    box-sizing: border-box;
+}
+
+.rightCont-text-item {
+    background-color: #ffffff;
+    border-radius: 10rpx;
+    margin-bottom: 30rpx;
+    padding: 20rpx;
+    box-sizing: border-box;
+    text-align: center;
+    position: relative;
+}
+
+.rightCont-text-number {
+    font-size: 20rpx;
+    right: 15rpx;
+    top: 15rpx;
+    background-color: #6c79fb;
+    color: #fff;
+    display: inline-block;
+    position: absolute;
+    border-radius: 50rpx;
+    padding: 0 10rpx;
+    transform: scale(.9);
+    height: 30rpx;
+    line-height: 30rpx;
+}
+
+.rightCont-text-name {
+    font-size: 26rpx;
+    background-color: transparent;
+    width: auto !important;
+    margin-bottom: 5rpx;
+    font-weight: normal;
+    padding: 0;
+}
+
+.rightCont-text-tips {
+    font-size: 22rpx;
+    color: #6f6f6f;
+}
+
+.rightCont-text-icon {
+    width: 38rpx;
+    height: 38rpx;
+}
+
+.rightCont-text-top {
+    text-align: right;
+    margin-bottom: 30rpx;
+    height: 160rpx;
+}
+
+.rightCont-top-img {
+    width: 120rpx;
+}
+
+.rightCont-top-name {
+    color: #d5a56d;
+    font-size: 28rpx;
+    height: 44rpx;
+    position: relative;
+    margin-bottom: 5rpx;
+}
+.rightCont-top-name::after {
+    position: absolute;
+    content: '';
+    right: 0;
+    bottom: 6rpx;
+    background-image: linear-gradient(to right,#f5d1a9, #ffffff);
+    width: 120rpx;
+    height: 14rpx;
+    border-radius: 30rpx;
+    z-index: 0;
+    display: none;
+}
+
+.rightNav.active .rightCont-top-name::after {
+    display: block;
+}
+
+.rightCont-top-name text {
+    display: inline-block;
+    position: absolute;
+    right: 0;
+    top: 0;
+    width: 100%;
+    z-index: 99;
+}
+
+.rightCont-top-text {
+    font-size: 22rpx;
+    color: #9f8b73;
+}
+
+/* 弹出层提示 */
+.publicBack {
+    position: fixed;
+    width: 100vw;
+    height: 100vh;
+    left: 0;
+    top: 0;
+    background-color: rgba(0, 0, 0, .5);
+    z-index: 99;
+}
+
+.publicPop {
+    left: 50%;
+    top: 50%;
+    width: 240px;
+    margin-left: -120px;
+    margin-top: -340rpx;
+    position: fixed;
+    z-index: 100;
+}
+
+.publicPop-cont {
+    height: 540rpx;
+    background-color: #FFFFFF;
+    border-radius: 30rpx;
+    padding: 30rpx;
+    box-sizing: border-box;
+    text-align: center;
+}
+
+.publicPop-img {
+    width: 70%;
+}
+
+.publicPop-text {
+    color: #9d9d9d;
+    font-size: 32rpx;
+    text-align: center;
+}
+
+.publicPop-text text {
+    color: #000000;
+    font-size: 40rpx;
+    display: block;
+    font-weight: 600;
+    margin: 20rpx 0 10rpx;
+}
+
+.publicPop-btn {
+    background-color: #1d37e2;
+    border-radius: 10rpx;
+    text-align: center;
+    line-height: 78rpx;
+    color: #FFFFFF;
+    margin-top: 30rpx;
+    font-size: 32rpx;
+}
+
+.publicPop-close {
+    text-align: center;
+    margin-top: 22rpx;
+}
+
+.publicPop-close image {
+    width: 58rpx;
+    height: 58rpx;
+}
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/project.config.json b/锶源昆仑饮水项目/锶源昆仑-改版/project.config.json
new file mode 100644
index 0000000..2497210
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/project.config.json
@@ -0,0 +1,51 @@
+{
+    "description": "项目配置文件",
+    "packOptions": {
+        "ignore": [],
+        "include": []
+    },
+    "setting": {
+        "bundle": false,
+        "userConfirmedBundleSwitch": false,
+        "urlCheck": true,
+        "scopeDataCheck": false,
+        "coverView": true,
+        "es6": true,
+        "postcss": true,
+        "compileHotReLoad": false,
+        "lazyloadPlaceholderEnable": false,
+        "preloadBackgroundData": false,
+        "minified": true,
+        "autoAudits": false,
+        "newFeature": false,
+        "uglifyFileName": false,
+        "uploadWithSourceMap": true,
+        "useIsolateContext": true,
+        "nodeModules": false,
+        "enhance": true,
+        "useMultiFrameRuntime": true,
+        "useApiHook": true,
+        "useApiHostProcess": true,
+        "showShadowRootInWxmlPanel": true,
+        "packNpmManually": false,
+        "enableEngineNative": false,
+        "packNpmRelationList": [],
+        "minifyWXSS": true,
+        "showES6CompileOption": false,
+        "minifyWXML": true,
+        "babelSetting": {
+            "ignore": [],
+            "disablePlugins": [],
+            "outputPath": ""
+        }
+    },
+    "compileType": "miniprogram",
+    "libVersion": "2.17.0",
+    "appid": "wxecf8786d25af47b3",
+    "projectname": "miniprogram-92",
+    "condition": {},
+    "editorSetting": {
+        "tabIndent": "insertSpaces",
+        "tabSize": 4
+    }
+}
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/project.private.config.json b/锶源昆仑饮水项目/锶源昆仑-改版/project.private.config.json
new file mode 100644
index 0000000..7be3bb0
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/project.private.config.json
@@ -0,0 +1,35 @@
+{
+    "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
+    "projectname": "%E9%94%B6%E6%BA%90%E6%98%86%E4%BB%91",
+    "setting": {
+        "compileHotReLoad": true,
+        "urlCheck": true
+    },
+    "condition": {
+        "miniprogram": {
+            "list": [
+                {
+                    "name": "",
+                    "pathName": "pages/member/index",
+                    "query": "",
+                    "launchMode": "default",
+                    "scene": null
+                },
+                {
+                    "name": "",
+                    "pathName": "pages/member/examine/examine",
+                    "query": "",
+                    "launchMode": "default",
+                    "scene": null
+                },
+                {
+                    "name": "",
+                    "pathName": "pages/login/index",
+                    "query": "",
+                    "launchMode": "default",
+                    "scene": null
+                }
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/sitemap.json b/锶源昆仑饮水项目/锶源昆仑-改版/sitemap.json
new file mode 100644
index 0000000..ca02add
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/sitemap.json
@@ -0,0 +1,7 @@
+{
+  "desc": "关于本文件的更多信息，请参考文档 https://developers.weixin.qq.com/miniprogram/dev/framework/sitemap.html",
+  "rules": [{
+  "action": "allow",
+  "page": "*"
+  }]
+}
\ No newline at end of file
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/address_01.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/address_01.png
new file mode 100644
index 0000000..18bbec0
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/address_01.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/address_02.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/address_02.png
new file mode 100644
index 0000000..dec75c1
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/address_02.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/arrow.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/arrow.png
new file mode 100644
index 0000000..84f8a2b
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/arrow.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/arrowBlack.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/arrowBlack.png
new file mode 100644
index 0000000..f25a5f5
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/arrowBlack.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/arrowWrite.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/arrowWrite.png
new file mode 100644
index 0000000..0a47644
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/arrowWrite.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/arrow_grey.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/arrow_grey.png
new file mode 100644
index 0000000..e01af34
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/arrow_grey.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/articleIcon_01.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/articleIcon_01.png
new file mode 100644
index 0000000..6709223
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/articleIcon_01.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/articleIcon_02.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/articleIcon_02.png
new file mode 100644
index 0000000..525f8dd
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/articleIcon_02.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/articleIcon_02_active.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/articleIcon_02_active.png
new file mode 100644
index 0000000..f17992a
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/articleIcon_02_active.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/articleIcon_03.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/articleIcon_03.png
new file mode 100644
index 0000000..6e95f12
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/articleIcon_03.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/articleIcon_03_active.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/articleIcon_03_active.png
new file mode 100644
index 0000000..adbe181
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/articleIcon_03_active.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/check_icon.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/check_icon.png
new file mode 100644
index 0000000..d4ca5a1
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/check_icon.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/homeBlack.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/homeBlack.png
new file mode 100644
index 0000000..5e4de66
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/homeBlack.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/homeWrite.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/homeWrite.png
new file mode 100644
index 0000000..f8745f0
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/homeWrite.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/indextop.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/indextop.png
new file mode 100644
index 0000000..594fcca
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/indextop.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/interest_00.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/interest_00.png
new file mode 100644
index 0000000..f055c12
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/interest_00.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/interest_01.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/interest_01.png
new file mode 100644
index 0000000..d9485f9
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/interest_01.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/interest_02.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/interest_02.png
new file mode 100644
index 0000000..d156c2e
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/interest_02.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/interest_03.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/interest_03.png
new file mode 100644
index 0000000..5f885d3
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/interest_03.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/interest_04.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/interest_04.png
new file mode 100644
index 0000000..29a0187
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/interest_04.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/loadingGif.gif b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/loadingGif.gif
new file mode 100644
index 0000000..d08d4e3
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/loadingGif.gif differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/member_01.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/member_01.png
new file mode 100644
index 0000000..9308989
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/member_01.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/member_02.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/member_02.png
new file mode 100644
index 0000000..8113422
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/member_02.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/member_03.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/member_03.png
new file mode 100644
index 0000000..a0978fe
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/member_03.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/member_04.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/member_04.png
new file mode 100644
index 0000000..a113d6c
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/member_04.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/member_05.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/member_05.png
new file mode 100644
index 0000000..8423d45
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/member_05.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/member_06.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/member_06.png
new file mode 100644
index 0000000..1b136c8
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/member_06.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/newIcon_03.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/newIcon_03.png
new file mode 100644
index 0000000..36fd80d
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/newIcon_03.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/orderIcon_00.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/orderIcon_00.png
new file mode 100644
index 0000000..8b3e65c
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/orderIcon_00.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/orderIcon_01.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/orderIcon_01.png
new file mode 100644
index 0000000..359be62
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/orderIcon_01.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/refresh_loding.gif b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/refresh_loding.gif
new file mode 100644
index 0000000..5bb90fd
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/refresh_loding.gif differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/reportColse_grey.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/reportColse_grey.png
new file mode 100644
index 0000000..34dd11b
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/reportColse_grey.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/share.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/share.png
new file mode 100644
index 0000000..2b68b28
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/share.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/stockList_01.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/stockList_01.png
new file mode 100644
index 0000000..e2a1186
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/stockList_01.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/stock_icon_01.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/stock_icon_01.png
new file mode 100644
index 0000000..7474518
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/stock_icon_01.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/stock_icon_02.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/stock_icon_02.png
new file mode 100644
index 0000000..dfa7947
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/stock_icon_02.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/stock_nav.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/stock_nav.png
new file mode 100644
index 0000000..2f2c280
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/stock_nav.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/stock_order.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/stock_order.png
new file mode 100644
index 0000000..b897e8e
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/stock_order.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/takeIcon_00.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/takeIcon_00.png
new file mode 100644
index 0000000..ba7ee53
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/takeIcon_00.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/takeIcon_01.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/takeIcon_01.png
new file mode 100644
index 0000000..9fc0d8c
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/takeIcon_01.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/takeIcon_02.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/takeIcon_02.png
new file mode 100644
index 0000000..e190709
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/takeIcon_02.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/takeIcon_03.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/takeIcon_03.png
new file mode 100644
index 0000000..4daf416
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/takeIcon_03.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/takeIcon_04.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/takeIcon_04.png
new file mode 100644
index 0000000..b7b5b79
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/takeIcon_04.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/userLogin_icon.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/userLogin_icon.png
new file mode 100644
index 0000000..e045d31
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/userLogin_icon.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/water.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/water.png
new file mode 100644
index 0000000..a418aac
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/water.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/waterDrop.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/waterDrop.png
new file mode 100644
index 0000000..8b6c2e1
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/icons/waterDrop.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/imgs/address.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/imgs/address.png
new file mode 100644
index 0000000..7761d17
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/imgs/address.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/imgs/codeshart_back.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/imgs/codeshart_back.png
new file mode 100644
index 0000000..fb6d0fc
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/imgs/codeshart_back.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/imgs/coupon_null.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/imgs/coupon_null.png
new file mode 100644
index 0000000..3beedd9
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/imgs/coupon_null.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/imgs/cover_img.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/imgs/cover_img.png
new file mode 100644
index 0000000..6de9619
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/imgs/cover_img.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/imgs/default.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/imgs/default.png
new file mode 100644
index 0000000..49580e3
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/imgs/default.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/imgs/default_myHead.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/imgs/default_myHead.png
new file mode 100644
index 0000000..07ded43
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/imgs/default_myHead.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/imgs/member.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/imgs/member.png
new file mode 100644
index 0000000..d6c38de
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/imgs/member.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/imgs/text_null.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/imgs/text_null.png
new file mode 100644
index 0000000..3beedd9
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/imgs/text_null.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/imgs/time.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/imgs/time.png
new file mode 100644
index 0000000..54175ff
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/imgs/time.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/imgs/uaer_back.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/imgs/uaer_back.png
new file mode 100644
index 0000000..a88e6dd
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/imgs/uaer_back.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/imgs/waterIcon.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/imgs/waterIcon.png
new file mode 100644
index 0000000..8230c61
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/imgs/waterIcon.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/imgs/wqb.jpg b/锶源昆仑饮水项目/锶源昆仑-改版/static/imgs/wqb.jpg
new file mode 100644
index 0000000..3003d5d
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/imgs/wqb.jpg differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/imgs/wx.jpg b/锶源昆仑饮水项目/锶源昆仑-改版/static/imgs/wx.jpg
new file mode 100644
index 0000000..c18f004
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/imgs/wx.jpg differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/goldenLogo.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/goldenLogo.png
new file mode 100644
index 0000000..497a3ae
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/goldenLogo.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/memberArrow.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/memberArrow.png
new file mode 100644
index 0000000..f9dfad8
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/memberArrow.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/memberIcon.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/memberIcon.png
new file mode 100644
index 0000000..2f7f28b
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/memberIcon.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/memberTitle.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/memberTitle.png
new file mode 100644
index 0000000..ad24edf
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/memberTitle.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/taskIcon_01.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/taskIcon_01.png
new file mode 100644
index 0000000..c9c015a
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/taskIcon_01.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/taskIcon_02.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/taskIcon_02.png
new file mode 100644
index 0000000..9110589
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/taskIcon_02.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/taskIcon_03.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/taskIcon_03.png
new file mode 100644
index 0000000..80701b8
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/taskIcon_03.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/taskIcon_04.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/taskIcon_04.png
new file mode 100644
index 0000000..ff6ed83
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/taskIcon_04.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/taskIcon_05.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/taskIcon_05.png
new file mode 100644
index 0000000..42aa859
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/taskIcon_05.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/taskIcon_05_active.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/taskIcon_05_active.png
new file mode 100644
index 0000000..0bbbc31
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/taskIcon_05_active.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/taskIcon_06.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/taskIcon_06.png
new file mode 100644
index 0000000..5c45c6b
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/taskIcon_06.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/taskIcon_07.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/taskIcon_07.png
new file mode 100644
index 0000000..1119801
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/taskIcon_07.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/taskIcon_08.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/taskIcon_08.png
new file mode 100644
index 0000000..e84027a
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/taskIcon_08.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/taskIcon_09.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/taskIcon_09.png
new file mode 100644
index 0000000..ea42ec7
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/taskIcon_09.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/taskIcon_10.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/taskIcon_10.png
new file mode 100644
index 0000000..355d564
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/taskIcon_10.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/taskIcon_11.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/taskIcon_11.png
new file mode 100644
index 0000000..c071049
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/taskIcon_11.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/taskIcon_12.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/taskIcon_12.png
new file mode 100644
index 0000000..a9d8cee
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/taskIcon_12.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/taskIcon_13.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/taskIcon_13.png
new file mode 100644
index 0000000..0273952
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/taskIcon_13.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/taskIcon_14.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/taskIcon_14.png
new file mode 100644
index 0000000..b40de02
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/taskIcon_14.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/taskIcon_15.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/taskIcon_15.png
new file mode 100644
index 0000000..c5df7f1
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/taskIcon_15.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/taskIcon_16.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/taskIcon_16.png
new file mode 100644
index 0000000..71a42db
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/taskIcon_16.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/userIcon_01.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/userIcon_01.png
new file mode 100644
index 0000000..6cbeef6
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/userIcon_01.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/userIcon_02.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/userIcon_02.png
new file mode 100644
index 0000000..02cf303
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/userIcon_02.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/userIcon_03.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/userIcon_03.png
new file mode 100644
index 0000000..9c92fc5
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/userIcon_03.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/userIcon_04.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/userIcon_04.png
new file mode 100644
index 0000000..8ec1304
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/userIcon_04.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/userIcon_05.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/userIcon_05.png
new file mode 100644
index 0000000..a3adadf
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/userIcon_05.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/userIcon_06.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/userIcon_06.png
new file mode 100644
index 0000000..0e9ecf8
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/userIcon_06.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/userIcon_07.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/userIcon_07.png
new file mode 100644
index 0000000..69c59a3
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/userIcon_07.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/userIcon_08.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/userIcon_08.png
new file mode 100644
index 0000000..b161e9b
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/userIcon_08.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/userIcon_09.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/userIcon_09.png
new file mode 100644
index 0000000..370cda7
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/userIcon_09.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/userIcon_10.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/userIcon_10.png
new file mode 100644
index 0000000..937a74a
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/userIcon_10.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/userIcon_11.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/userIcon_11.png
new file mode 100644
index 0000000..a491d9b
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/userIcon_11.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/userTap.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/userTap.png
new file mode 100644
index 0000000..10304ae
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/ls/userTap.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/tabBarIcon/00.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/tabBarIcon/00.png
new file mode 100644
index 0000000..cd6c1cc
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/tabBarIcon/00.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/tabBarIcon/00_active.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/tabBarIcon/00_active.png
new file mode 100644
index 0000000..c7a460e
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/tabBarIcon/00_active.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/tabBarIcon/01.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/tabBarIcon/01.png
new file mode 100644
index 0000000..361786e
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/tabBarIcon/01.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/tabBarIcon/01_active.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/tabBarIcon/01_active.png
new file mode 100644
index 0000000..3aaa909
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/tabBarIcon/01_active.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/tabBarIcon/02.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/tabBarIcon/02.png
new file mode 100644
index 0000000..cb349af
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/tabBarIcon/02.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/tabBarIcon/02_active.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/tabBarIcon/02_active.png
new file mode 100644
index 0000000..152314e
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/tabBarIcon/02_active.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/tabBarIcon/04.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/tabBarIcon/04.png
new file mode 100644
index 0000000..8bed463
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/tabBarIcon/04.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/static/tabBarIcon/04_active.png b/锶源昆仑饮水项目/锶源昆仑-改版/static/tabBarIcon/04_active.png
new file mode 100644
index 0000000..5f30087
Binary files /dev/null and b/锶源昆仑饮水项目/锶源昆仑-改版/static/tabBarIcon/04_active.png differ
diff --git a/锶源昆仑饮水项目/锶源昆仑-改版/utils/util.js b/锶源昆仑饮水项目/锶源昆仑-改版/utils/util.js
new file mode 100644
index 0000000..764bc2c
--- /dev/null
+++ b/锶源昆仑饮水项目/锶源昆仑-改版/utils/util.js
@@ -0,0 +1,19 @@
+const formatTime = date => {
+  const year = date.getFullYear()
+  const month = date.getMonth() + 1
+  const day = date.getDate()
+  const hour = date.getHours()
+  const minute = date.getMinutes()
+  const second = date.getSeconds()
+
+  return `${[year, month, day].map(formatNumber).join('/')} ${[hour, minute, second].map(formatNumber).join(':')}`
+}
+
+const formatNumber = n => {
+  n = n.toString()
+  return n[1] ? n : `0${n}`
+}
+
+module.exports = {
+  formatTime
+}