From 8c8522c68e9cfe9a54f51a0266f2a2ad3d2ded6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A6=E4=B9=A0=E5=BE=88=E5=B7=AE=E5=95=A6?=
 <17633066053@163.com>
Date: Wed, 14 Sep 2022 10:43:40 +0800
Subject: [PATCH] temp commit

---
 components/m-goods-list/common.vue  |  79 ++++
 components/m-goods-list/list.vue    | 241 ++++++------
 components/m-goods-list/seckill.vue | 190 ++++++++++
 config/api.js                       |   8 +-
 manifest.json                       |   4 +-
 pages/promotion/bargain/list.vue    |   6 +-
 pages/promotion/seckill.vue         | 567 +++++++++++-----------------
 plugins/APPUpdate/index.js          |   3 +-
 static/buy.png                      | Bin 0 -> 2273 bytes
 uview-ui/libs/css/common.scss       | 102 ++---
 10 files changed, 677 insertions(+), 523 deletions(-)
 create mode 100644 components/m-goods-list/common.vue
 create mode 100644 components/m-goods-list/seckill.vue
 create mode 100644 static/buy.png

diff --git a/components/m-goods-list/common.vue b/components/m-goods-list/common.vue
new file mode 100644
index 0000000..c4975f8
--- /dev/null
+++ b/components/m-goods-list/common.vue
@@ -0,0 +1,79 @@
+<template>
+</template>
+
+<script>
+	export default {
+		methods: {
+			// 高亮显示搜索内容	
+			lightSearchStr(keyword, str) {
+				if (!keyword) {
+					return str
+				} else {
+					let unicodes = '';
+					for (let i of Array.from(keyword)) {
+						unicodes += this.unicode(i) + "|"
+					}
+					const rule = '(' + unicodes + ')'
+					const reg = new RegExp(rule, 'gi');
+					return str ? str.replace(reg, matchValue =>
+						`<span style="color:${this.lightColor}">${matchValue}</span>`
+					) : ''
+				}
+			},
+			//  转换为unicode
+			unicode(str) {
+				var value = '';
+				for (var i = 0; i < str.length; i++) {
+					value += '\\u' + this.left_zero_4(parseInt(str.charCodeAt(i)).toString(16));
+				}
+				return value;
+			},
+			left_zero_4(str) {
+				if (str != null && str != '' && str != 'undefined') {
+					if (str.length == 2) {
+						return '00' + str;
+					}
+				}
+				return str;
+			},
+
+
+			// 格式化金钱  1999 --> [1999,00]
+			formatPrice(val) {
+				if (typeof val == "undefined") {
+					return val;
+				}
+				return val.toFixed(2).split(".");
+			},
+
+			// 数据去重一下 只显示一次 减免 劵 什么的
+			getPromotion(item) {
+				if (item.promotionMap) {
+					let array = [];
+					Object.keys(item.promotionMap).forEach((child) => {
+						if (!array.includes(child.split("-")[0])) {
+							array.push(child.split("-")[0]);
+						}
+					});
+					return array;
+				}
+			},
+			// 跳转到商品详情
+			navigateToDetailPage(item) {
+				uni.navigateTo({
+					url: `/pages/product/goods?id=${item.content.id}&goodsId=${item.content.goodsId}`,
+				});
+			},
+			// 跳转地址
+			navigateToStoreDetailPage(item) {
+				uni.navigateTo({
+					url: `/pages/product/shopPage?id=${item.content.storeId}`,
+				});
+			},
+		},
+	}
+</script>
+
+<style lang='scss' scoped>
+	
+</style>
diff --git a/components/m-goods-list/list.vue b/components/m-goods-list/list.vue
index dfc6e89..2d9a4b2 100644
--- a/components/m-goods-list/list.vue
+++ b/components/m-goods-list/list.vue
@@ -101,12 +101,15 @@
 </template>
 
 <script>
