feat: 🎨 合并其他分支代码

App.vue

@@ -2,12 +2,34 @@
 	/**
 	 * vuex管理登录状态，具体可以参考官方登录模板示例
 	 */
-import { mapMutations } from "vuex";
+	import {
+		mapMutations
+	} from "vuex";
 	import APPUpdate from "@/plugins/APPUpdate";
-import { getClipboardData } from "@/js_sdk/h5-copy/h5-copy.js";
+	import {
+		getClipboardData
+	} from "@/js_sdk/h5-copy/h5-copy.js";
 	import config from "@/config/config";
 	import storage from "@/utils/storage";
-// 悬浮球
+
+	
+	
+	/**
+	 * 路由监听并删除路由
+	 * https://developers.weixin.qq.com/miniprogram/dev/api/route/wx.navigateTo.html
+	 * */
+	// #ifdef MP-WEIXIN
+	wx.onAppRoute((res) => {
+		const pages = getCurrentPages();
+		console.log("pages:" + pages.length,pages);
+		if (pages.length > 3) {
+			delete getCurrentPages()[2]
+		}
+		console.log('路由监听', {
+			res
+		})
+	})
+	// #endif
 
 	export default {
 		data() {
@@ -16,6 +38,7 @@ export default {
 			};
 		},
 
+
 		/**
 		 * 监听返回
 		 */
@@ -116,8 +139,7 @@ export default {
 						//app启动时打开启动广告页
 						var w = plus.webview.open(
 							"/hybrid/html/advertise/advertise.html",
-            "本地地址",
+							"本地地址", {
-            {
 								top: 0,
 								bottom: 0,
 								zindex: 999,
@@ -217,15 +239,18 @@ export default {
 		height: auto !important;
 		padding-top: 10rpx;
 	}
+
 	// #endif
 
 	body {
 		background-color: $bg-color;
 	}
+
 	/************************ */
 	.w200 {
 		width: 200rpx !important;
 	}
+
 	.flex1 {
 		flex: 1; //必须父级设置flex
 	}

components/m-buy/goods.vue

@@ -99,10 +99,10 @@
 						</view>
 					</view>
 					<!-- 数量 -->
-					<view class="goods-skus-number">
+					<view class="goods-skus-number flex flex-a-c flex-j-sb">
 						<view class="view-class-title">数量</view>
 						
-						<u-input style='text-align: right;' v-model="num" type="number"  />
+						<u-input  class="view-class-input" v-model="num" type="number"  />
 					</view>
 				</scroll-view>
 				<!-- 按钮 -->
@@ -183,7 +183,6 @@
 			num(val){
 				if(val){
 					if(val > this.goodsDetail.quantity){
-						console.log(val)
 						this.val = this.goodsDetail.quantity
 					}
 				}
@@ -423,7 +422,13 @@
 	.goods-skus-number {
 		justify-content: space-between;
 		display: flex;
-		text-align: right
+		
+		>.view-class-title{
+			flex: 8;
+		}
+		>.view-class-input{
+			flex:1
+		}
 	}
 
 	/deep/ .uni-scroll-view {

components/m-goods-list/list.vue

@@ -0,0 +1,347 @@
+<template>
+	<view>
+		<!-- 一行两列商品展示 -->
+		<view class="goods-list" v-if="type == 'twoColumns'">
+			<view v-for="(item, index) in res" :key="index" class="goods-item">
+				<view class="image-wrapper" @click="navigateToDetailPage(item)">
+					<u-image :src="item.content.thumbnail" width="100%" height='330rpx' mode="aspectFill">
+						<u-loading slot="loading"></u-loading>
+					</u-image>
+				</view>
+				<view class="goods-detail">
+					<div class="title clamp" v-html="lightSearchStr(keyword,item.content.goodsName)"
+						@click="navigateToDetailPage(item)">
+
+					</div>
+					<view class="price-box" @click="navigateToDetailPage(item)">
+						<div class="price" v-if="item.content.price!=undefined">
+							¥<span>{{ formatPrice(item.content.price )[0] }} </span>.{{
+	            formatPrice(item.content.price )[1]
+	          }}
+						</div>
+					</view>
+					<div class="promotion" @click="navigateToDetailPage(item)">
+						<div v-if="item.content.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 class="count-config" @click="navigateToDetailPage(item)">
+						<span>已售 {{ item.content.buyCount || "0" }}</span>
+						<span>{{ item.content.commentNum || "0" }}条评论</span>
+					</div>
+					<div class="store-seller-name" v-if="storeName" @click="navigateToStoreDetailPage(item)">
+						<div class="text-hidden">
+							<u-tag style="margin-right: 10rpx" size="mini" mode="dark" v-if="item.selfOperated"
+								text="自营" type="error" />
+							<span>{{ item.content.storeName || "暂无" }}</span>
+						</div>
+						<span>
+							<u-icon name="arrow-right"></u-icon>
+						</span>
+					</div>
+				</view>
+			</view>
+		</view>
+		<!-- 一行一列商品展示 -->
+		<div v-if="type == 'oneColumns'">
+			<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.content.thumbnail">
+							<u-loading slot="loading"></u-loading>
+						</u-image>
+					</div>
+					<div class="goods-detail">
+						<div class="title clamp3" @click="navigateToDetailPage(item)">{{ item.content.goodsName }}</div>
+						<view class="price-box" @click="navigateToDetailPage(item)">
+							<div class="price" v-if="item.content.price!=undefined">
+								¥<span>{{ formatPrice(item.content.price )[0] }} </span>.{{
+			            formatPrice(item.content.price )[1]
+			          }}
+							</div>
+						</view>
+						<div class="promotion" @click="navigateToDetailPage(item)">
+							<div v-if="item.content.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.content.buyCount || '0' }}</span>
+							<span style="float: right; font-size: 22rpx">{{ item.content.commentNum || '0' }}条评论</span>
+						</div>
+						<div style="overflow: hidden" @click="navigateToStoreDetailPage(item)" class="count-config">
+							<div class="text-hidden" v-if="storeName">
+								<u-tag style="margin-right: 10rpx" size="mini" mode="dark" v-if="item.selfOperated"
+									text="自营" type="error" />
+								<span class="line1-store-name">{{ item.content.storeName }}</span>
+								<span class="to-store">进店<u-icon size="24" name="arrow-right" color="#666"></u-icon>
+								</span>
+							</div>
+							<span>
+								<u-icon name="arrow-right" color="#c5c5c5"></u-icon>
+							</span>
+						</div>
+					</div>
+				</div>
+
+			</div>
+		</div>
+
+	</view>
+</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 []
+				}
+			},
+			// 一行两列还是一行一列显示
+			type: {
+				type: String,
+				default: 'twoColumns',
+				validator() {
+					return ['twoColumns', 'oneColumns']
+				}
+			},
+			storeName: {
+				type: Boolean,
+				default: true
+			},
+			keyword: {
+				type: null,
+				default: ''
+			}
+
+		},
+		watch: {
+			keyword(val) {
+				if (val) {
+					this.lightSearchStr(val)
+				}
+			}
+		},
+		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>
+/* 商品列表 */
+		.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>

components/m-goods-list/promotion.vue

@@ -0,0 +1,160 @@
+<template>
+	<div>
+		<div v-for="(item, index) in res" :key="index" class="goods-row" @click="navigateToDetailPage(item)">
+			<div class="flex goods-col">
+				<div class="goods-img">
+					<u-image width="230rpx" border-radius='16' height="230rpx" :src="item.goodsImage || item.thumbnail">
+						<u-loading slot="loading"></u-loading>
+					</u-image>
+				</div>
+				<div class="goods-detail">
+					<div class="title clamp3">{{ item.goodsName }}</div>
+					<div class='flex flex-a-c flex-j-sb'>
+						<view class="price-box">
+							<!-- 秒杀 / 拼团 -->
+							<div class="price" v-if="!type && item.price!=undefined">
+								¥<span>{{ formatPrice(item.price )[0] }} </span>.{{
+										formatPrice(item.price )[1]
+									}}
+							</div>
+							<!-- 砍价 -->
+							<div class="price" v-if="type && item.purchasePrice!=undefined">
+								最低：
+								¥<span>{{ formatPrice(item.purchasePrice )[0] }} </span>.{{
+										formatPrice(item.purchasePrice )[1]
+									}}
+							</div>
+						</view>
+						<div>
+							<image class='buy' :src="buy"></image>
+						</div>
+					</div>
+					<div class='count-config' v-if="!type">
+						<span>即将恢复{{ item.originalPrice}}元</span>
+					</div>
+				</div>
+			</div>
+
+		</div>
+	</div>
+</template>
+
+<script>
+	import commonTpl from '@/components/m-goods-list/common'
+	export default {
+		data() {
+			return {
+				lightColor: this.$mainColor,
+				buy: require('@/static/buy.png')
+			}
+		},
+		mixins: [commonTpl],
+		props: {
+			// 遍历的数据
+			res: {
+				type: Array,
+				default: () => {
+					return []
+				}
+			},
+			type:{
+				type:null,
+				default:""
+			}
+		},
+		methods: {
+			// 跳转到商品详情
+			navigateToDetailPage(item) {
+				uni.navigateTo({
+					url: `/pages/product/goods?id=${item.skuId}&goodsId=${item.goodsId}`,
+				});
+			},
+		}
+	}
+</script>
+
+<style lang='scss' scoped>
+	.buy {
+		width: 152rpx;
+		height: 108rpx;
+	}
+	.flex-j-sb {
+		width: 100%;
+	}
+	.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;
+				}
+			}
+		}
+
+		.count-config {
+			padding: 5rpx 0;
+			color: #666;
+			display: flex;
+			font-size: 24rpx;
+			letter-spacing:2rpx;
+			padding-left: 10rpx;
+		}
+
+
+
+	}
+
+	.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: 48rpx;
+			}
+		}
+	}
+</style>

