From d0fc34265965cf0e74f2b37bc1be9d8d95a5ea35 Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Thu, 5 Dec 2024 00:40:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                     |   1 +
 api/model/index.js                          |  24 ++-
 api/model/info.js                           |  17 +-
 components/base/tabbar.vue                  |   2 +-
 components/product/productItem.vue          |   3 +-
 config.js                                   |   2 +-
 mixins/list.js                              |   4 +-
 pages.json                                  |  12 +-
 pages/index/cart.vue                        |  46 +++--
 pages/index/category.vue                    |  40 ++--
 pages/index/center.vue                      |  43 +++--
 pages/index/index.vue                       |  82 ++++++--
 pages/index/member.vue                      |  14 +-
 pages/index/order.vue                       |   3 +
 pages_order/auth/wxUserInfo.vue             |   2 +-
 pages_order/home/contact.vue                |  86 +++++++++
 pages_order/home/introduce.vue              |  58 +++---
 pages_order/home/journalism.vue             |  12 +-
 pages_order/home/notice.vue                 |  58 ++++++
 pages_order/mine/balance.vue                |  15 +-
 pages_order/mine/commission.vue             |  14 +-
 pages_order/mine/promotion.vue              | 277 ++++++++++++++++++++++++++++
 pages_order/mine/recommend.vue              |   9 +-
 pages_order/order/createOrder.vue           |  52 +++---
 pages_order/product/productDetail.vue       |  31 +++-
 static/image/member/m0.png                  | Bin 0 -> 10158 bytes
 static/image/member/m1.png                  | Bin 0 -> 8793 bytes
 static/image/member/m2.png                  | Bin 0 -> 7503 bytes
 store/store.js                              |  24 +++
 uni_modules/uv-ui-tools/libs/css/color.scss |   2 +-
 30 files changed, 760 insertions(+), 173 deletions(-)
 create mode 100644 pages_order/home/contact.vue
 create mode 100644 pages_order/home/notice.vue
 create mode 100644 pages_order/mine/promotion.vue
 create mode 100644 static/image/member/m0.png
 create mode 100644 static/image/member/m1.png
 create mode 100644 static/image/member/m2.png

diff --git a/App.vue b/App.vue
index 5277032..0d416ed 100644
--- a/App.vue
+++ b/App.vue
@@ -2,6 +2,7 @@
 	export default {
 		onLaunch: function() {
 			this.$store.commit('initConfig')
+			this.$store.commit('getCategoryList')
 		},
 		onShow: function() {
 		},
diff --git a/api/model/index.js b/api/model/index.js
index 2db07b1..5c4b3d3 100644
--- a/api/model/index.js
+++ b/api/model/index.js
@@ -20,7 +20,7 @@ const api = {
 	},
 	// 获取首页新闻详情
 	getRiceNewsDetail: {
-		url: '/rice_index/getRiceNewsDetail',
+		url: '/rice_index/getCommonNewsDetail',
 		method: 'GET', 
 	},
 	// 获取首页新闻列表
@@ -43,6 +43,28 @@ const api = {
 		url: '/rice_index/getRiceProductList',
 		method: 'GET', 
 	},
+	// 查询分类接口
+	getCategoryList: {
+		url: '/rice_index/getCategoryList',
+		method: 'GET',
+	},
+	// 获取分类分页商品列表接口
+	getClassShopPageList: {
+		url: '/rice_index/getClassShopPageList',
+		method: 'GET',
+	},
+	// 加入购物车
+	addCart: {
+		url: '/rice_index/addCart',
+		method: 'GET',
+		auth : true,
+	},
+	// 创建订单
+	createOrder: {
+		url: '/rice_index/createOrder',
+		method: 'GET',
+		auth : true,
+	},
 }
 
 export default api
\ No newline at end of file
diff --git a/api/model/info.js b/api/model/info.js
index 993cfc8..6fc61df 100644
--- a/api/model/info.js
+++ b/api/model/info.js
@@ -41,16 +41,29 @@ const api = {
 	getOrderPageList: {
 		url: '/rice_info/getOrderPageList',
 		method: 'GET',
-		limit : 500,
 		auth : true,
 	},
 	// 获取流水记录带分页
 	getWaterPageList: {
 		url: '/rice_info/getWaterPageList',
 		method: 'GET',
-		limit : 500,
 		auth : true,
 	},
+	// 获取相关介绍
+	getInfoIntroduce: {
+		url: '/rice_info/getInfoIntroduce',
+		method: 'GET',
+	},
+	// 获取相关介绍详情
+	getRiceInfo: {
+		url: '/rice_info/getRiceNewsDetail',
+		method: 'GET',
+	},
+	// 查询个人信息相关
+	getRiceInfo: {
+		url: '/rice_info/getRiceInfo',
+		method: 'GET',
+	},
 }
 
 export default api
