2021-3-22

App.vue

@@ -124,6 +124,7 @@ video {
 		}
 	}
 }
+
 // 设置富文本中图片最大宽度
 uni-rich-text img {
 	max-width: 100% !important;

manifest.json

@@ -1,85 +1,85 @@
 {
-	"name": "基础项目",
-	"appid": "__UNI__F0EBD91",
-	"description": "",
-	"versionName": "1.0.0",
-	"versionCode": "100",
-	"transformPx": false,
-	"app-plus": {
-		/* 5+App特有相关 */
-		"usingComponents": true,
-		"splashscreen": {
-			"alwaysShowBeforeRender": true,
-			"waiting": true,
-			"autoclose": true,
-			"delay": 0
-		},
-		"modules": {},
-		/* 模块配置 */
-		"distribute": {
-			/* 应用发布信息 */
-			"android": {
-				/* android打包配置 */
-				"permissions": [
-					"<uses-feature android:name=\"android.hardware.camera\"/>",
-					"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-					"<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
-					"<uses-permission android:name=\"android.permission.CAMERA\"/>",
-					"<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.READ_CONTACTS\"/>",
-					"<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
-					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-					"<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>"
-				],
-				"abiFilters": ["armeabi-v7a", "arm64-v8a", "x86"]
-			},
-			"ios": {
-				"idfa": false
-			},
-			/* ios打包配置 */
-			"sdkConfigs": {
-				"maps": {},
-				"oauth": {
-					"weixin": {
-						"appid": "",
-						"appsecret": "",
-						"UniversalLinks": ""
-					}
-				}
-			}
-		}
-	},
-	/* SDK配置 */
-	"quickapp": {},
-	/* 快应用特有相关 */
-	"mp-weixin": {
-		/* 小程序特有相关 */
-		"usingComponents": true,
-		"appid": "",
-		"setting": {
-			"urlCheck": true
-		}
-	},
-	"h5": {
-		"title": "商城",
-		"domain": "",
-		"router": {
-			"base": "/index/",
-			"mode": "history"
-		},
-		"devServer": {
-			"proxy": {
-				"/api": {
-					"target": "http://192.168.0.101/api",
-					// "changeOrigin": true,
-					"pathRewrite": {
-						"/api": "" // rewrite path
-					}
-				}
-			}
-		}
-	}
+    "name" : "基础项目",
+    "appid" : "__UNI__F0EBD91",
+    "description" : "",
+    "versionName" : "1.0.0",
+    "versionCode" : "100",
+    "transformPx" : false,
+    "app-plus" : {
+        /* 5+App特有相关 */
+        "usingComponents" : true,
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : true,
+            "waiting" : true,
+            "autoclose" : true,
+            "delay" : 0
+        },
+        "modules" : {},
+        /* 模块配置 */
+        "distribute" : {
+            /* 应用发布信息 */
+            "android" : {
+                /* android打包配置 */
+                "permissions" : [
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<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.READ_CONTACTS\"/>",
+                    "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>"
+                ],
+                "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ]
+            },
+            "ios" : {
+                "idfa" : false
+            },
+            /* ios打包配置 */
+            "sdkConfigs" : {
+                "maps" : {},
+                "oauth" : {
+                    "weixin" : {
+                        "appid" : "",
+                        "appsecret" : "",
+                        "UniversalLinks" : ""
+                    }
+                }
+            }
+        }
+    },
+    /* SDK配置 */
+    "quickapp" : {},
+    /* 快应用特有相关 */
+    "mp-weixin" : {
+        /* 小程序特有相关 */
+        "usingComponents" : true,
+        "appid" : "",
+        "setting" : {
+            "urlCheck" : true
+        }
+    },
+    "h5" : {
+        "title" : "商城",
+        "domain" : "",
+        "router" : {
+            "base" : "/index/",
+            "mode" : "hash"
+        },
+        "devServer" : {
+            "proxy" : {
+                "/api" : {
+                    "target" : "http://192.168.0.101/api",
+                    // "changeOrigin": true,
+                    "pathRewrite" : {
+                        "/api" : "" // rewrite path
+                    }
+                }
+            }
+        }
+    }
 }

pages/category/category.vue

