From 8a43aa5bde959f13ee4a3c1efa9da9a1f979157e Mon Sep 17 00:00:00 2001
From: guoxing <1369478551@qq.com>
Date: Thu, 18 Jan 2024 17:56:46 +0800
Subject: [PATCH] 123

---
 common/config.js                              |   3 +-
 common/request.api.js                         |  18 +
 custom-tab-bar/index.js                       |  41 +-
 pages.json                                    |  64 +-
 pages/good/shoppCart.vue                      | 297 ++++++++
 pages/home/cloudCard2.vue                     | 637 ++++++++++++++++++
 pages/home/myCellar.vue                       | 584 ++++++++++++++++
 pages/home/myHome.vue                         |   7 +-
 pages/login/login.vue                         |   3 +-
 pages/me/base_info.vue                        |   2 +-
 static/basket_icon.png                        | Bin 0 -> 10573 bytes
 static/inCart.png                             | Bin 0 -> 3078 bytes
 static/jia_icon.png                           | Bin 0 -> 328 bytes
 static/jian_icon.png                          | Bin 0 -> 394 bytes
 static/search_icon.png                        | Bin 0 -> 376 bytes
 static/shoppCart_icon.png                     | Bin 0 -> 921 bytes
 .../uni-popup-dialog/uni-popup-dialog.vue     |   2 +-
 17 files changed, 1624 insertions(+), 34 deletions(-)
 create mode 100644 pages/good/shoppCart.vue
 create mode 100644 pages/home/cloudCard2.vue
 create mode 100644 pages/home/myCellar.vue
 create mode 100644 static/basket_icon.png
 create mode 100644 static/inCart.png
 create mode 100644 static/jia_icon.png
 create mode 100644 static/jian_icon.png
 create mode 100644 static/search_icon.png
 create mode 100644 static/shoppCart_icon.png

diff --git a/common/config.js b/common/config.js
index 3dc586d..2946bc5 100644
--- a/common/config.js
+++ b/common/config.js
@@ -6,8 +6,9 @@
  * loginTimeoutPage = "/pages/login/index", // 登录超时或失效的情况下，跳转到的登录页面
  */
 module.exports = {
-	baseUrl: 'http://192.168.2.106:7211', // 本地
+	// baseUrl: 'http://192.168.2.110:7211', // 本地
 	// baseUrl: 'https://lpk.yyundong.com/lpkapi',  // 测试服务器
+	baseUrl: 'https://lpk.yyundong.com/mallapi',  // 测试服务器
 	// baseUrl: 'https://supervise.yxtsoft.com/lpkapi', // 正式服务器
 	tokenName: "Authorization", // 请求头中token的名字，与服务器端对应
 	loginTimeoutCode: "5001", // 登录超时或失效的情况下，服务器端返回的错误码
diff --git a/common/request.api.js b/common/request.api.js
index f1ba878..71917c3 100644
--- a/common/request.api.js
+++ b/common/request.api.js
@@ -88,4 +88,22 @@ export default {
 	changeNick: (params = {}) => request.formpost("/lpkcustomer/modifyUserNickName", params),
 	// 获取手机号
 	getPhone: (params = {}) => request.formpost("/lpkcustomer/getPhoneNumber", params),
+
+
+	//  2024-1-15 新需求
+	// 获取补充菜窖 商品分类列表
+	getAllGoodsType: (params = {}) => request.get("/lpkgiftcard/getAllGoodsType/" + params, params),
+	// 获取补充菜窖 商品分类列表
+	getGoodsByType: (params = {}) => request.post("/lpkgiftcard/getGoodsByType", params),
+	// 获取当前购物车总价及总斤数
+	getGoodsWeight: (params = {}) => request.post("/shoppingcart/getGoodsWeight", params),
+	// 加入购物车
+	addShoppingCart: (params = {}) => request.post("/shoppingcart/addShoppingCart", params),
+	// 购物车列表
+	shoppingCartList: (params = {}) => request.post("/shoppingcart/shoppingCartList", params, {}, {}, true),
+
+	// 我的菜窖 类型列表
+	vegeCellarTypeList: (params = {}) => request.post("/lpkgoods/vegeCellarTypeList", params),
+	// 我的菜窖 商品列表
+	vegeCellarList: (params = {}) => request.post("/lpkgoods/vegeCellarList", params),
 }
\ No newline at end of file
diff --git a/custom-tab-bar/index.js b/custom-tab-bar/index.js
index 74ea968..7cbe4d5 100644
--- a/custom-tab-bar/index.js
+++ b/custom-tab-bar/index.js
@@ -5,32 +5,45 @@ Component({
 	"selectedColor": "#FFFFFF",
 	"backgroundColor": "#F69448",
     list: [
+	// {
+	// 	"pagePath": "/pages/home/cloudCard",
+	// 	"text": "补充菜窖",
+	// 	"iconPath": "/static/bomicon/bom_notCloudCard.png",
+	// 	"selectedIconPath": "/static/bomicon/bom_cloudCard.png"
+	// },
 	{
-		"pagePath": "/pages/home/cloudCard",
+		"pagePath": "/pages/home/cloudCard2",
 		"text": "补充菜窖",
 		"iconPath": "/static/bomicon/bom_notCloudCard.png",
 		"selectedIconPath": "/static/bomicon/bom_cloudCard.png"
 	},
+	// {
+	// 	"pagePath": "/pages/home/pickUpCard",
+	// 	"text": "选菜窖",
+	// 	"iconPath": "/static/bomicon/bom_notPickUp.png",
+	// 	"selectedIconPath": "/static/bomicon/bom_pickUp.png"
+	// },
 	{
-		"pagePath": "/pages/home/pickUpCard",
-		"text": "选菜窖",
+		"pagePath": "/pages/home/myCellar",
+		"text": "我的菜窖",
 		"iconPath": "/static/bomicon/bom_notPickUp.png",
 		"selectedIconPath": "/static/bomicon/bom_pickUp.png"
 	},
-	{
-		"pagePath": "/pages/home/recordList2",
-		"text": "预约记录",
-		"iconPath": "/static/bomicon/bom_notRecordNew.png",
-		"selectedIconPath": "/static/bomicon/bom_recordNew.png"
-	}
-	,
 	
 	// {
-	// 	"pagePath": "/pages/home/myHome",
-	// 	"text": "我的",
-	// 	"iconPath": "/static/bomicon/bom_NotMy.png",
-	// 	"selectedIconPath": "/static/bomicon/bom_my.png"
+	// 	"pagePath": "/pages/home/recordList2",
+	// 	"text": "预约记录",
+	// 	"iconPath": "/static/bomicon/bom_notRecordNew.png",
+	// 	"selectedIconPath": "/static/bomicon/bom_recordNew.png"
 	// }
+	// ,
+	
+	{
+		"pagePath": "/pages/home/myHome",
+		"text": "我的",
+		"iconPath": "/static/bomicon/bom_NotMy.png",
+		"selectedIconPath": "/static/bomicon/bom_my.png"
+	}
 	
 	]
   },
diff --git a/pages.json b/pages.json
index c35037c..efde03f 100644
--- a/pages.json
+++ b/pages.json
@@ -13,6 +13,12 @@
 				"navigationStyle": "custom"
 			}
 		},
+		{
+			"path": "pages/home/cloudCard2",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		},
 		{
 			"path": "pages/card/card_detail",
 			"style": {
@@ -50,6 +56,9 @@
 			}
 		},
 
+
+
+
 		{
 			"path": "pages/bind/bind_pickUpCard",
 			"style": {
@@ -116,6 +125,8 @@
 				}
 			}
 		},