+	import commonTpl from '@/components/m-goods-list/common'
 	export default {
 		data() {
 			return {
 				lightColor: this.$mainColor
 			}
 		},
+		mixins: [commonTpl],
+		
 		props: {
 			// 遍历的数据
 			res: {
@@ -198,13 +201,13 @@
 			},
 			// 跳转到商品详情
 			navigateToDetailPage(item) {
-				this.$navigateTo({
+				uni.navigateTo({
 					url: `/pages/product/goods?id=${item.content.id}&goodsId=${item.content.goodsId}`,
 				});
 			},
 			// 跳转地址
 			navigateToStoreDetailPage(item) {
-				this.$navigateTo({
+				uni.navigateTo({
 					url: `/pages/product/shopPage?id=${item.content.storeId}`,
 				});
 			},
@@ -213,132 +216,132 @@
 </script>
 
 <style lang='scss' scoped>
-	/* 商品列表 */
-	.goods-list {
-		display: flex;
-		flex-wrap: wrap;
-		margin: 10rpx 20rpx 284rpx;
-		width: 100%;
-
-		>.goods-item {
-			background-color: #ffffff;
+/* 商品列表 */
+		.goods-list {
 			display: flex;
-			border-radius: 16rpx;
-			flex-direction: column;
-			width: calc(50% - 30rpx);
-			margin-bottom: 20rpx;
-			padding-bottom: 20rpx;
-
-			&:nth-child(2n + 1) {
-				margin-right: 20rpx;
+			flex-wrap: wrap;
+			margin: 10rpx 20rpx 284rpx;
+			width: 100%;
+	
+			>.goods-item {
+				background-color: #ffffff;
+				display: flex;
+				border-radius: 16rpx;
+				flex-direction: column;
+				width: calc(50% - 30rpx);
+				margin-bottom: 20rpx;
+				padding-bottom: 20rpx;
+	
+				&:nth-child(2n + 1) {
+					margin-right: 20rpx;
+				}
+	
+	
+				.image-wrapper {
+					width: 100%;
+					height: 330rpx;
+					border-radius: 16rpx 16rpx 0 0;
+					overflow: hidden;
+					padding: 0;
+				}
 			}
-
-
-			.image-wrapper {
-				width: 100%;
-				height: 330rpx;
-				border-radius: 16rpx 16rpx 0 0;
+	
+			.count-config,
+			.store-seller-name {
+				font-size: $font-sm;
+			}
+	
+			.text-hidden {
 				overflow: hidden;
-				padding: 0;
+				text-overflow: ellipsis;
+				white-space: nowrap;
 			}
 		}
-
-		.count-config,
-		.store-seller-name {
-			font-size: $font-sm;
-		}
-
-		.text-hidden {
-			overflow: hidden;
-			text-overflow: ellipsis;
-			white-space: nowrap;
-		}
-	}
-
-
-	.goods-row {
-		background: #fff;
-		padding: 16rpx;
-
-		>.goods-col {
-			display: flex;
-
-			>.goods-img {
-				overflow: hidden;
-				flex: 4;
-			}
-
-			>.goods-detail {
-				flex: 7;
-			}
-		}
-	}
-
-	.goods-detail {
-		margin: 0 20rpx;
-
-		>.title {
-			font-size: $font-base;
-			color: $font-color-dark;
-			line-height: 1.5;
-			height: 84rpx;
-			padding: 10rpx 0 0;
-			display: -webkit-box;
-			-webkit-box-orient: vertical;
-			-webkit-line-clamp: 2;
-			overflow: hidden;
-		}
-
-		.promotion {
-			margin-top: 4rpx;
-			display: flex;
-
-			div {
-				span {
-					font-size: 24rpx;
-					color: $light-color;
-					margin-right: 10rpx;
-					padding: 0 4rpx;
-					border-radius: 2rpx;
+	
+	
+		.goods-row {
+			background: #fff;
+			padding: 16rpx;
+	
+			>.goods-col {
+				display: flex;
+	
+				>.goods-img {
+					overflow: hidden;
+					flex: 4;
+				}
+	
+				>.goods-detail {
+					flex: 7;
 				}
 			}
 		}
-
-		.store-seller-name {
-			color: #666;
-			overflow: hidden;
-			display: flex;
-			justify-content: space-between;
-		}
-
-		.count-config {
-			padding: 5rpx 0;
-			color: #666;
-			display: flex;
-			font-size: 24rpx;
-			justify-content: space-between;
-		}
-
-		>.price-box {
-			margin-top: 10rpx;
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
-			padding-right: 10rpx;
-			font-size: 24rpx;
-			color: $font-color-light;
-
-			>.price {
-				font-size: 26rpx;
-				line-height: 1;
-				color: $main-color;
-				font-weight: bold;
-
-				/deep/ span:nth-of-type(1) {
-					font-size: 38rpx;
+	
+		.goods-detail {
+			margin: 0 20rpx;
+	
+			>.title {
+				font-size: $font-base;
+				color: $font-color-dark;
+				line-height: 1.5;
+				height: 84rpx;
+				padding: 10rpx 0 0;
+				display: -webkit-box;
+				-webkit-box-orient: vertical;
+				-webkit-line-clamp: 2;
+				overflow: hidden;
+			}
+	
+			.promotion {
+				margin-top: 4rpx;
+				display: flex;
+	
+				div {
+					span {
+						font-size: 24rpx;
+						color: $light-color;
+						margin-right: 10rpx;
+						padding: 0 4rpx;
+						border-radius: 2rpx;
+					}
 				}
 			}
+	
+			.store-seller-name {
+				color: #666;
+				overflow: hidden;
+				display: flex;
+				justify-content: space-between;
+			}
+	
+			.count-config {
+				padding: 5rpx 0;
+				color: #666;
+				display: flex;
+				font-size: 24rpx;
+				justify-content: space-between;
+			}
+	
+			>.price-box {
+				margin-top: 10rpx;
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				padding-right: 10rpx;
+				font-size: 24rpx;
+				color: $font-color-light;
+	
+				>.price {
+					font-size: 26rpx;
+					line-height: 1;
+					color: $main-color;
+					font-weight: bold;
+	
+					/deep/ span:nth-of-type(1) {
+						font-size: 38rpx;
+					}
+				}
+			}
+	
 		}
-
-	}
 </style>
diff --git a/components/m-goods-list/seckill.vue b/components/m-goods-list/seckill.vue
new file mode 100644
index 0000000..4e7b834
--- /dev/null
+++ b/components/m-goods-list/seckill.vue
@@ -0,0 +1,190 @@
+<template>
+	<div>
+		<div v-for="(item, index) in res" :key="index" class="goods-row">
+			<div class="flex goods-col">
+				<div class="goods-img" @click="navigateToDetailPage(item)">
+					<u-image width="230rpx" border-radius='16' height="230rpx" :src="item.goodsImage">
+						<u-loading slot="loading"></u-loading>
+					</u-image>
+				</div>
+				<div class="goods-detail">
+					<div class="title clamp3" @click="navigateToDetailPage(item)">{{ item.goodsName }}</div>
+					<view class="price-box" @click="navigateToDetailPage(item)">
+						<div class="price" v-if="item.price!=undefined">
+							¥<span>{{ formatPrice(item.price )[0] }} </span>.{{
+			            formatPrice(item.price )[1]
+			          }}
+						</div>
+					</view>
+					<div class="promotion" @click="navigateToDetailPage(item)">
+						<div v-if="item.salesModel == 'WHOLESALE'">
+							<span>批</span>
+						</div>
+						<div v-for="(promotionItem,promotionIndex) in  getPromotion(item)" :key="promotionIndex">
+							<span v-if="promotionItem.indexOf('COUPON') != -1">劵</span>
+							<span v-if="promotionItem.indexOf('FULL_DISCOUNT') != -1">满减</span>
+							<span v-if="promotionItem.indexOf('SECKILL') != -1">秒杀</span>
+						</div>
+					</div>
+					<div style="overflow: hidden" @click="navigateToDetailPage(item)" class="count-config">
+						<span style="float: left; font-size: 22rpx">已售 {{ item.buyCount || '0' }}</span>
+						<span style="float: right; font-size: 22rpx">{{ item.commentNum || '0' }}条评论</span>
+					</div>
+					
+				</div>
+			</div>
+
+		</div>
+	</div>
+</template>
+
+<script>
+	import commonTpl from '@/components/m-goods-list/common'
+	export default {
+		data() {
+			return {
+				lightColor: this.$mainColor
+			}
+		},
+		mixins: [commonTpl],
+		props: {
+			// 遍历的数据
+			res: {
+				type: Array,
+				default: () => {
+					return []
+				}
+			},
+		}
+	}
+</script>
+
+<style lang='scss' scoped>
+.goods-list {
+			display: flex;
+			flex-wrap: wrap;
+			margin: 10rpx 20rpx 284rpx;
+			width: 100%;
+	
+			>.goods-item {
+				background-color: #ffffff;
+				display: flex;
+				border-radius: 16rpx;
+				flex-direction: column;
+				width: calc(50% - 30rpx);
+				margin-bottom: 20rpx;
+				padding-bottom: 20rpx;
+	
+				&:nth-child(2n + 1) {
+					margin-right: 20rpx;
+				}
+	
+	
+				.image-wrapper {
+					width: 100%;
+					height: 330rpx;
+					border-radius: 16rpx 16rpx 0 0;
+					overflow: hidden;
+					padding: 0;
+				}
+			}
+	
+			.count-config,
+			.store-seller-name {
+				font-size: $font-sm;
+			}
+	
+			.text-hidden {
+				overflow: hidden;
+				text-overflow: ellipsis;
+				white-space: nowrap;
+			}
+		}
+	
+	
+		.goods-row {
+			background: #fff;
+			padding: 16rpx;
+	
+			>.goods-col {
+				display: flex;
+	
+				>.goods-img {
+					overflow: hidden;
+					flex: 4;
+				}
+	
+				>.goods-detail {
+					flex: 7;
+				}
+			}
+		}
+	
+		.goods-detail {
+			margin: 0 20rpx;
+	
+			>.title {
+				font-size: $font-base;
+				color: $font-color-dark;
+				line-height: 1.5;
+				height: 84rpx;
+				padding: 10rpx 0 0;
+				display: -webkit-box;
+				-webkit-box-orient: vertical;
+				-webkit-line-clamp: 2;
+				overflow: hidden;
+			}
+	
+			.promotion {
+				margin-top: 4rpx;
+				display: flex;
+	
+				div {
+					span {
+						font-size: 24rpx;
+						color: $light-color;
+						margin-right: 10rpx;
+						padding: 0 4rpx;
+						border-radius: 2rpx;
+					}
+				}
+			}
+	
+			.store-seller-name {
+				color: #666;
+				overflow: hidden;
+				display: flex;
+				justify-content: space-between;
+			}
+	
+			.count-config {
+				padding: 5rpx 0;
+				color: #666;
+				display: flex;
+				font-size: 24rpx;
+				justify-content: space-between;
+			}
+	
+			>.price-box {
+				margin-top: 10rpx;
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				padding-right: 10rpx;
+				font-size: 24rpx;
+				color: $font-color-light;
+	
+				>.price {
+					font-size: 26rpx;
+					line-height: 1;
+					color: $main-color;
+					font-weight: bold;
+	
+					/deep/ span:nth-of-type(1) {
+						font-size: 38rpx;
+					}
+				}
+			}
+	
+		}
+</style>
diff --git a/config/api.js b/config/api.js
index 4e4741c..e8461b2 100644
--- a/config/api.js
+++ b/config/api.js
@@ -4,8 +4,12 @@
  */
 // 开发环境
 const dev = {
-  common: "https://common-api.pickmall.cn",
-  buyer: "https://buyer-api.pickmall.cn",
+  // common: "https://common-api.pickmall.cn",
+  // buyer: "https://buyer-api.pickmall.cn",
+
+  common: "http://192.168.0.106:8890",
+	  buyer: "http://192.168.0.106:8888",
+
 
 
 };
diff --git a/manifest.json b/manifest.json
index 9267136..4cc39c1 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "lili商城",
     "appid" : "__UNI__EC9FD60",
     "description" : "",
-    "versionName" : "4.2.6",
-    "versionCode" : 4000260,
+    "versionName" : "4.2.5",
+    "versionCode" : 4000250,
     "transformPx" : false,
     "app-plus" : {
         "compatible" : {
diff --git a/pages/promotion/bargain/list.vue b/pages/promotion/bargain/list.vue
index 162d771..b80f856 100644
--- a/pages/promotion/bargain/list.vue
+++ b/pages/promotion/bargain/list.vue
@@ -88,10 +88,10 @@ page {
 </style>
 <style lang="scss" scoped>
 .wrapper {
-  background: url("https://lilishop-oss.oss-cn-beijing.aliyuncs.com/aac88f4e8eff452a8010af42c4560b04.png");
+  background: url("https://lili-system.oss-cn-beijing.aliyuncs.com/kanjia.png");
   background-repeat: no-repeat;
   background-size: 100% 100%;
-  height: 700rpx;
+  height: 600rpx;
   width: 100%;
 }
 
@@ -99,7 +99,7 @@ page {
   background: #fff;
   border-radius: 20rpx;
   position: relative;
-  top: 750rpx;
+  top: 650rpx;
   width: 94%;
   margin: 0 auto;
   > .bargain {
diff --git a/pages/promotion/seckill.vue b/pages/promotion/seckill.vue
index 075d9ff..2f5a527 100644
--- a/pages/promotion/seckill.vue
+++ b/pages/promotion/seckill.vue
@@ -1,145 +1,130 @@
 <template>
-  <view class="sale">
-    <view class="sale-head">
-      <image src="@/pages/promotion/static/head-sample.png"></image>
-    </view>
-    <scroll-view scroll-x>
-      <view class="index-navs">
-        <view class="index-nav-v">
-          <view class="index-nav" :class="{ 'index-nav-active': nav == index }" @click="clickNavigateTime(index)"
-            v-for="(item, index) in timeLine" :key="index">
-            {{ item.timeLine }}:00
-            <view class="index-nav-desc">{{ index === 0 && item.distanceStartTime === 0 ? '抢购中' : '即将开始' }}
-            </view>
-          </view>
-        </view>
-      </view>
-      <view class="trailer" v-if="timeLine[nav] && times">
-        {{ timeLine[nav].distanceStartTime === 0 ? (onlyOne ? '距结束' : '距下一轮') : '距开始' }}
-        {{ times.hours == '00' ? '0' : times.hours }}小时{{ times.minutes }}分{{ times.seconds }}秒
-      </view>
-    </scroll-view>
-    <view class="sale-items" v-if="goodsList.length > 0">
-      <view class="sale-item" v-for="(item,index) in goodsList" :key="index">
-        <view class="sale-item-img">
-          <image :src="item.goodsImage" mode="aspectFill"></image>
-        </view>
-        <view class="sale-item-content">
-          <view class="sale-item-title">
-            {{ item.goodsName }}
-            <view class="sale-item-title-desc"></view>
-          </view>
-          <view class="sale-item-price">
-            <text class="sale-item-price-now">¥{{ item.price | unitPrice}}</text>
-            <text class="sale-item-price-origin"> ¥{{ item.originalPrice | unitPrice }}</text>
-          </view>
-          <view class="sale-item-surplus">
-            仅剩{{ item.quantity - item.salesNum }}件
-            <view class="sale-item-surplus-text"
-              :style="{ width: (item.quantity / (item.quantity - item.salesNum)) * 100 + '%' }">
-            </view>
-          </view>
-          <view class="sale-item-btn" @click="navigateToGoodsDetail(item)">
-            {{ timeLine[nav].distanceStartTime === 0 ? (item.salesNum === item.quantity ? '已售空' : '购买') : '即将开始' }}
-          </view>
-        </view>
-      </view>
-    </view>
-    <view v-else>
-      <view class="nodata">
-        <image style="height: 240rpx;width: 320rpx;" src="/static/nodata.png" alt="" />
-        <div>暂无商品</div>
-      </view>
-    </view>
+	<view class="sale">
+		<view class="sale-head">
+			<image src="@/pages/promotion/static/head-sample.png"></image>
+		</view>
+		<scroll-view scroll-x>
+			<view class="index-navs">
+				<view class="index-nav-v">
+					<view class="index-nav" :class="{ 'index-nav-active': nav == index }"
+						@click="clickNavigateTime(index)" v-for="(item, index) in timeLine" :key="index">
+						{{ item.timeLine }}:00
+						<view class="index-nav-desc">{{ index === 0 && item.distanceStartTime === 0 ? '抢购中' : '即将开始' }}
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="trailer" v-if="timeLine[nav] && times">
+				{{ timeLine[nav].distanceStartTime === 0 ? (onlyOne ? '距结束' : '距下一轮') : '距开始' }}
+				{{ times.hours == '00' ? '0' : times.hours }}小时{{ times.minutes }}分{{ times.seconds }}秒
+			</view>
+		</scroll-view>
+		<view class="sale-items" v-if="goodsList.length > 0">
+			<goodsTemplate :res="goodsList" />
 
-  </view>
+		</view>
+		<view v-else>
+			<view class="nodata">
+				<image style="height: 240rpx;width: 320rpx;" src="/static/nodata.png" alt="" />
+				<div>暂无商品</div>
+			</view>
+		</view>
+
+	</view>
 </template>
 
 <script>
-import { getSeckillTimeLine, getSeckillTimeGoods } from "@/api/promotions.js";
-import Foundation from "@/utils/Foundation.js";
-export default {
-  data() {
-    return {
-      nav: 0, //默认选择第一个时间
-      timeLine: "", //获取几个点活动
-      resTime: 0, //当前时间
-      time: 0, //距离下一个活动的时间值
-      times: {}, //时间集合
-      onlyOne: "", //是否最后一个商品
-      goodsList: [], //商品集合
-      params: {
-        pageNumber: 1,
-        pageSize: 10,
-      },
-    };
-  },
+	import {
+		getSeckillTimeLine,
+		getSeckillTimeGoods
+	} from "@/api/promotions.js";
+	import Foundation from "@/utils/Foundation.js";
+	import goodsTemplate from '@/components/m-goods-list/seckill.vue'
+	export default {
+		components: {
+			goodsTemplate
+		},
+		data() {
+			return {
+				nav: 0, //默认选择第一个时间
+				timeLine: "", //获取几个点活动
+				resTime: 0, //当前时间
+				time: 0, //距离下一个活动的时间值
+				times: {}, //时间集合
+				onlyOne: "", //是否最后一个商品
+				goodsList: [], //商品集合
+				params: {
+					pageNumber: 1,
+					pageSize: 10,
+				},
+			};
+		},
 
-  /**
-   * 显示时间活动
-   */
-  async onShow() {
-    await this.getTimeLine();
-    if (!this.timeLine) {
-      await uni.showToast({
-        icon: "none",
-        duration: 2000,
-        title: "今天没有活动，明天再来吧",
-      });
-    }
-    this._setTimeInterval = setInterval(() => {
-      if (this.time <= 0) {
-        clearInterval(this._setTimeInterval);
-        this.getGoodsList();
-        this.getTimeLine();
-      } else {
-        this.times = Foundation.countTimeDown(this.time);
-        this.time--;
-      }
-    }, 1000);
-  },
+		/**
+		 * 显示时间活动
+		 */
+		async onShow() {
+			await this.getTimeLine();
+			if (!this.timeLine) {
+				await uni.showToast({
+					icon: "none",
+					duration: 2000,
+					title: "今天没有活动，明天再来吧",
+				});
+			}
+			this._setTimeInterval = setInterval(() => {
+				if (this.time <= 0) {
+					clearInterval(this._setTimeInterval);
+					this.getGoodsList();
+					this.getTimeLine();
+				} else {
+					this.times = Foundation.countTimeDown(this.time);
+					this.time--;
+				}
+			}, 1000);
+		},
 
-  onUnload() {
-    this._setTimeInterval && clearInterval(this._setTimeInterval);
-  },
-  methods: {
-    /**
-     * 获取时间线商品
-     */
-    async getTimeLine() {
-      let res = await getSeckillTimeLine();
-      if (res.data.success && res.data.result.length > 0) {
-        let timeLine = res.data.result.sort(
-          (x, y) => Number(x.timeLine) - Number(y.timeLine)
-        );
-        this.timeLine = timeLine.slice(0, 5);
-        this.resTime = parseInt(new Date().getTime() / 1000);
-        this.onlyOne = res.data.result.length === 1;
-        this.diffTime = parseInt(new Date().getTime() / 1000) - this.resTime;
+		onUnload() {
+			this._setTimeInterval && clearInterval(this._setTimeInterval);
+		},
+		methods: {
+			/**
+			 * 获取时间线商品
+			 */
+			async getTimeLine() {
+				let res = await getSeckillTimeLine();
+				if (res.data.success && res.data.result.length > 0) {
+					let timeLine = res.data.result.sort(
+						(x, y) => Number(x.timeLine) - Number(y.timeLine)
+					);
+					this.timeLine = timeLine.slice(0, 5);
+					this.resTime = parseInt(new Date().getTime() / 1000);
+					this.onlyOne = res.data.result.length === 1;
+					this.diffTime = parseInt(new Date().getTime() / 1000) - this.resTime;
 
-        this.time =
-          this.timeLine[this.nav].distanceStartTime ||
-          (this.timeLine[this.nav + 1] &&
-            this.timeLine[this.nav + 1].distanceStartTime) ||
-          Foundation.theNextDayTime() - this.diffTime;
-        this.times = Foundation.countTimeDown(this.time);
+					this.time =
+						this.timeLine[this.nav].distanceStartTime ||
+						(this.timeLine[this.nav + 1] &&
+							this.timeLine[this.nav + 1].distanceStartTime) ||
+						Foundation.theNextDayTime() - this.diffTime;
+					this.times = Foundation.countTimeDown(this.time);
 
-        this.getGoodsList();
-      }
-    },
+					this.getGoodsList();
+				}
+			},
 
-    /**
-     * 获取商品集合
-     */
-    async getGoodsList() {
-      this.params.timeLine = this.timeLine[this.nav].timeLine;
-      let res = await getSeckillTimeGoods(this.params.timeLine);
-      if (res.data.success && res.data.result.length != 0) {
-        this.goodsList = res.data.result;
-      } else {
-        this.goodsList = [];
-      }
-    },
+			/**
+			 * 获取商品集合
+			 */
+			async getGoodsList() {
+				this.params.timeLine = this.timeLine[this.nav].timeLine;
+				let res = await getSeckillTimeGoods(this.params.timeLine);
+				if (res.data.success && res.data.result.length != 0) {
+					this.goodsList = res.data.result;
+				} else {
+					this.goodsList = [];
+				}
+			},
 
     /**
      * 跳转到商品详情
@@ -151,237 +136,129 @@ export default {
       ) {
         return;
       } else {
-        this.$navigateTo({
+        uni.navigateTo({
           url: `/pages/product/goods?id=${item.skuId}&goodsId=${item.goodsId}`,
         });
       }
     },
 
-    /**
-     * 单击导航时间
-     */
-    clickNavigateTime(type) {
-      this.nav = type;
-      this.goodsList = [];
-      this.diffTime = parseInt(new Date().getTime() / 1000) - this.resTime;
-      this.time =
-        this.timeLine[this.nav].distanceStartTime ||
-        (this.timeLine[this.nav + 1] &&
-          this.timeLine[this.nav + 1].distanceStartTime) ||
-        Foundation.theNextDayTime() - this.diffTime;
+			/**
+			 * 单击导航时间
+			 */
+			clickNavigateTime(type) {
+				this.nav = type;
+				this.goodsList = [];
+				this.diffTime = parseInt(new Date().getTime() / 1000) - this.resTime;
+				this.time =
+					this.timeLine[this.nav].distanceStartTime ||
+					(this.timeLine[this.nav + 1] &&
+						this.timeLine[this.nav + 1].distanceStartTime) ||
+					Foundation.theNextDayTime() - this.diffTime;
 
-      this.times = Foundation.countTimeDown(this.time);
-      this.getGoodsList();
-    },
-  },
-};
+				this.times = Foundation.countTimeDown(this.time);
+				this.getGoodsList();
+			},
+		},
+	};
 </script>
 
 <style lang="scss" scoped>
-.sale {
-  width: 100%;
-  min-height: 100vh;
-  background-color: #f7f7f7;
-}
+	.sale {
+		width: 100%;
+		min-height: 100vh;
+		background-color: #f7f7f7;
+	}
 
-.nodata {
-  flex-direction: column;
-  display: flex;
-  width: 100%;
-  justify-content: center;
-  align-items: center;
-  margin-top: 40rpx;
+	.nodata {
+		flex-direction: column;
+		display: flex;
+		width: 100%;
+		justify-content: center;
+		align-items: center;
+		margin-top: 40rpx;
 
-  > div {
-    font-size: 24rpx;
-    margin-top: 20rpx;
-    color: #666;
-  }
-}
+		>div {
+			font-size: 24rpx;
+			margin-top: 20rpx;
+			color: #666;
+		}
+	}
 
-.sale-head {
-  image {
-    width: 100%;
-    height: 280rpx;
-  }
-}
+	.sale-head {
+		image {
+			width: 100%;
+			height: 280rpx;
+		}
+	}
 
-.sale-items {
-  padding-top: 20rpx;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: flex;
-  align-items: center;
-  flex-direction: column;
-}
+	.sale-items {
+		padding-top: 20rpx;
+	}
 
-.sale-item {
-  width: 710rpx;
-  height: 226rpx;
-  padding-left: 20rpx;
-  margin-bottom: 10rpx;
-  border-radius: 12rpx;
-  background-color: #fff;
-  position: relative;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: flex;
-  align-items: center;
-}
+	.trailer {
+		height: 100rpx;
+		background: #ffffff;
+		display: -webkit-box;
+		display: -webkit-flex;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		font-size: 22rpx;
+		color: #666666;
+		box-sizing: border-box;
+		position: relative;
+		z-index: 0;
+	}
 
-.sale-item-img {
-  margin-right: 20rpx;
-  image {
-    width: 186rpx;
-    height: 186rpx;
-    border-radius: 8rpx;
-  }
-}
+	.index-navs {
+		background-color: #f7f7f7;
+		display: -webkit-box;
+		display: -webkit-flex;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+	}
 
-.sale-item-content {
-  line-height: 2em;
-}
+	.index-nav-v {
+		display: -webkit-box;
+		display: -webkit-flex;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		position: relative;
+	}
 
-.sale-item-title {
-  display: -webkit-box;
-  -webkit-box-orient: vertical;
-  -webkit-line-clamp: 2;
-  overflow: hidden;
-  line-height: 1.5;
-  font-size: 28rpx;
-  color: #333;
-}
+	.index-nav {
+		font-size: 28rpx;
+		display: -webkit-box;
+		display: -webkit-flex;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		width: 150rpx;
+		flex-direction: column;
+		color: #bababa;
+		height: 115rpx;
+		line-height: 1em;
+		position: relative;
 
-.sale-item-title-desc {
-  font-size: 22rpx;
-  color: #999;
-}
+		&-active {
+			background-image: url(/static/seckill/active.png);
+			background-size: 100% 115rpx;
+			background-repeat: no-repeat;
+			color: #ffffff;
+			position: relative;
+			z-index: 30;
 
-.sale-item-price {
-  font-size: 22rpx;
-  color: 999;
-}
+			.index-nav-desc {
+				color: #ffffff;
+			}
+		}
+	}
 
-.sale-item-price-now {
-  font-size: 40rpx;
-  color: #ff5a10;
-  margin: 0 10rpx;
-}
-
-.sale-item-price-origin {
-  font-size: 20rpx;
-  color: #999;
-
-  -webkit-text-decoration-line: line-through;
-  text-decoration-line: line-through;
-  text-decoration: line-through;
-}
-
-.sale-item-surplus {
-  border: 2rpx solid rgb(34, 178, 140);
-  border-radius: 12px;
-  width: 166rpx;
-  color: rgb(31, 177, 138);
-  font-size: 20rpx;
-  position: relative;
-  text-align: center;
-  z-index: 2;
-  height: 32rpx;
-  line-height: 28rpx;
-  overflow: hidden;
-}
-
-.sale-item-surplus-text {
-  width: 166rpx;
-  background: rgb(234, 247, 245);
-  position: absolute;
-  top: 0;
-  left: 0;
-  z-index: -1;
-  height: 100%;
-}
-
-.sale-item-btn {
-  position: absolute;
-  right: 20rpx;
-  bottom: 20rpx;
-  padding: 0 20rpx;
-  height: 60rpx;
-  background-color: #1abc9c;
-  border-radius: 10rpx;
-  font-size: 25rpx;
-  color: #fff;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-
-.trailer {
-  height: 100rpx;
-  background: #ffffff;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  font-size: 22rpx;
-  color: #666666;
-  box-sizing: border-box;
-  position: relative;
-  z-index: 0;
-}
-
-.index-navs {
-  background-color: #f7f7f7;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-}
-
-.index-nav-v {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  position: relative;
-}
-
-.index-nav {
-  font-size: 28rpx;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  width: 150rpx;
-  flex-direction: column;
-  color: #bababa;
-  height: 115rpx;
-  line-height: 1em;
-  position: relative;
-
-  &-active {
-    background-image: url(/static/seckill/active.png);
-    background-size: 100% 115rpx;
-    background-repeat: no-repeat;
-    color: #ffffff;
-    position: relative;
-    z-index: 30;
-
-    .index-nav-desc {
-      color: #ffffff;
-    }
-  }
-}
-
-.index-nav-desc {
-  margin-top: 8rpx;
-  font-size: 22rpx;
-  color: #bababa;
-}
+	.index-nav-desc {
+		margin-top: 8rpx;
+		font-size: 22rpx;
+		color: #bababa;
+	}
 </style>
diff --git a/plugins/APPUpdate/index.js b/plugins/APPUpdate/index.js
index cfa6979..b980d1c 100644
--- a/plugins/APPUpdate/index.js
+++ b/plugins/APPUpdate/index.js
@@ -854,7 +854,8 @@ function downloadPopup(data, callback, cancelCallback, rebootCallback) {
 export default function (isPrompt = false) {
   getCurrentNo((version) => {
     getServerNo((res) => {
-      if (res.versionCode.replace(/\./g, "") <= version.version.replace(/\./g, "") ) {
+
+      if (res.versionCode.replace(/\./g, "") <= version.version.replace(/\./g, "")) {
         return false;
       }
 
diff --git a/static/buy.png b/static/buy.png
new file mode 100644
index 0000000000000000000000000000000000000000..e4accb0b891f5e7c87728e40d15b16cde90e545e
GIT binary patch
literal 2273
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

literal 0
HcmV?d00001

diff --git a/uview-ui/libs/css/common.scss b/uview-ui/libs/css/common.scss
index ffed482..201d271 100644
--- a/uview-ui/libs/css/common.scss
+++ b/uview-ui/libs/css/common.scss
@@ -109,63 +109,63 @@ text {
 }
 
 // 定义flex等分
-@for $i from 0 through 12 {
-	.u-flex-#{$i} {
-		flex: $i;
-	}
-}
+// @for $i from 0 through 12 {
+// 	.u-flex-#{$i} {
+// 		flex: $i;
+// 	}
+// }
 
-// 定义字体(px)单位，小于20都为px单位字体
-@for $i from 9 to 20 {
-	.u-font-#{$i} {
-		font-size: $i + px;
-	}
-}
+// // 定义字体(px)单位，小于20都为px单位字体
+// @for $i from 9 to 20 {
+// 	.u-font-#{$i} {
+// 		font-size: $i + px;
+// 	}
+// }
 
-// 定义字体(rpx)单位，大于或等于20的都为rpx单位字体
-@for $i from 20 through 40 {
-	.u-font-#{$i} {
-		font-size: $i + rpx;
-	}
-}
+// // 定义字体(rpx)单位，大于或等于20的都为rpx单位字体
+// @for $i from 20 through 40 {
+// 	.u-font-#{$i} {
+// 		font-size: $i + rpx;
+// 	}
+// }
 
-// 定义内外边距，历遍1-80
-@for $i from 0 through 80 {
-	// 只要双数和能被5除尽的数
-	@if $i % 2 == 0 or $i % 5 == 0 {
-		// 得出：u-margin-30或者u-m-30
-		.u-margin-#{$i}, .u-m-#{$i} {
-			margin: $i + rpx!important;
-		}
+// // 定义内外边距，历遍1-80
+// @for $i from 0 through 80 {
+// 	// 只要双数和能被5除尽的数
+// 	@if $i % 2 == 0 or $i % 5 == 0 {
+// 		// 得出：u-margin-30或者u-m-30
+// 		.u-margin-#{$i}, .u-m-#{$i} {
+// 			margin: $i + rpx!important;
+// 		}
 		
-		// 得出：u-padding-30或者u-p-30
-		.u-padding-#{$i}, .u-p-#{$i} {
-			padding: $i + rpx!important;
-		}
+// 		// 得出：u-padding-30或者u-p-30
+// 		.u-padding-#{$i}, .u-p-#{$i} {
+// 			padding: $i + rpx!important;
+// 		}
 		
-		@each $short, $long in l left, t top, r right, b bottom {
-			// 缩写版，结果如： u-m-l-30
-			// 定义外边距
-			.u-m-#{$short}-#{$i} {
-				margin-#{$long}: $i + rpx!important;
-			}
+// 		@each $short, $long in l left, t top, r right, b bottom {
+// 			// 缩写版，结果如： u-m-l-30
+// 			// 定义外边距
+// 			.u-m-#{$short}-#{$i} {
+// 				margin-#{$long}: $i + rpx!important;
+// 			}
 			
-			// 定义内边距
-			.u-p-#{$short}-#{$i} {
-				padding-#{$long}: $i + rpx!important;
-			}
+// 			// 定义内边距
+// 			.u-p-#{$short}-#{$i} {
+// 				padding-#{$long}: $i + rpx!important;
+// 			}
 			
-			// 完整版，结果如：u-margin-left-30
-			// 定义外边距
-			.u-margin-#{$long}-#{$i} {
-				margin-#{$long}: $i + rpx!important;
-			}
+// 			// 完整版，结果如：u-margin-left-30
+// 			// 定义外边距
+// 			.u-margin-#{$long}-#{$i} {
+// 				margin-#{$long}: $i + rpx!important;
+// 			}
 			
-			// 定义内边距
-			.u-padding-#{$long}-#{$i} {
-				padding-#{$long}: $i + rpx!important;
-			}
-		}
-	}
-}
+// 			// 定义内边距
+// 			.u-padding-#{$long}-#{$i} {
+// 				padding-#{$long}: $i + rpx!important;
+// 			}
+// 		}
+// 	}
+// }