\ No newline at end of file
diff --git a/components/base/tabbar.vue b/components/base/tabbar.vue
index bbff9ef..724d6a0 100644
--- a/components/base/tabbar.vue
+++ b/components/base/tabbar.vue
@@ -65,7 +65,7 @@
 		},
 		methods : {
 			toPath(item, index){
-				if(index == this.select){
+				if(item.key == this.select){
 					return
 				}
 				uni.reLaunch({
diff --git a/components/product/productItem.vue b/components/product/productItem.vue
index f3da87d..1228adc 100644
--- a/components/product/productItem.vue
+++ b/components/product/productItem.vue
@@ -1,7 +1,8 @@
 <template>
 	<view class="item" @click="$emit('click')">
 		<view class="item-image">
-			<image :src="item.image || 'https://img95.699pic.com/photo/50058/1378.jpg_wh860.jpg'" mode="aspectFill">
+			<image :src="item.image &&
+			item.image.split(',')[0]" mode="aspectFill">
 			</image>
 		</view>
 
diff --git a/config.js b/config.js
index b4d9cd4..4938f33 100644
--- a/config.js
+++ b/config.js
@@ -13,7 +13,7 @@ const type = 'dev'
 // 环境配置
 const config = {
 	dev : {
-		baseUrl : 'https://admin.szqwdgidm.com/rice-admin',
+		baseUrl : 'http://h5.xzaiyp.top/rice-admin',
 	},
 	prod : {
 		baseUrl : 'https://admin.szqwdgidm.com/rice-admin',
diff --git a/mixins/list.js b/mixins/list.js
index 4f072f9..a27db1c 100644
--- a/mixins/list.js
+++ b/mixins/list.js
@@ -52,9 +52,9 @@ export default {
 						
 						success(res.result)
 						
-						this[this.mixinsListKey || 'list'] = res.result.records
+						this[this.mixinsListKey || 'list'] = res.result.records || res.result
 						
-						this.total = res.result.total
+						this.total = res.result.total || res.result.length
 					}
 				})
 			})
diff --git a/pages.json b/pages.json
index f48717f..60f95e3 100644
--- a/pages.json
+++ b/pages.json
@@ -48,7 +48,8 @@
 	},
 	"subPackages": [{
 		"root": "pages_order",
-		"pages": [{
+		"pages": [
+			{
 				"path": "order/orderDetail"
 			},
 			{
@@ -101,6 +102,15 @@
 			},
 			{
 				"path": "mine/recharge"
+			},
+			{
+				"path": "mine/promotion"
+			},
+			{
+				"path": "home/notice"
+			},
+			{
+				"path": "home/contact"
 			}
 		]
 	}],
diff --git a/pages/index/cart.vue b/pages/index/cart.vue
index c5e018d..851294c 100644
--- a/pages/index/cart.vue
+++ b/pages/index/cart.vue
@@ -26,7 +26,8 @@
 								
 								<image 
 								class="image"
-								src="https://img95.699pic.com/photo/50058/1378.jpg_wh860.jpg" 
+								:src="item.image &&
+								item.image.split(',')[0]" 
 								mode=""></image>
 								
 								<view class="info">
@@ -40,7 +41,7 @@
 										</view>
 									</view>
 									<view class="unit">
-										规格：{{ item.unit }}
+										规格：{{ item.sku }}
 										<uv-icon name="arrow-down"></uv-icon>
 									</view>
 									<view class="price">
@@ -71,7 +72,8 @@
 						共{{ checkboxValue.length }}件，已享受更低优惠
 					</view>
 				</view>
-				<view class="btn">
+				<view class="btn"
+				@click="submit">
 					去结算
 				</view>
 			</view>
@@ -101,22 +103,6 @@
 						}
 					}, 
 				],
-				list : [
-					{
-						id : 1,
-						title : '桌布租赁',
-						num : 1,
-						price : 299,
-						unit : '120*40*75【桌子尺寸】',
-					},
-					{
-						id : 2,
-						title : '桌布租赁',
-						num : 1,
-						price : 299,
-						unit : '120*40*75【桌子尺寸】',
-					},
-				],
 				mixinsListApi : 'getCartPageList',
 			}
 		},
@@ -138,6 +124,28 @@
 			valChange(){
 				
 			},
+			// 立即下单
+			submit(){
+				if(this.checkboxValue.length == 0){
+					uni.showToast({
+						title: '请选择商品',
+						icon: 'none',
+					})
+					return
+				}
+				
+				let arr = []
+				
+				this.list.forEach(n => {
+					if(this.checkboxValue.includes(n.id)){
+						arr.push(n)
+					}
+				})
+				
+				this.$store.commit('setPayOrderProduct', arr)
+				
+				this.$utils.navigateTo('/pages_order/order/createOrder')
+			},
 		}
 	}
 </script>
diff --git a/pages/index/category.vue b/pages/index/category.vue
index ec4ac9a..c498558 100644
--- a/pages/index/category.vue
+++ b/pages/index/category.vue
@@ -4,18 +4,17 @@
 
 		<view class="category">
 			<uv-vtabs 
-			:chain="chain" 
 			:list="category"
-			height="1000px"
+			keyName="title"
 			:barItemBadgeStyle="{right:'20px',top:'12px'}" 
 			@change="change">
 				<uv-vtabs-item>
 					<view class="list">
 						<productItem
-						v-for="(item, index) in 10"
+						v-for="(item, index) in list"
 						:key="index"
 						:item="item"
-						@click="$utils.navigateTo('/pages_order/product/productDetail?id=123')"
+						@click="$utils.navigateTo('/pages_order/product/productDetail?id=' + item.id)"
 						/>
 					</view>
 				</uv-vtabs-item>
@@ -28,6 +27,7 @@
 <script>
 	import productItem from '@/components/product/productItem.vue';
 	import mixinsList from '@/mixins/list.js'
+	import { mapState } from 'vuex'
 	export default {
 		mixins : [mixinsList],
 		components: {
@@ -35,34 +35,22 @@
 		},
 		data() {
 			return {
-				category: [
-					{
-						name : '桌布'
-					},
-					{
-						name : '桌布'
-					},
-					{
-						name : '桌布'
-					},
-				],
-				value: 0
+				mixinsListApi : 'getClassShopPageList',
 			}
 		},
 		computed: {
-			list2() {
-				const _list = this.list[this.value]?.childrens;
-				return _list ? _list : [];
-			}
+			...mapState(['category'])
 		},
-		onReady() {
-			
+		onLoad() {
+			this.$store.commit('getCategoryList')
+			if(this.category.length > 0){
+				this.queryParams.classId = this.category[0].id
+			}
 		},
 		methods: {
-			change(index) {
-				console.log('选项改变：', index)
-				this.value = index;
-			}
+			change({index}) {
+				this.queryParams.classId = this.category[index].id
+			},
 		}
 	}
 </script>
diff --git a/pages/index/center.vue b/pages/index/center.vue
index e557994..abe18d1 100644
--- a/pages/index/center.vue
+++ b/pages/index/center.vue
@@ -10,7 +10,10 @@
 			<view class="info">
 				<view class="name">
 					<view class="one">{{ userInfo.nickName }}</view>
-					<view class="two">黄金会员</view>
+					<!-- <view class="two">黄金会员</view> -->
+					<view class="two">
+						<image :src="configList[vipImage[userInfo.isPay]]" mode=""></image>
+					</view>
 				</view>
 				<view class="vip">
 					ID：{{ userInfo.id }}
@@ -25,15 +28,16 @@
 		</view>
 
 		<view class="earnings">
-			<view class="member">
-				<view>会员等级：黄金会员</view>
+			<view class="member"
+			v-if="userInfo.isPay">
+				<view>会员等级：{{ vipType[userInfo.isPay] }}</view>
 				<view>查看权益></view>
 			</view>
 			<view class="deposit">
 				<view class="box"
 					@click="$utils.navigateTo('/pages_order/mine/balance')">
 					<view>
-						<view class="num">1.00</view>
+						<view class="num">{{ riceInfo.income || 0 }}</view>
 						<view class="text">收益明细(元)</view>
 					</view>
 					<view class="boxs">收益明细</view>
@@ -41,7 +45,7 @@
 				<view class="box">
 					<view
 					@click="$utils.navigateTo('/pages_order/mine/balance')">
-						<view class="num">1.00</view>
+						<view class="num">{{ riceInfo.balance || 0 }}</view>
 						<view class="text">余额(元)</view>
 					</view>
 					<view class="boxs"
@@ -51,7 +55,7 @@
 				<view class="box">
 					<view
 					@click="$utils.navigateTo('/pages_order/mine/commission')">
-						<view class="num" style="border: none;">1.00</view>
+						<view class="num" style="border: none;">{{ riceInfo.canWithdraw || 0 }}</view>
 						<view class="text">可提现(元)</view>
 					</view>
 					<view class="boxs"
@@ -107,7 +111,9 @@
 			</view>
 			<view class="cell-bottom">
 				<uv-cell-group>
-					<uv-cell icon="share" title="我的邀请码" :isLink="true" arrow-direction="right" />
+					<uv-cell icon="share" title="我的邀请码" 
+					@click="$utils.navigateTo('/pages_order/mine/promotion')"
+					:isLink="true" arrow-direction="right" />
 					
 					<uv-cell icon="share" title="我的推荐" :isLink="true" arrow-direction="right"
 						@click="$utils.navigateTo('/pages_order/mine/recommend')" />
@@ -142,13 +148,17 @@
 			customerServicePopup,
 		},
 		computed: {
-			...mapState(['userInfo']),
+			...mapState(['userInfo', 'riceInfo']),
 		},
 		data() {
-			return {}
+			return {
+				vipType : ['普通会员', '黄金会员', '渠道商'],
+				vipImage : ['vip_vip', 'vip_user', 'vip_shop']
+			}
 		},
 		onShow() {
 			this.$store.commit('getUserInfo')
+			this.$store.commit('getRiceInfo')
 		},
 		methods: {}
 	}