+
+
 		{
 			"path": "pages/home/recordList",
 			"style": {
@@ -244,6 +255,18 @@
 			}
 		},
 		{
+			"path": "pages/good/shoppCart",
+			"style": {
+				"navigationBarTitleText": "购物车",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/home/myCellar",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		}, {
 			"path": "pages/me/base_info",
 			"style": {
 				"navigationStyle": "custom",
@@ -264,30 +287,43 @@
 		"selectedColor": "#191919",
 		"borderStyle": "white",
 		"backgroundColor": "#F69448",
-		"list": [{
-				"pagePath": "pages/home/cloudCard",
+		"list": [
+			// {
+			// 	"pagePath": "pages/home/cloudCard",
+			// 	"text": "补充菜窖",
+			// 	"iconPath": "static/bomicon/bom_notCloudCard.png",
+			// 	"selectedIconPath": "static/bomicon/bom_cloudCard.png"
+			// },
+			{
+				"pagePath": "pages/home/cloudCard2",
 				"text": "补充菜窖",
 				"iconPath": "static/bomicon/bom_notCloudCard.png",
 				"selectedIconPath": "static/bomicon/bom_cloudCard.png"
 			},
+			// {
+			// 	"pagePath": "pages/home/pickUpCard",
+			// 	"text": "选菜窖",
+			// 	"iconPath": "static/bomicon/bom_notPickUp.png",
+			// 	"selectedIconPath": "static/bomicon/bom_pickUp.png"
+			// },
 			{
-				"pagePath": "pages/home/pickUpCard",
-				"text": "选菜窖",
+				"pagePath": "pages/home/myCellar",
+				"text": "我的菜窖",
 				"iconPath": "static/bomicon/bom_notPickUp.png",
 				"selectedIconPath": "static/bomicon/bom_pickUp.png"
 			},
-			{
-				"pagePath": "pages/home/recordList2",
-				"text": "预约记录",
-				"iconPath": "static/bomicon/bom_notRecordNew.png",
-				"selectedIconPath": "static/bomicon/bom_recordNew.png"
-			}
 			// {
-			// 	"pagePath": "pages/home/myHome",
-			// 	"text": "我的",
-			// 	"iconPath": "static/bomicon/bom_NotMy.png",
-			// 	"selectedIconPath": "static/bomicon/bom_my.png"
+			// 	"pagePath": "pages/home/recordList2",
+			// 	"text": "预约记录",
+			// 	"iconPath": "static/bomicon/bom_notRecordNew.png",
+			// 	"selectedIconPath": "static/bomicon/bom_recordNew.png"
 			// }
+			{
+				"pagePath": "pages/home/myHome",
+				"text": "我的",
+				"iconPath": "static/bomicon/bom_NotMy.png",
+				"selectedIconPath": "static/bomicon/bom_my.png"
+			}
 
 		]
 	},
diff --git a/pages/good/shoppCart.vue b/pages/good/shoppCart.vue
new file mode 100644
index 0000000..81a25d2
--- /dev/null
+++ b/pages/good/shoppCart.vue
@@ -0,0 +1,297 @@
+<template>
+	<view style="height: 100vh; width: 100%; background: #F2F2F2;
+		display: flex;flex-direction: column;overflow: scroll;">
+		<loading-state ref="pageView" @request="request">
+
+			<!-- <scroll-view scroll-y="true" style="min-height: calc(100% - 15vw);  width: 100%; margin-top: 10px;"
+				bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll"> -->
+
+			<view style="width: 100%; display: flex;flex-direction: column;">
+				<view v-for="(item,index) in data" @click="itemClick(item.goodsSid)" style="display: flex;flex-direction: column;justify-content: center; margin: 10px 10px 0px 10px;
+							 padding: 10px; border-radius: 15px; background-color: #fff; ">
+
+					<view style="display: flex;flex-direction: row;align-items: center;width: 100%;  ">
+
+						<image :src="item.iconUrl" style="width: 90px;height: 90px; border-radius: 10px; "
+							mode="aspectFill"></image>
+
+						<view style="display: flex;flex-direction: column;flex: 1; 
+								 margin-left: 10px;">
+
+							<text style="font-size: 13px;color: #000;">{{item.goodsName}}</text>
+
+							<text style="font-size: 10px;color: #999;margin-top: 5px;">{{item.remarks}}</text>
+
+							<view style="display: flex;flex-direction: row;align-items: center;margin-top: 8px;">
+								<text style="border: 1px #EE752F solid; border-radius: 5px;	padding: 0px 8px;
+										font-size: 10px;color: #EE752F;">{{item.jprice}}元/{{item.specificationUnit}}</text>
+								<text
+									style="border: 1px #EE752F solid; border-radius: 5px;	padding: 0px 8px;
+										font-size: 10px;color: #EE752F; margin-left: 10px; margin-right: 10px; ">{{item.weight}}{{item.specificationUnit}}/{{item.unitName}}</text>
+								<!-- <text
+											style="background: #FF9900; color: #fff; font-size: 10px;padding: 0px 8px; border-radius: 5px;">￥{{item.mefenPrice}}</text> -->
+							</view>
+
+							<view style="display: flex;flex-direction: row;align-items: center;justify-content: space-between; margin-top: 15px;
+									margin-right: 15px;">
+								<text style="font-size: 14px;color: #FF5006;">￥{{item.price}}</text>
+
+								<view style="display: flex;flex-direction: row;align-items: center;">
+
+									<image src="../../static/jian_icon.png" mode="aspectFill"
+										style="width: 20px;height: 20px;" @click.stop="jian(item)"></image>
+
+									<text
+										style="font-size: 14px;margin-left: 8px;margin-right: 8px;">{{item.goodsNumber}}</text>
+									<image src="../../static/jia_icon.png" mode="aspectFill"
+										style="width: 20px;height: 20px;" @click.stop="jia(item)"></image>
+
+								</view>
+
+							</view>
+
+						</view>
+
+					</view>
+
+				</view>
+				<view style="height: 150px; background: #F2F2F2;"></view>
+			</view>
+			<!-- </scroll-view> -->
+
+			<view style="height: 15vw; width: 100%; display: flex;flex-direction: column;position: fixed;bottom: 0;overflow:hidden;
+			justify-content: center;align-items: center; background: #fff;padding-top: 10px;">
+
+				<view style="display: flex;flex-direction: row;align-items: center;">
+					<view style="color: #888;font-size: 10px;">温馨提示：已定制了</view>
+					<view style="color: #FF5006;font-size: 15px;">{{page.weight}}斤</view>
+					<view style="color: #888;font-size: 10px;">，满200斤可定制云菜窖</view>
+				</view>
+
+				<view
+					style="display: flex;flex-direction: row; justify-content: center;align-items: center;padding-bottom: 10px;margin-top: 5px;">
+
+
+					<view
+						style="border: 1px #FF5006 solid;margin-left: 5px;margin-right: 5px;padding: 5px 40px 5px 15px;
+					display: flex;flex-direction: row;align-items: center;border-top-left-radius: 25px; border-bottom-left-radius: 25px;"
+						@click="gotoCart()">
+						<image src="../../static/shoppCart_icon.png" mode="aspectFill"
+							style="height: 20px;width: 25px;">
+						</image>
+						<text style="font-size: 15px;color: #FF5006;margin-left: 10px; ">￥{{page.price}}</text>
+						<text style="font-size: 10px;color: #666;margin-left: 10px; ">共减：￥{{page.reduce}}</text>
+					</view>
+					<text style="background: #FF9900; color: #fff;font-size: 13px; padding: 8px 15px;
+					border: 1px #FF5006 solid; border-top-right-radius: 25px; border-bottom-right-radius: 25px;"
+						@click="settlement()">结算</text>
+
+				</view>
+
+			</view>
+		</loading-state>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				page: {
+					affiliation: '',
+					weight: "0",
+					price: "0",
+					reduce: "0"
+				},
+				data: [
+
+				]
+			}
+		},
+		onLoad(options) {
+			this.page.affiliation = options.affiliation
+			console.log(" options", options);
+			this.request()
+		},
+		methods: {
+			request() {
+				let _this = this
+
+				var params = {
+					customerSid: getApp().globalData.sid,
+					affiliation: _this.page.affiliation
+				}
+
+				_this.$api.shoppingCartList(params).then((resp) => {
+					console.log("resp", resp);
+					_this.data = resp
+
+					_this.getallPrice()
+					_this.getweight()
+
+					_this.$nextTick(() => {
+						_this.$refs.pageView.setLoadState(2)
+					})
+					// 无数据
+					if (_this.data.length == 0) {
+						_this.$nextTick(() => {
+							_this.$refs.pageView.setLoadState(100)
+						})
+					}
+
+				}).catch(e => {
+					// 错误 1
+					_this.$nextTick(() => {
+						_this.$refs.pageView.setLoadState(1)
+					})
+				})
+			},
+			itemClick(goodsSid) {
+				uni.navigateTo({
+					url: '/pages/good/goodsDetail?sid=' + goodsSid
+				})
+			},
+
+			jian(item) {
+				const that = this
+				console.log("item》》》》", item)
+				if (Number(item.goodsNumber) == 1) {
+
+					wx.showModal({
+						content: '确定不要了吗',
+						cancelText: "再想想",
+						confirmText: "删除",
+						confirmColor: "#FF9900",
+						success(res) {
+							if (res.confirm) {
+								console.log('用户点击确定')
+								item.goodsNumber = 0
+								const index = that.data.findIndex((info) => info.goodsSid === item.goodsSid)
+								console.log("index》》》》", index)
+								that.data.splice(index, 1)
+								that.getallPrice()
+								that.getweight()
+								that.upDateShoppCart(item)
+							} else if (res.cancel) {
+
+							}
+						}
+					})
+
+				} else {
+					if (Number(item.goodsNumber) > 0) {
+						item.goodsNumber = Number(item.goodsNumber) - 1
+					}
+
+					item.totalPrice = Number(item.goodsNumber) * Number(item.price)
+					that.getallPrice()
+					that.getweight()
+					that.upDateShoppCart(item)
+				}
+
+			},
+			jia(item) {
+
+				item.goodsNumber = Number(item.goodsNumber) + 1
+				item.totalPrice = Number(item.goodsNumber) * Number(item.price)
+
+				this.getallPrice()
+				this.getweight()
+				this.upDateShoppCart(item)
+
+			},
+
+			getallPrice() {
+
+				let num = 0;
+				for (var i = 0; i < this.data.length; i++) {
+					num += Number(this.data[i].totalPrice);
+				}
+
+				this.page.price = num
+			},
+
+			getweight() {
+
+				let num = 0;
+				for (var i = 0; i < this.data.length; i++) {
+					num += Number(this.data[i].weight) * Number(this.data[i].goodsNumber);
+
+				}
+
+				this.page.weight = num
+
+			},
+
+			upDateShoppCart(item) {
+				var good = {
+					goodsSid: item.goodsSid,
+					goodsName: item.goodsName,
+					goodsNumber: item.goodsNumber,
+					affiliation: this.page.affiliation,
+					price: item.price,
+					weight: item.weight,
+					customerSid: getApp().globalData.sid
+				}
+
+				let _this = this
+				_this.$api.addShoppingCart(good).then((resp) => {
+
+				}).catch(e => {})
+			},
+
+			settlement() {
+				// 支付
+
+				if (this.page.weight < 200) {
+					this.shortToast('满200斤才可定制云菜窖哦，请继续选菜吧。')
+					return
+				}
+
+
+				let list = []
+
+				for (var i = 0; i < this.goods.length; i++) {
+					var item = this.data[i]
+					if (item.goodsNumber > 0)
+						list.push({
+							goodsSid: item.goodsSid,
+							goodsName: item.name,
+							partNumber: item.goodsNumber,
+							numofPart: item.weight,
+							priceUnit: item.jprice,
+							pricePart: item.mefenPrice,
+						})
+				}
+				// console.log("ddd", list);
+
+				if (list.length == 0) {
+					this.shortToast('请添加商品')
+					return
+				}
+
+				var params = {
+					customerSid: getApp().globalData.sid,
+					cardNumber: 1,
+					totalTee: this.page.price,
+					ordOrderDetailsVoList: list
+				}
+				// console.log("params", params);
+
+				let _this = this
+				_this.$api.createOrder(params).then((resp) => {
+
+					// console.log("resp", resp);
+					this.$pay(resp)
+				}).catch(e => {})
+
+			},
+
+
+		}
+	}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file
diff --git a/pages/home/cloudCard2.vue b/pages/home/cloudCard2.vue
new file mode 100644
index 0000000..8c6596d
--- /dev/null
+++ b/pages/home/cloudCard2.vue
@@ -0,0 +1,637 @@
+<template>
+
+	<view
+		style="display: flex;flex-direction: column;height: 100vh;background: -webkit-linear-gradient(left,#FEA65F,#FB9440);">
+
+		<view class="top">
+			<NavBar ref="nav" navTitle=" " :showIcon="false" :start-change-height="page.startHeight"
+				:end-change-height="page.endHeight">
+			</NavBar>
+
+			<view style="display: flex;flex-direction: row;align-items: center;justify-content: center;;
+			padding-left: 10vw;padding-right: 10vw; margin-top: 40vw;">
+
+				<view style="display: flex;flex-direction: column; flex: 1;justify-content: center;align-items: center;"
+					@click.stop="brandClick('0')">
+
+					<image src="https://supervise.yxtsoft.com/lpk/image/family_icon.png" mode="aspectFill"
+						:class="brandType=='0'?'top_img1':'top_img2'"
+						style="width: 60px;height:60px;border-radius: 50%;padding:5px;"></image>
+
+					<text :class="brandType=='0'?'top_text1':'top_text2'">百姓菜窖</text>
+
+				</view>
+
+				<view style="display: flex;flex-direction: column;flex: 1;justify-content: center;align-items: center;"
+					@click.stop="brandClick('1')">
+
+					<image src="https://supervise.yxtsoft.com/lpk/image/love_icon.png" mode="aspectFill"
+						:class="brandType=='1'?'top_img1':'top_img2'"
+						style="width: 60px;height: 60px;border-radius: 50%;padding: 5px;"></image>
+
+					<text :class="brandType=='1'?'top_text1':'top_text2'">精品菜窖</text>
+
+				</view>
+
+				<view style="display: flex;flex-direction: column;flex: 1;justify-content: center;align-items: center;"
+					@click.stop="brandClick('2')">
+
+					<image src="https://supervise.yxtsoft.com/lpk/image/enterprise_icon.png" mode="aspectFill"
+						:class="brandType=='2'?'top_img1':'top_img2'"
+						style="width: 60px;height: 60px;border-radius: 50%;padding: 5px;"></image>
+
+					<text :class="brandType=='2'?'top_text1':'top_text2'">企业菜窖</text>
+
+				</view>
+
+			</view>
+
+		</view>
+
+
+		<view style="background: #fff;flex-flow: 1; height: calc(100vh - 65vw - 50px); 
+			width: 100%; margin-top: -13vw;
+			border-radius: 25px;display: flex;flex-direction: column; box-sizing: border-box;">
+
+			<view style="display: flex;flex-direction: row;height: 25px; width: 100%; flex-shrink: 0;">
+
+				<view style="width: 20%;background: #F7F7F7;border-top-left-radius: 25px;"></view>
+				<view style="width: 80%;background: #fff; border-top-right-radius: 25px;"></view>
+			</view>
+
+			<view style="display: flex;flex-direction: row;min-height: calc(100% - 115px);  ">
+				<scroll-view scroll-y="true" style="height: 100%; width: 21%;border-bottom-left-radius: 25px;"
+					:scroll-top="scrollLeftTop" bindscrolltoupper="upper" bindscrolltolower="lower"
+					:show-scrollbar="false" :enhanced="true" bindscroll="scroll">
+
+					<view
+						style="width: 100%;; display: flex;flex-direction: column; background: #F7F7F7;border-bottom-left-radius: 25px;">
+						<view v-for="(item,index) in data" @click="labelClick(index,item)"
+							style="display: flex;flex-direction: column;justify-content: center; margin-top: 15px; ">
+							<text class="label" :class="{ label2: selectIndex==index }">{{item.name}}</text>
+						</view>
+
+					</view>
+				</scroll-view>
+
+				<view
+					style="width: 80%;min-height: calc(100% - 115px); display: flex;flex-direction: column; margin-left: 10px; margin-right: 10px;">
+
+					<view style=" border: 1px #bbb solid; border-radius: 8px;display: flex;flex-direction: row;align-items: center;
+					padding-left: 10px; margin-left: 20px;margin-right: 20px;">
+						<image src="../../static/search_icon.png" mode="aspectFill" style="width: 25px;height: 25px;">
+						</image>
+						<input placeholder="请输入"
+							style="font-size: 25rpx;flex: 1;height: 35px;line-height: 35px;padding-left: 10px;padding-right: 10px;"
+							:value="searchInfo.name" @input="onKeyInput" />
+					</view>
+
+					<scroll-view scroll-y="true" style="min-height: calc(100% - 150px);  width: 100%; margin-top: 10px;"
+						bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll" :show-scrollbar="false"
+						:scroll-top="scrollRightTop" :enhanced="true">
+
+						<view style="width: 100%; display: flex;flex-direction: column;">
+							<view v-for="(item,index) in goods" @click="itemClick(item.goodsSid)"
+								style="display: flex;flex-direction: column;justify-content: center;width: 100%; margin-top: 15px; ">
+
+								<view style="display: flex;flex-direction: row;align-items: center;width: 100%;  ">
+
+									<image :src="item.iconUrl" style="width: 90px;height: 90px; border-radius: 10px; "
+										mode="aspectFill"></image>
+
+									<view style="display: flex;flex-direction: column;flex: 1;  padding-bottom: 15px; margin-left: 10px;"
+									:style="{'border-bottom':(index == goods.length-1 ? 'none' : '1px #EFEFEF solid')}">
+
+										<text style="font-size: 13px;color: #000;">{{item.name}}</text>
+
+										<text
+											style="font-size: 10px;color: #999;margin-top: 5px;">{{item.remark}}</text>
+
+										<view
+											style="display: flex;flex-direction: row;align-items: center;margin-top: 8px;">
+											<text style="border: 1px #EE752F solid; border-radius: 5px;	padding: 0px 8px;
+											font-size: 10px;color: #EE752F;">{{item.jprice}}元/{{item.specificationUnit}}</text>
+											<text
+												style="border: 1px #EE752F solid; border-radius: 5px;	padding: 0px 8px;
+											font-size: 10px;color: #EE752F; margin-left: 10px; margin-right: 10px; ">{{item.weight}}{{item.specificationUnit}}/{{item.unitName}}</text>
+											<!-- <text
+												style="background: #FF9900; color: #fff; font-size: 10px;padding: 0px 8px; border-radius: 5px;">￥{{item.mefenPrice}}</text> -->
+										</view>
+
+										<view style="display: flex;flex-direction: row;align-items: center;justify-content: space-between; margin-top: 15px;
+										margin-right: 15px;">
+											<text style="font-size: 14px;color: #FF5006;">￥{{item.mefenPrice}}</text>
+											<!-- 
+											<image src="../../static/inCart.png" mode="aspectFill"
+												style="width: 25px;height: 25px;" @click.stop="itemShow(item)"
+												v-if="!item.showCart"></image> -->
+
+											<view style="display: flex;flex-direction: row;align-items: center;">
+
+												<image src="../../static/jian_icon.png" mode="aspectFill"
+													style="width: 20px;height: 20px;" @click.stop="jian(item)"></image>
+
+												<text
+													style="font-size: 14px;margin-left: 8px;margin-right: 8px;">{{item.goodsNumber}}</text>
+												<image src="../../static/jia_icon.png" mode="aspectFill"
+													style="width: 20px;height: 20px;" @click.stop="jia(item)"></image>
+
+												<!-- 	<text
+													style="margin-left: 10px;color: #fff; font-size: 12px; border: 1px #EE752F solid; border-radius: 5px;	padding: 0px 5px; background: #FF9900;"
+													@click.stop="itemShow2(item)">确定</text> -->
+											</view>
+
+										</view>
+
+									</view>
+
+								</view>
+
+							</view>
+
+						</view>
+					</scroll-view>
+
+				</view>
+
+			</view>
+
+			<view style="display: flex;flex-direction: column;border-top: 1px solid #F8F8F8; border-bottom-left-radius: 25px;border-bottom-right-radius: 25px;
+			padding-top: 5px; flex-shrink: 0;">
+
+				<view style="display: flex;flex-direction: row;align-items: center; padding-left: 30px;">
+					<view style="width: 35px;height: 35px;position: relative; visibility: hidden; ">
+
+						<image style="width: 25px;height: 25px;margin-left: 5px; margin-top: 5px; "
+							src="../../static/basket_icon.png" mode="aspectFill"></image>
+
+						<view style="border-radius: 50%;text-align: center;background: #f00;color: #fff;font-size: 8px;
+						position: absolute;
+						  top: 2px;
+						  right: 0px;
+						  padding: 2px 5px;
+						  width: auto;">{{page.count}}</view>
+
+					</view>
+
+					<view id="bomView"
+						style="display: flex;flex-direction: row;align-items: center; margin-left: 15px;">
+						<view style="color: #888;font-size: 10px;">温馨提示：已定制了</view>
+						<view style="color: #FF5006;font-size: 15px;">{{page.weight}}斤</view>
+						<!-- <view style="color: #FF5006;font-size: 15px;" v-if="brandType=='1'">{{page.weight2}}斤</view> -->
+						<!-- <view style="color: #FF5006;font-size: 15px;" v-if="brandType=='2'">{{page.weight3}}斤</view> -->
+						<view style="color: #888;font-size: 10px;">，满200斤可定制云菜窖</view>
+					</view>
+				</view>
+
+				<view
+					style="display: flex;flex-direction: row; justify-content: center;align-items: center;padding-bottom: 10px;margin-top: 5px;">
+
+					<text style="background: #FF9900; color: #fff;font-size: 13px; padding: 8px 15px;
+					border: 1px #FF5006 solid; border-top-left-radius: 25px; border-bottom-left-radius: 25px;">分享新人有礼</text>
+
+					<view style="border: 1px #FF5006 solid;margin-left: 5px;margin-right: 5px;padding: 5px 10px;
+					display: flex;flex-direction: row;align-items: center;" @click="gotoCart()">
+						<image src="../../static/shoppCart_icon.png" mode="aspectFill"
+							style="height: 20px;width: 25px;"></image>
+						<text style="font-size: 15px;color: #FF5006;margin-left: 10px; ">￥{{page.price}}</text>
+						<text style="font-size: 10px;color: #666;margin-left: 10px; ">共减：￥{{page.reduce}}</text>
+					</view>
+					<!-- <view style="border: 1px #FF5006 solid;margin-left: 5px;margin-right: 5px;padding: 5px 10px;
+					display: flex;flex-direction: row;align-items: center;" v-if="brandType=='1'">
+						<image src="../../static/shoppCart_icon.png" mode="aspectFill"
+							style="height: 20px;width: 25px;"></image>
+						<text style="font-size: 15px;color: #FF5006;margin-left: 10px; ">￥{{page.price2}}</text>
+						<text style="font-size: 10px;color: #666;margin-left: 10px; ">共减：￥{{page.reduce2}}</text>
+					</view>
+					<view style="border: 1px #FF5006 solid;margin-left: 5px;margin-right: 5px;padding: 5px 10px;
+					display: flex;flex-direction: row;align-items: center;" v-if="brandType=='2'">
+						<image src="../../static/shoppCart_icon.png" mode="aspectFill"
+							style="height: 20px;width: 25px;"></image>
+						<text style="font-size: 15px;color: #FF5006;margin-left: 10px; ">￥{{page.price3}}</text>
+						<text style="font-size: 10px;color: #666;margin-left: 10px; ">共减：￥{{page.reduce3}}</text>
+					</view> -->
+					<text style="background: #FF9900; color: #fff;font-size: 13px; padding: 8px 15px;
+					border: 1px #FF5006 solid; border-top-right-radius: 25px; border-bottom-right-radius: 25px;"
+						@click="settlement()">结算</text>
+
+				</view>
+
+			</view>
+
+		</view>
+
+	</view>
+
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				scrollHeight: "",
+				scrollLeftTop: "0",
+				scrollRightTop: "0",
+				searchInfo: {
+					sid: "0",
+					name: "",
+					affiliation: "",
+					customerSid: ""
+				},
+				brandType: "0",
+				styleObject: {
+					// 'position': 'fixed',
+					// 'top':'80vw',
+					'margin-top': '62vw',
+					'border-top-left-radius': '25px',
+					'border-top-right-radius': '25px',
+					'border-bottom-left-radius': '25px',
+					'border-bottom-right-radius': '25px',
+					'background': '#fff',
+					'padding-top': '10px',
+					'margin-bottom': "60px"
+
+				},
+				page: {
+					price: '0',
+					reduce: "0",
+					weight: "0",
+					// price2: '0',
+					// reduce2: "0",
+					// weight2: "0",
+					// price3: '0',
+					// reduce3: "0",
+					// weight3: "0",
+					count: "0",
+					startHeight: 0,
+					endHeight: 0
+				},
+				data: [],
+				goods: [],
+				selectIndex: 0,
+				initPrice: '0',
+				initReduce: "0",
+				initWeight: "0",
+
+			}
+		},
+		onShow() {
+			if (typeof this.$mp.page.getTabBar === 'function' && this.$mp.page.getTabBar()) {
+				this.$mp.page.getTabBar().setData({
+					selected: 0
+				})
+
+			}
+			this.getAllPriceOrWeight()
+				this.getgoods()
+		},
+
+		onLoad() {
+
+			let info = uni.getSystemInfoSync();
+
+			this.page.startHeight = info.windowWidth * 0.6
+			this.page.endHeight = info.windowWidth * 0.8
+
+			this.request()
+		
+			// this.getallPrice()
+			// this.getweight()
+			// this.getcount()
+
+		},
+		methods: {
+			// searchBtn() {
+			// 	 this.setData({
+			// 	      scrollLeftTop: 0,
+			// 		  scrollRightTop:0
+			// 	    })
+			// 	// this.scrollLeftTop =1 //可以在每次搜索的时候先初始一下
+			// 	// this.scrollRightTop = 1 //然后每次加0.01  别问为啥要加0.01 反正直接给0就是没效果 无解  也可能是本人代码有误  但是亲测有效
+			// },
+			labelClick(index, item) {
+				this.selectIndex = index
+
+				this.searchInfo.sid = item.sid
+				this.getgoods()
+
+			},
+			onKeyInput(event) {
+				this.searchInfo.name = event.target.value
+				this.getgoods()
+			},
+
+			brandClick(val) {
+
+				this.brandType = val
+				this.request()
+
+			},
+			request() {
+				let _this = this
+				_this.$api.getAllGoodsType(_this.brandType).then((resp) => {
+					_this.data = resp
+					_this.searchInfo.sid = _this.data[0].sid
+					_this.selectIndex = 0
+					_this.getgoods()
+					_this.getAllPriceOrWeight()
+					_this.scrollLeftTop = _this.scrollLeftTop == 0 ? -1 : 0
+					_this.scrollRightTop = _this.scrollRightTop == 0 ? -1 : 0
+				}).catch(e => {})
+			},
+			getAllPriceOrWeight() {
+				let _this = this
+
+				var params = {
+					customerSid: getApp().globalData.sid,
+					affiliation: this.brandType,
+				}
+
+				_this.$api.getGoodsWeight(params).then((resp) => {
+					console.log("getGoodsWeight", resp);
+
+					_this.page.price = resp.totalPrice
+					_this.page.weight = resp.totalWeight
+
+					_this.initPrice = resp.totalPrice
+					_this.initWeight = resp.totalWeight
+
+				}).catch(e => {})
+			},
+			getgoods() {
+				let _this = this
+
+				_this.searchInfo.customerSid = getApp().globalData.sid
+				_this.searchInfo.affiliation = this.brandType
+
+				_this.$api.getGoodsByType(_this.searchInfo).then((resp) => {
+					_this.goods = resp
+				}).catch(e => {})
+			},
+			itemShow(item) {
+				item.showCart = true
+				console.log("item", item.showCart);
+			},
+			itemShow2(item) {
+
+
+				if (item.goodsNumber == 0) {
+					this.shortToast('请添加商品。')
+					return
+				}
+
+				var good = {
+					goodsSid: item.goodsSid,
+					goodsName: item.name,
+					goodsNumber: item.goodsNumber,
+					affiliation: this.brandType,
+					price: item.mefenPrice,
+					weight: item.weight,
+					customerSid: getApp().globalData.sid
+				}
+				console.log("itemShow2", good);
+
+				let _this = this
+				_this.$api.addShoppingCart(good).then((resp) => {
+					item.showCart = false
+					console.log("item2", item.showCart);
+				}).catch(e => {})
+			},
+			jian(item) {
+				const that = this
+				console.log("item》》》》", item)
+				if (Number(item.goodsNumber) == 1) {
+
+					wx.showModal({
+						content: '确定不要了吗',
+						cancelText: "再想想",
+						confirmText: "删除",
+						confirmColor: "#FF9900",
+						success(res) {
+							if (res.confirm) {
+								console.log('用户点击确定')
+								item.goodsNumber = 0
+								item.subtotal = 0
+								that.getallPrice()
+								that.getweight()
+								that.upDateShoppCart(item)
+							} else if (res.cancel) {
+
+							}
+						}
+					})
+
+				} else {
+					if (Number(item.goodsNumber) > 0) {
+						item.goodsNumber = Number(item.goodsNumber) - 1
+					}
+
+					item.subtotal = Number(item.goodsNumber) * Number(item.mefenPrice)
+					that.getallPrice()
+					that.getweight()
+					that.upDateShoppCart(item)
+				}
+			},
+			jia(item) {
+
+				item.goodsNumber = Number(item.goodsNumber) + 1
+				item.subtotal = Number(item.goodsNumber) * Number(item.mefenPrice)
+
+				this.getallPrice()
+				this.getweight()
+				this.upDateShoppCart(item)
+			},
+
+			getallPrice() {
+
+				let num = 0;
+				for (var i = 0; i < this.goods.length; i++) {
+					num += Number(this.goods[i].subtotal);
+				}
+
+				this.page.price = num
+				// if (this.brandType == '0')
+				// 	this.page.price1 = num
+
+				// if (this.brandType == '1')
+				// 	this.page.price2 = num
+
+				// if (this.brandType == '2')
+				// 	this.page.price3 = num
+			},
+
+			getweight() {
+
+				let num = 0;
+				for (var i = 0; i < this.goods.length; i++) {
+					num += Number(this.goods[i].weight) * Number(this.goods[i].goodsNumber);
+
+				}
+
+				this.page.weight = num
+
+				// if (this.brandType == '0')
+				// 	this.page.weight1 = num
+
+				// if (this.brandType == '1')
+				// 	this.page.weight2 = num
+
+				// if (this.brandType == '2')
+				// 	this.page.weight3 = num
+			},
+
+			// getcount() {
+
+			// 	let num = 0;
+			// 	for (var i = 0; i < this.goods.length; i++) {
+			// 		num += Number(this.goods[i].goodsNumber);
+			// 	}
+
+			// 	this.page.goodsNumber = num
+			// },
+
+			upDateShoppCart(item) {
+				var good = {
+					goodsSid: item.goodsSid,
+					goodsName: item.name,
+					goodsNumber: item.goodsNumber,
+					affiliation: this.brandType,
+					price: item.mefenPrice,
+					weight: item.weight,
+					customerSid: getApp().globalData.sid
+				}
+
+				let _this = this
+				_this.$api.addShoppingCart(good).then((resp) => {
+
+				}).catch(e => {})
+			},
+
+
+			detail(item) {
+				// 详情
+				uni.navigateTo({
+					url: '/pages/cloud/detail_cloudCard?sid=' + item.sid + "&name=" + item.name
+				})
+			},
+			settlement() {
+				// 支付
+
+				// if (this.page.weight < 200) {
+				// 	this.shortToast('满200斤才可定制云菜窖哦，请继续选菜吧。')
+				// 	return
+				// }
+
+
+				let list = []
+
+				for (var i = 0; i < this.goods.length; i++) {
+					var item = this.goods[i]
+					if (item.goodsNumber > 0)
+						list.push({
+							goodsSid: item.goodsSid,
+							goodsName: item.name,
+							partNumber: item.goodsNumber,
+							numofPart: item.weight,
+							priceUnit: item.jprice, // 斤单价
+							pricePart: item.mefenPrice, //  份单价
+						})
+				}
+				// console.log("ddd", list);
+
+				if (list.length == 0) {
+					this.shortToast('请添加商品')
+					return
+				}
+
+				var params = {
+					customerSid: getApp().globalData.sid,
+					cardNumber: 1,
+					totalTee: this.page.price,
+					ordOrderDetailsVoList: list
+				}
+				// console.log("params", params);
+
+				let _this = this
+				_this.$api.createOrder(params).then((resp) => {
+
+					// console.log("resp", resp);
+					this.$pay(resp)
+				}).catch(e => {})
+
+			},
+			itemClick(goodsSid) {
+				uni.navigateTo({
+					url: '/pages/good/goodsDetail?sid=' + goodsSid
+				})
+			},
+			gotoCart() {
+				uni.navigateTo({
+					url: '/pages/good/shoppCart?affiliation=' + this.brandType
+				})
+			}
+		}
+	}
+</script>
+
+<style>
+	.top {
+		width: 100vw;
+		/* height: 126.66vw; */
+		height: 75vw;
+		/* 加载背景图 */
+		background-image: url(https://supervise.yxtsoft.com/lpk/image/clound_bj1.png);
+		/* background-image: url(../../static/clound_bj1.png); */
+		/* 让背景图基于容器大小伸缩 */
+		background-size: 100% 100%;
+	}
+
+	.label {
+		background: #fff;
+		color: #FF9900;
+		font-size: 13px;
+		padding-top: 15px;
+		padding-bottom: 15px;
+		text-align: center;
+	}
+
+	.label2 {
+
+		background: #FF9900;
+		color: #fff;
+		font-size: 13px;
+		padding-top: 15px;
+		padding-bottom: 15px;
+		text-align: center;
+	}
+
+	.top_img1 {
+		border: 1px #FF9900 solid;
+	}
+
+	.top_img2 {
+		border: none
+	}
+
+	.top_text1 {
+		border: 1px #FF9900 solid;
+		background: #FF5006;
+		color: #fff;
+		font-weight: 800;
+		font-family: sans-serif;
+		padding: 2px 5px;
+		border-radius: 5px;
+		margin-top: -25px;
+	}
+
+	.top_text2 {
+		border: 1px #FF9900 solid;
+		background: #fff;
+		color: #F6894B;
+		font-weight: 800;
+		font-family: sans-serif;
+		padding: 2px 5px;
+		border-radius: 5px;
+		margin-top: -25px;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/home/myCellar.vue b/pages/home/myCellar.vue
new file mode 100644
index 0000000..e18f452
--- /dev/null
+++ b/pages/home/myCellar.vue
@@ -0,0 +1,584 @@
+<template>
+
+	<view
+		style="display: flex;flex-direction: column;height: 100vh;background: -webkit-linear-gradient(left,#FEA65F,#FB9440);">
+
+		<view class="top">
+			<NavBar ref="nav" navTitle=" " :showIcon="false" :start-change-height="page.startHeight"
+				:end-change-height="page.endHeight">
+			</NavBar>
+
+		</view>
+
+
+		<view style="background: #fff;flex-flow: 1; height: calc(100vh - 65vw - 50px); 
+			width: 100%; margin-top: -13vw;
+			border-radius: 25px;display: flex;flex-direction: column; box-sizing: border-box;">
+
+			<view style="display: flex;flex-direction: row;height: 25px; width: 100%; flex-shrink: 0;">
+
+				<view style="width: 20%;background: #F7F7F7;border-top-left-radius: 25px;"></view>
+				<view style="width: 80%;background: #fff; border-top-right-radius: 25px;"></view>
+			</view>
+
+			<view style="display: flex;flex-direction: row;min-height: calc(100% - 80px);  ">
+
+				<view style="display: flex;flex-direction: column;width: 21%;background: #F7F7F7; ">
+					<text style="font-weight: 600;font-family: sans-serif;
+					color: #333;
+					font-size: 15px;
+					padding-top: 15px;
+					padding-bottom: 15px;
+					margin-top: -20px;
+					text-align: center;">菜窖分类</text>
+
+
+					<scroll-view scroll-y="true" style="height: 100%; width: 100%;border-bottom-left-radius: 25px;"
+						:scroll-top="scrollLeftTop" bindscrolltoupper="upper" bindscrolltolower="lower"
+						:show-scrollbar="false" :enhanced="true" bindscroll="scroll">
+
+
+						<view
+							style="width: 100%;height: 100%;; display: flex;flex-direction: column; background: #F7F7F7;border-bottom-left-radius: 25px;">
+							<view v-for="(item,index) in data" @click="labelClick(index,item)"
+								style="display: flex;flex-direction: column;justify-content: center; margin-bottom: 15px; position: relative;">
+
+								<text class="label" :class="{ label2: selectIndex==index }">{{item.name}}</text>
+
+								<view v-if="item.count>0" style="border-radius: 50%;text-align: center;background: #f00;color: #fff;font-size: 8px;
+								position: absolute;
+								  top: 8px;
+								  right: 3px;
+								  padding: 2px 5px;
+								  width: auto;">{{item.count}}</view>
+							</view>
+
+						</view>
+					</scroll-view>
+				</view>
+				<view style="width: 80%;min-height: calc(100% - 80px); display: flex;flex-direction: column; 
+					margin-left: 10px; margin-right: 10px; margin-top: -10px; ">
+
+					<scroll-view scroll-y="true" style="height: 100%;  width: 100%;" bindscrolltoupper="upper"
+						bindscrolltolower="lower" bindscroll="scroll" :show-scrollbar="false"
+						:scroll-top="scrollRightTop" :enhanced="true">
+
+						<view style="width: 100%; display: flex;flex-direction: column;">
+							<view v-for="(item,index) in goods" @click="itemClick(item.goodsSid)"
+								style="display: flex;flex-direction: column;justify-content: center;width: 100%; margin-top: 15px; ">
+
+								<view style="display: flex;flex-direction: row;align-items: center;width: 100%;  ">
+
+									<image :src="item.iconUrl" style="width: 90px;height: 90px; border-radius: 10px; "
+										mode="aspectFill"></image>
+
+									<view
+										style="display: flex;flex-direction: column;flex: 1;  padding-bottom: 15px; margin-left: 10px;"
+										:style="{'border-bottom':(index == goods.length-1 ? 'none' : '1px #EFEFEF solid')}">
+
+										<text style="font-size: 13px;color: #000;">{{item.name}}</text>
+
+										<text
+											style="font-size: 10px;color: #999;margin-top: 5px;">{{item.remark}}</text>
+
+										<view
+											style="display: flex;flex-direction: row;align-items: center;margin-top: 8px;">
+											<text
+												style="border: 1px #EE752F solid; border-radius: 5px;	padding: 0px 8px;
+											font-size: 10px;color: #EE752F;  margin-right: 10px; ">{{item.weight}}{{item.specificationUnit}}/{{item.unitName}}</text>
+
+											<text
+												style="border: 1px #EE752F solid; background: #FF9900; color: #fff; font-size: 10px;border-radius: 5px;	padding: 0px 8px;"
+												v-if="item.type=='0'">百姓菜!</text>
+											<text
+												style="border: 1px #3AA15F solid; background: #40C772; color: #fff; font-size: 10px;border-radius: 5px;	padding: 0px 8px;"
+												v-if="item.type=='1'">精品菜!</text>
+											<text
+												style="border: 1px #1D60C7 solid; background: #2489F7; color: #fff; font-size: 10px;border-radius: 5px;	padding: 0px 8px;"
+												v-if="item.type=='2'">企业菜!</text>
+
+										</view>
+
+										<view style="display: flex;flex-direction: row;align-items: center;justify-content: space-between; margin-top: 15px;
+										margin-right: 15px;">
+
+
+											<view style="display: flex;flex-direction: row;align-items: center;">
+												<text style="font-size: 12px;color: #666;">存量：</text>
+												<text
+													style="font-size: 14px;color: #FF5006;">{{item.goodsNumber}}{{item.unitName}}</text>
+											</view>
+
+
+
+											<view style="display: flex;flex-direction: row;align-items: center;">
+
+												<image src="../../static/jian_icon.png" mode="aspectFill"
+													style="width: 20px;height: 20px;" @click.stop="jian(item)"></image>
+
+												<text
+													style="font-size: 14px;margin-left: 8px;margin-right: 8px;">{{item.count}}</text>
+												<image src="../../static/jia_icon.png" mode="aspectFill"
+													style="width: 20px;height: 20px;" @click.stop="jia(item)"></image>
+
+											</view>
+
+										</view>
+
+									</view>
+
+								</view>
+
+							</view>
+
+							<view v-if="notData"
+								style="display: flex;flex-direction: column;justify-content: center;align-items: center;">
+
+								<image src="https://supervise.yxtsoft.com/lpk/image/buchongcaijiao.png"
+								mode="aspectFit" style="width: 15vm;height: 15vm;"></image>
+								<view style="display: flex;flex-direction: row;align-items: center;margin-top: 15px;">
+									<text style="font-size: 14px; color: #666;margin-right: 5px;">您的菜窖为空,请</text>
+									<text
+										style="background: #FF9900; border-radius: 8px; padding: 3px 8px; color: #fff;"
+										@click="gotoShopp()">补充菜窖</text>
+								</view>
+							</view>
+
+						</view>
+					</scroll-view>
+
+				</view>
+
+			</view>
+
+			<view style="display: flex;flex-direction: column;border-top: 1px solid #F8F8F8; border-bottom-left-radius: 25px;border-bottom-right-radius: 25px;
+			padding-top: 5px; flex-shrink: 0; ">
+
+				<view
+					style="display: flex;flex-direction: row; justify-content: center;align-items: center;padding-bottom: 10px;margin-top: 5px;">
+
+					<text style="background: #FF9900; color: #fff;font-size: 13px; padding: 8px 15px;
+					border: 1px #FF5006 solid; border-top-left-radius: 25px; border-bottom-left-radius: 25px;">转赠亲友</text>
+
+					<view style="border: 1px #FF5006 solid;margin-left: 5px;margin-right: 5px;padding: 5px 10px;
+					display: flex;flex-direction: row;align-items: center;" @click="gotoCart()">
+						<image src="../../static/shoppCart_icon.png" mode="aspectFill"
+							style="height: 20px;width: 25px;"></image>
+						<text style="font-size: 12px;color: #666;margin-left: 10px; ">共选</text>
+						<text style="font-size: 15px;color: #FF5006;margin-left: 10px; ">{{page.count}}</text>
+						<text style="font-size: 12px;color: #666;margin-left: 10px; ">份蔬菜</text>
+					</view>
+					<text style="background: #FF9900; color: #fff;font-size: 13px; padding: 8px 15px;
+					border: 1px #FF5006 solid; border-top-right-radius: 25px; border-bottom-right-radius: 25px;"
+						@click="reservation()">预约提菜</text>
+
+				</view>
+
+			</view>
+
+
+
+			<!-- 弹窗蒙版 -->
+			<view class="model" catchtouchmove='preventTouchMove' v-if='showModal' @click.stop="colseDialog()"></view>
+			<view class="modalDlg" catchtouchmove='preventTouchMove' v-if='showModal'>
+
+				<scroll-view scroll-y="true" style="min-height: calc(100% - 50px);; padding-top: 10px;"
+					bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll">
+
+					<view style="display: flex;flex-direction: column; margin: 20px;padding-top: 10px;">
+
+						<view
+							style="display: flex;flex-direction: row;align-items: center;justify-content: space-between;">
+
+							<text
+								style="font-size: 16px; color: #333; font-weight: 600; font-family: sans-serif;">提菜点信息</text>
+
+							<view style="display: flex;flex-direction: row;align-items: center;">
+								<text v-if="pickingUp.name==''"
+									style="font-size: 14px;color: #666;margin-right: 10px;">{{pickingUp.type}}</text>
+								<text v-if="pickingUp.name!=''"
+									style="font-size: 16px;color: #333;margin-right: 10px;">{{pickingUp.name}}</text>
+								<image src="../../static/right_icon.png" mode="aspectFill"
+									style="width: 20px;height: 20px;"></image>
+							</view>
+
+						</view>
+
+						<view v-if="pickingUp.name!=''" style="display: flex;flex-direction: column;">
+
+							<view style="display: flex;flex-direction: row;align-items: center;margin-top: 15px;">
+								<image src="https://supervise.yxtsoft.com/lpk/image/date.png"
+									style="width:20px;height: 20px;"></image>
+								<text
+									style="margin-left: 5px;flex: 1;color: #666;font-size: 14px;">营业时间:{{pickingUp.date}}</text>
+
+							</view>
+
+							<view style="display: flex;flex-direction: row;align-items: center;margin-top: 15px;">
+								<image src="https://supervise.yxtsoft.com/lpk/image/location.png"
+									style="width: 20px;height: 20px;"></image>
+								<text
+									style="margin-left: 5px;flex: 1; color: #666;font-size: 14px;">{{pickingUp.address}}</text>
+
+							</view>
+
+						</view>
+
+
+						<view
+							style="display: flex;flex-direction: row;align-items: center;justify-content: space-between;margin-top: 20px;">
+
+							<text
+								style="font-size: 16px; color: #333; font-weight: 600; font-family: sans-serif;">提菜人信息</text>
+
+							<view style="display: flex;flex-direction: row;align-items: center;">
+								<text v-if="userInfo.name==''"
+									style="font-size: 14px;color: #666;margin-right: 10px;">{{userInfo.type}}</text>
+								<text v-if="userInfo.name!=''"
+									style="font-size: 16px;color: #333;margin-right: 10px;">{{userInfo.name}}</text>
+								<text v-if="userInfo.phone!=''"
+									style="font-size: 14px;color: #666;margin-right: 10px;">{{userInfo.phone}}</text>
+								<image src="../../static/right_icon.png" mode="aspectFill"
+									style="width: 20px;height: 20px;"></image>
+							</view>
+
+						</view>
+
+
+						<view style="display: flex;flex-direction: column;margin-top: 20px;">
+
+							<text
+								style="font-size: 16px; color: #333; font-weight: 600; font-family: sans-serif;">所提蔬菜列表</text>
+
+							<view style="width: 100%; display: flex;flex-direction: column;">
+								<view v-for="(item,index) in pickingUpGoods" @click="itemClick(item.goodsSid)"
+									style="display: flex;flex-direction: column;justify-content: center;width: 100%; margin-top: 15px; ">
+
+									<view style="display: flex;flex-direction: row;align-items: center;width: 100%;  ">
+
+										<image :src="item.iconUrl"
+											style="width: 90px;height: 90px; border-radius: 10px; " mode="aspectFill">
+										</image>
+
+										<view
+											style="display: flex;flex-direction: column;flex: 1;  padding-bottom: 15px; margin-left: 10px;"
+											:style="{'border-bottom':(index == pickingUpGoods.length-1 ? 'none' : '1px #EFEFEF solid')}">
+
+											<text style="font-size: 13px;color: #000;">{{item.name}}</text>
+
+											<text
+												style="font-size: 10px;color: #999;margin-top: 5px;">{{item.remark}}</text>
+
+											<view
+												style="display: flex;flex-direction: row;align-items: center;margin-top: 8px;">
+												<text
+													style="border: 1px #EE752F solid; border-radius: 5px;	padding: 0px 8px;
+												font-size: 10px;color: #EE752F;  margin-right: 10px; ">{{item.weight}}{{item.specificationUnit}}/{{item.unitName}}</text>
+
+												<text
+													style="border: 1px #EE752F solid; background: #FF9900; color: #fff; font-size: 10px;border-radius: 5px;	padding: 0px 8px;"
+													v-if="item.type=='0'">百姓菜!</text>
+												<text
+													style="border: 1px #3AA15F solid; background: #40C772; color: #fff; font-size: 10px;border-radius: 5px;	padding: 0px 8px;"
+													v-if="item.type=='1'">精品菜!</text>
+												<text
+													style="border: 1px #1D60C7 solid; background: #2489F7; color: #fff; font-size: 10px;border-radius: 5px;	padding: 0px 8px;"
+													v-if="item.type=='2'">企业菜!</text>
+
+											</view>
+
+											<view style="display: flex;flex-direction: row;align-items: center;justify-content: space-between; margin-top: 15px;
+											margin-right: 15px;">
+
+
+												<view style="display: flex;flex-direction: row;align-items: center;">
+													<text style="font-size: 12px;color: #FF5006;">剩余：</text>
+													<text
+														style="font-size: 14px;color: #FF5006;">{{item.goodsNumber}}{{item.unitName}}</text>
+												</view>
+
+
+
+												<view style="display: flex;flex-direction: row;align-items: center;">
+
+													<image src="../../static/jian_icon.png" mode="aspectFill"
+														style="width: 20px;height: 20px;" @click.stop="jian(item)">
+													</image>
+
+													<text
+														style="font-size: 14px;margin-left: 8px;margin-right: 8px;">{{item.count}}</text>
+													<image src="../../static/jia_icon.png" mode="aspectFill"
+														style="width: 20px;height: 20px;" @click.stop="jia(item)">
+													</image>
+
+												</view>
+
+											</view>
+
+										</view>
+
+									</view>
+
+								</view>
+
+							</view>
+
+						</view>
+
+						<view style="height: 150px;"></view>
+
+						<text style="background: #FF9900;color: #fff; margin-left: 20px; margin-right: 20px;border-radius: 20px;
+						padding-top: 10px;padding-bottom: 10px;text-align: center;">确认提菜</text>
+
+						<view style="height: 80px;"></view>
+
+					</view>
+
+				</scroll-view>
+			</view>
+
+
+		</view>
+
+	</view>
+
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				notData: false,
+				showModal: false,
+				scrollHeight: "",
+				scrollLeftTop: "0",
+				scrollRightTop: "0",
+				brandType: "0",
+				styleObject: {
+					// 'position': 'fixed',
+					// 'top':'80vw',
+					'margin-top': '62vw',
+					'border-top-left-radius': '25px',
+					'border-top-right-radius': '25px',
+					'border-bottom-left-radius': '25px',
+					'border-bottom-right-radius': '25px',
+					'background': '#fff',
+					'padding-top': '10px',
+					'margin-bottom': "60px"
+
+				},
+				page: {
+					count: "0",
+					startHeight: 0,
+					endHeight: 0
+				},
+				data: [],
+				goods: [],
+				selectIndex: 0,
+				pickingUp: {
+					type: "去完善",
+					name: "",
+					date: "",
+					address: ""
+				},
+				userInfo: {
+					type: "去完善",
+					name: "",
+					phone: ""
+				},
+				pickingUpGoods: [
+
+				]
+
+			}
+		},
+		onShow() {
+			if (typeof this.$mp.page.getTabBar === 'function' && this.$mp.page.getTabBar()) {
+				this.$mp.page.getTabBar().setData({
+					selected: 1
+				})
+
+			}
+		},
+		onHide() {
+			this.colseDialog()
+		},
+
+		onLoad() {
+
+			let info = uni.getSystemInfoSync();
+
+			this.page.startHeight = info.windowWidth * 0.6
+			this.page.endHeight = info.windowWidth * 0.8
+
+			this.request()
+
+		},
+		methods: {
+			labelClick(index, item) {
+				this.selectIndex = index
+				this.brandType = item.sid
+				this.pickingUpGoods = []
+				this.page.count = 0
+				this.getgoods()
+
+			},
+			request() {
+				let _this = this
+				var params = {
+					customerSid: getApp().globalData.sid
+				}
+
+				_this.$api.vegeCellarTypeList(params).then((resp) => {
+					_this.data = resp
+					_this.selectIndex = 0
+					_this.getgoods()
+					_this.scrollLeftTop = _this.scrollLeftTop == 0 ? -1 : 0
+					_this.scrollRightTop = _this.scrollRightTop == 0 ? -1 : 0
+				}).catch(e => {})
+			},
+			getgoods() {
+				let _this = this
+
+				var params = {
+					customerSid: getApp().globalData.sid,
+					affiliation: this.brandType
+				}
+
+				_this.$api.vegeCellarList(params).then((resp) => {
+					_this.goods = resp
+
+					_this.notData = resp.length == 0
+				}).catch(e => {})
+			},
+			jian(item) {
+				if (Number(item.count) > 0) {
+					item.count = Number(item.count) - 1
+					this.addGoods(item)
+				}
+				this.getcount()
+			},
+			jia(item) {
+				item.count = Number(item.count) + 1
+				this.getcount()
+				this.addGoods(item)
+			},
+
+			getcount() {
+
+				let num = 0;
+				for (var i = 0; i < this.goods.length; i++) {
+					num += Number(this.goods[i].count);
+				}
+
+				this.page.count = num
+			},
+
+			addGoods(goods) {
+
+				var item = this.pickingUpGoods.find(item => item.goodsSid == goods.goodsSid)
+
+				if (item) {
+
+					if (goods.count == 0) {
+						var index = this.pickingUpGoods.findIndex(item => item.goodsSid == goods.goodsSid)
+						this.pickingUpGoods.splice(index, 1)
+					} else {
+						item.count = goods.count
+					}
+
+				} else {
+					this.pickingUpGoods.push(goods)
+
+				}
+
+			},
+
+			itemClick(goodsSid) {
+				uni.navigateTo({
+					url: '/pages/good/goodsDetail?sid=' + goodsSid
+				})
+			},
+
+			gotoShopp() {
+				uni.switchTab({
+					url: '/pages/home/cloudCard2',
+				})
+			},
+			reservation() {
+				if (this.pickingUpGoods.length > 0){
+					this.showModal = true
+				}else{
+					this.shortToast('请先选择商品')
+				}
+					
+			},
+			colseDialog() {
+				this.showModal = false
+			}
+		}
+	}
+</script>
+
+<style>
+	.top {
+		width: 100vw;
+		/* height: 126.66vw; */
+		height: 75vw;
+		/* 加载背景图 */
+		background-image: url(https://supervise.yxtsoft.com/lpk/image/clound_bj1.png);
+		/* background-image: url(../../static/clound_bj1.png); */
+		/* 让背景图基于容器大小伸缩 */
+		background-size: 100% 100%;
+	}
+
+	.label {
+		background: #fff;
+		color: #FF9900;
+		font-size: 13px;
+		padding-top: 15px;
+		padding-bottom: 15px;
+		text-align: center;
+	}
+
+	.label2 {
+
+		background: #FF9900;
+		color: #fff;
+		font-size: 13px;
+		padding-top: 15px;
+		padding-bottom: 15px;
+		text-align: center;
+	}
+
+	/* 弹窗样式 */
+	.model {
+		position: absolute;
+		width: 100%;
+		height: 100%;
+		background: #000;
+		z-index: 999;
+		opacity: 0.5;
+		top: 0;
+		left: 0;
+	}
+
+	.modalDlg {
+		/* 设置超出滚动 */
+		overflow: auto;
+		width: 100%;
+		position: fixed;
+		top: 50vw;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		z-index: 9999;
+		background-color: #fff;
+		border-top-right-radius: 20px;
+		border-top-left-radius: 20px;
+		display: flex;
+		flex-direction: column;
+
+
+	}
+</style>
\ No newline at end of file
diff --git a/pages/home/myHome.vue b/pages/home/myHome.vue
index f84f73d..5a4cd8d 100644
--- a/pages/home/myHome.vue
+++ b/pages/home/myHome.vue
@@ -21,7 +21,7 @@
 				</view>
 
 				<view style="display: flex;flex-direction: column;margin-left: 10px;" v-if="userInfo.nick==''">
-					<text style="font-size: 16px;color: #fff;" @click="showDiaLog">绑定用户</text>
+					<text style="font-size: 16px;color: #fff;" @click="showDiaLog">完善信息</text>
 				</view>
 			</view>
 
@@ -328,7 +328,10 @@
 				})
 			},
 			showDiaLog() {
-				this.showModal = true
+				// this.showModal = true
+				uni.navigateTo({
+					url: '/pages/me/base_info'
+				})
 			},
 			colseDialog() {
 				this.showModal = false
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 0eb5c1c..a673717 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -127,8 +127,9 @@
 
 										} else {
 											uni.switchTab({
-												url: '/pages/home/pickUpCard',
+												// url: '/pages/home/pickUpCard',
 												// url: '/pages/home/myHome',
+												url: '/pages/home/myCellar',
 											})
 										}
 