@@ -24,7 +24,7 @@ export default {
 		return {
 			sizeCalcState: false,
 			tabScrollTop: 0,
-			currentId: 1,
+			currentId: 9,
 			flist: [],
 		};
 	},
@@ -60,7 +60,9 @@ export default {
 			}
 			// 获取当前点击的id
 			this.currentId = item.id;
+			console.log(item.top);
 			this.tabScrollTop = item.top;
+			console.log(this.tabScrollTop);
 		},
 		//右侧栏滚动
 		asideScroll(e) {

pages/index/index.vue

@@ -54,7 +54,7 @@
 		
 		<view class="ad-1"><image src="/static/temp/ad1.jpg" mode="scaleToFill"></image></view>
 		<!-- 可领取优惠券 -->
-		<scroll-view class="coupon-box clamp" :scroll-x="true">
+		<!-- <scroll-view class="coupon-box clamp" :scroll-x="true">
 			<view v-for="(item, index) in couponArray" :key="item.id" class="coupon-list">
 				<view class="row flex">
 					<view class="list-money flex">
@@ -80,7 +80,7 @@
 					</view>
 				</view>
 			</view>
-		</scroll-view>
+		</scroll-view> -->
 
 		<!-- 秒杀楼层 -->
 		<seckill></seckill>
@@ -180,7 +180,7 @@
 					<view class="guess-section">
 						<view v-for="(item, index) in bastBanner" :key="index" class="guess-item" @click="navToDetailPage(item)">
 							<navigator :url="item.link">
-								<view class="image-wrapper"><image :src="item.image" mode="scaleToFill"></image></view>
+								<view class="image-wrappe r"><image :src="item.image" mode="scaleToFill"></image></view>
 								<text class="title clamp margin-c-20">{{ item.store_name }}</text>
 								<view class="cmy-hr"></view>
 								<view class="price margin-c-20 flex">
@@ -335,6 +335,7 @@ import { setCoupons } from '@/api/functionalUnit.js';
 import { getBargainList } from '@/api/product.js';
 import { interceptor } from '@/utils/loginUtils';
 import { mapState } from 'vuex';
+
 export default {
 	components: {
 		seckill

pages/order/createOrder.vue

@@ -283,6 +283,7 @@ export default {
 				addressId: this.addressData.id //地址编号
 			})
 				.then(({ data }) => {
+					console.log(data,'111');
 					this.payType = true;
 					this.integralShow = true;
 					// 获取支付金额
@@ -518,7 +519,6 @@ page {
 			padding-left: 24rpx;
 			overflow: hidden;
 		}
-
 		.title {
 			font-size: 30rpx;
 			color: $font-color-dark;

pages/product/seckill.vue

@@ -143,7 +143,7 @@ export default {
 			// 获取数据对象
 			let date = this.indexList[ind];
 			console.log(date, source);
-			if (source === 'tabChange' && date.loaded === true) {
+			if (source === 'tabChange' && date.loaded === true) {              
 				//tab切换只有第一次需要加载数据
 				return;
 			}

pages/user/award.vue

@@ -3,32 +3,32 @@
 		<view class="content-money">
 			<view class="money-box">
 				<view class="text">可提现佣金（元）</view>
-				<view class="money">{{ money | getMoneyStyle }}</view>
+				<view class="money">{{ money | getMoneyStyle }}</view>		
 			</view>
 			<view class="moneyTx" @click="navto('./withdrawal')">提现</view>
 			<view class="flex buttom-box">
 				<view class="buttom" @click="navto('/pages/money/recharge')">
-					<view class="icon"><image class="icon-img" src="/static/icon/i6.png" mode="aspectFit"></image></view>
+					<view class="icon"><image src="/static/icon/i6.png" mode="aspectFill" class="icon-img"></image></view>
 					<text>统计</text>
 				</view>
 				<view class="interval"></view>
 				<view class="buttom" @click="navto('./withdrawal')">
-					<view class="icon"><image class="icon-img" src="/static/icon/i7.png" mode="aspectFit"></image></view>
+					<view class="icon"><image src="/static/icon/i7.png" mode="aspectFill" class="icon-img"></image></view>
 					<text>提现</text>
 				</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 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+'px'}" class="swiper-box" duration="300" @change="changeTab">
 			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
-				<scroll-view class="list-scroll-content" scroll-y @scrolltolower="loadData">
+				<scroll-view scroll-y="true" class="list-scroll-content" @scrolltolower="loadData">
 					<!-- 空白页 -->
 					<empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty>
-
+					
 					<!-- 订单列表 -->
-					<view v-for="(item, index) in tabItem.orderList" :key="index" class="order-item flex">
+					<view class="order-item flex" v-for="(item, index) in tabItem.orderList" :key="index">
 						<view class="title-box">
 							<view class="title">
 								<text>{{ item.title }}</text>
@@ -63,19 +63,18 @@ export default {
 		uniLoadMore
 	},
 	onReady() {
-		// 初始化获取页面宽度
-		uni.createSelectorQuery()
-			.select('.content')
+		//初始化获取页面宽度
+		uni.createSelectorQuery().select('.content')
 			.fields(
-				{
-					size: true
-				},
-				data => {
-					console.log(data);
-					console.log(Math.floor((data.width / 750) * 300));
-					// 保存头部高度
-					this.maxheight =data.height - Math.floor((data.width / 750) * 570);
-					console.log(this.maxheight);
+			{
+				size:true
+			},
+			data => {
+				console.log(data);
+				console.log(Math.floor((data.width /750) * 300));
+				//保存头部高度
+				this.maxheight =data.height - Math.floor((data.width / 750) * 570);
+				console.log(this.maxheight);
 				}
 			)
 			.exec();
@@ -91,7 +90,7 @@ export default {
 					text: '收入',
 					loadingType: 'more',
 					orderList: [],
-					page: 1, //当前页数
+					page: 1, //当前页面
 					limit: 10 //每次信息条数
 				},
 				{
@@ -99,9 +98,9 @@ export default {
 					text: '支出',
 					loadingType: 'more',
 					orderList: [],
-					page: 1, //当前页数
+					page: 1, //当前页面
 					limit: 10 //每次信息条数
-				}
+				},
 			],
 			money: ''
 		};
@@ -109,21 +108,19 @@ export default {
 	onLoad(options) {},
 	onShow() {
 		this.loadData();
-		// 获取用户余额
+		//获取用户余额
 		userBalance({}).then(({ data }) => {
 			this.money = data.commissionCount;
 		});
 	},
 	methods: {
-		// 页面跳转
 		navto(e) {
 			uni.navigateTo({
 				url: e
 			});
 		},
-		//获取收入支出信息
 		async loadData(source) {
-			//这里是将订单挂载到tab列表下
+			//这里时将订单挂载到tab列表下
 			let index = this.tabCurrentIndex;
 			let navItem = this.navList[index];
 			let state = navItem.state+3;
@@ -135,9 +132,9 @@ export default {
 				//防止重复加载
 				return;
 			}
-			// 修改当前对象状态为加载中
+			//修改当前对象状态为加载中
 			navItem.loadingType = 'loading';
-
+			
 			spreadCommission(
 				{
 					page: navItem.page,
@@ -146,17 +143,16 @@ export default {
 				state
 			)
 				.then(({ data }) => {
-					if (data.length > 0) {
+					if(data.length > 0) {
 						navItem.orderList = navItem.orderList.concat(data[0].list);
 						console.log(navItem.orderList);
 						navItem.page++;
 					}
+					//判断是否还有数据, 有改为more, 没有改为noMore
 					if (navItem.limit == data.length) {
-						//判断是否还有数据， 有改为 more， 没有改为noMore
 						navItem.loadingType = 'more';
 						return;
 					} else {
-						//判断是否还有数据， 有改为 more， 没有改为noMore
 						navItem.loadingType = 'noMore';
 					}
 					uni.hideLoading();
@@ -166,7 +162,6 @@ export default {
 					console.log(e);
 				});
 		},
-
 		//swiper 切换
 		changeTab(e) {
 			this.tabCurrentIndex = e.target.current;
@@ -177,7 +172,7 @@ export default {
 			this.tabCurrentIndex = index;
 		}
 	}
-};
+}
 </script>
 
 <style lang="scss">
@@ -193,7 +188,7 @@ page {
 		top: 150rpx;
 		right: 0rpx;
 		width: 150rpx;
-		padding:10rpx 30rpx;
+		padding: 10rpx 30rpx;
 		border: 2px solid #FFFFFF;
 		border-top-left-radius: 99rpx;
 		border-bottom-left-radius: 99rpx;
@@ -275,7 +270,7 @@ page {
 		}
 	}
 }
-// 列表
+//列表
 
 .swiper-box {
 	padding-top: 10rpx;

pages/user/coupon.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="content">
 		<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 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" class="swiper-box" duration="300" @change="changeTab">
 			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
@@ -11,7 +11,7 @@
 					<view class="list-money flex">
 						<image :src="item._type == 2 ? '/static/img/img03.png' : '/static/img/img02.png'" mode="scaleToFill"></image>
 						<view class="list-money-text">
-							<view class="tit" :class="{ action: item._type == 2 }">
+							<view class="tit" :class="{ action: item._type} == 2">
 								<text>{{ item.coupon_price }}</text>
 							</view>
 							<view class="price">
@@ -25,11 +25,10 @@
 					</view>
 					<view class="row_list_right">
 						<view class="right_top">
-							<!-- <text class="right_name">【满减券】</text> -->
-							<text class="right_title" :class="{ action: item._type == 2 }">{{ item.coupon_title }}</text>
+							<text class="right_title" :class="{ action: item._type == 2}">{{ item.coupon_title }}</text>
 						</view>
 						<view class="right_time">
-							<text>{{ item._add_time }}-{{ item._end_time }}</text>
+							<text>{{ item._add_time }}-{{ item.end_time }}</text>
 						</view>
 						<view class="right_use action" v-if="item._type == 2">
 							<text>{{ item._msg }}</text>
@@ -49,7 +48,7 @@
 import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
 import empty from '@/components/empty';
 import { getCouponsList } from '@/api/order.js';
-export default {
+export default{
 	components: {
 		uniLoadMore,
 		empty
@@ -57,13 +56,13 @@ export default {
 	data() {
 		return {
 			tabCurrentIndex: 0,
-			navList: [
+			navList:[
 				{
 					state: 0,
 					text: '全部',
 					loadingType: 'more',
 					orderList: [],
-					page: 1, //当前页数
+					page: 1,//当前页数
 					limit: 10 //每次信息条数
 				},
 				{
@@ -79,7 +78,7 @@ export default {
 					text: '已使用',
 					loadingType: 'more',
 					orderList: [],
-					page: 1, //当前页数
+					page: 1,//当前页数
 					limit: 10 //每次信息条数
 				}
 			]
@@ -89,15 +88,15 @@ export default {
 		this.loadData();
 	},
 	methods: {
-		// 返回首页
-		navTo() {
+		//返回首页
+		navTo(){
 			uni.switchTab({
 				url: '/pages/index/index'
 			});
 		},
 		//获取订单列表
 		loadData(source) {
-			//这里是将订单挂载到tab列表下
+			//将订单挂载到tab列表下
 			let index = this.tabCurrentIndex;
 			let navItem = this.navList[index];
 			let state = navItem.state;
@@ -105,11 +104,11 @@ export default {
 				//tab切换只有第一次需要加载数据
 				return;
 			}
-			if (navItem.loadingType === 'loading') {
+			if (navItem.loadingType === 'loading'){
 				//防止重复加载
 				return;
 			}
-			// 修改当前对象状态为加载中
+			//修改当前对象状态为加载中
 			navItem.loadingType = 'loading';
 			getCouponsList(
 				{
@@ -122,17 +121,16 @@ export default {
 					let da = data.map(e => {
 						e.coupon_price = +e.coupon_price.replace(',', '');
 						e.use_min_price = +e.use_min_price.replace(',', '');
-						return e;
+						return e
 					});
 					navItem.orderList = navItem.orderList.concat(da);
 					console.log(navItem.orderList);
 					navItem.page++;
 					if (navItem.limit == data.length) {
-						//判断是否还有数据， 有改为 more， 没有改为noMore
+						// 判断是否还有数据，有改为more，没有改为noMore
 						navItem.loadingType = 'more';
 						return;
-					} else {
-						//判断是否还有数据， 有改为 more， 没有改为noMore
+					}else {
 						navItem.loadingType = 'noMore';
 					}
 					uni.hideLoading();
@@ -140,9 +138,8 @@ export default {
 				})
 				.catch(e => {
 					console.log(e);
-				});
+				})
 		},
-
 		//swiper 切换
 		changeTab(e) {
 			this.tabCurrentIndex = e.target.current;
@@ -159,6 +156,44 @@ export default {
 <style lang="scss">
 // 卡卷可用时颜色
 $card-color-action: #fc4141;
+page,
+.content {
+	background: $page-color-base;
+	height: 100%;
+}
+
+.navbar {
+	display: flex;
+	height: 40px;
+	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: $font-color-dark;
+		position: relative;
+		&.current {
+			color: #bc253a;
+			&:after {
+				content: '';
+				position: absolute;
+				left: 50%;
+				bottom: 0;
+				transform: translateX(-50%);
+				width: 44px;
+				height: 0;
+				border-bottom: 2px solid #bc253a;
+			}
+		}
+	}
+}
 
 .swiper-box {
 	height: calc(100% - 40px);
@@ -168,6 +203,7 @@ $card-color-action: #fc4141;
 		color: #1b1b1b;
 	}
 }
+
 .row {
 	border-radius: 15rpx;
 	margin: 0 25rpx;
@@ -230,7 +266,7 @@ $card-color-action: #fc4141;
 			margin: 15rpx 0;
 			padding: 10rpx;
 			width: 140rpx;
-			text-align: center;
+			text_align: center;
 			border-radius: 50rpx;
 			color: #fff;
 			font-size: $font-sm - 4rpx;
@@ -257,51 +293,13 @@ $card-color-action: #fc4141;
 			}
 		}
 	}
-
+	
 	.iconlocation {
 		font-size: 36rpx;
 		color: $font-color-light;
 	}
 }
-page,
-.content {
-	background: $page-color-base;
-	height: 100%;
-}
-
-.navbar {
-	display: flex;
-	height: 40px;
-	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: $font-color-dark;
-		position: relative;
-		&.current {
-			color: #bc253a;
-			&:after {
-				content: '';
-				position: absolute;
-				left: 50%;
-				bottom: 0;
-				transform: translateX(-50%);
-				width: 44px;
-				height: 0;
-				border-bottom: 2px solid #bc253a;
-			}
-		}
-	}
-}
-/* load-more */
+// uni-load-more
 .uni-load-more {
 	display: flex;
 	flex-direction: row;

pages/user/favorites.vue

@@ -10,7 +10,7 @@
 					<view>
 						<text>￥{{ ls.price }}</text>
 					</view>
-					<view @click.prevent.stop="del(ls.pid)" v-show="delshow" class="icon_del">
+					<view class="icon_del" @click.prevent.stop="del(ls.pid)" v-show="delshow">
 						<text class="iconfont icondelete"></text>
 						<text>取消</text>
 					</view>
@@ -55,6 +55,13 @@ export default {
 					console.log(e);
 				});
 		},
+		//跳转商品详情页
+		toproduct(item) {
+			let id = item;
+			uni.navigateTo({
+				url: `/pages/product/product?id=${id}`
+			})
+		},
 		//删除收藏夹商品
 		del(item) {
 			let obj = this;
@@ -81,25 +88,8 @@ export default {
 				}
 			});
 		},
-		//跳转商品详情页
-		toproduct(item) {
-			let id = item;
-			uni.navigateTo({
-				url: `/pages/product/product?id=${id}`
-			});
-		}
-		// //跳转忘记密码
-		// forget() {
-		// 	uni.navigateTo({
-		// 		url: `/pages/public/forget`
-		// 	});
-		// },
-		// // 后退
-		// navBack() {
-		// 	uni.navigateBack();
-		// }
 	}
-};
+}
 </script>
 
 <style lang="scss">
@@ -128,7 +118,6 @@ page {
 .favorites {
 	width: 90%;
 	background-color: #ffffff;
-	// height:100%;
 	border-radius: 15rpx;
 	margin: 15rpx auto;
 	padding: 25rpx 25rpx;
@@ -156,7 +145,7 @@ page {
 	overflow: hidden;
 	text-overflow: ellipsis;
 	display: -webkit-box;
-	-webkit-box-orient: vertical;
+	-webkit-box-orient: vertial;
 	-webkit-line-clamp: 2;
 }
 .favorites_peice {

store/index.js

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