@@ -162,7 +172,6 @@
 			align-items: center;
 			justify-content: center;
 			height: 100%;
-
 		}
 
 		.rect {
@@ -244,11 +253,15 @@
 				}
 
 				.two {
-					font-size: 24rpx;
-					margin-left: 10rpx;
-					padding: 3rpx 16rpx;
-					border-radius: 18rpx;
-					background-color: rgb(252, 213, 157);
+					// font-size: 24rpx;
+					// margin-left: 10rpx;
+					// padding: 3rpx 16rpx;
+					// border-radius: 18rpx;
+					// background-color: rgb(252, 213, 157);
+					image{
+						width: 100rpx;
+						height: 50rpx;
+					}
 				}
 			}
 
diff --git a/pages/index/index.vue b/pages/index/index.vue
index e8401c7..3ae6308 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -9,9 +9,12 @@
 			{{ configList.index_title }}
 		</view>
 
-		<view class="search">
-			<uv-search placeholder="搜你喜欢的产品" bgColor="#fff" v-model="keyword"></uv-search>
-		</view>
+		<!-- <view class="search">
+			<uv-search 
+			placeholder="搜你喜欢的产品" 
+			bgColor="#fff" 
+			v-model="keyword"></uv-search>
+		</view> -->
 
 		<view class="swipe">
 			<uv-swiper 
@@ -21,21 +24,24 @@
 		</view>
 
 		<view class="notice">
-			<uv-notice-bar fontSize="32rpx" :text="notice"></uv-notice-bar>
+			<uv-notice-bar fontSize="32rpx" 
+			@click="$utils.navigateTo('/pages_order/home/notice')"
+			:text="notice"></uv-notice-bar>
 		</view>
 
 		<view class="menu">
 			<uv-grid :border="false" :col="4" >
 				<uv-grid-item v-for="(item,index) in baseList" :key="index" 
 				@click="toUrl(item.url)">
-					<image :src="item.image" mode=""></image>
+					<image :src="item.image" mode="aspectFill"></image>
 					<text class="menu-text">{{item.title}}</text>
 				</uv-grid-item>
 			</uv-grid>
 		</view>
 
-		<view class="map">
-			<image :src="configList.index_center_image" mode="aspectFill" />
+		<view class="map"
+		v-if="configList.qd_image">
+			<image :src="configList.qd_image" mode="aspectFill" />
 		</view>
 
 		<view class="commodity"
@@ -59,7 +65,8 @@
 							<text class="text2">原价{{ item.oldPrice }}</text>
 						</view>
 						<view class="box-img">
-							<image :src="item.image" mode="aspectFill"></image>
+							<image :src="item.image && 
+							item.image.split(',')[0]" mode="aspectFill"></image>
 						</view>
 					</view>
 				</view>
@@ -87,7 +94,8 @@
 							<text class="text2">原价{{ item.oldPrice }}</text>
 						</view>
 						<view class="box-img">
-							<image :src="item.image" mode="aspectFill"></image>
+							<image :src="item.image && 
+							item.image.split(',')[0]" mode="aspectFill"></image>
 						</view>
 					</view>
 				</view>
@@ -110,10 +118,12 @@
 				<view class="centre">
 					<view class="boxs"
 					:key="index"
+					@click="$utils.navigateTo('/pages_order/home/newsDetail?id=' + item.id)"
 					v-for="(item, index) in newList"
 					>
 						<view class="images">
-							<image :src="item.image" mode="aspectFill"></image>
+							<image :src="item.image && 
+							item.image.split(',')[0]" mode="aspectFill"></image>
 						</view>
 						<view class="box-fone">
 							<view>{{ item.title }}</view>
@@ -130,12 +140,15 @@
 				<image :src="configList.down_image" mode="aspectFill"></image>
 			</view>
 			<view class="qr-bottom">
-				<view>保存公众号二维码图片</view>
-				<view>长按识别公众号</view>
+				<view
+				@click="saveImage(configList.down_image)"
+				>保存公众号二维码图片</view>
 			</view>
 		</view>
 
 		<PrivacyAgreementPoup />
+		
+		<customerServicePopup ref="customerServicePopup"/>
 
 		<tabber select="home" />
 	</view>
@@ -146,15 +159,16 @@
 	import Position from '@/utils/position.js'
 	import tabber from '@/components/base/tabbar.vue'
 	import { mapState } from 'vuex'
+	import customerServicePopup from '@/components/config/customerServicePopup.vue'
 	export default {
 		components: {
 			tabber,
 			PrivacyAgreementPoup,
+			customerServicePopup,
 		},
 		data() {
 			return {
-				area: '长沙',
-				notice: '长沙市刘师傅在服务过程中客户投诉“服务过程中有不文明的行为”.....',
+				notice: '',
 				bannerList: [],
 				baseList: [
 					// {
@@ -228,7 +242,7 @@
 			getRiceNoticeList(){
 				this.$api('getRiceNoticeList', res => {
 					if(res.code == 200){
-						this.notice = res.result.content
+						this.notice = res.result.title
 					}
 				})
 			},
@@ -272,10 +286,38 @@
 					})
 					return
 				}
+				
+				if(url == '::phone'){
+					this.$refs.customerServicePopup.open()
+					return
+				}
+				
 				uni.navigateTo({
 					url
 				})
 			},
