2021-2-16

manifest.json

@@ -1,5 +1,5 @@
 {
-    "name" : "基础项目",
+    "name" : "万吉商城",
     "appid" : "__UNI__F0EBD91",
     "description" : "",
     "versionName" : "1.0.0",
@@ -73,7 +73,7 @@
         "devServer" : {
             "proxy" : {
                 "/api" : {
-                    "target" : "http://192.168.0.101/api",
+                    "target" : "http://gp.frp.liuniu946.com/api",
                     // "changeOrigin": true,
                     "pathRewrite" : {
                         "/api" : "" // rewrite path

pages.json

@@ -17,27 +17,33 @@
 							"disabled": true,
 							"placeholderColor": "#606266",
 							"align": "left"
-						},
-						"buttons": [{
-								"fontSrc": "/static/yticon.ttf",
-								"text": "\ue60d",
-								"fontSize": "26",
-								"color": "#303133",
-								"float": "left",
-								"background": "rgba(0,0,0,0)"
-							},
-							{
-								"fontSrc": "/static/yticon.ttf",
-								"text": "\ue744",
-								"fontSize": "27",
-								"color": "#303133",
-								"background": "rgba(0,0,0,0)"
-							}
-						]
+						}
+						// "buttons": [{
+						// 		"fontSrc": "/static/yticon.ttf",
+						// 		"text": "\ue60d",
+						// 		"fontSize": "26",
+						// 		"color": "#303133",
+						// 		"float": "left",
+						// 		"background": "rgba(0,0,0,0)"
+						// 	},
+						// 	{
+						// 		"fontSrc": "/static/yticon.ttf",
+						// 		"text": "\ue744",
+						// 		"fontSize": "27",
+						// 		"color": "#303133",
+						// 		"background": "rgba(0,0,0,0)"
+						// 	}
+						// ]
 					}
 				},
 				// #endif
-				"navigationBarTitleText": "商城首页"
+				"navigationBarTitleText": "万吉商城"
+			}
+		},
+		{
+			"path": "pages/index/shopList",
+			"style": {
+				"navigationBarTitleText": "公排商品"
 			}
 		},
 		{

pages/index/shopList.vue

@@ -0,0 +1,164 @@
+<template>
+	<view class="main">
+		<view class="list-box-h">
+			<view v-for="(item, index) in list" :key="index" class="guess-item" @click="navToDetailPage(item)">
+				<image :src="item.image"></image>
+				<view class="guess-box">
+					<view class="title clamp2">{{ item.store_name }}</view>
+					<view class="flex itemContent">
+						<view>
+							<view class="price-box flex">
+								<view class="yuanprice">{{ item.ot_price }}</view>
+								<!-- <image src="../../static/img/jiantou.png" mode=""></image> -->
+								<!-- <view class="jiang">直降{{ (item.ot_price - item.price).toFixed(2) }}元</view> -->
+							</view>
+							<view class="price" >￥{{ item.price }}</view>
+						</view>
+						<view class="btn">立即购买</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<uni-load-more :status="loadingType"></uni-load-more>
+	</view>
+</template>
+
+<script>
+	import {
+		getProducts
+	} from '@/api/product.js';
+	export default {
+		data() {
+			return {
+				list: [],
+				page: 1,
+				limit: 10,
+				loadingType: 'more',
+			}
+		},
+		onLoad(opt) {
+			this.getArticleList()
+		},
+		methods: {
+			navToDetailPage(item) {
+				uni.navigateTo({
+					url: '/pages/product/product?id=' + item.id
+				});
+			},
+			getArticleList() {
+				let obj = this
+				if (obj.loadingType == 'noMore' || obj.loadingType == 'loading') {
+					return
+				}
+				obj.loadingType = 'loading'
+				getProducts({
+					page: obj.page,
+					limit: obj.limit,
+					is_gp:1 //设置是否vip商品
+				}, obj.cid).then(({
+					data
+				}) => {
+					obj.list = obj.list.concat(data)
+					obj.page++
+					if (data.length == obj.limit) {
+						obj.loadingType = 'more'
+					} else {
+						obj.loadingType = 'noMore'
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	page {
+		background-color: #fff;
+		min-height: 100%;
+	}
+
+	.list-box-h {
+		padding: 20rpx;
+	}
+
+	.guess-item {
+		padding: 10rpx;
+		display: flex;
+		min-width: 100%;
+		width: 0;
+		margin-bottom: 20rpx;
+		background: #ffffff;
+		border-radius: 10rpx;
+		box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
+
+		image {
+			width: 200rpx;
+			height: 200rpx;
+			border-radius: 10rpx;
+			flex-shrink: 0;
+		}
+
+		.guess-box {
+			width: 100%;
+			padding: 5px;
+			position: relative;
+			.itemContent {
+				position: absolute ;
+				width: 100%;
+				padding: 20rpx 10rpx;
+				bottom: 0;
+				right: 0;
+			}
+			.title {
+				font-size: 30rpx;
+				font-weight: bold;
+				color: #333333;
+				height: 2.5em;
+				line-height: 1.25em;
+			}
+
+			.price-box {
+				justify-content: flex-start;
+
+				.yuanprice {
+					font-size: 26rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					text-decoration: line-through;
+					color: #999999;
+					padding-right: 6rpx;
+				}
+
+				image {
+					width: 14rpx;
+					height: 16rpx;
+				}
+
+				.jiang {
+					padding-left: 2rpx;
+					font-size: 24rpx;
+					font-family: PingFang SC;
+					font-weight: bold;
+					color: #b59467;
+				}
+			}
+
+			.price {
+				font-size: 36rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #FF6F0F;
+			}
+
+			.btn {
+				background: #16cc9f;
+				border-radius: 28rpx;
+				font-size: 28rpx;
+				font-weight: 500;
+				color: #ffffff;
+				float: right;
+				padding: 10rpx 20rpx;
+			}
+		}
+	}
+</style>

pages/money/pay.vue

@@ -28,6 +28,22 @@
 				</view>
 				<label class="radio"><radio value="" color="#5dbc7c" :checked="payType == 3"></radio></label>
 			</view>
+			<view v-if="is_gp==1" class="type-item" @click="changePayType(4)">
+				<text class="icon iconfont iconyue"></text>
+				<view class="con">
+					<text class="tit">报单金额</text>
+					<text>可用余额 ¥{{ gp_now_money }}</text>
+				</view>
+				<label class="radio"><radio value="" color="#5dbc7c" :checked="payType == 4"></radio></label>
+			</view>
+			<view v-if="is_gp==1" class="type-item" @click="changePayType(5)">
+				<text class="icon iconfont iconyue"></text>
+				<view class="con">
+					<text class="tit">积分支付</text>
+					<text>可用积分 ¥{{ integral }}</text>
+				</view>
+				<label class="radio"><radio value="" color="#5dbc7c" :checked="payType == 5"></radio></label>
+			</view>
 		</view>
 		<text class="mix-btn" :class="{ clickbg: payLoding }" @click="!payLoding ? confirm() : ''">确认支付</text>
 	</view>
@@ -36,6 +52,7 @@
 <script>
 import { balance } from '@/api/wallet.js';
 import { createOrderkey,computedOrderkey,orderPay } from '@/api/order.js';
+import { getUserInfo } from '@/api/user.js';
 import { mapState } from 'vuex';
 export default {
 	data() {
@@ -57,7 +74,10 @@ export default {
 			// #ifdef H5
 			froms: '', //保存h5中数据来源对象
 			// #endif
-			pinkid: '' //保存拼团商品id
+			pinkid: '' ,//保存拼团商品id
+			'gp_now_money':0,
+			'integral':0,
+			is_gp:0//1为公排0不是公排
 		};
 	},
 	computed: {
@@ -66,6 +86,7 @@ export default {
 		// #endif
 	},
 	onLoad(options) {
+		
 		if (options.type == 1) {
 			this.type = 1;
 			this.orderId = options.ordid;
@@ -87,24 +108,50 @@ export default {
 		if (options.pinkid) {
 			this.pinkid = options.pinkid;
 		}
+		// 保存是否公排
+		if (options.is_gp) {
+			this.is_gp = options.is_gp;
+		}
 		// 载入余额
 		balance({}).then(({ data }) => {
 			// 获取余额
 			this.now_money = data.now_money;
 		});
+		// 载入用户信息
+		this.getUserInfo();
 	},
 	methods: {
+		getUserInfo(){
+			getUserInfo().then(({data}) => {
+				this.gp_now_money = data.gp_now_money
+				this.integral = data.integral
+				console.log(e,'数据');
+			})
+		},
 		//选择支付方式
 		changePayType(type) {
 			this.payType = type;
 			if (this.payType == 1) {
 				this.payName = 'weixin';
+				return
 			}
 			if (this.payType == 2) {
 				this.payName = 'ali';
+				return
 			}
 			if (this.payType == 3) {
 				this.payName = 'yue';
+				return
+			}
+			// 报单金额
+			if (this.payType == 4) {
+				this.payName = 'gp_now_money';
+				return
+			}
+			// 积分
+			if (this.payType == 5) {
+				this.payName = 'integral';
+				return
 			}
 		},
 		// 支付金额
@@ -201,6 +248,34 @@ export default {
 				});
 				return;
 			}
+			// 判断是否报单
+			if(obj.is_gp==1){
+				// 判断是否报单金额不足
+				if (obj.payName == 'gp_now_money' && +obj.gp_now_money < obj.money) {
+					uni.showModal({
+						title: '提示',
+						content: '账户余额不足！',
+						showCancel: false,
+						success: res => {},
+						fail: () => {},
+						complete: () => {}
+					});
+					return;
+				}
+				// 判断是否积分不足
+				if (obj.payName == 'integral' && +obj.integral < obj.money) {
+					uni.showModal({
+						title: '提示',
+						content: '账户余额不足！',
+						showCancel: false,
+						success: res => {},
+						fail: () => {},
+						complete: () => {}
+					});
+					return;
+				}
+			}
+			
 			// 支付中
 			obj.payLoding = true;
 			// #ifdef H5
@@ -239,7 +314,8 @@ export default {
 				// #ifdef APP-PLUS
 				from: 'app', //来源
 				// #endif
-				shipping_type: 1 //提货方式 1 快递 2自提
+				shipping_type: 1 ,//提货方式 1 快递 2自提
+				is_gp:obj.is_gp
 			};
 			// 判断是否拼团商品
 			if (obj.pinkid) {

pages/order/createOrder.vue

@@ -1,8 +1,8 @@
 <template>
 	<view>
-		<view class="navbar">
+		<!-- <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>
+		</view> -->
 
 		<!-- 地址 -->
 		<navigator v-if="tabCurrentIndex == 0" url="/pages/set/address?source=1" class="address-section">
@@ -73,19 +73,19 @@
 
 		<!-- 优惠明细 -->
 		<view class="yt-list">
-			<view class="yt-list-cell b-b" @click="couponListshow ? toggleMask('show') : ''">
+			<!-- <view class="yt-list-cell b-b" @click="couponListshow ? toggleMask('show') : ''">
 				<view class="cell-icon">券</view>
 				<text class="cell-tit clamp">优惠券</text>
 				<text class="cell-tip active" v-if="couponListshow && !couponChecked.coupon_price">选择优惠券</text>
 				<text class="cell-tip red" v-if="couponChecked.coupon_price">-￥{{ couponChecked.coupon_price }}</text>
 				<text class="cell-tip disabled" v-if="!couponListshow && !couponChecked.coupon_price">没有优惠券</text>
 				<text class="cell-more wanjia wanjia-gengduo-d"></text>
-			</view>
-			<view class="yt-list-cell b-b" v-if="moneyAll.storeFreePostage > 0">
+			</view> -->
+			<!-- <view class="yt-list-cell b-b" v-if="moneyAll.storeFreePostage > 0">
 				<view class="cell-icon hb">减</view>
 				<text class="cell-tit clamp">商家促销</text>
 				<text class="cell-tip disabled">满{{ moneyAll.storeFreePostage }}包邮</text>
-			</view>
+			</view> -->
 		</view>
 		<!-- 金额明细 -->
 		<view class="yt-list">
@@ -93,10 +93,10 @@
 				<text class="cell-tit clamp">优惠金额</text>
 				<text class="cell-tip red">-￥35</text>
 			</view> -->
-			<view class="yt-list-cell b-b">
+			<!-- <view class="yt-list-cell b-b">
 				<text class="cell-tit clamp">积分抵扣{{ '（当前积分：' + integralAll + '）' }}</text>
 				<view class="cell-tip"><radio @click="checkedPoints = !checkedPoints" color=" #5dbc7c" :checked="checkedPoints" /></view>
-			</view>
+			</view> -->
 			<view class="yt-list-cell b-b">
 				<text class="cell-tit clamp">运费</text>
 				<text class="cell-tip">{{ Postage }}</text>
@@ -111,14 +111,14 @@
 				<text class="cell-tit clamp">商品金额</text>
 				<text class="cell-tip">￥{{ payAllMoney }}</text>
 			</view>
-			<view class="yt-list-cell b-b" v-if="checkedPoints && integralShow">
+			<!-- <view class="yt-list-cell b-b" v-if="checkedPoints && integralShow">
 				<text class="cell-tit clamp">积分抵扣</text>
 				<text class="cell-tip">-￥{{ integralMoney }}</text>
-			</view>
-			<view class="yt-list-cell b-b" v-if="moneyAll.vipPrice > 0">
+			</view> -->
+			<!-- <view class="yt-list-cell b-b" v-if="moneyAll.vipPrice > 0">
 				<text class="cell-tit clamp">VIP优惠</text>
 				<text class="cell-tip">-￥{{ moneyAll.vipPrice }}</text>
-			</view>
+			</view> -->
 		</view>
 
 		<!-- 底部 -->
@@ -157,7 +157,7 @@
 
 <script>
 import { confirm,computedOrderkey,couponsOrder } from '@/api/order.js';
-import { userinfo } from '@/api/user.js';
+import { getUserInfo } from '@/api/user.js';
 import { cartAdd } from '@/api/product.js';
 export default {
 	data() {
@@ -212,10 +212,15 @@ export default {
 			integralMoney: 0, //积分抵扣金额
 			integralShow: false, //是否显示积分抵扣金额
 			payType: true, //是否可支付
-			pinkid: '' //保存拼团商品id
+			pinkid: '' ,//保存拼团商品id
+			is_gp:0,
 		};
 	},
 	onLoad(option) {
+		// 是否公排商品
+		if(option.is_gp){
+			this.is_gp = option.is_gp
+		}
 		// 判断是否为拼团商品
 		if (option.type == 'pink') {
 			this.pinkid = option.pinkId;
@@ -270,7 +275,7 @@ export default {
 		},
 		// 加载用户基础信息
 		userinfo() {
-			userinfo({}).then(({ data }) => {
+			getUserInfo({}).then(({ data }) => {
 				this.integralAll = data.integral;
 			});
 		},
@@ -337,7 +342,7 @@ export default {
 				// 计算金额
 				this.payMoneyNub();
 				// 加载优惠券
-				obj.couponsOrder(data.priceGroup.totalPrice);
+				// obj.couponsOrder(data.priceGroup.totalPrice);
 			});
 		},
 		// 购买数量变化
@@ -362,6 +367,9 @@ export default {
 			if(this.pinkid){
 				url += '&pinkid='+this.pinkid
 			}
+			if(this.is_gp==1){
+				url += '&is_gp=1'
+			}
 			uni.navigateTo({
 				url
 			});

pages/product/common/productBottom.vue

@@ -9,7 +9,7 @@
 			<text>收藏</text>
 		</view>
 		<view class="action-btn-group">
-			<button type="primary" class=" action-btn no-border add-cart-btn" @click="buy(2)">加入购物车</button>
+			<button type="primary" v-if="goodsObjact.is_gp!=1" class=" action-btn no-border add-cart-btn" @click="buy(2)">加入购物车</button>
 			<button type="primary" class=" action-btn no-border buy-now-btn" @click="buy(1)">立即购买</button>
 		</view>
 	</view>
@@ -108,6 +108,7 @@ export default {
 		display: flex;
 		height: 76rpx;
 		border-radius: 100px;
+		flex-grow: 1;
 		overflow: hidden;
 		margin-left: 20rpx;
 		position: relative;
@@ -122,6 +123,7 @@ export default {
 			border-right: 1px solid rgba(255, 255, 255, 0.5);
 		}
 		.action-btn {
+			flex-grow: 1;
 			display: flex;
 			align-items: center;
 			justify-content: center;

pages/product/product.vue

@@ -17,7 +17,7 @@
 		<!-- 底部高度撑开 -->
 		<view class="contentBottomHeight"></view>
 		<!-- 底部操作菜单 -->
-		<product-bottom @buy="buy" :goodsObjact="goodsObjact" :goodsid="goodsid" @specOPne="specOPne"></product-bottom>
+		<product-bottom v-if="goodsObjact.id" @buy="buy" :goodsObjact="goodsObjact" :goodsid="goodsid" @specOPne="specOPne"></product-bottom>
 		<!-- 规格-模态层弹窗 -->
 		<view class="popup spec" :class="specClass" @touchmove.stop.prevent="stopPrevent" @click="toggleSpec">
 			<!-- 遮罩层 -->
@@ -49,12 +49,12 @@
 						</text>
 					</view>
 				</view>
-				<!-- <view class="attr-list">
+				<view v-if="goodsObjact.is_gp!=1" class="attr-list">
 					<text>购买数量</text>
 					<view class="item-list">
 						<uni-number-box class="step" :isMin="true" :value="goodsNumber" :min="1" :max="goodsNumberMax" @eventChange="numberChange"></uni-number-box>
 					</view>
-				</view> -->
+				</view>
 				<button class="btn" @click.stop="buy" v-show="buys_show">完成</button>
 				<button class="btn" style="background-color: #999999;" v-show="buys_shows">售罄</button>
 			</view>
@@ -67,6 +67,7 @@ import { goodsDetail, cartAdd } from '@/api/product.js';
 import { mapState } from 'vuex';
 import store from '@/store/index.js';
 import { saveUrl } from '@/utils/loginUtils.js';
+import uniNumberBox from '@/components/uni-number-box.vue';
 // #ifdef H5
 import { weixindata } from '@/utils/wxAuthorized';
 // #endif
@@ -95,7 +96,8 @@ export default {
 		freshDetail,
 		contentText,
 		productBottom,
-		estimate
+		estimate,
+		uniNumberBox
 	},
 	data() {
 		return {
@@ -214,6 +216,9 @@ export default {
 		return shareObj;
 	},
 	methods: {
+		numberChange(e){
+			this.goodsNumber = e.number;
+		},
 		//选择规格
 		selectSpec(item, arr, ind) {
 			arr.attr_value.forEach(function(e) {
@@ -282,13 +287,14 @@ export default {
 		//加入购物车
 		Addcar(item) {
 			let obj = this;
-			cartAdd({
+			let data  = {
 				cartNum: '1', //商品数量
 				uniqueId: '', //商品标签
 				new: 0, //商品是否新增加到购物车1为不加入0为加入
 				mer_id: '',
 				productId: item.id //商品编号
-			})
+			}
+			cartAdd(data)
 				.then(function(e) {
 					uni.showToast({
 						title: '成功加入购物车',
@@ -360,13 +366,21 @@ export default {
 			if (obj.type == 2) {
 				data.new = 0;
 			}
+			if(obj.goodsObjact.is_gp==1){
+				data.is_gp = 1;
+			}
 			cartAdd(data)
 				.then(function(e) {
 					let da = e.data;
 					if (obj.type == 1) {
 						// 跳转到支付页
+						let url =  '/pages/order/createOrder?id=' + da.cartId;
+						if(obj.goodsObjact.is_gp==1){
+							data.is_gp = 1;
+							url+=`&is_gp=1`
+						}
 						uni.navigateTo({
-							url: '/pages/order/createOrder?id=' + da.cartId
+							url
 						});
 					}
 					if (obj.type == 2) {

pages/public/register.vue

@@ -21,13 +21,13 @@
 				<view class="login_img"><image src="/static/icon/img07.png"></image></view>
 				<view class="login_name"><input class="uni-input" type="text" v-model="invitation" focus placeholder="请输入邀请码" /></view>
 			</view>
-			<!-- <view class="login_input flex">
+			<view class="login_input flex">
 				<view class="login_img"><image src="/static/icon/img06.png"></image></view>
 				<view class="login_name flex">
 					<input class="uni-input width" v-model="code" focus placeholder="请输入验证码" />
 					<view class="code" @click="verification">{{ countDown == 0 ? '验证码' : countDown }}</view>
 				</view>
-			</view> -->
+			</view>
 			<view><button type="green" @click="register" class="uni-button uni-button-green">注册账号</button></view>
 			<view><button class="uni-button uni-button-green uni-button-green-plain" type="green" plain="true" hover-class="none" @click="login">返回登录</button></view>
 		</view>
@@ -87,13 +87,13 @@ export default {
 			// 	obj.$api.msg('请输入邀请码');
 			// 	return;
 			// }
-			// if (obj.code == '') {
-			// 	obj.$api.msg('请输入验证码');
-			// 	return;
-			// }
+			if (obj.code == '') {
+				obj.$api.msg('请输入验证码');
+				return;
+			}
 			register({
 				account: obj.phone, //账号
-				// captcha: obj.code, //验证码
+				captcha: obj.code, //验证码
 				password: obj.password ,//密码
 				spread:this.invitation//上级推广人
 			}).then(function(e) {

pages/user/user.vue

@@ -14,11 +14,11 @@
 					</view>
 					<view class="config iconfont">
 						<text class="setting iconsetting" @click="navTo('/pages/set/set')"></text>
-						<text class="message iconmessage" @click="navTo('/pages/user/notice')"></text>
+						<!-- <text class="message iconmessage" @click="navTo('/pages/user/notice')"></text> -->
 					</view>
 				</view>
 				<!-- 会员卡功能 -->
-				<view class="vip-card-box">
+				<!-- <view class="vip-card-box">
 					<image class="card-bg" src="/static/img/vip-card-bg.png" mode=""></image>
 					<view class="b-btn">我要升级</view>
 					<view class="tit">
@@ -27,20 +27,11 @@
 					</view>
 					<text class="e-m">DCloud Union</text>
 					<text class="e-b">开通会员开发无bug 一测就上线</text>
-				</view>
+				</view> -->
 			</view>
 
 			<view
 				class="cover-container"
-				:style="[
-					{
-						transform: coverTransform,
-						transition: coverTransition
-					}
-				]"
-				@touchstart="coverTouchstart"
-				@touchmove="coverTouchmove"
-				@touchend="coverTouchend"
 			>
 				<image class="arc" src="/static/img/arc.png"></image>
 
@@ -133,25 +124,25 @@
 
 				<!-- 浏览历史 -->
 				<view class="history-section icon">
-					<view class="sec-header">
+					<!-- <view class="sec-header">
 						<text class="iconfont iconfavor"></text>
 						<text>浏览历史</text>
-					</view>
-					<scroll-view scroll-x class="h-list">
+					</view> -->
+					<!-- <scroll-view scroll-x class="h-list">
 						<image
 							class="h-list-image"
 							@click="navTo('/pages/product/product')"
 							src="https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1553105186633&di=c121a29beece4e14269948d990f9e720&imgtype=0&src=http%3A%2F%2Fimg004.hc360.cn%2Fm8%2FM04%2FDE%2FDE%2FwKhQplZ-QteEBvsbAAAAADUkobU751.jpg"
 							mode="aspectFill"
 						></image>
-					</scroll-view>
+					</scroll-view> -->
 					<uni-list>
 						<uni-list-item title="我的钱包" @click="navTo('/pages/money/wallet')" thumb="/static/icon/img11.png"></uni-list-item>
-						<uni-list-item title="我的卡卷" @click="navTo('/pages/user/coupon')" thumb="/static/icon/img12.png"></uni-list-item>
+						<!-- <uni-list-item title="我的卡卷" @click="navTo('/pages/user/coupon')" thumb="/static/icon/img12.png"></uni-list-item> -->
 						<uni-list-item title="我的收藏" @click="navTo('/pages/user/favorites')" thumb="/static/icon/img02.png"></uni-list-item>
-						<uni-list-item title="商户入驻" @click="navTo('/pages/set/address')" thumb="/static/icon/img05.png"></uni-list-item>
+						<!-- <uni-list-item title="商户入驻" @click="navTo('/pages/set/address')" thumb="/static/icon/img05.png"></uni-list-item> -->
 						<uni-list-item title="邀请好友" @click="navTo('/pages/user/shareQrCode')" thumb="/static/icon/img10.png"></uni-list-item>
-						<uni-list-item title="关于我们" @click="navTo('/pages/shareQrCode/index')" thumb="/static/icon/img09.png"></uni-list-item>
+						<!-- <uni-list-item title="关于我们" @click="navTo('/pages/shareQrCode/index')" thumb="/static/icon/img09.png"></uni-list-item> -->
 					</uni-list>
 				</view>
 			</view>

pages/user/withdrawal.vue

@@ -21,6 +21,24 @@
 				<input class="input" type="number" v-model="withdrawal" :placeholder="'最低提现金额' + minPrice + '元'" placeholder-class="placeholder" />
 				<view class="buttom" @click="withdrawal = money">全部提现</view>
 			</view>
+			<view class="rowTex flex">
+				<text >手续费</text>
+				<text >
+					￥{{ withdrawal*commission/100}}
+				</text>
+			</view>
+			<view class="rowTex flex">
+				<text >积分到账</text>
+				<text >
+					{{ withdrawal*integral/100}}
+				</text>
+			</view>
+			<view class="rowTex flex">
+				<text >实际到账</text>
+				<text >
+					￥{{ withdrawal*(100-commission-integral)/100}}
+				</text>
+			</view>
 		</view>
 		<!-- #ifndef MP-WEIXIN -->
 		<view class="list" v-if="!weichatBsrowser">
@@ -92,6 +110,8 @@ export default {
 			minPrice: '', //最少提现金额
 			aliData: {},
 			bankData: {},
+			commission:0,//手续费
+			integral:0,//积分
 			// #ifdef H5
 			weichatBsrowser: false
 			// #endif
@@ -131,6 +151,8 @@ export default {
 				this.money = data.commissionCount;
 				this.minPrice = data.minPrice;
 				this.freeze = data.incommissionCount;
+				this.integral = data.integral;
+				this.commission = data.commission;
 			});
 		},
 		// 跳转
@@ -197,7 +219,7 @@ page {
 .flex {
 	background-color: #ffffff;
 	text-align: center;
-	margin: 0 30rpx;
+	// margin: 0 30rpx;
 	border-radius: $border-radius-sm;
 	.buttom {
 		font-size: $font-lg;
@@ -229,6 +251,10 @@ page {
 		font-size: $font-base + 2rpx;
 		color: $font-color-dark;
 	}
+	.rowTex{
+		font-size: 28rpx;
+		color: #aaaaaa;
+	}
 	.row {
 		display: flex;
 		align-items: center;

store/index.js

@@ -6,9 +6,8 @@ Vue.use(Vuex)
 const store = new Vuex.Store({
 	state: {
 		// baseURL:"http://yrh.liuniu946.com",//'http://eb.shuibo.net',//请求地址配置 
-		baseURL:'http://base.liuniu946.com',//请求地址配置 
+		baseURL:'http://wj.liuniu946.com',//请求地址配置 
 		urlFile:'/index',//项目部署所在文件夹
-		userInfo: {}, //登录信息
 		loginInterceptor:false,//是否打开强制登录
 		// #ifdef H5 || MP-WEIXIN
 		weichatInfo:{},//保存微信注册信息