静态页

api/product.js

@@ -19,6 +19,14 @@ export function getProducts(data) {
 		data
 	});
 }
+// 获取商品分类
+export function getCategorylist(data) {
+	return request({
+		url: '/api/category',
+		method: 'get',
+		data
+	});
+}
 // 获取商品详情
 export function goodsDetail(data, id) {
 	return request({

api/wallet.js

@@ -17,7 +17,14 @@ export function userBalance(data) {
 		data
 	});
 }
-
+// 金豆兑换
+export function exchange(data) {
+	return request({
+		url: '/api/exchange_golden',
+		method: 'post',
+		data
+	});
+}
 // 提现
 export function extractCash(data) {
 	return request({
@@ -123,6 +130,22 @@ export function integrallist(data) {
 		data
 	});
 }
+//	金豆列表
+export function goldenintegrallist(data) {
+	return request({
+		url: '/api/golden_bean_list/list',
+		method: 'get',
+		data
+	});
+}
+//	购物券列表
+export function shopintegrallist(data) {
+	return request({
+		url: '/api/shop_integral_list/list',
+		method: 'get',
+		data
+	});
+}
 
 //	预约券列表
 export function anticipatelist(data) {

components/seckill/seck.vue

@@ -0,0 +1,302 @@
+<template>
+	<view class="seckill-section m-t" v-if="show">
+		<view class="s-header">
+			<view class="f-left-icon">
+				<image src="../../static/img/seckill-inco.png" mode=""></image>
+			</view>
+			<view class="tit-box"><text class="tit">趣豆购区</text></view>
+			<!-- <view class="tip-box">
+				<text class="tip" v-if="status == 1">{{ showTime }}点场结束</text>
+				<text class="tip" v-if="status == 2">距离下场开始</text>
+				<text class="tip" v-if="status == 0">当天活动已结束</text>
+				<uni-countdown v-if="status == 1 || status == 2" :show-day="false" :hour="stopTimeH" :minute="stopTimeM" :second="stopTimeS"></uni-countdown>
+			</view> -->
+			<view class="textNav iconfont iconenter" @click="navTo('/pages/product/classify?type=2')">更多</view>
+		</view>
+		<!-- <view class="floor-list">
+			<image src="../../static/img/cg.jpg" mode=""></image>
+		</view> -->
+		<scroll-view class="floor-list" scroll-x>
+			<view class="scoll-wrapper position-relative" @click="navTo('/pages/product/classify?type=2')">
+				<view v-for="(item, index) in list" :key="index" class="floor-item">
+					<image class="list-image" :src="item.image" mode="aspectFill"></image>
+					<text class="title clamp">{{ item.title }}</text>
+					<text class="price">￥{{ item.price }}</text>
+				</view>
+				<view v-if="list.length == 0" class="floor-item ">
+					<image class="list-image" mode="aspectFill"></image>
+					<text class="title clamp"></text>
+					<text class="price"></text>
+				</view>
+				<view v-if="list.length == 0" class="noGoodsBg">
+					<view>敬请期待</view>
+				</view>
+			</view>
+		</scroll-view>
+	</view>
+</template>
+
+<script>
+	import uniCountdown from '@/components/uni-countdown/uni-countdown.vue';
+	import {
+		getSeckillList,
+		getSeckillClass,
+		groomList
+	} from '@/api/product.js';
+	import {
+		timeComputed
+	} from '@/utils/rocessor.js';
+	export default {
+		components: {
+			uniCountdown
+		},
+		data() {
+			return {
+				list: [],
+				page: 1,
+				limit: 10,
+				showTime: '', //显示的时间
+				showTImeId: '', //显示时间id用于查询数据
+				stopTimeH: 0,
+				stopTimeM: 0,
+				stopTimeS: 0,
+				// 判断是否所有活动已经结束
+				stop: false, //活动是否已经结束
+				show: false, //是否显示活动
+				status: 0 //获取状态值1为有活动开始中 2为活动未开始 0为活动已经结束
+			};
+		},
+		created: function(e) {
+			// 载入分类
+			this.getClass();
+		},
+		onLoad() {
+			this.getList()
+		},
+		methods: {
+			navTo(url) {
+				uni.switchTab({
+					url,
+					success: () => {
+
+					},
+					fail: (err) => {
+						console.log(err, 'err');
+						uni.navigateTo({
+							url
+						})
+					}
+				});
+			},
+			getList() {
+				groomList({
+							page: this.page,
+							limit: this.limit
+						}, 2
+
+					)
+					.then(res => {
+						console.log(res, 'eeee11');
+						this.list = res.data.list;
+					})
+					.catch(e => {
+						console.log(e);
+					});
+			},
+			getClass() {
+				let obj = this;
+				getSeckillClass({})
+					.then(({
+						data
+					}) => {
+						let arr = data.seckillTime;
+						// 用于判断是否有数据
+						let showDate = false;
+						for (var i = 0; i < arr.length; i++) {
+							let ar = arr[i];
+							if (ar.status === 1 || ar.status === 2) {
+								obj.status = ar.status;
+								// 保存要显示的场次时间
+								obj.showTime = ar.time;
+								// 保存要显示活动商品的id
+								obj.showTImeId = ar.id;
+								// 保存当前状态值
+								// 计算倒计时时间
+								if (ar.status === 1) {
+									obj.timeComputed(ar.stop * 1000);
+								} else {
+									// 获取需要开始
+									let arTime = ar.time.split(':');
+									let h = arTime[0];
+									let m = arTime[1];
+									let time = new Date();
+									// 设置时间
+									time.setHours(h, m, 0);
+									obj.timeComputed(time.getTime());
+								}
+								// 获取商品列表
+								obj.getList();
+								// 保存当前有活动在举行
+								showDate = true;
+								// 任务查询结束跳出循环
+								break;
+							}
+						}
+						// 判断是否有活动
+						if (arr.length > 0) {
+							obj.show = true;
+						}
+						// 判断今天活动是否已经全部结束
+						if (!showDate) {
+							// 保存活动结束最后一个小时的活动商品
+							obj.showTImeId = arr[arr.length - 1].id;
+							// 活动已经结束
+							obj.status = 0;
+							// 获取结束时的商品
+							obj.getList();
+							console.log(obj.status);
+						}
+						// 如果所有场次均已经结束
+					})
+					.catch(e => {
+						uni.showModal({
+							title: JSON.stringify(e)
+						});
+					});
+			},
+			// 计算倒计时时间
+			timeComputed(da) {
+				let obj = this;
+				let stopTime = timeComputed(da);
+				obj.stopTimeH = stopTime.hours;
+				obj.stopTimeM = stopTime.minutes;
+				obj.stopTimeS = stopTime.seconds;
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	/* 秒杀专区 */
+	.seckill-section {
+		padding: 4rpx 30rpx 24rpx;
+
+		.s-header {
+			display: flex;
+			align-items: center;
+			height: 92rpx;
+			line-height: 1;
+
+			.tit-box {
+				margin-left: 6rpx;
+				flex-shrink: 0;
+			}
+
+			.tit {
+				@extend %font-title;
+			}
+
+			.f-left-icon {
+				width: 36rpx;
+				height: 36rpx;
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+
+			.textNav {
+				line-height: 1;
+				padding: 15rpx 0;
+				flex-shrink: 0;
+				flex-grow: 1;
+				min-width: 100rpx;
+			}
+
+			.tip-box {
+				flex-grow: 1;
+				display: flex;
+				justify-content: flex-start;
+				align-items: center;
+			}
+
+			.tip {
+				font-size: $font-sm;
+				color: $font-color-light;
+				padding-left: 10rpx;
+				padding-right: 10rpx;
+			}
+
+			.timer {
+				display: inline-block;
+				width: 40rpx;
+				height: 36rpx;
+				text-align: center;
+				line-height: 36rpx;
+				margin-right: 14rpx;
+				font-size: $font-sm + 2rpx;
+				color: #fff;
+				border-radius: 2px;
+				background: rgba(0, 0, 0, 0.8);
+			}
+
+			.iconenter {
+				font-size: $font-sm;
+				color: $font-color-light;
+				flex: 1;
+				text-align: right;
+			}
+		}
+
+		.floor-list {
+			white-space: nowrap;
+			background-color: white;
+			padding: 20rpx;
+			border-radius: 5rpx;
+			box-shadow: $box-shadow;
+		}
+
+		image {
+			width: 650rpx;
+			height: 206rpx;
+			border-radius: 10rpx;
+			overflow: hidden;
+		}
+
+		.scoll-wrapper {
+			display: flex;
+			align-items: flex-start;
+
+			.noGoodsBg {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				height: 100%;
+				position: absolute;
+				top: 0;
+				left: 0;
+				width: 100%;
+				color: $font-color-light;
+			}
+
+			.floor-item {
+				width: 150rpx;
+				margin-right: 20rpx;
+				font-size: $font-sm + 2rpx;
+				color: $font-color-dark;
+				line-height: 1.8;
+
+				.list-image {
+					width: 150rpx;
+					height: 150rpx;
+					border-radius: 6rpx;
+				}
+
+				.price {
+					color: $color-red;
+				}
+			}
+		}
+	}
+</style>

components/seckill/seckill.vue

@@ -1,18 +1,21 @@
 <template>
-	<view class="seckill-section m-t" v-if="show">
-		<view class="s-header">
+	<view class="seckill-section m-t" v-if="show" @click="navTo('/pages/hall/hall')">
+		<view class="s-header" >
 			<view class="f-left-icon"><image src="../../static/img/seckill-inco.png" mode=""></image></view>
-			<view class="tit-box"><text class="tit">限时秒杀</text></view>
-			<view class="tip-box">
+			<view class="tit-box"><text class="tit">商品认购区</text></view>
+			<!-- <view class="tip-box">
 				<text class="tip" v-if="status == 1">{{ showTime }}点场结束</text>
 				<text class="tip" v-if="status == 2">距离下场开始</text>
 				<text class="tip" v-if="status == 0">当天活动已结束</text>
 				<uni-countdown v-if="status == 1 || status == 2" :show-day="false" :hour="stopTimeH" :minute="stopTimeM" :second="stopTimeS"></uni-countdown>
-			</view>
-			<view class="textNav iconfont iconenter" @click="navTo('/pages/product/seckill')">更多</view>
+			</view> -->
+			<view class="textNav iconfont iconenter" >更多</view>
+		</view>
+		<view class="floor-list">
+			<image src="../../static/img/cg.jpg" mode=""></image>
 		</view>
-		<scroll-view class="floor-list" scroll-x>
-			<view class="scoll-wrapper position-relative" @click="navTo('/pages/product/seckill')">
+		<!-- <scroll-view class="floor-list" scroll-x>
+			<view class="scoll-wrapper position-relative" @click="navTo('/pages/product/classify?type=2')">
 				<view v-for="(item, index) in list" :key="index" class="floor-item">
 					<image class="list-image" :src="item.image" mode="aspectFill"></image>
 					<text class="title clamp">{{ item.title }}</text>
@@ -25,13 +28,13 @@
 				</view>
 				<view v-if="list.length == 0" class="noGoodsBg"><view>敬请期待</view></view>
 			</view>
-		</scroll-view>
+		</scroll-view> -->
 	</view>
 </template>
 
 <script>
 import uniCountdown from '@/components/uni-countdown/uni-countdown.vue';
-import { getSeckillList, getSeckillClass } from '@/api/product.js';
+import { getSeckillList, getSeckillClass,groomList } from '@/api/product.js';
 import { timeComputed } from '@/utils/rocessor.js';
 export default {
 	components: {
@@ -57,22 +60,31 @@ export default {
 		// 载入分类
 		this.getClass();
 	},
+	onLoad() {
+		this.getList()
+	},
 	methods: {
 		navTo(url) {
-			uni.navigateTo({
-				url
+			uni.switchTab({
+				url,
+				success: () => {
+					
+				},fail: (err) => {
+					console.log(err,'err');
+				}
 			});
 		},
 		getList() {
-			getSeckillList(
+			groomList(
 				{
 					page: this.page,
 					limit: this.limit
-				},
-				this.showTImeId
+				},2
+					
 			)
-				.then(e => {
-					this.list = e.data;
+				.then(res => {
+					console.log(res,'eeee11');
+					this.list = res.data.list;
 				})
 				.catch(e => {
 					console.log(e);
@@ -218,6 +230,12 @@ export default {
 		border-radius: 5rpx;
 		box-shadow: $box-shadow;
 	}
+	image{
+		width: 650rpx;
+		height: 206rpx;
+		border-radius: 10rpx;
+		overflow: hidden;
+	}
 	.scoll-wrapper {
 		display: flex;
 		align-items: flex-start;

manifest.json

@@ -1,6 +1,6 @@
 {
-    "name" : "嗨易趣G0",
-    "appid" : "__UNI__ECA3760",
+    "name" : "易趣G",
+    "appid" : "__UNI__0D9C79D",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",
@@ -14,7 +14,9 @@
             "autoclose" : true,
             "delay" : 0
         },
-        "modules" : {},
+        "modules" : {
+            "OAuth" : {}
+        },
         /* 模块配置 */
         "distribute" : {
             /* 应用发布信息 */
@@ -28,6 +30,7 @@
                     "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
                     "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
                     "<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
                     "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
                     "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
@@ -44,8 +47,8 @@
                 "maps" : {},
                 "oauth" : {
                     "weixin" : {
-                        "appid" : "",
-                        "appsecret" : "",
+                        "appid" : "wxb6b7abe6a167492b",
+                        "appsecret" : "02b2a9605a080f0705eb3db43093679a",
                         "UniversalLinks" : ""
                     }
                 }
@@ -73,7 +76,7 @@
         "devServer" : {
             "proxy" : {
                 "/api" : {
-                    "target" : "http://newqudou.frp.liuniu946.com", //请求的目标域名
+                    "target" : "http://new.yiqushangshi.com", //请求的目标域名
                     "changeOrigin" : true,
                     // "secure": false,
                     "pathRewrite" : {}

pages.json

@@ -16,7 +16,7 @@
 					}
 				},
 				// #endif
-				"navigationBarTitleText": "商城首页"
+				"navigationBarTitleText": "易趣GO 一起购"
 			}
 		},
 		{
@@ -45,6 +45,12 @@
 				"navigationBarTitleText": "限时秒杀"
 			}
 		},
+		{
+			"path": "pages/index/goldenBean",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
 		{
 			"path": "pages/public/register",
 			"style": {
@@ -86,6 +92,12 @@
 				"navigationBarTitleText": "添加银行卡"
 			}
 		},
+		{
+			"path": "pages/user/zhuanyue",
+			"style": {
+				"navigationBarTitleText": "转换"
+			}
+		},
 		{
 			"path": "pages/collection/zfb",
 			"style": {
@@ -461,7 +473,7 @@
 		{
 			"path": "pages/money/wallet",
 			"style": {
-				"navigationBarTitleText": "易趣卷转账"
+				"navigationBarTitleText": "转账"
 			}
 		},
 		{
@@ -512,7 +524,7 @@
 		{
 			"path": "pages/hall/hall",
 			"style": {
-				"navigationBarTitleText": "易趣会馆",
+				"navigationBarTitleText": "易趣认购",
 				"app-plus": {
 					"titleNView": false
 				}
@@ -554,12 +566,21 @@
 		{
 			"path": "pages/user/myAppointment",
 			"style": {
-				"navigationBarTitleText": "我的易趣卷",
+				"navigationBarTitleText": "我的广告值",
 				"app-plus": {
 					"titleNView": false
 				}
 			}
 		},
+		{
+			"path": "pages/product/qudouShop",
+			"style": {
+				"navigationBarTitleText": "趣豆购物"
+				// "app-plus": {
+				// 	"titleNView": false
+				// }
+			}
+		},
 		{
 			"path": "pages/user/shareQrCode",
 			"style": {
@@ -576,7 +597,38 @@
 			}
 
 		}
-	],
+	    ,{
+            "path" : "pages/money/jinDou",
+          "style": {
+          	"navigationBarTitleText": "我的金豆",
+          	"enablePullDownRefresh": false,
+          	"app-plus": {
+          		"titleNView": false
+          	}
+          }
+            
+        }
+        ,{
+            "path" : "pages/money/gouwu",
+           "style": {
+           	"navigationBarTitleText": "我的购物券",
+           	"enablePullDownRefresh": false,
+           	"app-plus": {
+           		"titleNView": false
+           	}
+           }
+            
+        }
+        ,{
+            "path" : "pages/product/fenlei",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+    ],
 
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
@@ -601,18 +653,19 @@
 				"selectedIconPath": "static/tabBar/tab-cate-current.png",
 				"text": "分类"
 			},
+			{
+				"pagePath": "pages/product/new",
+				"iconPath": "static/tabBar/tab-cart.png",
+				"selectedIconPath": "static/tabBar/tab-cart-current.png",
+				"text": "新品认购区"
+			},
 			{
 				"pagePath": "pages/cart/cart",
 				"iconPath": "static/tabBar/tab-pink.png",
 				"selectedIconPath": "static/tabBar/tab-pink-current.png",
 				"text": "购物车"
 			},
-			{
-				"pagePath": "pages/product/new",
-				"iconPath": "static/tabBar/tab-cart.png",
-				"selectedIconPath": "static/tabBar/tab-cart-current.png",
-				"text": "新品"
-			},
+			
 			{
 				"pagePath": "pages/hall/hall",
 				// "iconPath": "static/tabBar/tab-cart.png",
@@ -639,4 +692,4 @@
 			}
 		]
 	}
-}
+}

pages/hall/gsell.vue

@@ -14,7 +14,7 @@
 			<view class="main-font">挂售价格(元)</view>
 			<view class="main-input">{{ (price * 1).toFixed(2) * 1 }}</view>
 		</view>
-		<view class="money">服务费{{ (fwprice * 1).toFixed(2) * 1 }}易趣卷</view>
+		<view class="money">服务费{{ (fwprice * 1).toFixed(2) * 1 }}广告值</view>
 		<view class="btn" @click="sall()">确定</view>
 	</view>
 </template>

pages/hall/hall.vue

@@ -1,12 +1,15 @@
 <template>
 	<view class="center">
 		<view class="top">
-			<image class="top-bg" src="../../static/img/hall-bg.png" mode=""></image>
-			<view class="title">易趣会馆</view>
+			<!-- <image class="top-bg" src="../../static/img/hall-bg.png" mode=""></image> -->
+			<view class="title">易趣认购</view>
 		</view>
-		<view class="hall-main"><image src="../../static/img/hell-main.png" mode=""></image></view>
+		<!-- <view class="hall-main"><image src="../../static/img/hell-main.png" mode=""></image></view> -->
+		<swiper class="carousel" autoplay="true" duration="400" interval="5000" @change="swiperChange">
+			<swiper-item class="carousel-item" v-for="(item,index) in carouselList "  @click="bannerNavToUrl(item)"><image :src="item.pic" mode=""></image> </swiper-item>
+		</swiper>
 		<view class="hall-center">
-			<view class="shingle-main" v-for="(item, index) in list" :key="index" @click="nav(item)">
+			<view class="shingle-main" v-for="(item, index) in list" :key="index" @click="nav(item)" v-if="item.name!='体验馆'">
 				<view class="shingle-bg"><image :src="item.image" mode=""></image></view>
 				<view class="shinglem-title flex">
 					<image class="tbg" src="../../static/img/tbg-left.png" mode=""></image>
@@ -45,9 +48,14 @@
 <script>
 import { tabbar } from '@/utils/tabbar.js';
 import { auction_gu } from '@/api/hall.js';
+import {
+		loadIndexs,
+		store_list
+	} from '@/api/index.js';
 export default {
 	data() {
 		return {
+			carouselList: [], //轮播图列表
 			tabbar: tabbar,
 			current: 2,
 			list: [],
@@ -58,8 +66,27 @@ export default {
 	},
 	onShow() {
 		this.loadData();
+		this.get()
 	},
 	methods: {
+		get(){
+			loadIndexs({})
+				.then(({
+					data
+				}) => {
+					let goods = data.info;
+					// this.dataList = goods.bastList; //精品推荐
+					this.carouselList = data.new_banner;
+					console.log(this.carouselList,'banner');
+				})
+				.catch(e => {});
+		},
+		//轮播图切换修改背景色
+		swiperChange(e) {
+			const index = e.detail.current;
+			this.swiperCurrent = index;
+			this.titleNViewBackground = this.carouselList[index].background;
+		},
 		loadData() {
 			const obj = this;
 			if (obj.loadingType == 'nomore' || obj.loadingType == 'loading') {
@@ -68,8 +95,8 @@ export default {
 			obj.loadingType = 'loading';
 			auction_gu({ pages: obj.page, limit: obj.limit })
 				.then(({ data }) => {
-					console.log(data);
-					this.list = data;
+					console.log(data,'data');
+					this.list = data
 				})
 				.catch(e => {
 					console.log(e);
@@ -105,6 +132,7 @@ page {
 	}
 	.title {
 		padding-top: 20rpx;
+		
 		text-align: center;
 		position: relative;
 		z-index: 2;
@@ -114,6 +142,18 @@ page {
 		color: #ffffff;
 	}
 }
+.carousel {
+	width: 700rpx;
+	height: 300rpx;
+	margin: -260rpx auto 0;
+	border-radius: 20rpx;
+	overflow:hidden;
+
+	image {
+		width: 700rpx;
+		height: 300rpx;
+	}
+}
 .hall-main {
 	margin: -252rpx auto 0;
 	width: 700rpx;
@@ -133,6 +173,8 @@ page {
 	position: relative;
 	.shingle-bg {
 		position: absolute;
+		border-radius: 10rpx;
+		overflow: hidden;
 		top: 0;
 		left: 0;
 		right: 0;

pages/hall/halllist.vue

@@ -4,7 +4,7 @@
 			<view class="status_bar"><!-- 这里是状态栏 --></view>
 			<view class="money-box">
 				<view class="goback-box" @click="toBack"><image class="goback" src="../../static/img/fanhui.png" mode=""></image></view>
-				<view class="header">CBB利润前置抢货区</view>
+				<view class="header">商品认购体验馆</view>
 				<image class="money_bg" src="../../static/img/hinfo-bg.png"></image>
 			</view>
 		</view>
@@ -44,7 +44,7 @@
 			<view class="navbar-item">
 				<view class="navbar-font" @click="navTo('/pages/user/myAppointment')">
 					<image class="navbar-image" src="../../static/money/m04.png" mode=""></image>
-					<view class="font">易趣卷</view>
+					<view class="font">广告值</view>
 				</view>
 				<view class="navbar-num">{{ userInfo.anticipate }}</view>
 			</view>
@@ -59,7 +59,7 @@
 						<view class="mmaint-time">{{ item.radd_time }}开售</view>
 					</view>
 					<view class="mmain-time" style="margin-top: 28rpx;">预约时间:{{ item.add_time }}-{{ item.end_time }}</view>
-					<view class="mmain-time">入场时间:{{ item.radd_time | ahead }}-{{ item.rend_time }}</view>
+					<view class="mmain-time">付款时间:{{ item.radd_time | ahead }}-{{ item.rend_time }}</view>
 					<view class="mmain-time flex">
 						<view class="mmain-font">距预约结束:</view>
 
@@ -82,21 +82,31 @@
 				</view>
 				<view class="mmain-image"><image :src="item.image" mode=""></image></view>
 			</view>
-			<view class="bottom" @click="open(item)">
+			<view class="bottom" :style="{'background-color': (item.str=='预约'?'#d13737':'#808080') ,'color': (item.str=='预约'?'#d13737':'#808080')}"  @click="open(item)">
 				<view class="bottom-font" v-if="item.str == '预约'">立即{{ item.str }}</view>
-				<view class="bottom-font" v-else>{{ item.daotime == 1 ? '立即进入' : '您已预约' }}</view>
+				<view class="bottom-font"  v-else>{{ item.daotime == 1 ? '立即进入' : '您已预约' }}</view>
 				<image class="bottom-image" src="../../static/img/jt.png" mode=""></image>
 			</view>
+			
 		</view>
 		<uni-popup ref="popup" type="center">
 			<view class="popup">
-				<view class="popup-title">预约需要{{ price }}易趣卷是否立即预约？</view>
+				<view class="popup-title">预约需要{{ price }}广告值是否立即预约？</view>
 				<view class="btn-box">
 					<view class="btn-left" @click="close()">取消</view>
 					<view class="btn-right" @click="appointment()">确定</view>
 				</view>
 			</view>
 		</uni-popup>
+		<uni-popup ref="navPopup" type="center">
+			<view class="popup">
+				<view class="popup-title">预约成功,是否跳转至订单页？</view>
+				<view class="btn-box">
+					<view class="btn-left" @click="close()">取消</view>
+					<view class="btn-right" @click="navTodd()">确定</view>
+				</view>
+			</view>
+		</uni-popup>
 	</view>
 </template>
 
@@ -196,7 +206,7 @@ export default {
 				auction_gu_id: obj.oid
 			}).then(({ data }) => {
 				obj.images = data.slider_image;
-				console.log(data);
+				console.log(data,'场馆');
 				data.data.forEach(e => {
 					let now_time = timeComputed(e.time);
 					console.log(e.time, now_time);
@@ -286,7 +296,9 @@ export default {
 				advance({ id: item.id })
 					.then(e => {
 						console.log(e, 'success');
-						this.nav();
+						uni.navigateTo({
+							url:'../order/order'
+						})
 					})
 					.catch(e => {
 						console.log(e, 'fail');
@@ -307,6 +319,13 @@ export default {
 			this.price = '';
 			this.id = '';
 			this.$refs.popup.close();
+			this.$refs.navPopup.close();
+		},
+		navTodd(){
+			this.$refs.navPopup.close()
+			uni.navigateTo({
+				url:'../order/order'
+			})
 		},
 		nav() {
 			uni.navigateTo({
@@ -334,6 +353,7 @@ export default {
 					this.list = [];
 					this.loadData();
 					this.updata();
+					this.$refs.navPopup.open()
 				})
 				.catch(e => {
 					this.price = '';

pages/hall/porducthall.vue

@@ -83,7 +83,7 @@
 		<view class="bottom flex">
 			<view class="bottom-item">
 				<image class="bi-image" src="../../static/img/quan.png" mode=""></image>
-				<view class="bottom-font">易趣卷</view>
+				<view class="bottom-font">广告值</view>
 				<!-- <view class="bottom-num">200</view> -->
 			</view>
 			<view class="shu"></view>

pages/index/goldenBean.vue

@@ -0,0 +1,247 @@
+<template>
+	<view class="">
+		<view class="goldenBean">
+			<view class="title">
+				<image src="@/static/img/list1.png"></image>
+				<view class="title-t"> {{list}} </view>
+				<text class="about">超值体验</text>
+				<view class="">
+					{{id}}
+				</view>
+			</view>
+			<view class="box">
+				<view class="header" :style="indexLoad%2!=1?bgColor[0]:bgColor[1]"  >
+					<view class="left">
+						<view class="title">
+							热门好物推荐
+						</view>
+						<view class="about">
+							买到就是赚到
+						</view>
+					</view>
+					<view class="right">
+						<image src="@/static/img/right.png" @click="navto('/pages/product/fenlei?id='+id)"></image>
+					</view>
+				</view>
+				<view class="footer">
+					<view class="list">
+						<view class="item" v-for="d in jdList"
+							@click="navto('/pages/product/product?id=' + d.id + '&is_gold=' + 1)">
+							<view class="img">
+								<image :src="d.image" mode=""></image>
+							</view>
+							<view class="name nowarp" :title='d.store_name'>
+								{{ d.store_name }}
+							</view>
+							<view class="price">
+								￥{{ d.price }}
+							</view>
+							<view class="name" style="font-size: 22rpx;color: #999;">
+								已售 {{ d.sales || '0'}}
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		goodsDetail,getProducts
+	} from '@/api/product.js'
+	export default {
+		props: ['data', 'leibie', 'index'],
+		mounted() {
+			// console.log(this.data);
+			console.log(this.leibie, this.index, 'ssss');
+			this.list = this.leibie.cate_name
+			this.id = this.leibie.id
+			console.log(this.id,'eiddidi');
+			this.indexLoad = this.index
+
+			// this.leibie.forEach(
+			// 	item => {
+			// 		this.list = item.cate_name
+			// 		console.log(this.list, 'weqeq')
+			// 	});
+			// for(let arr of this.leibie){arr=>{
+			// 	console.log(arr,'2222');
+			// }}
+		},
+		data() {
+			return {
+				list: '',
+				id: '',
+				indexLoad: '',
+				jdList:[],
+				bgColor: [{background: "linear-gradient(43deg, #FFBD70, #FF8F44)"},
+					{background: "linear-gradient(90deg, #F75022, #FF8B6C)"},
+				]
+			}
+		},
+		onLoad() {
+			this.getBargainList()
+		},
+		// onShow() {
+		// 	this.goodsDetail()
+		// },
+		methods: {
+			getBargainList() {
+				let that = this;
+				getProducts({
+						page: that.page,
+						limit: that.limit,
+						sid:that.id
+					})
+					.then(function(res) {
+						that.jdList = res.data
+						console.log(that.jdList,'jdlist');
+					})
+					.catch(res => {});
+			},
+			navto(url) {
+				uni.navigateTo({
+					url: url
+				});
+			},
+			// 获取商品信息
+			goodsDetail() {
+				let obj = this;
+				goodsDetail({}, this.id).then(function({
+					data
+				}) {
+					console.log(data, 'data');
+				});
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	$grey: #95A0B1;
+	$text: #333333;
+	$red: #FF4C4C;
+
+	// 金豆专区
+	.goldenBean {
+		font-family: PingFang-SC-Bold;
+		margin-top: 20rpx;
+		padding: 20rpx;
+		background-color: #fff;
+
+		.title {
+			display: flex;
+			line-height: 40rpx;
+
+			.title-t {
+				color: $text;
+				font-weight: bold;
+				margin: 0 20rpx;
+				font-size: 34rpx;
+			}
+
+			.about {
+				font-size: 24rpx;
+				color: $grey;
+			}
+
+			image {
+				width: 40rpx;
+				height: 40rpx;
+			}
+		}
+
+		.box {
+			margin: 20rpx 0;
+			border-radius: 10rpx;
+			overflow: hidden;
+
+			.header {
+				padding: 20rpx;
+
+				padding-bottom: 80rpx;
+				width: 100%;
+				display: flex;
+				justify-content: space-between;
+				color: #fff;
+
+				.left {
+					line-height: 40rpx;
+
+					.title {
+						font-size: 32rpx;
+					}
+
+					.about {
+						opacity: 0.9;
+						font-size: 24rpx;
+					}
+				}
+
+				.right {
+					margin: auto 0;
+
+					image {
+						width: 30rpx;
+						height: 30rpx;
+					}
+				}
+			}
+
+			.footer {
+				height: 300rpx;
+				background-color: $page-color-base;
+				padding: 20rpx;
+				margin-bottom: -50rpx;
+
+				.list {
+
+					display: flex;
+					justify-content: space-between;
+					overflow: auto;
+					border-radius: 10rpx;
+					position: relative;
+					top: -90rpx;
+					background-color: #fff;
+
+					.item {
+						padding: 35rpx;
+						border-right: solid 1rpx $page-color-base;
+
+						.name {
+
+							font-size: 24rpx;
+							color: #3F3F3F;
+							width: 150rpx;
+							overflow: hidden;
+							display: -webkit-box;
+							-webkit-box-orient: vertical;
+							-webkit-line-clamp: 1;
+							border-radius: 10rpx;
+							text-overflow: ellipsis;
+						}
+
+						.price {
+							font-size: 28rpx;
+							color: $red;
+							font-weight: bold;
+						}
+
+						.img {
+							overflow: hidden;
+							border-radius: 20rpx;
+
+							image {
+								width: 150rpx;
+								height: 150rpx;
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+</style>

pages/index/index.vue

@@ -1,4 +1,4 @@
-<template>
+<strong></strong><template>
 	<view class="center">
 		<view class="top">
 			<!-- <image class="top-bg" src="../../static/img/top-bg.png" mode=""></image> -->
@@ -29,45 +29,46 @@
 			</view>
 		</view>
 		<view class="navbar flex">
-			<view class="navbar-item" @click="nav('/pages/product/classify?type=4')">
+			<!-- @click="nav('/pages/product/classify?type=4')" -->
+			<view class="navbar-item" @click="nav('/pages/product/qudouShop')">
 				<image class="nitem-image" src="../../static/img/index-inco1.png" mode=""></image>
-				<view class="nitem-font">随意嗨购</view>
+				<view class="nitem-font">趣豆购物</view>
 			</view>
 
 			<view class="navbar-item" @click="nav('/pages/product/classify?type=5')">
 				<image class="nitem-image" src="../../static/img/index-inco3.png" mode=""></image>
-				<view class="nitem-font">置换</view>
+				<view class="nitem-font">购物券专区</view>
 			</view>
 			<view class="navbar-item" @click="nav('/pages/product/seckill')">
 				<image class="nitem-image" src="../../static/img/index-inco5.png" mode=""></image>
 				<view class="nitem-font">秒杀</view>
 			</view>
-			<view class="navbar-item" @click="nav('/pages/store/store')">
+			<!-- <view class="navbar-item" @click="nav('/pages/store/store')">
 				<image class="nitem-image" src="../../static/img/index-inco7.png" mode=""></image>
 				<view class="nitem-font">合作专区</view>
-			</view>
-			<view class="navbar-item" @click="nav('/pages/category/category')">
+			</view> -->
+			<!-- <view class="navbar-item" @click="nav('/pages/category/category')">
 				<image class="nitem-image" src="../../static/img/index-inco8.png" mode=""></image>
 				<view class="nitem-font">大品牌区</view>
-			</view>
+			</view> -->
 			<!-- <view class="navbar-item" @click="nav('/pages/index/message?type=2')">
 				<image class="nitem-image" src="../../static/img/index-inco6.png" mode=""></image>
 				<view class="nitem-font">拍卖品</view>
 			</view> -->
-			<view class="navbar-item" @click="nav('/pages/product/classify?type=1')">
+			<!-- <view class="navbar-item" @click="nav('/pages/product/classify?type=1')">
 				<image class="nitem-image" src="../../static/img/index-inco2.png" mode=""></image>
 				<view class="nitem-font">医斯佳专区</view>
 			</view>
 			<view class="navbar-item" @click="nav('/pages/product/classify?type=3')">
 				<image class="nitem-image" src="../../static/img/index-inco4.png" mode=""></image>
 				<view class="nitem-font">CBB专区</view>
-			</view>
+			</view> -->
 		</view>
 		<view class="shingle" v-if="list">
 			<view class="shingle-top flex">
-				<view class="shingle-title">CBB潮贝抢货通道</view>
+				<view class="shingle-title">商品认购体验馆</view>
 				<view class="shingle-btn" @click="nav('/pages/hall/hall')">
-					更多CBB代理团队
+					超值体验
 					<text>></text>
 				</view>
 			</view>
@@ -91,7 +92,7 @@
 					<view class="shu"></view>
 					<view class="smmain-item">
 						<view class="smitem-top clamp">{{ list.nickname }}</view>
-						<view class="smitem-bottom">CBB潮倍贝</view>
+						<view class="smitem-bottom">易趣商品</view>
 					</view>
 					<view class="shu"></view>
 					<view class="smmain-item">
@@ -111,12 +112,14 @@
 		</view>
 		<!-- 秒杀楼层 -->
 		<seckill></seckill>
+		<seck></seck>
+		<!-- <view>新品认购区加一张图，点进去跳转到新品认购区</view> -->
 		<view class="ge" v-if="stop.length != 0"></view>
 		<view class="serve" v-if="stop.length != 0">
 			<view class="seckill-title flex">
 				<view class="seckill-left flex">
 					<image class="seckill-inco" src="../../static/img/serve.png" mode=""></image>
-					<view class="seckill-font">服务专区推荐</view>
+					<view class="seckill-font">联盟商家展示区</view>
 				</view>
 				<view class="seckill-right" @click="nav('/pages/store/store')">
 					<view class="seckill-rfont">更多</view>
@@ -144,6 +147,7 @@
 		tabbar1
 	} from '@/utils/tabbar.js';
 	import seckill from '../../components/seckill/seckill.vue';
+	import seck from '../../components/seckill/seck.vue'
 	import {
 		article
 	} from '@/api/user.js';
@@ -160,6 +164,7 @@
 	} from '@/api/hall.js';
 	export default {
 		components: {
+			seck,
 			seckill,
 			uniCountdowns
 		},
@@ -210,6 +215,7 @@
 						data
 					}) => {
 						this.list = data[0];
+						console.log(data,'展示');
 					})
 					.catch(e => {
 						console.log(e);
@@ -433,6 +439,7 @@
 	.navbar {
 		justify-content: flex-start;
 		flex-wrap: wrap;
+		justify-content: space-around;
 
 		.navbar-item {
 			margin-top: 42rpx;
@@ -484,12 +491,13 @@
 			}
 
 			.shingle-btn {
+				text-align: center;
 				width: 250rpx;
 				height: 50rpx;
 				border: 2rpx solid #dc262b;
 				border-radius: 10rpx;
 				padding: 0 16rpx;
-				text-align: left;
+				// text-align: left;
 				font-size: 24rpx;
 				font-family: PingFang SC;
 				font-weight: 500;

pages/money/gouwu.vue

@@ -0,0 +1,410 @@
+<template>
+	<view class="content">
+		<view class="content-money">
+			<view class="status_bar"><!-- 这里是状态栏 --></view>
+			<view class="body-title">
+				<view class="goback-box" @click="toBack"><image class="goback" src="../../static/icon/fanhui.png" mode=""></image></view>
+				<view class="header">我的购物券</view>
+			</view>
+			<view class="content-bg"><image src="../../static/img/jindou-bg.png" mode=""></image></view>
+			<view class="money-box">
+				<view class="money">{{ userInfo.shop_integral }}</view>
+				<view>余额</view>
+			</view>
+			<view class="money-btn" @click="navto('/pages/money/wallet?id=4')">
+				转账
+			</view>
+		</view>
+		<!-- <view class="info-box flex">
+			<view class="info-item">
+				<view class="info-font">累计收入</view>
+				<view class="info-num">{{ recharge }}</view>
+			</view>
+			<view class="shu"></view>
+			<view class="info-item">
+				<view class="info-font">累计支出</view>
+				<view class="info-num">{{ orderStatusSum }}</view>
+			</view>
+		</view> -->
+		<view class="navbar">
+			<view v-for="(item, index) in navList" :key="index" class="nav-item" :class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">{{ item.text }}</view>
+		</view>
+		<swiper :current="tabCurrentIndex" :style="{ height: maxheight }" class="swiper-box" duration="300" @change="changeTab">
+			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
+				<scroll-view scroll-y="true" class="list-scroll-content" @scrolltolower="loadData">
+					<!-- 空白页 -->
+					<empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty>
+
+					<!-- 订单列表 -->
+					<view>
+						<view class="order-item flex" v-for="(item, index) in tabItem.orderList" :key="index">
+							<view class="title-box">
+								<view class="title">
+									<text>{{ item.mark }}</text>
+								</view>
+								<view class="time">
+									<text>{{ item.add_time }}</text>
+								</view>
+							</view>
+							<view class="money">
+								<view>{{ (item.pm == 0 ? '-' : '+') + item.number }}</view>
+								<view v-if="item.status == 0" class="status">待发放</view>
+							</view>
+						</view>
+					</view>
+					<!-- <uni-load-more :status="tabItem.loadingType" v-if="!(tabItem.orderList.length == 0 && tabItem.loaded)"></uni-load-more> -->
+				</scroll-view>
+			</swiper-item>
+		</swiper>
+	</view>
+</template>
+
+<script>
+import { integrallist ,shopintegrallist} from '@/api/wallet.js';
+import { getMoneyStyle } from '@/utils/rocessor.js';
+import { mapState, mapMutations } from 'vuex';
+import uniLoadMore from '@/uview-ui/components/u-loadmore/u-loadmore.vue';
+import empty from '@/uview-ui/components/u-empty/u-empty.vue';
+export default {
+	filters: {
+		getMoneyStyle
+	},
+	computed: {
+		...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
+	},
+	components: {
+		empty,
+		uniLoadMore
+	},
+	onReady(res) {
+		var _this = this;
+		uni.getSystemInfo({
+			success: resu => {
+				const query = uni.createSelectorQuery();
+				query.select('.swiper-box').boundingClientRect();
+				query.exec(function(res) {
+					_this.maxheight = resu.windowHeight - res[0].top + 'px';
+					console.log('打印页面的剩余高度', _this.height);
+				});
+			},
+			fail: res => {}
+		});
+	},
+	data() {
+		return {
+			// 头部图高度
+			maxheight: '',
+			tabCurrentIndex: 0,
+			orderStatusSum: 0,
+			recharge: 0,
+			navList: [
+				{
+					state: 0,
+					text: '支出',
+					loadingType: 'more',
+					orderList: [],
+					page: 1, //当前页数
+					limit: 1000, //每次信息条数
+					loaded: false
+				},
+				{
+					state: 1,
+					text: '收入',
+					loadingType: 'more',
+					orderList: [],
+					page: 1, //当前页数
+					limit: 1000, //每次信息条数
+					loaded: false
+				}
+			],
+			money: ''
+		};
+	},
+	onLoad(options) {},
+	onShow() {
+		this.loadData();
+	},
+	methods: {
+		// 页面跳转
+		navto(e) {
+			uni.navigateTo({
+				url: e
+			});
+		},
+		// 点击返回 我的页面
+		toBack() {
+			uni.switchTab({
+				url:'../user/user'
+			})
+		},
+		//获取收入支出信息
+		async loadData(source) {
+			let obj = this;
+			//这里是将订单挂载到tab列表下
+			let index = this.tabCurrentIndex;
+			let navItem = this.navList[index];
+			let state = navItem.state;
+			console.log(state, 'iwiwiwiwi');
+			if (source === 'tabChange' && navItem.loaded === true) {
+				//tab切换只有第一次需要加载数据
+				return;
+			}
+			if (navItem.loadingType === 'loading') {
+				//防止重复加载
+				return;
+			}
+			// 修改当前对象状态为加载中
+			navItem.loadingType = 'loading';
+
+			shopintegrallist({
+				page: navItem.page,
+				limit: navItem.limit,
+				pm:navItem.state
+			})
+				.then(({ data }) => {
+					// obj.recharge = data.income;
+					console.log(data,'额鹅鹅鹅');
+					navItem.orderList = data.list
+					// obj.orderStatusSum = data.expend;
+					// if(state == 0 ){
+					// 	navItem.orderList = data.zj
+					// }
+					// if(state == 1 ){
+					// 	navItem.orderList = data.kc
+					// }
+				})
+				.catch(e => {
+					console.log(e);
+				});
+		},
+
+		//swiper 切换
+		changeTab(e) {
+			this.tabCurrentIndex = e.target.current;
+			this.loadData('tabChange');
+		},
+		//顶部tab点击
+		tabClick(index) {
+			this.tabCurrentIndex = index;
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+page {
+	background: #f1f1f1;
+	height: 100%;
+}
+.status_bar {
+	height: var(--status-bar-height);
+	width: 100%;
+}
+.content-money {
+	position: relative;
+	height: 480rpx;
+	.content-bg {
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		width: 750rpx;
+		height: 480rpx;
+		image {
+			width: 100%;
+			height: 100%;
+		}
+	}
+	.body-title {
+		height: 80rpx;
+		text-align: center;
+		font-size: 35rpx;
+		position: relative;
+		.header {
+			position: absolute;
+			left: 0;
+			top: 0;
+			width: 100%;
+			font-size: 36rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #fffeff;
+			height: 80rpx;
+			font-size: 36rpx;
+			font-weight: 700;
+			z-index: 9;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+		}
+		.goback-box {
+			position: absolute;
+			left: 18rpx;
+			top: 0;
+			height: 80rpx;
+			display: flex;
+			align-items: center;
+		}
+
+		.goback {
+			z-index: 100;
+			width: 34rpx;
+			height: 34rpx;
+		}
+	}
+}
+.info-box {
+	width: 670rpx;
+	height: 186rpx;
+	background: #ffffff;
+	box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
+	border-radius: 20rpx;
+	margin: -100rpx auto 0;
+	position: relative;
+	z-index: 2;
+	.info-item {
+		width: 50%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		line-height: 1;
+		.info-font {
+			font-size: 30rpx;
+			font-weight: bold;
+			color: #999999;
+		}
+		.info-num {
+			margin-top: 30rpx;
+			font-size: 30rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #181818;
+		}
+	}
+	.shu {
+		width: 2rpx;
+		height: 74rpx;
+		background: #dcdfe6;
+	}
+}
+.money-box {
+	position: relative;
+	z-index: 2;
+	padding-top: 90rpx;
+	color: #ffffff;
+	text-align: center;
+	.money {
+		font-size: 72rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #ffffff;
+	}
+	.text {
+		font-size: 30rpx;
+	}
+}
+.money-btn {
+	position: relative;
+	z-index: 2;
+	color: #ffffff;
+	padding-right: 50rpx;
+	text-align: right;
+	font-size: 30rpx;
+	font-family: PingFang SC;
+	font-weight: bold;
+	color: #ffffff;
+	text {
+		display: inline-block;
+		padding-left: 10rpx;
+	}
+}
+
+.navbar {
+	margin-top: 20rpx;
+	display: flex;
+	height: 88rpx;
+	padding: 0 5px;
+	background: #fff;
+	box-shadow: 0 1px 5px rgba(0, 0, 0, 0.06);
+	position: relative;
+	z-index: 10;
+	.nav-item {
+		flex: 1;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 100%;
+		font-size: 15px;
+		color: #999999;
+		position: relative;
+		&.current {
+			color: #000;
+			&:after {
+				content: '';
+				position: absolute;
+				left: 50%;
+				bottom: 0;
+				transform: translateX(-50%);
+				width: 44px;
+				height: 0;
+				border-bottom: 2px solid #fe5b38;
+			}
+		}
+	}
+}
+//列表
+.swiper-box {
+	.order-item:last-child {
+		margin-bottom: 60rpx;
+	}
+	.order-item {
+		padding: 20rpx 30rpx;
+		line-height: 1.5;
+		.title-box {
+			.title {
+				font-size: $font-lg;
+				color: $font-color-base;
+			}
+			.time {
+				font-size: $font-base;
+				color: $font-color-light;
+			}
+		}
+		.money {
+			color: #fd5b23;
+			font-size: $font-lg;
+			text-align: right;
+			.status {
+				color: $font-color-light;
+			}
+		}
+	}
+}
+.list-scroll-content {
+	background: #ffffff;
+	height: 100%;
+}
+.content {
+	height: 100%;
+	.empty-content {
+		background-color: #ffffff;
+	}
+}
+.btn-box {
+	width: 674rpx;
+	height: 88rpx;
+	background: linear-gradient(0deg, #2e58ff, #32c6ff);
+	border-radius: 44rpx;
+	font-size: 36rpx;
+	font-family: PingFang SC;
+	font-weight: 500;
+	color: #ffffff;
+	text-align: center;
+	line-height: 88rpx;
+	position: fixed;
+	bottom: 48rpx;
+	left: 0;
+	right: 0;
+	margin: 0 auto;
+}
+</style>

pages/money/jinDou.vue

@@ -0,0 +1,429 @@
+<template>
+	<view class="content">
+		<view class="content-money">
+			<view class="status_bar"><!-- 这里是状态栏 --></view>
+			<view class="body-title">
+				<view class="goback-box" @click="toBack"><image class="goback" src="../../static/icon/fanhui.png" mode=""></image></view>
+				<view class="header">我的金豆</view>
+			</view>
+			<view class="content-bg"><image src="../../static/img/jindou-bg.png" mode=""></image></view>
+			<view class="money-box">
+				<view class="money">{{ userInfo.golden_bean}}</view>
+				<view>余额</view>
+			</view>
+			<view class="money-left" @click="navto('/pages/user/zhuanyue')">
+				兑换
+			</view>
+			<view class="money-btn" @click="navto('/pages/money/wallet?id=3')">
+				转账
+			</view>
+		</view>
+		<!-- <view class="info-box flex">
+			<view class="info-item">
+				<view class="info-font">累计收入</view>
+				<view class="info-num">{{ recharge }}</view>
+			</view>
+			<view class="shu"></view>
+			<view class="info-item">
+				<view class="info-font">累计支出</view>
+				<view class="info-num">{{ orderStatusSum }}</view>
+			</view>
+		</view> -->
+		<view class="navbar">
+			<view v-for="(item, index) in navList" :key="index" class="nav-item" :class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">{{ item.text }}</view>
+		</view>
+		<swiper :current="tabCurrentIndex" :style="{ height: maxheight }" class="swiper-box" duration="300" @change="changeTab">
+			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
+				<scroll-view scroll-y="true" class="list-scroll-content" @scrolltolower="loadData">
+					<!-- 空白页 -->
+					<empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty>
+
+					<!-- 订单列表 -->
+					<view>
+						<view class="order-item flex" v-for="(item, index) in tabItem.orderList" :key="index">
+							<view class="title-box">
+								<view class="title">
+									<text>{{ item.mark }}</text>
+								</view>
+								<view class="time">
+									<text>{{ item.add_time }}</text>
+								</view>
+							</view>
+							<view class="money">
+								<view>{{ (item.pm == 0 ? '-' : '+') + item.number }}</view>
+								<view v-if="item.status == 0" class="status">待发放</view>
+							</view>
+						</view>
+					</view>
+					<!-- <uni-load-more :status="tabItem.loadingType" v-if="!(tabItem.orderList.length == 0 && tabItem.loaded)"></uni-load-more> -->
+				</scroll-view>
+			</swiper-item>
+		</swiper>
+	</view>
+</template>
+
+<script>
+import { integrallist,goldenintegrallist } from '@/api/wallet.js';
+import { getMoneyStyle } from '@/utils/rocessor.js';
+import { mapState, mapMutations } from 'vuex';
+import uniLoadMore from '@/uview-ui/components/u-loadmore/u-loadmore.vue';
+import empty from '@/uview-ui/components/u-empty/u-empty.vue';
+export default {
+	filters: {
+		getMoneyStyle
+	},
+	computed: {
+		...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
+	},
+	components: {
+		empty,
+		uniLoadMore
+	},
+	onReady(res) {
+		var _this = this;
+		uni.getSystemInfo({
+			success: resu => {
+				const query = uni.createSelectorQuery();
+				query.select('.swiper-box').boundingClientRect();
+				query.exec(function(res) {
+					_this.maxheight = resu.windowHeight - res[0].top + 'px';
+					console.log('打印页面的剩余高度', _this.height);
+				});
+			},
+			fail: res => {}
+		});
+	},
+	data() {
+		return {
+			// 头部图高度
+			maxheight: '',
+			tabCurrentIndex: 0,
+			orderStatusSum: 0,
+			recharge: 0,
+			navList: [
+				{
+					state: 0,
+					text: '支出',
+					loadingType: 'more',
+					orderList: [],
+					page: 1, //当前页数
+					limit: 1000, //每次信息条数
+					loaded: false
+				},
+				{
+					state: 1,
+					text: '收入',
+					loadingType: 'more',
+					orderList: [],
+					page: 1, //当前页数
+					limit: 1000, //每次信息条数
+					loaded: false
+				}
+			],
+			money: ''
+		};
+	},
+	onLoad(options) {},
+	onShow() {
+		this.loadData();
+	},
+	methods: {
+		// 页面跳转
+		navto(e) {
+			uni.navigateTo({
+				url: e
+			});
+		},
+		// 点击返回 我的页面
+		toBack() {
+			uni.switchTab({
+				url:'../user/user'
+			})
+		},
+		//获取收入支出信息
+		async loadData(source) {
+			let obj = this;
+			//这里是将订单挂载到tab列表下
+			let index = this.tabCurrentIndex;
+			let navItem = this.navList[index];
+			let state = navItem.state;
+			console.log(source, 'iwiwiwiwi');
+			if (source === 'tabChange' && navItem.loaded === true) {
+				//tab切换只有第一次需要加载数据
+				return;
+			}
+			if (navItem.loadingType === 'loading') {
+				//防止重复加载
+				return;
+			}
+			// 修改当前对象状态为加载中
+			navItem.loadingType = 'loading';
+
+			goldenintegrallist({
+				page: navItem.page,
+				limit: navItem.limit,
+				pm:navItem.state
+			})
+				.then(({ data }) => {
+					// obj.recharge = data.income;
+					console.log(data,'222');
+					navItem.orderList = data.list
+					// obj.orderStatusSum = data.expend;
+					// if(state == 0 ){
+					// 	navItem.orderList = data.zj
+					// }
+					// if(state == 1 ){
+					// 	navItem.orderList = data.kc
+					// }
+				})
+				.catch(e => {
+					console.log(e);
+				});
+		},
+
+		//swiper 切换
+		changeTab(e) {
+			this.tabCurrentIndex = e.target.current;
+			this.loadData('tabChange');
+		},
+		//顶部tab点击
+		tabClick(index) {
+			this.tabCurrentIndex = index;
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+page {
+	background: #f1f1f1;
+	height: 100%;
+}
+.status_bar {
+	height: var(--status-bar-height);
+	width: 100%;
+}
+.content-money {
+	position: relative;
+	height: 480rpx;
+	.content-bg {
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		width: 750rpx;
+		height: 480rpx;
+		image {
+			width: 100%;
+			height: 100%;
+		}
+	}
+	.body-title {
+		height: 80rpx;
+		text-align: center;
+		font-size: 35rpx;
+		position: relative;
+		.header {
+			position: absolute;
+			left: 0;
+			top: 0;
+			width: 100%;
+			font-size: 36rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #fffeff;
+			height: 80rpx;
+			font-size: 36rpx;
+			font-weight: 700;
+			z-index: 9;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+		}
+		.goback-box {
+			position: absolute;
+			left: 18rpx;
+			top: 0;
+			height: 80rpx;
+			display: flex;
+			align-items: center;
+		}
+
+		.goback {
+			z-index: 100;
+			width: 34rpx;
+			height: 34rpx;
+		}
+	}
+}
+.info-box {
+	width: 670rpx;
+	height: 186rpx;
+	background: #ffffff;
+	box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
+	border-radius: 20rpx;
+	margin: -100rpx auto 0;
+	position: relative;
+	z-index: 2;
+	.info-item {
+		width: 50%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		line-height: 1;
+		.info-font {
+			font-size: 30rpx;
+			font-weight: bold;
+			color: #999999;
+		}
+		.info-num {
+			margin-top: 30rpx;
+			font-size: 30rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #181818;
+		}
+	}
+	.shu {
+		width: 2rpx;
+		height: 74rpx;
+		background: #dcdfe6;
+	}
+}
+.money-box {
+	position: relative;
+	z-index: 2;
+	padding-top: 90rpx;
+	color: #ffffff;
+	text-align: center;
+	.money {
+		font-size: 72rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #ffffff;
+	}
+	.text {
+		font-size: 30rpx;
+	}
+}
+
+.money-left{
+	position: absolute;
+	z-index: 2;
+	color: #ffffff;
+	padding-left: 50rpx;
+	text-align: left;
+	font-size: 30rpx;
+	font-weight: bold;
+	color: #ffffff;
+	text {
+		display: inline-block;
+		padding-right: 10rpx;
+	}
+}
+.money-btn {
+	position: absolute;
+	z-index: 2;
+	right: 0;
+	color: #ffffff;
+	padding-right: 50rpx;
+	text-align: right;
+	font-size: 30rpx;
+	font-weight: bold;
+	color: #ffffff;
+	text {
+		display: inline-block;
+		padding-left: 10rpx;
+	}
+}
+
+
+.navbar {
+	margin-top: 20rpx;
+	display: flex;
+	height: 88rpx;
+	padding: 0 5px;
+	background: #fff;
+	box-shadow: 0 1px 5px rgba(0, 0, 0, 0.06);
+	position: relative;
+	z-index: 10;
+	.nav-item {
+		flex: 1;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 100%;
+		font-size: 15px;
+		color: #999999;
+		position: relative;
+		&.current {
+			color: #000;
+			&:after {
+				content: '';
+				position: absolute;
+				left: 50%;
+				bottom: 0;
+				transform: translateX(-50%);
+				width: 44px;
+				height: 0;
+				border-bottom: 2px solid #fe5b38;
+			}
+		}
+	}
+}
+//列表
+.swiper-box {
+	.order-item:last-child {
+		margin-bottom: 60rpx;
+	}
+	.order-item {
+		padding: 20rpx 30rpx;
+		line-height: 1.5;
+		.title-box {
+			.title {
+				font-size: $font-lg;
+				color: $font-color-base;
+			}
+			.time {
+				font-size: $font-base;
+				color: $font-color-light;
+			}
+		}
+		.money {
+			color: #fd5b23;
+			font-size: $font-lg;
+			text-align: right;
+			.status {
+				color: $font-color-light;
+			}
+		}
+	}
+}
+.list-scroll-content {
+	background: #ffffff;
+	height: 100%;
+}
+.content {
+	height: 100%;
+	.empty-content {
+		background-color: #ffffff;
+	}
+}
+.btn-box {
+	width: 674rpx;
+	height: 88rpx;
+	background: linear-gradient(0deg, #2e58ff, #32c6ff);
+	border-radius: 44rpx;
+	font-size: 36rpx;
+	font-family: PingFang SC;
+	font-weight: 500;
+	color: #ffffff;
+	text-align: center;
+	line-height: 88rpx;
+	position: fixed;
+	bottom: 48rpx;
+	left: 0;
+	right: 0;
+	margin: 0 auto;
+}
+</style>

pages/money/money.vue

@@ -2,7 +2,7 @@
 	<view class="center">
 		<view class="top">
 			<image class="top-bg" src="../../static/img/order99.png" mode=""></image>
-			<view class="top-font">现金余额（元）</view>
+			<view class="top-font">余额（元）</view>
 			<view class="num">{{ userInfo.now_money || '0.00' }}</view>
 		</view>
 		<view class="navbar">
@@ -25,7 +25,7 @@
 			<view class="navbar-item">
 				<view class="navbar-font" @click="navTo('/pages/user/myAppointment')">
 					<image class="navbar-image" src="../../static/money/m04.png" mode=""></image>
-					<view class="font">易趣卷</view>
+					<view class="font">广告值</view>
 				</view>
 				<view class="navbar-num">{{ userInfo.anticipate }}</view>
 			</view>

pages/money/qudou.vue

@@ -11,9 +11,9 @@
 				<view class="money">{{ userInfo.integral }}</view>
 				<view>余额</view>
 			</view>
-			<!-- <view class="money-btn" @click="navto('/pages/money/withdrawal')">
+			<view class="money-btn" @click="navto('/pages/money/wallet?id=2')">
 				转账
-			</view> -->
+			</view>
 		</view>
 		<!-- <view class="info-box flex">
 			<view class="info-item">
@@ -99,7 +99,7 @@ export default {
 			recharge: 0,
 			navList: [
 				{
-					state: 0,
+					state: 1,
 					text: '收入',
 					loadingType: 'more',
 					orderList: [],
@@ -108,7 +108,7 @@ export default {
 					loaded: false
 				},
 				{
-					state: 1,
+					state: 2,
 					text: '支出',
 					loadingType: 'more',
 					orderList: [],
@@ -156,16 +156,18 @@ export default {
 
 			integrallist({
 				page: navItem.page,
-				limit: navItem.limit
+				limit: navItem.limit,
+				pm:navItem.state
 			})
 				.then(({ data }) => {
 					// obj.recharge = data.income;
 					// obj.orderStatusSum = data.expend;
-					if(state == 0 ){
-						navItem.orderList = data.zj
-					}
+					console.log(data,'datta');
 					if(state == 1 ){
-						navItem.orderList = data.kc
+						navItem.orderList = data.list
+					}
+					if(state == 2 ){
+						navItem.orderList = data.list
 					}
 				})
 				.catch(e => {

pages/money/recharge.vue

@@ -5,7 +5,7 @@
 			<view class="now-money">￥{{ new_money }}</view>
 		</view>
 		<view class="now" v-if="status == 2">
-			<view>当前易趣卷：</view>
+			<view>当前广告值：</view>
 			<view class="now-money">￥{{ userInfo.anticipate }}</view>
 		</view>
 		<view class="main-jg"></view>
@@ -537,4 +537,4 @@ page {
 	height: 21rpx;
 	background-color: #f8f6f6;
 }
-</style>
+</style>

pages/money/wallet.vue

@@ -2,9 +2,21 @@
 	<view class="content">
 		<view class="content-money">
 			<view class="flex">
-				<view class="buttom">
+				<view class="buttom" v-if="id==1">
 					<view class="icon">{{ userInfo.anticipate | getMoneyStyle }}</view>
-					<text class="text">可用易趣卷</text>
+					<text class="text">可用广告值</text>
+				</view>
+				<view class="buttom" v-if="id==2">
+					<view class="icon">{{ userInfo.integral | getMoneyStyle }}</view>
+					<text class="text">可用趣豆</text>
+				</view>
+				<view class="buttom" v-if="id==3">
+					<view class="icon">{{ userInfo.golden_bean | getMoneyStyle }}</view>
+					<text class="text">可用金豆</text>
+				</view>
+				<view class="buttom" v-if="id==4">
+					<view class="icon">{{ userInfo.shop_integral | getMoneyStyle }}</view>
+					<text class="text">可用购物券</text>
 				</view>
 			</view>
 		</view>
@@ -21,7 +33,9 @@
 			<view class="row">
 				<!-- <text class="tit">￥</text> -->
 				<input class="input" type="number" v-model="withdrawal" placeholder="转入金额" placeholder-class="placeholder" />
-				<view class="buttom" @click="withdrawal = userInfo.anticipate">全部转账</view>
+				<view v-if="id==1" class="buttom" @click="withdrawal = userInfo.anticipate">全部转账</view>
+				<view v-if="id==2" class="buttom" @click="withdrawal = userInfo.golden_bean">全部转账</view>
+				<view v-if="id==3" class="buttom" @click="withdrawal = userInfo.shop_integral">全部转账</view>
 			</view>
 		</view>
 
@@ -48,10 +62,13 @@ export default {
 			weichatBsrowser: false,
 			// #endif
 			loding: false,
-			type: 'xl'
+			type: 'xl',
+			id:0
 		};
 	},
 	onLoad(options) {
+		console.log(options,'options');
+		this.id = options.id
 		// #ifdef H5
 		this.weichatBsrowser = uni.getStorageSync('weichatBrowser');
 		// #endif
@@ -87,6 +104,7 @@ export default {
 		confirm() {
 			let obj = this;
 			obj.loding = true;
+			console.log(obj.id,'213');
 			if (obj.withdrawal < 10) {
 				obj.loding = false;
 				uni.showModal({
@@ -111,10 +129,12 @@ export default {
 				});
 				return;
 			} else {
+				
 				let data = {
 					uid: obj.card, //编号
 					anticipate: obj.withdrawal, //金额
-					payment: obj.password
+					payment: obj.password,
+					type:obj.id
 				};
 				transfer_accounts(data)
 					.then(e => {

pages/product/classify.vue

@@ -8,7 +8,7 @@
 				<view class="hot-price">
 					<view class="price">
 						<text class="font-size-sm">￥</text>
-						{{ item.price }}
+						{{ item.price }} + <span style="font-size: 28rpx;" >{{item.integral}} 趣豆</span>
 					</view>
 				</view>
 			</view>
@@ -45,7 +45,7 @@ export default {
 		if (option.type) {
 			this.type = option.type;
 			uni.setNavigationBarTitle({
-				title: option.type == 1 ? '医斯佳专区' : option.type == 4 ? '随意嗨购' : option.type == 3 ? 'CBB专区' : '置换'
+				title: option.type == 1 ? '医斯佳专区':option.type == 2 ? '趣豆购区' : option.type == 4 ? '随意嗨购' : option.type == 3 ? 'CBB专区' : '购物券区'
 			});
 		}
 		// 加载基础数据
@@ -75,6 +75,7 @@ export default {
 					// 保存轮播图
 					obj.bannerImg = data.banner;
 					// 保存商品信息
+					console.log(data,'list');
 					obj.list = this.list.concat(data.list);
 					obj.loaded = true;
 					obj.page++;

pages/product/fenlei.vue

@@ -0,0 +1,300 @@
+<template>
+	<view class="container">
+		<empty v-if="loaded === true && list.length === 0"></empty>
+		<view class="hotgoods">
+			<view class="hotgoods-item" v-for="item in list" :key="item.id" @click="navToDetailPage(item)">
+				<view class="image-wrapper"><image :src="item.image" mode="scaleToFill"></image></view>
+				<view class="title clamp margin-c-20">{{ item.store_name }}</view>
+				<view class="hot-price">
+					<view class="price">
+						<text class="font-size-sm">￥</text>
+						{{ item.price }}
+					</view>
+				</view>
+			</view>
+		</view>
+		<uni-load-more :status="loadingType"></uni-load-more>
+	</view>
+</template>
+
+<script>
+import empty from '@/components/empty';
+import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+import { groomList } from '@/api/product.js';
+export default {
+	data() {
+		return {
+			list: [],
+			bannerImg: [],
+			type: 1, //1->置换
+			loadingType: 'more',
+			loaded: false,
+			page: 1,
+			limit: 20,
+			id:0,
+		};
+	},
+	components: {
+		uniLoadMore,
+		empty
+	},
+	onReachBottom() {
+		this.loadData();
+	},
+	onLoad(option) {
+		this.id = option.id
+		// 获取查询对象
+		// if (option.type) {
+		// 	this.type = option.type;
+		// 	uni.setNavigationBarTitle({
+		// 		title: option.type == 1 ? '医斯佳专区':option.type == 2 ? '新品认购区' : option.type == 4 ? '随意嗨购' : option.type == 3 ? 'CBB专区' : '置换'
+		// 	});
+		// }
+		// 加载基础数据
+		this.loadData();
+	},
+	methods: {
+		navTo: function(ls) {
+			uni.navigateTo({
+				url: '/pages/product/product?id=' + ls.id
+			});
+		},
+		// 请求载入数据
+		async loadData() {
+			let obj = this;
+			if (obj.loadingType == 'loading' || obj.loadingType == 'noMore') {
+				return;
+			}
+			obj.loadingType = 'loading';
+			groomList(
+				{
+					page: obj.page,
+					limit: obj.limit
+				},
+				obj.id
+			)
+				.then(({ data }) => {
+					console.log(data,'datadata');
+					// 保存轮播图
+					obj.bannerImg = data.banner;
+					// 保存商品信息
+					obj.list = this.list.concat(data.list);
+					obj.loaded = true;
+					obj.page++;
+					if (obj.limit == data.list.length) {
+						obj.loadingType = 'more';
+					} else {
+						obj.loadingType = 'noMore';
+					}
+				})
+				.catch(e => {
+					console.log(e);
+				});
+		},
+		// 轮播图跳转
+		bannerNavToUrl(item) {
+			// #ifdef H5
+			if (item.wap_link.indexOf('http') > 0) {
+				window.location.href = item.wap_link;
+			}
+			// #endif
+			if (item.wap_link) {
+				uni.navigateTo({
+					url: item.wap_link
+				});
+			}
+		},
+		navToDetailPage(e) {
+			uni.navigateTo({
+				url: '/pages/product/product?id=' + e.id
+			});
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+page {
+	background: $page-color-base;
+}
+
+.carousel-section {
+	padding: 0;
+
+	.titleNview-placing {
+		padding-top: 0;
+		height: 0;
+	}
+
+	.swiper-dots {
+		left: 45rpx;
+		bottom: 40rpx;
+	}
+
+	.carousel {
+		width: 100%;
+		height: 360rpx;
+
+		.carousel-item {
+			width: 100%;
+			height: 100%;
+			overflow: hidden;
+		}
+
+		image {
+			width: 100%;
+			height: 100%;
+		}
+	}
+}
+
+// 中间标题样式
+.type-title-box {
+	padding: 40rpx;
+
+	.title-content {
+		height: 100%;
+		width: 200rpx;
+		text-align: center;
+		font-size: $font-lg;
+		font-weight: 500;
+		color: $font-color-dark;
+	}
+
+	.title-border {
+		width: 250rpx;
+		height: 2rpx;
+		background-color: #e9e9e9;
+	}
+}
+
+// 商品列表
+.goodsList-box {
+	.goodsList-item {
+		margin-bottom: 40rpx;
+		background-color: #ffffff;
+		padding: 30rpx;
+
+		image {
+			flex-shrink: 0;
+			border-radius: $border-radius-sm;
+			height: 180rpx;
+			width: 180rpx;
+		}
+
+		.goodsList-content {
+			margin-left: 20rpx;
+			flex-grow: 1;
+			height: 180rpx;
+			position: relative;
+
+			.title {
+				font-size: $font-base;
+				color: $font-color-dark;
+				font-weight: 500;
+			}
+
+			.goods-money {
+				position: absolute;
+				left: 0;
+				bottom: 0;
+				width: 100%;
+
+				.money-box {
+					.money {
+						font-size: $font-lg;
+						color: $color-red;
+						font-weight: bold;
+					}
+
+					.otMoney-box {
+						font-size: $font-sm;
+
+						.otMoney {
+							color: $font-color-dark;
+							padding-right: 20rpx;
+						}
+
+						.sales {
+							color: $font-color-light;
+						}
+					}
+				}
+
+				.cart {
+					border: 1px solid $color-red;
+					color: $color-red;
+					font-size: $font-base;
+					font-weight: bold;
+					border-radius: 99px;
+					width: 55rpx;
+					height: 55rpx;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+				}
+			}
+		}
+	}
+}
+
+.hotgoods {
+	margin-top: 38rpx;
+	width: 100%;
+	display: flex;
+	flex-wrap: wrap;
+	padding: 0 32rpx;
+
+	.hotgoods-item {
+		width: 48%;
+		background-color: #ffffff;
+		border-radius: 12rpx;
+		margin-bottom: 24rpx;
+
+		&:nth-child(2n + 1) {
+			margin-right: 24rpx;
+		}
+
+		.image-wrapper {
+			width: 100%;
+			height: 330rpx;
+			// background: red;
+			border-radius: 3px;
+			overflow: hidden;
+
+			image {
+				width: 100%;
+				height: 100%;
+				opacity: 1;
+				border-radius: 12rpx 12rpx 0 0;
+			}
+		}
+
+		.title {
+			font-size: $font-base;
+			color: $font-color-dark;
+			font-weight: bold;
+			line-height: 80rpx;
+		}
+
+		.hot-price {
+			display: flex;
+			justify-content: space-between;
+			padding: 0 16rpx 12rpx;
+
+			.price {
+				font-size: 36rpx;
+				font-weight: bold;
+				color: #fd3b39;
+			}
+
+			.cart-icon {
+				image {
+					width: 44rpx;
+					height: 44rpx;
+				}
+			}
+		}
+	}
+}
+</style>

pages/product/new.vue

@@ -2,19 +2,56 @@
 	<view class="center">
 		<view class="top">
 			<image class="top-bg" src="../../static/img/top-bg.png" mode=""></image>
-			<view class="title">新品</view>
+			<!-- <swiper class="carousel" autoplay="true" duration="400" interval="5000" @change="swiperChange">
+				<swiper-item v-for="(item, index) in carouselList" :key="index" class="carousel-item"
+					@click="bannerNavToUrl(item)">
+					<image class="top-bg" :src="item.pic" />
+				</swiper-item>
+			</swiper> -->
+			<view class="title">新品专区</view>
 		</view>
 		<swiper class="carousel" autoplay="true" duration="400" interval="5000" @change="swiperChange">
-			<swiper-item class="carousel-item" @click="bannerNavToUrl(item)"><image src="../../static/img/new.png" /></swiper-item>
+			<swiper-item class="carousel-item" v-for="(item,index) in carouselList "  @click="bannerNavToUrl(item)"><image :src="item.pic" mode=""></image> </swiper-item>
 		</swiper>
-		<view class="hotgoods" v-if="firstList.length != 0">
-			<view class="hotgoods-item" v-for="item in firstList" :key="item.id" @click="navToDetailPage(item)">
-				<view class="image-wrapper"><image :src="item.image" mode="scaleToFill"></image></view>
-				<view class="title clamp margin-c-20">{{ item.store_name }}</view>
-				<view class="hot-price">
-					<view class="price">
-						<text class="font-size-sm">￥</text>
-						{{ item.price }}
+		<view class="">
+			<view class="goldenBean" v-for="(item,index) in leibieList" v-if="item.loaded && item.list.length != 0">
+				<view class="title">
+					<image src="@/static/img/list1.png"></image>
+					<view class="title-t"> {{item.cate_name}} </view>
+					<text class="about">超值体验</text>
+				</view>
+				<view class="box">
+					<view class="header" :style="index%2!=1?bgColor[0]:bgColor[1]">
+						<view class="left">
+							<view class="title">
+								热门好物推荐
+							</view>
+							<view class="about">
+								买到就是赚到
+							</view>
+						</view>
+						<view class="right">
+							<image src="@/static/img/right.png" @click="navToDetailPage('/pages/product/fenlei?id=' + item.id)"></image>
+						</view>
+					</view>
+					<view class="footer">
+						<view class="list">
+							<view class="item" v-for="d in item.list" 
+								@click="navToDetailPage('/pages/product/product?id='+d.id)">
+								<view class="img">
+									<image :src="d.image" mode=""></image>
+								</view>
+								<view class="name nowarp" :title='d.store_name'>
+									{{d.store_name}}
+								</view>
+								<view class="price">
+									￥{{d.price}}
+								</view>
+								<view class="name" style="font-size: 22rpx;color: #999;">
+									已售 {{ d.sales || '0'}}
+								</view>
+							</view>
+						</view>
 					</view>
 				</view>
 			</view>
@@ -24,11 +61,31 @@
 </template>
 
 <script>
+	import {
+		loadIndexs,
+		store_list
+	} from '@/api/index.js';
+	// import {
+	// 	getProducts
+	// } from '@/api/product.js';
 import { tabbar1 } from '@/utils/tabbar.js';
-import { groomList } from '@/api/product.js';
+// import goldenBean from '@/pages/index/goldenBean.vue'
+import goldenBean from '@/pages/index/goldenBean.vue'
+import { groomList,getProducts,getCategorylist,goodsDetail } from '@/api/product.js';
 export default {
+	components: {
+		goldenBean
+		// wholesale,
+		// recommend,
+		// topTitle
+	},
 	data() {
 		return {
+			carouselList: [], //轮播图列表
+			bgColor: [{background: "linear-gradient(43deg, #FFBD70, #FF8F44)"},
+				{background: "linear-gradient(90deg, #F75022, #FF8B6C)"},
+			],
+			indexLoad: '',
 			current: 3,
 			tabbar: tabbar1,
 			firstList: [],
@@ -36,16 +93,84 @@ export default {
 			page: 1,
 			limit: 20,
 			loaded: false,
-			loadingType: 'more'
+			loadingType: 'more',
+			jdList: [], //金豆商品
+			leibieList:[],//'类别'
+			id:0,
+			swiperCurrent: 0,
+			swiperLength: 0,
 		};
 	},
 	onLoad() {
+		this.get()
+		// this.getProducts()
 		this.loadData();
+		this.getBargainList();
+	},
+	onShow() {
+		this.getGoodList()
+		// this.getProducts()
+		// this.loadData();
+		// this.getBargainList();
 	},
 	onReachBottom() {
-		this.loadData();
+		// this.loadData();
 	},
 	methods: {
+		nav(url){
+			uni.navigateTo({
+				url
+			})
+		},
+		get(){
+			loadIndexs({})
+				.then(({
+					data
+				}) => {
+					let goods = data.info;
+					// this.dataList = goods.bastList; //精品推荐
+					this.carouselList = data.banner;
+					console.log(this.carouselList,'banner');
+				})
+				.catch(e => {});
+		},
+		//轮播图切换修改背景色
+		swiperChange(e) {
+			const index = e.detail.current;
+			this.swiperCurrent = index;
+			this.titleNViewBackground = this.carouselList[index].background;
+		},
+		getProducts() {
+			let obj = this;
+			console.log(obj.id,'id');
+			getProducts({sid:obj.id} ).then(function({ data }) {
+				console.log(data,'data');
+				obj.jdList = data
+			});
+		},
+		getProductss(item) {
+			let obj = this;
+			getProducts({sid:item.id}).then(function({ data }) {
+				obj.$set(item,'list',data)
+				obj.$set(item,'loaded',true)
+				// item.loaded = true
+				console.log(item.list,'data+++++++');
+				
+			});
+		},
+		getBargainList() {
+			let that = this;
+			getProducts({
+					page: that.page,
+					limit: that.limit,
+					
+				})
+				.then(function(res) {
+					that.jdList = res.data
+					// console.log(that.jdList,'jdlist');
+				})
+				.catch(res => {});
+		},
 		loadData() {
 			let obj = this;
 			if (obj.loadingType == 'loading' || obj.loadingType == 'noMore') {
@@ -57,7 +182,7 @@ export default {
 					page: obj.page,
 					limit: obj.limit
 				},
-				this.type
+				obj.id
 			)
 				.then(({ data }) => {
 					// 保存轮播图
@@ -75,10 +200,22 @@ export default {
 				.catch(e => {
 					console.log(e);
 				});
+				
+		},
+		getGoodList() {
+			let obj = this
+			getCategorylist().then(res=>{
+				
+				this.leibieList = res.data[1].children
+				console.log(this.leibieList,'徐浩岚')
+				this.leibieList.forEach(item => {
+					obj.getProductss(item)
+				})
+			})
 		},
 		navToDetailPage(e) {
 			uni.navigateTo({
-				url: '/pages/product/product?id=' + e.id
+				url:e
 			});
 		}
 	}
@@ -86,6 +223,9 @@ export default {
 </script>
 
 <style lang="scss">
+	$grey: #95A0B1;
+	$text: #333333;
+	$red: #FF4C4C;
 page,
 .center {
 	min-height: 100%;
@@ -189,4 +329,120 @@ page,
 		}
 	}
 }
+.goldenBean {
+		font-family: PingFang-SC-Bold;
+		margin-top: 20rpx;
+		padding: 20rpx;
+		background-color: #fff;
+
+		.title {
+			display: flex;
+			line-height: 40rpx;
+
+			.title-t {
+				color: $text;
+				font-weight: bold;
+				margin: 0 20rpx;
+				font-size: 34rpx;
+			}
+
+			.about {
+				font-size: 24rpx;
+				color: $grey;
+			}
+
+			image {
+				width: 40rpx;
+				height: 40rpx;
+			}
+		}
+
+		.box {
+			margin: 20rpx 0;
+			border-radius: 10rpx;
+			overflow: hidden;
+
+			.header {
+				padding: 20rpx;
+
+				padding-bottom: 80rpx;
+				width: 100%;
+				display: flex;
+				justify-content: space-between;
+				color: #fff;
+
+				.left {
+					line-height: 40rpx;
+
+					.title {
+						font-size: 32rpx;
+					}
+
+					.about {
+						opacity: 0.9;
+						font-size: 24rpx;
+					}
+				}
+
+				.right {
+					margin: auto 0;
+
+					image {
+						width: 30rpx;
+						height: 30rpx;
+					}
+				}
+			}
+
+			.footer {
+				height: 300rpx;
+				background-color: $page-color-base;
+				padding: 20rpx;
+				margin-bottom: -50rpx;
+				.list {
+					display: flex;
+					// justify-content: space-between;
+					overflow: auto;
+					border-radius: 10rpx;
+					position: relative;
+					top: -90rpx;
+					background-color: #fff;
+
+					.item {
+						padding: 35rpx;
+						border-right: solid 1rpx $page-color-base;
+
+						.name {
+
+							font-size: 24rpx;
+							color: #3F3F3F;
+							width: 150rpx;
+							overflow: hidden;
+							display: -webkit-box;
+							-webkit-box-orient: vertical;
+							-webkit-line-clamp: 1;
+							border-radius: 10rpx;
+							text-overflow: ellipsis;
+						}
+
+						.price {
+							font-size: 28rpx;
+							color: $red;
+							font-weight: bold;
+						}
+
+						.img {
+							overflow: hidden;
+							border-radius: 20rpx;
+
+							image {
+								width: 150rpx;
+								height: 150rpx;
+							}
+						}
+					}
+				}
+			}
+		}
+	}
 </style>

pages/product/qudouShop.vue

@@ -0,0 +1,60 @@
+<template>
+	<view class="content">
+		<view class="navbar-item" @click="nav('/pages/category/category')">
+			<image class="nitem-image" src="../../static/img/qudouImg01.png" mode=""></image>
+			<!-- <view class="nitem-font">大品牌区</view> -->
+		</view>
+		<!-- <view class="navbar-item" @click="nav('/pages/index/message?type=2')">
+			<image class="nitem-image" src="../../static/img/index-inco6.png" mode=""></image>
+			<view class="nitem-font">拍卖品</view>
+		</view> -->
+		<view class="navbar-item" @click="nav('/pages/product/classify?type=1')">
+			<image class="nitem-image" src="../../static/img/qudouImg02.png" mode=""></image>
+			<!-- <view class="nitem-font">医斯佳专区</view> -->
+		</view>
+		<view class="navbar-item" @click="nav('/pages/product/classify?type=3')">
+			<image class="nitem-image" src="../../static/img/qudouImg03.png" mode=""></image>
+			<!-- <view class="nitem-font">CBB专区</view> -->
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {data(){
+		return{
+			
+		}
+		},
+		methods: {
+			nav(url){
+				uni.navigateTo({
+					url,
+					success: (res) => {
+						console.log(res);
+					},fail: (err) => {
+						console.log(err,'eeeerrrr');
+						uni.switchTab({
+							url
+						})
+					}
+					
+				})
+			}
+		},
+	}
+</script>
+
+<style lang="scss">
+	pages,.content{
+		padding: 0;
+		.navbar-item{
+			width: 700rpx;
+			height: 200rpx;
+			margin: 30rpx auto;
+			image{
+				width: 100%;
+				height: 100%;
+			}
+		}
+	}
+</style>

pages/user/myAppointment.vue

@@ -4,7 +4,7 @@
 			<view class="status_bar"><!-- 这里是状态栏 --></view>
 			<view class="body-title">
 				<view class="goback-box" @click="toBack"><image class="goback" src="../../static/icon/fanhui.png" mode=""></image></view>
-				<view class="header">我的易趣卷</view>
+				<view class="header">我的广告值</view>
 			</view>
 			<view class="content-bg"><image src="../../static/img/zhihuanjuan.png" mode=""></image></view>
 			<view class="money-box">
@@ -13,18 +13,18 @@
 			</view>
 			<view class="moneybtn-box">
 				<view class="money-btn" @click="navto('/pages/money/recharge?status=2')"></view>
-				<view class="money-btn" @click="navto('/pages/money/wallet')">转账</view>
+				<view class="money-btn" @click="navto('/pages/money/wallet?id=1')">转账</view>
 			</view>
 		</view>
 		<view class="info-box flex">
 			<view class="info-item">
 				<view class="info-font">累计收入</view>
-				<view class="info-num">{{ recharge }}</view>
+				<view class="info-num">{{ sr }}</view>
 			</view>
 			<view class="shu"></view>
 			<view class="info-item">
 				<view class="info-font">累计支出</view>
-				<view class="info-num">{{ orderStatusSum }}</view>
+				<view class="info-num">{{ zc }}</view>
 			</view>
 		</view>
 		<view class="navbar">
@@ -95,13 +95,24 @@ export default {
 		return {
 			// 头部图高度
 			maxheight: '',
+			sr:'',
+			zc:'',
 			tabCurrentIndex: 0,
 			orderStatusSum: 0,
 			recharge: 0,
 			navList: [
 				{
-					state: 0,
-					text: '易趣卷明细',
+					state: 1,
+					text: '收入',
+					loadingType: 'more',
+					orderList: [],
+					page: 1, //当前页数
+					limit: 1000, //每次信息条数
+					loaded: false
+				},
+				{
+					state: 2,
+					text: '支出',
 					loadingType: 'more',
 					orderList: [],
 					page: 1, //当前页数
@@ -145,21 +156,31 @@ export default {
 			}
 			// 修改当前对象状态为加载中
 			navItem.loadingType = 'loading';
-
+		
 			anticipatelist({
 				page: navItem.page,
-				limit: navItem.limit
+				limit: navItem.limit,
+				pm:navItem.state
 			})
 				.then(({ data }) => {
-					obj.recharge = data.sr;
-					obj.orderStatusSum = data.zc;
-					navItem.orderList = data.data;
+					// obj.recharge = data.income;
+					// obj.orderStatusSum = data.expend;
+					console.log(data,'datta');
+					obj.sr = data.sr
+					obj.zc = data.zc
+					
+					if(state == 1 ){
+						navItem.orderList = data.list
+					}
+					if(state == 2 ){
+						navItem.orderList = data.list
+					}
 				})
 				.catch(e => {
 					console.log(e);
 				});
 		},
-
+		
 		//swiper 切换
 		changeTab(e) {
 			this.tabCurrentIndex = e.target.current;

pages/user/user.vue

@@ -25,10 +25,10 @@
 						{{ userInfo.profit > 0? userInfo.profit : '0'}}
 					</view>
 					<view class="sy-item-name">
-						我的收益
+						收益
 					</view>
 				</view>
-				<!-- <view class="jg"></view> -->
+				<view class="jg"></view>
 				<!-- <view class="sy-item" @click="navTo('/pages/user/myyue')">
 					<view class="sy-item-val">
 						{{userInfo.now_money || '0.00'}}
@@ -43,7 +43,7 @@
 						{{userInfo.integral || '0.00'}}
 					</view>
 					<view class="sy-item-name">
-						我的趣豆
+						趣豆
 					</view>
 				</view>
 				<view class="jg"></view>
@@ -52,7 +52,16 @@
 						{{userInfo.anticipate || '0.00'}}
 					</view>
 					<view class="sy-item-name">
-						我的易趣卷
+						广告值
+					</view>
+				</view>
+				<view class="jg"></view>
+				<view class="sy-item" @click="navTo('/pages/money/jinDou')">
+					<view class="sy-item-val">
+						{{userInfo.anticipate || '0.00'}}
+					</view>
+					<view class="sy-item-name">
+						金豆
 					</view>
 				</view>
 			</view>
@@ -62,7 +71,7 @@
 			<view class="qd-info">
 				<view class="" style="font-weight: bold;color: #0C1732;">签到领取积分</view>
 				<view class="">已连续签到{{actionDay}}天</view>
-				<view class="">累计签到奖励{{sum_integral}}趣豆</view>
+				<view class="">签到奖励{{sum_integral}}趣豆</view>
 			</view>
 			<view class="qd-btn" :class="{'qded': qded}" @click="qded?'':goQd()">
 				{{qded?'已签到': '立即签到'}}
@@ -223,6 +232,22 @@
 						heigt: '56rpx',
 						img: '../../static/icon/tool-6.png',
 						path: '/pages/user/gzsq'
+					},
+					// {
+					// 	id: 't7',
+					// 	name: '金豆',
+					// 	width: '59rpx',
+					// 	heigt: '56rpx',
+					// 	img: '../../static/img/jindou-tit.png',
+					// 	path: '/pages/money/jinDou'
+					// },
+					{
+						id: 't8',
+						name: '购物券',
+						width: '59rpx',
+						heigt: '56rpx',
+						img: '../../static/img/gouwu-tit.png',
+						path: '/pages/money/gouwu'
 					}
 				]
 			};
@@ -317,7 +342,7 @@
 			signUser(){
 				signUser({all:1}).then(({data}) => {
 					this.actionDay = data.sign_num;//连续签到天数
-					this.sum_integral = data.sum_integral;//累计总积分
+					// this.sum_integral = data.sum_integral;//累计总积分
 				})
 			},
 			// 加载初始数据
@@ -444,12 +469,12 @@
 				integral({})
 					.then(e => {
 						this.integral = 
-						console.log(e);
+						console.log(e,'eeee');
 						// 改为已签到
 						this.qded = true
 						this.today_integral = e.data.integral
 						this.actionDay++;
-						this.sum_integral = +this.sum_integral + +e.data.integral 
+						this.sum_integral =e.data.integral 
 						this.$refs.popupqd.open()
 					})
 					.catch(e => {

pages/user/zhuanyue.vue

@@ -0,0 +1,402 @@
+<template>
+	<view class="content">
+		<!-- <uni-notice-bar single="true" text="实际到账98%"></uni-notice-bar> -->
+		<view class="content-money">
+			<view class="flex " style="width: 750rpx;justify-content: space-around;margin-left: 0;">
+				<view class="buttom">
+					<view class="icon">{{ userInfo.golden_bean | getMoneyStyle }}</view>
+					<text class="text">可转金豆</text>
+				</view>
+			</view>
+		</view>
+		<view class="">
+			<!-- <checkbox-group name="">
+				<label>
+					<text>广告值1</text><checkbox value="" />
+				</label>
+				<label>
+					<text>趣豆</text><checkbox value="" />
+				</label>
+			</checkbox-group> -->
+			<view class="">
+				<radio-group name="" class="radio-box">
+					<label @click="chooseLa(1)">
+						<text style="margin-right: 15rpx;">广告值</text>
+						<radio :checked="id==1" color="red" checked="true" style="transform: scale(0.8);" />
+					</label>
+					<label @click="chooseLa(2)">
+						<text style="margin-right: 15rpx;">趣豆</text>
+						<radio color="red" :checked="id==2" style="transform: scale(0.8);" />
+					</label>
+				</radio-group>
+			</view>
+		</view>
+
+		<view class="row-box">
+			<view class="title">转换为<span>{{id==1?'广告值':'趣豆'}}</span></view>
+			<view class="row">
+				<text class="tit">￥</text>
+				<input class="input" type="number" v-model="withdrawal" placeholder="请输入佣金数量"
+					placeholder-class="placeholder" />
+				<view class="buttom" @click="id ==1? withdrawal = userInfo.golden_bean:withdrawal = (userInfo.golden_bean*0.1).toFixed(2)">全部转换</view>
+			</view>
+		</view>
+		<!-- <view class="tip" v-if="withdrawal != 0">
+			实际到账 {{ id==2?getGg:getQd || "0"}} {{ id==2?'趣豆':'广告值' }}
+		</view> -->
+		<!-- #ifndef MP-WEIXIN -->
+		<view class="list">
+			<radio-group @change="tabRadio">
+
+
+			</radio-group>
+		</view>
+		<!-- #endif -->
+		<!-- 	<view class="row b-b" v-if="type == 'alipay'">
+			<text class="tit">支付宝账号</text>
+			<input class="input" type="text" v-model="alipay_code" placeholder="请输入支付宝账号" placeholder-class="placeholder" />
+		</view>
+		<view class="row b-b" v-if="type == 'alipay'">
+			<text class="tit">支付宝姓名</text>
+			<input class="input" type="text" v-model="alipay_name" placeholder="请输入支付宝姓名" placeholder-class="placeholder" />
+		</view> -->
+		<!-- 	<view class="row b-b" v-if="type == 'bank'">
+			<text class="tit">银行卡号</text>
+			<input class="input" type="text" v-model="bank_code" placeholder="请输入银行卡号" placeholder-class="placeholder" />
+		</view>
+		<view class="row b-b" v-if="type == 'bank'">
+			<text class="tit">姓名</text>
+			<input class="input" type="text" v-model="bank_people" placeholder="请输入银行卡姓名" placeholder-class="placeholder" />
+		</view>
+		<view class="row b-b" v-if="type == 'bank'">
+			<text class="tit">所属银行</text>
+			<input class="input" type="text" v-model="bank_name" placeholder="请输入所属银行" placeholder-class="placeholder" />
+		</view> -->
+		<button class="add-btn up" @click="confirm()">提交申请</button>
+		<!-- <button class="add-btn modified" v-if="!weichatBsrowser" @click="navTo('/pages/money/account')">账号管理</button> -->
+	</view>
+</template>
+
+<script>
+	// import { rechargeWechat, rechargeIndex } from '@/api/wallet.js';
+	import {
+		getMoneyStyle
+	} from '@/utils/rocessor.js';
+	import {
+		extractCash,
+		extractBank,
+		aliInfo,
+		rechargeWechat,
+		bankInfo,
+		exchange
+	} from '@/api/wallet.js';
+	import {
+		orderData,
+		getUserInfo
+	} from '@/api/user.js';
+	import {
+		mapState,
+		mapMutations
+	} from 'vuex';
+	import uniNoticeBar from '@/components/uni-notice-bar/uni-notice-bar.vue';
+	export default {
+		filters: {
+			getMoneyStyle
+		},
+		components: {
+			uniNoticeBar
+		},
+		computed: {
+			...mapState('user', ['userInfo', 'orderInfo', 'hasLogin']),
+			real() {
+				return (this.withdrawal - (this.withdrawal * this.sxf)).toFixed(2) * 1;
+			},
+			getQd() {
+				return this.withdrawal
+			},
+			getGg() {
+				return (this.withdrawal * 0.1).toFixed(2)
+			}
+		},
+		data() {
+			return {
+				id: 1,
+				type: 'alipay', //提现方式
+				money: '0.00', //可提现金额
+				freeze: '0.0', //冻结金额
+				withdrawal: '', //提现金额
+				minPrice: '', //最少提现金额
+				aliData: {},
+				sxf: 0,
+				bankData: {},
+				alipay_code: '',
+				alipay_name: '',
+				bank_code: '',
+				bank_people: '',
+				bank_name: '',
+				// #ifdef H5
+				weichatBsrowser: false
+				// #endif
+			};
+		},
+		onLoad(options) {
+			// #ifdef H5
+			this.weichatBsrowser = uni.getStorageSync('weichatBrowser');
+			// #endif
+			//加载提现信息
+			this.loadData();
+			// // 加载提款账号信息
+			// this.loadAli();
+			// this.loadBank();
+		},
+		methods: {
+			...mapMutations('user', ['setUserInfo', 'setOrderInfo']),
+			// 加载余额信息
+			async loadData() {
+				extractBank({}).then(({
+					data
+				}) => {
+					console.log(data, 'data')
+					this.sxf = data.sxf;
+					this.money = data.brokerage_price
+					this.minPrice = data.minPrice;
+				});
+			},
+			// 跳转
+			navTo(url) {
+				uni.navigateTo({
+					url: url
+				});
+			},
+			// 切换选中对象
+			tabRadio(e) {
+				this.type = e.detail.value;
+				console.log(this.type);
+			},
+			chooseLa(type) {
+				this.id = type
+				console.log(this.id);
+			},
+			// 提交
+			confirm(){
+				exchange({
+						price: this.withdrawal,
+						type: this.id,
+					}).then(e => {
+						console.log(e, 'eeee');
+						uni.showToast({
+							title: '转换成功',
+							duration: 2000,
+							position: 'top',
+							// success: function(e) {
+							// 	uni.navigateBack()
+							// }
+						});
+						this.loadData()
+						this.userInfo.golden_bean
+
+					})
+					.catch(e => {
+						console.log(e);
+					});
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	page {
+		height: 100%;
+	}
+
+	.content-money {
+		padding: 30rpx 0;
+		background: #ffffff;
+	}
+
+	.flex {
+		background-color: #ffffff;
+		text-align: center;
+		margin: 0 30rpx;
+		border-radius: $border-radius-sm;
+
+		.buttom {
+			font-size: $font-lg;
+			width: 50%;
+		}
+
+		.interval {
+			width: 2px;
+			height: 60rpx;
+			background-color: #eeeeee;
+		}
+
+		.icon {
+			background-size: 100%;
+			font-size: 42rpx;
+			color: $font-color-dark;
+			font-weight: bold;
+			background-repeat: no-repeat;
+			background-position: center;
+		}
+
+		.text {
+			color: $font-color-light;
+		}
+	}
+
+	.radio-box {
+		margin-top: 30rpx;
+		font-size: 32rpx;
+		font-weight: 500;
+		display: flex;
+		justify-content: space-around;
+	}
+
+	.row-box {
+		margin-top: 30rpx;
+		padding: 20rpx 30rpx;
+		background: #fff;
+
+		.title {
+			font-size: $font-base + 2rpx;
+			color: $font-color-dark;
+		}
+
+		.row {
+			display: flex;
+			align-items: center;
+			position: relative;
+			height: 80rpx;
+
+			.tit {
+				flex-shrink: 0;
+				width: 40rpx;
+				font-size: 30rpx;
+				color: $font-color-dark;
+			}
+
+			.input {
+				flex: 1;
+				font-size: 30rpx;
+				color: $font-color-dark;
+			}
+
+			.iconlocation {
+				font-size: 36rpx;
+				color: $font-color-light;
+			}
+
+			.buttom {
+				color: red;
+				font-size: $font-base;
+			}
+		}
+	}
+
+	.add-btn {
+		&.modified {
+			color: $base-color;
+		}
+
+		&.up {
+			background-color: red;
+			color: #ffffff;
+		}
+
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		width: 690rpx;
+		height: 80rpx;
+		margin: 0 auto;
+		margin-top: 30rpx;
+		font-size: $font-lg;
+		border-radius: 10rpx;
+		// box-shadow: 1px 2px 5px rgba(219, 63, 96, 0.4);
+	}
+
+	.list {
+		padding-left: 30rpx;
+		margin-top: 30rpx;
+		background-color: #ffffff;
+
+		.box {
+			display: flex;
+			align-items: center;
+			width: 100%;
+			height: 120rpx;
+			border-bottom: 1px solid $border-color-light;
+
+			.icon {
+				font-size: 48rpx;
+				padding-right: 20rpx;
+
+				.icon-img {
+					height: 50rpx;
+					width: 50rpx;
+				}
+			}
+
+			.iconweixin1 {
+				color: #18bf16;
+			}
+
+			.iconzhifubao {
+				color: #08aaec;
+			}
+
+			.title-box {
+				flex-grow: 1;
+				text-align: left;
+
+				.title {
+					font-size: $font-base + 2rpx;
+					color: $font-color-base;
+				}
+
+				.node {
+					font-size: $font-sm;
+					color: $font-color-light;
+				}
+			}
+		}
+	}
+
+	/deep/ .uni-radio-input {
+		width: 45rpx;
+		height: 45rpx;
+	}
+
+	.row {
+		display: flex;
+		align-items: center;
+		position: relative;
+		padding: 0 30upx;
+		height: 110upx;
+		background: #fff;
+
+		.tit {
+			flex-shrink: 0;
+			width: 250upx;
+			font-size: 30upx;
+			color: $font-color-dark;
+		}
+
+		.input {
+			flex: 1;
+			font-size: 30upx;
+			color: $font-color-dark;
+		}
+
+		.iconlocation {
+			font-size: 36upx;
+			color: $font-color-light;
+		}
+	}
+
+	.tip {
+		padding: 20rpx;
+		color: #FD3B39;
+	}
+</style>

store/index.js

@@ -7,7 +7,7 @@ const store = new Vuex.Store({
 	namespaced: true,
 	state: {
 		// baseURL:"http://yrh.liuniu946.com",//'http://eb.shuibo.net',//请求地址配置 
-		baseURL: 'http://newqudou.frp.liuniu946.com', //请求地址配置 
+		baseURL: 'http://new.yiqushangshi.com', //请求地址配置 
 		urlFile: '/index', //项目部署所在文件夹
 		userInfo: {}, //登录信息
 		loginInterceptor: false, //是否打开强制登录

unpackage/dist/build/h5/index.html

@@ -1,2 +1,2 @@
-<!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>商城</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/index/static/index.2772579d.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.516abe5d.js></script><script src=/index/static/js/index.430725b5.js></script></body></html>
+<!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>嗨易趣G0</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/index/static/index.2772579d.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.3c992190.js></script><script src=/index/static/js/index.f8122932.js></script></body></html>