4-24-1

api/order.js

@@ -143,5 +143,13 @@ export function computedOrderkey(data) {
 		data
 	});
 }
+
+export function storeList(data) {
+	return request({
+		url: '/api/store_list',
+		method: 'get',
+		data
+	});
+}
 
 

pages/index/index.vue

@@ -85,7 +85,7 @@
 							<view class="price">
 								<text class="font-size-sm"></text>
 								<text>￥{{ bditem.price * 1 }}</text>
-								<text class="give-jf">赠{{bditem.give_integral*1}}积分</text>
+								<text class="give-jf" v-if="bditem.give_integral*1 > 0">赠{{bditem.give_integral*1}}积分</text>
 							</view>
 							
 						</view>

pages/money/pay.vue

@@ -251,8 +251,11 @@ export default {
 				// #ifdef APP-PLUS
 				from: 'app', //来源
 				// #endif
-				shipping_type: 1 //提货方式 1 快递 2自提
-			};
+				shipping_type:  prepage.tabCurrentIndex+1 //提货方式 1 快递 2自提
+			};
+			if(data.shipping_type == 2) {
+				data.store_id = prepage.checkedPoint.id
+			}
 			// 判断是否拼团商品
 			if (obj.pinkid) {
 				data.pinkId = obj.pinkid;

pages/user/award.vue

@@ -185,13 +185,15 @@ export default {
 				
 			},state)
 				.then(({ data }) => {
-					if(data.length > 0) {
-						navItem.orderList = navItem.orderList.concat(data[0].list);
-						console.log(navItem.orderList);
-						navItem.page++;
-					}
+					// if(data.length > 0) {
+					// 	navItem.orderList = navItem.orderList.concat(data[0].list);
+					// 	console.log(navItem.orderList);
+					// 	navItem.page++;
+					// }
+					navItem.orderList = navItem.orderList.concat(data.list);
+					navItem.page++;
 					//判断是否还有数据, 有改为more, 没有改为noMore
-					if (navItem.limit == data.length) {
+					if (navItem.limit == data.list.length) {
 						navItem.loadingType = 'more';
 						return;
 					} else {

pages/user/team.vue

@@ -49,7 +49,7 @@
 									<view class="title-name clamp2">{{ item.nickname }} </view>
 								</view>
 								<view class="time">
-									<text >({{item.level == 1 ? '会员': (item.level == 2?'合伙人':(item.level == 3?'股东': (item.level == 4 ? '董事': '粉丝')))}})</text>
+									<text >({{item.level == 1 ? '会员': (item.level == 2?'合伙人':(item.level == 3?'股东': (item.level == 4 ? '董事': (item.level == 5 ? '联创':'粉丝'))))}})</text>
 								</view>
 								<view class="time">
 									<text>{{ item.time }}</text>

pages/user/user.vue

@@ -26,11 +26,11 @@
 					<view class="user-money-num">{{ userInfo.brokerage_price*1 || 0 }}</view>
 					<view class="user-money-font">奖金</view>
 				</view>
-				<view class="user-xian"></view>
+				<!-- <view class="user-xian"></view>
 				<view class="user-money-item" @click="navTo('/pages/user/jf')">
 					<view class="user-money-num">{{ userInfo.integral*1 || 0 }}</view>
 					<view class="user-money-font">积分</view>
-				</view>
+				</view> -->
 				<view class="user-xian"></view>
 				<view class="user-money-item" >
 					<view class="user-money-num">{{ userInfo.profit*1 || 0 }}</view>

pages/user/yjzz.vue

@@ -20,8 +20,8 @@
 				<!-- <text class="tit">￥</text> -->
 				<input class="input" type="number" v-model="withdrawal" placeholder="转入金额"
 					placeholder-class="placeholder" />
-				<view class="buttom" v-if="type == 'yj'" @click="withdrawal = userInfo.brokerage_price*1" >全部转账</view>
-				<view class="buttom" v-if="type == 'yue'" @click="withdrawal = userInfo.now_money*1" >全部转账</view>
+				<view class="buttom" v-if="type == 'yj'" @click="withdrawal = userInfo.brokerage_price*1">全部转账</view>
+				<view class="buttom" v-if="type == 'yue'" @click="withdrawal = userInfo.now_money*1">全部转账</view>
 				<!-- <view class="buttom" @click="withdrawal = userInfo.dynamic_integral" v-if="type== 2">全部转账</view> -->
 			</view>
 		</view>
@@ -104,18 +104,26 @@
 					});
 					return;
 				}
-				if(obj.phone == '') {
+				if (obj.withdrawal *1 < 0) {
+					obj.loding = false;
+					uni.showModal({
+						title: '提示',
+						content: '转账金额不要为负数'
+					});
+					return;
+				}
+				if (obj.phone == '') {
 					return obj.$api.msg('请输入收款人手机号')
 				}
 				let data = {
 					phone: obj.phone, //编号
-					price: obj.withdrawal ,//金额
+					price: obj.withdrawal, //金额
 					// type: obj.type
 				};
-				if(obj.type == 'yj') {
+				if (obj.type == 'yj') {
 					jfzz(data)
 						.then(e => {
-					
+
 							// 允许按钮点击
 							obj.loding = false;
 							// 初始化提现金额
@@ -134,10 +142,11 @@
 							console.log();
 						});
 				}
-				if(obj.type == 'yue') {
+				if (obj.type == 'yue') {
+
 					yuezz(data)
 						.then(e => {
-					
+
 							// 允许按钮点击
 							obj.loding = false;
 							// 初始化提现金额
@@ -155,8 +164,9 @@
 							obj.loding = false;
 							console.log();
 						});
+
 				}
-				
+
 			},
 			boblack() {
 				uni.navigateBack({
@@ -379,4 +389,4 @@
 			color: #5771DF;
 		}
 	}
-</style>
+</style>

pages/user/yue.vue

@@ -168,12 +168,17 @@ export default {
 				},state
 			)
 				.then(({ data }) => {
-					if (data.length > 0) {
-						navItem.orderList = navItem.orderList.concat(data[0].list);
-						console.log(navItem.orderList);
-						navItem.page++;
-					}
-					if (navItem.limit == data.length) {
+					// if (data.length > 0) {
+					// 	// data.map(item => {
+					// 	// 	navItem.orderList = navItem.orderList.concat(item.list);
+					// 	// })
+					// 	// navItem.orderList = navItem.orderList.concat(data[0].list);
+					// 	console.log(navItem.orderList);
+					// 	navItem.page++;
+					// }
+					navItem.orderList = navItem.orderList.concat(data.list);
+					navItem.page++;
+					if (navItem.limit == data.list.length) {
 						//判断是否还有数据， 有改为 more， 没有改为noMore
 						navItem.loadingType = 'more';
 						return;

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.63b34199.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.48a05ccf.js></script><script src=/index/static/js/index.669c7917.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.63b34199.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.48a05ccf.js></script><script src=/index/static/js/index.19ce4caf.js></script></body></html>