1-14-2

components/datalist.vue

@@ -12,7 +12,7 @@
 					
 				</view>
 				<view class="allprice">
-					<text class="price">￥{{ d.price }}</text>
+					<text class="price">￥{{ (d.price*1-d.max_integral*1).toFixed(2) }}</text>
 				</view>
 			</view>
 		</view>

pages/cart/cartt.vue

@@ -162,7 +162,7 @@
 		position: fixed;
 		bottom: 300rpx;
 		right: 20rpx;
-		// background-color: red;
+		background-color: #fff;
 		border-radius: 50%;
 		box-shadow: 0px 0 10rpx #999;
 		width: 100rpx;

pages/category/fillTable.vue

@@ -376,11 +376,12 @@
 		font-family: PingFang SC;
 		font-weight: 500;
 		color: #ffffff;
-		position: absolute;
-		bottom: 35rpx;
-		left: 0;
-		right: 0;
+		// position: absolute;
+		// bottom: 35rpx;
+		// left: 0;
+		// right: 0;
 		margin: auto;
+		margin-top: 60rpx;
 	}
 
 	.picker {

pages/index/child/goldenBean.vue

@@ -30,6 +30,9 @@
 						</view>
 						<view class="price">
 							￥{{ d.price }}
+						</view>
+						<view class="name" style="font-size: 22rpx;color: #999;">
+							已售 {{ d.sales || '0'}}
 						</view>
 					</view>
 				</view>

pages/order/orderDetail.vue

@@ -68,7 +68,7 @@
 			<view class="input">-￥{{ item.coupon_price }}</view>
 		</view>
 		<view class="row b-b flex" v-if="item.use_integral > 0">
-			<text class="tit">积分抵扣</text>
+			<text class="tit">金券抵扣</text>
 			<view class="input">-￥{{ item.use_integral }}</view>
 		</view>
 		<view class="row b-b flex">

pages/product/common/productContent.vue

@@ -1,19 +1,28 @@
 <template>
 	<view class="introduce-section">
 		<view class="price-box">
-			<text class="price-tip">¥</text>
+			<text class="price-tip">现金</text>
 			<view class="price">
-				{{ goodsObjact.price }}
-				<text class="m-price" v-if="goodsObjact.ot_price*1 > goodsObjact.price*1">¥{{ goodsObjact.ot_price }}</text>
+				{{ (goodsObjact.price*1-goodsObjact.max_integral*1).toFixed(2) }}
+				
 			</view>
 			<view class="" v-if="isgold == 1" style="color: #ffac60;">
 				可获金豆{{goodsObjact.price}}
 			</view>
-			<view class="" v-if="goodsObjact.is_integral == 1" style="color: #ffac60;">
-				最多可抵扣{{goodsObjact.max_integral}}
-			</view>
+			<view class="" v-if="goodsObjact.is_integral == 1" style="color: #ffac60; margin-left: 5rpx;">
+				+金券{{goodsObjact.max_integral}}
+			</view>
+			<text class="m-price" v-if="goodsObjact.ot_price*1 >= goodsObjact.price*1">原价¥{{ goodsObjact.ot_price }}</text>
+		</view>
+		<text class="title clamp2">{{ goodsObjact.store_name }}</text>
+		<view class="flex" style="color: #999;font-size: 22rpx;padding-top: 8rpx;">
+			<view class="">
+				销量：{{goodsObjact.sales || '0'}}
+			</view>
+			<view class="">
+				库存： {{goodsObjact.stock || '0'}}
+			</view>
 		</view>
-		<text class="title clamp2">{{ goodsObjact.store_name }}</text>
 	</view>
 </template>
 

pages/product/exchange.vue

@@ -83,7 +83,8 @@ import { getUserInfo } from '@/api/user.js';
 					is_integral: 1
 				})
 					.then(function(res) {
-						obj.data = res.data
+						obj.data = res.data
+						console.log(obj.data,'2131231231231');
 					})
 					.catch(res => {
 					});