+			saveImage(image){
+				/* 获取图片的信息 */
+				uni.getImageInfo({
+					src: image,
+					success: function(image) {
+						/* 保存图片到手机相册 */
+						uni.saveImageToPhotosAlbum({
+							filePath: image.path,
+							success: function() {
+								uni.showModal({
+									title: '保存成功',
+									content: '图片已成功保存到相册',
+									showCancel: false
+								});
+							},
+							complete(res) {
+								console.log(res);
+							}
+						});
+					}
+				});
+			},
 		},
 	}
 </script>
@@ -362,12 +404,11 @@
 
 		.map {
 			margin: 20rpx;
-			height: 100rpx;
 			border-radius: 16rpx;
 
 			image {
 				width: 100%;
-				height: 100%;
+				height: 100rpx;
 			}
 		}
 
@@ -427,7 +468,10 @@
 					width: 100%;
 					align-items: center;
 					justify-content: center;
-					margin-top: 10rpx;
+					margin-top: 20rpx;
+					background-color: #f9f9f9;
+					border-radius: 20rpx;
+					padding: 20rpx;
 
 					.images {
 						width: 180rpx;
@@ -532,7 +576,7 @@
 				font-size: 28rpx;
 				color: #A2A2A2;
 				justify-content: space-around;
-
+				padding-bottom: 20rpx;
 				view {
 					border: 2rpx solid #A2A2A2;
 					padding: 20rpx;
diff --git a/pages/index/member.vue b/pages/index/member.vue
index a3012fb..f02cccb 100644
--- a/pages/index/member.vue
+++ b/pages/index/member.vue
@@ -22,9 +22,10 @@
 			</view>
 			<view class="di">
 				<view class="pad">
-					1000/999
+					{{ riceInfo.memberNum }}/{{ configList.vip_open_num }}
 				</view>
-				<view class="submitOpen">
+				<view class="submitOpen"
+				@click="submitOpen">
 					开通会员
 				</view>
 			</view>
@@ -143,6 +144,7 @@
 
 <script>
 	import tabber from '@/components/base/tabbar.vue'
+	import { mapState } from 'vuex'
 	export default {
 		components: {
 			tabber,
@@ -153,9 +155,13 @@
 				vipInfoList: [],
 			};
 		},
+		computed : {
+			...mapState(['userInfo', 'riceInfo']),
+		},
 		onShow() {
 			this.getBanner()
 			this.getRiceVipList()
+			this.$store.commit('getRiceInfo')
 		},
 		methods : {
 			// 获取轮播图
@@ -174,6 +180,10 @@
 					}
 				})
 			},
+			// 开通会员
+			submitOpen(){
+				
+			},
 		}
 	}
 </script>
diff --git a/pages/index/order.vue b/pages/index/order.vue
index 5ca059b..7be3c6d 100644
--- a/pages/index/order.vue
+++ b/pages/index/order.vue
@@ -84,7 +84,9 @@
 
 <script>
 	import { mapGetters } from 'vuex'