config/api.js

@@ -4,14 +4,8 @@
  */
 // 开发环境
 const dev = {
-  // common: "https://common-api.pickmall.cn",
+  common: "https://common-api.pickmall.cn",
-  // buyer: "https://buyer-api.pickmall.cn",
+  buyer: "https://buyer-api.pickmall.cn",
-
-  common: "http://192.168.0.106:8890",
-	  buyer: "http://192.168.0.106:8888",
-
-
-
 };
 // 生产环境
 const prod = {

main.js

@@ -30,6 +30,8 @@ Object.keys(filters).forEach((key) => {
 
 // 引入Vuex
 Vue.prototype.$store = store;
+
+
 Vue.use(uView);
 Vue.config.productionTip = false;
 

manifest.json

@@ -2,8 +2,8 @@
     "name" : "lili商城",
     "appid" : "__UNI__EC9FD60",
     "description" : "",
-    "versionName" : "4.2.6",
+    "versionName" : "4.2.5",
-    "versionCode" : 4000260,
+    "versionCode" : 4000250,
     "transformPx" : false,
     "app-plus" : {
         "compatible" : {

pages.json

@@ -466,6 +466,8 @@
 					"path": "seckill",
 					"style": {
 						"navigationBarTitleText": "限时抢购",
+						"navigationStyle": "custom", // 隐藏系统导航栏
+						"navigationBarTextStyle": "white" ,
 						"app-plus": {
 							"titleNView": {
 								"homeButton":true
@@ -479,6 +481,7 @@
 					"style": {
 						"navigationBarTitleText": "拼团活动",
 						"navigationStyle": "custom", // 隐藏系统导航栏
+						"navigationBarTextStyle": "white" ,
 						"app-plus": {
 							// 将回弹属性关掉
 							"bounce": "none"

pages/mine/address/add.vue

@@ -162,9 +162,7 @@ export default {
             delete this.form.updateTime;
             editAddress(this.form).then((res) => {
               if (res.data.success) {
-                uni.navigateTo({
+                uni.navigateBack();
-                  url: `/${beforePage.route}`,
-                });
               }
             });
           }

pages/mine/address/addressManage.vue

@@ -86,22 +86,8 @@ export default {
    * 进入页面检测当前账户是否登录
    */
   onShow() {
-    let that = this;
+    if (this.$options.filters.tipsToLogin()) {
-    if (this.$options.filters.isLogin("auth")) {
       this.getAddressList();
-    } else {
-      uni.showModal({
-        title: "提示",
-        content: "检测到您的账号还未登录,是否去登录？",
-        confirmColor: this.$lightColor,
-        success: function (res) {
-          if (res.confirm) {
-            that.$options.filters.navigateToLogin();
-          } else if (res.cancel) {
-            uni.navigateBack();
-          }
-        },
-      });
     } 
   },
   methods: {

pages/order/myOrder.vue

@@ -326,10 +326,10 @@ export default {
     // this.loadData(this.status);
   },
   onShow() {
+    if(this.$options.filters.tipsToLogin()){
       if (!this.tabCurrentIndex) {
         this.initData(0);
-    } else {
+      }
-      
     }
     // this.loadData(this.status);
   },

pages/promotion/bargain/detail.vue

@@ -3,7 +3,7 @@
     <u-navbar :custom-back="back" back-icon-color="#fff" :background="background" :border-bottom="false">
     </u-navbar>
 
-    <div class="wrapper">
+    <div class="wrapper-box">
       <!-- 砍价列表 -->
       <div class="box box1">
         <div class="bargain">
@@ -106,10 +106,6 @@
       <popupGoods ref="popupGoods" :buyMask="maskFlag" @closeBuy="closePopupBuy" :goodsDetail="bargainDetail"
         :goodsSpec="goodsSpec" v-if="bargainDetail.id " @handleClickSku="getGoodsDetail" />
 
-      <!-- 产品详情 -->
-      <div class=" box4">
-
-      </div>
     </div>
   </div>
 </template>
@@ -352,11 +348,11 @@ page {
   align-items: center;
   padding: 10rpx 0;
 }
-.wrapper {
+.wrapper-box {
-  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: 506rpx;
   width: 100%;
 }
 
@@ -371,16 +367,16 @@ page {
   }
 }
 .box1 {
-  top: 750rpx;
+  top: 560rpx;
 }
 .box2 {
-  top: 770rpx;
+  top: 580rpx;
 }
 .box3 {
-  top: 790rpx;
+  top: 600rpx;
 }
 .box4 {
-  top: 810rpx;
+  top: 620  rpx;
   height: 200rpx;
 }
 .bargain-item {

pages/promotion/bargain/list.vue

@@ -6,22 +6,7 @@
       <!-- 砍价列表 -->
       <div class="box">
         <!-- 已砍的商品 -->
-        <div class="bargain" v-if="bargainList.length!=0">
+        <goodsTemplate type="kanJia" v-if="bargainList.length!=0" :res="bargainList" />
-          <div class="flex bargain-item" v-for="(item,index) in bargainList" :key="index">
-            <div class="goods-img">
-              <u-image width="150" height="150" :src="item.thumbnail"></u-image>
-            </div>
-            <div class="goods-config">
-              <div class="goods-title wes-2">
-                {{item.goodsName}}
-              </div>
-              <div class="flex goods-buy">
-                <div class="max-price">最低：<span>￥{{item.purchasePrice | unitPrice}}</span></div>
-                <div class="bargaining" @click="navigateToBargainDetail(item)">参与砍价</div>
-              </div>
-            </div>
-          </div>
-        </div>
         <div class="bargain empty" v-else>
           <u-empty text="暂无活动" mode="list"></u-empty>
         </div>
@@ -32,7 +17,9 @@
 
 <script>
 import { getBargainList } from "@/api/promotions";
+import goodsTemplate from '@/components/m-goods-list/promotion'
 export default {
+  components:{goodsTemplate},
   data() {
     return {
       background: {
@@ -91,7 +78,7 @@ page {
   background: url("https://lili-system.oss-cn-beijing.aliyuncs.com/kanjia.png");
   background-repeat: no-repeat;
   background-size: 100% 100%;
-  height: 600rpx;
+  height: 506rpx;
   width: 100%;
 }
 
@@ -99,7 +86,7 @@ page {
   background: #fff;
   border-radius: 20rpx;
   position: relative;
-  top: 650rpx;
+  top: 560rpx;
   width: 94%;
   margin: 0 auto;
   > .bargain {

pages/promotion/joinGroup.vue

@@ -1,14 +1,11 @@
 <template>
 	<view class="wrapper">
-
+		<u-navbar :border-bottom="false"  :title="title">
-    <u-navbar :border-bottom="false" :background="background" class="unavbar" :title="title">
 			<!-- 中间 -->
 			<view class="slot-wrap container-wrap">
-
 				<view v-if="search">
 					<u-search @search="searchFun()" @custom="searchFun()" v-model="params.goodsName"></u-search>
 				</view>
-
 			</view>
 			<!-- 右侧 -->
 			<view slot="right">
@@ -19,44 +16,14 @@
 			</view>
 		</u-navbar>
 		<!-- 顶部栏 -->
-
+		<div class='header-wraper'>
+			<image  src="/static/join-buy.png"></image>
+		</div>
 		<!-- 商品栏 -->
 		<div class="swiper">
+			<goodsTemplate v-if="goodsList.length" :res="goodsList" />
 			
-      <div v-if="groupBuy.length !=0">
-        <view class="view-item" v-for="(groupItem, groupIndex) in groupBuy" :key="groupIndex">
-          <view class="view-left">
-            <u-image border-radius="10" shape="square" :src="groupItem.thumbnail" width="186rpx" height="186rpx">
-
-              <view slot="error" style="font-size: 24rpx;">加载失败</view>
-            </u-image>
-          </view>
-          <view class="view-content">
-            <view class="view-content-name">
-              {{ groupItem.goodsName }}
-            </view>
-            <view class="view-content-bottom">
-              <view>
-                <view class="view-content-price">
-                  <!-- ￥{{groupItem.sales_price | unitPrice }} <span v-if="groupItem.point">+{{groupItem.point}}积分</span> -->
-                  ￥{{groupItem.price | unitPrice }}
-                </view>
-                <view class="view-content-original_price">
-                  ￥{{ groupItem.originalPrice | unitPrice }}
-                </view>
-              </view>
-
-              <view>
-                <view class="btn-group" @click="toHref(groupItem)"> 去拼团 </view>
-                <view class="buy-content">已售{{groupItem.num || 0}}件</view>
-              </view>
-            </view>
-          </view>
-        </view>
-        <u-loadmore bg-color='#f8f8f8' :status="status" />
-      </div>
 			<u-empty v-else style="margin-top:20%" text="暂无拼团活动" mode="data"></u-empty>
-
 		</div>
 
 	</view>
@@ -65,17 +32,17 @@
 <script>
 	import * as API_Promotions from "@/api/promotions";
 	import * as API_Goods from "@/api/goods";
+	import goodsTemplate from '@/components/m-goods-list/promotion.vue'
 	export default {
-  components: {},
+		components: {
+			goodsTemplate
+		},
 		data() {
 			return {
-      status: "loadmore",
 				is_empty: false,
 				search: false,
 				title: "拼团活动",
-      background: {
+
-        backgroundColor: "#fff",
-      },
 				empty: false,
 				params: {
 					pageNumber: 1,
@@ -83,7 +50,7 @@ export default {
 					categoryPath: "",
 					goodsName: "",
 				},
-      groupBuy: [],
+				goodsList: [],
 			};
 		},
 		mounted() {},
@@ -118,12 +85,12 @@ export default {
 				});
 			},
 			searchFun() {
-      this.groupBuy = [];
+				this.goodsList = [];
 				this.GET_AssembleGoods();
 			},
 			// 请求拼团数据
 			GET_AssembleGoods() {
-      this.status = "loading";
+
 				const params = JSON.parse(JSON.stringify(this.params));
 				if (params.category_id === 0) delete params.category_id;
 
@@ -133,15 +100,15 @@ export default {
 
 						if (!data || !data.length) {
 							this.is_empty = true;
-            this.status = "nomore";
+
 						} else {
 							if (data.length <= this.params.pageSize) {
-              this.status = "nomore";
+
 							} else {
-              this.status = "loadmore";
+
 							}
 							this.is_empty = false;
-            this.groupBuy.push(...(data || []));
+							this.goodsList.push(...(data || []));
 						}
 					})
 					.catch(() => {});
@@ -151,5 +118,16 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "./style.scss";
+	.header-wraper {
+		background: url('/static/bg.png');
+		height: 200rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		>image{
+			width: 188rpx;
+			height: 60rpx;
+		}
+	}
+	
 </style>

pages/promotion/point/pointList.vue

@@ -23,8 +23,8 @@
                   <u-loading slot="loading"></u-loading>
                 </u-image>
                 <view class="index-item-title">{{ item.goodsName }}</view>
-                <view class="index-item-price">
+                <view class="index-item-price flex flex-a-c flex-j-sb">
-                  {{ item.points }}积分
+                  <div class="point"><span>{{ item.points }}</span>积分</div> 
                   <span class="tipsMkt">¥{{ item.originalPrice | unitPrice }}</span>
                 </view>
               </view>
@@ -194,46 +194,12 @@ page {
   height: 100%;
 }
 .tipsMkt {
-  float: right;
   color: #c0c4cc;
-  font-size: 24rpx;
+  font-size: 24rpx !important;
   text-decoration: line-through;
-  margin-right: 20rpx;
+  margin-right: 20rpx !important;
 }
 
-.header {
-  background: $light-color;
-  position: relative;
-  color: #fff;
-  display: flex;
-  height: 80rpx;
-  align-items: center;
-  justify-content: center;
-  font-size: 26rpx;
-  font-size: 34rpx;
-
-  .left,
-  .right {
-    position: absolute;
-    width: max-content;
-    height: max-content;
-    top: 0;
-    bottom: 0;
-    margin: auto;
-  }
-
-  .left {
-    float: left;
-    top: 0;
-    bottom: 0;
-    left: 20rpx;
-  }
-
-  .right {
-    float: right;
-    right: 20rpx;
-  }
-}
 
 .index {
   height: 100vh;
@@ -341,15 +307,19 @@ page {
   overflow: hidden;
 }
 
-.index-item-title-desc {
+
-  font-size: 25rpx;
-  color: #999999;
-  margin-top: 10rpx;
-}
 
 .index-item-price {
   font-size: 28rpx;
-  color: #ff5a10;
+  overflow: hidden;
+  color: $main-color;
   padding: 20rpx 0 0 20rpx;
+  >.point{
+    >span{
+      font-size: 42rpx;
+      font-weight: bold;
+      margin-right:10rpx;
+    }
+  }
 }
 </style>

pages/promotion/seckill.vue

@@ -1,7 +1,8 @@
 <template>
 	<view class="sale">
-		<view class="sale-head">
+		<u-navbar title='限时抢购'></u-navbar>
-			<image src="@/pages/promotion/static/head-sample.png"></image>
+		<view class="header-wraper">
+				<image mode="widthFix" src="/static/seckill.png"></image>
 		</view>
 		<scroll-view scroll-x>
 			<view class="index-navs">
@@ -14,10 +15,7 @@
 					</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" />
@@ -39,7 +37,7 @@
 		getSeckillTimeGoods
 	} from "@/api/promotions.js";
 	import Foundation from "@/utils/Foundation.js";
-	import goodsTemplate from '@/components/m-goods-list/seckill.vue'
+	import goodsTemplate from '@/components/m-goods-list/promotion.vue'
 	export default {
 		components: {
 			goodsTemplate
@@ -184,10 +182,15 @@
 		}
 	}
 
-	.sale-head {
+	.header-wraper {
-		image {
+		background: url('/static/bg.png');
-			width: 100%;
+		height: 200rpx;
-			height: 280rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		>image{
+			width: 300rpx;
+			height: 100rpx;
 		}
 	}
 
@@ -195,22 +198,8 @@
 		padding-top: 20rpx;
 	}
 
-	.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: #fff;
 		background-color: #f7f7f7;
 		display: -webkit-box;
 		display: -webkit-flex;
@@ -241,17 +230,19 @@
 		height: 115rpx;
 		line-height: 1em;
 		position: relative;
+		font-size: 32rpx;
+		font-weight: bold;
 
 		&-active {
-			background-image: url(/static/seckill/active.png);
+			color: $main-color;
-			background-size: 100% 115rpx;
-			background-repeat: no-repeat;
-			color: #ffffff;
 			position: relative;
 			z-index: 30;
-
 			.index-nav-desc {
-				color: #ffffff;
+				color: #fff;
+				font-weight: bold;
+				background: $main-color;
+				padding: 6rpx 16rpx;
+				border-radius: 50px;
 			}
 		}
 	}

pages/tabbar/home/template/tpl_goods.vue

@@ -24,7 +24,9 @@
             {{ item.title }}
           </div>
           <div class="goods-bottom">
-            <div class="goods-price">￥{{ item.price | unitPrice }}</div>
+            <div class="goods-price">	¥<span>{{ formatPrice(item.price )[0] }} </span>.{{
+										formatPrice(item.price )[1]
+									}}</div>
           </div>
         </div>
       </div>
@@ -56,6 +58,13 @@ export default {
   },
   mounted() {},
   methods: {
+    	// 格式化金钱  1999 --> [1999,00]
+			formatPrice(val) {
+				if (typeof val == "undefined") {
+					return val;
+				}
+				return val.toFixed(2).split(".");
+			},
     handleClick(item) {
       uni.navigateTo({
         url: `/pages/product/goods?id=${item.id}&goodsId=${item.goodsId}`,
@@ -163,13 +172,11 @@ $w_94: 94%;
     > .goods-price {
       line-height: 2;
       color: $main-color;
+      >span{
+        font-size: 42rpx;
+      }
     }
   }
 }
 
-.goods-icon {
-  right: 10rpx;
-  top: 10rpx;
-  position: absolute;
-}
 </style>

pages/tabbar/home/views.vue

@@ -131,7 +131,7 @@ export default {
     },
 		// 是否有网络链接
 		isConnected(val){
-      val ? this.init() : "";
+			val ? this.init() : ''
 		},
 
     /**

plugins/APPUpdate/index.js

@@ -854,6 +854,7 @@ function downloadPopup(data, callback, cancelCallback, rebootCallback) {
 export default function (isPrompt = false) {
   getCurrentNo((version) => {
     getServerNo((res) => {
+
       if (res.versionCode.replace(/\./g, "") <= version.version.replace(/\./g, "")) {
         return false;
       }

uni.scss

@@ -150,6 +150,9 @@ $font-weight: 400;
 .flex-a-c{
 	align-items: center;
 }
+.flex-j-sb{
+	justify-content: space-between;
+}
 .relative {
 	position: relative;
 }

utils/filters.js

@@ -1,5 +1,7 @@
 import Foundation from "./Foundation.js";
 import storage from "@/utils/storage.js";
+import { getUserInfo } from '@/api/members';
+import Vue from "vue";
 /**
  * 金钱单位置换  2999 --> 2,999.00
  * @param val
@@ -99,12 +101,46 @@ export function clearStrComma(str) {
 export function isLogin(val) {
   let userInfo = storage.getUserInfo();
   if (val == "auth") {
-    return userInfo.id ? true : false;
+    return userInfo && userInfo.id ? true : false;
   } else {
     return storage.getUserInfo();
   }
 }
 
+
+export function tipsToLogin(){
+if(!isLogin('auth')){
+  uni.showModal({
+    title: "提示",
+    content: "当前用户未登录是否登录？",
+    confirmText: "确定",
+    cancelText: "取消",
+    confirmColor:Vue.prototype.$mainColor,
+    success: res => {
+      if (res.confirm) {
+        navigateToLogin()
+      } else if (res.cancel) {
+        uni.navigateBack()
+      }
+    },
+  })
+    return
+	}
+}
+
+
+
+/**
+ * 获取用户信息并重新添加到缓存里面
+ */
+export async function userInfo(){
+	let res = await getUserInfo();
+	if(res.data.success){
+		storage.setUserInfo(res.data.result);
+		return res.data.result 
+	}
+}
+
 /**
  * 验证是否登录如果没登录则去登录
  * @param {*} val
@@ -113,7 +149,7 @@ export function isLogin(val) {
 
 export function forceLogin() {
   let userInfo = storage.getUserInfo();
-  if (!userInfo.id) {
+  if (!userInfo ||  !userInfo.id) {
     // #ifdef MP-WEIXIN
 
     uni.navigateTo({

utils/request.js

@@ -1,7 +1,11 @@
 import Request from "@/lib/request/index.js";
-import { refreshTokenFn } from "@/api/login.js";
+import {
+	refreshTokenFn
+} from "@/api/login.js";
 import storage from "@/utils/storage.js";
-import { md5 } from "@/utils/md5.js";
+import {
+	md5
+} from "@/utils/md5.js";
 import Foundation from "@/utils/Foundation.js";
 import api from "@/config/api.js";
 
@@ -79,7 +83,10 @@ http.interceptors.request.use(
 				sign,
 			};
 			let params = config.params || {};
-      params = { ...params, ..._params };
+			params = {
+				...params,
+				..._params
+			};
 
 			config.params = params;
 			config.header.accessToken = accessToken;
@@ -112,7 +119,7 @@ http.interceptors.response.use(
 			//   cleanStorage();
 			//   isRefreshing = false;
 			// }
-    console.log(response)
+
 			let token = storage.getAccessToken();
 			if (
 				(token && response.statusCode === 403) ||
@@ -126,7 +133,10 @@ http.interceptors.response.use(
 					//调用刷新token的接口
 					return refreshTokenFn(oldRefreshToken)
 						.then((res) => {
-            let { accessToken, refreshToken } = res.data.result;
+							let {
+								accessToken,
+								refreshToken
+							} = res.data.result;
 							storage.setAccessToken(accessToken);
 							storage.setRefreshToken(refreshToken);
 
@@ -155,6 +165,7 @@ http.interceptors.response.use(
 						});
 					});
 				}
+
 				// 如果当前返回没登录
 			} else if (
 				(!token && !storage.getRefreshToken() && response.statusCode === 403) ||
@@ -183,7 +194,9 @@ http.interceptors.response.use(
 		}
 );
 
-export { http };
+export {
+	http
+};
 
 export const Method = {
 	GET: "GET",