pages/product/product.vue

@@ -31,8 +31,8 @@
 					<view class="right">
 						<view class="good-name clamp">{{ goodsObjact.store_name }}</view>
 						<text class="price">¥{{ actionPrice }}</text>
-						<!-- <text class="stock">库存：{{ goodsObjact.stock }}件</text>
-						<view class="selected" v-if="goodsType == 0">
+						<text class="stock" style="padding-top: 8rpx;">库存：{{ goodsObjact.stock }}件</text>
+						<!-- <view class="selected" v-if="goodsType == 0">
 							已选：
 							<text class="selected-text" v-for="(sItem, sIndex) in specSelected" :key="sIndex">{{ sItem }}</text>
 						</view> -->
@@ -49,6 +49,7 @@
 							@click="selectSpec(childItem, item, index)"
 						>
 							{{ childItem.attr }}
+						
 						</text>
 					</view>
 				</view>

pages/product/realyWhole.vue

@@ -28,7 +28,9 @@
 	import topSwiper from './common/topSwiper.vue';
 	// 图文详情
 	import contentText from './common/contentText.vue';
-
+	import {
+		getUserInfo
+	} from '@/api/user.js'
 	import {
 		getWholeDetai,
 		reservePackage,
@@ -49,6 +51,7 @@
 				is_new: '',
 				description: '',
 				loading: true,
+				userInfo: {}
 			}
 		},
 		onLoad(opt) {
@@ -61,7 +64,16 @@
 			}
 			this.getWholeDetai()
 		},
+		onShow() {
+			this.getUserInfo()
+		},
 		methods: {
+			getUserInfo() {
+				getUserInfo().then(res => {
+					console.log(res)
+					this.userInfo = res.data
+				})
+			},
 			getWholeDetai() {
 				let obj = this
 
@@ -87,6 +99,15 @@
 					obj.$api.msg('今日该场次未开始，请稍后')
 					return
 				}
+				if(!obj.userInfo.wx_qr) {
+					this.$api.msg('您未完善信息，请完善信息后购买！')
+					setTimeout(()=> {
+						uni.navigateTo({
+							url: '/pages/set/userinfo'
+						})
+					},1500)
+					return
+				}
 				let updata = {
 					whole_id: obj.goodItem.whole.id,
 					time_id: obj.time_id,

pages/product/wholesaleDetail.vue

@@ -7,7 +7,7 @@
 			<view class="new-price">
 				¥{{goodItem.price}}
 			</view>
-			<view class="old-price">
+			<view class="old-price" v-if="goodItem.price*1 < goodItem.ot_price*1">
 				¥{{goodItem.ot_price}}
 			</view>
 		</view>
@@ -53,6 +53,7 @@
 				is_new: 'non',
 				description: '',
 				loading: false,
+				userInfo: {}
 			}
 		},
 		onLoad(opt) {
@@ -72,12 +73,15 @@
 			this.getUserInfo()
 			this.getWholeDetai()
 		},
+		onShow() {
+			this.getUserInfo()
+		},
 		methods: {
 			getUserInfo() {
 				getUserInfo().then(res => {
 					console.log(res)
 					// this.setUserInfo(res.data);
-					// this.userInfo = res.data
+					this.userInfo = res.data
 					this.is_new = res.data.is_whole == 0? 'isn': 'non'
 				})
 			},
@@ -114,6 +118,15 @@
 					this.$api.msg('您已不是新人，无法购买新人专属商品')
 					return
 				}