+	import mixinsList from '@/mixins/list.js'
 	export default {
+		mixins : [mixinsList],
 		components : {
 		},
 		computed : {
@@ -131,6 +133,7 @@
 				},
 				state : -1,
 				current : 0,
+				mixinsListApi : 'getOrderPageList',
 			}
 		},
 		onLoad(args) {
diff --git a/pages_order/auth/wxUserInfo.vue b/pages_order/auth/wxUserInfo.vue
index bca3512..24fa41d 100644
--- a/pages_order/auth/wxUserInfo.vue
+++ b/pages_order/auth/wxUserInfo.vue
@@ -79,7 +79,7 @@
 							nickName : self.userInfo.nickName
 						}, res => {
 							if (res.code == 200) {
-								uni.switchTab({
+								uni.reLaunch({
 									url:'/pages/index/index'
 								})
 							}
diff --git a/pages_order/home/contact.vue b/pages_order/home/contact.vue
new file mode 100644
index 0000000..b531a96
--- /dev/null
+++ b/pages_order/home/contact.vue
@@ -0,0 +1,86 @@
+<template>
+	<view class="page">
+		<navbar title="联系我们" leftClick @leftClick="$utils.navigateBack" />
+		
+		<view class="box">
+			<view class="">
+				<image :src="configList.wx_image" mode="aspectFill"></image>
+				<view class="uni-color-btn"
+				@click="saveImage(configList.wx_image)">
+					保存二维码
+				</view>
+			</view>
+			
+			<view class="">
+				联系电话：{{ configList.phone }}
+				<view class="uni-color-btn"
+				@click="confirm">
+					拨打电话
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			// 拨打电话
+			confirm() {
+				uni.makePhoneCall({
+					phoneNumber: this.configList.phone,
+					success() {
+						console.log('安卓拨打成功');
+					},
+					fail() {
+						console.log('安卓拨打失败');
+					}
+				})
+			},
+			saveImage(image){
+				/* 获取图片的信息 */
+				uni.getImageInfo({
+					src: image,
+					success: function(image) {
+						/* 保存图片到手机相册 */
+						uni.saveImageToPhotosAlbum({
+							filePath: image.path,
+							success: function() {
+								uni.showModal({
+									title: '保存成功',
+									content: '图片已成功保存到相册',
+									showCancel: false
+								});
+							},
+							complete(res) {
+								console.log(res);
+							}
+						});
+					}
+				});
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+.page{
+	.box{
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 70vh;
+		flex-direction: column;
+		gap: 40rpx;
+		image{
+			width: 400rpx;
+			height: 400rpx;
+		}
+	}
+}
+</style>
diff --git a/pages_order/home/introduce.vue b/pages_order/home/introduce.vue
index d00bbce..7c4184e 100644
--- a/pages_order/home/introduce.vue
+++ b/pages_order/home/introduce.vue
@@ -1,36 +1,36 @@
 <template>
 	<view class="page">
-		<navbar title="公司介绍" leftClick @leftClick="$utils.navigateBack" />
+		<navbar :title="title[type]" leftClick @leftClick="$utils.navigateBack" />
 		<view class="box">
 			<view class="box-imgs">
-				<view>
-					<view class="box-img">
-						<view>公司介绍</view>
-					</view>
-				</view>
-				<view>
-					<view class="box-img">
-						<view>公司介绍</view>
-					</view>
-				</view>
-				<view>
-					<view class="box-img">
-						<view>公司介绍</view>
-					</view>
+				<view
+				:key="index"
+				@click="$utils.navigateTo(`/pages_order/home/notice?id=${item.id}&type=${type}`)"
+				class="box-img"
+				v-for="(item, index) in list">
+					<image :src="item.image" mode="aspectFill"></image>
+					<view>{{ item.title }}</view>
 				</view>
 			</view>
 		</view>
-
 	</view>
 </template>
 
 <script>
+	import mixinsList from '@/mixins/list.js'
 	export default {
+		mixins: [mixinsList],
 		data() {
 			return {
-
+				mixinsListApi: 'getInfoIntroduce',//获取相关介绍
+				title : ['公司介绍', '产品介绍', '关于我们', '其他'],
+				type : 0,
 			}
 		},
+		onLoad({type}) {
+			this.type = type || 0
+			this.queryParams.type = this.type
+		},
 		computed: {},
 		methods: {}
 	}
@@ -43,26 +43,30 @@
 
 		.box {
 			margin: 20rpx;
-
+			image{
+				width: 220rpx;
+				height: 400rpx;
+			}
 			.box-imgs {
 				display: flex;
 				justify-content: space-between;
+				flex-wrap: wrap;
 				.box-img{
-					display: flex;
-					width: 220rpx;
-					height: 400rpx;
-					background-size: 100% 100%;
-					background-image: url(../../static/image/home/9.png);
-					justify-content: center;
-					align-items: center;
 					border-radius: 20rpx;
 					overflow: hidden;
+					position: relative;
 					view{
+						position: absolute;
+						left: 50%;
+						transform: translate(-50%);
+						bottom: 80rpx;
 						color: #fff;
-						margin-top: 200rpx;
-						padding: 10rpx 20rpx;
 						background-color: #A3D250;
 						border-radius: 30rpx;
+						width: 80%;
+						height: 60rpx;
+						line-height: 60rpx;
+						text-align: center;
 					}
 				}
 			}
diff --git a/pages_order/home/journalism.vue b/pages_order/home/journalism.vue
index ad43b1d..6c06aa4 100644
--- a/pages_order/home/journalism.vue
+++ b/pages_order/home/journalism.vue
@@ -1,10 +1,12 @@
 <template>
 	<view class="page">
 		<navbar title="新闻中心" leftClick @leftClick="$utils.navigateBack" />
-		<view class="card" @click="$utils.navigateTo('/pages_order/home/newsDetail?id=' + item.id)"
+		<view class="card" 
+		@click="$utils.navigateTo('/pages_order/home/newsDetail?id=' + item.id)"
 			v-for="(item, index) in list" :key="item.id">
 			<view class="card-img">
-				<image :src="item.image" mode="aspectFill"></image>
+				<image :src="item.image && 
+				item.image.split(',')[0]" mode="aspectFill"></image>
 			</view>
 			<view>
 				{{ item.title }}
@@ -37,10 +39,10 @@
 		background-color: #F3F3F3;
 
 		.card {
-			margin: 20rpx;
+			margin: 30rpx;
 			background-color: #fff;
-			border-bottom-left-radius: 16rpx;
-			border-bottom-right-radius: 16rpx;
+			overflow: hidden;
+			border-radius: 20rpx;
 
 			.card-img {
 				height: 250rpx;
diff --git a/pages_order/home/notice.vue b/pages_order/home/notice.vue
new file mode 100644
index 0000000..4e5f04c
--- /dev/null
+++ b/pages_order/home/notice.vue
@@ -0,0 +1,58 @@
+<template>
+	<!-- 公告 -->
+	<view class="page">
+		<navbar title="公告" leftClick @leftClick="$utils.navigateBack" />
+		<view style="padding: 20rpx;">
+			<uv-parse :content="notice"></uv-parse>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				notice : {},
+				id : 0,
+				title : '',
+				titles : ['公司介绍', '产品介绍', '关于我们', '其他'],
+			}
+		},
+		onLoad({id, type}) {
+			if(type){
+				this.title = this.titles[type]
+			}
+			if(id){
+				this.id = id
+				this.getInfoIntroduce()
+			}else{
+				this.getRiceNoticeList()
+			}
+		},
+		methods: {
+			// 获取公告
+			getRiceNoticeList(){
+				this.$api('getRiceNoticeList', res => {
+					if(res.code == 200){
+						this.notice = res.result.content
+					}
+				})
+			},
+			// 获取相关介绍
+			getInfoIntroduce(){
+				this.$api('getInfoIntroduceDetail', {
+					id : this.id
+				}, res => {
+					if(res.code == 200){
+						this.notice = res.result.details
+					}
+				})
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.page {
+	}
+</style>
\ No newline at end of file
diff --git a/pages_order/mine/balance.vue b/pages_order/mine/balance.vue
index 6c44028..42a4487 100644
--- a/pages_order/mine/balance.vue
+++ b/pages_order/mine/balance.vue
@@ -29,7 +29,7 @@
 					:center="true">
 						<template #value>
 							<view class="cell-text">
-								<view class="price-text">-19.9</view>
+								<view class="price-text">{{ type[item.type] }}{{ item.money }}</view>
 								<view class="tips">已到账</view>
 							</view>
 						</template>
@@ -47,15 +47,10 @@
 		mixins : [mixinsList],
 		data() {
 			return {
-				// mixinsListApi : 'getWaterPageList',
-				list : [
-					{
-						title : '直播收入',
-						type : 0,
-						createTime : '2021-12-12',
-					}
-				],
-				type : ['-', '+'],
+				mixinsListApi : 'getWaterPageList',
+				list : [],
+				type : ['+', '-'],
+				state : ['审核中', '成功', '失败'],
 			}
 		},
 		methods: {
diff --git a/pages_order/mine/commission.vue b/pages_order/mine/commission.vue
index c3c427a..5d5ecfd 100644
--- a/pages_order/mine/commission.vue
+++ b/pages_order/mine/commission.vue
@@ -29,7 +29,7 @@
 					:center="true">
 						<template #value>
 							<view class="cell-text">
-								<view class="price-text">-19.9</view>
+								<view class="price-text">{{ type[item.type] }}{{ item.money }}</view>
 								<view class="tips">已到账</view>
 							</view>
 						</template>
@@ -47,15 +47,9 @@
 		mixins : [mixinsList],
 		data() {
 			return {
-				// mixinsListApi : 'getWaterPageList',
-				list : [
-					{
-						title : '直播收入',
-						type : 0,
-						createTime : '2021-12-12',
-					}
-				],
-				type : ['-', '+'],
+				mixinsListApi : 'getWaterPageList',
+				type : ['+', '-'],
+				state : ['审核中', '成功', '失败'],
 			}
 		},
 		methods: {
diff --git a/pages_order/mine/promotion.vue b/pages_order/mine/promotion.vue
new file mode 100644
index 0000000..8e7613d
--- /dev/null
+++ b/pages_order/mine/promotion.vue
@@ -0,0 +1,277 @@
+<template>
+	<view class="promotion">
+		
+		
+		<navbar title="二维码" leftClick @leftClick="$utils.navigateBack" />
+		
+		<view class="promotion-card">
+			<!-- <view class="user-info"> -->
+			<!-- <image class="image" :src="userInfo.headImage" mode="widthFix"></image> -->
+			<!-- <image class="image" src="../../static/logo.png" mode="widthFix"></image> -->
+			<!-- <view class="user-name">{{ userInfo.nickName }}</view> -->
+			<!-- <view class="user-name">湖南第一深情</view> -->
+			<!-- </view> -->
+			<!-- <view class="invitation-code-img">
+				<image 
+				style="width: 400rpx;"
+				:src="imagePath" mode="widthFix"></image>
+			</view> -->
+
+			<image style="width: 100%;" :src="imagePath" mode="widthFix"></image>
+
+			<!-- <view class="invitation-code">加油站: {{ title }}</view> -->
+			<canvas id="myCanvas" type="2d" canvas-id="firstCanvas1"></canvas>
+		</view>
+		<view class="btns">
+			<view class="btn"
+			@click="preservationImg(imagePath)">保存</view>
+			<!-- <view class="btn">立即邀请</view> -->
+		</view>
+	</view>
+</template>
+
+<script>
+	import { mapState } from 'vuex'
+	export default {
+		name: 'Promotion',
+		computed: {
+			...mapState(['userInfo']),
+		},
+		data() {
+			return {
+				url: '',
+				title: '123123',
+				baseUrl: 'https://dianpin-img.xzaiyp.top/',
+				canvas: {},
+				imagePath: '',
+			}
+		},
+		onShow() {
+			this.getQrCode()
+			this.$store.commit('getUserInfo')
+		},
+		methods: {
+			getQrCode() {
+				this.$api('getInviteCode', res => {
+					if (res.code == 200) {
+						this.url = res.result.url
+						this.title = res.result.name
+						this.draw()
+					}
+				})
+			},
+			draw() {
+
+				uni.showLoading({
+					title: "拼命绘画中..."
+				})
+
+				wx.createSelectorQuery()
+					.select('#myCanvas') // 绘制的canvas的id
+					.fields({
+						node: true,
+						size: true
+					})
+					.exec((res) => {
+						const canvas = res[0].node
+						// 渲染上下文
+						const ctx = canvas.getContext('2d')
+						// Canvas 画布的实际绘制宽高
+						const width = res[0].width
+						const height = res[0].height
+						// 初始化画布大小
+						const dpr = wx.getWindowInfo().pixelRatio
+
+						//根据dpr调整
+						// dpr  2 4
+						//      3 6
+						let Ratio = dpr * 2
+						console.log("bug", dpr)
+						canvas.width = width * dpr
+						canvas.height = height * dpr
+
+						this.canvas = canvas
+						ctx.scale(dpr, dpr)
+						ctx.clearRect(0, 0, width, height)
+						
+						ctx.fillStyle = '#fff'
+						ctx.fillRect(0, 0, canvas.width, canvas.height)
+
+						//用户图片
+						// const image = canvas.createImage()
+						// image.onload = () => {
+						// 	ctx.drawImage(image, 30, 18, 40, 40)
+						// }
+						// image.src = '/public/img/wechar_1.png'
+						// image.src = this.userInfo.headImage
+						ctx.fillStyle = 'black'
+						ctx.font = '22px PingFangSC-regular';
+
+						let s = this.title || '加油站'
+
+						ctx.fillText(s, canvas.width / Ratio - s.length * 11, 50);
+
+						//二维码图片
+						const coderImage = canvas.createImage()
+						coderImage.src = this.baseUrl + this.url
+						coderImage.onload = () => {
+							ctx.drawImage(coderImage,
+								canvas.width / Ratio - 240 / 2, 100, 240, 240)
+						}
+
+
+						// 绘制完成后存储路径
+
+						setTimeout(() => {
+							wx.canvasToTempFilePath({
+								x: 0,
+								y: 0,
+								width: this.canvas.width,
+								height: this.canvas.height,
+								canvas,
+								success: (res) => {
+									var tempFilePath = res.tempFilePath;
+									this.imagePath = tempFilePath
+									uni.hideLoading()
+								}
+							});
+						}, 600);
+
+					})
+
+			},
+			back() {
+				uni.navigateBack(-1)
+			},
+			preservationImg(img) {
+				let that = this
+				uni.authorize({
+					/* scope.writePhotosAlbum 类型是保存到相册 */
+					scope: 'scope.writePhotosAlbum',
+					success() {
+						/* 已授权进入 */
+						/* 保存图片到相册方法方法 */
+						that.imgApi(img);
+					},
+					complete(res) {
+						/* 判断如果没有授权就打开设置选项让用户重新授权 */
+						uni.getSetting({
+							success(res) {
+								if (!res.authSetting['scope.writePhotosAlbum']) {
+									/* 打开设置的方法 */
+									that.openInstall();
+								}
+							}
+						});
+					}
+				});
+			},
+			imgApi(image) {
+				/* 获取图片的信息 */
+				uni.getImageInfo({
+					src: image,
+					success: function(image) {
+						/* 保存图片到手机相册 */
+						uni.saveImageToPhotosAlbum({
+							filePath: image.path,
+							success: function() {
+								uni.showModal({
+									title: '保存成功',
+									content: '图片已成功保存到相册',
+									showCancel: false
+								});
+							},
+							complete(res) {
+								console.log(res);
+							}
+						});
+					}
+				});
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.promotion {
+		.promotion-card {
+			width: 90%;
+			margin: 100rpx auto 0rpx auto;
+			box-shadow: 0rpx 0rpx 15rpx rgba(0, 0, 0, .2);
+			border-radius: 15rpx;
+			padding: 40rpx 30rpx;
+			box-sizing: border-box;
+
+			.user-info {
+				display: flex;
+				align-items: center;
+
+				.image {
+					width: 80rpx;
+					height: 80rpx;
+					border-radius: 50%;
+					margin-right: 10rpx;
+				}
+
+				.user-name {
+					font-size: 30rpx;
+				}
+			}
+
+			.invitation-code-img {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				margin: 100rpx 0rpx;
+
+				.image {
+					width: 30%;
+					border-radius: 50%;
+				}
+			}
+
+			.invitation-code {
+				text-align: center;
+				color: #818181;
+				font-size: 28rpx;
+			}
+		}
+
+		.btns {
+			position: fixed;
+			left: 0;
+			bottom: 0;
+			width: 100%;
+			height: 120rpx;
+			display: flex;
+			background: $uni-color;
+			color: white;
+			font-size: 28rpx;
+
+			.btn {
+				flex: 1;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+
+				&:nth-child(2) {
+					background: orange;
+				}
+			}
+		}
+	}
+
+	#myCanvas {
+		position: fixed;
+		left: 100%;
+		/* visibility: hidden */
+		/* visibility: hidden; */
+		/* margin-top: 100rpx; */
+		margin: 68rpx auto;
+		width: 750rpx;
+		height: 750rpx;
+		/* line-height: 20px; */
+		background-color: rgba(255, 255, 255, 1);
+		text-align: center;
+	}
+</style>
\ No newline at end of file
diff --git a/pages_order/mine/recommend.vue b/pages_order/mine/recommend.vue
index 0a18224..fa4bce3 100644
--- a/pages_order/mine/recommend.vue
+++ b/pages_order/mine/recommend.vue
@@ -3,8 +3,8 @@
 		<navbar title="推广明细" leftClick @leftClick="$utils.navigateBack" />
 		<view class="top">
 			<view class="top-text">
-				<view>100</view>
-				<view>直推人数(元)</view>
+				<view>{{ total }}</view>
+				<view>直推人数</view>
 			</view>
 		</view>
 		<view class="cell">
@@ -18,7 +18,9 @@
 					:label="item.createTime" 
 					:center="true">
 						<template #value>
-							<text style="font-weight: 600; font-size: 28rpx;">黄金会员</text>
+							<text style="font-weight: 600; font-size: 28rpx;">
+								{{ vipType[item.isPay] }}
+							</text>
 						</template>
 					</uv-cell>
 				</uv-cell-group>
@@ -34,6 +36,7 @@
 		data() {
 			return {
 				mixinsListApi : 'getFansPageList',
+				vipType : ['普通会员', '黄金会员', '渠道商'],
 			}
 		},
 		onLoad(e) {},
diff --git a/pages_order/order/createOrder.vue b/pages_order/order/createOrder.vue
index 83469e7..dbc5e2d 100644
--- a/pages_order/order/createOrder.vue
+++ b/pages_order/order/createOrder.vue
@@ -10,7 +10,7 @@
 					{{ address.name }}
 				</view>
 				<view class="">
-					{{ address.addressDetail }}
+					{{ address.address }}
 				</view>
 				<view class="icon">
 					<uv-icon size="30rpx" name="arrow-right"></uv-icon>
@@ -22,8 +22,9 @@
 				:key="index"
 				v-for="(item, index) in productList">
 					<view class="item-image">
-						<image :src="item.image || 'https://img95.699pic.com/photo/50058/1378.jpg_wh860.jpg'"
-							mode="aspectFill"></image>
+						<image :src="item.image &&
+						item.image.split(',')[0]" 
+						mode="aspectFill"></image>
 					</view>
 
 					<view class="info">
@@ -36,7 +37,7 @@
 						<view class="price">
 							<view class="">
 								<uv-number-box 
-								v-model="num"
+								v-model="item.num"
 								></uv-number-box>
 							</view>
 							<view class="">
@@ -72,7 +73,8 @@
 			</view>
 			
 			
-			<view class="uni-color-btn">
+			<view class="uni-color-btn"
+			@click="submit">
 				确认下单
 			</view>
 		</view>
@@ -90,17 +92,17 @@
 
 <script>
 	import addressList from '../components/address/addressList.vue'
+	import { mapState } from 'vuex'
 	export default {
 		components: {
 			addressList,
 		},
 		data() {
 			return {
-				pids: [],
 				productList: [],
 				address: {
 					name: '请选择地址',
-					addressDetail: '',
+					address: '',
 				},
 				addressTotal: 0,
 				remark : '',
@@ -112,16 +114,14 @@
 				let price = 0
 				
 				this.productList.forEach(n => {
-					price += n.price * this.num
+					price += n.price * n.num
 				})
 				
 				return Number(price).toFixed(2)
 			},
+			...mapState(['payOrderProduct']),
 		},
-		onLoad({
-			pid
-		}) {
-			this.pids = pid ? pid.split(',') : [],
+		onLoad() {
 			this.getRiceProductDetail()
 		},
 		onShow() {
@@ -130,15 +130,7 @@
 		methods: {
 			// 获取商品
 			getRiceProductDetail() {
-				this.pids.forEach(id => {
-					this.$api('getRiceProductDetail', {
-						id
-					}, res => {
-						if (res.code == 200) {
-							this.productList.push(res.result)
-						}
-					})
-				})
+				this.productList = JSON.parse(JSON.stringify(this.payOrderProduct))
 			},
 			// 打开
 			getAddressList() {
@@ -164,6 +156,24 @@
 				this.address = e
 				this.$refs.addressPopup.close()
 			},
+			// 确认下单
+			submit(){
+				this.$api('createOrder', {
+					productId : this.productList[0].id,
+					num : 1,
+				}, res => {
+					if(res.code == 200){
+						uni.showToast({
+							title: '购买成功',
+							icon: 'none'
+						})
+						
+						setInterval(uni.navigateTo, 1000, {
+							url : '/pages/index/order'
+						})
+					}
+				})
+			},
 		}
 	}
 </script>
diff --git a/pages_order/product/productDetail.vue b/pages_order/product/productDetail.vue
index 5cfe1d1..88c4c74 100644
--- a/pages_order/product/productDetail.vue
+++ b/pages_order/product/productDetail.vue
@@ -7,13 +7,14 @@
 		
 		<view class="swipe">
 			<uv-swiper 
-			:list="productDetail.image.split(',')" 
+			:list="productDetail.image
+			&& productDetail.image.split(',')" 
 			indicator
 			height="520rpx"></uv-swiper>
 		</view>
 		
 		<view class="info">
-			<view class="">
+			<view style="width: 440rpx;">
 				<view class="title">
 					{{ productDetail.title }}
 				</view>
@@ -35,7 +36,8 @@
 		
 		<!-- 分享和购买按钮 -->
 		<submit 
-		@submit="$utils.navigateTo('/pages_order/order/createOrder?pid=' + id)"
+		@addCart="addCart"
+		@submit="submit"
 		/>
 		
 		<!-- <submit
@@ -60,7 +62,7 @@
 		data() {
 			return {
 				productDetail : {
-					image : 'https://cdn.uviewui.com/uview/swiper/swiper3.png,https://cdn.uviewui.com/uview/swiper/swiper2.png',
+					image : '',
 					details : '',
 				},
 				id : 0,
@@ -77,9 +79,14 @@
 			share(){
 				
 			},
-			// 选择完成规格立即租赁下单
+			// 立即下单
 			submit(){
 				
+				this.$store.commit('setPayOrderProduct', [
+					this.productDetail
+				])
+				
+				this.$utils.navigateTo('/pages_order/order/createOrder')
 			},
 			// 获取商品
 			getRiceProductDetail(){
@@ -87,10 +94,24 @@
 					id : this.id
 				}, res => {
 					if(res.code == 200){
+						res.result.num = 1
 						this.productDetail = res.result
 					}
 				})
 			},
+			addCart(){
+				this.$api('addCart', {
+					productId : this.id,
+					num : 1,
+				}, res => {
+					if(res.code == 200){
+						uni.showToast({
+							title: '加入购物车成功',
+							icon: 'none'
+						})
+					}
+				})
+			},
 		}
 	}
 </script>
diff --git a/static/image/member/m0.png b/static/image/member/m0.png
new file mode 100644
index 0000000000000000000000000000000000000000..a57fb0ad74ab641462d351755b613400294ba8ad
GIT binary patch
literal 10158
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

literal 0
HcmV?d00001

diff --git a/static/image/member/m1.png b/static/image/member/m1.png
new file mode 100644
index 0000000000000000000000000000000000000000..b0b67edcb11553ce1cb449006e6d91ccd7279bab
GIT binary patch
literal 8793
zcmV-fBBtGmP)<h;3K|Lk000e1NJLTq008I!002-31^@s66EHbo00001b5ch_0Itp)
z=>PyA07*naRCr$PT?bs$NA~~D(ya*CiDHWiR_w-(Vy}tD7GrWrjIl>exyvO+V=i`M
znkJ{F>cv=NFNhkAjo1+t5$qjM6k&m#|NqUe>@MuW?y{>8fAcv`!f(o(H}jqM=FOWo
z3{NoesM!JV^k`}Ts|t=Frei_isKCKXfx#CXegHh5Ac<Pje}4|>!H@`!WCoT5hHKow
zFM#ojI_NGypMID%o^<C)v4K6#hWWKcMUbd(ZQv{noQDCt0l;*RlLoCVjRW>^fExgI
z42(w@vRH(B8P7jhg%PRt)!}$<mjjeXPI1pH?H{JgLVqyc7hoh6wWM*NkaB=00&JBI
zd<E_%?qcnyWV*5=E(0h(KC39;^SXgyB7i_wc0#LL<G_>Q0KcN+Yz|Q3J63<#Ls!t?
zbb#{M1zv_nZW91L8BCLwt{60}&H~4Qy8xS`^Uj>hYK%>HCUs5)D3AWSD>v{39H{P0
zBDK0S4ipj&oHsDTXpcH$wmOSmrvQ}4d=r$F!RIlCKF%Uct4HHNVdVhlSnK9)7|()7
zU(9bG@(s|;6AODYW>^ZaQu!rDE3a|j@52F}#KDHS*B!YbKYel-pgekor@?S{7Qn^;
z+~IoiL%dd2<3PdY0OJPmFWhzhlUc|By(6?b1T21ZsW10PU&DcRjx?&3(Kzrlaex84
z*aLlU)_m-Jd;4uSKp#deD(~ZsO&n-oZ(~}1jRQ|D2RJ{bb7S3D@QCa7@W3vB^639o
z=iIQFgKJh=d$_FS)i?lv0db6@Gpjoy&Q^xl3{Zal$1*%EeLn}UYHQ_MK8*t!2h2IZ
zz%DS3maOjUH*MjKO#tQbOMQ82W~8Rp+QL#TkH&#KIKcUF-Gj6?w(Lps1Ssc`?pZPC
zw}Wd2A#LJm9B>u~H~}l9MmS^bbM@uT6QEhqi)V6j+tZT90gVGr<p5`x;Sv1Wd%0Db
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
P00000NkvXXu0mjf;-Kfc

literal 0
HcmV?d00001

diff --git a/static/image/member/m2.png b/static/image/member/m2.png
new file mode 100644
index 0000000000000000000000000000000000000000..6baed39b2bb107723d648cee7efd67cf0f2a6fbd
GIT binary patch
literal 7503
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
Z{U16amXU3-=L`S<002ovPDHLkV1kodPPza9

literal 0
HcmV?d00001

diff --git a/store/store.js b/store/store.js
index 52d26fc..ff07be2 100644
--- a/store/store.js
+++ b/store/store.js
@@ -10,6 +10,9 @@ const store = new Vuex.Store({
 	state: {
 		configList: {}, //配置列表
 		userInfo : {}, //用户信息
+		riceInfo : {},//用户相关信息
+		category : [],//分类信息
+		payOrderProduct : [],//支付订单中的商品
 	},
 	getters: {
 	},
@@ -74,6 +77,15 @@ const store = new Vuex.Store({
 				}
 			})
 		},
+		getRiceInfo(state){
+			api('getRiceInfo', {
+				token : uni.getStorageSync('token') || ''
+			},res => {
+				if(res.code == 200){
+					state.riceInfo = res.result
+				}
+			})
+		},
 		// 退出登录
 		logout(state){
 			uni.showModal({
@@ -90,6 +102,18 @@ const store = new Vuex.Store({
 				}
 			})
 		},
+		// 查询分类接口
+		getCategoryList(state){
+			api('getCategoryList', res => {
+				if(res.code == 200){
+					state.category = res.result
+				}
+			})
+		},
+		// 设置支付订单中的商品
+		setPayOrderProduct(state, data){
+			state.payOrderProduct = data
+		},
 	},
 	actions: {},
 })
diff --git a/uni_modules/uv-ui-tools/libs/css/color.scss b/uni_modules/uv-ui-tools/libs/css/color.scss
index 2a94a68..02ed321 100644
--- a/uni_modules/uv-ui-tools/libs/css/color.scss
+++ b/uni_modules/uv-ui-tools/libs/css/color.scss
@@ -6,7 +6,7 @@ $uv-border-color: #dadbde !default;
 $uv-bg-color: #f3f4f6 !default;
 $uv-disabled-color: #c8c9cc !default;
 
-$uv-primary: #FD5100 !default;
+$uv-primary: #A3D250 !default;
 // $uv-primary: #3c9cff !default;
 $uv-primary-dark: #398ade !default;
 $uv-primary-disabled: #9acafc !default;