Merge branch 'master' of http://git.liuniu946.com/cmy/wj

api/order.js

@@ -143,4 +143,29 @@ export function computedOrderkey(data) {
 		data
 	});
 }
-
+
+// 添加积分商品
+export function jfOrderCreate(data) {
+	return request({
+		url: '/api/juniu/order_create',
+		method: 'post',
+		data
+	});
+}
+// 获取积分订单列表
+export function getJfOrder(data) {
+	return request({
+		url: '/api/juniu/order',
+		method: 'get',
+		data
+	});
+}
+
+// 查看积分商品物流
+export function getWl(data) {
+	return request({
+		url: '/api/juniu/express',
+		method: 'get',
+		data
+	});
+}

api/product.js

@@ -183,4 +183,29 @@ export function reply_list(data,id) {
 		data
 	});
 }
-
+
+// 获取积分商品列表
+export function getJfList(data) {
+	return request({
+		url:'/api/juniu/lst',
+		method: 'post',
+		data
+	})
+}
+
+// 获取积分商品详情
+export function getJfDetail(data) {
+	return request({
+		url:'/api/juniu/info',
+		method: 'get',
+		data
+	})
+}
+
+export function getBl(data) {
+	return request({
+		url:'/api/index',
+		method: 'get',
+		data
+	})
+}

pages.json

@@ -46,8 +46,14 @@
 		{
 			"path": "pages/index/shopList",
 			"style": {
-				"navigationBarTitleText": "公排商品"
+				"navigationBarTitleText": "抢购商品"
 			}
+		},
+		{
+			"path": "pages/index/jfgood",
+			"style": {
+				"navigationBarTitleText": "积分商品"
+			}
 		},
 		{
 			"path": "pages/index/sign",
@@ -288,6 +294,17 @@
 					}
 				}
 			}
+		},
+		{
+			"path": "pages/product/jfproduct",
+			"style": {
+				"navigationStyle": "custom",
+				"app-plus": {
+					"titleNView": {
+						"type": "transparent"
+					}
+				}
+			}
 		},
 		{
 			"path": "pages/set/set",
@@ -444,7 +461,14 @@
 			"style": {
 				"navigationBarTitleText": "创建订单"
 			}
-		}, {
+		},
+		{
+			"path": "pages/order/jforder",
+			"style": {
+				"navigationBarTitleText": "积分订单"
+			}
+		},
+		{
 			"path": "pages/money/pay",
 			"style": {
 				"navigationBarTitleText": "支付"
@@ -558,7 +582,7 @@
 	}],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "uni-app",
+		"navigationBarTitleText": "万吉商城",
 		"navigationBarBackgroundColor": "#FFFFFF",
 		"backgroundColor": "#f8f8f8"
 	},

pages/index/gongyiList.vue

@@ -1,6 +1,7 @@
 <template>
 	<view class="main">
-		<view class="list-box-h">
+		<view class="list-box-h">
+			<empty v-if="loaded === true && list.length == 0"></empty>
 			<view v-for="(item, index) in list" :key="index" class="guess-item" @click="navToDetailPage(item)">
 				<image :src="item.image"></image>
 				<view class="guess-box">
@@ -23,17 +24,22 @@
 	</view>
 </template>
 
-<script>
+<script>
+	import empty from '@/components/empty';
 	import {
 		getProducts
 	} from '@/api/product.js';
-	export default {
+	export default {
+		components: {
+			empty
+		},
 		data() {
 			return {
 				list: [],
 				page: 1,
 				limit: 10,
-				loadingType: 'more',
+				loadingType: 'more',
+				loaded: false
 			}
 		},
 		onLoad(opt) {
@@ -54,9 +60,9 @@
 				getProducts({
 					page: obj.page,
 					limit: obj.limit,
-					is_gp:1 ,//设置是否vip商品
+					// is_gp:1 ,//设置是否vip商品
 					// sid:obj.sid
-					cid:8
+					cid:6
 					
 					
 				}).then(({
@@ -69,7 +75,8 @@
 						obj.loadingType = 'more'
 					} else {
 						obj.loadingType = 'noMore'
-					}
+					}
+					obj.loaded = true
 				})
 			}
 		}