+				if(!obj.userInfo.wx_qr) {
+					this.$api.msg('您未完善信息，请完善信息后购买！')
+					setTimeout(()=> {
+						uni.navigateTo({
+							url: '/pages/set/userinfo'
+						})
+					},1500)
+					return
+				}
 				let updata = {
 					whole_id: obj.good_id,
 					time_id: obj.time_id,

pages/user/JDcool.vue

@@ -16,18 +16,18 @@
 		<view class="title">
 			- 实时累计 -
 		</view>
-		<scroll-view class="swiper-box" scroll-y>
+		<scroll-view class="swiper-box" scroll-y :style="{'height': height}" @scrolltolower="loadData()">
 			<!-- 空白页 -->
 			<!-- <empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty> -->
 			<!-- 订单列表 -->
 			<template>
-				<view v-for="(item, index) in dataList" class="order-item flex">
+				<view v-for="(item, index) in dataList" class="order-item flex" >
 					<view class="left flex">
 						<view class="avator">
-							<image :src="item.pay_evaluation" mode=""></image>
+							<image :src="item.user.avatar" mode=""></image>
 						</view>
 						<view class="order-font">
-							{{item.user.real_name}}扣除<text>{{item.use_integral}}</text>个金豆
+							{{item.user.real_name}}{{item.title}}<text>{{item.number}}</text>
 						</view>
 					</view>
 					<view class="time">
@@ -35,7 +35,7 @@
 					</view>
 				</view>
 			</template>
-			<!-- <uni-load-more :status="tabItem.loadingType"></uni-load-more> -->
+			<uni-load-more :status="loadingType"></uni-load-more>
 		</scroll-view>
 	</view>
 </template>
@@ -56,7 +56,7 @@
 		},
 		data() {
 			return {
-
+				height: '',
 				jd: 0,
 				loadingType: 'more',
 				limit: 10, //每次加载多少信息
@@ -74,7 +74,7 @@
 					const query = uni.createSelectorQuery();
 					query.select('.swiper-box').boundingClientRect();
 					query.exec(function(res) {
-						_this.maxheight = resu.windowHeight - res[0].top + 'px';
+						_this.height = resu.windowHeight - res[0].top + 'px';
 						console.log('打印页面的剩余高度', _this.height);
 					});
 				},
@@ -93,9 +93,10 @@
 			},
 			loadData() {
 				let obj = this
-				if(obj.loadingType == 'noMore'){
+				if(obj.loadingType == 'noMore' || obj.loadingType == 'loading'){
 					return
-				}
+				}
+				obj.loadingType = 'loading'
 				jdCoool({
 					page: obj.page,
 					limit: obj.limit
@@ -113,7 +114,6 @@
 					//判断是否还有数据，有改为more，没有各位noMore
 					if(obj.limit == res.data.data.length){
 						obj.loadingType = 'more'
-						return
 					}else{
 						obj.loadingType = 'noMore'
 					}
@@ -276,7 +276,7 @@
 					width: 70rpx;
 					height: 70rpx;
 					border-radius: 50rpx;
-					background: #03A9F4;
+					// background: #03A9F4;
 
 					image {
 						width: 70rpx;

pages/user/myWholesale.vue

@@ -25,7 +25,7 @@
 							<view class="right">
 								<view class="flex-start" style="justify-content: space-between;">
 									<text class="title clamp">{{ item.whole.title }}</text>
-									<text class="price">{{ moneyNum(item.whole.price) }}</text>
+									<text class="price">{{ moneyNum(item.price) }}</text>
 								</view>
 								<view class="row flex">
 									<!-- <text class="row_title">{{ goodsItem.productInfo.attrInfo ? goodsItem.productInfo.attrInfo.suk : '' }}</text> -->
@@ -257,6 +257,7 @@
 						data
 					}) => {
 						navItem.orderList = navItem.orderList.concat(data.data)
+						console.log(navItem.orderList,'徐浩岚');
 						navItem.page++
 						if (navItem.limit == data.data.length) {
 							navItem.loadingType = 'more'

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.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.6808189b.js></script><script src=/index/static/js/index.ea2da74d.js></script></body></html>
+            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.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.6808189b.js></script><script src=/index/static/js/index.d4c309b4.js></script></body></html>