diff --git a/pages/me/base_info.vue b/pages/me/base_info.vue
index 13e5dc0..4e7f1cf 100644
--- a/pages/me/base_info.vue
+++ b/pages/me/base_info.vue
@@ -2,7 +2,7 @@
 
 	<view style="display: flex;flex-direction: column;">
 
-		<NavBar ref="nav" navTitle="个人信息" :showIcon="true">
+		<NavBar ref="nav" navTitle="个人信息" :showIcon="true" :supportChange="false">
 		</NavBar>
 
 		<loading-state ref="pageView" @request="request">
diff --git a/static/basket_icon.png b/static/basket_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..f5a5395342866463751ca540b47aebc8cebb62ad
GIT binary patch
literal 10573
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
b10?@1&LkU9a;2l>00000NkvXXu0mjf7-CcI

literal 0
HcmV?d00001

diff --git a/static/inCart.png b/static/inCart.png
new file mode 100644
index 0000000000000000000000000000000000000000..4755c84028f429e88ceb3c48acb9d67a025816b3
GIT binary patch
literal 3078
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
UDE`GBqW}N^07*qoM6N<$f&=K_iU0rr

literal 0
HcmV?d00001

diff --git a/static/jia_icon.png b/static/jia_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..2f63bccd93d7ad8d92dc94a0497c1989b3bc6fe5
GIT binary patch
literal 328
zcmeAS@N?(olHy`uVBq!ia0vp^8X(NV3?%C=ER6$F1_3@Hu0Z<#OosnJ03_jP2E+eJ
zU@nj`jp6^z1^=(l`oA~o|Kpv@?Yiy)^$3&%`2_>D{XO$mcMe}qj4jB7m*&n@K)LOn
zE{-7;bCMS*zR=<{D~)f|nwF=*!Ez||MA94uMS&R&0?EZKoLwphShpWK!os@vAs4e?
z(;|bVIvj?Mj_fNQxET1qP?|BR<yD)8;4hAaiob3yZ0Zu&#h`PeM=OI-ET%(CgH=q&
zMO1{H+i5Seum~f!(_B7b5ms&{W)C+`E<UDauI&n8ZzFUMy;51zcl?#_8b&5=s}%|+
zFE+9o=~&4%c}A2Z^jfS5?6EaW@HM+3Eb(oLM<@fsA5~M~<hyJOfL>tmboFyt=akR{
E0AoIRTmS$7

literal 0
HcmV?d00001

diff --git a/static/jian_icon.png b/static/jian_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..0bad543d7a77ed15a95a0d5c84ce5d899127b44d
GIT binary patch
literal 394
zcmeAS@N?(olHy`uVBq!ia0vp^8X(NU3?z3ec*FxKj{u(#S0Md;uJ-?#4F4NIjBj(b
zf#i>QTHohsf1juId7k0hNh;sw>U^80^L>u?r<uCn=4gGJs|93#nXmhMp3cwtx<I|(
zXKTeiZU9*#Q4-`A%<%s|)8Dsq&g_a2<?FGUrg5fdg|3zE0^7jN1{FXxH$7b(Ln`K6
z4e=IhR^UlF<-b8m;nm;#s8>#cOZD$=-E34CXXh;Rt^P&tr67)#Q(xL&P*dIDykh0i
z>Sy<3J*E}UcADP%TsQYxgEW72NyEJLdqNNKr(b`dc-`Bk^F+3K|AbPX-imPlmUX{B
zOs|OcsehNjwCdM4tHvNz*7EboXB=hS^aEZL9pfn6Gtu$-Bg1P4MP@qBmgu@8wbIw8
z)k$cZ@0JO_w;xb@^l8P0J$q#yRV!JV?v&hQlXCE+zlR*xuNf2Br|;wX@>FTP_Fsk+
l0e>&HuO6ua=kN7DV(qWyv|JK-qZQ~$22WQ%mvv4FO#rBDuCo9D

literal 0
HcmV?d00001

diff --git a/static/search_icon.png b/static/search_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..17dac5303284179cba6e63cccdbe476d32b9e948
GIT binary patch
literal 376
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-s#sNMdu0VR`%$c)h&4Q5Ar%#_h
ze?D9U$e1x>29SgUAb0!!UvGih1WSVaf*JlNTrhADIIzFr{``Uk@gF91pWDR*lzi;z
z;uumf=WU3)SgV4-?;w`l-|gSdZ#d7!+?T!i2#b;GKf4o&R`<<)-&=p~$gACa__kHO
z#ft+03%CC|wcP#IB85+LmA<>}T(RQU#odL{Us%J<KKRQma^6?;<@uTWB5O1!@6@w7
zb#}4y-tW#Kc1BD!!QY*y?oMTX>-@{ACd-Xsx4-}CCfBUa)s4DUsVo`UMk+kUJD<LN
z(6szamXFN*$bCyEbZBnBcPEME2*XcF##!47#FeMJi9Fa<vcqb_w$Rqzz`lpeieBYk
z=sz>j`0cR^^*y_m?RXT-Au7ZuqGYGp@`pd@4`abP7U#yFnk7K*GI+ZBxvX<aXaWE;
Cv#R<4

literal 0
HcmV?d00001

diff --git a/static/shoppCart_icon.png b/static/shoppCart_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..3adf7083e53a3f6818c5e43fba39fbe8e789de0c
GIT binary patch
literal 921
zcmV;K17`e*P)<h;3K|Lk000e1NJLTq001li001lq1^@s69)wx}00004b3#c}2nYxW
zd<bNS0009}Nkl<ZSV!%cU2@Yf5XaZ;OnIa|LDLh^oPclw(i70W@bN@BL6Z}ZKDFsf
z!wCo{Ah|&}0lop|4S0z7uO-`ZY*~^MnaK>A$z(j%$4~3szjhVTp0#Mtc<DcI=r5LA
zSlrVi?0u;gOi0iizj5@A;?NL2^B2HV;8j~fM|2ilQQ|Xc$i6!85XhIX@-hC8@&8OM
z{3&{qTRtR<)7-|OgNv*bbOPWLr`bB_WCotn4C}v28II_L-9k)hh^NnixmNhXv*<0|
z)~(Y7e2oDg(?M%`f#6#JxY$HsYCzutni)#X417leI-swr_ZV(55)X8aiFlG;K;CoA
z{Ztw1Y*VGoz>f&LKlG#Pz!P@}@B>J!_GNYBG@f*D0hTk~?GhFq1hi^Cbtz7iEBXL0
z(D^wJ0B|SAIDki3?k0tds2{zCT4}A>!uK@6p!X(!3Sn``=^SgmG#Sa}5*4Kg0jbXk
z3&(gqMR0$EN^k&{S~GBsQgi?;Qv^X@0L;4Y1>8f#epeIJ>f$ap0EMVXsTXj%(IP1d
zt`s&&lW}NiT28ToQuJ;8w|S4XtU+!Ep3(vkok$zLrgbeB;1PhOF0PRq2TbT)4k{Pm
zPNYpZrUG{0a^!x1A5XUNQ`6WDg)pw;0$fNNp~gej76e#7l528^Y)vchuB0us;GwD;
z*Eqqr6qAihGJYPY=btc2_O4<ZH{haN%B3y!x!+KaNIO17DWmJ*UC;Y#tmz7YJu{7S
z1Fn&q{LJ?zG7eZmg+^T2G)?IWT#>d$U?eWEuDlu$_>Z&{aa{t6ePz-WxLV(_OZ+O_
z!Dg9VeF!(;j-<_HQ*OYzs0)13Cv@?zZiAeFm9%j%q&Y?4b^%$NZ>16`u(UGQSEoUN
z4fhe*n$8x^20$G+0J(JW*I4^bW85-bH@TZPuzk(2J-mTc87?bnq6z$M+y+s(7+;w1
zt!a!OpKu%}jm-<VRKjG_T8>iF>Uue^`Xo5%`nH3_4_Gf@a;L7pw6j@Cs}+l`4Ov>N
zpi==SZ#0Y6Do568#bTzKo1V>$`&n2@8*5~y$4f-@u+1T&ZbI2-<xQnyuI&Y!djTKS
vXf8q0<Qi$<$$Z2)32Fsw^Usj)_YU|kp#DBQkK=?*00000NkvXXu0mjf>tUpt

literal 0
HcmV?d00001

diff --git a/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue b/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue
index b5eee79..57e3fed 100644
--- a/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue
+++ b/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue
@@ -244,7 +244,7 @@
 	}
 
 	.uni-button-color {
-		color: #007aff;
+		color: #F4934B;
 	}
 
 	.uni-dialog-input {