pages/index/index.vue

@@ -34,7 +34,7 @@
 			<navigator url="/pages/index/shopList">
 				<view class="cate-item">
 					<image src="/static/icon/c3.png"></image>
-					<text>公排商品</text>
+					<text>抢购商品</text>
 				</view>
 			</navigator>
 			<navigator url="/pages/index/gongyiList">
@@ -49,12 +49,12 @@
 					<text>超值拼团</text>
 				</view>
 			</navigator> -->
-			<!-- <navigator url="/pages/product/seckill">
+			<navigator url="/pages/index/jfgood">
 				<view class="cate-item">
 					<image src="/static/icon/c7.png"></image>
-					<text>限时秒杀</text>
+					<text>积分商品</text>
 				</view>
-			</navigator> -->
+			</navigator>
 			<!-- <navigator url="/pages/index/sign">
 				<view class="cate-item">
 					<image src="/static/icon/c8.png"></image>

pages/index/jfgood.vue

@@ -0,0 +1,262 @@
+<template>
+	<view class="main">
+		<view class="top-search">
+			<input type="text" class="search-key" placeholder="请输入关键字" v-model="keyword" />
+			<image src="../../static/icon/search.png" mode="" class="search-logo"></image>
+			<view class="search-btn" @click.stop="search">搜索</view>
+		</view>
+		<scroll-view scroll-y="true" :style="{'height': height}" class="scoll-wrap" @scrolltolower="getArticleList()">
+			<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.goods_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)*(three_integral)).toFixed(2) }}积分</view>
+							</view>
+							<view class="btn">立即购买</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<uni-load-more :status="loadingType"></uni-load-more>
+		</scroll-view>
+	</view>
+</template>
+
+<script>
+	import {
+		getJfList,getBl
+	} from '@/api/product.js';
+	export default {
+		data() {
+			return {
+				height: '',
+				list: [],
+				page: 1,
+				limit: 10,
+				loadingType: 'more',
+				total_pages: 0,
+				keyword: '',
+				three_integral: 1,
+			}
+		},
+		onLoad(opt) {
+			this.getBl()
+			this.getArticleList()
+		},
+		// onReachBottom() {
+		// 	this.getArticleList()
+		// },
+		onReady(res) {
+			var obj = this;
+			uni.getSystemInfo({
+				success: resu => {
+					const query = uni.createSelectorQuery();
+					query.select('.scoll-wrap').boundingClientRect();
+					query.exec(function(res) {
+						console.log(res, 'ddddddddddddd');
+						obj.height = resu.windowHeight - res[0].top + 'px';
+						console.log('打印页面的剩余高度', obj.height);
+					});
+				},
+				fail: res => {}
+			});
+		},
+		methods: {
+			getBl(){
+				let obj = this
+				getBl().then(res => {
+					console.log(res)
+					obj.three_integral = res.data.three_integral
+					console.log(obj.three_integral)
+				})
+			},
+			navToDetailPage(item) {
+				uni.navigateTo({
+					url: '/pages/product/jfproduct?id=' + item.id
+				});
+			},
+			getArticleList() {
+				let obj = this
+				if (obj.loadingType == 'noMore' || obj.loadingType == 'loading') {
+					return
+				}
+				obj.loadingType = 'loading'
+				getJfList({
+					page: obj.page,
+					// limit: obj.limit,
+					keyword: obj.keyword //商品关键字
+					// is_gp:1 //设置是否vip商品
+				}).then(({
+					data
+				}) => {
+					obj.list = obj.list.concat(data.data)
+					obj.total_pages = data.meta.pagination.total_pages
+					obj.page++
+					if(obj.page <= obj.total_pages) {
+						obj.loadingType = 'more'
+					}else {
+						obj.loadingType = 'noMore'
+					}
+					// if (data.length == obj.limit) {
+					// 	obj.loadingType = 'more'
+					// } else {
+					// 	obj.loadingType = 'noMore'
+					// }
+				})
+			},
+			search() {
+				let obj = this
+				obj.page = 1
+				obj.list = []
+				obj.loadingType = 'more'
+				obj.getArticleList()
+			}
+		}
+	}
+</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;
+			}
+		}
+	}
+	.top-search {
+		width: 750rpx;
+		height: 100rpx;
+		// padding-top: 20rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		position: relative;
+	
+		.search-key {
+			width: 700rpx;
+			height: 70rpx;
+			padding-left: 100rpx;
+			background: #FFFFFF;
+			box-shadow: 0px 1rpx 5rpx #16cc9f;
+			border-radius: 35rpx;
+			position: relative;
+		}
+	
+		.search-logo {
+			width: 36rpx;
+			height: 36rpx;
+			position: absolute;
+			top: 0;
+			bottom: 0;
+			left: 50rpx;
+			margin: auto;
+		}
+	
+		.search-btn {
+			width: 150rpx;
+			height: 70rpx;
+			border-radius: 30rpx;
+			color: #16cc9f;
+			text-align: center;
+			line-height: 70rpx;
+			position: absolute;
+			top: 0;
+			bottom: 0;
+			right: 10rpx;
+			margin: auto;
+			// background-color: red;
+			z-index: 9;
+		}
+	}
+</style>
+

