专区

common/host.js

@@ -28,7 +28,7 @@ function phpfunc(){
 	const { origin } = window.location;
 	let url = '';
 	// 测试环境
-	if(origin.indexOf('localhost') > -1 || origin.indexOf('test') > -1){
+	if(origin.indexOf('local') > -1 || origin.indexOf('test') > -1){
 		if(origin.indexOf('test') > -1){
 			url = `${origin}/mobile/index.php?`;
 		}else{

common/util.js

@@ -38,3 +38,19 @@ export function isWeixin(){
 		return false;
 	}
 }
+
+// 获取本地缓存
+export function getCache (key){
+	const timestamp = Date.parse(new Date()) / 1000;
+	if(key){
+		var val = uni.getStorageSync(key);
+		var tmp = val.split("|");
+		// 缓存失效
+		if(!tmp[1] || timestamp >= tmp[1]){
+			uni.removeStorageSync(key)
+			return "";
+		}else{
+			return tmp[0] || "";
+		}
+	}
+}
\ No newline at end of file

main.js

@@ -6,7 +6,8 @@ import {
 	go
 } from '@/common/host.js';
 import {
-	getNavigationBarTitle
+	getNavigationBarTitle,
+	getCache
 } from './common/util.js';
 
 // 微信分享公共接口
@@ -103,6 +104,7 @@ function jump(url, type) {
 
 Vue.prototype.$jumpGoodDetail = jumpGoodDetail;
 Vue.prototype.$jump = jump;
+Vue.prototype.$getCache = getCache;
 Vue.prototype.$addCart = addCart;
 Vue.prototype.$backup = backup;
 Vue.prototype.$__reloadResource = __reloadResource;

manifest.json

@@ -2,7 +2,7 @@
   "name": "shop_mobile_uni",
   "appid": "__UNI__F904656",
   "description": "",
-  "versionName": "1.0.12",
+  "versionName": "1.0.13",
   "versionCode": "100",
   "transformPx": false,
   "app-plus": {
@@ -51,7 +51,7 @@
       "mode": "history",
       "base": "/uni"
     },
-    "publicPath": "https://dbc-static.oss-cn-beijing.aliyuncs.com/dbc-shop/uni/test/1.0.12/",
+    "publicPath": "https://dbc-static.oss-cn-beijing.aliyuncs.com/dbc-shop/uni/mirror/1.0.13/",
     "optimization": {
       "treeShaking": {
         "enable": true

pages/financial/financialstage.vue

@@ -2,7 +2,7 @@
 	<view class="fin_content">
 		<SearchBar :isLogin="isLogin"/>
 		<view class="tab_bar">
-			<text @click="$jump('/pages/home/home', 2)">首页</text>
+			<text @click="backHome">首页</text>
 			<!-- <text @click="jumpPhpPage('app=promotion')">精彩活动</text> -->
 			<!-- <text @click="$jump('/pages/index/index')">
 				<i class="credit_icon"></i>
@@ -59,7 +59,7 @@
 					<i class="fin_rec_label fin_rec_label1">限时</i>
 					<i class="fin_rec_label fin_rec_label2">免息</i>
 					<text class="fin_rec_goodsname">{{val.equipment_name}}</text>
-					<text class="fin_rec_goodssubname">限量版宝璐天然粮</text>
+					<!-- <text class="fin_rec_goodssubname">限量版宝璐天然粮</text> -->
 					<text class="fin_rec_goodprice">
 						<text v-if="isLogin">￥</text>{{isLogin ? val.equipment_price : '登录显示价格'}}
 					</text>
@@ -83,7 +83,8 @@
 				EquipmentHotList: [], //精选
 				isLogin: 0,
 				current: 0,
-				height: false
+				height: false,
+				equipment_hot_list: []
 			}
 		},
 		onLoad() {
@@ -101,23 +102,48 @@
 		},
 		methods: {
 			getData() {
+				const goods_type = this.$getCache('goods_type');
 				uni.request({
 					url: '/uni/api/equipment_index/EquipmentIndex',
 					method: 'GET',
 					dataType: 'json',
 					success: (res) => {
 						uni.hideLoading();
-						this.EquipmentRecommendList = res.data.data.EquipmentRecommendList;
+						const EquipmentHotList = res.data.data.EquipmentHotList;
+						const EquipmentRecommendList = res.data.data.EquipmentRecommendList;
+						this.EquipmentRecommendList = EquipmentRecommendList;
 						this.isLogin = res.data.login_flg;
-						if(res.data.data.EquipmentHotList instanceof Array) {
+						// 热销列表 根据专区类型是否显示
+						if(EquipmentHotList instanceof Array) {
 							let array = [];
-							for (var i = 0, j = res.data.data.EquipmentHotList.length; i < j; i += 6) {
-							    array.push(res.data.data.EquipmentHotList.slice(i, i + 6));
+							let temp = [];
+							EquipmentHotList.map((item, index) => {
+								if((item.goods_type > 0 && goods_type > 0) || item.goods_type == 0) {
+									temp.push(item);
+								}
+							});
+							if(temp.length > 0){
+								for (var i = 0, j = temp.length; i < j; i += 6) {
+								  array.push(temp.slice(i, i + 6));
 								}
 								this.EquipmentHotList = array;
+							}else{
+								this.EquipmentHotList = null;
+							}							
 						} else {
-							this.EquipmentHotList = res.data.data.EquipmentHotList;
+							this.EquipmentHotList = EquipmentHotList;
+						}
+						// 推荐列表 根据专区类型是否显示
+						if(EquipmentRecommendList instanceof Array) {
+							let recommd_list = [];
+							EquipmentRecommendList.map((item, index) => {
+								if((item.goods_type > 0 && goods_type > 0) || item.goods_type == 0) {
+									recommd_list.push(item);
 								}
+							});
+							this.EquipmentRecommendList = recommd_list;
+						}
+						
 						if(this.EquipmentHotList[0].length > 3) {
 							this.height = true;
 						}
@@ -132,6 +158,9 @@
 					url: `/pages/installment/installmentinfo?id=${id}`,
 				});
 			},
+			backHome(){
+				this.$jump('/pages/home/home', 2);
+			},
 			navigate(url) {
 				uni.navigateTo({
 					url: url

pages/home/components/functionmenu.vue

 <template>
 	<view>
-		<view v-if="style_setting.rank === 1" class="rank rank1" :style="[{'background-image':style_setting.bg_url}, {'background-color': style_setting.bg_color},{'border-bottom-left-radius':style_setting.radius_bottom_left*2+'rpx', 'border-bottom-right-radius':style_setting.radius_bottom_right*2+'rpx', 'border-top-left-radius':style_setting.radius_top_left*2+'rpx', 'border-top-right-radius':style_setting.radius_top_right*2+'rpx'}, style_setting.bg_style === 1 ? {'width':'702rpx','margin':'0 auto'}: null]">
+		<view v-if="style_setting.rank === 1" class="rank rank1" :style="[{'background-image': `url(${style_setting.bg_url})`}, {'background-color': style_setting.bg_color},{'border-bottom-left-radius':style_setting.radius_bottom_left*2+'rpx', 'border-bottom-right-radius':style_setting.radius_bottom_right*2+'rpx', 'border-top-left-radius':style_setting.radius_top_left*2+'rpx', 'border-top-right-radius':style_setting.radius_top_right*2+'rpx'}, style_setting.bg_style === 1 ? {'width':'702rpx','margin':'0 auto'}: null]">
 			<view class="menuItem" v-for="(item, key) in menuArray" :key="key" :style="{'width': width,height: style_setting.menuHeight*2+'rpx'}" @click="$jump(item.img_href)">
 				<image :src="item.img_url" class="icon_img"></image>
 				<text v-if="style_setting.font_show" class="title" :style="{'color': style_setting.font_color}">{{item.title}}</text>
 			</view>
 		</view>
-		<swiper v-else indicator-dots="true" :style="[{'height': style_setting.rank*200+10+'rpx'}, style_setting.bg_style === 1 ? {'width':'702rpx','margin':'0 auto'}: null, {'background-image':style_setting.bg_url}, {'background-color': style_setting.bg_color}, {'border-bottom-left-radius':style_setting.radius_bottom_left*2+'rpx', 'border-bottom-right-radius':style_setting.radius_bottom_right*2+'rpx', 'border-top-left-radius':style_setting.radius_top_left*2+'rpx', 'border-top-right-radius':style_setting.radius_top_right*2+'rpx'}]" class="swiper_view">
+		<swiper v-else indicator-dots="true" :style="[{'height': style_setting.rank*200+10+'rpx'}, style_setting.bg_style === 1 ? {'width':'702rpx','margin':'0 auto'}: null, {'background-image':`url(${style_setting.bg_url})`}, {'background-color': style_setting.bg_color}, {'border-bottom-left-radius':style_setting.radius_bottom_left*2+'rpx', 'border-bottom-right-radius':style_setting.radius_bottom_right*2+'rpx', 'border-top-left-radius':style_setting.radius_top_left*2+'rpx', 'border-top-right-radius':style_setting.radius_top_right*2+'rpx'}]" class="swiper_view">
 			<swiper-item v-for="(item, key) in menuArray" :key="key" class="rank rank1">
 				<view class="menuItem" v-for="(val, index) in item" :key="index" :style="{'width': width, height: style_setting.menuHeight*2+'rpx'}" @click="$jump(val.img_href)">
 					<image :src="val.img_url" class="icon_img"></image>

pages/home/components/navigation.vue

 <template>
 	<view class="navigation" :style="[{'height': style_setting.height*2+'rpx', 'height': style_setting.height*2+'rpx'}, style_setting.bg_show ? {'background-image': 'url('+style_setting.bg_url+')'} : null, {'background-color': style_setting.bg_color}]">
 		<view>
-			<text class="navigation_item" v-for="(item, key) in list" :key="key" v-if="!item.goods_type || (item.goods_type > 0 && goods_type > 0)" >
+			<text class="navigation_item" v-for="(item, key) in list" :key="key" v-if="item.goods_type == 0 || (item.goods_type > 0 && goods_type > 0)" >
 				<text class="navigation_text" :style="[{'color': item.title_color}, item.title_bg_show ? {'background-image': 'url('+item.title_bg_url+')'} : '']" @click="$jump(item.link)">
 				<i v-if="item.title_icon_show" class="navigation_icon" :style="{'background-image': 'url('+item.title_icon_url+')'}"></i>
 				<text v-if="item.title_show">{{item.title}}</text>
@@ -26,18 +26,9 @@
 			}
 		},
 		mounted() {
-			const goods_type = getCurrentPages()[0]['$route']['query']['goods_type'] || '-1';
-			const gt = uni.getStorageSync('goods_type');
-			// 判断goods_type是否有值
-			if(goods_type === '-1' && gt){
-				this.goods_type = gt;
-			}else{
+			const goods_type = this.$getCache('goods_type');
 			this.goods_type = goods_type;
 		}
-			if(this.goods_type){
-				uni.setStorageSync('goods_type', this.goods_type);
-			}
-		}
 	}
 </script>
 

pages/home/components/slide.vue

@@ -30,19 +30,12 @@
 			}
 		},
 		mounted() {
-			let goods_type = getCurrentPages()[0]['$route']['query']['goods_type'] || '-1';
 			const { infinite } = this.slide_setting;
 			const list = [];
-			const gt = uni.getStorageSync('goods_type');
-			// 判断goods_type是否有值
-			if(goods_type === '-1' && gt){
-				goods_type = gt;
-			}
-			if(goods_type){
-				uni.setStorageSync('goods_type', goods_type);
-			}
+			const goods_type = this.$getCache('goods_type');
+			
 			this.slide_list.map((item, index) => {
-				if((item.goods_type > 0 && goods_type > 0) || !item.goods_type) {
+				if((item.goods_type > 0 && goods_type > 0) || item.goods_type == 0) {
 					list.push(item)
 				}
 			});

pages/home/home.vue

@@ -56,7 +56,7 @@
 					avatarShape: 'square',
 					titleWidth: '100%'
 				},
-				COUPON_ID: '423' //优惠券ID
+				COUPON_ID: '79' //优惠券ID
 			}
 		},
 		onLoad() {
@@ -94,15 +94,9 @@
 							this.isLogin = res.data.login_flg;
 							// uni.hideLoading();
 							this.loading = false;
-							// 打开广告弹窗
-							const timestamp = new Date('2020/05/01 00:00:00').getTime() / 1000;
-							const end_timestamp = new Date('2020/05/30 23:59:59').getTime() / 1000;
-							const is_receive = uni.getStorageSync('is_receive');
-							
-							if(res.data.login_flg === 1 && (res.data.reg_time > timestamp || res.data.reg_time < end_timestamp) && is_receive != this.COUPON_ID){
-								setTimeout(() => {
-									this.$refs.popup.open();
-								}, 800);
+							// 获取是否领取优惠券
+							if(res.data.login_flg === 1){
+								this.get_coupon(res.data.reg_time);
 							}
 						}else{
 							uni.showToast({
@@ -125,6 +119,27 @@
 				const { origin } = location;
 				this.$jump(`${origin}/mobile/index.php?app=coupon&act=view&id=${this.COUPON_ID}`);
 				this.$refs.popup.close();
+			},
+			get_coupon(reg_time){
+				// 打开广告弹窗
+				const timestamp = new Date('2020/05/01 00:00:00').getTime() / 1000;
+				const end_timestamp = new Date('2020/05/30 23:59:59').getTime() / 1000;
+				uni.request({
+					url: '/uni/api/coupon/GetCoupon',
+					method: 'GET',
+					data:{
+						coupon_id: this.COUPON_ID
+					},
+					dataType: 'json',
+					success: (res) => {
+						const {code, data} = res.data;
+						if(code === 0 && !data){
+							if(reg_time > timestamp && reg_time < end_timestamp){
+								this.$refs.popup.open();
+							}
+						}
+					}
+				})
 			}
 		},
 		components: {

pages/installment/installmentinfo.vue

 <template>
 	<view class="info_content">
-		<view class="topbar_icon_box">
+		<view class="topbar_icon_box" :class="bg_show && 'bg_show'">
 			<text class="info_icon back_icon" @click="backup()"></text>
 			<view>
 				<text class="info_icon home_icon" @click="jumpPhpPage()"></text>
@@ -163,6 +163,7 @@
 		data() {
 			return {
 				visible: false,
+				bg_show: false,
 				data: {
 					EquipmentImgs: [],
 					EquipmentInfo: {},
@@ -185,6 +186,14 @@
 				type: 2
 			}
 		},
+		onPageScroll(e){
+			const {scrollTop} = e;
+			if(scrollTop > 300){
+				this.bg_show = true;
+			}else{
+				this.bg_show = false;
+			}
+		},
 		onLoad(option) {
 			this.equipment_id = option.id;
 			this.getData(option.id);
@@ -373,11 +382,12 @@
 		width: 100%;
 		padding: 14rpx 20rpx;
 		box-sizing: border-box;
-		position: absolute;
+		position: fixed;
 		left: 0;
 		top: 0;
-		background: #fff;
+		background: rgba(255, 255, 255, 0);
 		z-index: 99;
+		// border-radius: 100%;
 		.info_icon {
 			display: inline-block;
 			vertical-align: middle;
@@ -387,20 +397,27 @@
 		.back_icon {
 			background:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAAAAAAfl4auAAABYUlEQVRIx6XXO46DMBAGYN9zBAWic7aOKFxQ0VJQcQgarkBLARdYbVZJGkiFkKiy5LEPssaD/f+l4ZMQ4PGMuGoz1kUWydD3QxllRT3q7xKatb5UHi3iqbLfhNvkRT590rK4UbQa1Rhxl5IxabeOq4CYBNUKnnLakHzS4SGmTYmH//iyp43ZX17xsNnOeljiKSaLxNMC52SV/C+uyDLVL+4CWxx0Pzgl66TfuCGHNE+sXLB64Ja5bXd41y23d5ww9nT91K0nN9x7nD2/aatDP+PSzRKVM1aOdn5lYvTM9rRmyRtFzdjd+uVaFM6WCpE5W8pE5GwpEtLZkhShs6VQ+PoLB96Sj2HosaEXBn0q6CeBfs/adVPdNga3Jc+mLQkVA6wMcQXwaCqAXOmVR0PpZYu+/DAUfei4wQ466IjFDneorcAaGqyVgpo4rH3EGlesZcaadXBMwAYUcDQChzKLcfALHjIc96F4z0sAAAAASUVORK5CYII=') no-repeat;
 			background-size: 100% 100%;
+			border-radius: 100%;
 		}
 		.home_icon {
 			background:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAAAAAAfl4auAAACjUlEQVRIx62Xz0sbQRTH5/98bKxpCpYtlWIgCXWFeAluK1EasAQCUqiXYgSDhx68aLAiRJtcpEUF0dJDN8HDdmWbZL89bH7s7M5skk6/p53vvA8sM2/evGEQymlUSzk9lUik9Fyp2nDEUUzgtWuGRpw0o9aeCm4VQuSAL7Qmwk2DpDKasbC1QbHasORwPUkTlKxLYLdMU6jsimA7T1Mpb0fhToamVKYThu2pWaKMzcNunmZQ3uXgMs2kchCu04yqj2FLsr/Zu7usZL+tESzJqy0XcLckuTaEm8LpuUMPZ2fwDueE080BLDwLi9fo7RDt9HC9KDwlPtwSza3ZeFglIlp9gL0mimgBDCgIZvb6uNT9T/0S/T1BSAFgaEfP/kIL3sHI1g48tBai1aENhlrEXrHgFING0YG1EgmrgUWXa7uL2yXeWrpFdzu6ZMwJ/XXyBDieDwfOHwMnoVTSHNbgnfQ9/lREi1vp4S7NWw1W5cabj8BHcU5dA4+bnFNlpeBw34OLihi+wk94+0GnxHLBodPfPZXD67t9J+jkmB4cLhsUA78lYzno6CwViomFeaVY4t/hhBqs9Nt6DPwk+yoO1vmt4uDnRy7Q+SCHc3ySBOEXv+B1bOBICpdC6RmAz3H/mqjSxTsZXA0fjBH80uumiYg+4ZsMbkSO5BAu4rtfCPFbAmtOpBgM4S18JSKip+hKYCNahqaHa9ECOITf4yIe1trR0nuKz6ZpmubBGDZN0zTNHyG4ICj6X0ZNg78P8+MW5I2g6PNLtnZ14+tq3TcOB+Ob82eC60Zy0U1Qc8IVG9vOTbzcY5o56/+0FWoNjVorpdTEqbWPao2rWsus1qwrPhPUHiiKTyPFR9kMz8G/v1mIKuFxp8YAAAAASUVORK5CYII=') no-repeat;
 			background-size: 100% 100%;
 			margin-right: 20rpx;
+			border-radius: 100%;
 		}
 		.collection_icon {
 			background:url('data:image/jpeg;base64,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') no-repeat;
 			background-size: 100% 100%;
+			border-radius: 100%;
 		}
 		.uncollection_icon {
 			background:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAAAAAAfl4auAAAC6ElEQVRIx6VXz0tqURA+/+eoSQkuDKIoyoWYbYQKyrIIixZh4creSyITIjIFCVx4N6HQpjaSPxBS8de931uovXuPc824s7oz53yXc+bMfDMjwEo7Hw97PS6Hw+XxhuP5Nr9LMLZawmcng9h9idpMYCUoIUf4oPIjuOAjU/EVpoKr+zRV9qvm4Mw8/SDzGRNwN0IzSKTLgZsBmkkCzUlwfZ1mlPW6DG7OjCVabxrB3QD9QgJdAzhCv5KIHpyhX0rmP7jKv68j2W4nHfx7V7/BJnH1FwD+mMTaGFzg190dhELouPnVwghskgtxFImKiJtkyRCsmITxF3aJdvFlEvAKIIAgvxjFBxHRB6L8ehAQqNl5V9dxRER0hDrvcHsNAgn+x6f4tBER2T5xyu9IQJi4y1bG+fDrHGWbictEmzn1gv8ki8bcUJlrIHviX2DO3RZ5g8G5E30oNjQA6nfk7KsAtEbxIbrjNGzOC8Mzrg05alBRErrb+BJKZTDkuDVDIIiwXn1F5enqYINxr2Pj4Oqpgle9LSy8erWHxWm5tIieXvUKj16t4XIa+BI1veoRLr16Bu3MHHumwbDqEsb7XUM1JZWIimujHyQw3UA95rHHKm4kJxqPTUS3UMMcNqziVjK5jA4jIkpiEJrEhgZIyjaP8amIiCiFvl+2+ftITWz0CuaMz8jJphyemZsIhmVCKMmmEpirxKXEGHFIWjalOT7Jcyn5OBlnl3jkUpIhgzfsyaY9vHFkwNBQC8uyaRktloYmCHARnTEXbW2NGagzkW/2Gke923gfUUgZKI8I5R3bHPVOkP4FskREgRLQaAClABFRFhcs6csuu0eMaPVFQyvmdMZa0F5WiWK4Z8uNXOjukF5K9dFPuomI3Mk++qmlNO74QieV2E0VgJZbGesrOQ2AusmXWLm4H1Z7iiE1/EqvemhW3C21FdYaGmutlKUmzlr7aK1xtdYyW2vWLY4J1gYUi6ORxaHsF+PgPyIWgG2yq3F6AAAAAElFTkSuQmCC') no-repeat;
 			background-size: 100% 100%;
+			border-radius: 100%;
+		}
 	}
+	.bg_show{
+		background-color: #f8f8f8;
 	}
 	.img_swiper {
 		width: 750rpx;
@@ -415,6 +432,8 @@
 			bottom: 0;
 			right: 0;
 			margin: auto;
+			width: auto;
+			height: auto;
 		}
 	}
 	.goods_info {