pages/money/pay.vue

@@ -5,7 +5,7 @@
 			<text class="price">{{ money }}</text>
 		</view>
 		<view class="pay-type-list">
-			<view class="type-item b-b" @click="changePayType(1)">
+			<view class="type-item b-b" @click="changePayType(1)" v-if="bool">
 				<text class="icon iconfont iconweixin"></text>
 				<view class="con">
 					<text class="tit">微信支付</text>
@@ -53,7 +53,10 @@
 import { balance } from '@/api/wallet.js';
 import { createOrderkey,computedOrderkey,orderPay } from '@/api/order.js';
 import { getUserInfo } from '@/api/user.js';
-import { mapState } from 'vuex';
+import { mapState } from 'vuex';
+// #ifdef H5
+import weixinBJ from "@/utils/wxAuthorized.js";
+// #endif
 export default {
 	data() {
 		return {
@@ -77,16 +80,16 @@ export default {
 			pinkid: '' ,//保存拼团商品id
 			'gp_now_money':0,
 			'integral':0,
-			is_gp:0//1为公排0不是公排
+			is_gp:0,//1为公排0不是公排
+			bool: true
 		};
 	},
-	computed: {
-		// #ifdef H5
-		...mapState(['weichatObj'])
-		// #endif
-	},
 	onLoad(options) {
-		
+		this.bool = uni.getStorageSync('weichatBrowser');
+		if(!this.bool) {
+			this.payType = 3
+			this.payName = 'yue'
+		}
 		if (options.type == 1) {
 			this.type = 1;
 			this.orderId = options.ordid;
@@ -179,7 +182,8 @@ export default {
 							obj.$api.msg(msg);
 						}
 					}
-					if (obj.payName == 'weixin' || obj.payName == 'routine') {
+					if (obj.payName == 'weixin' || obj.payName == 'routine') {
+						console.log("开始调用");
 						let da = e.data.result.jsConfig;
 						let data = {
 							// #ifdef H5
@@ -195,15 +199,26 @@ export default {
 							success: function(res) {
 								obj.paySuccessTo();
 							},
-							fail: () => {
-								uni.navigateTo({
-									url: '/pages/order/order?state=0'
+							fail: (e) => {
+								uni.showModal({
+									title: '错误',
+									content: e,
 								});
+								// uni.navigateTo({
+								// 	url: '/pages/order/order?state=0'
+								// });
 							}
 						};
 						// #ifdef H5
-						if(obj.payName == 'weixin'){
-						obj.weichatObj.chooseWXPay(data);
+						if(obj.payName == 'weixin'){
+							weixinBJ.weixinObj.chooseWXPay(data);
+							// weixindata().then(() => {
+							// }).catch((e) => {
+							// 	uni.showModal({
+							// 		title: '错误',
+							// 		content: e,
+							// 	});
+							// })
 						}
 						// #endif
 						// #ifdef MP-WEIXIN

pages/money/recharge.vue

@@ -15,7 +15,7 @@
 		<view class="list">
 					<radio-group @change="tabRadio">
 						<!-- #ifndef APP-PLUS -->
-						<label>
+						<label v-if="bool">
 							<view class="box">
 								<view class="icon iconfont iconweixin1"></view>
 								<view class="title-box">
@@ -56,7 +56,8 @@
 <script>
 import { getMoneyStyle } from '@/utils/rocessor.js';
 // #ifdef H5
-import { rechargeWechat,userBalance,extractBank} from '@/api/wallet.js';
+import { rechargeWechat,userBalance,extractBank} from '@/api/wallet.js';
+import weixinBJ from "@/utils/wxAuthorized.js";
 // #endif
 // #ifdef MP
 import { rechargeRoutine } from '@/api/wallet.js';
@@ -73,7 +74,7 @@ export default {
 			payLoding: false ,//是否加载中
 			yongMoney:'',
 			nowmoney:'',
-			
+			bool: true
 			
 		};
 	},
@@ -89,7 +90,14 @@ export default {
 			this.disable= true
 		});
 	},
-	onLoad(options) {},
+	onLoad(options) {
+		this.bool = uni.getStorageSync('weichatBrowser');
+		if(!this.bool) {
+			// this.payType = 3
+			this.type = 'yongjing'
+			this.typeText = 1
+		}
+	},
 	computed: {
 		// #ifdef H5
 		...mapState(['weichatObj'])
@@ -225,10 +233,19 @@ export default {
 						obj.payLoding = false;
 					}
 					if (obj.type == 'yongjing') {
-						uni.navigateTo({
-							url: '/pages/money/rechargeSuccess'
+						// uni.navigateTo({
+						// 	url: '/pages/money/rechargeSuccess'
+						// });
+						obj.payLoding = false;
+						uni.showToast({
+							title: '充值成功',
+							duration: 2000,
+						});
+						extractBank({}).then(({ data }) => {
+							obj.yongMoney = (data.commissionCount * 1).toFixed(2); //累积佣金
+							console.log(data,'wwwww');
+							obj.disable= true
 						});
-						obj.payLoding = false;
 						console.log(e, '佣金');
 					}
 				})
@@ -246,8 +263,7 @@ export default {
 					console.log(e);
 					if (obj.type == 'weixin') {
 						let da = e.data.data;
-						console.log(weixinObj, 'weixin');
-						weixinObj.chooseWXPay({
+						weixinBJ.weixinObj.chooseWXPay({
 							timestamp: da.timestamp,
 							nonceStr: da.nonceStr,
 							package: da.package,

pages/order/jforder.vue

@@ -0,0 +1,314 @@
+<template>
+	<view class="">
+		<view  v-for="(item, index) in list" :key="index" class="order-item">
+			<view class="i-top b-b">
+				<text class="time">{{ item.pay_time |showTime }}</text>
+				<!-- <text class="state" :style="{ color: item.stateTipColor }">{{ item._status._title }}</text> -->
+				<!-- <text v-if="item.status === 4" class="del-btn iconfont icondelete" @click="deleteOrder(index)"></text> -->
+			</view>
+			<view class="goods-box-single">
+				<image class="goods-img" :src="item.goods_image" mode="scaleToFill"></image>
+				<view class="right">
+					<view class="flex-start">
+						<text class="title clamp">{{ item.goods_name }}</text>
+						<!-- <text class="price">{{ item.pay_price|moneyNum }}</text> -->
+					</view>
+					<view class="row flex">
+						<!-- <text class="row_title">{{ goodsItem.productInfo.attrInfo ? goodsItem.productInfo.attrInfo.suk : '' }}</text> -->
+						<text class="attr-box"> x {{ item.goods_num }}</text>
+					</view>
+				</view>
+			</view>
+			<view class="price-box">
+				<!-- 共
+				<text class="num">{{ item.cartInfo.length }}</text>
+				件商品 邮费
+				<text class="price">{{ moneyNum(item.pay_postage)}}</text> -->
+				实付款
+				<text class="price">{{ moneyNum(item.pay_price)}}</text>
+			</view>
+			<view class="action-box b-t" v-if="item.sn">
+				<button  class="action-btn" @click.stop="lookWl(item.sn)">查看物流</button>
+			</view>
+			
+		</view>
+		<uni-load-more :status="loadingType"></uni-load-more>
+		<uni-popup ref="popup" type="center">
+			<view class="express">
+				<view class="">
+					快递公司：<text style="font-weight: bold;">{{express.express_name}}</text>
+				</view>
+				<view class="">
+					快递单号：<text style="font-weight: bold;">{{express.express_no}}</text>
+				</view>
+			</view>
+			
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	
+	import { getJfOrder, getWl } from '@/api/order.js'
+	import uniPopup from '@/components/uni-popup/uni-popup.vue'
+	export default {
+		data() {
+			return {
+				list: [],
+				loadingType: 'more',
+				page: 1,
+				limit: 10,
+				express:{express_name:'暂无',express_no:'暂无'},
+			}
+		},
+		onLoad() {
+			this.getDate()
+		},
+		filters: {
+			showTime(val) {
+				let date = new Date(val * 1000);
+				let Y = date.getFullYear();
+				let M = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1;
+				let D = date.getDate() < 10 ? '0' + date.getDay() : date.getDate();
+				return Y + '年' + M + '月' + D + '日';
+			},
+		},
+		onReachBottom() {
+			this.getDate()
+		},
+		methods: {
+			// 转换金额为数字
+			moneyNum(value){
+					return +value;
+			},
+			getDate() {
+				let obj = this
+				
+				if (obj.loadingType === 'loading') {
+					//防止重复加载
+					return;
+				}
+				if (obj.loadingType === 'noMore') {
+					//防止重复加载
+					return;
+				}
+				// 修改当前对象状态为加载中
+				obj.loadingType = 'loading';
+				getJfOrder({
+					page: obj.page,
+					limit: obj.limit
+				}).then(({data}) => {
+					// console.log(res)
+					obj.list = obj.list.concat(data.data)
+					obj.page++
+					if (obj.limit == data.data.length) {
+						//判断是否还有数据， 有改为 more， 没有改为noMore
+						obj.loadingType = 'more';
+					} else {
+						//判断是否还有数据， 有改为 more， 没有改为noMore
+						obj.loadingType = 'noMore';
+					}
+				})
+			},
+			//查看物流
+			lookWl(item) {
+				console.log(item)
+				let obj = this
+				uni.showLoading({
+					title:'查询中...'
+				})
+				getWl({
+					sn:item
+				}).then(({data}) => {
+					uni.hideLoading()
+					console.log(data)
+					if(data.status_code == 404) {
+						this.$api.msg('暂无该商品的物流信息')
+					}
+					obj.express = data.express_list[0]
+					obj.$refs.popup.open()
+				}).catch(err => {
+					uni.hideLoading()
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.order-item {
+		display: flex;
+		flex-direction: column;
+		padding-left: 30rpx;
+		background: #fff;
+		margin-top: 16rpx;
+		.i-top {
+			display: flex;
+			align-items: center;
+			height: 80rpx;
+			padding-right: 30rpx;
+			font-size: $font-base;
+			color: $font-color-dark;
+			position: relative;
+			.time {
+				flex: 1;
+			}
+			.state {
+				color: $base-color;
+			}
+			.del-btn {
+				padding: 10rpx 0 10rpx 36rpx;
+				font-size: $font-lg;
+				color: $font-color-light;
+				position: relative;
+				&:after {
+					content: '';
+					width: 0;
+					height: 30rpx;
+					border-left: 1px solid $border-color-dark;
+					position: absolute;
+					left: 20rpx;
+					top: 50%;
+					transform: translateY(-50%);
+				}
+			}
+		}
+		/* 多条商品 */
+		.goods-box {
+			height: 160rpx;
+			padding: 20rpx 0;
+			white-space: nowrap;
+			.goods-item {
+				width: 120rpx;
+				height: 120rpx;
+				display: inline-block;
+				margin-right: 24rpx;
+			}
+			.goods-img {
+				display: block;
+				width: 100%;
+				height: 100%;
+			}
+		}
+		/* 单条商品 */
+		.goods-box-single {
+			display: flex;
+			padding: 20rpx 0;
+			.goods-img {
+				display: block;
+				width: 120rpx;
+				height: 120rpx;
+			}
+			.right {
+				flex: 1;
+				display: flex;
+				flex-direction: column;
+				padding: 0 30rpx 0 24rpx;
+				overflow: hidden;
+				.row{
+					margin-top: 10rpx;
+				}
+				.row_title{
+					padding:5rpx 10rpx;
+					background-color: #dddddd;
+					border-radius: 10rpx;
+					font-size: 22rpx;
+					color: #ffffff;
+				}
+				.title {
+					font-size: $font-base + 2rpx;
+					color: $font-color-dark;
+					line-height: 1;
+					width: 80%;
+				}
+				.attr-box {
+					display: flex;
+					justify-content: flex-end;
+					font-size: $font-sm + 2rpx;
+					color: $font-color-light;
+				}
+				.price {
+					display: inline;
+					font-size: $font-base + 2rpx;
+					color: $font-color-dark;
+					&:before {
+						content: '积分';
+						font-size: $font-sm;
+						
+					}
+				}
+			}
+		}
+		.price-box {
+			display: flex;
+			justify-content: flex-end;
+			align-items: baseline;
+			padding: 20rpx 30rpx;
+			font-size: $font-sm + 2rpx;
+			color: $font-color-light;
+			.num {
+				margin: 0 8rpx;
+				color: $font-color-dark;
+			}
+			.price {
+				font-size: $font-lg;
+				color: $font-color-dark;
+				&::after {
+					content: '积分';
+					font-size: $font-sm;
+					margin: 0 2rpx 0 8rpx;
+				}
+				&::before {
+					content: ' ';
+					font-size: $font-sm;
+					margin: 0 2rpx 0 8rpx;
+				}
+			}
+		}
+		.action-box {
+			display: flex;
+			justify-content: flex-end;
+			align-items: center;
+			height: 100rpx;
+			position: relative;
+			padding-right: 30rpx;
+		}
+		.action-btn {
+			width: 160rpx;
+			height: 60rpx;
+			margin: 0;
+			margin-left: 24rpx;
+			padding: 0;
+			text-align: center;
+			line-height: 60rpx;
+			font-size: $font-sm + 2rpx;
+			color: $font-color-dark;
+			background: #fff;
+			border-radius: 100px;
+			&:after {
+				border-radius: 100px;
+			}
+			&.recom {
+				color: $base-color;
+				&:after {
+					border-color: $base-color;
+				}
+			}
+			&.evaluate {
+				color: $color-yellow;
+				&:after {
+					border-color: $color-yellow;
+				}
+			}
+		}
+	}
+	.express {
+		width: 600rpx;
+		height: 200rpx;
+		border-radius: 20rpx;
+		background-color: #fff;
+		text-align: center;
+		line-height: 100rpx;
+		font-size: 32rpx;
+	}
+</style>

pages/order/orderRefund.vue

@@ -87,7 +87,8 @@ export default {
 			});
 		},
 		//提交
-		confirm() {
+		confirm() {
+			let obj = this;
 			if (!obj.refund) {
 				uni.showModal({
 					title: '错误',
@@ -96,7 +97,7 @@ export default {
 				});
 				return false;
 			}
-			let obj = this;
+			
 			refund({
 				text: obj.refund,
 				uni: obj.orderId,

pages/product/product.vue

@@ -323,6 +323,7 @@ export default {
 				} //小程序商品详情图超出屏幕问题
 				obj.imgList = goods.slider_image; //保存轮播图
 				obj.specList = data.productAttr; //保存分类列表
+				obj.goodsStore = goods.stock
 				if (Array.isArray(data.productValue) != true) {
 					obj.many = 2;
 					obj.specList = data.productAttr; //保存产品属性

pages/set/set.vue

@@ -3,22 +3,22 @@
 		<uni-list>
 		    <uni-list-item title="个人资料" @click="navTo('/pages/set/userinfo')" ></uni-list-item>
 			<uni-list-item title="修改密码" @click="navTo('/pages/set/password')" ></uni-list-item>
-		    <uni-list-item title="实名认证" @click="navTo('/pages/set/phone')" ></uni-list-item>
+		    <!-- <uni-list-item title="实名认证" @click="navTo('/pages/set/phone')" ></uni-list-item> -->
 		    <uni-list-item title="收货地址" @click="navTo('/pages/set/address')" ></uni-list-item>
 		</uni-list>
-		<uni-list class="margin-t-20">
+		<!-- <uni-list class="margin-t-20">
 		    <uni-list-item title="消息推送" :switch-checked='true' :show-switch="true" :show-arrow="false" switch-color='#5dbc7c'  @switchChange='switchChange'> 
 			</uni-list-item>
-		</uni-list>
+		</uni-list> -->
 		
-		<uni-list class="margin-t-20">
+		<!-- <uni-list class="margin-t-20">
 		    <uni-list-item title="清除缓存" ></uni-list-item>
 		    <uni-list-item title="检查更新" >
 				<template slot="right">
 					当前版本 1.0.3
 				</template>
 			</uni-list-item>
-		</uni-list>
+		</uni-list> -->
 		<view class="list-cell log-out-btn" @click="toLogout">
 			<text class="cell-tit">退出登录</text>
 		</view>

pages/user/user.vue

@@ -11,7 +11,7 @@
 						</view>
 						<view class="info-box">
 							<view class="username">{{ userInfo.nickname || '游客' }}</view>
-							<view class="font-size-sm" v-if="userInfo.spread_uid">邀请码:{{ userInfo.spread_uid }}</view>
+							<view class="font-size-sm" v-if="userInfo.uid">UID: {{ userInfo.uid }}</view>
 							<text class="font-size-sm" v-if="orderTime!=''">分红周期：{{orderTime}}</text>
 						</view>
 					</view>
@@ -52,7 +52,7 @@
 					</view>
 					<view class="tj-item">
 						<text class="num">{{ userInfo.gp_now_money || '0.00' }}</text>
-						<text>爆单金额</text>
+						<text>报单金额</text>
 					</view>
 				</view>
 				<!-- 订单 -->
@@ -127,7 +127,7 @@
 							</view>
 							<text>奖励明细</text>
 						</view>
-						<view class="order-item" @click="navTo('/pages/user/award')" hover-class="common-hover"
+						<view class="order-item" @click="navTo('/pages/user/scoreAccumulate')" hover-class="common-hover"
 							:hover-stay-time="50">
 							<view class="icon">
 								<image class="icon-img" src="/static/icon/u3.png" mode="aspectFit"></image>
@@ -161,7 +161,7 @@
 						<!-- <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/order/jforder')" 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/user/extension')"
@@ -170,7 +170,6 @@
 							thumb="/static/icon/img07.png"></uni-list-item>
 						<uni-list-item title="转账记录" @click="navTo('/pages/user/zhuanlist')"
 							thumb="/static/icon/img08.png"></uni-list-item>
-
 					</uni-list>
 				</view>
 			</view>